Merge commit 'cbx/anopeng-uid' into anopeng-uid

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

6 files changed, 16 insertions, 12 deletions

diff --git a/src/core/bs_bot.c b/src/core/bs_bot.c
index 035dbcfff..d56f93539 100644
--- a/src/core/bs_bot.c
+++ b/src/core/bs_bot.c
@@ -111,7 +111,7 @@ int do_bot(User * u)
             }
 
             /* check for hardcored ircd forbidden nicks */
-            if (!anope_IsNickValid(nick)) {
+            if (!ircdproto->IsNickValid(nick)) {
                 notice_lang(s_BotServ, u, BOT_BAD_NICK);
                 return MOD_CONT;
             }
@@ -229,7 +229,7 @@ int do_bot(User * u)
             }
 
             /* check for hardcored ircd forbidden nicks */
-            if (!anope_IsNickValid(nick)) {
+            if (!ircdproto->IsNickValid(nick)) {
                 notice_lang(s_BotServ, u, BOT_BAD_NICK);
                 return MOD_CONT;
             }
diff --git a/src/core/cs_forbid.c b/src/core/cs_forbid.c
index 3085c80bf..5bee0ade4 100644
--- a/src/core/cs_forbid.c
+++ b/src/core/cs_forbid.c
@@ -84,7 +84,7 @@ int do_forbid(User * u)
     if (*chan != '#') {
         notice_lang(s_ChanServ, u, CHAN_SYMBOL_REQUIRED);
         return MOD_CONT;
-    } else if (!anope_IsChannelValid(chan)) {
+    } else if (!ircdproto->IsChannelValid(chan)) {
         notice_lang(s_ChanServ, u, CHAN_X_INVALID, chan);
         return MOD_CONT;
     }
diff --git a/src/core/cs_register.c b/src/core/cs_register.c
index efd601c98..c553a63a4 100644
--- a/src/core/cs_register.c
+++ b/src/core/cs_register.c
@@ -95,7 +95,7 @@ int do_register(User * u)
         notice_lang(s_ChanServ, u, CHAN_REGISTER_NOT_LOCAL);
     } else if (*chan != '#') {
         notice_lang(s_ChanServ, u, CHAN_SYMBOL_REQUIRED);
-    } else if (!anope_IsChannelValid(chan)) {
+    } else if (!ircdproto->IsChannelValid(chan)) {
         notice_lang(s_ChanServ, u, CHAN_X_INVALID, chan);
     } else if (!u->na || !(nc = u->na->nc)) {
         notice_lang(s_ChanServ, u, CHAN_MUST_REGISTER_NICK, s_NickServ);
diff --git a/src/core/ns_forbid.c b/src/core/ns_forbid.c
index 336b44c53..e244c2dc5 100644
--- a/src/core/ns_forbid.c
+++ b/src/core/ns_forbid.c
@@ -85,7 +85,7 @@ int do_forbid(User * u)
 
     if (readonly)
         notice_lang(s_NickServ, u, READ_ONLY_MODE);
-    if (!anope_IsNickValid(nick)) {
+    if (!ircdproto->IsNickValid(nick)) {
         notice_lang(s_NickServ, u, NICK_X_FORBIDDEN, nick);
         return MOD_CONT;
     }
diff --git a/src/core/ns_register.c b/src/core/ns_register.c
index 8908a1917..1b84a67a7 100644
--- a/src/core/ns_register.c
+++ b/src/core/ns_register.c
@@ -6,8 +6,8 @@
  * Please read COPYING and README for further details.
  *
  * Based on the original code of Epona by Lara.
- * Based on the original code of Services by Andy Church. 
- * 
+ * Based on the original code of Services by Andy Church.
+ *
  * $Id$
  *
  */
@@ -133,7 +133,7 @@ int do_register(User * u)
         return MOD_CONT;
     }
 
-    if (!anope_IsNickValid(u->nick)) {
+    if (!ircdproto->IsNickValid(u->nick)) {
         notice_lang(s_NickServ, u, NICK_X_FORBIDDEN, u->nick);
         return MOD_CONT;
     }
@@ -357,15 +357,15 @@ int do_confirm(User * u)
                 notice_lang(s_NickServ, u, NICK_REGISTERED_NO_MASK,
                             u->nick);
             send_event(EVENT_NICK_REGISTERED, 1, u->nick);
-        
-            if(enc_decrypt(na->nc->pass, tmp_pass, PASSMAX - 1)==1) 
+
+            if(enc_decrypt(na->nc->pass, tmp_pass, PASSMAX - 1)==1)
                 notice_lang(s_NickServ, u, NICK_PASSWORD_IS, tmp_pass);
 
             u->lastnickreg = time(NULL);
             if (ircd->modeonreg) {
                 len = strlen(ircd->modeonreg);
                 strncpy(modes,ircd->modeonreg,512);
-            if(ircd->rootmodeonid && is_services_root(u)) { 
+            if(ircd->rootmodeonid && is_services_root(u)) {
                     strncat(modes,ircd->rootmodeonid,512-len);
             } else if(ircd->adminmodeonid && is_services_admin(u)) {
                     strncat(modes,ircd->adminmodeonid,512-len);
diff --git a/src/core/os_jupe.c b/src/core/os_jupe.c
index 5cab65795..ea5d0a98a 100644
--- a/src/core/os_jupe.c
+++ b/src/core/os_jupe.c
@@ -77,7 +77,11 @@ int do_jupe(User * u)
         if (!isValidHost(jserver, 3)) {
             notice_lang(s_OperServ, u, OPER_JUPE_HOST_ERROR);
         } else {
-            anope_SendJupe(jserver, u->nick, reason);
+			char rbuf[256];
+			snprintf(rbuf, sizeof(rbuf), "Juped by %s%s%s", u->nick, reason ? ": " : "", reason ? reason : "");
+			if (findserver(servlist, jserver)) ircdproto->SendSquit(jserver, rbuf);
+			ircdproto->SendServer(jserver, 2, rbuf);
+			new_server(me_server, jserver, rbuf, SERVER_JUPED, NULL);
 
             if (WallOSJupe)
                 ircdproto->SendGlobops(s_OperServ, "\2%s\2 used JUPE on \2%s\2",