Fix cosmetic bug in email/newpass for staff from Q.

diff --git a/chanserv/authcmds/email.c b/chanserv/authcmds/email.c
index bb546705fdbe7818aeccb52169689bf56da86f3b..1ea2f1ac18be0195709a912d9438a48f96817fd5 100644 (file)
--- a/chanserv/authcmds/email.c
+++ b/chanserv/authcmds/email.c
@@ -122,8 +122,11 @@ int csa_doemail(void *source, int cargc, char **cargv) {
   rup->email=getsstring(cargv[1],EMAILLEN);
   rup->lastemailchange=t;
   rup->domain=findorcreatemaildomain(rup->email->content);
-  if(!UHasHelperPriv(rup))
+  if(!UHasHelperPriv(rup)) {
     rup->lockuntil=t+7*24*3600;
+  } else {
+    rup->lockuntil=0;
+  }
   addregusertomaildomain(rup, rup->domain);
 
   if(local) {

diff --git a/chanserv/authcmds/newpass.c b/chanserv/authcmds/newpass.c
index e49f296a97daa317a9af4e039e3cde11d4bcfe1e..01dc569a392c7d57bd116eb5c37404027a215caa 100644 (file)
--- a/chanserv/authcmds/newpass.c
+++ b/chanserv/authcmds/newpass.c
@@ -79,6 +79,8 @@ int csa_donewpw(void *source, int cargc, char **cargv) {
       return CMD_ERROR;
     }
     rup->lockuntil=t+7*24*3600;
+  } else {
+    rup->lockuntil=0;
   }
 
   if(rup->lastemail) {

diff --git a/chanserv/batcher/templates.py b/chanserv/batcher/templates.py
index 4da074cc9a7b0c21391b347ffa6729cbef35d16b..f8a3196187b5f2f3b6ad6e4562d9104a43e8df1e 100644 (file)
--- a/chanserv/batcher/templates.py
+++ b/chanserv/batcher/templates.py
@@ -20,6 +20,7 @@ def generate_url(config, obj):
 def generate_resetcode(config, obj):
   if obj["user.lockuntil"] == 0:
     obj["resetline"] = "LOCK UNTIL NOT SET. STAFF ACCOUNT'S CAN'T USE RESET"
+    obj["lockuntil"] = "never"
     return
 
   if not config.has_key("__codegensecret"):