Remove some fake client stuff, make it use the global record

[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 88d1b51e8296dc799418f685be0f9d6bbed82ae3..27bc621009bc8e0686806aa0d19ecbb5b18f1e58 100644 (file)
--- a/src/modes/cmode_o.cpp
+++ b/src/modes/cmode_o.cpp
@@ -11,8 +11,8 @@
  * ---------------------------------------------------
  */
 
-#include "configreader.h"
 #include "inspircd.h"
+#include "configreader.h"
 #include "mode.h"
 #include "channels.h"
 #include "users.h"
@@ -51,21 +51,19 @@ void ModeChannelOp::RemoveMode(chanrec* channel)
        CUList* list = channel->GetOppedUsers();
        CUList copy;
        char moderemove[MAXBUF];
-       userrec* n = new userrec(ServerInstance);
-       n->SetFd(FD_MAGIC_NUMBER);
 
        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 };
-               ServerInstance->SendMode(parameters, 3, n);
+               const char* parameters[] = { channel->name, moderemove, i->first->nick };
+               ServerInstance->SendMode(parameters, 3, ServerInstance->FakeClient);
        }
-       delete n;
 }
 
 void ModeChannelOp::RemoveMode(userrec* user)
@@ -133,11 +131,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)