Standardized code in all of core, not including language files, tests, or core mods.

git-svn-id: http://code.elgg.org/elgg/trunk@7124 36083f99-b078-4883-b0ff-0f9b5a30f544

1 files changed, 137 insertions, 132 deletions

diff --git a/engine/lib/xml.php b/engine/lib/xml.php
index bc52815f2..0d0d83da0 100644
--- a/engine/lib/xml.php
+++ b/engine/lib/xml.php
@@ -1,142 +1,147 @@
 <?php
-	/**
-	 * Elgg XML library.
-	 * Contains functions for generating and parsing XML.
-	 * 
-	 * @package Elgg
-	 * @subpackage Core
-	 */
-
-	/**
-	 * This function serialises an object recursively into an XML representation.
-	 * The function attempts to call $data->export() which expects a stdClass in return, otherwise it will attempt to
-	 * get the object variables using get_object_vars (which will only return public variables!)
-	 * @param $data object The object to serialise.
-	 * @param $n int Level, only used for recursion.
-	 * @return string The serialised XML output.
-	 */
-	function serialise_object_to_xml($data, $name = "", $n = 0)
-	{
-		$classname = ($name=="" ? get_class($data) : $name);
-		
-		$vars = method_exists($data, "export") ? get_object_vars($data->export()) : get_object_vars($data); 
-		
-		$output = "";
-		
-		if (($n==0) || ( is_object($data) && !($data instanceof stdClass))) {
-			$output = "<$classname>";
-		}
-		
-		foreach ($vars as $key => $value) {
-			$output .= "<$key type=\"".gettype($value)."\">";
-			
-			if (is_object($value)) {
-				$output .= serialise_object_to_xml($value, $key, $n+1);
-			} else if (is_array($value)) {
-				$output .= serialise_array_to_xml($value, $n+1);
-			} else if (gettype($value) == "boolean") {
-				$output .= $value ? "true" : "false";
-			} else {
-				$output .= htmlspecialchars($value, ENT_NOQUOTES, 'UTF-8');
-			}
-			
-			$output .= "</$key>\n";
-		}
-		
-		if (($n==0) || ( is_object($data) && !($data instanceof stdClass))) {
-			$output .= "</$classname>\n";
-		}
-		
-		return $output;
+/**
+ * Elgg XML library.
+ * Contains functions for generating and parsing XML.
+ *
+ * @package Elgg.Core
+ * @subpackage XML
+ */
+
+/**
+ * This function serialises an object recursively into an XML representation.
+ *
+ * The function attempts to call $data->export() which expects a stdClass in return,
+ * otherwise it will attempt to get the object variables using get_object_vars (which
+ * will only return public variables!)
+ *
+ * @param mixed  $data The object to serialise.
+ * @param string $name The name?
+ * @param int    $n    Level, only used for recursion.
+ *
+ * @return string The serialised XML output.
+ */
+function serialise_object_to_xml($data, $name = "", $n = 0) {
+	$classname = ($name == "" ? get_class($data) : $name);
+
+	$vars = method_exists($data, "export") ? get_object_vars($data->export()) : get_object_vars($data);
+
+	$output = "";
+
+	if (($n == 0) || ( is_object($data) && !($data instanceof stdClass))) {
+		$output = "<$classname>";
 	}
 
-	/**
-	 * Serialise an array.
-	 *
-	 * @param array $data
-	 * @param int $n Used for recursion
-	 * @return string
-	 */
-	function serialise_array_to_xml(array $data, $n = 0)
-	{
-		$output = "";
-		
-		if ($n==0) {
-			$output = "<array>\n";
+	foreach ($vars as $key => $value) {
+		$output .= "<$key type=\"" . gettype($value) . "\">";
+
+		if (is_object($value)) {
+			$output .= serialise_object_to_xml($value, $key, $n + 1);
+		} else if (is_array($value)) {
+			$output .= serialise_array_to_xml($value, $n + 1);
+		} else if (gettype($value) == "boolean") {
+			$output .= $value ? "true" : "false";
+		} else {
+			$output .= htmlspecialchars($value, ENT_NOQUOTES, 'UTF-8');
 		}
-		
-		foreach ($data as $key => $value) {
-			$item = "array_item";
-			
-			if (is_numeric($key)) {
-				$output .= "<$item name=\"$key\" type=\"".gettype($value)."\">";
-			} else {
-				$item = $key;
-				$output .= "<$item type=\"".gettype($value)."\">";
-			}
-			
-			if (is_object($value)) {
-				$output .= serialise_object_to_xml($value, "", $n+1);
-			} else if (is_array($value)) {
-				$output .= serialise_array_to_xml($value, $n+1);
-			} else if (gettype($value) == "boolean") {
-				$output .= $value ? "true" : "false";
-			} else {
-				$output .= htmlspecialchars($value, ENT_NOQUOTES, 'UTF-8');
-			}
-			
-			$output .= "</$item>\n";
+
+		$output .= "</$key>\n";
+	}
+
+	if (($n == 0) || (is_object($data) && !($data instanceof stdClass))) {
+		$output .= "</$classname>\n";
+	}
+
+	return $output;
+}
+
+/**
+ * Serialise an array.
+ *
+ * @param array $data The data to serialize
+ * @param int   $n    Used for recursion
+ *
+ * @return string
+ */
+function serialise_array_to_xml(array $data, $n = 0) {
+	$output = "";
+
+	if ($n == 0) {
+		$output = "<array>\n";
+	}
+
+	foreach ($data as $key => $value) {
+		$item = "array_item";
+
+		if (is_numeric($key)) {
+			$output .= "<$item name=\"$key\" type=\"" . gettype($value) . "\">";
+		} else {
+			$item = $key;
+			$output .= "<$item type=\"" . gettype($value) . "\">";
 		}
-		
-		if ($n==0) {
-			$output .= "</array>\n";
+
+		if (is_object($value)) {
+			$output .= serialise_object_to_xml($value, "", $n + 1);
+		} else if (is_array($value)) {
+			$output .= serialise_array_to_xml($value, $n + 1);
+		} else if (gettype($value) == "boolean") {
+			$output .= $value ? "true" : "false";
+		} else {
+			$output .= htmlspecialchars($value, ENT_NOQUOTES, 'UTF-8');
 		}
-		
-		return $output;
+
+		$output .= "</$item>\n";
 	}
-	
-	/**
-	 * Parse an XML file into an object.
-	 * Based on code from http://de.php.net/manual/en/function.xml-parse-into-struct.php by
-	 * efredricksen at gmail dot com
-	 * 
-	 * @param string $xml The XML.
-	 */
-	function xml_to_object($xml)
-	{
-		$parser = xml_parser_create();
-		
-		// Parse $xml into a structure
-		xml_parser_set_option($parser, XML_OPTION_SKIP_WHITE, 1);
-		xml_parser_set_option($parser, XML_OPTION_CASE_FOLDING, 0);	
-		xml_parse_into_struct($parser, $xml, $tags);
-		
-		xml_parser_free($parser);
-		
-		$elements = array(); 
-		$stack = array();
-		
-		foreach ($tags as $tag) {
-			$index = count($elements);
-			
-			if ($tag['type'] == "complete" || $tag['type'] == "open") {
-				$elements[$index] = new XmlElement;
-				$elements[$index]->name = $tag['tag'];
-				$elements[$index]->attributes = $tag['attributes'];
-				$elements[$index]->content = $tag['value'];
-				
-				if ($tag['type'] == "open") { 
-					$elements[$index]->children = array();
-					$stack[count($stack)] = &$elements;
-					$elements = &$elements[$index]->children;
-				}
-			}
-			
-			if ($tag['type'] == "close") {
-				$elements = &$stack[count($stack) - 1];
-				unset($stack[count($stack) - 1]);
+
+	if ($n == 0) {
+		$output .= "</array>\n";
+	}
+
+	return $output;
+}
+
+/**
+ * Parse an XML file into an object.
+ * Based on code from http://de.php.net/manual/en/function.xml-parse-into-struct.php by
+ * efredricksen at gmail dot com
+ *
+ * @param string $xml The XML
+ *
+ * @return object
+ */
+function xml_to_object($xml) {
+	$parser = xml_parser_create();
+
+	// Parse $xml into a structure
+	xml_parser_set_option($parser, XML_OPTION_SKIP_WHITE, 1);
+	xml_parser_set_option($parser, XML_OPTION_CASE_FOLDING, 0);
+	xml_parse_into_struct($parser, $xml, $tags);
+
+	xml_parser_free($parser);
+
+	$elements = array();
+	$stack = array();
+
+	foreach ($tags as $tag) {
+		$index = count($elements);
+
+		if ($tag['type'] == "complete" || $tag['type'] == "open") {
+			$elements[$index] = new XmlElement;
+			$elements[$index]->name = $tag['tag'];
+			$elements[$index]->attributes = $tag['attributes'];
+			$elements[$index]->content = $tag['value'];
+
+			if ($tag['type'] == "open") {
+				$elements[$index]->children = array();
+				$stack[count($stack)] = &$elements;
+				$elements = &$elements[$index]->children;
 			}
 		}
-		
-		return $elements[0];
+
+		if ($tag['type'] == "close") {
+			$elements = &$stack[count($stack) - 1];
+			unset($stack[count($stack) - 1]);
+		}
 	}
+
+	return $elements[0];
+}