Merge pull request #234 from KennyDs/beta

Added extra API user variable + XML attribute possibility

Author: chriskacerguis

application/libraries/Format.php

@@ -127,15 +127,24 @@ public function to_xml($data = null, $structure = null, $basenode = 'xml')
 			// replace anything not alpha numeric
 			$key = preg_replace('/[^a-z_\-0-9]/i', '', $key);
 
+			if ($key === '_attributes' && (is_array($value) || is_object($value)))
+			{
+				$attributes = $value;
+				if (is_object($attributes)) $attributes = get_object_vars($attributes);
+				
+				foreach ($attributes as $attributeName => $attributeValue)
+				{
+					$structure->addAttribute($attributeName, $attributeValue);
+				}
+			}
 			// if there is another array found recursively call this function
-			if (is_array($value) || is_object($value))
+			else if (is_array($value) || is_object($value))
 			{
 				$node = $structure->addChild($key);
 
 				// recursive call.
 				$this->to_xml($value, $node, $key);
 			}
-
 			else
 			{
 				// add single node.

application/libraries/REST_Controller.php

@@ -172,6 +172,13 @@ abstract class REST_Controller extends CI_Controller
 		'html' => 'text/html',
 		'csv' => 'application/csv'
 	);
+	
+	/**
+	 * Information about the current API user
+	 * 
+	 * @var object
+	 */
+	protected $_apiuser;
 
 	/**
 	 * Developers can extend this class and add a check in here.
@@ -692,6 +699,8 @@ protected function _detect_api_key()
 			isset($row->level) AND $this->rest->level = $row->level;
 			isset($row->ignore_limits) AND $this->rest->ignore_limits = $row->ignore_limits;
 
+			$this->_apiuser =  $row;
+			
 			/*
 			 * If "is private key" is enabled, compare the ip address with the list
 			 * of valid ip addresses stored in the database.