changed Makefile; build all commands as an own file

[NeonServV5.git] / cmd_neonserv_register.c

diff --git a/cmd_neonserv_register.c b/cmd_neonserv_register.c
index 4d57ac0e8f7dba0221223948b1b08a2afcfce869..d336d7fc15a42f9e769c8ffe34f1d9b942e58e4b 100644 (file)
--- a/cmd_neonserv_register.c
+++ b/cmd_neonserv_register.c
@@ -1,4 +1,6 @@
 
+#include "cmd_neonserv.h"
+
 /*
 * argv[0] - channel
 * argv[0/1] - nick / *auth
@@ -16,7 +18,7 @@ struct neonserv_cmd_register_cache {
     char *channel;
 };
 
-static CMD_BIND(neonserv_cmd_register) {
+CMD_BIND(neonserv_cmd_register) {
     MYSQL_RES *res;
     MYSQL_ROW row;
     char *channel = argv[0];
@@ -24,7 +26,7 @@ static CMD_BIND(neonserv_cmd_register) {
         reply(getTextBot(), user, "NS_INVALID_CHANNEL_NAME", argv[0]);
         return;
     }
-    printf_mysql_query("SELECT `botid` FROM `bot_channels` LEFT JOIN `bots` ON `bot_channels`.`botid` = `bots`.`id` WHERE `chanid` = '%d' AND `botclass` = '%d'", chan->channel_id, client->botid);
+    printf_mysql_query("SELECT `botid` 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' AND `botclass` = '%d'", escape_string(channel), client->botid);
     res = mysql_use();
     if ((row = mysql_fetch_row(res)) != NULL) {
         reply(getTextBot(), user, "NS_REGISTER_ALREADY", argv[0], client->user->nick);
@@ -34,7 +36,7 @@ static CMD_BIND(neonserv_cmd_register) {
     if(argv[1][0] == '*') {
         //we've got an auth
         argv[1]++;
-        printf_mysql_query("SELECT `user_user` FROM `users` WHERE `user_user` = '%s'", escape_string(argv[0]));
+        printf_mysql_query("SELECT `user_user` FROM `users` WHERE `user_user` = '%s'", escape_string(argv[1]));
         res = mysql_use();
         if ((row = mysql_fetch_row(res)) != NULL) {
             neonserv_cmd_register_async1(client, getTextBot(), user, chan, event, channel, row[0]);