X-Git-Url: http://git.pk910.de/?a=blobdiff_plain;f=src%2Fmodules%2FNeonServ.mod%2Fcmd_neonserv_recover.c;h=814d9ab0c9d76ae9269032864920c539bf9309ff;hb=HEAD;hp=41ecda2d3a47cb9f85bfeb1d24b4661762d9d210;hpb=689da1db7e2517c187ce76c6c553e20d630a7f36;p=NeonServV5.git

diff --git a/src/modules/NeonServ.mod/cmd_neonserv_recover.c b/src/modules/NeonServ.mod/cmd_neonserv_recover.c
index 41ecda2..814d9ab 100644
--- a/src/modules/NeonServ.mod/cmd_neonserv_recover.c
+++ b/src/modules/NeonServ.mod/cmd_neonserv_recover.c
@@ -1,4 +1,4 @@
-/* cmd_neonserv_recover.c - NeonServ v5.4
+/* cmd_neonserv_recover.c - NeonServ v5.6
  * Copyright (C) 2011-2012  Philipp Kreil (pk910)
  * 
  * This program is free software: you can redistribute it and/or modify
@@ -25,13 +25,7 @@ CMD_BIND(neonserv_cmd_recover) {
     MYSQL_ROW row, row2;
     char *channel = argv[0];
     if(!is_valid_chan(channel)) {
-        reply(getTextBot(), user, "NS_INVALID_CHANNEL_NAME", argv[0]);
-        return;
-    }
-    printf_mysql_query("SELECT `botid`, `bot_channels`.`id` FROM `bot_channels` LEFT JOIN `bots` ON `bot_channels`.`botid` = `bots`.`id` WHERE `chanid` = '%d' AND `botclass` = '%d'", chan->channel_id, client->botid);
-    res = mysql_use();
-    if ((row = mysql_fetch_row(res)) != NULL) {
-        reply(getTextBot(), user, "NS_REGISTER_ALREADY", argv[0], client->user->nick);
+        reply(textclient, user, "NS_INVALID_CHANNEL_NAME", argv[0]);
         return;
     }
     int chanid;
@@ -40,7 +34,13 @@ CMD_BIND(neonserv_cmd_recover) {
     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(textclient, user, "NS_UNREGISTER_NOT_REGISTERED", argv[0], client->user->nick);
+        return;
+    }
+    printf_mysql_query("SELECT `botid`, `bot_channels`.`id` 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(textclient, user, "NS_REGISTER_ALREADY", argv[0], client->user->nick);
         return;
     }
     printf_mysql_query("SELECT `id`, `max_channels`, `defaulttrigger` FROM `bots` WHERE `botclass` = '%d' ORDER BY `register_priority` DESC", client->botid);
@@ -58,7 +58,7 @@ CMD_BIND(neonserv_cmd_recover) {
         }
     }
     if(!botid) {
-        reply(getTextBot(), user, "NS_REGISTER_FULL");
+        reply(textclient, user, "NS_REGISTER_FULL");
         return;
     }
     struct ClientSocket *bot;
@@ -69,8 +69,8 @@ CMD_BIND(neonserv_cmd_recover) {
     if(bot) {
         putsock(bot, "JOIN %s", channel);
     } else
-        reply(getTextBot(), user, "NS_REGISTER_DISCONNECTED");
+        reply(textclient, user, "NS_REGISTER_DISCONNECTED");
     printf_mysql_query("INSERT INTO `bot_channels` (`botid`, `chanid`, `trigger`) VALUES ('%d', '%d', '%s')", botid, chanid, bottrigger);
-    reply(getTextBot(), user, "NS_RECOVER_DONE", channel);
+    reply(textclient, user, "NS_RECOVER_DONE", channel);
     logEvent(event);
 }