X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_restrictmsg.cpp;h=50d87b3535c324d3bbbd9b936a7dc807c6702037;hb=fea1a27cb96a114f698eedcf90401b78406108fb;hp=0bc03fab15b829836997d08967570b996cb999da;hpb=235a0a2035bda6dd214719107083266207f39883;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_restrictmsg.cpp b/src/modules/m_restrictmsg.cpp
index 0bc03fab1..50d87b353 100644
--- a/src/modules/m_restrictmsg.cpp
+++ b/src/modules/m_restrictmsg.cpp
@@ -48,7 +48,7 @@ class ModuleRestrictMsg : public Module
 		if (target_type == TYPE_USER)
 		{
 			userrec* u = (userrec*)dest;
-			if ((strchr(u->modes,'o')) || (strchr(user->modes,'o')))
+			if (*u->oper || *user->oper)
 			{
 				// message allowed if:
 				// (1) the sender is opered
@@ -57,7 +57,7 @@ class ModuleRestrictMsg : public Module
 				// anything else, blocked.
 				return 0;
 			}
-			WriteServ(user->fd,"531 %s %s :You are not permitted to send private messages to this user",user->nick,u->nick);
+			user->WriteServ("531 %s %s :You are not permitted to send private messages to this user",user->nick,u->nick);
 			return 1;
 		}
 		// however, we must allow channel messages...
@@ -66,7 +66,7 @@ class ModuleRestrictMsg : public Module
 
 	virtual int OnUserPreNotice(userrec* user,void* dest,int target_type, std::string &text, char status)
 	{
-		return this->OnUserPreMessage(user,dest,target_type,text);
+		return this->OnUserPreMessage(user,dest,target_type,text,status);
 	}
 
 	virtual ~ModuleRestrictMsg()