X-Git-Url: http://git.pk910.de/?p=PHP-P10.git;a=blobdiff_plain;f=Uplink%2FUplink.class.php;h=9d88ae523af513b05e5dd9b2223c2d1a0324767d;hp=9f3eb52c211e13eacc59fb3a8d24f29fcbffbd08;hb=0f30e96ae37491aee19e72b89cc54a6798d1f254;hpb=612c2da61421761d4f7797eacb33783dbc31f316

diff --git a/Uplink/Uplink.class.php b/Uplink/Uplink.class.php
index 9f3eb52..9d88ae5 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");
@@ -75,7 +44,7 @@ class Uplink {
 	private $settings = array();
 	private $server;
 	private $eventHandler = null;
-	private $last_local_numeric = 1;
+	private $last_local_numeric = 0;
 	
 	const FLAG_P10SESSION      = 0x0001; //connection is in P10 mode (server is connected)
 	const FLAG_SECURITY_QUIT   = 0x0002; //local connection abort because of security issues
@@ -556,14 +525,30 @@ 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 {
 				$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);
 					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]);
 			}
 		}
 	}
@@ -579,14 +564,30 @@ 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 {
 				$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);
 					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,8 +672,12 @@ 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);
 		}
 	}
 	
@@ -713,7 +718,7 @@ class Uplink {
 			$ident = $user->getIdent();
 			$host = $user->getHost();
 			$modes = $user->getModes()->getModeString();
-			$ip = Numerics::numericFromIP($user->getIP());
+			$ip = $user->getIP()->getNumeric();
 			$numeric = $user->getNumeric();
 			$realname = $user->getRealname();
 			$this->send("N", $nick, $connect_time, $ident, $host, $modes, $ip, $numeric, $realname);