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

diff --git a/Uplink/Uplink.class.php b/Uplink/Uplink.class.php
index 5c86c95..7cbc2f3 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");
@@ -54,16 +57,20 @@ require_once("P10_Server.class.php");
 require_once("P10_User.class.php");
 require_once("P10_Channel.class.php");
 require_once("P10_ModeSets.class.php");
+require_once("EventHandler.interface.php");
 
 class Uplink {
 	private $client;
 	private $settings = array();
 	private $server;
+	private $eventHandler = null;
 	
 	const FLAG_P10SESSION      = 0x0001; //connection is in P10 mode (server is connected)
 	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() {
@@ -94,7 +101,7 @@ class Uplink {
 		if(!$this->client->connected()) {
 			if(($this->flags & self::FLAG_P10SESSION)) {
 				//Server got disconnected
-				$this->server->disconnectServer(true);
+				$this->server->disconnectServer($this->eventHandler, true);
 				$this->flags &= ~self::FLAG_P10SESSION;
 			}
 			$host = $this->getSetting("host");
@@ -146,6 +153,14 @@ class Uplink {
 		$this->setSetting("their_password", $password);
 	}
 	
+	public function setEventHandler($event_handler) {
+		if(!is_a($event_handler, "EventHandler")) {
+			trigger_error((is_object($event_handler) ? get_class($event_handler) : gettype($event_handler))." is NOT a valid EventHandler.", E_USER_ERROR);
+			return;
+		}
+		$this->eventHandler = $event_handler;
+	}
+	
 	private function setSetting($setting, $value) {
 		$this->settings[$setting] = $value;
 	}
@@ -209,6 +224,13 @@ class Uplink {
 			case "B":
 				$this->recv_burst($from, $arguments);
 				break;
+			case "J":
+			case "C":
+				$this->recv_join($from, $arguments);
+				break;
+			case "L":
+				$this->recv_part($from, $arguments);
+				break;
 		//default
 			default:
 				//unknown cmd
@@ -238,7 +260,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,9 +282,17 @@ 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;
+			if($this->eventHandler)
+				$this->eventHandler->event_server($new_server, !($this->flags & self::FLAG_CONNECTED));
 		} else {
 			//another server got a new slave server ^^
 			$server = P10_Server::getServerByNum($from);
@@ -270,6 +302,8 @@ class Uplink {
 			}
 			$new_server = new P10_Server($args[0], substr($args[5],0,2), $server, $args[2], $args[3], $args[7]);
 			$server->addServer($new_server);
+			if($this->eventHandler)
+				$this->eventHandler->event_server($new_server, !($this->flags & self::FLAG_CONNECTED));
 		}
 	}
 	
@@ -285,7 +319,9 @@ class Uplink {
 				trigger_error("Server tries to change the nick of an user that does not exist or was not found on recv_nick.", E_USER_ERROR);
 				return;
 			}
-			$nick->setNick($args[0]);
+			if($this->eventHandler)
+				$this->eventHandler->event_nick($user, $args[0]);
+			$user->setNick($args[0]);
 		} else {
 			//New User
 			$numeric = $args[count($args)-2];
@@ -305,7 +341,9 @@ class Uplink {
 			$modes = new P10_UserModeSet($modes);
 			$ip = Numerics::parseIP($args[count($args)-3]);
 			$realname = $args[count($args)-1];
-			new P10_User($nick, $numeric, $server, $connect_time, $ident, $host, $ip, $realname, $modes);
+			$user = new P10_User($nick, $numeric, $server, $connect_time, $ident, $host, $ip, $realname, $modes);
+			if($this->eventHandler)
+				$this->eventHandler->event_connect($user, !($this->flags & self::FLAG_CONNECTED));
 		}
 	}
 	
@@ -318,7 +356,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) {
@@ -327,7 +365,7 @@ class Uplink {
 			trigger_error("Server (".$args[0].") not found.", E_USER_ERROR);
 			return;
 		}
-		$server->disconnectServer();
+		$server->disconnectServer($this->eventHandler);
 	}
 	
 	private function recv_quit($from, $args) {
@@ -336,16 +374,18 @@ class Uplink {
 			trigger_error("Server tries to quit an user that does not exist or was not found on recv_quit.", E_USER_ERROR);
 			return;
 		}
+		if($this->eventHandler)
+			$this->eventHandler->event_quit($user, $args[1]);
 		$user->quit($args[0]);
 	}
 	
 	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);
+		$channel->setCreateTime($create_time);
 		$modes = $channel->getModes();
 		$userstr = $args[count($args)-1];
 		$modeparamcount = count($args)-3;
@@ -358,11 +398,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;
 			}
@@ -380,10 +424,40 @@ class Uplink {
 				return;
 			}
 			$channel->burstUser($user, $isop, $isvoice);
+			if($this->eventHandler)
+				$this->eventHandler->event_join($user, $channel, true);
 		}
 		$modes->parseModes(implode(array_slice($args, 2, $modeparamcount)));
 	}
 	
+	private function recv_join($from, $args) {
+		$user = P10_User::getUserByNum($from);
+		if($user == null) {
+			trigger_error("Server tries to join an user that does not exist or was not found on recv_join.", E_USER_ERROR);
+			return;
+		}
+		$channel = P10_Channel::getChannelByName($args[0]);
+		if($channel == null)
+			$channel = new P10_Channel($args[0]);
+		$channel->joinUser($user);
+		if($this->eventHandler)
+			$this->eventHandler->event_join($user, $channel, false);
+	}
+	
+	private function recv_part($from, $args) {
+		$user = P10_User::getUserByNum($from);
+		if($user == null) {
+			trigger_error("Server tries to part an user that does not exist or was not found on recv_join.", E_USER_ERROR);
+			return;
+		}
+		$channel = P10_Channel::getChannelByName($args[0]);
+		if($channel == null)
+			$channel = new P10_Channel($args[0]);
+		if($this->eventHandler)
+			$this->eventHandler->event_part($user, $channel, $args[1]);
+		$channel->partUser($user);
+	}
+	
 	/********************************************************************************************
 	 *                                     SERVER FUNCTIONS                                     *
 	 ********************************************************************************************/
@@ -400,6 +474,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");
 	}