Debug to try figure this out ..

[user/henk/code/inspircd.git] / src / modes / cmode_o.cpp

diff --git a/src/modes/cmode_o.cpp b/src/modes/cmode_o.cpp
index b9fb0208badb69a744614f90e3275debdba6f997..47d191ff8f7198a3094d98f27ed78b83068df4ff 100644 (file)
--- a/src/modes/cmode_o.cpp
+++ b/src/modes/cmode_o.cpp
@@ -1,5 +1,18 @@
-#include "configreader.h"
+/*       +------------------------------------+
+ *       | 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 "inspircd.h"
+#include "configreader.h"
 #include "mode.h"
 #include "channels.h"
 #include "users.h"
@@ -43,13 +56,13 @@ void ModeChannelOp::RemoveMode(chanrec* channel)
 
        for (CUList::iterator i = list->begin(); i != list->end(); i++)
        {
-               userrec* n = i->second;
-               copy.insert(std::make_pair(n,n));
+               userrec* n = i->first;
+               copy.insert(std::make_pair(n,n->nick));
        }
        for (CUList::iterator i = copy.begin(); i != copy.end(); i++)
        {
                sprintf(moderemove,"-%c",this->GetModeChar());
-               const char* parameters[] = { channel->name, moderemove, i->second->nick };
+               const char* parameters[] = { channel->name, moderemove, i->first->nick };
                ServerInstance->SendMode(parameters, 3, n);
        }
        delete n;
@@ -77,7 +90,10 @@ ModeAction ModeChannelOp::OnModeChange(userrec* source, userrec* dest, chanrec*
         * the return value and is always MODEACTION_DENY if the mode is supposed to have
         * a parameter.
         */
-       return MODEACTION_ALLOW;
+       if (parameter.length())
+               return MODEACTION_ALLOW;
+       else
+               return MODEACTION_DENY;
 }
 
 std::string ModeChannelOp::AddOp(userrec *user,const char* dest,chanrec *chan,int status)
@@ -117,11 +133,8 @@ std::string ModeChannelOp::DelOp(userrec *user,const char *dest,chanrec *chan,in
                if (IS_LOCAL(user))
                {
                        int MOD_RESULT = 0;
-                       ServerInstance->Log(DEBUG,"Call OnAccessCheck for AC_DEOP");
                        FOREACH_RESULT(I_OnAccessCheck,OnAccessCheck(user,d,chan,AC_DEOP));
 
-                       ServerInstance->Log(DEBUG,"Returns %d",MOD_RESULT);
-
                        if (MOD_RESULT == ACR_DENY)
                                return "";
                        if (MOD_RESULT == ACR_DEFAULT)