X-Git-Url: http://git.pk910.de/?p=PHP-P10.git;a=blobdiff_plain;f=Uplink%2FClient.class.php;h=a8d946e9beaf7ca7ffd7b7143279aabadcd0d9a0;hp=1c3f778189cc69ad91f9394fc8e67f0f827b3f5c;hb=811bc0c7a1f583fb624a0f8c3601146e063c5a25;hpb=3927f0cb5827f9da038702bb0f7a8efd69b34aa7

diff --git a/Uplink/Client.class.php b/Uplink/Client.class.php
index 1c3f778..a8d946e 100644
--- a/Uplink/Client.class.php
+++ b/Uplink/Client.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-2012  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,29 +21,6 @@
  *
  * This file contains the basic Client Socket.
  *
- ************************************************************************
- * accessable methods:
- *
- * bool connect(String $host, int $port, String $bind = null, bool $ssl = false, int $blocking = 0)
- *     connects the socket to $host:$port with the provided options
- *
- * void disconnect()
- *     disconnects the socket
- *
- * bool connected()
- *     returns the state of the socket (true if the socket is connected with the server)
- *
- * String[] recv()
- *     tries to receive datas from the socket. Returns null or a array containing the lines received.
- *     this method BLOCKS THE SCRIPT EXECUTION for the defined time if $blocking is set on connect().
- *
- * void send(String $line, String $newline = "\r\n")
- *     tries to send datas through the socket.
- *
- * Array[] getTraffic()
- *     returns an array containing the traffic the socket has received and sent.
- *     index in = incoming (received) traffic count
-       index out = outgoing (sent) traffic count
  */
 
 class Client {
@@ -104,7 +78,7 @@ class Client {
 			while(($line = @fgets($this->socket)) != null) {
 				$line=trim($line);
 				if(!empty($line)) {
-					echo"[recv] ".$line."\n";
+					echo"[recv] ".utf8_decode($line)."\n";
 					$this->traffic['in'] += strlen($line);
 					$lines[] = $line;
 					if(count($lines) >= self::CLIENT_RECV_MAX_LINES) break;
@@ -117,7 +91,7 @@ class Client {
 	
 	public function send($line, $newline = "\r\n") {
 		if($this->socket == null) return;
-		echo"[send] ".$line."\n";
+		echo"[send] ".utf8_decode($line)."\n";
 		$this->traffic['out'] += strlen($line);
 		fwrite($this->socket,$line.$newline);
 	}