Remove topic_reveal.patch. This has been fixed in IRCU and ircu patch is correct...

[irc/quakenet/snircd-patchqueue.git] / opernotify.patch

# HG changeset patch
# Parent 4851bf918b577c1e610417fe4ae4886ee78fd17b

diff -r 4851bf918b57 ircd/s_user.c
--- a/ircd/s_user.c	Thu Jul 25 18:47:45 2013 +0100
+++ b/ircd/s_user.c	Thu Jul 25 18:57:13 2013 +0100
@@ -1312,7 +1312,7 @@
           if (MyConnect(sptr))
           {
             tmpmask = cli_snomask(sptr) & ~SNO_OPER;
-            cli_handler(sptr) = CLIENT_HANDLER;
+            cli_handler(sptr) = CLIENT_HANDLER;            
           }
         }
         break;
@@ -1501,27 +1501,44 @@
       /* user now oper */
       ++UserStats.opers;
       client_set_privs(sptr, NULL); /* may set propagate privilege */
+
+      /* notify my operators a user has OPERed on a remote server */
+      if (!MyConnect(sptr)) {
+         sendto_opmask_butone(0, SNO_OLDSNO, "%s (%s@%s) is now operator (O) as %s on %s",
+         cli_name(sptr), cli_user(sptr)->realusername, cli_user(sptr)->realhost,
+         cli_user(sptr)->opername ? cli_user(sptr)->opername : "<unknown>", cli_name(cli_user(sptr)->server));
+      }
+			 
     }
     /* remember propagate privilege setting */
     if (HasPriv(sptr, PRIV_PROPAGATE)) {
       prop = 1;
     }
+
+    /* user was a local operator */
+    if (FlagHas(&setflags, FLAG_LOCOP) && !IsLocOp(sptr)) {
+
+      /* notify my operators a local operator has deOPERed */
+      sendto_opmask_butone(0, SNO_OLDSNO, "%s (%s@%s) is no longer operator (o) as %s",
+        cli_name(sptr), cli_user(sptr)->realusername, cli_sockhost(sptr),
+        cli_user(sptr)->opername);
+    }
     if (FlagHas(&setflags, FLAG_OPER) && !IsOper(sptr)) {
       /* user no longer oper */
       assert(UserStats.opers > 0);
       --UserStats.opers;
 
-      /* notify my operators an operator has deOPERed on the network - wiebe */
+      /* notify my operators an operator has deOPERed on the network */
       if (MyConnect(sptr)) {
-        sendto_opmask_butone(0, SNO_OLDSNO, "%s (%s@%s) is no longer operator (O) as %s",
-        cli_name(sptr), cli_user(sptr)->realusername, cli_user(sptr)->realhost,
-        cli_user(sptr)->opername ? cli_user(sptr)->opername : "<unknown>");
+        sendto_opmask_butone(0, SNO_OLDSNO, "%s (%s@%s) is no longer operator (O)",
+          cli_name(sptr), cli_user(sptr)->realusername, cli_sockhost(sptr),
+          cli_user(sptr)->opername ? cli_user(sptr)->opername : "<unknown>");
       } else {
-        sendto_opmask_butone(0, SNO_OLDSNO, "%s (%s@%s) is no longer operator (O) as %s on %s",
-        cli_name(sptr), cli_user(sptr)->realusername, cli_user(sptr)->realhost,
-        cli_user(sptr)->opername ? cli_user(sptr)->opername : "<unknown>", cli_name(cli_user(sptr)->server));
+        sendto_opmask_butone(0, SNO_OLDSNO, "%s (%s@%s) is no longer operator (O) on %s",
+          cli_name(sptr), cli_user(sptr)->realusername, cli_user(sptr)->realhost,
+          cli_user(sptr)->opername ? cli_user(sptr)->opername : "<unknown>", cli_name(cli_user(sptr)->server));
       }
-     
+
       client_set_privs(sptr, NULL); /* will clear propagate privilege */
       if (cli_user(sptr)->opername) {
         MyFree(cli_user(sptr)->opername);