CHANSERV: alter default modes for relay addchan.

--HG--
branch : chanserv-live

diff --git a/chanserv/chancmds/addchan.c b/chanserv/chancmds/addchan.c
index b01a80127eadb4fd6e25819f3155b2f4557efa98..7c9c1e1fa04d34f0a4ea63604894c03400fd6690 100644 (file)
--- a/chanserv/chancmds/addchan.c
+++ b/chanserv/chancmds/addchan.c
@@ -107,7 +107,7 @@ int csc_doaddchan(void *source, int cargc, char **cargv) {
     return CMD_ERROR;
   }
 
-  rcp=cs_addchan(cip, sender, rup, founder, flags, type);
+  rcp=cs_addchan(cip, sender, rup, founder, flags, CHANMODE_DEFAULT, 0, type);
   if(rcp == NULL) {
     chanservstdmessage(sender, QM_ALREADYREGISTERED, cip->name->content);
     if (notify)

diff --git a/chanserv/chanserv.h b/chanserv/chanserv.h
index 81d96a856ce66c243e2b741aac59b2b083170d35..c8ddfc1ca13e05d50dd88ff5c6f4d9737dd40a6d 100644 (file)
--- a/chanserv/chanserv.h
+++ b/chanserv/chanserv.h
@@ -879,7 +879,7 @@ flag_t cs_sanitisechanlev(flag_t flags);
 int cs_unbanfn(nick *sender, chanindex *cip, int (*fn)(void *arg, struct chanban *ban), void *arg, int removepermbans, int abortonfailure);
 void cs_logchanop(regchan *rcp, char *nick, reguser *rup);
 int checkreason(nick *np, char *reason);
-regchan *cs_addchan(chanindex *cip, nick *sender, reguser *addedby, reguser *founder, flag_t flags, short type);
+regchan *cs_addchan(chanindex *cip, nick *sender, reguser *addedby, reguser *founder, flag_t flags, flag_t forcemodes, flag_t denymodes, short type);
 
 /* chanservstdcmds.c */
 int cs_doshowcommands(void *source, int cargc, char **cargv);

diff --git a/chanserv/chanserv_relay.c b/chanserv/chanserv_relay.c
index fd2c522010412d0e1da05de61c28ed4cc511037c..e3c5bc792b3271d2c58b513f218b7a315b84924a 100644 (file)
--- a/chanserv/chanserv_relay.c
+++ b/chanserv/chanserv_relay.c
@@ -477,7 +477,7 @@ int csa_doaddchan(void *source, int cargc, char **cargv) {
     return CMD_ERROR;
   }
 
-  rcp = cs_addchan(cip, sender, rup, founder, QCFLAG_JOINED | QCFLAG_AUTOOP | QCFLAG_BITCH | QCFLAG_FORCETOPIC | QCFLAG_PROTECT | QCFLAG_TOPICSAVE, type);
+  rcp = cs_addchan(cip, sender, rup, founder, QCFLAG_JOINED | QCFLAG_AUTOOP | QCFLAG_BITCH | QCFLAG_FORCETOPIC | QCFLAG_PROTECT | QCFLAG_TOPICSAVE, CHANMODE_NOCTCP | CHANMODE_DELJOINS | CHANMODE_MODNOAUTH | CHANMODE_NONOTICE | CHANMODE_NOEXTMSG | CHANMODE_SINGLETARG | CHANMODE_TOPICLIMIT | CHANMODE_NOQUITMSG, 0, type);
   if(!rcp) {
     controlreply(sender, "ADDCHAN FALSE alreadyregistered");
     return CMD_ERROR;

diff --git a/chanserv/chanservuser.c b/chanserv/chanservuser.c
index db70abd4ee388180be68820069c404652396e8ed..0007907f0d96cd8fe9fb042debbd42efd754ad86 100644 (file)
--- a/chanserv/chanservuser.c
+++ b/chanserv/chanservuser.c
@@ -1445,7 +1445,7 @@ int checkreason(nick *np, char *reason) {
   return 1;
 }
 
-regchan *cs_addchan(chanindex *cip, nick *sender, reguser *addedby, reguser *founder, flag_t flags, short type) {
+regchan *cs_addchan(chanindex *cip, nick *sender, reguser *addedby, reguser *founder, flag_t flags, flag_t forcemodes, flag_t denymodes, short type) {
   regchan *rcp;
   regchanuser *rcup;
   void *args[3];
@@ -1469,8 +1469,8 @@ regchan *cs_addchan(chanindex *cip, nick *sender, reguser *addedby, reguser *fou
   rcp->lastcountersync=0;
 
   rcp->limit=0;
-  rcp->forcemodes=CHANMODE_DEFAULT;
-  rcp->denymodes=0;
+  rcp->forcemodes=forcemodes;
+  rcp->denymodes=denymodes;
 
   if (CIsAutoLimit(rcp)) {
     rcp->forcemodes |= CHANMODE_LIMIT;