fixed cmd_register

diff --git a/bot_NeonServ.c b/bot_NeonServ.c
index 2526611544861eeb05a588c605f4ce5ee9263c5d..b95cf6d036afe0d96b459c76f7813d72d9645b8f 100644 (file)
--- a/bot_NeonServ.c
+++ b/bot_NeonServ.c
@@ -353,7 +353,7 @@ void init_NeonServ() {
     
     register_command(BOTID, "trace",        neonserv_cmd_trace,     1, CMDFLAG_REQUIRE_AUTH | CMDFLAG_CHECK_AUTH,                                                   NULL,                   400);
     register_command(BOTID, "register",     neonserv_cmd_register,  2, CMDFLAG_REQUIRE_AUTH | CMDFLAG_CHECK_AUTH | CMDFLAG_CHAN_PARAM,                              NULL,                   100);
-    register_command(BOTID, "unregister",   neonserv_cmd_unregister,2, CMDFLAG_REQUIRE_AUTH | CMDFLAG_CHECK_AUTH | CMDFLAG_CHAN_PARAM,                              NULL,                   100);
+    register_command(BOTID, "unregister",   neonserv_cmd_unregister,1, CMDFLAG_REQUIRE_AUTH | CMDFLAG_CHECK_AUTH | CMDFLAG_CHAN_PARAM,                              NULL,                   100);
     register_command(BOTID, "recover",      neonserv_cmd_recover,   1, CMDFLAG_REQUIRE_AUTH | CMDFLAG_CHECK_AUTH | CMDFLAG_CHAN_PARAM,                              NULL,                   100);
     
     start_bots();

diff --git a/cmd_neonserv_recover.c b/cmd_neonserv_recover.c
index 931e33972e9efa167dd632ce48e80eb4061d054d..7cdd323266910f60d877f5e6f711ff27547d1fbf 100644 (file)
--- a/cmd_neonserv_recover.c
+++ b/cmd_neonserv_recover.c
@@ -25,7 +25,7 @@ static CMD_BIND(neonserv_cmd_recover) {
         reply(getTextBot(), user, "NS_UNREGISTER_NOT_REGISTERED", argv[0], client->user->nick);
         return;
     }
-    printf_mysql_query("SELECT `botid`, `max_channels`, `defaulttrigger` FROM `bots` WHERE `botclass` = '%d' ORDER BY `register_priority` DESC", client->botid);
+    printf_mysql_query("SELECT `id`, `max_channels`, `defaulttrigger` FROM `bots` WHERE `botclass` = '%d' ORDER BY `register_priority` DESC", client->botid);
     res = mysql_use();
     int botid = 0;
     char *bottrigger;

diff --git a/cmd_neonserv_register.c b/cmd_neonserv_register.c
index 24063899c4ea9deb86dfed55156eaccca17ee364..9486ec93dfe3124d74b4c8be539edb623b4e6dd6 100644 (file)
--- a/cmd_neonserv_register.c
+++ b/cmd_neonserv_register.c
@@ -30,9 +30,9 @@ static CMD_BIND(neonserv_cmd_register) {
         return;
     }
     //check own access
-    if(argv[0][0] == '*') {
+    if(argv[1][0] == '*') {
         //we've got an auth
-        argv[0]++;
+        argv[1]++;
         printf_mysql_query("SELECT `user_user` FROM `users` WHERE `user_user` = '%s'", escape_string(argv[0]));
         res = mysql_use();
         if ((row = mysql_fetch_row(res)) != NULL) {
@@ -49,14 +49,14 @@ static CMD_BIND(neonserv_cmd_register) {
             cache->textclient = getTextBot();
             cache->user = user;
             cache->chan = chan;
-            cache->nick = strdup(argv[0]);
+            cache->nick = strdup(argv[1]);
             cache->channel = strdup(channel);
-            lookup_authname(argv[0], neonserv_cmd_register_auth_lookup, cache);
+            lookup_authname(argv[1], neonserv_cmd_register_auth_lookup, cache);
         }
     } else {
-        struct UserNode *cuser = getUserByNick(argv[0]);
+        struct UserNode *cuser = getUserByNick(argv[1]);
         if(!cuser) {
-            cuser = createTempUser(argv[0]);
+            cuser = createTempUser(argv[1]);
             cuser->flags |= USERFLAG_ISTMPUSER;
         }
         if(cuser->flags & USERFLAG_ISAUTHED) {
@@ -71,7 +71,7 @@ static CMD_BIND(neonserv_cmd_register) {
             cache->textclient = getTextBot();
             cache->user = user;
             cache->chan = chan;
-            cache->nick = strdup(argv[0]);
+            cache->nick = strdup(argv[1]);
             cache->channel = strdup(channel);
             get_userauth(cuser, neonserv_cmd_register_nick_lookup, cache);
         }
@@ -126,7 +126,7 @@ static void neonserv_cmd_register_async1(struct ClientSocket *client, struct Cli
         printf_mysql_query("INSERT INTO `users` (`user_user`) VALUES ('%s')", escape_string(auth));
         userid = (int) mysql_insert_id(mysql_conn);
     }
-    printf_mysql_query("SELECT `botid`, `max_channels`, `defaulttrigger` FROM `bots` WHERE `botclass` = '%d' ORDER BY `register_priority` DESC", client->botid);
+    printf_mysql_query("SELECT `id`, `max_channels`, `defaulttrigger` FROM `bots` WHERE `botclass` = '%d' ORDER BY `register_priority` DESC", client->botid);
     res = mysql_use();
     int botid = 0;
     char *bottrigger;