X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_topiclock.cpp;h=eba2b33f0760088ce6197b8f256d40b47fcdd402;hb=cee5a82d95fc3f5d3670ef483998bfc2d4a5a82e;hp=8d381d8488043343b3726d47d109851a278b4196;hpb=fd0fa86da89ab4cefa778307088ef2552a05a170;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_topiclock.cpp b/src/modules/m_topiclock.cpp
index 8d381d848..eba2b33f0 100644
--- a/src/modules/m_topiclock.cpp
+++ b/src/modules/m_topiclock.cpp
@@ -29,7 +29,7 @@ class CommandSVSTOPIC : public Command
 
 	CmdResult Handle(const std::vector<std::string> &parameters, User *user)
 	{
-		if (!ServerInstance->ULine(user->server))
+		if (!user->server->IsULine())
 		{
 			// Ulines only
 			return CMD_FAILURE;
@@ -45,7 +45,7 @@ class CommandSVSTOPIC : public Command
 			time_t topicts = ConvToInt(parameters[1]);
 			if (!topicts)
 			{
-				ServerInstance->Logs->Log("m_topiclock", LOG_DEFAULT, "Received SVSTOPIC with a 0 topicts, dropped.");
+				ServerInstance->Logs->Log(MODNAME, LOG_DEFAULT, "Received SVSTOPIC with a 0 topicts, dropped.");
 				return CMD_INVALID;
 			}
 
@@ -90,11 +90,7 @@ class FlagExtItem : public ExtensionItem
 {
  public:
 	FlagExtItem(const std::string& key, Module* owner)
-		: ExtensionItem(key, owner)
-	{
-	}
-
-	~FlagExtItem()
+		: ExtensionItem(key, ExtensionItem::EXT_CHANNEL, owner)
 	{
 	}
 
@@ -149,19 +145,12 @@ class ModuleTopicLock : public Module
 	{
 	}
 
-	void init() CXX11_OVERRIDE
-	{
-		ServerInstance->Modules->AddService(cmd);
-		ServerInstance->Modules->AddService(topiclock);
-		ServerInstance->Modules->Attach(I_OnPreTopicChange, this);
-	}
-
 	ModResult OnPreTopicChange(User* user, Channel* chan, const std::string &topic) CXX11_OVERRIDE
 	{
 		// Only fired for local users currently, but added a check anyway
 		if ((IS_LOCAL(user)) && (topiclock.get(chan)))
 		{
-			user->WriteNumeric(744, "%s :TOPIC cannot be changed due to topic lock being active on the channel", chan->name.c_str());
+			user->WriteNumeric(744, chan->name, "TOPIC cannot be changed due to topic lock being active on the channel");
 			return MOD_RES_DENY;
 		}