Probably wont compile yet - purge_empty_channels refactor

[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 1ec4b4fc79a33cefc5f0dcbe6ed419937d4f8318..21e360b1da6e80a8f9a9bf2e0a965045017d5e07 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,7 +47,7 @@ class ModuleOperChans : public Module
                {
                        chanrec* chan = (chanrec*)target;
                        
-                       if ((Srv->IsUlined(user->nick)) || (Srv->IsUlined(user->server)) || (!*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;
@@ -75,7 +73,7 @@ class ModuleOperChans : public Module
        
        virtual int OnUserPreJoin(userrec* user, chanrec* chan, const char* cname)
        {
-               if (!strchr(user->modes,'o'))
+               if (!*user->oper)
                {
                        if (chan)
                        {