Fix not being able to message ulines when m_restrictmsg is loaded.

[user/henk/code/inspircd.git] / src / modules / m_restrictmsg.cpp

diff --git a/src/modules/m_restrictmsg.cpp b/src/modules/m_restrictmsg.cpp
index 5d64535554fb80d3e7d1102d646511b19b8b60a1..2a9f1dc9328646a228ac846c0be8d76d3e6cc9c3 100644 (file)
--- a/src/modules/m_restrictmsg.cpp
+++ b/src/modules/m_restrictmsg.cpp
@@ -1,99 +1,84 @@
-/*       +------------------------------------+
- *       | Inspire Internet Relay Chat Daemon |
- *       +------------------------------------+
+/*
+ * InspIRCd -- Internet Relay Chat Daemon
  *
- *  Inspire is copyright (C) 2002-2004 ChatSpike-Dev.
- *                       E-mail:
- *                <brain@chatspike.net>
- *               <Craig@chatspike.net>
- *     
- * Written by Craig Edwards, Craig McLure, and others.
- * This program is free but copyrighted software; see
- *            the file COPYING for details.
+ *   Copyright (C) 2007 Dennis Friis <peavey@inspircd.org>
+ *   Copyright (C) 2007 Robin Burchell <robin+git@viroteck.net>
+ *   Copyright (C) 2005 Craig Edwards <craigedwards@brainbox.cc>
  *
- * ---------------------------------------------------
+ * This file is part of InspIRCd.  InspIRCd is free software: you can
+ * redistribute it and/or modify it under the terms of the GNU General Public
+ * License as published by the Free Software Foundation, version 2.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
+ * details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <stdio.h>
-#include <string>
-#include <vector>
-#include "users.h"
-#include "channels.h"
-#include "modules.h"
-#include "helperfuncs.h"
+
+#include "inspircd.h"
 
 /* $ModDesc: Forbids users from messaging each other. Users may still message opers and opers may message other opers. */
 
 
 class ModuleRestrictMsg : public Module
 {
-       Server *Srv;
+ private:
+       bool uline;
+
  public:
- 
-       ModuleRestrictMsg()
+
+       void init()
        {
-               Srv = new Server;
+               OnRehash(NULL);
+               Implementation eventlist[] = { I_OnRehash, I_OnUserPreMessage, I_OnUserPreNotice };
+               ServerInstance->Modules->Attach(eventlist, this, sizeof(eventlist)/sizeof(Implementation));
        }
 
-       virtual int OnUserPreMessage(userrec* user,void* dest,int target_type, std::string &text)
+       void OnRehash(User*)
        {
-               if (target_type == TYPE_USER)
+               uline = ServerInstance->Config->ConfValue("restrictmsg")->getBool("uline", false);
+       }
+
+       virtual ModResult OnUserPreMessage(User* user,void* dest,int target_type, std::string &text, char status, CUList &exempt_list)
+       {
+               if ((target_type == TYPE_USER) && (IS_LOCAL(user)))
                {
-                       userrec* u = (userrec*)dest;
-                       if ((strchr(u->modes,'o')) || (strchr(user->modes,'o')))
+                       User* u = (User*)dest;
+
+                       // message allowed if:
+                       // (1) the sender is opered
+                       // (2) the recipient is opered
+                       // (3) the recipient is on a ulined server
+                       // anything else, blocked.
+                       if (IS_OPER(u) || IS_OPER(user) || (uline && ServerInstance->ULine(u->server)))
                        {
-                               // message allowed if:
-                               // (1) the sender is opered
-                               // (2) the recipient is opered
-                               // (3) both are opered
-                               // anything else, blocked.
-                               return 0;
+                               return MOD_RES_PASSTHRU;
                        }
-                       WriteServ(user->fd,"531 %s %s :You are not permitted to send private messages to this user",user->nick,u->nick);
-                       return 1;
+                       user->WriteNumeric(ERR_CANTSENDTOUSER, "%s %s :You are not permitted to send private messages to this user",user->nick.c_str(),u->nick.c_str());
+                       return MOD_RES_DENY;
                }
+
                // however, we must allow channel messages...
-               return 0;
+               return MOD_RES_PASSTHRU;
        }
 
-       virtual int OnUserPreNotice(userrec* user,void* dest,int target_type, std::string &text)
+       virtual ModResult OnUserPreNotice(User* user,void* dest,int target_type, std::string &text, char status, CUList &exempt_list)
        {
-               return this->OnUserPreMessage(user,dest,target_type,text);
+               return this->OnUserPreMessage(user,dest,target_type,text,status,exempt_list);
        }
 
        virtual ~ModuleRestrictMsg()
        {
-               delete Srv;
-       }
-       
-       virtual Version GetVersion()
-       {
-               return Version(1,0,0,1,VF_VENDOR);
        }
-};
-
 
-class ModuleRestrictMsgFactory : public ModuleFactory
-{
- public:
-       ModuleRestrictMsgFactory()
-       {
-       }
-       
-       ~ModuleRestrictMsgFactory()
-       {
-       }
-       
-       virtual Module * CreateModule()
+       virtual Version GetVersion()
        {
-               return new ModuleRestrictMsg;
+               return Version("Forbids users from messaging each other. Users may still message opers and opers may message other opers.",VF_VENDOR);
        }
-       
 };
 
-
-extern "C" void * init_module( void )
-{
-       return new ModuleRestrictMsgFactory;
-}
-
+MODULE_INIT(ModuleRestrictMsg)