removed getTextBot() function and added textbot parameter to the CMD_BIND header...

[NeonServV5.git] / src / modules / global.mod / cmd_global_register.c

diff --git a/src/modules/global.mod/cmd_global_register.c b/src/modules/global.mod/cmd_global_register.c
index 81e018014b26bb4cdaef743a4cfd1bb52df7cdc4..03f94faa856e078f4081036e6524f21f851757c1 100644 (file)
--- a/src/modules/global.mod/cmd_global_register.c
+++ b/src/modules/global.mod/cmd_global_register.c
@@ -44,14 +44,14 @@ CMD_BIND(global_cmd_register) {
     char *botname = (argc > 2 ? argv[2] : NULL);
     int multibot = 0;
     if(!is_valid_chan(channel)) {
-        reply(getTextBot(), user, "NS_INVALID_CHANNEL_NAME", argv[0]);
+        reply(textclient, user, "NS_INVALID_CHANNEL_NAME", argv[0]);
         return;
     }
     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 && (client->botid || client->clientid == atoi(row[0]))) {
-            reply(getTextBot(), user, "NS_REGISTER_ALREADY", argv[0], client->user->nick);
+            reply(textclient, user, "NS_REGISTER_ALREADY", argv[0], client->user->nick);
             return;
         } else
             multibot = 1;
@@ -65,11 +65,11 @@ CMD_BIND(global_cmd_register) {
                 printf_mysql_query("DELETE FROM `donotregister` WHERE `dnr_id` = '%s'", row[3]);
             } else {
                 char expireBuf[MAXLEN];
-                reply(getTextBot(), user, "NS_DNR_SET_EXPIRES", channel, row[0], timeToStr(user, (expire_time - time(0)), 2, expireBuf), row[2]);
+                reply(textclient, user, "NS_DNR_SET_EXPIRES", channel, row[0], timeToStr(user, (expire_time - time(0)), 2, expireBuf), row[2]);
                 return;
             }
         } else {
-            reply(getTextBot(), user, "NS_DNR_SET", channel, row[0], row[2]);
+            reply(textclient, user, "NS_DNR_SET", channel, row[0], row[2]);
             return;
         }
     }
@@ -77,10 +77,10 @@ CMD_BIND(global_cmd_register) {
     if(multibot && argc < 2) {
         //skip all these owner check lines
         multibot = 2;
-        global_cmd_register_async1(client, getTextBot(), user, chan, event, channel, NULL, multibot, botname);
+        global_cmd_register_async1(client, textclient, user, chan, event, channel, NULL, multibot, botname);
         return;
     } else if(argc < 2) {
-        global_cmd_register_async1(client, getTextBot(), user, chan, event, channel, user->auth, multibot, botname);
+        global_cmd_register_async1(client, textclient, user, chan, event, channel, user->auth, multibot, botname);
         return;
     }
     //check own access
@@ -90,7 +90,7 @@ CMD_BIND(global_cmd_register) {
         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) {
-            global_cmd_register_async1(client, getTextBot(), user, chan, event, channel, row[0], multibot, botname);
+            global_cmd_register_async1(client, textclient, user, chan, event, channel, row[0], multibot, botname);
         } else {
             //we need to create a new user...
             //but first lookup the auth to check if it really exists
@@ -100,7 +100,7 @@ CMD_BIND(global_cmd_register) {
                 return;
             }
             cache->client = client;
-            cache->textclient = getTextBot();
+            cache->textclient = textclient;
             cache->user = user;
             cache->chan = chan;
             cache->event = event;
@@ -115,13 +115,13 @@ CMD_BIND(global_cmd_register) {
         if(!cuser) {
             cuser = createTempUser(argv[1]);
             if(!cuser) {
-                reply(getTextBot(), user, "NS_USER_UNKNOWN", argv[1]);
+                reply(textclient, user, "NS_USER_UNKNOWN", argv[1]);
                 return;
             }
             cuser->flags |= USERFLAG_ISTMPUSER;
         }
         if(cuser->flags & USERFLAG_ISAUTHED) {
-            global_cmd_register_async1(client, getTextBot(), user, chan, event, channel, cuser->auth, multibot, botname);
+            global_cmd_register_async1(client, textclient, user, chan, event, channel, cuser->auth, multibot, botname);
         } else {
             struct global_cmd_register_cache *cache = malloc(sizeof(*cache));
             if (!cache) {
@@ -129,7 +129,7 @@ CMD_BIND(global_cmd_register) {
                 return;
             }
             cache->client = client;
-            cache->textclient = getTextBot();
+            cache->textclient = textclient;
             cache->user = user;
             cache->chan = chan;
             cache->event = event;
@@ -196,11 +196,11 @@ static void global_cmd_register_async1(struct ClientSocket *client, struct Clien
                     printf_mysql_query("DELETE FROM `donotregister` WHERE `dnr_id` = '%s'", row[3]);
                 } else {
                     char expireBuf[MAXLEN];
-                    reply(getTextBot(), user, "NS_DNR_SET_EXPIRES", auth, row[0], timeToStr(user, (expire_time - time(0)), 2, expireBuf), row[2]);
+                    reply(textclient, user, "NS_DNR_SET_EXPIRES", auth, row[0], timeToStr(user, (expire_time - time(0)), 2, expireBuf), row[2]);
                     return;
                 }
             } else {
-                reply(getTextBot(), user, "NS_DNR_SET", auth, row[0], row[2]);
+                reply(textclient, user, "NS_DNR_SET", auth, row[0], row[2]);
                 return;
             }
         }