aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFlorian Schmaus <flo@geekplace.eu>2017-08-19 17:55:47 +0200
committerFlorian Schmaus <flo@geekplace.eu>2017-08-19 17:55:47 +0200
commite6150323317fb5c37e54a1ac3637b0dfa87038c6 (patch)
treec43e4b620f558dbf96176a9d4b6c151343ab7a54
parent77852192346b858f783a96d4f4a8bbe7e672a1e2 (diff)
downloadgnu-social-e6150323317fb5c37e54a1ac3637b0dfa87038c6.tar
gnu-social-e6150323317fb5c37e54a1ac3637b0dfa87038c6.zip
Fix PHP incompatibilities in XMPPHP
This fixes the following to errors in XMPPHP: Stack trace: 0 [internal function]: XMPPHP_XMLStream->endXML(Resource id 150, 'STREAM:FEATURES') 1 /var/vhosts/example.org/plugins/Xmpp/extlib/XMPPHP/XMLStream.php(420): xml_parse(Resource id 150, '<?xml version='...', false) 2 /var/vhosts/example.org/plugins/Xmpp/extlib/XMPPHP/XMLStream.php(471): XMPPHP_XMLStream->__process() 3 /var/vhosts/example.org/plugins/Xmpp/lib/xmppmanager.php(165): XMPPHP_XMLStream->processUntil(Array) 4 /var/vhosts/example.org/plugins/Xmpp/lib/xmppmanager.php(49): XmppManager->connect() 5 /var/vhosts/example.org/lib/iomaster.php(248): XmppManager->start(Object(ImMaster)) 6 /var/vhosts/example.org/lib/iomaster.php(111): IoMaster->start() 7 /var/vhosts/example.org/scripts/imdaemon.php(58): IoMaster->service() 8 /var/vhosts/example.org/lib/spawningdaemon.php(189): ImDaemon->runThread() in /var/vhosts/example.org/plugins/Xmpp/extlib/XMPPHP/XMLStream.php on line 567 PHP Fatal error: Uncaught Error: Function name must be a string in /var/vhosts/example.org/plugins/Xmpp/extlib/XMPPHP/XMLStream.php:567 PHP Fatal error: Uncaught Error: Call to undefined function split() in /var/vhosts/example.org/plugins/Xmpp/extlib/XMPPHP/XMLStream.php:266 Stack trace: 0 /var/vhosts/example.org/plugins/Xmpp/extlib/XMPPHP/XMPP.php(129): XMPPHP_XMLStream->addXPathHandler('{http://etherx....', 'features_handle...') 1 /var/vhosts/example.org/plugins/Xmpp/lib/xmppmanager.php(145): XMPPHP_XMPP->__construct('geekplace.eu', 5222, 'gnusocial', 'U^k&l5fV53duGy', 'gnusocial', 'geekplace.eu', false, NULL) 2 /var/vhosts/example.org/plugins/Xmpp/lib/xmppmanager.php(49): XmppManager->connect() 3 /var/vhosts/example.org/lib/iomaster.php(248): XmppManager->start(Object(ImMaster)) 4 /var/vhosts/example.org/lib/iomaster.php(111): IoMaster->start() 5 /var/vhosts/example.org/scripts/imdaemon.php(58): IoMaster->service() 6 /var/vhosts/example.org/lib/spawningdaemon.php(189): ImDaemon->runThread() 7 /var/vhosts/example.org/lib/spawningdaemon.php(118): SpawningDaemon->initAndRunChild(1 in /var/vhosts/example.org/plugins/Xmpp/extlib/XMPPHP/XMLStream.php on line 266
-rw-r--r--plugins/Xmpp/extlib/XMPPHP/Roster.php4
-rw-r--r--plugins/Xmpp/extlib/XMPPHP/XMLStream.php8
2 files changed, 6 insertions, 6 deletions
diff --git a/plugins/Xmpp/extlib/XMPPHP/Roster.php b/plugins/Xmpp/extlib/XMPPHP/Roster.php
index 2e459e2a2f..69457b22a1 100644
--- a/plugins/Xmpp/extlib/XMPPHP/Roster.php
+++ b/plugins/Xmpp/extlib/XMPPHP/Roster.php
@@ -118,7 +118,7 @@ class Roster {
* @param string $status
*/
public function setPresence($presence, $priority, $show, $status) {
- list($jid, $resource) = split("/", $presence);
+ list($jid, $resource) = explode("/", $presence);
if ($show != 'unavailable') {
if (!$this->isContact($jid)) {
$this->addContact($jid, 'not-in-roster');
@@ -137,7 +137,7 @@ class Roster {
* @param string $jid
*/
public function getPresence($jid) {
- $split = split("/", $jid);
+ $split = explode("/", $jid);
$jid = $split[0];
if($this->isContact($jid)) {
$current = array('resource' => '', 'active' => '', 'priority' => -129, 'show' => '', 'status' => ''); //Priorities can only be -128 = 127
diff --git a/plugins/Xmpp/extlib/XMPPHP/XMLStream.php b/plugins/Xmpp/extlib/XMPPHP/XMLStream.php
index d33411ec54..eefa84531c 100644
--- a/plugins/Xmpp/extlib/XMPPHP/XMLStream.php
+++ b/plugins/Xmpp/extlib/XMPPHP/XMLStream.php
@@ -263,7 +263,7 @@ class XMPPHP_XMLStream {
$ns_tags = array($xpath);
}
foreach($ns_tags as $ns_tag) {
- list($l, $r) = split("}", $ns_tag);
+ list($l, $r) = explode("}", $ns_tag);
if ($r != null) {
$xpart = array(substr($l, 1), $r);
} else {
@@ -564,7 +564,7 @@ class XMPPHP_XMLStream {
if ($searchxml !== null) {
if($handler[2] === null) $handler[2] = $this;
$this->log->log("Calling {$handler[1]}", XMPPHP_Log::LEVEL_DEBUG);
- $handler[2]->$handler[1]($this->xmlobj[2]);
+ $handler[2]->{$handler[1]}($this->xmlobj[2]);
}
}
}
@@ -584,7 +584,7 @@ class XMPPHP_XMLStream {
foreach($this->idhandlers as $id => $handler) {
if(array_key_exists('id', $this->xmlobj[2]->attrs) and $this->xmlobj[2]->attrs['id'] == $id) {
if($handler[1] === null) $handler[1] = $this;
- $handler[1]->$handler[0]($this->xmlobj[2]);
+ $handler[1]->{$handler[0]}($this->xmlobj[2]);
#id handlers are only used once
unset($this->idhandlers[$id]);
break;
@@ -640,7 +640,7 @@ class XMPPHP_XMLStream {
if($handler[2] === null) {
$handler[2] = $this;
}
- $handler[2]->$handler[1]($payload);
+ $handler[2]->{$handler[1]}($payload);
}
}
foreach($this->until as $key => $until) {