fixed last commit

[ircu2.10.12-pk.git] / ircd / channel.c

diff --git a/ircd/channel.c b/ircd/channel.c
index c839fa2285c650bcae9ce27e3b082997c96d2e5c..65d37b22afb8f0b1db2dd003035215827ab10a13 100644 (file)
--- a/ircd/channel.c
+++ b/ircd/channel.c
@@ -3496,7 +3496,9 @@ mode_process_clients(struct ParseState *state)
       else
         SetOpLevel(member, OpLevel(state->member) + 1);
     }
-
+       
+       int user_visible = (member->status & CHFL_VOICED_OR_OPPED);
+       
     /* actually effect the change */
     if (state->flags & MODE_PARSE_SET) {
       if (state->cli_change[i].flag & MODE_ADD) {
@@ -3516,8 +3518,16 @@ mode_process_clients(struct ParseState *state)
                        state->cli_change[i].client,
                         state->cli_change[i].oplevel);
        
-       if(MyUser(state->sptr) && (state->chptr->mode.mode & MODE_AUDITORIUM) && (state->cli_change[i].flag & MODE_CHANOP)) {
-               do_names(state->sptr, state->chptr, NAMES_ALL|NAMES_EON|((member->status & MODE_CHANOP) ? 0 : NAMES_OPS));
+       if((member->channel->mode.mode & MODE_AUDITORIUM)) {
+               //join or part the user
+               if((member->status & CHFL_VOICED_OR_OPPED) && !user_visible) {
+                       sendcmdto_channel_butserv_butone(member->user, CMD_JOIN, member->channel, member->user, SKIP_OPS, ":%H", member->channel);
+               } else if(!(member->status & CHFL_VOICED_OR_OPPED) && user_visible) {
+                       sendcmdto_channel_butserv_butone(member->user, CMD_PART, member->channel, member->user, SKIP_OPS, "%H :%s", member->channel, "user deoped/devoiced on a +u channel.");
+               }
+               if(MyUser(member->user) && (state->cli_change[i].flag & MODE_CHANOP)) {
+                       do_names(member->user, member->channel, NAMES_ALL|NAMES_EON|((member->status & MODE_CHANOP) ? 0 : NAMES_OPS));
+               }
        }
   } /* for (i = 0; state->cli_change[i].flags; i++) */
 }
@@ -3540,6 +3550,9 @@ mode_parse_mode(struct ParseState *state, ulong64 *flag_p)
   /* Local users are not permitted to change registration status */
   if (flag_p[0] == MODE_REGISTERED && !(state->flags & MODE_PARSE_FORCE) && MyUser(state->sptr))
     return;
+       
+  if(flag_p[0] == MODE_AUDITORIUM)
+    audit_chan_users(state, flag_p);
 
   if (state->dir == MODE_ADD) {
     state->add |= flag_p[0];
@@ -3674,10 +3687,6 @@ mode_parse(struct ModeBuf *mbuf, struct Client *cptr, struct Client *sptr,
       case 'l': /* deal with limits */
        mode_parse_limit(&state, flag_p);
        break;
-         case 'u': /* deal with not oped members */
-    audit_chan_users(&state, flag_p);
-       mode_parse_mode(&state, flag_p);
-    break;
       case 'a': /* deal with limits */
        mode_parse_access(&state, flag_p);
        break;
@@ -3948,7 +3957,7 @@ joinbuf_join(struct JoinBuf *jbuf, struct Channel *chan, unsigned int flags)
          }
        }
        
-       if((chan->mode.mode & MODE_DELJOINS) && !(flags & CHFL_VOICED_OR_OPPED)) {
+       if((chan->mode.mode & MODE_AUDITORIUM) && !(flags & CHFL_VOICED_OR_OPPED)) {
                //we have to send this JOIN event to ops only...                  
                sendcmdto_channel_butserv_butone(jbuf->jb_source, CMD_JOIN, chan, NULL, SKIP_NONOPS, "%H", chan);
                if(MyUser(jbuf->jb_source))