Synced with brains cvs server

git-svn-id: svn://svn.anope.org/anope/trunk@821 31f1291d-b8d6-0310-a050-a5561fc1590b


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

1 files changed, 36 insertions, 29 deletions

diff --git a/src/protocol/inspircd.c b/src/protocol/inspircd.c
index 2a11e57c0..7053ae8fd 100644
--- a/src/protocol/inspircd.c
+++ b/src/protocol/inspircd.c
@@ -19,37 +19,37 @@
 
 #ifdef _WIN32
 #include "winsock.h"
-int inet_aton(const char *name, struct in_addr *addr)
+int inet_aton (const char *name, struct in_addr *addr)
 {
-    uint32 a = inet_addr(name);
-    addr->s_addr = a;
-    return a != (uint32) - 1;
+     uint32 a = inet_addr (name);
+     addr->s_addr = a;
+     return a != (uint32)-1;
 }
 #endif
 
 IRCDVar myIrcd[] = {
     {"InspIRCd 1.0 Beta",       /* ircd name */
-     "+o",                      /* nickserv mode */
-     "+o",                      /* chanserv mode */
-     "+o",                      /* memoserv mode */
-     "+o",                      /* hostserv mode */
-     "+io",                     /* operserv mode */
-     "+o",                      /* botserv mode  */
-     "+o",                      /* helpserv mode */
-     "+i",                      /* Dev/Null mode */
-     "+io",                     /* Global mode   */
-     "+o",                      /* nickserv alias mode */
-     "+o",                      /* chanserv alias mode */
-     "+o",                      /* memoserv alias mode */
-     "+io",                     /* hostserv alias mode */
-     "+io",                     /* operserv alias mode */
-     "+o",                      /* botserv alias mode  */
-     "+o",                      /* helpserv alias mode */
-     "+i",                      /* Dev/Null alias mode */
-     "+io",                     /* Global alias mode   */
-     "+i",                      /* Used by BotServ Bots */
+     "+o",                     /* nickserv mode */
+     "+o",                     /* chanserv mode */
+     "+o",                     /* memoserv mode */
+     "+o",                     /* hostserv mode */
+     "+io",                    /* operserv mode */
+     "+o",                     /* botserv mode  */
+     "+o",                     /* helpserv mode */
+     "+i",                     /* Dev/Null mode */
+     "+io",                    /* Global mode   */
+     "+o",                     /* nickserv alias mode */
+     "+o",                     /* chanserv alias mode */
+     "+o",                     /* memoserv alias mode */
+     "+io",                    /* hostserv alias mode */
+     "+io",                    /* operserv alias mode */
+     "+o",                     /* botserv alias mode  */
+     "+o",                     /* helpserv alias mode */
+     "+i",                     /* Dev/Null alias mode */
+     "+io",                    /* Global alias mode   */
+     "+i",                     /* Used by BotServ Bots */
      5,                         /* Chan Max Symbols     */
-     "-cilmnpstuzCGKNOQRSV",    /* Modes to Remove */
+     "-cilmnpstuzCGKNOQRSV",  /* Modes to Remove */
      "+ao",                     /* Channel Umode used by Botserv bots */
      1,                         /* SVSNICK */
      1,                         /* Vhost  */
@@ -114,8 +114,7 @@ IRCDVar myIrcd[] = {
      0,                         /* p10 */
      NULL,                      /* character set */
      1,                         /* reports sync state */
-     }
-    ,
+     },
     {NULL}
 };
 
@@ -402,9 +401,7 @@ void inspircd_set_umode(User * user, int ac, char **av)
             if (add) {
                 opcnt++;
                 if (WallOper) {
-                    anope_cmd_global(s_OperServ,
-                                     "\2%s\2 is now an IRC operator.",
-                                     user->nick);
+                    anope_cmd_global(s_OperServ, "\2%s\2 is now an IRC operator.", user->nick);
                 }
                 display_news(user, NEWS_OPER);
             } else {
@@ -636,6 +633,11 @@ void inspircd_cmd_privmsg2(char *source, char *dest, char *msg)
 
 void inspircd_cmd_serv_notice(char *source, char *dest, char *msg)
 {
+   if (!uplink)
+   {
+      send_cmd(CreateSum(), "V %s * :%s", source, msg);
+   }
+   else
    if (!strcmp(dest,uplink))
    {
       alog("debug: serv_notice output to %s", dest);
@@ -645,6 +647,11 @@ void inspircd_cmd_serv_notice(char *source, char *dest, char *msg)
 
 void inspircd_cmd_serv_privmsg(char *source, char *dest, char *msg)
 {
+   if (!uplink)
+   {
+      send_cmd(CreateSum(), "P %s * :%s", source, msg);
+   }
+   else
    if (!strcmp(dest,uplink))
    {
       send_cmd(CreateSum(), "P %s * :%s", source, msg);