From c8136270dcc7283b8f6eb350dae1e9a9176025e6 Mon Sep 17 00:00:00 2001 From: pk910 Date: Sat, 24 Sep 2011 20:25:20 +0200 Subject: [PATCH] renamed cmd_a to cmd_access --- bot_NeonServ.c | 4 +-- cmd_neonserv_a.c => cmd_neonserv_access.c | 30 +++++++++++------------ 2 files changed, 17 insertions(+), 17 deletions(-) rename cmd_neonserv_a.c => cmd_neonserv_access.c (72%) diff --git a/bot_NeonServ.c b/bot_NeonServ.c index 5841c29..bc7f7c6 100644 --- a/bot_NeonServ.c +++ b/bot_NeonServ.c @@ -231,7 +231,7 @@ static struct ClientSocket *getBotForChannel(struct ChanNode *chan); INCLUDE ALL CMD's HERE */ //USER CMD's -#include "cmd_neonserv_a.c" +#include "cmd_neonserv_access.c" #include "cmd_neonserv_myaccess.c" #include "cmd_neonserv_adduser.c" #include "cmd_neonserv_clvl.c" @@ -442,7 +442,7 @@ void init_NeonServ() { USER_COMMAND("adduser", neonserv_cmd_adduser, 2, "#channel_canadd", CMDFLAG_REQUIRE_CHAN | CMDFLAG_REGISTERED_CHAN | CMDFLAG_REQUIRE_AUTH | CMDFLAG_CHECK_AUTH | CMDFLAG_LOG); USER_COMMAND("deluser", neonserv_cmd_deluser, 1, "#channel_candel", CMDFLAG_REQUIRE_CHAN | CMDFLAG_REGISTERED_CHAN | CMDFLAG_REQUIRE_AUTH | CMDFLAG_CHECK_AUTH | CMDFLAG_LOG); USER_COMMAND("clvl", neonserv_cmd_clvl, 2, "#channel_canclvl", CMDFLAG_REQUIRE_CHAN | CMDFLAG_REGISTERED_CHAN | CMDFLAG_REQUIRE_AUTH | CMDFLAG_CHECK_AUTH | CMDFLAG_LOG); - USER_COMMAND("a", neonserv_cmd_a, 0, NULL, CMDFLAG_REQUIRE_CHAN | CMDFLAG_REGISTERED_CHAN | CMDFLAG_LOG); + USER_COMMAND("access", neonserv_cmd_access, 0, NULL, CMDFLAG_REQUIRE_CHAN | CMDFLAG_REGISTERED_CHAN | CMDFLAG_LOG); USER_COMMAND("users", neonserv_cmd_users, 0, NULL, CMDFLAG_REQUIRE_CHAN | CMDFLAG_REGISTERED_CHAN); USER_COMMAND("suspend", neonserv_cmd_suspend, 1, "#channel_cansuspend", CMDFLAG_REQUIRE_CHAN | CMDFLAG_REGISTERED_CHAN | CMDFLAG_REQUIRE_AUTH | CMDFLAG_CHECK_AUTH | CMDFLAG_LOG); USER_COMMAND("unsuspend", neonserv_cmd_unsuspend, 1, "#channel_cansuspend", CMDFLAG_REQUIRE_CHAN | CMDFLAG_REGISTERED_CHAN | CMDFLAG_REQUIRE_AUTH | CMDFLAG_CHECK_AUTH | CMDFLAG_LOG); diff --git a/cmd_neonserv_a.c b/cmd_neonserv_access.c similarity index 72% rename from cmd_neonserv_a.c rename to cmd_neonserv_access.c index d7ae550..e064f8a 100644 --- a/cmd_neonserv_a.c +++ b/cmd_neonserv_access.c @@ -2,20 +2,20 @@ /* * argv[0] - nick / *auth */ -static USERAUTH_CALLBACK(neonserv_cmd_a_nick_lookup); -static void neonserv_cmd_a_async1(struct ClientSocket *client, struct ClientSocket *textclient, struct UserNode *user, struct ChanNode *chan, char *nick, char *auth, struct UserNode *target); +static USERAUTH_CALLBACK(neonserv_cmd_access_nick_lookup); +static void neonserv_cmd_access_async1(struct ClientSocket *client, struct ClientSocket *textclient, struct UserNode *user, struct ChanNode *chan, char *nick, char *auth, struct UserNode *target); -struct neonserv_cmd_a_cache { +struct neonserv_cmd_access_cache { struct ClientSocket *client, *textclient; struct UserNode *user; struct ChanNode *chan; char *nick; }; -static CMD_BIND(neonserv_cmd_a) { +static CMD_BIND(neonserv_cmd_access) { if(argc == 0) { if(!(user->flags & USERFLAG_ISAUTHED)) { - struct neonserv_cmd_a_cache *cache = malloc(sizeof(*cache)); + struct neonserv_cmd_access_cache *cache = malloc(sizeof(*cache)); if (!cache) { perror("malloc() failed"); return; @@ -25,14 +25,14 @@ static CMD_BIND(neonserv_cmd_a) { cache->user = user; cache->chan = chan; cache->nick = strdup(argv[0]); - get_userauth(user, neonserv_cmd_a_nick_lookup, cache); + get_userauth(user, neonserv_cmd_access_nick_lookup, cache); } else - neonserv_cmd_a_async1(client, getTextBot(), user, chan, user->nick, user->auth, user); + neonserv_cmd_access_async1(client, getTextBot(), user, chan, user->nick, user->auth, user); } else if(argv[0][0] == '*') { //we've got an auth argv[0]++; - neonserv_cmd_a_async1(client, getTextBot(), user, chan, NULL, argv[0], NULL); + neonserv_cmd_access_async1(client, getTextBot(), user, chan, NULL, argv[0], NULL); } else { struct UserNode *cuser = getUserByNick(argv[0]); if(!cuser) { @@ -40,9 +40,9 @@ static CMD_BIND(neonserv_cmd_a) { cuser->flags |= USERFLAG_ISTMPUSER; } if(cuser->flags & USERFLAG_ISAUTHED) { - neonserv_cmd_a_async1(client, getTextBot(), user, chan, argv[0], cuser->auth, cuser); + neonserv_cmd_access_async1(client, getTextBot(), user, chan, argv[0], cuser->auth, cuser); } else { - struct neonserv_cmd_a_cache *cache = malloc(sizeof(*cache)); + struct neonserv_cmd_access_cache *cache = malloc(sizeof(*cache)); if (!cache) { perror("malloc() failed"); return; @@ -52,13 +52,13 @@ static CMD_BIND(neonserv_cmd_a) { cache->user = user; cache->chan = chan; cache->nick = strdup(argv[0]); - get_userauth(cuser, neonserv_cmd_a_nick_lookup, cache); + get_userauth(cuser, neonserv_cmd_access_nick_lookup, cache); } } } -static USERAUTH_CALLBACK(neonserv_cmd_a_nick_lookup) { - struct neonserv_cmd_a_cache *cache = data; +static USERAUTH_CALLBACK(neonserv_cmd_access_nick_lookup) { + struct neonserv_cmd_access_cache *cache = data; if(!user) { //USER_DOES_NOT_EXIST reply(cache->textclient, cache->user, "NS_USER_UNKNOWN", cache->nick); @@ -71,12 +71,12 @@ static USERAUTH_CALLBACK(neonserv_cmd_a_nick_lookup) { reply(cache->textclient, cache->user, "NS_USER_NEED_AUTH", cache->nick); } else - neonserv_cmd_a_async1(cache->client, cache->textclient, cache->user, cache->chan, user->nick, user->auth, user); + neonserv_cmd_access_async1(cache->client, cache->textclient, cache->user, cache->chan, user->nick, user->auth, user); free(cache->nick); free(cache); } -static void neonserv_cmd_a_async1(struct ClientSocket *client, struct ClientSocket *textclient, struct UserNode *user, struct ChanNode *chan, char *nick, char *auth, struct UserNode *target) { +static void neonserv_cmd_access_async1(struct ClientSocket *client, struct ClientSocket *textclient, struct UserNode *user, struct ChanNode *chan, char *nick, char *auth, struct UserNode *target) { //we've got a valid auth now... MYSQL_RES *res; MYSQL_ROW user_row, chanuser_row; -- 2.20.1