From 862b101935a9573543090699cc7569910ec78feb Mon Sep 17 00:00:00 2001
From: "AYANOKOUZI, Ryuunosuke" <i38w7i3@yahoo.co.jp>
Date: Mon, 11 Feb 2013 14:23:58 +0900
Subject: add japanese translation

---
 src/language.c | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'src')

diff --git a/src/language.c b/src/language.c
index 41c894e4a..f80fd9742 100644
--- a/src/language.c
+++ b/src/language.c
@@ -43,6 +43,7 @@ static int langorder[NUM_LANGS] = {
     LANG_RU,                    /* Russian */
     LANG_HUN,                   /* Hungarian */
     LANG_PL,                    /* Polish */
+    LANG_JA_UTF8,               /* Japanese (UTF-8 encoding) */
 };
 
 /*************************************************************************/
@@ -191,6 +192,7 @@ void lang_init()
     load_lang(LANG_RU, "ru");
     load_lang(LANG_HUN, "hun");
     load_lang(LANG_PL, "pl");
+    load_lang(LANG_JA_UTF8, "ja_utf8");
 
     for (i = 0; i < NUM_LANGS; i++) {
         if (langtexts[langorder[i]] != NULL) {
-- 
cgit 


From f7bac0839b21707273d48bb656f66b0d3e25f34e Mon Sep 17 00:00:00 2001
From: Adam <Adam@anope.org>
Date: Wed, 13 Feb 2013 13:14:22 -0500
Subject: Do not allow invalid nicknames to be forbidden in ns_forbid

---
 src/core/ns_forbid.c | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

(limited to 'src')

diff --git a/src/core/ns_forbid.c b/src/core/ns_forbid.c
index 094c819c4..28bff3f55 100644
--- a/src/core/ns_forbid.c
+++ b/src/core/ns_forbid.c
@@ -73,6 +73,7 @@ static int do_forbid(User * u)
     NickAlias *na;
     char *nick = strtok(NULL, " ");
     char *reason = strtok(NULL, "");
+    char *ch;
 
     /* Assumes that permission checking has already been done. */
     if (!nick || (ForceForbidReason && !reason)) {
@@ -88,6 +89,21 @@ static int do_forbid(User * u)
         notice_lang(s_NickServ, u, NICK_X_FORBIDDEN, nick);
         return MOD_CONT;
     }
+
+    if (isdigit(nick[0]) || nick[0] == '-' || strlen(nick) > NICKMAX - 1)
+    {
+        notice_lang(s_NickServ, u, NICK_X_FORBIDDEN, nick);
+        return MOD_CONT;
+    }
+    for (ch = nick; *ch; ch++)
+    {
+        if (!isvalidnick(*ch))
+        {
+            notice_lang(s_NickServ, u, NICK_X_FORBIDDEN, nick);
+            return MOD_CONT;
+        }
+    }
+
     if ((na = findnick(nick)) != NULL) {
         if (NSSecureAdmins && nick_is_services_admin(na->nc)
             && !is_services_root(u)) {
-- 
cgit