Gah, im forgetting to SetMode!

[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 c15cd2b58e3f7d288d8544938b059c40bcb4b6b7..01b55f9cc7f027b503737943dd88d270b293ecae 100644 (file)
--- a/src/modules/m_operchans.cpp
+++ b/src/modules/m_operchans.cpp
@@ -24,11 +24,9 @@ using namespace std;
 
 /* $ModDesc: Provides support for oper-only chans via the +O channel mode */
 
-Server *Srv;
-        
-
 class ModuleOperChans : public Module
 {
+       Server* Srv;
  public:
        ModuleOperChans(Server* Me)
                : Module::Module(Me)
@@ -49,8 +47,9 @@ class ModuleOperChans : public Module
                {
                        chanrec* chan = (chanrec*)target;
                        
-                       if ((Srv->IsUlined(user->nick)) || (Srv->IsUlined(user->server)) || (!strcmp(user->server,"")) || (strchr(user->modes,'o')))
+                       if ((Srv->IsUlined(user->nick)) || (Srv->IsUlined(user->server)) || (!*user->server) || (*user->oper))
                        {
+                               log(DEBUG,"Allowing mode +O");
                                return 1;
                        }
                        else
@@ -67,18 +66,18 @@ class ModuleOperChans : public Module
                return 0;
        }
 
-        virtual void On005Numeric(std::string &output)
-        {
+       virtual void On005Numeric(std::string &output)
+       {
                InsertMode(output,"O",4);
-        }
+       }
        
        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);
                                        return 1;