X-Git-Url: http://git.pk910.de/?a=blobdiff_plain;f=src%2Fcmd_global_unregister.c;h=43dab20796f171615c61b67c487001eb0d539b22;hb=c32e8254ec4ed0d77757e32f8aa5aabcdb494057;hp=c0f208b90cd25fb993881cd9eb7dea8b9a16504c;hpb=cf75ab8a102b14d560db2c719721e53aaacb4c73;p=NeonServV5.git

diff --git a/src/cmd_global_unregister.c b/src/cmd_global_unregister.c
index c0f208b..43dab20 100644
--- a/src/cmd_global_unregister.c
+++ b/src/cmd_global_unregister.c
@@ -1,5 +1,5 @@
 /* cmd_global_unregister.c - NeonServ v5.3
- * Copyright (C) 2011  Philipp Kreil (pk910)
+ * Copyright (C) 2011-2012  Philipp Kreil (pk910)
  * 
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -42,19 +42,18 @@ CMD_BIND(global_cmd_unregister) {
         return;
     }
     if(client->botid == 0)
-        printf_mysql_query("SELECT `botid`, `bot_channels`.`id`, `suspended`, `bots`.`id` FROM `bot_channels` LEFT JOIN `bots` ON `bot_channels`.`botid` = `bots`.`id` WHERE `chanid` = '%d' AND `botclass` = '0' AND `botid` = '%d'", chanid, client->clientid);
+        printf_mysql_query("SELECT `botid`, `bot_channels`.`id`, `suspended` FROM `bot_channels` LEFT JOIN `bots` ON `bot_channels`.`botid` = `bots`.`id` WHERE `chanid` = '%d' AND `botclass` = '0' AND `botid` = '%d'", chanid, client->clientid);
     else
-        printf_mysql_query("SELECT `botid`, `bot_channels`.`id`, `suspended`, `bots`.`id` FROM `bot_channels` LEFT JOIN `bots` ON `bot_channels`.`botid` = `bots`.`id` WHERE `chanid` = '%d' AND `botclass` = '%d'", chanid, client->botid);
+        printf_mysql_query("SELECT `botid`, `bot_channels`.`id`, `suspended` FROM `bot_channels` LEFT JOIN `bots` ON `bot_channels`.`botid` = `bots`.`id` WHERE `chanid` = '%d' AND `botclass` = '%d'", chanid, client->botid);
     res = mysql_use();
     if ((row = mysql_fetch_row(res)) == NULL) {
         reply(getTextBot(), user, "NS_UNREGISTER_NOT_REGISTERED", argv[0], client->user->nick);
         return;
     }
     int botid = atoi(row[0]);
-    int clientid = atoi(row[3]);
     struct ClientSocket *bot;
     for(bot = getBots(SOCKET_FLAG_READY, NULL); bot; bot = getBots(SOCKET_FLAG_READY, bot)) {
-        if(bot->clientid == botid && (!botid || bot->clientid == clientid))
+        if(bot->clientid == botid)
             break;
     }
     if(bot && strcmp(row[2], "1")) {