X-Git-Url: http://git.pk910.de/?a=blobdiff_plain;f=src%2Fcmd_global_register.c;h=dd94f93c988860f75699ec13d4eccd00f85fdbd8;hb=0b17bccd2d7fbef5652168d11d4f0af1f41252d3;hp=ab467d979b87dde8fc24f7fba8b184f696c5960c;hpb=085e2a8525041163f59e0f4be823fdf8f6ba547f;p=NeonServV5.git

diff --git a/src/cmd_global_register.c b/src/cmd_global_register.c
index ab467d9..dd94f93 100644
--- a/src/cmd_global_register.c
+++ b/src/cmd_global_register.c
@@ -1,4 +1,4 @@
-/* cmd_global_register.c - NeonServ v5.2
+/* cmd_global_register.c - NeonServ v5.3
  * Copyright (C) 2011  Philipp Kreil (pk910)
  * 
  * This program is free software: you can redistribute it and/or modify
@@ -50,7 +50,7 @@ CMD_BIND(global_cmd_register) {
     printf_mysql_query("SELECT `botid`, `botclass` FROM `bot_channels` LEFT JOIN `bots` ON `bot_channels`.`botid` = `bots`.`id` LEFT JOIN `channels` ON `bot_channels`.`chanid` = `channels`.`channel_id` WHERE `channel_name` = '%s'", escape_string(channel));
     res = mysql_use();
     while ((row = mysql_fetch_row(res)) != NULL) {
-        if(atoi(row[1]) == client->botid) {
+        if(atoi(row[1]) == client->botid && (client->botid || client->clientid == atoi(row[0]))) {
             reply(getTextBot(), user, "NS_REGISTER_ALREADY", argv[0], client->user->nick);
             return;
         } else
@@ -209,17 +209,15 @@ static void global_cmd_register_async1(struct ClientSocket *client, struct Clien
             userid = (int) mysql_insert_id(mysql_conn);
         }
     }
-    printf_mysql_query("SELECT `id`, `max_channels`, `defaulttrigger`, `nick` FROM `bots` WHERE `botclass` = '%d' ORDER BY `register_priority` DESC", client->botid);
+    printf_mysql_query("SELECT `id`, `max_channels`, `defaulttrigger`, `nick` FROM `bots` WHERE `botclass` = '%d' AND `active` = '1' ORDER BY `register_priority` DESC", client->botid);
     res = mysql_use();
     int botid = 0;
-    char *bottrigger;
     while ((row = mysql_fetch_row(res)) != NULL) {
         //check channel count
         printf_mysql_query("SELECT COUNT(*) FROM `bot_channels` WHERE `botid` = '%s'", row[0]);
         row2 = mysql_fetch_row(mysql_use());
         if(atoi(row2[0]) < atoi(row[1]) && (!botname || !stricmp(botname, row[3]))) {
             botid = atoi(row[0]);
-            bottrigger = row[2];
             break;
         }
     }
@@ -245,8 +243,8 @@ static void global_cmd_register_async1(struct ClientSocket *client, struct Clien
     if(bot) {
         putsock(bot, "JOIN %s", channel);
     } else
-        reply(textclient, user, "NS_REGISTER_DISCONNECTED");
-    printf_mysql_query("INSERT INTO `bot_channels` (`botid`, `chanid`, `trigger`) VALUES ('%d', '%d', '%s')", botid, chanid, bottrigger);
+        reply(textclient, user, "NS_REGISTER_DISCONNECTED", channel);
+    printf_mysql_query("INSERT INTO `bot_channels` (`botid`, `chanid`, `trigger`) VALUES ('%d', '%d', NULL)", botid, chanid);
     if(multibot != 2) {
         if(multibot) {
             printf_mysql_query("UPDATE `chanusers` SET `chanuser_access` = 499 WHERE `chanuser_cid` = '%d' AND `chanuser_access` = '500'", chanid);