deop users on disallowed /mode events and do not revoke op events if target has enoug...

diff --git a/src/event_neonserv_mode.c b/src/event_neonserv_mode.c
index 4b507c4656e1e96ae6f9a6aadca46a2de1303f7c..c5ba129a39244f55bcdd063eb46501306a9b22bc 100644 (file)
--- a/src/event_neonserv_mode.c
+++ b/src/event_neonserv_mode.c
@@ -76,29 +76,33 @@ static void neonserv_event_mode_async1(struct ClientSocket *client, struct UserN
     MYSQL_ROW row, defaults = NULL;
     int i, arg, add = 1, skip = 0;
     unsigned int modetype;
-    int db_canop, db_canvoice, db_canban, db_enfmodes;
+    int db_canop, db_canvoice, db_canban, db_enfmodes, db_getop, db_getvoice;
     struct ModeNode *modelock = createModeNode(NULL);
     struct ModeBuffer *modeBuf;
     struct UserNode *cuser;
     struct ChanUser *chanuser;
     modeBuf = initModeBuffer(client, chan);
-    printf_mysql_query("SELECT `channel_canop`, `channel_canvoice`, `channel_canban`, `channel_enfmodes`, `channel_modes` FROM `channels` WHERE `channel_id` = '%d'", chan->channel_id);
+    printf_mysql_query("SELECT `channel_canop`, `channel_canvoice`, `channel_canban`, `channel_enfmodes`, `channel_modes`, `channel_getop`, `channel_getvoice` FROM `channels` WHERE `channel_id` = '%d'", chan->channel_id);
     row = mysql_fetch_row(mysql_use());
-    if(row[0] == NULL || row[1] == NULL || row[2] == NULL || row[3] == NULL || row[4] == NULL) {
-        printf_mysql_query("SELECT `channel_canop`, `channel_canvoice`, `channel_canban`, `channel_enfmodes`, `channel_modes` FROM `channels` WHERE `channel_name` = 'defaults'");
+    if(row[0] == NULL || row[1] == NULL || row[2] == NULL || row[3] == NULL || row[4] == NULL || row[5] == NULL || row[6] == NULL) {
+        printf_mysql_query("SELECT `channel_canop`, `channel_canvoice`, `channel_canban`, `channel_enfmodes`, `channel_modes`, `channel_getop`, `channel_getvoice` FROM `channels` WHERE `channel_name` = 'defaults'");
         defaults = mysql_fetch_row(mysql_use());
     }
     db_canop = atoi((row[0] ? row[0] : defaults[0]));
     db_canvoice = atoi((row[1] ? row[1] : defaults[1]));
     db_canban = atoi((row[2] ? row[2] : defaults[2]));
     db_enfmodes = atoi((row[3] ? row[3] : defaults[3]));
+    db_getop = atoi((row[5] ? row[5] : defaults[5]));
+    db_getvoice = atoi((row[6] ? row[6] : defaults[6]));
     if(row[4])
         parseModeString(modelock, row[4]);
     else if(defaults[4])
         parseModeString(modelock, defaults[4]);
     int uaccess = getChannelAccess(user, chan);
+    int caccess;
     char *carg;
     int sent_modes_locked = 0;
+    char deop_user = 0;
     char tmp[MAXLEN];
     arg = 0;
     for(i = 0; i < strlen(modes); i++) {
@@ -116,12 +120,18 @@ static void neonserv_event_mode_async1(struct ClientSocket *client, struct UserN
                 }
                 carg = argv[arg++];
                 cuser = searchUserByNick(carg);
+                if(!cuser) {
+                    break; //internal Bot error - this should never happen
+                }
+                caccess = getChannelAccess(cuser, chan);
                 if(modes[i] == 'o' && !(add && isBot(cuser))) {
                     if(uaccess < db_canop) {
                         reply(textclient, user, "NS_MODE_ENFOPS", chan->name);
                         db_canop = -1;
+                        if(uaccess < db_getop)
+                            deop_user = 1;
                     }
-                    if(db_canop == -1) {
+                    if(db_canop == -1 && caccess < db_getop) {
                         if(!neonserv_cmd_mode_botwar_detect(client, user, chan))
                             modeBufferSet(modeBuf, !add, modes[i], carg);
                         break;
@@ -130,16 +140,15 @@ static void neonserv_event_mode_async1(struct ClientSocket *client, struct UserN
                     if(uaccess < db_canvoice) {
                         reply(textclient, user, "NS_MODE_ENFVOICE", chan->name);
                         db_canvoice = -1;
+                        if(uaccess < db_getop)
+                            deop_user = 1;
                     }
-                    if(db_canvoice == -1) {
+                    if(db_canvoice == -1 && caccess < db_getvoice) {
                         if(!neonserv_cmd_mode_botwar_detect(client, user, chan))
                             modeBufferSet(modeBuf, !add, modes[i], carg);
                         break;
                     }
                 }
-                if(!cuser) {
-                    break; //internal Bot error - this should never happen
-                }
                 if(!add) {
                     //check protection
                     if(isBot(cuser)) {
@@ -153,6 +162,8 @@ static void neonserv_event_mode_async1(struct ClientSocket *client, struct UserN
                         reply(textclient, user, "NS_USER_PROTECTED", cuser->nick);
                         if(!neonserv_cmd_mode_botwar_detect(client, user, chan))
                             modeBufferSet(modeBuf, !add, modes[i], carg);
+                        if(uaccess < db_getop)
+                            deop_user = 1;
                         break;
                     }
                 }
@@ -169,6 +180,8 @@ static void neonserv_event_mode_async1(struct ClientSocket *client, struct UserN
                 if(db_canban == -1) {
                     if(!neonserv_cmd_mode_botwar_detect(client, user, chan))
                         modeBufferSet(modeBuf, !add, modes[i], carg);
+                    if(uaccess < db_getop)
+                        deop_user = 1;
                     break;
                 }
                 char hostmask_buffer[NICKLEN+USERLEN+HOSTLEN+3];
@@ -192,8 +205,11 @@ static void neonserv_event_mode_async1(struct ClientSocket *client, struct UserN
                         reply(textclient, user, "NS_LAME_MASK_WARNING", carg, match_count);
                     }
                 }
-                if(skip && !neonserv_cmd_mode_botwar_detect(client, user, chan)) {
-                    modeBufferSet(modeBuf, !add, modes[i], carg);
+                if(skip) {
+                    if(!neonserv_cmd_mode_botwar_detect(client, user, chan))
+                        modeBufferSet(modeBuf, !add, modes[i], carg);
+                    if(uaccess < db_getop)
+                        deop_user = 1;
                 }
                 break;
             default:
@@ -214,6 +230,8 @@ static void neonserv_event_mode_async1(struct ClientSocket *client, struct UserN
                                 getFullModeString(modelock, tmp);
                                 reply(textclient, user, "NS_MODE_LOCKED", tmp, chan->name);
                                 sent_modes_locked = 1;
+                                if(uaccess < db_getop)
+                                    deop_user = 1;
                             }
                             if(!neonserv_cmd_mode_botwar_detect(client, user, chan))
                                 modeBufferSet(modeBuf, add, modes[i], modelock_val);
@@ -227,6 +245,8 @@ static void neonserv_event_mode_async1(struct ClientSocket *client, struct UserN
                                 getFullModeString(modelock, tmp);
                                 reply(textclient, user, "NS_MODE_LOCKED", tmp, chan->name);
                                 sent_modes_locked = 1;
+                                if(uaccess < db_getop)
+                                    deop_user = 1;
                             }
                             sprintf(tmp, "%d", *modelock_val);
                             if(!neonserv_cmd_mode_botwar_detect(client, user, chan))
@@ -246,6 +266,8 @@ static void neonserv_event_mode_async1(struct ClientSocket *client, struct UserN
                         getFullModeString(modelock, tmp);
                         reply(textclient, user, "NS_MODE_LOCKED", tmp, chan->name);
                         sent_modes_locked = 1;
+                        if(uaccess < db_getop)
+                            deop_user = 1;
                     }
                     if(!neonserv_cmd_mode_botwar_detect(client, user, chan))
                         modeBufferSet(modeBuf, !add, modes[i], carg);
@@ -254,6 +276,9 @@ static void neonserv_event_mode_async1(struct ClientSocket *client, struct UserN
                 break;
         }
     }
+    if(deop_user && !neonserv_cmd_mode_botwar_detect(client, user, chan)) {
+        modeBufferDeop(modeBuf, user->nick);
+    }
     freeModeBuffer(modeBuf);
     freeModeNode(modelock);
 }