X-Git-Url: http://git.pk910.de/?a=blobdiff_plain;f=src%2Fcmd_global_register.c;h=9132484b362a445ad4a1ddcbdda3398f4a11c381;hb=bb5692b9cbff069abbf9573c81e86c3cd2061ceb;hp=08c172a17b7bc6eb9b969c2323e6e5a9e67292c1;hpb=ffc462dec2b405f14d7b13d37e17b95ea6fdf2f5;p=NeonServV5.git diff --git a/src/cmd_global_register.c b/src/cmd_global_register.c index 08c172a..9132484 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 @@ -19,11 +19,12 @@ /* * argv[0] - channel -* argv[0/1] - nick / *auth +* argv[1] - nick / *auth +* argv[2] - (optional) bot nick */ static AUTHLOOKUP_CALLBACK(global_cmd_register_auth_lookup); static USERAUTH_CALLBACK(global_cmd_register_nick_lookup); -static void global_cmd_register_async1(struct ClientSocket *client, struct ClientSocket *textclient, struct UserNode *user, struct ChanNode *chan, struct Event *event, char *channel, char *auth, int multibot); +static void global_cmd_register_async1(struct ClientSocket *client, struct ClientSocket *textclient, struct UserNode *user, struct ChanNode *chan, struct Event *event, char *channel, char *auth, int multibot, char *botname); struct global_cmd_register_cache { struct ClientSocket *client, *textclient; @@ -32,6 +33,7 @@ struct global_cmd_register_cache { struct Event *event; char *nick; char *channel; + char *botname; int multibot; }; @@ -39,6 +41,7 @@ CMD_BIND(global_cmd_register) { MYSQL_RES *res; MYSQL_ROW row; char *channel = argv[0]; + char *botname = (argc > 2 ? argv[2] : NULL); int multibot = 0; if(!is_valid_chan(channel)) { reply(getTextBot(), user, "NS_INVALID_CHANNEL_NAME", argv[0]); @@ -47,20 +50,37 @@ 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 multibot = 1; } + printf_mysql_query("SELECT `user_user`, `dnr_timeout`, `dnr_reason`, `dnr_id` FROM `donotregister` LEFT JOIN `users` ON `dnr_user` = `user_id` WHERE `dnr_target` = '%s'", escape_string(channel)); + res = mysql_use(); + if((row = mysql_fetch_row(res)) != NULL) { + int expire_time = atoi(row[1]); + if(expire_time) { + if(expire_time - time(0) <= 0) { + 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]); + return; + } + } else { + reply(getTextBot(), user, "NS_DNR_SET", channel, row[0], row[2]); + return; + } + } //if theres already another bot in the channel we don't need a owner parameter... if(multibot && argc < 2) { //skip all these owner check lines multibot = 2; - global_cmd_register_async1(client, getTextBot(), user, chan, event, channel, NULL, multibot); + 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 @@ -70,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); + global_cmd_register_async1(client, getTextBot(), 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 @@ -87,6 +107,7 @@ CMD_BIND(global_cmd_register) { cache->nick = strdup(argv[1]); cache->channel = strdup(channel); cache->multibot = multibot; + cache->botname = (botname ? strdup(botname) : NULL); lookup_authname(argv[1], global_cmd_register_auth_lookup, cache); } } else { @@ -96,7 +117,7 @@ CMD_BIND(global_cmd_register) { cuser->flags |= USERFLAG_ISTMPUSER; } if(cuser->flags & USERFLAG_ISAUTHED) { - global_cmd_register_async1(client, getTextBot(), user, chan, event, channel, cuser->auth, multibot); + global_cmd_register_async1(client, getTextBot(), user, chan, event, channel, cuser->auth, multibot, botname); } else { struct global_cmd_register_cache *cache = malloc(sizeof(*cache)); if (!cache) { @@ -111,6 +132,7 @@ CMD_BIND(global_cmd_register) { cache->nick = strdup(argv[1]); cache->channel = strdup(channel); cache->multibot = multibot; + cache->botname = (botname ? strdup(botname) : NULL); get_userauth(cuser, global_cmd_register_nick_lookup, cache); } } @@ -122,7 +144,9 @@ static AUTHLOOKUP_CALLBACK(global_cmd_register_auth_lookup) { //AUTH_DOES_NOT_EXIST reply(cache->textclient, cache->user, "NS_AUTH_UNKNOWN", cache->nick); } else - global_cmd_register_async1(cache->client, cache->textclient, cache->user, cache->chan, cache->event, cache->channel, auth, cache->multibot); + global_cmd_register_async1(cache->client, cache->textclient, cache->user, cache->chan, cache->event, cache->channel, auth, cache->multibot, cache->botname); + if(cache->botname) + free(cache->botname); free(cache->channel); free(cache->nick); free(cache); @@ -139,13 +163,15 @@ static USERAUTH_CALLBACK(global_cmd_register_nick_lookup) { reply(cache->textclient, cache->user, "NS_USER_NEED_AUTH", cache->nick); } else - global_cmd_register_async1(cache->client, cache->textclient, cache->user, cache->chan, cache->event, cache->channel, user->auth, cache->multibot); + global_cmd_register_async1(cache->client, cache->textclient, cache->user, cache->chan, cache->event, cache->channel, user->auth, cache->multibot, cache->botname); + if(cache->botname) + free(cache->botname); free(cache->channel); free(cache->nick); free(cache); } -static void global_cmd_register_async1(struct ClientSocket *client, struct ClientSocket *textclient, struct UserNode *user, struct ChanNode *chan, struct Event *event, char *channel, char *auth, int multibot) { +static void global_cmd_register_async1(struct ClientSocket *client, struct ClientSocket *textclient, struct UserNode *user, struct ChanNode *chan, struct Event *event, char *channel, char *auth, int multibot, char *botname) { //we've got a valid auth now... MYSQL_RES *res; MYSQL_ROW row, row2; @@ -157,6 +183,23 @@ static void global_cmd_register_async1(struct ClientSocket *client, struct Clien else adminid = 0; if(multibot != 2) { + printf_mysql_query("SELECT `user_user`, `dnr_timeout`, `dnr_reason`, `dnr_id` FROM `donotregister` LEFT JOIN `users` ON `dnr_user` = `user_id` WHERE `dnr_target` = '%s'", escape_string(auth)); + res = mysql_use(); + if((row = mysql_fetch_row(res)) != NULL) { + int expire_time = atoi(row[1]); + if(expire_time) { + if(expire_time - time(0) <= 0) { + 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]); + return; + } + } else { + reply(getTextBot(), user, "NS_DNR_SET", auth, row[0], row[2]); + return; + } + } printf_mysql_query("SELECT `user_id` FROM `users` WHERE `user_user` = '%s'", escape_string(auth)); res = mysql_use(); if ((row = mysql_fetch_row(res)) != NULL) { @@ -166,17 +209,18 @@ static void global_cmd_register_async1(struct ClientSocket *client, struct Clien userid = (int) mysql_insert_id(mysql_conn); } } - printf_mysql_query("SELECT `id`, `max_channels`, `defaulttrigger` FROM `bots` WHERE `botclass` = '%d' 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])) { + if(atoi(row2[0]) < atoi(row[1]) && (!botname || !stricmp(botname, row[3]))) { botid = atoi(row[0]); - bottrigger = row[2]; break; } } @@ -202,8 +246,8 @@ static void global_cmd_register_async1(struct ClientSocket *client, struct Clien if(bot) { putsock(bot, "JOIN %s", channel); } else - reply(textclient, user, "NS_REGISTER_DISCONNECTED"); - printf_mysql_query("INSERT INTO `bot_channels` (`botid`, `chanid`, `trigger`) VALUES ('%d', '%d', '%s')", botid, chanid, bottrigger); + reply(textclient, user, "NS_REGISTER_DISCONNECTED", channel); + 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);