Fixes for bug #493, tidyups to clearing of channel modes on losing FJOIN. Module...

[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..c4e3c241e8921799b182888aa1d1b5b20cc64d6f 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-2008 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"
@@ -15,9 +28,9 @@ unsigned int ModeChannelOp::GetPrefixRank()
        return OP_VALUE;
 }
 
-ModePair ModeChannelOp::ModeSet(userrec* source, userrec* dest, chanrec* channel, const std::string &parameter)
+ModePair ModeChannelOp::ModeSet(User*, User*, Channel* channel, const std::string &parameter)
 {
-       userrec* x = ServerInstance->FindNick(parameter);
+       User* x = ServerInstance->FindNick(parameter);
        if (x)
        {
                if (channel->GetStatusFlags(x) & UCMODE_OP)
@@ -33,33 +46,36 @@ ModePair ModeChannelOp::ModeSet(userrec* source, userrec* dest, chanrec* channel
 }
 
 
-void ModeChannelOp::RemoveMode(chanrec* channel)
+void ModeChannelOp::RemoveMode(Channel* channel, irc::modestacker* stack)
 {
-       CUList* list = channel->GetOppedUsers();
+       CUList* clist = 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++)
+       for (CUList::iterator i = clist->begin(); i != clist->end(); i++)
        {
-               userrec* n = i->second;
-               copy.insert(std::make_pair(n,n));
+               User* 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);
+               if (stack)
+                       stack->Push(this->GetModeChar(), i->first->nick);
+               else
+               {
+                       sprintf(moderemove,"-%c",this->GetModeChar());
+                       const char* parameters[] = { channel->name, moderemove, i->first->nick };
+                       ServerInstance->SendMode(parameters, 3, ServerInstance->FakeClient);
+               }
        }
-       delete n;
 }
 
-void ModeChannelOp::RemoveMode(userrec* user)
+void ModeChannelOp::RemoveMode(User*, irc::modestacker* stack)
 {
 }
 
-ModeAction ModeChannelOp::OnModeChange(userrec* source, userrec* dest, chanrec* channel, std::string &parameter, bool adding)
+ModeAction ModeChannelOp::OnModeChange(User* source, User*, Channel* channel, std::string &parameter, bool adding, bool servermode)
 {
        int status = channel->GetStatus(source);
 
@@ -77,12 +93,15 @@ 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)
+std::string ModeChannelOp::AddOp(User *user,const char* dest,Channel *chan,int status)
 {
-       userrec *d = ServerInstance->Modes->SanityChecks(user,dest,chan,status);
+       User *d = ServerInstance->Modes->SanityChecks(user,dest,chan,status);
 
        if (d)
        {
@@ -108,20 +127,17 @@ std::string ModeChannelOp::AddOp(userrec *user,const char* dest,chanrec *chan,in
        return "";
 }
 
-std::string ModeChannelOp::DelOp(userrec *user,const char *dest,chanrec *chan,int status)
+std::string ModeChannelOp::DelOp(User *user,const char *dest,Channel *chan,int status)
 {
-       userrec *d = ServerInstance->Modes->SanityChecks(user,dest,chan,status);
+       User *d = ServerInstance->Modes->SanityChecks(user,dest,chan,status);
 
        if (d)
        {
                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)