* +take stuff

svn: 1967

src/main.c

@@ -73,6 +73,7 @@ bool 	localhub = 1; 		/* we set this to 0 if we get a -B */
 bool	used_B = 0;		/* did we get started with -B? */
 int 	role;
 bool 	loading = 0;
+bool	have_take = 1;
 int	default_flags = 0;	/* Default user flags and */
 int	default_uflags = 0;	/* Default userdefinied flags for people
 				   who say 'hello' or for .adduser */

src/main.h

@@ -10,7 +10,7 @@ enum {
 
 extern int		role, default_flags, default_uflags,
 			updating;
-extern bool		use_stderr, backgrd, localhub, term_z, loading;
+extern bool		use_stderr, backgrd, localhub, term_z, loading, have_take;
 extern char		tempdir[], *binname, owner[], version[], ver[], quit_msg[];
 extern time_t		online_since, now;
 extern uid_t		myuid;

src/mod/channels.mod/channels.c

@@ -826,7 +826,7 @@ void channels_report(int idx, int details)
 	  i += my_strcpy(s + i, "nodesynch ");
         if (channel_closed(chan))
           i += my_strcpy(s + i, "closed ");
-        if (channel_take(chan))
+        if (have_take && channel_take(chan))
           i += my_strcpy(s + i, "take ");
         if (channel_voice(chan))
           i += my_strcpy(s + i, "voice ");

src/mod/channels.mod/cmdschan.c

@@ -1223,7 +1223,8 @@ static void cmd_chaninfo(int idx, char *par)
     SHOW_FLAG("protectops",	channel_protectops(chan));
     SHOW_FLAG("revenge",	channel_revenge(chan));
     SHOW_FLAG("revengebot",	channel_revengebot(chan));
-    SHOW_FLAG("take",		channel_take(chan));
+    if (have_take)
+      SHOW_FLAG("take",		channel_take(chan));
     SHOW_FLAG("voice",		channel_voice(chan));
     SHOW_FLAG("", 0);
     SHOW_FLAG("dynamicbans",	channel_dynamicbans(chan));

src/mod/channels.mod/tclchan.c

@@ -525,9 +525,9 @@ int channel_modify(char *result, struct chanset_t *chan, int items, char **item)
       chan->status |= CHAN_CLOSED;
     else if (!strcmp(item[i], "-closed"))
       chan->status &= ~CHAN_CLOSED;
-    else if (!strcmp(item[i], "+take"))
+    else if (have_take && !strcmp(item[i], "+take"))
       chan->status |= CHAN_TAKE;
-    else if (!strcmp(item[i], "-take"))
+    else if (have_take && !strcmp(item[i], "-take"))
       chan->status &= ~CHAN_TAKE;
     else if (!strcmp(item[i], "+voice"))
       chan->status |= CHAN_VOICE;

src/mod/channels.mod/userchan.c

@@ -715,8 +715,8 @@ flood-nick %d:%lu closed-ban %d closed-invite %d closed-private %d ban-time %lu
 exempt-time %lu invite-time %lu \
 %cenforcebans %cdynamicbans %cuserban %cbitch %cprotectops %crevenge \
 %crevengebot %cprivate %ccycle %cinactive %cdynamicexempts %cuserexempts \
-%cdynamicinvites %cuserinvites %cnodesynch %cclosed %ctake %cvoice \
-%cfastop %cautoop %cbotbitch }\n",
+%cdynamicinvites %cuserinvites %cnodesynch %cclosed %cvoice \
+%cfastop %cautoop %cbotbitch %c%s}\n",
 	chan->dname,
 	w,
         chan->added_by,
@@ -765,11 +765,12 @@ exempt-time %lu invite-time %lu \
 	PLSMNS(!channel_nouserinvites(chan)),
 	PLSMNS(channel_nodesynch(chan)),
 	PLSMNS(channel_closed(chan)),
-	PLSMNS(channel_take(chan)),
 	PLSMNS(channel_voice(chan)),
 	PLSMNS(channel_fastop(chan)),
         PLSMNS(channel_autoop(chan)),
-        PLSMNS(channel_botbitch(chan))
+        PLSMNS(channel_botbitch(chan)),
+	have_take ? PLSMNS(channel_take(chan)) : 0,
+        have_take ? "take " : " "
 /* Chanflag template
  * also include a %ctemp above.
  *      PLSMNS(channel_temp(chan)),