pegasus/anope
1
0
Fork 0
mirror of https://github.com/anope/anope.git synced 2026-06-29 10:56:38 +02:00
Code Activity

Merge pull request #24 from Robby-/1.9+fixes

Browse Source 
1.9+fixes
This commit is contained in:
Adam
2013-10-28 01:37:47 -07:00
parent fe31b0a666 4a1d32c5fd
commit f7692ec77f
10 changed files with 40 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files
data/botserv.example.conf
+1 -1
View File
@@ -261,7 +261,6 @@ module
*/
gentlebadwordreason = yes
}
command { service = "BotServ"; name = "KICK"; command = "botserv/kick"; }
command { service = "BotServ"; name = "KICK AMSG"; command = "botserv/kick/amsg"; }
command { service = "BotServ"; name = "KICK BADWORDS"; command = "botserv/kick/badwords"; }
@@ -277,6 +276,7 @@ command { service = "BotServ"; name = "KICK UNDERLINES"; command = "botserv/kick
command { service = "BotServ"; name = "SET DONTKICKOPS"; command = "botserv/set/dontkickops"; }
command { service = "BotServ"; name = "SET DONTKICKVOICES"; command = "botserv/set/dontkickvoices"; }
/*
* bs_set
*
data/chanserv.example.conf
+4 -4
View File
@@ -114,6 +114,7 @@ module
/*
* The maximum number of entries on a channel's access list.
* If not set, the default is 1024. This can be set to 0 for unlimited.
*/
accessmax = 1024
@@ -855,7 +856,6 @@ module
*/
autokickreason = "User has been banned from the channel"
}
command { service = "ChanServ"; name = "AKICK"; command = "chanserv/akick"; group = "chanserv/management"; }
/*
@@ -981,10 +981,11 @@ module
*/
listmax = 50
}
command { service = "ChanServ"; name = "LIST"; command = "chanserv/list"; permission = "chanserv/list"; group = "chanserv/admin"; }
command { service = "ChanServ"; name = "SET PRIVATE"; command = "chanserv/set/private"; }
/*
* cs_log
*
@@ -1044,7 +1045,6 @@ module
*/
mlock = "+nt"
}
command { service = "ChanServ"; name = "MODE"; command = "chanserv/mode"; group = "chanserv/management"; }
command { service = "ChanServ"; name = "OWNER"; command = "chanserv/modes"; group = "chanserv/status"; set = "OWNER" }
@@ -1062,6 +1062,7 @@ command { service = "ChanServ"; name = "DEHALFOP"; command = "chanserv/modes"; g
command { service = "ChanServ"; name = "VOICE"; command = "chanserv/modes"; group = "chanserv/status"; set = "VOICE" }
command { service = "ChanServ"; name = "DEVOICE"; command = "chanserv/modes"; group = "chanserv/status"; unset = "VOICE" }
/*
* cs_register
*
@@ -1133,7 +1134,6 @@ module
*/
defbantype = 2
}
command { service = "ChanServ"; name = "SET"; command = "chanserv/set"; group = "chanserv/management"; }
command { service = "ChanServ"; name = "SET AUTOOP"; command = "chanserv/set/autoop"; }
command { service = "ChanServ"; name = "SET BANTYPE"; command = "chanserv/set/bantype"; }
data/nickserv.example.conf
+14 -5
View File
@@ -249,6 +249,7 @@ module
/*
* The maximum number of entries allowed on a nickname's access list.
* If not set, the default is 32. This number cannot be set to 0.
*/
accessmax = 32
@@ -260,7 +261,6 @@ module
*/
addaccessonreg = yes
}
command { service = "NickServ"; name = "ACCESS"; command = "nickserv/access"; }
/*
@@ -298,7 +298,16 @@ command { service = "NickServ"; name = "ALIST"; command = "nickserv/alist"; }
*
* Used for configuring your SSL certificate list, which can be used to automatically identify you.
*/
module { name = "ns_cert"; accessmax = 5; }
module
{
name = "ns_cert"
/*
* The maximum number of entries allowed on a nickname's certificate fingerprint list.
* The default is 5. This number cannot be set to 0.
*/
accessmax = 5
}
command { service = "NickServ"; name = "CERT"; command = "nickserv/cert"; }
/*
@@ -389,6 +398,7 @@ command { service = "NickServ"; name = "INFO"; command = "nickserv/info"; }
command { service = "NickServ"; name = "SET HIDE"; command = "nickserv/set/hide"; }
command { service = "NickServ"; name = "SASET HIDE"; command = "nickserv/saset/hide"; permission = "nickserv/saset/hide"; }
/*
* ns_list
*
@@ -411,6 +421,7 @@ command { service = "NickServ"; name = "LIST"; command = "nickserv/list"; group
command { service = "NickServ"; name = "SET PRIVATE"; command = "nickserv/set/private"; }
command { service = "NickServ"; name = "SASET PRIVATE"; command = "nickserv/saset/private"; permission = "nickserv/saset/private"; }
/*
* ns_logout
*
@@ -484,7 +495,6 @@ module
*/
#unconfirmedexpire = 1d
}
command { service = "NickServ"; name = "CONFIRM"; command = "nickserv/confirm"; }
command { service = "NickServ"; name = "REGISTER"; command = "nickserv/register"; }
command { service = "NickServ"; name = "RESEND"; command = "nickserv/resend"; }
@@ -527,7 +537,6 @@ module
#allowkillimmed = yes
}
command { service = "NickServ"; name = "SET"; command = "nickserv/set"; }
command { service = "NickServ"; name = "SASET"; command = "nickserv/saset"; permission = "nickserv/saset/"; group = "nickserv/admin"; }
@@ -560,6 +569,7 @@ command { service = "NickServ"; name = "SASET SECURE"; command = "nickserv/saset
command { service = "NickServ"; name = "SASET NOEXPIRE"; command = "nickserv/saset/noexpire"; permission = "nickserv/saset/noexpire"; }
/*
* ns_set_misc
*
@@ -606,7 +616,6 @@ module
*/
#suspendexpire = 90d
}
command { service = "NickServ"; name = "SUSPEND"; command = "nickserv/suspend"; permission = "nickserv/suspend"; group = "nickserv/admin"; }
command { service = "NickServ"; name = "UNSUSPEND"; command = "nickserv/unsuspend"; permission = "nickserv/suspend"; group = "nickserv/admin"; }
data/operserv.example.conf
+5 -7
View File
@@ -488,11 +488,10 @@ module
/*
* The number of LOGON/OPER news items to display when a user logs on.
*
* This directive is optional, if no set it will default to 3.
* This directive is optional, if not set it will default to 3.
*/
#newscount = 3
}
command { service = "OperServ"; name = "LOGONNEWS"; command = "operserv/logonnews"; permission = "operserv/news"; }
command { service = "OperServ"; name = "OPERNEWS"; command = "operserv/opernews"; permission = "operserv/news"; }
command { service = "OperServ"; name = "RANDOMNEWS"; command = "operserv/randomnews"; permission = "operserv/news"; }
@@ -555,24 +554,24 @@ module
name = "os_session"
/*
* Default session limit per host. Once a host reaches it's session limit, all clients attempting
* Default session limit per host. Once a host reaches its session limit, all clients attempting
* to connect from that host will be killed.
*
* This directive is require if os_session is loaded.
* This directive is required if os_session is loaded.
*/
defaultsessionlimit = 3
/*
* The maximum session limit that may be set for a host in an exception.
*
* This directive is require if os_session is loaded.
* This directive is required if os_session is loaded.
*/
maxsessionlimit = 100
/*
* Sets the default expiry time for session exceptions.
*
* This directive is require if os_session is loaded.
* This directive is required if os_session is loaded.
*/
exceptionexpiry = 1d
@@ -643,7 +642,6 @@ module
*/
#superadmin = yes
}
command { service = "OperServ"; name = "SET"; command = "operserv/set"; permission = "operserv/set"; }
/*
include/modules.h
+3 -3
View File
@@ -185,9 +185,9 @@ class ModuleVersion
public:
/** Constructor
* @param major The major version numbber
* @param minor The minor version numbber
* @param patch The patch version numbber
* @param major The major version number
* @param minor The minor version number
* @param patch The patch version number
*/
ModuleVersion(int major, int minor, int patch);
language/anope.nl_NL.po
+1 -1
View File
@@ -7260,7 +7260,7 @@ msgstr "SET server.naam optie waarde"
#: modules/commands/ns_cert.cpp:336 modules/commands/ns_cert.cpp:346
msgid "SSL certificate fingerprint accepted, you are now identified."
msgstr "SSL certificaat vingerafdruk aanvaard, je bent nu geïdentificeerd."
msgstr "SSL certificaatvingerafdruk aanvaard, je bent nu geïdentificeerd."
#: modules/commands/cs_enforce.cpp:137
#, c-format
modules/commands/ns_access.cpp
+1 -1
View File
@@ -28,7 +28,7 @@ class CommandNSAccess : public Command
return;
}
if (nc->access.size() >= Config->GetModule(this->owner)->Get<unsigned>("accessmax"))
if (nc->access.size() >= Config->GetModule(this->owner)->Get<unsigned>("accessmax", "32"))
{
source.Reply(_("Sorry, the maximum of %d access entries has been reached."), Config->GetModule(this->owner)->Get<unsigned>("accessmax"));
return;
modules/commands/ns_cert.cpp
+5 -4
View File
@@ -138,7 +138,7 @@ class CommandNSCert : public Command
{
NSCertList *cl = nc->Require<NSCertList>("certificates");
if (cl->GetCertCount() >= Config->GetModule(this->owner)->Get<unsigned>("accessmax"))
if (cl->GetCertCount() >= Config->GetModule(this->owner)->Get<unsigned>("accessmax", "5"))
{
source.Reply(_("Sorry, the maximum of %d certificate entries has been reached."), Config->GetModule(this->owner)->Get<unsigned>("accessmax"));
return;
@@ -334,7 +334,7 @@ class NSCert : public Module
u->Identify(na);
u->SendMessage(NickServ, _("SSL certificate fingerprint accepted, you are now identified."));
Log(u) << "automatically identified for account " << na->nc->display << " via SSL certificate fingerprint";
Log(NickServ) << u->GetMask() << " automatically identified for account " << na->nc->display << " via SSL certificate fingerprint";
}
EventReturn OnNickValidate(User *u, NickAlias *na) anope_override
@@ -342,9 +342,10 @@ class NSCert : public Module
NSCertList *cl = certs.Get(na->nc);
if (!u->fingerprint.empty() && cl && cl->FindCert(u->fingerprint))
{
BotInfo *NickServ = Config->GetClient("NickServ");
u->Identify(na);
u->SendMessage(Config->GetClient("NickServ"), _("SSL certificate fingerprint accepted, you are now identified."));
Log(u) << "automatically identified for account " << na->nc->display << " via SSL certificate fingerprint";
u->SendMessage(NickServ, _("SSL certificate fingerprint accepted, you are now identified."));
Log(NickServ) << u->GetMask() << " automatically identified for account " << na->nc->display << " via SSL certificate fingerprint";
return EVENT_ALLOW;
}
modules/commands/os_session.cpp
+1 -1
View File
@@ -692,7 +692,7 @@ class OSSession : public Module
* decremented when the user is killed or quits - Adam
*/
++session->count;
if (kill && !exempt)
{
BotInfo *OperServ = Config->GetClient("OperServ");
modules/pseudoclients/nickserv.cpp
+5 -3
View File
@@ -151,6 +151,8 @@ class NickServCore : public Module, public NickServService
this->Collide(u, na);
return;
}
else if (MOD_RESULT == EVENT_ALLOW)
return;
if (!na->nc->HasExt("NS_SECURE") && u->IsRecognized())
{
@@ -181,13 +183,13 @@ class NickServCore : public Module, public NickServService
}
else if (na->nc->HasExt("KILL_QUICK"))
{
time_t killquick = Config->GetModule("nickserv")->Get<time_t>("killquick", "60s");
time_t killquick = Config->GetModule("nickserv")->Get<time_t>("killquick", "20s");
u->SendMessage(NickServ, _("If you do not change within %s, I will change your nick."), Anope::Duration(killquick, u->Account()).c_str());
new NickServCollide(this, u, na, killquick);
}
else
{
time_t kill = Config->GetModule("nickserv")->Get<time_t>("kill", "20s");
time_t kill = Config->GetModule("nickserv")->Get<time_t>("kill", "60s");
u->SendMessage(NickServ, _("If you do not change within %s, I will change your nick."), Anope::Duration(kill, u->Account()).c_str());
new NickServCollide(this, u, na, kill);
}
@@ -392,7 +394,7 @@ class NickServCore : public Module, public NickServService
void OnUserNickChange(User *u, const Anope::string &oldnick) anope_override
{
NickAlias *old_na = NickAlias::Find(oldnick), *na = NickAlias::Find(u->nick);
/* If the new nick isnt registerd or its registerd and not yours */
/* If the new nick isn't registered or it's registered and not yours */
if (!na || na->nc != u->Account())
{
/* Remove +r, but keep an account associated with the user */