X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_callerid.cpp;h=2df6d7af0cdb46c9a3c42b160bbe266ce69057aa;hb=a5d110282a864fd2e91b51ce360a977cd0643657;hp=74428f543a58005532786799de0ca79123fa3006;hpb=bc4177ad010d0db5248fd49db1498d67119d709a;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_callerid.cpp b/src/modules/m_callerid.cpp
index 74428f543..2df6d7af0 100644
--- a/src/modules/m_callerid.cpp
+++ b/src/modules/m_callerid.cpp
@@ -68,7 +68,12 @@ struct CallerIDExtInfo : public ExtensionItem
 
 	void unserialize(SerializeFormat format, Extensible* container, const std::string& value)
 	{
+		void* old = get_raw(container);
+		if (old)
+			this->free(old);
 		callerid_data* dat = new callerid_data;
+		set_raw(container, dat);
+
 		irc::commasepstream s(value);
 		std::string tok;
 		if (s.GetToken(tok))
@@ -89,10 +94,6 @@ struct CallerIDExtInfo : public ExtensionItem
 				}
 			}
 		}
-
-		void* old = set_raw(container, dat);
-		if (old)
-			this->free(old);
 	}
 
 	callerid_data* get(User* user, bool create)
@@ -146,7 +147,7 @@ public:
 		extInfo(Creator)
 	{
 		allow_empty_last_param = false;
-		syntax = "{[+|-]<nicks>}|*}";
+		syntax = "*|(+|-)<nick>[,(+|-)<nick> ...]";
 		TRANSLATE2(TR_CUSTOM, TR_END);
 	}
 
@@ -197,7 +198,7 @@ public:
 		/* Even if callerid mode is not set, we let them manage their ACCEPT list so that if they go +g they can
 		 * have a list already setup. */
 
-		std::string tok = parameters[0];
+		const std::string& tok = parameters[0];
 
 		if (tok == "*")
 		{
@@ -207,7 +208,12 @@ public:
 		}
 		else if (tok[0] == '-')
 		{
-			User* whotoremove = ServerInstance->FindNick(tok.substr(1));
+			User* whotoremove;
+			if (IS_LOCAL(user))
+				whotoremove = ServerInstance->FindNickOnly(tok.substr(1));
+			else
+				whotoremove = ServerInstance->FindNick(tok.substr(1));
+
 			if (whotoremove)
 				return (RemoveAccept(user, whotoremove) ? CMD_SUCCESS : CMD_FAILURE);
 			else
@@ -215,7 +221,13 @@ public:
 		}
 		else
 		{
-			User* whotoadd = ServerInstance->FindNick(tok[0] == '+' ? tok.substr(1) : tok);
+			const std::string target = (tok[0] == '+' ? tok.substr(1) : tok);
+			User* whotoadd;
+			if (IS_LOCAL(user))
+				whotoadd = ServerInstance->FindNickOnly(target);
+			else
+				whotoadd = ServerInstance->FindNick(target);
+
 			if ((whotoadd) && (whotoadd->registered == REG_ALL) && (!whotoadd->quitting) && (!IS_SERVER(whotoadd)))
 				return (AddAccept(user, whotoadd) ? CMD_SUCCESS : CMD_FAILURE);
 			else