BUILD : 1.7.10 (817) BUGS : N/A NOTES : Synced inspircd.c with brains cvs server

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


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

4 files changed, 20 insertions, 12 deletions

diff --git a/src/core/os_ignore.c b/src/core/os_ignore.c
index 7b1ee8ff5..99dcba408 100644
--- a/src/core/os_ignore.c
+++ b/src/core/os_ignore.c
@@ -32,7 +32,8 @@ int AnopeInit(int argc, char **argv)
     Command *c;
 
     moduleAddAuthor("Anope");
-    moduleAddVersion("$Id$");
+    moduleAddVersion
+        ("$Id$");
     moduleSetType(CORE);
     c = createCommand("IGNORE", do_ignoreuser, is_services_admin,
                       OPER_HELP_IGNORE, -1, -1, -1, -1);
@@ -171,9 +172,9 @@ void delete_ignore(const char *nick)
         if (stricmp(ign->who, nick) == 0)
             break;
     }
-	/* If the ignore was not found, bail out -GD */
-	if (!ign)
-		return;
+    /* If the ignore was not found, bail out -GD */
+    if (!ign)
+        return;
     if (prev)
         prev->next = ign->next;
     else
diff --git a/src/protocol/inspircd.c b/src/protocol/inspircd.c
index 762c2260c..3a0a1d80e 100644
--- a/src/protocol/inspircd.c
+++ b/src/protocol/inspircd.c
@@ -636,10 +636,19 @@ void inspircd_cmd_privmsg2(char *source, char *dest, char *msg)
 
 void inspircd_cmd_serv_notice(char *source, char *dest, char *msg)
 {
+   if (!strcmp(dest,uplink))
+   {
+      alog("debug: serv_notice output to %s", dest);
+      send_cmd(CreateSum(), "V %s * :%s", source, msg);
+   }
 }
 
 void inspircd_cmd_serv_privmsg(char *source, char *dest, char *msg)
 {
+   if (!strcmp(dest,uplink))
+   {
+      send_cmd(CreateSum(), "P %s * :%s", source, msg);
+   }
 }
 
 
@@ -826,7 +835,7 @@ void inspircd_cmd_211(char *buf)
 /* GLOBOPS */
 void inspircd_cmd_global(char *source, char *buf)
 {
-    send_cmd(CreateSum(), "V %s * :%s", (source ? source : s_OperServ), buf);
+    send_cmd(CreateSum(), "V %s @* :%s", (source ? source : s_OperServ), buf);
 }
 
 /* SQLINE */
@@ -901,9 +910,7 @@ void inspircd_cmd_connect(int servernum)
 
 int anope_event_ping(char *source, int ac, char **av)
 {
-    if (ac < 1)
-        return MOD_CONT;
-    inspircd_cmd_pong(ac > 1 ? av[1] : ServerName, av[0]);
+    inspircd_cmd_pong("", "");
     return MOD_CONT;
 }
 
@@ -941,7 +948,7 @@ int anope_event_topic(char *source, int ac, char **av)
     v[1] = av[0];
     v[2] = "0";
     v[3] = av[2];
-    do_topic(av[0], 3, v);
+    do_topic(av[0], 4, v);
     return MOD_CONT;
 }
 
diff --git a/src/protocol/plexus.c b/src/protocol/plexus.c
index fc5d788f1..c4e9498e7 100644
--- a/src/protocol/plexus.c
+++ b/src/protocol/plexus.c
@@ -1,4 +1,5 @@
 /*PlexusIRCD IRCD functions
+/*PlexusIRCD IRCD functions
  * (C) 2003-2005 Anope Team
  * Contact us at info@anope.org
  *
@@ -1815,3 +1816,4 @@ AnopeInit (int argc, char **argv)
 }
 
  
+
diff --git a/src/protocol/ptlink.c b/src/protocol/ptlink.c
index 418aed429..e1822735a 100644
--- a/src/protocol/ptlink.c
+++ b/src/protocol/ptlink.c
@@ -1,4 +1,5 @@
 /* PTLink IRCD functions
+/* PTLink IRCD functions
  *
  * (C) 2003-2005 Anope Team
  * Contact us at info@anope.org
@@ -586,7 +587,6 @@ void moduleAddIRCDMsgs(void) {
 }
 
 /* *INDENT-ON* */
-int anope_event_svsinfo(char *source, int ac, char **av)
 {
     return MOD_CONT;
 }
@@ -1717,5 +1717,3 @@ int AnopeInit(int argc, char **argv)
 
     return MOD_CONT;
 }
-
-