X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_cban.cpp;h=1ecb7f9d40c4feb4a73f568839304258027c34ae;hb=551d687ec6d7ce44be35fae0dd7345fe73c4f63a;hp=93a3d5b5a52aace04b7c379b9a7ebb395a04be4b;hpb=fcacc8e0306382bc3f938073092c3729d77e2b41;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_cban.cpp b/src/modules/m_cban.cpp
index 93a3d5b5a..1ecb7f9d4 100644
--- a/src/modules/m_cban.cpp
+++ b/src/modules/m_cban.cpp
@@ -38,10 +38,6 @@ public:
 		this->matchtext = ch.c_str();
 	}
 
-	~CBan()
-	{
-	}
-
 	// XXX I shouldn't have to define this
 	bool Matches(User *u)
 	{
@@ -55,12 +51,6 @@ public:
 		return false;
 	}
 
-	void DisplayExpiry()
-	{
-		ServerInstance->SNO->WriteToSnoMask('x',"Removing expired CBan %s (set by %s %ld seconds ago)",
-			this->matchtext.c_str(), this->source.c_str(), (long int)(ServerInstance->Time() - this->set_time));
-	}
-
 	const char* Displayable()
 	{
 		return matchtext.c_str();
@@ -74,7 +64,7 @@ class CBanFactory : public XLineFactory
  public:
 	CBanFactory() : XLineFactory("CBAN") { }
 
-	/** Generate a shun
+	/** Generate a CBAN
  	*/
 	XLine* Generate(time_t set_time, long duration, std::string source, std::string reason, std::string xline_specific_mask)
 	{
@@ -112,55 +102,44 @@ class CommandCBan : public Command
 			else
 			{
 				user->WriteServ("NOTICE %s :*** CBan %s not found in list, try /stats C.",user->nick.c_str(),parameters[0].c_str());
+				return CMD_FAILURE;
 			}
-
-			return CMD_SUCCESS;
 		}
-		else if (parameters.size() >= 2)
+		else
 		{
 			// Adding - XXX todo make this respect <insane> tag perhaps..
-			long duration = ServerInstance->Duration(parameters[1]);
-			CBan *r = NULL;
+			unsigned long duration = InspIRCd::Duration(parameters[1]);
 			const char *reason = (parameters.size() > 2) ? parameters[2].c_str() : "No reason supplied";
+			CBan* r = new CBan(ServerInstance->Time(), duration, user->nick.c_str(), reason, parameters[0].c_str());
 
-			try
-			{
-				r = new CBan(ServerInstance->Time(), duration, user->nick.c_str(), reason, parameters[0].c_str());
-			}
-			catch (...)
+			if (ServerInstance->XLines->AddLine(r, user))
 			{
-				; // Do nothing. If we get here, the regex was fucked up, and they already got told it fucked up.
-			}
-
-			if (r)
-			{
-				if (ServerInstance->XLines->AddLine(r, user))
+				if (!duration)
 				{
-					if (!duration)
-					{
-						ServerInstance->SNO->WriteGlobalSno('x', "%s added permanent CBan for %s: %s", user->nick.c_str(), parameters[0].c_str(), reason);
-					}
-					else
-					{
-						time_t c_requires_crap = duration + ServerInstance->Time();
-						ServerInstance->SNO->WriteGlobalSno('x', "%s added timed CBan for %s, expires on %s: %s", user->nick.c_str(), parameters[0].c_str(), ServerInstance->TimeString(c_requires_crap).c_str(), reason);
-					}
-
-					ServerInstance->XLines->ApplyLines();
+					ServerInstance->SNO->WriteGlobalSno('x', "%s added permanent CBan for %s: %s", user->nick.c_str(), parameters[0].c_str(), reason);
 				}
 				else
 				{
-					delete r;
-					user->WriteServ("NOTICE %s :*** CBan for %s already exists", user->nick.c_str(), parameters[0].c_str());
+					time_t c_requires_crap = duration + ServerInstance->Time();
+					std::string timestr = ServerInstance->TimeString(c_requires_crap);
+					ServerInstance->SNO->WriteGlobalSno('x', "%s added timed CBan for %s, expires on %s: %s", user->nick.c_str(), parameters[0].c_str(), timestr.c_str(), reason);
 				}
 			}
+			else
+			{
+				delete r;
+				user->WriteServ("NOTICE %s :*** CBan for %s already exists", user->nick.c_str(), parameters[0].c_str());
+				return CMD_FAILURE;
+			}
 		}
-
-		return CMD_FAILURE;
+		return CMD_SUCCESS;
 	}
 
 	RouteDescriptor GetRouting(User* user, const std::vector<std::string>& parameters)
 	{
+		if (IS_LOCAL(user))
+			return ROUTE_LOCALONLY; // spanningtree will send ADDLINE
+
 		return ROUTE_BROADCAST;
 	}
 };
@@ -172,12 +151,16 @@ class ModuleCBan : public Module
 
  public:
 	ModuleCBan() : mycommand(this)
+	{
+	}
+
+	void init()
 	{
 		ServerInstance->XLines->RegisterFactory(&f);
 
-		ServerInstance->AddCommand(&mycommand);
+		ServerInstance->Modules->AddService(mycommand);
 		Implementation eventlist[] = { I_OnUserPreJoin, I_OnStats };
-		ServerInstance->Modules->Attach(eventlist, this, 2);
+		ServerInstance->Modules->Attach(eventlist, this, sizeof(eventlist)/sizeof(Implementation));
 	}
 
 	virtual ~ModuleCBan()
@@ -195,17 +178,16 @@ class ModuleCBan : public Module
 		return MOD_RES_DENY;
 	}
 
-	virtual ModResult OnUserPreJoin(User *user, Channel *chan, const char *cname, std::string &privs, const std::string &keygiven)
+	ModResult OnUserPreJoin(User* user, Channel* chan, const std::string& cname, std::string& privs, const std::string& keygiven)
 	{
 		XLine *rl = ServerInstance->XLines->MatchesLine("CBAN", cname);
 
 		if (rl)
 		{
 			// Channel is banned.
-			user->WriteServ( "384 %s %s :Cannot join channel, CBANed (%s)", user->nick.c_str(), cname, rl->reason.c_str());
-			ServerInstance->SNO->WriteToSnoMask('a', "%s tried to join %s which is CBANed (%s)",
-				 user->nick.c_str(), cname, rl->reason.c_str());
-			ServerInstance->PI->SendSNONotice("A", user->nick + " tried to join " + std::string(cname) + " which is CBANed (" + rl->reason + ")");
+			user->WriteServ( "384 %s %s :Cannot join channel, CBANed (%s)", user->nick.c_str(), cname.c_str(), rl->reason.c_str());
+			ServerInstance->SNO->WriteGlobalSno('a', "%s tried to join %s which is CBANed (%s)",
+				 user->nick.c_str(), cname.c_str(), rl->reason.c_str());
 			return MOD_RES_DENY;
 		}
 
@@ -219,4 +201,3 @@ class ModuleCBan : public Module
 };
 
 MODULE_INIT(ModuleCBan)
-