Remove some debug (im on a crusade to make debug mode useful, but at the same time...

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

diff --git a/src/modules/m_showwhois.cpp b/src/modules/m_showwhois.cpp
index bdf3a9ba86afdbcaabf927b39c3e6a166302fc0f..7dcfebdf627c0dadea88ecc34bf8c81d6ab56ce9 100644 (file)
--- a/src/modules/m_showwhois.cpp
+++ b/src/modules/m_showwhois.cpp
@@ -1,22 +1,29 @@
-using namespace std;
-
-// showwhois module by typobox43
-// Modified by Craig
+/*       +------------------------------------+
+ *       | Inspire Internet Relay Chat Daemon |
+ *       +------------------------------------+
+ *
+ *  InspIRCd: (C) 2002-2007 InspIRCd Development Team
+ * See: http://www.inspircd.org/wiki/index.php/Credits
+ *
+ * This program is free but copyrighted software; see
+ *            the file COPYING for details.
+ *
+ * ---------------------------------------------------
+ */
 
 #include "users.h"
 #include "channels.h"
 #include "modules.h"
-
 #include "inspircd.h"
 
 /* $ModDesc: Allows opers to set +W to see when a user uses WHOIS on them */
 
-
-
+/** Handle user mode +W
+ */
 class SeeWhois : public ModeHandler
 {
  public:
-       SeeWhois(InspIRCd* Instance) : ModeHandler(Instance, 'W', 0, 0, false, MODETYPE_CHANNEL, false) { }
+       SeeWhois(InspIRCd* Instance) : ModeHandler(Instance, 'W', 0, 0, false, MODETYPE_USER, true) { }
 
        ModeAction OnModeChange(userrec* source, userrec* dest, chanrec* channel, std::string &parameter, bool adding)
        {
@@ -26,7 +33,7 @@ class SeeWhois : public ModeHandler
 
                if (adding)
                {
-                       if (!channel->IsModeSet('W'))
+                       if (!dest->IsModeSet('W'))
                        {
                                dest->SetMode('W',true);
                                return MODEACTION_ALLOW;
@@ -34,7 +41,7 @@ class SeeWhois : public ModeHandler
                }
                else
                {
-                       if (channel->IsModeSet('W'))
+                       if (dest->IsModeSet('W'))
                        {
                                dest->SetMode('W',false);
                                return MODEACTION_ALLOW;
@@ -56,7 +63,8 @@ class ModuleShowwhois : public Module
        {
                
                sw = new SeeWhois(ServerInstance);
-               ServerInstance->AddMode(sw, 'W');
+               if (!ServerInstance->AddMode(sw, 'W'))
+                       throw ModuleException("Could not add new modes!");
        }
 
        ~ModuleShowwhois()
@@ -72,7 +80,7 @@ class ModuleShowwhois : public Module
 
        virtual Version GetVersion()
        {
-               return Version(1,0,0,3,VF_COMMON|VF_VENDOR);
+               return Version(1,1,0,3,VF_COMMON|VF_VENDOR,API_VERSION);
        }
 
        virtual void OnWhois(userrec* source, userrec* dest)