fixed last commits

diff --git a/DBHelper.c b/DBHelper.c
index 587158635b065e64283c71849adfb479d250cc06..c8efb6b12092c13715b11aafdf8f36d894d808e2 100644 (file)
--- 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 a28c11fef10d2112db829505dc8006db06d2fd7f..54ca38511d188873b79eb0fa6364ca520f7ea178 100644 (file)
--- 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 1261c37321e23bc09f7d5afecaa09df11599d21e..d140d1fd49a8004b182d22c0cd4f6caf641bf675 100644 (file)
--- 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 8e3c60c41771bf48f6beff371ec3bb0d5913c0e7..57f01f3561ffc91e7069a62da9662d5021a142fd 100644 (file)
--- 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 7d079c76df365fd2e3740afa964eabfaf7614bf7..ccfa8d3384cb42a928a322fd7ea7fe6dc354a714 100644 (file)
--- 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 409a0f4fa8f544c232107f4dfdb56679e2885c96..a2a7a5faedcf69ca4e480ede5ced71c7f8618209 100644 (file)
--- 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 a780e879ac44c35e19d16d7564ea35e138bb47e9..316f59f5ab5fa3ae4a12dd7d9d3f6d64922a0c6a 100644 (file)
--- 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 65195d22faf01dcd625eef3375fc217b38fe5fef..0c9c7f77354f36f26d72ea128b862bab5befa470 100644 (file)
--- 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 42d2a7ace4f73231ac7a0fa4d473aba168164c8a..a69deb850751f31a50e233bd9840608f18930e25 100644 (file)
--- 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 a2cf4f9d678da24956fc2dbcfbb6e9802a6a03bd..34d05b1b934aae3d873d9a9cb49b675a9f6f4ea0 100644 (file)
--- 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 3ae71d978bd9b145f0e3c1e9588d11e3d4bb351f..274187229bc3584fde6e50e925841a475907ebd0 100644 (file)
--- 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 b47a6bb320b91593635f61120c3a21026dfffd78..d589ade1767642ad3c7e60edbf6eb63de61c93aa 100644 (file)
--- 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);