Update refrence.conf's explanation of invex/except with warnings about disabling...

[irc/rqf/shadowircd.git] / src / s_user.c

diff --git a/src/s_user.c b/src/s_user.c
index 8c9683e9cafb4380bf4493655f94932c3544b9ba..c64d50f1e39b22267f5e13806a8434914a426f23 100644 (file)
--- a/src/s_user.c
+++ b/src/s_user.c
@@ -73,7 +73,7 @@ int user_modes[256] = {
        UMODE_DEAF,             /* D */
        0,                      /* E */
        0,                      /* F */
-       0,                      /* G */
+       UMODE_SCALLERID,        /* G */
        0,                      /* H */
        0,                      /* I */
        0,                      /* J */
@@ -881,15 +881,6 @@ report_and_set_user_flags(struct Client *source_p, struct ConfItem *aconf)
        }
 }
 
-static void
-expire_umode_p(void *data)
-{
-       struct Client *source_p = data;
-       char *parv[4] = {source_p->name, source_p->name, "-p", NULL};
-       source_p->localClient->override_timeout_event = NULL;
-       user_mode(source_p, source_p, 3, parv);
-}
-
 static void
 show_other_user_mode(struct Client *source_p, struct Client *target_p)
 {
@@ -1172,17 +1163,6 @@ user_mode(struct Client *client_p, struct Client *source_p, int parc, const char
                sendto_one_numeric(source_p, RPL_SNOMASK, form_str(RPL_SNOMASK),
                        construct_snobuf(source_p->snomask));
 
-       if(ConfigFileEntry.expire_override_time && MyClient(source_p) && (source_p->umodes & ~setflags) & UMODE_OVERRIDE)
-       {
-               source_p->localClient->override_timeout_event =
-                       rb_event_addonce("expire_override", expire_umode_p, source_p, ConfigFileEntry.expire_override_time);
-       }
-       else if(MyClient(source_p) && source_p->localClient->override_timeout_event && (setflags & ~source_p->umodes) & UMODE_OVERRIDE)
-       {
-               rb_event_delete(source_p->localClient->override_timeout_event);
-               source_p->localClient->override_timeout_event = NULL;
-       }
-
        return (0);
 }
 
@@ -1490,6 +1470,13 @@ change_nick_user_host(struct Client *target_p,   const char *nick, const char *use
                        chptr = mscptr->chptr;
                        mptr = mode;
 
+                       if(is_owner(mscptr))
+                       {
+                               *mptr++ = 'a';
+                               strcat(modeval, nick);
+                               strcat(modeval, " ");
+                       }
+
                        if(is_chanop(mscptr))
                        {
                                *mptr++ = 'o';
@@ -1497,6 +1484,13 @@ change_nick_user_host(struct Client *target_p,   const char *nick, const char *use
                                strcat(modeval, " ");
                        }
 
+                       if(is_halfop(mscptr))
+                       {
+                               *mptr++ = 'h';
+                               strcat(modeval, nick);
+                               strcat(modeval, " ");
+                       }
+
                        if(is_voiced(mscptr))
                        {
                                *mptr++ = 'v';