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 6aa36cc79228990c1e3fc587290c74c1ec811369..c4e3c241e8921799b182888aa1d1b5b20cc64d6f 100644 (file)
--- a/src/modes/cmode_o.cpp
+++ b/src/modes/cmode_o.cpp
@@ -1,29 +1,39 @@
-#include <string>
-#include <vector>
-#include "inspircd_config.h"
-#include "configreader.h"
-#include "hash_map.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"
-#include "helperfuncs.h"
-#include "commands.h"
 #include "modules.h"
-#include "inspstring.h"
-#include "hashcomp.h"
 #include "modes/cmode_o.h"
 
-ModeChannelOp::ModeChannelOp(InspIRCd* Instance) : ModeHandler(Instance, 'o', 1, 1, true, MODETYPE_CHANNEL, false)
+ModeChannelOp::ModeChannelOp(InspIRCd* Instance) : ModeHandler(Instance, 'o', 1, 1, true, MODETYPE_CHANNEL, false, '@')
+{
+}
+
+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->GetStatus(x) == STATUS_OP)
+               if (channel->GetStatusFlags(x) & UCMODE_OP)
                {
                        return std::make_pair(true, x->nick);
                }
@@ -35,7 +45,37 @@ ModePair ModeChannelOp::ModeSet(userrec* source, userrec* dest, chanrec* channel
        return std::make_pair(false, parameter);
 }
 
-ModeAction ModeChannelOp::OnModeChange(userrec* source, userrec* dest, chanrec* channel, std::string &parameter, bool adding)
+
+void ModeChannelOp::RemoveMode(Channel* channel, irc::modestacker* stack)
+{
+       CUList* clist = channel->GetOppedUsers();
+       CUList copy;
+       char moderemove[MAXBUF];
+
+       for (CUList::iterator i = clist->begin(); i != clist->end(); i++)
+       {
+               User* n = i->first;
+               copy.insert(std::make_pair(n,n->nick));
+       }
+
+       for (CUList::iterator i = copy.begin(); i != copy.end(); i++)
+       {
+               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);
+               }
+       }
+}
+
+void ModeChannelOp::RemoveMode(User*, irc::modestacker* stack)
+{
+}
+
+ModeAction ModeChannelOp::OnModeChange(User* source, User*, Channel* channel, std::string &parameter, bool adding, bool servermode)
 {
        int status = channel->GetStatus(source);
 
@@ -53,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->ModeGrok->SanityChecks(user,dest,chan,status);
+       User *d = ServerInstance->Modes->SanityChecks(user,dest,chan,status);
 
        if (d)
        {
@@ -71,7 +114,7 @@ std::string ModeChannelOp::AddOp(userrec *user,const char* dest,chanrec *chan,in
                                return "";
                        if (MOD_RESULT == ACR_DEFAULT)
                        {
-                               if ((status < STATUS_OP) && (!is_uline(user->server)))
+                               if ((status < STATUS_OP) && (!ServerInstance->ULine(user->server)))
                                {
                                        user->WriteServ("482 %s %s :You're not a channel operator",user->nick, chan->name);
                                        return "";
@@ -79,30 +122,27 @@ std::string ModeChannelOp::AddOp(userrec *user,const char* dest,chanrec *chan,in
                        }
                }
 
-               return ServerInstance->ModeGrok->Grant(d,chan,UCMODE_OP);
+               return ServerInstance->Modes->Grant(d,chan,UCMODE_OP);
        }
        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->ModeGrok->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)
                        {
-                               if ((status < STATUS_OP) && (!is_uline(user->server)) && (IS_LOCAL(user)))
+                               if ((status < STATUS_OP) && (!ServerInstance->ULine(user->server)) && (IS_LOCAL(user)))
                                {
                                        user->WriteServ("482 %s %s :You are not a channel operator",user->nick, chan->name);
                                        return "";
@@ -110,7 +150,7 @@ std::string ModeChannelOp::DelOp(userrec *user,const char *dest,chanrec *chan,in
                        }
                }
 
-               return ServerInstance->ModeGrok->Revoke(d,chan,UCMODE_OP);
+               return ServerInstance->Modes->Revoke(d,chan,UCMODE_OP);
        }
        return "";
 }