Add method for writing server notices.

[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 d7a6a8cead5a0e7b57ffadae5bb18dc8bde70e3a..c4eba1b2e4c79cdfbb858aa5a3646926007c48bd 100644 (file)
--- a/src/modules/m_restrictmsg.cpp
+++ b/src/modules/m_restrictmsg.cpp
@@ -1,16 +1,24 @@
-/*       +------------------------------------+
- *       | Inspire Internet Relay Chat Daemon |
- *       +------------------------------------+
+/*
+ * InspIRCd -- Internet Relay Chat Daemon
  *
- *  InspIRCd: (C) 2002-2010 InspIRCd Development Team
- * See: http://wiki.inspircd.org/Credits
+ *   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 program is free but copyrighted software; see
- *            the file COPYING for details.
+ * 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 "inspircd.h"
 
 /* $ModDesc: Forbids users from messaging each other. Users may still message opers and opers may message other opers. */
@@ -21,11 +29,10 @@ class ModuleRestrictMsg : public Module
 
  public:
 
-       ModuleRestrictMsg()
-                       {
-
+       void init()
+       {
                Implementation eventlist[] = { I_OnUserPreMessage, I_OnUserPreNotice };
-               ServerInstance->Modules->Attach(eventlist, this, 2);
+               ServerInstance->Modules->Attach(eventlist, this, sizeof(eventlist)/sizeof(Implementation));
        }
 
 
@@ -39,7 +46,7 @@ class ModuleRestrictMsg : public Module
                        // (1) the sender is opered
                        // (2) the recipient is opered
                        // anything else, blocked.
-                       if (IS_OPER(u) || IS_OPER(user))
+                       if (u->IsOper() || user->IsOper())
                        {
                                return MOD_RES_PASSTHRU;
                        }
@@ -56,10 +63,6 @@ class ModuleRestrictMsg : public Module
                return this->OnUserPreMessage(user,dest,target_type,text,status,exempt_list);
        }
 
-       virtual ~ModuleRestrictMsg()
-       {
-       }
-
        virtual Version GetVersion()
        {
                return Version("Forbids users from messaging each other. Users may still message opers and opers may message other opers.",VF_VENDOR);