Fixes fuel#792: Made it possible to specify xml basenode in rest cont…

…rollers.

classes/controller/rest.php

@@ -35,6 +35,11 @@ abstract class Controller_Rest extends \Controller
 	 */
 	protected $http_status = null;
 
+	/**
+	 * @var  string  xml basenode name
+	 */
+	protected $xml_basenode = null;
+
 	/**
 	 * @var  array  List all supported methods
 	 */
@@ -165,8 +170,21 @@ protected function response($data = array(), $http_status = null)
 			// Set the correct format header
 			$this->response->set_header('Content-Type', $this->_supported_formats[$this->format]);
 
-			// Set the formatted response
-			$this->response->body(\Format::forge($data)->{'to_'.$this->format}());
+			// Handle XML output
+			if ($this->format === 'xml')
+			{
+				// Detect basenode
+				$xml_basenode = $this->xml_basenode;
+				$xml_basenode or $xml_basenode = \Config::get('format.xml.basenode', 'xml');
+
+				// Set the XML response
+				$this->response->body(\Format::forge($data)->{'to_'.$this->format}(null, null, $xml_basenode));
+			}
+			else
+			{
+				// Set the formatted response
+				$this->response->body(\Format::forge($data)->{'to_'.$this->format}());
+			}
 
 			// Set the reponse http status
 			$http_status and $this->response->status = $http_status;

classes/format.php

@@ -266,11 +266,12 @@ public function to_json($data = null, $pretty = false)
 	/**
 	 * To JSONP conversion
 	 *
-	 * @param   mixed  $data
-	 * @param   bool   wether to make the json pretty
-	 * @return  string
+	 * @param   mixed   $data
+	 * @param   bool    $pretty    wether to make the json pretty
+	 * @param   string  $callback  JSONP callback
+	 * @return  string  formatted JSONP
 	 */
-	public function to_jsonp($data = null, $pretty = false)
+	public function to_jsonp($data = null, $pretty = false, $callback = null)
 	{
 		 $callback = \Input::param('callback');
 		 is_null($callback) and $callback = 'response';
@@ -433,6 +434,7 @@ private function _from_serialize($string)
 	protected static function pretty_json($data)
 	{
 		$json = json_encode($data);
+
 		if ( ! $json)
 		{
 			return false;

config/format.php

@@ -27,4 +27,7 @@
 		'regex_newline'   => '\n',
 		'escape'    => '\\',
 	),
+	'xml' => array(
+		'basenode' => 'xml',
+	),
 );