Duplicate USER_VERBOSE and OPER_VERBOSE xflags into USER_VERBOSEV2 and OPER_VERBOSEV2

This will make it easier for us to enable them on upgraded servers without affecting non-upgraded servers.

diff --git a/src/channel.c b/src/channel.c
index e4bdf3c705062372e172c2d42d34d36605ce0d77..43708540af7a864be86d6e7b982c74769fdf58c8 100644 (file)
--- a/src/channel.c
+++ b/src/channel.c
@@ -3781,6 +3781,7 @@ void send_topic_burst(aClient *cptr)
                 sendto_one(cptr, ":%s SVSXCF %s JOIN_CONNECT_TIME:%d TALK_CONNECT_TIME:%d TALK_JOIN_TIME:%d", me.name, chptr->chname, chptr->join_connect_time, chptr->talk_connect_time, chptr->talk_join_time);
                 for(xflag = xflags_list; xflag->option; xflag++)
                 {
+                    if(!strcmp(xflag->option,"USER_VERBOSE") || !strcmp(xflag->option,"OPER_VERBOSE")) continue;
                     sendto_one(cptr, ":%s SVSXCF %s %s:%d", me.name, chptr->chname, xflag->option, (chptr->xflags & xflag->flag)?1:0);
                 }
                 if(chptr->greetmsg && (chptr->max_bans != MAXBANS))

diff --git a/src/m_services.c b/src/m_services.c
index 5d027c8f54c81abca175b1c144cd7f5e021b6b5a..66bbdc774554c8070c1d460a46e6c7148c5ada79 100644 (file)
--- a/src/m_services.c
+++ b/src/m_services.c
@@ -830,7 +830,9 @@ struct FlagList xflags_list[] =
   { "NO_UTF8",           XFLAG_NO_UTF8           },
   { "SJR",               XFLAG_SJR               },
   { "USER_VERBOSE",      XFLAG_USER_VERBOSE      },
+  { "USER_VERBOSEV2",    XFLAG_USER_VERBOSE      },
   { "OPER_VERBOSE",      XFLAG_OPER_VERBOSE      },
+  { "OPER_VERBOSEV2",    XFLAG_OPER_VERBOSE      },
   { NULL,                0                       }
 };
 

diff --git a/src/s_serv.c b/src/s_serv.c
index 832418f32f3cb80f920977db877ca980f8c5e23b..d0bea30f45fac4cd635efeb37c43b71a4ca783dd 100644 (file)
--- a/src/s_serv.c
+++ b/src/s_serv.c
@@ -3194,6 +3194,7 @@ m_check(aClient *cptr, aClient *sptr, int parc, char *parv[])
             sendto_one(sptr, "NOTICE %s :GREETMSG: %s", parv[0], chptr->greetmsg?chptr->greetmsg:"<NONE>");
             for(xflag = xflags_list; xflag->option; xflag++)
             {
+                if(!strcmp(xflag->option,"USER_VERBOSE") || !strcmp(xflag->option,"OPER_VERBOSE")) continue;
                 sendto_one(sptr, "NOTICE %s :%s: %s", parv[0], xflag->option, (chptr->xflags & xflag->flag)?"On":"Off");
             }
             sendto_one(sptr, "NOTICE %s :*** End of Check ***", parv[0]);