Suppress XML logging of errors

diff --git a/src/Model/GServer.php b/src/Model/GServer.php
index 0f5f55ab671a19979fd4b1a02659d199a889fb24..bc189af9d6bb7567ff531884ed214a2aaaca44c9 100644 (file)
--- a/src/Model/GServer.php
+++ b/src/Model/GServer.php
@@ -747,7 +747,7 @@ class GServer
                        return false;
                }
 
-               $xrd = XML::parseString($curlResult->getBody(), false);
+               $xrd = XML::parseString($curlResult->getBody());
                if (!is_object($xrd)) {
                        return false;
                }
@@ -796,13 +796,13 @@ class GServer
                DBA::close($gcontacts);
 
                $apcontacts = DBA::select('apcontact', ['url'], ['baseurl' => [$url, $serverdata['nurl']]]);
-               while ($gcontact = DBA::fetch($gcontacts)) {
+               while ($apcontact = DBA::fetch($apcontacts)) {
                        $contacts[Strings::normaliseLink($apcontact['url'])] = $apcontact['url'];
                }
                DBA::close($apcontacts);
 
                $pcontacts = DBA::select('contact', ['url', 'nurl'], ['uid' => 0, 'baseurl' => [$url, $serverdata['nurl']]]);
-               while ($gcontact = DBA::fetch($gcontacts)) {
+               while ($pcontact = DBA::fetch($pcontacts)) {
                        $contacts[$pcontact['nurl']] = $pcontact['url'];
                }
                DBA::close($pcontacts);

diff --git a/src/Model/Item.php b/src/Model/Item.php
index bd8d03359ef3b19677d9ae23999c3a7b40dd4a59..97c96f6748b73f8ec6a16f3460216d398bfc29f6 100644 (file)
--- a/src/Model/Item.php
+++ b/src/Model/Item.php
@@ -1249,8 +1249,8 @@ class Item
                        return;
                }
 
-               $xo = XML::parseString($item["object"], false);
-               $xt = XML::parseString($item["target"], false);
+               $xo = XML::parseString($item["object"]);
+               $xt = XML::parseString($item["target"]);
 
                if ($xt->type != Activity\ObjectType::NOTE) {
                        return;

diff --git a/src/Network/Probe.php b/src/Network/Probe.php
index b5991934b4912d16caeec3b6b0204ca3631cc43f..1e6d8406a12697b58bc181708705ede0d4310fbe 100644 (file)
--- a/src/Network/Probe.php
+++ b/src/Network/Probe.php
@@ -160,7 +160,7 @@ class Probe
                $ssl_connection_error = ($curlResult->getErrorNumber() == CURLE_COULDNT_CONNECT) || ($curlResult->getReturnCode() == 0);
                if ($curlResult->isSuccess()) {
                        $xml = $curlResult->getBody();
-                       $xrd = XML::parseString($xml, false);
+                       $xrd = XML::parseString($xml, true);
                        if (!empty($url)) {
                                $host_url = 'https://' . $host;
                        } else {
@@ -185,7 +185,7 @@ class Probe
                        }
 
                        $xml = $curlResult->getBody();
-                       $xrd = XML::parseString($xml, false);
+                       $xrd = XML::parseString($xml, true);
                        $host_url = 'http://'.$host;
                }
                if (!is_object($xrd)) {
@@ -936,7 +936,7 @@ class Probe
                }
 
                // If it is not JSON, maybe it is XML
-               $xrd = XML::parseString($data, false);
+               $xrd = XML::parseString($data, true);
                if (!is_object($xrd)) {
                        Logger::log("No webfinger data retrievable for ".$url, Logger::DEBUG);
                        return false;

diff --git a/src/Protocol/ActivityPub/Transmitter.php b/src/Protocol/ActivityPub/Transmitter.php
index e35d833615abbdea8d31c5b30087d43015684c05..0e5056dbe5e83d3b3f49ad0da946bf94a651e2ec 100644 (file)
--- a/src/Protocol/ActivityPub/Transmitter.php
+++ b/src/Protocol/ActivityPub/Transmitter.php
@@ -1406,8 +1406,8 @@ class Transmitter
         */
        private static function createAddTag($item, $data)
        {
-               $object = XML::parseString($item['object'], false);
-               $target = XML::parseString($item["target"], false);
+               $object = XML::parseString($item['object']);
+               $target = XML::parseString($item["target"]);
 
                $data['diaspora:guid'] = $item['guid'];
                $data['actor'] = $item['author-link'];

diff --git a/src/Protocol/DFRN.php b/src/Protocol/DFRN.php
index f65a202f4818b8967b226346df7837503d0b1a11..4e5aac37d990d930bbda690e221d8e2d6c3a32dd 100644 (file)
--- a/src/Protocol/DFRN.php
+++ b/src/Protocol/DFRN.php
@@ -805,7 +805,7 @@ class DFRN
                if ($activity) {
                        $entry = $doc->createElement($element);
 
-                       $r = XML::parseString($activity, false);
+                       $r = XML::parseString($activity);
                        if (!$r) {
                                return false;
                        }
@@ -831,7 +831,7 @@ class DFRN
                                        $r->link = preg_replace('/\<link(.*?)\"\>/', '<link$1"/>', $r->link);
 
                                        // XML does need a single element as root element so we add a dummy element here
-                                       $data = XML::parseString("<dummy>" . $r->link . "</dummy>", false);
+                                       $data = XML::parseString("<dummy>" . $r->link . "</dummy>");
                                        if (is_object($data)) {
                                                foreach ($data->link as $link) {
                                                        $attributes = [];
@@ -2101,7 +2101,7 @@ class DFRN
                if (!$verb) {
                        return;
                }
-               $xo = XML::parseString($item["object"], false);
+               $xo = XML::parseString($item["object"]);
 
                if (($xo->type == Activity\ObjectType::PERSON) && ($xo->id)) {
                        // somebody was poked/prodded. Was it me?
@@ -2224,8 +2224,8 @@ class DFRN
                        }
 
                        if (($item["verb"] == Activity::TAG) && ($item["object-type"] == Activity\ObjectType::TAGTERM)) {
-                               $xo = XML::parseString($item["object"], false);
-                               $xt = XML::parseString($item["target"], false);
+                               $xo = XML::parseString($item["object"]);
+                               $xt = XML::parseString($item["target"]);
 
                                if ($xt->type == Activity\ObjectType::NOTE) {
                                        $item_tag = Item::selectFirst(['id', 'uri-id', 'tag'], ['uri' => $xt->id, 'uid' => $importer["importer_uid"]]);
@@ -2413,7 +2413,7 @@ class DFRN
                $item["object"] = self::transformActivity($xpath, $object, "object");
 
                if (trim($item["object"]) != "") {
-                       $r = XML::parseString($item["object"], false);
+                       $r = XML::parseString($item["object"]);
                        if (isset($r->type)) {
                                $item["object-type"] = $r->type;
                        }

diff --git a/src/Protocol/Diaspora.php b/src/Protocol/Diaspora.php
index fe6c328d9f6da63f76ea147606cced05f4c48ae1..7c4e19d923a7dda098576c1f9ffb350bef954200 100644 (file)
--- a/src/Protocol/Diaspora.php
+++ b/src/Protocol/Diaspora.php
@@ -325,7 +325,7 @@ class Diaspora
         */
        private static function verifyMagicEnvelope($envelope)
        {
-               $basedom = XML::parseString($envelope);
+               $basedom = XML::parseString($envelope, true);
 
                if (!is_object($basedom)) {
                        Logger::log("Envelope is no XML file");
@@ -451,7 +451,7 @@ class Diaspora
                        $xml = $raw;
                }
 
-               $basedom = XML::parseString($xml);
+               $basedom = XML::parseString($xml, true);
 
                if (!is_object($basedom)) {
                        Logger::log('Received data does not seem to be an XML. Discarding. '.$xml);

diff --git a/src/Util/XML.php b/src/Util/XML.php
index 9aba38910d6a7a0020e743d8f95ba30ec24690b2..4eed3a85f84eb511b0859521d75be1a34a99a760 100644 (file)
--- a/src/Util/XML.php
+++ b/src/Util/XML.php
@@ -433,18 +433,26 @@ class XML
                }
        }
 
-       public static function parseString($s, $strict = true)
+       /**
+        * Parse XML string
+        *
+        * @param string  $s
+        * @param boolean $suppress_log
+        * @return Object
+        */
+       public static function parseString(string $s, bool $suppress_log = false)
        {
-               // the "strict" parameter is deactivated
                libxml_use_internal_errors(true);
 
                $x = @simplexml_load_string($s);
                if (!$x) {
-                       Logger::error('Error(s) while parsing XML string.', ['callstack' => System::callstack()]);
-                       foreach (libxml_get_errors() as $err) {
-                               Logger::info('libxml error', ['code' => $err->code, 'position' => $err->line . ":" . $err->column, 'message' => $err->message]);
+                       if (!$suppress_log) {
+                               Logger::error('Error(s) while parsing XML string.', ['callstack' => System::callstack()]);
+                               foreach (libxml_get_errors() as $err) {
+                                       Logger::info('libxml error', ['code' => $err->code, 'position' => $err->line . ":" . $err->column, 'message' => $err->message]);
+                               }
+                               Logger::debug('Erroring XML string', ['xml' => $s]);
                        }
-                       Logger::debug('Erroring XML string', ['xml' => $s]);
                        libxml_clear_errors();
                }
                return $x;