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

diff --git a/Uplink/Uplink.class.php b/Uplink/Uplink.class.php
index e7b8e9c..5c86c95 100644
--- a/Uplink/Uplink.class.php
+++ b/Uplink/Uplink.class.php
@@ -52,10 +52,11 @@ require_once("Numerics.class.php");
 require_once("P10Formatter.class.php");
 require_once("P10_Server.class.php");
 require_once("P10_User.class.php");
+require_once("P10_Channel.class.php");
 require_once("P10_ModeSets.class.php");
 
 class Uplink {
-	private $client = new Client();
+	private $client;
 	private $settings = array();
 	private $server;
 	
@@ -66,7 +67,8 @@ class Uplink {
 	private $flags = 0;
 	
 	public function __construct() {
-		$this->setSettings("recv_timeout", 1000);
+		$this->client = new Client();
+		$this->setSetting("recv_timeout", 1000);
 	}
 	
 	public function initialize() {
@@ -104,7 +106,7 @@ class Uplink {
 			if(($this->flags & self::FLAG_SECURITY_QUIT) || ($this->flags & self::FLAG_NOT_CONNECTABLE)) {
 				sleep(1);
 			}
-			$state = $this->client->connect($host, $port, $this->getSettings("bind"), $this->getSettings("ssl"), $this->getSettings("recv_timeout"));
+			$state = $this->client->connect($host, $port, $this->getSetting("bind"), $this->getSetting("ssl"), $this->getSetting("recv_timeout"));
 			if(!$state) {
 				usleep($this->getSetting("recv_timeout") / 1000);
 				$this->flags |= self::FLAG_NOT_CONNECTABLE;
@@ -121,7 +123,7 @@ class Uplink {
 		}
 	}
 	
-	public function setUplink($host, $port, $ssl = false, $bind = null) {
+	public function setUplinkHost($host, $port, $ssl = false, $bind = null) {
 		$this->setSetting("host", $host);
 		$this->setSetting("port", $port);
 		$this->setSetting("ssl", $ssl);
@@ -195,6 +197,18 @@ class Uplink {
 			case "EB":
 				$this->recv_end_of_burst($from, $arguments);
 				break;
+			case "EA":
+				$this->recv_end_of_burst_ack($from, $arguments);
+				break;
+			case "SQ":
+				$this->recv_server_quit($from, $arguments);
+				break;
+			case "Q":
+				$this->recv_quit($from, $arguments);
+				break;
+			case "B":
+				$this->recv_burst($from, $arguments);
+				break;
 		//default
 			default:
 				//unknown cmd
@@ -206,6 +220,8 @@ class Uplink {
 		if(func_num_args() > 1) {
 			$args = array_slice(func_get_args(), 1);
 			$command = P10Formatter::formatCMD($this->getSetting("numeric"), $command, $args);
+		} else {
+			$command = P10Formatter::formatCMD($this->getSetting("numeric"), $command, array());
 		}
 		$this->client->send($command);
 	}
@@ -243,7 +259,7 @@ class Uplink {
 				return;
 			}
 			$new_server = new P10_Server($args[0], substr($args[5],0,2), $this->server, $args[2], $args[3], $args[7]);
-			$this->server->add_server($new_server);
+			$this->server->addServer($new_server);
 			$this->flags |= self::FLAG_P10SESSION | self::FLAG_BURST_PENDING;
 		} else {
 			//another server got a new slave server ^^
@@ -253,7 +269,7 @@ class Uplink {
 				return;
 			}
 			$new_server = new P10_Server($args[0], substr($args[5],0,2), $server, $args[2], $args[3], $args[7]);
-			$server->add_server($new_server);
+			$server->addServer($new_server);
 		}
 	}
 	
@@ -262,8 +278,7 @@ class Uplink {
 	}
 	
 	private function recv_nick($from, $args) {
-		//[recv] AM N Zer0n|IRPG 2 1292194168 ~Zer0n c04D8C5.localIP +oiwgrftx Zer0n Zer0n.admin.WebGamesNet AKBNjF AMAAj :Zer0n IRPG - Will never answer here.
-		if(count($args) == 2) {
+		if(count($args) <= 2) {
 			//Nick change
 			$user = P10_User::getUserByNum($from);
 			if($user == null) {
@@ -287,7 +302,7 @@ class Uplink {
 			$ident = $args[3];
 			$host = $args[4];
 			$modes = implode(" ",array_slice($args, 5, count($args)-8));
-			$modes = new UserModeSet($modes);
+			$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);
@@ -302,13 +317,89 @@ class Uplink {
 		}
 	}
 	
+	private function recv_end_of_burst_ack($from, $args) {
+		//nothing to do here?
+	}
 	
+	private function recv_server_quit($from, $args) {
+		$server = P10_Server::getServerByName($args[0]);
+		if($server == null) {
+			trigger_error("Server (".$args[0].") not found.", E_USER_ERROR);
+			return;
+		}
+		$server->disconnectServer();
+	}
+	
+	private function recv_quit($from, $args) {
+		$user = P10_User::getUserByNum($from);
+		if($user == null) {
+			trigger_error("Server tries to quit an user that does not exist or was not found on recv_quit.", E_USER_ERROR);
+			return;
+		}
+		$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)
+			$channel = new P10_Channel($name);
+		$modes = $channel->getModes();
+		$userstr = $args[count($args)-1];
+		$modeparamcount = count($args)-3;
+		if($userstr[0] == "%") {
+			//ban list
+			$banlist = explode(" ", substr($userstr, 1));
+			foreach($banlist as $ban) {
+				//TODO: save bans
+			}
+			$userstr = $args[count($args)-2];
+			$modeparamcount--;
+		}
+		$users = explode(":",$userstr);
+		$isop = false; $isvoice = false;
+		foreach($users as $user) {
+			$uexp = explode(":", $user);
+			if(strlen($uexp[0]) != 6) {
+				trigger_error("burst parse error: '".$uexp[0]."' is not an user numeric.", E_USER_ERROR);
+				return;
+			}
+			if(count($uexp) > 1) {
+				$isop = false;
+				$isvoice = false;
+				for($i = 0; $i < strlen($uexp[1]); $i++) {
+					if($uexp[1][0] == "@") $isop = true;
+					if($uexp[1][0] == "+") $isvoice = true;
+				}
+			}
+			$user = P10_User::getUserByNum($uexp[0]);
+			if($user == null) {
+				trigger_error("burst parse error: cant find User '".$uexp[0]."'.", E_USER_ERROR);
+				return;
+			}
+			$channel->burstUser($user, $isop, $isvoice);
+		}
+		$modes->parseModes(implode(array_slice($args, 2, $modeparamcount)));
+	}
 	
 	/********************************************************************************************
 	 *                                     SERVER FUNCTIONS                                     *
 	 ********************************************************************************************/
 	
 	private function burst() {
+		foreach($this->server->getUsers() as $user) {
+			$nick = $user->getNick();
+			$connect_time = $user->getConnectTime();
+			$ident = $user->getIdent();
+			$host = $user->getHost();
+			$modes = $user->getModes()->getModeString();
+			$ip = Numerics::numericFromIP($user->getIP());
+			$numeric = $user->getNumeric();
+			$realname = $user->getRealname();
+			$this->send("N", $nick, $connect_time, $ident, $host, $modes, $ip, $numeric, $realname);
+		}
 		$this->send("EB");
 	}