LOC fix for non-ldap LOC where ldap is available

[irc/evilnet/x3.git] / src / global.c

diff --git a/src/global.c b/src/global.c
index ad325c5639e82387b518afd9551661617bdaa876..ee30cd32ef0886210a4a94a2405998177571f81e 100644 (file)
--- a/src/global.c
+++ b/src/global.c
@@ -33,6 +33,7 @@
 
 /* Global options */
 #define KEY_DB_BACKUP_FREQ     "db_backup_freq"
+#define KEY_ANNOUNCEMENTS_DEFAULT "announcements_default"
 #define KEY_NICK               "nick"
 
 /* Message data */
@@ -137,6 +138,7 @@ static struct log_type *G_LOG;
 static struct
 {
     unsigned long db_backup_frequency;
+    unsigned int announcements_default : 1;
 } global_conf;
 
 #define global_notice(target, format...) send_message(target , global , ## format)
@@ -253,6 +255,8 @@ message_create(struct userNode *user, unsigned int argc, char *argv[])
                flags |= MESSAGE_RECIPIENT_STAFF;
            } else if(!irccasecmp(argv[i], "channels")) {
                flags |= MESSAGE_RECIPIENT_CHANNELS;
+            } else if(!irccasecmp(argv[i], "announcement") || !irccasecmp(argv[i], "announce")) {
+                flags |= MESSAGE_RECIPIENT_ANNOUNCE;
            } else {
                global_notice(user, "GMSG_INVALID_TARGET", argv[i]);
                return NULL;
@@ -291,6 +295,10 @@ messageType(const struct globalMessage *message)
     {
        return "staff";
     }
+    else if(message->flags & MESSAGE_RECIPIENT_ANNOUNCE)
+    {
+        return "announcement";
+    }
     else if(message->flags & MESSAGE_RECIPIENT_OPERS)
     {
        return "opers";
@@ -342,6 +350,7 @@ message_send(struct globalMessage *message)
 {
     struct userNode *user;
     unsigned long n;
+    dict_iterator_t it;
 
     if(message->flags & MESSAGE_RECIPIENT_CHANNELS)
     {
@@ -354,6 +363,20 @@ message_send(struct globalMessage *message)
        return;
     }
 
+    if(message->flags & MESSAGE_RECIPIENT_ANNOUNCE)
+    {
+        char announce;
+
+        for (it = dict_first(clients); it; it = iter_next(it)) {
+            user = iter_data(it);
+            if (user->uplink == self) continue;
+            announce = user->handle_info ? user->handle_info->announcements : '?';
+            if (announce == 'n') continue;
+            if ((announce == '?') && !global_conf.announcements_default) continue;
+            notice_target(user->nick, message);
+        }
+    }
+
     if(message->flags & MESSAGE_RECIPIENT_OPERS)
     {
        for(n = 0; n < curr_opers.used; n++)
@@ -470,6 +493,8 @@ static GLOBAL_FUNC(cmd_notice)
        target = MESSAGE_RECIPIENT_OPERS;
     } else if(!irccasecmp(argv[1], "staff") || !irccasecmp(argv[1], "privileged")) {
        target |= MESSAGE_RECIPIENT_HELPERS | MESSAGE_RECIPIENT_OPERS;
+    } else if(!irccasecmp(argv[1], "announcement") || !irccasecmp(argv[1], "announce")) {
+        target |= MESSAGE_RECIPIENT_ANNOUNCE;
     } else if(!irccasecmp(argv[1], "channels")) {
        target = MESSAGE_RECIPIENT_CHANNELS;
     } else {
@@ -693,6 +718,8 @@ global_conf_read(void)
 
     str = database_get_data(conf_node, KEY_DB_BACKUP_FREQ, RECDB_QSTRING);
     global_conf.db_backup_frequency = str ? ParseInterval(str) : 7200;
+    str = database_get_data(conf_node, KEY_ANNOUNCEMENTS_DEFAULT, RECDB_QSTRING);
+    global_conf.announcements_default = str ? enabled_string(str) : 1;
 
     str = database_get_data(conf_node, KEY_NICK, RECDB_QSTRING);
     if(global && str)
@@ -783,7 +810,7 @@ init_global(const char *nick)
     if(nick)
     {
         const char *modes = conf_get_data("services/global/modes", RECDB_QSTRING);
-        global = AddLocalUser(nick, nick, NULL, "Global Services", modes);
+        global = AddService(nick, modes ? modes : NULL, "Global Services", NULL);
         global_service = service_register(global);
     }