X-Git-Url: http://git.pk910.de/?a=blobdiff_plain;f=ircd%2Fchannel.c;h=2a83b7c3f210e5a4a428ae288b661f6fcbfde750;hb=8e6d4e241c4250f28d37e38db2cbc9d6b86e6aa8;hp=28c6547d5dd81a9d58a77dd6b909d03674bfcd49;hpb=931fd0f059fedf7837cd2cd51e23d4ba460cd3d8;p=ircu2.10.12-pk.git

diff --git a/ircd/channel.c b/ircd/channel.c
index 28c6547..2a83b7c 100644
--- a/ircd/channel.c
+++ b/ircd/channel.c
@@ -2339,17 +2339,17 @@ struct ParseState {
   struct Membership *member;
   int parc;
   char **parv;
-  unsigned int flags;
-  unsigned int dir;
-  unsigned int done;
-  unsigned int add;
-  unsigned int del;
+  ulong64 flags;
+  ulong64 dir;
+  ulong64 done;
+  ulong64 add;
+  ulong64 del;
   int args_used;
   int max_args;
   int numbans;
   struct Ban banlist[MAXPARA];
   struct {
-    unsigned int flag;
+    ulong64 flag;
     unsigned short oplevel;
     struct Client *client;
   } cli_change[MAXPARA];
@@ -3133,16 +3133,12 @@ static void audit_chan_users(struct ParseState *state, ulong64 *flag_p) {
 				sendcmdto_channel_butserv_butone(member->user, CMD_PART, member->channel, member->user, SKIP_OPS, "%H :%s", member->channel, "mode +u set.");
 			}
 		}
-        state->add |= flag_p[0];
-        state->del &= ~flag_p[0];
 	} else {
 		for(member = state->chptr->members; member; member = member->next_member) {
 			if(!IsChanOp(member) && !HasVoice(member)) {
 				sendcmdto_channel_butserv_butone(member->user, CMD_JOIN, member->channel, member->user, SKIP_OPS, ":%H", member->channel);
 			}
 		}
-		state->del |= flag_p[0];
-        state->add &= ~flag_p[0];
 	}
 }
 
@@ -3500,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) {
@@ -3519,6 +3517,18 @@ mode_process_clients(struct ParseState *state)
     modebuf_mode_client(state->mbuf, state->cli_change[i].flag,
 			state->cli_change[i].client,
                         state->cli_change[i].oplevel);
+	
+	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,9 +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);
-    break;
       case 'a': /* deal with limits */
 	mode_parse_access(&state, flag_p);
 	break;
@@ -3907,7 +3917,10 @@ joinbuf_join(struct JoinBuf *jbuf, struct Channel *chan, unsigned int flags)
 
     /* Send notification to channel */
 	if((chan->mode.mode & MODE_AUDITORIUM) && !(flags & CHFL_VOICED_OR_OPPED)) {
-	  //do noting here
+	  //send part to ops only
+	  sendcmdto_channel_butserv_butone(jbuf->jb_source, CMD_PART, chan, NULL, SKIP_NONOPS, "%H :%s", chan, jbuf->jb_comment);
+	  if(MyUser(jbuf->jb_source))
+		  sendcmdto_one(jbuf->jb_source, CMD_PART, jbuf->jb_source, "%H :%s", chan, jbuf->jb_comment);
     } else if (!(flags & (CHFL_ZOMBIE | CHFL_DELAYED)))
       sendcmdto_channel_butserv_butone(jbuf->jb_source, CMD_PART, chan, NULL, 0,
 				(flags & CHFL_BANNED || !jbuf->jb_comment) ?
@@ -3947,7 +3960,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))