X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_callerid.cpp;h=c7ec7a4dbe93528a65fc4039d6a647d7e96f5d32;hb=de69e28a4a1aea89e410b693bbbb67890ecb0bd3;hp=4f7017a1bbb9433981bca48bae764c462a7849e3;hpb=9336468f5bfa60318cb57db5126047147b7a21cb;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_callerid.cpp b/src/modules/m_callerid.cpp
index 4f7017a1b..c7ec7a4db 100644
--- a/src/modules/m_callerid.cpp
+++ b/src/modules/m_callerid.cpp
@@ -18,7 +18,7 @@
 
 /* $ModDesc: Implementation of callerid (umode +g & /accept, ala hybrid etc) */
 
-class callerid_data : public classbase
+class callerid_data
 {
  public:
 	time_t lastnotify;
@@ -78,7 +78,7 @@ struct CallerIDExtInfo : public ExtensionItem
 	{
 	}
 
-	std::string serialize(SerializeFormat format, const Extensible* container, void* item)
+	std::string serialize(SerializeFormat format, const Extensible* container, void* item) const
 	{
 		callerid_data* dat = static_cast<callerid_data*>(item);
 		return dat->ToString(format);
@@ -93,7 +93,7 @@ struct CallerIDExtInfo : public ExtensionItem
 	callerid_data* get(User* user, bool create)
 	{
 		callerid_data* dat = static_cast<callerid_data*>(get_raw(user));
-		if (!dat)
+		if (create && !dat)
 		{
 			dat = new callerid_data;
 			set_raw(user, dat);
@@ -128,7 +128,7 @@ struct CallerIDExtInfo : public ExtensionItem
 class User_g : public SimpleUserModeHandler
 {
 public:
-	User_g(Module* Creator) : SimpleUserModeHandler(Creator, 'g') { }
+	User_g(Module* Creator) : SimpleUserModeHandler(Creator, "callerid", 'g') { }
 };
 
 class CommandAccept : public Command
@@ -350,7 +350,7 @@ public:
 			throw ModuleException("Could not add usermode +g");
 
 		ServerInstance->AddCommand(&cmd);
-		Extensible::Register(&cmd.extInfo);
+		ServerInstance->Extensions.Register(&cmd.extInfo);
 
 		Implementation eventlist[] = { I_OnRehash, I_OnUserPreNick, I_OnUserQuit, I_On005Numeric, I_OnUserPreNotice, I_OnUserPreMessage };
 		ServerInstance->Modules->Attach(eventlist, this, 6);
@@ -362,7 +362,7 @@ public:
 
 	virtual Version GetVersion()
 	{
-		return Version("Implementation of callerid (umode +g & /accept, ala hybrid etc)", VF_COMMON | VF_VENDOR, API_VERSION);
+		return Version("Implementation of callerid (umode +g & /accept, ala hybrid etc)", VF_COMMON | VF_VENDOR);
 	}
 
 	virtual void On005Numeric(std::string& output)
@@ -389,7 +389,7 @@ public:
 			if (now > (dat->lastnotify + (time_t)notify_cooldown))
 			{
 				user->WriteNumeric(717, "%s %s :has been informed that you messaged them.", user->nick.c_str(), dest->nick.c_str());
-				ServerInstance->DumpText(dest, ":%s 718 %s %s %s@%s :is messaging you, and you have umode +g. Use /ACCEPT +%s to allow.",
+				dest->SendText(":%s 718 %s %s %s@%s :is messaging you, and you have umode +g. Use /ACCEPT +%s to allow.",
 					ServerInstance->Config->ServerName.c_str(), dest->nick.c_str(), user->nick.c_str(), user->ident.c_str(), user->dhost.c_str(), user->nick.c_str());
 				dat->lastnotify = now;
 			}