Patch to rectify Syntax output from langfiles and update certain modules to use syntax_error rather than notice_lang. (Adam)

git-svn-id: http://anope.svn.sourceforge.net/svnroot/anope/stable@2287 5417fbe8-f217-4b02-8779-1006273d7864

4 files changed, 8 insertions, 8 deletions

diff --git a/src/core/hs_del.c b/src/core/hs_del.c
index f4db34509..f8670de44 100644
--- a/src/core/hs_del.c
+++ b/src/core/hs_del.c
@@ -85,7 +85,7 @@ int do_del(User * u)
             notice_lang(s_HostServ, u, HOST_NOREG, nick);
         }
     } else {
-        notice_lang(s_HostServ, u, HOST_DEL_SYNTAX, s_HostServ);
+    	syntax_error(s_HostServ, u, "DEL", HOST_DEL_SYNTAX);
     }
     return MOD_CONT;
 }
diff --git a/src/core/hs_delall.c b/src/core/hs_delall.c
index 78a4112eb..6c637db30 100644
--- a/src/core/hs_delall.c
+++ b/src/core/hs_delall.c
@@ -74,7 +74,7 @@ int do_delall(User * u)
     NickAlias *na;
     NickCore *nc;
     if (!nick) {
-        notice_lang(s_HostServ, u, HOST_DELALL_SYNTAX, s_HostServ);
+    	syntax_error(s_HostServ, u, "DELALL", HOST_DELALL_SYNTAX);
         return MOD_CONT;
     }
     if ((na = findnick(nick))) {
diff --git a/src/core/os_defcon.c b/src/core/os_defcon.c
index ee7899082..ef7ee9c95 100644
--- a/src/core/os_defcon.c
+++ b/src/core/os_defcon.c
@@ -96,7 +96,7 @@ int do_defcon(User * u)
     }
     newLevel = atoi(lvl);
     if (newLevel < 1 || newLevel > 5) {
-        notice_lang(s_OperServ, u, OPER_DEFCON_SYNTAX);
+	syntax_error(s_OperServ, u, "DEFCON", OPER_DEFCON_SYNTAX);
         return MOD_CONT;
     }
     DefConLevel = newLevel;
diff --git a/src/core/os_ignore.c b/src/core/os_ignore.c
index d19dd8473..83cd71c89 100644
--- a/src/core/os_ignore.c
+++ b/src/core/os_ignore.c
@@ -72,7 +72,7 @@ int do_ignoreuser(User * u)
     int t;
 
     if (!cmd) {
-        notice_lang(s_OperServ, u, OPER_IGNORE_SYNTAX);
+    	syntax_error(s_OperServ, u, "IGNORE", OPER_IGNORE_SYNTAX);
         return MOD_CONT;
     }
 
@@ -82,10 +82,10 @@ int do_ignoreuser(User * u)
         char *rest = strtok(NULL, "");
 
         if (!nick) {
-            notice_lang(s_OperServ, u, OPER_IGNORE_SYNTAX);
+	    syntax_error(s_OperServ, u, "IGNORE", OPER_IGNORE_SYNTAX);
             return MOD_CONT;
         } else if (!time) {
-            notice_lang(s_OperServ, u, OPER_IGNORE_SYNTAX);
+	    syntax_error(s_OperServ, u, "IGNORE", OPER_IGNORE_SYNTAX);
             return MOD_CONT;
         } else {
             t = dotime(time);
@@ -108,7 +108,7 @@ int do_ignoreuser(User * u)
     } else if (!stricmp(cmd, "DEL")) {
         char *nick = strtok(NULL, " ");
         if (!nick) {
-            notice_lang(s_OperServ, u, OPER_IGNORE_SYNTAX);
+	    syntax_error(s_OperServ, u, "IGNORE", OPER_IGNORE_SYNTAX);
         } else {
             if (delete_ignore(nick)) {
                 notice_lang(s_OperServ, u, OPER_IGNORE_DEL_DONE, nick);
@@ -121,7 +121,7 @@ int do_ignoreuser(User * u)
         notice_lang(s_OperServ, u, OPER_IGNORE_LIST_CLEARED);
         return MOD_CONT;
     } else
-        notice_lang(s_OperServ, u, OPER_IGNORE_SYNTAX);
+    	syntax_error(s_OperServ, u, "IGNORE", OPER_IGNORE_SYNTAX);
 
     return MOD_CONT;
 }