If the user's nick is just a case change, the TS is NOT updated (thanks jilles)

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

diff --git a/src/modes/cmode_h.cpp b/src/modes/cmode_h.cpp
index a77366c824b098451903b84b5fc8e2519deb0748..831ec809c15fe7bc290f0d88b4e53c9ca3086b68 100644 (file)
--- a/src/modes/cmode_h.cpp
+++ b/src/modes/cmode_h.cpp
@@ -11,8 +11,8 @@
  * ---------------------------------------------------
  */
 
-#include "configreader.h"
 #include "inspircd.h"
+#include "configreader.h"
 #include "mode.h"
 #include "channels.h"
 #include "users.h"
@@ -50,21 +50,20 @@ void ModeChannelHalfOp::RemoveMode(chanrec* channel)
        CUList* list = channel->GetHalfoppedUsers();
        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 ModeChannelHalfOp::RemoveMode(userrec* user)
@@ -84,8 +83,6 @@ ModeAction ModeChannelHalfOp::OnModeChange(userrec* source, userrec* dest, chanr
 
        int status = channel->GetStatus(source);
 
-       ServerInstance->Log(DEBUG,"Halfop handler, source=%s channel=%s parameter=%s adding=%d",source->nick, channel->name, parameter.c_str(), adding);
-
        /* Call the correct method depending on wether we're adding or removing the mode */
        if (adding)
        {
@@ -110,8 +107,6 @@ std::string ModeChannelHalfOp::AddHalfOp(userrec *user,const char* dest,chanrec
 {
        userrec *d = ServerInstance->Modes->SanityChecks(user,dest,chan,status);
 
-       ServerInstance->Log(DEBUG,"Add halfop");
-
        if (d)
        {
                if (IS_LOCAL(user))
@@ -131,7 +126,6 @@ std::string ModeChannelHalfOp::AddHalfOp(userrec *user,const char* dest,chanrec
                        }
                }
 
-               ServerInstance->Log(DEBUG,"Calling Grant");
                return ServerInstance->Modes->Grant(d,chan,UCMODE_HOP);
        }
        return "";
@@ -141,8 +135,6 @@ std::string ModeChannelHalfOp::DelHalfOp(userrec *user,const char *dest,chanrec
 {
        userrec *d = ServerInstance->Modes->SanityChecks(user,dest,chan,status);
 
-       ServerInstance->Log(DEBUG,"Del halfop");
-
        if (d)
        {
                if (IS_LOCAL(user))
@@ -162,7 +154,6 @@ std::string ModeChannelHalfOp::DelHalfOp(userrec *user,const char *dest,chanrec
                        }
                }
 
-               ServerInstance->Log(DEBUG,"Calling revoke");
                return ServerInstance->Modes->Revoke(d,chan,UCMODE_HOP);
        }
        return "";