Merge default.

[irc/quakenet/newserv.git] / chanserv / chanservstdcmds.c

diff --git a/chanserv/chanservstdcmds.c b/chanserv/chanservstdcmds.c
index 88b0674ba4a95843a2a7a50b7fdfa76242122e18..d98cf2900d87030f3690b7bb24c42c40e4fe76e5 100644 (file)
--- a/chanserv/chanservstdcmds.c
+++ b/chanserv/chanservstdcmds.c
@@ -188,7 +188,7 @@ int cs_doshowcommands(void *source, int cargc, char **cargv) {
       if (time(NULL) < ACHIEVEMENTS_START)
         continue;
       
-      if ((time(NULL) > 1270162800) && 
+      if ((time(NULL) > ACHIEVEMENTS_END) && 
         !UIsAchievements(rup))
         continue;
     }
@@ -197,7 +197,7 @@ int cs_doshowcommands(void *source, int cargc, char **cargv) {
      *  Only valid on 01/04/2010. */
     if ((cmdlist[i]->level & QCMD_TITLES) && 
         ((time(NULL) < ACHIEVEMENTS_START) ||
-         (time(NULL) > ACHIEVEMENTS_END))))
+         (time(NULL) > ACHIEVEMENTS_END)))
       continue;
     
     /* We passed all the checks, send the message */    
@@ -229,8 +229,9 @@ int cs_sendhelp(nick *sender, char *thecmd, int oneline) {
       ((cmd->level & QCMD_HELPER) && (!rup || !UHasHelperPriv(rup))) ||
       ((cmd->level & QCMD_OPER) && (!rup || !UHasOperPriv(rup))) ||
       ((cmd->level & QCMD_ADMIN) && (!rup || !UHasAdminPriv(rup))) ||
-      ((cmd->level & QCMD_DEV) && (!rup || !UIsDev(rup)))) {
-    chanservstdmessage(sender, QM_NOHELP, cmd->command->content);
+      ((cmd->level & QCMD_DEV) && (!rup || !UIsDev(rup))) ||
+      ((cmd->level & (QCMD_TITLES | QCMD_ACHIEVEMENTS)) && (time(NULL) < ACHIEVEMENTS_START))) {
+    chanservstdmessage(sender, QM_UNKNOWNCMD, thecmd);
     return CMD_OK;
   }