added cmd_command

diff --git a/bot_NeonServ.c b/bot_NeonServ.c
index 16947576b28fbb94e6a9bd0b0c45deb96f493a2d..5841c29ae20a3985e7ccb0dd9cb2fb4942ff906a 100644 (file)
--- a/bot_NeonServ.c
+++ b/bot_NeonServ.c
@@ -218,6 +218,8 @@ static const struct default_language_entry msgtab[] = {
     {"NS_EVENTS_HEADER", "The following channel events were found:"},
     {"NS_OPLOG_HEADER", "The following oper events were found:"},
     {"NS_SEARCH_HEADER", "The following channels were found:"},
+    {"NS_COMMAND_BINDING", "$b%s$b is a binding of %s %s"}, /* {ARGS: "TestCommand", "TestFunction", "TestParameters"} */
+    {"NS_COMMAND_ACCESS", "You need at least %d channel access and %d oper access to execute this command."}, /* {ARGS: 500, 100} */
     {NULL, NULL}
 };
 
@@ -280,6 +282,7 @@ INCLUDE ALL CMD's HERE
 #include "cmd_neonserv_version.c"
 #include "cmd_neonserv_chanservsync.c"
 #include "cmd_neonserv_events.c"
+#include "cmd_neonserv_command.c"
 
 //OPER CMD's
 #include "cmd_neonserv_bind.c"
@@ -484,6 +487,7 @@ void init_NeonServ() {
     USER_COMMAND("inviteme",     neonserv_cmd_inviteme,  0, "#channel_getinvite",   CMDFLAG_REQUIRE_CHAN | CMDFLAG_REGISTERED_CHAN | CMDFLAG_REQUIRE_AUTH | CMDFLAG_CHECK_AUTH | CMDFLAG_LOG);
     USER_COMMAND("help",         neonserv_cmd_help,      0, NULL,                   0);
     USER_COMMAND("events",       neonserv_cmd_events,    0, "1",                    CMDFLAG_REQUIRE_CHAN | CMDFLAG_REGISTERED_CHAN | CMDFLAG_REQUIRE_AUTH | CMDFLAG_CHECK_AUTH);
+    USER_COMMAND("command",      neonserv_cmd_command,   1, NULL,                   0);
     #undef USER_COMMAND
     
     #define OPER_COMMAND(NAME,FUNCTION,PARAMCOUNT,GACCESS,FLAGS) register_command(BOTID, NAME, FUNCTION, PARAMCOUNT, NULL, GACCESS, FLAGS)

diff --git a/cmd_neonserv_command.c b/cmd_neonserv_command.c
new file mode 100644 (file)
index 0000000..874816d
--- /dev/null
+++ b/cmd_neonserv_command.c
@@ -0,0 +1,149 @@
+
+/*
+* argv[0-1]     command
+*/
+static int neonserv_cmd_command_chanaccess(struct cmd_binding *cbind, struct ChanNode *chan);
+static int neonserv_cmd_command_operaccess(struct cmd_binding *cbind);
+
+static CMD_BIND(neonserv_cmd_command) {
+    char *ident;
+    MYSQL_RES *res;
+    MYSQL_ROW row;
+    struct cmd_binding *cbind = find_cmd_binding(client->botid, argv[0]);
+    if (!cbind) {
+        reply(getTextBot(), user, "NS_UNBIND_NOT_FOUND", argv[0]);
+        return;
+    }
+    ident = argv[0];
+    reply(getTextBot(), user, "NS_COMMAND_BINDING", cbind->cmd, cbind->func->name, (cbind->parameters ? cbind->parameters : ""));
+    if(chan)
+        reply(getTextBot(), user, "NS_COMMAND_ACCESS", neonserv_cmd_command_chanaccess(cbind, chan), neonserv_cmd_command_operaccess(cbind));
+    printf_mysql_query("SELECT `user_lang` FROM `users` WHERE `user_user` = '%s'", escape_string(user->auth));
+    res = mysql_use();
+    char *lang;
+    if ((row = mysql_fetch_row(res)) != NULL)
+        lang = row[0];
+    else
+        lang = "en";
+    printf_mysql_query("SELECT `text` FROM `help` WHERE `lang` = '%s' AND `ident` = '%s'", escape_string(lang), escape_string(ident));
+    res = mysql_use();
+    if ((row = mysql_fetch_row(res)) == NULL) {
+        if(stricmp(lang, "en")) {
+            printf_mysql_query("SELECT `text` FROM `help` WHERE `lang` = 'en' AND `ident` = '%s'", escape_string(ident));
+            res = mysql_use();
+        }
+        if ((row = mysql_fetch_row(res)) == NULL) {
+            printf_mysql_query("SELECT `text` FROM `help` WHERE `lang` = '%s' AND `ident` = '%s'", escape_string(lang), escape_string(cbind->func->name));
+            res = mysql_use();
+            if ((row = mysql_fetch_row(res)) == NULL) {
+                if(stricmp(lang, "en")) {
+                    printf_mysql_query("SELECT `text` FROM `help` WHERE `lang` = 'en' AND `ident` = '%s'", escape_string(cbind->func->name));
+                    res = mysql_use();
+                }
+                if ((row = mysql_fetch_row(res)) == NULL) {
+                    return;
+                }
+            }
+        }
+    }
+    char sendBuf[MAXLEN];
+    int sendBufPos = 0;
+    int i;
+    for(i = 0; i < strlen(row[0]); i++) {
+        switch(row[0][i]) {
+            case '\n':
+                if(sendBufPos) {
+                    sendBuf[sendBufPos] = '\0';
+                    reply(getTextBot(), user, "%s", sendBuf);
+                    sendBufPos = 0;
+                }
+                break;
+            case '$':
+                switch(row[0][i+1]) {
+                    case 'b':
+                        sendBuf[sendBufPos++] = '\002';
+                        i++;
+                        break;
+                    case 'k':
+                        sendBuf[sendBufPos++] = '\003';
+                        i++;
+                        break;
+                    case 'u':
+                        sendBuf[sendBufPos++] = '\031';
+                        i++;
+                        break;
+                    case 'C':
+                    case 'S':
+                        sendBufPos += sprintf(sendBuf + sendBufPos, "%s", client->user->nick);
+                        i++;
+                        break;
+                    default:
+                        sendBuf[sendBufPos++] = '$';
+                        break;
+                }
+                break;
+            default:
+                sendBuf[sendBufPos++] = row[0][i];
+                break;
+        }
+    }
+    if(sendBufPos) {
+        sendBuf[sendBufPos] = '\0';
+        reply(getTextBot(), user, "%s", sendBuf);
+        sendBufPos = 0;
+    }
+}
+
+static int neonserv_cmd_command_chanaccess(struct cmd_binding *cbind, struct ChanNode *chan) {
+    char access_list[256];
+    int access_pos = 0;
+    int access_count = 0;
+    int minaccess = 0;
+    char *str_a, *str_b = cbind->func->channel_access, *str_c;
+    if(cbind->flags & CMDFLAG_OVERRIDE_CHANNEL_ACCESS)
+        str_b = cbind->channel_access;
+    access_list[0] = '\0';
+    if(str_b) {
+        str_c = strdup(str_b);
+        str_b = str_c;
+        while((str_a = str_b)) {
+            str_b = strstr(str_a, ",");
+            if(str_b) {
+                *str_b = '\0';
+                str_b++;
+            }
+            if(*str_a == '#') {
+                str_a++;
+                access_pos += sprintf(access_list+access_pos, (access_pos ? ", `%s`" : "`%s`"), str_a);
+                access_count++;
+            } else {
+               if(atoi(str_a) > minaccess)
+                     minaccess = atoi(str_a);
+            }
+        }
+        free(str_c);
+    }
+    if(access_count) {
+        MYSQL_RES *res;
+        MYSQL_ROW row, defaults = NULL;
+        printf_mysql_query("SELECT %s FROM `channels` WHERE `channel_name` = '%s'", access_list, escape_string(chan->name));
+        res = mysql_use();
+        if ((row = mysql_fetch_row(res)) != NULL) {
+            int i, caccess;
+            for(i = 0; i < access_count; i++) {
+                if(!row[i] && !defaults) {
+                    printf_mysql_query("SELECT %s FROM `channels` WHERE `channel_name` = 'defaults'", access_list);
+                    defaults = mysql_fetch_row(mysql_use());
+                }
+                caccess = (row[i] ? atoi(row[i]) : atoi(defaults[i]));
+                if(caccess > minaccess)
+                     minaccess = caccess;
+            }
+        }
+    }
+    return minaccess;
+}
+
+static int neonserv_cmd_command_operaccess(struct cmd_binding *cbind) {
+    return ((cbind->flags & CMDFLAG_OVERRIDE_GLOBAL_ACCESS) ? cbind->global_access : cbind->func->global_access);
+}

diff --git a/cmd_neonserv_version.c b/cmd_neonserv_version.c
index 26dce8dbd4a82d263ab62d0d8554bfc8643c7a00..d4a64505f4005a8bac9e4b5de8ec2282fcbfb985 100644 (file)
--- a/cmd_neonserv_version.c
+++ b/cmd_neonserv_version.c
@@ -10,6 +10,7 @@ static CMD_BIND(neonserv_cmd_version) {
     //helpers :D
     reply(getTextBot(), user, "special thanks to:");
     reply(getTextBot(), user, "  Zer0n, TeaTow  (testing and ideas current version)");
+    reply(getTextBot(), user, "  Buchman, Zer0n  (translating current version)");
     reply(getTextBot(), user, "  Patschi95, DerGrinch, Darkfly, Zer0n, Buschman  (testing and ideas older versions)");
     reply(getTextBot(), user, "  Buschman, Georg, richard  (translating older versions)");
     reply(getTextBot(), user, "and all the other users that reported all these nasty bugs :D");

diff --git a/modcmd.c b/modcmd.c
index 602de719db8287f9bca4f09dc3d3ccc67439171b..61ebdc2f74fbff84caae69c1ac1e598370f5d033 100644 (file)
--- a/modcmd.c
+++ b/modcmd.c
@@ -618,3 +618,15 @@ void bind_set_channel_access(int botid, char *cmd, char *chanaccess) {
         }
     }
 }
+
+struct cmd_binding *find_cmd_binding(int botid, char *cmd) {
+    int bind_index = get_binds_index(cmd[0]);
+    struct cmd_binding *cbind;
+    for(cbind = cmd_binds[bind_index]; cbind; cbind = cbind->next) {
+        if(cbind->botid == botid && strcmp(cbind->cmd, cmd) == 0) {
+            return cbind;
+        }
+    }
+    return NULL;
+}
+

diff --git a/modcmd.h b/modcmd.h
index 963851bfac6cdd73d10caa21e6cdaf5c29b33347..940ab32a6d021e4aac83c8fc07405e6c2e5adae0 100644 (file)
--- a/modcmd.h
+++ b/modcmd.h
@@ -67,5 +67,6 @@ struct ClientSocket *getTextBot();
 void bind_set_parameters(int botid, char *cmd, char *parameters);
 void bind_set_global_access(int botid, char *cmd, int gaccess);
 void bind_set_channel_access(int botid, char *cmd, char *chanaccess);
+struct cmd_binding *find_cmd_binding(int botid, char *cmd);
 
 #endif
\ No newline at end of file