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

diff --git a/src/cmd_global_register.c b/src/cmd_global_register.c
index dd94f93..548860d 100644
--- a/src/cmd_global_register.c
+++ b/src/cmd_global_register.c
@@ -1,5 +1,5 @@
 /* cmd_global_register.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
@@ -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,10 +210,13 @@ 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;
     while ((row = mysql_fetch_row(res)) != NULL) {
@@ -233,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)) {