Move remaining functions:

[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 63588b45624875f339306347cba4903dcebee220..c8a969b9ce45cb6faa42d28466eee55d5bd80c70 100644 (file)
--- a/src/modes/cmode_o.cpp
+++ b/src/modes/cmode_o.cpp
@@ -71,7 +71,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->is_uline(user->server)))
                                {
                                        user->WriteServ("482 %s %s :You're not a channel operator",user->nick, chan->name);
                                        return "";
@@ -93,16 +93,16 @@ std::string ModeChannelOp::DelOp(userrec *user,const char *dest,chanrec *chan,in
                if (IS_LOCAL(user))
                {
                        int MOD_RESULT = 0;
-                       log(DEBUG,"Call OnAccessCheck for AC_DEOP");
+                       ServerInstance->Log(DEBUG,"Call OnAccessCheck for AC_DEOP");
                        FOREACH_RESULT(I_OnAccessCheck,OnAccessCheck(user,d,chan,AC_DEOP));
 
-                       log(DEBUG,"Returns %d",MOD_RESULT);
+                       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->is_uline(user->server)) && (IS_LOCAL(user)))
                                {
                                        user->WriteServ("482 %s %s :You are not a channel operator",user->nick, chan->name);
                                        return "";