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 e19eddb1e8621af322261299a9c39236d9fd72f9..7dcfebdf627c0dadea88ecc34bf8c81d6ab56ce9 100644 (file)
--- a/src/modules/m_showwhois.cpp
+++ b/src/modules/m_showwhois.cpp
@@ -1,52 +1,95 @@
-using namespace std;
-
-// showwhois module by typobox43
+/*       +------------------------------------+
+ *       | 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 "helperfuncs.h"
+#include "inspircd.h"
 
 /* $ModDesc: Allows opers to set +W to see when a user uses WHOIS on them */
 
-Server *Srv;
-
-class ModuleShowwhois : public Module
+/** Handle user mode +W
+ */
+class SeeWhois : public ModeHandler
 {
-       public:
-               ModuleShowwhois()
-               {
-                       Srv = new Server;
-                       Srv->AddExtendedMode('W',MT_CLIENT,true,0,0);
-               }
+ public:
+       SeeWhois(InspIRCd* Instance) : ModeHandler(Instance, 'W', 0, 0, false, MODETYPE_USER, true) { }
 
-               ~ModuleShowwhois()
-               {
-                       delete Srv;
-               }
+       ModeAction OnModeChange(userrec* source, userrec* dest, chanrec* channel, std::string &parameter, bool adding)
+       {
+               /* Only opers can change other users modes */
+               if ((source != dest) && (!*source->oper))
+                       return MODEACTION_DENY;
 
-               virtual Version GetVersion()
+               if (adding)
                {
-                       return Version(1,0,0,3,VF_STATIC);
+                       if (!dest->IsModeSet('W'))
+                       {
+                               dest->SetMode('W',true);
+                               return MODEACTION_ALLOW;
+                       }
                }
-
-               virtual int OnExtendedMode(userrec* user, void* target, char modechar, int type, bool mode_on, string_list& params)
+               else
                {
-                       if((type == MT_CLIENT) && (modechar == 'W'))
+                       if (dest->IsModeSet('W'))
                        {
-                               return 1;
+                               dest->SetMode('W',false);
+                               return MODEACTION_ALLOW;
                        }
-
-                       return 0;
                }
 
-               virtual void OnWhois(userrec* source, userrec* dest)
+               return MODEACTION_DENY;
+       }
+};
+
+class ModuleShowwhois : public Module
+{
+       
+       SeeWhois* sw;
+
+ public:
+
+       ModuleShowwhois(InspIRCd* Me) : Module::Module(Me)
+       {
+               
+               sw = new SeeWhois(ServerInstance);
+               if (!ServerInstance->AddMode(sw, 'W'))
+                       throw ModuleException("Could not add new modes!");
+       }
+
+       ~ModuleShowwhois()
+       {
+               ServerInstance->Modes->DelMode(sw);
+               DELETE(sw);
+       }
+
+       void Implements(char* List)
+       {
+               List[I_OnWhois] = 1;
+       }
+
+       virtual Version GetVersion()
+       {
+               return Version(1,1,0,3,VF_COMMON|VF_VENDOR,API_VERSION);
+       }
+
+       virtual void OnWhois(userrec* source, userrec* dest)
+       {
+               if ((dest->IsModeSet('W')) && (source != dest))
                {
-                       if(strchr(dest->modes,'W'))
-                       {
-                               WriteServ(dest->fd,"NOTICE %s :*** %s (%s@%s) did a /whois on you.",dest->nick,source->nick,source->ident,source->host);
-                       }
+                       dest->WriteServ("NOTICE %s :*** %s (%s@%s) did a /whois on you.",dest->nick,source->nick,source->ident,source->host);
                }
+       }
 
 };
 
@@ -61,9 +104,9 @@ class ModuleShowwhoisFactory : public ModuleFactory
                {
                }
 
-               virtual Module* CreateModule()
+               virtual Module* CreateModule(InspIRCd* Me)
                {
-                       return new ModuleShowwhois;
+                       return new ModuleShowwhois(Me);
                }
 
 };