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

diff --git a/ircd/channel.c b/ircd/channel.c
index fa8412e..28c6547 100644
--- a/ircd/channel.c
+++ b/ircd/channel.c
@@ -870,6 +870,8 @@ void channel_modes(struct Client *cptr, char *mbuf, char *pbuf, int buflen,
     *mbuf++ = 'M';
   if (chptr->mode.mode & MODE_QUARANTINE)
     *mbuf++ = 'Q';
+  if (chptr->mode.mode & MODE_AUDITORIUM)
+    *mbuf++ = 'u';
   if (chptr->mode.limit) {
     *mbuf++ = 'l';
     ircd_snprintf(0, pbuf, buflen, "%u", chptr->mode.limit);
@@ -1603,6 +1605,7 @@ modebuf_flush_int(struct ModeBuf *mbuf, int all)
     MODE_NOAMSGS,   'M',
 	MODE_NONOTICE,  'N',
 	MODE_QUARANTINE,  'Q',
+	MODE_AUDITORIUM,  'u',
     0x0, 0x0
   };
   static ulong64 local_flags[] = {
@@ -2040,7 +2043,8 @@ modebuf_mode(struct ModeBuf *mbuf, ulong64 mode)
   mode &= (MODE_ADD | MODE_DEL | MODE_PRIVATE | MODE_SECRET | MODE_MODERATED |
 	   MODE_TOPICLIMIT | MODE_INVITEONLY | MODE_NOPRIVMSGS | MODE_REGONLY |
            MODE_DELJOINS | MODE_WASDELJOINS | MODE_REGISTERED | MODE_PERSIST |
-           MODE_NOCOLOUR | MODE_NOCTCP | MODE_NOAMSGS | MODE_NONOTICE | MODE_QUARANTINE);
+           MODE_NOCOLOUR | MODE_NOCTCP | MODE_NOAMSGS | MODE_NONOTICE | 
+		   MODE_QUARANTINE | MODE_AUDITORIUM);
 
   if (!(mode & ~(MODE_ADD | MODE_DEL))) /* don't add empty modes... */
     return;
@@ -2218,6 +2222,7 @@ modebuf_extract(struct ModeBuf *mbuf, char *buf)
 	MODE_QUARANTINE,  'Q',
 	MODE_ALTCHAN,    'F',
 	MODE_ACCESS,    'a',
+	MODE_AUDITORIUM, 'u',
     0x0, 0x0
   };
   ulong64 add;
@@ -3116,6 +3121,32 @@ static void reveal_hidden_chan_users(struct ParseState *state, ulong64 *flag_p)
     }
 }
 
+/* Handle MODE_AUDITORIUM changes 
+ * set Delayed for all hidden users on MODE_DEL
+ * part all nonoped users on MODE_ADD
+ */
+static void audit_chan_users(struct ParseState *state, ulong64 *flag_p) {
+	struct Membership *member;
+	if (state->dir == MODE_ADD) {
+		for(member = state->chptr->members; member; member = member->next_member) {
+			if(!IsChanOp(member) && !HasVoice(member)) {
+				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];
+	}
+}
+
+
 /*
  * Helper function to convert bans
  */
@@ -3577,6 +3608,7 @@ mode_parse(struct ModeBuf *mbuf, struct Client *cptr, struct Client *sptr,
 	MODE_QUARANTINE,      'Q',
 	MODE_ALTCHAN,        'F',
     MODE_ACCESS,        'a',
+	MODE_AUDITORIUM,    'u',
     MODE_ADD,		'+',
     MODE_DEL,		'-',
     0x0, 0x0
@@ -3642,6 +3674,9 @@ 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;
@@ -3871,7 +3906,9 @@ joinbuf_join(struct JoinBuf *jbuf, struct Channel *chan, unsigned int flags)
     SetUserParting(member);
 
     /* Send notification to channel */
-    if (!(flags & (CHFL_ZOMBIE | CHFL_DELAYED)))
+	if((chan->mode.mode & MODE_AUDITORIUM) && !(flags & CHFL_VOICED_OR_OPPED)) {
+	  //do noting here
+    } 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) ?
 				":%H" : "%H :%s", chan, jbuf->jb_comment);
@@ -3909,8 +3946,14 @@ joinbuf_join(struct JoinBuf *jbuf, struct Channel *chan, unsigned int flags)
 			    "%H %Tu %i", chan, chan->creationtime, 0);
 	  }
 	}
-
-    if (!((chan->mode.mode & MODE_DELJOINS) && !(flags & CHFL_VOICED_OR_OPPED)) && !((flags & CHFL_INVISIBLE) && !(flags & CHFL_VOICED_OR_OPPED))) {
+	
+	if((chan->mode.mode & MODE_DELJOINS) && !(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))
+		  sendcmdto_one(jbuf->jb_source, CMD_JOIN, jbuf->jb_source, ":%H", chan);
+	}
+    else if (!((chan->mode.mode & MODE_DELJOINS) && !(flags & CHFL_VOICED_OR_OPPED)) && !((flags & CHFL_INVISIBLE) && !(flags & CHFL_VOICED_OR_OPPED))) {
       /* Send the notification to the channel */
       sendcmdto_channel_butserv_butone(jbuf->jb_source, CMD_JOIN, chan, NULL, 0, "%H", chan);
 
@@ -4023,6 +4066,16 @@ void CheckDelayedJoins(struct Channel *chan)
   }
 }
 
+void CheckEnableDelayedJoins(struct Channel *chan) {
+  if (!(chan->mode.mode & MODE_WASDELJOINS) && find_delayed_joins(chan)) {
+	chan->mode.mode |= MODE_WASDELJOINS;
+	sendcmdto_channel_butserv_butone(&me, CMD_MODE, chan, NULL, 0,
+                                     "%H +d", chan);
+    sendcmdto_channel_servers_butone(&me, CMD_MODE, chan, NULL, 0,
+                                     "%H +d", chan);
+  }
+}
+
 /* checks whether a channel is nonpersistent with no users and deletes it
  * returns 1 if deleted, otherwise 0
  */