X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=include%2Fxml.php;h=f45d6cade0cdcf3272ae949ae4bf78ef75f115d9;hb=497fd34026fbaa83b11a64d3a0a6e20f1360e5d6;hp=ed2f49fb7fbb4836905785cb4125db9a8746fbc9;hpb=cb3704ab436c8e3d0b43e101e54465d9ff3f5a44;p=friendica.git

diff --git a/include/xml.php b/include/xml.php
index ed2f49fb7f..f45d6cade0 100644
--- a/include/xml.php
+++ b/include/xml.php
@@ -27,8 +27,11 @@ class xml {
 				foreach ($namespaces AS $nskey => $nsvalue)
 					$key .= " xmlns".($nskey == "" ? "":":").$nskey.'="'.$nsvalue.'"';
 
-				$root = new SimpleXMLElement("<".$key."/>");
-				self::from_array($value, $root, $remove_header, $namespaces, false);
+				if (is_array($value)) {
+					$root = new SimpleXMLElement("<".$key."/>");
+					self::from_array($value, $root, $remove_header, $namespaces, false);
+				} else
+					$root = new SimpleXMLElement("<".$key.">".xmlify($value)."</".$key.">");
 
 				$dom = dom_import_simplexml($root)->ownerDocument;
 				$dom->formatOutput = true;
@@ -44,6 +47,20 @@ class xml {
 		}
 
 		foreach($array as $key => $value) {
+			if (!isset($element) AND isset($xml))
+				$element = $xml;
+
+			if (is_integer($key)) {
+				if (isset($element)) {
+					if (is_scalar($value)) {
+						$element[0] = $value;
+					} else {
+						/// @todo: handle nested array values
+					}
+				}
+				continue;
+			}
+
 			if (substr($key, 0, 11) == "@attributes") {
 				if (!isset($element) OR !is_array($value))
 					continue;
@@ -55,7 +72,7 @@ class xml {
 					else
 						$namespace = NULL;
 
-					$element->addAttribute ($attr_key, $attr_value, $namespace);
+					$element->addAttribute($attr_key, $attr_value, $namespace);
 				}
 
 				continue;
@@ -64,6 +81,8 @@ class xml {
 			$element_parts = explode(":", $key);
 			if ((count($element_parts) > 1) AND isset($namespaces[$element_parts[0]]))
 				$namespace = $namespaces[$element_parts[0]];
+			elseif (isset($namespaces[""]))
+				$namespace = $namespaces[""];
 			else
 				$namespace = NULL;
 
@@ -131,11 +150,11 @@ class xml {
 	/**
 	 * @brief Convert an XML document to a normalised, case-corrected array
 	 *   used by webfinger
-	 * 
+	 *
 	 * @param object $xml_element The XML document
-	 * @param integer $recursion_depth recursion counter for internal use - default 0 
+	 * @param integer $recursion_depth recursion counter for internal use - default 0
 	 *    internal use, recursion counter
-	 * 
+	 *
 	 * @return array | sring The array from the xml element or the string
 	 */
 	public static function element_to_array($xml_element, &$recursion_depth=0) {
@@ -181,23 +200,23 @@ class xml {
 
 	/**
 	 * @brief Convert the given XML text to an array in the XML structure.
-	 * 
+	 *
 	 * xml::to_array() will convert the given XML text to an array in the XML structure.
 	 * Link: http://www.bin-co.com/php/scripts/xml2array/
 	 * Portions significantly re-written by mike@macgirvin.com for Friendica
 	 * (namespaces, lowercase tags, get_attribute default changed, more...)
-	 * 
+	 *
 	 * Examples: $array =  xml::to_array(file_get_contents('feed.xml'));
 	 *		$array =  xml::to_array(file_get_contents('feed.xml', true, 1, 'attribute'));
-	 * 
+	 *
 	 * @param object $contents The XML text
 	 * @param boolean $namespaces True or false include namespace information
 	 *	in the returned array as array elements.
-	 * @param integer $get_attributes 1 or 0. If this is 1 the function will get the attributes as well as the tag values - 
+	 * @param integer $get_attributes 1 or 0. If this is 1 the function will get the attributes as well as the tag values -
 	 *	this results in a different array structure in the return value.
 	 * @param string $priority Can be 'tag' or 'attribute'. This will change the way the resulting
 	 *	 array sturcture. For 'tag', the tags are given more importance.
-	 * 
+	 *
 	 * @return array The parsed XML in an array form. Use print_r() to see the resulting array structure.
 	 */
 	public static function to_array($contents, $namespaces = true, $get_attributes=1, $priority = 'attribute') {