X-Git-Url: http://git.pk910.de/?a=blobdiff_plain;f=Uplink%2FUplink.class.php;h=f83c7e35a85cb3e64f0cd49efba41edb60be1704;hb=7288d3417adb446166a53374152227a62e3516ff;hp=041d1c6efac13850f1245c11298a82c5425403cd;hpb=ecbd414862800db8bb4c45dfc640c9090f80dce1;p=PHP-P10.git

diff --git a/Uplink/Uplink.class.php b/Uplink/Uplink.class.php
index 041d1c6..f83c7e3 100644
--- a/Uplink/Uplink.class.php
+++ b/Uplink/Uplink.class.php
@@ -483,7 +483,7 @@ class Uplink {
 			if($this->eventHandler)
 				$this->eventHandler->event_join($user, $channel, true);
 		}
-		$modes->parseModes(implode(array_slice($args, 2, $modeparamcount)));
+		$modes->parseModes(implode(" ", array_slice($args, 2, $modeparamcount)));
 	}
 	
 	private function recv_join($from, $args) {
@@ -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]);
@@ -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)