From: pk910 Date: Sun, 21 Aug 2011 07:32:46 +0000 (+0200) Subject: added list of cmd's to do and added cmd_delme X-Git-Tag: v5.3~499 X-Git-Url: http://git.pk910.de/?p=NeonServV5.git;a=commitdiff_plain;h=297742a7848c09a9688de35e36c82795b02c4075 added list of cmd's to do and added cmd_delme --- diff --git a/bot_NeonServ.c b/bot_NeonServ.c index 0a7df69..fe07501 100644 --- a/bot_NeonServ.c +++ b/bot_NeonServ.c @@ -25,6 +25,7 @@ static const struct default_language_entry msgtab[] = { {"NS_ADDUSER_ALREADY_ADDED", "%s is already on the \002%s\002 user list (with access %d)."}, {"NS_ADDUSER_DONE", "Added %s to the %s user list with access %d."}, {"NS_NOT_ON_USERLIST", "%s lacks access to \002%s\002."}, + {"NS_NOT_ON_USERLIST_YOU", "You lack access to \002%s\002."}, {"NS_DELUSER_DONE", "Deleted %s (with access %d) from the %s user list."}, {"NS_ACCESS_OUTRANKED", "You cannot give users access greater than or equal to your own."}, {"NS_USER_OUTRANKED", "\002%s\002 outranks you (command has no effect)."}, @@ -57,20 +58,93 @@ static const struct default_language_entry msgtab[] = { {"NS_SUSPEND_NOT", "\002%s\002 is not suspended." }, {"NS_SUSPEND_DONE", "\002%s\002's access to \002%s\002 has been suspended." }, {"NS_SUSPEND_RESTORED", "\002%s\002's access to \002%s\002 has been restored." }, + {"NS_DELME_KEY", "To really remove yourself, you must use 'deleteme %s'."}, + {"NS_DELME_DONE", "Your \002%d\002 access has been deleted from \002%s\002."}, {NULL, NULL} }; /* INCLUDE ALL CMD's HERE */ -#include "cmd_neonserv_users.c" -#include "cmd_neonserv_modes.c" +//USER CMD's +#include "cmd_neonserv_a.c" +//#include "cmd_neonserv_myaccess.c" #include "cmd_neonserv_adduser.c" -#include "cmd_neonserv_deluser.c" #include "cmd_neonserv_clvl.c" -#include "cmd_neonserv_a.c" +#include "cmd_neonserv_deluser.c" +#include "cmd_neonserv_delme.c" +//#include "cmd_neonserv_mdeluser.c" +//#include "cmd_neonserv_trim.c" +//#include "cmd_neonserv_giveownership.c" +#include "cmd_neonserv_users.c" +//#include "cmd_neonserv_up.c" +//#include "cmd_neonserv_down.c" +//#include "cmd_neonserv_upall.c" +//#include "cmd_neonserv_downall.c" +//#include "cmd_neonserv_op.c" +//#include "cmd_neonserv_opall.c" +//#include "cmd_neonserv_deop.c" +//#include "cmd_neonserv_deopall.c" +//#include "cmd_neonserv_voice.c" +//#include "cmd_neonserv_voiceall.c" +//#include "cmd_neonserv_devoiceall.c" +//#include "cmd_neonserv_devoice.c" +//#include "cmd_neonserv_uset.c" +//#include "cmd_neonserv_kick.c" +//#include "cmd_neonserv_kickban.c" +//#include "cmd_neonserv_ban.c" +//#include "cmd_neonserv_unban.c" +//#include "cmd_neonserv_unbanall.c" +//#include "cmd_neonserv_unbanme.c" #include "cmd_neonserv_suspend.c" #include "cmd_neonserv_unsuspend.c" +//#include "cmd_neonserv_wipeinfo.c" +//#include "cmd_neonserv_addban.c" +//#include "cmd_neonserv_addtimeban.c" +//#include "cmd_neonserv_delban.c" +//#include "cmd_neonserv_banlist.c" +//#include "cmd_neonserv_open.c" +//#include "cmd_neonserv_topic.c" +//#include "cmd_neonserv_mode.c" +//#include "cmd_neonserv_invite.c" +//#include "cmd_neonserv_info.c" +//#include "cmd_neonserv_netinfo.c" +//#include "cmd_neonserv_peek.c" +//#include "cmd_neonserv_set.c" +//#include "cmd_neonserv_events.c" +//#include "cmd_neonserv_resync.c" +//#include "cmd_neonserv_help.c" +//#include "cmd_neonserv_version.c" + +//OPER CMD's +//#include "cmd_neonserv_bind.c" +//#include "cmd_neonserv_unbind.c" +//#include "cmd_neonserv_modcmd.c" +//#include "cmd_neonserv_register.c" +//#include "cmd_neonserv_unregister.c" +//#include "cmd_neonserv_allowregister.c" +//#include "cmd_neonserv_noregister.c" +//#include "cmd_neonserv_god.c" +//#include "cmd_neonserv_expire.c" +//#include "cmd_neonserv_csuspend.c" +//#include "cmd_neonserv_cunsuspend.c" +//#include "cmd_neonserv_unvisited.c" +//#include "cmd_neonserv_merge.c" +//#include "cmd_neonserv_move.c" +//#include "cmd_neonserv_dnrsearch.c" +//#include "cmd_neonserv_search.c" +//#include "cmd_neonserv_trace.c" +//#include "cmd_neonserv_say.c" +//#include "cmd_neonserv_emote.c" +//#include "cmd_neonserv_notice.c" +//#include "cmd_neonserv_raw.c" + +//HARDCODED FUN CMD's +//#include "cmd_neonserv_iplocate.c" +//#include "cmd_neonserv_calc.c" + +//DEBUG +#include "cmd_neonserv_modes.c" static void neonserv_bot_ready(struct ClientSocket *client) { MYSQL_RES *res; @@ -142,6 +216,7 @@ void init_NeonServ() { register_command(BOTID, "users", neonserv_cmd_users, 0, CMDFLAG_REQUIRE_CHAN | CMDFLAG_REGISTERED_CHAN); register_command(BOTID, "suspend", neonserv_cmd_suspend, 1, CMDFLAG_REQUIRE_CHAN | CMDFLAG_REGISTERED_CHAN | CMDFLAG_REQUIRE_AUTH | CMDFLAG_CHECK_AUTH); register_command(BOTID, "unsuspend", neonserv_cmd_unsuspend, 1, CMDFLAG_REQUIRE_CHAN | CMDFLAG_REGISTERED_CHAN | CMDFLAG_REQUIRE_AUTH | CMDFLAG_CHECK_AUTH); + register_command(BOTID, "delme", neonserv_cmd_delme, 0, CMDFLAG_REQUIRE_CHAN | CMDFLAG_REGISTERED_CHAN | CMDFLAG_REQUIRE_AUTH | CMDFLAG_CHECK_AUTH); start_bots(); bind_bot_ready(neonserv_bot_ready); diff --git a/cmd_neonserv_delme.c b/cmd_neonserv_delme.c new file mode 100644 index 0000000..1da0cf8 --- /dev/null +++ b/cmd_neonserv_delme.c @@ -0,0 +1,40 @@ + +/* +* argv[0] - key +*/ + +static CMD_BIND(neonserv_cmd_delme) { + check_mysql(); + MYSQL_RES *res; + MYSQL_ROW row; + int userid; + printf_mysql_query("SELECT `user_id` FROM `users` WHERE `user_user` = '%s'", escape_string(user->auth)); + res = mysql_use(); + if ((row = mysql_fetch_row(res)) != NULL) { + userid = atoi(row[0]); + //check if the user is added + printf_mysql_query("SELECT `chanuser_access`, `chanuser_id` FROM `chanusers` WHERE `chanuser_cid` = '%d' AND `chanuser_uid` = '%d'", chan->channel_id, userid); + res = mysql_use(); + if ((row = mysql_fetch_row(res)) != NULL) { + //check key + int seed = 0; + char *tmp; + static char unregkey[16]; + for(tmp = user->auth; *tmp; tmp++) + seed = (seed * 0xEECE66DL ^ ((*tmp << 24) | (*tmp << 16) | (*tmp << 8) | *tmp)); + for(tmp = chan->name; *tmp; tmp++) + seed = (seed * 0xEECE66DL ^ ((*tmp << 24) | (*tmp << 16) | (*tmp << 8) | *tmp)); + sprintf(unregkey, "%08x", seed); + if(argc < 1 || strcmp(argv[0], unregkey)) { + reply(getTextBot(), user, "NS_DELME_KEY", unregkey); + return; + } else { + //delete + printf_mysql_query("DELETE FROM `chanusers` WHERE `chanuser_id` = '%s'", row[1]); + reply(textclient, user, "NS_DELME_DONE", atoi(row[0]), chan->name); + return; + } + } + } + reply(textclient, user, "NS_NOT_ON_USERLIST_YOU", chan->name); +}