CHANSERV: tell user when they can't attempts to auth any more, and drop max attempts...

[irc/quakenet/newserv.git] / jupe / jupe_commands.c

diff --git a/jupe/jupe_commands.c b/jupe/jupe_commands.c
index a787d825271f44b97f29d3b175cae19a7949258f..ec653d2db2c6584904c501652b91e71fadb1af6d 100644 (file)
--- a/jupe/jupe_commands.c
+++ b/jupe/jupe_commands.c
@@ -10,8 +10,7 @@ int ju_addjupe(void *source, int cargc, char **cargv) {
   int result, duration;
 
   if (cargc < 3) {
-    controlreply(np, "Syntax: addjupe <servername> <duration> <reason>");
-    return CMD_OK;
+    return CMD_USAGE;
   }
 
   if (jupe_find(cargv[0]) != NULL) {
@@ -28,9 +27,10 @@ int ju_addjupe(void *source, int cargc, char **cargv) {
 
   result = jupe_add(cargv[0], cargv[2], duration, JUPE_ACTIVE);
 
-  if (result)
+  if (result) {
+    controlwall(NO_OPER, NL_MISC, "%s added JUPE for '%s' expiring in %s with reason %s", controlid(np), cargv[0], longtoduration(duration, 0), cargv[2]);
     controlreply(np, "Done.");
-  else
+  } else
     controlreply(np, "Jupe could not be created.");
 
   return CMD_OK;
@@ -41,9 +41,7 @@ int ju_activatejupe(void *source, int cargc, char **cargv) {
   jupe_t *jupe;
 
   if (cargc < 1) {
-    controlreply(np, "Syntax: activatejupe <servername>");
-
-    return CMD_OK;
+    return CMD_USAGE;
   }
 
   jupe = jupe_find(cargv[0]);
@@ -61,8 +59,8 @@ int ju_activatejupe(void *source, int cargc, char **cargv) {
 
   jupe_activate(jupe);
 
+  controlwall(NO_OPER, NL_MISC, "%s reactivated JUPE for '%s'", controlid(np), cargv[0]);
   controlreply(np, "Done.");
-
   return CMD_OK;
 }
 
@@ -71,28 +69,25 @@ int ju_deactivatejupe(void *source, int cargc, char **cargv) {
   jupe_t *jupe;
 
   if (cargc < 1) {
-    controlreply(np, "Syntax: deactivatejupe <servername>");
-    return CMD_OK;
+    return CMD_USAGE;
   }
 
   jupe = jupe_find(cargv[0]);
 
   if (jupe == NULL) {
     controlreply(np, "There is no such jupe.");
-
     return CMD_OK;
   }
 
   if ((jupe->ju_flags & JUPE_ACTIVE) == 0) {
     controlreply(np, "This jupe is already deactivated.");
-
     return CMD_OK;
   }
 
   jupe_deactivate(jupe);
 
+  controlwall(NO_OPER, NL_MISC, "%s deactivated JUPE for '%s'", controlid(np), cargv[0]);
   controlreply(np, "Done.");
-       
   return CMD_OK;
 }
 
@@ -113,15 +108,14 @@ int ju_jupelist(void *source, int cargc, char **cargv) {
   }
 
   controlreply(np, "--- End of JUPE list.");
-
   return CMD_OK;
 }
 
 void _init(void) {
-  registercontrolcmd("addjupe", 10, 3, ju_addjupe);
-  registercontrolcmd("activatejupe", 10, 1, ju_activatejupe);
-  registercontrolcmd("deactivatejupe", 10, 1, ju_deactivatejupe);
-  registercontrolcmd("jupelist", 10, 0, ju_jupelist);
+  registercontrolhelpcmd("addjupe", NO_OPER, 3, ju_addjupe, "Usage: addjupe <servername> <duration> <reason>");
+  registercontrolhelpcmd("activatejupe", NO_OPER, 1, ju_activatejupe, "Usage: activatejupe <servername>");
+  registercontrolhelpcmd("deactivatejupe", NO_OPER, 1, ju_deactivatejupe, "Usage: deactivatejupe <servername>");
+  registercontrolhelpcmd("jupelist", NO_OPER, 0, ju_jupelist, "Usage: jupelist");
 }
 
 void _fini(void) {