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

1.9+fixes

4 files changed, 12 insertions, 9 deletions

diff --git a/modules/commands/ns_access.cpp b/modules/commands/ns_access.cpp
index ddbcad0a2..15bddeb36 100644
--- a/modules/commands/ns_access.cpp
+++ b/modules/commands/ns_access.cpp
@@ -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;
diff --git a/modules/commands/ns_cert.cpp b/modules/commands/ns_cert.cpp
index 6b3aa2a14..ce7d53e51 100644
--- a/modules/commands/ns_cert.cpp
+++ b/modules/commands/ns_cert.cpp
@@ -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;
 		}
 
diff --git a/modules/commands/os_session.cpp b/modules/commands/os_session.cpp
index 80eee41f9..be003900d 100644
--- a/modules/commands/os_session.cpp
+++ b/modules/commands/os_session.cpp
@@ -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");
diff --git a/modules/pseudoclients/nickserv.cpp b/modules/pseudoclients/nickserv.cpp
index 652f91a88..4c512b427 100644
--- a/modules/pseudoclients/nickserv.cpp
+++ b/modules/pseudoclients/nickserv.cpp
@@ -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 */