X-Git-Url: http://git.pk910.de/?a=blobdiff_plain;f=src%2Fmodules%2Fglobal.mod%2Fcmd_global_unregister.c;fp=src%2Fmodules%2Fglobal.mod%2Fcmd_global_unregister.c;h=97ef4f9a8fc8ee60191b98a4aa62d33d90d4d830;hb=e192ffc0fed753aa5a5c5081674511f90c5a953b;hp=e5525faca946391d0416bd6d52875f5a84eb6704;hpb=5db7ffe3eaf08c7346f5b8507d0af7b1fb77dd15;p=NeonServV5.git

diff --git a/src/modules/global.mod/cmd_global_unregister.c b/src/modules/global.mod/cmd_global_unregister.c
index e5525fa..97ef4f9 100644
--- a/src/modules/global.mod/cmd_global_unregister.c
+++ b/src/modules/global.mod/cmd_global_unregister.c
@@ -16,6 +16,7 @@
  */
 
 #include "cmd_global.h"
+#include "../botid.h"
 
 /*
 * argv[0] - channel
@@ -29,25 +30,30 @@ CMD_BIND(global_cmd_unregister) {
     else
         channel = (chan ? chan->name : "");
     if(!is_valid_chan(channel)) {
-        reply(getTextBot(), user, "NS_INVALID_CHANNEL_NAME", argv[0]);
+        reply(getTextBot(), user, "NS_INVALID_CHANNEL_NAME", channel);
         return;
     }
     int chanid;
-    printf_mysql_query("SELECT `channel_id` FROM `channels` WHERE `channel_name` = '%s'", escape_string(channel));
+    printf_mysql_query("SELECT `channel_id`, `channel_nodelete` FROM `channels` WHERE `channel_name` = '%s'", escape_string(channel));
     res = mysql_use();
     if ((row = mysql_fetch_row(res)) != NULL) {
         chanid = atoi(row[0]);
     } else {
-        reply(getTextBot(), user, "NS_UNREGISTER_NOT_REGISTERED", argv[0], client->user->nick);
+        reply(getTextBot(), user, "NS_UNREGISTER_NOT_REGISTERED", channel, client->user->nick);
         return;
     }
+    if(client->botid == NEONSERV_BOTID && !strcmp(row[1], "1")) {
+        reply(getTextBot(), user, "NS_UNREGISTER_NODELETE", channel);
+        return;
+    }
+    int sync_neonspam_unreg = get_int_field("General/sync_neonspam_unreg");
     if(client->botid == 0)
         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` 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);
+        reply(getTextBot(), user, "NS_UNREGISTER_NOT_REGISTERED", channel, client->user->nick);
         return;
     }
     int botid = atoi(row[0]);
@@ -61,5 +67,21 @@ CMD_BIND(global_cmd_unregister) {
     if(bot && strcmp(row[2], "1")) {
         putsock(bot, "PART %s :Channel unregistered.", channel);
     }
+    if(client->botid == NEONSERV_BOTID && sync_neonspam_unreg) {
+        printf_mysql_query("SELECT `botid`, `bot_channels`.`id`, `suspended` FROM `bot_channels` LEFT JOIN `bots` ON `bot_channels`.`botid` = `bots`.`id` LEFT JOIN `channels` ON `chanid` = `channel_id` WHERE `channel_name` = '%s' AND `botclass` = '%d'", escape_string(channel), NEONSPAM_BOTID);
+        res = mysql_use();
+        if ((row = mysql_fetch_row(res)) == NULL) {
+            return;
+        }
+        botid = atoi(row[0]);
+        for(bot = getBots(SOCKET_FLAG_READY, NULL); bot; bot = getBots(SOCKET_FLAG_READY, bot)) {
+            if(bot->clientid == botid)
+                break;
+        }
+        printf_mysql_query("DELETE FROM `bot_channels` WHERE `id` = '%s'", row[1]);
+        if(bot && strcmp(row[2], "1")) {
+            putsock(bot, "PART %s :Channel unregistered.", channel);
+        }
+    }
     logEvent(event);
 }