X-Git-Url: http://git.pk910.de/?p=PHP-P10.git;a=blobdiff_plain;f=Uplink%2FUplink.class.php;h=345ceb8312c25131cc1c0d1f0fd3919ac733767c;hp=232d976619a9abba4b373fd16c960786ff463302;hb=051ecddb99aba9afbfc8a09193e7dc13d823b9d3;hpb=55c45ccc4c5422ddd9ca3bb8840b5e75aa4184bc

diff --git a/Uplink/Uplink.class.php b/Uplink/Uplink.class.php
index 232d976..345ceb8 100644
--- a/Uplink/Uplink.class.php
+++ b/Uplink/Uplink.class.php
@@ -1,22 +1,19 @@
 <?php
-/********************************* PHP-P10 ******************************
- *    P10 uplink class by pk910   (c)2011 pk910                         *
- ************************************************************************
- *                          Version 2 (OOP)                             *
+/******************************* PHP-P10 v2 *****************************
+ * Copyright (C) 2011  Philipp Kreil (pk910)                            *
  *                                                                      *
- * PHP-P10 is free software; you can redistribute it and/or modify      *
+ * This program is free software: you can redistribute it and/or modify *
  * it under the terms of the GNU General Public License as published by *
- * the Free Software Foundation; either version 2 of the License, or    *
+ * the Free Software Foundation, either version 3 of the License, or    *
  * (at your option) any later version.                                  *
- *                                                                      *
+ *                                                                      * 
  * This program is distributed in the hope that it will be useful,      *
  * but WITHOUT ANY WARRANTY; without even the implied warranty of       *
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the        *
  * GNU General Public License for more details.                         *
  *                                                                      *
  * You should have received a copy of the GNU General Public License    *
- * along with PHP-P10; if not, write to the Free Software Foundation,   *
- * Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA.       *
+ * along with this program. If not, see <http://www.gnu.org/licenses/>. *
  *                                                                      *
  ************************************************************************
  * 
@@ -24,34 +21,6 @@
  *
  * This file contains the basic P10 Protocol handler.
  *
- ************************************************************************
- * accessable methods:
- *
- * void initialize()
- *     has to be called after the settings have been set.
- *
- * void loop() 
- *     loop function that should be calles as many times as possible. 
- *     It reads from the socket and BLOCKS the script execution for a 
- *     specific time if nothing is received.
- *
- * void setUplinkHost(String $host, int $port, bool $ssl = false, String $bind = null)
- *     sets the Uplink connection information.
- *
- * void setLoopTimeout(int $timeout)
- *     sets the maximum time loop() is blocking the script execution.
- *
- * void setUplinkServer(int $numeric, String $name, String $password, String $description)
- *     sets the own P10 Server information.
- *
- * 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
  */
 require_once("Client.class.php");
 require_once("Numerics.class.php");
@@ -438,13 +407,16 @@ class Uplink {
 	private function recv_burst($from, $args) {
 		$name = $args[0];
 		$create_time = $args[1];
+        if(count($args) == 2) {
+            //we've got an empty channel without any modes set???  dead channel!
+            return;
+        }
 		$channel = P10_Channel::getChannelByName($name);
 		if($channel == null)
 			$channel = new P10_Channel($name);
 		$channel->setCreateTime($create_time);
 		$modes = $channel->getModes();
 		$userstr = $args[count($args)-1];
-		$modeparamcount = count($args)-3;
 		if($userstr[0] == "%") {
 			//ban list
 			$banlist = explode(" ", substr($userstr, 1));
@@ -452,10 +424,8 @@ class Uplink {
 				//TODO: save bans
 			}
 			$userstr = $args[count($args)-2];
-			$modeparamcount--;
 		}
 		if($userstr[0] == "+") { //MODE String
-			$modeparamcount++;
 			$userstr = "";
 		}
 		$users = explode(",",$userstr);
@@ -464,8 +434,8 @@ class Uplink {
 			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);
-				return;
+				trigger_error("burst parse error: '".$uexp[0]."' is not an user numeric.", E_USER_WARNING);
+				break;
 			}
 			if(count($uexp) > 1) {
 				$isop = false;
@@ -484,7 +454,9 @@ class Uplink {
 			if($this->eventHandler)
 				$this->eventHandler->event_join($user, $channel, true);
 		}
-		$modes->parseModes(implode(" ", array_slice($args, 2, $modeparamcount)));
+		$modestr = array_slice($args, 2);
+		if($modestr[0] == "+")
+			$modes->parseModes(implode(" ", $modestr));
 	}
 	
 	private function recv_join($from, $args) {
@@ -548,7 +520,7 @@ class Uplink {
 	private function recv_privmsg($from, $args) {
 		$user = P10_User::getUserByNum($from);
 		if($user == null) {
-			trigger_error("Server tries to send a privmsg from an user that does not exist or was not found on recv_privmsg.", E_USER_ERROR);
+			trigger_error("Server tries to send a privmsg from an user that does not exist or was not found on recv_privmsg.", E_USER_WARNING);
 			return;
 		}
 		if($this->eventHandler) {
@@ -556,14 +528,33 @@ class Uplink {
 				$channel = P10_Channel::getChannelByName($args[0]);
 				if($channel == null)
 					$channel = new P10_Channel($args[0]);
-				$this->eventHandler->event_chanmessage($user, $channel, $args[1]);
+				if(strlen($args[1]) > 0 && $args[1][0] == "\001") {
+					//ctcp
+					$args[1] = substr($args[1],1);
+					if($args[1][strlen($args[1])-1] == "\001")
+						$args[1] = substr($args[1],0,-1);
+					$ctcpexp = explode(" ",$args[1],2);
+					$this->eventHandler->event_chanctcp($user, $channel, strtoupper($ctcpexp[0]), (count($ctcpexp) > 1 ? $ctcpexp[1] : null));
+				} else
+					$this->eventHandler->event_chanmessage($user, $channel, $args[1]);
+			} else if($args[0][0] == "$") {
+				//"multicast"
+				$this->eventHandler->event_privmessage($user, NULL, $args[1]);
 			} else {
 				$targetUser = P10_User::getUserByNum($args[0]);
 				if($targetUser == null) {
-					trigger_error("Server tries to send a privmsg to an user that does not exist or was not found on recv_privmsg.", E_USER_ERROR);
+					trigger_error("Server tries to send a privmsg to an user that does not exist or was not found on recv_privmsg.", E_USER_WARNING);
 					return;
 				}
-				$this->eventHandler->event_privmessage($user, $targetUser, $args[1]);
+				if(strlen($args[1]) > 0 && $args[1][0] == "\001") {
+					//ctcp
+					$args[1] = substr($args[1],1);
+					if($args[1][strlen($args[1])-1] == "\001")
+						$args[1] = substr($args[1],0,-1);
+					$ctcpexp = explode(" ",$args[1],2);
+					$this->eventHandler->event_privctcp($user, $targetUser, strtoupper($ctcpexp[0]), (count($ctcpexp) > 1 ? $ctcpexp[1] : null));
+				} else
+					$this->eventHandler->event_privmessage($user, $targetUser, $args[1]);
 			}
 		}
 	}
@@ -571,7 +562,7 @@ class Uplink {
 	private function recv_notice($from, $args) {
 		$user = P10_User::getUserByNum($from);
 		if($user == null) {
-			trigger_error("Server tries to send a notice from an user that does not exist or was not found on recv_notice.", E_USER_ERROR);
+			trigger_error("Server tries to send a notice from an user that does not exist or was not found on recv_notice.", E_USER_WARNING);
 			return;
 		}
 		if($this->eventHandler) {
@@ -579,14 +570,33 @@ class Uplink {
 				$channel = P10_Channel::getChannelByName($args[0]);
 				if($channel == null)
 					$channel = new P10_Channel($args[0]);
-				$this->eventHandler->event_channotice($user, $channel, $args[1]);
+				if(strlen($args[1]) > 0 && $args[1][0] == "\001") {
+					//ctcp
+					$args[1] = substr($args[1],1);
+					if($args[1][strlen($args[1])-1] == "\001")
+						$args[1] = substr($args[1],0,-1);
+					$ctcpexp = explode(" ",$args[1],2);
+					$this->eventHandler->event_chanctcpreply($user, $channel, strtoupper($ctcpexp[0]), (count($ctcpexp) > 1 ? $ctcpexp[1] : null));
+				} else
+					$this->eventHandler->event_channotice($user, $channel, $args[1]);
+			} else if($args[0][0] == "$") {
+				//"multicast"
+				$this->eventHandler->event_privnotice($user, NULL, $args[1]);
 			} else {
 				$targetUser = P10_User::getUserByNum($args[0]);
 				if($targetUser == null) {
-					trigger_error("Server tries to send a notice to an user that does not exist or was not found on recv_notice.", E_USER_ERROR);
+					trigger_error("Server tries to send a notice to an user that does not exist or was not found on recv_notice.", E_USER_WARNING);
 					return;
 				}
-				$this->eventHandler->event_privnotice($user, $targetUser, $args[1]);
+				if(strlen($args[1]) > 0 && $args[1][0] == "\001") {
+					//ctcp
+					$args[1] = substr($args[1],1);
+					if($args[1][strlen($args[1])-1] == "\001")
+						$args[1] = substr($args[1],0,-1);
+					$ctcpexp = explode(" ",$args[1],2);
+					$this->eventHandler->event_privctcpreply($user, $targetUser, strtoupper($ctcpexp[0]), (count($ctcpexp) > 1 ? $ctcpexp[1] : null));
+				} else
+					$this->eventHandler->event_privnotice($user, $targetUser, $args[1]);
 			}
 		}
 	}
@@ -671,14 +681,18 @@ class Uplink {
 		}
 		if(count($args) > 0) {
 			$user->setAway($args[0]);
+			if($this->eventHandler)
+				$this->eventHandler->event_away($user, $args[0]);
 		} else {
 			$user->setAway(null);
+			if($this->eventHandler)
+				$this->eventHandler->event_away($user, null);
 		}
 	}
 	
 	private function recv_mode($from, $args) {
 		$user = P10_User::getUserByNum($from);
-		if($user == null) {
+		if($user == null && strlen($from) != 2) {
 			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;
 		}
@@ -688,7 +702,7 @@ class Uplink {
 			if($channel == null)
 				$channel = new P10_Channel($args[0]);
 			$channel->getModes()->setModes($modes);
-			if($this->eventHandler)
+			if($this->eventHandler && strlen($from) != 2)
 				$this->eventHandler->event_chanmode($user, $channel, $modes);
 		} else {
 			$targetUser = P10_User::getUserByNick($args[0]);
@@ -979,7 +993,13 @@ class Uplink {
 		}
 	}
 	
+	public function ctcp($user, $target, $command, $text) {
+		return $this->privmsg($user, $target, "\001".strtoupper($command)." ".$text."\001");
+	}
 	
+	public function ctcp_reply($user, $target, $command, $text) {
+		return $this->notice($user, $target, "\001".strtoupper($command)." ".$text."\001");
+	}
 	
 }