X-Git-Url: http://git.pk910.de/?a=blobdiff_plain;f=Uplink%2FUplink.class.php;h=a9406d12823fe92fa69399e64f8c9a9522a155d9;hb=5ba9f2f5aa8a9db4351cdee5d72b41e25b0d9331;hp=0585595fdce6a576cfff90eb9370b0c6131581ac;hpb=61ea565f8e0161c0f0f75aac75682941fc2a3611;p=PHP-P10.git

diff --git a/Uplink/Uplink.class.php b/Uplink/Uplink.class.php
index 0585595..a9406d1 100644
--- a/Uplink/Uplink.class.php
+++ b/Uplink/Uplink.class.php
@@ -47,6 +47,9 @@
  * void setValidateServer(String $name, String $password)
  *     sets additional security relevant information about the remote server.
  *
+ * void setHISOptions(String $serverName, String $serverDescription String $usermask)
+ *     sets the default Account fakehost
+ *
  * void setEventHandler(EventHandler $event_handler)
  *     sets the EventHandlder
  */
@@ -84,6 +87,7 @@ class Uplink {
 	public function __construct() {
 		$this->client = new Client();
 		$this->setSetting("recv_timeout", 1000);
+		$this->setSetting("his_usermask", "user.NoMask");
 	}
 	
 	public function initialize() {
@@ -138,6 +142,15 @@ class Uplink {
 		}
 	}
 	
+	public function shutdown() {
+		if($this->client->connected()) {
+			if(($this->flags & self::FLAG_P10SESSION)) {
+				$this->send("SQ", "Shutdown requested.");
+			}
+			$this->client->disconnect();
+		}
+	}
+	
 	public function setUplinkHost($host, $port, $ssl = false, $bind = null) {
 		$this->setSetting("host", $host);
 		$this->setSetting("port", $port);
@@ -161,6 +174,12 @@ class Uplink {
 		$this->setSetting("their_password", $password);
 	}
 	
+	public function setHISOptions($servername, $serverdesc, $usermask) {
+		$this->setSetting("his_name", $servername);
+		$this->setSetting("his_desc", $serverdesc);
+		$this->setSetting("his_usermask", $usermask);
+	}
+	
 	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);
@@ -254,6 +273,16 @@ class Uplink {
 			case "O":
 				$this->recv_notice($from, $arguments);
 				break;
+			case "W":
+				$this->recv_whois($from, $arguments);
+				break;
+			case "A":
+				$this->recv_away($from, $arguments);
+				break;
+			case "M":
+			case "OM":
+				$this->recv_mode($from, $arguments);
+				break;
 		//default
 			default:
 				//unknown cmd
@@ -317,7 +346,7 @@ class Uplink {
 			$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));
+				$this->eventHandler->event_newserver($new_server, !($this->flags & self::FLAG_CONNECTED));
 		} else {
 			//another server got a new slave server ^^
 			$server = P10_Server::getServerByNum($from);
@@ -328,12 +357,13 @@ 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));
+				$this->eventHandler->event_newserver($new_server, !($this->flags & self::FLAG_CONNECTED));
 		}
 	}
 	
 	private function recv_ping($from, $args) {
 		$this->send("Z", $args[0]); //simply PONG
+		P10_Channel::recheckAllChannels();
 	}
 	
 	private function recv_nick($from, $args) {
@@ -430,6 +460,7 @@ class Uplink {
 		$users = explode(",",$userstr);
 		$isop = false; $isvoice = false;
 		foreach($users as $user) {
+			if($user == "") continue;
 			$uexp = explode(":", $user);
 			if(strlen($uexp[0]) != 5) {
 				trigger_error("burst parse error: '".$uexp[0]."' is not an user numeric.", E_USER_ERROR);
@@ -520,7 +551,7 @@ class Uplink {
 			return;
 		}
 		if($this->eventHandler) {
-			if($args[0] == "#") {
+			if($args[0][0] == "#") {
 				$channel = P10_Channel::getChannelByName($args[0]);
 				if($channel == null)
 					$channel = new P10_Channel($args[0]);
@@ -543,7 +574,7 @@ class Uplink {
 			return;
 		}
 		if($this->eventHandler) {
-			if($args[0] == "#") {
+			if($args[0][0] == "#") {
 				$channel = P10_Channel::getChannelByName($args[0]);
 				if($channel == null)
 					$channel = new P10_Channel($args[0]);
@@ -559,6 +590,117 @@ class Uplink {
 		}
 	}
 	
+	private function recv_whois($from, $args) {
+		/* [get] ACAAF W AX :NetworkServ */
+		$fromUser = P10_User::getUserByNum($from);
+		if($fromUser == null) {
+			trigger_error("Server tries to send a whois from an user that does not exist or was not found on recv_whois.", E_USER_ERROR);
+			return;
+		}
+		$users=explode(",",$args[1]);
+		foreach($users as $nick) {
+			$user = P10_User::getUserByNick($nick);
+			if(!$user) {
+				$this->send("401", $from, $nick);
+				continue;
+			}
+			$nick = $user->getNick();
+			$ident = $user->getIdent();
+			$hostmask = $user->getHost();
+			$modes = $user->getModes();
+			if($modes->hasMode('x')) {
+				if(($fakehost = $modes->hasMode('f'))) {
+					$hostmask = $fakehost;
+				} elseif(($account = $modes->hasMode('r'))) {
+					$hostmask = $account.".".$this->getSetting("his_usermask");
+				}
+			}
+			$realname = $user->getRealname();
+			$this->send("311", $from , $nick, $ident, $hostmask, $realname);
+			if(((!$modes->hasMode('n') && !$modes->hasMode('k')) || $from == $user->getNumeric()) && count($user->getChannels()) != 0) {
+				$channels = "";
+				foreach($user->getChannels() as $channel) {
+					$cmodes = $channel->getModes();
+					$privs = $channel->getUserPrivs($user);
+					if($cmodes->hasMode("s") && !$fromUser->isOnChannel($channel) && $from != $user->getNumeric()) continue;
+					if($cmodes->hasMode("u") && ($privs & (P10_Channel::USERPRIV_OPED | P10_Channel::USERPRIV_VOICE)) == 0 && $from != $user->getNumeric()) continue;
+					$chanstr = ($channels == "" ? "" : " ");
+					$prefix = "";
+					if(($privs & P10_Channel::USERPRIV_OPED)) {
+						$prefix = "@";
+					} else if(($privs & P10_Channel::USERPRIV_VOICE)) {
+						$prefix = "+";
+					}
+					$chanstr .= $prefix.$channel->getName();
+					if(strlen($channels) + strlen($chanstr) > 450) {
+						$this->send("319", $from, $nick, $channels);
+						$channels = $prefix.$channel->getName();
+					}
+				}
+				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);
+				}
+			}
+		}
+		$this->send("318", $from, $args[1]);
+	}
+	
+	private function recv_away($from, $args) {
+		$user = P10_User::getUserByNum($from);
+		if($user == null) {
+			trigger_error("Server tries to send an away command from an user that does not exist or was not found on recv_away.", E_USER_ERROR);
+			return;
+		}
+		if(count($args) > 0) {
+			$user->setAway($args[0]);
+		} else {
+			$user->setAway(null);
+		}
+	}
+	
+	private function recv_mode($from, $args) {
+		$user = P10_User::getUserByNum($from);
+		if($user == null) {
+			trigger_error("Server tries to send a modechange from an user that does not exist or was not found on recv_mode.", E_USER_ERROR);
+			return;
+		}
+		$modes = implode(" ",array_slice($args,1));
+		if($args[0][0] == "#") {
+			$channel = P10_Channel::getChannelByName($args[0]);
+			if($channel == null)
+				$channel = new P10_Channel($args[0]);
+			$channel->getModes()->setModes($modes);
+			if($this->eventHandler)
+				$this->eventHandler->event_chanmode($user, $channel, $modes);
+		} else {
+			$targetUser = P10_User::getUserByNum($args[0]);
+			if($targetUser == null) {
+				trigger_error("Server tries to send a mode to an user that does not exist or was not found on recv_mode.", E_USER_ERROR);
+				return;
+			}
+			$targetUser->getModes()->setModes($modes);
+			if($this->eventHandler)
+				$this->eventHandler->event_usermode($targetUser, $modes);
+		}
+	}
+	
 	/********************************************************************************************
 	 *                                     SERVER FUNCTIONS                                     *
 	 ********************************************************************************************/
@@ -642,6 +784,7 @@ class Uplink {
 			$numeric = substr($this->server->getNumeric(),0,2).Numerics::intToNum($this->last_local_numeric, 3);
 		}
 		$this->last_local_numeric++;
+		$modes = new P10_UserModeSet($modes);
 		$user = new P10_User($nick, $numeric, $this->server, time(), $ident, $host, $ip, $realname, $modes);
 		if(($this->flags & self::FLAG_CONNECTED)) {
 			$ip = Numerics::numericFromIP($user->getIP());
@@ -670,7 +813,7 @@ class Uplink {
 		}
 	}
 	
-	public function join($user, $chanName) {
+	public function join($user, $chanName, $privs = 0) {
 		if(!is_a($user, "P10_User") || !($user->getServer() === $this->server))
 			return ERR_INVALID_USER;
 		if($chanName[0] != "#")
@@ -681,6 +824,15 @@ class Uplink {
 		$channel->joinUser($user);
 		if(($this->flags & self::FLAG_CONNECTED))
 			$this->send("J", $user->getNumeric(), $chanName, time(), 0);
+		if($privs != 0) {
+			$channel->setUserPrivs($user, $privs);
+			if(($this->flags & self::FLAG_CONNECTED)) {
+				$modestr = "+".(($privs & P10_Channel::USERPRIV_OPED) ? "o" : "").(($privs & P10_Channel::USERPRIV_VOICE) ? "v" : "");
+				$modestr .= (($privs & P10_Channel::USERPRIV_OPED) ? " ".$user->getNumeric() : "");
+				$modestr .= (($privs & P10_Channel::USERPRIV_VOICE) ? " ".$user->getNumeric() : "");
+				$this->send("OM", $user->getNumeric(), $chanName, $modestr);
+			}
+		}
 		if($this->eventHandler)
 			$this->eventHandler->event_join($user, $channel, false);
 	}