1 files changed, 69 insertions, 5 deletions
diff --git a/lib/private/app/infoparser.php b/lib/private/app/infoparser.php
index b4bdbea5c04..0bfbf6bd139 100644
--- a/lib/private/app/infoparser.php
+++ b/lib/private/app/infoparser.php
@@ -47,7 +47,7 @@ class InfoParser {
 		if ($xml == false) {
 			return null;
 		}
-		$array = json_decode(json_encode((array)$xml), TRUE);
+		$array = $this->xmlToArray($xml, false);
 		if (is_null($array)) {
 			return null;
 		}
@@ -60,8 +60,11 @@ class InfoParser {
 		if (!array_key_exists('public', $array)) {
 			$array['public'] = array();
 		}
+		if (!array_key_exists('types', $array)) {
+			$array['types'] = array();
+		}
 
-		if (array_key_exists('documentation', $array)) {
+		if (array_key_exists('documentation', $array) && is_array($array['documentation'])) {
 			foreach ($array['documentation'] as $key => $url) {
 				// If it is not an absolute URL we assume it is a key
 				// i.e. admin-ldap will get converted to go.php?to=admin-ldap
@@ -73,9 +76,70 @@ class InfoParser {
 			}
 		}
 		if (array_key_exists('types', $array)) {
-			foreach ($array['types'] as $type => $v) {
-				unset($array['types'][$type]);
-				$array['types'][] = $type;
+			if (is_array($array['types'])) {
+				foreach ($array['types'] as $type => $v) {
+					unset($array['types'][$type]);
+					if (is_string($type)) {
+						$array['types'][] = $type;
+					}
+				}
+			} else {
+				$array['types'] = array();
+			}
+		}
+
+		return $array;
+	}
+
+	/**
+	 * @param \SimpleXMLElement $xml
+	 * @return array
+	 */
+	function xmlToArray($xml) {
+		if (!$xml->children()) {
+			return (string)$xml;
+		}
+
+		$array = array();
+		foreach ($xml->children() as $element => $node) {
+			$totalElement = count($xml->{$element});
+
+			if (!isset($array[$element])) {
+				$array[$element] = "";
+			}
+			/**
+			 * @var \SimpleXMLElement $node
+			 */
+
+			// Has attributes
+			if ($attributes = $node->attributes()) {
+				$data = array(
+					'@attributes' => array(),
+				);
+				if (!count($node->children())){
+					$value = (string)$node;
+					if (!empty($value)) {
+						$data['@value'] = (string)$node;
+					}
+				} else {
+					$data = array_merge($data, $this->xmlToArray($node));
+				}
+				foreach ($attributes as $attr => $value) {
+					$data['@attributes'][$attr] = (string)$value;
+				}
+
+				if ($totalElement > 1) {
+					$array[$element][] = $data;
+				} else {
+					$array[$element] = $data;
+				}
+				// Just a value
+			} else {
+				if ($totalElement > 1) {
+					$array[$element][] = $this->xmlToArray($node);
+				} else {
+					$array[$element] = $this->xmlToArray($node);
+				}
 			}
 		}