OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /v/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 02-May-2005 15:47:38
Branch: HEAD Handle: 2005050214473800
Modified files:
openpkg-src/ratbox ratbox.patch
Log:
refine NOVOICES to REFUSEVOICES/SHUTUPVOICES
Summary:
Revision Changes Path
1.10 +130 -0 openpkg-src/ratbox/ratbox.patch
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/ratbox/ratbox.patch
============================================================================
$ cvs diff -u -r1.9 -r1.10 ratbox.patch
--- openpkg-src/ratbox/ratbox.patch 25 Apr 2005 07:45:08 -0000 1.9
+++ openpkg-src/ratbox/ratbox.patch 2 May 2005 13:47:38 -0000 1.10
@@ -10,3 +10,133 @@
.so.sl:
$(LD) -b $< -o $@
+Index: ratbox-services/help/chanserv/set
+--- ratbox-services/help/chanserv/set.orig 2005-04-25 09:36:09 +0200
++++ ratbox-services/help/chanserv/set 2005-05-02 15:15:38 +0200
+@@ -4,7 +4,8 @@
+ automatically enabled by NOOPS/NOVOICES.
+ NOOPS [on|off]: Disallow any user being opped.
+ RESTRICTOPS [on|off]: Disallow any users without OP access being opped.
+- NOVOICES [on|off]: Disallow any user being voiced.
++ REFUSEVOICES [on|off]: Disallow any user being voiced.
++ SHUTUPVOICES [on|off]: Disallow any user stay voiced.
+ WARNOVERRIDE [on|off]: Warns chanops when INVITE/GETKEY are used.
+ Requires AUTOJOIN.
+ CREATEMODES [modes] : Channel modes used on channel creation. Set to "+"
+Index: ratbox-services/include/s_chanserv.h
+--- ratbox-services/include/s_chanserv.h.orig 2005-04-18 16:59:22
+0200
++++ ratbox-services/include/s_chanserv.h 2005-05-02 15:15:38 +0200
+@@ -11,12 +11,13 @@
+ #define CS_FLAGS_AUTOJOIN 0x0004
+ #define CS_FLAGS_WARNOVERRIDE 0x0008
+ #define CS_FLAGS_RESTRICTOPS 0x0010
+-#define CS_FLAGS_NOVOICES 0x0020
++#define CS_FLAGS_REFUSEVOICES 0x0020
++#define CS_FLAGS_SHUTUPVOICES 0x0040
+
+ /* those flags shown in CHANSERV::INFO */
+ #define CS_FLAGS_SHOW (CS_FLAGS_NOOPS|CS_FLAGS_AUTOJOIN|\
+ CS_FLAGS_WARNOVERRIDE|CS_FLAGS_RESTRICTOPS|\
+- CS_FLAGS_NOVOICES)
++ CS_FLAGS_REFUSEVOICES|CS_FLAGS_SHUTUPVOICES)
+
+ /* Flags not stored in the DB: 0xFFFF0000 */
+ #define CS_FLAGS_NEEDUPDATE 0x00010000
+Index: ratbox-services/src/s_chanserv.c
+--- ratbox-services/src/s_chanserv.c.orig 2005-05-02 12:43:09 +0200
++++ ratbox-services/src/s_chanserv.c 2005-05-02 15:15:38 +0200
+@@ -941,7 +941,7 @@
+ return 0;
+
+ /* only thing we're testing here.. */
+- if(!(chreg_p->flags & CS_FLAGS_NOVOICES))
++ if(!(chreg_p->flags & CS_FLAGS_SHUTUPVOICES))
+ return 0;
+
+ modebuild_start(chanserv_p, chptr);
+@@ -1127,7 +1127,7 @@
+ hit++;
+ }
+
+- if(is_voiced(member_p) && (chreg_p->flags & CS_FLAGS_NOVOICES))
++ if(is_voiced(member_p) && (chreg_p->flags &
CS_FLAGS_SHUTUPVOICES))
+ {
+ if(dlink_list_length(&chptr->users) == 1)
+ enable_autojoin(chreg_p);
+@@ -1155,7 +1155,7 @@
+ }
+ else if(mreg_p->flags & CS_MEMBER_AUTOVOICE &&
+ !is_voiced(member_p) &&
+- !(chreg_p->flags & CS_FLAGS_NOVOICES))
++ !(chreg_p->flags &
(CS_FLAGS_REFUSEVOICES|CS_FLAGS_SHUTUPVOICES)))
+ {
+ modebuild_add(DIR_ADD, "v",
+ member_p->client_p->name);
+@@ -1223,7 +1223,7 @@
+ }
+ else if(mreg_p->flags & CS_MEMBER_AUTOVOICE &&
+ !is_voiced(member_p) &&
+- !(chreg_p->flags & CS_FLAGS_NOVOICES))
++ !(chreg_p->flags &
(CS_FLAGS_REFUSEVOICES|CS_FLAGS_SHUTUPVOICES)))
+ {
+ sendto_server(":%s MODE %s +v %s",
+ chanserv_p->name, chptr->name,
+@@ -2103,9 +2103,14 @@
+
+ return 1;
+ }
+- else if(!strcasecmp(parv[1], "NOVOICES"))
++ else if(!strcasecmp(parv[1], "REFUSEVOICES"))
+ {
+- retval = s_chan_set_flag(client_p, chreg_p, parv[1], arg,
CS_FLAGS_NOVOICES);
++ s_chan_set_flag(client_p, chreg_p, parv[1], arg,
CS_FLAGS_REFUSEVOICES);
++ return 1;
++ }
++ else if(!strcasecmp(parv[1], "SHUTUPVOICES"))
++ {
++ retval = s_chan_set_flag(client_p, chreg_p, parv[1], arg,
CS_FLAGS_SHUTUPVOICES);
+
+ if(retval == 1)
+ {
+@@ -2398,15 +2403,23 @@
+ if((reg_p = verify_member_reg_name(client_p, &chptr, parv[0],
S_C_USER)) == NULL)
+ return 1;
+
+- /* noone is allowed to be voiced.. */
+- if(reg_p->channel_reg->flags & CS_FLAGS_NOVOICES)
++ /* noone is allowed to receive voice... */
++ if(reg_p->channel_reg->flags & (CS_FLAGS_REFUSEVOICES))
+ {
+ service_error(chanserv_p, client_p,
+- "Channel %s is set NOVOICES",
++ "Channel %s is set REFUSEVOICES",
+ reg_p->channel_reg->name);
+ return 1;
+ }
+
++ /* noone is allowed to keep voice... */
++ if(reg_p->channel_reg->flags & (CS_FLAGS_SHUTUPVOICES))
++ {
++ service_error(chanserv_p, client_p,
++ "Channel %s is set SHUTUPVOICES",
++ reg_p->channel_reg->name);
++ return 1;
++ }
+
+ if((msptr = find_chmember(chptr, client_p)) == NULL)
+ {
+@@ -2902,11 +2915,12 @@
+
+ if(chreg_p->flags & CS_FLAGS_SHOW)
+ service_send(chanserv_p, client_p, conn_p,
+- "[%s] Settings: %s%s%s%s%s",
++ "[%s] Settings: %s%s%s%s%s%s",
+ chreg_p->name,
+ (chreg_p->flags & CS_FLAGS_AUTOJOIN) ? "AUTOJOIN " : "",
+ (chreg_p->flags & CS_FLAGS_NOOPS) ? "NOOPS " : "",
+- (chreg_p->flags & CS_FLAGS_NOVOICES) ? "NOVOICES " : "",
++ (chreg_p->flags & CS_FLAGS_REFUSEVOICES) ?
"REFUSEVOICES " : "",
++ (chreg_p->flags & CS_FLAGS_SHUTUPVOICES) ?
"SHUTUPVOICES " : "",
+ (chreg_p->flags & CS_FLAGS_RESTRICTOPS) ? "RESTRICTOPS
" : "",
+ (chreg_p->flags & CS_FLAGS_WARNOVERRIDE) ?
"WARNOVERRIDE" : "");
+
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [email protected]
