diff options
| author | Naram Qashat cyberbotx@cyberbotx.com <Naram Qashat cyberbotx@cyberbotx.com@5417fbe8-f217-4b02-8779-1006273d7864> | 2008-10-15 02:57:50 +0000 |
|---|---|---|
| committer | Naram Qashat cyberbotx@cyberbotx.com <Naram Qashat cyberbotx@cyberbotx.com@5417fbe8-f217-4b02-8779-1006273d7864> | 2008-10-15 02:57:50 +0000 |
| commit | eef1d4d691e8b7c4c80763dcd1e0c97b11350be0 (patch) | |
| tree | c23b2417b1b7402563abf410f4cbdbedf49d1425 /src/core | |
| parent | 29a074878d72f789f9a7eacb6b17e2e97b33fdd0 (diff) | |
Merge branch 'anopeng-config' of http://git.inspircd.org/git/anope/ into anopeng-config
git-svn-id: http://anope.svn.sourceforge.net/svnroot/anope/trunk@1449 5417fbe8-f217-4b02-8779-1006273d7864
Diffstat (limited to 'src/core')
| -rw-r--r-- | src/core/cs_register.c | 6 | ||||
| -rw-r--r-- | src/core/cs_set.c | 3 | ||||
| -rw-r--r-- | src/core/ns_register.c | 3 |
3 files changed, 5 insertions, 7 deletions
diff --git a/src/core/cs_register.c b/src/core/cs_register.c index c553a63a4..713500e99 100644 --- a/src/core/cs_register.c +++ b/src/core/cs_register.c @@ -116,11 +116,9 @@ int do_register(User * u) } else if (!chan_has_user_status(c, u, CUS_OP)) { notice_lang(s_ChanServ, u, CHAN_MUST_BE_CHANOP); - } else if (!is_servadmin && nc->channelmax > 0 - && nc->channelcount >= nc->channelmax) { + } else if (!is_servadmin && CSMaxReg && nc->channelcount >= CSMaxReg) { notice_lang(s_ChanServ, u, nc->channelcount > - nc->channelmax ? CHAN_EXCEEDED_CHANNEL_LIMIT : - CHAN_REACHED_CHANNEL_LIMIT, nc->channelmax); + CSMaxReg ? CHAN_EXCEEDED_CHANNEL_LIMIT : CHAN_REACHED_CHANNEL_LIMIT, CSMaxReg); } else if (stricmp(u->nick, pass) == 0 || (StrictPasswords && strlen(pass) < 5)) { notice_lang(s_ChanServ, u, MORE_OBSCURE_PASSWORD); diff --git a/src/core/cs_set.c b/src/core/cs_set.c index 43bf5d3e4..646e4313b 100644 --- a/src/core/cs_set.c +++ b/src/core/cs_set.c @@ -296,8 +296,7 @@ int do_set_founder(User * u, ChannelInfo * ci, char *param) } nc = na->nc; - if (nc->channelmax > 0 && nc->channelcount >= nc->channelmax - && !is_services_admin(u)) { + if (CSMaxReg && nc->channelcount >= CSMaxReg && !is_services_admin(u)) { notice_lang(s_ChanServ, u, CHAN_SET_FOUNDER_TOO_MANY_CHANS, param); return MOD_CONT; } diff --git a/src/core/ns_register.c b/src/core/ns_register.c index 1b84a67a7..77e68acd5 100644 --- a/src/core/ns_register.c +++ b/src/core/ns_register.c @@ -320,8 +320,9 @@ int do_confirm(User * u) break; } } + na->nc->memos.memomax = MSMaxMemos; - na->nc->channelmax = CSMaxReg; + if (forced == 1) { na->last_usermask = sstrdup("*@*"); na->last_realname = sstrdup("unknown"); |