fixed cmd_downall and cmd_upall to be multibot-supported

diff --git a/src/cmd_neonserv_downall.c b/src/cmd_neonserv_downall.c
index ca1163f566851270de5b2cb158067eaaa383d0b8..a7add4772d67c13537d659262d49e825306f24a4 100644 (file)
--- a/src/cmd_neonserv_downall.c
+++ b/src/cmd_neonserv_downall.c
@@ -23,6 +23,7 @@
 
 CMD_BIND(neonserv_cmd_downall) {
     struct ChanUser *chanuser;
+    int botid = client->botid;
     for(chanuser = getUserChannels(user, NULL); chanuser; chanuser = getUserChannels(user, chanuser)) {
         chan = chanuser->chan;
         loadChannelSettings(chan);
@@ -30,6 +31,8 @@ CMD_BIND(neonserv_cmd_downall) {
         printf_mysql_query("SELECT `botid` FROM `bot_channels` LEFT JOIN `bots` ON `bot_channels`.`botid` = `bots`.`id` WHERE `chanid` = '%d' AND `botclass` = '%d'", chan->channel_id, client->botid);
         if (mysql_fetch_row(mysql_use()) == NULL) continue;
         int done = 0;
+        client = getChannelBot(chan, botid);
+        if(!client) continue;
         if((chanuser->flags & CHANUSERFLAG_OPPED)) {
             putsock(client, "MODE %s -o %s", chan->name, user->nick);
             done = 1;

diff --git a/src/cmd_neonserv_upall.c b/src/cmd_neonserv_upall.c
index 81ac54cd8642df43c4a34c57164f82c3f21614bd..0f12379558bb33b30821a9a5bb85b3e48e7a7265 100644 (file)
--- a/src/cmd_neonserv_upall.c
+++ b/src/cmd_neonserv_upall.c
@@ -26,6 +26,7 @@ CMD_BIND(neonserv_cmd_upall) {
     MYSQL_ROW row, default_row;
     struct ChanUser *chanuser;
     int userid, chan_getop, chan_getvoice, caccess;
+    int botid = client->botid;
     printf_mysql_query("SELECT `user_id` FROM `users` WHERE `user_user` = '%s'", user->auth);
     res = mysql_use();
     if ((row = mysql_fetch_row(res)) == NULL)
@@ -51,6 +52,8 @@ CMD_BIND(neonserv_cmd_upall) {
         }
         caccess = atoi(row[0]);
         int done = 0;
+        client = getChannelBot(chan, botid);
+        if(!client) continue;
         if(caccess >= chan_getop) {
             if(!(chanuser->flags & CHANUSERFLAG_OPPED)) {
                 putsock(client, "MODE %s +o %s", chan->name, user->nick);