Wahhhhhhhhhhhh bwahahaha. Mass commit to tidy up tons of messy include lists

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

diff --git a/src/modules/m_operchans.cpp b/src/modules/m_operchans.cpp
index 461b7bece4d7e7f4d3f113221b6e82bd168672d1..7f3b989aa32f8216b708c13194cb6c00eb11d889 100644 (file)
--- a/src/modules/m_operchans.cpp
+++ b/src/modules/m_operchans.cpp
@@ -1,58 +1,84 @@
-#include <stdio.h>
+/*       +------------------------------------+
+ *       | Inspire Internet Relay Chat Daemon |
+ *       +------------------------------------+
+ *
+ *  InspIRCd is copyright (C) 2002-2006 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.
+ *
+ * ---------------------------------------------------
+ */
+
+using namespace std;
 
 #include "users.h"
 #include "channels.h"
 #include "modules.h"
+#include "inspircd.h"
 
 /* $ModDesc: Provides support for oper-only chans via the +O channel mode */
 
-Server *Srv;
-        
-
-class ModuleOperChans : public Module
+class OperChans : public ModeHandler
 {
  public:
-       ModuleOperChans()
-       {
-               Srv = new Server;
+       /* This is an oper-only mode */
+       OperChans(InspIRCd* Instance) : ModeHandler(Instance, 'O', 0, 0, false, MODETYPE_CHANNEL, true) { }
 
-               // Add a mode +O for channels with no parameters                
-               Srv->AddExtendedMode('Z',MT_CHANNEL,false,0,0);
-       }
-       
-       virtual int OnExtendedMode(userrec* user, void* target, char modechar, int type, bool mode_on, string_list &params)
+       ModeAction OnModeChange(userrec* source, userrec* dest, chanrec* channel, std::string &parameter, bool adding)
        {
-               if ((modechar == 'O') && (type == MT_CHANNEL))
+               if (adding)
                {
-                       chanrec* chan = (chanrec*)target;
-                       
-                       if ((Srv->IsUlined(source->nick)) || (Srv->IsUlined(source->server)) || (!strcmp(source->server,"")) || (strchr(source->modes,'o')))
+                       if (!channel->IsModeSet('O'))
                        {
-                               return 1;
+                               channel->SetMode('O',true);
+                               return MODEACTION_ALLOW;
                        }
-                       else
+               }
+               else
+               {
+                       if (channel->IsModeSet('O'))
                        {
-                               // eat the mode change, return an error
-                               WriteServ(user->fd,"468 %s %s :Only servers and opers may set channel mode +O",user->nick, chan->name);
-                               return -1;
+                               channel->SetMode('O',false);
+                               return MODEACTION_ALLOW;
                        }
-       
-                       // must return 1 to handle the mode!
-                       return 1;
                }
-               
-               return 0;
+
+               return MODEACTION_DENY;
        }
+};
+
+class ModuleOperChans : public Module
+{
        
+       OperChans* oc;
+ public:
+       ModuleOperChans(InspIRCd* Me)
+               : Module::Module(Me)
+       {
+                               
+               oc = new OperChans(ServerInstance);
+               ServerInstance->AddMode(oc, 'O');
+       }
+
+       void Implements(char* List)
+       {
+               List[I_OnUserPreJoin] = 1;
+       }
+
        virtual int OnUserPreJoin(userrec* user, chanrec* chan, const char* cname)
        {
-               if (!strchr(user->modes,'o'))
+               if (!*user->oper)
                {
                        if (chan)
                        {
-                               if (chan->IsCustomModeSet('O'))
+                               if (chan->IsModeSet('O'))
                                {
-                                       WriteServ(user->fd,"520 %s %s :Only IRC operators may join the channel %s (+O is set)",user->nick, chan->name,chan->name);
+                                       user->WriteServ("520 %s %s :Only IRC operators may join the channel %s (+O is set)",user->nick, chan->name,chan->name);
                                        return 1;
                                }
                        }
@@ -62,18 +88,13 @@ class ModuleOperChans : public Module
        
        virtual ~ModuleOperChans()
        {
-               delete Srv;
+               DELETE(oc);
        }
        
        virtual Version GetVersion()
        {
-               return Version(1,0,0,0);
-       }
-       
-       virtual void OnUserConnect(userrec* user)
-       {
+               return Version(1,0,0,0,VF_STATIC|VF_VENDOR);
        }
-
 };
 
 
@@ -88,9 +109,9 @@ class ModuleOperChansFactory : public ModuleFactory
        {
        }
        
-       virtual Module * CreateModule()
+       virtual Module * CreateModule(InspIRCd* Me)
        {
-               return new ModuleOperChans;
+               return new ModuleOperChans(Me);
        }
        
 };