Merge remote-tracking branch 'upstream/master' into social-master

[quix0rs-gnu-social.git] / plugins / Xmpp / lib / xmppmanager.php

diff --git a/plugins/Xmpp/lib/xmppmanager.php b/plugins/Xmpp/lib/xmppmanager.php
index c7d4c15dd6987568a8f182ab01a4d0acb0ef5637..954639f18019ce82f4d238f7d53e7b32dc931e04 100644 (file)
--- a/plugins/Xmpp/lib/xmppmanager.php
+++ b/plugins/Xmpp/lib/xmppmanager.php
@@ -81,7 +81,7 @@ class XmppManager extends ImManager
     {
         // Process the queue for as long as needed
         try {
-            common_log(LOG_DEBUG, "Servicing the XMPP queue.");
+            common_debug("Servicing the XMPP queue.");
             $this->stats('xmpp_process');
             $this->conn->processTime(0);
         } catch (XMPPHP_Exception $e) {
@@ -131,7 +131,7 @@ class XmppManager extends ImManager
     {
         if (!$this->conn || $this->conn->isDisconnected()) {
             $resource = 'queue' . posix_getpid();
-            $this->conn = new Sharing_XMPP($this->plugin->host ?
+            $this->conn = new SharingXMPP($this->plugin->host ?
                                     $this->plugin->host :
                                     $this->plugin->server,
                                     $this->plugin->port,
@@ -182,7 +182,7 @@ class XmppManager extends ImManager
             $this->pingid++;
         }
 
-        common_log(LOG_DEBUG, "Sending ping #{$this->pingid}");
+        common_debug("Sending ping #{$this->pingid}");
                $this->conn->send("<iq from='{" . $this->plugin->daemonScreenname() . "}' to='{$this->plugin->server}' id='ping_{$this->pingid}' type='get'><ping xmlns='urn:xmpp:ping'/></iq>");
         $this->lastping = $now;
         return true;