mode fix

[PHP-P10.git] / Uplink / Uplink.class.php

diff --git a/Uplink/Uplink.class.php b/Uplink/Uplink.class.php
index a9406d12823fe92fa69399e64f8c9a9522a155d9..1e8aca09411a00d1a2fc22e112e2fdc578127a18 100644 (file)
--- a/Uplink/Uplink.class.php
+++ b/Uplink/Uplink.class.php
@@ -640,23 +640,23 @@ class Uplink {
                                if($channels != "") {
                                        $this->send("319", $from, $nick, $channels);
                                }
-                               if($fromUser->getModes()->hasMode("o") || $from == $user->getNumeric() || !$this->getSetting("his_name")) {
-                                       $this->send("312", $from, $nick, $user->getServer()->getName(), $user->getServer()->getDescription());
-                               } else {
-                                       $this->send("312", $from, $nick, $this->getSetting("his_name"), $this->getSetting("his_desc"));
-                               }
-                               if($modes->hasMode("o") && (!$modes->hasMode("H") || $fromUser->getModes()->hasMode("o"))) {
-                                       if($modes->hasMode("S")) {
-                                               if($modes->hasMode("D"))
-                                                       $this->send("313", $from, $nick, "is a Network Service");
-                                               else
-                                                       $this->send("313", $from, $nick, "is an illegal Network Service - HACKER!");
-                                       } else
-                                               $this->send("313", $from, $nick, "is an IRC Operator");
-                               }
-                               if(($auth = $modes->hasMode("r"))) {
-                                       $this->send("330", $from, $nick, $auth);
-                               }
+                       }
+                       if($fromUser->getModes()->hasMode("o") || $from == $user->getNumeric() || !$this->getSetting("his_name")) {
+                               $this->send("312", $from, $nick, $user->getServer()->getName(), $user->getServer()->getDescription());
+                       } else {
+                               $this->send("312", $from, $nick, $this->getSetting("his_name"), $this->getSetting("his_desc"));
+                       }
+                       if($modes->hasMode("o") && (!$modes->hasMode("H") || $fromUser->getModes()->hasMode("o"))) {
+                               if($modes->hasMode("S")) {
+                                       if($modes->hasMode("D"))
+                                               $this->send("313", $from, $nick, "is a Network Service");
+                                       else
+                                               $this->send("313", $from, $nick, "is an illegal Network Service - HACKER!");
+                               } else
+                                       $this->send("313", $from, $nick, "is an IRC Operator");
+                       }
+                       if(($auth = $modes->hasMode("r"))) {
+                               $this->send("330", $from, $nick, $auth);
                        }
                }
                $this->send("318", $from, $args[1]);
@@ -730,7 +730,7 @@ class Uplink {
                                $local_users = true;
                                $sorted_users[$strPrivs][] = $user;
                        }
-                       if(!$local_users && !$channel->getModes()->hasMode("z")) continue;
+                       if(!$local_users) continue;
                        $userStr = "";
                        foreach($sorted_users['-'] as $user) {
                                if($userStr != "") $userStr.=",";
@@ -955,7 +955,7 @@ class Uplink {
                        $channel = P10_Channel::getChannelByName($targetStr);
                        if($channel == null)
                                $channel = new P10_Channel($targetStr);
-                       $modes = $channel->getModes()->setModes($modes);
+                       $modes = $channel->getModes()->setModes($modes, true);
                        if(($this->flags & self::FLAG_CONNECTED))
                                $this->send(($force ? "OM" : "M"), $user->getNumeric(), $targetStr, $modes);
                        if($this->eventHandler)
@@ -964,7 +964,7 @@ class Uplink {
                        $targetUser = P10_User::getUserByNum($targetStr);
                        if($targetUser->getServer() === $this->server) {
                                //just do it :D
-                               $modes = $targetUser->getModes()->setModes($modes);
+                               $modes = $targetUser->getModes()->setModes($modes, true);
                                if(($this->flags & self::FLAG_CONNECTED))
                                        $this->send("M", $targetUser->getNumeric(), $targetUser->getNick(), $modes);
                                if($this->eventHandler)