Revert automated conversion by Special, as it (unfortunately) neglects some details...

[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 7ff66bdb289b0598184d1c751e60b5df8b476604..207c468b14583e48f6c49f27b40a18d0ba7bde82 100644 (file)
--- a/src/modules/m_operchans.cpp
+++ b/src/modules/m_operchans.cpp
@@ -2,123 +2,100 @@
  *       | 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.
+ *  InspIRCd: (C) 2002-2008 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.
  *
  * ---------------------------------------------------
  */
 
-using namespace std;
-
-#include <stdio.h>
-#include "users.h"
-#include "channels.h"
-#include "modules.h"
-#include "helperfuncs.h"
+#include "inspircd.h"
 
 /* $ModDesc: Provides support for oper-only chans via the +O channel mode */
 
-class ModuleOperChans : public Module
+class OperChans : public ModeHandler
 {
-       Server* Srv;
  public:
-       ModuleOperChans(Server* Me)
-               : Module::Module(Me)
-       {
-               Srv = Me;
-               // Add a mode +O for channels with no parameters                
-               Srv->AddExtendedMode('O',MT_CHANNEL,false,0,0);
-       }
+       /* This is an oper-only mode */
+       OperChans(InspIRCd* Instance) : ModeHandler(Instance, 'O', 0, 0, false, MODETYPE_CHANNEL, true) { }
 
-       void Implements(char* List)
+       ModeAction OnModeChange(User* source, User* dest, Channel* channel, std::string &parameter, bool adding, bool)
        {
-               List[I_OnExtendedMode] = List[I_On005Numeric] = List[I_OnUserPreJoin] = 1;
-       }
-       
-       virtual int OnExtendedMode(userrec* user, void* target, char modechar, int type, bool mode_on, string_list &params)
-       {
-               if ((modechar == 'O') && (type == MT_CHANNEL))
+               if (adding)
                {
-                       chanrec* chan = (chanrec*)target;
-                       
-                       if ((Srv->IsUlined(user->nick)) || (Srv->IsUlined(user->server)) || (!*user->server) || (*user->oper))
+                       if (!channel->IsModeSet('O'))
                        {
-                               log(DEBUG,"Allowing mode +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 0;
+                               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(Me)
+       {
+
+               oc = new OperChans(ServerInstance);
+               if (!ServerInstance->Modes->AddMode(oc))
+                       throw ModuleException("Could not add new modes!");
+               Implementation eventlist[] = { I_OnUserPreJoin };
+               ServerInstance->Modules->Attach(eventlist, this, 1);
+       }
+
 
-        virtual void On005Numeric(std::string &output)
-        {
-               InsertMode(output,"O",4);
-        }
-       
-       virtual int OnUserPreJoin(userrec* user, chanrec* chan, const char* cname)
+       virtual int OnUserPreJoin(User* user, Channel* chan, const char* cname, std::string &privs, const std::string &keygiven)
        {
-               if (!*user->oper)
+               if (!IS_OPER(user))
                {
                        if (chan)
                        {
                                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->WriteNumeric(ERR_CANTJOINOPERSONLY, "%s %s :Only IRC operators may join the channel %s (+O is set)",user->nick.c_str(), chan->name.c_str(), chan->name.c_str());
                                        return 1;
                                }
                        }
                }
+               else
+               {
+                       if (chan && chan->IsExtBanned(user->oper, 'O'))
+                       {
+                               user->WriteNumeric(ERR_BANNEDFROMCHAN, "%s %s :Cannot join channel (You're banned)", user->nick.c_str(),  chan->name.c_str());
+                               return 1;
+                       }
+               }
+
                return 0;
        }
-       
-       virtual ~ModuleOperChans()
-       {
-       }
-       
-       virtual Version GetVersion()
-       {
-               return Version(1,0,0,0,VF_STATIC|VF_VENDOR);
-       }
-};
-
 
-class ModuleOperChansFactory : public ModuleFactory
-{
- public:
-       ModuleOperChansFactory()
-       {
-       }
-       
-       ~ModuleOperChansFactory()
+       virtual ~ModuleOperChans()
        {
+               ServerInstance->Modes->DelMode(oc);
+               delete oc;
        }
-       
-       virtual Module * CreateModule(Server* Me)
+
+       virtual Version GetVersion()
        {
-               return new ModuleOperChans(Me);
+               return Version(1,2,0,0,VF_VENDOR|VF_COMMON,API_VERSION);
        }
-       
 };
 
-
-extern "C" void * init_module( void )
-{
-       return new ModuleOperChansFactory;
-}
-
+MODULE_INIT(ModuleOperChans)