X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_callerid.cpp;h=45d3f0e5ccddca52eb2d78b0fc89bd7ddb68ab9e;hb=4a64082e31c3c3dfa97a1edfb8a3c97fe8d32ea7;hp=2e508399b8ba464e450cc619dcc31dbb608943b2;hpb=6d57bbe05c31c79eaad02fe81cfb9c1ed6b79c58;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_callerid.cpp b/src/modules/m_callerid.cpp
index 2e508399b..45d3f0e5c 100644
--- a/src/modules/m_callerid.cpp
+++ b/src/modules/m_callerid.cpp
@@ -32,7 +32,7 @@ class callerid_data : public classbase
 	std::list<callerid_data *> wholistsme;
 
 	callerid_data() : lastnotify(0) { }
-	callerid_data(const std::string& str, InspIRCd* ServerInstance)
+	callerid_data(const std::string& str)
 	{
 		irc::commasepstream s(str);
 		std::string tok;
@@ -56,14 +56,15 @@ class callerid_data : public classbase
 		}
 	}
 
-	std::string ToString(Module* proto) const
+	std::string ToString(SerializeFormat format) const
 	{
 		std::ostringstream oss;
 		oss << lastnotify;
 		for (std::set<User*>::const_iterator i = accepting.begin(); i != accepting.end(); ++i)
 		{
+			User* u = *i;
 			// Encode UIDs.
-			oss << "," << proto->ProtoTranslate(*i);
+			oss << "," << (format == FORMAT_USER ? u->nick : u->uuid);
 		}
 		oss << std::ends;
 		return oss.str();
@@ -77,15 +78,15 @@ struct CallerIDExtInfo : public ExtensionItem
 	{
 	}
 
-	std::string serialize(Module* requestor, const Extensible* container, void* item)
+	std::string serialize(SerializeFormat format, const Extensible* container, void* item)
 	{
 		callerid_data* dat = static_cast<callerid_data*>(item);
-		return dat->ToString(requestor);
+		return dat->ToString(format);
 	}
 
-	void unserialize(Module* requestor, Extensible* container, const std::string& value)
+	void unserialize(SerializeFormat format, Extensible* container, const std::string& value)
 	{
-		callerid_data* dat = new callerid_data(value, requestor->ServerInstance);
+		callerid_data* dat = new callerid_data(value);
 		set_raw(container, dat);
 	}
 
@@ -127,7 +128,7 @@ struct CallerIDExtInfo : public ExtensionItem
 class User_g : public SimpleUserModeHandler
 {
 public:
-	User_g(InspIRCd* Instance, Module* Creator) : SimpleUserModeHandler(Instance, Creator, 'g') { }
+	User_g(Module* Creator) : SimpleUserModeHandler(Creator, 'g') { }
 };
 
 class CommandAccept : public Command
@@ -135,7 +136,7 @@ class CommandAccept : public Command
 public:
 	CallerIDExtInfo extInfo;
 	unsigned int maxaccepts;
-	CommandAccept(InspIRCd* Instance, Module* Creator) : Command(Instance, Creator, "ACCEPT", 0, 1),
+	CommandAccept(Module* Creator) : Command(Creator, "ACCEPT", 1),
 		extInfo(Creator)
 	{
 		syntax = "{[+|-]<nicks>}|*}";
@@ -341,7 +342,7 @@ private:
 	}
 
 public:
-	ModuleCallerID(InspIRCd* Me) : Module(Me), cmd(Me, this), myumode(Me, this)
+	ModuleCallerID() : cmd(this), myumode(this)
 	{
 		OnRehash(NULL);
 
@@ -362,7 +363,7 @@ public:
 
 	virtual Version GetVersion()
 	{
-		return Version("$Id$", VF_COMMON | VF_VENDOR, API_VERSION);
+		return Version("Implementation of callerid (umode +g & /accept, ala hybrid etc)", VF_COMMON | VF_VENDOR, API_VERSION);
 	}
 
 	virtual void On005Numeric(std::string& output)
@@ -428,7 +429,7 @@ public:
 
 	virtual void OnRehash(User* user)
 	{
-		ConfigReader Conf(ServerInstance);
+		ConfigReader Conf;
 		cmd.maxaccepts = Conf.ReadInteger("callerid", "maxaccepts", "16", 0, true);
 		operoverride = Conf.ReadFlag("callerid", "operoverride", "0", 0);
 		tracknick = Conf.ReadFlag("callerid", "tracknick", "0", 0);