Consolidate use_registered_mode into off_channel and expand overall functionality

[srvx.git] / src / chanserv.c

diff --git a/src/chanserv.c b/src/chanserv.c
index 0a2bbd762bceb5d15eae2b14c6762130c44a4451..abba31fa3717cfa974ea4014edba4a7f25c531b8 100644 (file)
--- a/src/chanserv.c
+++ b/src/chanserv.c
@@ -502,8 +502,6 @@ static struct
     unsigned int       max_chan_bans;
     unsigned int        max_userinfo_length;
 
-    unsigned int       use_registered_mode;
-
     struct string_list  *set_shows;
     struct string_list  *eightball;
     struct string_list  *old_ban_names;
@@ -1292,7 +1290,7 @@ unregister_channel(struct chanData *channel, const char *reason)
 
     timeq_del(0, NULL, channel, TIMEQ_IGNORE_FUNC | TIMEQ_IGNORE_WHEN);
 
-    if(chanserv_conf.use_registered_mode)
+    if(off_channel > 0)
     {
       mod_chanmode_init(&change);
       change.modes_clear |= MODE_REGISTERED;
@@ -1753,7 +1751,7 @@ static CHANSERV_FUNC(cmd_register)
     cData = register_channel(channel, user->handle_info->handle);
     scan_user_presence(add_channel_user(cData, handle, UL_OWNER, 0, NULL), NULL);
     cData->modes = chanserv_conf.default_modes;
-    if(chanserv_conf.use_registered_mode)
+    if(off_channel > 0)
       cData->modes.modes_set |= MODE_REGISTERED;
     change = mod_chanmode_dup(&cData->modes, 1);
     change->args[change->argc].mode = MODE_CHANOP;
@@ -1845,6 +1843,7 @@ static CHANSERV_FUNC(cmd_unregister)
 
 static CHANSERV_FUNC(cmd_move)
 {
+    struct mod_chanmode change;
     struct chanNode *target;
     struct modeNode *mn;
     struct userData *uData;
@@ -1886,6 +1885,7 @@ static CHANSERV_FUNC(cmd_move)
         }
     }
 
+    mod_chanmode_init(&change);
     if(!(target = GetChannel(argv[1])))
     {
         target = AddChannel(argv[1], now, NULL, NULL);
@@ -1905,14 +1905,23 @@ static CHANSERV_FUNC(cmd_move)
     }
     else if(!IsSuspended(channel->channel_info))
     {
-        struct mod_chanmode change;
-        mod_chanmode_init(&change);
         change.argc = 1;
         change.args[0].mode = MODE_CHANOP;
         change.args[0].u.member = AddChannelUser(chanserv, target);
         mod_chanmode_announce(chanserv, target, &change);
     }
 
+    if(off_channel > 0)
+    {
+        /* Clear MODE_REGISTERED from old channel, add it to new. */
+        change.argc = 0;
+        change.modes_clear = MODE_REGISTERED;
+        mod_chanmode_announce(chanserv, channel, &change);
+        change.modes_clear = 0;
+        change.modes_set = MODE_REGISTERED;
+        mod_chanmode_announce(chanserv, target, &change);
+    }
+
     /* Move the channel_info to the target channel; it
        shouldn't be necessary to clear timeq callbacks
        for the old channel. */
@@ -6023,7 +6032,8 @@ handle_auth(struct userNode *user, UNUSED_ARG(struct handle_info *old_handle))
         struct banData *ban;
 
         if((user->channels.list[ii]->modes & (MODE_CHANOP|MODE_VOICE))
-           || !channel->channel_info)
+           || !channel->channel_info
+           || IsSuspended(channel->channel_info))
             continue;
         for(jj = 0; jj < channel->banlist.used; ++jj)
             if(user_matches_glob(user, channel->banlist.list[jj]->ban, 1))
@@ -6456,9 +6466,7 @@ chanserv_conf_read(void)
     /* the variable itself is actually declared in proto-common.c; this is equally 
      * parse issue. */
     str = database_get_data(conf_node, "off_channel", RECDB_QSTRING);
-    off_channel = (str && enabled_string(str)) ? 1 : 0;
-    str = database_get_data(conf_node, "use_registered_mode", RECDB_QSTRING);
-    chanserv_conf.use_registered_mode = (str && enabled_string(str)) ? 1 : 0;
+    off_channel = str ? atoi(str) : 0;
 }
 
 static void
@@ -6768,7 +6776,7 @@ chanserv_channel_read(const char *key, struct record_data *hir)
        && (argc = split_line(str, 0, ArrayLength(argv), argv))
        && (modes = mod_chanmode_parse(cNode, argv, argc, MCP_KEY_FREE))) {
         cData->modes = *modes;
-       if(chanserv_conf.use_registered_mode)
+       if(off_channel > 0)
           cData->modes.modes_set |= MODE_REGISTERED;
         if(cData->modes.argc > 1)
             cData->modes.argc = 1;
@@ -7252,7 +7260,7 @@ init_chanserv(const char *nick)
     DEFINE_CHANNEL_OPTION(ctcpusers);
     DEFINE_CHANNEL_OPTION(ctcpreaction);
     DEFINE_CHANNEL_OPTION(inviteme);
-    if(off_channel)
+    if(off_channel > 1)
         DEFINE_CHANNEL_OPTION(offchannel);
     modcmd_register(chanserv_module, "set defaults", chan_opt_defaults, 1, 0, "access", "owner", NULL);