added DoNotRegister system and command cmd_noregister
authorpk910 <philipp@zoelle1.de>
Fri, 4 Nov 2011 19:49:26 +0000 (20:49 +0100)
committerpk910 <philipp@zoelle1.de>
Fri, 4 Nov 2011 20:08:30 +0000 (21:08 +0100)
Makefile.am
database.sql
database.upgrade.sql
src/bot_NeonServ.c
src/cmd_global_register.c
src/cmd_neonserv.h
src/cmd_neonserv_giveowner.c
src/cmd_neonserv_noregister.c [new file with mode: 0644]
src/commands.c
src/mysqlConn.c

index 5a0eb2eb0ae3e96124ce74ff1d2403a3759cd45d..d33ab4b5b7714423d0a8a4053c7a3456a431579b 100644 (file)
@@ -112,6 +112,7 @@ neonserv_SOURCES = src/version.c \
       src/cmd_neonserv_unvisited.c \
       src/cmd_neonserv_extscript.c \
       src/cmd_neonspam_set.c \
+      src/cmd_neonserv_noregister.c \
       src/cmd_funcmds.c \
       src/lib/ini.c
 
index 3693c0d519c432b8cee5f9456fff34a7689d5101..1aebd1e08ceda4df7e1117376b039ed23e4a2e3e 100644 (file)
@@ -339,3 +339,19 @@ CREATE TABLE IF NOT EXISTS `version` (
   PRIMARY KEY (`database_version`)
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1;
 
+-- --------------------------------------------------------
+
+--
+-- Tabellenstruktur für Tabelle `donotregister`
+--
+
+CREATE TABLE `donotregister` (
+`dnr_id` INT( 11 ) NOT NULL AUTO_INCREMENT PRIMARY KEY ,
+`dnr_target` VARCHAR( 256 ) NOT NULL ,
+`dnr_user` INT( 11 ) NOT NULL ,
+`dnr_timeout` INT( 20 ) NOT NULL ,
+`dnr_reason` TEXT NOT NULL ,
+UNIQUE (
+`dnr_target`
+)
+) ENGINE = MYISAM ;
\ No newline at end of file
index 4d4a9e4c9638b403f1c2e14b3948fcff4042e918..36c8b0faf7b761855bdb4c89d44b450bb06862dd 100644 (file)
@@ -63,3 +63,16 @@ ALTER TABLE `channels`
 ALTER TABLE `bots` ADD `queue` TINYINT( 1 ) NOT NULL AFTER `textbot` 
 
 -- version: 5
+
+CREATE TABLE `donotregister` (
+`dnr_id` INT( 11 ) NOT NULL AUTO_INCREMENT PRIMARY KEY ,
+`dnr_target` VARCHAR( 256 ) NOT NULL ,
+`dnr_user` INT( 11 ) NOT NULL ,
+`dnr_timeout` INT( 20 ) NOT NULL ,
+`dnr_reason` TEXT NOT NULL ,
+UNIQUE (
+`dnr_target`
+)
+) ENGINE = MYISAM ;
+
+-- version: 6
index 81240489a188ec26cb53a2b8881ba11f4b56f5ad..7e6b9beedf57e79ef3f93c6fa9826564a85ee936 100644 (file)
@@ -318,6 +318,18 @@ static const struct default_language_entry msgtab[] = {
     {"NS_COMMANDS_ACCESS", "Access"},
     {"NS_COMMANDS_GACCESS", "GodAccess"},
     {"NS_COMMANDS_FUNCTION", "Function"},
+    {"NS_DNR_SET", "$b%s$b is do-not-register (by $b%s$b): %s" },
+    {"NS_DNR_SET_EXPIRES", "$b%s$b is do-not-register (by $b%s$b; expires %s): %s" },
+    {"NS_DNR_SET_ANONYM", "$b%s$b is do-not-register. Please contact the support to get more information."},
+    {"NS_NOREGISTER_INVALID_DURATION", "$b%s$b is not a valid duration."},
+    {"NS_NOREGISTER_REGISTERED", "$b%s$b is currently registered and can't be added to the do-not-register list."},
+    {"NS_NOREGISTER_DONE", "added $b%s$b to the do-not-register list."},
+    {"NS_NOREGISTER_HEAD", "The following do-not-registers were found:"},
+    {"NS_DNR_TARGET", "Target"},
+    {"NS_DNR_USER", "Issuer"},
+    {"NS_DNR_EXPIRES", "Expires"},
+    {"NS_DNR_REASON", "Reason"},
+    
     {NULL, NULL}
 };
 
index 08c172a17b7bc6eb9b969c2323e6e5a9e67292c1..61d3e909479900f8465cc558729054a732a49090 100644 (file)
@@ -53,6 +53,23 @@ CMD_BIND(global_cmd_register) {
         } else
             multibot = 1;
     }
+    printf_mysql_query("SELECT `user_user`, `dnr_timeout`, `dnr_reason`, `dnr_id` FROM `donotregister` LEFT JOIN `users` ON `dnr_user` = `user_id` WHERE `dnr_target` = '%s'", escape_string(channel));
+    res = mysql_use();
+    if((row = mysql_fetch_row(res)) != NULL) {
+        int expire_time = atoi(row[1]);
+        if(expire_time) {
+            if(expire_time - time(0) <= 0) {
+                printf_mysql_query("DELETE FROM `donotregister` WHERE `dnr_id` = '%s'", row[3]);
+            } else {
+                char expireBuf[MAXLEN];
+                reply(getTextBot(), user, "NS_DNR_SET_EXPIRES", channel, row[0], timeToStr(user, (expire_time - time(0)), 2, expireBuf), row[2]);
+                return;
+            }
+        } else {
+            reply(getTextBot(), user, "NS_DNR_SET", channel, row[0], row[2]);
+            return;
+        }
+    }
     //if theres already another bot in the channel we don't need a owner parameter...
     if(multibot && argc < 2) {
         //skip all these owner check lines
@@ -157,6 +174,23 @@ static void global_cmd_register_async1(struct ClientSocket *client, struct Clien
     else
         adminid = 0;
     if(multibot != 2) {
+        printf_mysql_query("SELECT `user_user`, `dnr_timeout`, `dnr_reason`, `dnr_id` FROM `donotregister` LEFT JOIN `users` ON `dnr_user` = `user_id` WHERE `dnr_target` = '%s'", escape_string(auth));
+        res = mysql_use();
+        if((row = mysql_fetch_row(res)) != NULL) {
+            int expire_time = atoi(row[1]);
+            if(expire_time) {
+                if(expire_time - time(0) <= 0) {
+                    printf_mysql_query("DELETE FROM `donotregister` WHERE `dnr_id` = '%s'", row[3]);
+                } else {
+                    char expireBuf[MAXLEN];
+                    reply(getTextBot(), user, "NS_DNR_SET_EXPIRES", auth, row[0], timeToStr(user, (expire_time - time(0)), 2, expireBuf), row[2]);
+                    return;
+                }
+            } else {
+                reply(getTextBot(), user, "NS_DNR_SET", auth, row[0], row[2]);
+                return;
+            }
+        }
         printf_mysql_query("SELECT `user_id` FROM `users` WHERE `user_user` = '%s'", escape_string(auth));
         res = mysql_use();
         if ((row = mysql_fetch_row(res)) != NULL) {
index c6eb9dce8744a7ceec6fa3028d6830fab6c70657..334a0029f68614c74486e8d2658d0902aa7d6b20 100644 (file)
@@ -74,6 +74,7 @@ CMD_BIND(neonserv_cmd_mdeluser);
 CMD_BIND(neonserv_cmd_mode);
 CMD_BIND(neonserv_cmd_move);
 CMD_BIND(neonserv_cmd_myaccess);
+CMD_BIND(neonserv_cmd_noregister);
 CMD_BIND(neonserv_cmd_op);
 CMD_BIND(neonserv_cmd_opall);
 CMD_BIND(neonserv_cmd_oplog);
index 3d41b02cb3533408500d84c1d14624d3f942609e..dd203d83fee23ed708f97c907413d7a2943153e7 100644 (file)
@@ -103,6 +103,22 @@ static void neonserv_cmd_giveowner_async1(struct ClientSocket *client, struct Cl
     }
     MYSQL_RES *res;
     MYSQL_ROW row;
+    printf_mysql_query("SELECT `user_user`, `dnr_timeout`, `dnr_reason`, `dnr_id` FROM `donotregister` LEFT JOIN `users` ON `dnr_user` = `user_id` WHERE `dnr_target` = '%s'", escape_string(auth));
+    res = mysql_use();
+    if((row = mysql_fetch_row(res)) != NULL) {
+        int expire_time = atoi(row[1]);
+        if(expire_time) {
+            if(expire_time - time(0) <= 0) {
+                printf_mysql_query("DELETE FROM `donotregister` WHERE `dnr_id` = '%s'", row[3]);
+            } else {
+                reply(getTextBot(), user, "NS_DNR_SET_ANONYM", auth);
+                return;
+            }
+        } else {
+            reply(getTextBot(), user, "NS_DNR_SET_ANONYM", auth);
+            return;
+        }
+    }
     int userid;
     printf_mysql_query("SELECT `user_id` FROM `users` WHERE `user_user` = '%s'", escape_string(auth));
     res = mysql_use();
diff --git a/src/cmd_neonserv_noregister.c b/src/cmd_neonserv_noregister.c
new file mode 100644 (file)
index 0000000..e67992f
--- /dev/null
@@ -0,0 +1,195 @@
+/* cmd_neonserv_noregister.c - NeonServ v5.2
+ * Copyright (C) 2011  Philipp Kreil (pk910)
+ * 
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License 
+ * along with this program. If not, see <http://www.gnu.org/licenses/>. 
+ */
+
+#include "cmd_neonserv.h"
+
+/*
+* argv[0]   *auth/#channel
+* argv[1]   duration
+* argv[2-*] reason
+*/
+
+static AUTHLOOKUP_CALLBACK(neonserv_cmd_noregister_auth_lookup);
+static USERAUTH_CALLBACK(neonserv_cmd_noregister_nick_lookup);
+static void neonserv_cmd_noregister_async1(struct ClientSocket *client, struct ClientSocket *textclient, struct UserNode *user, struct ChanNode *chan, struct Event *event,char *auth, int duration, char *reason);
+static void neonserv_cmd_noregister_list(struct ClientSocket *client, struct UserNode *user, struct ChanNode *chan, struct Event *event, char **argv, int argc);
+
+struct neonserv_cmd_noregister_cache {
+    struct ClientSocket *client, *textclient;
+    struct UserNode *user;
+    struct ChanNode *chan;
+    struct Event *event;
+    int duration;
+    char *reason, *nick;
+};
+
+CMD_BIND(neonserv_cmd_noregister) {
+    if(argc < 3) {
+        neonserv_cmd_noregister_list(client, user, chan, event, argv, argc);
+        return;
+    }
+    int duration = strToTime(user, argv[1]);
+    if(duration == 0 && strcmp(argv[1], "0")) {
+        reply(getTextBot(), user, "NS_NOREGISTER_INVALID_DURATION", argv[1]);
+        return;
+    }
+    char *reason = merge_argv(argv, 2, argc);
+    MYSQL_RES *res;
+    MYSQL_ROW row;
+    if(argv[0][0] == '#') {
+        printf_mysql_query("SELECT `botid` FROM `bot_channels` LEFT JOIN `channels` ON `bot_channels`.`chanid` = `channels`.`channel_id` WHERE `channel_name` = '%s'", escape_string(argv[0]));
+        res = mysql_use();
+        if ((row = mysql_fetch_row(res)) != NULL) {
+            reply(getTextBot(), user, "NS_NOREGISTER_REGISTERED", argv[0]);
+            return;
+        }
+        neonserv_cmd_noregister_async1(client, getTextBot(), user, chan, event, argv[0], duration, reason);
+    } else if(argv[0][0] == '*') {
+        //we've got an auth
+        argv[0]++;
+        printf_mysql_query("SELECT `user_user` FROM `users` WHERE `user_user` = '%s'", escape_string(argv[0]));
+        res = mysql_use();
+        if ((row = mysql_fetch_row(res)) != NULL) {
+            neonserv_cmd_noregister_async1(client, getTextBot(), user, chan, event, row[0], duration, reason);
+        } else {
+            //we need to create a new user...
+            //but first lookup the auth to check if it really exists
+            struct neonserv_cmd_noregister_cache *cache = malloc(sizeof(*cache));
+            if (!cache) {
+                perror("malloc() failed");
+                return;
+            }
+            cache->client = client;
+            cache->textclient = getTextBot();
+            cache->user = user;
+            cache->chan = chan;
+            cache->event = event;
+            cache->nick = strdup(argv[0]);
+            cache->duration = duration;
+            cache->reason = strdup(reason);
+            lookup_authname(argv[0], neonserv_cmd_noregister_auth_lookup, cache);
+        }
+    } else {
+        struct UserNode *cuser = getUserByNick(argv[0]);
+        if(!cuser) {
+            cuser = createTempUser(argv[0]);
+            cuser->flags |= USERFLAG_ISTMPUSER;
+        }
+        if(cuser->flags & USERFLAG_ISAUTHED) {
+            neonserv_cmd_noregister_async1(client, getTextBot(), user, chan, event, cuser->auth, duration, reason);
+        } else {
+            struct neonserv_cmd_noregister_cache *cache = malloc(sizeof(*cache));
+            if (!cache) {
+                perror("malloc() failed");
+                return;
+            }
+            cache->client = client;
+            cache->textclient = getTextBot();
+            cache->user = user;
+            cache->chan = chan;
+            cache->event = event;
+            cache->nick = strdup(user->nick);
+            cache->duration = duration;
+            cache->reason = strdup(reason);
+            get_userauth(cuser, neonserv_cmd_noregister_nick_lookup, cache);
+        }
+    }
+}
+
+static AUTHLOOKUP_CALLBACK(neonserv_cmd_noregister_auth_lookup) {
+    struct neonserv_cmd_noregister_cache *cache = data;
+    if(!exists) {
+        //AUTH_DOES_NOT_EXIST
+        reply(cache->textclient, cache->user, "NS_AUTH_UNKNOWN", cache->nick);
+    } else
+        neonserv_cmd_noregister_async1(cache->client, cache->textclient, cache->user, cache->chan, cache->event, auth, cache->duration, cache->reason);
+    free(cache->reason);
+    free(cache->nick);
+    free(cache);
+}
+
+static USERAUTH_CALLBACK(neonserv_cmd_noregister_nick_lookup) {
+    struct neonserv_cmd_noregister_cache *cache = data;
+    if(!user) {
+        //USER_DOES_NOT_EXIST
+        reply(cache->textclient, cache->user, "NS_USER_UNKNOWN", cache->nick);
+    }
+    else if(!(user->flags & USERFLAG_ISAUTHED)) {
+        //USER_NOT_AUTHED
+        reply(cache->textclient, cache->user, "NS_USER_NEED_AUTH", cache->nick);
+    }
+    else
+        neonserv_cmd_noregister_async1(cache->client, cache->textclient, cache->user, cache->chan, cache->event, user->auth, cache->duration, cache->reason);
+    free(cache->reason);
+    free(cache->nick);
+    free(cache);
+}
+
+static void neonserv_cmd_noregister_async1(struct ClientSocket *client, struct ClientSocket *textclient, struct UserNode *user, struct ChanNode *chan, struct Event *event,char *auth, int duration, char *reason) {
+    MYSQL_RES *res;
+    MYSQL_ROW row;
+    printf_mysql_query("SELECT `dnr_id` FROM `donotregister` WHERE `dnr_target` = '%s'", escape_string(auth));
+    res = mysql_use();
+    if((row = mysql_fetch_row(res)) != NULL) {
+        printf_mysql_query("DELETE FROM `donotregister` WHERE `dnr_id` = '%s'", row[0]);
+    }
+    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
+        userid = 0;
+    printf_mysql_query("INSERT INTO `donotregister` (`dnr_target`, `dnr_timeout`, `dnr_user`, `dnr_reason`) VALUES ('%s', '%lu', '%d', '%s')", escape_string(auth), (duration ? (time(0)+duration) : 0), userid, escape_string(reason));
+    reply(getTextBot(), user, "NS_NOREGISTER_DONE", auth);
+}
+
+static void neonserv_cmd_noregister_list(struct ClientSocket *client, struct UserNode *user, struct ChanNode *chan, struct Event *event, char **argv, int argc) {
+    struct Table *table;
+    int entrys = 0;
+    MYSQL_RES *res;
+    MYSQL_ROW row;
+    printf_mysql_query("SELECT `dnr_target`, `dnr_timeout`, `user_user`, `dnr_reason` FROM `donotregister` LEFT JOIN `users` ON `dnr_user` = `user_id` ORDER BY `dnr_target` ASC");
+    res = mysql_use();
+    table = table_init(4, mysql_num_rows(res) + 1, 0);
+    char *content[4];
+    content[0] = get_language_string(user, "NS_DNR_TARGET");
+    content[1] = get_language_string(user, "NS_DNR_USER");
+    content[2] = get_language_string(user, "NS_DNR_EXPIRES");
+    content[3] = get_language_string(user, "NS_DNR_REASON");
+    table_add(table, content);
+    int duration;
+    char expires_str[MAXLEN];
+    while ((row = mysql_fetch_row(res)) != NULL) {
+        entrys++;
+        content[0] = row[0];
+        content[1] = row[2];
+        duration = atoi(row[1]);
+        content[2] = (duration ? timeToStr(user, (duration - time(0)), 2, expires_str) : get_language_string(user, "NS_USERS_SEEN_NEVER"));
+        content[3] = row[3];
+        table_add(table, content);
+    }
+    //send the table
+    char **table_lines = table_end(table);
+    int i;
+    for(i = 0; i < table->entrys; i++) {
+        reply(getTextBot(), user, table_lines[i]);
+    }
+    if(!entrys)
+        reply(getTextBot(), user, "NS_TABLE_NONE");
+    table_free(table);
+}
index 93e7d73096bb08ce2cf2495948073981c9b06d8d..9fe300575e9894786a958b228a1a36e0b84b0fc8 100644 (file)
@@ -118,6 +118,7 @@ void register_commands() {
     OPER_COMMAND("listrank",     neonserv_cmd_listrank,  0,     1,    CMDFLAG_REQUIRE_AUTH | CMDFLAG_CHECK_AUTH | CMDFLAG_OPLOG);
     OPER_COMMAND("rename",       neonserv_cmd_rename,    2,     300,  CMDFLAG_REQUIRE_AUTH | CMDFLAG_CHECK_AUTH | CMDFLAG_OPLOG);
     OPER_COMMAND("unvisited",    neonserv_cmd_unvisited, 0,     400,  CMDFLAG_REQUIRE_AUTH | CMDFLAG_CHECK_AUTH | CMDFLAG_OPLOG);
+    OPER_COMMAND("noregister",   neonserv_cmd_noregister,0,     300,  CMDFLAG_REQUIRE_AUTH | CMDFLAG_CHECK_AUTH | CMDFLAG_CHAN_PARAM | CMDFLAG_OPLOG);
     #undef OPER_COMMAND
     
     //NeonSpam Commands
index faeb701096edee8a0dbcdeb6a8141220e01caf0b..272bb21f64451f72066ef1ca9ec0c292181ca41b 100644 (file)
@@ -16,7 +16,7 @@
  */
 
 #include "mysqlConn.h"
-#define DATABASE_VERSION "5"
+#define DATABASE_VERSION "6"
 
 struct used_result {
     MYSQL_RES *result;