X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_cban.cpp;h=263426f60bf665326a952bfca39ff8a27789340c;hb=992674362c5f64bdb8e1942eeaa7612524529cd6;hp=35daba328f7226994a1668ed0f6f975f65fee9a4;hpb=988d8218071b504521bd1da6c2275db877d857b9;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_cban.cpp b/src/modules/m_cban.cpp
index 35daba328..263426f60 100644
--- a/src/modules/m_cban.cpp
+++ b/src/modules/m_cban.cpp
@@ -23,18 +23,19 @@
 #include "inspircd.h"
 #include "xline.h"
 
-/* $ModDesc: Gives /cban, aka C:lines. Think Q:lines, for channels. */
-
 /** Holds a CBAN item
  */
 class CBan : public XLine
 {
-public:
+private:
+	std::string displaytext;
 	irc::string matchtext;
 
-	CBan(time_t s_time, long d, std::string src, std::string re, std::string ch)
+public:
+	CBan(time_t s_time, long d, const std::string& src, const std::string& re, const std::string& ch)
 		: XLine(s_time, d, src, re, "CBAN")
 	{
+		this->displaytext = ch;
 		this->matchtext = ch.c_str();
 	}
 
@@ -51,9 +52,9 @@ public:
 		return false;
 	}
 
-	const char* Displayable()
+	const std::string& Displayable()
 	{
-		return matchtext.c_str();
+		return displaytext;
 	}
 };
 
@@ -85,7 +86,6 @@ class CommandCBan : public Command
 	CommandCBan(Module* Creator) : Command(Creator, "CBAN", 1, 3)
 	{
 		flags_needed = 'o'; this->syntax = "<channel> [<duration> :<reason>]";
-		TRANSLATE4(TR_TEXT,TR_TEXT,TR_TEXT,TR_END);
 	}
 
 	CmdResult Handle(const std::vector<std::string> &parameters, User *user)
@@ -101,7 +101,7 @@ 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());
+				user->WriteNotice("*** CBan " + parameters[0] + " not found in list, try /stats C.");
 				return CMD_FAILURE;
 			}
 		}
@@ -128,7 +128,7 @@ class CommandCBan : public Command
 			else
 			{
 				delete r;
-				user->WriteServ("NOTICE %s :*** CBan for %s already exists", user->nick.c_str(), parameters[0].c_str());
+				user->WriteNotice("*** CBan for " + parameters[0] + " already exists");
 				return CMD_FAILURE;
 			}
 		}
@@ -154,22 +154,18 @@ class ModuleCBan : public Module
 	{
 	}
 
-	void init()
+	void init() CXX11_OVERRIDE
 	{
 		ServerInstance->XLines->RegisterFactory(&f);
-
-		ServerInstance->Modules->AddService(mycommand);
-		Implementation eventlist[] = { I_OnUserPreJoin, I_OnStats };
-		ServerInstance->Modules->Attach(eventlist, this, sizeof(eventlist)/sizeof(Implementation));
 	}
 
-	virtual ~ModuleCBan()
+	~ModuleCBan()
 	{
 		ServerInstance->XLines->DelAll("CBAN");
 		ServerInstance->XLines->UnregisterFactory(&f);
 	}
 
-	virtual ModResult OnStats(char symbol, User* user, string_list &out)
+	ModResult OnStats(char symbol, User* user, string_list &out) CXX11_OVERRIDE
 	{
 		if (symbol != 'C')
 			return MOD_RES_PASSTHRU;
@@ -178,7 +174,7 @@ class ModuleCBan : public Module
 		return MOD_RES_DENY;
 	}
 
-	ModResult OnUserPreJoin(LocalUser* user, Channel* chan, const std::string& cname, std::string& privs, const std::string& keygiven)
+	ModResult OnUserPreJoin(LocalUser* user, Channel* chan, const std::string& cname, std::string& privs, const std::string& keygiven) CXX11_OVERRIDE
 	{
 		XLine *rl = ServerInstance->XLines->MatchesLine("CBAN", cname);
 
@@ -194,7 +190,7 @@ class ModuleCBan : public Module
 		return MOD_RES_PASSTHRU;
 	}
 
-	virtual Version GetVersion()
+	Version GetVersion() CXX11_OVERRIDE
 	{
 		return Version("Gives /cban, aka C:lines. Think Q:lines, for channels.", VF_COMMON | VF_VENDOR);
 	}