From: pk910 Date: Thu, 25 Aug 2011 04:31:04 +0000 (+0200) Subject: fixed last commits X-Git-Tag: v5.3~480 X-Git-Url: http://git.pk910.de/?p=NeonServV5.git;a=commitdiff_plain;h=fb1dee61840455a6669c868f30701e963cdfa629 fixed last commits --- diff --git a/DBHelper.c b/DBHelper.c index 5871586..c8efb6b 100644 --- a/DBHelper.c +++ b/DBHelper.c @@ -118,13 +118,13 @@ int isUserProtected(struct ChanNode *chan, struct UserNode *victim, struct UserN char protection; loadChannelSettings(chan); if(!(chan->flags & CHANFLAG_CHAN_REGISTERED)) return 0; - printf_mysql_query("SELECT `channel_protect` FROM `channels` WHERE `channel_id` = '%d'"); + printf_mysql_query("SELECT `channel_protect` FROM `channels` WHERE `channel_id` = '%d'", chan->channel_id); res = mysql_use(); if(!(row = mysql_fetch_row(res))) return 0; if(row[0]) { protection = (char) atoi(row[0]); } else { - printf_mysql_query("SELECT `channel_protect` FROM `channels` WHERE `channel_name` = 'defaults'", chan->channel_id); + printf_mysql_query("SELECT `channel_protect` FROM `channels` WHERE `channel_name` = 'defaults'"); res = mysql_use(); row = mysql_fetch_row(res); protection = (char) atoi(row[0]); diff --git a/bot_NeonServ.c b/bot_NeonServ.c index a28c11f..54ca385 100644 --- a/bot_NeonServ.c +++ b/bot_NeonServ.c @@ -266,10 +266,10 @@ void init_NeonServ() { register_command(BOTID, "deop", neonserv_cmd_deop, 1, CMDFLAG_REQUIRE_CHAN | CMDFLAG_REGISTERED_CHAN | CMDFLAG_REQUIRE_AUTH | CMDFLAG_CHECK_AUTH); register_command(BOTID, "voice", neonserv_cmd_voice, 1, CMDFLAG_REQUIRE_CHAN | CMDFLAG_REGISTERED_CHAN | CMDFLAG_REQUIRE_AUTH | CMDFLAG_CHECK_AUTH); register_command(BOTID, "devoice", neonserv_cmd_devoice, 1, CMDFLAG_REQUIRE_CHAN | CMDFLAG_REGISTERED_CHAN | CMDFLAG_REQUIRE_AUTH | CMDFLAG_CHECK_AUTH); - register_command(BOTID, "opall", neonserv_cmd_opall, 1, CMDFLAG_REQUIRE_CHAN | CMDFLAG_REGISTERED_CHAN | CMDFLAG_REQUIRE_AUTH | CMDFLAG_CHECK_AUTH); - register_command(BOTID, "deopall", neonserv_cmd_deopall, 1, CMDFLAG_REQUIRE_CHAN | CMDFLAG_REGISTERED_CHAN | CMDFLAG_REQUIRE_AUTH | CMDFLAG_CHECK_AUTH); - register_command(BOTID, "voiceall", neonserv_cmd_voiceall, 1, CMDFLAG_REQUIRE_CHAN | CMDFLAG_REGISTERED_CHAN | CMDFLAG_REQUIRE_AUTH | CMDFLAG_CHECK_AUTH); - register_command(BOTID, "devoiceall", neonserv_cmd_devoiceall, 1, CMDFLAG_REQUIRE_CHAN | CMDFLAG_REGISTERED_CHAN | CMDFLAG_REQUIRE_AUTH | CMDFLAG_CHECK_AUTH); + register_command(BOTID, "opall", neonserv_cmd_opall, 0, CMDFLAG_REQUIRE_CHAN | CMDFLAG_REGISTERED_CHAN | CMDFLAG_REQUIRE_AUTH | CMDFLAG_CHECK_AUTH); + register_command(BOTID, "deopall", neonserv_cmd_deopall, 0, CMDFLAG_REQUIRE_CHAN | CMDFLAG_REGISTERED_CHAN | CMDFLAG_REQUIRE_AUTH | CMDFLAG_CHECK_AUTH); + register_command(BOTID, "voiceall", neonserv_cmd_voiceall, 0, CMDFLAG_REQUIRE_CHAN | CMDFLAG_REGISTERED_CHAN | CMDFLAG_REQUIRE_AUTH | CMDFLAG_CHECK_AUTH); + register_command(BOTID, "devoiceall", neonserv_cmd_devoiceall, 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_deop.c b/cmd_neonserv_deop.c index 1261c37..d140d1f 100644 --- a/cmd_neonserv_deop.c +++ b/cmd_neonserv_deop.c @@ -4,7 +4,7 @@ */ static CMD_BIND(neonserv_cmd_deop) { - int i, done_users; + int i, done_users = 0; struct UserNode *cuser; struct ChanUser *chanuser; struct ModeBuffer *modeBuf; diff --git a/cmd_neonserv_deopall.c b/cmd_neonserv_deopall.c index 8e3c60c..57f01f3 100644 --- a/cmd_neonserv_deopall.c +++ b/cmd_neonserv_deopall.c @@ -4,9 +4,8 @@ */ static CMD_BIND(neonserv_cmd_deopall) { - int i, issuer_access, user_access, done_users; + int issuer_access, victim_access, done_users = 0; char *nickmask = NULL; - struct UserNode *cuser; struct ChanUser *chanuser; struct ModeBuffer *modeBuf; check_mysql(); @@ -23,7 +22,7 @@ static CMD_BIND(neonserv_cmd_deopall) { victim_access = getChannelAccess(user, chan, 0); if(victim_access >= issuer_access) continue; if(!(chanuser->flags & CHANUSERFLAG_OPPED)) continue; - modeBufferDeop(modeBuf, argv[i]); + modeBufferDeop(modeBuf, chanuser->user->nick); done_users++; } freeModeBuffer(modeBuf); diff --git a/cmd_neonserv_devoice.c b/cmd_neonserv_devoice.c index 7d079c7..ccfa8d3 100644 --- a/cmd_neonserv_devoice.c +++ b/cmd_neonserv_devoice.c @@ -4,7 +4,7 @@ */ static CMD_BIND(neonserv_cmd_devoice) { - int i, done_users; + int i, done_users = 0; struct UserNode *cuser; struct ChanUser *chanuser; struct ModeBuffer *modeBuf; diff --git a/cmd_neonserv_devoiceall.c b/cmd_neonserv_devoiceall.c index 409a0f4..a2a7a5f 100644 --- a/cmd_neonserv_devoiceall.c +++ b/cmd_neonserv_devoiceall.c @@ -4,9 +4,8 @@ */ static CMD_BIND(neonserv_cmd_devoiceall) { - int i, issuer_access, user_access, done_users; + int issuer_access, victim_access, done_users = 0; char *nickmask = NULL; - struct UserNode *cuser; struct ChanUser *chanuser; struct ModeBuffer *modeBuf; check_mysql(); @@ -23,7 +22,7 @@ static CMD_BIND(neonserv_cmd_devoiceall) { victim_access = getChannelAccess(user, chan, 0); if(victim_access >= issuer_access) continue; if(!(chanuser->flags & CHANUSERFLAG_VOICED)) continue; - modeBufferDevoice(modeBuf, argv[i]); + modeBufferDevoice(modeBuf, chanuser->user->nick); done_users++; } freeModeBuffer(modeBuf); diff --git a/cmd_neonserv_op.c b/cmd_neonserv_op.c index a780e87..316f59f 100644 --- a/cmd_neonserv_op.c +++ b/cmd_neonserv_op.c @@ -4,7 +4,7 @@ */ static CMD_BIND(neonserv_cmd_op) { - int i, done_users; + int i, done_users = 0; struct UserNode *cuser; struct ChanUser *chanuser; struct ModeBuffer *modeBuf; diff --git a/cmd_neonserv_opall.c b/cmd_neonserv_opall.c index 65195d2..0c9c7f7 100644 --- a/cmd_neonserv_opall.c +++ b/cmd_neonserv_opall.c @@ -5,9 +5,8 @@ */ static CMD_BIND(neonserv_cmd_opall) { - int i, done_users; + int done_users = 0; char *nickmask = NULL; - struct UserNode *cuser; struct ChanUser *chanuser; struct ModeBuffer *modeBuf; check_mysql(); @@ -25,7 +24,7 @@ static CMD_BIND(neonserv_cmd_opall) { for(chanuser = getChannelUsers(chan, NULL); chanuser; chanuser = getChannelUsers(chan, chanuser)) { if(nickmask && match(nickmask, chanuser->user->nick)) continue; if(chanuser->flags & CHANUSERFLAG_OPPED) continue; - modeBufferOp(modeBuf, argv[i]); + modeBufferOp(modeBuf, chanuser->user->nick); done_users++; } freeModeBuffer(modeBuf); diff --git a/cmd_neonserv_voice.c b/cmd_neonserv_voice.c index 42d2a7a..a69deb8 100644 --- a/cmd_neonserv_voice.c +++ b/cmd_neonserv_voice.c @@ -4,7 +4,7 @@ */ static CMD_BIND(neonserv_cmd_voice) { - int i, done_users; + int i, done_users = 0; struct UserNode *cuser; struct ChanUser *chanuser; struct ModeBuffer *modeBuf; diff --git a/cmd_neonserv_voiceall.c b/cmd_neonserv_voiceall.c index a2cf4f9..34d05b1 100644 --- a/cmd_neonserv_voiceall.c +++ b/cmd_neonserv_voiceall.c @@ -4,9 +4,8 @@ */ static CMD_BIND(neonserv_cmd_voiceall) { - int i, done_users; + int done_users = 0; char *nickmask = NULL; - struct UserNode *cuser; struct ChanUser *chanuser; struct ModeBuffer *modeBuf; check_mysql(); @@ -20,7 +19,7 @@ static CMD_BIND(neonserv_cmd_voiceall) { for(chanuser = getChannelUsers(chan, NULL); chanuser; chanuser = getChannelUsers(chan, chanuser)) { if(nickmask && match(nickmask, chanuser->user->nick)) continue; if(chanuser->flags & CHANUSERFLAG_VOICED) continue; - modeBufferVoice(modeBuf, argv[i]); + modeBufferVoice(modeBuf, chanuser->user->nick); done_users++; } freeModeBuffer(modeBuf); diff --git a/tools.c b/tools.c index 3ae71d9..2741872 100644 --- a/tools.c +++ b/tools.c @@ -1,6 +1,8 @@ #include "tools.h" #include "UserNode.h" +#include "ChanNode.h" #include "lang.h" +#include "ClientSocket.h" static const struct default_language_entry msgtab[] = { {"TIME_MASK_2_ITEMS", "%s and %s"}, @@ -307,7 +309,7 @@ struct ModeBuffer* initModeBuffer(struct ClientSocket *client, struct ChanNode * struct ModeBuffer *modeBuf = malloc(sizeof(*modeBuf)); if(!modeBuf) { perror("malloc() failed"); - return; + return NULL; } modeBuf->client = client; modeBuf->chan = chan; diff --git a/tools.h b/tools.h index b47a6bb..d589ade 100644 --- a/tools.h +++ b/tools.h @@ -8,7 +8,7 @@ struct ClientSocket; struct UserNode; -struct ChanNode +struct ChanNode; struct Table { char ***contents; @@ -30,8 +30,8 @@ struct ModeBuffer { char delModes[MAXMODES]; char *addModesParams[MAXMODES]; char *delModesParams[MAXMODES]; - char addCount; - char delCount; + int addCount; + int delCount; }; int match(const char *mask, const char *name);