variable name conflict on reconnect

darcs-hash:20080902172039-84dde-2b1bbac407959af2a5ca0c764aa503f0cb05c785.gz

diff --git a/extlib/XMPPHP/XMLStream.php b/extlib/XMPPHP/XMLStream.php
index b27811407913a8379128428e6658c40d751cc762..3916abea239c79dfa8238824e6023387c72d229d 100644 (file)
--- a/extlib/XMPPHP/XMLStream.php
+++ b/extlib/XMPPHP/XMLStream.php
@@ -156,7 +156,7 @@ class XMPPHP_XMLStream {
        /**
         * @var integer
         */
-       protected $reconnect = 30;
+       protected $reconnectTimeout = 30;
 
        /**
         * Constructor
@@ -296,14 +296,14 @@ class XMPPHP_XMLStream {
         */
        public function doReconnect() {
                if(!$this->is_server) {
-                       $this->log->log("Reconnecting ($this->reconnect)...",  XMPPHP_Log::LEVEL_WARNING);
-                       $this->connect($this->reconnect, false, false);
+                       $this->log->log("Reconnecting ($this->reconnectTimeout)...",  XMPPHP_Log::LEVEL_WARNING);
+                       $this->connect($this->reconnectTimeout, false, false);
                        $this->reset();
                        $this->event('reconnect');
                }
        }
 
-       public function reconnectTimeout($timeout) {
+       public function setReconnectTimeout($timeout) {
                $this->reconnect = $timeout;
        }
        

diff --git a/scripts/publicqueuehandler.php b/scripts/publicqueuehandler.php
index 366c1e5c394e71342f0b6e424be194ee159c6a8a..fa4270f09f6335f3124e8e13a2c530f14ea91262 100755 (executable)
--- a/scripts/publicqueuehandler.php
+++ b/scripts/publicqueuehandler.php
@@ -47,7 +47,7 @@ class PublicQueueHandler extends QueueHandler {
                if ($this->conn) {
                        $this->conn->addEventHandler('message', 'forward_message', $this);
                        $this->conn->addEventHandler('reconnect', 'handle_reconnect', $this);
-                       $this->conn->reconnectTimeout(600);
+                       $this->conn->setReconnectTimeout(600);
                        jabber_send_presence("Send me a message to post an notice", 'available', NULL, 'available', -1);
                }
                return !is_null($this->conn);

diff --git a/scripts/xmppconfirmhandler.php b/scripts/xmppconfirmhandler.php
index 3b69d8e8fbb48f8dfefeadb499102df67fdfc472..00b5d63b205865efb2a4491edb890433d6b0ddab 100755 (executable)
--- a/scripts/xmppconfirmhandler.php
+++ b/scripts/xmppconfirmhandler.php
@@ -52,7 +52,7 @@ class XmppConfirmHandler {
                if ($this->conn) {
                        $this->conn->addEventHandler('message', 'forward_message', $this);
                        $this->conn->addEventHandler('reconnect', 'handle_reconnect', $this);
-                       $this->conn->reconnectTimeout(600);
+                       $this->conn->setReconnectTimeout(600);
                        jabber_send_presence("Send me a message to post an notice", 'available', NULL, 'available', -1);
                }
                return !is_null($this->conn);

diff --git a/scripts/xmppdaemon.php b/scripts/xmppdaemon.php
index 3e866761c332e5dffb8e4303a9f140f7f05f665f..c29b14b7bd22e53f806f4b01d443da30d42e1053 100755 (executable)
--- a/scripts/xmppdaemon.php
+++ b/scripts/xmppdaemon.php
@@ -67,7 +67,7 @@ class XMPPDaemon {
                        return false;
                }
                
-               $this->conn->reconnectTimeout(600);
+               $this->conn->setReconnectTimeout(600);
                
                jabber_send_presence("Send me a message to post a notice", 'available',
                                                         NULL, 'available', 100);

diff --git a/scripts/xmppqueuehandler.php b/scripts/xmppqueuehandler.php
index 80fb533810dc543edfb67c9bb82096c93f00c009..8b4470d3e369e50ef0dce90767f640114a039938 100755 (executable)
--- a/scripts/xmppqueuehandler.php
+++ b/scripts/xmppqueuehandler.php
@@ -46,7 +46,7 @@ class XmppQueueHandler extends QueueHandler {
                # Low priority; we don't want to receive messages
                $this->conn = jabber_connect($this->_id);
                if ($this->conn) {
-                       $this->conn->reconnectTimeout(600);
+                       $this->conn->setReconnectTimeout(600);
                        $this->conn->addEventHandler('message', 'forward_message', $this);
                        $this->conn->addEventHandler('reconnect', 'handle_reconnect', $this);
                        jabber_send_presence("Send me a message to post an notice", 'available', NULL, 'available', -1);