[cvslog] [CVS] Module eggdrop1.6: Change committed

cvs at eggheads.org cvs at eggheads.org
Mon Nov 23 03:42:12 CST 2009


CVSROOT    : /usr/local/cvsroot
Module     : eggdrop1.6
Commit time: 2009-11-23 09:42:11 UTC
Committer  : Rumen Stoyanov <pseudo at egg6.net>

Modified files:
     eggdrop.conf doc/Changes1.6 doc/html/mod-channels.html
     doc/settings/mod.channels src/patch.h
     src/mod/channels.mod/channels.c
     src/mod/channels.mod/help/set/channels.help

Log message:

Introduced new config variable allow-ps to allow chanmode optionally enforce both +ps at the same time.
Fixes Bugzilla Bug # 414  "channel modes +s and +p on ts5 network"

Found by: Ofloo / Patch by: pseudo

---------------------- diff included ----------------------
Index: eggdrop1.6/doc/Changes1.6
diff -u eggdrop1.6/doc/Changes1.6:1.47 eggdrop1.6/doc/Changes1.6:1.48
--- eggdrop1.6/doc/Changes1.6:1.47	Sat Nov 21 17:12:29 2009
+++ eggdrop1.6/doc/Changes1.6	Mon Nov 23 03:42:01 2009
@@ -1,4 +1,4 @@
-$Id: Changes1.6,v 1.47 2009/11/21 23:12:29 pseudo Exp $
+$Id: Changes1.6,v 1.48 2009/11/23 09:42:01 pseudo Exp $
 
 Eggdrop Changes (since version 1.6.0)
 
@@ -6,6 +6,11 @@
 
 1.6.20 (CVS):
 
+  - Introduced new config variable allow-ps to allow chanmode optionally
+    enforce both +ps at the same time.
+    Fixes Bugzilla Bug # 414  "channel modes +s and +p on ts5 network" 
+    Found by: Ofloo / Patch by: pseudo
+
   - Modified reset_chan_info() to support independent reset of various
     information through flags. Updated tcl_resetchan() to make use of this.
   - Removed redundant TOPIC requests and optimized the channel join/reset code
Index: eggdrop1.6/doc/html/mod-channels.html
diff -u eggdrop1.6/doc/html/mod-channels.html:1.28 eggdrop1.6/doc/html/mod-channels.html:1.29
--- eggdrop1.6/doc/html/mod-channels.html:1.28	Sat May 16 05:25:28 2009
+++ eggdrop1.6/doc/html/mod-channels.html	Mon Nov 23 03:42:01 2009
@@ -1,5 +1,5 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
-<!-- $Id: mod-channels.html,v 1.28 2009/05/16 11:25:28 tothwolf Exp $ -->
+<!-- $Id: mod-channels.html,v 1.29 2009/11/23 09:42:01 pseudo Exp $ -->
 
 <html>
   <head>
@@ -65,6 +65,15 @@
           info line.</p>
         </dd>
 
+        <dt><strong>set allow-ps 0</strong></dt>
+
+        <dd>
+          <p>Set this setting to 1 if you want to allow both +p and +s channel
+          modes to be enforced at the same time by the chanmode channel setting.
+          Make sure your server supports +ps mixing or you may get endless mode
+          floods.</p>
+        </dd>
+
         <dt><strong>channel add #channel { SETTINGS }</strong></dt>
 
         <dd>
Index: eggdrop1.6/doc/settings/mod.channels
diff -u eggdrop1.6/doc/settings/mod.channels:1.23 eggdrop1.6/doc/settings/mod.channels:1.24
--- eggdrop1.6/doc/settings/mod.channels:1.23	Sat May 16 05:25:28 2009
+++ eggdrop1.6/doc/settings/mod.channels	Mon Nov 23 03:42:01 2009
@@ -1,4 +1,4 @@
-$Id: mod.channels,v 1.23 2009/05/16 11:25:28 tothwolf Exp $
+$Id: mod.channels,v 1.24 2009/11/23 09:42:01 pseudo Exp $
 
 Channels Module
 Last revised: February 12, 2003
@@ -37,6 +37,11 @@
     set use-info 1
       Set this setting to 1 if you want to allow users to store an info line.
 
+    set allow-ps 0
+      Set this setting to 1 if you want to allow both +p and +s channel modes
+      to be enforced at the same time by the chanmode channel setting.
+      Make sure your server supports +ps mixing or you may get endless mode
+      floods.
 
     channel add #channel { SETTINGS }
       Add each static channel you want your bot to sit in using this command.
Index: eggdrop1.6/eggdrop.conf
diff -u eggdrop1.6/eggdrop.conf:1.57 eggdrop1.6/eggdrop.conf:1.58
--- eggdrop1.6/eggdrop.conf:1.57	Sun Oct 25 09:19:05 2009
+++ eggdrop1.6/eggdrop.conf	Mon Nov 23 03:42:01 2009
@@ -1,7 +1,7 @@
 #! /path/to/executable/eggdrop
 # ^- This should contain a fully qualified path to your Eggdrop executable.
 #
-# $Id: eggdrop.conf,v 1.57 2009/10/25 15:19:05 pseudo Exp $
+# $Id: eggdrop.conf,v 1.58 2009/11/23 09:42:01 pseudo Exp $
 #
 # This is a sample Eggdrop configuration file which includes all possible
 # settings that can be used to configure your bot.
@@ -461,6 +461,12 @@
 # Set this setting to 1 if you want to allow users to store an info line.
 set use-info 1
 
+# Set this setting to 1 if you want to allow both +p and +s channel modes
+# to be enforced at the same time by the chanmode channel setting.
+# Make sure your server supports +ps mixing or you may get endless mode
+# floods.
+set allow-ps 0
+
 # The following settings are used as default values when you .+chan #chan or .tcl
 # channel add #chan. Look in the section below for explanation of every option.
 
Index: eggdrop1.6/src/mod/channels.mod/channels.c
diff -u eggdrop1.6/src/mod/channels.mod/channels.c:1.98 eggdrop1.6/src/mod/channels.mod/channels.c:1.99
--- eggdrop1.6/src/mod/channels.mod/channels.c:1.98	Thu May  7 16:01:41 2009
+++ eggdrop1.6/src/mod/channels.mod/channels.c	Mon Nov 23 03:42:01 2009
@@ -2,7 +2,7 @@
  * channels.c -- part of channels.mod
  *   support for channels within the bot
  *
- * $Id: channels.c,v 1.98 2009/05/07 22:01:41 tothwolf Exp $
+ * $Id: channels.c,v 1.99 2009/11/23 09:42:01 pseudo Exp $
  */
 /*
  * Copyright (C) 1997 Robey Pointer
@@ -39,7 +39,7 @@
 static int setstatic, use_info, chan_hack, quiet_save, global_revenge_mode,
            global_stopnethack_mode, global_idle_kick, global_aop_min,
            global_aop_max, global_ban_time, global_exempt_time,
-           global_invite_time, global_ban_type;
+           global_invite_time, global_ban_type, allow_ps;
 
 /* Global channel settings (drummer/dw) */
 static char glob_chanset[512];
@@ -168,7 +168,7 @@
     }
   }
   /* Prevents a +s-p +p-s flood  (fixed by drummer) */
-  if (chan->mode_pls_prot & CHANSEC)
+  if (chan->mode_pls_prot & CHANSEC && !allow_ps)
     chan->mode_pls_prot &= ~CHANPRIV;
 }
 
@@ -823,6 +823,7 @@
   {"share-greet",             NULL,                     0},
   {"use-info",                &use_info,                0},
   {"quiet-save",              &quiet_save,              0},
+  {"allow-ps",                &allow_ps,                0},
   {"global-stopnethack-mode", &global_stopnethack_mode, 0},
   {"global-revenge-mode",     &global_revenge_mode,     0},
   {"global-idle-kick",        &global_idle_kick,        0},
@@ -966,6 +967,7 @@
   global_idle_kick = 0;
   global_aop_min = 5;
   global_aop_max = 30;
+  allow_ps = 0;
   setstatic = 0;
   lastdeletedmask = 0;
   use_info = 1;
Index: eggdrop1.6/src/mod/channels.mod/help/set/channels.help
diff -u eggdrop1.6/src/mod/channels.mod/help/set/channels.help:1.7 eggdrop1.6/src/mod/channels.mod/help/set/channels.help:1.8
--- eggdrop1.6/src/mod/channels.mod/help/set/channels.help:1.7	Sun Nov 30 15:39:30 2003
+++ eggdrop1.6/src/mod/channels.mod/help/set/channels.help	Mon Nov 23 03:42:01 2009
@@ -9,3 +9,9 @@
 %{+n}
 ###  %bset use-info%b <0/1>
    Set this setting to 1 if you want to allow users to store an info line.
+%{help=set allow-ps}%{+n}
+###  %bset allow-ps%b <0/1>
+   Set this setting to 1 if you want to allow both +p and +s channel modes to
+   be enforced at the same time by the chanmode channel setting.
+   Make sure your server supports +ps mixing or you may get endless mode
+   floods.
Index: eggdrop1.6/src/patch.h
diff -u eggdrop1.6/src/patch.h:1.1221 eggdrop1.6/src/patch.h:1.1222
--- eggdrop1.6/src/patch.h:1.1221	Sat Nov 21 17:12:30 2009
+++ eggdrop1.6/src/patch.h	Mon Nov 23 03:42:01 2009
@@ -10,7 +10,7 @@
  * statement, leave the rest of the file alone, this allows better
  * overlapping patches.
  *
- * $Id: patch.h,v 1.1221 2009/11/21 23:12:30 pseudo Exp $
+ * $Id: patch.h,v 1.1222 2009/11/23 09:42:01 pseudo Exp $
  */
 /*
  * Copyright (C) 1997 Robey Pointer
@@ -41,12 +41,12 @@
  *
  *
  */
-patch("1258844438");            /* current unixtime */
+patch("1258969117");            /* current unixtime */
 /*
  *
  *
  */
-patch("pendingbinds");
+patch("chanmode-ps");
 /*
  *
  *
----------------------- End of diff -----------------------


More information about the Changes mailing list