syntax & bug fixes (first startable version)

[PHP-P10.git] / Uplink / Uplink.class.php

diff --git a/Uplink/Uplink.class.php b/Uplink/Uplink.class.php
index 0095445030321de298caf5bafc0a64d26ef4689c..f0637b03d41ef32f7522f3643c626da4966b2204 100644 (file)
--- a/Uplink/Uplink.class.php
+++ b/Uplink/Uplink.class.php
@@ -55,7 +55,7 @@ require_once("P10_User.class.php");
 require_once("P10_ModeSets.class.php");
 
 class Uplink {
-       private $client = new Client();
+       private $client;
        private $settings = array();
        private $server;
        
@@ -66,7 +66,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 +105,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 +122,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);