G 2.13 just a few bugfixes

diff --git a/helpmod2/changelist b/helpmod2/changelist
index eea168b9bc3a063d9317cd6ac15f5236c4333729..9216156e7eae3494463a53ab3f10822e7733cd82 100644 (file)
--- a/helpmod2/changelist
+++ b/helpmod2/changelist
@@ -346,3 +346,7 @@ Fixed the unknown error suppression bug (again)
 Fixed a bug when adding bans to authed -x users
 Added a rating command
 Added missing command help for ?+ and ?-
+
+2.13
+Fixed the account expiration problem
+Fixed the empty censor pattern bug

diff --git a/helpmod2/haccount.c b/helpmod2/haccount.c
index a8aa62b73c3c940ff9a5ad058b47bbe3dacf0f1e..ec9e15221ae4fb78b4a2eb0f91c250a0c5ac3468 100644 (file)
--- a/helpmod2/haccount.c
+++ b/helpmod2/haccount.c
@@ -90,7 +90,7 @@ void haccount_clear_inactives(void)
 {
     haccount **ptr = &haccounts;
     while (*ptr)
-       if ((time(NULL) - (*ptr)->last_activity > HELPMOD_ACCOUNT_EXPIRATION[(*ptr)->level]) && !(*ptr)->flags & H_NO_EXPIRE)
+       if ((time(NULL) - (*ptr)->last_activity > HELPMOD_ACCOUNT_EXPIRATION[(*ptr)->level]) && !((*ptr)->flags & H_NO_EXPIRE))
            haccount_del(*ptr);
        else
             ptr = &(*ptr)->next;

diff --git a/helpmod2/hcommands.c b/helpmod2/hcommands.c
index 61c21552efc122c368b1caecc1bb21b4da62c1bf..afa3e481b424a01307d96a9f386b70a2be91cfec 100644 (file)
--- a/helpmod2/hcommands.c
+++ b/helpmod2/hcommands.c
@@ -553,9 +553,16 @@ static void helpmod_cmd_censor (huser *sender, channel* returntype, char* ostr,
            }
 
            pattern = argv[0];
-            SKIP_WORD;
-            if (argc)
-                reason = ostr;
+
+           if (strlen(pattern) == 0)
+           {
+               helpmod_reply(sender, returntype, "Cannot add censor entry: Pattern must be non-empty");
+                return;
+           }
+
+           SKIP_WORD;
+           if (argc && strlen(ostr) > 0)
+               reason = ostr;
             else
                 reason = NULL;
 

diff --git a/helpmod2/helpmod.h b/helpmod2/helpmod.h
index e49e49315465b51748c3cedeef00076b48498bd7..028d65fd1d425b22302980e3f4bea8b91f7d02d7 100644 (file)
--- a/helpmod2/helpmod.h
+++ b/helpmod2/helpmod.h
@@ -12,8 +12,8 @@
 /* configuration */
 
 /* These should always be equal */
-#define HELPMOD_VERSION_INTERNAL HELPMOD_VERSION_2_12
-#define HELPMOD_VERSION "2.12"
+#define HELPMOD_VERSION_INTERNAL HELPMOD_VERSION_2_13
+#define HELPMOD_VERSION "2.13"
 
 #define HELPMOD_USER_TIMEOUT 1200
 

diff --git a/helpmod2/hversions.h b/helpmod2/hversions.h
index 7dfcf6612f5ff8e17508bbd187547542db1588b1..8499d3cb66a840d8daa8397abc75d0a5ffa6b483 100644 (file)
--- a/helpmod2/hversions.h
+++ b/helpmod2/hversions.h
@@ -10,4 +10,6 @@
 
 #define HELPMOD_VERSION_2_12 12 /* */
 
+#define HELPMOD_VERSION_2_13 13 /* */
+
 #endif