X-Git-Url: http://git.pk910.de/?a=blobdiff_plain;f=Uplink%2FUplink.class.php;h=b91bf8a993b99e8fa55cea3a5bdfa60fa4feda58;hb=7ee52d8a44c982d62baecf92cea6b266e8c2eb26;hp=5c86c95b6afb0d6e183892e85b9d190b63a9e9e9;hpb=455040407c031d33129808462d42414c577863b4;p=PHP-P10.git

diff --git a/Uplink/Uplink.class.php b/Uplink/Uplink.class.php
index 5c86c95..b91bf8a 100644
--- a/Uplink/Uplink.class.php
+++ b/Uplink/Uplink.class.php
@@ -46,6 +46,9 @@
  *
  * void setValidateServer(String $name, String $password)
  *     sets additional security relevant information about the remote server.
+ *
+ * void setEventHandler(EventHandler $event_handler)
+ *     sets the EventHandlder
  */
 require_once("Client.class.php");
 require_once("Numerics.class.php");
@@ -64,6 +67,8 @@ class Uplink {
 	const FLAG_SECURITY_QUIT   = 0x0002; //local connection abort because of security issues
 	const FLAG_NOT_CONNECTABLE = 0x0004; //remote server is not connectable
 	const FLAG_BURST_PENDING   = 0x0008; //we still have to burst
+	const FLAG_CONNECTED       = 0x0010; //connected and synced (ready)
+	const FLAG_GOT_PASS        = 0x0020; //got PASS from the remote Server
 	private $flags = 0;
 	
 	public function __construct() {
@@ -238,7 +243,9 @@ class Uplink {
 				$this->flags |= self::FLAG_SECURITY_QUIT;
 				$this->send("ERROR", "Incorrect password received.");
 				$this->client->disconnect();
+				return;
 			}
+			$this->flags |= self::FLAG_GOT_PASS;
 		}
 	}
 	
@@ -258,6 +265,12 @@ class Uplink {
 				$this->client->disconnect();
 				return;
 			}
+			if($this->getSetting("their_password") && !($this->flags & self::FLAG_GOT_PASS)) {
+				$this->flags |= self::FLAG_SECURITY_QUIT;
+				$this->send("ERROR", "PASS missing.");
+				$this->client->disconnect();
+				return;
+			}
 			$new_server = new P10_Server($args[0], substr($args[5],0,2), $this->server, $args[2], $args[3], $args[7]);
 			$this->server->addServer($new_server);
 			$this->flags |= self::FLAG_P10SESSION | self::FLAG_BURST_PENDING;
@@ -318,7 +331,7 @@ class Uplink {
 	}
 	
 	private function recv_end_of_burst_ack($from, $args) {
-		//nothing to do here?
+		$this->flags |= self::FLAG_CONNECTED;
 	}
 	
 	private function recv_server_quit($from, $args) {
@@ -340,11 +353,10 @@ class Uplink {
 	}
 	
 	private function recv_burst($from, $args) {
-		//AK B #aide 1292621006 +tn ALAMH:o
 		$name = $args[0];
 		$create_time = $args[1];
 		$channel = P10_Channel::getChannelByName($name);
-		if($name == null)
+		if($channel == null)
 			$channel = new P10_Channel($name);
 		$modes = $channel->getModes();
 		$userstr = $args[count($args)-1];
@@ -358,11 +370,15 @@ class Uplink {
 			$userstr = $args[count($args)-2];
 			$modeparamcount--;
 		}
-		$users = explode(":",$userstr);
+		if($userstr[0] == "+") { //MODE String
+			$modeparamcount++;
+			$userstr = "";
+		}
+		$users = explode(",",$userstr);
 		$isop = false; $isvoice = false;
 		foreach($users as $user) {
 			$uexp = explode(":", $user);
-			if(strlen($uexp[0]) != 6) {
+			if(strlen($uexp[0]) != 5) {
 				trigger_error("burst parse error: '".$uexp[0]."' is not an user numeric.", E_USER_ERROR);
 				return;
 			}
@@ -400,6 +416,57 @@ class Uplink {
 			$realname = $user->getRealname();
 			$this->send("N", $nick, $connect_time, $ident, $host, $modes, $ip, $numeric, $realname);
 		}
+		foreach(P10_Channel::getChannels() as $channel) {
+			$sorted_users = array('ov' => array(), 'o' => array(), 'v' => array(), '-' => array());
+			$local_users = false;
+			foreach($channel->getUsers() as $user) {
+				if(substr($user->getNumeric(), 0, 2) != $this->server->getNumeric()) continue; //skip users that are not on the local server
+				$privs = $channel->getUserPrivs($user);
+				$strPrivs = "";
+				if(($privs & P10_Channel::USERPRIV_OPED)) $strPrivs .= "o";
+				if(($privs & P10_Channel::USERPRIV_VOICE)) $strPrivs .= "v";
+				if($strPrivs == "") $strPrivs = "-";
+				$local_users = true;
+				$sorted_users[$strPrivs][] = $user;
+			}
+			if(!$local_users) continue;
+			$userStr = "";
+			foreach($sorted_users['-'] as $user) {
+				if($userStr != "") $userStr.=",";
+				$userStr .= $user->getNumeric();
+			}
+			foreach($sorted_users['ov'] as $i => $user) {
+				if($userStr != "") $userStr.=",";
+				$userStr .= $user->getNumeric();
+				if($i == 0) $userStr .= ":ov";
+			}
+			foreach($sorted_users['o'] as $i => $user) {
+				if($userStr != "") $userStr.=",";
+				$userStr .= $user->getNumeric();
+				if($i == 0) $userStr .= ":o";
+			}
+			foreach($sorted_users['v'] as $i => $user) {
+				if($userStr != "") $userStr.=",";
+				$userStr .= $user->getNumeric();
+				if($i == 0) $userStr .= ":v";
+			}
+			$banString = "";
+			//TODO: Build ban String
+			$burstString = "";
+			$modeString = $channel->getModes()->getModeString();
+			if($modeString != "+") {
+				$burstString .= $modeString;
+			}
+			if($userStr != "") {
+				if($burstString != "") $burstString .= " ";
+				$burstString .= $userStr;
+			}
+			if($banString != "") {
+				if($burstString != "") $burstString .= " ";
+				$burstString .= ":%".$banString;
+			}
+			$this->send("B", $channel->getName(), $channel->getCreateTime(), $burstString);
+		}
 		$this->send("EB");
 	}