| d92b9c8d |
1 | use snomask SNO_GLINE when oper is the source of the GLINE message, else use SNO_AUTO |
| 2 | |
| 3 | diff -r 5302f8ba2ea2 ircd/gline.c |
| 4 | --- a/ircd/gline.c Thu Mar 25 11:41:07 2010 +0100 |
| 5 | +++ b/ircd/gline.c Thu Mar 25 11:53:55 2010 +0100 |
| 6 | @@ -231,7 +231,7 @@ |
| 7 | continue; |
| 8 | |
| 9 | /* let the ops know about it */ |
| 10 | - sendto_opmask_butone(0, SNO_GLINE, "BADCHAN active for %H", chptr); |
| 11 | + sendto_opmask_butone(0, IsUser(sptr) ? SNO_GLINE : SNO_AUTO, "BADCHAN active for %H", chptr); |
| 12 | |
| 13 | for (member=chptr->members;member;member=nmember) { |
| 14 | nmember=member->next_member; |
| 15 | @@ -286,7 +286,7 @@ |
| 16 | gline->gl_reason); |
| 17 | |
| 18 | /* let the ops know about it */ |
| 19 | - sendto_opmask_butone(0, SNO_GLINE, "G-line active for %s", |
| 20 | + sendto_opmask_butone(0, IsUser(sptr) ? SNO_GLINE : SNO_AUTO, "G-line active for %s", |
| 21 | get_client_name(acptr, SHOW_IP)); |
| 22 | |
| 23 | /* and get rid of him */ |
| 24 | @@ -567,7 +567,7 @@ |
| 25 | /* lifetime is already an absolute timestamp */ |
| 26 | |
| 27 | /* Inform ops... */ |
| 28 | - sendto_opmask_butone(0, ircd_strncmp(reason, "AUTO", 4) ? SNO_GLINE : |
| 29 | + sendto_opmask_butone(0, IsUser(sptr) ? SNO_GLINE : |
| 30 | SNO_AUTO, "%s adding %s%s %s for %s%s%s%s%s, expiring at " |
| 31 | "%Tu: %s", |
| 32 | (feature_bool(FEAT_HIS_SNOTICES) || IsServer(sptr)) ? |
| 33 | @@ -643,7 +643,7 @@ |
| 34 | return 0; /* was active to begin with */ |
| 35 | |
| 36 | /* Inform ops and log it */ |
| 37 | - sendto_opmask_butone(0, SNO_GLINE, "%s activating global %s for %s%s%s%s%s, " |
| 38 | + sendto_opmask_butone(0, IsUser(sptr) ? SNO_GLINE : SNO_AUTO, "%s activating global %s for %s%s%s%s%s, " |
| 39 | "expiring at %Tu: %s", |
| 40 | (feature_bool(FEAT_HIS_SNOTICES) || IsServer(sptr)) ? |
| 41 | get_client_name_and_opername(sptr) : |
| 42 | @@ -716,7 +716,7 @@ |
| 43 | } |
| 44 | |
| 45 | /* Inform ops and log it */ |
| 46 | - sendto_opmask_butone(0, SNO_GLINE, "%s %s %s for %s%s%s%s%s, expiring at %Tu: " |
| 47 | + sendto_opmask_butone(0, IsUser(sptr) ? SNO_GLINE : SNO_AUTO, "%s %s %s for %s%s%s%s%s, expiring at %Tu: " |
| 48 | "%s", |
| 49 | (feature_bool(FEAT_HIS_SNOTICES) || IsServer(sptr)) ? |
| 50 | get_client_name_and_opername(sptr) : |
| 51 | @@ -921,7 +921,7 @@ |
| 52 | } |
| 53 | |
| 54 | /* All right, inform ops... */ |
| 55 | - sendto_opmask_butone(0, SNO_GLINE, "%s modifying global %s for %s%s%s%s%s:%s", |
| 56 | + sendto_opmask_butone(0, IsUser(sptr) ? SNO_GLINE : SNO_AUTO, "%s modifying global %s for %s%s%s%s%s:%s", |
| 57 | (feature_bool(FEAT_HIS_SNOTICES) || IsServer(sptr)) ? |
| 58 | get_client_name_and_opername(sptr) : cli_name((cli_user(sptr))->server), |
| 59 | GlineIsBadChan(gline) ? "BADCHAN" : "GLINE", |
| 60 | @@ -968,7 +968,7 @@ |
| 61 | assert(GlineIsLocal(gline)); |
| 62 | |
| 63 | /* Inform ops and log it */ |
| 64 | - sendto_opmask_butone(0, SNO_GLINE, "%s removing local %s for %s%s%s%s%s", |
| 65 | + sendto_opmask_butone(0, IsUser(sptr) ? SNO_GLINE : SNO_AUTO, "%s removing local %s for %s%s%s%s%s", |
| 66 | (feature_bool(FEAT_HIS_SNOTICES) || IsServer(sptr)) ? |
| 67 | get_client_name_and_opername(sptr) : cli_name((cli_user(sptr))->server), |
| 68 | GlineIsBadChan(gline) ? "BADCHAN" : "GLINE", |
projects / irc / quakenet / snircd-patchqueue.git / blame