request: Remove user functionality.

--HG--
branch : shroudrequest

diff --git a/request/Makefile.in b/request/Makefile.in
index 11b767f32be5e8abc8a5a6374f90d8610d83aacd..22f02d885c88a102bd0024a2b1b227b4da9c7111 100644 (file)
--- a/request/Makefile.in
+++ b/request/Makefile.in
@@ -6,4 +6,4 @@ LDFLAGS+=$(LIBPGSQL)
 .PHONY: all
 all: request.so
 
-request.so: lrequest.o request.o request_block.o request_fasttrack.o sqrequest.o user.o 
+request.so: lrequest.o request.o request_block.o request_fasttrack.o sqrequest.o

diff --git a/request/request.c b/request/request.c
index 6d604ac5482fc581ce222cee67a4df0550b144a4..823da2285e02d1476c10e62e0a31f7d35c820da2 100644 (file)
--- a/request/request.c
+++ b/request/request.c
@@ -15,7 +15,6 @@
 #include "request_fasttrack.h"
 #include "lrequest.h"
 #include "sqrequest.h"
-#include "user.h"
 
 MODULE_VERSION("");
 
@@ -34,11 +33,6 @@ int rqcmd_listblocks(void *user, int cargc, char **cargv);
 int rqcmd_stats(void *user, int cargc, char **cargv);
 int rqcmd_requestop(void *user, int cargc, char **cargv);
 
-int rqcmd_adduser(void *user, int cargc, char **cargv);
-int rqcmd_deluser(void *user, int cargc, char **cargv);
-int rqcmd_changelev(void *user, int cargc, char **cargv);
-int rqcmd_userlist(void *user, int cargc, char **cargv);
-
 #define min(a,b) ((a > b) ? b : a)
 
 /* stats counters */
@@ -68,18 +62,12 @@ void _init(void) {
   addcommandtotree(rqcommands, "requestspamscan", RQU_ANY, 1, &rqcmd_requestspamscan);
   addcommandtotree(rqcommands, "requestop", RQU_ANY, 2, &rqcmd_requestop);
 
-  addcommandtotree(rqcommands, "addblock", RQU_ACCOUNT, 3, &rqcmd_addblock);
-  addcommandtotree(rqcommands, "delblock", RQU_ACCOUNT, 1, &rqcmd_delblock);
-  addcommandtotree(rqcommands, "listblocks", RQU_ACCOUNT, 1, &rqcmd_listblocks);
-  addcommandtotree(rqcommands, "stats", RQU_ACCOUNT, 1, &rqcmd_stats);
-
-  addcommandtotree(rqcommands, "adduser", RQU_OPER, 2, &rqcmd_adduser);
-  addcommandtotree(rqcommands, "deluser", RQU_OPER, 1, &rqcmd_deluser);
-  addcommandtotree(rqcommands, "changelev", RQU_OPER, 2, &rqcmd_changelev);
-  addcommandtotree(rqcommands, "userlist", RQU_OPER, 1, &rqcmd_userlist);
+  addcommandtotree(rqcommands, "addblock", RQU_OPER, 3, &rqcmd_addblock);
+  addcommandtotree(rqcommands, "delblock", RQU_OPER, 1, &rqcmd_delblock);
+  addcommandtotree(rqcommands, "listblocks", RQU_OPER, 1, &rqcmd_listblocks);
+  addcommandtotree(rqcommands, "stats", RQU_OPER, 1, &rqcmd_stats);
   
   qr_initrequest();
-  ru_load();
 
   rq_logfd = fopen(RQ_LOGFILE, "a");
   
@@ -102,17 +90,11 @@ void _fini(void) {
   deletecommandfromtree(rqcommands, "listblocks", &rqcmd_listblocks);
   deletecommandfromtree(rqcommands, "stats", &rqcmd_stats);
 
-  deletecommandfromtree(rqcommands, "adduser", &rqcmd_adduser);
-  deletecommandfromtree(rqcommands, "deluser", &rqcmd_deluser);
-  deletecommandfromtree(rqcommands, "changelev", &rqcmd_changelev);
-  deletecommandfromtree(rqcommands, "userlist", &rqcmd_userlist);
-
   destroycommandtree(rqcommands);
 
   rq_finiblocks();
   rq_finifasttrack();
   qr_finirequest();
-  ru_persist();
 
   if (rq_logfd != NULL)
     fclose(rq_logfd);
@@ -180,13 +162,6 @@ void rq_handler(nick *target, int type, void **params) {
         return;
       }
 
-      if ((cmd->level & RQU_ACCOUNT) && (!IsAccount(user) || ru_getlevel(user) == 0) && !IsOper(user)) {
-        sendnoticetouser(rqnick, user, "Sorry, this command is not "
-              "available to you.");
-
-       return;
-      }
-
       if (cargc - 1 > cmd->maxparams)
         rejoinline(cargv[cmd->maxparams], cargc - cmd->maxparams);
 
@@ -219,9 +194,6 @@ int rqcmd_showcommands(void *user, int cargc, char **cargv) {
     if ((cmdlist[i]->level & RQU_OPER) && !IsOper(np))
       continue;
  
-    if ((cmdlist[i]->level & RQU_ACCOUNT) && !(IsOper(np) || (IsAccount(np) && ru_getlevel(np) > 0)))
-      continue;
-
     sendnoticetouser(rqnick, np, "%s", cmdlist[i]->command->content);
   }
 
@@ -572,9 +544,8 @@ int rqcmd_addblock(void *user, int cargc, char **cargv) {
   rq_block *block;
   time_t expires;
   char *account;
-  int level = ru_getlevel(np);
 
-  if (level < 20) {
+  if (!IsOper(np)) {
     sendnoticetouser(rqnick, np, "You do not have access to this command.");
 
     return RQ_ERROR;
@@ -602,12 +573,6 @@ int rqcmd_addblock(void *user, int cargc, char **cargv) {
 
   expires = getnettime() + durationtolong(cargv[1]);
 
-  if (expires > getnettime() + RQU_HELPER_MAXEXPIRE && level < 30) {
-    sendnoticetouser(rqnick, np, "Maximum expiry time is %s.", rq_longtoduration(RQU_HELPER_MAXEXPIRE));
-
-    return RQ_ERROR;
-  }
-  
   rq_addblock(cargv[0], cargv[2], account, 0, expires);
 
   sendnoticetouser(rqnick, np, "Blocked channels/accounts matching '%s' from "
@@ -618,12 +583,9 @@ int rqcmd_addblock(void *user, int cargc, char **cargv) {
 
 int rqcmd_delblock(void *user, int cargc, char **cargv) {
   nick *np = (nick*)user;
-  int result, level;
-  rq_block *block;
+  int result;
 
-  level = ru_getlevel(np);
-  
-  if (level < 20) {
+  if (!IsOper(np)) {
     sendnoticetouser(rqnick, np, "You do not have access to this command.");
 
     return RQ_ERROR;
@@ -635,16 +597,6 @@ int rqcmd_delblock(void *user, int cargc, char **cargv) {
     return RQ_ERROR;
   }
 
-  block = rq_findblock(cargv[0]);
-
-  if (block != NULL && level < 50) {
-    if (ircd_strcmp(block->creator->content, np->authname) != 0) {
-      sendnoticetouser(rqnick, np, "This block was created by someone else. You cannot remove it.");
-      
-      return RQ_ERROR;
-    }
-  }
-
   result = rq_removeblock(cargv[0]);
 
   if (result > 0) {
@@ -661,11 +613,9 @@ int rqcmd_delblock(void *user, int cargc, char **cargv) {
 int rqcmd_listblocks(void *user, int cargc, char **cargv) {
   nick *np = (nick*)user;
   rq_block block;
-  int i, level;
+  int i;
 
-  level = ru_getlevel(np);
-  
-  if (level < 10) {
+  if (!IsOper(np)) {
     sendnoticetouser(rqnick, np, "You do not have access to this command.");
 
     return RQ_ERROR;
@@ -695,9 +645,8 @@ int rqcmd_listblocks(void *user, int cargc, char **cargv) {
 
 int rqcmd_stats(void *user, int cargc, char **cargv) {
   nick *np = (nick*)user;
-  int level = ru_getlevel(np);
 
-  if (level < 10) {
+  if (!IsOper(np)) {
     sendnoticetouser(rqnick, np, "You do not have access to this command.");
 
     return RQ_ERROR;
@@ -714,112 +663,3 @@ int rqcmd_stats(void *user, int cargc, char **cargv) {
   return RQ_OK;
 }
 
-int rqcmd_adduser(void *user, int cargc, char **cargv) {
-  nick *np = (nick*)user;
-  int result, level;
-
-  if (cargc < 2) {
-    sendnoticetouser(rqnick, np, "Syntax: adduser <account> <level>");
-
-    return RQ_ERROR;
-  }
-
-  level = atoi(cargv[1]);
-
-  if (level <= 0) {
-    sendnoticetouser(rqnick, np, "Level must be a positive integer.");
-
-    return RQ_ERROR;
-  }
-
-  result = ru_create(cargv[0], level);
-
-  if (result) {
-    sendnoticetouser(rqnick, np, "User '%s' was added with level '%d'.", cargv[0], level);
-
-    return RQ_OK;
-  } else {
-    sendnoticetouser(rqnick, np, "Something strange happened. Contact shroud.");
-
-    return RQ_ERROR;
-  }
-}
-
-int rqcmd_deluser(void *user, int cargc, char **cargv) {
-  nick *np = (nick*)user;
-  int level;
-
-  if (cargc < 1) {
-    sendnoticetouser(rqnick, np, "Syntax: deluser <account>");
-
-    return RQ_ERROR;
-  }
-
-  level = ru_getlevel_str(cargv[0]);
-
-  if (level <= 0) {
-    sendnoticetouser(rqnick, np, "There is no such user.");
-
-    return RQ_ERROR;
-  }
-
-  ru_destroy(cargv[0]);
-
-  sendnoticetouser(rqnick, np, "Done.");
-
-  return RQ_OK;
-}
-
-int rqcmd_changelev(void *user, int cargc, char **cargv) {
-  nick *np = (nick*)user;
-  int result, level;
-
-  if (cargc < 2) {
-    sendnoticetouser(rqnick, np, "Syntax: changelev <account> <level>");
-
-    return RQ_ERROR;
-  }
-
-  level = atoi(cargv[1]);
-
-  if (level <= 0) {
-    sendnoticetouser(rqnick, np, "Level must be a positive integer.");
-
-    return RQ_ERROR;
-  }
-
-  if (ru_getlevel_str(cargv[0]) <= 0) {
-    sendnoticetouser(rqnick, np, "Unknown user.");
-
-    return RQ_ERROR;
-  }
-  
-  result = ru_setlevel(cargv[0], level);
-  
-  if (result != 0) {
-    sendnoticetouser(rqnick, np, "Done.");
-
-    return RQ_OK;
-  } else {
-    sendnoticetouser(rqnick, np, "Something strange happened. Contact shroud.");
-
-    return RQ_ERROR;
-  }
-}
-
-int rqcmd_userlist(void *user, int cargc, char **cargv) {
-  nick *np = (nick*)user;
-  r_user_t *userp = r_userlist;
-
-  sendnoticetouser(rqnick, np, "User Level");
-
-  while (userp) {
-    sendnoticetouser(rqnick, np, "%s %d", userp->name, userp->level);
-    userp = userp->next;
-  }
-
-  sendnoticetouser(rqnick, np, "--- End of USERS.");
-
-  return RQ_OK;
-}
-

diff --git a/request/request.h b/request/request.h
index da0db8ce092da1810754eb975450fb984a83d1cd..e4332f2842eac48bcc6cfaa2814a88b44a364c3f 100644 (file)
--- a/request/request.h
+++ b/request/request.h
@@ -1,6 +1,6 @@
 #define RQ_TLZ "#twilightzone"
 
-#define RQ_QSERVER "CServe.quakenet.org"
+#define RQ_QSERVER "nslave.netsplit.net"
 #define RQ_QNICK "Q"
 
 #define RQ_SSERVER "services.de.quakenet.org"
@@ -15,12 +15,7 @@
 
 #define RQU_ANY 0
 #define RQU_OPER 1
-#define RQU_ACCOUNT 2
 
-/* one week by default */
-#define RQU_HELPER_MAXEXPIRE 604800
-
-#define RQ_USERFILE "data/rqusers"
 #define RQ_LOGFILE "logs/request.log"
 
 #define RQ_OK 0

diff --git a/request/user.c b/request/user.c
deleted file mode 100644 (file)
index 563591f..0000000
--- a/request/user.c
+++ /dev/null
@@ -1,192 +0,0 @@
-#include <stdio.h>
-#include <string.h>
-
-#include "../irc/irc_config.h"
-#include "../lib/irc_string.h"
-#include "../lib/strlfunc.h"
-#include "../nick/nick.h"
-#include "request.h"
-#include "user.h"
-
-r_user_t *r_userlist = NULL;
-int ru_loading = 0;
-
-r_user_t *ru_find(char *name);
-
-int ru_create(char *name, unsigned int level) {
-       r_user_t *user, *trav;
-
-       if (ru_setlevel(name, level) != 0)
-               return 1;
-
-       user = (r_user_t*)malloc(sizeof(r_user_t));
-
-       if (user == NULL)
-               return 0;
-
-       user->next = NULL;
-       strlcpy(user->name, name, sizeof(user->name));
-       user->level = level;
-
-       if (r_userlist == NULL)
-               r_userlist = user;
-       else {
-               trav = r_userlist;
-
-               while (trav->next)
-                       trav = trav->next;
-
-               trav->next = user;
-       }
-
-       ru_persist();
-       
-       return 1;
-}
-
-void ru_destroy(char *name) {
-       r_user_t *puser;
-       r_user_t *user = r_userlist;
-
-       if (user && ircd_strcmp(user->name, name) == 0) {
-               free(r_userlist);
-
-               r_userlist = NULL;
-
-               ru_persist();
-               
-               return;
-       }
-
-       if (user == NULL)
-               return;
-       
-       while (user && user->next) {    
-               if (ircd_strcmp(user->next->name, name) == 0) {
-                       puser = user->next;
-                       user->next = user->next->next;
-
-                       free(puser);
-               }
-
-               user = user->next;
-       }
-
-       ru_persist();
-}
-
-int ru_parseline(char *line) {
-  char name[ACCOUNTLEN];
-  unsigned int level;
-  int result;
-
-  if (sscanf(line, "%s %u", name, &level) < 2)
-    return 0;
-
-  ru_loading = 1;
-  result = ru_create(name, level);
-  ru_loading = 0;
-
-  return result;
-}
-
-int ru_load(void) {
-  char line[4096];
-  FILE *rudata;
-  int count;
-
-  rudata = fopen(RQ_USERFILE, "r");
-
-  if (rudata == NULL)
-    return 0;
-
-  count = 0;
-
-  while (!feof(rudata)) {
-    if (fgets(line, sizeof(line), rudata) == NULL)
-      break;
-
-    if (line[strlen(line) - 1] == '\n')
-      line[strlen(line) - 1] = '\0';
-
-    if (line[strlen(line) - 1] == '\r')
-      line[strlen(line) - 1] = '\0';
-
-    if (line[0] != '\0') {
-      if (ru_parseline(line))
-        count++;
-    }
-  }
-
-  fclose(rudata);
-
-  return count;
-}
-
-int ru_persist(void) {
-  FILE *rudata;
-  int count = 0;
-  r_user_t *user = r_userlist;
-
-  if (ru_loading)
-    return 0;
-
-  rudata = fopen(RQ_USERFILE, "w");
-
-  if (rudata == NULL)
-    return 0;
-
-  while (user) {
-    fprintf(rudata, "%s %u\n", user->name, user->level);
-
-    user = user->next;
-  }
-
-  fclose(rudata);
-
-  return count;
-}
-
-r_user_t *ru_find(char *name) {
-       r_user_t *user = r_userlist;
-
-       while (user) {
-               if (ircd_strcmp(user->name, name) == 0)
-                       return user;
-
-               user = user->next;
-       }
-
-       return NULL;
-}
-
-unsigned int ru_getlevel(nick *np) {
-       if (IsOper(np))
-               return 999;
-       else if (!IsAccount(np))
-               return 0;
-
-       return ru_getlevel_str(np->authname);
-}
-
-unsigned int ru_getlevel_str(char *name) {
-       r_user_t *user = ru_find(name);
-
-       if (user)
-               return user->level;
-       else
-               return 0;
-}
-
-int ru_setlevel(char *name, unsigned int level) {
-       r_user_t *user = ru_find(name);
-
-       if (user) {
-               user->level = level;
-
-               ru_persist();
-
-               return 1;
-       } else
-               return 0;
-}

diff --git a/request/user.h b/request/user.h
deleted file mode 100644 (file)
index 09b0816..0000000
--- a/request/user.h
+++ /dev/null
@@ -1,18 +0,0 @@
-/* R user system */
-
-typedef struct r_user_s {
-       struct r_user_s *next;
-       char name[ACCOUNTLEN];
-       unsigned int level;
-} r_user_t;
-
-extern r_user_t *r_userlist;
-
-int ru_load(void);
-int ru_persist(void);
-
-int ru_create(char *name, unsigned int level);
-void ru_destroy(char *name);
-unsigned int ru_getlevel(nick *np);
-unsigned int ru_getlevel_str(char *name);
-int ru_setlevel(char *name, unsigned int level);