X-Git-Url: http://git.pk910.de/?a=blobdiff_plain;f=src%2Fcmd_global_register.c;h=548860d65053f350ae753bba69bdc182d48d478a;hb=f90d21daf31f8d69e24406678be696afa8cae962;hp=a0c42587defee4804b438b5b4a046589908ec615;hpb=6d925b70ffc5a5e8be12d20b61210b8a4bc9810c;p=NeonServV5.git

diff --git a/src/cmd_global_register.c b/src/cmd_global_register.c
index a0c4258..548860d 100644
--- a/src/cmd_global_register.c
+++ b/src/cmd_global_register.c
@@ -1,5 +1,5 @@
-/* cmd_global_register.c - NeonServ v5.2
- * Copyright (C) 2011  Philipp Kreil (pk910)
+/* cmd_global_register.c - NeonServ v5.3
+ * 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
@@ -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
@@ -80,7 +80,7 @@ CMD_BIND(global_cmd_register) {
         global_cmd_register_async1(client, getTextBot(), user, chan, event, channel, NULL, multibot, botname);
         return;
     } else if(argc < 2) {
-        reply(getTextBot(), user, "MODCMD_LESS_PARAM_COUNT");
+        global_cmd_register_async1(client, getTextBot(), user, chan, event, channel, user->auth, multibot, botname);
         return;
     }
     //check own access
@@ -114,6 +114,10 @@ CMD_BIND(global_cmd_register) {
         struct UserNode *cuser = getUserByNick(argv[1]);
         if(!cuser) {
             cuser = createTempUser(argv[1]);
+			if(!cuser) {
+                reply(getTextBot(), user, "NS_USER_UNKNOWN", argv[1]);
+                return;
+            }
             cuser->flags |= USERFLAG_ISTMPUSER;
         }
         if(cuser->flags & USERFLAG_ISAUTHED) {
@@ -206,20 +210,21 @@ static void global_cmd_register_async1(struct ClientSocket *client, struct Clien
             userid = atoi(row[0]);
         } else {
             printf_mysql_query("INSERT INTO `users` (`user_user`) VALUES ('%s')", escape_string(auth));
-            userid = (int) mysql_insert_id(mysql_conn);
+            userid = (int) mysql_insert_id(get_mysql_conn());
         }
     }
-    printf_mysql_query("SELECT `id`, `max_channels`, `defaulttrigger`, `nick` FROM `bots` WHERE `botclass` = '%d' AND `active` = '1' ORDER BY `register_priority` DESC", client->botid);
+    if(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);
+    else
+        printf_mysql_query("SELECT `id`, `max_channels`, `defaulttrigger`, `nick` FROM `bots` WHERE `id` = '%d' AND `active` = '1'", client->clientid);
     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;
         }
     }
@@ -235,7 +240,7 @@ static void global_cmd_register_async1(struct ClientSocket *client, struct Clien
         printf_mysql_query("UPDATE `channels` SET `channel_registered` = UNIX_TIMESTAMP(), `channel_registrator` = '%d' WHERE `channel_id` = '%d'", adminid, chanid);
     } else {
         printf_mysql_query("INSERT INTO `channels` (`channel_name`, `channel_registered`, `channel_registrator`) VALUES ('%s', UNIX_TIMESTAMP(), '%d')", escape_string(channel), adminid);
-        chanid = (int) mysql_insert_id(mysql_conn);
+        chanid = (int) mysql_insert_id(get_mysql_conn());
     }
     struct ClientSocket *bot;
     for(bot = getBots(SOCKET_FLAG_READY, NULL); bot; bot = getBots(SOCKET_FLAG_READY, bot)) {
@@ -246,7 +251,7 @@ static void global_cmd_register_async1(struct ClientSocket *client, struct Clien
         putsock(bot, "JOIN %s", channel);
     } else
         reply(textclient, user, "NS_REGISTER_DISCONNECTED", channel);
-    printf_mysql_query("INSERT INTO `bot_channels` (`botid`, `chanid`, `trigger`) VALUES ('%d', '%d', '%s')", botid, chanid, bottrigger);
+    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);