added dirty cmd_uset

diff --git a/bot_NeonServ.c b/bot_NeonServ.c
index c28198e3122ac4da284379a4b09b9e2fe672949c..f3448ac239a41d227f8b5b7828ecb01d4b8ed0b2 100644 (file)
--- a/bot_NeonServ.c
+++ b/bot_NeonServ.c
@@ -183,6 +183,10 @@ static const struct default_language_entry msgtab[] = {
     {"NS_PEEK_MODES", "Modes:       %s"}, /* {ARGS: "+xyz"} */
     {"NS_PEEK_USERS", "Total Users: %d (%d ops, %d voices, %d regulars, %d invisible)"}, /* {ARGS: 20, 4, 6, 8, 2} */
     {"NS_PEEK_OPS", "Ops:"},
+    {"NS_USET_GLOBAL", "\002--- Global ---\002"},
+    {"NS_USET_CHANNEL", "\002--- User options (channel) ---\002"},
+    {"NS_USET_NO_ACCESS", "no access"},
+    {"NS_USET_UNKNOWN_SETTING", "\002%s\002 is an unknown uset setting."}, /* {ARGS: "TestSetting"} */
     {NULL, NULL}
 };
 
@@ -215,7 +219,7 @@ INCLUDE ALL CMD's HERE
 #include "cmd_neonserv_voiceall.c"
 #include "cmd_neonserv_devoice.c"
 #include "cmd_neonserv_devoiceall.c"
-//#include "cmd_neonserv_uset.c"
+#include "cmd_neonserv_uset.c"
 #include "cmd_neonserv_kick.c"
 #include "cmd_neonserv_kickban.c"
 #include "cmd_neonserv_ban.c"
@@ -416,6 +420,7 @@ void init_NeonServ() {
     register_command(BOTID, "version",      neonserv_cmd_version,   0, 0,                                                                                           NULL,                   0);
     register_command(BOTID, "peek",         neonserv_cmd_peek,      0, CMDFLAG_REQUIRE_CHAN | CMDFLAG_REGISTERED_CHAN,                                              NULL,                   0);
     //register_command(BOTID, "info",         neonserv_cmd_info,      0, CMDFLAG_REQUIRE_CHAN | CMDFLAG_REGISTERED_CHAN,                                              NULL,                   0);
+    register_command(BOTID, "uset",         neonserv_cmd_uset,      0, CMDFLAG_REQUIRE_AUTH | CMDFLAG_CHECK_AUTH,                                                   NULL,                   0);
     
     register_command(BOTID, "trace",        neonserv_cmd_trace,     1, CMDFLAG_REQUIRE_AUTH | CMDFLAG_CHECK_AUTH,                                                   NULL,                   400);
     register_command(BOTID, "register",     neonserv_cmd_register,  2, CMDFLAG_REQUIRE_AUTH | CMDFLAG_CHECK_AUTH | CMDFLAG_CHAN_PARAM | CMDFLAG_OPLOG,              NULL,                   100);

diff --git a/cmd_neonserv_peek.c b/cmd_neonserv_peek.c
index a6ae3121606466e511cc7d655a299507eb1a1dcb..c4bdbebe567ff5d39f5e3fd15b6a9d26e8b9ffe2 100644 (file)
--- a/cmd_neonserv_peek.c
+++ b/cmd_neonserv_peek.c
@@ -32,7 +32,8 @@ static void neonserv_cmd_peek_async1(struct ClientSocket *client, struct ClientS
     reply(textclient, user, "NS_PEEK_HEADER", chan->name);
     reply(textclient, user, "NS_PEEK_TOPIC", chan->topic);
     char tmpStr[MAXLEN];
-    reply(textclient, user, "NS_PEEK_MODES", getModeString(chan->modes, tmpStr));
+    getModeString(chan->modes, tmpStr);
+    reply(textclient, user, "NS_PEEK_MODES", tmpStr);
     struct ChanUser *chanuser;
     int op_count = 0, voice_count = 0, normal_count = 0, invi_count = 0;
     for(chanuser = getChannelUsers(chan, NULL); chanuser; chanuser = getChannelUsers(chan, chanuser)) {

diff --git a/cmd_neonserv_uset.c b/cmd_neonserv_uset.c
new file mode 100644 (file)
index 0000000..ec285ce
--- /dev/null
+++ b/cmd_neonserv_uset.c
@@ -0,0 +1,162 @@
+
+static CMD_BIND(neonserv_cmd_uset) {
+    MYSQL_RES *res;
+    MYSQL_ROW row;
+    loadUserSettings(user);
+    if(argc > 0) {
+        if(!stricmp(argv[0], "language")) {
+            struct language* lang;
+            if(argc > 1) {
+                if((lang = get_language_by_tag(argv[1])) == NULL && (lang = get_language_by_name(argv[1])) == NULL) {
+                    lang = user->language;
+                } else {
+                    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) {
+                        printf_mysql_query("UPDATE `users` SET `user_lang` = '%s' WHERE `user_id` = '%s'", escape_string(lang->langtag), row[0]);
+                    } else {
+                        printf_mysql_query("INSERT INTO `users` (`user_user`, `user_lang`) VALUES ('%s', '%s')", escape_string(user->auth), escape_string(lang->langtag));
+                    }
+                    user->language = lang;
+                }
+            } else
+                lang = user->language;
+            reply(getTextBot(), user, "\002Language   \002%s", lang->langname);
+            char tmp[MAXLEN];
+            int tmppos = 0;
+            lang = get_default_language();
+            tmppos = sprintf(tmp, "%s (%s)", lang->langname, lang->langtag);
+            printf_mysql_query("SELECT `lang`,`text` FROM `language` WHERE `ident` = 'name'");
+            res = mysql_use();
+            while((row = mysql_fetch_row(res)) != NULL) {
+                tmppos += sprintf(tmp + tmppos, ", %s (%s)", row[1], row[0]);
+            }
+            reply(getTextBot(), user, "  %s", tmp);
+        } else if(!stricmp(argv[0], "noinvite") && chan) {
+            loadChannelSettings(chan);
+            if(!(chan->flags & CHANFLAG_CHAN_REGISTERED)) {
+                reply(getTextBot(), user, "MODCMD_CHAN_REQUIRED");
+                return;
+            }
+            printf_mysql_query("SELECT `id` FROM `noinvite` LEFT JOIN `users` ON `uid` = `user_id` WHERE `cid` = '%d' AND `user_user` = '%s'", chan->channel_id, escape_string(user->auth));
+            res = mysql_use();
+            row = mysql_fetch_row(res);
+            int noinvite = (row ? 1 : 0);
+            if(argc > 1) {
+                if(!strcmp(argv[1], "0") || !stricmp(argv[1], "off") || !stricmp(argv[1], get_language_string(user, "NS_SET_OFF"))) {
+                    if(noinvite) {
+                        printf_mysql_query("DELETE FROM `noinvite` WHERE `id` = '%s'", row[0]);
+                        noinvite = 0;
+                    }
+                } else if(!strcmp(argv[1], "1") || !stricmp(argv[1], "on") || !stricmp(argv[1], get_language_string(user, "NS_SET_ON"))) {
+                    if(!noinvite) {
+                        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]);
+                        } else {
+                            printf_mysql_query("INSERT INTO `users` (`user_user`) VALUES ('%s')", escape_string(user->auth));
+                            userid = (int) mysql_insert_id(mysql_conn);
+                        }
+                        printf_mysql_query("INSERT INTO `noinvite` (`uid`, `cid`) VALUES ('%d', '%d')", userid, chan->channel_id);
+                        noinvite = 1;
+                    }
+                }
+            }
+            reply(getTextBot(), user, "\002NoInvite   \002%s", (noinvite ? get_language_string(user, "NS_SET_ON") : get_language_string(user, "NS_SET_OFF")));
+        } else if((!stricmp(argv[0], "autoinvite") || !stricmp(argv[0], "noautoop") || !stricmp(argv[0], "info")) && chan) {
+            loadChannelSettings(chan);
+            if(!(chan->flags & CHANFLAG_CHAN_REGISTERED)) {
+                reply(getTextBot(), user, "MODCMD_CHAN_REQUIRED");
+                return;
+            }
+            printf_mysql_query("SELECT `chanuser_flags`, `chanuser_infoline`, `chanuser_access`, `channel_getinvite`, `chanuser_id` FROM `chanusers` LEFT JOIN `users` ON `chanuser_uid` = `user_id` LEFT JOIN `channels` ON `channel_id` = `chanuser_cid` WHERE `chanuser_cid` = '%d' AND `user_user` = '%s'", chan->channel_id, escape_string(user->auth));
+            res = mysql_use();
+            row = mysql_fetch_row(res);
+            if(row) {
+                int flags = atoi(row[0]);
+                if(!stricmp(argv[0], "autoinvite")) {
+                    int getInvite = 0;
+                    if(!row[3] && atoi(row[2]) >= atoi(getChanDefault("channel_getinvite")))
+                        getInvite = 1;
+                    else if(row[3] && atoi(row[2]) >= atoi(row[3]))
+                        getInvite = 1;
+                    if(getInvite && argc > 1) {
+                        if(!strcmp(argv[1], "0") || !stricmp(argv[1], "off") || !stricmp(argv[1], get_language_string(user, "NS_SET_OFF"))) {
+                            if(flags & DB_CHANUSER_AUTOINVITE) {
+                                flags &= ~DB_CHANUSER_AUTOINVITE;
+                                printf_mysql_query("UPDATE `chanusers` SET `chanuser_flags` = '%d' WHERE `chanuser_id` = '%s'", flags, row[4]);
+                            }
+                        } else if(!strcmp(argv[1], "1") || !stricmp(argv[1], "on") || !stricmp(argv[1], get_language_string(user, "NS_SET_ON"))) {
+                            if(!(flags & DB_CHANUSER_AUTOINVITE)) {
+                                flags |= DB_CHANUSER_AUTOINVITE;
+                                printf_mysql_query("UPDATE `chanusers` SET `chanuser_flags` = '%d' WHERE `chanuser_id` = '%s'", flags, row[4]);
+                            }
+                        }
+                    }
+                    if(getInvite)
+                        reply(getTextBot(), user, "\002AutoInvite \002%s", ((flags & DB_CHANUSER_AUTOINVITE) ? get_language_string(user, "NS_SET_ON") : get_language_string(user, "NS_SET_OFF")));
+                    else
+                        reply(getTextBot(), user, "\002AutoInvite \002%s", get_language_string(user, "NS_USET_NO_ACCESS"));
+                } else if(!stricmp(argv[0], "noautoop")) {
+                    if(argc > 1) {
+                        if(!strcmp(argv[1], "0") || !stricmp(argv[1], "off") || !stricmp(argv[1], get_language_string(user, "NS_SET_OFF"))) {
+                            if(flags & DB_CHANUSER_NOAUTOOP) {
+                                flags &= ~DB_CHANUSER_NOAUTOOP;
+                                printf_mysql_query("UPDATE `chanusers` SET `chanuser_flags` = '%d' WHERE `chanuser_id` = '%s'", flags, row[4]);
+                            }
+                        } else if(!strcmp(argv[1], "1") || !stricmp(argv[1], "on") || !stricmp(argv[1], get_language_string(user, "NS_SET_ON"))) {
+                            if(!(flags & DB_CHANUSER_NOAUTOOP)) {
+                                flags |= DB_CHANUSER_NOAUTOOP;
+                                printf_mysql_query("UPDATE `chanusers` SET `chanuser_flags` = '%d' WHERE `chanuser_id` = '%s'", flags, row[4]);
+                            }
+                        }
+                    }
+                    reply(getTextBot(), user, "\002NoAutoOp   \002%s", ((flags & DB_CHANUSER_NOAUTOOP) ? get_language_string(user, "NS_SET_ON") : get_language_string(user, "NS_SET_OFF")));
+                } else if(!stricmp(argv[0], "info")) {
+                    char *infoline;
+                    if(argc > 1) {
+                        infoline = merge_argv(argv, 1, argc);
+                        if(!strcmp(infoline, "*"))
+                            infoline = "";
+                        printf_mysql_query("UPDATE `chanusers` SET `chanuser_infoline` = '%s' WHERE `chanuser_id` = '%s'", escape_string(infoline), row[4]);
+                    } else
+                        infoline = row[1];
+                    reply(getTextBot(), user, "\002Info       \002%s", infoline);
+                }
+            } else
+                reply(getTextBot(), user, "NS_NOT_ON_USERLIST_YOU", chan);
+        } else
+            reply(getTextBot(), user, "NS_USET_UNKNOWN_SETTING", argv[0]);
+    } else {
+        //view all options
+        reply(getTextBot(), user, "NS_USET_GLOBAL");
+        reply(getTextBot(), user, "\002Language   \002%s", user->language->langname);
+        if(!chan) return;
+        loadChannelSettings(chan);
+        if(!(chan->flags & CHANFLAG_CHAN_REGISTERED)) return;
+        reply(getTextBot(), user, "NS_USET_CHANNEL");
+        printf_mysql_query("SELECT `id` FROM `noinvite` LEFT JOIN `users` ON `uid` = `user_id` WHERE `cid` = '%d' AND `user_user` = '%s'", chan->channel_id, escape_string(user->auth));
+        res = mysql_use();
+        row = mysql_fetch_row(res);
+        reply(getTextBot(), user, "\002NoInvite   \002%s", (row ? get_language_string(user, "NS_SET_ON") : get_language_string(user, "NS_SET_OFF")));
+        printf_mysql_query("SELECT `chanuser_flags`, `chanuser_infoline`, `chanuser_access`, `channel_getinvite` FROM `chanusers` LEFT JOIN `users` ON `chanuser_uid` = `user_id` LEFT JOIN `channels` ON `channel_id` = `chanuser_cid` WHERE `chanuser_cid` = '%d' AND `user_user` = '%s'", chan->channel_id, escape_string(user->auth));
+        res = mysql_use();
+        row = mysql_fetch_row(res);
+        if(row) {
+            int flags = atoi(row[0]);
+            int getInvite = 0;
+            if(!row[3] && atoi(row[2]) >= atoi(getChanDefault("channel_getinvite")))
+                getInvite = 1;
+            else if(row[3] && atoi(row[2]) >= atoi(row[3]))
+                getInvite = 1;
+            if(getInvite)
+                reply(getTextBot(), user, "\002AutoInvite \002%s", ((flags & DB_CHANUSER_AUTOINVITE) ? get_language_string(user, "NS_SET_ON") : get_language_string(user, "NS_SET_OFF")));
+            else
+                reply(getTextBot(), user, "\002AutoInvite \002%s", get_language_string(user, "NS_USET_NO_ACCESS"));
+            reply(getTextBot(), user, "\002NoAutoOp   \002%s", ((flags & DB_CHANUSER_NOAUTOOP) ? get_language_string(user, "NS_SET_ON") : get_language_string(user, "NS_SET_OFF")));
+            reply(getTextBot(), user, "\002Info       \002%s", row[1]);
+        }
+    }
+}
\ No newline at end of file