X-Git-Url: http://git.pk910.de/?a=blobdiff_plain;f=src%2Fmodules%2FNeonServ.mod%2Fcmd_neonserv_uset.c;h=e1b588f357bdff7f9ba419079ab9ca747d257294;hb=HEAD;hp=c9c7b5fe3f9dc0d29925a2f7da7fc211853deecc;hpb=f079e885c28482c8b0160a797442f2adbed940ea;p=NeonServV5.git diff --git a/src/modules/NeonServ.mod/cmd_neonserv_uset.c b/src/modules/NeonServ.mod/cmd_neonserv_uset.c index c9c7b5f..e1b588f 100644 --- a/src/modules/NeonServ.mod/cmd_neonserv_uset.c +++ b/src/modules/NeonServ.mod/cmd_neonserv_uset.c @@ -1,4 +1,4 @@ -/* cmd_neonserv_uset.c - NeonServ v5.4 +/* cmd_neonserv_uset.c - NeonServ v5.6 * Copyright (C) 2011-2012 Philipp Kreil (pk910) * * This program is free software: you can redistribute it and/or modify @@ -17,12 +17,13 @@ #include "cmd_neonserv.h" -typedef void neonserv_cmd_uset_function(struct ClientSocket *client, struct UserNode *user, struct ChanNode *chan, struct Event *event, const char *setting, char *argument, MYSQL_ROW defaults); -static void neonserv_cmd_uset_language(struct ClientSocket *client, struct UserNode *user, struct ChanNode *chan, struct Event *event, const char *setting, char *argument, MYSQL_ROW defaults); -static void neonserv_cmd_uset_noinvite(struct ClientSocket *client, struct UserNode *user, struct ChanNode *chan, struct Event *event, const char *setting, char *argument, MYSQL_ROW defaults); -static void neonserv_cmd_uset_autoinvite(struct ClientSocket *client, struct UserNode *user, struct ChanNode *chan, struct Event *event, const char *setting, char *argument, MYSQL_ROW defaults); -static void neonserv_cmd_uset_noautoop(struct ClientSocket *client, struct UserNode *user, struct ChanNode *chan, struct Event *event, const char *setting, char *argument, MYSQL_ROW defaults); -static void neonserv_cmd_uset_info(struct ClientSocket *client, struct UserNode *user, struct ChanNode *chan, struct Event *event, const char *setting, char *argument, MYSQL_ROW defaults); +typedef void neonserv_cmd_uset_function(struct ClientSocket *client, struct ClientSocket *textclient, struct UserNode *user, struct ChanNode *chan, struct Event *event, const char *setting, char *argument, MYSQL_ROW defaults); +static void neonserv_cmd_uset_language(struct ClientSocket *client, struct ClientSocket *textclient, struct UserNode *user, struct ChanNode *chan, struct Event *event, const char *setting, char *argument, MYSQL_ROW defaults); +static void neonserv_cmd_uset_blockinvite(struct ClientSocket *client, struct ClientSocket *textclient, struct UserNode *user, struct ChanNode *chan, struct Event *event, const char *setting, char *argument, MYSQL_ROW defaults); +static void neonserv_cmd_uset_noinvite(struct ClientSocket *client, struct ClientSocket *textclient, struct UserNode *user, struct ChanNode *chan, struct Event *event, const char *setting, char *argument, MYSQL_ROW defaults); +static void neonserv_cmd_uset_autoinvite(struct ClientSocket *client, struct ClientSocket *textclient, struct UserNode *user, struct ChanNode *chan, struct Event *event, const char *setting, char *argument, MYSQL_ROW defaults); +static void neonserv_cmd_uset_noautoop(struct ClientSocket *client, struct ClientSocket *textclient, struct UserNode *user, struct ChanNode *chan, struct Event *event, const char *setting, char *argument, MYSQL_ROW defaults); +static void neonserv_cmd_uset_info(struct ClientSocket *client, struct ClientSocket *textclient, struct UserNode *user, struct ChanNode *chan, struct Event *event, const char *setting, char *argument, MYSQL_ROW defaults); #define USET_FLAG_GLOBAL 0x01 #define USET_FLAG_CHANNEL 0x02 @@ -38,12 +39,15 @@ static const struct { neonserv_cmd_uset_function *function; int flags; } uset_settings[] = { - {"Language", neonserv_cmd_uset_language, USET_FLAG_GLOBAL}, - {"NoInvite", neonserv_cmd_uset_noinvite, USET_FLAG_CHANNEL}, - {"AutoInvite", neonserv_cmd_uset_autoinvite, USET_FLAG_CHANNEL | USET_FLAG_DEFAULTS}, - {"NoAutoOp", neonserv_cmd_uset_noautoop, USET_FLAG_CHANNEL | USET_FLAG_DEFAULTS}, - {"NoAutoVoice", neonserv_cmd_uset_noautoop, USET_FLAG_CHANNEL | USET_FLAG_DEFAULTS | USET_FLAG_INVISIBLE}, //alias of NoAutoOp - {"Info", neonserv_cmd_uset_info, USET_FLAG_CHANNEL | USET_FLAG_DEFAULTS}, + {"Language", neonserv_cmd_uset_language, USET_FLAG_GLOBAL}, + {"BlockInvites", neonserv_cmd_uset_blockinvite, USET_FLAG_GLOBAL}, + {"BlockInvite", neonserv_cmd_uset_blockinvite, USET_FLAG_GLOBAL | USET_FLAG_INVISIBLE}, + {"BlockAllInvites", neonserv_cmd_uset_blockinvite, USET_FLAG_GLOBAL | USET_FLAG_INVISIBLE}, + {"NoInvite", neonserv_cmd_uset_noinvite, USET_FLAG_CHANNEL}, + {"AutoInvite", neonserv_cmd_uset_autoinvite, USET_FLAG_CHANNEL | USET_FLAG_DEFAULTS}, + {"NoAutoOp", neonserv_cmd_uset_noautoop, USET_FLAG_CHANNEL | USET_FLAG_DEFAULTS}, + {"NoAutoVoice", neonserv_cmd_uset_noautoop, USET_FLAG_CHANNEL | USET_FLAG_DEFAULTS | USET_FLAG_INVISIBLE}, //alias of NoAutoOp + {"Info", neonserv_cmd_uset_info, USET_FLAG_CHANNEL | USET_FLAG_DEFAULTS}, {NULL, NULL, 0} }; @@ -63,7 +67,7 @@ CMD_BIND(neonserv_cmd_uset) { loadChannelSettings(chan); if(!(chan->flags & CHANFLAG_CHAN_REGISTERED)) { neonserv_cmd_uset_err_chan_required: - reply(getTextBot(), user, "MODCMD_CHAN_REQUIRED"); + reply(textclient, user, "MODCMD_CHAN_REQUIRED"); return; } if((uset_settings[i].flags & USET_FLAG_DEFAULTS) && !row) { @@ -71,13 +75,13 @@ CMD_BIND(neonserv_cmd_uset) { res = mysql_use(); row = mysql_fetch_row(res); if(!row) { - reply(getTextBot(), user, "NS_NOT_ON_USERLIST_YOU", chan->name); + reply(textclient, user, "NS_NOT_ON_USERLIST_YOU", chan->name); return; } } } neonserv_cmd_uset_function *func = uset_settings[i].function; - func(client, user, chan, event, uset_settings[i].setting, args, row); + func(client, textclient, user, chan, event, uset_settings[i].setting, args, row); j = 1; break; } @@ -85,22 +89,22 @@ CMD_BIND(neonserv_cmd_uset) { } if(j == 0) { //unknown setting - reply(getTextBot(), user, "NS_USET_UNKNOWN_SETTING", argv[0]); + reply(textclient, user, "NS_USET_UNKNOWN_SETTING", argv[0]); } } else { //view all options - reply(getTextBot(), user, "NS_USET_GLOBAL"); + reply(textclient, user, "NS_USET_GLOBAL"); while(uset_settings[i].setting) { if((uset_settings[i].flags & (USET_FLAG_INVISIBLE | USET_FLAG_GLOBAL)) == USET_FLAG_GLOBAL) { neonserv_cmd_uset_function *func = uset_settings[i].function; - func(client, user, chan, event, uset_settings[i].setting, NULL, row); + func(client, textclient, user, chan, event, uset_settings[i].setting, NULL, row); } i++; } if(!chan) return; loadChannelSettings(chan); if(!(chan->flags & CHANFLAG_CHAN_REGISTERED)) return; - reply(getTextBot(), user, "NS_USET_CHANNEL"); + reply(textclient, user, "NS_USET_CHANNEL"); i = 0; while(uset_settings[i].setting) { if((uset_settings[i].flags & (USET_FLAG_INVISIBLE | USET_FLAG_CHANNEL)) == USET_FLAG_CHANNEL) { @@ -114,14 +118,14 @@ CMD_BIND(neonserv_cmd_uset) { } } neonserv_cmd_uset_function *func = uset_settings[i].function; - func(client, user, chan, event, uset_settings[i].setting, NULL, row); + func(client, textclient, user, chan, event, uset_settings[i].setting, NULL, row); } i++; } } } -static void neonserv_cmd_uset_language(struct ClientSocket *client, struct UserNode *user, struct ChanNode *chan, struct Event *event, const char *setting, char *argument, MYSQL_ROW defaults) { +static void neonserv_cmd_uset_language(struct ClientSocket *client, struct ClientSocket *textclient, struct UserNode *user, struct ChanNode *chan, struct Event *event, const char *setting, char *argument, MYSQL_ROW defaults) { MYSQL_RES *res; MYSQL_ROW row; struct language* lang; @@ -144,7 +148,7 @@ static void neonserv_cmd_uset_language(struct ClientSocket *client, struct UserN } } else lang = user->language; - reply(getTextBot(), user, "\002Language \002%s", lang->langname); + reply(textclient, user, "\002Language \002%s", lang->langname); char tmp[MAXLEN]; int tmppos = 0; lang = get_default_language(); @@ -154,10 +158,32 @@ static void neonserv_cmd_uset_language(struct ClientSocket *client, struct UserN while((row = mysql_fetch_row(res)) != NULL) { tmppos += sprintf(tmp + tmppos, ", %s (%s)", row[1], row[0]); } - reply(getTextBot(), user, " %s", tmp); + reply(textclient, user, " %s", tmp); } -static void neonserv_cmd_uset_noinvite(struct ClientSocket *client, struct UserNode *user, struct ChanNode *chan, struct Event *event, const char *setting, char *argument, MYSQL_ROW defaults) { +static void neonserv_cmd_uset_blockinvite(struct ClientSocket *client, struct ClientSocket *textclient, struct UserNode *user, struct ChanNode *chan, struct Event *event, const char *setting, char *argument, MYSQL_ROW defaults) { + MYSQL_RES *res; + MYSQL_ROW row; + printf_mysql_query("SELECT `user_id`, `user_block_invites` FROM `users` WHERE `user_user` = '%s'", escape_string(user->auth)); + res = mysql_use(); + row = mysql_fetch_row(res); + int blockinvite = (row ? atoi(row[1]) : 0); + if(argument) { + if(!strcmp(argument, "0") || !stricmp(argument, "off") || !stricmp(argument, get_language_string(user, "NS_SET_OFF"))) { + blockinvite = 0; + } else if(!strcmp(argument, "1") || !stricmp(argument, "on") || !stricmp(argument, get_language_string(user, "NS_SET_ON"))) { + blockinvite = 1; + } + if(blockinvite && !row) { + printf_mysql_query("INSERT INTO `users` (`user_user`, `user_block_invites`) VALUES ('%s', '1')", escape_string(user->auth)); + } else if(blockinvite != atoi(row[1])) { + printf_mysql_query("UPDATE `users` SET `user_block_invites` = '%d' WHERE `user_id` = '%s'", blockinvite, row[0]); + } + } + reply(textclient, user, "\002BlockInvite \002%s", (blockinvite ? get_language_string(user, "NS_SET_ON") : get_language_string(user, "NS_SET_OFF"))); +} + +static void neonserv_cmd_uset_noinvite(struct ClientSocket *client, struct ClientSocket *textclient, struct UserNode *user, struct ChanNode *chan, struct Event *event, const char *setting, char *argument, MYSQL_ROW defaults) { MYSQL_RES *res; MYSQL_ROW row; printf_mysql_query("SELECT `id` FROM `noinvite` LEFT JOIN `users` ON `uid` = `user_id` WHERE `cid` = '%d' AND `user_user` = '%s'", chan->channel_id, escape_string(user->auth)); @@ -186,10 +212,10 @@ static void neonserv_cmd_uset_noinvite(struct ClientSocket *client, struct UserN } } } - reply(getTextBot(), user, "\002NoInvite \002%s", (noinvite ? get_language_string(user, "NS_SET_ON") : get_language_string(user, "NS_SET_OFF"))); + reply(textclient, user, "\002NoInvite \002%s", (noinvite ? get_language_string(user, "NS_SET_ON") : get_language_string(user, "NS_SET_OFF"))); } -static void neonserv_cmd_uset_autoinvite(struct ClientSocket *client, struct UserNode *user, struct ChanNode *chan, struct Event *event, const char *setting, char *argument, MYSQL_ROW defaults) { +static void neonserv_cmd_uset_autoinvite(struct ClientSocket *client, struct ClientSocket *textclient, struct UserNode *user, struct ChanNode *chan, struct Event *event, const char *setting, char *argument, MYSQL_ROW defaults) { int flags = atoi(defaults[0]); int getInvite = 0; if(!defaults[3] && atoi(defaults[2]) >= atoi(getChanDefault("channel_getinvite"))) @@ -210,12 +236,12 @@ static void neonserv_cmd_uset_autoinvite(struct ClientSocket *client, struct Use } } if(getInvite) - reply(getTextBot(), user, "\002AutoInvite \002%s", ((flags & DB_CHANUSER_AUTOINVITE) ? get_language_string(user, "NS_SET_ON") : get_language_string(user, "NS_SET_OFF"))); + reply(textclient, user, "\002AutoInvite \002%s", ((flags & DB_CHANUSER_AUTOINVITE) ? get_language_string(user, "NS_SET_ON") : get_language_string(user, "NS_SET_OFF"))); else - reply(getTextBot(), user, "\002AutoInvite \002%s", get_language_string(user, "NS_USET_NO_ACCESS")); + reply(textclient, user, "\002AutoInvite \002%s", get_language_string(user, "NS_USET_NO_ACCESS")); } -static void neonserv_cmd_uset_noautoop(struct ClientSocket *client, struct UserNode *user, struct ChanNode *chan, struct Event *event, const char *setting, char *argument, MYSQL_ROW defaults) { +static void neonserv_cmd_uset_noautoop(struct ClientSocket *client, struct ClientSocket *textclient, struct UserNode *user, struct ChanNode *chan, struct Event *event, const char *setting, char *argument, MYSQL_ROW defaults) { int flags = atoi(defaults[0]); if(argument) { if(!strcmp(argument, "0") || !stricmp(argument, "off") || !stricmp(argument, get_language_string(user, "NS_SET_OFF"))) { @@ -230,10 +256,10 @@ static void neonserv_cmd_uset_noautoop(struct ClientSocket *client, struct UserN } } } - reply(getTextBot(), user, "\002NoAutoOp \002%s", ((flags & DB_CHANUSER_NOAUTOOP) ? get_language_string(user, "NS_SET_ON") : get_language_string(user, "NS_SET_OFF"))); + reply(textclient, user, "\002NoAutoOp \002%s", ((flags & DB_CHANUSER_NOAUTOOP) ? get_language_string(user, "NS_SET_ON") : get_language_string(user, "NS_SET_OFF"))); } -static void neonserv_cmd_uset_info(struct ClientSocket *client, struct UserNode *user, struct ChanNode *chan, struct Event *event, const char *setting, char *argument, MYSQL_ROW defaults) { +static void neonserv_cmd_uset_info(struct ClientSocket *client, struct ClientSocket *textclient, struct UserNode *user, struct ChanNode *chan, struct Event *event, const char *setting, char *argument, MYSQL_ROW defaults) { char *infoline; if(argument) { infoline = argument; @@ -242,5 +268,5 @@ static void neonserv_cmd_uset_info(struct ClientSocket *client, struct UserNode printf_mysql_query("UPDATE `chanusers` SET `chanuser_infoline` = '%s' WHERE `chanuser_id` = '%s'", escape_string(infoline), defaults[4]); } else infoline = defaults[1]; - reply(getTextBot(), user, "\002Info \002%s", infoline); + reply(textclient, user, "\002Info \002%s", infoline); }