From 971e2d08b72bb34e75d1355d32709f5cd3dc0498 Mon Sep 17 00:00:00 2001
From: Luracast <arul@luracast.com>
Date: Sat, 9 Apr 2011 02:27:09 +0800
Subject: [PATCH 01/61] Read Me text added

---
 README | 25 +++++++++++++++++++++++++
 1 file changed, 25 insertions(+)

diff --git a/README b/README
index e69de29bb..f8ae662ed 100644
--- a/README
+++ b/README
@@ -0,0 +1,25 @@
+# Luracast Restler
+
+Restler is a simple and effective multi-protocol REST API Server written in PHP.
+
+* [Developer Home](http://luracast.com/products/restler/)
+
+## Features
+
+* Light weight
+* Flexible
+* Customizable
+* Supports HTTP request methods  GET, POST, PUT, and DELETE
+* Clients can use X-HTTP-Method-Override header
+* Two way format conversion
+* Pluggable Formatters
+* Comes with JSON, and XML formats
+* Pluggable Authentication schemes
+* Comes with Digest Authentication Example
+* URL to Function mapping
+* URL part to Function parameter mapping
+* Supports URLEncoded format for simplified input
+* Query parameters to Function parameter mapping
+* Source code distributed under LGPL
+
+more information is available on the [features page](http://luracast.com/products/restler/features/)
\ No newline at end of file

From 229a3b7787be4dabd287eef4ecad317686f6f38f Mon Sep 17 00:00:00 2001
From: Luracast <arul@luracast.com>
Date: Sat, 9 Apr 2011 02:30:40 +0800
Subject: [PATCH 02/61] Change of extension

---
 README => README.md | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename README => README.md (100%)

diff --git a/README b/README.md
similarity index 100%
rename from README
rename to README.md

From 7b7aa6ab9c3ad45886182990aea299b273cbb924 Mon Sep 17 00:00:00 2001
From: Luracast <arul@luracast.com>
Date: Sat, 9 Apr 2011 02:34:07 +0800
Subject: [PATCH 03/61] Sharing the Restler v1.0 Beta source files

---
 restler.php   | 891 ++++++++++++++++++++++++++++++++++++++++++++++++++
 xmlformat.php | 193 +++++++++++
 2 files changed, 1084 insertions(+)
 create mode 100644 restler.php
 create mode 100644 xmlformat.php

diff --git a/restler.php b/restler.php
new file mode 100644
index 000000000..47dedfbb8
--- /dev/null
+++ b/restler.php
@@ -0,0 +1,891 @@
+<?php
+/**
+ * REST API Server. It is the server part of the Restler framework.
+ * Based on the RestServer code from <http://jacwright.com/blog/resources/RestServer.txt>
+ *
+ * @category   Framework
+ * @package    restler
+ * @author     Jac Wright <jacwright@gmail.com>
+ * @author     R.Arul Kumaran <arul@luracast.com>
+ * @copyright  2010 Luracast
+ * @license    http://www.opensource.org/licenses/lgpl-license.php LGPL
+ * @link       http://luracast.com/products/restler/
+ * @version    1.0.17 beta
+ */
+
+class Restler
+{
+	/**
+	 * URL of the currently mapped service
+	 * @var string
+	 */
+	public $url;
+
+	/**
+	 * Http request method of the current request.
+	 * Any value between [GET, PUT, POST, DELETE]
+	 * @var string
+	 */
+	public $request_method;
+
+	/**
+	 * Requested data format. Instance of the current format class
+	 * which implements the iFormat interface
+	 * @var iFormat
+	 * @example jsonFormat, xmlFormat, yamlFormat etc
+	 */
+	public $request_format;
+
+	/**
+	 * Data sent to the service
+	 * @var string
+	 */
+	public $request_data;
+
+	/**
+	 * Used in production mode to store the URL Map to disk
+	 * @var string
+	 */
+	public $cache_dir = '.';
+
+	/**
+	 * Response data format. Instance of the current format class
+	 * which implements the iFormat interface
+	 * @var iFormat
+	 * @example jsonFormat, xmlFormat, yamlFormat etc
+	 */
+	public $response_format;
+
+	///////////////////////////////////////
+
+	/**
+	 * When set to false, it will run in debug mode and parse the
+	 * class files every time to map it to the URL
+	 * @var boolean
+	 */
+	protected $production_mode;
+
+
+	/**
+	 * Associated array that maps urls to their respective service and function
+	 * @var array
+	 */
+	protected $url_map = array();
+
+	/**
+	 * Associated array that maps formats to their respective format class name
+	 * @var array
+	 */
+	protected $format_map = array();
+
+	/**
+	 * Instance of the current api service class
+	 * @var object
+	 */
+	protected $service_class;
+
+	/**
+	 * Name of the api method being called
+	 * @var string
+	 */
+	protected $service_method;
+
+	protected $auth_classes = array();
+	protected $error_classes = array();
+
+	/**
+	 * Caching of url map is enabled or not
+	 * @var boolean
+	 */
+	protected $cached;
+
+	/**
+	 * Constructor
+	 * @param boolean $production_mode When set to false, it will run in
+	 * debug mode and parse the class files every time to map it to the URL
+	 */
+	public function  __construct($production_mode = false)
+	{
+		$this->production_mode = $production_mode;
+		$this->cache_dir = $this->cache_dir == '.' ? getcwd() : $this->cache_dir;
+	}
+
+	/**
+	 * Store the url map cache if needed
+	 */
+	public function  __destruct()
+	{
+		if ($this->production_mode && !$this->cached) {
+			if (function_exists('apc_store')) {
+				apc_store('urlMap', $this->url_map);
+			} else {
+				file_put_contents($this->cache_dir . '/urlMap.cache', serialize($this->url_map));
+			}
+		}
+	}
+
+	/**
+	 * Use it in production mode to refresh the url map cache
+	 */
+	public function refreshCache()
+	{
+		$this->url_map = array();
+		$this->cached = false;
+	}
+
+	/**
+	 * Call this method and pass all the formats that should be
+	 * supported by the API. Accepts multiple parameters
+	 * @param string class name of the format class (iFormat)
+	 * @example $restler->setSupportedFormats('JsonFormat', 'XmlFormat'...);
+	 */
+	public function setSupportedFormats()
+	{
+		$args = func_get_args();
+		foreach ($args as $class) {
+			if (is_string($class) && !class_exists($class)){
+				throw new Exception('Invalid format class');
+			} elseif (!is_string($class) && !is_object($class)) {
+				throw new Exception('Invalid format class; must be a classname or object');
+			}
+			/**
+			 * Format Instance
+			 * @var iFormat
+			 */
+			$obj = is_string($class) ? new $class() : $class;
+			if(! $obj instanceof iFormat){
+				throw new Exception('Invalid format class; must be implementing iFormat');
+			}
+			foreach ($obj->getMIMEMap() as $key => $value) {
+				if(!isset($this->format_map[$key]))$this->format_map[$key]=$class;
+				if(!isset($this->format_map[$value]))$this->format_map[$value]=$class;
+			}
+		}
+		$this->format_map['default']=$args[0];
+	}
+
+	/**
+	 * Add api classes throgh this function. All the public methods which have
+	 * url comment will be exposed as the public api.
+	 * All the protected methods with url comment will exposed as protected api
+	 * which will require authentication
+	 * @param string $class name of the service class
+	 * @param string $basePath optional url prefix for mapping
+	 * @throws Exception when supplied with invalid class name
+	 */
+	public function addAPIClass($class, $basePath = '')
+	{
+		$this->loadCache();
+		if (!$this->cached) {
+			if (is_string($class) && !class_exists($class)){
+				throw new Exception('Invalid method or class');
+			} elseif (!is_string($class) && !is_object($class)) {
+				throw new Exception('Invalid method or class; must be a classname or object');
+			}
+
+			if (strlen($basePath) > 0 && $basePath[0] == '/') {
+				$basePath = substr($basePath, 1);
+			}
+			if (strlen($basePath) > 0 && $basePath[strlen($basePath) - 1] != '/') {
+				$basePath .= '/';
+			}
+
+			$this->generateMap($class, $basePath);
+		}
+	}
+
+	/**
+	 * protected methods will need atleast one authentication class to be set
+	 * in order to allow that method to be executed
+	 * @param string $class name of the authentication class
+	 */
+	public function addAuthenticationClass($class)
+	{
+		$this->auth_classes[] = $class;
+		$this->addAPIClass($class);
+	}
+
+	/**
+	 * Add class for custom error handling
+	 * @param string $class name of the error handling class
+	 */
+	public function addErrorClass($class)
+	{
+		$this->errorClasses[] = $class;
+	}
+
+	/**
+	 * Convenience method to respond with an error message
+	 * @param int $statusCode http error code
+	 * @param string $errorMessage optional custom error message
+	 */
+	public function handleError($statusCode, $errorMessage = null)
+	{
+		$method = "handle$statusCode";
+		foreach ($this->error_classes as $class) {
+			$obj = is_string($class) ? new $class() : $class;
+			if (!method_exists($obj, $method)) {
+				$obj->$method();
+				return;
+			}
+		}
+		$message = $this->codes[$statusCode] . (!$errorMessage || $this->production_mode ? '' : ': ' . $errorMessage);
+
+		$this->setStatus($statusCode);
+		$this->sendData(array('error' => array('code' => $statusCode, 'message' => $message)));
+	}
+
+	/**
+	 * Main function for processing the api request
+	 * and return the response
+	 * @throws Exception when the api service class is missing
+	 * @throws RestException to send error response
+	 */
+	public function handle()
+	{
+		$this->url = $this->getPath();
+		$this->request_method = $this->getRequestMethod();
+
+		if(empty($this->format_map))$this->setSupportedFormats('JsonFormat');
+		$this->response_format = $this->getResponseFormat();
+		$this->request_format = $this->getRequestFormat();
+		if($this->request_format==null)$this->request_format = $this->response_format;
+		//echo $this->request_format;
+
+		if($this->request_method == 'PUT' || $this->request_method == 'POST')	{
+			$this->request_data = $this->getRequestData();
+		}
+		list($class, $method, $params, $is_public) = $this->mapUrlToMethod();
+
+		if($class) {
+			if(is_string($class) && class_exists($class)){
+				$this->service_class=$obj=new $class();
+				$this->service_method=$method;
+			}else{
+				throw new Exception("Class $class does not exist");
+			}
+		}else{
+			$this->handleError(404);
+			return;
+		}
+		$obj->restler = $this;
+
+		$pre_process = $this->request_format->getExtension().'_'.$method;
+		if(method_exists($obj,$pre_process)) {
+			call_user_func_array(array($obj, $pre_process), $params);
+		}
+		try {
+			if($is_public) {
+				$result = call_user_func_array(array($obj,$method), $params);
+			}else{
+				$auth_method = 'isAuthenticated';
+				if(!count($this->auth_classes))throw new RestException(401);
+				foreach ($this->auth_classes as $auth_class) {
+					$auth_obj = is_string($auth_class) ? new $auth_class() : $auth_class;
+					if (!method_exists($auth_obj, $auth_method) || !$auth_obj->$auth_method()) {
+						throw new RestException(401);
+					}
+				}
+				$reflection_method = new ReflectionMethod($class, $method);
+				$reflection_method->setAccessible(true);
+				$result = $reflection_method->invokeArgs($obj, $params);
+			}
+		} catch (RestException $e) {
+			$this->handleError($e->getCode(), $e->getMessage());
+		}
+		if (isset($result) && $result !== null) {
+			$this->sendData($result);
+		}
+	}
+
+	/**
+	 * Encodes the response in the prefered format
+	 * and sends back
+	 * @param $data array php data
+	 */
+	public function sendData($data)
+	{
+		$data =  $this->response_format->encode($data, !$this->production_mode);
+		$post_process =  $this->service_method .'_'.$this->response_format->getExtension();
+		if(isset($this->service_class) && method_exists($this->service_class,$post_process)){
+			$data = call_user_method($post_process, $this->service_class, $data);
+		}
+		header("Cache-Control: no-cache, must-revalidate");
+		header("Expires: 0");
+		header('Content-Type: ' . $this->response_format->getMIME());
+		echo $data;
+	}
+
+	/**
+	 * Sets the HTTP response status
+	 * @param int $code response code
+	 */
+	public function setStatus($code)
+	{
+		header("{$_SERVER['SERVER_PROTOCOL']} $code ".$this->codes[strval($code)]);
+	}
+	///////////////////////////////////////////////////////////////
+
+	/**
+	 * Parses the requst url and get the api path
+	 * @return string api path
+	 */
+	protected function getPath()
+	{
+		$path = substr(preg_replace('/(\.\w+)|(\?.*$)/', '', $_SERVER['REQUEST_URI']), 1);
+		if ($path[strlen($path) - 1] == '/') {
+			$path = substr($path, 0, -1);
+		}
+		return $path;
+	}
+
+	/**
+	 * Parses the request to figure out the http request type
+	 * @return string which will be one of the following
+	 * [GET, POST, PUT, DELETE]
+	 * @example GET
+	 */
+	protected function getRequestMethod()
+	{
+		$method = $_SERVER['REQUEST_METHOD'];
+		if (isset($_SERVER['HTTP_X_HTTP_METHOD_OVERRIDE'])){
+			$method = $_SERVER['HTTP_X_HTTP_METHOD_OVERRIDE'];
+		}elseif ($method == 'POST' && isset($_GET['method'])){
+			switch ($_GET['method']){
+				case 'PUT':
+				case 'DELETE':
+					$method = $_GET['method'];
+			}
+		}
+		return $method;
+	}
+
+	/**
+	 * Parses the request to figure out format of the request data
+	 * @return iFormat any class that implements iFormat
+	 * @example JsonFormat
+	 */
+	protected function getRequestFormat(){
+		$format=null;
+		//check if client has sent any information on request format
+		if(isset($_SERVER['CONTENT_TYPE'])){
+			$mime = $_SERVER['CONTENT_TYPE'];
+			if($mime==UrlEncodedFormat::MIME){
+				$format = new UrlEncodedFormat();
+			}else{
+				if(isset($this->format_map[$mime])){
+					$format = $this->format_map[$mime];
+					$format = is_string($format) ? new $format: $format;
+					$format->setMIME($accept);
+					return $format;
+				}
+			}
+		}
+		return $format;
+	}
+
+	/**
+	 * Parses the request to figure out the best format for response
+	 * @return iFormat any class that implements iFormat
+	 * @example JsonFormat
+	 */
+	protected function getResponseFormat()
+	{
+		//check if client has specified an extension
+		/**
+		* @var iFormat
+		*/
+		$format;
+		$extension = array_pop(explode('.', parse_url($_SERVER['REQUEST_URI'],PHP_URL_PATH)));
+		if($extension && isset($this->format_map[$extension])){
+			$format = $this->format_map[$extension];
+			$format = is_string($format) ? new $format: $format;
+			$format->setExtension($extension);
+			//echo "Extension $extension";
+			return $format;
+		}
+		//check if client has sent list of accepted data formats
+		if(isset($_SERVER['HTTP_ACCEPT'])){
+			$accepts = explode(',', $_SERVER['HTTP_ACCEPT']);
+			foreach ($accepts as $accept) {
+				if($extension && isset($this->format_map[$accept])){
+					$format = $this->format_map[$accept];
+					$format = is_string($format) ? new $format: $format;
+					$format->setMIME($accept);
+					//echo "MIME $accept";
+					return $format;
+				}
+			}
+		}
+		$format = $this->format_map['default'];
+		//echo "DEFAULT ".$this->format_map['default'];
+		return is_string($format) ? new $format: $format;
+
+	}
+
+	/**
+	 * Parses the request data and returns it
+	 * @return array php data
+	 */
+	protected function getRequestData()
+	{
+		try{
+			$r = file_get_contents('php://input');
+			if(is_null($r))return $_GET;
+			return $this->request_format->decode($r);
+		} catch (RestException $e) {
+			$this->handleError($e->getCode(), $e->getMessage());
+		}
+	}
+
+	protected function loadCache()
+	{
+		if ($this->cached !== null) {
+			return;
+		}
+
+		$this->cached = false;
+
+		if ($this->production_mode) {
+			if (function_exists('apc_fetch')) {
+				$map = apc_fetch('urlMap');
+			} elseif (file_exists($this->cache_dir . '/urlMap.cache')) {
+				$map = unserialize(file_get_contents($this->cache_dir . '/urlMap.cache'));
+			}
+			if (isset($map) && is_array($map)) {
+				$this->url_map = $map;
+				$this->cached = true;
+			}
+		} else {
+			if (function_exists('apc_store')) {
+				apc_delete('urlMap');
+			} else {
+				@unlink($this->cache_dir . '/urlMap.cache');
+			}
+		}
+	}
+
+
+	protected function mapUrlToMethod()
+	{
+		if(!isset($this->url_map[$this->request_method])){
+			return array(null,null,null,null,null);
+		}
+		$urls = $this->url_map[$this->request_method];
+		if (!$urls)return array(null,null,null,null,null);
+
+		$found=false;
+
+		foreach ($urls as $url => $call) {
+			$params = array('data'=>$this->request_data);
+			if(is_array($this->request_data))$params+=$this->request_data;
+			//use query parameters
+			$params+=$_GET;
+			$args = $call[2];
+			//if it has url based parameters
+			if (strstr($url, ':')) {
+				$regex = preg_replace('/\\\:([^\/]+)/', '(?P<$1>[^/]+)', preg_quote($url));
+				if (preg_match(":^$regex$:", $this->url, $matches)) {
+					foreach ($matches as $arg => $match) {
+						//echo "$arg => $match $args[$arg] \n";
+						if (isset($args[$arg]))$params[$arg] = $match;
+					}
+					$found=true;
+					break;
+				}
+			}elseif ($url == $this->url){
+				$found=true;
+				break;
+			}
+		}
+		if($found){
+			$optional_index = $call[4];
+			if($optional_index){
+				$p=array_fill(0, $optional_index, null);
+			}elseif (count($params)){
+				$p=array_fill(0, count($params), null);
+			}else{
+				$p=array();
+			}
+			foreach ($args as $key => $value) {
+				//echo "$key => $value \n";
+				if(isset($params[$key]))$p[$value] = $params[$key];
+			}
+			$call[2]=$p;
+			return $call;
+
+		}
+	}
+
+	protected function generateMap($class, $basePath = '')
+	{
+		if (is_object($class)) {
+			$reflection = new ReflectionObject($class);
+		} elseif (class_exists($class)) {
+			$reflection = new ReflectionClass($class);
+		}
+
+		$methods = $reflection->getMethods(
+		ReflectionMethod::IS_PUBLIC +
+		ReflectionMethod::IS_PROTECTED
+		);
+
+		foreach ($methods as $method) {
+			$doc = $method->getDocComment();
+			if (preg_match_all('/@url\s+(GET|POST|PUT|DELETE|HEAD|OPTIONS)[ \t]*\/?(\S*)/s', $doc, $matches, PREG_SET_ORDER)) {
+
+				$params = $method->getParameters();
+
+				foreach ($matches as $match) {
+					$httpMethod = $match[1];
+					$url = $basePath . $match[2];
+					if (strlen($url)>0 && $url[strlen($url) - 1] == '/') {
+						$url = substr($url, 0, -1);
+					}
+					$call = array($class, $method->getName());
+					$args = array();
+					$optional_index = $method->getNumberOfRequiredParameters();
+					foreach ($params as $param){
+						$args[$param->getName()] = $param->getPosition();
+					}
+					/*
+					 foreach ($params as $param) {
+						$args[$param->getName()] = $param->getPosition();
+						if(!isset($optional_index) && $param->isOptional()){
+						$optional_index =  $param->getPosition();
+						}
+						}
+						if(!isset($optional_index))$optional_index=count($params);
+						*/
+					$call[] = $args;
+					$call[] = $method->isPublic();
+					$call[] = @$optional_index;
+
+					$this->url_map[$httpMethod][$url] = $call;
+				}
+			}
+		}
+	}
+
+	private $codes = array(
+	100 => 'Continue',
+	101 => 'Switching Protocols',
+	200 => 'OK',
+	201 => 'Created',
+	202 => 'Accepted',
+	203 => 'Non-Authoritative Information',
+	204 => 'No Content',
+	205 => 'Reset Content',
+	206 => 'Partial Content',
+	300 => 'Multiple Choices',
+	301 => 'Moved Permanently',
+	302 => 'Found',
+	303 => 'See Other',
+	304 => 'Not Modified',
+	305 => 'Use Proxy',
+	306 => '(Unused)',
+	307 => 'Temporary Redirect',
+	400 => 'Bad Request',
+	401 => 'Unauthorized',
+	402 => 'Payment Required',
+	403 => 'Forbidden',
+	404 => 'Not Found',
+	405 => 'Method Not Allowed',
+	406 => 'Not Acceptable',
+	407 => 'Proxy Authentication Required',
+	408 => 'Request Timeout',
+	409 => 'Conflict',
+	410 => 'Gone',
+	411 => 'Length Required',
+	412 => 'Precondition Failed',
+	413 => 'Request Entity Too Large',
+	414 => 'Request-URI Too Long',
+	415 => 'Unsupported Media Type',
+	416 => 'Requested Range Not Satisfiable',
+	417 => 'Expectation Failed',
+	500 => 'Internal Server Error',
+	501 => 'Not Implemented',
+	502 => 'Bad Gateway',
+	503 => 'Service Unavailable',
+	504 => 'Gateway Timeout',
+	505 => 'HTTP Version Not Supported'
+	);
+}
+/**
+ * Special Exception for raising API errors
+ * that can be used in API methods
+ * @category   Framework
+ * @package    restler
+ * @subpackage exception
+ * @author     R.Arul Kumaran <arul@luracast.com>
+ * @copyright  2010 Luracast
+ * @license    http://www.opensource.org/licenses/lgpl-license.php LGPL
+ * @link       http://luracast.com/products/restler/
+ */
+class RestException extends Exception
+{
+
+	public function __construct($code, $message = null)
+	{
+		parent::__construct($message, $code);
+	}
+
+}
+
+/**
+ * Conveniance function that converts the given object
+ * in to associative array
+ * @param object $object that needs to be converted
+ * @category   Framework
+ * @package    restler
+ * @subpackage format
+ * @author     R.Arul Kumaran <arul@luracast.com>
+ * @copyright  2010 Luracast
+ * @license    http://www.opensource.org/licenses/lgpl-license.php LGPL
+ * @link       http://luracast.com/products/restler/
+ */
+function object_to_array($object, $utf_encode=true)
+{
+	if(is_array($object) || is_object($object))
+	{
+		$array = array();
+		foreach($object as $key => $value)
+		{
+			$value = object_to_array($value, $utf_encode);
+			if($utf_encode && is_string($value)){
+				$value = utf8_encode($value);
+			}
+			$array[$key] = $value;
+		}
+		return $array;
+	}
+	return $object;
+}
+
+/**
+ * Interface for creating authentication classes
+ * @category   Framework
+ * @package    restler
+ * @subpackage auth
+ * @author     R.Arul Kumaran <arul@luracast.com>
+ * @copyright  2010 Luracast
+ * @license    http://www.opensource.org/licenses/lgpl-license.php LGPL
+ * @link       http://luracast.com/products/restler/
+ */
+interface iAuthenticate
+{
+	/**
+	 * Auth function that is called when a protected method is requested
+	 * @return boolean true or false
+	 */
+	public function isAuthenticated();
+}
+
+
+/**
+ * Interface for creating custom data formats
+ * like xml, json, yaml, amf etc
+ * @category   Framework
+ * @package    restler
+ * @subpackage format
+ * @author     R.Arul Kumaran <arul@luracast.com>
+ * @copyright  2010 Luracast
+ * @license    http://www.opensource.org/licenses/lgpl-license.php LGPL
+ * @link       http://luracast.com/products/restler/
+ */
+interface iFormat
+{
+	/**
+	 * Get Extension => MIME type mappings as an associative array
+	 * @return array list of mime strings for the format
+	 * @example array('json'=>'application/json');
+	 */
+	public function getMIMEMap();
+
+	/**
+	 * Set the selected MIME type
+	 * @param string $mime MIME type
+	 */
+	public function setMIME($mime);
+	/**
+	 * Get selected MIME type
+	 */
+	public function getMIME();
+
+	/**
+	 * Set the selected file extension
+	 * @param string $extension file extension
+	 */
+	public function setExtension($extension);
+	/**
+	 * Get the selected file extension
+	 * @return string file extension
+	 */
+	public function getExtension();
+
+
+	/**
+	 * Encode the given data in the format
+	 * @param array $data resulting data that needs to
+	 * be encoded in the given format
+	 * @param boolean $human_readable set to true when restler
+	 * is not running in production mode. Formatter has to
+	 * make the encoded output more human readable
+	 * @return string encoded string
+	 */
+	public function encode($data, $human_readable=false);
+
+	/**
+	 * Decode the given data from the format
+	 * @param string $data data sent from client to
+	 * the api in the given format.
+	 * @return array associative array of the parsed data
+	 */
+	public function decode($data);
+}
+
+/**
+ * URL Encoded String Format
+ * @category   Framework
+ * @package    restler
+ * @subpackage format
+ * @author     R.Arul Kumaran <arul@luracast.com>
+ * @copyright  2010 Luracast
+ * @license    http://www.opensource.org/licenses/lgpl-license.php LGPL
+ * @link       http://luracast.com/products/restler/
+ */
+class UrlEncodedFormat implements iFormat
+{
+	const MIME = 'application/x-www-form-urlencoded';
+	const EXTENSION = 'post';
+	public function getMIMEMap()
+	{
+		return array(UrlEncodedFormat::EXTENSION=>UrlEncodedFormat::MIME);
+	}
+	public function getMIME(){
+		return  UrlEncodedFormat::MIME;
+	}
+	public function getExtension(){
+		return UrlEncodedFormat::EXTENSION;
+	}
+	public function setMIME($mime){
+		//do nothing
+	}
+	public function setExtension($extension){
+		//do nothing
+	}
+	public function encode($data, $human_readable=false){
+		return http_build_query($data);
+	}
+	public function decode($data){
+		parse_str($data,$r);
+		return $r;
+	}
+	public function __toString(){
+		return $this->getExtension();
+	}
+}
+
+/**
+ * Javascript Object Notation Format
+ * @category   Framework
+ * @package    restler
+ * @subpackage format
+ * @author     R.Arul Kumaran <arul@luracast.com>
+ * @copyright  2010 Luracast
+ * @license    http://www.opensource.org/licenses/lgpl-license.php LGPL
+ * @link       http://luracast.com/products/restler/
+ */
+class JsonFormat implements iFormat
+{
+	const MIME ='application/json';
+	const EXTENSION = 'json';
+	public function getMIMEMap()
+	{
+		return array(JsonFormat::EXTENSION=>JsonFormat::MIME);
+	}
+	public function getMIME(){
+		return  JsonFormat::MIME;
+	}
+	public function getExtension(){
+		return JsonFormat::EXTENSION;
+	}
+	public function setMIME($mime){
+		//do nothing
+	}
+	public function setExtension($extension){
+		//do nothing
+	}
+	public function encode($data, $human_readable=false){
+		return $human_readable ? $this->json_format(json_encode(object_to_array($data))) : json_encode(object_to_array($data));
+	}
+	public function decode($data){
+		return json_decode($data);
+	}
+
+	/**
+	 * Pretty print JSON string
+	 * @param string $json
+	 * @return string formated json
+	 */
+	private function json_format($json)
+	{
+		$tab = "  ";
+		$new_json = "";
+		$indent_level = 0;
+		$in_string = false;
+
+		$len = strlen($json);
+
+		for($c = 0; $c < $len; $c++) {
+			$char = $json[$c];
+			switch($char) {
+				case '{':
+				case '[':
+					if(!$in_string) {
+						$new_json .= $char . "\n" . str_repeat($tab, $indent_level+1);
+						$indent_level++;
+					} else {
+						$new_json .= $char;
+					}
+					break;
+				case '}':
+				case ']':
+					if(!$in_string) {
+						$indent_level--;
+						$new_json .= "\n" . str_repeat($tab, $indent_level) . $char;
+					} else {
+						$new_json .= $char;
+					}
+					break;
+				case ',':
+					if(!$in_string) {
+						$new_json .= ",\n" . str_repeat($tab, $indent_level);
+					} else {
+						$new_json .= $char;
+					}
+					break;
+				case ':':
+					if(!$in_string) {
+						$new_json .= ": ";
+					} else {
+						$new_json .= $char;
+					}
+					break;
+				case '"':
+					if($c > 0 && $json[$c-1] != '\\') {
+						$in_string = !$in_string;
+					}
+				default:
+					$new_json .= $char;
+					break;
+			}
+		}
+
+		return $new_json;
+	}
+
+	public function __toString(){
+		return $this->getExtension();
+	}
+}
\ No newline at end of file
diff --git a/xmlformat.php b/xmlformat.php
new file mode 100644
index 000000000..a3244416a
--- /dev/null
+++ b/xmlformat.php
@@ -0,0 +1,193 @@
+<?php
+/**
+ * XML Markup Format for Restler Framework
+ * @category   Framework
+ * @package    restler
+ * @subpackage format
+ * @author     R.Arul Kumaran <arul@luracast.com>
+ * @copyright  2010 Luracast
+ * @license    http://www.opensource.org/licenses/lgpl-license.php LGPL
+ * @link       http://luracast.com/products/restler/
+ */
+class XmlFormat implements iFormat
+{
+	public static $parse_attributes=true;
+	public static $parse_namespaces=false;
+	public static $attribute_names=array('xmlns');
+	/**
+	 * Default name for the root node.
+	 * @var string $rootNodeName
+	 */
+	public static  $root_name='result';
+	public static  $default_tag_name='item';
+
+	const MIME ='application/xml';
+	const EXTENSION = 'xml';
+
+	public function getMIMEMap()
+	{
+		return array(XmlFormat::EXTENSION=>XmlFormat::MIME);
+	}
+	public function getMIME(){
+		return  XmlFormat::MIME;
+	}
+	public function getExtension(){
+		return XmlFormat::EXTENSION;
+	}
+	public function setMIME($mime){
+		//do nothing
+	}
+	public function setExtension($extension){
+		//do nothing
+	}
+
+	public function encode($data, $human_readable=false){
+		return $this->toXML( object_to_array($data, false),XmlFormat::$root_name, $human_readable);
+	}
+
+	public function decode($data){
+		try {
+			if($data=='')return array();
+			return $this->toArray($data);
+		} catch (Exception $e) {
+			throw new RestException(400, "Error decoding request. ".$e->getMessage());
+		}
+	}
+
+	public function __toString(){
+		return $this->getExtension();
+	}
+
+	/**
+	 * determine if a variable is an associative array
+	 */
+	public function isAssoc( $array ) {
+		return (is_array($array) && 0 !== count(array_diff_key($array, array_keys(array_keys($array)))));
+	}
+
+	/**
+	 * The main function for converting to an XML document.
+	 * Pass in a multi dimensional array and this recrusively loops through and builds up an XML document.
+	 * @param array $data
+	 * @param string $rootNodeName - what you want the root node to be - defaults to data.
+	 * @param SimpleXMLElement $xml - should only be used recursively
+	 * @return string XML
+	 * @link http://snipplr.com/view/3491/convert-php-array-to-xml-or-simple-xml-object-if-you-wish/
+	 */
+	public function toXML( $data, $root_node_name = 'result', $human_readable=false, &$xml=null) {
+
+		// turn off compatibility mode as simple xml throws a wobbly if you don't.
+		if ( ini_get('zend.ze1_compatibility_mode') == 1 ) ini_set ( 'zend.ze1_compatibility_mode', 0 );
+		if ( is_null( $xml ) ) $xml = @simplexml_load_string( "<$root_node_name/>" );
+
+		if(is_array($data)){
+			$numeric=0;
+			// loop through the data passed in.
+			foreach( $data as $key => $value ) {
+
+				// no numeric keys in our xml please!
+				if ( is_numeric( $key ) ) {
+					$numeric = 1;
+					$key = XmlFormat::$root_name == $root_node_name ? XmlFormat::$default_tag_name : $root_node_name;
+				}
+
+				// delete any char not allowed in XML element names
+				$key = preg_replace('/[^a-z0-9\-\_\.\:]/i', '', $key);
+
+				// if there is another array found recrusively call this function
+				if ( is_array( $value ) ) {
+					$node = $this->isAssoc( $value ) || $numeric ? $xml->addChild( $key ) : $xml;
+
+					// recrusive call.
+					if ( $numeric ) $key = 'anon';
+					$this->toXML($value, $key, $human_readable, $node);
+				} else {
+
+					// add single node.
+					$value = utf8_encode(htmlentities($value));
+					//$xml->addChild( $key, $value );
+					in_array($key,XmlFormat::$attribute_names) ? $xml->addAttribute($key,$value) : $xml->addChild( $key, $value);
+				}
+			}
+		}else{ //if given data is a string or number
+			//simply wrap it as text node to root
+			if(is_bool($data)) $data = $data ? 'true' : 'false';
+			$xml->{0} = $data;
+		}
+		if(!$human_readable){
+			return $xml->saveXML();
+		}else{
+			$dom = dom_import_simplexml($xml)->ownerDocument;
+			$dom->formatOutput = true;
+			return $dom->saveXML();
+		}
+	}
+
+	/**
+	 * Convert an XML document to a multi dimensional array
+	 * Pass in an XML document (or SimpleXMLElement object) and this
+	 * recrusively loops through and builds a representative array
+	 *
+	 * @param string $xml - XML document - can optionally be a SimpleXMLElement object
+	 * @return array ARRAY
+	 * @link http://snipplr.com/view/3491/convert-php-array-to-xml-or-simple-xml-object-if-you-wish/
+	 */
+	public function toArray( $xml, $firstCall=true) {
+		if ( is_string( $xml ) ) $xml = new SimpleXMLElement( $xml );
+		$children = $xml->children();
+		if ( !$children ) {
+			$r = (string) $xml;
+			if($r=='true' || $r=='false')$r=$r=='true';
+			return $r;
+		}
+		$arr = array();
+
+		if($firstCall){
+			//reset the attribute names list
+			XmlFormat::$attribute_names=array();
+			XmlFormat::$root_name = $xml->getName();
+			if (XmlFormat::$parse_namespaces){
+				foreach($xml->getDocNamespaces(TRUE) as $namepace => $uri) {
+					$arr[$namepace=='' ? 'xmlns' : 'xmlns:'.$namepace] = (string)$uri;
+				}
+			}
+		}
+		if(XmlFormat::$parse_attributes){
+			foreach($xml->attributes() as $attName => $attValue) {
+				$arr[$attName] = (string)$attValue;
+				//add to attribute list for round trip support
+				XmlFormat::$attribute_names[]=$attName;
+			}
+		}
+		foreach ( $children as $key => $node ) {
+			$node = $this->toArray($node, false);
+			// support for 'anon' non-associative arrays
+			if ( $key == 'anon' ) $key = count( $arr );
+
+			// if the node is already set, put it into an array
+			if ( isset( $arr[$key] ) ) {
+				if ( !is_array( $arr[$key] ) || @$arr[$key][0] == null ) $arr[$key] = array( $arr[$key] );
+				$arr[$key][] = $node;
+			} else {
+				$arr[$key] = $node;
+			}
+		}
+		return $arr;
+	}
+
+	/**
+	 * When you decode an XML its structure is copied to the static vars
+	 * we can use this function to echo them out and then copy paste inside
+	 * our service methods
+	 * @return string PHP source code to reproduce the configuration
+	 */
+	public static function exportCurrentSettings() {
+		$s = 'XmlFormat::$root_name = "'.(XmlFormat::$root_name)."\";\n";
+		$s .= 'XmlFormat::$attribute_names = '.(var_export(XmlFormat::$attribute_names, true)).";\n";
+		$s .= 'XmlFormat::$default_tag_name = "'.XmlFormat::$default_tag_name."\";\n";
+		$s .= 'XmlFormat::$parse_attributes = '.(XmlFormat::$parse_attributes ? 'true' : 'false').";\n";
+		$s .= 'XmlFormat::$parse_namespaces = '.(XmlFormat::$parse_namespaces ? 'true' : 'false').";\n\n\n";
+		return $s;
+	}
+
+}

From d6a48e8eca7d93e4173ad6c46c421a875286f661 Mon Sep 17 00:00:00 2001
From: Luracast <arul@luracast.com>
Date: Sat, 9 Apr 2011 02:45:55 +0800
Subject: [PATCH 04/61] Barebones Hello World example that shows the simplicity
 and power of Restler is added

---
 examples/helloworld/README.txt               | 31 +++++++
 examples/helloworld/digestauthentication.php | 85 ++++++++++++++++++++
 examples/helloworld/index.php                | 11 +++
 examples/helloworld/simpleservice.php        | 41 ++++++++++
 4 files changed, 168 insertions(+)
 create mode 100644 examples/helloworld/README.txt
 create mode 100644 examples/helloworld/digestauthentication.php
 create mode 100644 examples/helloworld/index.php
 create mode 100644 examples/helloworld/simpleservice.php

diff --git a/examples/helloworld/README.txt b/examples/helloworld/README.txt
new file mode 100644
index 000000000..0394a5dde
--- /dev/null
+++ b/examples/helloworld/README.txt
@@ -0,0 +1,31 @@
+UNZIP AND COPY THE FILES into your web root (including the .htaccess file)
+Assuming that you are testing it on localhost try the following urls
+
+	http://localhost/
+	should return "HelloWorld"
+	
+	http://localhost/sum
+	should return 0
+	
+	http://localhost/sum.json
+	should return 0
+	
+	http://localhost/sum.xml
+	should return the following xml (view source if required)
+	<?xml version="1.0"?>
+	<result>0</result>
+	
+	http://localhost/sum.json?num1=10&num2=4
+	should return 14
+	
+	http://localhost/multiply.json/4/2
+	should return 8
+	
+	http://localhost/protectedsum.json?n1=5&n2=4
+	should ask for username and password
+	give admin and mypass respectively
+	then it should return 9
+	
+Now take a look at simpleservice.php to understand how the mapping is done
+
+Keep this as the starting point and build your own :)
\ No newline at end of file
diff --git a/examples/helloworld/digestauthentication.php b/examples/helloworld/digestauthentication.php
new file mode 100644
index 000000000..feb435ace
--- /dev/null
+++ b/examples/helloworld/digestauthentication.php
@@ -0,0 +1,85 @@
+<?php
+/**
+ * Digest Authentication Scheme Example for Restler Framework
+ * @category   Framework
+ * @package    restler
+ * @subpackage auth
+ * @author     R.Arul Kumaran <arul@luracast.com>
+ * @copyright  2010 Luracast
+ * @license    http://www.opensource.org/licenses/lgpl-license.php LGPL
+ * @link       http://luracast.com/products/restler/
+ */
+class DigestAuthentication implements iAuthenticate
+{
+	public $realm = 'Restricted API';
+	public static $user;
+	public $restler;
+
+	public function isAuthenticated()
+	{
+		//user => password hardcoded for convenience
+		$users = array('admin' => 'mypass', 'guest' => 'guest');
+
+		if (empty($_SERVER['PHP_AUTH_DIGEST'])) {
+			header('HTTP/1.1 401 Unauthorized');
+			header('WWW-Authenticate: Digest realm="'.$this->realm.'",qop="auth",nonce="'.
+			uniqid().'",opaque="'.md5($this->realm).'"');
+			die('Digest Authorisation Required');
+		}
+
+		// analyze the PHP_AUTH_DIGEST variable
+		if (!($data = DigestAuthentication::http_digest_parse($_SERVER['PHP_AUTH_DIGEST'])) ||
+		!isset($users[$data['username']]))
+		{
+			throw new RestException(401, 'Wrong Credentials!');
+		}
+
+
+		// generate the valid response
+		$A1 = md5($data['username'] . ':' . $this->realm . ':' . $users[$data['username']]);
+		$A2 = md5($_SERVER['REQUEST_METHOD'].':'.$data['uri']);
+		$valid_response = md5($A1.':'.$data['nonce'].':'.$data['nc'].':'.$data['cnonce'].':'.$data['qop'].':'.$A2);
+
+		if ($data['response'] != $valid_response)
+		{
+			throw new RestException(401, 'Wrong Credentials!');
+		}
+		// ok, valid username & password
+		DigestAuthentication::$user=$data['username'];
+		return true;
+	}
+
+	/**
+	 * Logs user out of the digest authentication by bringing the login dialog again
+	 * ignore the dialog to logout
+	 *
+	 * @url GET /user/login
+	 * @url GET /user/logout
+	 */
+	public function logout()
+	{
+		header('HTTP/1.1 401 Unauthorized');
+		header('WWW-Authenticate: Digest realm="'.$this->realm.'",qop="auth",nonce="'.
+		uniqid().'",opaque="'.md5($this->realm).'"');
+		die('Digest Authorisation Required');
+	}
+
+
+	// function to parse the http auth header
+	private function http_digest_parse($txt)
+	{
+		// protect against missing data
+		$needed_parts = array('nonce'=>1, 'nc'=>1, 'cnonce'=>1, 'qop'=>1, 'username'=>1, 'uri'=>1, 'response'=>1);
+		$data = array();
+		$keys = implode('|', array_keys($needed_parts));
+
+		preg_match_all('@(' . $keys . ')=(?:([\'"])([^\2]+?)\2|([^\s,]+))@', $txt, $matches, PREG_SET_ORDER);
+
+		foreach ($matches as $m) {
+			$data[$m[1]] = $m[3] ? $m[3] : $m[4];
+			unset($needed_parts[$m[1]]);
+		}
+
+		return $needed_parts ? false : $data;
+	}
+}
\ No newline at end of file
diff --git a/examples/helloworld/index.php b/examples/helloworld/index.php
new file mode 100644
index 000000000..355711b86
--- /dev/null
+++ b/examples/helloworld/index.php
@@ -0,0 +1,11 @@
+<?php
+//SIMPLE USAGE EXAMPLE
+
+//rester and related classes should be
+//placed in include path
+spl_autoload_register();
+$restler = new Restler();
+$restler->setSupportedFormats('JsonFormat', 'XmlFormat');
+$restler->addAPIClass('SimpleService');
+$restler->addAuthenticationClass('DigestAuthentication');
+$restler->handle();
\ No newline at end of file
diff --git a/examples/helloworld/simpleservice.php b/examples/helloworld/simpleservice.php
new file mode 100644
index 000000000..dc8823b55
--- /dev/null
+++ b/examples/helloworld/simpleservice.php
@@ -0,0 +1,41 @@
+<?php
+class SimpleService {
+	/**
+	 * HelloWorld
+	 * @url GET /
+	 * @url GET /index
+	 */
+	function helloworld() {
+		return "HelloWorld";
+	}
+	/**
+	 * Sums the given numbers
+	 * @param integer $num1
+	 * @param integer $num2
+	 * @return integer
+	 * @url GET /sum
+	 */
+	function sum($num1, $num2){
+		return $num1+$num2;
+	}
+	/**
+	 * Multiplies the given numbers
+	 * @param integer $num1
+	 * @param integer $num2
+	 * @return integer
+	 * @url GET /multiply/:num1/:num2
+	 */
+	 function multiply($num1, $num2){
+		return $num1*$num2;
+	}
+	/**
+	 * Sums the given numbers
+	 * @param integer $n1
+	 * @param integer $n2
+	 * @return integer
+	 * @url GET /protectedsum
+	 */
+	protected function protectedsum($n1, $n2){
+		return $n1+$n2;
+	}
+}
\ No newline at end of file

From 0ef468528e060a4d63bec5df3161ceea7be385df Mon Sep 17 00:00:00 2001
From: Luracast <arul@luracast.com>
Date: Sat, 9 Apr 2011 02:53:18 +0800
Subject: [PATCH 05/61] htaccess file that is required for the helloword
 example is now added

---
 examples/helloworld/.htaccess | 8 ++++++++
 1 file changed, 8 insertions(+)
 create mode 100644 examples/helloworld/.htaccess

diff --git a/examples/helloworld/.htaccess b/examples/helloworld/.htaccess
new file mode 100644
index 000000000..b766fc6f0
--- /dev/null
+++ b/examples/helloworld/.htaccess
@@ -0,0 +1,8 @@
+DirectoryIndex index.php
+<IfModule mod_rewrite.c>
+	RewriteEngine On
+	RewriteRule ^$ index.php [QSA,L]
+	RewriteCond %{REQUEST_FILENAME} !-f
+	RewriteCond %{REQUEST_FILENAME} !-d
+	RewriteRule ^(.*)$ index.php [QSA,L]
+</IfModule>
\ No newline at end of file

From df61f9dd20f06d30b27883dcd581f3ad69b962e6 Mon Sep 17 00:00:00 2001
From: Luracast <arul@luracast.com>
Date: Sat, 9 Apr 2011 02:55:39 +0800
Subject: [PATCH 06/61] improving the documentation

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index f8ae662ed..c7424399a 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,6 @@
 # Luracast Restler
 
-Restler is a simple and effective multi-protocol REST API Server written in PHP.
+Restler is a simple and effective multi-protocol REST API Server written in PHP. Just deal with your business logic in php, restler will take care of the REST!
 
 * [Developer Home](http://luracast.com/products/restler/)
 

From 6407133588a6dda68a93e6a25a9d300400c53edf Mon Sep 17 00:00:00 2001
From: Luracast <arul@luracast.com>
Date: Sat, 9 Apr 2011 13:34:54 +0800
Subject: [PATCH 07/61] Moved the restler bundle to subfolder so that it can be
 downloaded without examples and formats

---
 restler.php => restler/restler.php     | 0
 xmlformat.php => restler/xmlformat.php | 0
 2 files changed, 0 insertions(+), 0 deletions(-)
 rename restler.php => restler/restler.php (100%)
 rename xmlformat.php => restler/xmlformat.php (100%)

diff --git a/restler.php b/restler/restler.php
similarity index 100%
rename from restler.php
rename to restler/restler.php
diff --git a/xmlformat.php b/restler/xmlformat.php
similarity index 100%
rename from xmlformat.php
rename to restler/xmlformat.php

From 889859562f4f72c898dea8a78ff215aa766bc554 Mon Sep 17 00:00:00 2001
From: Luracast <arul@luracast.com>
Date: Sun, 8 May 2011 01:50:40 +0800
Subject: [PATCH 08/61] Restler is now improved to support hosting in
 subfolders and mapping the paths relative to gateway (index.php)

optional parameter support is greatly improved

helloworld example updated
---
 examples/helloworld/README.txt        | 12 ++++-----
 examples/helloworld/index.php         |  2 ++
 examples/helloworld/simpleservice.php |  1 -
 restler/restler.php                   | 39 +++++++++++----------------
 4 files changed, 23 insertions(+), 31 deletions(-)

diff --git a/examples/helloworld/README.txt b/examples/helloworld/README.txt
index 0394a5dde..3ddaecd13 100644
--- a/examples/helloworld/README.txt
+++ b/examples/helloworld/README.txt
@@ -4,24 +4,24 @@ Assuming that you are testing it on localhost try the following urls
 	http://localhost/
 	should return "HelloWorld"
 	
-	http://localhost/sum
+	http://localhost/sum and http://localhost/index.php/sum
 	should return 0
 	
-	http://localhost/sum.json
+	http://localhost/sum.json and http://localhost/index.php/sum.json
 	should return 0
 	
-	http://localhost/sum.xml
+	http://localhost/sum.xml and http://localhost/index.php/sum.xml
 	should return the following xml (view source if required)
 	<?xml version="1.0"?>
 	<result>0</result>
 	
-	http://localhost/sum.json?num1=10&num2=4
+	http://localhost/sum.json?num1=10&num2=4 and http://localhost/index.php/sum.json?num1=10&num2=4
 	should return 14
 	
-	http://localhost/multiply.json/4/2
+	http://localhost/multiply.json/4/2 and http://localhost/index.php/multiply.json/4/2
 	should return 8
 	
-	http://localhost/protectedsum.json?n1=5&n2=4
+	http://localhost/protectedsum.json?n1=5&n2=4 and http://localhost/index.php/protectedsum.json?n1=5&n2=4
 	should ask for username and password
 	give admin and mypass respectively
 	then it should return 9
diff --git a/examples/helloworld/index.php b/examples/helloworld/index.php
index 355711b86..e9af3f165 100644
--- a/examples/helloworld/index.php
+++ b/examples/helloworld/index.php
@@ -3,6 +3,8 @@
 
 //rester and related classes should be
 //placed in include path
+set_include_path(get_include_path() . PATH_SEPARATOR . '../../restler');
+
 spl_autoload_register();
 $restler = new Restler();
 $restler->setSupportedFormats('JsonFormat', 'XmlFormat');
diff --git a/examples/helloworld/simpleservice.php b/examples/helloworld/simpleservice.php
index dc8823b55..ce5e053cb 100644
--- a/examples/helloworld/simpleservice.php
+++ b/examples/helloworld/simpleservice.php
@@ -3,7 +3,6 @@ class SimpleService {
 	/**
 	 * HelloWorld
 	 * @url GET /
-	 * @url GET /index
 	 */
 	function helloworld() {
 		return "HelloWorld";
diff --git a/restler/restler.php b/restler/restler.php
index 47dedfbb8..30a7e05ce 100644
--- a/restler/restler.php
+++ b/restler/restler.php
@@ -10,7 +10,7 @@
  * @copyright  2010 Luracast
  * @license    http://www.opensource.org/licenses/lgpl-license.php LGPL
  * @link       http://luracast.com/products/restler/
- * @version    1.0.17 beta
+ * @version    1.0.18 beta
  */
 
 class Restler
@@ -332,10 +332,12 @@ public function setStatus($code)
 	 */
 	protected function getPath()
 	{
-		$path = substr(preg_replace('/(\.\w+)|(\?.*$)/', '', $_SERVER['REQUEST_URI']), 1);
-		if ($path[strlen($path) - 1] == '/') {
-			$path = substr($path, 0, -1);
-		}
+		$sn = trim($_SERVER['SCRIPT_NAME'], '/');
+		$path = $_SERVER['REQUEST_URI'];
+		$path = str_replace($sn, '', $path);
+		$path = str_replace(dirname($sn), '', $path);
+		$path = trim($path,'/');
+		$path = preg_replace('/(\.\w+)|(\?.*$)/', '', $path);
 		return $path;
 	}
 
@@ -469,10 +471,10 @@ protected function loadCache()
 	protected function mapUrlToMethod()
 	{
 		if(!isset($this->url_map[$this->request_method])){
-			return array(null,null,null,null,null);
+			return array(null,null,null,null,null,null);
 		}
 		$urls = $this->url_map[$this->request_method];
-		if (!$urls)return array(null,null,null,null,null);
+		if (!$urls)return array(null,null,null,null,null,null);
 
 		$found=false;
 
@@ -499,14 +501,7 @@ protected function mapUrlToMethod()
 			}
 		}
 		if($found){
-			$optional_index = $call[4];
-			if($optional_index){
-				$p=array_fill(0, $optional_index, null);
-			}elseif (count($params)){
-				$p=array_fill(0, count($params), null);
-			}else{
-				$p=array();
-			}
+			$p = is_null($call[5]) ? array() : $call[5];
 			foreach ($args as $key => $value) {
 				//echo "$key => $value \n";
 				if(isset($params[$key]))$p[$value] = $params[$key];
@@ -544,22 +539,18 @@ protected function generateMap($class, $basePath = '')
 					}
 					$call = array($class, $method->getName());
 					$args = array();
+					$defaults = array();
 					$optional_index = $method->getNumberOfRequiredParameters();
 					foreach ($params as $param){
 						$args[$param->getName()] = $param->getPosition();
-					}
-					/*
-					 foreach ($params as $param) {
-						$args[$param->getName()] = $param->getPosition();
-						if(!isset($optional_index) && $param->isOptional()){
-						$optional_index =  $param->getPosition();
-						}
+						if($param->isDefaultValueAvailable()){
+							$defaults[$param->getPosition()]=$param->getDefaultValue();
 						}
-						if(!isset($optional_index))$optional_index=count($params);
-						*/
+					}
 					$call[] = $args;
 					$call[] = $method->isPublic();
 					$call[] = @$optional_index;
+					$call[] = $defaults;
 
 					$this->url_map[$httpMethod][$url] = $call;
 				}

From 662cf6b979fe9c4d5ca6bab0f3a726c8dca0c86c Mon Sep 17 00:00:00 2001
From: Luracast <arul@luracast.com>
Date: Tue, 10 May 2011 17:03:53 +0800
Subject: [PATCH 09/61] Fixes the Version 1.0.18 bug which makes the API calls
 to fail when they contain an extention (example
 http://rest.ler/helloworld.json)

---
 restler/restler.php | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/restler/restler.php b/restler/restler.php
index 30a7e05ce..9ee7ee25b 100644
--- a/restler/restler.php
+++ b/restler/restler.php
@@ -10,7 +10,7 @@
  * @copyright  2010 Luracast
  * @license    http://www.opensource.org/licenses/lgpl-license.php LGPL
  * @link       http://luracast.com/products/restler/
- * @version    1.0.18 beta
+ * @version    1.0.19 beta
  */
 
 class Restler
@@ -332,12 +332,18 @@ public function setStatus($code)
 	 */
 	protected function getPath()
 	{
-		$sn = trim($_SERVER['SCRIPT_NAME'], '/');
+		$sn = trim($_SERVER['SCRIPT_NAME'],'/');
 		$path = $_SERVER['REQUEST_URI'];
-		$path = str_replace($sn, '', $path);
-		$path = str_replace(dirname($sn), '', $path);
+		if(strpos($path, $sn)===false){
+			$sn = dirname($sn);
+			if(count($sn)>1)
+				$path = str_replace($sn, '', $path);
+		}else{
+			$path = str_replace($sn, '', $path);
+		}
 		$path = trim($path,'/');
 		$path = preg_replace('/(\.\w+)|(\?.*$)/', '', $path);
+		//echo $path;
 		return $path;
 	}
 

From 1ea211966e37962c64a20c0427c1e2ebc3b488d8 Mon Sep 17 00:00:00 2001
From: Luracast <arul@luracast.com>
Date: Wed, 11 May 2011 15:03:54 +0800
Subject: [PATCH 10/61] Bug fix for the relative path mapping fails issue that
 was not fixed 1.0.19

---
 restler/restler.php | 35 +++++++++++++++++++++++------------
 1 file changed, 23 insertions(+), 12 deletions(-)

diff --git a/restler/restler.php b/restler/restler.php
index 9ee7ee25b..93d7dc2cf 100644
--- a/restler/restler.php
+++ b/restler/restler.php
@@ -10,7 +10,7 @@
  * @copyright  2010 Luracast
  * @license    http://www.opensource.org/licenses/lgpl-license.php LGPL
  * @link       http://luracast.com/products/restler/
- * @version    1.0.19 beta
+ * @version    1.0.20 beta
  */
 
 class Restler
@@ -324,24 +324,35 @@ public function setStatus($code)
 	{
 		header("{$_SERVER['SERVER_PROTOCOL']} $code ".$this->codes[strval($code)]);
 	}
+	/**
+	 * Compare two strings and remove the common 
+	 * sub string from the first string and return it
+	 * @param string $first 
+	 * @param string $second
+	 * @param string $char optional, set it as 
+	 * blank string for char by char comparison
+	 * @return string
+	 */
+	public function removeCommonPath($first, $second, $char='/'){
+		$first = explode($char, $first);
+		$second = explode($char, $second);
+		while (count($second)){
+			if($first[0]==$second[0]){
+				array_shift($first);
+			} else break;
+			array_shift($second);
+		}
+		return implode($char, $first);
+	}
+	
 	///////////////////////////////////////////////////////////////
-
 	/**
 	 * Parses the requst url and get the api path
 	 * @return string api path
 	 */
 	protected function getPath()
 	{
-		$sn = trim($_SERVER['SCRIPT_NAME'],'/');
-		$path = $_SERVER['REQUEST_URI'];
-		if(strpos($path, $sn)===false){
-			$sn = dirname($sn);
-			if(count($sn)>1)
-				$path = str_replace($sn, '', $path);
-		}else{
-			$path = str_replace($sn, '', $path);
-		}
-		$path = trim($path,'/');
+		$path = $this->removeCommonPath($_SERVER['REQUEST_URI'], $_SERVER['SCRIPT_NAME']);
 		$path = preg_replace('/(\.\w+)|(\?.*$)/', '', $path);
 		//echo $path;
 		return $path;

From ce53f941cdf6fbd261ae1fc863693b38be104c40 Mon Sep 17 00:00:00 2001
From: Luracast <arul@luracast.com>
Date: Thu, 25 Aug 2011 00:39:30 +0800
Subject: [PATCH 11/61] Luracast Restler 2.0 is a major rewrite to use
 convention over configuration and it is optimized for performance. Here are
 some of the major changes and improvements.

* PHPDoc comments to map a method to URI is now optional.
* All public methods that does not begin with an underscore are mapped
  automatically to the method name (`gateway\classname\methodname\param1\...`)
* If we do not specify the second parameter for `$restler->addAPIClass` it will be mapped to the
  class name instead of mapping it to the root
* Restler 2 is written for PHP 5.3 and above but it make use of compat.php and work on
  any version of PHP starting from PHP 5.0
---
 README.html                                   |  64 ++
 README.md                                     |  41 +-
 .../{helloworld => _001_helloworld}/.htaccess |   0
 examples/_001_helloworld/index.php            |  14 +
 examples/_001_helloworld/readme.html          | 107 ++
 examples/_001_helloworld/readme.md            |  63 ++
 examples/_001_helloworld/say.php              |   6 +
 examples/_002_minimal/.htaccess               |   8 +
 examples/_002_minimal/index.php               |  23 +
 examples/_002_minimal/math.php                |   9 +
 examples/_002_minimal/readme.html             | 103 ++
 examples/_002_minimal/readme.md               |  64 ++
 examples/_003_multiformat/.htaccess           |   8 +
 examples/_003_multiformat/bmi.php             |  37 +
 examples/_003_multiformat/index.php           |  72 ++
 examples/_003_multiformat/readme.html         | 128 +++
 examples/_003_multiformat/readme.md           |  86 ++
 examples/_004_error_response/.htaccess        |   8 +
 examples/_004_error_response/currency.php     |  11 +
 examples/_004_error_response/index.php        |  44 +
 examples/_004_error_response/readme.html      | 102 ++
 examples/_004_error_response/readme.md        |  59 ++
 examples/_005_protected_api/.htaccess         |   8 +
 examples/_005_protected_api/index.php         |  43 +
 examples/_005_protected_api/readme.html       | 106 ++
 examples/_005_protected_api/readme.md         |  63 ++
 examples/_005_protected_api/secured.php       |  10 +
 examples/_005_protected_api/simple.php        |  15 +
 examples/_005_protected_api/simpleauth.php    |  10 +
 examples/_006_crud/.htaccess                  |   8 +
 examples/_006_crud/author.php                 |  33 +
 examples/_006_crud/author.sql                 |   4 +
 examples/_006_crud/author.sqlite              | Bin 0 -> 163840 bytes
 examples/_006_crud/filename.sqlite            | Bin 0 -> 4096 bytes
 examples/_006_crud/index.php                  | 121 +++
 examples/_006_crud/readme.html                | 177 ++++
 examples/_006_crud/readme.md                  | 133 +++
 examples/_006_crud/routes.php                 | 160 +++
 examples/_006_crud/sessiondb.php              |  57 +
 examples/_006_crud/sqlitedb.php               |  68 ++
 examples/helloworld/README.txt                |  31 -
 examples/helloworld/digestauthentication.php  |  85 --
 examples/helloworld/index.php                 |  13 -
 examples/helloworld/simpleservice.php         |  40 -
 examples/index.html                           |  87 ++
 examples/resources/Luracast.gif               | Bin 0 -> 8033 bytes
 examples/resources/Restler2.gif               | Bin 0 -> 12476 bytes
 examples/resources/ZeroClipboard.swf          | Bin 0 -> 1071 bytes
 examples/resources/closelabel.png             | Bin 0 -> 168 bytes
 examples/resources/facebox.css                |  80 ++
 examples/resources/facebox.js                 | 309 ++++++
 examples/resources/getsource.php              |  41 +
 examples/resources/hacks.css                  |  13 +
 examples/resources/jquery-1.6.2.min.js        |  18 +
 examples/resources/jquery.snippet.min.css     |  40 +
 examples/resources/jquery.snippet.min.js      |  12 +
 examples/resources/loading.gif                | Bin 0 -> 2767 bytes
 examples/resources/markdown.css               | 403 ++++++++
 restler/amfformat/Zend/Amf/Constants.php      |  87 ++
 .../Zend/Amf/Parse/Amf3/Deserializer.php      | 424 ++++++++
 .../Zend/Amf/Parse/Amf3/Serializer.php        | 507 +++++++++
 .../amfformat/Zend/Amf/Parse/Deserializer.php |  65 ++
 .../amfformat/Zend/Amf/Parse/InputStream.php  |  39 +
 .../amfformat/Zend/Amf/Parse/OutputStream.php |  49 +
 .../amfformat/Zend/Amf/Parse/Serializer.php   |  59 ++
 .../amfformat/Zend/Amf/Parse/TypeLoader.php   | 231 +++++
 .../amfformat/Zend/Amf/Util/BinaryStream.php  | 285 +++++
 .../Amf/Value/Messaging/AbstractMessage.php   |  92 ++
 .../Value/Messaging/AcknowledgeMessage.php    |  60 ++
 .../Zend/Amf/Value/Messaging/AsyncMessage.php |  43 +
 .../Amf/Value/Messaging/CommandMessage.php    | 119 +++
 .../Zend/Amf/Value/Messaging/ErrorMessage.php |  67 ++
 .../Amf/Value/Messaging/RemotingMessage.php   |  73 ++
 restler/amfformat/amfformat.php               |  70 ++
 restler/compat.php                            |  58 ++
 restler/plistformat/.svn/entries              | 166 +++
 .../CFBinaryPropertyList.php.svn-base         | 970 ++++++++++++++++++
 .../text-base/CFPropertyList.php.svn-base     | 587 +++++++++++
 .../.svn/text-base/CFType.php.svn-base        | 742 ++++++++++++++
 .../text-base/CFTypeDetector.php.svn-base     | 167 +++
 .../.svn/text-base/IOException.php.svn-base   |  99 ++
 .../text-base/PListException.php.svn-base     |  22 +
 restler/plistformat/CFBinaryPropertyList.php  | 970 ++++++++++++++++++
 restler/plistformat/CFPropertyList.php        | 586 +++++++++++
 restler/plistformat/CFType.php                | 742 ++++++++++++++
 restler/plistformat/CFTypeDetector.php        | 167 +++
 restler/plistformat/IOException.php           |  99 ++
 restler/plistformat/PListException.php        |  22 +
 restler/plistformat/plistformat.php           |  86 ++
 restler/restler.php                           | 941 +++++++++++------
 restler/xmlformat.php                         |  82 +-
 restler/yamlformat/LICENSE                    |  19 +
 restler/yamlformat/README.markdown            |  15 +
 restler/yamlformat/sfyaml.php                 | 137 +++
 restler/yamlformat/sfyamlInline.php           | 442 ++++++++
 restler/yamlformat/sfyamldumper.php           |  60 ++
 restler/yamlformat/sfyamlparser.php           | 622 +++++++++++
 restler/yamlformat/yamlformat.php             |  47 +
 98 files changed, 12833 insertions(+), 530 deletions(-)
 create mode 100644 README.html
 rename examples/{helloworld => _001_helloworld}/.htaccess (100%)
 mode change 100644 => 100755
 create mode 100755 examples/_001_helloworld/index.php
 create mode 100755 examples/_001_helloworld/readme.html
 create mode 100755 examples/_001_helloworld/readme.md
 create mode 100755 examples/_001_helloworld/say.php
 create mode 100755 examples/_002_minimal/.htaccess
 create mode 100755 examples/_002_minimal/index.php
 create mode 100755 examples/_002_minimal/math.php
 create mode 100755 examples/_002_minimal/readme.html
 create mode 100755 examples/_002_minimal/readme.md
 create mode 100755 examples/_003_multiformat/.htaccess
 create mode 100755 examples/_003_multiformat/bmi.php
 create mode 100755 examples/_003_multiformat/index.php
 create mode 100755 examples/_003_multiformat/readme.html
 create mode 100755 examples/_003_multiformat/readme.md
 create mode 100755 examples/_004_error_response/.htaccess
 create mode 100755 examples/_004_error_response/currency.php
 create mode 100755 examples/_004_error_response/index.php
 create mode 100755 examples/_004_error_response/readme.html
 create mode 100755 examples/_004_error_response/readme.md
 create mode 100755 examples/_005_protected_api/.htaccess
 create mode 100755 examples/_005_protected_api/index.php
 create mode 100755 examples/_005_protected_api/readme.html
 create mode 100755 examples/_005_protected_api/readme.md
 create mode 100755 examples/_005_protected_api/secured.php
 create mode 100755 examples/_005_protected_api/simple.php
 create mode 100755 examples/_005_protected_api/simpleauth.php
 create mode 100755 examples/_006_crud/.htaccess
 create mode 100755 examples/_006_crud/author.php
 create mode 100755 examples/_006_crud/author.sql
 create mode 100755 examples/_006_crud/author.sqlite
 create mode 100755 examples/_006_crud/filename.sqlite
 create mode 100755 examples/_006_crud/index.php
 create mode 100755 examples/_006_crud/readme.html
 create mode 100755 examples/_006_crud/readme.md
 create mode 100755 examples/_006_crud/routes.php
 create mode 100755 examples/_006_crud/sessiondb.php
 create mode 100755 examples/_006_crud/sqlitedb.php
 delete mode 100644 examples/helloworld/README.txt
 delete mode 100644 examples/helloworld/digestauthentication.php
 delete mode 100644 examples/helloworld/index.php
 delete mode 100644 examples/helloworld/simpleservice.php
 create mode 100755 examples/index.html
 create mode 100755 examples/resources/Luracast.gif
 create mode 100755 examples/resources/Restler2.gif
 create mode 100755 examples/resources/ZeroClipboard.swf
 create mode 100755 examples/resources/closelabel.png
 create mode 100755 examples/resources/facebox.css
 create mode 100755 examples/resources/facebox.js
 create mode 100755 examples/resources/getsource.php
 create mode 100755 examples/resources/hacks.css
 create mode 100755 examples/resources/jquery-1.6.2.min.js
 create mode 100755 examples/resources/jquery.snippet.min.css
 create mode 100755 examples/resources/jquery.snippet.min.js
 create mode 100755 examples/resources/loading.gif
 create mode 100755 examples/resources/markdown.css
 create mode 100644 restler/amfformat/Zend/Amf/Constants.php
 create mode 100644 restler/amfformat/Zend/Amf/Parse/Amf3/Deserializer.php
 create mode 100644 restler/amfformat/Zend/Amf/Parse/Amf3/Serializer.php
 create mode 100644 restler/amfformat/Zend/Amf/Parse/Deserializer.php
 create mode 100644 restler/amfformat/Zend/Amf/Parse/InputStream.php
 create mode 100644 restler/amfformat/Zend/Amf/Parse/OutputStream.php
 create mode 100644 restler/amfformat/Zend/Amf/Parse/Serializer.php
 create mode 100644 restler/amfformat/Zend/Amf/Parse/TypeLoader.php
 create mode 100644 restler/amfformat/Zend/Amf/Util/BinaryStream.php
 create mode 100644 restler/amfformat/Zend/Amf/Value/Messaging/AbstractMessage.php
 create mode 100644 restler/amfformat/Zend/Amf/Value/Messaging/AcknowledgeMessage.php
 create mode 100644 restler/amfformat/Zend/Amf/Value/Messaging/AsyncMessage.php
 create mode 100644 restler/amfformat/Zend/Amf/Value/Messaging/CommandMessage.php
 create mode 100644 restler/amfformat/Zend/Amf/Value/Messaging/ErrorMessage.php
 create mode 100644 restler/amfformat/Zend/Amf/Value/Messaging/RemotingMessage.php
 create mode 100644 restler/amfformat/amfformat.php
 create mode 100644 restler/compat.php
 create mode 100644 restler/plistformat/.svn/entries
 create mode 100644 restler/plistformat/.svn/text-base/CFBinaryPropertyList.php.svn-base
 create mode 100644 restler/plistformat/.svn/text-base/CFPropertyList.php.svn-base
 create mode 100644 restler/plistformat/.svn/text-base/CFType.php.svn-base
 create mode 100644 restler/plistformat/.svn/text-base/CFTypeDetector.php.svn-base
 create mode 100644 restler/plistformat/.svn/text-base/IOException.php.svn-base
 create mode 100644 restler/plistformat/.svn/text-base/PListException.php.svn-base
 create mode 100644 restler/plistformat/CFBinaryPropertyList.php
 create mode 100644 restler/plistformat/CFPropertyList.php
 create mode 100644 restler/plistformat/CFType.php
 create mode 100644 restler/plistformat/CFTypeDetector.php
 create mode 100644 restler/plistformat/IOException.php
 create mode 100644 restler/plistformat/PListException.php
 create mode 100644 restler/plistformat/plistformat.php
 create mode 100755 restler/yamlformat/LICENSE
 create mode 100755 restler/yamlformat/README.markdown
 create mode 100755 restler/yamlformat/sfyaml.php
 create mode 100755 restler/yamlformat/sfyamlInline.php
 create mode 100755 restler/yamlformat/sfyamldumper.php
 create mode 100755 restler/yamlformat/sfyamlparser.php
 create mode 100644 restler/yamlformat/yamlformat.php

diff --git a/README.html b/README.html
new file mode 100644
index 000000000..9cb4eb882
--- /dev/null
+++ b/README.html
@@ -0,0 +1,64 @@
+
+<!DOCTYPE html>
+<html>
+<head>
+<title>Luracast Restler 2.0 Example:- CRUD</title>
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+<link rel="stylesheet" type="text/css" href="examples/resources/markdown.css"/>
+</head>
+<body>
+<article>
+<h1>Luracast Restler 2.0</h1>
+
+<p>Restler is a simple and effective multi-protocol REST API Server written in PHP. 
+Just deal with your business logic in php, restler will take care of the REST!</p>
+
+<ul>
+<li><a href="http://luracast.com/products/restler/" target="_blank">Developer Home</a></li>
+<li><a href="http://bit.ly/RestlerLiveExamples" target="_blank">Live Examples</a></li>
+<li><a href="http://bit.ly/TakingCareOfTheREST" target="_blank">Taking Care of the REST - Presentation</a></li>
+<li><a href="http://bit.ly/SingMood" target="_blank">Open Sourced Real World Example - SingMood</a></li>
+<li><a href="http://twitter.com/Luracast" target="_blank">Updates on Twitter</a></li>
+</ul>
+
+<h2>Features</h2>
+
+<ul>
+<li>Light weight</li>
+<li>Flexible</li>
+<li>Customizable</li>
+<li>Supports HTTP request methods  GET, POST, PUT, and DELETE</li>
+<li>Clients can use X-HTTP-Method-Override header</li>
+<li>Two way format conversion</li>
+<li>Pluggable Formatters</li>
+<li>Comes with JSON, XML, Yaml, Amf, and Plist(both XML and Binary) formats</li>
+<li>Pluggable Authentication schemes</li>
+<li>Comes with many <a href="http://bit.ly/RestlerLiveExamples" target="_blank">Examples</a> 
+that can be tried on your localhost to get started</li>
+<li>URL to Method mapping</li>
+<li>URL part to Method parameter mapping</li>
+<li>Supports URLEncoded format for simplified input</li>
+<li>Query parameters to Method parameter mapping</li>
+<li>Source code distributed under LGPL</li>
+</ul>
+
+<h2>Changes from Restler 1.0</h2>
+
+<p>Restler 2.0 is a major rewrite to use convention over configuration and it is optimized 
+for performance. Here are some of the major changes and improvements</p>
+
+<ul>
+<li>PHPDoc comments to map a method to URI is now optional.</li>
+<li>All public methods that does not begin with an underscore are mapped 
+automatically to the method name (<code>gateway\classname\methodname\param1\...</code>)</li>
+<li>If we do not specify the second parameter for <code>$restler-&gt;addAPIClass</code> it will be mapped to the 
+class name instead of mapping it to the root</li>
+<li>Restler 2 is written for PHP 5.3 and above but it make use of compat.php and work on 
+any version of PHP starting from PHP 5.0</li>
+</ul>
+
+<p>more information is available on the
+<a href="http://luracast.com/products/restler/features/" target="_blank">features page</a>
+</article>
+</body>
+</html></p>
diff --git a/README.md b/README.md
index c7424399a..3963f7c10 100644
--- a/README.md
+++ b/README.md
@@ -1,10 +1,17 @@
-# Luracast Restler
+Luracast Restler 2.0
+====================
 
-Restler is a simple and effective multi-protocol REST API Server written in PHP. Just deal with your business logic in php, restler will take care of the REST!
+Restler is a simple and effective multi-protocol REST API Server written in PHP. 
+Just deal with your business logic in php, restler will take care of the REST!
 
 * [Developer Home](http://luracast.com/products/restler/)
+* [Live Examples](http://bit.ly/RestlerLiveExamples)
+* [Taking Care of the REST - Presentation](http://bit.ly/TakingCareOfTheREST)
+* [Open Sourced Real World Example - SingMood](http://bit.ly/SingMood)
+* [Updates on Twitter](http://twitter.com/Luracast)
 
-## Features
+Features
+--------
 
 * Light weight
 * Flexible
@@ -13,13 +20,29 @@ Restler is a simple and effective multi-protocol REST API Server written in PHP.
 * Clients can use X-HTTP-Method-Override header
 * Two way format conversion
 * Pluggable Formatters
-* Comes with JSON, and XML formats
+* Comes with JSON, XML, Yaml, Amf, and Plist(both XML and Binary) formats
 * Pluggable Authentication schemes
-* Comes with Digest Authentication Example
-* URL to Function mapping
-* URL part to Function parameter mapping
+* Comes with many [Examples](http://bit.ly/RestlerLiveExamples) 
+  that can be tried on your localhost to get started
+* URL to Method mapping
+* URL part to Method parameter mapping
 * Supports URLEncoded format for simplified input
-* Query parameters to Function parameter mapping
+* Query parameters to Method parameter mapping
 * Source code distributed under LGPL
 
-more information is available on the [features page](http://luracast.com/products/restler/features/)
\ No newline at end of file
+Changes from Restler 1.0
+------------------------
+
+Restler 2.0 is a major rewrite to use convention over configuration and it is optimized 
+for performance. Here are some of the major changes and improvements
+
+* PHPDoc comments to map a method to URI is now optional.
+* All public methods that does not begin with an underscore are mapped 
+  automatically to the method name (`gateway\classname\methodname\param1\...`)
+* If we do not specify the second parameter for `$restler->addAPIClass` it will be mapped to the 
+  class name instead of mapping it to the root
+* Restler 2 is written for PHP 5.3 and above but it make use of compat.php and work on 
+  any version of PHP starting from PHP 5.0
+
+more information is available on the
+[features page](http://luracast.com/products/restler/features/)
\ No newline at end of file
diff --git a/examples/helloworld/.htaccess b/examples/_001_helloworld/.htaccess
old mode 100644
new mode 100755
similarity index 100%
rename from examples/helloworld/.htaccess
rename to examples/_001_helloworld/.htaccess
diff --git a/examples/_001_helloworld/index.php b/examples/_001_helloworld/index.php
new file mode 100755
index 000000000..34d44b636
--- /dev/null
+++ b/examples/_001_helloworld/index.php
@@ -0,0 +1,14 @@
+<?php
+/*
+ Title: Hello World Example.
+ Tagline: Let's say hello!.
+ Description: Basic hello world example to get started with Restler 2.0.
+ Example 1: GET say/hello returns "Hello world!".
+ Example 2: GET say/hello/restler2.0 returns "Hello Restler2.0!".
+ Example 3: GET say/hello?to=R.Arul%20Kumaran returns "Hello R.Arul Kumaran!".
+ */
+require_once '../../restler/restler.php';
+require_once 'say.php';
+$r = new Restler();
+$r->addAPIClass('Say');
+$r->handle();
\ No newline at end of file
diff --git a/examples/_001_helloworld/readme.html b/examples/_001_helloworld/readme.html
new file mode 100755
index 000000000..8ed7126da
--- /dev/null
+++ b/examples/_001_helloworld/readme.html
@@ -0,0 +1,107 @@
+<!DOCTYPE html>
+<html>
+<head>
+<title>Luracast Restler 2.0 Example:- Hello World Example</title>
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+<link rel="stylesheet" type="text/css" href="../resources/markdown.css"/>
+<link rel="stylesheet" type="text/css" href="../resources/jquery.snippet.min.css"/>
+<link rel="stylesheet" type="text/css" href="../resources/facebox.css"/>
+<link rel="stylesheet" type="text/css" href="../resources/hacks.css"/>
+
+<script type="text/javascript" src="../resources/jquery-1.6.2.min.js"></script>
+<script type="text/javascript" src="../resources/jquery.snippet.min.js"></script>
+<script type="text/javascript" src="../resources/facebox.js"></script>
+
+<script type="text/javascript">
+ $(document).ready(function(){
+ 	 //$('a[target*=_blank]').facebox();
+	 $("abbr").click(function(){
+	 	$('#codeviewer').load('../resources/getsource.php?file='+$(this).attr("title"), function(){
+	 		$("pre#php").snippet("php",{style:"acid",showNum:false});
+	 		jQuery.facebox({ div: '#codeviewer' });
+	 	});
+ 	 });
+ })
+</script>
+</head>
+<body>
+<div id="codeviewer" style="display:none;"></div>
+<nav id="left">
+<img src="../resources/Restler2.gif" width="126" height="126" title="Luracast Restler 2.0"/>
+<h3><a href="../index.html">Examples</a></h3>
+<ul>
+<li><a href="../_001_helloworld/readme.html" title="Let's say hello!">Hello World</a></li>
+<li><a href="../_002_minimal/readme.html" title="Less is more">Minimal</a></li>
+<li><a href="../_003_multiformat/readme.html" title="Serving what the client wants">Multi-format</a></li>
+<li><a href="../_004_error_response/readme.html" title="Making use of HTTP status codes">Error Response</a></li>
+<li><a href="../_005_protected_api/readme.html" title="Creating restricted zone">Protected API</a></li>
+<li><a href="../_006_crud/readme.html" title="using POST, GET, PUT and DELETE">CRUD</a></li>
+<li>
+</nav>
+<article id="right">
+<h2>Hello World Example</h2>
+
+<p>Basic hello world example to get started with Restler 2.0</p>
+
+<blockquote>
+  <p>This API Server is made using the following php files/folders</p>
+  
+  <ul>
+  <li><abbr title="_001_helloworld/index.php">index.php</abbr>      (gateway)</li>
+  <li><abbr title="_001_helloworld/say.php">say.php</abbr>      (api)</li>
+  <li><abbr title="../restler/restler.php">restler.php</abbr>      (framework)</li>
+  </ul>
+</blockquote>
+
+<p>This API Server exposes the following URIs</p>
+
+<pre><code>GET say/hello     ⇠ Say::hello()
+GET say/hello/:to ⇠ Say::hello()
+</code></pre>
+
+<p>Try the following links in your browser</p>
+
+<dl>
+<dt>GET <a href="say/hello" target="_blank">say/hello</a></dt>
+<dd>
+<pre><code>"Hello world!"
+</code></pre>
+</dd>
+
+<dt>GET <a href="say/hello/restler2.0" target="_blank">say/hello/restler2.0</a></dt>
+<dd><pre><code>"Hello Restler2.0!"
+</code></pre></dd>
+
+<dl>
+<dt>GET <a href="say/hello?to=R.Arul%20Kumaran" target="_blank">say/hello?to=R.Arul%20Kumaran</a></dt>
+<dd>
+<pre><code>"Hello R.Arul Kumaran!"
+</code></pre>
+</dd>
+</dl>
+
+<p>If the above links fail, it could be due to missing <code>.htaccess</code> file or URL Rewriting is not supported in your server. 
+Try the following links instead</p>
+
+<dl>
+<dt>GET <a href="index.php/say/hello" target="_blank"><abbr title="_001_helloworld/index.php">index.php</abbr>/say/hello</a></dt>
+<dd>
+<pre><code>"Hello world!"
+</code></pre>
+</dd>
+
+<dt>GET <a href="index.php/say/hello/restler2.0" target="_blank"><abbr title="_001_helloworld/index.php">index.php</abbr>/say/hello/restler2.0</a></dt>
+<dd><pre><code>"Hello Restler2.0!"
+</code></pre></dd>
+
+<dl>
+<dt>GET <a href="index.php/say/hello?to=R.Arul%20Kumaran" target="_blank"><abbr title="_001_helloworld/index.php">index.php</abbr>/say/hello?to=R.Arul%20Kumaran</a></dt>
+<dd>
+<pre><code>"Hello R.Arul Kumaran!"
+</code></pre>
+</dd>
+</dl>
+
+</article>
+</body>
+</html>
\ No newline at end of file
diff --git a/examples/_001_helloworld/readme.md b/examples/_001_helloworld/readme.md
new file mode 100755
index 000000000..7ec0dfba9
--- /dev/null
+++ b/examples/_001_helloworld/readme.md
@@ -0,0 +1,63 @@
+Hello World Example
+-------------------
+
+Basic hello world example to get started with Restler 2.0
+> This API Server is made using the following php files/folders
+
+> * index.php      (gateway)
+> * say.php      (api)
+> * restler.php      (framework)
+
+This API Server exposes the following URIs
+
+	GET say/hello     ⇠ Say::hello()
+	GET say/hello/:to ⇠ Say::hello()
+
+
+Try the following links in your browser
+
+GET [say/hello](say/hello)
+:	
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+"Hello world!"
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+GET [say/hello/restler2.0](say/hello/restler2.0)
+:	
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+"Hello Restler2.0!"
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+GET [say/hello?to=R.Arul%20Kumaran](say/hello?to=R.Arul%20Kumaran)
+:	
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+"Hello R.Arul Kumaran!"
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+
+If the above links fail, it could be due to missing `.htaccess` file or URL Rewriting is not supported in your server. 
+Try the following links instead
+
+GET [index.php/say/hello](index.php/say/hello)
+:	
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+"Hello world!"
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+GET [index.php/say/hello/restler2.0](index.php/say/hello/restler2.0)
+:	
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+"Hello Restler2.0!"
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+GET [index.php/say/hello?to=R.Arul%20Kumaran](index.php/say/hello?to=R.Arul%20Kumaran)
+:	
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+"Hello R.Arul Kumaran!"
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+
+
+*[index.php]: _001_helloworld/index.php
+*[say.php]: _001_helloworld/say.php
+*[restler.php]: ../restler/restler.php
diff --git a/examples/_001_helloworld/say.php b/examples/_001_helloworld/say.php
new file mode 100755
index 000000000..dda8e1eac
--- /dev/null
+++ b/examples/_001_helloworld/say.php
@@ -0,0 +1,6 @@
+<?php
+class Say {
+	function hello($to='world') {
+		return "Hello $to!";
+	}
+}
\ No newline at end of file
diff --git a/examples/_002_minimal/.htaccess b/examples/_002_minimal/.htaccess
new file mode 100755
index 000000000..b766fc6f0
--- /dev/null
+++ b/examples/_002_minimal/.htaccess
@@ -0,0 +1,8 @@
+DirectoryIndex index.php
+<IfModule mod_rewrite.c>
+	RewriteEngine On
+	RewriteRule ^$ index.php [QSA,L]
+	RewriteCond %{REQUEST_FILENAME} !-f
+	RewriteCond %{REQUEST_FILENAME} !-d
+	RewriteRule ^(.*)$ index.php [QSA,L]
+</IfModule>
\ No newline at end of file
diff --git a/examples/_002_minimal/index.php b/examples/_002_minimal/index.php
new file mode 100755
index 000000000..b041048cb
--- /dev/null
+++ b/examples/_002_minimal/index.php
@@ -0,0 +1,23 @@
+<?php
+/*
+ Tagline: Less is more.
+ Description: Shows the bare minimum code needed to get your RESTful api server up and running.
+ Example 1: GET math/add returns 2.
+ Example 2: GET math/add/4/3 returns 7.
+ Example 3: GET math/add?n1=6&n2=4 returns 10.
+ Example 4: GET math/multiply returns {"result":10}.
+ Example 5: GET math/multiply/4/3 returns {"result":12}.
+ Example 6: GET math/multiply?n2=4 returns {"result":20}.
+ */
+
+#add restler to include path
+set_include_path(get_include_path() . PATH_SEPARATOR . '../../restler');
+
+#set autoloader
+#do not use spl_autoload_register with out parameter
+#it will disable the autoloading of formats
+spl_autoload_register('spl_autoload');
+
+$r = new Restler();
+$r->addAPIClass('Math');
+$r->handle();
\ No newline at end of file
diff --git a/examples/_002_minimal/math.php b/examples/_002_minimal/math.php
new file mode 100755
index 000000000..9a17b3b8b
--- /dev/null
+++ b/examples/_002_minimal/math.php
@@ -0,0 +1,9 @@
+<?php
+class Math {
+    function add($n1=1, $n2=1) {
+        return $n1+$n2;
+    }
+    function multiply($n1=5, $n2=2) {
+        return array('result'=>($n1*$n2));
+    }
+}
\ No newline at end of file
diff --git a/examples/_002_minimal/readme.html b/examples/_002_minimal/readme.html
new file mode 100755
index 000000000..6df5e42a5
--- /dev/null
+++ b/examples/_002_minimal/readme.html
@@ -0,0 +1,103 @@
+<!DOCTYPE html>
+<html>
+<head>
+<title>Luracast Restler 2.0 Example:- Minimal Example</title>
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+<link rel="stylesheet" type="text/css" href="../resources/markdown.css"/>
+<link rel="stylesheet" type="text/css" href="../resources/jquery.snippet.min.css"/>
+<link rel="stylesheet" type="text/css" href="../resources/facebox.css"/>
+<link rel="stylesheet" type="text/css" href="../resources/hacks.css"/>
+
+<script type="text/javascript" src="../resources/jquery-1.6.2.min.js"></script>
+<script type="text/javascript" src="../resources/jquery.snippet.min.js"></script>
+<script type="text/javascript" src="../resources/facebox.js"></script>
+
+<script type="text/javascript">
+ $(document).ready(function(){
+ 	 //$('a[target*=_blank]').facebox();
+	 $("abbr").click(function(){
+	 	$('#codeviewer').load('../resources/getsource.php?file='+$(this).attr("title"), function(){
+	 		$("pre#php").snippet("php",{style:"acid",showNum:false});
+	 		jQuery.facebox({ div: '#codeviewer' });
+	 	});
+ 	 });
+ })
+</script>
+</head>
+<body>
+<div id="codeviewer" style="display:none;"></div>
+<nav id="left">
+<img src="../resources/Restler2.gif" width="126" height="126" title="Luracast Restler 2.0"/>
+<h3><a href="../index.html">Examples</a></h3>
+<ul>
+<li><a href="../_001_helloworld/readme.html" title="Let's say hello!">Hello World</a></li>
+<li><a href="../_002_minimal/readme.html" title="Less is more">Minimal</a></li>
+<li><a href="../_003_multiformat/readme.html" title="Serving what the client wants">Multi-format</a></li>
+<li><a href="../_004_error_response/readme.html" title="Making use of HTTP status codes">Error Response</a></li>
+<li><a href="../_005_protected_api/readme.html" title="Creating restricted zone">Protected API</a></li>
+<li><a href="../_006_crud/readme.html" title="using POST, GET, PUT and DELETE">CRUD</a></li>
+<li>
+</nav>
+<article id="right">
+<h2>Minimal Example</h2>
+
+<p>Shows the bare minimum code needed to get your RESTful api server up and running</p>
+
+<blockquote>
+  <p>This API Server is made using the following php files/folders</p>
+  
+  <ul>
+  <li><abbr title="_002_minimal/index.php">index.php</abbr>      (gateway)</li>
+  <li><abbr title="_002_minimal/math.php">math.php</abbr>      (api)</li>
+  <li><abbr title="../restler/restler.php">restler.php</abbr>      (framework)</li>
+  </ul>
+</blockquote>
+
+<p>This API Server exposes the following URIs</p>
+
+<pre><code>GET math/add              ⇠ Math::add()
+GET math/add/:n1          ⇠ Math::add()
+GET math/add/:n1/:n2      ⇠ Math::add()
+GET math/multiply         ⇠ Math::multiply()
+GET math/multiply/:n1     ⇠ Math::multiply()
+GET math/multiply/:n1/:n2 ⇠ Math::multiply()
+</code></pre>
+
+<p>Try the following links in your browser</p>
+
+<dl>
+<dt>GET <a href="index.php/math/add" target="_blank">math/add</a></dt>
+<dd>
+<pre><code>2
+</code></pre>
+</dd>
+
+<dt>GET <a href="index.php/math/add/4/3" target="_blank">math/add/4/3</a></dt>
+<dd><pre><code>7
+</code></pre></dd>
+
+<dl>
+<dt>GET <a href="index.php/math/add?n1=6&amp;n2=4" target="_blank">math/add?n1=6&amp;n2=4</a></dt>
+<dd>
+<pre><code>10
+</code></pre>
+</dd>
+
+<dt>GET <a href="index.php/math/multiply" target="_blank">math/multiply</a></dt>
+<dd><pre><code>{"result":10}
+</code></pre></dd>
+
+<dl>
+<dt>GET <a href="index.php/math/multiply/4/3" target="_blank">math/multiply/4/3</a></dt>
+<dd>
+<pre><code>{"result":12}
+</code></pre>
+</dd>
+
+<dt>GET <a href="index.php/math/multiply?n2=4" target="_blank">math/multiply?n2=4</a></dt>
+<dd><pre><code>{"result":20}
+</code></pre></dd>
+
+</article>
+</body>
+</html>
\ No newline at end of file
diff --git a/examples/_002_minimal/readme.md b/examples/_002_minimal/readme.md
new file mode 100755
index 000000000..1d45643ad
--- /dev/null
+++ b/examples/_002_minimal/readme.md
@@ -0,0 +1,64 @@
+Minimal Example
+---------------
+
+Shows the bare minimum code needed to get your RESTful api server up and running
+> This API Server is made using the following php files/folders
+
+> * index.php      (gateway)
+> * math.php      (api)
+> * restler.php      (framework)
+
+This API Server exposes the following URIs
+
+	GET math/add              ⇠ Math::add()
+	GET math/add/:n1          ⇠ Math::add()
+	GET math/add/:n1/:n2      ⇠ Math::add()
+	GET math/multiply         ⇠ Math::multiply()
+	GET math/multiply/:n1     ⇠ Math::multiply()
+	GET math/multiply/:n1/:n2 ⇠ Math::multiply()
+
+
+Try the following links in your browser
+
+GET [math/add](index.php/math/add)
+:	
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+2
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+GET [math/add/4/3](index.php/math/add/4/3)
+:	
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+7
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+GET [math/add?n1=6&n2=4](index.php/math/add?n1=6&n2=4)
+:	
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+10
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+GET [math/multiply](index.php/math/multiply)
+:	
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+{"result":10}
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+GET [math/multiply/4/3](index.php/math/multiply/4/3)
+:	
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+{"result":12}
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+GET [math/multiply?n2=4](index.php/math/multiply?n2=4)
+:	
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+{"result":20}
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+
+
+
+*[index.php]: _002_minimal/index.php
+*[math.php]: _002_minimal/math.php
+*[restler.php]: ../restler/restler.php
diff --git a/examples/_003_multiformat/.htaccess b/examples/_003_multiformat/.htaccess
new file mode 100755
index 000000000..b766fc6f0
--- /dev/null
+++ b/examples/_003_multiformat/.htaccess
@@ -0,0 +1,8 @@
+DirectoryIndex index.php
+<IfModule mod_rewrite.c>
+	RewriteEngine On
+	RewriteRule ^$ index.php [QSA,L]
+	RewriteCond %{REQUEST_FILENAME} !-f
+	RewriteCond %{REQUEST_FILENAME} !-d
+	RewriteRule ^(.*)$ index.php [QSA,L]
+</IfModule>
\ No newline at end of file
diff --git a/examples/_003_multiformat/bmi.php b/examples/_003_multiformat/bmi.php
new file mode 100755
index 000000000..be8d96fe4
--- /dev/null
+++ b/examples/_003_multiformat/bmi.php
@@ -0,0 +1,37 @@
+<?php
+class BMI {
+	function index($height=162.6, $weight=84) {
+		$result = new stdClass();
+
+		#	1 pound = 0.45359237 kilograms
+		#	1 meter = 3.2808399  feet
+		#	1 meter = 39.3700787 inches
+		#	1 meter = 100		 cms
+		
+		#assume height is given in centimeters
+		$cm = $height;
+		#assume weight is given in kilograms
+		$kg = $weight;
+		
+		$meter = $cm / 100;
+		$inches = $meter * 39.3700787;
+		$feet = round($inches/12);
+		$inches = $inches % 12; 
+		
+		$result->bmi = round($kg/($meter*$meter),2);
+		$lb = round($kg/0.45359237,2);
+		
+		if($result->bmi<18.5){
+			$result->message = 'Underweight';
+		}elseif ($result->bmi<=24.9){
+			$result->message = 'Normal weight';
+		}elseif ($result->bmi<=29.9){
+			$result->message = 'Overweight';
+		}else{
+			$result->message = 'Obesity';
+		}
+		$result->metric = array('height'=>"$cm centimeter", 'weight'=>"$weight kilograms");
+		$result->imperial = array('height'=>"$feet feet $inches inches", 'weight'=>"$lb pounds");
+		return $result;
+	}
+}
\ No newline at end of file
diff --git a/examples/_003_multiformat/index.php b/examples/_003_multiformat/index.php
new file mode 100755
index 000000000..9d9ab6611
--- /dev/null
+++ b/examples/_003_multiformat/index.php
@@ -0,0 +1,72 @@
+<?php
+/*
+ Title: Multi-format.
+ Tagline: Serving what the client wants.
+ Description: This BMI calculator service shows how you can serve data in different 
+ formats using Rester. This example uses JsonFormat (default) and XmlFormat. 
+ 
+ First  format specified in `Restler::setSuportedFormats` is used as the default 
+ format when client does not specify the format. 
+ 
+ Client can specify the format either using  extension like .json or specify 
+ the MIME type in HTTP Accept Header.
+ 
+ Example 1: GET bmi returns 
+ 
+ {
+  "bmi": 31.77,
+  "message": "Obesity",
+  "metric": {
+    "height": "162.6 centimeter",
+    "weight": "84 kilograms"
+  },
+  "imperial": {
+    "height": "5 feet 4 inches",
+    "weight": "185.19 pounds"
+  }
+}.
+
+ Example 2: GET bmi.xml returns 
+  
+<?xml version="1.0"?>
+<response>
+  <bmi>31.77</bmi>
+  <message>Obesity</message>
+  <metric>
+    <height>162.6 centimeter</height>
+    <weight>84 kilograms</weight>
+  </metric>
+  <imperial>
+    <height>5 feet 4 inches</height>
+    <weight>185.19 pounds</weight>
+  </imperial>
+</response>.
+
+ Example 3: GET bmi.json returns 
+ 
+ {
+  "bmi": 31.77,
+  "message": "Obesity",
+  "metric": {
+    "height": "162.6 centimeter",
+    "weight": "84 kilograms"
+  },
+  "imperial": {
+    "height": "5 feet 4 inches",
+    "weight": "185.19 pounds"
+  }
+}
+.
+ */
+
+require_once '../../restler/restler.php';
+
+#set autoloader
+#do not use spl_autoload_register with out parameter
+#it will disable the autoloading of formats
+spl_autoload_register('spl_autoload');
+
+$r = new Restler();
+$r->setSupportedFormats('JsonFormat', 'XmlFormat');
+$r->addAPIClass('BMI');
+$r->handle();
\ No newline at end of file
diff --git a/examples/_003_multiformat/readme.html b/examples/_003_multiformat/readme.html
new file mode 100755
index 000000000..5755f6cae
--- /dev/null
+++ b/examples/_003_multiformat/readme.html
@@ -0,0 +1,128 @@
+<!DOCTYPE html>
+<html>
+<head>
+<title>Luracast Restler 2.0 Example:- Multi-format</title>
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+<link rel="stylesheet" type="text/css" href="../resources/markdown.css"/>
+<link rel="stylesheet" type="text/css" href="../resources/jquery.snippet.min.css"/>
+<link rel="stylesheet" type="text/css" href="../resources/facebox.css"/>
+<link rel="stylesheet" type="text/css" href="../resources/hacks.css"/>
+
+<script type="text/javascript" src="../resources/jquery-1.6.2.min.js"></script>
+<script type="text/javascript" src="../resources/jquery.snippet.min.js"></script>
+<script type="text/javascript" src="../resources/facebox.js"></script>
+
+<script type="text/javascript">
+ $(document).ready(function(){
+ 	 //$('a[target*=_blank]').facebox();
+	 $("abbr").click(function(){
+	 	$('#codeviewer').load('../resources/getsource.php?file='+$(this).attr("title"), function(){
+	 		$("pre#php").snippet("php",{style:"acid",showNum:false});
+	 		jQuery.facebox({ div: '#codeviewer' });
+	 	});
+ 	 });
+ })
+</script>
+</head>
+<body>
+<div id="codeviewer" style="display:none;"></div>
+<nav id="left">
+<img src="../resources/Restler2.gif" width="126" height="126" title="Luracast Restler 2.0"/>
+<h3><a href="../index.html">Examples</a></h3>
+<ul>
+<li><a href="../_001_helloworld/readme.html" title="Let's say hello!">Hello World</a></li>
+<li><a href="../_002_minimal/readme.html" title="Less is more">Minimal</a></li>
+<li><a href="../_003_multiformat/readme.html" title="Serving what the client wants">Multi-format</a></li>
+<li><a href="../_004_error_response/readme.html" title="Making use of HTTP status codes">Error Response</a></li>
+<li><a href="../_005_protected_api/readme.html" title="Creating restricted zone">Protected API</a></li>
+<li><a href="../_006_crud/readme.html" title="using POST, GET, PUT and DELETE">CRUD</a></li>
+<li>
+</nav>
+<article id="right">
+<h2>Multi-format</h2>
+
+<p>This BMI calculator service shows how you can serve data in different 
+formats using Rester. This example uses JsonFormat (default) and XmlFormat.</p>
+
+<p>First  format specified in <code>Restler::setSuportedFormats</code> is used as the default 
+format when client does not specify the format.</p>
+
+<p>Client can specify the format either using  extension like .json or specify 
+the MIME type in HTTP Accept Header</p>
+
+<blockquote>
+  <p>This API Server is made using the following php files/folders</p>
+  
+  <ul>
+  <li><abbr title="_003_multiformat/index.php">index.php</abbr>      (gateway)</li>
+  <li><abbr title="_003_multiformat/bmi.php">bmi.php</abbr>      (api)</li>
+  <li><abbr title="../restler/restler.php">restler.php</abbr>      (framework)</li>
+  <li><abbr title="../restler/xmlformat.php">xmlformat.php</abbr>      (format)</li>
+  </ul>
+</blockquote>
+
+<p>This API Server exposes the following URIs</p>
+
+<pre><code>GET bmi                 ⇠ BMI::index()
+GET bmi/:height         ⇠ BMI::index()
+GET bmi/:height/:weight ⇠ BMI::index()
+</code></pre>
+
+<p>Try the following links in your browser</p>
+
+<dl>
+<dt>GET <a href="index.php/bmi" target="_blank">bmi</a></dt>
+<dd>
+<pre><code>{
+ "bmi": 31.77,
+ "message": "Obesity",
+ "metric": {
+   "height": "162.6 centimeter",
+   "weight": "84 kilograms"
+ },
+ "imperial": {
+   "height": "5 feet 4 inches",
+   "weight": "185.19 pounds"
+ }
+}
+</code></pre>
+</dd>
+
+<dt>GET <a href="index.php/bmi.xml" target="_blank">bmi.xml</a></dt>
+<dd><pre><code>&lt;?xml version="1.0"?&gt;
+&lt;response&gt;
+ &lt;bmi&gt;31.77&lt;/bmi&gt;
+ &lt;message&gt;Obesity&lt;/message&gt;
+ &lt;metric&gt;
+   &lt;height&gt;162.6 centimeter&lt;/height&gt;
+   &lt;weight&gt;84 kilograms&lt;/weight&gt;
+ &lt;/metric&gt;
+ &lt;imperial&gt;
+   &lt;height&gt;5 feet 4 inches&lt;/height&gt;
+   &lt;weight&gt;185.19 pounds&lt;/weight&gt;
+ &lt;/imperial&gt;
+&lt;/response&gt;
+</code></pre></dd>
+
+<dl>
+<dt>GET <a href="index.php/bmi.json" target="_blank">bmi.json</a></dt>
+<dd>
+<pre><code>{
+ "bmi": 31.77,
+ "message": "Obesity",
+ "metric": {
+   "height": "162.6 centimeter",
+   "weight": "84 kilograms"
+ },
+ "imperial": {
+   "height": "5 feet 4 inches",
+   "weight": "185.19 pounds"
+ }
+}
+</code></pre>
+</dd>
+</dl>
+
+</article>
+</body>
+</html>
\ No newline at end of file
diff --git a/examples/_003_multiformat/readme.md b/examples/_003_multiformat/readme.md
new file mode 100755
index 000000000..b236d0703
--- /dev/null
+++ b/examples/_003_multiformat/readme.md
@@ -0,0 +1,86 @@
+Multi-format
+------------
+
+This BMI calculator service shows how you can serve data in different 
+formats using Rester. This example uses JsonFormat (default) and XmlFormat. 
+
+First  format specified in `Restler::setSuportedFormats` is used as the default 
+format when client does not specify the format. 
+
+Client can specify the format either using  extension like .json or specify 
+the MIME type in HTTP Accept Header
+> This API Server is made using the following php files/folders
+
+> * index.php      (gateway)
+> * bmi.php      (api)
+> * restler.php      (framework)
+> * xmlformat.php      (format)
+
+This API Server exposes the following URIs
+
+	GET bmi                 ⇠ BMI::index()
+	GET bmi/:height         ⇠ BMI::index()
+	GET bmi/:height/:weight ⇠ BMI::index()
+
+
+Try the following links in your browser
+
+GET [bmi](index.php/bmi)
+:	
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+{
+ "bmi": 31.77,
+ "message": "Obesity",
+ "metric": {
+   "height": "162.6 centimeter",
+   "weight": "84 kilograms"
+ },
+ "imperial": {
+   "height": "5 feet 4 inches",
+   "weight": "185.19 pounds"
+ }
+}
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+GET [bmi.xml](index.php/bmi.xml)
+:	
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+<?xml version="1.0"?>
+<response>
+ <bmi>31.77</bmi>
+ <message>Obesity</message>
+ <metric>
+   <height>162.6 centimeter</height>
+   <weight>84 kilograms</weight>
+ </metric>
+ <imperial>
+   <height>5 feet 4 inches</height>
+   <weight>185.19 pounds</weight>
+ </imperial>
+</response>
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+GET [bmi.json](index.php/bmi.json)
+:	
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+{
+ "bmi": 31.77,
+ "message": "Obesity",
+ "metric": {
+   "height": "162.6 centimeter",
+   "weight": "84 kilograms"
+ },
+ "imperial": {
+   "height": "5 feet 4 inches",
+   "weight": "185.19 pounds"
+ }
+}
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+
+
+
+*[index.php]: _003_multiformat/index.php
+*[bmi.php]: _003_multiformat/bmi.php
+*[restler.php]: ../restler/restler.php
+*[xmlformat.php]: ../restler/xmlformat.php
diff --git a/examples/_004_error_response/.htaccess b/examples/_004_error_response/.htaccess
new file mode 100755
index 000000000..b766fc6f0
--- /dev/null
+++ b/examples/_004_error_response/.htaccess
@@ -0,0 +1,8 @@
+DirectoryIndex index.php
+<IfModule mod_rewrite.c>
+	RewriteEngine On
+	RewriteRule ^$ index.php [QSA,L]
+	RewriteCond %{REQUEST_FILENAME} !-f
+	RewriteCond %{REQUEST_FILENAME} !-d
+	RewriteRule ^(.*)$ index.php [QSA,L]
+</IfModule>
\ No newline at end of file
diff --git a/examples/_004_error_response/currency.php b/examples/_004_error_response/currency.php
new file mode 100755
index 000000000..9f5de0e4d
--- /dev/null
+++ b/examples/_004_error_response/currency.php
@@ -0,0 +1,11 @@
+<?php
+class Currency {
+	function format($number=NULL) {
+		if(is_null($number))throw new RestException(400);
+		if(!is_numeric($number))throw new RestException(412,'not a valid number');
+		
+		// let's print the international format for the en_US locale
+		setlocale(LC_MONETARY, 'en_US');
+		return money_format('%i', $number);
+	}
+}
\ No newline at end of file
diff --git a/examples/_004_error_response/index.php b/examples/_004_error_response/index.php
new file mode 100755
index 000000000..9367c9217
--- /dev/null
+++ b/examples/_004_error_response/index.php
@@ -0,0 +1,44 @@
+<?php
+/*
+ Title: Error Response.
+ Tagline: Making use of HTTP status codes.
+ Description: API methods can make use of RestException class to provide 
+ error information to the user. 
+ 
+ use `throw new RestException($http_status_code)` to send the error response 
+ to the client. 
+ 
+ For the list of HTTP Status codes and their meaning take a look at 
+ [Wikipedia](http://en.wikipedia.org/wiki/List_of_HTTP_status_codes).
+ 
+ Example 1: GET currency/format returns 
+ 
+{
+  "error": {
+    "code": 400,
+    "message": "Bad Request"
+  }
+}.
+
+ Example 2: GET currency/format/not_a_number returns 
+  
+{
+  "error": {
+    "code": 412,
+    "message": "Precondition Failed: not a valid number"
+  }
+}.
+
+ Example 3: GET currency/format?number=55 returns "USD55.00".
+*/
+
+require_once '../../restler/restler.php';
+
+#set autoloader
+#do not use spl_autoload_register with out parameter
+#it will disable the autoloading of formats
+spl_autoload_register('spl_autoload');
+
+$r = new Restler();
+$r->addAPIClass('Currency');
+$r->handle();
\ No newline at end of file
diff --git a/examples/_004_error_response/readme.html b/examples/_004_error_response/readme.html
new file mode 100755
index 000000000..348f80669
--- /dev/null
+++ b/examples/_004_error_response/readme.html
@@ -0,0 +1,102 @@
+<!DOCTYPE html>
+<html>
+<head>
+<title>Luracast Restler 2.0 Example:- Error Response</title>
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+<link rel="stylesheet" type="text/css" href="../resources/markdown.css"/>
+<link rel="stylesheet" type="text/css" href="../resources/jquery.snippet.min.css"/>
+<link rel="stylesheet" type="text/css" href="../resources/facebox.css"/>
+<link rel="stylesheet" type="text/css" href="../resources/hacks.css"/>
+
+<script type="text/javascript" src="../resources/jquery-1.6.2.min.js"></script>
+<script type="text/javascript" src="../resources/jquery.snippet.min.js"></script>
+<script type="text/javascript" src="../resources/facebox.js"></script>
+
+<script type="text/javascript">
+ $(document).ready(function(){
+ 	 //$('a[target*=_blank]').facebox();
+	 $("abbr").click(function(){
+	 	$('#codeviewer').load('../resources/getsource.php?file='+$(this).attr("title"), function(){
+	 		$("pre#php").snippet("php",{style:"acid",showNum:false});
+	 		jQuery.facebox({ div: '#codeviewer' });
+	 	});
+ 	 });
+ })
+</script>
+</head>
+<body>
+<div id="codeviewer" style="display:none;"></div>
+<nav id="left">
+<img src="../resources/Restler2.gif" width="126" height="126" title="Luracast Restler 2.0"/>
+<h3><a href="../index.html">Examples</a></h3>
+<ul>
+<li><a href="../_001_helloworld/readme.html" title="Let's say hello!">Hello World</a></li>
+<li><a href="../_002_minimal/readme.html" title="Less is more">Minimal</a></li>
+<li><a href="../_003_multiformat/readme.html" title="Serving what the client wants">Multi-format</a></li>
+<li><a href="../_004_error_response/readme.html" title="Making use of HTTP status codes">Error Response</a></li>
+<li><a href="../_005_protected_api/readme.html" title="Creating restricted zone">Protected API</a></li>
+<li><a href="../_006_crud/readme.html" title="using POST, GET, PUT and DELETE">CRUD</a></li>
+<li>
+</nav>
+<article id="right">
+<h2>Error Response</h2>
+
+<p>API methods can make use of RestException class to provide 
+error information to the user.</p>
+
+<p>use <code>throw new RestException($http_status_code)</code> to send the error response 
+to the client.</p>
+
+<p>For the list of HTTP Status codes and their meaning take a look at 
+<a href="http://en.wikipedia.org/wiki/List_of_HTTP_status_codes" target="_blank">Wikipedia</a></p>
+
+<blockquote>
+  <p>This API Server is made using the following php files/folders</p>
+  
+  <ul>
+  <li><abbr title="_004_error_response/index.php">index.php</abbr>      (gateway)</li>
+  <li><abbr title="_004_error_response/currency.php">currency.php</abbr>      (api)</li>
+  <li><abbr title="../restler/restler.php">restler.php</abbr>      (framework)</li>
+  </ul>
+</blockquote>
+
+<p>This API Server exposes the following URIs</p>
+
+<pre><code>GET currency/format         ⇠ Currency::format()
+GET currency/format/:number ⇠ Currency::format()
+</code></pre>
+
+<p>Try the following links in your browser</p>
+
+<dl>
+<dt>GET <a href="index.php/currency/format" target="_blank">currency/format</a></dt>
+<dd>
+<pre><code>{
+ "error": {
+   "code": 400,
+   "message": "Bad Request"
+ }
+}
+</code></pre>
+</dd>
+
+<dt>GET <a href="index.php/currency/format/not_a_number" target="_blank">currency/format/not_a_number</a></dt>
+<dd><pre><code>{
+ "error": {
+   "code": 412,
+   "message": "Precondition Failed: not a valid number"
+ }
+}
+</code></pre></dd>
+
+<dl>
+<dt>GET <a href="index.php/currency/format?number=55" target="_blank">currency/format?number=55</a></dt>
+<dd>
+<pre><code>"USD55.00"
+</code></pre>
+</dd>
+</dl>
+
+</article>
+</body>
+</html>
\ No newline at end of file
diff --git a/examples/_004_error_response/readme.md b/examples/_004_error_response/readme.md
new file mode 100755
index 000000000..fba9f3c5d
--- /dev/null
+++ b/examples/_004_error_response/readme.md
@@ -0,0 +1,59 @@
+Error Response
+--------------
+
+API methods can make use of RestException class to provide 
+error information to the user. 
+
+use `throw new RestException($http_status_code)` to send the error response 
+to the client. 
+
+For the list of HTTP Status codes and their meaning take a look at 
+[Wikipedia](http://en.wikipedia.org/wiki/List_of_HTTP_status_codes)
+> This API Server is made using the following php files/folders
+
+> * index.php      (gateway)
+> * currency.php      (api)
+> * restler.php      (framework)
+
+This API Server exposes the following URIs
+
+	GET currency/format         ⇠ Currency::format()
+	GET currency/format/:number ⇠ Currency::format()
+
+
+Try the following links in your browser
+
+GET [currency/format](index.php/currency/format)
+:	
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+{
+ "error": {
+   "code": 400,
+   "message": "Bad Request"
+ }
+}
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+GET [currency/format/not_a_number](index.php/currency/format/not_a_number)
+:	
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+{
+ "error": {
+   "code": 412,
+   "message": "Precondition Failed: not a valid number"
+ }
+}
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+GET [currency/format?number=55](index.php/currency/format?number=55)
+:	
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+"USD55.00"
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+
+
+
+*[index.php]: _004_error_response/index.php
+*[currency.php]: _004_error_response/currency.php
+*[restler.php]: ../restler/restler.php
diff --git a/examples/_005_protected_api/.htaccess b/examples/_005_protected_api/.htaccess
new file mode 100755
index 000000000..b766fc6f0
--- /dev/null
+++ b/examples/_005_protected_api/.htaccess
@@ -0,0 +1,8 @@
+DirectoryIndex index.php
+<IfModule mod_rewrite.c>
+	RewriteEngine On
+	RewriteRule ^$ index.php [QSA,L]
+	RewriteCond %{REQUEST_FILENAME} !-f
+	RewriteCond %{REQUEST_FILENAME} !-d
+	RewriteRule ^(.*)$ index.php [QSA,L]
+</IfModule>
\ No newline at end of file
diff --git a/examples/_005_protected_api/index.php b/examples/_005_protected_api/index.php
new file mode 100755
index 000000000..352c86336
--- /dev/null
+++ b/examples/_005_protected_api/index.php
@@ -0,0 +1,43 @@
+<?php
+/*
+ Title: Protected API.
+ Tagline: Creating restricted zone.
+ Description: Not all the API exposed needs to be public, we need to protect some of our API. 
+ Here are three ways to protect a method
+ 
+ 1. Change it to a `protected function`
+ 2. Add a PHPDoc comment `@protected` to the method
+ 3. Add `@protected` comment to the class to protect all methods of that class
+ 
+ In order to provide access to those protected methods we use a class that implements `iAuthenticate`. Also note that
+ An Authentication class is also an API class so all public methods that does not begin with `_` will be exposed as API
+ for example [SimpleAuth::key](simpleauth/key). It can be used to create login/logout methods.
+ 
+ 
+ Example 1: GET restricted returns 
+ 
+{
+  "error": {
+    "code": 401,
+    "message": "Unauthorized"
+  }
+}.
+
+ Example 2: GET restricted?key=rEsTlEr2 returns "protected method".
+ 
+ Example 3: GET secured?key=rEsTlEr2 returns "protected class".
+*/
+
+require_once '../../restler/restler.php';
+
+#set autoloader
+#do not use spl_autoload_register with out parameter
+#it will disable the autoloading of formats
+spl_autoload_register('spl_autoload');
+
+$r = new Restler();
+
+$r->addAPIClass('Simple','');
+$r->addAPIClass('Secured');
+$r->addAuthenticationClass('SimpleAuth');
+$r->handle();
\ No newline at end of file
diff --git a/examples/_005_protected_api/readme.html b/examples/_005_protected_api/readme.html
new file mode 100755
index 000000000..c86aefcf0
--- /dev/null
+++ b/examples/_005_protected_api/readme.html
@@ -0,0 +1,106 @@
+<!DOCTYPE html>
+<html>
+<head>
+<title>Luracast Restler 2.0 Example:- Protected API</title>
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+<link rel="stylesheet" type="text/css" href="../resources/markdown.css"/>
+<link rel="stylesheet" type="text/css" href="../resources/jquery.snippet.min.css"/>
+<link rel="stylesheet" type="text/css" href="../resources/facebox.css"/>
+<link rel="stylesheet" type="text/css" href="../resources/hacks.css"/>
+
+<script type="text/javascript" src="../resources/jquery-1.6.2.min.js"></script>
+<script type="text/javascript" src="../resources/jquery.snippet.min.js"></script>
+<script type="text/javascript" src="../resources/facebox.js"></script>
+
+<script type="text/javascript">
+ $(document).ready(function(){
+ 	 //$('a[target*=_blank]').facebox();
+	 $("abbr").click(function(){
+	 	$('#codeviewer').load('../resources/getsource.php?file='+$(this).attr("title"), function(){
+	 		$("pre#php").snippet("php",{style:"acid",showNum:false});
+	 		jQuery.facebox({ div: '#codeviewer' });
+	 	});
+ 	 });
+ })
+</script>
+</head>
+<body>
+<div id="codeviewer" style="display:none;"></div>
+<nav id="left">
+<img src="../resources/Restler2.gif" width="126" height="126" title="Luracast Restler 2.0"/>
+<h3><a href="../index.html">Examples</a></h3>
+<ul>
+<li><a href="../_001_helloworld/readme.html" title="Let's say hello!">Hello World</a></li>
+<li><a href="../_002_minimal/readme.html" title="Less is more">Minimal</a></li>
+<li><a href="../_003_multiformat/readme.html" title="Serving what the client wants">Multi-format</a></li>
+<li><a href="../_004_error_response/readme.html" title="Making use of HTTP status codes">Error Response</a></li>
+<li><a href="../_005_protected_api/readme.html" title="Creating restricted zone">Protected API</a></li>
+<li><a href="../_006_crud/readme.html" title="using POST, GET, PUT and DELETE">CRUD</a></li>
+<li>
+</nav>
+<article id="right">
+<h2>Protected API</h2>
+
+<p>Not all the API exposed needs to be public, we need to protect some of our API. 
+Here are three ways to protect a method</p>
+
+<ol>
+<li>Change it to a <code>protected function</code></li>
+<li>Add a PHPDoc comment <code>@protected</code> to the method</li>
+<li>Add <code>@protected</code> comment to the class to protect all methods of that class</li>
+</ol>
+
+<p>In order to provide access to those protected methods we use a class that implements <code>iAuthenticate</code>. Also note that
+An Authentication class is also an API class so all public methods that does not begin with <code>_</code> will be exposed as API
+for example <a href="simpleauth/key" target="_blank">SimpleAuth::key</a>. It can be used to create login/logout methods</p>
+
+<blockquote>
+  <p>This API Server is made using the following php files/folders</p>
+  
+  <ul>
+  <li><abbr title="_005_protected_api/index.php">index.php</abbr>      (gateway)</li>
+  <li><abbr title="_005_protected_api/simple.php">simple.php</abbr>      (api)</li>
+  <li><abbr title="_005_protected_api/secured.php">secured.php</abbr>      (api)</li>
+  <li><abbr title="_005_protected_api/simpleauth.php">simpleauth.php</abbr>      (auth)</li>
+  <li><abbr title="../restler/restler.php">restler.php</abbr>      (framework)</li>
+  </ul>
+</blockquote>
+
+<p>This API Server exposes the following URIs</p>
+
+<pre><code>GET normal         ⇠ Simple::normal()
+GET restricted     ⇠ Simple::restricted()
+GET restricted2    ⇠ Simple::restricted2()
+GET secured        ⇠ Secured::index()
+GET simpleauth/key ⇠ SimpleAuth::key()
+</code></pre>
+
+<p>Try the following links in your browser</p>
+
+<dl>
+<dt>GET <a href="index.php/restricted" target="_blank">restricted</a></dt>
+<dd>
+<pre><code>{
+ "error": {
+   "code": 401,
+   "message": "Unauthorized"
+ }
+}
+</code></pre>
+</dd>
+
+<dt>GET <a href="index.php/restricted?key=rEsTlEr2" target="_blank">restricted?key=rEsTlEr2</a></dt>
+<dd><pre><code>"protected method"
+</code></pre></dd>
+
+<dl>
+<dt>GET <a href="index.php/secured?key=rEsTlEr2" target="_blank">secured?key=rEsTlEr2</a></dt>
+<dd>
+<pre><code>"protected class"
+</code></pre>
+</dd>
+</dl>
+
+</article>
+</body>
+</html>
\ No newline at end of file
diff --git a/examples/_005_protected_api/readme.md b/examples/_005_protected_api/readme.md
new file mode 100755
index 000000000..a118d9463
--- /dev/null
+++ b/examples/_005_protected_api/readme.md
@@ -0,0 +1,63 @@
+Protected API
+-------------
+
+Not all the API exposed needs to be public, we need to protect some of our API. 
+Here are three ways to protect a method
+
+1. Change it to a `protected function`
+2. Add a PHPDoc comment `@protected` to the method
+3. Add `@protected` comment to the class to protect all methods of that class
+
+In order to provide access to those protected methods we use a class that implements `iAuthenticate`. Also note that
+An Authentication class is also an API class so all public methods that does not begin with `_` will be exposed as API
+for example [SimpleAuth::key](simpleauth/key). It can be used to create login/logout methods
+> This API Server is made using the following php files/folders
+
+> * index.php      (gateway)
+> * simple.php      (api)
+> * secured.php      (api)
+> * simpleauth.php      (auth)
+> * restler.php      (framework)
+
+This API Server exposes the following URIs
+
+	GET normal         ⇠ Simple::normal()
+	GET restricted     ⇠ Simple::restricted()
+	GET restricted2    ⇠ Simple::restricted2()
+	GET secured        ⇠ Secured::index()
+	GET simpleauth/key ⇠ SimpleAuth::key()
+
+
+Try the following links in your browser
+
+GET [restricted](index.php/restricted)
+:	
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+{
+ "error": {
+   "code": 401,
+   "message": "Unauthorized"
+ }
+}
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+GET [restricted?key=rEsTlEr2](index.php/restricted?key=rEsTlEr2)
+:	
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+"protected method"
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+GET [secured?key=rEsTlEr2](index.php/secured?key=rEsTlEr2)
+:	
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+"protected class"
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+
+
+
+*[index.php]: _005_protected_api/index.php
+*[simple.php]: _005_protected_api/simple.php
+*[secured.php]: _005_protected_api/secured.php
+*[simpleauth.php]: _005_protected_api/simpleauth.php
+*[restler.php]: ../restler/restler.php
diff --git a/examples/_005_protected_api/secured.php b/examples/_005_protected_api/secured.php
new file mode 100755
index 000000000..dd4326d19
--- /dev/null
+++ b/examples/_005_protected_api/secured.php
@@ -0,0 +1,10 @@
+<?php
+/**
+ * All methods in this class are protected
+ * @protected
+ */
+class Secured {
+	function index() {
+		return 'protected class';
+	}
+}
\ No newline at end of file
diff --git a/examples/_005_protected_api/simple.php b/examples/_005_protected_api/simple.php
new file mode 100755
index 000000000..5d342e1f0
--- /dev/null
+++ b/examples/_005_protected_api/simple.php
@@ -0,0 +1,15 @@
+<?php
+class Simple {
+	function normal() {
+		return 'open for all';
+	}
+	protected function restricted() {
+		return 'protected method';
+	}
+	/**
+	 * @protected
+	 */
+	function restricted2(){
+		return 'protected by comment';
+	}
+}
\ No newline at end of file
diff --git a/examples/_005_protected_api/simpleauth.php b/examples/_005_protected_api/simpleauth.php
new file mode 100755
index 000000000..f64cacec5
--- /dev/null
+++ b/examples/_005_protected_api/simpleauth.php
@@ -0,0 +1,10 @@
+<?php
+class SimpleAuth implements iAuthenticate{
+	const KEY = 'rEsTlEr2';
+	function __isAuthenticated() {
+		return isset($_GET['key']) && $_GET['key']==SimpleAuth::KEY ? TRUE : FALSE;
+	}
+	function key(){
+		return SimpleAuth::KEY;
+	}
+}
\ No newline at end of file
diff --git a/examples/_006_crud/.htaccess b/examples/_006_crud/.htaccess
new file mode 100755
index 000000000..b766fc6f0
--- /dev/null
+++ b/examples/_006_crud/.htaccess
@@ -0,0 +1,8 @@
+DirectoryIndex index.php
+<IfModule mod_rewrite.c>
+	RewriteEngine On
+	RewriteRule ^$ index.php [QSA,L]
+	RewriteCond %{REQUEST_FILENAME} !-f
+	RewriteCond %{REQUEST_FILENAME} !-d
+	RewriteRule ^(.*)$ index.php [QSA,L]
+</IfModule>
\ No newline at end of file
diff --git a/examples/_006_crud/author.php b/examples/_006_crud/author.php
new file mode 100755
index 000000000..49a85a63d
--- /dev/null
+++ b/examples/_006_crud/author.php
@@ -0,0 +1,33 @@
+<?php
+class Author {
+	public $dp;
+
+	static $FIELDS = array('name', 'email');
+
+	function __construct(){
+		$this->dp = new SessionDB();
+	}
+
+	function get($id=NULL) {
+		return is_null($id) ? $this->dp->getAll() : $this->dp->get($id);
+	}
+	function post($request_data=NULL) {
+		return $this->dp->insert($this->_validate($request_data));
+	}
+	function put($id=NULL, $request_data=NULL) {
+		return $this->dp->update($id, $this->_validate($request_data));
+	}
+	function delete($id=NULL) {
+		return $this->dp->delete($id);
+	}
+
+	private function _validate($data){
+		$author=array();
+		foreach (Author::$FIELDS as $field) {
+//you may also vaildate the data here
+			if(!isset($data[$field]))throw new RestException(417,"$field field missing");
+			$author[$field]=$data[$field];
+		}
+		return $author;
+	}
+}
\ No newline at end of file
diff --git a/examples/_006_crud/author.sql b/examples/_006_crud/author.sql
new file mode 100755
index 000000000..9556f9c96
--- /dev/null
+++ b/examples/_006_crud/author.sql
@@ -0,0 +1,4 @@
+DROP TABLE IF EXISTS "author";
+CREATE TABLE "author" ("id" INTEGER PRIMARY KEY  AUTOINCREMENT  NOT NULL , "name" VARCHAR NOT NULL , "email" VARCHAR NOT NULL  UNIQUE );
+INSERT INTO "author" VALUES(1,'Jac Wright','jacwright@gmail.com');
+INSERT INTO "author" VALUES(2,'Arul Kumaran','arul@luracast.com');
diff --git a/examples/_006_crud/author.sqlite b/examples/_006_crud/author.sqlite
new file mode 100755
index 0000000000000000000000000000000000000000..d959af334d065a839a84e71dee026b09e8281086
GIT binary patch
literal 163840
zcmeI*&u$w<7y$5H+YMEvoDhm4gfy`flqjZE$OAN{vf7Z;ZH)tpI7Cy&O}1Lw%6hHl
zR0DTjh?hX(gpjy!<jj!+n?FSfs<=~rpJr#jnc4kz=eG~AUp(8(%3*jhDMqmjTgf*`
znkL&JBuR3+I&M|Ro2XYw`eyKt{Mz)5^mg*eZyznr|4bUMzfb0^`H!!EsS-he009C7
z2oNAZfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+009C72oNAZfB*pk1PBlyK!5-N
z0t5&UAV7cs0RjXF5FkK+009C72oNAZfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+
z009C72oNAZfB*pk1PBlyK!5-N0t5&UAV7cs0RsOnu-jNzT3t=QF5~ljI6cj)Khqyh
z%UEt+&u=~Gb=v(-=(j)H>xAnoYvuF2l^vb6&hJ@&T3=Y&*hmj<6dRt-hU3BCwXcSa
zx0bwGTpP#Hur(c?u74ZS_m-BI)9*gKs2OMF$)vdKYd0!1FDIK}t(hG)!%nx~dD!WN
zr@fuW?cPDy?Hq*A-tRxz=~lNr?sWShbf5G?cYkj$v_kXzfz9w`yZ7KxyLV${IEq>R
zmZh-Y-Fdd(3F{lRg{Aw;X_AePhG$nc)yqsS#)p@$b+~zXu2&zUu~>Dr`47qb*Qyf)
z2oNAZfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+009C72oNAZfB*pk1PBlyK!5-N
z0t5&UAV7cs0RjXF5FkK+009C72oNAZfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+
z009C72oNAZfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF5FkL{KPRwKYb2}p+QlpnyR%U&
z;y70Mc0McOAWqA>gUM(mZ6qsOpT|M?s>qH{%9nBQ>LS@b9>pv_zvND}@7nyQWd3{A
z2?7KN5FkK+009C72oNAZfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+009C72oNAZ
zfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+009C72oNAZfB*pk1PBlyK!5-N0t5&U
zAV7cs0RjXF5FkK+009C72oNAZfB*pk1PBlyK!5-N0t5&UAn?uzEY-KtmvQi_$c|6S
z?c-6*^1Fk{DE***FO9`4-_B=69K>mPK3iL?_MOiENUA0X5FkK+009C72oNAZfB*pk
z1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+009C72oNAZfB*pk1PBlyK!5-N0t5&UAV7cs
z0RjXF5FkK+009C72oNAZfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+009C72oNAZ
zfB*pk1PBlyK!5-N0t5&UAV7e?|4QIaT3=4%tUQ?%wZ&@Z>HO!UYJva(0t5&UAV7cs
z0RjXF5FkK+009C72oNAZfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+009C72oNAZ
zfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+009C72oNAZfB*pk1PBlyK!5-N0t5&U
zAV7cs0RjXF5FkK+009C72oNAZfB*pk1PHuy0w1T1<@@i)S$Q%krl)yU4iBrrBpV+M
O&(5=I`f&5pu=y91*~Ur$

literal 0
HcmV?d00001

diff --git a/examples/_006_crud/filename.sqlite b/examples/_006_crud/filename.sqlite
new file mode 100755
index 0000000000000000000000000000000000000000..be89fb66dae6a1174e9a2ed5c64ac977243e886d
GIT binary patch
literal 4096
zcmdPWQV7Y&ELKR%%t=*9&d)1J%*-oRNX%0R4)n<^NmVe?GgL@PEJ;jCEKXI>(qhmk
zeSC`n3c7(b3yd>LkA}c#2n@*(h+yDg5MVe1%*zsB_ct&wFoGD6ylub$<TJ7HsOT9O
zWag!$RxoG)i-Vlhyu{p8g~Za5e6XN`p(X=dn86sN9co?@NIxSRkC=i|5?BS2I)n}r
z2InAG#}HSA5Jx8;R|U9)f<|VFLS|lxjzUptVQFe{Nil>M5aj9W7!;}C?HUPEqN&L+
znahM3Z0#s98UmvsKtc#`Ferdkb3yea8MqrpfO9Pa!-LU0MM6l9Djf}hp%((M{12(`
b*}*xVnU&p;!D2N3553qNb@6Bj5FY{nVe&{n

literal 0
HcmV?d00001

diff --git a/examples/_006_crud/index.php b/examples/_006_crud/index.php
new file mode 100755
index 000000000..aa2eb85d0
--- /dev/null
+++ b/examples/_006_crud/index.php
@@ -0,0 +1,121 @@
+<?php
+/*
+ Title: CRUD.
+ Tagline: using POST, GET, PUT and DELETE.
+ Description: Create, Retrive, Update and Delete using 
+ HTTP methods POST, GET, PUT and DELETE respectively. 
+ For simplicity and making it work out of the box it is using
+ a session based fake database, thus depending on a client that
+ supports PHP Session Cookies. You may use [REST Console](https://chrome.google.com/webstore/detail/faceofpmfclkengnkgkgjkcibdbhemoc#)
+ an extension for Chrome or [RESTClient](https://addons.mozilla.org/en-US/firefox/addon/restclient/) 
+ a firefox extension.
+ 
+ Example 1: GET author returns 
+ 
+[
+  {
+    "id": 1,
+    "name": "Jac Wright",
+    "email": "jacwright@gmail.com"
+  },
+  {
+    "id": 2,
+    "name": "Arul Kumaran",
+    "email": "arul@luracast.com"
+  }
+].
+
+ Example 2: GET author/2 returns 
+  
+{
+  "id": 2,
+  "name": "Arul Kumaran",
+  "email": "arul@luracast.com"
+}.
+
+ Usage: 
+  
+ ###Creating new Author
+ 
+ Typical post request to create a new author will be any of the following
+ 
+ 
+**Using query parameters**
+ 
+	POST /examples/_006_crud/index.php/author?name=Another&email=another@email.com HTTP/1.1
+	Host: restler2.dev
+	Content-Length: 0
+	Accept-Language: en
+	X-Requested-With: XMLHttpRequest
+	User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10_7_0) AppleWebKit/535.1 (KHTML, like Gecko) Chrome/13.0.782.112 Safari/535.1
+	Content-Type: application/x-www-form-urlencoded; charset=UTF-8
+	Accept: *//*
+	Accept-Encoding: gzip,deflate,sdch
+	Accept-Charset: ISO-8859-1,utf-8;q=0.7,*;q=0.3
+	Cookie: PHPSESSID=dcdfec433e86c1a6730f75303187071f
+
+**Using post vars**
+
+	POST /examples/_006_crud/index.php/author HTTP/1.1
+	Host: restler2.dev
+	Content-Length: 36
+	Accept-Language: en
+	X-Requested-With: XMLHttpRequest
+	User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10_7_0) AppleWebKit/535.1 (KHTML, like Gecko) Chrome/13.0.782.112 Safari/535.1
+	Content-Type: application/x-www-form-urlencoded; charset=UTF-8
+	Accept: *//*
+	Accept-Encoding: gzip,deflate,sdch
+	Accept-Charset: ISO-8859-1,utf-8;q=0.7,*;q=0.3
+	Cookie: PHPSESSID=dcdfec433e86c1a6730f75303187071f
+
+	name=Another&email=another@email.com
+
+**Using JSON data**
+
+	POST /examples/_006_crud/index.php/author HTTP/1.1
+	Host: restler2.dev
+	Content-Length: 46
+	Origin: chrome-extension://faceofpmfclkengnkgkgjkcibdbhemoc
+	Accept-Language: en
+	X-Requested-With: XMLHttpRequest
+	User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10_7_0) AppleWebKit/535.1 (KHTML, like Gecko) Chrome/13.0.782.112 Safari/535.1
+	Content-Type: application/json; charset=UTF-8
+	Accept: *//*
+	Accept-Encoding: gzip,deflate,sdch
+	Accept-Charset: ISO-8859-1,utf-8;q=0.7,*;q=0.3
+	Cookie: PHPSESSID=dcdfec433e86c1a6730f75303187071f
+	
+	{"name":"Another","email":"another@email.com"}
+	
+
+and the response could be
+
+	HTTP/1.1 200 OK
+	Date: Fri, 19 Aug 2011 16:34:41 GMT
+	Server: Apache/2.2.19 (Unix) mod_ssl/2.2.19 OpenSSL/0.9.8r DAV/2 PHP/5.3.6 with Suhosin-Patch
+	X-Powered-By: Luracast Restler v2.0.0
+	Expires: 0
+	Cache-Control: no-cache, must-revalidate
+	Pragma: no-cache
+	Content-Length: 66
+	Content-Type: application/json
+	
+	{
+	  "name": "Another",
+	  "email": "another@email.com",
+	  "id": 7
+	}.
+	
+ Helper Classes: SessionDB.
+ */
+
+require_once '../../restler/restler.php';
+
+#set autoloader
+#do not use spl_autoload_register with out parameter
+#it will disable the autoloading of formats
+spl_autoload_register('spl_autoload');
+
+$r = new Restler();
+$r->addAPIClass('Author');
+$r->handle();
\ No newline at end of file
diff --git a/examples/_006_crud/readme.html b/examples/_006_crud/readme.html
new file mode 100755
index 000000000..35608357c
--- /dev/null
+++ b/examples/_006_crud/readme.html
@@ -0,0 +1,177 @@
+<!DOCTYPE html>
+<html>
+<head>
+<title>Luracast Restler 2.0 Example:- CRUD</title>
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+<link rel="stylesheet" type="text/css" href="../resources/markdown.css"/>
+<link rel="stylesheet" type="text/css" href="../resources/jquery.snippet.min.css"/>
+<link rel="stylesheet" type="text/css" href="../resources/facebox.css"/>
+<link rel="stylesheet" type="text/css" href="../resources/hacks.css"/>
+
+<script type="text/javascript" src="../resources/jquery-1.6.2.min.js"></script>
+<script type="text/javascript" src="../resources/jquery.snippet.min.js"></script>
+<script type="text/javascript" src="../resources/facebox.js"></script>
+
+<script type="text/javascript">
+ $(document).ready(function(){
+ 	 //$('a[target*=_blank]').facebox();
+	 $("abbr").click(function(){
+	 	$('#codeviewer').load('../resources/getsource.php?file='+$(this).attr("title"), function(){
+	 		$("pre#php").snippet("php",{style:"acid",showNum:false});
+	 		jQuery.facebox({ div: '#codeviewer' });
+	 	});
+ 	 });
+ })
+</script>
+</head>
+<body>
+<div id="codeviewer" style="display:none;"></div>
+<nav id="left">
+<img src="../resources/Restler2.gif" width="126" height="126" title="Luracast Restler 2.0"/>
+<h3><a href="../index.html">Examples</a></h3>
+<ul>
+<li><a href="../_001_helloworld/readme.html" title="Let's say hello!">Hello World</a></li>
+<li><a href="../_002_minimal/readme.html" title="Less is more">Minimal</a></li>
+<li><a href="../_003_multiformat/readme.html" title="Serving what the client wants">Multi-format</a></li>
+<li><a href="../_004_error_response/readme.html" title="Making use of HTTP status codes">Error Response</a></li>
+<li><a href="../_005_protected_api/readme.html" title="Creating restricted zone">Protected API</a></li>
+<li><a href="../_006_crud/readme.html" title="using POST, GET, PUT and DELETE">CRUD</a></li>
+<li>
+</nav>
+<article id="right">
+<h2>CRUD</h2>
+
+<p>Create, Retrive, Update and Delete using 
+HTTP methods POST, GET, PUT and DELETE respectively. 
+For simplicity and making it work out of the box it is using
+a session based fake database, thus depending on a client that
+supports PHP Session Cookies. You may use <a href="https://chrome.google.com/webstore/detail/faceofpmfclkengnkgkgjkcibdbhemoc#" target="_blank">REST Console</a>
+an extension for Chrome or <a href="https://addons.mozilla.org/en-US/firefox/addon/restclient/" target="_blank">RESTClient</a> 
+a firefox extension</p>
+
+<blockquote>
+  <p>This API Server is made using the following php files/folders</p>
+  
+  <ul>
+  <li><abbr title="_006_crud/index.php">index.php</abbr>      (gateway)</li>
+  <li><abbr title="_006_crud/author.php">author.php</abbr>      (api)</li>
+  <li><abbr title="_006_crud/sessiondb.php">sessiondb.php</abbr>      (helper)</li>
+  <li><abbr title="../restler/restler.php">restler.php</abbr>      (framework)</li>
+  </ul>
+</blockquote>
+
+<p>This API Server exposes the following URIs</p>
+
+<pre><code>GET    author     ⇠ Author::get()
+GET    author/:id ⇠ Author::get()
+POST   author     ⇠ Author::post()
+PUT    author     ⇠ Author::put()
+PUT    author/:id ⇠ Author::put()
+DELETE author     ⇠ Author::delete()
+DELETE author/:id ⇠ Author::delete()
+</code></pre>
+
+<p>Try the following links in your browser</p>
+
+<dl>
+<dt>GET <a href="index.php/author" target="_blank">author</a></dt>
+<dd>
+<pre><code>[
+ {
+   "id": 1,
+   "name": "Jac Wright",
+   "email": "jacwright@gmail.com"
+ },
+ {
+   "id": 2,
+   "name": "Arul Kumaran",
+   "email": "arul@luracast.com"
+ }
+]
+</code></pre>
+</dd>
+
+<dt>GET <a href="index.php/author/2" target="_blank">author/2</a></dt>
+<dd><pre><code>{
+ "id": 2,
+ "name": "Arul Kumaran",
+ "email": "arul@luracast.com"
+}
+</code></pre></dd>
+
+<h3>Creating new Author</h3>
+
+<p>Typical post request to create a new author will be any of the following</p>
+
+<p><strong>Using query parameters</strong></p>
+
+<pre><code>POST /examples/_006_crud/index.php/author?name=Another&amp;email=another@email.com HTTP/1.1
+Host: restler2.dev
+Content-Length: 0
+Accept-Language: en
+X-Requested-With: XMLHttpRequest
+User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10_7_0) AppleWebKit/535.1 (KHTML, like Gecko) Chrome/13.0.782.112 Safari/535.1
+Content-Type: application/x-www-form-urlencoded; charset=UTF-8
+Accept: */*
+Accept-Encoding: gzip,deflate,sdch
+Accept-Charset: ISO-8859-1,utf-8;q=0.7,*;q=0.3
+Cookie: PHPSESSID=dcdfec433e86c1a6730f75303187071f
+</code></pre>
+
+<p><strong>Using post vars</strong></p>
+
+<pre><code>POST /examples/_006_crud/index.php/author HTTP/1.1
+Host: restler2.dev
+Content-Length: 36
+Accept-Language: en
+X-Requested-With: XMLHttpRequest
+User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10_7_0) AppleWebKit/535.1 (KHTML, like Gecko) Chrome/13.0.782.112 Safari/535.1
+Content-Type: application/x-www-form-urlencoded; charset=UTF-8
+Accept: */*
+Accept-Encoding: gzip,deflate,sdch
+Accept-Charset: ISO-8859-1,utf-8;q=0.7,*;q=0.3
+Cookie: PHPSESSID=dcdfec433e86c1a6730f75303187071f
+
+name=Another&amp;email=another@email.com
+</code></pre>
+
+<p><strong>Using JSON data</strong></p>
+
+<pre><code>POST /examples/_006_crud/index.php/author HTTP/1.1
+Host: restler2.dev
+Content-Length: 46
+Origin: chrome-extension://faceofpmfclkengnkgkgjkcibdbhemoc
+Accept-Language: en
+X-Requested-With: XMLHttpRequest
+User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10_7_0) AppleWebKit/535.1 (KHTML, like Gecko) Chrome/13.0.782.112 Safari/535.1
+Content-Type: application/json; charset=UTF-8
+Accept: */*
+Accept-Encoding: gzip,deflate,sdch
+Accept-Charset: ISO-8859-1,utf-8;q=0.7,*;q=0.3
+Cookie: PHPSESSID=dcdfec433e86c1a6730f75303187071f
+
+{"name":"Another","email":"another@email.com"}
+</code></pre>
+
+<p>and the response could be</p>
+
+<pre><code>HTTP/1.1 200 OK
+Date: Fri, 19 Aug 2011 16:34:41 GMT
+Server: Apache/2.2.19 (Unix) mod_ssl/2.2.19 OpenSSL/0.9.8r DAV/2 PHP/5.3.6 with Suhosin-Patch
+X-Powered-By: Luracast Restler v2.0.0
+Expires: 0
+Cache-Control: no-cache, must-revalidate
+Pragma: no-cache
+Content-Length: 66
+Content-Type: application/json
+
+{
+  "name": "Another",
+  "email": "another@email.com",
+  "id": 7
+}
+</code></pre>
+
+</article>
+</body>
+</html>
\ No newline at end of file
diff --git a/examples/_006_crud/readme.md b/examples/_006_crud/readme.md
new file mode 100755
index 000000000..4e0059815
--- /dev/null
+++ b/examples/_006_crud/readme.md
@@ -0,0 +1,133 @@
+CRUD
+----
+
+Create, Retrive, Update and Delete using 
+HTTP methods POST, GET, PUT and DELETE respectively. 
+For simplicity and making it work out of the box it is using
+a session based fake database, thus depending on a client that
+supports PHP Session Cookies. You may use [REST Console](https://chrome.google.com/webstore/detail/faceofpmfclkengnkgkgjkcibdbhemoc#)
+an extension for Chrome or [RESTClient](https://addons.mozilla.org/en-US/firefox/addon/restclient/) 
+a firefox extension
+> This API Server is made using the following php files/folders
+
+> * index.php      (gateway)
+> * author.php      (api)
+> * sessiondb.php      (helper)
+> * restler.php      (framework)
+
+This API Server exposes the following URIs
+
+	GET    author     ⇠ Author::get()
+	GET    author/:id ⇠ Author::get()
+	POST   author     ⇠ Author::post()
+	PUT    author     ⇠ Author::put()
+	PUT    author/:id ⇠ Author::put()
+	DELETE author     ⇠ Author::delete()
+	DELETE author/:id ⇠ Author::delete()
+
+
+Try the following links in your browser
+
+GET [author](index.php/author)
+:	
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+[
+ {
+   "id": 1,
+   "name": "Jac Wright",
+   "email": "jacwright@gmail.com"
+ },
+ {
+   "id": 2,
+   "name": "Arul Kumaran",
+   "email": "arul@luracast.com"
+ }
+]
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+GET [author/2](index.php/author/2)
+:	
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+{
+ "id": 2,
+ "name": "Arul Kumaran",
+ "email": "arul@luracast.com"
+}
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+
+###Creating new Author
+
+Typical post request to create a new author will be any of the following
+
+
+**Using query parameters**
+
+	POST /examples/_006_crud/index.php/author?name=Another&email=another@email.com HTTP/1.1
+	Host: restler2.dev
+	Content-Length: 0
+	Accept-Language: en
+	X-Requested-With: XMLHttpRequest
+	User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10_7_0) AppleWebKit/535.1 (KHTML, like Gecko) Chrome/13.0.782.112 Safari/535.1
+	Content-Type: application/x-www-form-urlencoded; charset=UTF-8
+	Accept: */*
+	Accept-Encoding: gzip,deflate,sdch
+	Accept-Charset: ISO-8859-1,utf-8;q=0.7,*;q=0.3
+	Cookie: PHPSESSID=dcdfec433e86c1a6730f75303187071f
+
+**Using post vars**
+
+	POST /examples/_006_crud/index.php/author HTTP/1.1
+	Host: restler2.dev
+	Content-Length: 36
+	Accept-Language: en
+	X-Requested-With: XMLHttpRequest
+	User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10_7_0) AppleWebKit/535.1 (KHTML, like Gecko) Chrome/13.0.782.112 Safari/535.1
+	Content-Type: application/x-www-form-urlencoded; charset=UTF-8
+	Accept: */*
+	Accept-Encoding: gzip,deflate,sdch
+	Accept-Charset: ISO-8859-1,utf-8;q=0.7,*;q=0.3
+	Cookie: PHPSESSID=dcdfec433e86c1a6730f75303187071f
+
+	name=Another&email=another@email.com
+
+**Using JSON data**
+
+	POST /examples/_006_crud/index.php/author HTTP/1.1
+	Host: restler2.dev
+	Content-Length: 46
+	Origin: chrome-extension://faceofpmfclkengnkgkgjkcibdbhemoc
+	Accept-Language: en
+	X-Requested-With: XMLHttpRequest
+	User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10_7_0) AppleWebKit/535.1 (KHTML, like Gecko) Chrome/13.0.782.112 Safari/535.1
+	Content-Type: application/json; charset=UTF-8
+	Accept: */*
+	Accept-Encoding: gzip,deflate,sdch
+	Accept-Charset: ISO-8859-1,utf-8;q=0.7,*;q=0.3
+	Cookie: PHPSESSID=dcdfec433e86c1a6730f75303187071f
+	
+	{"name":"Another","email":"another@email.com"}
+	
+
+and the response could be
+
+	HTTP/1.1 200 OK
+	Date: Fri, 19 Aug 2011 16:34:41 GMT
+	Server: Apache/2.2.19 (Unix) mod_ssl/2.2.19 OpenSSL/0.9.8r DAV/2 PHP/5.3.6 with Suhosin-Patch
+	X-Powered-By: Luracast Restler v2.0.0
+	Expires: 0
+	Cache-Control: no-cache, must-revalidate
+	Pragma: no-cache
+	Content-Length: 66
+	Content-Type: application/json
+	
+	{
+	  "name": "Another",
+	  "email": "another@email.com",
+	  "id": 7
+	}
+
+*[index.php]: _006_crud/index.php
+*[author.php]: _006_crud/author.php
+*[sessiondb.php]: _006_crud/sessiondb.php
+*[restler.php]: ../restler/restler.php
diff --git a/examples/_006_crud/routes.php b/examples/_006_crud/routes.php
new file mode 100755
index 000000000..bcd27129c
--- /dev/null
+++ b/examples/_006_crud/routes.php
@@ -0,0 +1,160 @@
+<?php $o=array();
+
+
+
+############### GET ###############
+
+$o['GET']=array();
+
+#==== GET author
+
+$o['GET']['author']=array (
+	  'class_name' => 'Author',
+	  'method_name' => 'get',
+	  'arguments' => 
+	  array (
+	    'id' => 0,
+	  ),
+	  'defaults' => 
+	  array (
+	    0 => NULL,
+	  ),
+	  'metadata' => 
+	  array (
+	  ),
+	  'method_flag' => 0,
+	);
+
+#==== GET author/:id
+
+$o['GET']['author/:id']=array (
+	  'class_name' => 'Author',
+	  'method_name' => 'get',
+	  'arguments' => 
+	  array (
+	    'id' => 0,
+	  ),
+	  'defaults' => 
+	  array (
+	    0 => NULL,
+	  ),
+	  'metadata' => 
+	  array (
+	  ),
+	  'method_flag' => 0,
+	);
+
+
+############### POST ###############
+
+$o['POST']=array();
+
+#==== POST author
+
+$o['POST']['author']=array (
+	  'class_name' => 'Author',
+	  'method_name' => 'post',
+	  'arguments' => 
+	  array (
+	    'request_data' => 0,
+	  ),
+	  'defaults' => 
+	  array (
+	    0 => NULL,
+	  ),
+	  'metadata' => 
+	  array (
+	  ),
+	  'method_flag' => 0,
+	);
+
+
+############### PUT ###############
+
+$o['PUT']=array();
+
+#==== PUT author
+
+$o['PUT']['author']=array (
+	  'class_name' => 'Author',
+	  'method_name' => 'put',
+	  'arguments' => 
+	  array (
+	    'id' => 0,
+	    'request_data' => 1,
+	  ),
+	  'defaults' => 
+	  array (
+	    0 => NULL,
+	    1 => NULL,
+	  ),
+	  'metadata' => 
+	  array (
+	  ),
+	  'method_flag' => 0,
+	);
+
+#==== PUT author/:id
+
+$o['PUT']['author/:id']=array (
+	  'class_name' => 'Author',
+	  'method_name' => 'put',
+	  'arguments' => 
+	  array (
+	    'id' => 0,
+	    'request_data' => 1,
+	  ),
+	  'defaults' => 
+	  array (
+	    0 => NULL,
+	    1 => NULL,
+	  ),
+	  'metadata' => 
+	  array (
+	  ),
+	  'method_flag' => 0,
+	);
+
+
+############### DELETE ###############
+
+$o['DELETE']=array();
+
+#==== DELETE author
+
+$o['DELETE']['author']=array (
+	  'class_name' => 'Author',
+	  'method_name' => 'delete',
+	  'arguments' => 
+	  array (
+	    'id' => 0,
+	  ),
+	  'defaults' => 
+	  array (
+	    0 => NULL,
+	  ),
+	  'metadata' => 
+	  array (
+	  ),
+	  'method_flag' => 0,
+	);
+
+#==== DELETE author/:id
+
+$o['DELETE']['author/:id']=array (
+	  'class_name' => 'Author',
+	  'method_name' => 'delete',
+	  'arguments' => 
+	  array (
+	    'id' => 0,
+	  ),
+	  'defaults' => 
+	  array (
+	    0 => NULL,
+	  ),
+	  'metadata' => 
+	  array (
+	  ),
+	  'method_flag' => 0,
+	);
+return $o;
\ No newline at end of file
diff --git a/examples/_006_crud/sessiondb.php b/examples/_006_crud/sessiondb.php
new file mode 100755
index 000000000..1cef0dcec
--- /dev/null
+++ b/examples/_006_crud/sessiondb.php
@@ -0,0 +1,57 @@
+<?php
+/**
+ * Fake Database. All records are stored in $_SESSION
+ */
+class SessionDB {
+	function __construct() {
+		session_start();
+		if (!isset($_SESSION['pk'])) {
+			$_SESSION['pk'] = 5;
+			$_SESSION['rs'] = getData();
+		}
+	}
+	private function pk() {
+		return $_SESSION['pk']++;
+	}
+	private function find($id){
+		foreach ($_SESSION['rs'] as $index=>$rec) {
+			if ($rec['id'] == $id) {
+				return $index;
+			}
+		}
+		return FALSE;
+	}
+	function get($id) {
+		$index = $this->find($id);
+		if($index===FALSE)return FALSE;
+		return $_SESSION['rs'][$index];
+	}
+	function getAll() {
+		return $_SESSION['rs'];
+	}
+	public function insert($rec) {
+		$rec['id']=$this->pk();
+		array_push($_SESSION['rs'], $rec);
+		return $rec;
+	}
+	public function update($id, $rec) {
+		$index = $this->find($id);
+		if($index===FALSE)return FALSE;
+		$rec['id']=$id;
+		$_SESSION['rs'][$index]=$rec;
+		return $rec;
+	}
+	public function delete($id) {
+		$index = $this->find($id);
+		if($index===FALSE)return FALSE;
+		return array_shift(array_splice($_SESSION['rs'], $index, 1));
+	}
+}
+
+// Sample data.
+function getData() {
+	return array(
+	array('id'=>1,	'name'=>'Jac Wright',   'email'=>'jacwright@gmail.com'),
+	array('id'=>2,	'name'=>'Arul Kumaran', 'email'=>'arul@luracast.com'  ),
+	);
+}
\ No newline at end of file
diff --git a/examples/_006_crud/sqlitedb.php b/examples/_006_crud/sqlitedb.php
new file mode 100755
index 000000000..85f1caf7e
--- /dev/null
+++ b/examples/_006_crud/sqlitedb.php
@@ -0,0 +1,68 @@
+<?php
+/**
+ * Sqlite database
+ */
+class SqliteDB {
+	private $db;
+	function __construct() {
+		if ($db = new SQLiteDatabase(SqliteDB::NAME.'sqlite') {
+			$q = @$db->query('SELECT requests FROM tablename WHERE id = 1');
+			if ($q === false) {
+				$db->queryExec('CREATE TABLE tablename (id int, requests int, PRIMARY KEY (id)); INSERT INTO tablename VALUES (1,1)');
+				$hits = 1;
+			} else {
+				$result = $q->fetchSingle();
+				$hits = $result+1;
+			}
+			$db->queryExec("UPDATE tablename SET requests = '$hits' WHERE id = 1");
+		} else {
+			die($err);
+		}
+		$this->db = new SQLite3('author.sqlite');
+	}
+	private function find($id){
+		foreach ($_SESSION['rs'] as $index => $rec) {
+			if ($rec['id'] == $id) {
+				return $index;
+			}
+		}
+		return FALSE;
+	}
+	function get($id) {
+		$results = $this->db->query("SELECT * FROM author");
+		$r=array();
+		while ($row = $results->fetchArray()) {
+			print_r($row);
+			$r[]=$row;
+		}
+		return $row;
+	}
+	function getAll() {
+		return $_SESSION['rs'];
+	}
+	public function insert($rec) {
+		$rec['id']=$this->pk();
+		array_push($_SESSION['rs'], $rec);
+		return $rec;
+	}
+	public function update($id, $rec) {
+		$index = $this->find($id);
+		if($index===FALSE)return FALSE;
+		$rec['id']=$id;
+		$_SESSION['rs'][$index]=$rec;
+		return $rec;
+	}
+	public function delete($id) {
+		$index = $this->find($id);
+		if($index===FALSE)return FALSE;
+		return array_shift(array_splice($_SESSION['rs'], $index, 1));
+	}
+}
+
+// Sample data.
+function getData() {
+	return array(
+	array('id' => 1, 'name' => 'Jac Wright',   'email' => 'jacwright@gmail.com'),
+	array('id' => 2, 'name' => 'Arul Kumaran', 'email' => 'arul@luracast.com'  ),
+	);
+}
\ No newline at end of file
diff --git a/examples/helloworld/README.txt b/examples/helloworld/README.txt
deleted file mode 100644
index 3ddaecd13..000000000
--- a/examples/helloworld/README.txt
+++ /dev/null
@@ -1,31 +0,0 @@
-UNZIP AND COPY THE FILES into your web root (including the .htaccess file)
-Assuming that you are testing it on localhost try the following urls
-
-	http://localhost/
-	should return "HelloWorld"
-	
-	http://localhost/sum and http://localhost/index.php/sum
-	should return 0
-	
-	http://localhost/sum.json and http://localhost/index.php/sum.json
-	should return 0
-	
-	http://localhost/sum.xml and http://localhost/index.php/sum.xml
-	should return the following xml (view source if required)
-	<?xml version="1.0"?>
-	<result>0</result>
-	
-	http://localhost/sum.json?num1=10&num2=4 and http://localhost/index.php/sum.json?num1=10&num2=4
-	should return 14
-	
-	http://localhost/multiply.json/4/2 and http://localhost/index.php/multiply.json/4/2
-	should return 8
-	
-	http://localhost/protectedsum.json?n1=5&n2=4 and http://localhost/index.php/protectedsum.json?n1=5&n2=4
-	should ask for username and password
-	give admin and mypass respectively
-	then it should return 9
-	
-Now take a look at simpleservice.php to understand how the mapping is done
-
-Keep this as the starting point and build your own :)
\ No newline at end of file
diff --git a/examples/helloworld/digestauthentication.php b/examples/helloworld/digestauthentication.php
deleted file mode 100644
index feb435ace..000000000
--- a/examples/helloworld/digestauthentication.php
+++ /dev/null
@@ -1,85 +0,0 @@
-<?php
-/**
- * Digest Authentication Scheme Example for Restler Framework
- * @category   Framework
- * @package    restler
- * @subpackage auth
- * @author     R.Arul Kumaran <arul@luracast.com>
- * @copyright  2010 Luracast
- * @license    http://www.opensource.org/licenses/lgpl-license.php LGPL
- * @link       http://luracast.com/products/restler/
- */
-class DigestAuthentication implements iAuthenticate
-{
-	public $realm = 'Restricted API';
-	public static $user;
-	public $restler;
-
-	public function isAuthenticated()
-	{
-		//user => password hardcoded for convenience
-		$users = array('admin' => 'mypass', 'guest' => 'guest');
-
-		if (empty($_SERVER['PHP_AUTH_DIGEST'])) {
-			header('HTTP/1.1 401 Unauthorized');
-			header('WWW-Authenticate: Digest realm="'.$this->realm.'",qop="auth",nonce="'.
-			uniqid().'",opaque="'.md5($this->realm).'"');
-			die('Digest Authorisation Required');
-		}
-
-		// analyze the PHP_AUTH_DIGEST variable
-		if (!($data = DigestAuthentication::http_digest_parse($_SERVER['PHP_AUTH_DIGEST'])) ||
-		!isset($users[$data['username']]))
-		{
-			throw new RestException(401, 'Wrong Credentials!');
-		}
-
-
-		// generate the valid response
-		$A1 = md5($data['username'] . ':' . $this->realm . ':' . $users[$data['username']]);
-		$A2 = md5($_SERVER['REQUEST_METHOD'].':'.$data['uri']);
-		$valid_response = md5($A1.':'.$data['nonce'].':'.$data['nc'].':'.$data['cnonce'].':'.$data['qop'].':'.$A2);
-
-		if ($data['response'] != $valid_response)
-		{
-			throw new RestException(401, 'Wrong Credentials!');
-		}
-		// ok, valid username & password
-		DigestAuthentication::$user=$data['username'];
-		return true;
-	}
-
-	/**
-	 * Logs user out of the digest authentication by bringing the login dialog again
-	 * ignore the dialog to logout
-	 *
-	 * @url GET /user/login
-	 * @url GET /user/logout
-	 */
-	public function logout()
-	{
-		header('HTTP/1.1 401 Unauthorized');
-		header('WWW-Authenticate: Digest realm="'.$this->realm.'",qop="auth",nonce="'.
-		uniqid().'",opaque="'.md5($this->realm).'"');
-		die('Digest Authorisation Required');
-	}
-
-
-	// function to parse the http auth header
-	private function http_digest_parse($txt)
-	{
-		// protect against missing data
-		$needed_parts = array('nonce'=>1, 'nc'=>1, 'cnonce'=>1, 'qop'=>1, 'username'=>1, 'uri'=>1, 'response'=>1);
-		$data = array();
-		$keys = implode('|', array_keys($needed_parts));
-
-		preg_match_all('@(' . $keys . ')=(?:([\'"])([^\2]+?)\2|([^\s,]+))@', $txt, $matches, PREG_SET_ORDER);
-
-		foreach ($matches as $m) {
-			$data[$m[1]] = $m[3] ? $m[3] : $m[4];
-			unset($needed_parts[$m[1]]);
-		}
-
-		return $needed_parts ? false : $data;
-	}
-}
\ No newline at end of file
diff --git a/examples/helloworld/index.php b/examples/helloworld/index.php
deleted file mode 100644
index e9af3f165..000000000
--- a/examples/helloworld/index.php
+++ /dev/null
@@ -1,13 +0,0 @@
-<?php
-//SIMPLE USAGE EXAMPLE
-
-//rester and related classes should be
-//placed in include path
-set_include_path(get_include_path() . PATH_SEPARATOR . '../../restler');
-
-spl_autoload_register();
-$restler = new Restler();
-$restler->setSupportedFormats('JsonFormat', 'XmlFormat');
-$restler->addAPIClass('SimpleService');
-$restler->addAuthenticationClass('DigestAuthentication');
-$restler->handle();
\ No newline at end of file
diff --git a/examples/helloworld/simpleservice.php b/examples/helloworld/simpleservice.php
deleted file mode 100644
index ce5e053cb..000000000
--- a/examples/helloworld/simpleservice.php
+++ /dev/null
@@ -1,40 +0,0 @@
-<?php
-class SimpleService {
-	/**
-	 * HelloWorld
-	 * @url GET /
-	 */
-	function helloworld() {
-		return "HelloWorld";
-	}
-	/**
-	 * Sums the given numbers
-	 * @param integer $num1
-	 * @param integer $num2
-	 * @return integer
-	 * @url GET /sum
-	 */
-	function sum($num1, $num2){
-		return $num1+$num2;
-	}
-	/**
-	 * Multiplies the given numbers
-	 * @param integer $num1
-	 * @param integer $num2
-	 * @return integer
-	 * @url GET /multiply/:num1/:num2
-	 */
-	 function multiply($num1, $num2){
-		return $num1*$num2;
-	}
-	/**
-	 * Sums the given numbers
-	 * @param integer $n1
-	 * @param integer $n2
-	 * @return integer
-	 * @url GET /protectedsum
-	 */
-	protected function protectedsum($n1, $n2){
-		return $n1+$n2;
-	}
-}
\ No newline at end of file
diff --git a/examples/index.html b/examples/index.html
new file mode 100755
index 000000000..dce26a468
--- /dev/null
+++ b/examples/index.html
@@ -0,0 +1,87 @@
+<!DOCTYPE html>
+<html>
+<head>
+<title>Luracast Restler 2.0 Example:- </title>
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+<link rel="stylesheet" type="text/css" href="resources/markdown.css"/>
+
+
+<script type="text/javascript">
+ $(document).ready(function(){
+ 	 //$('a[target*=_blank]').facebox();
+	 $("abbr").click(function(){
+	 	$('#codeviewer').load('resources/getsource.php?file='+$(this).attr("title"), function(){
+	 		$("pre#php").snippet("php",{style:"acid",showNum:false});
+	 		jQuery.facebox({ div: '#codeviewer' });
+	 	});
+ 	 });
+ })
+</script>
+</head>
+<body>
+<div id="codeviewer" style="display:none;"></div>
+<nav id="left">
+<img src="resources/Restler2.gif" width="126" height="126" title="Luracast Restler 2.0"/>
+<h3><a href="index.html">Examples</a></h3>
+<ul>
+<li><a href="_001_helloworld/readme.html" title="Let's say hello!">Hello World</a></li>
+<li><a href="_002_minimal/readme.html" title="Less is more">Minimal</a></li>
+<li><a href="_003_multiformat/readme.html" title="Serving what the client wants">Multi-format</a></li>
+<li><a href="_004_error_response/readme.html" title="Making use of HTTP status codes">Error Response</a></li>
+<li><a href="_005_protected_api/readme.html" title="Creating restricted zone">Protected API</a></li>
+<li><a href="_006_crud/readme.html" title="using POST, GET, PUT and DELETE">CRUD</a></li>
+<li>
+</nav>
+<article id="right">
+<h2>Examples</h2>
+<p>Luracast Restler is a microframework to expose php methods as RESTful API. Best way to learn is by examples, here are the examples that shows the features of Restler and how to use them.</p>
+<p>We have created it in such a way that they can be tested on your local host.</p>
+<p>You can check the source code, try some of the API's exposed at the comfort of your browser</p>
+<ol class="toc">
+	<li><a href="_001_helloworld/readme.html" title="Basic hello world example to get started with Restler 2.0">
+<span>Hello World 
+<small><i>Let's say hello!</i></small>
+</span> <right>Example 1</right>
+</a></li>
+	<li><a href="_002_minimal/readme.html" title="Shows the bare minimum code needed to get your RESTful api server up and running">
+<span>Minimal 
+<small><i>Less is more</i></small>
+</span> <right>Example 2</right>
+</a></li>
+	<li><a href="_003_multiformat/readme.html" title="This BMI calculator service shows how you can serve data in different 
+formats using Rester. This example uses JsonFormat (default) and XmlFormat">
+<span>Multi-format 
+<small><i>Serving what the client wants</i></small>
+</span> <right>Example 3</right>
+</a></li>
+	<li><a href="_004_error_response/readme.html" title="API methods can make use of RestException class to provide 
+error information to the user. 
+
+use `throw new RestException($http_status_code)` to send the error response 
+to the client">
+<span>Error Response 
+<small><i>Making use of HTTP status codes</i></small>
+</span> <right>Example 4</right>
+</a></li>
+	<li><a href="_005_protected_api/readme.html" title="Not all the API exposed needs to be public, we need to protect some of our API. 
+Here are three ways to protect a method
+
+1">
+<span>Protected API 
+<small><i>Creating restricted zone</i></small>
+</span> <right>Example 5</right>
+</a></li>
+	<li><a href="_006_crud/readme.html" title="Create, Retrive, Update and Delete using 
+HTTP methods POST, GET, PUT and DELETE respectively. 
+For simplicity and making it work out of the box it is using
+a session based fake database, thus depending on a client that
+supports PHP Session Cookies">
+<span>CRUD 
+<small><i>using POST, GET, PUT and DELETE</i></small>
+</span> <right>Example 6</right>
+</a></li>
+
+</ol>
+</article>
+</body>
+</html>
\ No newline at end of file
diff --git a/examples/resources/Luracast.gif b/examples/resources/Luracast.gif
new file mode 100755
index 0000000000000000000000000000000000000000..98f92aac5a99ce8178b04105fb38a4776cf750d6
GIT binary patch
literal 8033
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
VyDR_qar9n%VE$+REfN4|{2$~qqzM23

literal 0
HcmV?d00001

diff --git a/examples/resources/Restler2.gif b/examples/resources/Restler2.gif
new file mode 100755
index 0000000000000000000000000000000000000000..19dd0ad5ec5162f58c0643d255e38e57c16e419a
GIT binary patch
literal 12476
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
LxAl-Qfb;(WO<9`*

literal 0
HcmV?d00001

diff --git a/examples/resources/ZeroClipboard.swf b/examples/resources/ZeroClipboard.swf
new file mode 100755
index 0000000000000000000000000000000000000000..13bf8e396202964e0048333d878f4b949a2f5e6a
GIT binary patch
literal 1071
zcmV+~1kn3KS5pay1^@tfoPAa6Qrkup-d$aeB-<EsF<>A-xFjKf1te)pFM-&Q&_dOT
zp~-XxqP4X~YJ}vGWC;KAD1C=MKwiO_PG6^Vbs@z~r#qgr-}!Xr?4IxJ9P1kT4dpSa
zmlT9hja*+}e;Cbih*6`(JT|+I(1(#NIVSiTL~Dq=|Lb=d5tOYL`L;_#dyQQ%FAAmI
zcth~a_gzLk@xphk!Y?fFYp&C2`ZTZ#X}INt9hY9ojZWZ1Om23g$oC2%i(XLAs&#|V
z5ArS7X}yhomj%SJ<VF-Y-kHMb&JlYT0gsONf$ReBA{KbmE$wDt-{X6mwph9E0?E-d
zYT4?!-wl~@!2+>GT~|rnZj|zM|I&j59e1QKqGxQN5!(ijWrx1S)ZN!RwWBwC`$uYc
z!)028S7F4?l?H2dd39HKImh$+mv#S~I-YjmQ;P-rUfUM~-;Xr+ldpAXK+hS!b|@Ro
zUs)@fv!kf9RjpFXZ?d(Pe_q{bY*sgP{Ykaib==7Da_N!X$Z^AwK5e&BZ5R5<db+3S
zYrYrpE3sgvKPZuowj$?(rGb<GlVs}l1K3I)Ks}R~1zOtKSeyda@}KT1X94ZlPAgQK
z?9B1@9M=^OX=F>6j>T=;_5DD$nR8}GiWShym;5A&x*eM;)Us-}<67Eb+@9n>sdlhm
z`(coON!$a6H-ML=9U8}t-8aV1yD!xY9v@|7-FWq*lEUMka&b=Hq$X{>72}4eNl_P+
zccPJWGtXb!r#GbVPIO$}sN%oME%Yf<`b@|2f6G5y#$}-l<FbUxgXJj+jS0$Pd8r~-
z?p5wr9#obq4=W3#C=slvT29Ot28x5Fp~rv;5D|z3L<T_tNd=;TlmjUbqyW+YkRr$>
zAR|D=L6`ti0Wt|N4P*v{Ss-&j?gE(yvY_TMkQE@SK-Pd%f#~WwXExMLZXW@84CD#m
zFMxar<SQUsK)wd@4Ulhvd<W__zz&dSfa@Uag0Kg|a}6a^1b=4uA~^lXhX@vMHb}52
zsUnhOK5HZd7=eP3q9UXTIG0#Hrs6rIVo}6MLzrtJ^z`SPl8B}i%)-i$sjdvq8UrFH
z$!&5pBZb>!IU~i}<XA>ZGSTvX;GX_!`A@yKkIbSu*e=l_b9m*BF@hOB8SS;p?XkU4
z+#Y{FagI+_hF#pQ*y^c#B7H9*TQ=n-IvJZOQ*KYMV&e{u!2((~XOiIAy*Zr0yBr$x
zqA6D~T{u}ZWn+;Cn@jC`refSD34E}PZ{YGaxq%P2g&VlCEyl30qM2Z<#-M2CQxMno
zG_4J<Av}R(LR3xZ>8H7mc8(VenQzJ;=@j=BiTh*RubMeS$61ORcM^S6!u6l;=?s|@
py1A~K8@jovn~!u;;=k8uI$3rc`gC{*rT-s&a~N%N=5J58nk1s|4c7nw

literal 0
HcmV?d00001

diff --git a/examples/resources/closelabel.png b/examples/resources/closelabel.png
new file mode 100755
index 0000000000000000000000000000000000000000..c339e59333e4c3b5bc5fd910796fda5469a2515f
GIT binary patch
literal 168
zcmeAS@N?(olHy`uVBq!ia0vp^93afW1|*O0@9PFqk|nMYCBgY=CFO}lsSJ)O`AMk?
zp1FzXsX?iUDV2pMQ*D5XygXeTLn>}1B_t#Wus+)Bu;yq3!!CzC+*<6@{_r1Jzd&eL
zz_<DpGF=C>O}6Q6nrOf&;;F`V=YhW2-H5dcFFa<LmtNe%DJ0CwVZgAlLm}^O;tU<2
OsSKX3elF{r5}E)7K{l%Z

literal 0
HcmV?d00001

diff --git a/examples/resources/facebox.css b/examples/resources/facebox.css
new file mode 100755
index 000000000..3f33b9f47
--- /dev/null
+++ b/examples/resources/facebox.css
@@ -0,0 +1,80 @@
+#facebox {
+  position: absolute;
+  top: 0;
+  left: 0;
+  z-index: 100;
+  text-align: left;
+}
+
+
+#facebox .popup{
+  position:relative;
+  border:3px solid rgba(0,0,0,0);
+  -webkit-border-radius:5px;
+  -moz-border-radius:5px;
+  border-radius:5px;
+  -webkit-box-shadow:0 0 18px rgba(0,0,0,0.4);
+  -moz-box-shadow:0 0 18px rgba(0,0,0,0.4);
+  box-shadow:0 0 18px rgba(0,0,0,0.4);
+}
+
+#facebox .content {
+  display:table;
+  width: 370px;
+  padding: 10px;
+  background: #fff;
+  -webkit-border-radius:4px;
+  -moz-border-radius:4px;
+  border-radius:4px;
+}
+
+#facebox .content > p:first-child{
+  margin-top:0;
+}
+#facebox .content > p:last-child{
+  margin-bottom:0;
+}
+
+#facebox .close{
+  position:absolute;
+  top:5px;
+  right:5px;
+  padding:2px;
+  background:#fff;
+}
+#facebox .close img{
+  opacity:0.3;
+}
+#facebox .close:hover img{
+  opacity:1.0;
+}
+
+#facebox .loading {
+  text-align: center;
+}
+
+#facebox .image {
+  text-align: center;
+}
+
+#facebox img {
+  border: 0;
+  margin: 0;
+}
+
+#facebox_overlay {
+  position: fixed;
+  top: 0px;
+  left: 0px;
+  height:100%;
+  width:100%;
+}
+
+.facebox_hide {
+  z-index:-100;
+}
+
+.facebox_overlayBG {
+  background-color: #000;
+  z-index: 99;
+}
\ No newline at end of file
diff --git a/examples/resources/facebox.js b/examples/resources/facebox.js
new file mode 100755
index 000000000..b764dbf89
--- /dev/null
+++ b/examples/resources/facebox.js
@@ -0,0 +1,309 @@
+/*
+ * Facebox (for jQuery)
+ * version: 1.2 (05/05/2008)
+ * @requires jQuery v1.2 or later
+ *
+ * Examples at http://famspam.com/facebox/
+ *
+ * Licensed under the MIT:
+ *   http://www.opensource.org/licenses/mit-license.php
+ *
+ * Copyright 2007, 2008 Chris Wanstrath [ chris@ozmm.org ]
+ *
+ * Usage:
+ *
+ *  jQuery(document).ready(function() {
+ *    jQuery('a[rel*=facebox]').facebox()
+ *  })
+ *
+ *  <a href="#terms" rel="facebox">Terms</a>
+ *    Loads the #terms div in the box
+ *
+ *  <a href="terms.html" rel="facebox">Terms</a>
+ *    Loads the terms.html page in the box
+ *
+ *  <a href="terms.png" rel="facebox">Terms</a>
+ *    Loads the terms.png image in the box
+ *
+ *
+ *  You can also use it programmatically:
+ *
+ *    jQuery.facebox('some html')
+ *    jQuery.facebox('some html', 'my-groovy-style')
+ *
+ *  The above will open a facebox with "some html" as the content.
+ *
+ *    jQuery.facebox(function($) {
+ *      $.get('blah.html', function(data) { $.facebox(data) })
+ *    })
+ *
+ *  The above will show a loading screen before the passed function is called,
+ *  allowing for a better ajaxy experience.
+ *
+ *  The facebox function can also display an ajax page, an image, or the contents of a div:
+ *
+ *    jQuery.facebox({ ajax: 'remote.html' })
+ *    jQuery.facebox({ ajax: 'remote.html' }, 'my-groovy-style')
+ *    jQuery.facebox({ image: 'stairs.jpg' })
+ *    jQuery.facebox({ image: 'stairs.jpg' }, 'my-groovy-style')
+ *    jQuery.facebox({ div: '#box' })
+ *    jQuery.facebox({ div: '#box' }, 'my-groovy-style')
+ *
+ *  Want to close the facebox?  Trigger the 'close.facebox' document event:
+ *
+ *    jQuery(document).trigger('close.facebox')
+ *
+ *  Facebox also has a bunch of other hooks:
+ *
+ *    loading.facebox
+ *    beforeReveal.facebox
+ *    reveal.facebox (aliased as 'afterReveal.facebox')
+ *    init.facebox
+ *    afterClose.facebox
+ *
+ *  Simply bind a function to any of these hooks:
+ *
+ *   $(document).bind('reveal.facebox', function() { ...stuff to do after the facebox and contents are revealed... })
+ *
+ */
+(function($) {
+  $.facebox = function(data, klass) {
+    $.facebox.loading()
+
+    if (data.ajax) fillFaceboxFromAjax(data.ajax, klass)
+    else if (data.image) fillFaceboxFromImage(data.image, klass)
+    else if (data.div) fillFaceboxFromHref(data.div, klass)
+    else if ($.isFunction(data)) data.call($)
+    else $.facebox.reveal(data, klass)
+  }
+
+  /*
+   * Public, $.facebox methods
+   */
+
+  $.extend($.facebox, {
+    settings: {
+      opacity      : 0.2,
+      overlay      : true,
+      loadingImage : '../resources/loading.gif',
+      closeImage   : '../resources/closelabel.png',
+      imageTypes   : [ 'png', 'jpg', 'jpeg', 'gif' ],
+      faceboxHtml  : '\
+    <div id="facebox" style="display:none;"> \
+      <div class="popup"> \
+        <div class="content"> \
+        </div> \
+        <a href="#" class="close"><img src="../resources/closelabel.png" title="close" class="close_image" /></a> \
+      </div> \
+    </div>'
+    },
+
+    loading: function() {
+      init()
+      if ($('#facebox .loading').length == 1) return true
+      showOverlay()
+
+      $('#facebox .content').empty()
+      $('#facebox .body').children().hide().end().
+        append('<div class="loading"><img src="'+$.facebox.settings.loadingImage+'"/></div>')
+
+      $('#facebox').css({
+        top:	getPageScroll()[1] + (getPageHeight() / 10),
+        left:	$(window).width() / 2 - 205
+      }).show()
+
+      $(document).bind('keydown.facebox', function(e) {
+        if (e.keyCode == 27) $.facebox.close()
+        return true
+      })
+      $(document).trigger('loading.facebox')
+    },
+
+    reveal: function(data, klass) {
+      $(document).trigger('beforeReveal.facebox')
+      if (klass) $('#facebox .content').addClass(klass)
+      $('#facebox .content').append(data)
+      $('#facebox .loading').remove()
+      $('#facebox .body').children().fadeIn('normal')
+      $('#facebox').css('left', $(window).width() / 2 - ($('#facebox .popup').width() / 2))
+      $(document).trigger('reveal.facebox').trigger('afterReveal.facebox')
+    },
+
+    close: function() {
+      $(document).trigger('close.facebox')
+      return false
+    }
+  })
+
+  /*
+   * Public, $.fn methods
+   */
+
+  $.fn.facebox = function(settings) {
+    if ($(this).length == 0) return
+
+    init(settings)
+
+    function clickHandler() {
+      $.facebox.loading(true)
+
+      // support for rel="facebox.inline_popup" syntax, to add a class
+      // also supports deprecated "facebox[.inline_popup]" syntax
+      var klass = this.rel.match(/facebox\[?\.(\w+)\]?/)
+      if (klass) klass = klass[1]
+
+      fillFaceboxFromHref(this.href, klass)
+      return false
+    }
+
+    return this.bind('click.facebox', clickHandler)
+  }
+
+  /*
+   * Private methods
+   */
+
+  // called one time to setup facebox on this page
+  function init(settings) {
+    if ($.facebox.settings.inited) return true
+    else $.facebox.settings.inited = true
+
+    $(document).trigger('init.facebox')
+    makeCompatible()
+
+    var imageTypes = $.facebox.settings.imageTypes.join('|')
+    $.facebox.settings.imageTypesRegexp = new RegExp('\.(' + imageTypes + ')$', 'i')
+
+    if (settings) $.extend($.facebox.settings, settings)
+    $('body').append($.facebox.settings.faceboxHtml)
+
+    var preload = [ new Image(), new Image() ]
+    preload[0].src = $.facebox.settings.closeImage
+    preload[1].src = $.facebox.settings.loadingImage
+
+    $('#facebox').find('.b:first, .bl').each(function() {
+      preload.push(new Image())
+      preload.slice(-1).src = $(this).css('background-image').replace(/url\((.+)\)/, '$1')
+    })
+
+    $('#facebox .close').click($.facebox.close)
+    $('#facebox .close_image').attr('src', $.facebox.settings.closeImage)
+  }
+
+  // getPageScroll() by quirksmode.com
+  function getPageScroll() {
+    var xScroll, yScroll;
+    if (self.pageYOffset) {
+      yScroll = self.pageYOffset;
+      xScroll = self.pageXOffset;
+    } else if (document.documentElement && document.documentElement.scrollTop) {	 // Explorer 6 Strict
+      yScroll = document.documentElement.scrollTop;
+      xScroll = document.documentElement.scrollLeft;
+    } else if (document.body) {// all other Explorers
+      yScroll = document.body.scrollTop;
+      xScroll = document.body.scrollLeft;
+    }
+    return new Array(xScroll,yScroll)
+  }
+
+  // Adapted from getPageSize() by quirksmode.com
+  function getPageHeight() {
+    var windowHeight
+    if (self.innerHeight) {	// all except Explorer
+      windowHeight = self.innerHeight;
+    } else if (document.documentElement && document.documentElement.clientHeight) { // Explorer 6 Strict Mode
+      windowHeight = document.documentElement.clientHeight;
+    } else if (document.body) { // other Explorers
+      windowHeight = document.body.clientHeight;
+    }
+    return windowHeight
+  }
+
+  // Backwards compatibility
+  function makeCompatible() {
+    var $s = $.facebox.settings
+
+    $s.loadingImage = $s.loading_image || $s.loadingImage
+    $s.closeImage = $s.close_image || $s.closeImage
+    $s.imageTypes = $s.image_types || $s.imageTypes
+    $s.faceboxHtml = $s.facebox_html || $s.faceboxHtml
+  }
+
+  // Figures out what you want to display and displays it
+  // formats are:
+  //     div: #id
+  //   image: blah.extension
+  //    ajax: anything else
+  function fillFaceboxFromHref(href, klass) {
+    // div
+    if (href.match(/#/)) {
+      var url    = window.location.href.split('#')[0]
+      var target = href.replace(url,'')
+      if (target == '#') return
+      $.facebox.reveal($(target).html(), klass)
+
+    // image
+    } else if (href.match($.facebox.settings.imageTypesRegexp)) {
+      fillFaceboxFromImage(href, klass)
+    // ajax
+    } else {
+      fillFaceboxFromAjax(href, klass)
+    }
+  }
+
+  function fillFaceboxFromImage(href, klass) {
+    var image = new Image()
+    image.onload = function() {
+      $.facebox.reveal('<div class="image"><img src="' + image.src + '" /></div>', klass)
+    }
+    image.src = href
+  }
+
+  function fillFaceboxFromAjax(href, klass) {
+    $.get(href, function(data) { $.facebox.reveal(data, klass) })
+  }
+
+  function skipOverlay() {
+    return $.facebox.settings.overlay == false || $.facebox.settings.opacity === null
+  }
+
+  function showOverlay() {
+    if (skipOverlay()) return
+
+    if ($('#facebox_overlay').length == 0)
+      $("body").append('<div id="facebox_overlay" class="facebox_hide"></div>')
+
+    $('#facebox_overlay').hide().addClass("facebox_overlayBG")
+      .css('opacity', $.facebox.settings.opacity)
+      .click(function() { $(document).trigger('close.facebox') })
+      .fadeIn(200)
+    return false
+  }
+
+  function hideOverlay() {
+    if (skipOverlay()) return
+
+    $('#facebox_overlay').fadeOut(200, function(){
+      $("#facebox_overlay").removeClass("facebox_overlayBG")
+      $("#facebox_overlay").addClass("facebox_hide")
+      $("#facebox_overlay").remove()
+    })
+
+    return false
+  }
+
+  /*
+   * Bindings
+   */
+
+  $(document).bind('close.facebox', function() {
+    $(document).unbind('keydown.facebox')
+    $('#facebox').fadeOut(function() {
+      $('#facebox .content').removeClass().addClass('content')
+      $('#facebox .loading').remove()
+      $(document).trigger('afterClose.facebox')
+    })
+    hideOverlay()
+  })
+
+})(jQuery);
diff --git a/examples/resources/getsource.php b/examples/resources/getsource.php
new file mode 100755
index 000000000..e3f8d3723
--- /dev/null
+++ b/examples/resources/getsource.php
@@ -0,0 +1,41 @@
+<?php
+if (isset($_GET['file'])) {
+	$file = $_GET['file'];
+	$require_comments=$file[0]=='.';
+	$file = '../'.$file;
+	$filepath = realpath($file);
+	$basepath = realpath('../../');
+	if(strpos($basepath,$filepath)===0){
+		#trying to get the source outside restler examples
+		die('not allowed');
+	}
+	if(!file_exists($file))die('file not found');
+	$text = file_get_contents($file);
+	$file = pathinfo($file, PATHINFO_FILENAME).'.php';
+	if(!$require_comments)$text = strip_comments($text);
+	die($file.'<pre id="php">'.htmlspecialchars($text)."</pre>");
+}else {
+	die('no file specified');
+}
+function strip_comments($fileStr) {
+	$newStr='';
+	$commentTokens = array(T_COMMENT);
+
+	//if (defined('T_DOC_COMMENT'))
+	//$commentTokens[] = T_DOC_COMMENT; // PHP 5
+
+	$tokens = token_get_all($fileStr);
+
+	foreach ($tokens as $token) {
+		if (is_array($token)) {
+			if (in_array($token[0], $commentTokens))
+			continue;
+
+			$token = $token[1];
+		}
+
+		$newStr .= $token;
+	}
+
+	return $newStr;
+}
\ No newline at end of file
diff --git a/examples/resources/hacks.css b/examples/resources/hacks.css
new file mode 100755
index 000000000..ddc417196
--- /dev/null
+++ b/examples/resources/hacks.css
@@ -0,0 +1,13 @@
+.snippet-wrap pre.sh_sourceCode {
+	padding: inherit;
+	-moz-border-radius: 0;
+	-webkit-border-radius: 0;
+	border-radius: 0;
+	box-shadow: none;
+	-moz-box-shadow: none;
+	-webkit-box-shadow: none;
+}
+
+.snippet-wrap .snippet-menu,.snippet-wrap .snippet-hide {
+	font-size: .5em;
+}
\ No newline at end of file
diff --git a/examples/resources/jquery-1.6.2.min.js b/examples/resources/jquery-1.6.2.min.js
new file mode 100755
index 000000000..48590ecb9
--- /dev/null
+++ b/examples/resources/jquery-1.6.2.min.js
@@ -0,0 +1,18 @@
+/*!
+ * jQuery JavaScript Library v1.6.2
+ * http://jquery.com/
+ *
+ * Copyright 2011, John Resig
+ * Dual licensed under the MIT or GPL Version 2 licenses.
+ * http://jquery.org/license
+ *
+ * Includes Sizzle.js
+ * http://sizzlejs.com/
+ * Copyright 2011, The Dojo Foundation
+ * Released under the MIT, BSD, and GPL Licenses.
+ *
+ * Date: Thu Jun 30 14:16:56 2011 -0400
+ */
+(function(a,b){function cv(a){return f.isWindow(a)?a:a.nodeType===9?a.defaultView||a.parentWindow:!1}function cs(a){if(!cg[a]){var b=c.body,d=f("<"+a+">").appendTo(b),e=d.css("display");d.remove();if(e==="none"||e===""){ch||(ch=c.createElement("iframe"),ch.frameBorder=ch.width=ch.height=0),b.appendChild(ch);if(!ci||!ch.createElement)ci=(ch.contentWindow||ch.contentDocument).document,ci.write((c.compatMode==="CSS1Compat"?"<!doctype html>":"")+"<html><body>"),ci.close();d=ci.createElement(a),ci.body.appendChild(d),e=f.css(d,"display"),b.removeChild(ch)}cg[a]=e}return cg[a]}function cr(a,b){var c={};f.each(cm.concat.apply([],cm.slice(0,b)),function(){c[this]=a});return c}function cq(){cn=b}function cp(){setTimeout(cq,0);return cn=f.now()}function cf(){try{return new a.ActiveXObject("Microsoft.XMLHTTP")}catch(b){}}function ce(){try{return new a.XMLHttpRequest}catch(b){}}function b$(a,c){a.dataFilter&&(c=a.dataFilter(c,a.dataType));var d=a.dataTypes,e={},g,h,i=d.length,j,k=d[0],l,m,n,o,p;for(g=1;g<i;g++){if(g===1)for(h in a.converters)typeof h=="string"&&(e[h.toLowerCase()]=a.converters[h]);l=k,k=d[g];if(k==="*")k=l;else if(l!=="*"&&l!==k){m=l+" "+k,n=e[m]||e["* "+k];if(!n){p=b;for(o in e){j=o.split(" ");if(j[0]===l||j[0]==="*"){p=e[j[1]+" "+k];if(p){o=e[o],o===!0?n=p:p===!0&&(n=o);break}}}}!n&&!p&&f.error("No conversion from "+m.replace(" "," to ")),n!==!0&&(c=n?n(c):p(o(c)))}}return c}function bZ(a,c,d){var e=a.contents,f=a.dataTypes,g=a.responseFields,h,i,j,k;for(i in g)i in d&&(c[g[i]]=d[i]);while(f[0]==="*")f.shift(),h===b&&(h=a.mimeType||c.getResponseHeader("content-type"));if(h)for(i in e)if(e[i]&&e[i].test(h)){f.unshift(i);break}if(f[0]in d)j=f[0];else{for(i in d){if(!f[0]||a.converters[i+" "+f[0]]){j=i;break}k||(k=i)}j=j||k}if(j){j!==f[0]&&f.unshift(j);return d[j]}}function bY(a,b,c,d){if(f.isArray(b))f.each(b,function(b,e){c||bC.test(a)?d(a,e):bY(a+"["+(typeof e=="object"||f.isArray(e)?b:"")+"]",e,c,d)});else if(!c&&b!=null&&typeof b=="object")for(var e in b)bY(a+"["+e+"]",b[e],c,d);else d(a,b)}function bX(a,c,d,e,f,g){f=f||c.dataTypes[0],g=g||{},g[f]=!0;var h=a[f],i=0,j=h?h.length:0,k=a===bR,l;for(;i<j&&(k||!l);i++)l=h[i](c,d,e),typeof l=="string"&&(!k||g[l]?l=b:(c.dataTypes.unshift(l),l=bX(a,c,d,e,l,g)));(k||!l)&&!g["*"]&&(l=bX(a,c,d,e,"*",g));return l}function bW(a){return function(b,c){typeof b!="string"&&(c=b,b="*");if(f.isFunction(c)){var d=b.toLowerCase().split(bN),e=0,g=d.length,h,i,j;for(;e<g;e++)h=d[e],j=/^\+/.test(h),j&&(h=h.substr(1)||"*"),i=a[h]=a[h]||[],i[j?"unshift":"push"](c)}}}function bA(a,b,c){var d=b==="width"?a.offsetWidth:a.offsetHeight,e=b==="width"?bv:bw;if(d>0){c!=="border"&&f.each(e,function(){c||(d-=parseFloat(f.css(a,"padding"+this))||0),c==="margin"?d+=parseFloat(f.css(a,c+this))||0:d-=parseFloat(f.css(a,"border"+this+"Width"))||0});return d+"px"}d=bx(a,b,b);if(d<0||d==null)d=a.style[b]||0;d=parseFloat(d)||0,c&&f.each(e,function(){d+=parseFloat(f.css(a,"padding"+this))||0,c!=="padding"&&(d+=parseFloat(f.css(a,"border"+this+"Width"))||0),c==="margin"&&(d+=parseFloat(f.css(a,c+this))||0)});return d+"px"}function bm(a,b){b.src?f.ajax({url:b.src,async:!1,dataType:"script"}):f.globalEval((b.text||b.textContent||b.innerHTML||"").replace(be,"/*$0*/")),b.parentNode&&b.parentNode.removeChild(b)}function bl(a){f.nodeName(a,"input")?bk(a):"getElementsByTagName"in a&&f.grep(a.getElementsByTagName("input"),bk)}function bk(a){if(a.type==="checkbox"||a.type==="radio")a.defaultChecked=a.checked}function bj(a){return"getElementsByTagName"in a?a.getElementsByTagName("*"):"querySelectorAll"in a?a.querySelectorAll("*"):[]}function bi(a,b){var c;if(b.nodeType===1){b.clearAttributes&&b.clearAttributes(),b.mergeAttributes&&b.mergeAttributes(a),c=b.nodeName.toLowerCase();if(c==="object")b.outerHTML=a.outerHTML;else if(c!=="input"||a.type!=="checkbox"&&a.type!=="radio"){if(c==="option")b.selected=a.defaultSelected;else if(c==="input"||c==="textarea")b.defaultValue=a.defaultValue}else a.checked&&(b.defaultChecked=b.checked=a.checked),b.value!==a.value&&(b.value=a.value);b.removeAttribute(f.expando)}}function bh(a,b){if(b.nodeType===1&&!!f.hasData(a)){var c=f.expando,d=f.data(a),e=f.data(b,d);if(d=d[c]){var g=d.events;e=e[c]=f.extend({},d);if(g){delete e.handle,e.events={};for(var h in g)for(var i=0,j=g[h].length;i<j;i++)f.event.add(b,h+(g[h][i].namespace?".":"")+g[h][i].namespace,g[h][i],g[h][i].data)}}}}function bg(a,b){return f.nodeName(a,"table")?a.getElementsByTagName("tbody")[0]||a.appendChild(a.ownerDocument.createElement("tbody")):a}function W(a,b,c){b=b||0;if(f.isFunction(b))return f.grep(a,function(a,d){var e=!!b.call(a,d,a);return e===c});if(b.nodeType)return f.grep(a,function(a,d){return a===b===c});if(typeof b=="string"){var d=f.grep(a,function(a){return a.nodeType===1});if(R.test(b))return f.filter(b,d,!c);b=f.filter(b,d)}return f.grep(a,function(a,d){return f.inArray(a,b)>=0===c})}function V(a){return!a||!a.parentNode||a.parentNode.nodeType===11}function N(a,b){return(a&&a!=="*"?a+".":"")+b.replace(z,"`").replace(A,"&")}function M(a){var b,c,d,e,g,h,i,j,k,l,m,n,o,p=[],q=[],r=f._data(this,"events");if(!(a.liveFired===this||!r||!r.live||a.target.disabled||a.button&&a.type==="click")){a.namespace&&(n=new RegExp("(^|\\.)"+a.namespace.split(".").join("\\.(?:.*\\.)?")+"(\\.|$)")),a.liveFired=this;var s=r.live.slice(0);for(i=0;i<s.length;i++)g=s[i],g.origType.replace(x,"")===a.type?q.push(g.selector):s.splice(i--,1);e=f(a.target).closest(q,a.currentTarget);for(j=0,k=e.length;j<k;j++){m=e[j];for(i=0;i<s.length;i++){g=s[i];if(m.selector===g.selector&&(!n||n.test(g.namespace))&&!m.elem.disabled){h=m.elem,d=null;if(g.preType==="mouseenter"||g.preType==="mouseleave")a.type=g.preType,d=f(a.relatedTarget).closest(g.selector)[0],d&&f.contains(h,d)&&(d=h);(!d||d!==h)&&p.push({elem:h,handleObj:g,level:m.level})}}}for(j=0,k=p.length;j<k;j++){e=p[j];if(c&&e.level>c)break;a.currentTarget=e.elem,a.data=e.handleObj.data,a.handleObj=e.handleObj,o=e.handleObj.origHandler.apply(e.elem,arguments);if(o===!1||a.isPropagationStopped()){c=e.level,o===!1&&(b=!1);if(a.isImmediatePropagationStopped())break}}return b}}function K(a,c,d){var e=f.extend({},d[0]);e.type=a,e.originalEvent={},e.liveFired=b,f.event.handle.call(c,e),e.isDefaultPrevented()&&d[0].preventDefault()}function E(){return!0}function D(){return!1}function m(a,c,d){var e=c+"defer",g=c+"queue",h=c+"mark",i=f.data(a,e,b,!0);i&&(d==="queue"||!f.data(a,g,b,!0))&&(d==="mark"||!f.data(a,h,b,!0))&&setTimeout(function(){!f.data(a,g,b,!0)&&!f.data(a,h,b,!0)&&(f.removeData(a,e,!0),i.resolve())},0)}function l(a){for(var b in a)if(b!=="toJSON")return!1;return!0}function k(a,c,d){if(d===b&&a.nodeType===1){var e="data-"+c.replace(j,"$1-$2").toLowerCase();d=a.getAttribute(e);if(typeof d=="string"){try{d=d==="true"?!0:d==="false"?!1:d==="null"?null:f.isNaN(d)?i.test(d)?f.parseJSON(d):d:parseFloat(d)}catch(g){}f.data(a,c,d)}else d=b}return d}var c=a.document,d=a.navigator,e=a.location,f=function(){function J(){if(!e.isReady){try{c.documentElement.doScroll("left")}catch(a){setTimeout(J,1);return}e.ready()}}var e=function(a,b){return new e.fn.init(a,b,h)},f=a.jQuery,g=a.$,h,i=/^(?:[^<]*(<[\w\W]+>)[^>]*$|#([\w\-]*)$)/,j=/\S/,k=/^\s+/,l=/\s+$/,m=/\d/,n=/^<(\w+)\s*\/?>(?:<\/\1>)?$/,o=/^[\],:{}\s]*$/,p=/\\(?:["\\\/bfnrt]|u[0-9a-fA-F]{4})/g,q=/"[^"\\\n\r]*"|true|false|null|-?\d+(?:\.\d*)?(?:[eE][+\-]?\d+)?/g,r=/(?:^|:|,)(?:\s*\[)+/g,s=/(webkit)[ \/]([\w.]+)/,t=/(opera)(?:.*version)?[ \/]([\w.]+)/,u=/(msie) ([\w.]+)/,v=/(mozilla)(?:.*? rv:([\w.]+))?/,w=/-([a-z])/ig,x=function(a,b){return b.toUpperCase()},y=d.userAgent,z,A,B,C=Object.prototype.toString,D=Object.prototype.hasOwnProperty,E=Array.prototype.push,F=Array.prototype.slice,G=String.prototype.trim,H=Array.prototype.indexOf,I={};e.fn=e.prototype={constructor:e,init:function(a,d,f){var g,h,j,k;if(!a)return this;if(a.nodeType){this.context=this[0]=a,this.length=1;return this}if(a==="body"&&!d&&c.body){this.context=c,this[0]=c.body,this.selector=a,this.length=1;return this}if(typeof a=="string"){a.charAt(0)!=="<"||a.charAt(a.length-1)!==">"||a.length<3?g=i.exec(a):g=[null,a,null];if(g&&(g[1]||!d)){if(g[1]){d=d instanceof e?d[0]:d,k=d?d.ownerDocument||d:c,j=n.exec(a),j?e.isPlainObject(d)?(a=[c.createElement(j[1])],e.fn.attr.call(a,d,!0)):a=[k.createElement(j[1])]:(j=e.buildFragment([g[1]],[k]),a=(j.cacheable?e.clone(j.fragment):j.fragment).childNodes);return e.merge(this,a)}h=c.getElementById(g[2]);if(h&&h.parentNode){if(h.id!==g[2])return f.find(a);this.length=1,this[0]=h}this.context=c,this.selector=a;return this}return!d||d.jquery?(d||f).find(a):this.constructor(d).find(a)}if(e.isFunction(a))return f.ready(a);a.selector!==b&&(this.selector=a.selector,this.context=a.context);return e.makeArray(a,this)},selector:"",jquery:"1.6.2",length:0,size:function(){return this.length},toArray:function(){return F.call(this,0)},get:function(a){return a==null?this.toArray():a<0?this[this.length+a]:this[a]},pushStack:function(a,b,c){var d=this.constructor();e.isArray(a)?E.apply(d,a):e.merge(d,a),d.prevObject=this,d.context=this.context,b==="find"?d.selector=this.selector+(this.selector?" ":"")+c:b&&(d.selector=this.selector+"."+b+"("+c+")");return d},each:function(a,b){return e.each(this,a,b)},ready:function(a){e.bindReady(),A.done(a);return this},eq:function(a){return a===-1?this.slice(a):this.slice(a,+a+1)},first:function(){return this.eq(0)},last:function(){return this.eq(-1)},slice:function(){return this.pushStack(F.apply(this,arguments),"slice",F.call(arguments).join(","))},map:function(a){return this.pushStack(e.map(this,function(b,c){return a.call(b,c,b)}))},end:function(){return this.prevObject||this.constructor(null)},push:E,sort:[].sort,splice:[].splice},e.fn.init.prototype=e.fn,e.extend=e.fn.extend=function(){var a,c,d,f,g,h,i=arguments[0]||{},j=1,k=arguments.length,l=!1;typeof i=="boolean"&&(l=i,i=arguments[1]||{},j=2),typeof i!="object"&&!e.isFunction(i)&&(i={}),k===j&&(i=this,--j);for(;j<k;j++)if((a=arguments[j])!=null)for(c in a){d=i[c],f=a[c];if(i===f)continue;l&&f&&(e.isPlainObject(f)||(g=e.isArray(f)))?(g?(g=!1,h=d&&e.isArray(d)?d:[]):h=d&&e.isPlainObject(d)?d:{},i[c]=e.extend(l,h,f)):f!==b&&(i[c]=f)}return i},e.extend({noConflict:function(b){a.$===e&&(a.$=g),b&&a.jQuery===e&&(a.jQuery=f);return e},isReady:!1,readyWait:1,holdReady:function(a){a?e.readyWait++:e.ready(!0)},ready:function(a){if(a===!0&&!--e.readyWait||a!==!0&&!e.isReady){if(!c.body)return setTimeout(e.ready,1);e.isReady=!0;if(a!==!0&&--e.readyWait>0)return;A.resolveWith(c,[e]),e.fn.trigger&&e(c).trigger("ready").unbind("ready")}},bindReady:function(){if(!A){A=e._Deferred();if(c.readyState==="complete")return setTimeout(e.ready,1);if(c.addEventListener)c.addEventListener("DOMContentLoaded",B,!1),a.addEventListener("load",e.ready,!1);else if(c.attachEvent){c.attachEvent("onreadystatechange",B),a.attachEvent("onload",e.ready);var b=!1;try{b=a.frameElement==null}catch(d){}c.documentElement.doScroll&&b&&J()}}},isFunction:function(a){return e.type(a)==="function"},isArray:Array.isArray||function(a){return e.type(a)==="array"},isWindow:function(a){return a&&typeof a=="object"&&"setInterval"in a},isNaN:function(a){return a==null||!m.test(a)||isNaN(a)},type:function(a){return a==null?String(a):I[C.call(a)]||"object"},isPlainObject:function(a){if(!a||e.type(a)!=="object"||a.nodeType||e.isWindow(a))return!1;if(a.constructor&&!D.call(a,"constructor")&&!D.call(a.constructor.prototype,"isPrototypeOf"))return!1;var c;for(c in a);return c===b||D.call(a,c)},isEmptyObject:function(a){for(var b in a)return!1;return!0},error:function(a){throw a},parseJSON:function(b){if(typeof b!="string"||!b)return null;b=e.trim(b);if(a.JSON&&a.JSON.parse)return a.JSON.parse(b);if(o.test(b.replace(p,"@").replace(q,"]").replace(r,"")))return(new Function("return "+b))();e.error("Invalid JSON: "+b)},parseXML:function(b,c,d){a.DOMParser?(d=new DOMParser,c=d.parseFromString(b,"text/xml")):(c=new ActiveXObject("Microsoft.XMLDOM"),c.async="false",c.loadXML(b)),d=c.documentElement,(!d||!d.nodeName||d.nodeName==="parsererror")&&e.error("Invalid XML: "+b);return c},noop:function(){},globalEval:function(b){b&&j.test(b)&&(a.execScript||function(b){a.eval.call(a,b)})(b)},camelCase:function(a){return a.replace(w,x)},nodeName:function(a,b){return a.nodeName&&a.nodeName.toUpperCase()===b.toUpperCase()},each:function(a,c,d){var f,g=0,h=a.length,i=h===b||e.isFunction(a);if(d){if(i){for(f in a)if(c.apply(a[f],d)===!1)break}else for(;g<h;)if(c.apply(a[g++],d)===!1)break}else if(i){for(f in a)if(c.call(a[f],f,a[f])===!1)break}else for(;g<h;)if(c.call(a[g],g,a[g++])===!1)break;return a},trim:G?function(a){return a==null?"":G.call(a)}:function(a){return a==null?"":(a+"").replace(k,"").replace(l,"")},makeArray:function(a,b){var c=b||[];if(a!=null){var d=e.type(a);a.length==null||d==="string"||d==="function"||d==="regexp"||e.isWindow(a)?E.call(c,a):e.merge(c,a)}return c},inArray:function(a,b){if(H)return H.call(b,a);for(var c=0,d=b.length;c<d;c++)if(b[c]===a)return c;return-1},merge:function(a,c){var d=a.length,e=0;if(typeof c.length=="number")for(var f=c.length;e<f;e++)a[d++]=c[e];else while(c[e]!==b)a[d++]=c[e++];a.length=d;return a},grep:function(a,b,c){var d=[],e;c=!!c;for(var f=0,g=a.length;f<g;f++)e=!!b(a[f],f),c!==e&&d.push(a[f]);return d},map:function(a,c,d){var f,g,h=[],i=0,j=a.length,k=a instanceof e||j!==b&&typeof j=="number"&&(j>0&&a[0]&&a[j-1]||j===0||e.isArray(a));if(k)for(;i<j;i++)f=c(a[i],i,d),f!=null&&(h[h.length]=f);else for(g in a)f=c(a[g],g,d),f!=null&&(h[h.length]=f);return h.concat.apply([],h)},guid:1,proxy:function(a,c){if(typeof c=="string"){var d=a[c];c=a,a=d}if(!e.isFunction(a))return b;var f=F.call(arguments,2),g=function(){return a.apply(c,f.concat(F.call(arguments)))};g.guid=a.guid=a.guid||g.guid||e.guid++;return g},access:function(a,c,d,f,g,h){var i=a.length;if(typeof c=="object"){for(var j in c)e.access(a,j,c[j],f,g,d);return a}if(d!==b){f=!h&&f&&e.isFunction(d);for(var k=0;k<i;k++)g(a[k],c,f?d.call(a[k],k,g(a[k],c)):d,h);return a}return i?g(a[0],c):b},now:function(){return(new Date).getTime()},uaMatch:function(a){a=a.toLowerCase();var b=s.exec(a)||t.exec(a)||u.exec(a)||a.indexOf("compatible")<0&&v.exec(a)||[];return{browser:b[1]||"",version:b[2]||"0"}},sub:function(){function a(b,c){return new a.fn.init(b,c)}e.extend(!0,a,this),a.superclass=this,a.fn=a.prototype=this(),a.fn.constructor=a,a.sub=this.sub,a.fn.init=function(d,f){f&&f instanceof e&&!(f instanceof a)&&(f=a(f));return e.fn.init.call(this,d,f,b)},a.fn.init.prototype=a.fn;var b=a(c);return a},browser:{}}),e.each("Boolean Number String Function Array Date RegExp Object".split(" "),function(a,b){I["[object "+b+"]"]=b.toLowerCase()}),z=e.uaMatch(y),z.browser&&(e.browser[z.browser]=!0,e.browser.version=z.version),e.browser.webkit&&(e.browser.safari=!0),j.test(" ")&&(k=/^[\s\xA0]+/,l=/[\s\xA0]+$/),h=e(c),c.addEventListener?B=function(){c.removeEventListener("DOMContentLoaded",B,!1),e.ready()}:c.attachEvent&&(B=function(){c.readyState==="complete"&&(c.detachEvent("onreadystatechange",B),e.ready())});return e}(),g="done fail isResolved isRejected promise then always pipe".split(" "),h=[].slice;f.extend({_Deferred:function(){var a=[],b,c,d,e={done:function(){if(!d){var c=arguments,g,h,i,j,k;b&&(k=b,b=0);for(g=0,h=c.length;g<h;g++)i=c[g],j=f.type(i),j==="array"?e.done.apply(e,i):j==="function"&&a.push(i);k&&e.resolveWith(k[0],k[1])}return this},resolveWith:function(e,f){if(!d&&!b&&!c){f=f||[],c=1;try{while(a[0])a.shift().apply(e,f)}finally{b=[e,f],c=0}}return this},resolve:function(){e.resolveWith(this,arguments);return this},isResolved:function(){return!!c||!!b},cancel:function(){d=1,a=[];return this}};return e},Deferred:function(a){var b=f._Deferred(),c=f._Deferred(),d;f.extend(b,{then:function(a,c){b.done(a).fail(c);return this},always:function(){return b.done.apply(b,arguments).fail.apply(this,arguments)},fail:c.done,rejectWith:c.resolveWith,reject:c.resolve,isRejected:c.isResolved,pipe:function(a,c){return f.Deferred(function(d){f.each({done:[a,"resolve"],fail:[c,"reject"]},function(a,c){var e=c[0],g=c[1],h;f.isFunction(e)?b[a](function(){h=e.apply(this,arguments),h&&f.isFunction(h.promise)?h.promise().then(d.resolve,d.reject):d[g](h)}):b[a](d[g])})}).promise()},promise:function(a){if(a==null){if(d)return d;d=a={}}var c=g.length;while(c--)a[g[c]]=b[g[c]];return a}}),b.done(c.cancel).fail(b.cancel),delete b.cancel,a&&a.call(b,b);return b},when:function(a){function i(a){return function(c){b[a]=arguments.length>1?h.call(arguments,0):c,--e||g.resolveWith(g,h.call(b,0))}}var b=arguments,c=0,d=b.length,e=d,g=d<=1&&a&&f.isFunction(a.promise)?a:f.Deferred();if(d>1){for(;c<d;c++)b[c]&&f.isFunction(b[c].promise)?b[c].promise().then(i(c),g.reject):--e;e||g.resolveWith(g,b)}else g!==a&&g.resolveWith(g,d?[a]:[]);return g.promise()}}),f.support=function(){var a=c.createElement("div"),b=c.documentElement,d,e,g,h,i,j,k,l,m,n,o,p,q,r,s,t,u;a.setAttribute("className","t"),a.innerHTML="   <link/><table></table><a href='/a' style='top:1px;float:left;opacity:.55;'>a</a><input type='checkbox'/>",d=a.getElementsByTagName("*"),e=a.getElementsByTagName("a")[0];if(!d||!d.length||!e)return{};g=c.createElement("select"),h=g.appendChild(c.createElement("option")),i=a.getElementsByTagName("input")[0],k={leadingWhitespace:a.firstChild.nodeType===3,tbody:!a.getElementsByTagName("tbody").length,htmlSerialize:!!a.getElementsByTagName("link").length,style:/top/.test(e.getAttribute("style")),hrefNormalized:e.getAttribute("href")==="/a",opacity:/^0.55$/.test(e.style.opacity),cssFloat:!!e.style.cssFloat,checkOn:i.value==="on",optSelected:h.selected,getSetAttribute:a.className!=="t",submitBubbles:!0,changeBubbles:!0,focusinBubbles:!1,deleteExpando:!0,noCloneEvent:!0,inlineBlockNeedsLayout:!1,shrinkWrapBlocks:!1,reliableMarginRight:!0},i.checked=!0,k.noCloneChecked=i.cloneNode(!0).checked,g.disabled=!0,k.optDisabled=!h.disabled;try{delete a.test}catch(v){k.deleteExpando=!1}!a.addEventListener&&a.attachEvent&&a.fireEvent&&(a.attachEvent("onclick",function(){k.noCloneEvent=!1}),a.cloneNode(!0).fireEvent("onclick")),i=c.createElement("input"),i.value="t",i.setAttribute("type","radio"),k.radioValue=i.value==="t",i.setAttribute("checked","checked"),a.appendChild(i),l=c.createDocumentFragment(),l.appendChild(a.firstChild),k.checkClone=l.cloneNode(!0).cloneNode(!0).lastChild.checked,a.innerHTML="",a.style.width=a.style.paddingLeft="1px",m=c.getElementsByTagName("body")[0],o=c.createElement(m?"div":"body"),p={visibility:"hidden",width:0,height:0,border:0,margin:0},m&&f.extend(p,{position:"absolute",left:-1e3,top:-1e3});for(t in p)o.style[t]=p[t];o.appendChild(a),n=m||b,n.insertBefore(o,n.firstChild),k.appendChecked=i.checked,k.boxModel=a.offsetWidth===2,"zoom"in a.style&&(a.style.display="inline",a.style.zoom=1,k.inlineBlockNeedsLayout=a.offsetWidth===2,a.style.display="",a.innerHTML="<div style='width:4px;'></div>",k.shrinkWrapBlocks=a.offsetWidth!==2),a.innerHTML="<table><tr><td style='padding:0;border:0;display:none'></td><td>t</td></tr></table>",q=a.getElementsByTagName("td"),u=q[0].offsetHeight===0,q[0].style.display="",q[1].style.display="none",k.reliableHiddenOffsets=u&&q[0].offsetHeight===0,a.innerHTML="",c.defaultView&&c.defaultView.getComputedStyle&&(j=c.createElement("div"),j.style.width="0",j.style.marginRight="0",a.appendChild(j),k.reliableMarginRight=(parseInt((c.defaultView.getComputedStyle(j,null)||{marginRight:0}).marginRight,10)||0)===0),o.innerHTML="",n.removeChild(o);if(a.attachEvent)for(t in{submit:1,change:1,focusin:1})s="on"+t,u=s in a,u||(a.setAttribute(s,"return;"),u=typeof a[s]=="function"),k[t+"Bubbles"]=u;o=l=g=h=m=j=a=i=null;return k}(),f.boxModel=f.support.boxModel;var i=/^(?:\{.*\}|\[.*\])$/,j=/([a-z])([A-Z])/g;f.extend({cache:{},uuid:0,expando:"jQuery"+(f.fn.jquery+Math.random()).replace(/\D/g,""),noData:{embed:!0,object:"clsid:D27CDB6E-AE6D-11cf-96B8-444553540000",applet:!0},hasData:function(a){a=a.nodeType?f.cache[a[f.expando]]:a[f.expando];return!!a&&!l(a)},data:function(a,c,d,e){if(!!f.acceptData(a)){var g=f.expando,h=typeof c=="string",i,j=a.nodeType,k=j?f.cache:a,l=j?a[f.expando]:a[f.expando]&&f.expando;if((!l||e&&l&&!k[l][g])&&h&&d===b)return;l||(j?a[f.expando]=l=++f.uuid:l=f.expando),k[l]||(k[l]={},j||(k[l].toJSON=f.noop));if(typeof c=="object"||typeof c=="function")e?k[l][g]=f.extend(k[l][g],c):k[l]=f.extend(k[l],c);i=k[l],e&&(i[g]||(i[g]={}),i=i[g]),d!==b&&(i[f.camelCase(c)]=d);if(c==="events"&&!i[c])return i[g]&&i[g].events;return h?i[f.camelCase(c)]||i[c]:i}},removeData:function(b,c,d){if(!!f.acceptData(b)){var e=f.expando,g=b.nodeType,h=g?f.cache:b,i=g?b[f.expando]:f.expando;if(!h[i])return;if(c){var j=d?h[i][e]:h[i];if(j){delete j[c];if(!l(j))return}}if(d){delete h[i][e];if(!l(h[i]))return}var k=h[i][e];f.support.deleteExpando||h!=a?delete h[i]:h[i]=null,k?(h[i]={},g||(h[i].toJSON=f.noop),h[i][e]=k):g&&(f.support.deleteExpando?delete b[f.expando]:b.removeAttribute?b.removeAttribute(f.expando):b[f.expando]=null)}},_data:function(a,b,c){return f.data(a,b,c,!0)},acceptData:function(a){if(a.nodeName){var b=f.noData[a.nodeName.toLowerCase()];if(b)return b!==!0&&a.getAttribute("classid")===b}return!0}}),f.fn.extend({data:function(a,c){var d=null;if(typeof a=="undefined"){if(this.length){d=f.data(this[0]);if(this[0].nodeType===1){var e=this[0].attributes,g;for(var h=0,i=e.length;h<i;h++)g=e[h].name,g.indexOf("data-")===0&&(g=f.camelCase(g.substring(5)),k(this[0],g,d[g]))}}return d}if(typeof a=="object")return this.each(function(){f.data(this,a)});var j=a.split(".");j[1]=j[1]?"."+j[1]:"";if(c===b){d=this.triggerHandler("getData"+j[1]+"!",[j[0]]),d===b&&this.length&&(d=f.data(this[0],a),d=k(this[0],a,d));return d===b&&j[1]?this.data(j[0]):d}return this.each(function(){var b=f(this),d=[j[0],c];b.triggerHandler("setData"+j[1]+"!",d),f.data(this,a,c),b.triggerHandler("changeData"+j[1]+"!",d)})},removeData:function(a){return this.each(function(){f.removeData(this,a)})}}),f.extend({_mark:function(a,c){a&&(c=(c||"fx")+"mark",f.data(a,c,(f.data(a,c,b,!0)||0)+1,!0))},_unmark:function(a,c,d){a!==!0&&(d=c,c=a,a=!1);if(c){d=d||"fx";var e=d+"mark",g=a?0:(f.data(c,e,b,!0)||1)-1;g?f.data(c,e,g,!0):(f.removeData(c,e,!0),m(c,d,"mark"))}},queue:function(a,c,d){if(a){c=(c||"fx")+"queue";var e=f.data(a,c,b,!0);d&&(!e||f.isArray(d)?e=f.data(a,c,f.makeArray(d),!0):e.push(d));return e||[]}},dequeue:function(a,b){b=b||"fx";var c=f.queue(a,b),d=c.shift(),e;d==="inprogress"&&(d=c.shift()),d&&(b==="fx"&&c.unshift("inprogress"),d.call(a,function(){f.dequeue(a,b)})),c.length||(f.removeData(a,b+"queue",!0),m(a,b,"queue"))}}),f.fn.extend({queue:function(a,c){typeof a!="string"&&(c=a,a="fx");if(c===b)return f.queue(this[0],a);return this.each(function(){var b=f.queue(this,a,c);a==="fx"&&b[0]!=="inprogress"&&f.dequeue(this,a)})},dequeue:function(a){return this.each(function(){f.dequeue(this,a)})},delay:function(a,b){a=f.fx?f.fx.speeds[a]||a:a,b=b||"fx";return this.queue(b,function(){var c=this;setTimeout(function(){f.dequeue(c,b)},a)})},clearQueue:function(a){return this.queue(a||"fx",[])},promise:function(a,c){function m(){--h||d.resolveWith(e,[e])}typeof a!="string"&&(c=a,a=b),a=a||"fx";var d=f.Deferred(),e=this,g=e.length,h=1,i=a+"defer",j=a+"queue",k=a+"mark",l;while(g--)if(l=f.data(e[g],i,b,!0)||(f.data(e[g],j,b,!0)||f.data(e[g],k,b,!0))&&f.data(e[g],i,f._Deferred(),!0))h++,l.done(m);m();return d.promise()}});var n=/[\n\t\r]/g,o=/\s+/,p=/\r/g,q=/^(?:button|input)$/i,r=/^(?:button|input|object|select|textarea)$/i,s=/^a(?:rea)?$/i,t=/^(?:autofocus|autoplay|async|checked|controls|defer|disabled|hidden|loop|multiple|open|readonly|required|scoped|selected)$/i,u=/\:|^on/,v,w;f.fn.extend({attr:function(a,b){return f.access(this,a,b,!0,f.attr)},removeAttr:function(a){return this.each(function(){f.removeAttr(this,a)})},prop:function(a,b){return f.access(this,a,b,!0,f.prop)},removeProp:function(a){a=f.propFix[a]||a;return this.each(function(){try{this[a]=b,delete this[a]}catch(c){}})},addClass:function(a){var b,c,d,e,g,h,i;if(f.isFunction(a))return this.each(function(b){f(this).addClass(a.call(this,b,this.className))});if(a&&typeof a=="string"){b=a.split(o);for(c=0,d=this.length;c<d;c++){e=this[c];if(e.nodeType===1)if(!e.className&&b.length===1)e.className=a;else{g=" "+e.className+" ";for(h=0,i=b.length;h<i;h++)~g.indexOf(" "+b[h]+" ")||(g+=b[h]+" ");e.className=f.trim(g)}}}return this},removeClass:function(a){var c,d,e,g,h,i,j;if(f.isFunction(a))return this.each(function(b){f(this).removeClass(a.call(this,b,this.className))});if(a&&typeof a=="string"||a===b){c=(a||"").split(o);for(d=0,e=this.length;d<e;d++){g=this[d];if(g.nodeType===1&&g.className)if(a){h=(" "+g.className+" ").replace(n," ");for(i=0,j=c.length;i<j;i++)h=h.replace(" "+c[i]+" "," ");g.className=f.trim(h)}else g.className=""}}return this},toggleClass:function(a,b){var c=typeof a,d=typeof b=="boolean";if(f.isFunction(a))return this.each(function(c){f(this).toggleClass(a.call(this,c,this.className,b),b)});return this.each(function(){if(c==="string"){var e,g=0,h=f(this),i=b,j=a.split(o);while(e=j[g++])i=d?i:!h.hasClass(e),h[i?"addClass":"removeClass"](e)}else if(c==="undefined"||c==="boolean")this.className&&f._data(this,"__className__",this.className),this.className=this.className||a===!1?"":f._data(this,"__className__")||""})},hasClass:function(a){var b=" "+a+" ";for(var c=0,d=this.length;c<d;c++)if((" "+this[c].className+" ").replace(n," ").indexOf(b)>-1)return!0;return!1},val:function(a){var c,d,e=this[0];if(!arguments.length){if(e){c=f.valHooks[e.nodeName.toLowerCase()]||f.valHooks[e.type];if(c&&"get"in c&&(d=c.get(e,"value"))!==b)return d;d=e.value;return typeof d=="string"?d.replace(p,""):d==null?"":d}return b}var g=f.isFunction(a);return this.each(function(d){var e=f(this),h;if(this.nodeType===1){g?h=a.call(this,d,e.val()):h=a,h==null?h="":typeof h=="number"?h+="":f.isArray(h)&&(h=f.map(h,function(a){return a==null?"":a+""})),c=f.valHooks[this.nodeName.toLowerCase()]||f.valHooks[this.type];if(!c||!("set"in c)||c.set(this,h,"value")===b)this.value=h}})}}),f.extend({valHooks:{option:{get:function(a){var b=a.attributes.value;return!b||b.specified?a.value:a.text}},select:{get:function(a){var b,c=a.selectedIndex,d=[],e=a.options,g=a.type==="select-one";if(c<0)return null;for(var h=g?c:0,i=g?c+1:e.length;h<i;h++){var j=e[h];if(j.selected&&(f.support.optDisabled?!j.disabled:j.getAttribute("disabled")===null)&&(!j.parentNode.disabled||!f.nodeName(j.parentNode,"optgroup"))){b=f(j).val();if(g)return b;d.push(b)}}if(g&&!d.length&&e.length)return f(e[c]).val();return d},set:function(a,b){var c=f.makeArray(b);f(a).find("option").each(function(){this.selected=f.inArray(f(this).val(),c)>=0}),c.length||(a.selectedIndex=-1);return c}}},attrFn:{val:!0,css:!0,html:!0,text:!0,data:!0,width:!0,height:!0,offset:!0},attrFix:{tabindex:"tabIndex"},attr:function(a,c,d,e){var g=a.nodeType;if(!a||g===3||g===8||g===2)return b;if(e&&c in f.attrFn)return f(a)[c](d);if(!("getAttribute"in a))return f.prop(a,c,d);var h,i,j=g!==1||!f.isXMLDoc(a);j&&(c=f.attrFix[c]||c,i=f.attrHooks[c],i||(t.test(c)?i=w:v&&c!=="className"&&(f.nodeName(a,"form")||u.test(c))&&(i=v)));if(d!==b){if(d===null){f.removeAttr(a,c);return b}if(i&&"set"in i&&j&&(h=i.set(a,d,c))!==b)return h;a.setAttribute(c,""+d);return d}if(i&&"get"in i&&j&&(h=i.get(a,c))!==null)return h;h=a.getAttribute(c);return h===null?b:h},removeAttr:function(a,b){var c;a.nodeType===1&&(b=f.attrFix[b]||b,f.support.getSetAttribute?a.removeAttribute(b):(f.attr(a,b,""),a.removeAttributeNode(a.getAttributeNode(b))),t.test(b)&&(c=f.propFix[b]||b)in a&&(a[c]=!1))},attrHooks:{type:{set:function(a,b){if(q.test(a.nodeName)&&a.parentNode)f.error("type property can't be changed");else if(!f.support.radioValue&&b==="radio"&&f.nodeName(a,"input")){var c=a.value;a.setAttribute("type",b),c&&(a.value=c);return b}}},tabIndex:{get:function(a){var c=a.getAttributeNode("tabIndex");return c&&c.specified?parseInt(c.value,10):r.test(a.nodeName)||s.test(a.nodeName)&&a.href?0:b}},value:{get:function(a,b){if(v&&f.nodeName(a,"button"))return v.get(a,b);return b in a?a.value:null},set:function(a,b,c){if(v&&f.nodeName(a,"button"))return v.set(a,b,c);a.value=b}}},propFix:{tabindex:"tabIndex",readonly:"readOnly","for":"htmlFor","class":"className",maxlength:"maxLength",cellspacing:"cellSpacing",cellpadding:"cellPadding",rowspan:"rowSpan",colspan:"colSpan",usemap:"useMap",frameborder:"frameBorder",contenteditable:"contentEditable"},prop:function(a,c,d){var e=a.nodeType;if(!a||e===3||e===8||e===2)return b;var g,h,i=e!==1||!f.isXMLDoc(a);i&&(c=f.propFix[c]||c,h=f.propHooks[c]);return d!==b?h&&"set"in h&&(g=h.set(a,d,c))!==b?g:a[c]=d:h&&"get"in h&&(g=h.get(a,c))!==b?g:a[c]},propHooks:{}}),w={get:function(a,c){return f.prop(a,c)?c.toLowerCase():b},set:function(a,b,c){var d;b===!1?f.removeAttr(a,c):(d=f.propFix[c]||c,d in a&&(a[d]=!0),a.setAttribute(c,c.toLowerCase()));return c}},f.support.getSetAttribute||(f.attrFix=f.propFix,v=f.attrHooks.name=f.attrHooks.title=f.valHooks.button={get:function(a,c){var d;d=a.getAttributeNode(c);return d&&d.nodeValue!==""?d.nodeValue:b},set:function(a,b,c){var d=a.getAttributeNode(c);if(d){d.nodeValue=b;return b}}},f.each(["width","height"],function(a,b){f.attrHooks[b]=f.extend(f.attrHooks[b],{set:function(a,c){if(c===""){a.setAttribute(b,"auto");return c}}})})),f.support.hrefNormalized||f.each(["href","src","width","height"],function(a,c){f.attrHooks[c]=f.extend(f.attrHooks[c],{get:function(a){var d=a.getAttribute(c,2);return d===null?b:d}})}),f.support.style||(f.attrHooks.style={get:function(a){return a.style.cssText.toLowerCase()||b},set:function(a,b){return a.style.cssText=""+b}}),f.support.optSelected||(f.propHooks.selected=f.extend(f.propHooks.selected,{get:function(a){var b=a.parentNode;b&&(b.selectedIndex,b.parentNode&&b.parentNode.selectedIndex)}})),f.support.checkOn||f.each(["radio","checkbox"],function(){f.valHooks[this]={get:function(a){return a.getAttribute("value")===null?"on":a.value}}}),f.each(["radio","checkbox"],function(){f.valHooks[this]=f.extend(f.valHooks[this],{set:function(a,b){if(f.isArray(b))return a.checked=f.inArray(f(a).val(),b)>=0}})});var x=/\.(.*)$/,y=/^(?:textarea|input|select)$/i,z=/\./g,A=/ /g,B=/[^\w\s.|`]/g,C=function(a){return a.replace(B,"\\$&")};f.event={add:function(a,c,d,e){if(a.nodeType!==3&&a.nodeType!==8){if(d===!1)d=D;else if(!d)return;var g,h;d.handler&&(g=d,d=g.handler),d.guid||(d.guid=f.guid++);var i=f._data(a);if(!i)return;var j=i.events,k=i.handle;j||(i.events=j={}),k||(i.handle=k=function(a){return typeof f!="undefined"&&(!a||f.event.triggered!==a.type)?f.event.handle.apply(k.elem,arguments):b}),k.elem=a,c=c.split(" ");var l,m=0,n;while(l=c[m++]){h=g?f.extend({},g):{handler:d,data:e},l.indexOf(".")>-1?(n=l.split("."),l=n.shift(),h.namespace=n.slice(0).sort().join(".")):(n=[],h.namespace=""),h.type=l,h.guid||(h.guid=d.guid);var o=j[l],p=f.event.special[l]||{};if(!o){o=j[l]=[];if(!p.setup||p.setup.call(a,e,n,k)===!1)a.addEventListener?a.addEventListener(l,k,!1):a.attachEvent&&a.attachEvent("on"+l,k)}p.add&&(p.add.call(a,h),h.handler.guid||(h.handler.guid=d.guid)),o.push(h),f.event.global[l]=!0}a=null}},global:{},remove:function(a,c,d,e){if(a.nodeType!==3&&a.nodeType!==8){d===!1&&(d=D);var g,h,i,j,k=0,l,m,n,o,p,q,r,s=f.hasData(a)&&f._data(a),t=s&&s.events;if(!s||!t)return;c&&c.type&&(d=c.handler,c=c.type);if(!c||typeof c=="string"&&c.charAt(0)==="."){c=c||"";for(h in t)f.event.remove(a,h+c);return}c=c.split(" ");while(h=c[k++]){r=h,q=null,l=h.indexOf(".")<0,m=[],l||(m=h.split("."),h=m.shift(),n=new RegExp("(^|\\.)"+f.map(m.slice(0).sort(),C).join("\\.(?:.*\\.)?")+"(\\.|$)")),p=t[h];if(!p)continue;if(!d){for(j=0;j<p.length;j++){q=p[j];if(l||n.test(q.namespace))f.event.remove(a,r,q.handler,j),p.splice(j--,1)}continue}o=f.event.special[h]||{};for(j=e||0;j<p.length;j++){q=p[j];if(d.guid===q.guid){if(l||n.test(q.namespace))e==null&&p.splice(j--,1),o.remove&&o.remove.call(a,q);if(e!=null)break}}if(p.length===0||e!=null&&p.length===1)(!o.teardown||o.teardown.call(a,m)===!1)&&f.removeEvent(a,h,s.handle),g=null,delete t[h]}if(f.isEmptyObject(t)){var u=s.handle;u&&(u.elem=null),delete s.events,delete s.handle,f.isEmptyObject(s)&&f.removeData(a,b,!0)}}},customEvent:{getData:!0,setData:!0,changeData:!0},trigger:function(c,d,e,g){var h=c.type||c,i=[],j;h.indexOf("!")>=0&&(h=h.slice(0,-1),j=!0),h.indexOf(".")>=0&&(i=h.split("."),h=i.
+shift(),i.sort());if(!!e&&!f.event.customEvent[h]||!!f.event.global[h]){c=typeof c=="object"?c[f.expando]?c:new f.Event(h,c):new f.Event(h),c.type=h,c.exclusive=j,c.namespace=i.join("."),c.namespace_re=new RegExp("(^|\\.)"+i.join("\\.(?:.*\\.)?")+"(\\.|$)");if(g||!e)c.preventDefault(),c.stopPropagation();if(!e){f.each(f.cache,function(){var a=f.expando,b=this[a];b&&b.events&&b.events[h]&&f.event.trigger(c,d,b.handle.elem)});return}if(e.nodeType===3||e.nodeType===8)return;c.result=b,c.target=e,d=d!=null?f.makeArray(d):[],d.unshift(c);var k=e,l=h.indexOf(":")<0?"on"+h:"";do{var m=f._data(k,"handle");c.currentTarget=k,m&&m.apply(k,d),l&&f.acceptData(k)&&k[l]&&k[l].apply(k,d)===!1&&(c.result=!1,c.preventDefault()),k=k.parentNode||k.ownerDocument||k===c.target.ownerDocument&&a}while(k&&!c.isPropagationStopped());if(!c.isDefaultPrevented()){var n,o=f.event.special[h]||{};if((!o._default||o._default.call(e.ownerDocument,c)===!1)&&(h!=="click"||!f.nodeName(e,"a"))&&f.acceptData(e)){try{l&&e[h]&&(n=e[l],n&&(e[l]=null),f.event.triggered=h,e[h]())}catch(p){}n&&(e[l]=n),f.event.triggered=b}}return c.result}},handle:function(c){c=f.event.fix(c||a.event);var d=((f._data(this,"events")||{})[c.type]||[]).slice(0),e=!c.exclusive&&!c.namespace,g=Array.prototype.slice.call(arguments,0);g[0]=c,c.currentTarget=this;for(var h=0,i=d.length;h<i;h++){var j=d[h];if(e||c.namespace_re.test(j.namespace)){c.handler=j.handler,c.data=j.data,c.handleObj=j;var k=j.handler.apply(this,g);k!==b&&(c.result=k,k===!1&&(c.preventDefault(),c.stopPropagation()));if(c.isImmediatePropagationStopped())break}}return c.result},props:"altKey attrChange attrName bubbles button cancelable charCode clientX clientY ctrlKey currentTarget data detail eventPhase fromElement handler keyCode layerX layerY metaKey newValue offsetX offsetY pageX pageY prevValue relatedNode relatedTarget screenX screenY shiftKey srcElement target toElement view wheelDelta which".split(" "),fix:function(a){if(a[f.expando])return a;var d=a;a=f.Event(d);for(var e=this.props.length,g;e;)g=this.props[--e],a[g]=d[g];a.target||(a.target=a.srcElement||c),a.target.nodeType===3&&(a.target=a.target.parentNode),!a.relatedTarget&&a.fromElement&&(a.relatedTarget=a.fromElement===a.target?a.toElement:a.fromElement);if(a.pageX==null&&a.clientX!=null){var h=a.target.ownerDocument||c,i=h.documentElement,j=h.body;a.pageX=a.clientX+(i&&i.scrollLeft||j&&j.scrollLeft||0)-(i&&i.clientLeft||j&&j.clientLeft||0),a.pageY=a.clientY+(i&&i.scrollTop||j&&j.scrollTop||0)-(i&&i.clientTop||j&&j.clientTop||0)}a.which==null&&(a.charCode!=null||a.keyCode!=null)&&(a.which=a.charCode!=null?a.charCode:a.keyCode),!a.metaKey&&a.ctrlKey&&(a.metaKey=a.ctrlKey),!a.which&&a.button!==b&&(a.which=a.button&1?1:a.button&2?3:a.button&4?2:0);return a},guid:1e8,proxy:f.proxy,special:{ready:{setup:f.bindReady,teardown:f.noop},live:{add:function(a){f.event.add(this,N(a.origType,a.selector),f.extend({},a,{handler:M,guid:a.handler.guid}))},remove:function(a){f.event.remove(this,N(a.origType,a.selector),a)}},beforeunload:{setup:function(a,b,c){f.isWindow(this)&&(this.onbeforeunload=c)},teardown:function(a,b){this.onbeforeunload===b&&(this.onbeforeunload=null)}}}},f.removeEvent=c.removeEventListener?function(a,b,c){a.removeEventListener&&a.removeEventListener(b,c,!1)}:function(a,b,c){a.detachEvent&&a.detachEvent("on"+b,c)},f.Event=function(a,b){if(!this.preventDefault)return new f.Event(a,b);a&&a.type?(this.originalEvent=a,this.type=a.type,this.isDefaultPrevented=a.defaultPrevented||a.returnValue===!1||a.getPreventDefault&&a.getPreventDefault()?E:D):this.type=a,b&&f.extend(this,b),this.timeStamp=f.now(),this[f.expando]=!0},f.Event.prototype={preventDefault:function(){this.isDefaultPrevented=E;var a=this.originalEvent;!a||(a.preventDefault?a.preventDefault():a.returnValue=!1)},stopPropagation:function(){this.isPropagationStopped=E;var a=this.originalEvent;!a||(a.stopPropagation&&a.stopPropagation(),a.cancelBubble=!0)},stopImmediatePropagation:function(){this.isImmediatePropagationStopped=E,this.stopPropagation()},isDefaultPrevented:D,isPropagationStopped:D,isImmediatePropagationStopped:D};var F=function(a){var b=a.relatedTarget,c=!1,d=a.type;a.type=a.data,b!==this&&(b&&(c=f.contains(this,b)),c||(f.event.handle.apply(this,arguments),a.type=d))},G=function(a){a.type=a.data,f.event.handle.apply(this,arguments)};f.each({mouseenter:"mouseover",mouseleave:"mouseout"},function(a,b){f.event.special[a]={setup:function(c){f.event.add(this,b,c&&c.selector?G:F,a)},teardown:function(a){f.event.remove(this,b,a&&a.selector?G:F)}}}),f.support.submitBubbles||(f.event.special.submit={setup:function(a,b){if(!f.nodeName(this,"form"))f.event.add(this,"click.specialSubmit",function(a){var b=a.target,c=b.type;(c==="submit"||c==="image")&&f(b).closest("form").length&&K("submit",this,arguments)}),f.event.add(this,"keypress.specialSubmit",function(a){var b=a.target,c=b.type;(c==="text"||c==="password")&&f(b).closest("form").length&&a.keyCode===13&&K("submit",this,arguments)});else return!1},teardown:function(a){f.event.remove(this,".specialSubmit")}});if(!f.support.changeBubbles){var H,I=function(a){var b=a.type,c=a.value;b==="radio"||b==="checkbox"?c=a.checked:b==="select-multiple"?c=a.selectedIndex>-1?f.map(a.options,function(a){return a.selected}).join("-"):"":f.nodeName(a,"select")&&(c=a.selectedIndex);return c},J=function(c){var d=c.target,e,g;if(!!y.test(d.nodeName)&&!d.readOnly){e=f._data(d,"_change_data"),g=I(d),(c.type!=="focusout"||d.type!=="radio")&&f._data(d,"_change_data",g);if(e===b||g===e)return;if(e!=null||g)c.type="change",c.liveFired=b,f.event.trigger(c,arguments[1],d)}};f.event.special.change={filters:{focusout:J,beforedeactivate:J,click:function(a){var b=a.target,c=f.nodeName(b,"input")?b.type:"";(c==="radio"||c==="checkbox"||f.nodeName(b,"select"))&&J.call(this,a)},keydown:function(a){var b=a.target,c=f.nodeName(b,"input")?b.type:"";(a.keyCode===13&&!f.nodeName(b,"textarea")||a.keyCode===32&&(c==="checkbox"||c==="radio")||c==="select-multiple")&&J.call(this,a)},beforeactivate:function(a){var b=a.target;f._data(b,"_change_data",I(b))}},setup:function(a,b){if(this.type==="file")return!1;for(var c in H)f.event.add(this,c+".specialChange",H[c]);return y.test(this.nodeName)},teardown:function(a){f.event.remove(this,".specialChange");return y.test(this.nodeName)}},H=f.event.special.change.filters,H.focus=H.beforeactivate}f.support.focusinBubbles||f.each({focus:"focusin",blur:"focusout"},function(a,b){function e(a){var c=f.event.fix(a);c.type=b,c.originalEvent={},f.event.trigger(c,null,c.target),c.isDefaultPrevented()&&a.preventDefault()}var d=0;f.event.special[b]={setup:function(){d++===0&&c.addEventListener(a,e,!0)},teardown:function(){--d===0&&c.removeEventListener(a,e,!0)}}}),f.each(["bind","one"],function(a,c){f.fn[c]=function(a,d,e){var g;if(typeof a=="object"){for(var h in a)this[c](h,d,a[h],e);return this}if(arguments.length===2||d===!1)e=d,d=b;c==="one"?(g=function(a){f(this).unbind(a,g);return e.apply(this,arguments)},g.guid=e.guid||f.guid++):g=e;if(a==="unload"&&c!=="one")this.one(a,d,e);else for(var i=0,j=this.length;i<j;i++)f.event.add(this[i],a,g,d);return this}}),f.fn.extend({unbind:function(a,b){if(typeof a=="object"&&!a.preventDefault)for(var c in a)this.unbind(c,a[c]);else for(var d=0,e=this.length;d<e;d++)f.event.remove(this[d],a,b);return this},delegate:function(a,b,c,d){return this.live(b,c,d,a)},undelegate:function(a,b,c){return arguments.length===0?this.unbind("live"):this.die(b,null,c,a)},trigger:function(a,b){return this.each(function(){f.event.trigger(a,b,this)})},triggerHandler:function(a,b){if(this[0])return f.event.trigger(a,b,this[0],!0)},toggle:function(a){var b=arguments,c=a.guid||f.guid++,d=0,e=function(c){var e=(f.data(this,"lastToggle"+a.guid)||0)%d;f.data(this,"lastToggle"+a.guid,e+1),c.preventDefault();return b[e].apply(this,arguments)||!1};e.guid=c;while(d<b.length)b[d++].guid=c;return this.click(e)},hover:function(a,b){return this.mouseenter(a).mouseleave(b||a)}});var L={focus:"focusin",blur:"focusout",mouseenter:"mouseover",mouseleave:"mouseout"};f.each(["live","die"],function(a,c){f.fn[c]=function(a,d,e,g){var h,i=0,j,k,l,m=g||this.selector,n=g?this:f(this.context);if(typeof a=="object"&&!a.preventDefault){for(var o in a)n[c](o,d,a[o],m);return this}if(c==="die"&&!a&&g&&g.charAt(0)==="."){n.unbind(g);return this}if(d===!1||f.isFunction(d))e=d||D,d=b;a=(a||"").split(" ");while((h=a[i++])!=null){j=x.exec(h),k="",j&&(k=j[0],h=h.replace(x,""));if(h==="hover"){a.push("mouseenter"+k,"mouseleave"+k);continue}l=h,L[h]?(a.push(L[h]+k),h=h+k):h=(L[h]||h)+k;if(c==="live")for(var p=0,q=n.length;p<q;p++)f.event.add(n[p],"live."+N(h,m),{data:d,selector:m,handler:e,origType:h,origHandler:e,preType:l});else n.unbind("live."+N(h,m),e)}return this}}),f.each("blur focus focusin focusout load resize scroll unload click dblclick mousedown mouseup mousemove mouseover mouseout mouseenter mouseleave change select submit keydown keypress keyup error".split(" "),function(a,b){f.fn[b]=function(a,c){c==null&&(c=a,a=null);return arguments.length>0?this.bind(b,a,c):this.trigger(b)},f.attrFn&&(f.attrFn[b]=!0)}),function(){function u(a,b,c,d,e,f){for(var g=0,h=d.length;g<h;g++){var i=d[g];if(i){var j=!1;i=i[a];while(i){if(i.sizcache===c){j=d[i.sizset];break}if(i.nodeType===1){f||(i.sizcache=c,i.sizset=g);if(typeof b!="string"){if(i===b){j=!0;break}}else if(k.filter(b,[i]).length>0){j=i;break}}i=i[a]}d[g]=j}}}function t(a,b,c,d,e,f){for(var g=0,h=d.length;g<h;g++){var i=d[g];if(i){var j=!1;i=i[a];while(i){if(i.sizcache===c){j=d[i.sizset];break}i.nodeType===1&&!f&&(i.sizcache=c,i.sizset=g);if(i.nodeName.toLowerCase()===b){j=i;break}i=i[a]}d[g]=j}}}var a=/((?:\((?:\([^()]+\)|[^()]+)+\)|\[(?:\[[^\[\]]*\]|['"][^'"]*['"]|[^\[\]'"]+)+\]|\\.|[^ >+~,(\[\\]+)+|[>+~])(\s*,\s*)?((?:.|\r|\n)*)/g,d=0,e=Object.prototype.toString,g=!1,h=!0,i=/\\/g,j=/\W/;[0,0].sort(function(){h=!1;return 0});var k=function(b,d,f,g){f=f||[],d=d||c;var h=d;if(d.nodeType!==1&&d.nodeType!==9)return[];if(!b||typeof b!="string")return f;var i,j,n,o,q,r,s,t,u=!0,w=k.isXML(d),x=[],y=b;do{a.exec(""),i=a.exec(y);if(i){y=i[3],x.push(i[1]);if(i[2]){o=i[3];break}}}while(i);if(x.length>1&&m.exec(b))if(x.length===2&&l.relative[x[0]])j=v(x[0]+x[1],d);else{j=l.relative[x[0]]?[d]:k(x.shift(),d);while(x.length)b=x.shift(),l.relative[b]&&(b+=x.shift()),j=v(b,j)}else{!g&&x.length>1&&d.nodeType===9&&!w&&l.match.ID.test(x[0])&&!l.match.ID.test(x[x.length-1])&&(q=k.find(x.shift(),d,w),d=q.expr?k.filter(q.expr,q.set)[0]:q.set[0]);if(d){q=g?{expr:x.pop(),set:p(g)}:k.find(x.pop(),x.length===1&&(x[0]==="~"||x[0]==="+")&&d.parentNode?d.parentNode:d,w),j=q.expr?k.filter(q.expr,q.set):q.set,x.length>0?n=p(j):u=!1;while(x.length)r=x.pop(),s=r,l.relative[r]?s=x.pop():r="",s==null&&(s=d),l.relative[r](n,s,w)}else n=x=[]}n||(n=j),n||k.error(r||b);if(e.call(n)==="[object Array]")if(!u)f.push.apply(f,n);else if(d&&d.nodeType===1)for(t=0;n[t]!=null;t++)n[t]&&(n[t]===!0||n[t].nodeType===1&&k.contains(d,n[t]))&&f.push(j[t]);else for(t=0;n[t]!=null;t++)n[t]&&n[t].nodeType===1&&f.push(j[t]);else p(n,f);o&&(k(o,h,f,g),k.uniqueSort(f));return f};k.uniqueSort=function(a){if(r){g=h,a.sort(r);if(g)for(var b=1;b<a.length;b++)a[b]===a[b-1]&&a.splice(b--,1)}return a},k.matches=function(a,b){return k(a,null,null,b)},k.matchesSelector=function(a,b){return k(b,null,null,[a]).length>0},k.find=function(a,b,c){var d;if(!a)return[];for(var e=0,f=l.order.length;e<f;e++){var g,h=l.order[e];if(g=l.leftMatch[h].exec(a)){var j=g[1];g.splice(1,1);if(j.substr(j.length-1)!=="\\"){g[1]=(g[1]||"").replace(i,""),d=l.find[h](g,b,c);if(d!=null){a=a.replace(l.match[h],"");break}}}}d||(d=typeof b.getElementsByTagName!="undefined"?b.getElementsByTagName("*"):[]);return{set:d,expr:a}},k.filter=function(a,c,d,e){var f,g,h=a,i=[],j=c,m=c&&c[0]&&k.isXML(c[0]);while(a&&c.length){for(var n in l.filter)if((f=l.leftMatch[n].exec(a))!=null&&f[2]){var o,p,q=l.filter[n],r=f[1];g=!1,f.splice(1,1);if(r.substr(r.length-1)==="\\")continue;j===i&&(i=[]);if(l.preFilter[n]){f=l.preFilter[n](f,j,d,i,e,m);if(!f)g=o=!0;else if(f===!0)continue}if(f)for(var s=0;(p=j[s])!=null;s++)if(p){o=q(p,f,s,j);var t=e^!!o;d&&o!=null?t?g=!0:j[s]=!1:t&&(i.push(p),g=!0)}if(o!==b){d||(j=i),a=a.replace(l.match[n],"");if(!g)return[];break}}if(a===h)if(g==null)k.error(a);else break;h=a}return j},k.error=function(a){throw"Syntax error, unrecognized expression: "+a};var l=k.selectors={order:["ID","NAME","TAG"],match:{ID:/#((?:[\w\u00c0-\uFFFF\-]|\\.)+)/,CLASS:/\.((?:[\w\u00c0-\uFFFF\-]|\\.)+)/,NAME:/\[name=['"]*((?:[\w\u00c0-\uFFFF\-]|\\.)+)['"]*\]/,ATTR:/\[\s*((?:[\w\u00c0-\uFFFF\-]|\\.)+)\s*(?:(\S?=)\s*(?:(['"])(.*?)\3|(#?(?:[\w\u00c0-\uFFFF\-]|\\.)*)|)|)\s*\]/,TAG:/^((?:[\w\u00c0-\uFFFF\*\-]|\\.)+)/,CHILD:/:(only|nth|last|first)-child(?:\(\s*(even|odd|(?:[+\-]?\d+|(?:[+\-]?\d*)?n\s*(?:[+\-]\s*\d+)?))\s*\))?/,POS:/:(nth|eq|gt|lt|first|last|even|odd)(?:\((\d*)\))?(?=[^\-]|$)/,PSEUDO:/:((?:[\w\u00c0-\uFFFF\-]|\\.)+)(?:\((['"]?)((?:\([^\)]+\)|[^\(\)]*)+)\2\))?/},leftMatch:{},attrMap:{"class":"className","for":"htmlFor"},attrHandle:{href:function(a){return a.getAttribute("href")},type:function(a){return a.getAttribute("type")}},relative:{"+":function(a,b){var c=typeof b=="string",d=c&&!j.test(b),e=c&&!d;d&&(b=b.toLowerCase());for(var f=0,g=a.length,h;f<g;f++)if(h=a[f]){while((h=h.previousSibling)&&h.nodeType!==1);a[f]=e||h&&h.nodeName.toLowerCase()===b?h||!1:h===b}e&&k.filter(b,a,!0)},">":function(a,b){var c,d=typeof b=="string",e=0,f=a.length;if(d&&!j.test(b)){b=b.toLowerCase();for(;e<f;e++){c=a[e];if(c){var g=c.parentNode;a[e]=g.nodeName.toLowerCase()===b?g:!1}}}else{for(;e<f;e++)c=a[e],c&&(a[e]=d?c.parentNode:c.parentNode===b);d&&k.filter(b,a,!0)}},"":function(a,b,c){var e,f=d++,g=u;typeof b=="string"&&!j.test(b)&&(b=b.toLowerCase(),e=b,g=t),g("parentNode",b,f,a,e,c)},"~":function(a,b,c){var e,f=d++,g=u;typeof b=="string"&&!j.test(b)&&(b=b.toLowerCase(),e=b,g=t),g("previousSibling",b,f,a,e,c)}},find:{ID:function(a,b,c){if(typeof b.getElementById!="undefined"&&!c){var d=b.getElementById(a[1]);return d&&d.parentNode?[d]:[]}},NAME:function(a,b){if(typeof b.getElementsByName!="undefined"){var c=[],d=b.getElementsByName(a[1]);for(var e=0,f=d.length;e<f;e++)d[e].getAttribute("name")===a[1]&&c.push(d[e]);return c.length===0?null:c}},TAG:function(a,b){if(typeof b.getElementsByTagName!="undefined")return b.getElementsByTagName(a[1])}},preFilter:{CLASS:function(a,b,c,d,e,f){a=" "+a[1].replace(i,"")+" ";if(f)return a;for(var g=0,h;(h=b[g])!=null;g++)h&&(e^(h.className&&(" "+h.className+" ").replace(/[\t\n\r]/g," ").indexOf(a)>=0)?c||d.push(h):c&&(b[g]=!1));return!1},ID:function(a){return a[1].replace(i,"")},TAG:function(a,b){return a[1].replace(i,"").toLowerCase()},CHILD:function(a){if(a[1]==="nth"){a[2]||k.error(a[0]),a[2]=a[2].replace(/^\+|\s*/g,"");var b=/(-?)(\d*)(?:n([+\-]?\d*))?/.exec(a[2]==="even"&&"2n"||a[2]==="odd"&&"2n+1"||!/\D/.test(a[2])&&"0n+"+a[2]||a[2]);a[2]=b[1]+(b[2]||1)-0,a[3]=b[3]-0}else a[2]&&k.error(a[0]);a[0]=d++;return a},ATTR:function(a,b,c,d,e,f){var g=a[1]=a[1].replace(i,"");!f&&l.attrMap[g]&&(a[1]=l.attrMap[g]),a[4]=(a[4]||a[5]||"").replace(i,""),a[2]==="~="&&(a[4]=" "+a[4]+" ");return a},PSEUDO:function(b,c,d,e,f){if(b[1]==="not")if((a.exec(b[3])||"").length>1||/^\w/.test(b[3]))b[3]=k(b[3],null,null,c);else{var g=k.filter(b[3],c,d,!0^f);d||e.push.apply(e,g);return!1}else if(l.match.POS.test(b[0])||l.match.CHILD.test(b[0]))return!0;return b},POS:function(a){a.unshift(!0);return a}},filters:{enabled:function(a){return a.disabled===!1&&a.type!=="hidden"},disabled:function(a){return a.disabled===!0},checked:function(a){return a.checked===!0},selected:function(a){a.parentNode&&a.parentNode.selectedIndex;return a.selected===!0},parent:function(a){return!!a.firstChild},empty:function(a){return!a.firstChild},has:function(a,b,c){return!!k(c[3],a).length},header:function(a){return/h\d/i.test(a.nodeName)},text:function(a){var b=a.getAttribute("type"),c=a.type;return a.nodeName.toLowerCase()==="input"&&"text"===c&&(b===c||b===null)},radio:function(a){return a.nodeName.toLowerCase()==="input"&&"radio"===a.type},checkbox:function(a){return a.nodeName.toLowerCase()==="input"&&"checkbox"===a.type},file:function(a){return a.nodeName.toLowerCase()==="input"&&"file"===a.type},password:function(a){return a.nodeName.toLowerCase()==="input"&&"password"===a.type},submit:function(a){var b=a.nodeName.toLowerCase();return(b==="input"||b==="button")&&"submit"===a.type},image:function(a){return a.nodeName.toLowerCase()==="input"&&"image"===a.type},reset:function(a){var b=a.nodeName.toLowerCase();return(b==="input"||b==="button")&&"reset"===a.type},button:function(a){var b=a.nodeName.toLowerCase();return b==="input"&&"button"===a.type||b==="button"},input:function(a){return/input|select|textarea|button/i.test(a.nodeName)},focus:function(a){return a===a.ownerDocument.activeElement}},setFilters:{first:function(a,b){return b===0},last:function(a,b,c,d){return b===d.length-1},even:function(a,b){return b%2===0},odd:function(a,b){return b%2===1},lt:function(a,b,c){return b<c[3]-0},gt:function(a,b,c){return b>c[3]-0},nth:function(a,b,c){return c[3]-0===b},eq:function(a,b,c){return c[3]-0===b}},filter:{PSEUDO:function(a,b,c,d){var e=b[1],f=l.filters[e];if(f)return f(a,c,b,d);if(e==="contains")return(a.textContent||a.innerText||k.getText([a])||"").indexOf(b[3])>=0;if(e==="not"){var g=b[3];for(var h=0,i=g.length;h<i;h++)if(g[h]===a)return!1;return!0}k.error(e)},CHILD:function(a,b){var c=b[1],d=a;switch(c){case"only":case"first":while(d=d.previousSibling)if(d.nodeType===1)return!1;if(c==="first")return!0;d=a;case"last":while(d=d.nextSibling)if(d.nodeType===1)return!1;return!0;case"nth":var e=b[2],f=b[3];if(e===1&&f===0)return!0;var g=b[0],h=a.parentNode;if(h&&(h.sizcache!==g||!a.nodeIndex)){var i=0;for(d=h.firstChild;d;d=d.nextSibling)d.nodeType===1&&(d.nodeIndex=++i);h.sizcache=g}var j=a.nodeIndex-f;return e===0?j===0:j%e===0&&j/e>=0}},ID:function(a,b){return a.nodeType===1&&a.getAttribute("id")===b},TAG:function(a,b){return b==="*"&&a.nodeType===1||a.nodeName.toLowerCase()===b},CLASS:function(a,b){return(" "+(a.className||a.getAttribute("class"))+" ").indexOf(b)>-1},ATTR:function(a,b){var c=b[1],d=l.attrHandle[c]?l.attrHandle[c](a):a[c]!=null?a[c]:a.getAttribute(c),e=d+"",f=b[2],g=b[4];return d==null?f==="!=":f==="="?e===g:f==="*="?e.indexOf(g)>=0:f==="~="?(" "+e+" ").indexOf(g)>=0:g?f==="!="?e!==g:f==="^="?e.indexOf(g)===0:f==="$="?e.substr(e.length-g.length)===g:f==="|="?e===g||e.substr(0,g.length+1)===g+"-":!1:e&&d!==!1},POS:function(a,b,c,d){var e=b[2],f=l.setFilters[e];if(f)return f(a,c,b,d)}}},m=l.match.POS,n=function(a,b){return"\\"+(b-0+1)};for(var o in l.match)l.match[o]=new RegExp(l.match[o].source+/(?![^\[]*\])(?![^\(]*\))/.source),l.leftMatch[o]=new RegExp(/(^(?:.|\r|\n)*?)/.source+l.match[o].source.replace(/\\(\d+)/g,n));var p=function(a,b){a=Array.prototype.slice.call(a,0);if(b){b.push.apply(b,a);return b}return a};try{Array.prototype.slice.call(c.documentElement.childNodes,0)[0].nodeType}catch(q){p=function(a,b){var c=0,d=b||[];if(e.call(a)==="[object Array]")Array.prototype.push.apply(d,a);else if(typeof a.length=="number")for(var f=a.length;c<f;c++)d.push(a[c]);else for(;a[c];c++)d.push(a[c]);return d}}var r,s;c.documentElement.compareDocumentPosition?r=function(a,b){if(a===b){g=!0;return 0}if(!a.compareDocumentPosition||!b.compareDocumentPosition)return a.compareDocumentPosition?-1:1;return a.compareDocumentPosition(b)&4?-1:1}:(r=function(a,b){if(a===b){g=!0;return 0}if(a.sourceIndex&&b.sourceIndex)return a.sourceIndex-b.sourceIndex;var c,d,e=[],f=[],h=a.parentNode,i=b.parentNode,j=h;if(h===i)return s(a,b);if(!h)return-1;if(!i)return 1;while(j)e.unshift(j),j=j.parentNode;j=i;while(j)f.unshift(j),j=j.parentNode;c=e.length,d=f.length;for(var k=0;k<c&&k<d;k++)if(e[k]!==f[k])return s(e[k],f[k]);return k===c?s(a,f[k],-1):s(e[k],b,1)},s=function(a,b,c){if(a===b)return c;var d=a.nextSibling;while(d){if(d===b)return-1;d=d.nextSibling}return 1}),k.getText=function(a){var b="",c;for(var d=0;a[d];d++)c=a[d],c.nodeType===3||c.nodeType===4?b+=c.nodeValue:c.nodeType!==8&&(b+=k.getText(c.childNodes));return b},function(){var a=c.createElement("div"),d="script"+(new Date).getTime(),e=c.documentElement;a.innerHTML="<a name='"+d+"'/>",e.insertBefore(a,e.firstChild),c.getElementById(d)&&(l.find.ID=function(a,c,d){if(typeof c.getElementById!="undefined"&&!d){var e=c.getElementById(a[1]);return e?e.id===a[1]||typeof e.getAttributeNode!="undefined"&&e.getAttributeNode("id").nodeValue===a[1]?[e]:b:[]}},l.filter.ID=function(a,b){var c=typeof a.getAttributeNode!="undefined"&&a.getAttributeNode("id");return a.nodeType===1&&c&&c.nodeValue===b}),e.removeChild(a),e=a=null}(),function(){var a=c.createElement("div");a.appendChild(c.createComment("")),a.getElementsByTagName("*").length>0&&(l.find.TAG=function(a,b){var c=b.getElementsByTagName(a[1]);if(a[1]==="*"){var d=[];for(var e=0;c[e];e++)c[e].nodeType===1&&d.push(c[e]);c=d}return c}),a.innerHTML="<a href='#'></a>",a.firstChild&&typeof a.firstChild.getAttribute!="undefined"&&a.firstChild.getAttribute("href")!=="#"&&(l.attrHandle.href=function(a){return a.getAttribute("href",2)}),a=null}(),c.querySelectorAll&&function(){var a=k,b=c.createElement("div"),d="__sizzle__";b.innerHTML="<p class='TEST'></p>";if(!b.querySelectorAll||b.querySelectorAll(".TEST").length!==0){k=function(b,e,f,g){e=e||c;if(!g&&!k.isXML(e)){var h=/^(\w+$)|^\.([\w\-]+$)|^#([\w\-]+$)/.exec(b);if(h&&(e.nodeType===1||e.nodeType===9)){if(h[1])return p(e.getElementsByTagName(b),f);if(h[2]&&l.find.CLASS&&e.getElementsByClassName)return p(e.getElementsByClassName(h[2]),f)}if(e.nodeType===9){if(b==="body"&&e.body)return p([e.body],f);if(h&&h[3]){var i=e.getElementById(h[3]);if(!i||!i.parentNode)return p([],f);if(i.id===h[3])return p([i],f)}try{return p(e.querySelectorAll(b),f)}catch(j){}}else if(e.nodeType===1&&e.nodeName.toLowerCase()!=="object"){var m=e,n=e.getAttribute("id"),o=n||d,q=e.parentNode,r=/^\s*[+~]/.test(b);n?o=o.replace(/'/g,"\\$&"):e.setAttribute("id",o),r&&q&&(e=e.parentNode);try{if(!r||q)return p(e.querySelectorAll("[id='"+o+"'] "+b),f)}catch(s){}finally{n||m.removeAttribute("id")}}}return a(b,e,f,g)};for(var e in a)k[e]=a[e];b=null}}(),function(){var a=c.documentElement,b=a.matchesSelector||a.mozMatchesSelector||a.webkitMatchesSelector||a.msMatchesSelector;if(b){var d=!b.call(c.createElement("div"),"div"),e=!1;try{b.call(c.documentElement,"[test!='']:sizzle")}catch(f){e=!0}k.matchesSelector=function(a,c){c=c.replace(/\=\s*([^'"\]]*)\s*\]/g,"='$1']");if(!k.isXML(a))try{if(e||!l.match.PSEUDO.test(c)&&!/!=/.test(c)){var f=b.call(a,c);if(f||!d||a.document&&a.document.nodeType!==11)return f}}catch(g){}return k(c,null,null,[a]).length>0}}}(),function(){var a=c.createElement("div");a.innerHTML="<div class='test e'></div><div class='test'></div>";if(!!a.getElementsByClassName&&a.getElementsByClassName("e").length!==0){a.lastChild.className="e";if(a.getElementsByClassName("e").length===1)return;l.order.splice(1,0,"CLASS"),l.find.CLASS=function(a,b,c){if(typeof b.getElementsByClassName!="undefined"&&!c)return b.getElementsByClassName(a[1])},a=null}}(),c.documentElement.contains?k.contains=function(a,b){return a!==b&&(a.contains?a.contains(b):!0)}:c.documentElement.compareDocumentPosition?k.contains=function(a,b){return!!(a.compareDocumentPosition(b)&16)}:k.contains=function(){return!1},k.isXML=function(a){var b=(a?a.ownerDocument||a:0).documentElement;return b?b.nodeName!=="HTML":!1};var v=function(a,b){var c,d=[],e="",f=b.nodeType?[b]:b;while(c=l.match.PSEUDO.exec(a))e+=c[0],a=a.replace(l.match.PSEUDO,"");a=l.relative[a]?a+"*":a;for(var g=0,h=f.length;g<h;g++)k(a,f[g],d);return k.filter(e,d)};f.find=k,f.expr=k.selectors,f.expr[":"]=f.expr.filters,f.unique=k.uniqueSort,f.text=k.getText,f.isXMLDoc=k.isXML,f.contains=k.contains}();var O=/Until$/,P=/^(?:parents|prevUntil|prevAll)/,Q=/,/,R=/^.[^:#\[\.,]*$/,S=Array.prototype.slice,T=f.expr.match.POS,U={children:!0,contents:!0,next:!0,prev:!0};f.fn.extend({find:function(a){var b=this,c,d;if(typeof a!="string")return f(a).filter(function(){for(c=0,d=b.length;c<d;c++)if(f.contains(b[c],this))return!0});var e=this.pushStack("","find",a),g,h,i;for(c=0,d=this.length;c<d;c++){g=e.length,f.find(a,this[c],e);if(c>0)for(h=g;h<e.length;h++)for(i=0;i<g;i++)if(e[i]===e[h]){e.splice(h--,1);break}}return e},has:function(a){var b=f(a);return this.filter(function(){for(var a=0,c=b.length;a<c;a++)if(f.contains(this,b[a]))return!0})},not:function(a){return this.pushStack(W(this,a,!1),"not",a)},filter:function(a){return this.pushStack(W(this,a,!0),"filter",a)},is:function(a){return!!a&&(typeof a=="string"?f.filter(a,this).length>0:this.filter(a).length>0)},closest:function(a,b){var c=[],d,e,g=this[0];if(f.isArray(a)){var h,i,j={},k=1;if(g&&a.length){for(d=0,e=a.length;d<e;d++)i=a[d],j[i]||(j[i]=T.test(i)?f(i,b||this.context):i);while(g&&g.ownerDocument&&g!==b){for(i in j)h=j[i],(h.jquery?h.index(g)>-1:f(g).is(h))&&c.push({selector:i,elem:g,level:k});g=g.parentNode,k++}}return c}var l=T.test(a)||typeof a!="string"?f(a,b||this.context):0;for(d=0,e=this.length;d<e;d++){g=this[d];while(g){if(l?l.index(g)>-1:f.find.matchesSelector(g,a)){c.push(g);break}g=g.parentNode;if(!g||!g.ownerDocument||g===b||g.nodeType===11)break}}c=c.length>1?f.unique(c):c;return this.pushStack(c,"closest",a)},index:function(a){if(!a||typeof a=="string")return f.inArray(this[0],a?f(a):this.parent().children());return f.inArray(a.jquery?a[0]:a,this)},add:function(a,b){var c=typeof a=="string"?f(a,b):f.makeArray(a&&a.nodeType?[a]:a),d=f.merge(this.get(),c);return this.pushStack(V(c[0])||V(d[0])?d:f.unique(d))},andSelf:function(){return this.add(this.prevObject)}}),f.each({parent:function(a){var b=a.parentNode;return b&&b.nodeType!==11?b:null},parents:function(a){return f.dir(a,"parentNode")},parentsUntil:function(a,b,c){return f.dir(a,"parentNode",c)},next:function(a){return f.nth(a,2,"nextSibling")},prev:function(a){return f.nth(a,2,"previousSibling")},nextAll:function(a){return f.dir(a,"nextSibling")},prevAll:function(a){return f.dir(a,"previousSibling")},nextUntil:function(a,b,c){return f.dir(a,"nextSibling",c)},prevUntil:function(a,b,c){return f.dir(a,"previousSibling",c)},siblings:function(a){return f.sibling(a.parentNode.firstChild,a)},children:function(a){return f.sibling(a.firstChild)},contents:function(a){return f.nodeName(a,"iframe")?a.contentDocument||a.contentWindow.document:f.makeArray(a.childNodes)}},function(a,b){f.fn[a]=function(c,d){var e=f.map(this,b,c),g=S.call(arguments);O.test(a)||(d=c),d&&typeof d=="string"&&(e=f.filter(d,e)),e=this.length>1&&!U[a]?f.unique(e):e,(this.length>1||Q.test(d))&&P.test(a)&&(e=e.reverse());return this.pushStack(e,a,g.join(","))}}),f.extend({filter:function(a,b,c){c&&(a=":not("+a+")");return b.length===1?f.find.matchesSelector(b[0],a)?[b[0]]:[]:f.find.matches(a,b)},dir:function(a,c,d){var e=[],g=a[c];while(g&&g.nodeType!==9&&(d===b||g.nodeType!==1||!f(g).is(d)))g.nodeType===1&&e.push(g),g=g[c];return e},nth:function(a,b,c,d){b=b||1;var e=0;for(;a;a=a[c])if(a.nodeType===1&&++e===b)break;return a},sibling:function(a,b){var c=[];for(;a;a=a.nextSibling)a.nodeType===1&&a!==b&&c.push(a);return c}});var X=/ jQuery\d+="(?:\d+|null)"/g,Y=/^\s+/,Z=/<(?!area|br|col|embed|hr|img|input|link|meta|param)(([\w:]+)[^>]*)\/>/ig,$=/<([\w:]+)/,_=/<tbody/i,ba=/<|&#?\w+;/,bb=/<(?:script|object|embed|option|style)/i,bc=/checked\s*(?:[^=]|=\s*.checked.)/i,bd=/\/(java|ecma)script/i,be=/^\s*<!(?:\[CDATA\[|\-\-)/,bf={option:[1,"<select multiple='multiple'>","</select>"],legend:[1,"<fieldset>","</fieldset>"],thead:[1,"<table>","</table>"],tr:[2,"<table><tbody>","</tbody></table>"],td:[3,"<table><tbody><tr>","</tr></tbody></table>"],col:[2,"<table><tbody></tbody><colgroup>","</colgroup></table>"],area:[1,"<map>","</map>"],_default:[0,"",""]};bf.optgroup=bf.option,bf.tbody=bf.tfoot=bf.colgroup=bf.caption=bf.thead,bf.th=bf.td,f.support.htmlSerialize||(bf._default=[1,"div<div>","</div>"]),f.fn.extend({text:function(a){if(f.isFunction(a))return this.each(function(b){var c=f(this);c.text(a.call(this,b,c.text()))});if(typeof a!="object"&&a!==b)return this.empty().append((this[0]&&this[0].ownerDocument||c).createTextNode(a));return f.text(this)},wrapAll:function(a){if(f.isFunction(a))return this.each(function(b){f(this).wrapAll(a.call(this,b))});if(this[0]){var b=f(a,this[0].ownerDocument).eq(0).clone(!0);this[0].parentNode&&b.insertBefore(this[0]),b.map(function(){var a=this;while(a.firstChild&&a.firstChild.nodeType===1)a=a.firstChild;return a}).append(this)}return this},wrapInner:function(a){if(f.isFunction(a))return this.each(function(b){f(this).wrapInner(a.call(this,b))});return this.each(function(){var b=f(this),c=b.contents();c.length?c.wrapAll(a):b.append(a)})},wrap:function(a){return this.each(function(){f(this).wrapAll(a)})},unwrap:function(){return this.parent().each(function(){f.nodeName(this,"body")||f(this).replaceWith(this.childNodes)}).end()},append:function(){return this.domManip(arguments,!0,function(a){this.nodeType===1&&this.appendChild(a)})},prepend:function(){return this.domManip(arguments,!0,function(a){this.nodeType===1&&this.insertBefore(a,this.firstChild)})},before:function(){if(this[0]&&this[0].parentNode)return this.domManip(arguments,!1,function(a){this.parentNode.insertBefore(a,this)});if(arguments.length){var a=f(arguments[0]);a.push.apply(a,this.toArray());return this.pushStack(a,"before",arguments)}},after:function(){if(this[0]&&this[0].parentNode)return this.domManip(arguments,!1,function(a){this.parentNode.insertBefore(a,this.nextSibling)});if(arguments.length){var a=this.pushStack(this,"after",arguments);a.push.apply(a,f(arguments[0]).toArray());return a}},remove:function(a,b){for(var c=0,d;(d=this[c])!=null;c++)if(!a||f.filter(a,[d]).length)!b&&d.nodeType===1&&(f.cleanData(d.getElementsByTagName("*")),f.cleanData([d])),d.parentNode&&d.parentNode.removeChild(d);return this},empty:function(){for(var a=0,b;(b=this[a])!=null;a++){b.nodeType===1&&f.cleanData(b.getElementsByTagName("*"));while(b.firstChild)b.removeChild(b.firstChild)}return this},clone:function(a,b){a=a==null?!1:a,b=b==null?a:b;return this.map(function(){return f.clone(this,a,b)})},html:function(a){if(a===b)return this[0]&&this[0].nodeType===1?this[0].innerHTML.replace(X,""):null;if(typeof a=="string"&&!bb.test(a)&&(f.support.leadingWhitespace||!Y.test(a))&&!bf[($.exec(a)||["",""])[1].toLowerCase()]){a=a.replace(Z,"<$1></$2>");try{for(var c=0,d=this.length;c<d;c++)this[c].nodeType===1&&(f.cleanData(this[c].getElementsByTagName("*")),this[c].innerHTML=a)}catch(e){this.empty().append(a)}}else f.isFunction(a)?this.each(function(b){var c=f(this);c.html(a.call(this,b,c.html()))}):this.empty().append(a);return this},replaceWith:function(a){if(this[0]&&this[0].parentNode){if(f.isFunction(a))return this.each(function(b){var c=f(this),d=c.html();c.replaceWith(a.call(this,b,d))});typeof a!="string"&&(a=f(a).detach());return this.each(function(){var b=this.nextSibling,c=this.parentNode;f(this).remove(),b?f(b).before(a):f(c).append(a)})}return this.length?this.pushStack(f(f.isFunction(a)?a():a),"replaceWith",a):this},detach:function(a){return this.remove(a,!0)},domManip:function(a,c,d){var e,g,h,i,j=a[0],k=[];if(!f.support.checkClone&&arguments.length===3&&typeof j=="string"&&bc.test(j))return this.each(function(){f(this).domManip(a,c,d,!0)});if(f.isFunction(j))return this.each(function(e){var g=f(this);a[0]=j.call(this,e,c?g.html():b),g.domManip(a,c,d)});if(this[0]){i=j&&j.parentNode,f.support.parentNode&&i&&i.nodeType===11&&i.childNodes.length===this.length?e={fragment:i}:e=f.buildFragment(a,this,k),h=e.fragment,h.childNodes.length===1?g=h=h.firstChild:g=h.firstChild;if(g){c=c&&f.nodeName(g,"tr");for(var l=0,m=this.length,n=m-1;l<m;l++)d.call(c?bg(this[l],g):this[l],e.cacheable||m>1&&l<n?f.clone(h,!0,!0):h)}k.length&&f.each(k,bm)}return this}}),f.buildFragment=function(a,b,d){var e,g,h,i;b&&b[0]&&(i=b[0].ownerDocument||b[0]),i.createDocumentFragment||(i=c),a.length===1&&typeof a[0]=="string"&&a[0].length<512&&i===c&&a[0].charAt(0)==="<"&&!bb.test(a[0])&&(f.support.checkClone||!bc.test(a[0]))&&(g=!0,h=f.fragments[a[0]],h&&h!==1&&(e=h)),e||(e=i.createDocumentFragment(),f.clean(a,i,e,d)),g&&(f.fragments[a[0]]=h?e:1);return{fragment:e,cacheable:g}},f.fragments={},f.each({appendTo:"append",prependTo:"prepend",insertBefore:"before",insertAfter:"after",replaceAll:"replaceWith"},function(a,b){f.fn[a]=function(c){var d=[],e=f(c),g=this.length===1&&this[0].parentNode;if(g&&g.nodeType===11&&g.childNodes.length===1&&e.length===1){e[b](this[0]);return this}for(var h=0,i=e.length;h<i;h++){var j=(h>0?this.clone(!0):this).get();f(e[h])[b](j),d=d.concat(j
+)}return this.pushStack(d,a,e.selector)}}),f.extend({clone:function(a,b,c){var d=a.cloneNode(!0),e,g,h;if((!f.support.noCloneEvent||!f.support.noCloneChecked)&&(a.nodeType===1||a.nodeType===11)&&!f.isXMLDoc(a)){bi(a,d),e=bj(a),g=bj(d);for(h=0;e[h];++h)bi(e[h],g[h])}if(b){bh(a,d);if(c){e=bj(a),g=bj(d);for(h=0;e[h];++h)bh(e[h],g[h])}}e=g=null;return d},clean:function(a,b,d,e){var g;b=b||c,typeof b.createElement=="undefined"&&(b=b.ownerDocument||b[0]&&b[0].ownerDocument||c);var h=[],i;for(var j=0,k;(k=a[j])!=null;j++){typeof k=="number"&&(k+="");if(!k)continue;if(typeof k=="string")if(!ba.test(k))k=b.createTextNode(k);else{k=k.replace(Z,"<$1></$2>");var l=($.exec(k)||["",""])[1].toLowerCase(),m=bf[l]||bf._default,n=m[0],o=b.createElement("div");o.innerHTML=m[1]+k+m[2];while(n--)o=o.lastChild;if(!f.support.tbody){var p=_.test(k),q=l==="table"&&!p?o.firstChild&&o.firstChild.childNodes:m[1]==="<table>"&&!p?o.childNodes:[];for(i=q.length-1;i>=0;--i)f.nodeName(q[i],"tbody")&&!q[i].childNodes.length&&q[i].parentNode.removeChild(q[i])}!f.support.leadingWhitespace&&Y.test(k)&&o.insertBefore(b.createTextNode(Y.exec(k)[0]),o.firstChild),k=o.childNodes}var r;if(!f.support.appendChecked)if(k[0]&&typeof (r=k.length)=="number")for(i=0;i<r;i++)bl(k[i]);else bl(k);k.nodeType?h.push(k):h=f.merge(h,k)}if(d){g=function(a){return!a.type||bd.test(a.type)};for(j=0;h[j];j++)if(e&&f.nodeName(h[j],"script")&&(!h[j].type||h[j].type.toLowerCase()==="text/javascript"))e.push(h[j].parentNode?h[j].parentNode.removeChild(h[j]):h[j]);else{if(h[j].nodeType===1){var s=f.grep(h[j].getElementsByTagName("script"),g);h.splice.apply(h,[j+1,0].concat(s))}d.appendChild(h[j])}}return h},cleanData:function(a){var b,c,d=f.cache,e=f.expando,g=f.event.special,h=f.support.deleteExpando;for(var i=0,j;(j=a[i])!=null;i++){if(j.nodeName&&f.noData[j.nodeName.toLowerCase()])continue;c=j[f.expando];if(c){b=d[c]&&d[c][e];if(b&&b.events){for(var k in b.events)g[k]?f.event.remove(j,k):f.removeEvent(j,k,b.handle);b.handle&&(b.handle.elem=null)}h?delete j[f.expando]:j.removeAttribute&&j.removeAttribute(f.expando),delete d[c]}}}});var bn=/alpha\([^)]*\)/i,bo=/opacity=([^)]*)/,bp=/([A-Z]|^ms)/g,bq=/^-?\d+(?:px)?$/i,br=/^-?\d/,bs=/^[+\-]=/,bt=/[^+\-\.\de]+/g,bu={position:"absolute",visibility:"hidden",display:"block"},bv=["Left","Right"],bw=["Top","Bottom"],bx,by,bz;f.fn.css=function(a,c){if(arguments.length===2&&c===b)return this;return f.access(this,a,c,!0,function(a,c,d){return d!==b?f.style(a,c,d):f.css(a,c)})},f.extend({cssHooks:{opacity:{get:function(a,b){if(b){var c=bx(a,"opacity","opacity");return c===""?"1":c}return a.style.opacity}}},cssNumber:{fillOpacity:!0,fontWeight:!0,lineHeight:!0,opacity:!0,orphans:!0,widows:!0,zIndex:!0,zoom:!0},cssProps:{"float":f.support.cssFloat?"cssFloat":"styleFloat"},style:function(a,c,d,e){if(!!a&&a.nodeType!==3&&a.nodeType!==8&&!!a.style){var g,h,i=f.camelCase(c),j=a.style,k=f.cssHooks[i];c=f.cssProps[i]||i;if(d===b){if(k&&"get"in k&&(g=k.get(a,!1,e))!==b)return g;return j[c]}h=typeof d;if(h==="number"&&isNaN(d)||d==null)return;h==="string"&&bs.test(d)&&(d=+d.replace(bt,"")+parseFloat(f.css(a,c)),h="number"),h==="number"&&!f.cssNumber[i]&&(d+="px");if(!k||!("set"in k)||(d=k.set(a,d))!==b)try{j[c]=d}catch(l){}}},css:function(a,c,d){var e,g;c=f.camelCase(c),g=f.cssHooks[c],c=f.cssProps[c]||c,c==="cssFloat"&&(c="float");if(g&&"get"in g&&(e=g.get(a,!0,d))!==b)return e;if(bx)return bx(a,c)},swap:function(a,b,c){var d={};for(var e in b)d[e]=a.style[e],a.style[e]=b[e];c.call(a);for(e in b)a.style[e]=d[e]}}),f.curCSS=f.css,f.each(["height","width"],function(a,b){f.cssHooks[b]={get:function(a,c,d){var e;if(c){if(a.offsetWidth!==0)return bA(a,b,d);f.swap(a,bu,function(){e=bA(a,b,d)});return e}},set:function(a,b){if(!bq.test(b))return b;b=parseFloat(b);if(b>=0)return b+"px"}}}),f.support.opacity||(f.cssHooks.opacity={get:function(a,b){return bo.test((b&&a.currentStyle?a.currentStyle.filter:a.style.filter)||"")?parseFloat(RegExp.$1)/100+"":b?"1":""},set:function(a,b){var c=a.style,d=a.currentStyle;c.zoom=1;var e=f.isNaN(b)?"":"alpha(opacity="+b*100+")",g=d&&d.filter||c.filter||"";c.filter=bn.test(g)?g.replace(bn,e):g+" "+e}}),f(function(){f.support.reliableMarginRight||(f.cssHooks.marginRight={get:function(a,b){var c;f.swap(a,{display:"inline-block"},function(){b?c=bx(a,"margin-right","marginRight"):c=a.style.marginRight});return c}})}),c.defaultView&&c.defaultView.getComputedStyle&&(by=function(a,c){var d,e,g;c=c.replace(bp,"-$1").toLowerCase();if(!(e=a.ownerDocument.defaultView))return b;if(g=e.getComputedStyle(a,null))d=g.getPropertyValue(c),d===""&&!f.contains(a.ownerDocument.documentElement,a)&&(d=f.style(a,c));return d}),c.documentElement.currentStyle&&(bz=function(a,b){var c,d=a.currentStyle&&a.currentStyle[b],e=a.runtimeStyle&&a.runtimeStyle[b],f=a.style;!bq.test(d)&&br.test(d)&&(c=f.left,e&&(a.runtimeStyle.left=a.currentStyle.left),f.left=b==="fontSize"?"1em":d||0,d=f.pixelLeft+"px",f.left=c,e&&(a.runtimeStyle.left=e));return d===""?"auto":d}),bx=by||bz,f.expr&&f.expr.filters&&(f.expr.filters.hidden=function(a){var b=a.offsetWidth,c=a.offsetHeight;return b===0&&c===0||!f.support.reliableHiddenOffsets&&(a.style.display||f.css(a,"display"))==="none"},f.expr.filters.visible=function(a){return!f.expr.filters.hidden(a)});var bB=/%20/g,bC=/\[\]$/,bD=/\r?\n/g,bE=/#.*$/,bF=/^(.*?):[ \t]*([^\r\n]*)\r?$/mg,bG=/^(?:color|date|datetime|email|hidden|month|number|password|range|search|tel|text|time|url|week)$/i,bH=/^(?:about|app|app\-storage|.+\-extension|file|widget):$/,bI=/^(?:GET|HEAD)$/,bJ=/^\/\//,bK=/\?/,bL=/<script\b[^<]*(?:(?!<\/script>)<[^<]*)*<\/script>/gi,bM=/^(?:select|textarea)/i,bN=/\s+/,bO=/([?&])_=[^&]*/,bP=/^([\w\+\.\-]+:)(?:\/\/([^\/?#:]*)(?::(\d+))?)?/,bQ=f.fn.load,bR={},bS={},bT,bU;try{bT=e.href}catch(bV){bT=c.createElement("a"),bT.href="",bT=bT.href}bU=bP.exec(bT.toLowerCase())||[],f.fn.extend({load:function(a,c,d){if(typeof a!="string"&&bQ)return bQ.apply(this,arguments);if(!this.length)return this;var e=a.indexOf(" ");if(e>=0){var g=a.slice(e,a.length);a=a.slice(0,e)}var h="GET";c&&(f.isFunction(c)?(d=c,c=b):typeof c=="object"&&(c=f.param(c,f.ajaxSettings.traditional),h="POST"));var i=this;f.ajax({url:a,type:h,dataType:"html",data:c,complete:function(a,b,c){c=a.responseText,a.isResolved()&&(a.done(function(a){c=a}),i.html(g?f("<div>").append(c.replace(bL,"")).find(g):c)),d&&i.each(d,[c,b,a])}});return this},serialize:function(){return f.param(this.serializeArray())},serializeArray:function(){return this.map(function(){return this.elements?f.makeArray(this.elements):this}).filter(function(){return this.name&&!this.disabled&&(this.checked||bM.test(this.nodeName)||bG.test(this.type))}).map(function(a,b){var c=f(this).val();return c==null?null:f.isArray(c)?f.map(c,function(a,c){return{name:b.name,value:a.replace(bD,"\r\n")}}):{name:b.name,value:c.replace(bD,"\r\n")}}).get()}}),f.each("ajaxStart ajaxStop ajaxComplete ajaxError ajaxSuccess ajaxSend".split(" "),function(a,b){f.fn[b]=function(a){return this.bind(b,a)}}),f.each(["get","post"],function(a,c){f[c]=function(a,d,e,g){f.isFunction(d)&&(g=g||e,e=d,d=b);return f.ajax({type:c,url:a,data:d,success:e,dataType:g})}}),f.extend({getScript:function(a,c){return f.get(a,b,c,"script")},getJSON:function(a,b,c){return f.get(a,b,c,"json")},ajaxSetup:function(a,b){b?f.extend(!0,a,f.ajaxSettings,b):(b=a,a=f.extend(!0,f.ajaxSettings,b));for(var c in{context:1,url:1})c in b?a[c]=b[c]:c in f.ajaxSettings&&(a[c]=f.ajaxSettings[c]);return a},ajaxSettings:{url:bT,isLocal:bH.test(bU[1]),global:!0,type:"GET",contentType:"application/x-www-form-urlencoded",processData:!0,async:!0,accepts:{xml:"application/xml, text/xml",html:"text/html",text:"text/plain",json:"application/json, text/javascript","*":"*/*"},contents:{xml:/xml/,html:/html/,json:/json/},responseFields:{xml:"responseXML",text:"responseText"},converters:{"* text":a.String,"text html":!0,"text json":f.parseJSON,"text xml":f.parseXML}},ajaxPrefilter:bW(bR),ajaxTransport:bW(bS),ajax:function(a,c){function w(a,c,l,m){if(s!==2){s=2,q&&clearTimeout(q),p=b,n=m||"",v.readyState=a?4:0;var o,r,u,w=l?bZ(d,v,l):b,x,y;if(a>=200&&a<300||a===304){if(d.ifModified){if(x=v.getResponseHeader("Last-Modified"))f.lastModified[k]=x;if(y=v.getResponseHeader("Etag"))f.etag[k]=y}if(a===304)c="notmodified",o=!0;else try{r=b$(d,w),c="success",o=!0}catch(z){c="parsererror",u=z}}else{u=c;if(!c||a)c="error",a<0&&(a=0)}v.status=a,v.statusText=c,o?h.resolveWith(e,[r,c,v]):h.rejectWith(e,[v,c,u]),v.statusCode(j),j=b,t&&g.trigger("ajax"+(o?"Success":"Error"),[v,d,o?r:u]),i.resolveWith(e,[v,c]),t&&(g.trigger("ajaxComplete",[v,d]),--f.active||f.event.trigger("ajaxStop"))}}typeof a=="object"&&(c=a,a=b),c=c||{};var d=f.ajaxSetup({},c),e=d.context||d,g=e!==d&&(e.nodeType||e instanceof f)?f(e):f.event,h=f.Deferred(),i=f._Deferred(),j=d.statusCode||{},k,l={},m={},n,o,p,q,r,s=0,t,u,v={readyState:0,setRequestHeader:function(a,b){if(!s){var c=a.toLowerCase();a=m[c]=m[c]||a,l[a]=b}return this},getAllResponseHeaders:function(){return s===2?n:null},getResponseHeader:function(a){var c;if(s===2){if(!o){o={};while(c=bF.exec(n))o[c[1].toLowerCase()]=c[2]}c=o[a.toLowerCase()]}return c===b?null:c},overrideMimeType:function(a){s||(d.mimeType=a);return this},abort:function(a){a=a||"abort",p&&p.abort(a),w(0,a);return this}};h.promise(v),v.success=v.done,v.error=v.fail,v.complete=i.done,v.statusCode=function(a){if(a){var b;if(s<2)for(b in a)j[b]=[j[b],a[b]];else b=a[v.status],v.then(b,b)}return this},d.url=((a||d.url)+"").replace(bE,"").replace(bJ,bU[1]+"//"),d.dataTypes=f.trim(d.dataType||"*").toLowerCase().split(bN),d.crossDomain==null&&(r=bP.exec(d.url.toLowerCase()),d.crossDomain=!(!r||r[1]==bU[1]&&r[2]==bU[2]&&(r[3]||(r[1]==="http:"?80:443))==(bU[3]||(bU[1]==="http:"?80:443)))),d.data&&d.processData&&typeof d.data!="string"&&(d.data=f.param(d.data,d.traditional)),bX(bR,d,c,v);if(s===2)return!1;t=d.global,d.type=d.type.toUpperCase(),d.hasContent=!bI.test(d.type),t&&f.active++===0&&f.event.trigger("ajaxStart");if(!d.hasContent){d.data&&(d.url+=(bK.test(d.url)?"&":"?")+d.data),k=d.url;if(d.cache===!1){var x=f.now(),y=d.url.replace(bO,"$1_="+x);d.url=y+(y===d.url?(bK.test(d.url)?"&":"?")+"_="+x:"")}}(d.data&&d.hasContent&&d.contentType!==!1||c.contentType)&&v.setRequestHeader("Content-Type",d.contentType),d.ifModified&&(k=k||d.url,f.lastModified[k]&&v.setRequestHeader("If-Modified-Since",f.lastModified[k]),f.etag[k]&&v.setRequestHeader("If-None-Match",f.etag[k])),v.setRequestHeader("Accept",d.dataTypes[0]&&d.accepts[d.dataTypes[0]]?d.accepts[d.dataTypes[0]]+(d.dataTypes[0]!=="*"?", */*; q=0.01":""):d.accepts["*"]);for(u in d.headers)v.setRequestHeader(u,d.headers[u]);if(d.beforeSend&&(d.beforeSend.call(e,v,d)===!1||s===2)){v.abort();return!1}for(u in{success:1,error:1,complete:1})v[u](d[u]);p=bX(bS,d,c,v);if(!p)w(-1,"No Transport");else{v.readyState=1,t&&g.trigger("ajaxSend",[v,d]),d.async&&d.timeout>0&&(q=setTimeout(function(){v.abort("timeout")},d.timeout));try{s=1,p.send(l,w)}catch(z){status<2?w(-1,z):f.error(z)}}return v},param:function(a,c){var d=[],e=function(a,b){b=f.isFunction(b)?b():b,d[d.length]=encodeURIComponent(a)+"="+encodeURIComponent(b)};c===b&&(c=f.ajaxSettings.traditional);if(f.isArray(a)||a.jquery&&!f.isPlainObject(a))f.each(a,function(){e(this.name,this.value)});else for(var g in a)bY(g,a[g],c,e);return d.join("&").replace(bB,"+")}}),f.extend({active:0,lastModified:{},etag:{}});var b_=f.now(),ca=/(\=)\?(&|$)|\?\?/i;f.ajaxSetup({jsonp:"callback",jsonpCallback:function(){return f.expando+"_"+b_++}}),f.ajaxPrefilter("json jsonp",function(b,c,d){var e=b.contentType==="application/x-www-form-urlencoded"&&typeof b.data=="string";if(b.dataTypes[0]==="jsonp"||b.jsonp!==!1&&(ca.test(b.url)||e&&ca.test(b.data))){var g,h=b.jsonpCallback=f.isFunction(b.jsonpCallback)?b.jsonpCallback():b.jsonpCallback,i=a[h],j=b.url,k=b.data,l="$1"+h+"$2";b.jsonp!==!1&&(j=j.replace(ca,l),b.url===j&&(e&&(k=k.replace(ca,l)),b.data===k&&(j+=(/\?/.test(j)?"&":"?")+b.jsonp+"="+h))),b.url=j,b.data=k,a[h]=function(a){g=[a]},d.always(function(){a[h]=i,g&&f.isFunction(i)&&a[h](g[0])}),b.converters["script json"]=function(){g||f.error(h+" was not called");return g[0]},b.dataTypes[0]="json";return"script"}}),f.ajaxSetup({accepts:{script:"text/javascript, application/javascript, application/ecmascript, application/x-ecmascript"},contents:{script:/javascript|ecmascript/},converters:{"text script":function(a){f.globalEval(a);return a}}}),f.ajaxPrefilter("script",function(a){a.cache===b&&(a.cache=!1),a.crossDomain&&(a.type="GET",a.global=!1)}),f.ajaxTransport("script",function(a){if(a.crossDomain){var d,e=c.head||c.getElementsByTagName("head")[0]||c.documentElement;return{send:function(f,g){d=c.createElement("script"),d.async="async",a.scriptCharset&&(d.charset=a.scriptCharset),d.src=a.url,d.onload=d.onreadystatechange=function(a,c){if(c||!d.readyState||/loaded|complete/.test(d.readyState))d.onload=d.onreadystatechange=null,e&&d.parentNode&&e.removeChild(d),d=b,c||g(200,"success")},e.insertBefore(d,e.firstChild)},abort:function(){d&&d.onload(0,1)}}}});var cb=a.ActiveXObject?function(){for(var a in cd)cd[a](0,1)}:!1,cc=0,cd;f.ajaxSettings.xhr=a.ActiveXObject?function(){return!this.isLocal&&ce()||cf()}:ce,function(a){f.extend(f.support,{ajax:!!a,cors:!!a&&"withCredentials"in a})}(f.ajaxSettings.xhr()),f.support.ajax&&f.ajaxTransport(function(c){if(!c.crossDomain||f.support.cors){var d;return{send:function(e,g){var h=c.xhr(),i,j;c.username?h.open(c.type,c.url,c.async,c.username,c.password):h.open(c.type,c.url,c.async);if(c.xhrFields)for(j in c.xhrFields)h[j]=c.xhrFields[j];c.mimeType&&h.overrideMimeType&&h.overrideMimeType(c.mimeType),!c.crossDomain&&!e["X-Requested-With"]&&(e["X-Requested-With"]="XMLHttpRequest");try{for(j in e)h.setRequestHeader(j,e[j])}catch(k){}h.send(c.hasContent&&c.data||null),d=function(a,e){var j,k,l,m,n;try{if(d&&(e||h.readyState===4)){d=b,i&&(h.onreadystatechange=f.noop,cb&&delete cd[i]);if(e)h.readyState!==4&&h.abort();else{j=h.status,l=h.getAllResponseHeaders(),m={},n=h.responseXML,n&&n.documentElement&&(m.xml=n),m.text=h.responseText;try{k=h.statusText}catch(o){k=""}!j&&c.isLocal&&!c.crossDomain?j=m.text?200:404:j===1223&&(j=204)}}}catch(p){e||g(-1,p)}m&&g(j,k,m,l)},!c.async||h.readyState===4?d():(i=++cc,cb&&(cd||(cd={},f(a).unload(cb)),cd[i]=d),h.onreadystatechange=d)},abort:function(){d&&d(0,1)}}}});var cg={},ch,ci,cj=/^(?:toggle|show|hide)$/,ck=/^([+\-]=)?([\d+.\-]+)([a-z%]*)$/i,cl,cm=[["height","marginTop","marginBottom","paddingTop","paddingBottom"],["width","marginLeft","marginRight","paddingLeft","paddingRight"],["opacity"]],cn,co=a.webkitRequestAnimationFrame||a.mozRequestAnimationFrame||a.oRequestAnimationFrame;f.fn.extend({show:function(a,b,c){var d,e;if(a||a===0)return this.animate(cr("show",3),a,b,c);for(var g=0,h=this.length;g<h;g++)d=this[g],d.style&&(e=d.style.display,!f._data(d,"olddisplay")&&e==="none"&&(e=d.style.display=""),e===""&&f.css(d,"display")==="none"&&f._data(d,"olddisplay",cs(d.nodeName)));for(g=0;g<h;g++){d=this[g];if(d.style){e=d.style.display;if(e===""||e==="none")d.style.display=f._data(d,"olddisplay")||""}}return this},hide:function(a,b,c){if(a||a===0)return this.animate(cr("hide",3),a,b,c);for(var d=0,e=this.length;d<e;d++)if(this[d].style){var g=f.css(this[d],"display");g!=="none"&&!f._data(this[d],"olddisplay")&&f._data(this[d],"olddisplay",g)}for(d=0;d<e;d++)this[d].style&&(this[d].style.display="none");return this},_toggle:f.fn.toggle,toggle:function(a,b,c){var d=typeof a=="boolean";f.isFunction(a)&&f.isFunction(b)?this._toggle.apply(this,arguments):a==null||d?this.each(function(){var b=d?a:f(this).is(":hidden");f(this)[b?"show":"hide"]()}):this.animate(cr("toggle",3),a,b,c);return this},fadeTo:function(a,b,c,d){return this.filter(":hidden").css("opacity",0).show().end().animate({opacity:b},a,c,d)},animate:function(a,b,c,d){var e=f.speed(b,c,d);if(f.isEmptyObject(a))return this.each(e.complete,[!1]);a=f.extend({},a);return this[e.queue===!1?"each":"queue"](function(){e.queue===!1&&f._mark(this);var b=f.extend({},e),c=this.nodeType===1,d=c&&f(this).is(":hidden"),g,h,i,j,k,l,m,n,o;b.animatedProperties={};for(i in a){g=f.camelCase(i),i!==g&&(a[g]=a[i],delete a[i]),h=a[g],f.isArray(h)?(b.animatedProperties[g]=h[1],h=a[g]=h[0]):b.animatedProperties[g]=b.specialEasing&&b.specialEasing[g]||b.easing||"swing";if(h==="hide"&&d||h==="show"&&!d)return b.complete.call(this);c&&(g==="height"||g==="width")&&(b.overflow=[this.style.overflow,this.style.overflowX,this.style.overflowY],f.css(this,"display")==="inline"&&f.css(this,"float")==="none"&&(f.support.inlineBlockNeedsLayout?(j=cs(this.nodeName),j==="inline"?this.style.display="inline-block":(this.style.display="inline",this.style.zoom=1)):this.style.display="inline-block"))}b.overflow!=null&&(this.style.overflow="hidden");for(i in a)k=new f.fx(this,b,i),h=a[i],cj.test(h)?k[h==="toggle"?d?"show":"hide":h]():(l=ck.exec(h),m=k.cur(),l?(n=parseFloat(l[2]),o=l[3]||(f.cssNumber[i]?"":"px"),o!=="px"&&(f.style(this,i,(n||1)+o),m=(n||1)/k.cur()*m,f.style(this,i,m+o)),l[1]&&(n=(l[1]==="-="?-1:1)*n+m),k.custom(m,n,o)):k.custom(m,h,""));return!0})},stop:function(a,b){a&&this.queue([]),this.each(function(){var a=f.timers,c=a.length;b||f._unmark(!0,this);while(c--)a[c].elem===this&&(b&&a[c](!0),a.splice(c,1))}),b||this.dequeue();return this}}),f.each({slideDown:cr("show",1),slideUp:cr("hide",1),slideToggle:cr("toggle",1),fadeIn:{opacity:"show"},fadeOut:{opacity:"hide"},fadeToggle:{opacity:"toggle"}},function(a,b){f.fn[a]=function(a,c,d){return this.animate(b,a,c,d)}}),f.extend({speed:function(a,b,c){var d=a&&typeof a=="object"?f.extend({},a):{complete:c||!c&&b||f.isFunction(a)&&a,duration:a,easing:c&&b||b&&!f.isFunction(b)&&b};d.duration=f.fx.off?0:typeof d.duration=="number"?d.duration:d.duration in f.fx.speeds?f.fx.speeds[d.duration]:f.fx.speeds._default,d.old=d.complete,d.complete=function(a){f.isFunction(d.old)&&d.old.call(this),d.queue!==!1?f.dequeue(this):a!==!1&&f._unmark(this)};return d},easing:{linear:function(a,b,c,d){return c+d*a},swing:function(a,b,c,d){return(-Math.cos(a*Math.PI)/2+.5)*d+c}},timers:[],fx:function(a,b,c){this.options=b,this.elem=a,this.prop=c,b.orig=b.orig||{}}}),f.fx.prototype={update:function(){this.options.step&&this.options.step.call(this.elem,this.now,this),(f.fx.step[this.prop]||f.fx.step._default)(this)},cur:function(){if(this.elem[this.prop]!=null&&(!this.elem.style||this.elem.style[this.prop]==null))return this.elem[this.prop];var a,b=f.css(this.elem,this.prop);return isNaN(a=parseFloat(b))?!b||b==="auto"?0:b:a},custom:function(a,b,c){function h(a){return d.step(a)}var d=this,e=f.fx,g;this.startTime=cn||cp(),this.start=a,this.end=b,this.unit=c||this.unit||(f.cssNumber[this.prop]?"":"px"),this.now=this.start,this.pos=this.state=0,h.elem=this.elem,h()&&f.timers.push(h)&&!cl&&(co?(cl=!0,g=function(){cl&&(co(g),e.tick())},co(g)):cl=setInterval(e.tick,e.interval))},show:function(){this.options.orig[this.prop]=f.style(this.elem,this.prop),this.options.show=!0,this.custom(this.prop==="width"||this.prop==="height"?1:0,this.cur()),f(this.elem).show()},hide:function(){this.options.orig[this.prop]=f.style(this.elem,this.prop),this.options.hide=!0,this.custom(this.cur(),0)},step:function(a){var b=cn||cp(),c=!0,d=this.elem,e=this.options,g,h;if(a||b>=e.duration+this.startTime){this.now=this.end,this.pos=this.state=1,this.update(),e.animatedProperties[this.prop]=!0;for(g in e.animatedProperties)e.animatedProperties[g]!==!0&&(c=!1);if(c){e.overflow!=null&&!f.support.shrinkWrapBlocks&&f.each(["","X","Y"],function(a,b){d.style["overflow"+b]=e.overflow[a]}),e.hide&&f(d).hide();if(e.hide||e.show)for(var i in e.animatedProperties)f.style(d,i,e.orig[i]);e.complete.call(d)}return!1}e.duration==Infinity?this.now=b:(h=b-this.startTime,this.state=h/e.duration,this.pos=f.easing[e.animatedProperties[this.prop]](this.state,h,0,1,e.duration),this.now=this.start+(this.end-this.start)*this.pos),this.update();return!0}},f.extend(f.fx,{tick:function(){for(var a=f.timers,b=0;b<a.length;++b)a[b]()||a.splice(b--,1);a.length||f.fx.stop()},interval:13,stop:function(){clearInterval(cl),cl=null},speeds:{slow:600,fast:200,_default:400},step:{opacity:function(a){f.style(a.elem,"opacity",a.now)},_default:function(a){a.elem.style&&a.elem.style[a.prop]!=null?a.elem.style[a.prop]=(a.prop==="width"||a.prop==="height"?Math.max(0,a.now):a.now)+a.unit:a.elem[a.prop]=a.now}}}),f.expr&&f.expr.filters&&(f.expr.filters.animated=function(a){return f.grep(f.timers,function(b){return a===b.elem}).length});var ct=/^t(?:able|d|h)$/i,cu=/^(?:body|html)$/i;"getBoundingClientRect"in c.documentElement?f.fn.offset=function(a){var b=this[0],c;if(a)return this.each(function(b){f.offset.setOffset(this,a,b)});if(!b||!b.ownerDocument)return null;if(b===b.ownerDocument.body)return f.offset.bodyOffset(b);try{c=b.getBoundingClientRect()}catch(d){}var e=b.ownerDocument,g=e.documentElement;if(!c||!f.contains(g,b))return c?{top:c.top,left:c.left}:{top:0,left:0};var h=e.body,i=cv(e),j=g.clientTop||h.clientTop||0,k=g.clientLeft||h.clientLeft||0,l=i.pageYOffset||f.support.boxModel&&g.scrollTop||h.scrollTop,m=i.pageXOffset||f.support.boxModel&&g.scrollLeft||h.scrollLeft,n=c.top+l-j,o=c.left+m-k;return{top:n,left:o}}:f.fn.offset=function(a){var b=this[0];if(a)return this.each(function(b){f.offset.setOffset(this,a,b)});if(!b||!b.ownerDocument)return null;if(b===b.ownerDocument.body)return f.offset.bodyOffset(b);f.offset.initialize();var c,d=b.offsetParent,e=b,g=b.ownerDocument,h=g.documentElement,i=g.body,j=g.defaultView,k=j?j.getComputedStyle(b,null):b.currentStyle,l=b.offsetTop,m=b.offsetLeft;while((b=b.parentNode)&&b!==i&&b!==h){if(f.offset.supportsFixedPosition&&k.position==="fixed")break;c=j?j.getComputedStyle(b,null):b.currentStyle,l-=b.scrollTop,m-=b.scrollLeft,b===d&&(l+=b.offsetTop,m+=b.offsetLeft,f.offset.doesNotAddBorder&&(!f.offset.doesAddBorderForTableAndCells||!ct.test(b.nodeName))&&(l+=parseFloat(c.borderTopWidth)||0,m+=parseFloat(c.borderLeftWidth)||0),e=d,d=b.offsetParent),f.offset.subtractsBorderForOverflowNotVisible&&c.overflow!=="visible"&&(l+=parseFloat(c.borderTopWidth)||0,m+=parseFloat(c.borderLeftWidth)||0),k=c}if(k.position==="relative"||k.position==="static")l+=i.offsetTop,m+=i.offsetLeft;f.offset.supportsFixedPosition&&k.position==="fixed"&&(l+=Math.max(h.scrollTop,i.scrollTop),m+=Math.max(h.scrollLeft,i.scrollLeft));return{top:l,left:m}},f.offset={initialize:function(){var a=c.body,b=c.createElement("div"),d,e,g,h,i=parseFloat(f.css(a,"marginTop"))||0,j="<div style='position:absolute;top:0;left:0;margin:0;border:5px solid #000;padding:0;width:1px;height:1px;'><div></div></div><table style='position:absolute;top:0;left:0;margin:0;border:5px solid #000;padding:0;width:1px;height:1px;' cellpadding='0' cellspacing='0'><tr><td></td></tr></table>";f.extend(b.style,{position:"absolute",top:0,left:0,margin:0,border:0,width:"1px",height:"1px",visibility:"hidden"}),b.innerHTML=j,a.insertBefore(b,a.firstChild),d=b.firstChild,e=d.firstChild,h=d.nextSibling.firstChild.firstChild,this.doesNotAddBorder=e.offsetTop!==5,this.doesAddBorderForTableAndCells=h.offsetTop===5,e.style.position="fixed",e.style.top="20px",this.supportsFixedPosition=e.offsetTop===20||e.offsetTop===15,e.style.position=e.style.top="",d.style.overflow="hidden",d.style.position="relative",this.subtractsBorderForOverflowNotVisible=e.offsetTop===-5,this.doesNotIncludeMarginInBodyOffset=a.offsetTop!==i,a.removeChild(b),f.offset.initialize=f.noop},bodyOffset:function(a){var b=a.offsetTop,c=a.offsetLeft;f.offset.initialize(),f.offset.doesNotIncludeMarginInBodyOffset&&(b+=parseFloat(f.css(a,"marginTop"))||0,c+=parseFloat(f.css(a,"marginLeft"))||0);return{top:b,left:c}},setOffset:function(a,b,c){var d=f.css(a,"position");d==="static"&&(a.style.position="relative");var e=f(a),g=e.offset(),h=f.css(a,"top"),i=f.css(a,"left"),j=(d==="absolute"||d==="fixed")&&f.inArray("auto",[h,i])>-1,k={},l={},m,n;j?(l=e.position(),m=l.top,n=l.left):(m=parseFloat(h)||0,n=parseFloat(i)||0),f.isFunction(b)&&(b=b.call(a,c,g)),b.top!=null&&(k.top=b.top-g.top+m),b.left!=null&&(k.left=b.left-g.left+n),"using"in b?b.using.call(a,k):e.css(k)}},f.fn.extend({position:function(){if(!this[0])return null;var a=this[0],b=this.offsetParent(),c=this.offset(),d=cu.test(b[0].nodeName)?{top:0,left:0}:b.offset();c.top-=parseFloat(f.css(a,"marginTop"))||0,c.left-=parseFloat(f.css(a,"marginLeft"))||0,d.top+=parseFloat(f.css(b[0],"borderTopWidth"))||0,d.left+=parseFloat(f.css(b[0],"borderLeftWidth"))||0;return{top:c.top-d.top,left:c.left-d.left}},offsetParent:function(){return this.map(function(){var a=this.offsetParent||c.body;while(a&&!cu.test(a.nodeName)&&f.css(a,"position")==="static")a=a.offsetParent;return a})}}),f.each(["Left","Top"],function(a,c){var d="scroll"+c;f.fn[d]=function(c){var e,g;if(c===b){e=this[0];if(!e)return null;g=cv(e);return g?"pageXOffset"in g?g[a?"pageYOffset":"pageXOffset"]:f.support.boxModel&&g.document.documentElement[d]||g.document.body[d]:e[d]}return this.each(function(){g=cv(this),g?g.scrollTo(a?f(g).scrollLeft():c,a?c:f(g).scrollTop()):this[d]=c})}}),f.each(["Height","Width"],function(a,c){var d=c.toLowerCase();f.fn["inner"+c]=function(){var a=this[0];return a&&a.style?parseFloat(f.css(a,d,"padding")):null},f.fn["outer"+c]=function(a){var b=this[0];return b&&b.style?parseFloat(f.css(b,d,a?"margin":"border")):null},f.fn[d]=function(a){var e=this[0];if(!e)return a==null?null:this;if(f.isFunction(a))return this.each(function(b){var c=f(this);c[d](a.call(this,b,c[d]()))});if(f.isWindow(e)){var g=e.document.documentElement["client"+c];return e.document.compatMode==="CSS1Compat"&&g||e.document.body["client"+c]||g}if(e.nodeType===9)return Math.max(e.documentElement["client"+c],e.body["scroll"+c],e.documentElement["scroll"+c],e.body["offset"+c],e.documentElement["offset"+c]);if(a===b){var h=f.css(e,d),i=parseFloat(h);return f.isNaN(i)?h:i}return this.css(d,typeof a=="string"?a:a+"px")}}),a.jQuery=a.$=f})(window);
\ No newline at end of file
diff --git a/examples/resources/jquery.snippet.min.css b/examples/resources/jquery.snippet.min.css
new file mode 100755
index 000000000..fec562a4d
--- /dev/null
+++ b/examples/resources/jquery.snippet.min.css
@@ -0,0 +1,40 @@
+.sh_acid .sh_sourceCode{background-color:#eee;color:#000;font-weight:400;font-style:normal;}.sh_acid .sh_sourceCode .sh_type{color:#8080c0;font-weight:700;font-style:normal;}.sh_acid .sh_sourceCode .sh_comment{color:#ff8000;font-weight:400;font-style:normal;}.sh_acid .sh_sourceCode .sh_number{color:purple;font-weight:700;font-style:normal;}.sh_acid .sh_sourceCode .sh_preproc{color:#0080c0;font-weight:700;font-style:normal;}.sh_acid .sh_sourceCode .sh_function{color:#046;font-weight:400;font-style:normal;}.sh_berries-dark .sh_sourceCode{background-color:#80bfff;color:#400080;font-weight:400;font-style:normal;}.sh_berries-dark .sh_sourceCode .sh_type{color:#3f2bf0;font-weight:400;font-style:normal;}.sh_berries-dark .sh_sourceCode .sh_comment{color:#df0959;font-weight:400;font-style:italic;}.sh_berries-light .sh_sourceCode{background-color:#d7ffff;color:#47406d;font-weight:400;font-style:normal;}.sh_berries-light .sh_sourceCode .sh_type{color:#8b51c0;font-weight:400;font-style:normal;}.sh_berries-light .sh_sourceCode .sh_comment{color:#9c3caf;font-weight:400;font-style:italic;}.sh_bipolar .sh_sourceCode{background-color:#000;color:#d149a6;font-weight:400;font-style:normal;}.sh_bipolar .sh_sourceCode .sh_type{color:#aadd8b;font-weight:700;font-style:normal;}.sh_bipolar .sh_sourceCode .sh_comment{color:#35d6e5;font-weight:400;font-style:italic;}.sh_bipolar .sh_sourceCode .sh_preproc{color:#07f6bf;font-weight:400;font-style:normal;}.sh_bipolar .sh_sourceCode .sh_function{color:#d51993;font-weight:700;font-style:normal;}.sh_blacknblue .sh_sourceCode{background-color:#000;color:#2346d5;font-weight:400;font-style:normal;}.sh_blacknblue .sh_sourceCode .sh_type{color:#c06cf8;font-weight:700;font-style:normal;}.sh_blacknblue .sh_sourceCode .sh_comment{color:#6fb2c4;font-weight:400;font-style:italic;}.sh_blacknblue .sh_sourceCode .sh_number{color:#c4ac60;font-weight:400;font-style:normal;}.sh_blacknblue .sh_sourceCode .sh_preproc{color:#8080ff;font-weight:400;font-style:normal;}.sh_blacknblue .sh_sourceCode .sh_function{color:#1c96ed;font-weight:400;font-style:normal;}.sh_bright .sh_sourceCode{background-color:#fff;color:#401e7a;font-weight:400;font-style:normal;}.sh_bright .sh_sourceCode .sh_type{color:#f7b92c;font-weight:400;font-style:normal;}.sh_bright .sh_sourceCode .sh_comment{color:#38ad24;font-weight:400;font-style:normal;}.sh_bright .sh_sourceCode .sh_number{color:#32ba06;font-weight:400;font-style:normal;}.sh_bright .sh_sourceCode .sh_preproc{color:#5374b0;font-weight:400;font-style:normal;}.sh_bright .sh_sourceCode .sh_function{color:#d11ced;font-weight:400;font-style:normal;}.sh_contrast .sh_sourceCode{background-color:#ed6104;color:#00f;font-weight:400;font-style:normal;}.sh_contrast .sh_sourceCode .sh_number{color:#971ad8;font-weight:400;font-style:normal;}.sh_contrast .sh_sourceCode .sh_preproc{color:#7b44e0;font-weight:400;font-style:normal;}.sh_contrast .sh_sourceCode .sh_function{color:#fff700;font-weight:700;font-style:normal;}.sh_darkblue .sh_sourceCode{background-color:#000040;color:#C7C7C7;font-weight:400;font-style:normal;}.sh_darkblue .sh_sourceCode .sh_type{color:#60ff60;font-weight:400;font-style:normal;}.sh_darkblue .sh_sourceCode .sh_comment{color:#80a0ff;font-weight:400;font-style:normal;}.sh_darkblue .sh_sourceCode .sh_number{color:#42cad9;font-weight:400;font-style:normal;}.sh_darkblue .sh_sourceCode .sh_preproc{color:#ff80ff;font-weight:400;font-style:normal;}.sh_darkness .sh_sourceCode .sh_number{color:#619de7;font-weight:400;font-style:normal;}.sh_darkness .sh_sourceCode .sh_preproc{color:#1da3cf;font-weight:400;font-style:normal;}.sh_darkness .sh_sourceCode .sh_function{color:#f34627;font-weight:400;font-style:normal;}.sh_desert .sh_sourceCode{background-color:#af947e;color:#fffdec;font-weight:400;font-style:normal;}.sh_desert .sh_sourceCode .sh_type{color:#fef8bc;font-weight:400;font-style:normal;}.sh_desert .sh_sourceCode .sh_comment{color:#a00000;font-weight:400;font-style:italic;}.sh_desert .sh_sourceCode .sh_number{color:#3e3f25;font-weight:400;font-style:normal;}.sh_desert .sh_sourceCode .sh_preproc{color:#833914;font-weight:400;font-style:normal;}.sh_desert .sh_sourceCode .sh_function{color:#f3d266;font-weight:700;font-style:normal;}.sh_dull .sh_sourceCode{background-color:#bfbfbf;color:#656565;font-weight:400;font-style:normal;}.sh_dull .sh_sourceCode .sh_type{color:#3241c6;font-weight:400;font-style:normal;}.sh_dull .sh_sourceCode .sh_comment{color:#d11d20;font-weight:400;font-style:italic;}.sh_dull .sh_sourceCode .sh_number{color:#16930d;font-weight:400;font-style:normal;}.sh_dull .sh_sourceCode .sh_preproc{color:#003;font-weight:400;font-style:normal;}.sh_dull .sh_sourceCode .sh_function{color:#38255c;font-weight:400;font-style:normal;}.sh_easter .sh_sourceCode{background-color:#ffff80;color:#2C7B34;font-weight:400;font-style:normal;}.sh_easter .sh_sourceCode .sh_type{color:#ed0f55;font-weight:700;font-style:normal;}.sh_easter .sh_sourceCode .sh_comment{color:#24c815;font-weight:400;font-style:italic;}.sh_easter .sh_sourceCode .sh_number{color:#e11a70;font-weight:400;font-style:normal;}.sh_easter .sh_sourceCode .sh_preproc{color:#1583b1;font-weight:400;font-style:normal;}.sh_easter .sh_sourceCode .sh_function{color:#1d45d6;font-weight:400;font-style:normal;}.sh_emacs .sh_sourceCode .sh_type{color:#208920;font-weight:400;font-style:normal;}.sh_emacs .sh_sourceCode .sh_comment{color:#ac2020;font-weight:400;font-style:italic;}.sh_golden .sh_sourceCode{background-color:#000;color:#db0;font-weight:400;font-style:normal;}.sh_golden .sh_sourceCode .sh_type{color:#ffed8a;font-weight:400;font-style:normal;}.sh_golden .sh_sourceCode .sh_comment{color:#978345;font-weight:400;font-style:italic;}.sh_golden .sh_sourceCode .sh_preproc{color:#fda;font-weight:400;font-style:normal;}.sh_golden .sh_sourceCode .sh_function{color:#db0;font-weight:700;font-style:normal;}.sh_greenlcd .sh_sourceCode{background-color:#003400;color:#0b0;font-weight:400;font-style:normal;}.sh_greenlcd .sh_sourceCode .sh_type{color:#00ed00;font-weight:400;font-style:normal;}.sh_greenlcd .sh_sourceCode .sh_function{color:#c0ff73;font-weight:400;font-style:normal;}.sh_ide-anjuta .sh_sourceCode .sh_type{color:navy;font-weight:400;font-style:normal;}.sh_ide-anjuta .sh_sourceCode .sh_comment{color:red;font-weight:400;font-style:italic;}.sh_ide-anjuta .sh_sourceCode .sh_preproc{color:#678000;font-weight:400;font-style:normal;}.sh_ide-codewarrior .sh_sourceCode .sh_type{color:#4c73a6;font-weight:400;font-style:normal;}.sh_ide-codewarrior .sh_sourceCode .sh_comment{color:#b30000;font-weight:400;font-style:normal;}.sh_ide-devcpp .sh_sourceCode .sh_comment{color:navy;font-weight:400;font-style:italic;}.sh_ide-eclipse .sh_sourceCode .sh_comment{color:#717ab3;font-weight:400;font-style:normal;}.sh_ide-eclipse .sh_sourceCode .sh_preproc{color:#3f5fbf;font-weight:400;font-style:normal;}.sh_ide-kdev .sh_sourceCode .sh_type{color:#600000;font-weight:400;font-style:normal;}.sh_ide-kdev .sh_sourceCode .sh_comment{color:#bfbfbf;font-weight:400;font-style:italic;}.sh_ide-msvcpp .sh_sourceCode .sh_comment{color:green;font-weight:400;font-style:italic;}.sh_kwrite .sh_sourceCode .sh_type{color:#830000;font-weight:400;font-style:normal;}.sh_kwrite .sh_sourceCode .sh_comment{color:#838183;font-weight:400;font-style:italic;}.sh_kwrite .sh_sourceCode .sh_number{color:#2928ff;font-weight:400;font-style:normal;}.sh_kwrite .sh_sourceCode .sh_preproc{color:#008200;font-weight:400;font-style:normal;}.sh_kwrite .sh_sourceCode .sh_function{color:#010181;font-weight:400;font-style:normal;}.sh_navy .sh_sourceCode{background-color:#000035;color:#008bff;font-weight:400;font-style:normal;}.sh_navy .sh_sourceCode .sh_type{color:#e1e72f;font-weight:400;font-style:normal;}.sh_navy .sh_sourceCode .sh_comment{color:#fb0;font-weight:400;font-style:italic;}.sh_navy .sh_sourceCode .sh_number{color:#f87ff4;font-weight:400;font-style:normal;}.sh_nedit .sh_sourceCode .sh_comment{color:#000;font-weight:400;font-style:italic;}.sh_nedit .sh_sourceCode .sh_preproc{color:#27408b;font-weight:400;font-style:normal;}.sh_night .sh_sourceCode{background-color:#004;color:#d0f;font-weight:400;font-style:normal;}.sh_night .sh_sourceCode .sh_type{color:#f1157c;font-weight:700;font-style:normal;}.sh_night .sh_sourceCode .sh_number{color:#8ee119;font-weight:400;font-style:normal;}.sh_night .sh_sourceCode .sh_preproc{color:#0b0;font-weight:400;font-style:normal;}.sh_night .sh_sourceCode .sh_function{color:#ff06cd;font-weight:700;font-style:normal;}.sh_pablo .sh_sourceCode .sh_type{color:#00c000;font-weight:700;font-style:normal;}.sh_pablo .sh_sourceCode .sh_comment{color:gray;font-weight:400;font-style:normal;}.sh_pablo .sh_sourceCode .sh_function{color:#ff22b9;font-weight:400;font-style:normal;}.sh_peachpuff .sh_sourceCode{background-color:#ffdab9;color:#000;font-weight:400;font-style:normal;}.sh_peachpuff .sh_sourceCode .sh_type{color:#2e8b57;font-weight:700;font-style:normal;}.sh_peachpuff .sh_sourceCode .sh_comment{color:#406090;font-weight:400;font-style:normal;}.sh_peachpuff .sh_sourceCode .sh_preproc{color:#cd00cd;font-weight:400;font-style:normal;}.sh_peachpuff .sh_sourceCode .sh_function{color:#521cc7;font-weight:400;font-style:normal;}.sh_rand01 .sh_sourceCode{background-color:#fff;color:#121b28;font-weight:400;font-style:normal;}.sh_rand01 .sh_sourceCode .sh_type{color:#c42638;font-weight:700;font-style:normal;}.sh_rand01 .sh_sourceCode .sh_number{color:#0da344;font-weight:400;font-style:normal;}.sh_rand01 .sh_sourceCode .sh_preproc{color:#620ac6;font-weight:400;font-style:normal;}.sh_the .sh_sourceCode .sh_type{color:#808;font-weight:400;font-style:normal;}.sh_typical .sh_sourceCode .sh_number{color:#a900a9;font-weight:400;font-style:normal;}.sh_typical .sh_sourceCode .sh_preproc{color:#00b800;font-weight:400;font-style:normal;}.sh_vampire .sh_sourceCode{background-color:#000;color:red;font-weight:400;font-style:normal;}.sh_vampire .sh_sourceCode .sh_type{color:#F35E1E;font-weight:700;font-style:normal;}.sh_vampire .sh_sourceCode .sh_function{color:#7bc710;font-weight:400;font-style:normal;}.sh_whatis .sh_sourceCode{background-color:#000;color:#0f0;font-weight:400;font-style:normal;}.sh_whatis .sh_sourceCode .sh_function{color:#e721d3;font-weight:400;font-style:normal;}.sh_whitengrey .sh_sourceCode{background-color:#fff;color:#696969;font-weight:400;font-style:normal;}.sh_whitengrey .sh_sourceCode .sh_type{color:#696969;font-weight:400;font-style:normal;}.sh_whitengrey .sh_sourceCode .sh_comment{color:#1326a2;font-weight:400;font-style:italic;}.sh_whitengrey .sh_sourceCode .sh_preproc{color:#470000;font-weight:400;font-style:normal;}.sh_zellner .sh_sourceCode .sh_preproc{color:#a020f0;font-weight:400;font-style:normal;}.sh_acid,.sh_berries-dark,.sh_berries-light,.sh_bipolar,.sh_blacknblue,.sh_bright,.sh_contrast,.sh_darkblue,.sh_darkness,.sh_desert,.sh_dull,.sh_easter,.sh_emacs,.sh_golden,.sh_greenlcd,.sh_ide-anjuta,.sh_ide-codewarrior,.sh_ide-devcpp,.sh_ide-eclipse,.sh_ide-kdev,.sh_ide-msvcpp,.sh_kwrite,.sh_matlab,.sh_navy,.sh_nedit,.sh_neon,.sh_night,.sh_pablo,.sh_peachpuff,.sh_print,.sh_rand01,.sh_the,.sh_typical,.sh_vampire,.sh_vim-dark,.sh_vim,.sh_whatis,.sh_whitengrey,.sh_zellner{background:none;border:0 none;margin:0;padding:0;}.sh_acid .sh_sourceCode .sh_keyword,.sh_acid .sh_sourceCode .sh_date,.sh_acid .sh_sourceCode .sh_time,.sh_acid .sh_sourceCode .sh_file,.sh_acid .sh_sourceCode .sh_difflines,.sh_acid .sh_sourceCode .sh_property{color:#bb7977;font-weight:700;font-style:normal;}.sh_acid .sh_sourceCode .sh_string,.sh_acid .sh_sourceCode .sh_regexp,.sh_acid .sh_sourceCode .sh_url,.sh_acid .sh_sourceCode .sh_ip,.sh_acid .sh_sourceCode .sh_name,.sh_acid .sh_sourceCode .sh_newfile,.sh_acid .sh_sourceCode .sh_value{color:#a68500;font-weight:400;font-style:normal;}.sh_acid .sh_sourceCode .sh_specialchar,.sh_acid .sh_sourceCode .sh_oldfile{color:#f0f;font-weight:700;font-style:normal;}.sh_acid .sh_sourceCode .sh_symbol,.sh_acid .sh_sourceCode .sh_cbracket{color:#ff0080;font-weight:700;font-style:normal;}.sh_acid .sh_sourceCode .sh_variable,.sh_acid .sh_sourceCode .sh_selector{color:#0080c0;font-weight:400;font-style:normal;}.sh_berries-dark .sh_sourceCode .sh_keyword,.sh_berries-dark .sh_sourceCode .sh_date,.sh_berries-dark .sh_sourceCode .sh_time,.sh_berries-dark .sh_sourceCode .sh_file,.sh_berries-dark .sh_sourceCode .sh_difflines,.sh_berries-dark .sh_sourceCode .sh_property{color:#3f2bf0;font-weight:700;font-style:normal;}.sh_berries-dark .sh_sourceCode .sh_string,.sh_berries-dark .sh_sourceCode .sh_regexp,.sh_berries-dark .sh_sourceCode .sh_url,.sh_berries-dark .sh_sourceCode .sh_ip,.sh_berries-dark .sh_sourceCode .sh_name,.sh_berries-dark .sh_sourceCode .sh_newfile,.sh_berries-dark .sh_sourceCode .sh_value{color:#c40000;font-weight:400;font-style:normal;}.sh_berries-dark .sh_sourceCode .sh_specialchar,.sh_berries-dark .sh_sourceCode .sh_oldfile{color:#77379a;font-weight:400;font-style:normal;}.sh_berries-dark .sh_sourceCode .sh_number,.sh_berries-light .sh_sourceCode .sh_number{color:#20755a;font-weight:400;font-style:normal;}.sh_berries-dark .sh_sourceCode .sh_preproc,.sh_berries-light .sh_sourceCode .sh_preproc{color:#0628cb;font-weight:400;font-style:normal;}.sh_berries-dark .sh_sourceCode .sh_symbol,.sh_berries-dark .sh_sourceCode .sh_cbracket,.sh_contrast .sh_sourceCode .sh_comment,.sh_emacs .sh_sourceCode .sh_number,.sh_emacs .sh_sourceCode .sh_preproc,.sh_emacs .sh_sourceCode .sh_function,.sh_ide-anjuta .sh_sourceCode .sh_function,.sh_ide-codewarrior .sh_sourceCode .sh_number,.sh_ide-codewarrior .sh_sourceCode .sh_function,.sh_ide-devcpp .sh_sourceCode .sh_type,.sh_ide-devcpp .sh_sourceCode .sh_function,.sh_ide-eclipse .sh_sourceCode .sh_number,.sh_ide-eclipse .sh_sourceCode .sh_function,.sh_ide-kdev .sh_sourceCode .sh_function,.sh_ide-msvcpp .sh_sourceCode .sh_string,.sh_ide-msvcpp .sh_sourceCode .sh_regexp,.sh_ide-msvcpp .sh_sourceCode .sh_specialchar,.sh_ide-msvcpp .sh_sourceCode .sh_number,.sh_ide-msvcpp .sh_sourceCode .sh_function,.sh_ide-msvcpp .sh_sourceCode .sh_url,.sh_ide-msvcpp .sh_sourceCode .sh_ip,.sh_ide-msvcpp .sh_sourceCode .sh_name,.sh_ide-msvcpp .sh_sourceCode .sh_oldfile,.sh_ide-msvcpp .sh_sourceCode .sh_newfile,.sh_ide-msvcpp .sh_sourceCode .sh_value,.sh_matlab .sh_sourceCode .sh_type,.sh_matlab .sh_sourceCode .sh_specialchar,.sh_matlab .sh_sourceCode .sh_number,.sh_matlab .sh_sourceCode .sh_function,.sh_matlab .sh_sourceCode .sh_oldfile,.sh_nedit .sh_sourceCode .sh_function,.sh_print .sh_sourceCode .sh_string,.sh_print .sh_sourceCode .sh_regexp,.sh_print .sh_sourceCode .sh_specialchar,.sh_print .sh_sourceCode .sh_number,.sh_print .sh_sourceCode .sh_url,.sh_print .sh_sourceCode .sh_ip,.sh_print .sh_sourceCode .sh_name,.sh_print .sh_sourceCode .sh_oldfile,.sh_print .sh_sourceCode .sh_newfile,.sh_print .sh_sourceCode .sh_value,.sh_the .sh_sourceCode .sh_specialchar,.sh_the .sh_sourceCode .sh_function,.sh_the .sh_sourceCode .sh_oldfile,.sh_vim .sh_sourceCode .sh_function,.sh_whitengrey .sh_sourceCode .sh_function{color:#000;font-weight:400;font-style:normal;}.sh_berries-dark .sh_sourceCode .sh_function,.sh_berries-light .sh_sourceCode .sh_function{color:#901164;font-weight:700;font-style:normal;}.sh_berries-dark .sh_sourceCode .sh_variable,.sh_berries-dark .sh_sourceCode .sh_selector{color:#a91ea7;font-weight:400;font-style:normal;}.sh_berries-light .sh_sourceCode .sh_keyword,.sh_berries-light .sh_sourceCode .sh_date,.sh_berries-light .sh_sourceCode .sh_time,.sh_berries-light .sh_sourceCode .sh_file,.sh_berries-light .sh_sourceCode .sh_difflines,.sh_berries-light .sh_sourceCode .sh_property{color:#2cae1e;font-weight:700;font-style:normal;}.sh_berries-light .sh_sourceCode .sh_string,.sh_berries-light .sh_sourceCode .sh_regexp,.sh_berries-light .sh_sourceCode .sh_specialchar,.sh_berries-light .sh_sourceCode .sh_url,.sh_berries-light .sh_sourceCode .sh_ip,.sh_berries-light .sh_sourceCode .sh_name,.sh_berries-light .sh_sourceCode .sh_oldfile,.sh_berries-light .sh_sourceCode .sh_newfile,.sh_berries-light .sh_sourceCode .sh_value{color:#5f81b3;font-weight:400;font-style:normal;}.sh_berries-light .sh_sourceCode .sh_symbol,.sh_berries-light .sh_sourceCode .sh_cbracket{color:#d2073b;font-weight:400;font-style:normal;}.sh_berries-light .sh_sourceCode .sh_variable,.sh_berries-light .sh_sourceCode .sh_selector{color:#0628cb;font-weight:700;font-style:normal;}.sh_bipolar .sh_sourceCode .sh_keyword,.sh_bipolar .sh_sourceCode .sh_date,.sh_bipolar .sh_sourceCode .sh_time,.sh_bipolar .sh_sourceCode .sh_file,.sh_bipolar .sh_sourceCode .sh_difflines,.sh_bipolar .sh_sourceCode .sh_property{color:#ee85e2;font-weight:700;font-style:normal;}.sh_bipolar .sh_sourceCode .sh_string,.sh_bipolar .sh_sourceCode .sh_regexp,.sh_bipolar .sh_sourceCode .sh_specialchar,.sh_bipolar .sh_sourceCode .sh_url,.sh_bipolar .sh_sourceCode .sh_ip,.sh_bipolar .sh_sourceCode .sh_name,.sh_bipolar .sh_sourceCode .sh_oldfile,.sh_bipolar .sh_sourceCode .sh_newfile,.sh_bipolar .sh_sourceCode .sh_value{color:#9ef457;font-weight:400;font-style:normal;}.sh_bipolar .sh_sourceCode .sh_number,.sh_golden .sh_sourceCode .sh_number,.sh_greenlcd .sh_sourceCode .sh_number,.sh_navy .sh_sourceCode .sh_string,.sh_navy .sh_sourceCode .sh_regexp,.sh_navy .sh_sourceCode .sh_specialchar,.sh_navy .sh_sourceCode .sh_symbol,.sh_navy .sh_sourceCode .sh_function,.sh_navy .sh_sourceCode .sh_cbracket,.sh_navy .sh_sourceCode .sh_url,.sh_navy .sh_sourceCode .sh_ip,.sh_navy .sh_sourceCode .sh_name,.sh_navy .sh_sourceCode .sh_oldfile,.sh_navy .sh_sourceCode .sh_newfile,.sh_navy .sh_sourceCode .sh_value,.sh_night .sh_sourceCode .sh_string,.sh_night .sh_sourceCode .sh_regexp,.sh_night .sh_sourceCode .sh_url,.sh_night .sh_sourceCode .sh_ip,.sh_night .sh_sourceCode .sh_name,.sh_night .sh_sourceCode .sh_newfile,.sh_night .sh_sourceCode .sh_value,.sh_vampire .sh_sourceCode .sh_specialchar,.sh_vampire .sh_sourceCode .sh_variable,.sh_vampire .sh_sourceCode .sh_oldfile,.sh_vampire .sh_sourceCode .sh_selector,.sh_vim-dark .sh_sourceCode .sh_function{color:#fff;font-weight:400;font-style:normal;}.sh_bipolar .sh_sourceCode .sh_symbol,.sh_bipolar .sh_sourceCode .sh_cbracket{color:#348fef;font-weight:400;font-style:normal;}.sh_bipolar .sh_sourceCode .sh_variable,.sh_bipolar .sh_sourceCode .sh_selector{color:#72d42c;font-weight:700;font-style:normal;}.sh_blacknblue .sh_sourceCode .sh_keyword,.sh_blacknblue .sh_sourceCode .sh_date,.sh_blacknblue .sh_sourceCode .sh_time,.sh_blacknblue .sh_sourceCode .sh_file,.sh_blacknblue .sh_sourceCode .sh_difflines,.sh_blacknblue .sh_sourceCode .sh_property{color:#1ededc;font-weight:700;font-style:normal;}.sh_blacknblue .sh_sourceCode .sh_string,.sh_blacknblue .sh_sourceCode .sh_regexp,.sh_blacknblue .sh_sourceCode .sh_url,.sh_blacknblue .sh_sourceCode .sh_ip,.sh_blacknblue .sh_sourceCode .sh_name,.sh_blacknblue .sh_sourceCode .sh_newfile,.sh_blacknblue .sh_sourceCode .sh_value{color:#cfc631;font-weight:400;font-style:normal;}.sh_blacknblue .sh_sourceCode .sh_specialchar,.sh_blacknblue .sh_sourceCode .sh_symbol,.sh_blacknblue .sh_sourceCode .sh_cbracket,.sh_blacknblue .sh_sourceCode .sh_oldfile{color:#ccc6c6;font-weight:400;font-style:normal;}.sh_blacknblue .sh_sourceCode .sh_variable,.sh_blacknblue .sh_sourceCode .sh_selector{color:#ecea26;font-weight:400;font-style:normal;}.sh_bright .sh_sourceCode .sh_keyword,.sh_bright .sh_sourceCode .sh_date,.sh_bright .sh_sourceCode .sh_time,.sh_bright .sh_sourceCode .sh_file,.sh_bright .sh_sourceCode .sh_difflines,.sh_bright .sh_sourceCode .sh_property{color:#ff3030;font-weight:700;font-style:normal;}.sh_bright .sh_sourceCode .sh_string,.sh_bright .sh_sourceCode .sh_regexp,.sh_bright .sh_sourceCode .sh_specialchar,.sh_bright .sh_sourceCode .sh_url,.sh_bright .sh_sourceCode .sh_ip,.sh_bright .sh_sourceCode .sh_name,.sh_bright .sh_sourceCode .sh_oldfile,.sh_bright .sh_sourceCode .sh_newfile,.sh_bright .sh_sourceCode .sh_value{color:#1861a7;font-weight:400;font-style:normal;}.sh_bright .sh_sourceCode .sh_symbol,.sh_bright .sh_sourceCode .sh_cbracket{color:#3030ee;font-weight:400;font-style:normal;}.sh_bright .sh_sourceCode .sh_variable,.sh_bright .sh_sourceCode .sh_selector,.sh_emacs .sh_sourceCode .sh_variable,.sh_emacs .sh_sourceCode .sh_selector,.sh_ide-anjuta .sh_sourceCode .sh_variable,.sh_ide-anjuta .sh_sourceCode .sh_selector,.sh_ide-devcpp .sh_sourceCode .sh_number,.sh_ide-eclipse .sh_sourceCode .sh_string,.sh_ide-eclipse .sh_sourceCode .sh_regexp,.sh_ide-eclipse .sh_sourceCode .sh_specialchar,.sh_ide-eclipse .sh_sourceCode .sh_url,.sh_ide-eclipse .sh_sourceCode .sh_ip,.sh_ide-eclipse .sh_sourceCode .sh_name,.sh_ide-eclipse .sh_sourceCode .sh_oldfile,.sh_ide-eclipse .sh_sourceCode .sh_newfile,.sh_ide-eclipse .sh_sourceCode .sh_value,.sh_ide-kdev .sh_sourceCode .sh_number,.sh_ide-msvcpp .sh_sourceCode .sh_type,.sh_ide-msvcpp .sh_sourceCode .sh_preproc,.sh_matlab .sh_sourceCode .sh_keyword,.sh_matlab .sh_sourceCode .sh_date,.sh_matlab .sh_sourceCode .sh_time,.sh_matlab .sh_sourceCode .sh_file,.sh_matlab .sh_sourceCode .sh_variable,.sh_matlab .sh_sourceCode .sh_difflines,.sh_matlab .sh_sourceCode .sh_selector,.sh_matlab .sh_sourceCode .sh_property,.sh_pablo .sh_sourceCode .sh_specialchar,.sh_pablo .sh_sourceCode .sh_oldfile,.sh_the .sh_sourceCode .sh_keyword,.sh_the .sh_sourceCode .sh_date,.sh_the .sh_sourceCode .sh_time,.sh_the .sh_sourceCode .sh_file,.sh_the .sh_sourceCode .sh_variable,.sh_the .sh_sourceCode .sh_difflines,.sh_the .sh_sourceCode .sh_selector,.sh_the .sh_sourceCode .sh_property,.sh_typical .sh_sourceCode .sh_type,.sh_vim-dark .sh_sourceCode .sh_comment,.sh_vim .sh_sourceCode .sh_comment,.sh_zellner .sh_sourceCode .sh_type{color:#00f;font-weight:400;font-style:normal;}.sh_contrast .sh_sourceCode .sh_keyword,.sh_contrast .sh_sourceCode .sh_type,.sh_contrast .sh_sourceCode .sh_date,.sh_contrast .sh_sourceCode .sh_time,.sh_contrast .sh_sourceCode .sh_file,.sh_contrast .sh_sourceCode .sh_difflines,.sh_contrast .sh_sourceCode .sh_property,.sh_darkblue .sh_sourceCode .sh_function,.sh_neon .sh_sourceCode .sh_function,.sh_night .sh_sourceCode .sh_keyword,.sh_night .sh_sourceCode .sh_date,.sh_night .sh_sourceCode .sh_time,.sh_night .sh_sourceCode .sh_file,.sh_night .sh_sourceCode .sh_difflines,.sh_night .sh_sourceCode .sh_property,.sh_vampire .sh_sourceCode .sh_keyword,.sh_vampire .sh_sourceCode .sh_date,.sh_vampire .sh_sourceCode .sh_time,.sh_vampire .sh_sourceCode .sh_file,.sh_vampire .sh_sourceCode .sh_difflines,.sh_vampire .sh_sourceCode .sh_property,.sh_whatis .sh_sourceCode .sh_type{color:#fff;font-weight:700;font-style:normal;}.sh_contrast .sh_sourceCode .sh_string,.sh_contrast .sh_sourceCode .sh_regexp,.sh_contrast .sh_sourceCode .sh_specialchar,.sh_contrast .sh_sourceCode .sh_url,.sh_contrast .sh_sourceCode .sh_ip,.sh_contrast .sh_sourceCode .sh_name,.sh_contrast .sh_sourceCode .sh_oldfile,.sh_contrast .sh_sourceCode .sh_newfile,.sh_contrast .sh_sourceCode .sh_value{color:#11f80c;font-weight:400;font-style:normal;}.sh_contrast .sh_sourceCode .sh_symbol,.sh_contrast .sh_sourceCode .sh_cbracket,.sh_golden .sh_sourceCode .sh_variable,.sh_golden .sh_sourceCode .sh_selector{color:#dedede;font-weight:700;font-style:normal;}.sh_contrast .sh_sourceCode .sh_variable,.sh_contrast .sh_sourceCode .sh_selector{color:#11f80c;font-weight:700;font-style:normal;}.sh_darkblue .sh_sourceCode .sh_keyword,.sh_darkblue .sh_sourceCode .sh_date,.sh_darkblue .sh_sourceCode .sh_time,.sh_darkblue .sh_sourceCode .sh_file,.sh_darkblue .sh_sourceCode .sh_difflines,.sh_darkblue .sh_sourceCode .sh_property{color:#ffff60;font-weight:400;font-style:normal;}.sh_darkblue .sh_sourceCode .sh_string,.sh_darkblue .sh_sourceCode .sh_regexp,.sh_darkblue .sh_sourceCode .sh_url,.sh_darkblue .sh_sourceCode .sh_ip,.sh_darkblue .sh_sourceCode .sh_name,.sh_darkblue .sh_sourceCode .sh_newfile,.sh_darkblue .sh_sourceCode .sh_value{color:#ffa0a0;font-weight:400;font-style:normal;}.sh_darkblue .sh_sourceCode .sh_specialchar,.sh_darkblue .sh_sourceCode .sh_oldfile{color:orange;font-weight:400;font-style:normal;}.sh_darkblue .sh_sourceCode .sh_symbol,.sh_darkblue .sh_sourceCode .sh_cbracket{color:#d8e91b;font-weight:700;font-style:normal;}.sh_darkblue .sh_sourceCode .sh_variable,.sh_darkblue .sh_sourceCode .sh_selector,.sh_darkness .sh_sourceCode .sh_variable,.sh_darkness .sh_sourceCode .sh_selector{color:#26e0e7;font-weight:400;font-style:normal;}.sh_darkness .sh_sourceCode,.sh_neon .sh_sourceCode,.sh_pablo .sh_sourceCode,.sh_vim-dark .sh_sourceCode{background-color:#000;color:#fff;font-weight:400;font-style:normal;}.sh_darkness .sh_sourceCode .sh_keyword,.sh_darkness .sh_sourceCode .sh_date,.sh_darkness .sh_sourceCode .sh_time,.sh_darkness .sh_sourceCode .sh_file,.sh_darkness .sh_sourceCode .sh_difflines,.sh_darkness .sh_sourceCode .sh_property{color:#ff0;font-weight:700;font-style:normal;}.sh_darkness .sh_sourceCode .sh_type,.sh_pablo .sh_sourceCode .sh_preproc,.sh_vim-dark .sh_sourceCode .sh_type,.sh_vim .sh_sourceCode .sh_type{color:#0f0;font-weight:400;font-style:normal;}.sh_darkness .sh_sourceCode .sh_string,.sh_darkness .sh_sourceCode .sh_regexp,.sh_darkness .sh_sourceCode .sh_url,.sh_darkness .sh_sourceCode .sh_ip,.sh_darkness .sh_sourceCode .sh_name,.sh_darkness .sh_sourceCode .sh_newfile,.sh_darkness .sh_sourceCode .sh_value{color:#abab00;font-weight:700;font-style:normal;}.sh_darkness .sh_sourceCode .sh_specialchar,.sh_darkness .sh_sourceCode .sh_oldfile,.sh_greenlcd .sh_sourceCode .sh_preproc,.sh_night .sh_sourceCode .sh_comment,.sh_whatis .sh_sourceCode .sh_preproc{color:#bfbfbf;font-weight:400;font-style:normal;}.sh_darkness .sh_sourceCode .sh_comment,.sh_greenlcd .sh_sourceCode .sh_comment{color:#888;font-weight:400;font-style:italic;}.sh_darkness .sh_sourceCode .sh_symbol,.sh_darkness .sh_sourceCode .sh_cbracket,.sh_kwrite .sh_sourceCode .sh_specialchar,.sh_kwrite .sh_sourceCode .sh_oldfile,.sh_neon .sh_sourceCode .sh_number,.sh_zellner .sh_sourceCode .sh_string,.sh_zellner .sh_sourceCode .sh_regexp,.sh_zellner .sh_sourceCode .sh_specialchar,.sh_zellner .sh_sourceCode .sh_number,.sh_zellner .sh_sourceCode .sh_url,.sh_zellner .sh_sourceCode .sh_ip,.sh_zellner .sh_sourceCode .sh_name,.sh_zellner .sh_sourceCode .sh_oldfile,.sh_zellner .sh_sourceCode .sh_newfile,.sh_zellner .sh_sourceCode .sh_value{color:#f0f;font-weight:400;font-style:normal;}.sh_desert .sh_sourceCode .sh_keyword,.sh_desert .sh_sourceCode .sh_date,.sh_desert .sh_sourceCode .sh_time,.sh_desert .sh_sourceCode .sh_file,.sh_desert .sh_sourceCode .sh_difflines,.sh_desert .sh_sourceCode .sh_property{color:#fef8bc;font-weight:700;font-style:normal;}.sh_desert .sh_sourceCode .sh_string,.sh_desert .sh_sourceCode .sh_regexp,.sh_desert .sh_sourceCode .sh_specialchar,.sh_desert .sh_sourceCode .sh_url,.sh_desert .sh_sourceCode .sh_ip,.sh_desert .sh_sourceCode .sh_name,.sh_desert .sh_sourceCode .sh_oldfile,.sh_desert .sh_sourceCode .sh_newfile,.sh_desert .sh_sourceCode .sh_value{color:#f6f647;font-weight:400;font-style:normal;}.sh_desert .sh_sourceCode .sh_symbol,.sh_desert .sh_sourceCode .sh_cbracket{color:#66574f;font-weight:400;font-style:normal;}.sh_desert .sh_sourceCode .sh_variable,.sh_desert .sh_sourceCode .sh_selector,.sh_ide-devcpp .sh_sourceCode .sh_keyword,.sh_ide-devcpp .sh_sourceCode .sh_date,.sh_ide-devcpp .sh_sourceCode .sh_time,.sh_ide-devcpp .sh_sourceCode .sh_file,.sh_ide-devcpp .sh_sourceCode .sh_variable,.sh_ide-devcpp .sh_sourceCode .sh_difflines,.sh_ide-devcpp .sh_sourceCode .sh_selector,.sh_ide-devcpp .sh_sourceCode .sh_property,.sh_kwrite .sh_sourceCode .sh_keyword,.sh_kwrite .sh_sourceCode .sh_date,.sh_kwrite .sh_sourceCode .sh_time,.sh_kwrite .sh_sourceCode .sh_file,.sh_kwrite .sh_sourceCode .sh_variable,.sh_kwrite .sh_sourceCode .sh_difflines,.sh_kwrite .sh_sourceCode .sh_selector,.sh_kwrite .sh_sourceCode .sh_property,.sh_nedit .sh_sourceCode .sh_keyword,.sh_nedit .sh_sourceCode .sh_symbol,.sh_nedit .sh_sourceCode .sh_cbracket,.sh_nedit .sh_sourceCode .sh_date,.sh_nedit .sh_sourceCode .sh_time,.sh_nedit .sh_sourceCode .sh_file,.sh_nedit .sh_sourceCode .sh_difflines,.sh_nedit .sh_sourceCode .sh_property,.sh_print .sh_sourceCode .sh_keyword,.sh_print .sh_sourceCode .sh_type,.sh_print .sh_sourceCode .sh_preproc,.sh_print .sh_sourceCode .sh_symbol,.sh_print .sh_sourceCode .sh_cbracket,.sh_print .sh_sourceCode .sh_date,.sh_print .sh_sourceCode .sh_time,.sh_print .sh_sourceCode .sh_file,.sh_print .sh_sourceCode .sh_variable,.sh_print .sh_sourceCode .sh_difflines,.sh_print .sh_sourceCode .sh_selector,.sh_print .sh_sourceCode .sh_property,.sh_rand01 .sh_sourceCode .sh_function,.sh_typical .sh_sourceCode .sh_function,.sh_zellner .sh_sourceCode .sh_function{color:#000;font-weight:700;font-style:normal;}.sh_dull .sh_sourceCode .sh_keyword,.sh_dull .sh_sourceCode .sh_date,.sh_dull .sh_sourceCode .sh_time,.sh_dull .sh_sourceCode .sh_file,.sh_dull .sh_sourceCode .sh_difflines,.sh_dull .sh_sourceCode .sh_property{color:#353535;font-weight:700;font-style:normal;}.sh_dull .sh_sourceCode .sh_string,.sh_dull .sh_sourceCode .sh_regexp,.sh_dull .sh_sourceCode .sh_specialchar,.sh_dull .sh_sourceCode .sh_url,.sh_dull .sh_sourceCode .sh_ip,.sh_dull .sh_sourceCode .sh_name,.sh_dull .sh_sourceCode .sh_oldfile,.sh_dull .sh_sourceCode .sh_newfile,.sh_dull .sh_sourceCode .sh_value{color:#059;font-weight:400;font-style:normal;}.sh_dull .sh_sourceCode .sh_symbol,.sh_dull .sh_sourceCode .sh_cbracket{color:#222;font-weight:400;font-style:normal;}.sh_dull .sh_sourceCode .sh_variable,.sh_dull .sh_sourceCode .sh_selector{color:#ae5a16;font-weight:400;font-style:normal;}.sh_easter .sh_sourceCode .sh_keyword,.sh_easter .sh_sourceCode .sh_date,.sh_easter .sh_sourceCode .sh_time,.sh_easter .sh_sourceCode .sh_file,.sh_easter .sh_sourceCode .sh_difflines,.sh_easter .sh_sourceCode .sh_property{color:#1d45d6;font-weight:700;font-style:normal;}.sh_easter .sh_sourceCode .sh_string,.sh_easter .sh_sourceCode .sh_regexp,.sh_easter .sh_sourceCode .sh_specialchar,.sh_easter .sh_sourceCode .sh_url,.sh_easter .sh_sourceCode .sh_ip,.sh_easter .sh_sourceCode .sh_name,.sh_easter .sh_sourceCode .sh_oldfile,.sh_easter .sh_sourceCode .sh_newfile,.sh_easter .sh_sourceCode .sh_value{color:#ca4be3;font-weight:400;font-style:normal;}.sh_easter .sh_sourceCode .sh_symbol,.sh_easter .sh_sourceCode .sh_cbracket{color:#fa4700;font-weight:400;font-style:normal;}.sh_easter .sh_sourceCode .sh_variable,.sh_easter .sh_sourceCode .sh_selector{color:#26aae7;font-weight:700;font-style:normal;}.sh_emacs .sh_sourceCode,.sh_ide-anjuta .sh_sourceCode,.sh_ide-codewarrior .sh_sourceCode,.sh_ide-devcpp .sh_sourceCode,.sh_ide-eclipse .sh_sourceCode,.sh_ide-kdev .sh_sourceCode,.sh_ide-msvcpp .sh_sourceCode,.sh_kwrite .sh_sourceCode,.sh_matlab .sh_sourceCode,.sh_nedit .sh_sourceCode,.sh_print .sh_sourceCode,.sh_the .sh_sourceCode,.sh_typical .sh_sourceCode,.sh_vim .sh_sourceCode,.sh_zellner .sh_sourceCode{background-color:#fff;color:#000;font-weight:400;font-style:normal;}.sh_emacs .sh_sourceCode .sh_keyword,.sh_emacs .sh_sourceCode .sh_date,.sh_emacs .sh_sourceCode .sh_time,.sh_emacs .sh_sourceCode .sh_file,.sh_emacs .sh_sourceCode .sh_difflines,.sh_emacs .sh_sourceCode .sh_property{color:#9c20ee;font-weight:700;font-style:normal;}.sh_emacs .sh_sourceCode .sh_string,.sh_emacs .sh_sourceCode .sh_regexp,.sh_emacs .sh_sourceCode .sh_specialchar,.sh_emacs .sh_sourceCode .sh_url,.sh_emacs .sh_sourceCode .sh_ip,.sh_emacs .sh_sourceCode .sh_name,.sh_emacs .sh_sourceCode .sh_oldfile,.sh_emacs .sh_sourceCode .sh_newfile,.sh_emacs .sh_sourceCode .sh_value{color:#bd8d8b;font-weight:400;font-style:normal;}.sh_golden .sh_sourceCode .sh_keyword,.sh_golden .sh_sourceCode .sh_date,.sh_golden .sh_sourceCode .sh_time,.sh_golden .sh_sourceCode .sh_file,.sh_golden .sh_sourceCode .sh_difflines,.sh_golden .sh_sourceCode .sh_property{color:#ffed8a;font-weight:700;font-style:normal;}.sh_golden .sh_sourceCode .sh_string,.sh_golden .sh_sourceCode .sh_regexp,.sh_golden .sh_sourceCode .sh_specialchar,.sh_golden .sh_sourceCode .sh_url,.sh_golden .sh_sourceCode .sh_ip,.sh_golden .sh_sourceCode .sh_name,.sh_golden .sh_sourceCode .sh_oldfile,.sh_golden .sh_sourceCode .sh_newfile,.sh_golden .sh_sourceCode .sh_value,.sh_ide-devcpp .sh_sourceCode .sh_string,.sh_ide-devcpp .sh_sourceCode .sh_regexp,.sh_ide-devcpp .sh_sourceCode .sh_specialchar,.sh_ide-devcpp .sh_sourceCode .sh_url,.sh_ide-devcpp .sh_sourceCode .sh_ip,.sh_ide-devcpp .sh_sourceCode .sh_name,.sh_ide-devcpp .sh_sourceCode .sh_oldfile,.sh_ide-devcpp .sh_sourceCode .sh_newfile,.sh_ide-devcpp .sh_sourceCode .sh_value,.sh_ide-kdev .sh_sourceCode .sh_string,.sh_ide-kdev .sh_sourceCode .sh_regexp,.sh_ide-kdev .sh_sourceCode .sh_specialchar,.sh_ide-kdev .sh_sourceCode .sh_url,.sh_ide-kdev .sh_sourceCode .sh_ip,.sh_ide-kdev .sh_sourceCode .sh_name,.sh_ide-kdev .sh_sourceCode .sh_oldfile,.sh_ide-kdev .sh_sourceCode .sh_newfile,.sh_ide-kdev .sh_sourceCode .sh_value,.sh_kwrite .sh_sourceCode .sh_string,.sh_kwrite .sh_sourceCode .sh_regexp,.sh_kwrite .sh_sourceCode .sh_url,.sh_kwrite .sh_sourceCode .sh_ip,.sh_kwrite .sh_sourceCode .sh_name,.sh_kwrite .sh_sourceCode .sh_newfile,.sh_kwrite .sh_sourceCode .sh_value,.sh_pablo .sh_sourceCode .sh_symbol,.sh_pablo .sh_sourceCode .sh_cbracket,.sh_the .sh_sourceCode .sh_number,.sh_the .sh_sourceCode .sh_preproc,.sh_typical .sh_sourceCode .sh_string,.sh_typical .sh_sourceCode .sh_regexp,.sh_typical .sh_sourceCode .sh_symbol,.sh_typical .sh_sourceCode .sh_cbracket,.sh_typical .sh_sourceCode .sh_url,.sh_typical .sh_sourceCode .sh_ip,.sh_typical .sh_sourceCode .sh_name,.sh_typical .sh_sourceCode .sh_newfile,.sh_typical .sh_sourceCode .sh_value,.sh_vim-dark .sh_sourceCode .sh_string,.sh_vim-dark .sh_sourceCode .sh_regexp,.sh_vim-dark .sh_sourceCode .sh_number,.sh_vim-dark .sh_sourceCode .sh_url,.sh_vim-dark .sh_sourceCode .sh_ip,.sh_vim-dark .sh_sourceCode .sh_name,.sh_vim-dark .sh_sourceCode .sh_newfile,.sh_vim-dark .sh_sourceCode .sh_value,.sh_vim .sh_sourceCode .sh_string,.sh_vim .sh_sourceCode .sh_regexp,.sh_vim .sh_sourceCode .sh_number,.sh_vim .sh_sourceCode .sh_url,.sh_vim .sh_sourceCode .sh_ip,.sh_vim .sh_sourceCode .sh_name,.sh_vim .sh_sourceCode .sh_newfile,.sh_vim .sh_sourceCode .sh_value,.sh_whatis .sh_sourceCode .sh_comment,.sh_zellner .sh_sourceCode .sh_comment{color:red;font-weight:400;font-style:normal;}.sh_golden .sh_sourceCode .sh_symbol,.sh_golden .sh_sourceCode .sh_cbracket,.sh_vampire .sh_sourceCode .sh_preproc{color:#ababab;font-weight:400;font-style:normal;}.sh_greenlcd .sh_sourceCode .sh_keyword,.sh_greenlcd .sh_sourceCode .sh_date,.sh_greenlcd .sh_sourceCode .sh_time,.sh_greenlcd .sh_sourceCode .sh_file,.sh_greenlcd .sh_sourceCode .sh_difflines,.sh_greenlcd .sh_sourceCode .sh_property{color:#00ed00;font-weight:700;font-style:normal;}.sh_greenlcd .sh_sourceCode .sh_string,.sh_greenlcd .sh_sourceCode .sh_regexp,.sh_greenlcd .sh_sourceCode .sh_specialchar,.sh_greenlcd .sh_sourceCode .sh_url,.sh_greenlcd .sh_sourceCode .sh_ip,.sh_greenlcd .sh_sourceCode .sh_name,.sh_greenlcd .sh_sourceCode .sh_oldfile,.sh_greenlcd .sh_sourceCode .sh_newfile,.sh_greenlcd .sh_sourceCode .sh_value{color:#dfdfdf;font-weight:400;font-style:normal;}.sh_greenlcd .sh_sourceCode .sh_symbol,.sh_greenlcd .sh_sourceCode .sh_cbracket{color:#2fe7a9;font-weight:400;font-style:normal;}.sh_greenlcd .sh_sourceCode .sh_variable,.sh_greenlcd .sh_sourceCode .sh_selector{color:#beef13;font-weight:400;font-style:normal;}.sh_ide-anjuta .sh_sourceCode .sh_keyword,.sh_ide-anjuta .sh_sourceCode .sh_date,.sh_ide-anjuta .sh_sourceCode .sh_time,.sh_ide-anjuta .sh_sourceCode .sh_file,.sh_ide-anjuta .sh_sourceCode .sh_difflines,.sh_ide-anjuta .sh_sourceCode .sh_property{color:navy;font-weight:700;font-style:normal;}.sh_ide-anjuta .sh_sourceCode .sh_string,.sh_ide-anjuta .sh_sourceCode .sh_regexp,.sh_ide-anjuta .sh_sourceCode .sh_specialchar,.sh_ide-anjuta .sh_sourceCode .sh_url,.sh_ide-anjuta .sh_sourceCode .sh_ip,.sh_ide-anjuta .sh_sourceCode .sh_name,.sh_ide-anjuta .sh_sourceCode .sh_oldfile,.sh_ide-anjuta .sh_sourceCode .sh_newfile,.sh_ide-anjuta .sh_sourceCode .sh_value{color:#db0;font-weight:400;font-style:normal;}.sh_ide-anjuta .sh_sourceCode .sh_number,.sh_whitengrey .sh_sourceCode .sh_string,.sh_whitengrey .sh_sourceCode .sh_regexp,.sh_whitengrey .sh_sourceCode .sh_specialchar,.sh_whitengrey .sh_sourceCode .sh_url,.sh_whitengrey .sh_sourceCode .sh_ip,.sh_whitengrey .sh_sourceCode .sh_name,.sh_whitengrey .sh_sourceCode .sh_oldfile,.sh_whitengrey .sh_sourceCode .sh_newfile,.sh_whitengrey .sh_sourceCode .sh_value{color:#080;font-weight:400;font-style:normal;}.sh_ide-codewarrior .sh_sourceCode .sh_keyword,.sh_ide-codewarrior .sh_sourceCode .sh_preproc,.sh_ide-codewarrior .sh_sourceCode .sh_date,.sh_ide-codewarrior .sh_sourceCode .sh_time,.sh_ide-codewarrior .sh_sourceCode .sh_file,.sh_ide-codewarrior .sh_sourceCode .sh_variable,.sh_ide-codewarrior .sh_sourceCode .sh_difflines,.sh_ide-codewarrior .sh_sourceCode .sh_selector,.sh_ide-codewarrior .sh_sourceCode .sh_property{color:#0000b3;font-weight:400;font-style:normal;}.sh_ide-codewarrior .sh_sourceCode .sh_string,.sh_ide-codewarrior .sh_sourceCode .sh_regexp,.sh_ide-codewarrior .sh_sourceCode .sh_specialchar,.sh_ide-codewarrior .sh_sourceCode .sh_url,.sh_ide-codewarrior .sh_sourceCode .sh_ip,.sh_ide-codewarrior .sh_sourceCode .sh_name,.sh_ide-codewarrior .sh_sourceCode .sh_oldfile,.sh_ide-codewarrior .sh_sourceCode .sh_newfile,.sh_ide-codewarrior .sh_sourceCode .sh_value{color:#666;font-weight:400;font-style:normal;}.sh_ide-devcpp .sh_sourceCode .sh_preproc,.sh_ide-kdev .sh_sourceCode .sh_preproc{color:green;font-weight:400;font-style:normal;}.sh_ide-eclipse .sh_sourceCode .sh_keyword,.sh_ide-eclipse .sh_sourceCode .sh_type,.sh_ide-eclipse .sh_sourceCode .sh_date,.sh_ide-eclipse .sh_sourceCode .sh_time,.sh_ide-eclipse .sh_sourceCode .sh_file,.sh_ide-eclipse .sh_sourceCode .sh_variable,.sh_ide-eclipse .sh_sourceCode .sh_difflines,.sh_ide-eclipse .sh_sourceCode .sh_selector,.sh_ide-eclipse .sh_sourceCode .sh_property{color:#7f0055;font-weight:700;font-style:normal;}.sh_ide-kdev .sh_sourceCode .sh_keyword,.sh_ide-kdev .sh_sourceCode .sh_date,.sh_ide-kdev .sh_sourceCode .sh_time,.sh_ide-kdev .sh_sourceCode .sh_file,.sh_ide-kdev .sh_sourceCode .sh_variable,.sh_ide-kdev .sh_sourceCode .sh_difflines,.sh_ide-kdev .sh_sourceCode .sh_selector,.sh_ide-kdev .sh_sourceCode .sh_property{color:#600000;font-weight:700;font-style:normal;}.sh_ide-msvcpp .sh_sourceCode .sh_keyword,.sh_ide-msvcpp .sh_sourceCode .sh_date,.sh_ide-msvcpp .sh_sourceCode .sh_time,.sh_ide-msvcpp .sh_sourceCode .sh_file,.sh_ide-msvcpp .sh_sourceCode .sh_variable,.sh_ide-msvcpp .sh_sourceCode .sh_difflines,.sh_ide-msvcpp .sh_sourceCode .sh_selector,.sh_ide-msvcpp .sh_sourceCode .sh_property,.sh_typical .sh_sourceCode .sh_keyword,.sh_typical .sh_sourceCode .sh_date,.sh_typical .sh_sourceCode .sh_time,.sh_typical .sh_sourceCode .sh_file,.sh_typical .sh_sourceCode .sh_difflines,.sh_typical .sh_sourceCode .sh_property{color:#00f;font-weight:700;font-style:normal;}.sh_matlab .sh_sourceCode .sh_string,.sh_matlab .sh_sourceCode .sh_regexp,.sh_matlab .sh_sourceCode .sh_url,.sh_matlab .sh_sourceCode .sh_ip,.sh_matlab .sh_sourceCode .sh_name,.sh_matlab .sh_sourceCode .sh_newfile,.sh_matlab .sh_sourceCode .sh_value{color:maroon;font-weight:400;font-style:normal;}.sh_navy .sh_sourceCode .sh_keyword,.sh_navy .sh_sourceCode .sh_date,.sh_navy .sh_sourceCode .sh_time,.sh_navy .sh_sourceCode .sh_file,.sh_navy .sh_sourceCode .sh_difflines,.sh_navy .sh_sourceCode .sh_property{color:#f8c50b;font-weight:700;font-style:normal;}.sh_navy .sh_sourceCode .sh_preproc,.sh_vampire .sh_sourceCode .sh_string,.sh_vampire .sh_sourceCode .sh_regexp,.sh_vampire .sh_sourceCode .sh_number,.sh_vampire .sh_sourceCode .sh_url,.sh_vampire .sh_sourceCode .sh_ip,.sh_vampire .sh_sourceCode .sh_name,.sh_vampire .sh_sourceCode .sh_newfile,.sh_vampire .sh_sourceCode .sh_value,.sh_whitengrey .sh_sourceCode .sh_number{color:#b0f;font-weight:400;font-style:normal;}.sh_navy .sh_sourceCode .sh_variable,.sh_navy .sh_sourceCode .sh_selector{color:#13d8ef;font-weight:400;font-style:normal;}.sh_nedit .sh_sourceCode .sh_type,.sh_peachpuff .sh_sourceCode .sh_keyword,.sh_peachpuff .sh_sourceCode .sh_date,.sh_peachpuff .sh_sourceCode .sh_time,.sh_peachpuff .sh_sourceCode .sh_file,.sh_peachpuff .sh_sourceCode .sh_difflines,.sh_peachpuff .sh_sourceCode .sh_property{color:#a52a2a;font-weight:700;font-style:normal;}.sh_nedit .sh_sourceCode .sh_string,.sh_nedit .sh_sourceCode .sh_regexp,.sh_nedit .sh_sourceCode .sh_number,.sh_nedit .sh_sourceCode .sh_url,.sh_nedit .sh_sourceCode .sh_ip,.sh_nedit .sh_sourceCode .sh_name,.sh_nedit .sh_sourceCode .sh_newfile,.sh_nedit .sh_sourceCode .sh_value{color:#006400;font-weight:400;font-style:normal;}.sh_nedit .sh_sourceCode .sh_specialchar,.sh_nedit .sh_sourceCode .sh_oldfile{color:#2e8b57;font-weight:400;font-style:normal;}.sh_nedit .sh_sourceCode .sh_variable,.sh_nedit .sh_sourceCode .sh_selector{color:#dda0dd;font-weight:700;font-style:normal;}.sh_neon .sh_sourceCode .sh_keyword,.sh_neon .sh_sourceCode .sh_date,.sh_neon .sh_sourceCode .sh_time,.sh_neon .sh_sourceCode .sh_file,.sh_neon .sh_sourceCode .sh_difflines,.sh_neon .sh_sourceCode .sh_property{color:#0ff;font-weight:700;font-style:normal;}.sh_neon .sh_sourceCode .sh_type,.sh_whatis .sh_sourceCode .sh_number{color:#ff0;font-weight:400;font-style:normal;}.sh_neon .sh_sourceCode .sh_string,.sh_neon .sh_sourceCode .sh_regexp,.sh_neon .sh_sourceCode .sh_specialchar,.sh_neon .sh_sourceCode .sh_url,.sh_neon .sh_sourceCode .sh_ip,.sh_neon .sh_sourceCode .sh_name,.sh_neon .sh_sourceCode .sh_oldfile,.sh_neon .sh_sourceCode .sh_newfile,.sh_neon .sh_sourceCode .sh_value{color:#cd00ff;font-weight:400;font-style:normal;}.sh_neon .sh_sourceCode .sh_comment,.sh_the .sh_sourceCode .sh_comment{color:#0f0;font-weight:400;font-style:italic;}.sh_neon .sh_sourceCode .sh_preproc,.sh_whatis .sh_sourceCode .sh_string,.sh_whatis .sh_sourceCode .sh_regexp,.sh_whatis .sh_sourceCode .sh_specialchar,.sh_whatis .sh_sourceCode .sh_url,.sh_whatis .sh_sourceCode .sh_ip,.sh_whatis .sh_sourceCode .sh_name,.sh_whatis .sh_sourceCode .sh_oldfile,.sh_whatis .sh_sourceCode .sh_newfile,.sh_whatis .sh_sourceCode .sh_value{color:#fb0;font-weight:400;font-style:normal;}.sh_neon .sh_sourceCode .sh_symbol,.sh_neon .sh_sourceCode .sh_cbracket{color:#ee5896;font-weight:700;font-style:normal;}.sh_neon .sh_sourceCode .sh_variable,.sh_neon .sh_sourceCode .sh_selector{color:#ef1347;font-weight:700;font-style:normal;}.sh_night .sh_sourceCode .sh_specialchar,.sh_night .sh_sourceCode .sh_oldfile{color:#82d66d;font-weight:400;font-style:normal;}.sh_night .sh_sourceCode .sh_symbol,.sh_night .sh_sourceCode .sh_cbracket{color:#e7ee5c;font-weight:700;font-style:normal;}.sh_night .sh_sourceCode .sh_variable,.sh_night .sh_sourceCode .sh_selector{color:#7aec27;font-weight:700;font-style:normal;}.sh_pablo .sh_sourceCode .sh_keyword,.sh_pablo .sh_sourceCode .sh_date,.sh_pablo .sh_sourceCode .sh_time,.sh_pablo .sh_sourceCode .sh_file,.sh_pablo .sh_sourceCode .sh_difflines,.sh_pablo .sh_sourceCode .sh_property{color:#c0c000;font-weight:700;font-style:normal;}.sh_pablo .sh_sourceCode .sh_string,.sh_pablo .sh_sourceCode .sh_regexp,.sh_pablo .sh_sourceCode .sh_number,.sh_pablo .sh_sourceCode .sh_url,.sh_pablo .sh_sourceCode .sh_ip,.sh_pablo .sh_sourceCode .sh_name,.sh_pablo .sh_sourceCode .sh_newfile,.sh_pablo .sh_sourceCode .sh_value,.sh_whatis .sh_sourceCode .sh_symbol,.sh_whatis .sh_sourceCode .sh_cbracket{color:#0ff;font-weight:400;font-style:normal;}.sh_pablo .sh_sourceCode .sh_variable,.sh_pablo .sh_sourceCode .sh_selector{color:#0000c0;font-weight:700;font-style:normal;}.sh_peachpuff .sh_sourceCode .sh_string,.sh_peachpuff .sh_sourceCode .sh_regexp,.sh_peachpuff .sh_sourceCode .sh_number,.sh_peachpuff .sh_sourceCode .sh_url,.sh_peachpuff .sh_sourceCode .sh_ip,.sh_peachpuff .sh_sourceCode .sh_name,.sh_peachpuff .sh_sourceCode .sh_newfile,.sh_peachpuff .sh_sourceCode .sh_value{color:#c00058;font-weight:400;font-style:normal;}.sh_peachpuff .sh_sourceCode .sh_specialchar,.sh_peachpuff .sh_sourceCode .sh_oldfile{color:#6a5acd;font-weight:400;font-style:normal;}.sh_peachpuff .sh_sourceCode .sh_variable,.sh_peachpuff .sh_sourceCode .sh_selector{color:#275fec;font-weight:700;font-style:normal;}.sh_print .sh_sourceCode .sh_comment,.sh_typical .sh_sourceCode .sh_comment{color:#666;font-weight:400;font-style:italic;}.sh_rand01 .sh_sourceCode .sh_keyword,.sh_rand01 .sh_sourceCode .sh_date,.sh_rand01 .sh_sourceCode .sh_time,.sh_rand01 .sh_sourceCode .sh_file,.sh_rand01 .sh_sourceCode .sh_difflines,.sh_rand01 .sh_sourceCode .sh_property{color:#0a7f6d;font-weight:700;font-style:normal;}.sh_rand01 .sh_sourceCode .sh_string,.sh_rand01 .sh_sourceCode .sh_regexp,.sh_rand01 .sh_sourceCode .sh_url,.sh_rand01 .sh_sourceCode .sh_ip,.sh_rand01 .sh_sourceCode .sh_name,.sh_rand01 .sh_sourceCode .sh_newfile,.sh_rand01 .sh_sourceCode .sh_value{color:#2b83ba;font-weight:400;font-style:normal;}.sh_rand01 .sh_sourceCode .sh_specialchar,.sh_rand01 .sh_sourceCode .sh_oldfile{color:#a764cb;font-weight:400;font-style:normal;}.sh_rand01 .sh_sourceCode .sh_comment,.sh_vampire .sh_sourceCode .sh_comment{color:#ababab;font-weight:400;font-style:italic;}.sh_rand01 .sh_sourceCode .sh_symbol,.sh_rand01 .sh_sourceCode .sh_cbracket{color:#0000de;font-weight:400;font-style:normal;}.sh_rand01 .sh_sourceCode .sh_variable,.sh_rand01 .sh_sourceCode .sh_selector{color:#e12f76;font-weight:700;font-style:normal;}.sh_the .sh_sourceCode .sh_string,.sh_the .sh_sourceCode .sh_regexp,.sh_the .sh_sourceCode .sh_url,.sh_the .sh_sourceCode .sh_ip,.sh_the .sh_sourceCode .sh_name,.sh_the .sh_sourceCode .sh_newfile,.sh_the .sh_sourceCode .sh_value{color:#008;font-weight:400;font-style:normal;}.sh_typical .sh_sourceCode .sh_specialchar,.sh_typical .sh_sourceCode .sh_oldfile{color:#C42DA8;font-weight:400;font-style:normal;}.sh_typical .sh_sourceCode .sh_variable,.sh_typical .sh_sourceCode .sh_selector{color:#ec7f15;font-weight:400;font-style:normal;}.sh_vampire .sh_sourceCode .sh_symbol,.sh_vampire .sh_sourceCode .sh_cbracket{color:#F3E651;font-weight:400;font-style:normal;}.sh_vim-dark .sh_sourceCode .sh_keyword,.sh_vim-dark .sh_sourceCode .sh_date,.sh_vim-dark .sh_sourceCode .sh_time,.sh_vim-dark .sh_sourceCode .sh_file,.sh_vim-dark .sh_sourceCode .sh_variable,.sh_vim-dark .sh_sourceCode .sh_difflines,.sh_vim-dark .sh_sourceCode .sh_selector,.sh_vim-dark .sh_sourceCode .sh_property,.sh_vim .sh_sourceCode .sh_keyword,.sh_vim .sh_sourceCode .sh_date,.sh_vim .sh_sourceCode .sh_time,.sh_vim .sh_sourceCode .sh_file,.sh_vim .sh_sourceCode .sh_variable,.sh_vim .sh_sourceCode .sh_difflines,.sh_vim .sh_sourceCode .sh_selector,.sh_vim .sh_sourceCode .sh_property{color:#B26818;font-weight:400;font-style:normal;}.sh_vim-dark .sh_sourceCode .sh_specialchar,.sh_vim-dark .sh_sourceCode .sh_preproc,.sh_vim-dark .sh_sourceCode .sh_oldfile,.sh_vim .sh_sourceCode .sh_specialchar,.sh_vim .sh_sourceCode .sh_preproc,.sh_vim .sh_sourceCode .sh_oldfile{color:#f2f;font-weight:400;font-style:normal;}.sh_whatis .sh_sourceCode .sh_keyword,.sh_whatis .sh_sourceCode .sh_date,.sh_whatis .sh_sourceCode .sh_time,.sh_whatis .sh_sourceCode .sh_file,.sh_whatis .sh_sourceCode .sh_difflines,.sh_whatis .sh_sourceCode .sh_property{color:#fa5a03;font-weight:700;font-style:normal;}.sh_whatis .sh_sourceCode .sh_variable,.sh_whatis .sh_sourceCode .sh_selector{color:#efe219;font-weight:700;font-style:normal;}.sh_whitengrey .sh_sourceCode .sh_keyword,.sh_whitengrey .sh_sourceCode .sh_date,.sh_whitengrey .sh_sourceCode .sh_time,.sh_whitengrey .sh_sourceCode .sh_file,.sh_whitengrey .sh_sourceCode .sh_variable,.sh_whitengrey .sh_sourceCode .sh_difflines,.sh_whitengrey .sh_sourceCode .sh_selector,.sh_whitengrey .sh_sourceCode .sh_property{color:#696969;font-weight:700;font-style:normal;}.sh_zellner .sh_sourceCode .sh_keyword,.sh_zellner .sh_sourceCode .sh_date,.sh_zellner .sh_sourceCode .sh_time,.sh_zellner .sh_sourceCode .sh_file,.sh_zellner .sh_sourceCode .sh_difflines,.sh_zellner .sh_sourceCode .sh_property{color:#a52a2a;font-weight:400;font-style:normal;}.sh_zellner .sh_sourceCode .sh_variable,.sh_zellner .sh_sourceCode .sh_selector{color:#225f2d;font-weight:400;font-style:normal;}
+
+.snippet-wrap {position:relative;}
+*:first-child+html .snippet-wrap {display:inline-block;}
+* html .snippet-wrap {display:inline-block;}
+.snippet-reveal{text-decoration:underline;}
+.snippet-wrap .snippet-menu, .snippet-wrap .snippet-hide {position:absolute; top:10px; right:15px; font-size:.9em;z-index:1;background-color:transparent;}
+.snippet-wrap .snippet-hide {top:auto; bottom:10px;}
+*:first-child+html .snippet-wrap .snippet-hide {bottom:25px;}
+* html .snippet-wrap .snippet-hide {bottom:25px;}
+.snippet-wrap .snippet-menu pre, .snippet-wrap .snippet-hide pre {background-color:transparent; margin:0; padding:0;}
+.snippet-wrap .snippet-menu a, .snippet-wrap .snippet-hide a {padding:0 5px; text-decoration:underline;}
+.snippet-wrap pre.sh_sourceCode{padding:1em;line-height:1.8em;overflow:auto;position:relative;
+-moz-border-radius:15px;
+-webkit-border-radius:15px;
+border-radius:15px;
+box-shadow: 2px 2px 5px #000;
+-moz-box-shadow: 2px 2px 5px #000;
+-webkit-box-shadow: 2px 2px 5px #000;}
+.snippet-wrap pre.snippet-textonly {padding:2em;}
+*:first-child+html .snippet-wrap pre.snippet-formatted {padding:2em 1em;}
+* html .snippet-wrap pre.snippet-formatted {padding:2em 1em;}
+.snippet-reveal pre.sh_sourceCode {padding:.5em 1em; text-align:right;}
+.snippet-wrap .snippet-num li{padding-left:1.5em;}
+.snippet-wrap .snippet-no-num{list-style:none; padding:.6em 1em; margin:0;}
+.snippet-wrap .snippet-no-num li {list-style:none; padding-left:0;}
+.snippet-wrap .snippet-num {margin:1em 0 1em 1em; padding-left:3em;}
+.snippet-wrap .snippet-num li {list-style:decimal-leading-zero outside none;}
+.snippet-wrap .snippet-no-num li.box {padding:0 6px; margin-left:-6px;}
+.snippet-wrap .snippet-num li.box {border:1px solid; list-style-position:inside; margin-left:-3em; padding-left:6px;}
+*:first-child+html .snippet-wrap .snippet-num li.box {margin-left:-2.4em;}
+* html .snippet-wrap .snippet-num li.box {margin-left:-2.4em;}
+.snippet-wrap li.box-top {border-width:1px 1px 0 !important;}
+.snippet-wrap li.box-bot {border-width:0 1px 1px !important;}
+.snippet-wrap li.box-mid {border-width:0 1px !important;}
+.snippet-wrap .snippet-num li .box-sp {width:18px; display:inline-block;}
+*:first-child+html .snippet-wrap .snippet-num li .box-sp {width:27px;}
+* html .snippet-wrap .snippet-num li .box-sp {width:27px;}
+.snippet-wrap .snippet-no-num li.box {border:1px solid;}
+.snippet-wrap .snippet-no-num li .box-sp {display:none;}
\ No newline at end of file
diff --git a/examples/resources/jquery.snippet.min.js b/examples/resources/jquery.snippet.min.js
new file mode 100755
index 000000000..cf840643f
--- /dev/null
+++ b/examples/resources/jquery.snippet.min.js
@@ -0,0 +1,12 @@
+/*
+ * Snippet :: jQuery Syntax Highlighter v2.0.0
+ * http://steamdev.com/snippet
+ *
+ * Copyright 2011, SteamDev
+ * Released under the MIT license.
+ * http://www.opensource.org/licenses/mit-license.php
+ *
+ * Date: Wed Jan 19, 2011
+ */
+
+(function(a){window.log=function(){log.history=log.history||[];log.history.push(arguments);if(this.console){console.log(Array.prototype.slice.call(arguments))}};a.fn.snippet=function(e,c){if(typeof e=="object"){c=e}if(typeof e=="string"){e=e.toLowerCase()}var d={style:"random",showNum:true,transparent:false,collapse:false,menu:true,showMsg:"Expand Code",hideMsg:"Collapse Code",clipboard:"",startCollapsed:true,startText:false,box:"",boxColor:"",boxFill:""};var b=["acid","berries-dark","berries-light","bipolar","blacknblue","bright","contrast","darkblue","darkness","desert","dull","easter","emacs","golden","greenlcd","ide-anjuta","ide-codewarrior","ide-devcpp","ide-eclipse","ide-kdev","ide-msvcpp","kwrite","matlab","navy","nedit","neon","night","pablo","peachpuff","print","rand01","the","typical","vampire","vim","vim-dark","whatis","whitengrey","zellner"];if(c){a.extend(d,c)}return this.each(function(){var H=d.style.toLowerCase();if(d.style=="random"){var D=Math.floor(Math.random()*(b.length));H=b[D]}var u=a(this);var y=this.nodeName.toLowerCase();if(y=="pre"){if(u.data("orgHtml")==undefined||u.data("orgHtml")==null){var f=u.html();u.data("orgHtml",f)}if(!u.parent().hasClass("snippet-wrap")){if(typeof e!="string"){if(u.attr("class").length>0){var t=' class="'+u.attr("class")+'"'}else{var t=""}if(u.attr("id").length>0){var J=' id="'+u.attr("id")+'"'}else{var J=""}var A="Snippet Error: You must specify a language on inital usage of Snippet. Reference <pre"+t+J+">";console.log(A);return false}u.addClass("sh_"+e).addClass("snippet-formatted").wrap("<div class='snippet-container' style='"+u.attr("style")+";'><div class='sh_"+H+" snippet-wrap'></div></div>");u.removeAttr("style");sh_highlightDocument();if(d.showNum){var v=u.html();v=v.replace(/\n/g,"</li><li>");v="<ol class='snippet-num'><li>"+v+"</li></ol>";while(v.indexOf("<li></li></ol>")!=-1){v=v.replace("<li></li></ol>","</ol>")}}else{var v=u.html();v=v.replace(/\n/g,"</li><li>");v="<ul class='snippet-no-num'><li>"+v+"</li></ul>";while(v.indexOf("<li></li></ul>")!=-1){v=v.replace("<li></li></ul>","</ul>")}}v=v.replace(/\t/g,"&nbsp;&nbsp;&nbsp;&nbsp;");u.html(v);while(u.find("li").eq(0).html()==""){u.find("li").eq(0).remove()}u.find("li").each(function(){if(a(this).html().length<2){var i=(a(this).html()).replace(/\s/g,"");if(i==""){if(a.browser.opera){a(this).html("&nbsp;")}else{a(this).html("<span style='display:none;'>&nbsp;</span>")}}}});var w="<pre class='snippet-textonly sh_sourceCode' style='display:none;'>"+u.data("orgHtml")+"</pre>";var r="<div class='snippet-menu sh_sourceCode' style='display:none;'><pre><a class='snippet-copy' href='#'>copy</a><a class='snippet-text' href='#'>text</a><a class='snippet-window' href='#'>pop-up</a></pre></div>";u.parent().append(w);u.parent().prepend(r);u.parent().hover(function(){a(this).find(".snippet-menu").fadeIn("fast")},function(){a(this).find(".snippet-menu").fadeOut("fast")});if(d.clipboard!=""&&d.clipboard!=false){var j=u.parent().find("a.snippet-copy");j.show();j.parents(".snippet-menu").show();var s=u.parents(".snippet-wrap").find(".snippet-textonly").text();ZeroClipboard.setMoviePath(d.clipboard);var G=new ZeroClipboard.Client();G.setText(s);G.glue(j[0],j.parents(".snippet-menu")[0]);G.addEventListener("complete",function(i,o){if(o.length>500){o=o.substr(0,500)+"...\n\n("+(o.length-500)+" characters not shown)"}alert("Copied text to clipboard:\n\n "+o)});j.parents(".snippet-menu").hide()}else{u.parent().find("a.snippet-copy").hide()}u.parent().find("a.snippet-text").click(function(){var o=a(this).parents(".snippet-wrap").find(".snippet-formatted");var i=a(this).parents(".snippet-wrap").find(".snippet-textonly");o.toggle();i.toggle();if(i.is(":visible")){a(this).html("html")}else{a(this).html("text")}a(this).blur();return false});u.parent().find("a.snippet-window").click(function(){var i=a(this).parents(".snippet-wrap").find(".snippet-textonly").html();snippetPopup(i);a(this).blur();return false});if(!d.menu){u.prev(".snippet-menu").find("pre,.snippet-clipboard").hide()}if(d.collapse){var n=u.parent().attr("class");var h="<div class='snippet-reveal "+n+"'><pre class='sh_sourceCode'><a href='#' class='snippet-toggle'>"+d.showMsg+"</a></pre></div>";var E="<div class='sh_sourceCode snippet-hide'><pre><a href='#' class='snippet-revealed snippet-toggle'>"+d.hideMsg+"</a></pre></div>";u.parents(".snippet-container").append(h);u.parent().append(E);var z=u.parents(".snippet-container");if(d.startCollapsed){z.find(".snippet-reveal").show();z.find(".snippet-wrap").eq(0).hide()}else{z.find(".snippet-reveal").hide();z.find(".snippet-wrap").eq(0).show()}z.find("a.snippet-toggle").click(function(){z.find(".snippet-wrap").toggle();return false})}if(d.transparent){var k={"background-color":"transparent","box-shadow":"none","-moz-box-shadow":"none","-webkit-box-shadow":"none"};u.css(k);u.next(".snippet-textonly").css(k);u.parents(".snippet-container").find(".snippet-reveal pre").css(k)}if(d.startText){u.hide();u.next(".snippet-textonly").show();u.parent().find(".snippet-text").html("html")}if(d.box!=""){var m="<span class='box-sp'>&nbsp;</span>";var C=d.box.split(",");for(var B=0;B<C.length;B++){var I=C[B];if(I.indexOf("-")==-1){I=parseFloat(I)-1;u.find("li").eq(I).addClass("box").prepend(m)}else{var g=parseFloat(I.split("-")[0])-1;var l=parseFloat(I.split("-")[1])-1;if(g<l){u.find("li").eq(g).addClass("box box-top").prepend(m);u.find("li").eq(l).addClass("box box-bot").prepend(m);for(var p=g+1;p<l;p++){u.find("li").eq(p).addClass("box box-mid").prepend(m)}}else{if(g==l){u.find("li").eq(g).addClass("box").prepend(m)}}}}if(d.boxColor!=""){u.find("li.box").css("border-color",d.boxColor)}if(d.boxFill!=""){u.find("li.box, li.box-top, li.box-mid, li.box-bot").addClass("box-bg").css("background-color",d.boxFill)}if(a.browser.webkit){u.find(".snippet-num li.box").css("margin-left","-3.3em");u.find(".snippet-num li .box-sp").css("width","21px")}}u.parents(".snippet-container").find("a").addClass("sh_url")}else{u.parent().attr("class","sh_"+H+" snippet-wrap");u.parents(".snippet-container").find(".snippet-reveal").attr("class","sh_"+H+" snippet-wrap snippet-reveal");u.find("li.box, li.box-top, li.box-mid, li.box-bot").removeAttr("style").removeAttr("class");u.find("li .box-sp").remove();if(d.transparent){var k={"background-color":"transparent","box-shadow":"none","-moz-box-shadow":"none","-webkit-box-shadow":"none"};u.css(k);u.next(".snippet-textonly").css(k);u.parents(".snippet-container").find(".snippet-hide pre").css(k)}else{var k={"background-color":"","box-shadow":"","-moz-box-shadow":"","-webkit-box-shadow":""};u.css(k);u.next(".snippet-textonly").css(k);u.parents(".snippet-container").find(".snippet-reveal pre").css(k)}if(d.showNum){var F=u.find("li").eq(0).parent();if(F.hasClass("snippet-no-num")){F.wrap("<ol class='snippet-num'></ol>");var q=u.find("li").eq(0);q.unwrap()}}else{var F=u.find("li").eq(0).parent();if(F.hasClass("snippet-num")){F.wrap("<ul class='snippet-no-num'></ul>");var q=u.find("li").eq(0);q.unwrap()}}if(d.box!=""){var m="<span class='box-sp'>&nbsp;</span>";var C=d.box.split(",");for(var B=0;B<C.length;B++){var I=C[B];if(I.indexOf("-")==-1){I=parseFloat(I)-1;u.find("li").eq(I).addClass("box").prepend(m)}else{var g=parseFloat(I.split("-")[0])-1;var l=parseFloat(I.split("-")[1])-1;if(g<l){u.find("li").eq(g).addClass("box box-top").prepend(m);u.find("li").eq(l).addClass("box box-bot").prepend(m);for(var p=g+1;p<l;p++){u.find("li").eq(p).addClass("box box-mid").prepend(m)}}else{if(g==l){u.find("li").eq(g).addClass("box").prepend(m)}}}}if(d.boxColor!=""){u.find("li.box").css("border-color",d.boxColor)}if(d.boxFill!=""){u.find("li.box").addClass("box-bg").css("background-color",d.boxFill)}if(a.browser.webkit){u.find(".snippet-num li.box").css("margin-left","-3.3em");u.find(".snippet-num li .box-sp").css("width","21px")}}sh_highlightDocument();if(!d.menu){u.prev(".snippet-menu").find("pre,.snippet-clipboard").hide()}else{u.prev(".snippet-menu").find("pre,.snippet-clipboard").show()}}}else{var A="Snippet Error: Sorry, Snippet only formats '<pre>' elements. '<"+y+">' elements are currently unsupported.";console.log(A);return false}})}})(jQuery);function snippetPopup(a){top.consoleRef=window.open("","myconsole","width=600,height=300,left=50,top=50,menubar=0,toolbar=0,location=0,status=0,scrollbars=1,resizable=1");top.consoleRef.document.writeln("<html><head><title>Snippet :: Code View :: "+location.href+'</title></head><body bgcolor=white onLoad="self.focus()"><pre>'+a+"</pre></body></html>");top.consoleRef.document.close()}var ZeroClipboard={version:"1.0.7",clients:{},moviePath:"ZeroClipboard.swf",nextId:1,$:function(a){if(typeof(a)=="string"){a=document.getElementById(a)}if(!a.addClass){a.hide=function(){this.style.display="none"};a.show=function(){this.style.display=""};a.addClass=function(b){this.removeClass(b);this.className+=" "+b};a.removeClass=function(d){var e=this.className.split(/\s+/);var b=-1;for(var c=0;c<e.length;c++){if(e[c]==d){b=c;c=e.length}}if(b>-1){e.splice(b,1);this.className=e.join(" ")}return this};a.hasClass=function(b){return !!this.className.match(new RegExp("\\s*"+b+"\\s*"))}}return a},setMoviePath:function(a){this.moviePath=a},dispatch:function(d,b,c){var a=this.clients[d];if(a){a.receiveEvent(b,c)}},register:function(b,a){this.clients[b]=a},getDOMObjectPosition:function(c,a){var b={left:0,top:0,width:c.width?c.width:c.offsetWidth,height:c.height?c.height:c.offsetHeight};while(c&&(c!=a)){b.left+=c.offsetLeft;b.top+=c.offsetTop;c=c.offsetParent}return b},Client:function(a){this.handlers={};this.id=ZeroClipboard.nextId++;this.movieId="ZeroClipboardMovie_"+this.id;ZeroClipboard.register(this.id,this);if(a){this.glue(a)}}};ZeroClipboard.Client.prototype={id:0,ready:false,movie:null,clipText:"",handCursorEnabled:true,cssEffects:true,handlers:null,glue:function(d,b,e){this.domElement=ZeroClipboard.$(d);var f=99;if(this.domElement.style.zIndex){f=parseInt(this.domElement.style.zIndex,10)+1}if(typeof(b)=="string"){b=ZeroClipboard.$(b)}else{if(typeof(b)=="undefined"){b=document.getElementsByTagName("body")[0]}}var c=ZeroClipboard.getDOMObjectPosition(this.domElement,b);this.div=document.createElement("div");this.div.className="snippet-clipboard";var a=this.div.style;a.position="absolute";a.left=""+c.left+"px";a.top=""+c.top+"px";a.width=""+c.width+"px";a.height=""+c.height+"px";a.zIndex=f;if(typeof(e)=="object"){for(addedStyle in e){a[addedStyle]=e[addedStyle]}}b.appendChild(this.div);this.div.innerHTML=this.getHTML(c.width,c.height)},getHTML:function(d,a){var c="";var b="id="+this.id+"&width="+d+"&height="+a;if(navigator.userAgent.match(/MSIE/)){var e=location.href.match(/^https/i)?"https://":"http://";c+='<object classid="clsid:d27cdb6e-ae6d-11cf-96b8-444553540000" codebase="'+e+'download.macromedia.com/pub/shockwave/cabs/flash/swflash.cab#version=9,0,0,0" width="'+d+'" height="'+a+'" id="'+this.movieId+'" align="middle"><param name="allowScriptAccess" value="always" /><param name="allowFullScreen" value="false" /><param name="movie" value="'+ZeroClipboard.moviePath+'" /><param name="loop" value="false" /><param name="menu" value="false" /><param name="quality" value="best" /><param name="bgcolor" value="#ffffff" /><param name="flashvars" value="'+b+'"/><param name="wmode" value="transparent"/></object>'}else{c+='<embed id="'+this.movieId+'" src="'+ZeroClipboard.moviePath+'" loop="false" menu="false" quality="best" bgcolor="#ffffff" width="'+d+'" height="'+a+'" name="'+this.movieId+'" align="middle" allowScriptAccess="always" allowFullScreen="false" type="application/x-shockwave-flash" pluginspage="http://www.macromedia.com/go/getflashplayer" flashvars="'+b+'" wmode="transparent" />'}return c},hide:function(){if(this.div){this.div.style.left="-2000px"}},show:function(){this.reposition()},destroy:function(){if(this.domElement&&this.div){this.hide();this.div.innerHTML="";var a=document.getElementsByTagName("body")[0];try{a.removeChild(this.div)}catch(b){}this.domElement=null;this.div=null}},reposition:function(c){if(c){this.domElement=ZeroClipboard.$(c);if(!this.domElement){this.hide()}}if(this.domElement&&this.div){var b=ZeroClipboard.getDOMObjectPosition(this.domElement);var a=this.div.style;a.left=""+b.left+"px";a.top=""+b.top+"px"}},setText:function(a){this.clipText=a;if(this.ready){this.movie.setText(a)}},addEventListener:function(a,b){a=a.toString().toLowerCase().replace(/^on/,"");if(!this.handlers[a]){this.handlers[a]=[]}this.handlers[a].push(b)},setHandCursor:function(a){this.handCursorEnabled=a;if(this.ready){this.movie.setHandCursor(a)}},setCSSEffects:function(a){this.cssEffects=!!a},receiveEvent:function(d,f){d=d.toString().toLowerCase().replace(/^on/,"");switch(d){case"load":this.movie=document.getElementById(this.movieId);if(!this.movie){var c=this;setTimeout(function(){c.receiveEvent("load",null)},1);return}if(!this.ready&&navigator.userAgent.match(/Firefox/)&&navigator.userAgent.match(/Windows/)){var c=this;setTimeout(function(){c.receiveEvent("load",null)},100);this.ready=true;return}this.ready=true;try{this.movie.setText(this.clipText)}catch(h){}try{this.movie.setHandCursor(this.handCursorEnabled)}catch(h){}break;case"mouseover":if(this.domElement&&this.cssEffects){this.domElement.addClass("hover");if(this.recoverActive){this.domElement.addClass("active")}}break;case"mouseout":if(this.domElement&&this.cssEffects){this.recoverActive=false;if(this.domElement.hasClass("active")){this.domElement.removeClass("active");this.recoverActive=true}this.domElement.removeClass("hover")}break;case"mousedown":if(this.domElement&&this.cssEffects){this.domElement.addClass("active")}break;case"mouseup":if(this.domElement&&this.cssEffects){this.domElement.removeClass("active");this.recoverActive=false}break}if(this.handlers[d]){for(var b=0,a=this.handlers[d].length;b<a;b++){var g=this.handlers[d][b];if(typeof(g)=="function"){g(this,f)}else{if((typeof(g)=="object")&&(g.length==2)){g[0][g[1]](this,f)}else{if(typeof(g)=="string"){window[g](this,f)}}}}}}};if(!this.sh_languages){this.sh_languages={}}var sh_requests={};function sh_isEmailAddress(b){if(/^mailto:/.test(b)){return false}return b.indexOf("@")!==-1}function sh_setHref(e,h,g){var f=g.substring(e[h-2].pos,e[h-1].pos);if(f.length>=2&&f.charAt(0)==="<"&&f.charAt(f.length-1)===">"){f=f.substr(1,f.length-2)}if(sh_isEmailAddress(f)){f="mailto:"+f}e[h-2].node.href=f}function sh_konquerorExec(c){var d=[""];d.index=c.length;d.input=c;return d}function sh_highlightString(X,ah){if(/Konqueror/.test(navigator.userAgent)){if(!ah.konquered){for(var T=0;T<ah.length;T++){for(var R=0;R<ah[T].length;R++){var S=ah[T][R][0];if(S.source==="$"){S.exec=sh_konquerorExec}}}ah.konquered=true}}var i=document.createElement("a");var ag=document.createElement("span");var Y=[];var am=0;var ai=[];var W=0;var al=null;var ab=function(c,b){var g=c.length;if(g===0){return}if(!b){var e=ai.length;if(e!==0){var d=ai[e-1];if(!d[3]){b=d[1]}}}if(al!==b){if(al){Y[am++]={pos:W};if(al==="sh_url"){sh_setHref(Y,am,X)}}if(b){var f;if(b==="sh_url"){f=i.cloneNode(false)}else{f=ag.cloneNode(false)}f.className=b;Y[am++]={node:f,pos:W}}}W+=g;al=b};var af=/\r\n|\r|\n/g;af.lastIndex=0;var ar=X.length;while(W<ar){var ad=W;var ak;var ac;var an=af.exec(X);if(an===null){ak=ar;ac=ar}else{ak=an.index;ac=af.lastIndex}var ao=X.substring(ad,ak);var p=[];for(;;){var Q=W-ad;var V;var aa=ai.length;if(aa===0){V=0}else{V=ai[aa-1][2]}var a=ah[V];var Z=a.length;var aj=p[V];if(!aj){aj=p[V]=[]}var U=null;var ae=-1;for(var s=0;s<Z;s++){var ap;if(s<aj.length&&(aj[s]===null||Q<=aj[s].index)){ap=aj[s]}else{var at=a[s][0];at.lastIndex=Q;ap=at.exec(ao);aj[s]=ap}if(ap!==null&&(U===null||ap.index<U.index)){U=ap;ae=s;if(ap.index===Q){break}}}if(U===null){ab(ao.substring(Q),null);break}else{if(U.index>Q){ab(ao.substring(Q,U.index),null)}var aq=a[ae];var P=aq[1];var au;if(P instanceof Array){for(var r=0;r<P.length;r++){au=U[r+1];ab(au,P[r])}}else{au=U[0];ab(au,P)}switch(aq[2]){case -1:break;case -2:ai.pop();break;case -3:ai.length=0;break;default:ai.push(aq);break}}}if(al){Y[am++]={pos:W};if(al==="sh_url"){sh_setHref(Y,am,X)}al=null}W=ac}return Y}function sh_getClasses(i){var g=[];var f=i.className;if(f&&f.length>0){var h=f.split(" ");for(var j=0;j<h.length;j++){if(h[j].length>0){g.push(h[j])}}}return g}function sh_addClass(h,f){var g=sh_getClasses(h);for(var e=0;e<g.length;e++){if(f.toLowerCase()===g[e].toLowerCase()){return}}g.push(f);h.className=g.join(" ")}function sh_extractTagsFromNodeList(l,h){var i=l.length;for(var k=0;k<i;k++){var j=l.item(k);switch(j.nodeType){case 1:if(j.nodeName.toLowerCase()==="br"){var g;if(/MSIE/.test(navigator.userAgent)){g="\r"}else{g="\n"}h.text.push(g);h.pos++}else{h.tags.push({node:j.cloneNode(false),pos:h.pos});sh_extractTagsFromNodeList(j.childNodes,h);h.tags.push({pos:h.pos})}break;case 3:case 4:h.text.push(j.data);h.pos+=j.length;break}}}function sh_extractTags(f,d){var e={};e.text=[];e.tags=d;e.pos=0;sh_extractTagsFromNodeList(f.childNodes,e);return e.text.join("")}function sh_mergeTags(o,m){var r=o.length;if(r===0){return m}var p=m.length;if(p===0){return o}var j=[];var n=0;var q=0;while(n<r&&q<p){var k=o[n];var l=m[q];if(k.pos<=l.pos){j.push(k);n++}else{j.push(l);if(m[q+1].pos<=k.pos){q++;j.push(m[q]);q++}else{j.push({pos:k.pos});m[q]={node:l.node.cloneNode(false),pos:k.pos}}}}while(n<r){j.push(o[n]);n++}while(q<p){j.push(m[q]);q++}return j}function sh_insertTags(n,q){var r=document;var m=document.createDocumentFragment();var t=0;var u=n.length;var w=0;var o=q.length;var v=m;while(w<o||t<u){var p;var x;if(t<u){p=n[t];x=p.pos}else{x=o}if(x<=w){if(p.node){var s=p.node;v.appendChild(s);v=s}else{v=v.parentNode}t++}else{v.appendChild(r.createTextNode(q.substring(w,x)));w=x}}return m}function sh_highlightElement(m,j){sh_addClass(m,"sh_sourceCode");var n=[];var l=sh_extractTags(m,n);var k=sh_highlightString(l,j);var h=sh_mergeTags(n,k);var i=sh_insertTags(h,l);while(m.hasChildNodes()){m.removeChild(m.firstChild)}m.appendChild(i)}function sh_getXMLHttpRequest(){if(window.ActiveXObject){return new ActiveXObject("Msxml2.XMLHTTP")}else{if(window.XMLHttpRequest){return new XMLHttpRequest()}}throw"No XMLHttpRequest implementation available"}function sh_load(language,element,prefix,suffix){if(language in sh_requests){sh_requests[language].push(element);return}sh_requests[language]=[element];var request=sh_getXMLHttpRequest();var url=prefix+"sh_"+language+suffix;request.open("GET",url,true);request.onreadystatechange=function(){if(request.readyState===4){try{if(!request.status||request.status===200){eval(request.responseText);var elements=sh_requests[language];for(var i=0;i<elements.length;i++){sh_highlightElement(elements[i],sh_languages[language])}}else{throw"HTTP error: status "+request.status}}finally{request=null}}};request.send(null)}function sh_highlightDocument(e,g){var b=document.getElementsByTagName("pre");for(var d=0;d<b.length;d++){var c=b.item(d);var f=c.className.toLowerCase();var a=f.replace(/sh_sourcecode/g,"");if(a.indexOf("sh_")!=-1){a=a.match(/(\bsh_)\w+\b/g)[0]}if(f.indexOf("sh_sourcecode")!=-1){continue}if(a.substr(0,3)==="sh_"){var h=a.substring(3);if(h in sh_languages){sh_highlightElement(c,sh_languages[h])}else{if(typeof(e)==="string"&&typeof(g)==="string"){sh_load(h,c,e,g)}else{console.log('Found <pre> element with class="'+a+'", but no such language exists');continue}}break}}}if(!this.sh_languages){this.sh_languages={}}sh_languages.c=[[[/\/\/\//g,"sh_comment",1],[/\/\//g,"sh_comment",7],[/\/\*\*/g,"sh_comment",8],[/\/\*/g,"sh_comment",9],[/(\bstruct)([ \t]+)([A-Za-z0-9_]+)/g,["sh_keyword","sh_normal","sh_classname"],-1],[/^[ \t]*#(?:[ \t]*include)/g,"sh_preproc",10,1],[/^[ \t]*#(?:[ \t]*[A-Za-z0-9_]*)/g,"sh_preproc",-1],[/\b[+-]?(?:(?:0x[A-Fa-f0-9]+)|(?:(?:[\d]*\.)?[\d]+(?:[eE][+-]?[\d]+)?))u?(?:(?:int(?:8|16|32|64))|L)?\b/g,"sh_number",-1],[/"/g,"sh_string",13],[/'/g,"sh_string",14],[/\b(?:__asm|__cdecl|__declspec|__export|__far16|__fastcall|__fortran|__import|__pascal|__rtti|__stdcall|_asm|_cdecl|__except|_export|_far16|_fastcall|__finally|_fortran|_import|_pascal|_stdcall|__thread|__try|asm|auto|break|case|catch|cdecl|const|continue|default|do|else|enum|extern|for|goto|if|pascal|register|return|sizeof|static|struct|switch|typedef|union|volatile|while)\b/g,"sh_keyword",-1],[/\b(?:bool|char|double|float|int|long|short|signed|unsigned|void|wchar_t)\b/g,"sh_type",-1],[/~|!|%|\^|\*|\(|\)|-|\+|=|\[|\]|\\|:|;|,|\.|\/|\?|&|<|>|\|/g,"sh_symbol",-1],[/\{|\}/g,"sh_cbracket",-1],[/(?:[A-Za-z]|_)[A-Za-z0-9_]*(?=[ \t]*\()/g,"sh_function",-1],[/([A-Za-z](?:[^`~!@#$%&*()_=+{}|;:",<.>\/?'\\[\]\^\-\s]|[_])*)((?:<.*>)?)(\s+(?=[*&]*[A-Za-z][^`~!@#$%&*()_=+{}|;:",<.>\/?'\\[\]\^\-\s]*\s*[`~!@#$%&*()_=+{}|;:",<.>\/?'\\[\]\^\-\[\]]+))/g,["sh_usertype","sh_usertype","sh_normal"],-1]],[[/$/g,null,-2],[/(?:<?)[A-Za-z0-9_\.\/\-_~]+@[A-Za-z0-9_\.\/\-_~]+(?:>?)|(?:<?)[A-Za-z0-9_]+:\/\/[A-Za-z0-9_\.\/\-_~]+(?:>?)/g,"sh_url",-1],[/<\?xml/g,"sh_preproc",2,1],[/<!DOCTYPE/g,"sh_preproc",4,1],[/<!--/g,"sh_comment",5],[/<(?:\/)?[A-Za-z](?:[A-Za-z0-9_:.-]*)(?:\/)?>/g,"sh_keyword",-1],[/<(?:\/)?[A-Za-z](?:[A-Za-z0-9_:.-]*)/g,"sh_keyword",6,1],[/&(?:[A-Za-z0-9]+);/g,"sh_preproc",-1],[/<(?:\/)?[A-Za-z][A-Za-z0-9]*(?:\/)?>/g,"sh_keyword",-1],[/<(?:\/)?[A-Za-z][A-Za-z0-9]*/g,"sh_keyword",6,1],[/@[A-Za-z]+/g,"sh_type",-1],[/(?:TODO|FIXME|BUG)(?:[:]?)/g,"sh_todo",-1]],[[/\?>/g,"sh_preproc",-2],[/([^=" \t>]+)([ \t]*)(=?)/g,["sh_type","sh_normal","sh_symbol"],-1],[/"/g,"sh_string",3]],[[/\\(?:\\|")/g,null,-1],[/"/g,"sh_string",-2]],[[/>/g,"sh_preproc",-2],[/([^=" \t>]+)([ \t]*)(=?)/g,["sh_type","sh_normal","sh_symbol"],-1],[/"/g,"sh_string",3]],[[/-->/g,"sh_comment",-2],[/<!--/g,"sh_comment",5]],[[/(?:\/)?>/g,"sh_keyword",-2],[/([^=" \t>]+)([ \t]*)(=?)/g,["sh_type","sh_normal","sh_symbol"],-1],[/"/g,"sh_string",3]],[[/$/g,null,-2]],[[/\*\//g,"sh_comment",-2],[/(?:<?)[A-Za-z0-9_\.\/\-_~]+@[A-Za-z0-9_\.\/\-_~]+(?:>?)|(?:<?)[A-Za-z0-9_]+:\/\/[A-Za-z0-9_\.\/\-_~]+(?:>?)/g,"sh_url",-1],[/<\?xml/g,"sh_preproc",2,1],[/<!DOCTYPE/g,"sh_preproc",4,1],[/<!--/g,"sh_comment",5],[/<(?:\/)?[A-Za-z](?:[A-Za-z0-9_:.-]*)(?:\/)?>/g,"sh_keyword",-1],[/<(?:\/)?[A-Za-z](?:[A-Za-z0-9_:.-]*)/g,"sh_keyword",6,1],[/&(?:[A-Za-z0-9]+);/g,"sh_preproc",-1],[/<(?:\/)?[A-Za-z][A-Za-z0-9]*(?:\/)?>/g,"sh_keyword",-1],[/<(?:\/)?[A-Za-z][A-Za-z0-9]*/g,"sh_keyword",6,1],[/@[A-Za-z]+/g,"sh_type",-1],[/(?:TODO|FIXME|BUG)(?:[:]?)/g,"sh_todo",-1]],[[/\*\//g,"sh_comment",-2],[/(?:<?)[A-Za-z0-9_\.\/\-_~]+@[A-Za-z0-9_\.\/\-_~]+(?:>?)|(?:<?)[A-Za-z0-9_]+:\/\/[A-Za-z0-9_\.\/\-_~]+(?:>?)/g,"sh_url",-1],[/(?:TODO|FIXME|BUG)(?:[:]?)/g,"sh_todo",-1]],[[/$/g,null,-2],[/</g,"sh_string",11],[/"/g,"sh_string",12],[/\/\/\//g,"sh_comment",1],[/\/\//g,"sh_comment",7],[/\/\*\*/g,"sh_comment",8],[/\/\*/g,"sh_comment",9]],[[/$/g,null,-2],[/>/g,"sh_string",-2]],[[/$/g,null,-2],[/\\(?:\\|")/g,null,-1],[/"/g,"sh_string",-2]],[[/"/g,"sh_string",-2],[/\\./g,"sh_specialchar",-1]],[[/'/g,"sh_string",-2],[/\\./g,"sh_specialchar",-1]]];if(!this.sh_languages){this.sh_languages={}}sh_languages.cpp=[[[/(\b(?:class|struct|typename))([ \t]+)([A-Za-z0-9_]+)/g,["sh_keyword","sh_normal","sh_classname"],-1],[/\b(?:class|const_cast|delete|dynamic_cast|explicit|false|friend|inline|mutable|namespace|new|operator|private|protected|public|reinterpret_cast|static_cast|template|this|throw|true|try|typeid|typename|using|virtual)\b/g,"sh_keyword",-1],[/\/\/\//g,"sh_comment",1],[/\/\//g,"sh_comment",7],[/\/\*\*/g,"sh_comment",8],[/\/\*/g,"sh_comment",9],[/(\bstruct)([ \t]+)([A-Za-z0-9_]+)/g,["sh_keyword","sh_normal","sh_classname"],-1],[/^[ \t]*#(?:[ \t]*include)/g,"sh_preproc",10,1],[/^[ \t]*#(?:[ \t]*[A-Za-z0-9_]*)/g,"sh_preproc",-1],[/\b[+-]?(?:(?:0x[A-Fa-f0-9]+)|(?:(?:[\d]*\.)?[\d]+(?:[eE][+-]?[\d]+)?))u?(?:(?:int(?:8|16|32|64))|L)?\b/g,"sh_number",-1],[/"/g,"sh_string",13],[/'/g,"sh_string",14],[/\b(?:__asm|__cdecl|__declspec|__export|__far16|__fastcall|__fortran|__import|__pascal|__rtti|__stdcall|_asm|_cdecl|__except|_export|_far16|_fastcall|__finally|_fortran|_import|_pascal|_stdcall|__thread|__try|asm|auto|break|case|catch|cdecl|const|continue|default|do|else|enum|extern|for|goto|if|pascal|register|return|sizeof|static|struct|switch|typedef|union|volatile|while)\b/g,"sh_keyword",-1],[/\b(?:bool|char|double|float|int|long|short|signed|unsigned|void|wchar_t)\b/g,"sh_type",-1],[/~|!|%|\^|\*|\(|\)|-|\+|=|\[|\]|\\|:|;|,|\.|\/|\?|&|<|>|\|/g,"sh_symbol",-1],[/\{|\}/g,"sh_cbracket",-1],[/(?:[A-Za-z]|_)[A-Za-z0-9_]*(?=[ \t]*\()/g,"sh_function",-1],[/([A-Za-z](?:[^`~!@#$%&*()_=+{}|;:",<.>\/?'\\[\]\^\-\s]|[_])*)((?:<.*>)?)(\s+(?=[*&]*[A-Za-z][^`~!@#$%&*()_=+{}|;:",<.>\/?'\\[\]\^\-\s]*\s*[`~!@#$%&*()_=+{}|;:",<.>\/?'\\[\]\^\-\[\]]+))/g,["sh_usertype","sh_usertype","sh_normal"],-1]],[[/$/g,null,-2],[/(?:<?)[A-Za-z0-9_\.\/\-_~]+@[A-Za-z0-9_\.\/\-_~]+(?:>?)|(?:<?)[A-Za-z0-9_]+:\/\/[A-Za-z0-9_\.\/\-_~]+(?:>?)/g,"sh_url",-1],[/<\?xml/g,"sh_preproc",2,1],[/<!DOCTYPE/g,"sh_preproc",4,1],[/<!--/g,"sh_comment",5],[/<(?:\/)?[A-Za-z](?:[A-Za-z0-9_:.-]*)(?:\/)?>/g,"sh_keyword",-1],[/<(?:\/)?[A-Za-z](?:[A-Za-z0-9_:.-]*)/g,"sh_keyword",6,1],[/&(?:[A-Za-z0-9]+);/g,"sh_preproc",-1],[/<(?:\/)?[A-Za-z][A-Za-z0-9]*(?:\/)?>/g,"sh_keyword",-1],[/<(?:\/)?[A-Za-z][A-Za-z0-9]*/g,"sh_keyword",6,1],[/@[A-Za-z]+/g,"sh_type",-1],[/(?:TODO|FIXME|BUG)(?:[:]?)/g,"sh_todo",-1]],[[/\?>/g,"sh_preproc",-2],[/([^=" \t>]+)([ \t]*)(=?)/g,["sh_type","sh_normal","sh_symbol"],-1],[/"/g,"sh_string",3]],[[/\\(?:\\|")/g,null,-1],[/"/g,"sh_string",-2]],[[/>/g,"sh_preproc",-2],[/([^=" \t>]+)([ \t]*)(=?)/g,["sh_type","sh_normal","sh_symbol"],-1],[/"/g,"sh_string",3]],[[/-->/g,"sh_comment",-2],[/<!--/g,"sh_comment",5]],[[/(?:\/)?>/g,"sh_keyword",-2],[/([^=" \t>]+)([ \t]*)(=?)/g,["sh_type","sh_normal","sh_symbol"],-1],[/"/g,"sh_string",3]],[[/$/g,null,-2]],[[/\*\//g,"sh_comment",-2],[/(?:<?)[A-Za-z0-9_\.\/\-_~]+@[A-Za-z0-9_\.\/\-_~]+(?:>?)|(?:<?)[A-Za-z0-9_]+:\/\/[A-Za-z0-9_\.\/\-_~]+(?:>?)/g,"sh_url",-1],[/<\?xml/g,"sh_preproc",2,1],[/<!DOCTYPE/g,"sh_preproc",4,1],[/<!--/g,"sh_comment",5],[/<(?:\/)?[A-Za-z](?:[A-Za-z0-9_:.-]*)(?:\/)?>/g,"sh_keyword",-1],[/<(?:\/)?[A-Za-z](?:[A-Za-z0-9_:.-]*)/g,"sh_keyword",6,1],[/&(?:[A-Za-z0-9]+);/g,"sh_preproc",-1],[/<(?:\/)?[A-Za-z][A-Za-z0-9]*(?:\/)?>/g,"sh_keyword",-1],[/<(?:\/)?[A-Za-z][A-Za-z0-9]*/g,"sh_keyword",6,1],[/@[A-Za-z]+/g,"sh_type",-1],[/(?:TODO|FIXME|BUG)(?:[:]?)/g,"sh_todo",-1]],[[/\*\//g,"sh_comment",-2],[/(?:<?)[A-Za-z0-9_\.\/\-_~]+@[A-Za-z0-9_\.\/\-_~]+(?:>?)|(?:<?)[A-Za-z0-9_]+:\/\/[A-Za-z0-9_\.\/\-_~]+(?:>?)/g,"sh_url",-1],[/(?:TODO|FIXME|BUG)(?:[:]?)/g,"sh_todo",-1]],[[/$/g,null,-2],[/</g,"sh_string",11],[/"/g,"sh_string",12],[/\/\/\//g,"sh_comment",1],[/\/\//g,"sh_comment",7],[/\/\*\*/g,"sh_comment",8],[/\/\*/g,"sh_comment",9]],[[/$/g,null,-2],[/>/g,"sh_string",-2]],[[/$/g,null,-2],[/\\(?:\\|")/g,null,-1],[/"/g,"sh_string",-2]],[[/"/g,"sh_string",-2],[/\\./g,"sh_specialchar",-1]],[[/'/g,"sh_string",-2],[/\\./g,"sh_specialchar",-1]]];if(!this.sh_languages){this.sh_languages={}}sh_languages.csharp=[[[/\b(?:using)\b/g,"sh_preproc",-1],[/\b[+-]?(?:(?:0x[A-Fa-f0-9]+)|(?:(?:[\d]*\.)?[\d]+(?:[eE][+-]?[\d]+)?))(?:[FfDdMmUulL]+)?\b/g,"sh_number",-1],[/(\b(?:class|struct|typename))([ \t]+)([A-Za-z0-9_]+)/g,["sh_keyword","sh_normal","sh_classname"],-1],[/\b(?:abstract|event|new|struct|as|explicit|null|switch|base|extern|this|false|operator|throw|break|finally|out|true|fixed|override|try|case|params|typeof|catch|for|private|foreach|protected|checked|goto|public|unchecked|class|if|readonly|unsafe|const|implicit|ref|continue|in|return|virtual|default|interface|sealed|volatile|delegate|internal|do|is|sizeof|while|lock|stackalloc|else|static|enum|namespace|get|partial|set|value|where|yield)\b/g,"sh_keyword",-1],[/\/\/\//g,"sh_comment",1],[/\/\//g,"sh_comment",7],[/\/\*\*/g,"sh_comment",8],[/\/\*/g,"sh_comment",9],[/(\bstruct)([ \t]+)([A-Za-z0-9_]+)/g,["sh_keyword","sh_normal","sh_classname"],-1],[/^[ \t]*#(?:[ \t]*include)/g,"sh_preproc",10,1],[/^[ \t]*#(?:[ \t]*[A-Za-z0-9_]*)/g,"sh_preproc",-1],[/\b[+-]?(?:(?:0x[A-Fa-f0-9]+)|(?:(?:[\d]*\.)?[\d]+(?:[eE][+-]?[\d]+)?))u?(?:(?:int(?:8|16|32|64))|L)?\b/g,"sh_number",-1],[/"/g,"sh_string",13],[/'/g,"sh_string",14],[/\b(?:bool|byte|sbyte|char|decimal|double|float|int|uint|long|ulong|object|short|ushort|string|void)\b/g,"sh_type",-1],[/~|!|%|\^|\*|\(|\)|-|\+|=|\[|\]|\\|:|;|,|\.|\/|\?|&|<|>|\|/g,"sh_symbol",-1],[/\{|\}/g,"sh_cbracket",-1],[/(?:[A-Za-z]|_)[A-Za-z0-9_]*(?=[ \t]*\()/g,"sh_function",-1],[/([A-Za-z](?:[^`~!@#$%&*()_=+{}|;:",<.>\/?'\\[\]\^\-\s]|[_])*)((?:<.*>)?)(\s+(?=[*&]*[A-Za-z][^`~!@#$%&*()_=+{}|;:",<.>\/?'\\[\]\^\-\s]*\s*[`~!@#$%&*()_=+{}|;:",<.>\/?'\\[\]\^\-\[\]]+))/g,["sh_usertype","sh_usertype","sh_normal"],-1]],[[/$/g,null,-2],[/(?:<?)[A-Za-z0-9_\.\/\-_~]+@[A-Za-z0-9_\.\/\-_~]+(?:>?)|(?:<?)[A-Za-z0-9_]+:\/\/[A-Za-z0-9_\.\/\-_~]+(?:>?)/g,"sh_url",-1],[/<\?xml/g,"sh_preproc",2,1],[/<!DOCTYPE/g,"sh_preproc",4,1],[/<!--/g,"sh_comment",5],[/<(?:\/)?[A-Za-z](?:[A-Za-z0-9_:.-]*)(?:\/)?>/g,"sh_keyword",-1],[/<(?:\/)?[A-Za-z](?:[A-Za-z0-9_:.-]*)/g,"sh_keyword",6,1],[/&(?:[A-Za-z0-9]+);/g,"sh_preproc",-1],[/<(?:\/)?[A-Za-z][A-Za-z0-9]*(?:\/)?>/g,"sh_keyword",-1],[/<(?:\/)?[A-Za-z][A-Za-z0-9]*/g,"sh_keyword",6,1],[/@[A-Za-z]+/g,"sh_type",-1],[/(?:TODO|FIXME|BUG)(?:[:]?)/g,"sh_todo",-1]],[[/\?>/g,"sh_preproc",-2],[/([^=" \t>]+)([ \t]*)(=?)/g,["sh_type","sh_normal","sh_symbol"],-1],[/"/g,"sh_string",3]],[[/\\(?:\\|")/g,null,-1],[/"/g,"sh_string",-2]],[[/>/g,"sh_preproc",-2],[/([^=" \t>]+)([ \t]*)(=?)/g,["sh_type","sh_normal","sh_symbol"],-1],[/"/g,"sh_string",3]],[[/-->/g,"sh_comment",-2],[/<!--/g,"sh_comment",5]],[[/(?:\/)?>/g,"sh_keyword",-2],[/([^=" \t>]+)([ \t]*)(=?)/g,["sh_type","sh_normal","sh_symbol"],-1],[/"/g,"sh_string",3]],[[/$/g,null,-2]],[[/\*\//g,"sh_comment",-2],[/(?:<?)[A-Za-z0-9_\.\/\-_~]+@[A-Za-z0-9_\.\/\-_~]+(?:>?)|(?:<?)[A-Za-z0-9_]+:\/\/[A-Za-z0-9_\.\/\-_~]+(?:>?)/g,"sh_url",-1],[/<\?xml/g,"sh_preproc",2,1],[/<!DOCTYPE/g,"sh_preproc",4,1],[/<!--/g,"sh_comment",5],[/<(?:\/)?[A-Za-z](?:[A-Za-z0-9_:.-]*)(?:\/)?>/g,"sh_keyword",-1],[/<(?:\/)?[A-Za-z](?:[A-Za-z0-9_:.-]*)/g,"sh_keyword",6,1],[/&(?:[A-Za-z0-9]+);/g,"sh_preproc",-1],[/<(?:\/)?[A-Za-z][A-Za-z0-9]*(?:\/)?>/g,"sh_keyword",-1],[/<(?:\/)?[A-Za-z][A-Za-z0-9]*/g,"sh_keyword",6,1],[/@[A-Za-z]+/g,"sh_type",-1],[/(?:TODO|FIXME|BUG)(?:[:]?)/g,"sh_todo",-1]],[[/\*\//g,"sh_comment",-2],[/(?:<?)[A-Za-z0-9_\.\/\-_~]+@[A-Za-z0-9_\.\/\-_~]+(?:>?)|(?:<?)[A-Za-z0-9_]+:\/\/[A-Za-z0-9_\.\/\-_~]+(?:>?)/g,"sh_url",-1],[/(?:TODO|FIXME|BUG)(?:[:]?)/g,"sh_todo",-1]],[[/$/g,null,-2],[/</g,"sh_string",11],[/"/g,"sh_string",12],[/\/\/\//g,"sh_comment",1],[/\/\//g,"sh_comment",7],[/\/\*\*/g,"sh_comment",8],[/\/\*/g,"sh_comment",9]],[[/$/g,null,-2],[/>/g,"sh_string",-2]],[[/$/g,null,-2],[/\\(?:\\|")/g,null,-1],[/"/g,"sh_string",-2]],[[/"/g,"sh_string",-2],[/\\./g,"sh_specialchar",-1]],[[/'/g,"sh_string",-2],[/\\./g,"sh_specialchar",-1]]];if(!this.sh_languages){this.sh_languages={}}sh_languages.css=[[[/\/\/\//g,"sh_comment",1],[/\/\//g,"sh_comment",7],[/\/\*\*/g,"sh_comment",8],[/\/\*/g,"sh_comment",9],[/(?:\.|#)[A-Za-z0-9_]+/g,"sh_selector",-1],[/\{/g,"sh_cbracket",10,1],[/~|!|%|\^|\*|\(|\)|-|\+|=|\[|\]|\\|:|;|,|\.|\/|\?|&|<|>|\|/g,"sh_symbol",-1]],[[/$/g,null,-2],[/(?:<?)[A-Za-z0-9_\.\/\-_~]+@[A-Za-z0-9_\.\/\-_~]+(?:>?)|(?:<?)[A-Za-z0-9_]+:\/\/[A-Za-z0-9_\.\/\-_~]+(?:>?)/g,"sh_url",-1],[/<\?xml/g,"sh_preproc",2,1],[/<!DOCTYPE/g,"sh_preproc",4,1],[/<!--/g,"sh_comment",5],[/<(?:\/)?[A-Za-z](?:[A-Za-z0-9_:.-]*)(?:\/)?>/g,"sh_keyword",-1],[/<(?:\/)?[A-Za-z](?:[A-Za-z0-9_:.-]*)/g,"sh_keyword",6,1],[/&(?:[A-Za-z0-9]+);/g,"sh_preproc",-1],[/<(?:\/)?[A-Za-z][A-Za-z0-9]*(?:\/)?>/g,"sh_keyword",-1],[/<(?:\/)?[A-Za-z][A-Za-z0-9]*/g,"sh_keyword",6,1],[/@[A-Za-z]+/g,"sh_type",-1],[/(?:TODO|FIXME|BUG)(?:[:]?)/g,"sh_todo",-1]],[[/\?>/g,"sh_preproc",-2],[/([^=" \t>]+)([ \t]*)(=?)/g,["sh_type","sh_normal","sh_symbol"],-1],[/"/g,"sh_string",3]],[[/\\(?:\\|")/g,null,-1],[/"/g,"sh_string",-2]],[[/>/g,"sh_preproc",-2],[/([^=" \t>]+)([ \t]*)(=?)/g,["sh_type","sh_normal","sh_symbol"],-1],[/"/g,"sh_string",3]],[[/-->/g,"sh_comment",-2],[/<!--/g,"sh_comment",5]],[[/(?:\/)?>/g,"sh_keyword",-2],[/([^=" \t>]+)([ \t]*)(=?)/g,["sh_type","sh_normal","sh_symbol"],-1],[/"/g,"sh_string",3]],[[/$/g,null,-2]],[[/\*\//g,"sh_comment",-2],[/(?:<?)[A-Za-z0-9_\.\/\-_~]+@[A-Za-z0-9_\.\/\-_~]+(?:>?)|(?:<?)[A-Za-z0-9_]+:\/\/[A-Za-z0-9_\.\/\-_~]+(?:>?)/g,"sh_url",-1],[/<\?xml/g,"sh_preproc",2,1],[/<!DOCTYPE/g,"sh_preproc",4,1],[/<!--/g,"sh_comment",5],[/<(?:\/)?[A-Za-z](?:[A-Za-z0-9_:.-]*)(?:\/)?>/g,"sh_keyword",-1],[/<(?:\/)?[A-Za-z](?:[A-Za-z0-9_:.-]*)/g,"sh_keyword",6,1],[/&(?:[A-Za-z0-9]+);/g,"sh_preproc",-1],[/<(?:\/)?[A-Za-z][A-Za-z0-9]*(?:\/)?>/g,"sh_keyword",-1],[/<(?:\/)?[A-Za-z][A-Za-z0-9]*/g,"sh_keyword",6,1],[/@[A-Za-z]+/g,"sh_type",-1],[/(?:TODO|FIXME|BUG)(?:[:]?)/g,"sh_todo",-1]],[[/\*\//g,"sh_comment",-2],[/(?:<?)[A-Za-z0-9_\.\/\-_~]+@[A-Za-z0-9_\.\/\-_~]+(?:>?)|(?:<?)[A-Za-z0-9_]+:\/\/[A-Za-z0-9_\.\/\-_~]+(?:>?)/g,"sh_url",-1],[/(?:TODO|FIXME|BUG)(?:[:]?)/g,"sh_todo",-1]],[[/\}/g,"sh_cbracket",-2],[/\/\/\//g,"sh_comment",1],[/\/\//g,"sh_comment",7],[/\/\*\*/g,"sh_comment",8],[/\/\*/g,"sh_comment",9],[/[A-Za-z0-9_-]+[ \t]*:/g,"sh_property",-1],[/[.%A-Za-z0-9_-]+/g,"sh_value",-1],[/#(?:[A-Za-z0-9_]+)/g,"sh_string",-1]]];if(!this.sh_languages){this.sh_languages={}}sh_languages.flex=[[[/^%\{/g,"sh_preproc",1,1],[/^%[sx]/g,"sh_preproc",16,1],[/^%option/g,"sh_preproc",17,1],[/^%(?:array|pointer|[aceknopr])/g,"sh_preproc",-1],[/[A-Za-z_][A-Za-z0-9_-]*/g,"sh_preproc",19,1],[/^%%/g,"sh_preproc",20,1]],[[/^%\}/g,"sh_preproc",-2],[/(\b(?:class|struct|typename))([ \t]+)([A-Za-z0-9_]+)/g,["sh_keyword","sh_normal","sh_classname"],-1],[/\b(?:class|const_cast|delete|dynamic_cast|explicit|false|friend|inline|mutable|namespace|new|operator|private|protected|public|reinterpret_cast|static_cast|template|this|throw|true|try|typeid|typename|using|virtual)\b/g,"sh_keyword",-1],[/\/\/\//g,"sh_comment",2],[/\/\//g,"sh_comment",8],[/\/\*\*/g,"sh_comment",9],[/\/\*/g,"sh_comment",10],[/(\bstruct)([ \t]+)([A-Za-z0-9_]+)/g,["sh_keyword","sh_normal","sh_classname"],-1],[/^[ \t]*#(?:[ \t]*include)/g,"sh_preproc",11,1],[/^[ \t]*#(?:[ \t]*[A-Za-z0-9_]*)/g,"sh_preproc",-1],[/\b[+-]?(?:(?:0x[A-Fa-f0-9]+)|(?:(?:[\d]*\.)?[\d]+(?:[eE][+-]?[\d]+)?))u?(?:(?:int(?:8|16|32|64))|L)?\b/g,"sh_number",-1],[/"/g,"sh_string",14],[/'/g,"sh_string",15],[/\b(?:__asm|__cdecl|__declspec|__export|__far16|__fastcall|__fortran|__import|__pascal|__rtti|__stdcall|_asm|_cdecl|__except|_export|_far16|_fastcall|__finally|_fortran|_import|_pascal|_stdcall|__thread|__try|asm|auto|break|case|catch|cdecl|const|continue|default|do|else|enum|extern|for|goto|if|pascal|register|return|sizeof|static|struct|switch|typedef|union|volatile|while)\b/g,"sh_keyword",-1],[/\b(?:bool|char|double|float|int|long|short|signed|unsigned|void|wchar_t)\b/g,"sh_type",-1],[/~|!|%|\^|\*|\(|\)|-|\+|=|\[|\]|\\|:|;|,|\.|\/|\?|&|<|>|\|/g,"sh_symbol",-1],[/\{|\}/g,"sh_cbracket",-1],[/(?:[A-Za-z]|_)[A-Za-z0-9_]*(?=[ \t]*\()/g,"sh_function",-1],[/([A-Za-z](?:[^`~!@#$%&*()_=+{}|;:",<.>\/?'\\[\]\^\-\s]|[_])*)((?:<.*>)?)(\s+(?=[*&]*[A-Za-z][^`~!@#$%&*()_=+{}|;:",<.>\/?'\\[\]\^\-\s]*\s*[`~!@#$%&*()_=+{}|;:",<.>\/?'\\[\]\^\-\[\]]+))/g,["sh_usertype","sh_usertype","sh_normal"],-1]],[[/$/g,null,-2],[/(?:<?)[A-Za-z0-9_\.\/\-_~]+@[A-Za-z0-9_\.\/\-_~]+(?:>?)|(?:<?)[A-Za-z0-9_]+:\/\/[A-Za-z0-9_\.\/\-_~]+(?:>?)/g,"sh_url",-1],[/<\?xml/g,"sh_preproc",3,1],[/<!DOCTYPE/g,"sh_preproc",5,1],[/<!--/g,"sh_comment",6],[/<(?:\/)?[A-Za-z](?:[A-Za-z0-9_:.-]*)(?:\/)?>/g,"sh_keyword",-1],[/<(?:\/)?[A-Za-z](?:[A-Za-z0-9_:.-]*)/g,"sh_keyword",7,1],[/&(?:[A-Za-z0-9]+);/g,"sh_preproc",-1],[/<(?:\/)?[A-Za-z][A-Za-z0-9]*(?:\/)?>/g,"sh_keyword",-1],[/<(?:\/)?[A-Za-z][A-Za-z0-9]*/g,"sh_keyword",7,1],[/@[A-Za-z]+/g,"sh_type",-1],[/(?:TODO|FIXME|BUG)(?:[:]?)/g,"sh_todo",-1]],[[/\?>/g,"sh_preproc",-2],[/([^=" \t>]+)([ \t]*)(=?)/g,["sh_type","sh_normal","sh_symbol"],-1],[/"/g,"sh_string",4]],[[/\\(?:\\|")/g,null,-1],[/"/g,"sh_string",-2]],[[/>/g,"sh_preproc",-2],[/([^=" \t>]+)([ \t]*)(=?)/g,["sh_type","sh_normal","sh_symbol"],-1],[/"/g,"sh_string",4]],[[/-->/g,"sh_comment",-2],[/<!--/g,"sh_comment",6]],[[/(?:\/)?>/g,"sh_keyword",-2],[/([^=" \t>]+)([ \t]*)(=?)/g,["sh_type","sh_normal","sh_symbol"],-1],[/"/g,"sh_string",4]],[[/$/g,null,-2]],[[/\*\//g,"sh_comment",-2],[/(?:<?)[A-Za-z0-9_\.\/\-_~]+@[A-Za-z0-9_\.\/\-_~]+(?:>?)|(?:<?)[A-Za-z0-9_]+:\/\/[A-Za-z0-9_\.\/\-_~]+(?:>?)/g,"sh_url",-1],[/<\?xml/g,"sh_preproc",3,1],[/<!DOCTYPE/g,"sh_preproc",5,1],[/<!--/g,"sh_comment",6],[/<(?:\/)?[A-Za-z](?:[A-Za-z0-9_:.-]*)(?:\/)?>/g,"sh_keyword",-1],[/<(?:\/)?[A-Za-z](?:[A-Za-z0-9_:.-]*)/g,"sh_keyword",7,1],[/&(?:[A-Za-z0-9]+);/g,"sh_preproc",-1],[/<(?:\/)?[A-Za-z][A-Za-z0-9]*(?:\/)?>/g,"sh_keyword",-1],[/<(?:\/)?[A-Za-z][A-Za-z0-9]*/g,"sh_keyword",7,1],[/@[A-Za-z]+/g,"sh_type",-1],[/(?:TODO|FIXME|BUG)(?:[:]?)/g,"sh_todo",-1]],[[/\*\//g,"sh_comment",-2],[/(?:<?)[A-Za-z0-9_\.\/\-_~]+@[A-Za-z0-9_\.\/\-_~]+(?:>?)|(?:<?)[A-Za-z0-9_]+:\/\/[A-Za-z0-9_\.\/\-_~]+(?:>?)/g,"sh_url",-1],[/(?:TODO|FIXME|BUG)(?:[:]?)/g,"sh_todo",-1]],[[/$/g,null,-2],[/</g,"sh_string",12],[/"/g,"sh_string",13],[/\/\/\//g,"sh_comment",2],[/\/\//g,"sh_comment",8],[/\/\*\*/g,"sh_comment",9],[/\/\*/g,"sh_comment",10]],[[/$/g,null,-2],[/>/g,"sh_string",-2]],[[/$/g,null,-2],[/\\(?:\\|")/g,null,-1],[/"/g,"sh_string",-2]],[[/"/g,"sh_string",-2],[/\\./g,"sh_specialchar",-1]],[[/'/g,"sh_string",-2],[/\\./g,"sh_specialchar",-1]],[[/$/g,null,-2],[/[A-Za-z_][A-Za-z0-9_-]*/g,"sh_function",-1]],[[/$/g,null,-2],[/[A-Za-z_][A-Za-z0-9_-]*/g,"sh_keyword",-1],[/"/g,"sh_string",18],[/=/g,"sh_symbol",-1]],[[/$/g,null,-2],[/"/g,"sh_string",-2]],[[/$/g,null,-2],[/\{[A-Za-z_][A-Za-z0-9_-]*\}/g,"sh_type",-1],[/"/g,"sh_string",13],[/~|!|%|\^|\*|\(|\)|-|\+|=|\[|\]|\\|:|;|,|\.|\/|\?|&|<|>|\|/g,"sh_symbol",-1]],[[/^%%/g,"sh_preproc",21,1],[/<[A-Za-z_][A-Za-z0-9_-]*>/g,"sh_function",-1],[/"/g,"sh_string",13],[/\\./g,"sh_preproc",-1],[/\{[A-Za-z_][A-Za-z0-9_-]*\}/g,"sh_type",-1],[/\/\*/g,"sh_comment",22],[/\{/g,"sh_cbracket",23,1],[/~|!|%|\^|\*|\(|\)|-|\+|=|\[|\]|\\|:|;|,|\.|\/|\?|&|<|>|\|/g,"sh_symbol",-1]],[[/(\b(?:class|struct|typename))([ \t]+)([A-Za-z0-9_]+)/g,["sh_keyword","sh_normal","sh_classname"],-1],[/\b(?:class|const_cast|delete|dynamic_cast|explicit|false|friend|inline|mutable|namespace|new|operator|private|protected|public|reinterpret_cast|static_cast|template|this|throw|true|try|typeid|typename|using|virtual)\b/g,"sh_keyword",-1],[/\/\/\//g,"sh_comment",2],[/\/\//g,"sh_comment",8],[/\/\*\*/g,"sh_comment",9],[/\/\*/g,"sh_comment",10],[/(\bstruct)([ \t]+)([A-Za-z0-9_]+)/g,["sh_keyword","sh_normal","sh_classname"],-1],[/^[ \t]*#(?:[ \t]*include)/g,"sh_preproc",11,1],[/^[ \t]*#(?:[ \t]*[A-Za-z0-9_]*)/g,"sh_preproc",-1],[/\b[+-]?(?:(?:0x[A-Fa-f0-9]+)|(?:(?:[\d]*\.)?[\d]+(?:[eE][+-]?[\d]+)?))u?(?:(?:int(?:8|16|32|64))|L)?\b/g,"sh_number",-1],[/"/g,"sh_string",14],[/'/g,"sh_string",15],[/\b(?:__asm|__cdecl|__declspec|__export|__far16|__fastcall|__fortran|__import|__pascal|__rtti|__stdcall|_asm|_cdecl|__except|_export|_far16|_fastcall|__finally|_fortran|_import|_pascal|_stdcall|__thread|__try|asm|auto|break|case|catch|cdecl|const|continue|default|do|else|enum|extern|for|goto|if|pascal|register|return|sizeof|static|struct|switch|typedef|union|volatile|while)\b/g,"sh_keyword",-1],[/\b(?:bool|char|double|float|int|long|short|signed|unsigned|void|wchar_t)\b/g,"sh_type",-1],[/~|!|%|\^|\*|\(|\)|-|\+|=|\[|\]|\\|:|;|,|\.|\/|\?|&|<|>|\|/g,"sh_symbol",-1],[/\{|\}/g,"sh_cbracket",-1],[/(?:[A-Za-z]|_)[A-Za-z0-9_]*(?=[ \t]*\()/g,"sh_function",-1],[/([A-Za-z](?:[^`~!@#$%&*()_=+{}|;:",<.>\/?'\\[\]\^\-\s]|[_])*)((?:<.*>)?)(\s+(?=[*&]*[A-Za-z][^`~!@#$%&*()_=+{}|;:",<.>\/?'\\[\]\^\-\s]*\s*[`~!@#$%&*()_=+{}|;:",<.>\/?'\\[\]\^\-\[\]]+))/g,["sh_usertype","sh_usertype","sh_normal"],-1]],[[/\*\//g,"sh_comment",-2],[/\/\*/g,"sh_comment",22]],[[/\}/g,"sh_cbracket",-2],[/\{/g,"sh_cbracket",23,1],[/\$./g,"sh_variable",-1],[/(\b(?:class|struct|typename))([ \t]+)([A-Za-z0-9_]+)/g,["sh_keyword","sh_normal","sh_classname"],-1],[/\b(?:class|const_cast|delete|dynamic_cast|explicit|false|friend|inline|mutable|namespace|new|operator|private|protected|public|reinterpret_cast|static_cast|template|this|throw|true|try|typeid|typename|using|virtual)\b/g,"sh_keyword",-1],[/\/\/\//g,"sh_comment",2],[/\/\//g,"sh_comment",8],[/\/\*\*/g,"sh_comment",9],[/\/\*/g,"sh_comment",10],[/(\bstruct)([ \t]+)([A-Za-z0-9_]+)/g,["sh_keyword","sh_normal","sh_classname"],-1],[/^[ \t]*#(?:[ \t]*include)/g,"sh_preproc",11,1],[/^[ \t]*#(?:[ \t]*[A-Za-z0-9_]*)/g,"sh_preproc",-1],[/\b[+-]?(?:(?:0x[A-Fa-f0-9]+)|(?:(?:[\d]*\.)?[\d]+(?:[eE][+-]?[\d]+)?))u?(?:(?:int(?:8|16|32|64))|L)?\b/g,"sh_number",-1],[/"/g,"sh_string",14],[/'/g,"sh_string",15],[/\b(?:__asm|__cdecl|__declspec|__export|__far16|__fastcall|__fortran|__import|__pascal|__rtti|__stdcall|_asm|_cdecl|__except|_export|_far16|_fastcall|__finally|_fortran|_import|_pascal|_stdcall|__thread|__try|asm|auto|break|case|catch|cdecl|const|continue|default|do|else|enum|extern|for|goto|if|pascal|register|return|sizeof|static|struct|switch|typedef|union|volatile|while)\b/g,"sh_keyword",-1],[/\b(?:bool|char|double|float|int|long|short|signed|unsigned|void|wchar_t)\b/g,"sh_type",-1],[/~|!|%|\^|\*|\(|\)|-|\+|=|\[|\]|\\|:|;|,|\.|\/|\?|&|<|>|\|/g,"sh_symbol",-1],[/\{|\}/g,"sh_cbracket",-1],[/(?:[A-Za-z]|_)[A-Za-z0-9_]*(?=[ \t]*\()/g,"sh_function",-1],[/([A-Za-z](?:[^`~!@#$%&*()_=+{}|;:",<.>\/?'\\[\]\^\-\s]|[_])*)((?:<.*>)?)(\s+(?=[*&]*[A-Za-z][^`~!@#$%&*()_=+{}|;:",<.>\/?'\\[\]\^\-\s]*\s*[`~!@#$%&*()_=+{}|;:",<.>\/?'\\[\]\^\-\[\]]+))/g,["sh_usertype","sh_usertype","sh_normal"],-1]]];if(!this.sh_languages){this.sh_languages={}}sh_languages.html=[[[/<\?xml/g,"sh_preproc",1,1],[/<!DOCTYPE/g,"sh_preproc",3,1],[/<!--/g,"sh_comment",4],[/<(?:\/)?[A-Za-z](?:[A-Za-z0-9_:.-]*)(?:\/)?>/g,"sh_keyword",-1],[/<(?:\/)?[A-Za-z](?:[A-Za-z0-9_:.-]*)/g,"sh_keyword",5,1],[/&(?:[A-Za-z0-9]+);/g,"sh_preproc",-1],[/<(?:\/)?[A-Za-z][A-Za-z0-9]*(?:\/)?>/g,"sh_keyword",-1],[/<(?:\/)?[A-Za-z][A-Za-z0-9]*/g,"sh_keyword",5,1]],[[/\?>/g,"sh_preproc",-2],[/([^=" \t>]+)([ \t]*)(=?)/g,["sh_type","sh_normal","sh_symbol"],-1],[/"/g,"sh_string",2]],[[/\\(?:\\|")/g,null,-1],[/"/g,"sh_string",-2]],[[/>/g,"sh_preproc",-2],[/([^=" \t>]+)([ \t]*)(=?)/g,["sh_type","sh_normal","sh_symbol"],-1],[/"/g,"sh_string",2]],[[/-->/g,"sh_comment",-2],[/<!--/g,"sh_comment",4]],[[/(?:\/)?>/g,"sh_keyword",-2],[/([^=" \t>]+)([ \t]*)(=?)/g,["sh_type","sh_normal","sh_symbol"],-1],[/"/g,"sh_string",2]]];if(!this.sh_languages){this.sh_languages={}}sh_languages.java=[[[/\b(?:import|package)\b/g,"sh_preproc",-1],[/\/\/\//g,"sh_comment",1],[/\/\//g,"sh_comment",7],[/\/\*\*/g,"sh_comment",8],[/\/\*/g,"sh_comment",9],[/\b[+-]?(?:(?:0x[A-Fa-f0-9]+)|(?:(?:[\d]*\.)?[\d]+(?:[eE][+-]?[\d]+)?))u?(?:(?:int(?:8|16|32|64))|L)?\b/g,"sh_number",-1],[/"/g,"sh_string",10],[/'/g,"sh_string",11],[/(\b(?:class|interface))([ \t]+)([$A-Za-z0-9_]+)/g,["sh_keyword","sh_normal","sh_classname"],-1],[/\b(?:abstract|assert|break|case|catch|class|const|continue|default|do|else|extends|false|final|finally|for|goto|if|implements|instanceof|interface|native|new|null|private|protected|public|return|static|strictfp|super|switch|synchronized|throw|throws|true|this|transient|try|volatile|while)\b/g,"sh_keyword",-1],[/\b(?:int|byte|boolean|char|long|float|double|short|void)\b/g,"sh_type",-1],[/~|!|%|\^|\*|\(|\)|-|\+|=|\[|\]|\\|:|;|,|\.|\/|\?|&|<|>|\|/g,"sh_symbol",-1],[/\{|\}/g,"sh_cbracket",-1],[/(?:[A-Za-z]|_)[A-Za-z0-9_]*(?=[ \t]*\()/g,"sh_function",-1],[/([A-Za-z](?:[^`~!@#$%&*()_=+{}|;:",<.>\/?'\\[\]\^\-\s]|[_])*)((?:<.*>)?)(\s+(?=[*&]*[A-Za-z][^`~!@#$%&*()_=+{}|;:",<.>\/?'\\[\]\^\-\s]*\s*[`~!@#$%&*()_=+{}|;:",<.>\/?'\\[\]\^\-\[\]]+))/g,["sh_usertype","sh_usertype","sh_normal"],-1]],[[/$/g,null,-2],[/(?:<?)[A-Za-z0-9_\.\/\-_~]+@[A-Za-z0-9_\.\/\-_~]+(?:>?)|(?:<?)[A-Za-z0-9_]+:\/\/[A-Za-z0-9_\.\/\-_~]+(?:>?)/g,"sh_url",-1],[/<\?xml/g,"sh_preproc",2,1],[/<!DOCTYPE/g,"sh_preproc",4,1],[/<!--/g,"sh_comment",5],[/<(?:\/)?[A-Za-z](?:[A-Za-z0-9_:.-]*)(?:\/)?>/g,"sh_keyword",-1],[/<(?:\/)?[A-Za-z](?:[A-Za-z0-9_:.-]*)/g,"sh_keyword",6,1],[/&(?:[A-Za-z0-9]+);/g,"sh_preproc",-1],[/<(?:\/)?[A-Za-z][A-Za-z0-9]*(?:\/)?>/g,"sh_keyword",-1],[/<(?:\/)?[A-Za-z][A-Za-z0-9]*/g,"sh_keyword",6,1],[/@[A-Za-z]+/g,"sh_type",-1],[/(?:TODO|FIXME|BUG)(?:[:]?)/g,"sh_todo",-1]],[[/\?>/g,"sh_preproc",-2],[/([^=" \t>]+)([ \t]*)(=?)/g,["sh_type","sh_normal","sh_symbol"],-1],[/"/g,"sh_string",3]],[[/\\(?:\\|")/g,null,-1],[/"/g,"sh_string",-2]],[[/>/g,"sh_preproc",-2],[/([^=" \t>]+)([ \t]*)(=?)/g,["sh_type","sh_normal","sh_symbol"],-1],[/"/g,"sh_string",3]],[[/-->/g,"sh_comment",-2],[/<!--/g,"sh_comment",5]],[[/(?:\/)?>/g,"sh_keyword",-2],[/([^=" \t>]+)([ \t]*)(=?)/g,["sh_type","sh_normal","sh_symbol"],-1],[/"/g,"sh_string",3]],[[/$/g,null,-2]],[[/\*\//g,"sh_comment",-2],[/(?:<?)[A-Za-z0-9_\.\/\-_~]+@[A-Za-z0-9_\.\/\-_~]+(?:>?)|(?:<?)[A-Za-z0-9_]+:\/\/[A-Za-z0-9_\.\/\-_~]+(?:>?)/g,"sh_url",-1],[/<\?xml/g,"sh_preproc",2,1],[/<!DOCTYPE/g,"sh_preproc",4,1],[/<!--/g,"sh_comment",5],[/<(?:\/)?[A-Za-z](?:[A-Za-z0-9_:.-]*)(?:\/)?>/g,"sh_keyword",-1],[/<(?:\/)?[A-Za-z](?:[A-Za-z0-9_:.-]*)/g,"sh_keyword",6,1],[/&(?:[A-Za-z0-9]+);/g,"sh_preproc",-1],[/<(?:\/)?[A-Za-z][A-Za-z0-9]*(?:\/)?>/g,"sh_keyword",-1],[/<(?:\/)?[A-Za-z][A-Za-z0-9]*/g,"sh_keyword",6,1],[/@[A-Za-z]+/g,"sh_type",-1],[/(?:TODO|FIXME|BUG)(?:[:]?)/g,"sh_todo",-1]],[[/\*\//g,"sh_comment",-2],[/(?:<?)[A-Za-z0-9_\.\/\-_~]+@[A-Za-z0-9_\.\/\-_~]+(?:>?)|(?:<?)[A-Za-z0-9_]+:\/\/[A-Za-z0-9_\.\/\-_~]+(?:>?)/g,"sh_url",-1],[/(?:TODO|FIXME|BUG)(?:[:]?)/g,"sh_todo",-1]],[[/"/g,"sh_string",-2],[/\\./g,"sh_specialchar",-1]],[[/'/g,"sh_string",-2],[/\\./g,"sh_specialchar",-1]]];if(!this.sh_languages){this.sh_languages={}}sh_languages.javascript=[[[/\/\/\//g,"sh_comment",1],[/\/\//g,"sh_comment",7],[/\/\*\*/g,"sh_comment",8],[/\/\*/g,"sh_comment",9],[/\b(?:abstract|break|case|catch|class|const|continue|debugger|default|delete|do|else|enum|export|extends|false|final|finally|for|function|goto|if|implements|in|instanceof|interface|native|new|null|private|protected|prototype|public|return|static|super|switch|synchronized|throw|throws|this|transient|true|try|typeof|var|volatile|while|with)\b/g,"sh_keyword",-1],[/(\+\+|--|\)|\])(\s*)(\/=?(?![*\/]))/g,["sh_symbol","sh_normal","sh_symbol"],-1],[/(0x[A-Fa-f0-9]+|(?:[\d]*\.)?[\d]+(?:[eE][+-]?[\d]+)?)(\s*)(\/(?![*\/]))/g,["sh_number","sh_normal","sh_symbol"],-1],[/([A-Za-z$_][A-Za-z0-9$_]*\s*)(\/=?(?![*\/]))/g,["sh_normal","sh_symbol"],-1],[/\/(?:\\.|[^*\\\/])(?:\\.|[^\\\/])*\/[gim]*/g,"sh_regexp",-1],[/\b[+-]?(?:(?:0x[A-Fa-f0-9]+)|(?:(?:[\d]*\.)?[\d]+(?:[eE][+-]?[\d]+)?))u?(?:(?:int(?:8|16|32|64))|L)?\b/g,"sh_number",-1],[/"/g,"sh_string",10],[/'/g,"sh_string",11],[/~|!|%|\^|\*|\(|\)|-|\+|=|\[|\]|\\|:|;|,|\.|\/|\?|&|<|>|\|/g,"sh_symbol",-1],[/\{|\}/g,"sh_cbracket",-1],[/\b(?:Math|Infinity|NaN|undefined|arguments)\b/g,"sh_predef_var",-1],[/\b(?:Array|Boolean|Date|Error|EvalError|Function|Number|Object|RangeError|ReferenceError|RegExp|String|SyntaxError|TypeError|URIError|decodeURI|decodeURIComponent|encodeURI|encodeURIComponent|eval|isFinite|isNaN|parseFloat|parseInt)\b/g,"sh_predef_func",-1],[/(?:[A-Za-z]|_)[A-Za-z0-9_]*(?=[ \t]*\()/g,"sh_function",-1]],[[/$/g,null,-2],[/(?:<?)[A-Za-z0-9_\.\/\-_~]+@[A-Za-z0-9_\.\/\-_~]+(?:>?)|(?:<?)[A-Za-z0-9_]+:\/\/[A-Za-z0-9_\.\/\-_~]+(?:>?)/g,"sh_url",-1],[/<\?xml/g,"sh_preproc",2,1],[/<!DOCTYPE/g,"sh_preproc",4,1],[/<!--/g,"sh_comment",5],[/<(?:\/)?[A-Za-z](?:[A-Za-z0-9_:.-]*)(?:\/)?>/g,"sh_keyword",-1],[/<(?:\/)?[A-Za-z](?:[A-Za-z0-9_:.-]*)/g,"sh_keyword",6,1],[/&(?:[A-Za-z0-9]+);/g,"sh_preproc",-1],[/<(?:\/)?[A-Za-z][A-Za-z0-9]*(?:\/)?>/g,"sh_keyword",-1],[/<(?:\/)?[A-Za-z][A-Za-z0-9]*/g,"sh_keyword",6,1],[/@[A-Za-z]+/g,"sh_type",-1],[/(?:TODO|FIXME|BUG)(?:[:]?)/g,"sh_todo",-1]],[[/\?>/g,"sh_preproc",-2],[/([^=" \t>]+)([ \t]*)(=?)/g,["sh_type","sh_normal","sh_symbol"],-1],[/"/g,"sh_string",3]],[[/\\(?:\\|")/g,null,-1],[/"/g,"sh_string",-2]],[[/>/g,"sh_preproc",-2],[/([^=" \t>]+)([ \t]*)(=?)/g,["sh_type","sh_normal","sh_symbol"],-1],[/"/g,"sh_string",3]],[[/-->/g,"sh_comment",-2],[/<!--/g,"sh_comment",5]],[[/(?:\/)?>/g,"sh_keyword",-2],[/([^=" \t>]+)([ \t]*)(=?)/g,["sh_type","sh_normal","sh_symbol"],-1],[/"/g,"sh_string",3]],[[/$/g,null,-2]],[[/\*\//g,"sh_comment",-2],[/(?:<?)[A-Za-z0-9_\.\/\-_~]+@[A-Za-z0-9_\.\/\-_~]+(?:>?)|(?:<?)[A-Za-z0-9_]+:\/\/[A-Za-z0-9_\.\/\-_~]+(?:>?)/g,"sh_url",-1],[/<\?xml/g,"sh_preproc",2,1],[/<!DOCTYPE/g,"sh_preproc",4,1],[/<!--/g,"sh_comment",5],[/<(?:\/)?[A-Za-z](?:[A-Za-z0-9_:.-]*)(?:\/)?>/g,"sh_keyword",-1],[/<(?:\/)?[A-Za-z](?:[A-Za-z0-9_:.-]*)/g,"sh_keyword",6,1],[/&(?:[A-Za-z0-9]+);/g,"sh_preproc",-1],[/<(?:\/)?[A-Za-z][A-Za-z0-9]*(?:\/)?>/g,"sh_keyword",-1],[/<(?:\/)?[A-Za-z][A-Za-z0-9]*/g,"sh_keyword",6,1],[/@[A-Za-z]+/g,"sh_type",-1],[/(?:TODO|FIXME|BUG)(?:[:]?)/g,"sh_todo",-1]],[[/\*\//g,"sh_comment",-2],[/(?:<?)[A-Za-z0-9_\.\/\-_~]+@[A-Za-z0-9_\.\/\-_~]+(?:>?)|(?:<?)[A-Za-z0-9_]+:\/\/[A-Za-z0-9_\.\/\-_~]+(?:>?)/g,"sh_url",-1],[/(?:TODO|FIXME|BUG)(?:[:]?)/g,"sh_todo",-1]],[[/"/g,"sh_string",-2],[/\\./g,"sh_specialchar",-1]],[[/'/g,"sh_string",-2],[/\\./g,"sh_specialchar",-1]]];if(!this.sh_languages){this.sh_languages={}}sh_languages.javascript_dom=[[[/\/\/\//g,"sh_comment",1],[/\/\//g,"sh_comment",7],[/\/\*\*/g,"sh_comment",8],[/\/\*/g,"sh_comment",9],[/\b(?:abstract|break|case|catch|class|const|continue|debugger|default|delete|do|else|enum|export|extends|false|final|finally|for|function|goto|if|implements|in|instanceof|interface|native|new|null|private|protected|prototype|public|return|static|super|switch|synchronized|throw|throws|this|transient|true|try|typeof|var|volatile|while|with)\b/g,"sh_keyword",-1],[/(\+\+|--|\)|\])(\s*)(\/=?(?![*\/]))/g,["sh_symbol","sh_normal","sh_symbol"],-1],[/(0x[A-Fa-f0-9]+|(?:[\d]*\.)?[\d]+(?:[eE][+-]?[\d]+)?)(\s*)(\/(?![*\/]))/g,["sh_number","sh_normal","sh_symbol"],-1],[/([A-Za-z$_][A-Za-z0-9$_]*\s*)(\/=?(?![*\/]))/g,["sh_normal","sh_symbol"],-1],[/\/(?:\\.|[^*\\\/])(?:\\.|[^\\\/])*\/[gim]*/g,"sh_regexp",-1],[/\b[+-]?(?:(?:0x[A-Fa-f0-9]+)|(?:(?:[\d]*\.)?[\d]+(?:[eE][+-]?[\d]+)?))u?(?:(?:int(?:8|16|32|64))|L)?\b/g,"sh_number",-1],[/"/g,"sh_string",10],[/'/g,"sh_string",11],[/~|!|%|\^|\*|\(|\)|-|\+|=|\[|\]|\\|:|;|,|\.|\/|\?|&|<|>|\|/g,"sh_symbol",-1],[/\{|\}/g,"sh_cbracket",-1],[/\b(?:Math|Infinity|NaN|undefined|arguments)\b/g,"sh_predef_var",-1],[/\b(?:Array|Boolean|Date|Error|EvalError|Function|Number|Object|RangeError|ReferenceError|RegExp|String|SyntaxError|TypeError|URIError|decodeURI|decodeURIComponent|encodeURI|encodeURIComponent|eval|isFinite|isNaN|parseFloat|parseInt)\b/g,"sh_predef_func",-1],[/\b(?:applicationCache|closed|Components|content|controllers|crypto|defaultStatus|dialogArguments|directories|document|frameElement|frames|fullScreen|globalStorage|history|innerHeight|innerWidth|length|location|locationbar|menubar|name|navigator|opener|outerHeight|outerWidth|pageXOffset|pageYOffset|parent|personalbar|pkcs11|returnValue|screen|availTop|availLeft|availHeight|availWidth|colorDepth|height|left|pixelDepth|top|width|screenX|screenY|scrollbars|scrollMaxX|scrollMaxY|scrollX|scrollY|self|sessionStorage|sidebar|status|statusbar|toolbar|top|window)\b/g,"sh_predef_var",-1],[/\b(?:alert|addEventListener|atob|back|blur|btoa|captureEvents|clearInterval|clearTimeout|close|confirm|dump|escape|find|focus|forward|getAttention|getComputedStyle|getSelection|home|moveBy|moveTo|open|openDialog|postMessage|print|prompt|releaseEvents|removeEventListener|resizeBy|resizeTo|scroll|scrollBy|scrollByLines|scrollByPages|scrollTo|setInterval|setTimeout|showModalDialog|sizeToContent|stop|unescape|updateCommands|onabort|onbeforeunload|onblur|onchange|onclick|onclose|oncontextmenu|ondragdrop|onerror|onfocus|onkeydown|onkeypress|onkeyup|onload|onmousedown|onmousemove|onmouseout|onmouseover|onmouseup|onpaint|onreset|onresize|onscroll|onselect|onsubmit|onunload)\b/g,"sh_predef_func",-1],[/(?:[A-Za-z]|_)[A-Za-z0-9_]*(?=[ \t]*\()/g,"sh_function",-1]],[[/$/g,null,-2],[/(?:<?)[A-Za-z0-9_\.\/\-_~]+@[A-Za-z0-9_\.\/\-_~]+(?:>?)|(?:<?)[A-Za-z0-9_]+:\/\/[A-Za-z0-9_\.\/\-_~]+(?:>?)/g,"sh_url",-1],[/<\?xml/g,"sh_preproc",2,1],[/<!DOCTYPE/g,"sh_preproc",4,1],[/<!--/g,"sh_comment",5],[/<(?:\/)?[A-Za-z](?:[A-Za-z0-9_:.-]*)(?:\/)?>/g,"sh_keyword",-1],[/<(?:\/)?[A-Za-z](?:[A-Za-z0-9_:.-]*)/g,"sh_keyword",6,1],[/&(?:[A-Za-z0-9]+);/g,"sh_preproc",-1],[/<(?:\/)?[A-Za-z][A-Za-z0-9]*(?:\/)?>/g,"sh_keyword",-1],[/<(?:\/)?[A-Za-z][A-Za-z0-9]*/g,"sh_keyword",6,1],[/@[A-Za-z]+/g,"sh_type",-1],[/(?:TODO|FIXME|BUG)(?:[:]?)/g,"sh_todo",-1]],[[/\?>/g,"sh_preproc",-2],[/([^=" \t>]+)([ \t]*)(=?)/g,["sh_type","sh_normal","sh_symbol"],-1],[/"/g,"sh_string",3]],[[/\\(?:\\|")/g,null,-1],[/"/g,"sh_string",-2]],[[/>/g,"sh_preproc",-2],[/([^=" \t>]+)([ \t]*)(=?)/g,["sh_type","sh_normal","sh_symbol"],-1],[/"/g,"sh_string",3]],[[/-->/g,"sh_comment",-2],[/<!--/g,"sh_comment",5]],[[/(?:\/)?>/g,"sh_keyword",-2],[/([^=" \t>]+)([ \t]*)(=?)/g,["sh_type","sh_normal","sh_symbol"],-1],[/"/g,"sh_string",3]],[[/$/g,null,-2]],[[/\*\//g,"sh_comment",-2],[/(?:<?)[A-Za-z0-9_\.\/\-_~]+@[A-Za-z0-9_\.\/\-_~]+(?:>?)|(?:<?)[A-Za-z0-9_]+:\/\/[A-Za-z0-9_\.\/\-_~]+(?:>?)/g,"sh_url",-1],[/<\?xml/g,"sh_preproc",2,1],[/<!DOCTYPE/g,"sh_preproc",4,1],[/<!--/g,"sh_comment",5],[/<(?:\/)?[A-Za-z](?:[A-Za-z0-9_:.-]*)(?:\/)?>/g,"sh_keyword",-1],[/<(?:\/)?[A-Za-z](?:[A-Za-z0-9_:.-]*)/g,"sh_keyword",6,1],[/&(?:[A-Za-z0-9]+);/g,"sh_preproc",-1],[/<(?:\/)?[A-Za-z][A-Za-z0-9]*(?:\/)?>/g,"sh_keyword",-1],[/<(?:\/)?[A-Za-z][A-Za-z0-9]*/g,"sh_keyword",6,1],[/@[A-Za-z]+/g,"sh_type",-1],[/(?:TODO|FIXME|BUG)(?:[:]?)/g,"sh_todo",-1]],[[/\*\//g,"sh_comment",-2],[/(?:<?)[A-Za-z0-9_\.\/\-_~]+@[A-Za-z0-9_\.\/\-_~]+(?:>?)|(?:<?)[A-Za-z0-9_]+:\/\/[A-Za-z0-9_\.\/\-_~]+(?:>?)/g,"sh_url",-1],[/(?:TODO|FIXME|BUG)(?:[:]?)/g,"sh_todo",-1]],[[/"/g,"sh_string",-2],[/\\./g,"sh_specialchar",-1]],[[/'/g,"sh_string",-2],[/\\./g,"sh_specialchar",-1]]];if(!this.sh_languages){this.sh_languages={}}sh_languages.perl=[[[/\b(?:import)\b/g,"sh_preproc",-1],[/(s)(\{(?:\\\}|[^}])*\}\{(?:\\\}|[^}])*\})([ixsmogce]*)/g,["sh_keyword","sh_regexp","sh_keyword"],-1],[/(s)(\((?:\\\)|[^)])*\)\((?:\\\)|[^)])*\))([ixsmogce]*)/g,["sh_keyword","sh_regexp","sh_keyword"],-1],[/(s)(\[(?:\\\]|[^\]])*\]\[(?:\\\]|[^\]])*\])([ixsmogce]*)/g,["sh_keyword","sh_regexp","sh_keyword"],-1],[/(s)(<.*><.*>)([ixsmogce]*)/g,["sh_keyword","sh_regexp","sh_keyword"],-1],[/(q(?:q?))(\{(?:\\\}|[^}])*\})/g,["sh_keyword","sh_string"],-1],[/(q(?:q?))(\((?:\\\)|[^)])*\))/g,["sh_keyword","sh_string"],-1],[/(q(?:q?))(\[(?:\\\]|[^\]])*\])/g,["sh_keyword","sh_string"],-1],[/(q(?:q?))(<.*>)/g,["sh_keyword","sh_string"],-1],[/(q(?:q?))([^A-Za-z0-9 \t])(.*\2)/g,["sh_keyword","sh_string","sh_string"],-1],[/(s)([^A-Za-z0-9 \t])(.*\2.*\2)([ixsmogce]*(?=[ \t]*(?:\)|;)))/g,["sh_keyword","sh_regexp","sh_regexp","sh_keyword"],-1],[/(s)([^A-Za-z0-9 \t])(.*\2[ \t]*)([^A-Za-z0-9 \t])(.*\4)([ixsmogce]*(?=[ \t]*(?:\)|;)))/g,["sh_keyword","sh_regexp","sh_regexp","sh_regexp","sh_regexp","sh_keyword"],-1],[/#/g,"sh_comment",1],[/\b[+-]?(?:(?:0x[A-Fa-f0-9]+)|(?:(?:[\d]*\.)?[\d]+(?:[eE][+-]?[\d]+)?))u?(?:(?:int(?:8|16|32|64))|L)?\b/g,"sh_number",-1],[/(?:m|qr)(?=\{)/g,"sh_keyword",2],[/(?:m|qr)(?=#)/g,"sh_keyword",4],[/(?:m|qr)(?=\|)/g,"sh_keyword",6],[/(?:m|qr)(?=@)/g,"sh_keyword",8],[/(?:m|qr)(?=<)/g,"sh_keyword",10],[/(?:m|qr)(?=\[)/g,"sh_keyword",12],[/(?:m|qr)(?=\\)/g,"sh_keyword",14],[/(?:m|qr)(?=\/)/g,"sh_keyword",16],[/"/g,"sh_string",18],[/'/g,"sh_string",19],[/</g,"sh_string",20],[/\/[^\n]*\//g,"sh_string",-1],[/\b(?:chomp|chop|chr|crypt|hex|i|index|lc|lcfirst|length|oct|ord|pack|q|qq|reverse|rindex|sprintf|substr|tr|uc|ucfirst|m|s|g|qw|abs|atan2|cos|exp|hex|int|log|oct|rand|sin|sqrt|srand|my|local|our|delete|each|exists|keys|values|pack|read|syscall|sysread|syswrite|unpack|vec|undef|unless|return|length|grep|sort|caller|continue|dump|eval|exit|goto|last|next|redo|sub|wantarray|pop|push|shift|splice|unshift|split|switch|join|defined|foreach|last|chop|chomp|bless|dbmclose|dbmopen|ref|tie|tied|untie|while|next|map|eq|die|cmp|lc|uc|and|do|if|else|elsif|for|use|require|package|import|chdir|chmod|chown|chroot|fcntl|glob|ioctl|link|lstat|mkdir|open|opendir|readlink|rename|rmdir|stat|symlink|umask|unlink|utime|binmode|close|closedir|dbmclose|dbmopen|die|eof|fileno|flock|format|getc|print|printf|read|readdir|rewinddir|seek|seekdir|select|syscall|sysread|sysseek|syswrite|tell|telldir|truncate|warn|write|alarm|exec|fork|getpgrp|getppid|getpriority|kill|pipe|qx|setpgrp|setpriority|sleep|system|times|x|wait|waitpid)\b/g,"sh_keyword",-1],[/^\=(?:head1|head2|item)/g,"sh_comment",21],[/(?:\$[#]?|@|%)[\/A-Za-z0-9_]+/g,"sh_variable",-1],[/~|!|%|\^|\*|\(|\)|-|\+|=|\[|\]|\\|:|;|,|\.|\/|\?|&|<|>|\|/g,"sh_symbol",-1],[/\{|\}/g,"sh_cbracket",-1],[/(?:[A-Za-z]|_)[A-Za-z0-9_]*(?=[ \t]*\()/g,"sh_function",-1]],[[/$/g,null,-2]],[[/\{/g,"sh_regexp",3]],[[/[ \t]+#.*/g,"sh_comment",-1],[/\$(?:[A-Za-z0-9_]+|\{[A-Za-z0-9_]+\})/g,"sh_variable",-1],[/\\\{|\\\}|\}/g,"sh_regexp",-3]],[[/#/g,"sh_regexp",5]],[[/[ \t]+#.*/g,"sh_comment",-1],[/\$(?:[A-Za-z0-9_]+|\{[A-Za-z0-9_]+\})/g,"sh_variable",-1],[/\\#|#/g,"sh_regexp",-3]],[[/\|/g,"sh_regexp",7]],[[/[ \t]+#.*/g,"sh_comment",-1],[/\$(?:[A-Za-z0-9_]+|\{[A-Za-z0-9_]+\})/g,"sh_variable",-1],[/\\\||\|/g,"sh_regexp",-3]],[[/@/g,"sh_regexp",9]],[[/[ \t]+#.*/g,"sh_comment",-1],[/\$(?:[A-Za-z0-9_]+|\{[A-Za-z0-9_]+\})/g,"sh_variable",-1],[/\\@|@/g,"sh_regexp",-3]],[[/</g,"sh_regexp",11]],[[/[ \t]+#.*/g,"sh_comment",-1],[/\$(?:[A-Za-z0-9_]+|\{[A-Za-z0-9_]+\})/g,"sh_variable",-1],[/\\<|\\>|>/g,"sh_regexp",-3]],[[/\[/g,"sh_regexp",13]],[[/[ \t]+#.*/g,"sh_comment",-1],[/\$(?:[A-Za-z0-9_]+|\{[A-Za-z0-9_]+\})/g,"sh_variable",-1],[/\\]|\]/g,"sh_regexp",-3]],[[/\\/g,"sh_regexp",15]],[[/[ \t]+#.*/g,"sh_comment",-1],[/\$(?:[A-Za-z0-9_]+|\{[A-Za-z0-9_]+\})/g,"sh_variable",-1],[/\\\\|\\/g,"sh_regexp",-3]],[[/\//g,"sh_regexp",17]],[[/[ \t]+#.*/g,"sh_comment",-1],[/\$(?:[A-Za-z0-9_]+|\{[A-Za-z0-9_]+\})/g,"sh_variable",-1],[/\\\/|\//g,"sh_regexp",-3]],[[/$/g,null,-2],[/\\(?:\\|")/g,null,-1],[/"/g,"sh_string",-2]],[[/$/g,null,-2],[/\\(?:\\|')/g,null,-1],[/'/g,"sh_string",-2]],[[/$/g,null,-2],[/>/g,"sh_string",-2]],[[/\=cut/g,"sh_comment",-2]]];if(!this.sh_languages){this.sh_languages={}}sh_languages.php=[[[/\b(?:include|include_once|require|require_once)\b/g,"sh_preproc",-1],[/\/\//g,"sh_comment",1],[/#/g,"sh_comment",1],[/\b[+-]?(?:(?:0x[A-Fa-f0-9]+)|(?:(?:[\d]*\.)?[\d]+(?:[eE][+-]?[\d]+)?))u?(?:(?:int(?:8|16|32|64))|L)?\b/g,"sh_number",-1],[/"/g,"sh_string",2],[/'/g,"sh_string",3],[/\b(?:and|or|xor|__FILE__|exception|php_user_filter|__LINE__|array|as|break|case|cfunction|class|const|continue|declare|default|die|do|each|echo|else|elseif|empty|enddeclare|endfor|endforeach|endif|endswitch|endwhile|eval|exit|extends|for|foreach|function|global|if|isset|list|new|old_function|print|return|static|switch|unset|use|var|while|__FUNCTION__|__CLASS__|__METHOD__)\b/g,"sh_keyword",-1],[/\/\/\//g,"sh_comment",4],[/\/\//g,"sh_comment",1],[/\/\*\*/g,"sh_comment",9],[/\/\*/g,"sh_comment",10],[/(?:\$[#]?|@|%)[A-Za-z0-9_]+/g,"sh_variable",-1],[/<\?php|~|!|%|\^|\*|\(|\)|-|\+|=|\[|\]|\\|:|;|,|\.|\/|\?|&|<|>|\|/g,"sh_symbol",-1],[/\{|\}/g,"sh_cbracket",-1],[/(?:[A-Za-z]|_)[A-Za-z0-9_]*(?=[ \t]*\()/g,"sh_function",-1]],[[/$/g,null,-2]],[[/\\(?:\\|")/g,null,-1],[/"/g,"sh_string",-2]],[[/\\(?:\\|')/g,null,-1],[/'/g,"sh_string",-2]],[[/$/g,null,-2],[/(?:<?)[A-Za-z0-9_\.\/\-_~]+@[A-Za-z0-9_\.\/\-_~]+(?:>?)|(?:<?)[A-Za-z0-9_]+:\/\/[A-Za-z0-9_\.\/\-_~]+(?:>?)/g,"sh_url",-1],[/<\?xml/g,"sh_preproc",5,1],[/<!DOCTYPE/g,"sh_preproc",6,1],[/<!--/g,"sh_comment",7],[/<(?:\/)?[A-Za-z](?:[A-Za-z0-9_:.-]*)(?:\/)?>/g,"sh_keyword",-1],[/<(?:\/)?[A-Za-z](?:[A-Za-z0-9_:.-]*)/g,"sh_keyword",8,1],[/&(?:[A-Za-z0-9]+);/g,"sh_preproc",-1],[/<(?:\/)?[A-Za-z][A-Za-z0-9]*(?:\/)?>/g,"sh_keyword",-1],[/<(?:\/)?[A-Za-z][A-Za-z0-9]*/g,"sh_keyword",8,1],[/@[A-Za-z]+/g,"sh_type",-1],[/(?:TODO|FIXME|BUG)(?:[:]?)/g,"sh_todo",-1]],[[/\?>/g,"sh_preproc",-2],[/([^=" \t>]+)([ \t]*)(=?)/g,["sh_type","sh_normal","sh_symbol"],-1],[/"/g,"sh_string",2]],[[/>/g,"sh_preproc",-2],[/([^=" \t>]+)([ \t]*)(=?)/g,["sh_type","sh_normal","sh_symbol"],-1],[/"/g,"sh_string",2]],[[/-->/g,"sh_comment",-2],[/<!--/g,"sh_comment",7]],[[/(?:\/)?>/g,"sh_keyword",-2],[/([^=" \t>]+)([ \t]*)(=?)/g,["sh_type","sh_normal","sh_symbol"],-1],[/"/g,"sh_string",2]],[[/\*\//g,"sh_comment",-2],[/(?:<?)[A-Za-z0-9_\.\/\-_~]+@[A-Za-z0-9_\.\/\-_~]+(?:>?)|(?:<?)[A-Za-z0-9_]+:\/\/[A-Za-z0-9_\.\/\-_~]+(?:>?)/g,"sh_url",-1],[/<\?xml/g,"sh_preproc",5,1],[/<!DOCTYPE/g,"sh_preproc",6,1],[/<!--/g,"sh_comment",7],[/<(?:\/)?[A-Za-z](?:[A-Za-z0-9_:.-]*)(?:\/)?>/g,"sh_keyword",-1],[/<(?:\/)?[A-Za-z](?:[A-Za-z0-9_:.-]*)/g,"sh_keyword",8,1],[/&(?:[A-Za-z0-9]+);/g,"sh_preproc",-1],[/<(?:\/)?[A-Za-z][A-Za-z0-9]*(?:\/)?>/g,"sh_keyword",-1],[/<(?:\/)?[A-Za-z][A-Za-z0-9]*/g,"sh_keyword",8,1],[/@[A-Za-z]+/g,"sh_type",-1],[/(?:TODO|FIXME|BUG)(?:[:]?)/g,"sh_todo",-1]],[[/\*\//g,"sh_comment",-2],[/(?:<?)[A-Za-z0-9_\.\/\-_~]+@[A-Za-z0-9_\.\/\-_~]+(?:>?)|(?:<?)[A-Za-z0-9_]+:\/\/[A-Za-z0-9_\.\/\-_~]+(?:>?)/g,"sh_url",-1],[/(?:TODO|FIXME|BUG)(?:[:]?)/g,"sh_todo",-1]]];if(!this.sh_languages){this.sh_languages={}}sh_languages.python=[[[/\b(?:import|from)\b/g,"sh_preproc",-1],[/#/g,"sh_comment",1],[/\b[+-]?(?:(?:0x[A-Fa-f0-9]+)|(?:(?:[\d]*\.)?[\d]+(?:[eE][+-]?[\d]+)?))u?(?:(?:int(?:8|16|32|64))|L)?\b/g,"sh_number",-1],[/\b(?:and|assert|break|class|continue|def|del|elif|else|except|exec|finally|for|global|if|in|is|lambda|not|or|pass|print|raise|return|try|while)\b/g,"sh_keyword",-1],[/^(?:[\s]*'{3})/g,"sh_comment",2],[/^(?:[\s]*\"{3})/g,"sh_comment",3],[/^(?:[\s]*'(?:[^\\']|\\.)*'[\s]*|[\s]*\"(?:[^\\\"]|\\.)*\"[\s]*)$/g,"sh_comment",-1],[/(?:[\s]*'{3})/g,"sh_string",4],[/(?:[\s]*\"{3})/g,"sh_string",5],[/"/g,"sh_string",6],[/'/g,"sh_string",7],[/~|!|%|\^|\*|\(|\)|-|\+|=|\[|\]|\\|:|;|,|\.|\/|\?|&|<|>|\||\{|\}/g,"sh_symbol",-1],[/(?:[A-Za-z]|_)[A-Za-z0-9_]*(?=[ \t]*\()/g,"sh_function",-1]],[[/$/g,null,-2]],[[/(?:'{3})/g,"sh_comment",-2]],[[/(?:\"{3})/g,"sh_comment",-2]],[[/(?:'{3})/g,"sh_string",-2]],[[/(?:\"{3})/g,"sh_string",-2]],[[/$/g,null,-2],[/\\(?:\\|")/g,null,-1],[/"/g,"sh_string",-2]],[[/$/g,null,-2],[/\\(?:\\|')/g,null,-1],[/'/g,"sh_string",-2]]];if(!this.sh_languages){this.sh_languages={}}sh_languages.ruby=[[[/\b(?:require)\b/g,"sh_preproc",-1],[/\b[+-]?(?:(?:0x[A-Fa-f0-9]+)|(?:(?:[\d]*\.)?[\d]+(?:[eE][+-]?[\d]+)?))u?(?:(?:int(?:8|16|32|64))|L)?\b/g,"sh_number",-1],[/"/g,"sh_string",1],[/'/g,"sh_string",2],[/</g,"sh_string",3],[/\/[^\n]*\//g,"sh_regexp",-1],[/(%r)(\{(?:\\\}|#\{[A-Za-z0-9]+\}|[^}])*\})/g,["sh_symbol","sh_regexp"],-1],[/\b(?:alias|begin|BEGIN|break|case|defined|do|else|elsif|end|END|ensure|for|if|in|include|loop|next|raise|redo|rescue|retry|return|super|then|undef|unless|until|when|while|yield|false|nil|self|true|__FILE__|__LINE__|and|not|or|def|class|module|catch|fail|load|throw)\b/g,"sh_keyword",-1],[/(?:^\=begin)/g,"sh_comment",4],[/(?:\$[#]?|@@|@)(?:[A-Za-z0-9_]+|'|\"|\/)/g,"sh_type",-1],[/[A-Za-z0-9]+(?:\?|!)/g,"sh_normal",-1],[/~|!|%|\^|\*|\(|\)|-|\+|=|\[|\]|\\|:|;|,|\.|\/|\?|&|<|>|\|/g,"sh_symbol",-1],[/(#)(\{)/g,["sh_symbol","sh_cbracket"],-1],[/#/g,"sh_comment",5],[/\{|\}/g,"sh_cbracket",-1]],[[/$/g,null,-2],[/\\(?:\\|")/g,null,-1],[/"/g,"sh_string",-2]],[[/$/g,null,-2],[/\\(?:\\|')/g,null,-1],[/'/g,"sh_string",-2]],[[/$/g,null,-2],[/>/g,"sh_string",-2]],[[/^(?:\=end)/g,"sh_comment",-2]],[[/$/g,null,-2]]];if(!this.sh_languages){this.sh_languages={}}sh_languages.sql=[[[/\b(?:VARCHAR|TINYINT|TEXT|DATE|SMALLINT|MEDIUMINT|INT|BIGINT|FLOAT|DOUBLE|DECIMAL|DATETIME|TIMESTAMP|TIME|YEAR|UNSIGNED|CHAR|TINYBLOB|TINYTEXT|BLOB|MEDIUMBLOB|MEDIUMTEXT|LONGBLOB|LONGTEXT|ENUM|BOOL|BINARY|VARBINARY)\b/gi,"sh_type",-1],[/\b(?:ALL|ASC|AS|ALTER|AND|ADD|AUTO_INCREMENT|BETWEEN|BINARY|BOTH|BY|BOOLEAN|CHANGE|CHECK|COLUMNS|COLUMN|CROSS|CREATE|DATABASES|DATABASE|DATA|DELAYED|DESCRIBE|DESC|DISTINCT|DELETE|DROP|DEFAULT|ENCLOSED|ESCAPED|EXISTS|EXPLAIN|FIELDS|FIELD|FLUSH|FOR|FOREIGN|FUNCTION|FROM|GROUP|GRANT|HAVING|IGNORE|INDEX|INFILE|INSERT|INNER|INTO|IDENTIFIED|IN|IS|IF|JOIN|KEYS|KILL|KEY|LEADING|LIKE|LIMIT|LINES|LOAD|LOCAL|LOCK|LOW_PRIORITY|LEFT|LANGUAGE|MODIFY|NATURAL|NOT|NULL|NEXTVAL|OPTIMIZE|OPTION|OPTIONALLY|ORDER|OUTFILE|OR|OUTER|ON|PROCEDURE|PROCEDURAL|PRIMARY|READ|REFERENCES|REGEXP|RENAME|REPLACE|RETURN|REVOKE|RLIKE|RIGHT|SHOW|SONAME|STATUS|STRAIGHT_JOIN|SELECT|SETVAL|SET|TABLES|TERMINATED|TO|TRAILING|TRUNCATE|TABLE|TEMPORARY|TRIGGER|TRUSTED|UNIQUE|UNLOCK|USE|USING|UPDATE|VALUES|VARIABLES|VIEW|WITH|WRITE|WHERE|ZEROFILL|TYPE|XOR)\b/gi,"sh_keyword",-1],[/"/g,"sh_string",1],[/'/g,"sh_string",2],[/`/g,"sh_string",3],[/#/g,"sh_comment",4],[/\/\/\//g,"sh_comment",5],[/\/\//g,"sh_comment",4],[/\/\*\*/g,"sh_comment",11],[/\/\*/g,"sh_comment",12],[/--/g,"sh_comment",4],[/~|!|%|\^|\*|\(|\)|-|\+|=|\[|\]|\\|:|;|,|\.|\/|\?|&|<|>|\|/g,"sh_symbol",-1],[/\b[+-]?(?:(?:0x[A-Fa-f0-9]+)|(?:(?:[\d]*\.)?[\d]+(?:[eE][+-]?[\d]+)?))u?(?:(?:int(?:8|16|32|64))|L)?\b/g,"sh_number",-1]],[[/"/g,"sh_string",-2],[/\\./g,"sh_specialchar",-1]],[[/'/g,"sh_string",-2],[/\\./g,"sh_specialchar",-1]],[[/`/g,"sh_string",-2],[/\\./g,"sh_specialchar",-1]],[[/$/g,null,-2]],[[/$/g,null,-2],[/(?:<?)[A-Za-z0-9_\.\/\-_~]+@[A-Za-z0-9_\.\/\-_~]+(?:>?)|(?:<?)[A-Za-z0-9_]+:\/\/[A-Za-z0-9_\.\/\-_~]+(?:>?)/g,"sh_url",-1],[/<\?xml/g,"sh_preproc",6,1],[/<!DOCTYPE/g,"sh_preproc",8,1],[/<!--/g,"sh_comment",9],[/<(?:\/)?[A-Za-z](?:[A-Za-z0-9_:.-]*)(?:\/)?>/g,"sh_keyword",-1],[/<(?:\/)?[A-Za-z](?:[A-Za-z0-9_:.-]*)/g,"sh_keyword",10,1],[/&(?:[A-Za-z0-9]+);/g,"sh_preproc",-1],[/<(?:\/)?[A-Za-z][A-Za-z0-9]*(?:\/)?>/g,"sh_keyword",-1],[/<(?:\/)?[A-Za-z][A-Za-z0-9]*/g,"sh_keyword",10,1],[/@[A-Za-z]+/g,"sh_type",-1],[/(?:TODO|FIXME|BUG)(?:[:]?)/g,"sh_todo",-1]],[[/\?>/g,"sh_preproc",-2],[/([^=" \t>]+)([ \t]*)(=?)/g,["sh_type","sh_normal","sh_symbol"],-1],[/"/g,"sh_string",7]],[[/\\(?:\\|")/g,null,-1],[/"/g,"sh_string",-2]],[[/>/g,"sh_preproc",-2],[/([^=" \t>]+)([ \t]*)(=?)/g,["sh_type","sh_normal","sh_symbol"],-1],[/"/g,"sh_string",7]],[[/-->/g,"sh_comment",-2],[/<!--/g,"sh_comment",9]],[[/(?:\/)?>/g,"sh_keyword",-2],[/([^=" \t>]+)([ \t]*)(=?)/g,["sh_type","sh_normal","sh_symbol"],-1],[/"/g,"sh_string",7]],[[/\*\//g,"sh_comment",-2],[/(?:<?)[A-Za-z0-9_\.\/\-_~]+@[A-Za-z0-9_\.\/\-_~]+(?:>?)|(?:<?)[A-Za-z0-9_]+:\/\/[A-Za-z0-9_\.\/\-_~]+(?:>?)/g,"sh_url",-1],[/<\?xml/g,"sh_preproc",6,1],[/<!DOCTYPE/g,"sh_preproc",8,1],[/<!--/g,"sh_comment",9],[/<(?:\/)?[A-Za-z](?:[A-Za-z0-9_:.-]*)(?:\/)?>/g,"sh_keyword",-1],[/<(?:\/)?[A-Za-z](?:[A-Za-z0-9_:.-]*)/g,"sh_keyword",10,1],[/&(?:[A-Za-z0-9]+);/g,"sh_preproc",-1],[/<(?:\/)?[A-Za-z][A-Za-z0-9]*(?:\/)?>/g,"sh_keyword",-1],[/<(?:\/)?[A-Za-z][A-Za-z0-9]*/g,"sh_keyword",10,1],[/@[A-Za-z]+/g,"sh_type",-1],[/(?:TODO|FIXME|BUG)(?:[:]?)/g,"sh_todo",-1]],[[/\*\//g,"sh_comment",-2],[/(?:<?)[A-Za-z0-9_\.\/\-_~]+@[A-Za-z0-9_\.\/\-_~]+(?:>?)|(?:<?)[A-Za-z0-9_]+:\/\/[A-Za-z0-9_\.\/\-_~]+(?:>?)/g,"sh_url",-1],[/(?:TODO|FIXME|BUG)(?:[:]?)/g,"sh_todo",-1]]];if(!this.sh_languages){this.sh_languages={}}sh_languages.url=[[{regex:/(?:<?)[A-Za-z0-9_\.\/\-_]+@[A-Za-z0-9_\.\/\-_]+(?:>?)/g,style:"sh_url"},{regex:/(?:<?)[A-Za-z0-9_]+:\/\/[A-Za-z0-9_\.\/\-_]+(?:>?)/g,style:"sh_url"}]];if(!this.sh_languages){this.sh_languages={}}sh_languages.xml=[[[/<\?xml/g,"sh_preproc",1,1],[/<!DOCTYPE/g,"sh_preproc",3,1],[/<!--/g,"sh_comment",4],[/<(?:\/)?[A-Za-z](?:[A-Za-z0-9_:.-]*)(?:\/)?>/g,"sh_keyword",-1],[/<(?:\/)?[A-Za-z](?:[A-Za-z0-9_:.-]*)/g,"sh_keyword",5,1],[/&(?:[A-Za-z0-9]+);/g,"sh_preproc",-1]],[[/\?>/g,"sh_preproc",-2],[/([^=" \t>]+)([ \t]*)(=?)/g,["sh_type","sh_normal","sh_symbol"],-1],[/"/g,"sh_string",2]],[[/\\(?:\\|")/g,null,-1],[/"/g,"sh_string",-2]],[[/>/g,"sh_preproc",-2],[/([^=" \t>]+)([ \t]*)(=?)/g,["sh_type","sh_normal","sh_symbol"],-1],[/"/g,"sh_string",2]],[[/-->/g,"sh_comment",-2],[/<!--/g,"sh_comment",4]],[[/(?:\/)?>/g,"sh_keyword",-2],[/([^=" \t>]+)([ \t]*)(=?)/g,["sh_type","sh_normal","sh_symbol"],-1],[/"/g,"sh_string",2]]];
\ No newline at end of file
diff --git a/examples/resources/loading.gif b/examples/resources/loading.gif
new file mode 100755
index 0000000000000000000000000000000000000000..f864d5fd38b7466c76b5a36dc0e3e9455c0126e2
GIT binary patch
literal 2767
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
XWBrHU7iSEP8X8hQyAJO{V6g1pwSv80

literal 0
HcmV?d00001

diff --git a/examples/resources/markdown.css b/examples/resources/markdown.css
new file mode 100755
index 000000000..be0ee0477
--- /dev/null
+++ b/examples/resources/markdown.css
@@ -0,0 +1,403 @@
+body {
+	margin: 0 auto;
+	font-family: Georgia, Palatino, serif;
+	color: #444444;
+	line-height: 1;
+	max-width: 960px;
+	padding: 0 30px 30px;
+	background-color: #E6E2DF;
+}
+
+h1,h2,h3,h4 {
+	color: #111111;
+	font-weight: 400;
+}
+
+h1,h2,h3,h4,h5,p {
+	margin-bottom: 24px;
+	padding: 0;
+}
+
+h1 {
+	font-size: 48px;
+}
+
+h2 {
+	font-size: 36px;
+	margin: 24px 0 6px;
+	margin-top: .5em !important;
+	border-top: 4px solid #E0E0E0 !important;
+	padding-top: .5em !important;
+}
+
+h3 {
+	font-size: 24px;
+}
+
+h4 {
+	font-size: 21px;
+}
+
+h5 {
+	font-size: 18px;
+}
+
+a {
+	color: #0099ff;
+	padding: 0;
+	vertical-align: baseline;
+	margin: 0;
+	text-decoration: none;
+}
+
+a:hover,a:active,a:focus {
+	background-color: #0099ff;
+	text-decoration: none;
+	color: white;
+}
+
+ul,ol {
+	padding: 4px 20px 0px;
+	margin: 0;
+}
+
+li {
+	line-height: 24px;
+}
+
+blockquote ul {
+	margin: 0 auto;
+	padding: 0;
+	overflow: hidden;
+}
+
+blockquote ul li {
+	text-align: left;
+	float: left;
+	list-style: none;
+	height: 30px;
+	width: 228px;
+}
+
+p,article.ul,article.ol {
+	font-size: 16px;
+	line-height: 24px;
+	max-width: 540px;
+}
+
+article pre {
+	padding: 13px;
+	/*
+	hyphens: all;
+	word-break-inside: hyphenate; 
+	overflow : hyphenate; 
+	hyphenate-character : "\2010"; 
+	white-space : pre-wrap;
+	white-space: -moz-pre-wrap;
+	white-space: -o-pre-wrap;
+	hyphenate-character: "\2010";
+	*/
+	background: #f3f3f3;
+	border-style: dashed;
+	border-color: #DADADA;
+	border-width: 1px;
+	max-width: 600 px;
+	overflow: auto;
+}
+
+code {
+	font-family: Consolas, Monaco, Andale Mono, monospace;
+	background: #ffffdd;
+	font-size: smaller;
+}
+
+pre code {
+	line-height: 1.5;
+	background-color: transparent;
+	font-size: 13px;
+}
+
+abbr {
+	border-radius: 3px;
+	-moz-border-radius: 3px;
+	-webkit-border-radius: 3px;
+	-khtml-border-radius: 3px;
+	background: blue;
+	opacity: 0.3;
+	color: white;
+	padding: 4px;
+	cursor: help;
+}
+
+abbr:HOVER {
+	opacity: 0.6;
+	background: black;
+}
+
+a abbr,a abbr:HOVER {
+	background: inherit;
+	color: inherit;
+	opacity: inherit;
+	border: inherit;
+	cursor: inherit;
+	padding: inherit;
+}
+
+aside {
+	display: block;
+	float: right;
+	width: 390px;
+}
+
+blockquote {
+	margin: 1em 2em;
+	max-width: 476px;
+	background: #ECEDE5;
+	border-left: 10px solid #ccc;
+	padding: .5em 10px;
+}
+
+blockquote p {
+	color: #666;
+	max-width: 460px;
+	margin: 0;
+}
+
+hr {
+	width: 540px;
+	text-align: left;
+	margin: 0 auto 0 0;
+	color: #999;
+}
+
+dl {
+	margin: 2em 0;
+	padding: 0;
+	max-width: 476px;
+}
+
+dt { /*
+	background-color: #131210;
+	font-weight: bold;
+	color: #959289;
+	text-align: center;
+	*/
+	font-family: Fixed, monospace;
+	padding: .5em;
+	border: 1px solid #131210;
+	border-right: 1px solid #131210;
+	border-top: 1px solid #131210;
+	padding: .5em;
+}
+
+dd {
+	margin: 0 0 1em 0;
+	/*
+	background: #DBD8D8;
+	font-style: italic;
+	text-align: center;
+	*/
+	padding: 1em .5em;
+	border-left: 1px solid #131210;
+	border-right: 1px solid #131210;
+	border-bottom: 1px solid #131210;
+}
+
+dd pre {
+	border: none;
+	background-color: transparent;
+}
+/**
+ * Left side
+ */
+#left {
+	position: fixed;
+	top: 0;
+	bottom: 0;
+	left: 0;
+	height: auto;
+	margin: 0;
+	padding: 7px;
+	overflow: auto;
+	background: black;
+	line-height: 1.6;
+}
+
+#left img {
+	margin-top: -10px;
+	margin-left: -10px;
+	margin-bottom: 0px;
+	padding-top: 0px;
+	padding-left: 0px;
+}
+
+#left h3 {
+	color: white;
+	border-bottom: 1px solid #aaaaaa;
+	border-top: 1px solid #aaaaaa;
+}
+
+#left a {
+	color: #bbccff;
+}
+
+#left a:hover {
+	color: white;
+}
+
+#left ul {
+	list-style: none;
+	padding: 0 0 0 0px;
+	margin: 0;
+	color: white;
+}
+
+#left li {
+	white-space: nowrap;
+}
+
+#left ul ul {
+	padding-left: 10px;
+}
+
+#left .active>a {
+	color: #333;
+	background: none;
+	font-weight: bold;
+}
+
+.collapsed {
+	display: none;
+}
+
+/**
+ *	Right side
+ */
+#right {
+	margin-left: 120px;
+	min-height: 600px;
+	background-repeat: no-repeat;
+	background-position: top right;
+	-moz-box-shadow: 5px 5px 5px #ccc;
+	-webkit-box-shadow: 5px 5px 5px #ccc;
+	box-shadow: 5px 5px 5px #ccc;
+}
+
+ol.toc li {
+	clear: left;
+	border-bottom: dashed 1px #aaa;
+	height: 1.05em;
+	margin-top: 20px;
+	position: relative;
+	margin-top: 20px;
+	height: 1.05em;
+}
+
+ol.toc li:HOVER {
+	color: #0099ff;
+	border-bottom: dashed 1px #0099ff;
+}
+
+ol.toc li:HOVER small {
+	color: #7FCCFF;
+}
+
+ol.toc a {
+	text-decoration: none;
+	color: inherit;
+}
+
+ol.toc right,ol.toc span {
+	background: #fff;
+	padding: 0 3px 0 0;
+	float: left;
+	position: absolute;
+	text-decoration: none;
+}
+
+ol.toc right {
+	padding: 0 0 0 3px;
+	right: 0;
+}
+
+ol.toc a:HOVER {
+	
+}
+
+ol.toc ol {
+	list-style: lower-roman;
+	margin: 1.5em 0 1em 5%;
+	padding: 0;
+	background: #fff;
+	float: left;
+	display: block;
+	width: 95%;
+}
+
+ol.toc small {
+	color: #a999a9;
+}
+
+article {
+	background: white;
+	position: relative;
+	padding: 25px 50px;
+	margin: 20px 0;
+	max-width: 550px;
+	/*
+	padding: 25px 210px 0 30px;
+	*/
+}
+
+article:after {
+	content: "";
+	position: absolute;
+	top: 0;
+	left: 0;
+	width: 0;
+	height: 0;
+	border-top: 10px solid #E6E2DF;
+	border-left: 10px solid #E6E2DF;
+	border-bottom: 10px solid #d9d3cf;
+	border-right: 10px solid #d9d3cf;
+}
+
+.menu {
+	margin: 0;
+	padding: 0;
+	width: px;
+	list-style: none;
+	background: rgb();
+}
+
+.menu li {
+	padding: 0;
+	margin: 0 0 1px 0;
+	height: 40px;
+	display: block;
+}
+
+.menu li a {
+	text-align: ;
+	height: 40px;
+	padding: 0px 25px;
+	font: 16px Verdana, Arial, Helvetica, sans-serif;
+	color: rgb();
+	display: block;
+	background: url('verMenuImages.png') 0px 0px no-repeat;
+	text-decoration: none;
+}
+
+.menu li a:hover {
+	background: url('verMenuImages.png') 0px -40px no-repeat;
+	color: rgb();
+}
+
+.menu li a.active,.menu li a.active:hover {
+	background: url('verMenuImages.png') 0px -80px no-repeat;
+	color: rgb();
+}
+
+.menu li a span {
+	line-height: 40px;
+}
\ No newline at end of file
diff --git a/restler/amfformat/Zend/Amf/Constants.php b/restler/amfformat/Zend/Amf/Constants.php
new file mode 100644
index 000000000..f3bc4ee9c
--- /dev/null
+++ b/restler/amfformat/Zend/Amf/Constants.php
@@ -0,0 +1,87 @@
+<?php
+/**
+ * Zend Framework
+ *
+ * LICENSE
+ *
+ * This source file is subject to the new BSD license that is bundled
+ * with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://framework.zend.com/license/new-bsd
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@zend.com so we can send you a copy immediately.
+ *
+ * @category   Zend
+ * @package    Zend_Amf
+ * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ * @version    $Id: Constants.php 20096 2010-01-06 02:05:09Z bkarwin $
+ */
+
+/**
+ * The following constants are used throughout serialization and
+ * deserialization to detect the AMF marker and encoding types.
+ *
+ * @package    Zend_Amf
+ * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ */
+final class Zend_Amf_Constants
+{
+    const AMF0_NUMBER            = 0x00;
+    const AMF0_BOOLEAN           = 0x01;
+    const AMF0_STRING            = 0x02;
+    const AMF0_OBJECT            = 0x03;
+    const AMF0_MOVIECLIP         = 0x04;
+    const AMF0_NULL              = 0x05;
+    const AMF0_UNDEFINED         = 0x06;
+    const AMF0_REFERENCE         = 0x07;
+    const AMF0_MIXEDARRAY        = 0x08;
+    const AMF0_OBJECTTERM        = 0x09;
+    const AMF0_ARRAY             = 0x0a;
+    const AMF0_DATE              = 0x0b;
+    const AMF0_LONGSTRING        = 0x0c;
+    const AMF0_UNSUPPORTED       = 0x0e;
+    const AMF0_XML               = 0x0f;
+    const AMF0_TYPEDOBJECT       = 0x10;
+    const AMF0_AMF3              = 0x11;
+    const AMF0_OBJECT_ENCODING   = 0x00;
+
+    const AMF3_UNDEFINED         = 0x00;
+    const AMF3_NULL              = 0x01;
+    const AMF3_BOOLEAN_FALSE     = 0x02;
+    const AMF3_BOOLEAN_TRUE      = 0x03;
+    const AMF3_INTEGER           = 0x04;
+    const AMF3_NUMBER            = 0x05;
+    const AMF3_STRING            = 0x06;
+    const AMF3_XML               = 0x07;
+    const AMF3_DATE              = 0x08;
+    const AMF3_ARRAY             = 0x09;
+    const AMF3_OBJECT            = 0x0A;
+    const AMF3_XMLSTRING         = 0x0B;
+    const AMF3_BYTEARRAY         = 0x0C;
+    const AMF3_OBJECT_ENCODING   = 0x03;
+
+    // Object encodings for AMF3 object types
+    const ET_PROPLIST            = 0x00;
+    const ET_EXTERNAL            = 0x01;
+    const ET_DYNAMIC             = 0x02;
+    const ET_PROXY               = 0x03;
+
+    const FMS_OBJECT_ENCODING    = 0x01;
+
+    /**
+     * Special content length value that indicates "unknown" content length
+     * per AMF Specification
+     */
+    const UNKNOWN_CONTENT_LENGTH = -1;
+    const URL_APPEND_HEADER      = 'AppendToGatewayUrl';
+    const RESULT_METHOD          = '/onResult';
+    const STATUS_METHOD          = '/onStatus';
+    const CREDENTIALS_HEADER     = 'Credentials';
+    const PERSISTENT_HEADER      = 'RequestPersistentHeader';
+    const DESCRIBE_HEADER        = 'DescribeService';
+
+    const GUEST_ROLE             = 'anonymous';
+}
diff --git a/restler/amfformat/Zend/Amf/Parse/Amf3/Deserializer.php b/restler/amfformat/Zend/Amf/Parse/Amf3/Deserializer.php
new file mode 100644
index 000000000..e974173f8
--- /dev/null
+++ b/restler/amfformat/Zend/Amf/Parse/Amf3/Deserializer.php
@@ -0,0 +1,424 @@
+<?php
+/**
+ * Zend Framework
+ *
+ * LICENSE
+ *
+ * This source file is subject to the new BSD license that is bundled
+ * with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://framework.zend.com/license/new-bsd
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@zend.com so we can send you a copy immediately.
+ *
+ * @category   Zend
+ * @package    Zend_Amf
+ * @subpackage Parse_Amf3
+ * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ * @version    $Id: Deserializer.php 21210 2010-02-27 10:37:39Z yoshida@zend.co.jp $
+ */
+
+/** Zend_Amf_Constants */
+require_once 'Zend/Amf/Constants.php';
+
+/** Zend_Amf_Parse_Deserializer */
+require_once 'Zend/Amf/Parse/Deserializer.php';
+
+/** Zend_Amf_Parse_TypeLoader */
+require_once 'Zend/Amf/Parse/TypeLoader.php';
+
+/**
+ * Read an AMF3 input stream and convert it into PHP data types.
+ *
+ * @todo       readObject to handle Typed Objects
+ * @todo       readXMLStrimg to be implemented.
+ * @todo       Class could be implemented as Factory Class with each data type it's own class.
+ * @package    Zend_Amf
+ * @subpackage Parse_Amf3
+ * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ */
+class Zend_Amf_Parse_Amf3_Deserializer extends Zend_Amf_Parse_Deserializer
+{
+    /**
+     * Total number of objects in the referenceObject array
+     * @var int
+     */
+    protected $_objectCount;
+
+    /**
+     * An array of reference objects per amf body
+     * @var array
+     */
+    protected $_referenceObjects = array();
+
+    /**
+     * An array of reference strings per amf body
+     * @var array
+     */
+    protected $_referenceStrings = array();
+
+    /**
+     * An array of reference class definitions per body
+     * @var array
+     */
+    protected $_referenceDefinitions = array();
+
+    /**
+     * Read AMF markers and dispatch for deserialization
+     *
+     * Checks for AMF marker types and calls the appropriate methods
+     * for deserializing those marker types. markers are the data type of
+     * the following value.
+     *
+     * @param  integer $typeMarker
+     * @return mixed Whatever the corresponding PHP data type is
+     * @throws Zend_Amf_Exception for unidentified marker type
+     */
+    public function readTypeMarker($typeMarker = null)
+    {
+        if(null === $typeMarker) {
+            $typeMarker = $this->_stream->readByte();
+        }
+
+        switch($typeMarker) {
+            case Zend_Amf_Constants::AMF3_UNDEFINED:
+                 return null;
+            case Zend_Amf_Constants::AMF3_NULL:
+                 return null;
+            case Zend_Amf_Constants::AMF3_BOOLEAN_FALSE:
+                 return false;
+            case Zend_Amf_Constants::AMF3_BOOLEAN_TRUE:
+                 return true;
+            case Zend_Amf_Constants::AMF3_INTEGER:
+                 return $this->readInteger();
+            case Zend_Amf_Constants::AMF3_NUMBER:
+                 return $this->_stream->readDouble();
+            case Zend_Amf_Constants::AMF3_STRING:
+                 return $this->readString();
+            case Zend_Amf_Constants::AMF3_DATE:
+                 return $this->readDate();
+            case Zend_Amf_Constants::AMF3_ARRAY:
+                 return $this->readArray();
+            case Zend_Amf_Constants::AMF3_OBJECT:
+                 return $this->readObject();
+            case Zend_Amf_Constants::AMF3_XML:
+            case Zend_Amf_Constants::AMF3_XMLSTRING:
+                 return $this->readXmlString();
+            case Zend_Amf_Constants::AMF3_BYTEARRAY:
+                 return $this->readString();
+            default:
+                require_once 'Zend/Amf/Exception.php';
+                throw new Zend_Amf_Exception('Unsupported type marker: ' . $typeMarker);
+        }
+    }
+
+    /**
+     * Read and deserialize an integer
+     *
+     * AMF 3 represents smaller integers with fewer bytes using the most
+     * significant bit of each byte. The worst case uses 32-bits
+     * to represent a 29-bit number, which is what we would have
+     * done with no compression.
+     * - 0x00000000 - 0x0000007F : 0xxxxxxx
+     * - 0x00000080 - 0x00003FFF : 1xxxxxxx 0xxxxxxx
+     * - 0x00004000 - 0x001FFFFF : 1xxxxxxx 1xxxxxxx 0xxxxxxx
+     * - 0x00200000 - 0x3FFFFFFF : 1xxxxxxx 1xxxxxxx 1xxxxxxx xxxxxxxx
+     * - 0x40000000 - 0xFFFFFFFF : throw range exception
+     *
+     * 0x04 -> integer type code, followed by up to 4 bytes of data.
+     *
+     * Parsing integers on OSFlash for the AMF3 integer data format:
+     * @link http://osflash.org/amf3/parsing_integers
+     * @return int|float
+     */
+    public function readInteger()
+    {
+        $count        = 1;
+        $intReference = $this->_stream->readByte();
+        $result       = 0;
+        while ((($intReference & 0x80) != 0) && $count < 4) {
+            $result       <<= 7;
+            $result        |= ($intReference & 0x7f);
+            $intReference   = $this->_stream->readByte();
+            $count++;
+        }
+        if ($count < 4) {
+            $result <<= 7;
+            $result  |= $intReference;
+        } else {
+            // Use all 8 bits from the 4th byte
+            $result <<= 8;
+            $result  |= $intReference;
+
+            // Check if the integer should be negative
+            if (($result & 0x10000000) != 0) {
+                //and extend the sign bit
+                $result |= ~0xFFFFFFF;
+            }
+        }
+        return $result;
+    }
+
+    /**
+     * Read and deserialize a string
+     *
+     * Strings can be sent as a reference to a previously
+     * occurring String by using an index to the implicit string reference table.
+     * Strings are encoding using UTF-8 - however the header may either
+     * describe a string literal or a string reference.
+     *
+     * - string = 0x06 string-data
+     * - string-data = integer-data [ modified-utf-8 ]
+     * - modified-utf-8 = *OCTET
+     *
+     * @return String
+     */
+    public function readString()
+    {
+        $stringReference = $this->readInteger();
+
+        //Check if this is a reference string
+        if (($stringReference & 0x01) == 0) {
+            // reference string
+            $stringReference = $stringReference >> 1;
+            if ($stringReference >= count($this->_referenceStrings)) {
+                require_once 'Zend/Amf/Exception.php';
+                throw new Zend_Amf_Exception('Undefined string reference: ' . $stringReference);
+            }
+            // reference string found
+            return $this->_referenceStrings[$stringReference];
+        }
+
+        $length = $stringReference >> 1;
+        if ($length) {
+            $string = $this->_stream->readBytes($length);
+            $this->_referenceStrings[] = $string;
+        } else {
+            $string = "";
+        }
+        return $string;
+    }
+
+    /**
+     * Read and deserialize a date
+     *
+     * Data is the number of milliseconds elapsed since the epoch
+     * of midnight, 1st Jan 1970 in the UTC time zone.
+     * Local time zone information is not sent to flash.
+     *
+     * - date = 0x08 integer-data [ number-data ]
+     *
+     * @return Zend_Date
+     */
+    public function readDate()
+    {
+        $dateReference = $this->readInteger();
+        if (($dateReference & 0x01) == 0) {
+            $dateReference = $dateReference >> 1;
+            if ($dateReference>=count($this->_referenceObjects)) {
+                require_once 'Zend/Amf/Exception.php';
+                throw new Zend_Amf_Exception('Undefined date reference: ' . $dateReference);
+            }
+            return $this->_referenceObjects[$dateReference];
+        }
+
+        $timestamp = floor($this->_stream->readDouble() / 1000);
+
+        require_once 'Zend/Date.php';
+        $dateTime  = new Zend_Date((int) $timestamp);
+        $this->_referenceObjects[] = $dateTime;
+        return $dateTime;
+    }
+
+    /**
+     * Read amf array to PHP array
+     *
+     * - array = 0x09 integer-data ( [ 1OCTET *amf3-data ] | [OCTET *amf3-data 1] | [ OCTET *amf-data ] )
+     *
+     * @return array
+     */
+    public function readArray()
+    {
+        $arrayReference = $this->readInteger();
+        if (($arrayReference & 0x01)==0){
+            $arrayReference = $arrayReference >> 1;
+            if ($arrayReference>=count($this->_referenceObjects)) {
+                require_once 'Zend/Amf/Exception.php';
+                throw new Zend_Amf_Exception('Unknow array reference: ' . $arrayReference);
+            }
+            return $this->_referenceObjects[$arrayReference];
+        }
+
+        // Create a holder for the array in the reference list
+        $data = array();
+        $this->_referenceObjects[] =& $data;
+        $key = $this->readString();
+
+        // Iterating for string based keys.
+        while ($key != '') {
+            $data[$key] = $this->readTypeMarker();
+            $key = $this->readString();
+        }
+
+        $arrayReference = $arrayReference >>1;
+
+        //We have a dense array
+        for ($i=0; $i < $arrayReference; $i++) {
+            $data[] = $this->readTypeMarker();
+        }
+
+        return $data;
+    }
+
+    /**
+     * Read an object from the AMF stream and convert it into a PHP object
+     *
+     * @todo   Rather than using an array of traitsInfo create Zend_Amf_Value_TraitsInfo
+     * @return object|array
+     */
+    public function readObject()
+    {
+        $traitsInfo   = $this->readInteger();
+        $storedObject = ($traitsInfo & 0x01)==0;
+        $traitsInfo   = $traitsInfo >> 1;
+
+        // Check if the Object is in the stored Objects reference table
+        if ($storedObject) {
+            $ref = $traitsInfo;
+            if (!isset($this->_referenceObjects[$ref])) {
+                require_once 'Zend/Amf/Exception.php';
+                throw new Zend_Amf_Exception('Unknown Object reference: ' . $ref);
+            }
+            $returnObject = $this->_referenceObjects[$ref];
+        } else {
+            // Check if the Object is in the stored Definitions reference table
+            $storedClass = ($traitsInfo & 0x01) == 0;
+            $traitsInfo  = $traitsInfo >> 1;
+            if ($storedClass) {
+                $ref = $traitsInfo;
+                if (!isset($this->_referenceDefinitions[$ref])) {
+                    require_once 'Zend/Amf/Exception.php';
+                    throw new Zend_Amf_Exception('Unknows Definition reference: '. $ref);
+                }
+                // Populate the reference attributes
+                $className     = $this->_referenceDefinitions[$ref]['className'];
+                $encoding      = $this->_referenceDefinitions[$ref]['encoding'];
+                $propertyNames = $this->_referenceDefinitions[$ref]['propertyNames'];
+            } else {
+                // The class was not in the reference tables. Start reading rawdata to build traits.
+                // Create a traits table. Zend_Amf_Value_TraitsInfo would be ideal
+                $className     = $this->readString();
+                $encoding      = $traitsInfo & 0x03;
+                $propertyNames = array();
+                $traitsInfo    = $traitsInfo >> 2;
+            }
+
+            // We now have the object traits defined in variables. Time to go to work:
+            if (!$className) {
+                // No class name generic object
+                $returnObject = new stdClass();
+            } else {
+                // Defined object
+                // Typed object lookup against registered classname maps
+                if ($loader = Zend_Amf_Parse_TypeLoader::loadType($className)) {
+                    $returnObject = new $loader();
+                } else {
+                    //user defined typed object
+                    require_once 'Zend/Amf/Exception.php';
+                    throw new Zend_Amf_Exception('Typed object not found: '. $className . ' ');
+                }
+            }
+
+            // Add the Object to the reference table
+            $this->_referenceObjects[] = $returnObject;
+
+            $properties = array(); // clear value
+            // Check encoding types for additional processing.
+            switch ($encoding) {
+                case (Zend_Amf_Constants::ET_EXTERNAL):
+                    // Externalizable object such as {ArrayCollection} and {ObjectProxy}
+                    if (!$storedClass) {
+                        $this->_referenceDefinitions[] = array(
+                            'className'     => $className,
+                            'encoding'      => $encoding,
+                            'propertyNames' => $propertyNames,
+                        );
+                    }
+                    $returnObject->externalizedData = $this->readTypeMarker();
+                    break;
+                case (Zend_Amf_Constants::ET_DYNAMIC):
+                    // used for Name-value encoding
+                    if (!$storedClass) {
+                        $this->_referenceDefinitions[] = array(
+                            'className'     => $className,
+                            'encoding'      => $encoding,
+                            'propertyNames' => $propertyNames,
+                        );
+                    }
+                    // not a reference object read name value properties from byte stream
+                    do {
+                        $property = $this->readString();
+                        if ($property != "") {
+                            $propertyNames[]       = $property;
+                            $properties[$property] = $this->readTypeMarker();
+                        }
+                    } while ($property !="");
+                    break;
+                default:
+                    // basic property list object.
+                    if (!$storedClass) {
+                        $count = $traitsInfo; // Number of properties in the list
+                        for($i=0; $i< $count; $i++) {
+                            $propertyNames[] = $this->readString();
+                        }
+                        // Add a reference to the class.
+                        $this->_referenceDefinitions[] = array(
+                            'className'     => $className,
+                            'encoding'      => $encoding,
+                            'propertyNames' => $propertyNames,
+                        );
+                    }
+                    foreach ($propertyNames as $property) {
+                        $properties[$property] = $this->readTypeMarker();
+                    }
+                    break;
+            }
+
+            // Add properties back to the return object.
+            foreach($properties as $key=>$value) {
+                if($key) {
+                    $returnObject->$key = $value;
+                }
+            }
+
+
+        }
+
+        if($returnObject instanceof Zend_Amf_Value_Messaging_ArrayCollection) {
+            if(isset($returnObject->externalizedData)) {
+                $returnObject = $returnObject->externalizedData;
+            } else {
+                $returnObject = get_object_vars($returnObject);
+            }
+        }
+
+        return $returnObject;
+    }
+
+    /**
+     * Convert XML to SimpleXml
+     * If user wants DomDocument they can use dom_import_simplexml
+     *
+     * @return SimpleXml Object
+     */
+    public function readXmlString()
+    {
+        $xmlReference = $this->readInteger();
+        $length = $xmlReference >> 1;
+        $string = $this->_stream->readBytes($length);
+        return simplexml_load_string($string);
+    }
+}
diff --git a/restler/amfformat/Zend/Amf/Parse/Amf3/Serializer.php b/restler/amfformat/Zend/Amf/Parse/Amf3/Serializer.php
new file mode 100644
index 000000000..031ce7c4f
--- /dev/null
+++ b/restler/amfformat/Zend/Amf/Parse/Amf3/Serializer.php
@@ -0,0 +1,507 @@
+<?php
+/**
+ * Zend Framework
+ *
+ * LICENSE
+ *
+ * This source file is subject to the new BSD license that is bundled
+ * with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://framework.zend.com/license/new-bsd
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@zend.com so we can send you a copy immediately.
+ *
+ * @category   Zend
+ * @package    Zend_Amf
+ * @subpackage Parse_Amf3
+ * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ * @version    $Id: Serializer.php 20392 2010-01-18 18:34:23Z stas $
+ */
+
+/** Zend_Amf_Constants */
+require_once 'Zend/Amf/Constants.php';
+
+/** Zend_Amf_Parse_Serializer */
+require_once 'Zend/Amf/Parse/Serializer.php';
+
+/** Zend_Amf_Parse_TypeLoader */
+require_once 'Zend/Amf/Parse/TypeLoader.php';
+
+/**
+ * Detect PHP object type and convert it to a corresponding AMF3 object type
+ *
+ * @package    Zend_Amf
+ * @subpackage Parse_Amf3
+ * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ */
+class Zend_Amf_Parse_Amf3_Serializer extends Zend_Amf_Parse_Serializer
+{
+    /**
+     * An array of reference objects per amf body
+     * @var array
+     */
+    protected $_referenceObjects = array();
+
+    /**
+     * An array of reference strings per amf body
+     * @var array
+     */
+    protected $_referenceStrings = array();
+
+    /**
+     * An array of reference class definitions, indexed by classname
+     * @var array
+     */
+    protected $_referenceDefinitions = array();
+
+    /**
+     * Serialize PHP types to AMF3 and write to stream
+     *
+     * Checks to see if the type was declared and then either
+     * auto negotiates the type or use the user defined markerType to
+     * serialize the data from php back to AMF3
+     *
+     * @param  mixed $content
+     * @param  int $markerType
+     * @return void
+     */
+    public function writeTypeMarker($data, $markerType=null)
+    {
+        if (null !== $markerType) {
+            // Write the Type Marker to denote the following action script data type
+            $this->_stream->writeByte($markerType);
+
+            switch ($markerType) {
+                case Zend_Amf_Constants::AMF3_NULL:
+                    break;
+                case Zend_Amf_Constants::AMF3_BOOLEAN_FALSE:
+                    break;
+                case Zend_Amf_Constants::AMF3_BOOLEAN_TRUE:
+                    break;
+                case Zend_Amf_Constants::AMF3_INTEGER:
+                    $this->writeInteger($data);
+                    break;
+                case Zend_Amf_Constants::AMF3_NUMBER:
+                    $this->_stream->writeDouble($data);
+                    break;
+                case Zend_Amf_Constants::AMF3_STRING:
+                    $this->writeString($data);
+                    break;
+                case Zend_Amf_Constants::AMF3_DATE:
+                    $this->writeDate($data);
+                    break;
+                case Zend_Amf_Constants::AMF3_ARRAY:
+                    $this->writeArray($data);
+                    break;
+                case Zend_Amf_Constants::AMF3_OBJECT:
+                    $this->writeObject($data);
+                    break;
+                case Zend_Amf_Constants::AMF3_BYTEARRAY:
+                    $this->writeByteArray($data);
+                    break;
+                case Zend_Amf_Constants::AMF3_XMLSTRING;
+                    $this->writeXml($data);
+                    break;
+                default:
+                    require_once 'Zend/Amf/Exception.php';
+                    throw new Zend_Amf_Exception('Unknown Type Marker: ' . $markerType);
+            }
+        } else {
+            // Detect Type Marker
+            if(is_resource($data)) {
+                $data = Zend_Amf_Parse_TypeLoader::handleResource($data);
+            }
+             switch (true) {
+                case (null === $data):
+                    $markerType = Zend_Amf_Constants::AMF3_NULL;
+                    break;
+                case (is_bool($data)):
+                    if ($data){
+                        $markerType = Zend_Amf_Constants::AMF3_BOOLEAN_TRUE;
+                    } else {
+                        $markerType = Zend_Amf_Constants::AMF3_BOOLEAN_FALSE;
+                    }
+                    break;
+                case (is_int($data)):
+                    if (($data > 0xFFFFFFF) || ($data < -268435456)) {
+                        $markerType = Zend_Amf_Constants::AMF3_NUMBER;
+                    } else {
+                        $markerType = Zend_Amf_Constants::AMF3_INTEGER;
+                    }
+                    break;
+                case (is_float($data)):
+                    $markerType = Zend_Amf_Constants::AMF3_NUMBER;
+                    break;
+                case (is_string($data)):
+                    $markerType = Zend_Amf_Constants::AMF3_STRING;
+                    break;
+                case (is_array($data)):
+                    $markerType = Zend_Amf_Constants::AMF3_ARRAY;
+                    break;
+                case (is_object($data)):
+                    // Handle object types.
+                    if (($data instanceof DateTime) || ($data instanceof Zend_Date)) {
+                        $markerType = Zend_Amf_Constants::AMF3_DATE;
+                    } else if ($data instanceof Zend_Amf_Value_ByteArray) {
+                        $markerType = Zend_Amf_Constants::AMF3_BYTEARRAY;
+                    } else if (($data instanceof DOMDocument) || ($data instanceof SimpleXMLElement)) {
+                        $markerType = Zend_Amf_Constants::AMF3_XMLSTRING;
+                    } else {
+                        $markerType = Zend_Amf_Constants::AMF3_OBJECT;
+                    }
+                    break;
+                default:
+                    require_once 'Zend/Amf/Exception.php';
+                    throw new Zend_Amf_Exception('Unsupported data type: ' . gettype($data));
+             }
+            $this->writeTypeMarker($data, $markerType);
+        }
+    }
+
+    /**
+     * Write an AMF3 integer
+     *
+     * @param int|float $data
+     * @return Zend_Amf_Parse_Amf3_Serializer
+     */
+    public function writeInteger($int)
+    {
+        if (($int & 0xffffff80) == 0) {
+            $this->_stream->writeByte($int & 0x7f);
+            return $this;
+        }
+
+        if (($int & 0xffffc000) == 0 ) {
+            $this->_stream->writeByte(($int >> 7 ) | 0x80);
+            $this->_stream->writeByte($int & 0x7f);
+            return $this;
+        }
+
+        if (($int & 0xffe00000) == 0) {
+            $this->_stream->writeByte(($int >> 14 ) | 0x80);
+            $this->_stream->writeByte(($int >> 7 ) | 0x80);
+            $this->_stream->writeByte($int & 0x7f);
+            return $this;
+        }
+
+        $this->_stream->writeByte(($int >> 22 ) | 0x80);
+        $this->_stream->writeByte(($int >> 15 ) | 0x80);
+        $this->_stream->writeByte(($int >> 8 ) | 0x80);
+        $this->_stream->writeByte($int & 0xff);
+        return $this;
+    }
+
+    /**
+     * Send string to output stream, without trying to reference it.
+     * The string is prepended with strlen($string) << 1 | 0x01
+     *
+     * @param  string $string
+     * @return Zend_Amf_Parse_Amf3_Serializer
+     */
+    protected function writeBinaryString($string){
+        $ref = strlen($string) << 1 | 0x01;
+        $this->writeInteger($ref);
+        $this->_stream->writeBytes($string);
+
+        return $this;
+    }
+
+    /**
+     * Send string to output stream
+     *
+     * @param  string $string
+     * @return Zend_Amf_Parse_Amf3_Serializer
+     */
+    public function writeString($string)
+    {
+        $len = strlen($string);
+        if(!$len){
+            $this->writeInteger(0x01);
+            return $this;
+        }
+
+        $ref = array_search($string, $this->_referenceStrings, true);
+        if($ref === false){
+            $this->_referenceStrings[] = $string;
+            $this->writeBinaryString($string);
+        } else {
+            $ref <<= 1;
+            $this->writeInteger($ref);
+        }
+
+        return $this;
+    }
+
+    /**
+     * Send ByteArray to output stream
+     *
+     * @param  string|Zend_Amf_Value_ByteArray  $data
+     * @return Zend_Amf_Parse_Amf3_Serializer
+     */
+    public function writeByteArray($data){
+        if($this->writeObjectReference($data)){
+            return $this;
+        }
+
+        if(is_string($data)) {
+            //nothing to do
+        } else if ($data instanceof Zend_Amf_Value_ByteArray) {
+            $data = $data->getData();
+        } else {
+            require_once 'Zend/Amf/Exception.php';
+            throw new Zend_Amf_Exception('Invalid ByteArray specified; must be a string or Zend_Amf_Value_ByteArray');
+        }
+
+        $this->writeBinaryString($data);
+
+        return $this;
+    }
+
+    /**
+     * Send xml to output stream
+     *
+     * @param  DOMDocument|SimpleXMLElement  $xml
+     * @return Zend_Amf_Parse_Amf3_Serializer
+     */
+    public function writeXml($xml)
+    {
+        if($this->writeObjectReference($xml)){
+            return $this;
+        }
+
+        if(is_string($xml)) {
+            //nothing to do
+        } else if ($xml instanceof DOMDocument) {
+            $xml = $xml->saveXml();
+        } else if ($xml instanceof SimpleXMLElement) {
+            $xml = $xml->asXML();
+        } else {
+            require_once 'Zend/Amf/Exception.php';
+            throw new Zend_Amf_Exception('Invalid xml specified; must be a DOMDocument or SimpleXMLElement');
+        }
+
+        $this->writeBinaryString($xml);
+
+        return $this;
+    }
+
+    /**
+     * Convert DateTime/Zend_Date to AMF date
+     *
+     * @param  DateTime|Zend_Date $date
+     * @return Zend_Amf_Parse_Amf3_Serializer
+     */
+    public function writeDate($date)
+    {
+        if($this->writeObjectReference($date)){
+            return $this;
+        }
+
+        if ($date instanceof DateTime) {
+            $dateString = $date->format('U') * 1000;
+        } elseif ($date instanceof Zend_Date) {
+            $dateString = $date->toString('U') * 1000;
+        } else {
+            require_once 'Zend/Amf/Exception.php';
+            throw new Zend_Amf_Exception('Invalid date specified; must be a string DateTime or Zend_Date object');
+        }
+
+        $this->writeInteger(0x01);
+        // write time to stream minus milliseconds
+        $this->_stream->writeDouble($dateString);
+        return $this;
+    }
+
+    /**
+     * Write a PHP array back to the amf output stream
+     *
+     * @param array $array
+     * @return Zend_Amf_Parse_Amf3_Serializer
+     */
+    public function writeArray(array $array)
+    {
+	// arrays aren't reference here but still counted
+        $this->_referenceObjects[] = $array;
+
+        // have to seperate mixed from numberic keys.
+        $numeric = array();
+        $string  = array();
+        foreach ($array as $key => $value) {
+            if (is_int($key)) {
+                $numeric[] = $value;
+            } else {
+                $string[$key] = $value;
+            }
+        }
+
+        // write the preamble id of the array
+        $length = count($numeric);
+        $id     = ($length << 1) | 0x01;
+        $this->writeInteger($id);
+
+        //Write the mixed type array to the output stream
+        foreach($string as $key => $value) {
+            $this->writeString($key)
+                 ->writeTypeMarker($value);
+        }
+        $this->writeString('');
+
+        // Write the numeric array to ouput stream
+        foreach($numeric as $value) {
+            $this->writeTypeMarker($value);
+        }
+        return $this;
+    }
+
+    /**
+     * Check if the given object is in the reference table, write the reference if it exists,
+     * otherwise add the object to the reference table
+     *
+     * @param mixed $object object to check for reference
+     * @return Boolean true, if the reference was written, false otherwise
+     */
+    protected function writeObjectReference($object)
+    {
+        $ref = array_search($object, $this->_referenceObjects,true);
+        //quickly handle object references
+        if($ref !== false){
+            $ref <<= 1;
+            $this->writeInteger($ref);
+            return true;
+        }
+        $this->_referenceObjects[] = $object;
+        return false;
+    }
+
+    /**
+     * Write object to ouput stream
+     *
+     * @param  mixed $data
+     * @return Zend_Amf_Parse_Amf3_Serializer
+     */
+    public function writeObject($object)
+    {
+        if($this->writeObjectReference($object)){
+            return $this;
+        }
+
+        $className = '';
+
+        //Check to see if the object is a typed object and we need to change
+        switch (true) {
+             // the return class mapped name back to actionscript class name.
+            case ($className = Zend_Amf_Parse_TypeLoader::getMappedClassName(get_class($object))):
+                break;
+
+            // Check to see if the user has defined an explicit Action Script type.
+            case isset($object->_explicitType):
+                $className = $object->_explicitType;
+                break;
+
+            // Check if user has defined a method for accessing the Action Script type
+            case method_exists($object, 'getASClassName'):
+                $className = $object->getASClassName();
+                break;
+
+            // No return class name is set make it a generic object
+            case ($object instanceof stdClass):
+                $className = '';
+                break;
+
+            // By default, use object's class name
+            default:
+                $className = get_class($object);
+                break;
+        }
+
+        $writeTraits = true;
+
+        //check to see, if we have a corresponding definition
+        if(array_key_exists($className, $this->_referenceDefinitions)){
+            $traitsInfo    = $this->_referenceDefinitions[$className]['id'];
+            $encoding      = $this->_referenceDefinitions[$className]['encoding'];
+            $propertyNames = $this->_referenceDefinitions[$className]['propertyNames'];
+
+            $traitsInfo = ($traitsInfo << 2) | 0x01;
+
+            $writeTraits = false;
+        } else {
+            $propertyNames = array();
+
+            if($className == ''){
+                //if there is no className, we interpret the class as dynamic without any sealed members
+                $encoding = Zend_Amf_Constants::ET_DYNAMIC;
+            } else {
+                $encoding = Zend_Amf_Constants::ET_PROPLIST;
+
+                foreach($object as $key => $value) {
+                    if( $key[0] != "_") {
+                        $propertyNames[] = $key;
+                    }
+                }
+            }
+
+            $this->_referenceDefinitions[$className] = array(
+                        'id'            => count($this->_referenceDefinitions),
+                        'encoding'      => $encoding,
+                        'propertyNames' => $propertyNames,
+                    );
+
+            $traitsInfo = Zend_Amf_Constants::AMF3_OBJECT_ENCODING;
+            $traitsInfo |= $encoding << 2;
+            $traitsInfo |= (count($propertyNames) << 4);
+        }
+
+        $this->writeInteger($traitsInfo);
+
+        if($writeTraits){
+            $this->writeString($className);
+            foreach ($propertyNames as $value) {
+                $this->writeString($value);
+            }
+        }
+
+        try {
+            switch($encoding) {
+                case Zend_Amf_Constants::ET_PROPLIST:
+                    //Write the sealed values to the output stream.
+                    foreach ($propertyNames as $key) {
+                        $this->writeTypeMarker($object->$key);
+                    }
+                    break;
+                case Zend_Amf_Constants::ET_DYNAMIC:
+                    //Write the sealed values to the output stream.
+                    foreach ($propertyNames as $key) {
+                        $this->writeTypeMarker($object->$key);
+                    }
+
+                    //Write remaining properties
+                    foreach($object as $key => $value){
+                        if(!in_array($key,$propertyNames) && $key[0] != "_"){
+                            $this->writeString($key);
+                            $this->writeTypeMarker($value);
+                        }
+                    }
+
+                    //Write an empty string to end the dynamic part
+                    $this->writeString('');
+                    break;
+                case Zend_Amf_Constants::ET_EXTERNAL:
+                    require_once 'Zend/Amf/Exception.php';
+                    throw new Zend_Amf_Exception('External Object Encoding not implemented');
+                    break;
+                default:
+                    require_once 'Zend/Amf/Exception.php';
+                    throw new Zend_Amf_Exception('Unknown Object Encoding type: ' . $encoding);
+            }
+        } catch (Exception $e) {
+            require_once 'Zend/Amf/Exception.php';
+            throw new Zend_Amf_Exception('Unable to writeObject output: ' . $e->getMessage(), 0, $e);
+        }
+
+        return $this;
+    }
+}
diff --git a/restler/amfformat/Zend/Amf/Parse/Deserializer.php b/restler/amfformat/Zend/Amf/Parse/Deserializer.php
new file mode 100644
index 000000000..4f697bb1f
--- /dev/null
+++ b/restler/amfformat/Zend/Amf/Parse/Deserializer.php
@@ -0,0 +1,65 @@
+<?php
+/**
+ * Zend Framework
+ *
+ * LICENSE
+ *
+ * This source file is subject to the new BSD license that is bundled
+ * with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://framework.zend.com/license/new-bsd
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@zend.com so we can send you a copy immediately.
+ *
+ * @category   Zend
+ * @package    Zend_Amf
+ * @subpackage Parse
+ * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ * @version    $Id: Deserializer.php 20096 2010-01-06 02:05:09Z bkarwin $
+ */
+
+/**
+ * Abstract cass that all deserializer must implement.
+ *
+ * Logic for deserialization of the AMF envelop is based on resources supplied
+ * by Adobe Blaze DS. For and example of deserialization please review the BlazeDS
+ * source tree.
+ *
+ * @see        http://opensource.adobe.com/svn/opensource/blazeds/trunk/modules/core/src/java/flex/messaging/io/amf/
+ * @package    Zend_Amf
+ * @subpackage Parse
+ * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ */
+abstract class Zend_Amf_Parse_Deserializer
+{
+    /**
+     * The raw string that represents the AMF request.
+     *
+     * @var Zend_Amf_Parse_InputStream
+     */
+    protected $_stream;
+
+    /**
+     * Constructor
+     *
+     * @param  Zend_Amf_Parse_InputStream $stream
+     * @return void
+     */
+    public function __construct(Zend_Amf_Parse_InputStream $stream)
+    {
+        $this->_stream = $stream;
+    }
+
+    /**
+     * Checks for AMF marker types and calls the appropriate methods
+     * for deserializing those marker types. Markers are the data type of
+     * the following value.
+     *
+     * @param  int $typeMarker
+     * @return mixed Whatever the data type is of the marker in php
+     */
+    public abstract function readTypeMarker($markerType = null);
+}
diff --git a/restler/amfformat/Zend/Amf/Parse/InputStream.php b/restler/amfformat/Zend/Amf/Parse/InputStream.php
new file mode 100644
index 000000000..03dff2f6b
--- /dev/null
+++ b/restler/amfformat/Zend/Amf/Parse/InputStream.php
@@ -0,0 +1,39 @@
+<?php
+/**
+ * Zend Framework
+ *
+ * LICENSE
+ *
+ * This source file is subject to the new BSD license that is bundled
+ * with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://framework.zend.com/license/new-bsd
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@zend.com so we can send you a copy immediately.
+ *
+ * @category   Zend
+ * @package    Zend_Amf
+ * @subpackage Parse
+ * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ * @version    $Id: InputStream.php 20096 2010-01-06 02:05:09Z bkarwin $
+ */
+
+/** Zend_Amf_Util_BinaryStream */
+require_once 'Zend/Amf/Util/BinaryStream.php';
+
+/**
+ * InputStream is used to iterate at a binary level through the AMF request.
+ *
+ * InputStream extends BinaryStream as eventually BinaryStream could be placed
+ * outside of Zend_Amf in order to allow other packages to use the class.
+ *
+ * @package    Zend_Amf
+ * @subpackage Parse
+ * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ */
+class Zend_Amf_Parse_InputStream extends Zend_Amf_Util_BinaryStream
+{
+}
diff --git a/restler/amfformat/Zend/Amf/Parse/OutputStream.php b/restler/amfformat/Zend/Amf/Parse/OutputStream.php
new file mode 100644
index 000000000..b8b64989f
--- /dev/null
+++ b/restler/amfformat/Zend/Amf/Parse/OutputStream.php
@@ -0,0 +1,49 @@
+<?php
+/**
+ * Zend Framework
+ *
+ * LICENSE
+ *
+ * This source file is subject to the new BSD license that is bundled
+ * with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://framework.zend.com/license/new-bsd
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@zend.com so we can send you a copy immediately.
+ *
+ * @category   Zend
+ * @package    Zend_Amf
+ * @subpackage Parse
+ * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ * @version    $Id: OutputStream.php 20096 2010-01-06 02:05:09Z bkarwin $
+ */
+
+/** Zend_Amf_Util_BinaryStream */
+require_once 'Zend/Amf/Util/BinaryStream.php';
+
+/**
+ * Iterate at a binary level through the AMF response
+ *
+ * OutputStream extends BinaryStream as eventually BinaryStream could be placed
+ * outside of Zend_Amf in order to allow other packages to use the class.
+ *
+ * @uses       Zend_Amf_Util_BinaryStream
+ * @package    Zend_Amf
+ * @subpackage Parse
+ * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ */
+class Zend_Amf_Parse_OutputStream extends Zend_Amf_Util_BinaryStream
+{
+    /**
+     * Constructor
+     *
+     * @return void
+     */
+    public function __construct()
+    {
+        parent::__construct('');
+    }
+}
diff --git a/restler/amfformat/Zend/Amf/Parse/Serializer.php b/restler/amfformat/Zend/Amf/Parse/Serializer.php
new file mode 100644
index 000000000..eb29c4134
--- /dev/null
+++ b/restler/amfformat/Zend/Amf/Parse/Serializer.php
@@ -0,0 +1,59 @@
+<?php
+/**
+ * Zend Framework
+ *
+ * LICENSE
+ *
+ * This source file is subject to the new BSD license that is bundled
+ * with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://framework.zend.com/license/new-bsd
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@zend.com so we can send you a copy immediately.
+ *
+ * @category   Zend
+ * @package    Zend_Amf
+ * @subpackage Parse
+ * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ * @version    $Id: Serializer.php 21210 2010-02-27 10:37:39Z yoshida@zend.co.jp $
+ */
+
+/**
+ * Base abstract class for all AMF serializers.
+ *
+ * @package    Zend_Amf
+ * @subpackage Parse
+ * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ */
+abstract class Zend_Amf_Parse_Serializer
+{
+    /**
+     * Reference to the current output stream being constructed
+     *
+     * @var string
+     */
+    protected $_stream;
+
+    /**
+     * Constructor
+     *
+     * @param  Zend_Amf_Parse_OutputStream $stream
+     * @return void
+     */
+    public function __construct(Zend_Amf_Parse_OutputStream $stream)
+    {
+        $this->_stream = $stream;
+    }
+
+    /**
+     * Find the PHP object type and convert it into an AMF object type
+     *
+     * @param  mixed $content
+     * @param  int $markerType
+     * @return void
+     */
+    public abstract function writeTypeMarker($content, $markerType=null);
+}
diff --git a/restler/amfformat/Zend/Amf/Parse/TypeLoader.php b/restler/amfformat/Zend/Amf/Parse/TypeLoader.php
new file mode 100644
index 000000000..85aab3212
--- /dev/null
+++ b/restler/amfformat/Zend/Amf/Parse/TypeLoader.php
@@ -0,0 +1,231 @@
+<?php
+/**
+ * Zend Framework
+ *
+ * LICENSE
+ *
+ * This source file is subject to the new BSD license that is bundled
+ * with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://framework.zend.com/license/new-bsd
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@zend.com so we can send you a copy immediately.
+ *
+ * @category   Zend
+ * @package    Zend_Amf
+ * @subpackage Parse
+ * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ * @version    $Id: TypeLoader.php 20096 2010-01-06 02:05:09Z bkarwin $
+ */
+
+/**
+ * @see Zend_Amf_Value_Messaging_AcknowledgeMessage
+ */
+require_once 'Zend/Amf/Value/Messaging/AcknowledgeMessage.php';
+/**
+ * @see Zend_Amf_Value_Messaging_AsyncMessage
+ */
+require_once 'Zend/Amf/Value/Messaging/AsyncMessage.php';
+/**
+ * @see Zend_Amf_Value_Messaging_CommandMessage
+ */
+require_once 'Zend/Amf/Value/Messaging/CommandMessage.php';
+/**
+ * @see Zend_Amf_Value_Messaging_ErrorMessage
+ */
+require_once 'Zend/Amf/Value/Messaging/ErrorMessage.php';
+/**
+ * @see Zend_Amf_Value_Messaging_RemotingMessage
+ */
+require_once 'Zend/Amf/Value/Messaging/RemotingMessage.php';
+
+/**
+ * Loads a local class and executes the instantiation of that class.
+ *
+ * @todo       PHP 5.3 can drastically change this class w/ namespace and the new call_user_func w/ namespace
+ * @package    Zend_Amf
+ * @subpackage Parse
+ * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ */
+final class Zend_Amf_Parse_TypeLoader
+{
+    /**
+     * @var string callback class
+     */
+    public static $callbackClass;
+
+    /**
+     * @var array AMF class map
+     */
+    public static $classMap = array (
+        'flex.messaging.messages.AcknowledgeMessage' => 'Zend_Amf_Value_Messaging_AcknowledgeMessage',
+        'flex.messaging.messages.ErrorMessage'       => 'Zend_Amf_Value_Messaging_AsyncMessage',
+        'flex.messaging.messages.CommandMessage'     => 'Zend_Amf_Value_Messaging_CommandMessage',
+        'flex.messaging.messages.ErrorMessage'       => 'Zend_Amf_Value_Messaging_ErrorMessage',
+        'flex.messaging.messages.RemotingMessage'    => 'Zend_Amf_Value_Messaging_RemotingMessage',
+        'flex.messaging.io.ArrayCollection'          => 'Zend_Amf_Value_Messaging_ArrayCollection',
+    );
+
+    /**
+     * @var array Default class map
+     */
+    protected static $_defaultClassMap = array(
+        'flex.messaging.messages.AcknowledgeMessage' => 'Zend_Amf_Value_Messaging_AcknowledgeMessage',
+        'flex.messaging.messages.ErrorMessage'       => 'Zend_Amf_Value_Messaging_AsyncMessage',
+        'flex.messaging.messages.CommandMessage'     => 'Zend_Amf_Value_Messaging_CommandMessage',
+        'flex.messaging.messages.ErrorMessage'       => 'Zend_Amf_Value_Messaging_ErrorMessage',
+        'flex.messaging.messages.RemotingMessage'    => 'Zend_Amf_Value_Messaging_RemotingMessage',
+        'flex.messaging.io.ArrayCollection'          => 'Zend_Amf_Value_Messaging_ArrayCollection',
+    );
+
+    /**
+     * @var Zend_Loader_PluginLoader_Interface
+     */
+    protected static $_resourceLoader = null;
+
+
+    /**
+     * Load the mapped class type into a callback.
+     *
+     * @param  string $className
+     * @return object|false
+     */
+    public static function loadType($className)
+    {
+        $class    = self::getMappedClassName($className);
+        if(!$class) {
+            $class = str_replace('.', '_', $className);
+        }
+        if (!class_exists($class)) {
+            return "stdClass";
+        }
+        return $class;
+    }
+
+    /**
+     * Looks up the supplied call name to its mapped class name
+     *
+     * @param  string $className
+     * @return string
+     */
+    public static function getMappedClassName($className)
+    {
+        $mappedName = array_search($className, self::$classMap);
+
+        if ($mappedName) {
+            return $mappedName;
+        }
+
+        $mappedName = array_search($className, array_flip(self::$classMap));
+
+        if ($mappedName) {
+            return $mappedName;
+        }
+
+        return false;
+    }
+
+    /**
+     * Map PHP class names to ActionScript class names
+     *
+     * Allows users to map the class names of there action script classes
+     * to the equivelent php class name. Used in deserialization to load a class
+     * and serialiation to set the class name of the returned object.
+     *
+     * @param  string $asClassName
+     * @param  string $phpClassName
+     * @return void
+     */
+    public static function setMapping($asClassName, $phpClassName)
+    {
+        self::$classMap[$asClassName] = $phpClassName;
+    }
+
+    /**
+     * Reset type map
+     *
+     * @return void
+     */
+    public static function resetMap()
+    {
+        self::$classMap = self::$_defaultClassMap;
+    }
+
+    /**
+     * Set loader for resource type handlers
+     *
+     * @param Zend_Loader_PluginLoader_Interface $loader
+     */
+    public static function setResourceLoader(Zend_Loader_PluginLoader_Interface $loader)
+    {
+        self::$_resourceLoader = $loader;
+    }
+
+    /**
+     * Add directory to the list of places where to look for resource handlers
+     *
+     * @param string $prefix
+     * @param string $dir
+     */
+    public static function addResourceDirectory($prefix, $dir)
+    {
+        if(self::$_resourceLoader) {
+            self::$_resourceLoader->addPrefixPath($prefix, $dir);
+        }
+    }
+
+    /**
+     * Get plugin class that handles this resource
+     *
+     * @param resource $resource Resource type
+     * @return string Class name
+     */
+    public static function getResourceParser($resource)
+    {
+        if(self::$_resourceLoader) {
+            $type = preg_replace("/[^A-Za-z0-9_]/", " ", get_resource_type($resource));
+            $type = str_replace(" ","", ucwords($type));
+            return self::$_resourceLoader->load($type);
+        }
+        return false;
+    }
+
+    /**
+     * Convert resource to a serializable object
+     *
+     * @param resource $resource
+     * @return mixed
+     */
+    public static function handleResource($resource)
+    {
+        if(!self::$_resourceLoader) {
+            require_once 'Zend/Amf/Exception.php';
+            throw new Zend_Amf_Exception('Unable to handle resources - resource plugin loader not set');
+        }
+        try {
+            while(is_resource($resource)) {
+                $resclass = self::getResourceParser($resource);
+                if(!$resclass) {
+                    require_once 'Zend/Amf/Exception.php';
+                    throw new Zend_Amf_Exception('Can not serialize resource type: '. get_resource_type($resource));
+                }
+                $parser = new $resclass();
+                if(is_callable(array($parser, 'parse'))) {
+                    $resource = $parser->parse($resource);
+                } else {
+                    require_once 'Zend/Amf/Exception.php';
+                    throw new Zend_Amf_Exception("Could not call parse() method on class $resclass");
+                }
+            }
+            return $resource;
+        } catch(Zend_Amf_Exception $e) {
+            throw new Zend_Amf_Exception($e->getMessage(), $e->getCode(), $e);
+        } catch(Exception $e) {
+            require_once 'Zend/Amf/Exception.php';
+            throw new Zend_Amf_Exception('Can not serialize resource type: '. get_resource_type($resource), 0, $e);
+        }
+    }
+}
diff --git a/restler/amfformat/Zend/Amf/Util/BinaryStream.php b/restler/amfformat/Zend/Amf/Util/BinaryStream.php
new file mode 100644
index 000000000..faa532af4
--- /dev/null
+++ b/restler/amfformat/Zend/Amf/Util/BinaryStream.php
@@ -0,0 +1,285 @@
+<?php
+/**
+ * Zend Framework
+ *
+ * LICENSE
+ *
+ * This source file is subject to the new BSD license that is bundled
+ * with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://framework.zend.com/license/new-bsd
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@zend.com so we can send you a copy immediately.
+ *
+ * @category   Zend
+ * @package    Zend_Amf
+ * @subpackage Util
+ * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ * @version    $Id: BinaryStream.php 21210 2010-02-27 10:37:39Z yoshida@zend.co.jp $
+ */
+
+/**
+ * Utility class to walk through a data stream byte by byte with conventional names
+ *
+ * @package    Zend_Amf
+ * @subpackage Util
+ * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ */
+class Zend_Amf_Util_BinaryStream
+{
+    /**
+     * @var string Byte stream
+     */
+    protected $_stream;
+
+    /**
+     * @var int Length of stream
+     */
+    protected $_streamLength;
+
+    /**
+     * @var bool BigEndian encoding?
+     */
+    protected $_bigEndian;
+
+    /**
+     * @var int Current position in stream
+     */
+    protected $_needle;
+
+    /**
+     * Constructor
+     *
+     * Create a reference to a byte stream that is going to be parsed or created
+     * by the methods in the class. Detect if the class should use big or
+     * little Endian encoding.
+     *
+     * @param  string $stream use '' if creating a new stream or pass a string if reading.
+     * @return void
+     */
+    public function __construct($stream)
+    {
+        if (!is_string($stream)) {
+            require_once 'Zend/Amf/Exception.php';
+            throw new Zend_Amf_Exception('Inputdata is not of type String');
+        }
+
+        $this->_stream       = $stream;
+        $this->_needle       = 0;
+        $this->_streamLength = strlen($stream);
+        $this->_bigEndian    = (pack('l', 1) === "\x00\x00\x00\x01");
+    }
+
+    /**
+     * Returns the current stream
+     *
+     * @return string
+     */
+    public function getStream()
+    {
+        return $this->_stream;
+    }
+
+    /**
+     * Read the number of bytes in a row for the length supplied.
+     *
+     * @todo   Should check that there are enough bytes left in the stream we are about to read.
+     * @param  int $length
+     * @return string
+     * @throws Zend_Amf_Exception for buffer underrun
+     */
+    public function readBytes($length)
+    {
+        if (($length + $this->_needle) > $this->_streamLength) {
+            require_once 'Zend/Amf/Exception.php';
+            throw new Zend_Amf_Exception('Buffer underrun at needle position: ' . $this->_needle . ' while requesting length: ' . $length);
+        }
+        $bytes = substr($this->_stream, $this->_needle, $length);
+        $this->_needle+= $length;
+        return $bytes;
+    }
+
+    /**
+     * Write any length of bytes to the stream
+     *
+     * Usually a string.
+     *
+     * @param  string $bytes
+     * @return Zend_Amf_Util_BinaryStream
+     */
+    public function writeBytes($bytes)
+    {
+        $this->_stream.= $bytes;
+        return $this;
+    }
+
+    /**
+     * Reads a signed byte
+     *
+     * @return int Value is in the range of -128 to 127.
+     */
+    public function readByte()
+    {
+        if (($this->_needle + 1) > $this->_streamLength) {
+            require_once 'Zend/Amf/Exception.php';
+            throw new Zend_Amf_Exception('Buffer underrun at needle position: ' . $this->_needle . ' while requesting length: ' . $length);
+        }
+
+        return ord($this->_stream{$this->_needle++});
+    }
+
+    /**
+     * Writes the passed string into a signed byte on the stream.
+     *
+     * @param  string $stream
+     * @return Zend_Amf_Util_BinaryStream
+     */
+    public function writeByte($stream)
+    {
+        $this->_stream.= pack('c', $stream);
+        return $this;
+    }
+
+    /**
+     * Reads a signed 32-bit integer from the data stream.
+     *
+     * @return int Value is in the range of -2147483648 to 2147483647
+     */
+    public function readInt()
+    {
+        return ($this->readByte() << 8) + $this->readByte();
+    }
+
+    /**
+     * Write an the integer to the output stream as a 32 bit signed integer
+     *
+     * @param  int $stream
+     * @return Zend_Amf_Util_BinaryStream
+     */
+    public function writeInt($stream)
+    {
+        $this->_stream.= pack('n', $stream);
+        return $this;
+    }
+
+    /**
+     * Reads a UTF-8 string from the data stream
+     *
+     * @return string A UTF-8 string produced by the byte representation of characters
+     */
+    public function readUtf()
+    {
+        $length = $this->readInt();
+        return $this->readBytes($length);
+    }
+
+    /**
+     * Wite a UTF-8 string to the outputstream
+     *
+     * @param  string $stream
+     * @return Zend_Amf_Util_BinaryStream
+     */
+    public function writeUtf($stream)
+    {
+        $this->writeInt(strlen($stream));
+        $this->_stream.= $stream;
+        return $this;
+    }
+
+
+    /**
+     * Read a long UTF string
+     *
+     * @return string
+     */
+    public function readLongUtf()
+    {
+        $length = $this->readLong();
+        return $this->readBytes($length);
+    }
+
+    /**
+     * Write a long UTF string to the buffer
+     *
+     * @param  string $stream
+     * @return Zend_Amf_Util_BinaryStream
+     */
+    public function writeLongUtf($stream)
+    {
+        $this->writeLong(strlen($stream));
+        $this->_stream.= $stream;
+    }
+
+    /**
+     * Read a long numeric value
+     *
+     * @return double
+     */
+    public function readLong()
+    {
+        return ($this->readByte() << 24) + ($this->readByte() << 16) + ($this->readByte() << 8) + $this->readByte();
+    }
+
+    /**
+     * Write long numeric value to output stream
+     *
+     * @param  int|string $stream
+     * @return Zend_Amf_Util_BinaryStream
+     */
+    public function writeLong($stream)
+    {
+        $this->_stream.= pack('N', $stream);
+        return $this;
+    }
+
+    /**
+     * Read a 16 bit unsigned short.
+     *
+     * @todo   This could use the unpack() w/ S,n, or v
+     * @return double
+     */
+    public function readUnsignedShort()
+    {
+        $byte1 = $this->readByte();
+        $byte2 = $this->readByte();
+        return (($byte1 << 8) | $byte2);
+    }
+
+    /**
+     * Reads an IEEE 754 double-precision floating point number from the data stream.
+     *
+     * @return double Floating point number
+     */
+    public function readDouble()
+    {
+        $bytes = substr($this->_stream, $this->_needle, 8);
+        $this->_needle+= 8;
+
+        if (!$this->_bigEndian) {
+            $bytes = strrev($bytes);
+        }
+
+        $double = unpack('dflt', $bytes);
+        return $double['flt'];
+    }
+
+    /**
+     * Writes an IEEE 754 double-precision floating point number from the data stream.
+     *
+     * @param  string|double $stream
+     * @return Zend_Amf_Util_BinaryStream
+     */
+    public function writeDouble($stream)
+    {
+        $stream = pack('d', $stream);
+        if (!$this->_bigEndian) {
+            $stream = strrev($stream);
+        }
+        $this->_stream.= $stream;
+        return $this;
+    }
+
+}
diff --git a/restler/amfformat/Zend/Amf/Value/Messaging/AbstractMessage.php b/restler/amfformat/Zend/Amf/Value/Messaging/AbstractMessage.php
new file mode 100644
index 000000000..1974405a5
--- /dev/null
+++ b/restler/amfformat/Zend/Amf/Value/Messaging/AbstractMessage.php
@@ -0,0 +1,92 @@
+<?php
+/**
+ * Zend Framework
+ *
+ * LICENSE
+ *
+ * This source file is subject to the new BSD license that is bundled
+ * with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://framework.zend.com/license/new-bsd
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@zend.com so we can send you a copy immediately.
+ *
+ * @category   Zend
+ * @package    Zend_Amf
+ * @subpackage Value
+ * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ * @version    $Id: AbstractMessage.php 20096 2010-01-06 02:05:09Z bkarwin $
+ */
+
+/**
+ * This is the default Implementation of Message, which provides
+ * a convenient base for behavior and association of common endpoints
+ *
+ * @package    Zend_Amf
+ * @subpackage Value
+ * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ */
+class Zend_Amf_Value_Messaging_AbstractMessage
+{
+    /**
+     * @var string Client identifier
+     */
+    public $clientId;
+
+    /**
+     * @var string Destination
+     */
+    public $destination;
+
+    /**
+     * @var string Message identifier
+     */
+    public $messageId;
+
+    /**
+     * @var int Message timestamp
+     */
+    public $timestamp;
+
+    /**
+     * @var int Message TTL
+     */
+    public $timeToLive;
+
+    /**
+     * @var object Message headers
+     */
+    public $headers;
+
+    /**
+     * @var string Message body
+     */
+    public $body;
+
+    /**
+     * generate a unique id
+     *
+     * Format is: ########-####-####-####-############
+     * Where # is an uppercase letter or number
+     * example: 6D9DC7EC-A273-83A9-ABE3-00005FD752D6
+     *
+     * @return string
+     */
+    public function generateId()
+    {
+        return sprintf(
+            '%08X-%04X-%04X-%02X%02X-%012X',
+            mt_rand(),
+            mt_rand(0, 65535),
+            bindec(substr_replace(
+                sprintf('%016b', mt_rand(0, 65535)), '0100', 11, 4)
+            ),
+            bindec(substr_replace(sprintf('%08b', mt_rand(0, 255)), '01', 5, 2)),
+            mt_rand(0, 255),
+            mt_rand()
+        );
+    }
+}
diff --git a/restler/amfformat/Zend/Amf/Value/Messaging/AcknowledgeMessage.php b/restler/amfformat/Zend/Amf/Value/Messaging/AcknowledgeMessage.php
new file mode 100644
index 000000000..5b96f2541
--- /dev/null
+++ b/restler/amfformat/Zend/Amf/Value/Messaging/AcknowledgeMessage.php
@@ -0,0 +1,60 @@
+<?php
+/**
+ * Zend Framework
+ *
+ * LICENSE
+ *
+ * This source file is subject to the new BSD license that is bundled
+ * with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://framework.zend.com/license/new-bsd
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@zend.com so we can send you a copy immediately.
+ *
+ * @category   Zend
+ * @package    Zend_Amf
+ * @subpackage Value
+ * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ * @version    $Id: AcknowledgeMessage.php 20096 2010-01-06 02:05:09Z bkarwin $
+ */
+
+/** Zend_Amf_Value_Messaging_AsyncMessage */
+require_once 'Zend/Amf/Value/Messaging/AsyncMessage.php';
+
+/**
+ * This is the type of message returned by the MessageBroker
+ * to endpoints after the broker has routed an endpoint's message
+ * to a service.
+ *
+ * flex.messaging.messages.AcknowledgeMessage
+ *
+ * @package    Zend_Amf
+ * @subpackage Value
+ * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ */
+class Zend_Amf_Value_Messaging_AcknowledgeMessage extends Zend_Amf_Value_Messaging_AsyncMessage
+{
+    /**
+     * Create a new Acknowledge Message
+     *
+     * @param unknown_type $message
+     */
+    public function __construct($message)
+    {
+        $this->clientId    = $this->generateId();
+        $this->destination = null;
+        $this->messageId   = $this->generateId();
+        $this->timestamp   = time().'00';
+        $this->timeToLive  = 0;
+        $this->headers     = new STDClass();
+        $this->body        = null;
+
+        // correleate the two messages
+        if ($message && isset($message->messageId)) {
+            $this->correlationId = $message->messageId;
+        }
+    }
+}
diff --git a/restler/amfformat/Zend/Amf/Value/Messaging/AsyncMessage.php b/restler/amfformat/Zend/Amf/Value/Messaging/AsyncMessage.php
new file mode 100644
index 000000000..0e02f2ee1
--- /dev/null
+++ b/restler/amfformat/Zend/Amf/Value/Messaging/AsyncMessage.php
@@ -0,0 +1,43 @@
+<?php
+/**
+ * Zend Framework
+ *
+ * LICENSE
+ *
+ * This source file is subject to the new BSD license that is bundled
+ * with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://framework.zend.com/license/new-bsd
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@zend.com so we can send you a copy immediately.
+ *
+ * @category   Zend
+ * @package    Zend_Amf
+ * @subpackage Value
+ * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ * @version    $Id: AsyncMessage.php 20096 2010-01-06 02:05:09Z bkarwin $
+ */
+
+
+/** Zend_Amf_Value_Messaging_AbstractMessage */
+require_once 'Zend/Amf/Value/Messaging/AbstractMessage.php';
+
+/**
+ * This type of message contains information necessary to perform
+ * point-to-point or publish-subscribe messaging.
+ *
+ * @package    Zend_Amf
+ * @subpackage Value
+ * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ */
+class Zend_Amf_Value_Messaging_AsyncMessage extends Zend_Amf_Value_Messaging_AbstractMessage
+{
+    /**
+     * The message id to be responded to.
+     * @var String
+     */
+    public $correlationId;
+}
diff --git a/restler/amfformat/Zend/Amf/Value/Messaging/CommandMessage.php b/restler/amfformat/Zend/Amf/Value/Messaging/CommandMessage.php
new file mode 100644
index 000000000..e926a5e31
--- /dev/null
+++ b/restler/amfformat/Zend/Amf/Value/Messaging/CommandMessage.php
@@ -0,0 +1,119 @@
+<?php
+/**
+ * Zend Framework
+ *
+ * LICENSE
+ *
+ * This source file is subject to the new BSD license that is bundled
+ * with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://framework.zend.com/license/new-bsd
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@zend.com so we can send you a copy immediately.
+ *
+ * @category   Zend
+ * @package    Zend_Amf
+ * @subpackage Value
+ * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ * @version    $Id: CommandMessage.php 20096 2010-01-06 02:05:09Z bkarwin $
+ */
+
+/**
+ * @see Zend_Amf_Value_Messaging_AsyncMessage
+ */
+require_once 'Zend/Amf/Value/Messaging/AsyncMessage.php';
+
+/**
+ * A message that represents an infrastructure command passed between
+ * client and server. Subscribe/unsubscribe operations result in
+ * CommandMessage transmissions, as do polling operations.
+ *
+ * Corresponds to flex.messaging.messages.CommandMessage
+ *
+ * Note: THESE VALUES MUST BE THE SAME ON CLIENT AND SERVER
+ *
+ * @package    Zend_Amf
+ * @subpackage Value
+ * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ */
+class Zend_Amf_Value_Messaging_CommandMessage extends Zend_Amf_Value_Messaging_AsyncMessage
+{
+    /**
+     *  This operation is used to subscribe to a remote destination.
+     */
+    const SUBSCRIBE_OPERATION = 0;
+
+    /**
+     * This operation is used to unsubscribe from a remote destination.
+     */
+    const UNSUSBSCRIBE_OPERATION = 1;
+
+    /**
+     * This operation is used to poll a remote destination for pending,
+     * undelivered messages.
+     */
+    const POLL_OPERATION = 2;
+
+    /**
+     * This operation is used by a remote destination to sync missed or cached messages
+     * back to a client as a result of a client issued poll command.
+     */
+    const CLIENT_SYNC_OPERATION = 4;
+
+    /**
+     * This operation is used to test connectivity over the current channel to
+     * the remote endpoint.
+     */
+    const CLIENT_PING_OPERATION = 5;
+
+    /**
+     * This operation is used to request a list of failover endpoint URIs
+     * for the remote destination based on cluster membership.
+     */
+    const CLUSTER_REQUEST_OPERATION = 7;
+
+    /**
+     * This operation is used to send credentials to the endpoint so that
+     * the user can be logged in over the current channel.
+     * The credentials need to be Base64 encoded and stored in the <code>body</code>
+     * of the message.
+     */
+    const LOGIN_OPERATION = 8;
+
+    /**
+     * This operation is used to log the user out of the current channel, and
+     * will invalidate the server session if the channel is HTTP based.
+     */
+    const LOGOUT_OPERATION = 9;
+
+    /**
+     * This operation is used to indicate that the client's subscription to a
+     * remote destination has been invalidated.
+     */
+    const SESSION_INVALIDATE_OPERATION = 10;
+
+    /**
+     * This operation is used by the MultiTopicConsumer to subscribe/unsubscribe
+     * from multiple subtopics/selectors in the same message.
+     */
+    const MULTI_SUBSCRIBE_OPERATION = 11;
+
+    /**
+     * This operation is used to indicate that a channel has disconnected
+     */
+    const DISCONNECT_OPERATION = 12;
+
+    /**
+     * This is the default operation for new CommandMessage instances.
+     */
+    const UNKNOWN_OPERATION = 10000;
+
+    /**
+     * The operation to execute for messages of this type
+     * @var int
+     */
+    public $operation = self::UNKNOWN_OPERATION;
+}
diff --git a/restler/amfformat/Zend/Amf/Value/Messaging/ErrorMessage.php b/restler/amfformat/Zend/Amf/Value/Messaging/ErrorMessage.php
new file mode 100644
index 000000000..93da0e929
--- /dev/null
+++ b/restler/amfformat/Zend/Amf/Value/Messaging/ErrorMessage.php
@@ -0,0 +1,67 @@
+<?php
+/**
+ * Zend Framework
+ *
+ * LICENSE
+ *
+ * This source file is subject to the new BSD license that is bundled
+ * with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://framework.zend.com/license/new-bsd
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@zend.com so we can send you a copy immediately.
+ *
+ * @category   Zend
+ * @package    Zend_Amf
+ * @subpackage Value
+ * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ * @version    $Id: ErrorMessage.php 20096 2010-01-06 02:05:09Z bkarwin $
+ */
+
+/** @see Zend_Amf_Value_Messaging_AcknowledgeMessage */
+require_once 'Zend/Amf/Value/Messaging/AcknowledgeMessage.php';
+
+/**
+ * Creates the error message to report to flex the issue with the call
+ *
+ * Corresponds to flex.messaging.messages.ErrorMessage
+ *
+ * @package    Zend_Amf
+ * @subpackage Value
+ * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ */
+class Zend_Amf_Value_Messaging_ErrorMessage extends Zend_Amf_Value_Messaging_AcknowledgeMessage
+{
+    /**
+     * Additional data with error
+     * @var object
+     */
+    public $extendedData = null;
+
+    /**
+     * Error code number
+     * @var string
+     */
+    public $faultCode;
+
+    /**
+     * Description as to the cause of the error
+     * @var string
+     */
+    public $faultDetail;
+
+    /**
+     * Short description of error
+     * @var string
+     */
+    public $faultString = '';
+
+    /**
+     * root cause of error
+     * @var object
+     */
+    public $rootCause = null;
+}
diff --git a/restler/amfformat/Zend/Amf/Value/Messaging/RemotingMessage.php b/restler/amfformat/Zend/Amf/Value/Messaging/RemotingMessage.php
new file mode 100644
index 000000000..e13915cde
--- /dev/null
+++ b/restler/amfformat/Zend/Amf/Value/Messaging/RemotingMessage.php
@@ -0,0 +1,73 @@
+<?php
+/**
+ * Zend Framework
+ *
+ * LICENSE
+ *
+ * This source file is subject to the new BSD license that is bundled
+ * with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://framework.zend.com/license/new-bsd
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@zend.com so we can send you a copy immediately.
+ *
+ * @category   Zend
+ * @package    Zend_Amf
+ * @subpackage Value
+ * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ * @version    $Id: RemotingMessage.php 20096 2010-01-06 02:05:09Z bkarwin $
+ */
+
+/** Zend_Amf_Value_Messaging_AbstractMessage */
+require_once 'Zend/Amf/Value/Messaging/AbstractMessage.php';
+
+/**
+ * This type of message contains information needed to perform
+ * a Remoting invocation.
+ *
+ * Corresponds to flex.messaging.messages.RemotingMessage
+ *
+ * @package    Zend_Amf
+ * @subpackage Value
+ * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ */
+class Zend_Amf_Value_Messaging_RemotingMessage extends Zend_Amf_Value_Messaging_AbstractMessage
+{
+
+    /**
+     * The name of the service to be called including package name
+     * @var String
+     */
+    public $source;
+
+    /**
+     * The name of the method to be called
+     * @var string
+     */
+    public $operation;
+
+    /**
+     * The arguments to call the mathod with
+     * @var array
+     */
+    public $parameters;
+
+    /**
+     * Create a new Remoting Message
+     *
+     * @return void
+     */
+    public function __construct()
+    {
+        $this->clientId    = $this->generateId();
+        $this->destination = null;
+        $this->messageId   = $this->generateId();
+        $this->timestamp   = time().'00';
+        $this->timeToLive  = 0;
+        $this->headers     = new stdClass();
+        $this->body        = null;
+    }
+}
diff --git a/restler/amfformat/amfformat.php b/restler/amfformat/amfformat.php
new file mode 100644
index 000000000..d070d2143
--- /dev/null
+++ b/restler/amfformat/amfformat.php
@@ -0,0 +1,70 @@
+<?php
+/**
+ * AMF Binary Format for Restler Framework.
+ * Native format supported by Adobe Flash and Adobe AIR
+ * @category   Framework
+ * @package    restler
+ * @subpackage format
+ * @author     R.Arul Kumaran <arul@luracast.com>
+ * @copyright  2010 Luracast
+ * @license    http://www.opensource.org/licenses/lgpl-license.php LGPL
+ * @link       http://luracast.com/products/restler/
+ */
+
+class AmfFormat implements iFormat
+{
+	const PATH = '/Zend/Amf/Parse/';
+	const MIME = 'application/x-amf';
+	const EXTENSION = 'amf';
+
+	public $path = '';
+
+	public function init(){
+		$this->path = dirname(__FILE__);
+		$include_path = get_include_path();
+		if(strpos($include_path, 'Zend')===FALSE){
+			set_include_path($this->path.':'.$include_path);
+		}
+		$this->path .= AmfFormat::PATH;
+	}
+
+	public function getMIMEMap()
+	{
+		return array(AmfFormat::EXTENSION=>AmfFormat::MIME);
+	}
+	public function getMIME(){
+		return  AmfFormat::MIME;
+	}
+	public function getExtension(){
+		return AmfFormat::EXTENSION;
+	}
+	public function setMIME($mime){
+		//do nothing
+	}
+	public function setExtension($extension){
+		//do nothing
+	}
+
+	public function encode($data, $human_readable=false){
+		$this->init();
+		require_once $this->path . 'OutputStream.php';
+		require_once $this->path . 'Amf3/Serializer.php';
+		$stream = new Zend_Amf_Parse_OutputStream();
+		$serializer = new Zend_Amf_Parse_Amf3_Serializer($stream);
+		$serializer->writeTypeMarker($data);
+		return $stream->getStream();
+	}
+
+	public function decode($data){
+		$this->init();
+		require_once $this->path .'InputStream.php';
+		require_once $this->path .'Amf3/Deserializer.php';
+		$stream = new Zend_Amf_Parse_InputStream(substr($data, 1));
+		$deserializer = new Zend_Amf_Parse_Amf3_Deserializer($stream);
+		return $deserializer->readTypeMarker();
+	}
+
+	public function __toString(){
+		return $this->getExtension();
+	}
+}
\ No newline at end of file
diff --git a/restler/compat.php b/restler/compat.php
new file mode 100644
index 000000000..08a950d20
--- /dev/null
+++ b/restler/compat.php
@@ -0,0 +1,58 @@
+<?php
+if(version_compare('5.0.0',PHP_VERSION)>0){
+	die('Restler requires PHP 5.x.x');
+}
+#requires 5.3.2
+if(!method_exists('ReflectionMethod', 'setAccessible')){
+	#echo'RESTLER_METHOD_UNPROTECTION_MODE';
+	function isRestlerCompatibilityModeEnabled(){
+		return TRUE;
+	}
+	function unprotect($method_info){
+		$class_name = $method_info->class_name;
+		$method = $method_info->method_name;
+		$params = $method_info->arguments;
+		$unique = uniqid('Dynamic')."_";
+		$class_code = "class $unique$class_name extends $class_name {";
+		$p = array();
+		for ($i = 0; $i < count($params); $i++) {
+			$p[]='$'."P$i";
+		}
+		$p = implode(',', $p);
+		$class_code .= "function $unique$method($p){return parent::$method($p);}";
+		$class_code .= "}";
+		#echo $class_code;
+		eval($class_code);
+		$method_info->class_name = "$unique$class_name";
+		$method_info->method_name = "$unique$method";
+		return $method_info;
+	}
+	function call_protected_user_method_array($class_name, $method, $params)
+	{
+		if(is_object($class_name))$class_name = get_class($class_name);
+		$unique = uniqid('Dynamic')."_";
+		$class_code = "class $unique$class_name  extends  $class_name {";
+		$p = array();
+		for ($i = 0; $i < count($params); $i++) {
+			$p[]='$'."P$i";
+		}
+		$p = implode(',', $p);
+		$class_code .= "function $unique$method($p){return parent::$method($p);}";
+		$class_code .= "}";
+		#echo $class_code;
+		eval($class_code);
+		$obj = $unique.$class_name;
+		$obj = new $obj();
+		return call_user_func_array(array($obj,$unique.$method), $params);
+	}
+}
+
+#requires 5.2.3
+#if(!method_exists('ReflectionParameter', 'getPosition')){
+#found fix! not using getPosition in restler 2.0
+#}
+
+#requires 5.3.0
+#if(!defined('__DIR__')){
+# avoided using it in Restler and replaced it with dirname(__FILE__)
+#}
diff --git a/restler/plistformat/.svn/entries b/restler/plistformat/.svn/entries
new file mode 100644
index 000000000..74a1b625b
--- /dev/null
+++ b/restler/plistformat/.svn/entries
@@ -0,0 +1,166 @@
+10
+
+dir
+0
+svn://localhost/Restler/trunk/Restler/plistformat
+svn://localhost/Restler
+add
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ce0eef8e-4246-4db1-a4b2-968e926b47c2
+
+CFPropertyList.php
+file
+
+
+
+add
+
+0f1e8ab2446ca3efc549a0827098f007
+
+
+
+
+
+
+
+
+
+
+
+copied
+svn://localhost/Restler/trunk/Restler/plist/CFPropertyList.php
+12
+
+CFType.php
+file
+
+
+
+add
+
+cdea3ed5c0b042bb991dae717782054b
+
+
+
+
+
+
+
+
+
+
+
+copied
+svn://localhost/Restler/trunk/Restler/plist/CFType.php
+12
+
+PListException.php
+file
+
+
+
+add
+
+6aab48e2e1e2d38666e6dc0ebc644358
+
+
+
+
+
+
+
+
+
+
+
+copied
+svn://localhost/Restler/trunk/Restler/plist/PListException.php
+12
+
+CFBinaryPropertyList.php
+file
+
+
+
+add
+
+03b16947dab62b9f6484f8abdab84666
+
+
+
+
+
+
+
+
+
+
+
+copied
+svn://localhost/Restler/trunk/Restler/plist/CFBinaryPropertyList.php
+12
+
+CFTypeDetector.php
+file
+
+
+
+add
+
+1626382122aedd2aacb0fb6bede301ea
+
+
+
+
+
+
+
+
+
+
+
+copied
+svn://localhost/Restler/trunk/Restler/plist/CFTypeDetector.php
+12
+
+IOException.php
+file
+
+
+
+add
+
+0a452a75451b9e95e07cdc25e96cf1ea
+
+
+
+
+
+
+
+
+
+
+
+copied
+svn://localhost/Restler/trunk/Restler/plist/IOException.php
+12
+
diff --git a/restler/plistformat/.svn/text-base/CFBinaryPropertyList.php.svn-base b/restler/plistformat/.svn/text-base/CFBinaryPropertyList.php.svn-base
new file mode 100644
index 000000000..f946193da
--- /dev/null
+++ b/restler/plistformat/.svn/text-base/CFBinaryPropertyList.php.svn-base
@@ -0,0 +1,970 @@
+<?php
+/**
+ * CFPropertyList
+ * {@link http://developer.apple.com/documentation/Darwin/Reference/ManPages/man5/plist.5.html Property Lists}
+ * @author Rodney Rehm <rodney.rehm@medialize.de>
+ * @author Christian Kruse <cjk@wwwtech.de>
+ * @package plist
+ * @version $Id$
+ */
+
+/**
+ * Facility for reading and writing binary PropertyLists. Ported from {@link http://www.opensource.apple.com/source/CF/CF-476.15/CFBinaryPList.c CFBinaryPList.c}.
+ * @author Rodney Rehm <rodney.rehm@medialize.de>
+ * @author Christian Kruse <cjk@wwwtech.de>
+ * @package plist
+ * @example example-read-02.php Read a Binary PropertyList
+ * @example example-read-03.php Read a PropertyList without knowing the type
+ */
+abstract class CFBinaryPropertyList {
+  /**
+   * Content of the plist (unparsed string)
+   * @var string
+   */
+  protected $content = NULL;
+
+  /**
+   * position in the (unparsed) string
+   * @var integer
+   */
+  protected $pos = 0;
+
+  /**
+   * Table containing uniqued objects
+   * @var array
+   */
+  protected $uniqueTable = Array();
+
+  /**
+   * Number of objects in file
+   * @var integer
+   */
+  protected $countObjects = 0;
+
+  /**
+   * The length of all strings in the file (byte length, not character length)
+   * @var integer
+   */
+  protected $stringSize = 0;
+
+  /**
+   * The length of all ints in file (byte length)
+   * @var integer
+   */
+  protected $intSize = 0;
+
+  /**
+   * The length of misc objects (i.e. not integer and not string) in file
+   * @var integer
+   */
+  protected $miscSize = 0;
+
+  /**
+   * Number of object references in file (needed to calculate reference byte length)
+   * @var integer
+   */
+  protected $objectRefs = 0;
+
+  /**
+   * Number of objects written during save phase; needed to calculate the size of the object table
+   * @var integer
+   */
+  protected $writtenObjectCount = 0;
+
+  /**
+   * Table containing all objects in the file
+   */
+  protected $objectTable = Array();
+
+  /**
+   * The size of object references
+   */
+  protected $objectRefSize = 0;
+
+  /**
+   * The „offsets” (i.e. the different entries) in the file
+   */
+  protected $offsets = Array();
+
+  /**
+   * Read a „null type” (filler byte, true, false, 0 byte)
+   * @param $length The byte itself
+   * @return the byte value (e.g. CFBoolean(true), CFBoolean(false), 0 or 15)
+   * @throws PListException on encountering an unknown null type
+   */
+  protected function readBinaryNullType($length) {
+    switch($length) {
+      case 0: return 0; // null type
+      case 8: return new CFBoolean(false);
+      case 9: return new CFBoolean(true);
+      case 15: return 15; // fill type
+    }
+
+    throw new PListException("unknown null type: $length");
+  }
+
+  /**
+   * Create an 64 bit integer using bcmath or gmp
+   * @param int $hi The higher word
+   * @param int $lo The lower word
+   * @return mixed The integer (as int if possible, as string if not possible)
+   * @throws PListException if neither gmp nor bc available
+   */
+  protected static function make64Int($hi,$lo) {
+    // on x64, we can just use int
+    if(PHP_INT_SIZE > 4) return (((int)$hi)<<32) | ((int)$lo);
+
+    // lower word has to be unsigned since we don't use bitwise or, we use bcadd/gmp_add
+    $lo = sprintf("%u", $lo);
+
+    // use GMP or bcmath if possible
+    if(function_exists("gmp_mul")) return gmp_strval(gmp_add(gmp_mul($hi, "4294967296"), $lo));
+
+    if(function_exists("bcmul")) return bcadd(bcmul($hi,"4294967296"), $lo);
+
+    if(class_exists('Math_BigInteger')) {
+      $bi = new Math_BigInteger($hi);
+      return $bi->multiply("4294967296")->add($lo)->toString();
+    }
+
+    throw new PListException("either gmp or bc has to be installed, or the Math_BigInteger has to be available!");
+  }
+
+  /**
+   * Read an integer value
+   * @param integer $length The length (in bytes) of the integer value, coded as „set bit $length to 1”
+   * @return CFNumber The integer value
+   * @throws PListException if integer val is invalid
+   * @throws IOException if read error occurs
+   * @uses make64Int() to overcome PHP's big integer problems
+   */
+  protected function readBinaryInt($length) {
+    if($length > 3) throw new PListException("Integer greater than 8 bytes: $length");
+
+    $nbytes = 1 << $length;
+
+    $val = null;
+    if(strlen($buff = substr($this->content, $this->pos, $nbytes)) != $nbytes) throw IOException::readError("");
+    $this->pos += $nbytes;
+
+    switch($length) {
+      case 0:
+        $val = unpack("C", $buff);
+        $val = $val[1];
+        break;
+      case 1:
+        $val = unpack("n", $buff);
+        $val = $val[1];
+        break;
+      case 2:
+        $val = unpack("N", $buff);
+        $val = $val[1];
+        break;
+      case 3:
+        $words = unpack("Nhighword/Nlowword",$buff);
+        //$val = $words['highword'] << 32 | $words['lowword'];
+        $val = self::make64Int($words['highword'],$words['lowword']);
+        break;
+    }
+
+    return new CFNumber($val);
+  }
+
+  /**
+   * Read a real value
+   * @param integer $length The length (in bytes) of the integer value, coded as „set bit $length to 1”
+   * @return CFNumber The real value
+   * @throws PListException if real val is invalid
+   * @throws IOException if read error occurs
+   */
+  protected function readBinaryReal($length) {
+    if($length > 3) throw new PListException("Real greater than 8 bytes: $length");
+
+    $nbytes = 1 << $length;
+    $val = null;
+    if(strlen($buff = substr($this->content,$this->pos, $nbytes)) != $nbytes) throw IOException::readError("");
+    $this->pos += $nbytes;
+
+    switch($length) {
+      case 0: // 1 byte float? must be an error
+      case 1: // 2 byte float? must be an error
+        $x = $length + 1;
+        throw new PListException("got {$x} byte float, must be an error!");
+      case 2:
+        $val = unpack("f", strrev($buff));
+        $val = $val[1];
+        break;
+      case 3:
+        $val = unpack("d", strrev($buff));
+        $val = $val[1];
+        break;
+    }
+
+    return new CFNumber($val);
+  }
+
+  /**
+   * Read a date value
+   * @param integer $length The length (in bytes) of the integer value, coded as „set bit $length to 1”
+   * @return CFDate The date value
+   * @throws PListException if date val is invalid
+   * @throws IOException if read error occurs
+   */
+  protected function readBinaryDate($length) {
+    if($length > 3) throw new PListException("Date greater than 8 bytes: $length");
+
+    $nbytes = 1 << $length;
+    $val = null;
+    if(strlen($buff = substr($this->content, $this->pos, $nbytes)) != $nbytes) throw IOException::readError("");
+    $this->pos += $nbytes;
+
+    switch($length) {
+      case 0: // 1 byte CFDate is an error
+      case 1: // 2 byte CFDate is an error
+        $x = $length + 1;
+        throw new PListException("{$x} byte CFdate, error");
+
+      case 2:
+        $val = unpack("f", strrev($buff));
+        $val = $val[1];
+        break;
+      case 3:
+        $val = unpack("d", strrev($buff));
+        $val = $val[1];
+        break;
+    }
+
+    return new CFDate($val,CFDate::TIMESTAMP_APPLE);
+  }
+
+  /**
+   * Read a data value
+   * @param integer $length The length (in bytes) of the integer value, coded as „set bit $length to 1”
+   * @return CFData The data value
+   * @throws IOException if read error occurs
+   */
+  protected function readBinaryData($length) {
+    if($length == 0) $buff = "";
+    else {
+      $buff = substr($this->content, $this->pos, $length);
+      if(strlen($buff) != $length) throw IOException::readError("");
+      $this->pos += $length;
+    }
+
+    return new CFData($buff,false);
+  }
+
+  /**
+   * Read a string value, usually coded as utf8
+   * @param integer $length The length (in bytes) of the string value
+   * @return CFString The string value, utf8 encoded
+   * @throws IOException if read error occurs
+   */
+  protected function readBinaryString($length) {
+    if($length == 0) $buff = "";
+    else {
+      if(strlen($buff = substr($this->content, $this->pos, $length)) != $length) throw IOException::readError("");
+      $this->pos += $length;
+    }
+
+    if(!isset($this->uniqueTable[$buff])) $this->uniqueTable[$buff] = true;
+    return new CFString($buff);
+  }
+
+  /**
+   * Convert the given string from one charset to another.
+   * Trying to use MBString, Iconv, Recode - in that particular order.
+   * @param string $string the string to convert
+   * @param string $fromCharset the charset the given string is currently encoded in
+   * @param string $toCharset the charset to convert to, defaults to UTF-8
+   * @return string the converted string
+   * @throws PListException on neither MBString, Iconv, Recode being available
+   */
+  public static function convertCharset($string, $fromCharset, $toCharset='UTF-8') {
+    if(function_exists('mb_convert_encoding')) return mb_convert_encoding($string, $toCharset, $fromCharset);
+    if(function_exists('iconv')) return iconv($fromCharset, $toCharset, $string);
+    if(function_exists('recode_string')) return recode_string($fromCharset .'..'. $toCharset, $string);
+
+    throw new PListException('neither iconv nor mbstring supported. how are we supposed to work on strings here?');
+  }
+
+  /**
+   * Count characters considering character set
+   * Trying to use MBString, Iconv - in that particular order.
+   * @param string $string the string to convert
+   * @param string $charset the charset the given string is currently encoded in
+   * @return integer The number of characters in that string
+   * @throws PListException on neither MBString, Iconv being available
+   */
+  public static function charsetStrlen($string,$charset="UTF-8") {
+    if(function_exists('mb_strlen')) return mb_strlen($string, $charset);
+    if(function_exists('iconv_strlen')) return iconv_strlen($string,$charset);
+
+    throw new PListException('neither iconv nor mbstring supported. how are we supposed to work on strings here?');
+  }
+
+  /**
+   * Read a unicode string value, coded as UTF-16BE
+   * @param integer $length The length (in bytes) of the string value
+   * @return CFString The string value, utf8 encoded
+   * @throws IOException if read error occurs
+   */
+  protected function readBinaryUnicodeString($length) {
+    /* The problem is: we get the length of the string IN CHARACTERS;
+       since a char in UTF-16 can be 16 or 32 bit long, we don't really know
+       how long the string is in bytes */
+    if(strlen($buff = substr($this->content, $this->pos, 2*$length)) != 2*$length) throw IOException::readError("");
+    $this->pos += 2 * $length;
+
+    if(!isset($this->uniqueTable[$buff])) $this->uniqueTable[$buff] = true;
+    return new CFString(self::convertCharset($buff, "UTF-16BE", "UTF-8"));
+  }
+
+  /**
+   * Read an array value, including contained objects
+   * @param integer $length The number of contained objects
+   * @return CFArray The array value, including the objects
+   * @throws IOException if read error occurs
+   */
+  protected function readBinaryArray($length) {
+    $ary = new CFArray();
+
+    // first: read object refs
+    if($length != 0) {
+      if(strlen($buff = substr($this->content, $this->pos, $length * $this->objectRefSize)) != $length * $this->objectRefSize) throw IOException::readError("");
+      $this->pos += $length * $this->objectRefSize;
+
+      $objects = unpack($this->objectRefSize == 1 ? "C*" : "n*", $buff);
+
+      // now: read objects
+      for($i=0;$i<$length;++$i) {
+        $object = $this->readBinaryObjectAt($objects[$i+1]+1,$this->objectRefSize);
+        $ary->add($object);
+      }
+    }
+
+    return $ary;
+  }
+
+  /**
+   * Read a dictionary value, including contained objects
+   * @param integer $length The number of contained objects
+   * @return CFDictionary The dictionary value, including the objects
+   * @throws IOException if read error occurs
+   */
+  protected function readBinaryDict($length) {
+    $dict = new CFDictionary();
+
+    // first: read keys
+    if($length != 0) {
+      if(strlen($buff = substr($this->content, $this->pos, $length * $this->objectRefSize)) != $length * $this->objectRefSize) throw IOException::readError("");
+      $this->pos += $length * $this->objectRefSize;
+      $keys = unpack(($this->objectRefSize == 1 ? "C*" : "n*"), $buff);
+
+      // second: read object refs
+      if(strlen($buff = substr($this->content, $this->pos, $length * $this->objectRefSize)) != $length * $this->objectRefSize) throw IOException::readError("");
+      $this->pos += $length * $this->objectRefSize;
+      $objects = unpack(($this->objectRefSize == 1 ? "C*" : "n*"), $buff);
+
+      // read real keys and objects
+      for($i=0;$i<$length;++$i) {
+        $key = $this->readBinaryObjectAt($keys[$i+1]+1);
+        $object = $this->readBinaryObjectAt($objects[$i+1]+1);
+        $dict->add($key->getValue(),$object);
+      }
+    }
+
+    return $dict;
+  }
+
+  /**
+   * Read an object type byte, decode it and delegate to the correct reader function
+   * @return mixed The value of the delegate reader, so any of the CFType subclasses
+   * @throws IOException if read error occurs
+   */
+  function readBinaryObject() {
+    // first: read the marker byte
+    if(strlen($buff = substr($this->content,$this->pos,1)) != 1) throw IOException::readError("");
+    $this->pos++;
+
+    $object_length = unpack("C*", $buff);
+    $object_length = $object_length[1]  & 0xF;
+    $buff = unpack("H*", $buff);
+    $buff = $buff[1];
+
+    $object_type = substr($buff, 0, 1);
+    if($object_type != "0" && $object_length == 15) {
+      $object_length = $this->readBinaryObject($this->objectRefSize);
+      $object_length = $object_length->getValue();
+    }
+
+    $retval = null;
+    switch($object_type) {
+      case '0': // null, false, true, fillbyte
+        $retval = $this->readBinaryNullType($object_length);
+        break;
+      case '1': // integer
+        $retval = $this->readBinaryInt($object_length);
+        break;
+      case '2': // real
+        $retval = $this->readBinaryReal($object_length);
+        break;
+      case '3': // date
+        $retval = $this->readBinaryDate($object_length);
+        break;
+      case '4': // data
+        $retval = $this->readBinaryData($object_length);
+        break;
+      case '5': // byte string, usually utf8 encoded
+        $retval = $this->readBinaryString($object_length);
+        break;
+      case '6': // unicode string (utf16be)
+        $retval = $this->readBinaryUnicodeString($object_length);
+        break;
+      case 'a': // array
+        $retval = $this->readBinaryArray($object_length);
+        break;
+      case 'd': // dictionary
+        $retval = $this->readBinaryDict($object_length);
+        break;
+    }
+
+    return $retval;
+  }
+
+  /**
+   * Read an object type byte at position $pos, decode it and delegate to the correct reader function
+   * @param integer $pos The table position in the offsets table
+   * @return mixed The value of the delegate reader, so any of the CFType subclasses
+   */
+  function readBinaryObjectAt($pos) {
+    $this->pos = $this->offsets[$pos];
+    return $this->readBinaryObject();
+  }
+
+  /**
+   * Parse a binary plist string
+   * @return void
+   * @throws IOException if read error occurs
+   */
+  public function parseBinaryString() {
+    $this->uniqueTable = Array();
+    $this->countObjects = 0;
+    $this->stringSize = 0;
+    $this->intSize = 0;
+    $this->miscSize = 0;
+    $this->objectRefs = 0;
+
+    $this->writtenObjectCount = 0;
+    $this->objectTable = Array();
+    $this->objectRefSize = 0;
+
+    $this->offsets = Array();
+
+    // first, we read the trailer: 32 byte from the end
+    $buff = substr($this->content,-32);
+
+    $infos = unpack("x6/Coffset_size/Cobject_ref_size/x4/Nnumber_of_objects/x4/Ntop_object/x4/Ntable_offset",$buff);
+
+    // after that, get the offset table
+    $coded_offset_table = substr($this->content,$infos['table_offset'],$infos['number_of_objects'] * $infos['offset_size']);
+    if(strlen($coded_offset_table) != $infos['number_of_objects'] * $infos['offset_size']) throw IOException::readError("");
+    $this->countObjects = $infos['number_of_objects'];
+
+    // decode offset table
+    $formats = Array("","C*","n*",NULL,"N*");
+    if($infos['offset_size'] == 3) { # since PHP does not support parenthesis in pack/unpack expressions,
+                                     # "(H6)*" does not work and we have to work round this by repeating the
+                                     # expression as often as it fits in the string
+      $this->offsets = array(NULL);
+      while($coded_offset_table) {
+        $str = unpack("H6",$coded_offset_table);
+        $this->offsets[] = hexdec($str[1]);
+        $coded_offset_table = substr($coded_offset_table,3);
+      }
+    }
+    else $this->offsets = unpack($formats[$infos['offset_size']],$coded_offset_table);
+
+    $this->uniqueTable = Array();
+    $this->objectRefSize = $infos['object_ref_size'];
+
+    $top = $this->readBinaryObjectAt($infos['top_object']+1);
+    $this->add($top);
+  }
+
+  /**
+   * Read a binary plist stream
+   * @param resource $stream The stream to read
+   * @return void
+   * @throws IOException if read error occurs
+   */
+  function readBinaryStream($stream) {
+    $str = stream_get_contents($stream);
+    $this->parseBinary($str);
+  }
+
+  /**
+   * parse a binary plist string
+   * @param string $content The stream to read, defaults to {@link $this->content}
+   * @return void
+   * @throws IOException if read error occurs
+   */
+  function parseBinary($content=NULL) {
+    if($content !== NULL) $this->content = $content;
+    $this->pos = 0;
+
+    $this->parseBinaryString();
+  }
+
+  /**
+   * Read a binary plist file
+   * @param string $file The file to read
+   * @return void
+   * @throws IOException if read error occurs
+   */
+  function readBinary($file) {
+    if(!($fd = fopen($file,"rb"))) throw new IOException("Could not open file {$file}!");
+    $this->readBinaryStream($fd);
+    fclose($fd);
+  }
+
+  /**
+   * calculate the bytes needed for a size integer value
+   * @param integer $int The integer value to calculate
+   * @return integer The number of bytes needed
+   */
+  public static function bytesSizeInt($int) {
+    $nbytes = 0;
+
+    if($int > 0xE) $nbytes += 2; // 2 size-bytes
+    if($int > 0xFF) $nbytes += 1; // 3 size-bytes
+    if($int > 0xFFFF) $nbytes += 2; // 5 size-bytes
+
+    return $nbytes;
+  }
+
+  /**
+   * Calculate the byte needed for a „normal” integer value
+   * @param integer $int The integer value
+   * @return integer The number of bytes needed + 1 (because of the „marker byte”)
+   */
+  public static function bytesInt($int) {
+    $nbytes = 1;
+
+    if($int > 0xFF) $nbytes += 1; // 2 byte integer
+    if($int > 0xFFFF) $nbytes += 2; // 4 byte integer
+    if($int > 0xFFFFFFFF) $nbytes += 4; // 8 byte integer
+    if($int < 0) $nbytes += 7; // 8 byte integer (since it is signed)
+
+    return $nbytes + 1; // one „marker” byte
+  }
+
+  /**
+   * „pack” a value (i.e. write the binary representation as big endian to a string) with the specified size
+   * @param integer $nbytes The number of bytes to pack
+   * @param integer $int the integer value to pack
+   * @return string The packed value as string
+   */
+  public static function packItWithSize($nbytes,$int) {
+    $formats = Array("C", "n", "N", "N");
+    $format = $formats[$nbytes-1];
+    $ret = '';
+
+    if($nbytes == 3) return substr(pack($format, $int), -3);
+    return pack($format, $int);
+  }
+
+  /**
+   * Calculate the bytes needed to save the number of objects
+   * @param integer $count_objects The number of objects
+   * @return integer The number of bytes
+   */
+  public static function bytesNeeded($count_objects) {
+    $nbytes = 0;
+
+    while($count_objects >= 1) {
+      $nbytes++;
+      $count_objects /= 256;
+    }
+
+    return $nbytes;
+  }
+
+  /**
+   * Code an integer to byte representation
+   * @param integer $int The integer value
+   * @return string The packed byte value
+   */
+  public static function intBytes($int) {
+    $intbytes = "";
+
+    if($int > 0xFFFF) $intbytes = "\x12".pack("N", $int); // 4 byte integer
+    elseif($int > 0xFF) $intbytes = "\x11".pack("n", $int); // 2 byte integer
+    else $intbytes = "\x10".pack("C", $int); // 8 byte integer
+
+    return $intbytes;
+  }
+
+  /**
+   * Code an type byte, consisting of the type marker and the length of the type
+   * @param string $type The type byte value (i.e. "d" for dictionaries)
+   * @param integer $type_len The length of the type
+   * @return string The packed type byte value
+   */
+  public static function typeBytes($type,$type_len) {
+    $optional_int = "";
+
+    if($type_len < 15) $type .= sprintf("%x", $type_len);
+    else {
+      $type .= "f";
+      $optional_int = self::intBytes($type_len);
+    }
+
+    return pack("H*", $type).$optional_int;
+  }
+
+  /**
+   * Count number of objects and create a unique table for strings
+   * @param $value The value to count and unique
+   * @return void
+   */
+  protected function uniqueAndCountValues($value) {
+    // no uniquing for other types than CFString and CFData
+    if($value instanceof CFNumber) {
+      $val = $value->getValue();
+      if(intval($val) == $val && !is_float($val) && strpos($val,'.') === false) $this->intSize += self::bytesInt($val);
+      else $this->miscSize += 9; // 9 bytes (8 + marker byte) for real
+      $this->countObjects++;
+      return;
+    }
+    elseif($value instanceof CFDate) {
+      $this->miscSize += 9; // since date in plist is real, we need 9 byte (8 + marker byte)
+      $this->countObjects++;
+      return;
+    }
+    elseif($value instanceof CFBoolean) {
+      $this->countObjects++;
+      $this->miscSize += 1;
+      return;
+    }
+    elseif($value instanceof CFArray) {
+      $cnt = 0;
+      foreach($value as $v) {
+        ++$cnt;
+        $this->uniqueAndCountValues($v);
+        $this->objectRefs++; // each array member is a ref
+      }
+
+      $this->countObjects++;
+      $this->intSize += self::bytesSizeInt($cnt);
+      $this->miscSize++; // marker byte for array
+      return;
+    }
+    elseif($value instanceof CFDictionary) {
+      $cnt = 0;
+      foreach($value as $k => $v) {
+        ++$cnt;
+        if(!isset($this->uniqueTable[$k])) {
+          $this->uniqueTable[$k] = 0;
+          $len = self::binaryStrlen($k);
+          $this->stringSize += $len + 1;
+          $this->intSize += self::bytesSizeInt(self::charsetStrlen($k,'UTF-8'));
+        }
+
+        $this->objectRefs += 2; // both, key and value, are refs
+        $this->uniqueTable[$k]++;
+        $this->uniqueAndCountValues($v);
+      }
+
+      $this->countObjects++;
+      $this->miscSize++; // marker byte for dict
+      $this->intSize += self::bytesSizeInt($cnt);
+      return;
+    }
+    elseif($value instanceOf CFData) {
+      $val = $value->getValue();
+      $len = strlen($val);
+      $this->intSize += self::bytesSizeInt($len);
+      $this->miscSize += $len + 1;
+      $this->countObjects++;
+      return;
+    }
+    else $val = $value->getValue();
+
+    if(!isset($this->uniqueTable[$val])) {
+      $this->uniqueTable[$val] = 0;
+      $len = self::binaryStrlen($val);
+      $this->stringSize += $len + 1;
+      $this->intSize += self::bytesSizeInt(self::charsetStrlen($val,'UTF-8'));
+    }
+    $this->uniqueTable[$val]++;
+  }
+
+  /**
+   * Convert CFPropertyList to binary format; since we have to count our objects we simply unique CFDictionary and CFArray
+   * @return string The binary plist content
+   */
+  public function toBinary() {
+    $this->uniqueTable = Array();
+    $this->countObjects = 0;
+    $this->stringSize = 0;
+    $this->intSize = 0;
+    $this->miscSize = 0;
+    $this->objectRefs = 0;
+
+    $this->writtenObjectCount = 0;
+    $this->objectTable = Array();
+    $this->objectRefSize = 0;
+
+    $this->offsets = Array();
+
+    $binary_str = "bplist00";
+    $value = $this->getValue(true);
+    $this->uniqueAndCountValues($value);
+
+    $this->countObjects += count($this->uniqueTable);
+    $this->objectRefSize = self::bytesNeeded($this->countObjects);
+    $file_size = $this->stringSize + $this->intSize + $this->miscSize + $this->objectRefs * $this->objectRefSize + 40;
+    $offset_size = self::bytesNeeded($file_size);
+    $table_offset = $file_size - 32;
+
+    $this->objectTable = Array();
+    $this->writtenObjectCount = 0;
+    $this->uniqueTable = Array(); // we needed it to calculate several values
+    $value->toBinary($this);
+
+    $object_offset = 8;
+    $offsets = Array();
+
+    for($i=0;$i<count($this->objectTable);++$i) {
+      $binary_str .= $this->objectTable[$i];
+      $offsets[$i] = $object_offset;
+      $object_offset += strlen($this->objectTable[$i]);
+    }
+
+    for($i=0;$i<count($offsets);++$i) {
+      $binary_str .= self::packItWithSize($offset_size, $offsets[$i]);
+    }
+
+
+    $binary_str .= pack("x6CC", $offset_size, $this->objectRefSize);
+    $binary_str .= pack("x4N", $this->countObjects);
+    $binary_str .= pack("x4N", 0);
+    $binary_str .= pack("x4N", $table_offset);
+
+    return $binary_str;
+  }
+
+  /**
+   * Counts the number of bytes the string will have when coded; utf-16be if non-ascii characters are present.
+   * @param string $val The string value
+   * @return integer The length of the coded string in bytes
+   */
+  protected static function binaryStrlen($val) {
+    for($i=0;$i<strlen($val);++$i) {
+      if(ord($val{$i}) >= 128) {
+        $val = self::convertCharset($val, 'UTF-8', 'UTF-16BE');
+        return strlen($val);
+      }
+    }
+
+    return strlen($val);
+  }
+
+  /**
+   * Uniques and transforms a string value to binary format and adds it to the object table
+   * @param string $val The string value
+   * @return integer The position in the object table
+   */
+  public function stringToBinary($val) {
+    $saved_object_count = -1;
+
+    if(!isset($this->uniqueTable[$val])) {
+      $saved_object_count = $this->writtenObjectCount++;
+      $this->uniqueTable[$val] = $saved_object_count;
+      $utf16 = false;
+
+      for($i=0;$i<strlen($val);++$i) {
+        if(ord($val{$i}) >= 128) {
+          $utf16 = true;
+          break;
+        }
+      }
+
+      if($utf16) {
+        $bdata = self::typeBytes("6", mb_strlen($val,'UTF-8')); // 6 is 0110, unicode string (utf16be)
+        $val = self::convertCharset($val, 'UTF-8', 'UTF-16BE');
+        $this->objectTable[$saved_object_count] = $bdata.$val;
+      }
+      else {
+        $bdata = self::typeBytes("5", strlen($val)); // 5 is 0101 which is an ASCII string (seems to be ASCII encoded)
+        $this->objectTable[$saved_object_count] = $bdata.$val;
+      }
+    }
+    else $saved_object_count = $this->uniqueTable[$val];
+
+    return $saved_object_count;
+  }
+
+  /**
+   * Codes an integer to binary format
+   * @param integer $value The integer value
+   * @return string the coded integer
+   */
+  protected function intToBinary($value) {
+    $nbytes = 0;
+    if($value > 0xFF) $nbytes = 1; // 1 byte integer
+    if($value > 0xFFFF) $nbytes += 1; // 4 byte integer
+    if($value > 0xFFFFFFFF) $nbytes += 1; // 8 byte integer
+    if($value < 0) $nbytes = 3; // 8 byte integer, since signed
+
+    $bdata = self::typeBytes("1", $nbytes); // 1 is 0001, type indicator for integer
+    $buff = "";
+
+    if($nbytes < 3) {
+      if($nbytes == 0) $fmt = "C";
+      elseif($nbytes == 1) $fmt = "n";
+      else $fmt = "N";
+
+      $buff = pack($fmt, $value);
+    }
+    else {
+      if(PHP_INT_SIZE > 4) {
+        // 64 bit signed integer; we need the higher and the lower 32 bit of the value
+        $high_word = $value >> 32;
+        $low_word = $value & 0xFFFFFFFF;
+      }
+      else {
+        // since PHP can only handle 32bit signed, we can only get 32bit signed values at this point - values above 0x7FFFFFFF are
+        // floats. So we ignore the existance of 64bit on non-64bit-machines
+        if($value < 0) $high_word = 0xFFFFFFFF;
+        else $high_word = 0;
+        $low_word = $value;
+      }
+      $buff = pack("N", $high_word).pack("N", $low_word);
+    }
+
+    return $bdata.$buff;
+  }
+
+  /**
+   * Codes a real value to binary format
+   * @param float $val The real value
+   * @return string The coded real
+   */
+  protected function realToBinary($val) {
+    $bdata = self::typeBytes("2", 3); // 2 is 0010, type indicator for reals
+    return $bdata.strrev(pack("d", (float)$val));
+  }
+
+  /**
+   * Converts a numeric value to binary and adds it to the object table
+   * @param numeric $value The numeric value
+   * @return integer The position in the object table
+   */
+  public function numToBinary($value) {
+    $saved_object_count = $this->writtenObjectCount++;
+
+    $val = "";
+    if(intval($value) == $value && !is_float($value) && strpos($value,'.') === false) $val = $this->intToBinary($value);
+    else $val = $this->realToBinary($value);
+
+    $this->objectTable[$saved_object_count] = $val;
+    return $saved_object_count;
+  }
+
+  /**
+   * Convert date value (apple format) to binary and adds it to the object table
+   * @param integer $value The date value
+   * @return integer The position of the coded value in the object table
+   */
+  public function dateToBinary($val) {
+    $saved_object_count = $this->writtenObjectCount++;
+
+    $hour = gmdate("H",$val);
+    $min = gmdate("i",$val);
+    $sec = gmdate("s",$val);
+    $mday = gmdate("j",$val);
+    $mon = gmdate("n",$val);
+    $year = gmdate("Y",$val);
+
+    $val = gmmktime($hour,$min,$sec,$mon,$mday,$year) - CFDate::DATE_DIFF_APPLE_UNIX; // CFDate is a real, number of seconds since 01/01/2001 00:00:00 GMT
+
+    $bdata = self::typeBytes("3", 3); // 3 is 0011, type indicator for date
+    $this->objectTable[$saved_object_count] = $bdata.strrev(pack("d", $val));
+
+    return $saved_object_count;
+  }
+
+  /**
+   * Convert a bool value to binary and add it to the object table
+   * @param bool $val The boolean value
+   * @return integer The position in the object table
+   */
+  public function boolToBinary($val) {
+    $saved_object_count = $this->writtenObjectCount++;
+    $this->objectTable[$saved_object_count] = $val ? "\x9" : "\x8"; // 0x9 is 1001, type indicator for true; 0x8 is 1000, type indicator for false
+    return $saved_object_count;
+  }
+
+  /**
+   * Convert data value to binary format and add it to the object table
+   * @param string $val The data value
+   * @return integer The position in the object table
+   */
+  public function dataToBinary($val) {
+    $saved_object_count = $this->writtenObjectCount++;
+
+    $bdata = self::typeBytes("4", strlen($val)); // a is 1000, type indicator for data
+    $this->objectTable[$saved_object_count] = $bdata.$val;
+
+    return $saved_object_count;
+  }
+
+  /**
+   * Convert array to binary format and add it to the object table
+   * @param CFArray $val The array to convert
+   * @return integer The position in the object table
+   */
+  public function arrayToBinary($val) {
+    $saved_object_count = $this->writtenObjectCount++;
+
+    $bdata = self::typeBytes("a", count($val->getValue())); // a is 1010, type indicator for arrays
+
+    foreach($val as $v) {
+      $bval = $v->toBinary($this);
+      $bdata .= self::packItWithSize($this->objectRefSize, $bval);
+    }
+
+    $this->objectTable[$saved_object_count] = $bdata;
+    return $saved_object_count;
+  }
+
+  /**
+   * Convert dictionary to binary format and add it to the object table
+   * @param CFDictionary $val The dict to convert
+   * @return integer The position in the object table
+   */
+  public function dictToBinary($val) {
+    $saved_object_count = $this->writtenObjectCount++;
+    $bdata = self::typeBytes("d", count($val->getValue())); // d=1101, type indicator for dictionary
+
+    foreach($val as $k => $v) {
+      $str = new CFString($k);
+      $key = $str->toBinary($this);
+      $bdata .= self::packItWithSize($this->objectRefSize, $key);
+    }
+
+    foreach($val as $k => $v) {
+      $bval = $v->toBinary($this);
+      $bdata .= self::packItWithSize($this->objectRefSize, $bval);
+    }
+
+    $this->objectTable[$saved_object_count] = $bdata;
+    return $saved_object_count;
+  }
+
+}
+
+
+?>
diff --git a/restler/plistformat/.svn/text-base/CFPropertyList.php.svn-base b/restler/plistformat/.svn/text-base/CFPropertyList.php.svn-base
new file mode 100644
index 000000000..6366be48c
--- /dev/null
+++ b/restler/plistformat/.svn/text-base/CFPropertyList.php.svn-base
@@ -0,0 +1,587 @@
+<?php
+/**
+ * CFPropertyList
+ * {@link http://developer.apple.com/documentation/Darwin/Reference/ManPages/man5/plist.5.html Property Lists}
+ * @author Rodney Rehm <rodney.rehm@medialize.de>
+ * @author Christian Kruse <cjk@wwwtech.de>
+ * @package plist
+ * @version $Id$
+ * @example example-read-01.php Read an XML PropertyList
+ * @example example-read-02.php Read a Binary PropertyList
+ * @example example-read-03.php Read a PropertyList without knowing the type
+ * @example example-create-01.php Using the CFPropertyList API
+ * @example example-create-02.php Using {@link CFTypeDetector}
+ * @example example-create-03.php Using {@link CFTypeDetector} with {@link CFDate} and {@link CFData}
+ * @example example-modify-01.php Read, modify and save a PropertyList
+ */
+
+/**
+ * Require IOException, PListException, CFType and CFBinaryPropertyList
+ */
+$plistDirectory = dirname(__FILE__);
+require_once($plistDirectory.'/IOException.php');
+require_once($plistDirectory.'/PListException.php');
+require_once($plistDirectory.'/CFType.php');
+require_once($plistDirectory.'/CFBinaryPropertyList.php');
+require_once($plistDirectory.'/CFTypeDetector.php');
+
+/**
+ * Property List
+ * Interface for handling reading, editing and saving Property Lists as defined by Apple.
+ * @author Rodney Rehm <rodney.rehm@medialize.de>
+ * @author Christian Kruse <cjk@wwwtech.de>
+ * @package plist
+ * @example example-read-01.php Read an XML PropertyList
+ * @example example-read-02.php Read a Binary PropertyList
+ * @example example-read-03.php Read a PropertyList without knowing the type
+ * @example example-create-01.php Using the CFPropertyList API
+ * @example example-create-02.php Using {@link CFTypeDetector}
+ * @example example-create-03.php Using {@link CFTypeDetector} with {@link CFDate} and {@link CFData}
+ * @example example-create-04.php Using and extended {@link CFTypeDetector}
+ */
+class CFPropertyList extends CFBinaryPropertyList implements Iterator {
+  /**
+   * Format constant for binary format
+   * @var integer
+   */
+  const FORMAT_BINARY = 1;
+
+  /**
+   * Format constant for xml format
+   * @var integer
+   */
+  const FORMAT_XML = 2;
+
+  /**
+   * Format constant for automatic format recognizing
+   * @var integer
+   */
+  const FORMAT_AUTO = 0;
+
+  /**
+   * Path of PropertyList
+   * @var string
+   */
+  protected $file = null;
+
+  /**
+   * Path of PropertyList
+   * @var integer
+   */
+  protected $format = null;
+
+  /**
+   * CFType nodes
+   * @var array
+   */
+  protected $value = array();
+
+  /**
+   * Position of iterator {@link http://php.net/manual/en/class.iterator.php}
+   * @var integer
+   */
+  protected $iteratorPosition = 0;
+
+  /**
+   * List of Keys for numerical iterator access {@link http://php.net/manual/en/class.iterator.php}
+   * @var array
+   */
+  protected $iteratorKeys = null;
+
+  /**
+   * List of NodeNames to ClassNames for resolving plist-files
+   * @var array
+   */
+  protected static $types = array(
+    'string' => 'CFString',
+    'real' => 'CFNumber',
+    'integer' => 'CFNumber',
+    'date' => 'CFDate',
+    'true' => 'CFBoolean',
+    'false' => 'CFBoolean',
+    'data' => 'CFData',
+    'array' => 'CFArray',
+    'dict' => 'CFDictionary'
+ );
+
+
+  /**
+   * Create new CFPropertyList.
+   * If a path to a PropertyList is specified, it is loaded automatically.
+   * @param string $file Path of PropertyList
+   * @param integer $format he format of the property list, see {@link FORMAT_XML}, {@link FORMAT_BINARY} and {@link FORMAT_AUTO}, defaults to {@link FORMAT_AUTO}
+   * @throws IOException if file could not be read by {@link load()}
+   * @uses $file for storing the current file, if specified
+   * @uses load() for loading the plist-file
+   */
+  public function __construct($file=null,$format=self::FORMAT_AUTO) {
+    $this->file = $file;
+    $this->format = $format;
+    if($this->file) $this->load();
+  }
+
+  /**
+   * Load an XML PropertyList.
+   * @param string $file Path of PropertyList, defaults to {@link $file}
+   * @return void
+   * @throws IOException if file could not be read
+   * @throws DOMException if XML-file could not be read properly
+   * @uses load() to actually load the file
+   */
+  public function loadXML($file=null) {
+    $this->load($file,CFPropertyList::FORMAT_XML);
+  }
+
+  /**
+   * Load an XML PropertyList.
+   * @param resource $stream A stream containing the xml document.
+   * @return void
+   * @throws IOException if stream could not be read
+   * @throws DOMException if XML-stream could not be read properly
+   */
+  public function loadXMLStream($stream) {
+    if(($contents = stream_get_contents($stream)) === FALSE) throw IOException::notReadable('<stream>');
+    $this->parse($content,CFPropertyList::FORMAT_XML);
+  }
+
+  /**
+   * Load an binary PropertyList.
+   * @param string $file Path of PropertyList, defaults to {@link $file}
+   * @return void
+   * @throws IOException if file could not be read
+   * @throws PListException if binary plist-file could not be read properly
+   * @uses load() to actually load the file
+   */
+  public function loadBinary($file=null) {
+    $this->load($file,CFPropertyList::FORMAT_BINARY);
+  }
+
+  /**
+   * Load an binary PropertyList.
+   * @param stream $stream Stream containing the PropertyList
+   * @return void
+   * @throws IOException if file could not be read
+   * @throws PListException if binary plist-file could not be read properly
+   * @uses parse() to actually load the file
+   */
+  public function loadBinaryStream($stream) {
+    if(($contents = stream_get_contents($stream)) === FALSE) throw IOException::notReadable('<stream>');
+    $this->parse($content,CFPropertyList::FORMAT_BINARY);
+  }
+
+  /**
+   * Load a plist file.
+   * Load and import a plist file.
+   * @param string $file Path of PropertyList, defaults to {@link $file}
+   * @param integer $format The format of the property list, see {@link FORMAT_XML}, {@link FORMAT_BINARY} and {@link FORMAT_AUTO}, defaults to {@link $format}
+   * @return void
+   * @throws PListException if file format version is not 00
+   * @throws IOException if file could not be read
+   * @throws DOMException if plist file could not be parsed properly
+   * @uses $file if argument $file was not specified
+   * @uses $value reset to empty array
+   * @uses import() for importing the values
+   */
+  public function load($file=null,$format=null) {
+    $file = $file ? $file : $this->file;
+    $format = $format !== null ? $format : $this->format;
+    $this->value = array();
+
+    if(!is_readable($file)) throw IOException::notReadable($file);
+
+    switch($format) {
+      case CFPropertyList::FORMAT_BINARY:
+        $this->readBinary($file);
+        break;
+      case CFPropertyList::FORMAT_AUTO: // what we now do is ugly, but neccessary to recognize the file format
+        $fd = fopen($file,"rb");
+        if(($magic_number = fread($fd,8)) === false) throw IOException::notReadable($file);
+        fclose($fd);
+
+        $filetype = substr($magic_number,0,6);
+        $version  = substr($magic_number,-2);
+
+        if($filetype == "bplist") {
+          if($version != "00") throw new PListException("Wrong file format version! Expected 00, got $version!");
+          $this->readBinary($file);
+          break;
+        }
+        // else: xml format, break not neccessary
+      case CFPropertyList::FORMAT_XML:
+        $doc = new DOMDocument();
+        if(!$doc->load($file)) throw new DOMException();
+        $this->import($doc->documentElement, $this);
+        break;
+    }
+  }
+
+  /**
+   * Parse a plist string.
+   * Parse and import a plist string.
+   * @param string $str String containing the PropertyList, defaults to {@link $content}
+   * @param integer $format The format of the property list, see {@link FORMAT_XML}, {@link FORMAT_BINARY} and {@link FORMAT_AUTO}, defaults to {@link $format}
+   * @return void
+   * @throws PListException if file format version is not 00
+   * @throws IOException if file could not be read
+   * @throws DOMException if plist file could not be parsed properly
+   * @uses $content if argument $str was not specified
+   * @uses $value reset to empty array
+   * @uses import() for importing the values
+   */
+  public function parse($str=NULL,$format=NULL) {
+    $format = $format !== null ? $format : $this->format;
+    $str = $str !== null ? $str : $this->content;
+    $this->value = array();
+
+    switch($format) {
+      case CFPropertyList::FORMAT_BINARY:
+        $this->parseBinary($str);
+        break;
+      case CFPropertyList::FORMAT_AUTO: // what we now do is ugly, but neccessary to recognize the file format
+        if(($magic_number = substr($str,0,8)) === false) throw IOException::notReadable("<string>");
+
+        $filetype = substr($magic_number,0,6);
+        $version  = substr($magic_number,-2);
+
+        if($filetype == "bplist") {
+          if($version != "00") throw new PListException("Wrong file format version! Expected 00, got $version!");
+          $this->parseBinary($str);
+          break;
+        }
+        // else: xml format, break not neccessary
+      case CFPropertyList::FORMAT_XML:
+        $doc = new DOMDocument();
+        if(!$doc->loadXML($str)) throw new DOMException();
+        $this->import($doc->documentElement, $this);
+        break;
+    }
+  }
+
+  /**
+   * Convert a DOMNode into a CFType.
+   * @param DOMNode $node Node to import children of
+   * @param CFDictionary|CFArray|CFPropertyList $parent
+   * @return void
+   */
+  protected function import(DOMNode $node, $parent) {
+    // abort if there are no children
+    if(!$node->childNodes->length) return;
+
+    foreach($node->childNodes as $n) {
+      // skip if we can't handle the element
+      if(!isset(self::$types[$n->nodeName])) continue;
+
+      $class = self::$types[$n->nodeName];
+      $key = null;
+
+      // find previous <key> if possible
+      $ps = $n->previousSibling;
+      while($ps && $ps->nodeName == '#text' && $ps->previousSibling) $ps = $ps->previousSibling;
+
+      // read <key> if possible
+      if($ps && $ps->nodeName == 'key') $key = $ps->firstChild->nodeValue;
+
+      switch($n->nodeName) {
+        case 'date':
+          $value = new $class(CFDate::dateValue($n->nodeValue));
+          break;
+        case 'data':
+          $value = new $class($n->nodeValue,true);
+          break;
+        case 'string':
+          $value = new $class($n->nodeValue);
+          break;
+
+        case 'real':
+        case 'integer':
+          $value = new $class($n->nodeName == 'real' ? floatval($n->nodeValue) : intval($n->nodeValue));
+          break;
+
+        case 'true':
+        case 'false':
+          $value = new $class($n->nodeName == 'true');
+          break;
+
+        case 'array':
+        case 'dict':
+          $value = new $class();
+          $this->import($n, $value);
+          break;
+      }
+
+      // Dictionaries need a key
+      if($parent instanceof CFDictionary) $parent->add($key, $value);
+      // others don't
+      else $parent->add($value);
+    }
+  }
+
+  /**
+   * Convert CFPropertyList to XML and save to file.
+   * @param string $file Path of PropertyList, defaults to {@link $file}
+   * @return void
+   * @throws IOException if file could not be read
+   * @uses $file if $file was not specified
+   */
+  public function saveXML($file) {
+    $this->save($file,CFPropertyList::FORMAT_XML);
+  }
+
+  /**
+   * Convert CFPropertyList to binary format (bplist00) and save to file.
+   * @param string $file Path of PropertyList, defaults to {@link $file}
+   * @return void
+   * @throws IOException if file could not be read
+   * @uses $file if $file was not specified
+   */
+  public function saveBinary($file) {
+    $this->save($file,CFPropertyList::FORMAT_BINARY);
+  }
+
+  /**
+   * Convert CFPropertyList to XML or binary and save to file.
+   * @param string $file Path of PropertyList, defaults to {@link $file}
+   * @param string $format Format of PropertyList, defaults to {@link $format}
+   * @return void
+   * @throws IOException if file could not be read
+   * @throws PListException if evaluated $format is neither {@link FORMAT_XML} nor {@link FORMAL_BINARY}
+   * @uses $file if $file was not specified
+   * @uses $format if $format was not specified
+   */
+  public function save($file=null,$format=null) {
+    $file = $file ? $file : $this->file;
+    $format = $format ? $format : $this->format;
+
+    if( !in_array( $format, array( self::FORMAT_BINARY, self::FORMAT_XML ) ) )
+      throw new PListException( "format {$format} is not supported, use CFPropertyList::FORMAT_BINARY or CFPropertyList::FORMAT_XML" );
+
+    if(!file_exists($file)) {
+      // dirname("file.xml") == "" and is treated as the current working directory
+      if(!is_writable(dirname($file))) throw IOException::notWritable($file);
+    }
+    else if(!is_writable($file)) throw IOException::notWritable($file);
+
+    $content = $format == self::FORMAT_BINARY ? $this->toBinary() : $this->toXML();
+
+    $fh = fopen($file, 'wb');
+    fwrite($fh,$content);
+    fclose($fh);
+  }
+
+  /**
+   * Convert CFPropertyList to XML
+   * @param bool $formatted Print plist formatted (i.e. with newlines and whitespace indention) if true; defaults to false
+   * @return string The XML content
+   */
+  public function toXML($formatted=false) {
+    $domimpl = new DOMImplementation();
+    // <!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+    $dtd = $domimpl->createDocumentType('plist', '-//Apple Computer//DTD PLIST 1.0//EN', 'http://www.apple.com/DTDs/PropertyList-1.0.dtd');
+    $doc = $domimpl->createDocument(null, "plist", $dtd);
+    $doc->encoding = "UTF-8";
+
+    // format output
+    if($formatted) {
+      $doc->formatOutput = true;
+      $doc->preserveWhiteSpace = true;
+    }
+
+    // get documentElement and set attribs
+    $plist = $doc->documentElement;
+    $plist->setAttribute('version', '1.0');
+
+    // add PropertyList's children
+    $plist->appendChild($this->getValue(true)->toXML($doc));
+
+    return $doc->saveXML();
+  }
+
+
+  /************************************************************************************************
+   *    M A N I P U L A T I O N
+   ************************************************************************************************/
+
+  /**
+   * Add CFType to collection.
+   * @param CFType $value CFType to add to collection
+   * @return void
+   * @uses $value for adding $value
+   */
+  public function add(CFType $value=null) {
+    // anything but CFType is null, null is an empty string - sad but true
+    if( !$value )
+      $value = new CFString();
+
+    $this->value[] = $value;
+  }
+
+  /**
+   * Get CFType from collection.
+   * @param integer $key Key of CFType to retrieve from collection
+   * @return CFType CFType found at $key, null else
+   * @uses $value for retrieving CFType of $key
+   */
+  public function get($key) {
+    if(isset($this->value[$key])) return $this->value[$key];
+    return null;
+  }
+
+  /**
+   * Generic getter (magic)
+   *
+   * @param integer $key Key of CFType to retrieve from collection
+   * @return CFType CFType found at $key, null else
+   * @author Sean Coates <sean@php.net>
+   * @link http://php.net/oop5.overloading
+   */
+  public function __get($key) {
+    return $this->get($key);
+  }
+
+  /**
+   * Remove CFType from collection.
+   * @param integer $key Key of CFType to removes from collection
+   * @return CFType removed CFType, null else
+   * @uses $value for removing CFType of $key
+   */
+  public function del($key) {
+    if(isset($this->value[$key])) {
+      $t = $this->value[$key];
+      unset($this->value[$key]);
+      return $t;
+    }
+
+    return null;
+  }
+
+  /**
+   * Empty the collection
+   * @return array the removed CFTypes
+   * @uses $value for removing CFType of $key
+   */
+  public function purge() {
+    $t = $this->value;
+    $this->value = array();
+    return $t;
+  }
+
+  /**
+   * Get first (and only) child, or complete collection.
+   * @param string $cftype if set to true returned value will be CFArray instead of an array in case of a collection
+   * @return CFType|array CFType or list of CFTypes known to the PropertyList
+   * @uses $value for retrieving CFTypes
+   */
+  public function getValue($cftype=false) {
+    if(count($this->value) === 1) {
+      $t = array_values( $this->value );
+      return $t[0];
+	}
+    if($cftype) {
+      $t = new CFArray();
+      foreach( $this->value as $value ) {
+        if( $value instanceof CFType ) $t->add($value);
+      }
+      return $t;
+    }
+    return $this->value;
+  }
+
+  /**
+   * Create CFType-structure from guessing the data-types.
+   * The functionality has been moved to the more flexible {@link CFTypeDetector} facility.
+   * @param mixed $value Value to convert to CFType
+   * @param boolean $autoDictionary if true {@link CFArray}-detection is bypassed and arrays will be returned as {@link CFDictionary}.
+   * @return CFType CFType based on guessed type
+   * @uses CFTypeDetector for actual type detection
+   * @deprecated
+   */
+  public static function guess($value, $autoDictionary=false) {
+    static $t = null;
+    if( $t === null )
+      $t = new CFTypeDetector( $autoDictionary );
+
+    return $t->toCFType( $value );
+  }
+
+
+  /************************************************************************************************
+   *    S E R I A L I Z I N G
+   ************************************************************************************************/
+
+  /**
+   * Get PropertyList as array.
+   * @return mixed primitive value of first (and only) CFType, or array of primitive values of collection
+   * @uses $value for retrieving CFTypes
+   */
+  public function toArray() {
+    $a = array();
+    foreach($this->value as $value) $a[] = $value->toArray();
+    if(count($a) === 1) return $a[0];
+
+    return $a;
+  }
+
+
+  /************************************************************************************************
+   *    I T E R A T O R   I N T E R F A C E
+   ************************************************************************************************/
+
+  /**
+   * Rewind {@link $iteratorPosition} to first position (being 0)
+   * @link http://php.net/manual/en/iterator.rewind.php
+   * @return void
+   * @uses $iteratorPosition set to 0
+   * @uses $iteratorKeys store keys of {@link $value}
+   */
+  public function rewind() {
+    $this->iteratorPosition = 0;
+    $this->iteratorKeys = array_keys($this->value);
+  }
+
+  /**
+   * Get Iterator's current {@link CFType} identified by {@link $iteratorPosition}
+   * @link http://php.net/manual/en/iterator.current.php
+   * @return CFType current Item
+   * @uses $iteratorPosition identify current key
+   * @uses $iteratorKeys identify current value
+   */
+  public function current() {
+    return $this->value[$this->iteratorKeys[$this->iteratorPosition]];
+  }
+
+  /**
+   * Get Iterator's current key identified by {@link $iteratorPosition}
+   * @link http://php.net/manual/en/iterator.key.php
+   * @return string key of the current Item
+   * @uses $iteratorPosition identify current key
+   * @uses $iteratorKeys identify current value
+   */
+  public function key() {
+    return $this->iteratorKeys[$this->iteratorPosition];
+  }
+
+  /**
+   * Increment {@link $iteratorPosition} to address next {@see CFType}
+   * @link http://php.net/manual/en/iterator.next.php
+   * @return void
+   * @uses $iteratorPosition increment by 1
+   */
+  public function next() {
+    $this->iteratorPosition++;
+  }
+
+  /**
+   * Test if {@link $iteratorPosition} addresses a valid element of {@link $value}
+   * @link http://php.net/manual/en/iterator.valid.php
+   * @return boolean true if current position is valid, false else
+   * @uses $iteratorPosition test if within {@link $iteratorKeys}
+   * @uses $iteratorPosition test if within {@link $value}
+   */
+  public function valid() {
+    return isset($this->iteratorKeys[$this->iteratorPosition]) && isset($this->value[$this->iteratorKeys[$this->iteratorPosition]]);
+  }
+
+}
+
+
+?>
\ No newline at end of file
diff --git a/restler/plistformat/.svn/text-base/CFType.php.svn-base b/restler/plistformat/.svn/text-base/CFType.php.svn-base
new file mode 100644
index 000000000..246c22177
--- /dev/null
+++ b/restler/plistformat/.svn/text-base/CFType.php.svn-base
@@ -0,0 +1,742 @@
+<?php
+/**
+ * Data-Types for CFPropertyList as defined by Apple.
+ * {@link http://developer.apple.com/documentation/Darwin/Reference/ManPages/man5/plist.5.html Property Lists}
+ * @author Rodney Rehm <rodney.rehm@medialize.de>
+ * @author Christian Kruse <cjk@wwwtech.de>
+ * @package plist
+ * @subpackage plist.types
+ * @version $Id$
+ */
+
+/**
+ * Base-Class of all CFTypes used by CFPropertyList 
+ * @author Rodney Rehm <rodney.rehm@medialize.de>
+ * @author Christian Kruse <cjk@wwwtech.de>
+ * @package plist
+ * @subpackage plist.types
+ * @version $Id$
+ * @example example-create-01.php Using the CFPropertyList API
+ * @example example-create-02.php Using CFPropertyList::guess()
+ * @example example-create-03.php Using CFPropertyList::guess() with {@link CFDate} and {@link CFData}
+ */
+abstract class CFType {
+  /**
+   * CFType nodes
+   * @var array
+   */
+  protected $value = null;
+
+  /**
+   * Create new CFType.
+   * @param mixed $value Value of CFType
+   */
+  public function __construct($value=null) {
+    $this->setValue($value);
+  }
+
+  /************************************************************************************************
+   *    M A G I C   P R O P E R T I E S
+   ************************************************************************************************/
+  
+  /**
+   * Get the CFType's value
+   * @return mixed CFType's value
+   */
+  public function getValue() {
+    return $this->value;
+  }
+
+  /**
+   * Set the CFType's value
+   * @return void
+   */
+  public function setValue($value) {
+    $this->value = $value;
+  }
+
+  /************************************************************************************************
+   *    S E R I A L I Z I N G
+   ************************************************************************************************/
+
+  /**
+   * Get XML-Node.
+   * @param DOMDocument $doc DOMDocument to create DOMNode in
+   * @param string $nodeName Name of element to create
+   * @return DOMNode Node created based on CType
+   * @uses $value as nodeValue
+   */
+  public function toXML(DOMDocument $doc, $nodeName) {
+    $text = $doc->createTextNode($this->value);
+    $node = $doc->createElement($nodeName);
+    $node->appendChild($text);
+    return $node;
+  }
+
+  /**
+   * convert value to binary representation
+   * @param CFBinaryPropertyList The binary property list object
+   * @return The offset in the object table
+   */
+  public abstract function toBinary(CFBinaryPropertyList &$bplist);
+
+  /**
+   * Get CFType's value.
+   * @return mixed primitive value
+   * @uses $value for retrieving primitive of CFType
+   */
+  public function toArray() {
+    return $this->getValue();
+  }
+
+}
+
+/**
+ * String Type of CFPropertyList
+ * @author Rodney Rehm <rodney.rehm@medialize.de>
+ * @author Christian Kruse <cjk@wwwtech.de>
+ * @package plist
+ * @subpackage plist.types
+ */
+class CFString extends CFType {
+  /**
+   * Get XML-Node.
+   * @param DOMDocument $doc DOMDocument to create DOMNode in
+   * @param string $nodeName For compatibility reasons; just ignore it
+   * @return DOMNode &lt;string&gt;-Element
+   */
+  public function toXML(DOMDocument $doc,$nodeName="") {
+    return parent::toXML($doc, 'string');
+  }
+
+  /**
+   * convert value to binary representation
+   * @param CFBinaryPropertyList The binary property list object
+   * @return The offset in the object table
+   */
+  public function toBinary(CFBinaryPropertyList &$bplist) {
+    return $bplist->stringToBinary($this->value);
+  }
+}
+
+/**
+ * Number Type of CFPropertyList
+ * @author Rodney Rehm <rodney.rehm@medialize.de>
+ * @author Christian Kruse <cjk@wwwtech.de>
+ * @package plist
+ * @subpackage plist.types
+ */
+class CFNumber extends CFType {
+  /**
+   * Get XML-Node.
+   * Returns &lt;real&gt; if $value is a float, &lt;integer&gt; if $value is an integer.
+   * @param DOMDocument $doc DOMDocument to create DOMNode in
+   * @param string $nodeName For compatibility reasons; just ignore it
+   * @return DOMNode &lt;real&gt; or &lt;integer&gt;-Element 
+   */
+  public function toXML(DOMDocument $doc,$nodeName="") {
+    $ret = 'real';
+    if(intval($this->value) == $this->value && !is_float($this->value) && strpos($this->value,'.') === false) {
+      $this->value = intval($this->value);
+      $ret = 'integer';
+    }
+    return parent::toXML($doc, $ret);
+  }
+
+  /**
+   * convert value to binary representation
+   * @param CFBinaryPropertyList The binary property list object
+   * @return The offset in the object table
+   */
+  public function toBinary(CFBinaryPropertyList &$bplist) {
+    return $bplist->numToBinary($this->value);
+  }
+}
+
+/**
+ * Date Type of CFPropertyList
+ * Note: CFDate uses Unix timestamp (epoch) to store dates internally
+ * @author Rodney Rehm <rodney.rehm@medialize.de>
+ * @author Christian Kruse <cjk@wwwtech.de>
+ * @package plist
+ * @subpackage plist.types
+ */
+class CFDate extends CFType {
+  const TIMESTAMP_APPLE = 0;
+  const TIMESTAMP_UNIX  = 1;
+  const DATE_DIFF_APPLE_UNIX = 978307200;
+
+  /**
+   * Create new Date CFType.
+   * @param integer $value timestamp to set
+   * @param integer $format format the timestamp is specified in, use {@link TIMESTAMP_APPLE} or {@link TIMESTAMP_UNIX}, defaults to {@link TIMESTAMP_APPLE}
+   * @uses setValue() to convert the timestamp
+   */
+  function __construct($value,$format=CFDate::TIMESTAMP_UNIX) {
+    $this->setValue($value,$format);
+  }
+
+  /**
+   * Set the Date CFType's value.
+   * @param integer $value timestamp to set
+   * @param integer $format format the timestamp is specified in, use {@link TIMESTAMP_APPLE} or {@link TIMESTAMP_UNIX}, defaults to {@link TIMESTAMP_UNIX}
+   * @return void
+   * @uses TIMESTAMP_APPLE to determine timestamp type
+   * @uses TIMESTAMP_UNIX to determine timestamp type
+   * @uses DATE_DIFF_APPLE_UNIX to convert Apple-timestamp to Unix-timestamp
+   */
+  function setValue($value,$format=CFDate::TIMESTAMP_UNIX) {
+    if($format == CFDate::TIMESTAMP_UNIX) $this->value = $value;
+    else $this->value = $value + CFDate::DATE_DIFF_APPLE_UNIX;
+  }
+  
+  /**
+   * Get the Date CFType's value.
+   * @param integer $format format the timestamp is specified in, use {@link TIMESTAMP_APPLE} or {@link TIMESTAMP_UNIX}, defaults to {@link TIMESTAMP_UNIX}
+   * @return integer Unix timestamp
+   * @uses TIMESTAMP_APPLE to determine timestamp type
+   * @uses TIMESTAMP_UNIX to determine timestamp type
+   * @uses DATE_DIFF_APPLE_UNIX to convert Unix-timestamp to Apple-timestamp
+   */
+  function getValue($format=CFDate::TIMESTAMP_UNIX) {
+    if($format == CFDate::TIMESTAMP_UNIX) return $this->value;
+    else return $this->value - CFDate::DATE_DIFF_APPLE_UNIX;
+  }
+
+  /**
+   * Get XML-Node.
+   * @param DOMDocument $doc DOMDocument to create DOMNode in
+   * @param string $nodeName For compatibility reasons; just ignore it
+   * @return DOMNode &lt;date&gt;-Element
+   */
+  public function toXML(DOMDocument $doc,$nodeName="") {
+    $text = $doc->createTextNode(gmdate("Y-m-d\TH:i:s\Z",$this->getValue()));
+    $node = $doc->createElement("date");
+    $node->appendChild($text);
+    return $node;
+  }
+
+  /**
+   * convert value to binary representation
+   * @param CFBinaryPropertyList The binary property list object
+   * @return The offset in the object table
+   */
+  public function toBinary(CFBinaryPropertyList &$bplist) {
+    return $bplist->dateToBinary($this->value);
+  }
+  
+  /**
+   * Create a UNIX timestamp from a PList date string
+   * @param string $val The date string (e.g. "2009-05-13T20:23:43Z")
+   * @return integer The UNIX timestamp
+   * @throws PListException when encountering an unknown date string format
+   */
+  public static function dateValue($val) {
+    //2009-05-13T20:23:43Z
+    if(!preg_match('/^(\d{4})-(\d{2})-(\d{2})T(\d{2}):(\d{2}):(\d{2})Z/',$val,$matches)) throw new PListException("Unknown date format: $val");
+    return gmmktime($matches[4],$matches[5],$matches[6],$matches[2],$matches[3],$matches[1]);
+  }
+}
+
+/**
+ * Boolean Type of CFPropertyList
+ * @author Rodney Rehm <rodney.rehm@medialize.de>
+ * @author Christian Kruse <cjk@wwwtech.de>
+ * @package plist
+ * @subpackage plist.types
+ */
+class CFBoolean extends CFType {
+  /**
+   * Get XML-Node.
+   * Returns &lt;true&gt; if $value is a true, &lt;false&gt; if $value is false.
+   * @param DOMDocument $doc DOMDocument to create DOMNode in
+   * @param string $nodeName For compatibility reasons; just ignore it
+   * @return DOMNode &lt;true&gt; or &lt;false&gt;-Element 
+   */
+  public function toXML(DOMDocument $doc,$nodeName="") {
+    return $doc->createElement($this->value ? 'true' : 'false');
+  }
+
+  /**
+   * convert value to binary representation
+   * @param CFBinaryPropertyList The binary property list object
+   * @return The offset in the object table
+   */
+  public function toBinary(CFBinaryPropertyList &$bplist) {
+    return $bplist->boolToBinary($this->value);
+  }
+
+}
+
+/**
+ * Data Type of CFPropertyList
+ * Note: Binary data is base64-encoded.
+ * @author Rodney Rehm <rodney.rehm@medialize.de>
+ * @author Christian Kruse <cjk@wwwtech.de>
+ * @package plist
+ * @subpackage plist.types
+ */
+class CFData extends CFType {
+  /**
+   * Create new Data CFType
+   * @param string $value data to be contained by new object
+   * @param boolean $already_coded if true $value will not be base64-encoded, defaults to false
+   */
+  public function __construct($value=null,$already_coded=false) {
+    if($already_coded) $this->value = $value;
+    else $this->setValue($value);
+  }
+
+  /**
+   * Set the CFType's value and base64-encode it.
+   * <b>Note:</b> looks like base64_encode has troubles with UTF-8 encoded strings
+   * @return void
+   */
+  public function setValue($value) {
+    //if(function_exists('mb_check_encoding') && mb_check_encoding($value, 'UTF-8')) $value = utf8_decode($value);
+    $this->value = base64_encode($value);
+  }
+
+  /**
+   * Get base64 encoded data
+   * @return string The base64 encoded data value
+   */
+  public function getCodedValue() {
+    return $this->value;
+  }
+
+  /**
+   * Get the base64-decoded CFType's value.
+   * @return mixed CFType's value
+   */
+  public function getValue() {
+    return base64_decode($this->value);
+  }
+
+  /**
+   * Get XML-Node.
+   * @param DOMDocument $doc DOMDocument to create DOMNode in
+   * @param string $nodeName For compatibility reasons; just ignore it
+   * @return DOMNode &lt;data&gt;-Element
+   */
+  public function toXML(DOMDocument $doc,$nodeName="") {
+    return parent::toXML($doc, 'data');
+  }
+
+  /**
+   * convert value to binary representation
+   * @param CFBinaryPropertyList The binary property list object
+   * @return The offset in the object table
+   */
+  public function toBinary(CFBinaryPropertyList &$bplist) {
+    return $bplist->dataToBinary($this->getValue());
+  }
+}
+
+/**
+ * Array Type of CFPropertyList
+ * @author Rodney Rehm <rodney.rehm@medialize.de>
+ * @author Christian Kruse <cjk@wwwtech.de>
+ * @package plist
+ * @subpackage plist.types
+ */
+class CFArray extends CFType implements Iterator, ArrayAccess {
+  /**
+   * Position of iterator {@link http://php.net/manual/en/class.iterator.php}
+   * @var integer
+   */
+  protected $iteratorPosition = 0;
+
+
+  /**
+   * Create new CFType.
+   * @param array $value Value of CFType
+   */
+  public function __construct($value=array()) {
+    $this->value = $value;
+  }
+
+  /**
+   * Set the CFType's value
+   * <b>Note:</b> this dummy does nothing
+   * @return void
+   */
+  public function setValue($value) {
+  }
+
+  /**
+   * Add CFType to collection.
+   * @param CFType $value CFType to add to collection, defaults to null which results in an empty {@link CFString}
+   * @return void
+   * @uses $value for adding $value
+   */
+  public function add(CFType $value=null) {
+    // anything but CFType is null, null is an empty string - sad but true
+    if( !$value )
+      $value = new CFString();
+
+    $this->value[] = $value;
+  }
+
+  /**
+   * Get CFType from collection.
+   * @param integer $key Key of CFType to retrieve from collection
+   * @return CFType CFType found at $key, null else
+   * @uses $value for retrieving CFType of $key
+   */
+  public function get($key) {
+    if(isset($this->value[$key])) return $this->value[$key];
+    return null;
+  }
+
+  /**
+   * Remove CFType from collection.
+   * @param integer $key Key of CFType to removes from collection
+   * @return CFType removed CFType, null else
+   * @uses $value for removing CFType of $key
+   */
+  public function del($key) {
+    if(isset($this->value[$key])) unset($this->value[$key]);
+  }
+
+
+  /************************************************************************************************
+   *    S E R I A L I Z I N G
+   ************************************************************************************************/
+
+  /**
+   * Get XML-Node.
+   * @param DOMDocument $doc DOMDocument to create DOMNode in
+   * @param string $nodeName For compatibility reasons; just ignore it
+   * @return DOMNode &lt;array&gt;-Element
+   */
+  public function toXML(DOMDocument $doc,$nodeName="") {
+    $node = $doc->createElement('array');
+
+    foreach($this->value as $value) $node->appendChild($value->toXML($doc));
+    return $node;
+  }
+
+  /**
+   * convert value to binary representation
+   * @param CFBinaryPropertyList The binary property list object
+   * @return The offset in the object table
+   */
+  public function toBinary(CFBinaryPropertyList &$bplist) {
+    return $bplist->arrayToBinary($this);
+  }
+
+  /**
+   * Get CFType's value.
+   * @return array primitive value
+   * @uses $value for retrieving primitive of CFType
+   */
+  public function toArray() {
+    $a = array();
+    foreach($this->value as $value) $a[] = $value->toArray();
+    return $a;
+  }
+
+
+  /************************************************************************************************
+   *    I T E R A T O R   I N T E R F A C E
+   ************************************************************************************************/
+
+  /**
+   * Rewind {@link $iteratorPosition} to first position (being 0)
+   * @link http://php.net/manual/en/iterator.rewind.php
+   * @return void
+   * @uses $iteratorPosition set to 0
+   */
+  public function rewind() {
+    $this->iteratorPosition = 0;
+  }
+
+  /**
+   * Get Iterator's current {@link CFType} identified by {@link $iteratorPosition}
+   * @link http://php.net/manual/en/iterator.current.php
+   * @return CFType current Item
+   * @uses $iteratorPosition identify current key
+   */
+  public function current() {
+    return $this->value[$this->iteratorPosition];
+  }
+
+  /**
+   * Get Iterator's current key identified by {@link $iteratorPosition}
+   * @link http://php.net/manual/en/iterator.key.php
+   * @return string key of the current Item
+   * @uses $iteratorPosition identify current key
+   */
+  public function key() {
+    return $this->iteratorPosition;
+  }
+
+  /**
+   * Increment {@link $iteratorPosition} to address next {@see CFType}
+   * @link http://php.net/manual/en/iterator.next.php
+   * @return void
+   * @uses $iteratorPosition increment by 1
+   */
+  public function next() {
+    $this->iteratorPosition++;
+  }
+
+  /**
+   * Test if {@link $iteratorPosition} addresses a valid element of {@link $value}
+   * @link http://php.net/manual/en/iterator.valid.php
+   * @return boolean true if current position is valid, false else
+   * @uses $iteratorPosition test if within {@link $iteratorKeys}
+   * @uses $iteratorPosition test if within {@link $value}
+   */
+  public function valid() {
+    return isset($this->value[$this->iteratorPosition]);
+  }
+
+  /************************************************************************************************
+   *    ArrayAccess   I N T E R F A C E
+   ************************************************************************************************/
+  
+  /**
+   * Determine if the array's key exists
+   * @param string $key the key to check
+   * @return bool true if the offset exists, false if not
+   * @link http://php.net/manual/en/arrayaccess.offsetexists.php
+   * @uses $value to check if $key exists
+   * @author Sean Coates <sean@php.net>
+   */
+  public function offsetExists($key) {
+    return isset($this->value[$key]);
+  }
+  
+  /**
+   * Fetch a specific key from the CFArray
+   * @param string $key the key to check
+   * @return mixed the value associated with the key; null if the key is not found
+   * @link http://php.net/manual/en/arrayaccess.offsetget.php
+   * @uses get() to get the key's value
+   * @author Sean Coates <sean@php.net>
+   */
+  public function offsetGet($key) {
+    return $this->get($key);
+  }
+  
+  /**
+   * Set a value in the array
+   * @param string $key the key to set
+   * @param string $value the value to set
+   * @return void
+   * @link http://php.net/manual/en/arrayaccess.offsetset.php
+   * @uses setValue() to set the key's new value
+   * @author Sean Coates <sean@php.net>
+   */
+  public function offsetSet($key, $value) {
+    return $this->setValue($value);
+  }
+  
+  /**
+   * Unsets a value in the array
+   * <b>Note:</b> this dummy does nothing
+   * @param string $key the key to set
+   * @return void
+   * @link http://php.net/manual/en/arrayaccess.offsetunset.php
+   * @author Sean Coates <sean@php.net>
+   */
+  public function offsetUnset($key) {
+    
+  }
+  
+  
+}
+
+/**
+ * Array Type of CFPropertyList
+ * @author Rodney Rehm <rodney.rehm@medialize.de>
+ * @author Christian Kruse <cjk@wwwtech.de>
+ * @package plist
+ * @subpackage plist.types
+ */
+class CFDictionary extends CFType implements Iterator {
+  /**
+   * Position of iterator {@link http://php.net/manual/en/class.iterator.php}
+   * @var integer
+   */
+  protected $iteratorPosition = 0;
+
+  /**
+   * List of Keys for numerical iterator access {@link http://php.net/manual/en/class.iterator.php}
+   * @var array
+   */
+  protected $iteratorKeys = null;
+
+
+  /**
+   * Create new CFType.
+   * @param array $value Value of CFType
+   */
+  public function __construct($value=array()) {
+    $this->value = $value;
+  }
+
+  /**
+   * Set the CFType's value
+   * <b>Note:</b> this dummy does nothing
+   * @return void
+   */
+  public function setValue($value) {
+  }
+
+  /**
+   * Add CFType to collection.
+   * @param string $key Key to add to collection
+   * @param CFType $value CFType to add to collection, defaults to null which results in an empty {@link CFString}
+   * @return void
+   * @uses $value for adding $key $value pair
+   */
+  public function add($key, CFType $value=null) {
+    // anything but CFType is null, null is an empty string - sad but true
+    if( !$value )
+      $value = new CFString();
+
+    $this->value[$key] = $value;
+  }
+
+  /**
+   * Get CFType from collection.
+   * @param string $key Key of CFType to retrieve from collection
+   * @return CFType CFType found at $key, null else
+   * @uses $value for retrieving CFType of $key
+   */
+  public function get($key) {
+    if(isset($this->value[$key])) return $this->value[$key];
+    return null;
+  }
+
+  /**
+   * Generic getter (magic)
+   * @param integer $key Key of CFType to retrieve from collection
+   * @return CFType CFType found at $key, null else
+   * @link http://php.net/oop5.overloading
+   * @uses get() to retrieve the key's value
+   * @author Sean Coates <sean@php.net>
+   */
+  public function __get($key) {
+    return $this->get($key);
+  }
+
+  /**
+   * Remove CFType from collection.
+   * @param string $key Key of CFType to removes from collection
+   * @return CFType removed CFType, null else
+   * @uses $value for removing CFType of $key
+   */
+  public function del($key) {
+    if(isset($this->value[$key])) unset($this->value[$key]);
+  }
+
+
+  /************************************************************************************************
+   *    S E R I A L I Z I N G
+   ************************************************************************************************/
+
+  /**
+   * Get XML-Node.
+   * @param DOMDocument $doc DOMDocument to create DOMNode in
+   * @param string $nodeName For compatibility reasons; just ignore it
+   * @return DOMNode &lt;dict&gt;-Element
+   */
+  public function toXML(DOMDocument $doc,$nodeName="") {
+    $node = $doc->createElement('dict');
+
+    foreach($this->value as $key => $value) {
+      $node->appendChild($doc->createElement('key', $key));
+      $node->appendChild($value->toXML($doc));
+    }
+
+    return $node;
+  }
+
+  /**
+   * convert value to binary representation
+   * @param CFBinaryPropertyList The binary property list object
+   * @return The offset in the object table
+   */
+  public function toBinary(CFBinaryPropertyList &$bplist) {
+    return $bplist->dictToBinary($this);
+  }
+
+  /**
+   * Get CFType's value.
+   * @return array primitive value
+   * @uses $value for retrieving primitive of CFType
+   */
+  public function toArray() {
+    $a = array();
+
+    foreach($this->value as $key => $value) $a[$key] = $value->toArray();
+    return $a;
+  }
+
+
+  /************************************************************************************************
+   *    I T E R A T O R   I N T E R F A C E
+   ************************************************************************************************/
+
+  /**
+   * Rewind {@link $iteratorPosition} to first position (being 0)
+   * @link http://php.net/manual/en/iterator.rewind.php
+   * @return void
+   * @uses $iteratorPosition set to 0
+   * @uses $iteratorKeys store keys of {@link $value}
+   */
+  public function rewind() {
+    $this->iteratorPosition = 0;
+    $this->iteratorKeys = array_keys($this->value);
+  }
+
+  /**
+   * Get Iterator's current {@link CFType} identified by {@link $iteratorPosition}
+   * @link http://php.net/manual/en/iterator.current.php
+   * @return CFType current Item
+   * @uses $iteratorPosition identify current key
+   * @uses $iteratorKeys identify current value
+   */
+  public function current() {
+    return $this->value[$this->iteratorKeys[$this->iteratorPosition]];
+  }
+
+  /**
+   * Get Iterator's current key identified by {@link $iteratorPosition}
+   * @link http://php.net/manual/en/iterator.key.php
+   * @return string key of the current Item
+   * @uses $iteratorPosition identify current key
+   * @uses $iteratorKeys identify current value
+   */
+  public function key() {
+    return $this->iteratorKeys[$this->iteratorPosition];
+  }
+
+  /**
+   * Increment {@link $iteratorPosition} to address next {@see CFType}
+   * @link http://php.net/manual/en/iterator.next.php
+   * @return void
+   * @uses $iteratorPosition increment by 1
+   */
+  public function next() {
+    $this->iteratorPosition++;
+  }
+
+  /**
+   * Test if {@link $iteratorPosition} addresses a valid element of {@link $value}
+   * @link http://php.net/manual/en/iterator.valid.php
+   * @return boolean true if current position is valid, false else
+   * @uses $iteratorPosition test if within {@link $iteratorKeys}
+   * @uses $iteratorPosition test if within {@link $value}
+   */
+  public function valid() {
+    return isset($this->iteratorKeys[$this->iteratorPosition]) && isset($this->value[$this->iteratorKeys[$this->iteratorPosition]]);
+  }
+
+}
+
+?>
\ No newline at end of file
diff --git a/restler/plistformat/.svn/text-base/CFTypeDetector.php.svn-base b/restler/plistformat/.svn/text-base/CFTypeDetector.php.svn-base
new file mode 100644
index 000000000..996439326
--- /dev/null
+++ b/restler/plistformat/.svn/text-base/CFTypeDetector.php.svn-base
@@ -0,0 +1,167 @@
+<?php
+
+ /**
+  * CFTypeDetector
+  * Interface for converting native PHP data structures to CFPropertyList objects.
+  * @author Rodney Rehm <rodney.rehm@medialize.de>
+  * @author Christian Kruse <cjk@wwwtech.de>
+  * @package plist
+  * @subpackage plist.types
+  * @example example-create-02.php Using {@link CFTypeDetector}
+  * @example example-create-03.php Using {@link CFTypeDetector} with {@link CFDate} and {@link CFData}
+  * @example example-create-04.php Using and extended {@link CFTypeDetector}
+  */
+class CFTypeDetector {
+  
+  /**
+   * flag stating if all arrays should automatically be converted to {@link CFDictionary}
+   * @var boolean
+   */
+  protected $autoDictionary = false;
+  
+  /**
+   * flag stating if exceptions should be suppressed or thrown
+   * @var boolean
+   */
+  protected $suppressExceptions = false;
+
+  /**
+   * name of a method that will be used for array to object conversations
+   * @var boolean
+   */
+  protected $objectToArrayMethod = false;
+
+
+  /**
+   * Create new CFTypeDetector
+   * @param boolean $autoDicitionary if set to true all arrays will be converted to {@link CFDictionary}
+   * @param boolean $suppressExceptions if set to true toCFType() will not throw any exceptions
+   * @param boolean $objectToArrayMethod if non-null, this method will be called on objects (if possible) to convert the object to an array
+   */
+  public function __construct($autoDicitionary=false,$suppressExceptions=false,$objectToArrayMethod=null) {
+    $this->autoDicitionary = $autoDicitionary;
+    $this->suppressExceptions = $suppressExceptions;
+    $this->objectToArrayMethod = $objectToArrayMethod;
+  }
+  
+  /**
+   * Determine if an array is associative or numerical.
+   * Numerical Arrays have incrementing index-numbers that don't contain gaps.
+   * @param array $value Array to check indexes of
+   * @return boolean true if array is associative, false if array has numeric indexes
+   */
+  protected function isAssociativeArray($value) {
+    $numericKeys = true;
+    $previousKey = null;
+    foreach($value as $key => $v) {
+      if(!is_numeric($key) || ($previousKey !== null && $previousKey != $key-1)) {
+        $numericKeys = false;
+        break;
+      }
+
+      $previousKey = $key;
+    }
+    return !$numericKeys;
+  }
+  
+  /**
+   * Get the default value
+   * @return CFType the default value to return if no suitable type could be determined
+   */
+  protected function defaultValue() {
+    return new CFString();
+  }
+  
+  /**
+   * Create CFType-structure by guessing the data-types.
+   * {@link CFArray}, {@link CFDictionary}, {@link CFBoolean}, {@link CFNumber} and {@link CFString} can be created, {@link CFDate} and {@link CFData} cannot.
+   * <br /><b>Note:</b>Distinguishing between {@link CFArray} and {@link CFDictionary} is done by examining the keys. 
+   * Keys must be strictly incrementing integers to evaluate to a {@link CFArray}. 
+   * Since PHP does not offer a function to test for associative arrays, 
+   * this test causes the input array to be walked twice and thus work rather slow on large collections. 
+   * If you work with large arrays and can live with all arrays evaluating to {@link CFDictionary}, 
+   * feel free to set the appropriate flag.
+   * <br /><b>Note:</b> If $value is an instance of CFType it is simply returned.
+   * <br /><b>Note:</b> If $value is neither a CFType, array, numeric, boolean nor string, it is omitted.
+   * @param mixed $value Value to convert to CFType
+   * @param boolean $autoDictionary if true {@link CFArray}-detection is bypassed and arrays will be returned as {@link CFDictionary}.
+   * @return CFType CFType based on guessed type
+   * @uses isAssociativeArray() to check if an array only has numeric indexes
+   */
+  public function toCFType($value) {
+    switch(true) {
+      case $value instanceof CFType:
+        return $value;
+      break;
+
+      case is_object($value):
+        // DateTime should be CFDate
+        if(class_exists( 'DateTime' ) && $value instanceof DateTime){
+          return new CFDate($value->getTimestamp());
+        }
+        
+        // convert possible objects to arrays, arrays will be arrays
+        if($this->objectToArrayMethod && is_callable(array($value, $this->objectToArrayMethod))){
+          $value = call_user_func( array( $value, $this->objectToArrayMethod ) );
+        }
+        
+        if(!is_array($value)){
+          if($this->suppressExceptions)
+            return $this->defaultValue();
+
+          throw new PListException('Could not determine CFType for object of type '. get_class($value));
+        }
+      /* break; omitted */
+
+      case $value instanceof Iterator:
+      case is_array($value):
+        // test if $value is simple or associative array
+        if(!$this->autoDictionary) {
+          if(!$this->isAssociativeArray($value)) {
+            $t = new CFArray();
+            foreach($value as $v) $t->add($this->toCFType($v));
+            return $t;
+          }
+        }
+
+        $t = new CFDictionary();
+        foreach($value as $k => $v) $t->add($k, $this->toCFType($v));
+
+        return $t;
+      break;
+
+      case is_numeric($value):
+        return new CFNumber($value);
+      break;
+
+      case is_bool($value):
+        return new CFBoolean($value);
+      break;
+
+      case is_string($value):
+        return new CFString($value);
+      break;
+
+      case is_null($value):
+        return new CFString();
+      break;
+
+      case is_resource($value):
+        if( $this->suppressExceptions )
+          return $this->defaultValue();
+
+        throw new PListException('Could not determine CFType for resource of type '. get_resource_type($value));
+      break;
+      
+      default:
+        if( $this->suppressExceptions )
+          return $this->defaultValue();
+
+        throw new PListException('Could not determine CFType for '. gettype($value));
+      break;
+    }
+  }
+
+}
+
+?>
\ No newline at end of file
diff --git a/restler/plistformat/.svn/text-base/IOException.php.svn-base b/restler/plistformat/.svn/text-base/IOException.php.svn-base
new file mode 100644
index 000000000..991855394
--- /dev/null
+++ b/restler/plistformat/.svn/text-base/IOException.php.svn-base
@@ -0,0 +1,99 @@
+<?php
+/**
+ * CFPropertyList
+ * {@link http://developer.apple.com/documentation/Darwin/Reference/ManPages/man5/plist.5.html Property Lists}
+ * @author Rodney Rehm <rodney.rehm@medialize.de>
+ * @author Christian Kruse <cjk@wwwtech.de>
+ * @package plist
+ * @version $Id$
+ */
+
+/**
+ * Basic Input / Output Exception
+ * @author Rodney Rehm <rodney.rehm@medialize.de>
+ * @author Christian Kruse <cjk@wwwtech.de>
+ * @package plist
+ */
+class IOException extends Exception {
+  /**
+   * Flag telling the File could not be found
+   */
+  const NOT_FOUND = 1;
+  
+  /**
+   * Flag telling the File is not readable
+   */
+  const NOT_READABLE = 2;
+  
+  /**
+   * Flag telling the File is not writable
+   */
+  const NOT_WRITABLE = 3;
+
+  /**
+   * Flag telling there was a read error
+   */
+  const READ_ERROR = 4;
+
+  /**
+   * Flag telling there was a read error
+   */
+  const WRITE_ERROR = 5;
+
+  /**
+   * Create new IOException
+   * @param string $path Source of the problem
+   * @param integer $type Type of the problem
+   */
+  public function __construct($path, $type=null) {
+    parent::__construct( $path, $type );
+  }
+  
+  /**
+   * Create new FileNotFound-Exception
+   * @param string $path Source of the problem
+   * @return IOException new FileNotFound-Exception
+   */
+  public static function notFound($path) {
+    return new IOException( $path, self::NOT_FOUND );
+  }
+
+  /**
+   * Create new FileNotReadable-Exception
+   * @param string $path Source of the problem
+   * @return IOException new FileNotReadable-Exception
+   */
+  public static function notReadable($path) {
+    return new IOException( $path, self::NOT_READABLE );
+  }
+
+  /**
+   * Create new FileNotWritable-Exception
+   * @param string $path Source of the problem
+   * @return IOException new FileNotWritable-Exception
+   */
+  public static function notWritable($path) {
+    return new IOException( $path, self::NOT_WRITABLE );
+  }
+
+  /**
+   * Create new ReadError-Exception
+   * @param string $path Source of the problem
+   * @return IOException new ReadError-Exception
+   */
+  public static function readError($path) {
+    return new IOException( $path, self::READ_ERROR );
+  }
+
+  /**
+   * Create new WriteError-Exception
+   * @param string $path Source of the problem
+   * @return IOException new WriteError-Exception
+   */
+  public static function writeError($path) {
+    return new IOException( $path, self::WRITE_ERROR );
+  }
+}
+
+
+?>
\ No newline at end of file
diff --git a/restler/plistformat/.svn/text-base/PListException.php.svn-base b/restler/plistformat/.svn/text-base/PListException.php.svn-base
new file mode 100644
index 000000000..b738d2382
--- /dev/null
+++ b/restler/plistformat/.svn/text-base/PListException.php.svn-base
@@ -0,0 +1,22 @@
+<?php
+/**
+ * CFPropertyList
+ * {@link http://developer.apple.com/documentation/Darwin/Reference/ManPages/man5/plist.5.html Property Lists}
+ * @author Rodney Rehm <rodney.rehm@medialize.de>
+ * @author Christian Kruse <cjk@wwwtech.de>
+ * @package plist
+ * @version $Id$
+ */
+
+/**
+ * Exception for errors with the PList format
+ * @author Rodney Rehm <rodney.rehm@medialize.de>
+ * @author Christian Kruse <cjk@wwwtech.de>
+ * @package plist
+ */
+class PListException extends Exception {
+
+}
+
+
+?>
\ No newline at end of file
diff --git a/restler/plistformat/CFBinaryPropertyList.php b/restler/plistformat/CFBinaryPropertyList.php
new file mode 100644
index 000000000..f946193da
--- /dev/null
+++ b/restler/plistformat/CFBinaryPropertyList.php
@@ -0,0 +1,970 @@
+<?php
+/**
+ * CFPropertyList
+ * {@link http://developer.apple.com/documentation/Darwin/Reference/ManPages/man5/plist.5.html Property Lists}
+ * @author Rodney Rehm <rodney.rehm@medialize.de>
+ * @author Christian Kruse <cjk@wwwtech.de>
+ * @package plist
+ * @version $Id$
+ */
+
+/**
+ * Facility for reading and writing binary PropertyLists. Ported from {@link http://www.opensource.apple.com/source/CF/CF-476.15/CFBinaryPList.c CFBinaryPList.c}.
+ * @author Rodney Rehm <rodney.rehm@medialize.de>
+ * @author Christian Kruse <cjk@wwwtech.de>
+ * @package plist
+ * @example example-read-02.php Read a Binary PropertyList
+ * @example example-read-03.php Read a PropertyList without knowing the type
+ */
+abstract class CFBinaryPropertyList {
+  /**
+   * Content of the plist (unparsed string)
+   * @var string
+   */
+  protected $content = NULL;
+
+  /**
+   * position in the (unparsed) string
+   * @var integer
+   */
+  protected $pos = 0;
+
+  /**
+   * Table containing uniqued objects
+   * @var array
+   */
+  protected $uniqueTable = Array();
+
+  /**
+   * Number of objects in file
+   * @var integer
+   */
+  protected $countObjects = 0;
+
+  /**
+   * The length of all strings in the file (byte length, not character length)
+   * @var integer
+   */
+  protected $stringSize = 0;
+
+  /**
+   * The length of all ints in file (byte length)
+   * @var integer
+   */
+  protected $intSize = 0;
+
+  /**
+   * The length of misc objects (i.e. not integer and not string) in file
+   * @var integer
+   */
+  protected $miscSize = 0;
+
+  /**
+   * Number of object references in file (needed to calculate reference byte length)
+   * @var integer
+   */
+  protected $objectRefs = 0;
+
+  /**
+   * Number of objects written during save phase; needed to calculate the size of the object table
+   * @var integer
+   */
+  protected $writtenObjectCount = 0;
+
+  /**
+   * Table containing all objects in the file
+   */
+  protected $objectTable = Array();
+
+  /**
+   * The size of object references
+   */
+  protected $objectRefSize = 0;
+
+  /**
+   * The „offsets” (i.e. the different entries) in the file
+   */
+  protected $offsets = Array();
+
+  /**
+   * Read a „null type” (filler byte, true, false, 0 byte)
+   * @param $length The byte itself
+   * @return the byte value (e.g. CFBoolean(true), CFBoolean(false), 0 or 15)
+   * @throws PListException on encountering an unknown null type
+   */
+  protected function readBinaryNullType($length) {
+    switch($length) {
+      case 0: return 0; // null type
+      case 8: return new CFBoolean(false);
+      case 9: return new CFBoolean(true);
+      case 15: return 15; // fill type
+    }
+
+    throw new PListException("unknown null type: $length");
+  }
+
+  /**
+   * Create an 64 bit integer using bcmath or gmp
+   * @param int $hi The higher word
+   * @param int $lo The lower word
+   * @return mixed The integer (as int if possible, as string if not possible)
+   * @throws PListException if neither gmp nor bc available
+   */
+  protected static function make64Int($hi,$lo) {
+    // on x64, we can just use int
+    if(PHP_INT_SIZE > 4) return (((int)$hi)<<32) | ((int)$lo);
+
+    // lower word has to be unsigned since we don't use bitwise or, we use bcadd/gmp_add
+    $lo = sprintf("%u", $lo);
+
+    // use GMP or bcmath if possible
+    if(function_exists("gmp_mul")) return gmp_strval(gmp_add(gmp_mul($hi, "4294967296"), $lo));
+
+    if(function_exists("bcmul")) return bcadd(bcmul($hi,"4294967296"), $lo);
+
+    if(class_exists('Math_BigInteger')) {
+      $bi = new Math_BigInteger($hi);
+      return $bi->multiply("4294967296")->add($lo)->toString();
+    }
+
+    throw new PListException("either gmp or bc has to be installed, or the Math_BigInteger has to be available!");
+  }
+
+  /**
+   * Read an integer value
+   * @param integer $length The length (in bytes) of the integer value, coded as „set bit $length to 1”
+   * @return CFNumber The integer value
+   * @throws PListException if integer val is invalid
+   * @throws IOException if read error occurs
+   * @uses make64Int() to overcome PHP's big integer problems
+   */
+  protected function readBinaryInt($length) {
+    if($length > 3) throw new PListException("Integer greater than 8 bytes: $length");
+
+    $nbytes = 1 << $length;
+
+    $val = null;
+    if(strlen($buff = substr($this->content, $this->pos, $nbytes)) != $nbytes) throw IOException::readError("");
+    $this->pos += $nbytes;
+
+    switch($length) {
+      case 0:
+        $val = unpack("C", $buff);
+        $val = $val[1];
+        break;
+      case 1:
+        $val = unpack("n", $buff);
+        $val = $val[1];
+        break;
+      case 2:
+        $val = unpack("N", $buff);
+        $val = $val[1];
+        break;
+      case 3:
+        $words = unpack("Nhighword/Nlowword",$buff);
+        //$val = $words['highword'] << 32 | $words['lowword'];
+        $val = self::make64Int($words['highword'],$words['lowword']);
+        break;
+    }
+
+    return new CFNumber($val);
+  }
+
+  /**
+   * Read a real value
+   * @param integer $length The length (in bytes) of the integer value, coded as „set bit $length to 1”
+   * @return CFNumber The real value
+   * @throws PListException if real val is invalid
+   * @throws IOException if read error occurs
+   */
+  protected function readBinaryReal($length) {
+    if($length > 3) throw new PListException("Real greater than 8 bytes: $length");
+
+    $nbytes = 1 << $length;
+    $val = null;
+    if(strlen($buff = substr($this->content,$this->pos, $nbytes)) != $nbytes) throw IOException::readError("");
+    $this->pos += $nbytes;
+
+    switch($length) {
+      case 0: // 1 byte float? must be an error
+      case 1: // 2 byte float? must be an error
+        $x = $length + 1;
+        throw new PListException("got {$x} byte float, must be an error!");
+      case 2:
+        $val = unpack("f", strrev($buff));
+        $val = $val[1];
+        break;
+      case 3:
+        $val = unpack("d", strrev($buff));
+        $val = $val[1];
+        break;
+    }
+
+    return new CFNumber($val);
+  }
+
+  /**
+   * Read a date value
+   * @param integer $length The length (in bytes) of the integer value, coded as „set bit $length to 1”
+   * @return CFDate The date value
+   * @throws PListException if date val is invalid
+   * @throws IOException if read error occurs
+   */
+  protected function readBinaryDate($length) {
+    if($length > 3) throw new PListException("Date greater than 8 bytes: $length");
+
+    $nbytes = 1 << $length;
+    $val = null;
+    if(strlen($buff = substr($this->content, $this->pos, $nbytes)) != $nbytes) throw IOException::readError("");
+    $this->pos += $nbytes;
+
+    switch($length) {
+      case 0: // 1 byte CFDate is an error
+      case 1: // 2 byte CFDate is an error
+        $x = $length + 1;
+        throw new PListException("{$x} byte CFdate, error");
+
+      case 2:
+        $val = unpack("f", strrev($buff));
+        $val = $val[1];
+        break;
+      case 3:
+        $val = unpack("d", strrev($buff));
+        $val = $val[1];
+        break;
+    }
+
+    return new CFDate($val,CFDate::TIMESTAMP_APPLE);
+  }
+
+  /**
+   * Read a data value
+   * @param integer $length The length (in bytes) of the integer value, coded as „set bit $length to 1”
+   * @return CFData The data value
+   * @throws IOException if read error occurs
+   */
+  protected function readBinaryData($length) {
+    if($length == 0) $buff = "";
+    else {
+      $buff = substr($this->content, $this->pos, $length);
+      if(strlen($buff) != $length) throw IOException::readError("");
+      $this->pos += $length;
+    }
+
+    return new CFData($buff,false);
+  }
+
+  /**
+   * Read a string value, usually coded as utf8
+   * @param integer $length The length (in bytes) of the string value
+   * @return CFString The string value, utf8 encoded
+   * @throws IOException if read error occurs
+   */
+  protected function readBinaryString($length) {
+    if($length == 0) $buff = "";
+    else {
+      if(strlen($buff = substr($this->content, $this->pos, $length)) != $length) throw IOException::readError("");
+      $this->pos += $length;
+    }
+
+    if(!isset($this->uniqueTable[$buff])) $this->uniqueTable[$buff] = true;
+    return new CFString($buff);
+  }
+
+  /**
+   * Convert the given string from one charset to another.
+   * Trying to use MBString, Iconv, Recode - in that particular order.
+   * @param string $string the string to convert
+   * @param string $fromCharset the charset the given string is currently encoded in
+   * @param string $toCharset the charset to convert to, defaults to UTF-8
+   * @return string the converted string
+   * @throws PListException on neither MBString, Iconv, Recode being available
+   */
+  public static function convertCharset($string, $fromCharset, $toCharset='UTF-8') {
+    if(function_exists('mb_convert_encoding')) return mb_convert_encoding($string, $toCharset, $fromCharset);
+    if(function_exists('iconv')) return iconv($fromCharset, $toCharset, $string);
+    if(function_exists('recode_string')) return recode_string($fromCharset .'..'. $toCharset, $string);
+
+    throw new PListException('neither iconv nor mbstring supported. how are we supposed to work on strings here?');
+  }
+
+  /**
+   * Count characters considering character set
+   * Trying to use MBString, Iconv - in that particular order.
+   * @param string $string the string to convert
+   * @param string $charset the charset the given string is currently encoded in
+   * @return integer The number of characters in that string
+   * @throws PListException on neither MBString, Iconv being available
+   */
+  public static function charsetStrlen($string,$charset="UTF-8") {
+    if(function_exists('mb_strlen')) return mb_strlen($string, $charset);
+    if(function_exists('iconv_strlen')) return iconv_strlen($string,$charset);
+
+    throw new PListException('neither iconv nor mbstring supported. how are we supposed to work on strings here?');
+  }
+
+  /**
+   * Read a unicode string value, coded as UTF-16BE
+   * @param integer $length The length (in bytes) of the string value
+   * @return CFString The string value, utf8 encoded
+   * @throws IOException if read error occurs
+   */
+  protected function readBinaryUnicodeString($length) {
+    /* The problem is: we get the length of the string IN CHARACTERS;
+       since a char in UTF-16 can be 16 or 32 bit long, we don't really know
+       how long the string is in bytes */
+    if(strlen($buff = substr($this->content, $this->pos, 2*$length)) != 2*$length) throw IOException::readError("");
+    $this->pos += 2 * $length;
+
+    if(!isset($this->uniqueTable[$buff])) $this->uniqueTable[$buff] = true;
+    return new CFString(self::convertCharset($buff, "UTF-16BE", "UTF-8"));
+  }
+
+  /**
+   * Read an array value, including contained objects
+   * @param integer $length The number of contained objects
+   * @return CFArray The array value, including the objects
+   * @throws IOException if read error occurs
+   */
+  protected function readBinaryArray($length) {
+    $ary = new CFArray();
+
+    // first: read object refs
+    if($length != 0) {
+      if(strlen($buff = substr($this->content, $this->pos, $length * $this->objectRefSize)) != $length * $this->objectRefSize) throw IOException::readError("");
+      $this->pos += $length * $this->objectRefSize;
+
+      $objects = unpack($this->objectRefSize == 1 ? "C*" : "n*", $buff);
+
+      // now: read objects
+      for($i=0;$i<$length;++$i) {
+        $object = $this->readBinaryObjectAt($objects[$i+1]+1,$this->objectRefSize);
+        $ary->add($object);
+      }
+    }
+
+    return $ary;
+  }
+
+  /**
+   * Read a dictionary value, including contained objects
+   * @param integer $length The number of contained objects
+   * @return CFDictionary The dictionary value, including the objects
+   * @throws IOException if read error occurs
+   */
+  protected function readBinaryDict($length) {
+    $dict = new CFDictionary();
+
+    // first: read keys
+    if($length != 0) {
+      if(strlen($buff = substr($this->content, $this->pos, $length * $this->objectRefSize)) != $length * $this->objectRefSize) throw IOException::readError("");
+      $this->pos += $length * $this->objectRefSize;
+      $keys = unpack(($this->objectRefSize == 1 ? "C*" : "n*"), $buff);
+
+      // second: read object refs
+      if(strlen($buff = substr($this->content, $this->pos, $length * $this->objectRefSize)) != $length * $this->objectRefSize) throw IOException::readError("");
+      $this->pos += $length * $this->objectRefSize;
+      $objects = unpack(($this->objectRefSize == 1 ? "C*" : "n*"), $buff);
+
+      // read real keys and objects
+      for($i=0;$i<$length;++$i) {
+        $key = $this->readBinaryObjectAt($keys[$i+1]+1);
+        $object = $this->readBinaryObjectAt($objects[$i+1]+1);
+        $dict->add($key->getValue(),$object);
+      }
+    }
+
+    return $dict;
+  }
+
+  /**
+   * Read an object type byte, decode it and delegate to the correct reader function
+   * @return mixed The value of the delegate reader, so any of the CFType subclasses
+   * @throws IOException if read error occurs
+   */
+  function readBinaryObject() {
+    // first: read the marker byte
+    if(strlen($buff = substr($this->content,$this->pos,1)) != 1) throw IOException::readError("");
+    $this->pos++;
+
+    $object_length = unpack("C*", $buff);
+    $object_length = $object_length[1]  & 0xF;
+    $buff = unpack("H*", $buff);
+    $buff = $buff[1];
+
+    $object_type = substr($buff, 0, 1);
+    if($object_type != "0" && $object_length == 15) {
+      $object_length = $this->readBinaryObject($this->objectRefSize);
+      $object_length = $object_length->getValue();
+    }
+
+    $retval = null;
+    switch($object_type) {
+      case '0': // null, false, true, fillbyte
+        $retval = $this->readBinaryNullType($object_length);
+        break;
+      case '1': // integer
+        $retval = $this->readBinaryInt($object_length);
+        break;
+      case '2': // real
+        $retval = $this->readBinaryReal($object_length);
+        break;
+      case '3': // date
+        $retval = $this->readBinaryDate($object_length);
+        break;
+      case '4': // data
+        $retval = $this->readBinaryData($object_length);
+        break;
+      case '5': // byte string, usually utf8 encoded
+        $retval = $this->readBinaryString($object_length);
+        break;
+      case '6': // unicode string (utf16be)
+        $retval = $this->readBinaryUnicodeString($object_length);
+        break;
+      case 'a': // array
+        $retval = $this->readBinaryArray($object_length);
+        break;
+      case 'd': // dictionary
+        $retval = $this->readBinaryDict($object_length);
+        break;
+    }
+
+    return $retval;
+  }
+
+  /**
+   * Read an object type byte at position $pos, decode it and delegate to the correct reader function
+   * @param integer $pos The table position in the offsets table
+   * @return mixed The value of the delegate reader, so any of the CFType subclasses
+   */
+  function readBinaryObjectAt($pos) {
+    $this->pos = $this->offsets[$pos];
+    return $this->readBinaryObject();
+  }
+
+  /**
+   * Parse a binary plist string
+   * @return void
+   * @throws IOException if read error occurs
+   */
+  public function parseBinaryString() {
+    $this->uniqueTable = Array();
+    $this->countObjects = 0;
+    $this->stringSize = 0;
+    $this->intSize = 0;
+    $this->miscSize = 0;
+    $this->objectRefs = 0;
+
+    $this->writtenObjectCount = 0;
+    $this->objectTable = Array();
+    $this->objectRefSize = 0;
+
+    $this->offsets = Array();
+
+    // first, we read the trailer: 32 byte from the end
+    $buff = substr($this->content,-32);
+
+    $infos = unpack("x6/Coffset_size/Cobject_ref_size/x4/Nnumber_of_objects/x4/Ntop_object/x4/Ntable_offset",$buff);
+
+    // after that, get the offset table
+    $coded_offset_table = substr($this->content,$infos['table_offset'],$infos['number_of_objects'] * $infos['offset_size']);
+    if(strlen($coded_offset_table) != $infos['number_of_objects'] * $infos['offset_size']) throw IOException::readError("");
+    $this->countObjects = $infos['number_of_objects'];
+
+    // decode offset table
+    $formats = Array("","C*","n*",NULL,"N*");
+    if($infos['offset_size'] == 3) { # since PHP does not support parenthesis in pack/unpack expressions,
+                                     # "(H6)*" does not work and we have to work round this by repeating the
+                                     # expression as often as it fits in the string
+      $this->offsets = array(NULL);
+      while($coded_offset_table) {
+        $str = unpack("H6",$coded_offset_table);
+        $this->offsets[] = hexdec($str[1]);
+        $coded_offset_table = substr($coded_offset_table,3);
+      }
+    }
+    else $this->offsets = unpack($formats[$infos['offset_size']],$coded_offset_table);
+
+    $this->uniqueTable = Array();
+    $this->objectRefSize = $infos['object_ref_size'];
+
+    $top = $this->readBinaryObjectAt($infos['top_object']+1);
+    $this->add($top);
+  }
+
+  /**
+   * Read a binary plist stream
+   * @param resource $stream The stream to read
+   * @return void
+   * @throws IOException if read error occurs
+   */
+  function readBinaryStream($stream) {
+    $str = stream_get_contents($stream);
+    $this->parseBinary($str);
+  }
+
+  /**
+   * parse a binary plist string
+   * @param string $content The stream to read, defaults to {@link $this->content}
+   * @return void
+   * @throws IOException if read error occurs
+   */
+  function parseBinary($content=NULL) {
+    if($content !== NULL) $this->content = $content;
+    $this->pos = 0;
+
+    $this->parseBinaryString();
+  }
+
+  /**
+   * Read a binary plist file
+   * @param string $file The file to read
+   * @return void
+   * @throws IOException if read error occurs
+   */
+  function readBinary($file) {
+    if(!($fd = fopen($file,"rb"))) throw new IOException("Could not open file {$file}!");
+    $this->readBinaryStream($fd);
+    fclose($fd);
+  }
+
+  /**
+   * calculate the bytes needed for a size integer value
+   * @param integer $int The integer value to calculate
+   * @return integer The number of bytes needed
+   */
+  public static function bytesSizeInt($int) {
+    $nbytes = 0;
+
+    if($int > 0xE) $nbytes += 2; // 2 size-bytes
+    if($int > 0xFF) $nbytes += 1; // 3 size-bytes
+    if($int > 0xFFFF) $nbytes += 2; // 5 size-bytes
+
+    return $nbytes;
+  }
+
+  /**
+   * Calculate the byte needed for a „normal” integer value
+   * @param integer $int The integer value
+   * @return integer The number of bytes needed + 1 (because of the „marker byte”)
+   */
+  public static function bytesInt($int) {
+    $nbytes = 1;
+
+    if($int > 0xFF) $nbytes += 1; // 2 byte integer
+    if($int > 0xFFFF) $nbytes += 2; // 4 byte integer
+    if($int > 0xFFFFFFFF) $nbytes += 4; // 8 byte integer
+    if($int < 0) $nbytes += 7; // 8 byte integer (since it is signed)
+
+    return $nbytes + 1; // one „marker” byte
+  }
+
+  /**
+   * „pack” a value (i.e. write the binary representation as big endian to a string) with the specified size
+   * @param integer $nbytes The number of bytes to pack
+   * @param integer $int the integer value to pack
+   * @return string The packed value as string
+   */
+  public static function packItWithSize($nbytes,$int) {
+    $formats = Array("C", "n", "N", "N");
+    $format = $formats[$nbytes-1];
+    $ret = '';
+
+    if($nbytes == 3) return substr(pack($format, $int), -3);
+    return pack($format, $int);
+  }
+
+  /**
+   * Calculate the bytes needed to save the number of objects
+   * @param integer $count_objects The number of objects
+   * @return integer The number of bytes
+   */
+  public static function bytesNeeded($count_objects) {
+    $nbytes = 0;
+
+    while($count_objects >= 1) {
+      $nbytes++;
+      $count_objects /= 256;
+    }
+
+    return $nbytes;
+  }
+
+  /**
+   * Code an integer to byte representation
+   * @param integer $int The integer value
+   * @return string The packed byte value
+   */
+  public static function intBytes($int) {
+    $intbytes = "";
+
+    if($int > 0xFFFF) $intbytes = "\x12".pack("N", $int); // 4 byte integer
+    elseif($int > 0xFF) $intbytes = "\x11".pack("n", $int); // 2 byte integer
+    else $intbytes = "\x10".pack("C", $int); // 8 byte integer
+
+    return $intbytes;
+  }
+
+  /**
+   * Code an type byte, consisting of the type marker and the length of the type
+   * @param string $type The type byte value (i.e. "d" for dictionaries)
+   * @param integer $type_len The length of the type
+   * @return string The packed type byte value
+   */
+  public static function typeBytes($type,$type_len) {
+    $optional_int = "";
+
+    if($type_len < 15) $type .= sprintf("%x", $type_len);
+    else {
+      $type .= "f";
+      $optional_int = self::intBytes($type_len);
+    }
+
+    return pack("H*", $type).$optional_int;
+  }
+
+  /**
+   * Count number of objects and create a unique table for strings
+   * @param $value The value to count and unique
+   * @return void
+   */
+  protected function uniqueAndCountValues($value) {
+    // no uniquing for other types than CFString and CFData
+    if($value instanceof CFNumber) {
+      $val = $value->getValue();
+      if(intval($val) == $val && !is_float($val) && strpos($val,'.') === false) $this->intSize += self::bytesInt($val);
+      else $this->miscSize += 9; // 9 bytes (8 + marker byte) for real
+      $this->countObjects++;
+      return;
+    }
+    elseif($value instanceof CFDate) {
+      $this->miscSize += 9; // since date in plist is real, we need 9 byte (8 + marker byte)
+      $this->countObjects++;
+      return;
+    }
+    elseif($value instanceof CFBoolean) {
+      $this->countObjects++;
+      $this->miscSize += 1;
+      return;
+    }
+    elseif($value instanceof CFArray) {
+      $cnt = 0;
+      foreach($value as $v) {
+        ++$cnt;
+        $this->uniqueAndCountValues($v);
+        $this->objectRefs++; // each array member is a ref
+      }
+
+      $this->countObjects++;
+      $this->intSize += self::bytesSizeInt($cnt);
+      $this->miscSize++; // marker byte for array
+      return;
+    }
+    elseif($value instanceof CFDictionary) {
+      $cnt = 0;
+      foreach($value as $k => $v) {
+        ++$cnt;
+        if(!isset($this->uniqueTable[$k])) {
+          $this->uniqueTable[$k] = 0;
+          $len = self::binaryStrlen($k);
+          $this->stringSize += $len + 1;
+          $this->intSize += self::bytesSizeInt(self::charsetStrlen($k,'UTF-8'));
+        }
+
+        $this->objectRefs += 2; // both, key and value, are refs
+        $this->uniqueTable[$k]++;
+        $this->uniqueAndCountValues($v);
+      }
+
+      $this->countObjects++;
+      $this->miscSize++; // marker byte for dict
+      $this->intSize += self::bytesSizeInt($cnt);
+      return;
+    }
+    elseif($value instanceOf CFData) {
+      $val = $value->getValue();
+      $len = strlen($val);
+      $this->intSize += self::bytesSizeInt($len);
+      $this->miscSize += $len + 1;
+      $this->countObjects++;
+      return;
+    }
+    else $val = $value->getValue();
+
+    if(!isset($this->uniqueTable[$val])) {
+      $this->uniqueTable[$val] = 0;
+      $len = self::binaryStrlen($val);
+      $this->stringSize += $len + 1;
+      $this->intSize += self::bytesSizeInt(self::charsetStrlen($val,'UTF-8'));
+    }
+    $this->uniqueTable[$val]++;
+  }
+
+  /**
+   * Convert CFPropertyList to binary format; since we have to count our objects we simply unique CFDictionary and CFArray
+   * @return string The binary plist content
+   */
+  public function toBinary() {
+    $this->uniqueTable = Array();
+    $this->countObjects = 0;
+    $this->stringSize = 0;
+    $this->intSize = 0;
+    $this->miscSize = 0;
+    $this->objectRefs = 0;
+
+    $this->writtenObjectCount = 0;
+    $this->objectTable = Array();
+    $this->objectRefSize = 0;
+
+    $this->offsets = Array();
+
+    $binary_str = "bplist00";
+    $value = $this->getValue(true);
+    $this->uniqueAndCountValues($value);
+
+    $this->countObjects += count($this->uniqueTable);
+    $this->objectRefSize = self::bytesNeeded($this->countObjects);
+    $file_size = $this->stringSize + $this->intSize + $this->miscSize + $this->objectRefs * $this->objectRefSize + 40;
+    $offset_size = self::bytesNeeded($file_size);
+    $table_offset = $file_size - 32;
+
+    $this->objectTable = Array();
+    $this->writtenObjectCount = 0;
+    $this->uniqueTable = Array(); // we needed it to calculate several values
+    $value->toBinary($this);
+
+    $object_offset = 8;
+    $offsets = Array();
+
+    for($i=0;$i<count($this->objectTable);++$i) {
+      $binary_str .= $this->objectTable[$i];
+      $offsets[$i] = $object_offset;
+      $object_offset += strlen($this->objectTable[$i]);
+    }
+
+    for($i=0;$i<count($offsets);++$i) {
+      $binary_str .= self::packItWithSize($offset_size, $offsets[$i]);
+    }
+
+
+    $binary_str .= pack("x6CC", $offset_size, $this->objectRefSize);
+    $binary_str .= pack("x4N", $this->countObjects);
+    $binary_str .= pack("x4N", 0);
+    $binary_str .= pack("x4N", $table_offset);
+
+    return $binary_str;
+  }
+
+  /**
+   * Counts the number of bytes the string will have when coded; utf-16be if non-ascii characters are present.
+   * @param string $val The string value
+   * @return integer The length of the coded string in bytes
+   */
+  protected static function binaryStrlen($val) {
+    for($i=0;$i<strlen($val);++$i) {
+      if(ord($val{$i}) >= 128) {
+        $val = self::convertCharset($val, 'UTF-8', 'UTF-16BE');
+        return strlen($val);
+      }
+    }
+
+    return strlen($val);
+  }
+
+  /**
+   * Uniques and transforms a string value to binary format and adds it to the object table
+   * @param string $val The string value
+   * @return integer The position in the object table
+   */
+  public function stringToBinary($val) {
+    $saved_object_count = -1;
+
+    if(!isset($this->uniqueTable[$val])) {
+      $saved_object_count = $this->writtenObjectCount++;
+      $this->uniqueTable[$val] = $saved_object_count;
+      $utf16 = false;
+
+      for($i=0;$i<strlen($val);++$i) {
+        if(ord($val{$i}) >= 128) {
+          $utf16 = true;
+          break;
+        }
+      }
+
+      if($utf16) {
+        $bdata = self::typeBytes("6", mb_strlen($val,'UTF-8')); // 6 is 0110, unicode string (utf16be)
+        $val = self::convertCharset($val, 'UTF-8', 'UTF-16BE');
+        $this->objectTable[$saved_object_count] = $bdata.$val;
+      }
+      else {
+        $bdata = self::typeBytes("5", strlen($val)); // 5 is 0101 which is an ASCII string (seems to be ASCII encoded)
+        $this->objectTable[$saved_object_count] = $bdata.$val;
+      }
+    }
+    else $saved_object_count = $this->uniqueTable[$val];
+
+    return $saved_object_count;
+  }
+
+  /**
+   * Codes an integer to binary format
+   * @param integer $value The integer value
+   * @return string the coded integer
+   */
+  protected function intToBinary($value) {
+    $nbytes = 0;
+    if($value > 0xFF) $nbytes = 1; // 1 byte integer
+    if($value > 0xFFFF) $nbytes += 1; // 4 byte integer
+    if($value > 0xFFFFFFFF) $nbytes += 1; // 8 byte integer
+    if($value < 0) $nbytes = 3; // 8 byte integer, since signed
+
+    $bdata = self::typeBytes("1", $nbytes); // 1 is 0001, type indicator for integer
+    $buff = "";
+
+    if($nbytes < 3) {
+      if($nbytes == 0) $fmt = "C";
+      elseif($nbytes == 1) $fmt = "n";
+      else $fmt = "N";
+
+      $buff = pack($fmt, $value);
+    }
+    else {
+      if(PHP_INT_SIZE > 4) {
+        // 64 bit signed integer; we need the higher and the lower 32 bit of the value
+        $high_word = $value >> 32;
+        $low_word = $value & 0xFFFFFFFF;
+      }
+      else {
+        // since PHP can only handle 32bit signed, we can only get 32bit signed values at this point - values above 0x7FFFFFFF are
+        // floats. So we ignore the existance of 64bit on non-64bit-machines
+        if($value < 0) $high_word = 0xFFFFFFFF;
+        else $high_word = 0;
+        $low_word = $value;
+      }
+      $buff = pack("N", $high_word).pack("N", $low_word);
+    }
+
+    return $bdata.$buff;
+  }
+
+  /**
+   * Codes a real value to binary format
+   * @param float $val The real value
+   * @return string The coded real
+   */
+  protected function realToBinary($val) {
+    $bdata = self::typeBytes("2", 3); // 2 is 0010, type indicator for reals
+    return $bdata.strrev(pack("d", (float)$val));
+  }
+
+  /**
+   * Converts a numeric value to binary and adds it to the object table
+   * @param numeric $value The numeric value
+   * @return integer The position in the object table
+   */
+  public function numToBinary($value) {
+    $saved_object_count = $this->writtenObjectCount++;
+
+    $val = "";
+    if(intval($value) == $value && !is_float($value) && strpos($value,'.') === false) $val = $this->intToBinary($value);
+    else $val = $this->realToBinary($value);
+
+    $this->objectTable[$saved_object_count] = $val;
+    return $saved_object_count;
+  }
+
+  /**
+   * Convert date value (apple format) to binary and adds it to the object table
+   * @param integer $value The date value
+   * @return integer The position of the coded value in the object table
+   */
+  public function dateToBinary($val) {
+    $saved_object_count = $this->writtenObjectCount++;
+
+    $hour = gmdate("H",$val);
+    $min = gmdate("i",$val);
+    $sec = gmdate("s",$val);
+    $mday = gmdate("j",$val);
+    $mon = gmdate("n",$val);
+    $year = gmdate("Y",$val);
+
+    $val = gmmktime($hour,$min,$sec,$mon,$mday,$year) - CFDate::DATE_DIFF_APPLE_UNIX; // CFDate is a real, number of seconds since 01/01/2001 00:00:00 GMT
+
+    $bdata = self::typeBytes("3", 3); // 3 is 0011, type indicator for date
+    $this->objectTable[$saved_object_count] = $bdata.strrev(pack("d", $val));
+
+    return $saved_object_count;
+  }
+
+  /**
+   * Convert a bool value to binary and add it to the object table
+   * @param bool $val The boolean value
+   * @return integer The position in the object table
+   */
+  public function boolToBinary($val) {
+    $saved_object_count = $this->writtenObjectCount++;
+    $this->objectTable[$saved_object_count] = $val ? "\x9" : "\x8"; // 0x9 is 1001, type indicator for true; 0x8 is 1000, type indicator for false
+    return $saved_object_count;
+  }
+
+  /**
+   * Convert data value to binary format and add it to the object table
+   * @param string $val The data value
+   * @return integer The position in the object table
+   */
+  public function dataToBinary($val) {
+    $saved_object_count = $this->writtenObjectCount++;
+
+    $bdata = self::typeBytes("4", strlen($val)); // a is 1000, type indicator for data
+    $this->objectTable[$saved_object_count] = $bdata.$val;
+
+    return $saved_object_count;
+  }
+
+  /**
+   * Convert array to binary format and add it to the object table
+   * @param CFArray $val The array to convert
+   * @return integer The position in the object table
+   */
+  public function arrayToBinary($val) {
+    $saved_object_count = $this->writtenObjectCount++;
+
+    $bdata = self::typeBytes("a", count($val->getValue())); // a is 1010, type indicator for arrays
+
+    foreach($val as $v) {
+      $bval = $v->toBinary($this);
+      $bdata .= self::packItWithSize($this->objectRefSize, $bval);
+    }
+
+    $this->objectTable[$saved_object_count] = $bdata;
+    return $saved_object_count;
+  }
+
+  /**
+   * Convert dictionary to binary format and add it to the object table
+   * @param CFDictionary $val The dict to convert
+   * @return integer The position in the object table
+   */
+  public function dictToBinary($val) {
+    $saved_object_count = $this->writtenObjectCount++;
+    $bdata = self::typeBytes("d", count($val->getValue())); // d=1101, type indicator for dictionary
+
+    foreach($val as $k => $v) {
+      $str = new CFString($k);
+      $key = $str->toBinary($this);
+      $bdata .= self::packItWithSize($this->objectRefSize, $key);
+    }
+
+    foreach($val as $k => $v) {
+      $bval = $v->toBinary($this);
+      $bdata .= self::packItWithSize($this->objectRefSize, $bval);
+    }
+
+    $this->objectTable[$saved_object_count] = $bdata;
+    return $saved_object_count;
+  }
+
+}
+
+
+?>
diff --git a/restler/plistformat/CFPropertyList.php b/restler/plistformat/CFPropertyList.php
new file mode 100644
index 000000000..2f53a3b48
--- /dev/null
+++ b/restler/plistformat/CFPropertyList.php
@@ -0,0 +1,586 @@
+<?php
+/**
+ * CFPropertyList
+ * {@link http://developer.apple.com/documentation/Darwin/Reference/ManPages/man5/plist.5.html Property Lists}
+ * @author Rodney Rehm <rodney.rehm@medialize.de>
+ * @author Christian Kruse <cjk@wwwtech.de>
+ * @package plist
+ * @version $Id$
+ * @example example-read-01.php Read an XML PropertyList
+ * @example example-read-02.php Read a Binary PropertyList
+ * @example example-read-03.php Read a PropertyList without knowing the type
+ * @example example-create-01.php Using the CFPropertyList API
+ * @example example-create-02.php Using {@link CFTypeDetector}
+ * @example example-create-03.php Using {@link CFTypeDetector} with {@link CFDate} and {@link CFData}
+ * @example example-modify-01.php Read, modify and save a PropertyList
+ */
+
+/**
+ * Require IOException, PListException, CFType and CFBinaryPropertyList
+ */
+require_once('IOException.php');
+require_once('PListException.php');
+require_once('CFType.php');
+require_once('CFBinaryPropertyList.php');
+require_once('CFTypeDetector.php');
+
+/**
+ * Property List
+ * Interface for handling reading, editing and saving Property Lists as defined by Apple.
+ * @author Rodney Rehm <rodney.rehm@medialize.de>
+ * @author Christian Kruse <cjk@wwwtech.de>
+ * @package plist
+ * @example example-read-01.php Read an XML PropertyList
+ * @example example-read-02.php Read a Binary PropertyList
+ * @example example-read-03.php Read a PropertyList without knowing the type
+ * @example example-create-01.php Using the CFPropertyList API
+ * @example example-create-02.php Using {@link CFTypeDetector}
+ * @example example-create-03.php Using {@link CFTypeDetector} with {@link CFDate} and {@link CFData}
+ * @example example-create-04.php Using and extended {@link CFTypeDetector}
+ */
+class CFPropertyList extends CFBinaryPropertyList implements Iterator {
+  /**
+   * Format constant for binary format
+   * @var integer
+   */
+  const FORMAT_BINARY = 1;
+
+  /**
+   * Format constant for xml format
+   * @var integer
+   */
+  const FORMAT_XML = 2;
+
+  /**
+   * Format constant for automatic format recognizing
+   * @var integer
+   */
+  const FORMAT_AUTO = 0;
+
+  /**
+   * Path of PropertyList
+   * @var string
+   */
+  protected $file = null;
+
+  /**
+   * Path of PropertyList
+   * @var integer
+   */
+  protected $format = null;
+
+  /**
+   * CFType nodes
+   * @var array
+   */
+  protected $value = array();
+
+  /**
+   * Position of iterator {@link http://php.net/manual/en/class.iterator.php}
+   * @var integer
+   */
+  protected $iteratorPosition = 0;
+
+  /**
+   * List of Keys for numerical iterator access {@link http://php.net/manual/en/class.iterator.php}
+   * @var array
+   */
+  protected $iteratorKeys = null;
+
+  /**
+   * List of NodeNames to ClassNames for resolving plist-files
+   * @var array
+   */
+  protected static $types = array(
+    'string' => 'CFString',
+    'real' => 'CFNumber',
+    'integer' => 'CFNumber',
+    'date' => 'CFDate',
+    'true' => 'CFBoolean',
+    'false' => 'CFBoolean',
+    'data' => 'CFData',
+    'array' => 'CFArray',
+    'dict' => 'CFDictionary'
+ );
+
+
+  /**
+   * Create new CFPropertyList.
+   * If a path to a PropertyList is specified, it is loaded automatically.
+   * @param string $file Path of PropertyList
+   * @param integer $format he format of the property list, see {@link FORMAT_XML}, {@link FORMAT_BINARY} and {@link FORMAT_AUTO}, defaults to {@link FORMAT_AUTO}
+   * @throws IOException if file could not be read by {@link load()}
+   * @uses $file for storing the current file, if specified
+   * @uses load() for loading the plist-file
+   */
+  public function __construct($file=null,$format=self::FORMAT_AUTO) {
+    $this->file = $file;
+    $this->format = $format;
+    if($this->file) $this->load();
+  }
+
+  /**
+   * Load an XML PropertyList.
+   * @param string $file Path of PropertyList, defaults to {@link $file}
+   * @return void
+   * @throws IOException if file could not be read
+   * @throws DOMException if XML-file could not be read properly
+   * @uses load() to actually load the file
+   */
+  public function loadXML($file=null) {
+    $this->load($file,CFPropertyList::FORMAT_XML);
+  }
+
+  /**
+   * Load an XML PropertyList.
+   * @param resource $stream A stream containing the xml document.
+   * @return void
+   * @throws IOException if stream could not be read
+   * @throws DOMException if XML-stream could not be read properly
+   */
+  public function loadXMLStream($stream) {
+    if(($contents = stream_get_contents($stream)) === FALSE) throw IOException::notReadable('<stream>');
+    $this->parse($content,CFPropertyList::FORMAT_XML);
+  }
+
+  /**
+   * Load an binary PropertyList.
+   * @param string $file Path of PropertyList, defaults to {@link $file}
+   * @return void
+   * @throws IOException if file could not be read
+   * @throws PListException if binary plist-file could not be read properly
+   * @uses load() to actually load the file
+   */
+  public function loadBinary($file=null) {
+    $this->load($file,CFPropertyList::FORMAT_BINARY);
+  }
+
+  /**
+   * Load an binary PropertyList.
+   * @param stream $stream Stream containing the PropertyList
+   * @return void
+   * @throws IOException if file could not be read
+   * @throws PListException if binary plist-file could not be read properly
+   * @uses parse() to actually load the file
+   */
+  public function loadBinaryStream($stream) {
+    if(($contents = stream_get_contents($stream)) === FALSE) throw IOException::notReadable('<stream>');
+    $this->parse($content,CFPropertyList::FORMAT_BINARY);
+  }
+
+  /**
+   * Load a plist file.
+   * Load and import a plist file.
+   * @param string $file Path of PropertyList, defaults to {@link $file}
+   * @param integer $format The format of the property list, see {@link FORMAT_XML}, {@link FORMAT_BINARY} and {@link FORMAT_AUTO}, defaults to {@link $format}
+   * @return void
+   * @throws PListException if file format version is not 00
+   * @throws IOException if file could not be read
+   * @throws DOMException if plist file could not be parsed properly
+   * @uses $file if argument $file was not specified
+   * @uses $value reset to empty array
+   * @uses import() for importing the values
+   */
+  public function load($file=null,$format=null) {
+    $file = $file ? $file : $this->file;
+    $format = $format !== null ? $format : $this->format;
+    $this->value = array();
+
+    if(!is_readable($file)) throw IOException::notReadable($file);
+
+    switch($format) {
+      case CFPropertyList::FORMAT_BINARY:
+        $this->readBinary($file);
+        break;
+      case CFPropertyList::FORMAT_AUTO: // what we now do is ugly, but neccessary to recognize the file format
+        $fd = fopen($file,"rb");
+        if(($magic_number = fread($fd,8)) === false) throw IOException::notReadable($file);
+        fclose($fd);
+
+        $filetype = substr($magic_number,0,6);
+        $version  = substr($magic_number,-2);
+
+        if($filetype == "bplist") {
+          if($version != "00") throw new PListException("Wrong file format version! Expected 00, got $version!");
+          $this->readBinary($file);
+          break;
+        }
+        // else: xml format, break not neccessary
+      case CFPropertyList::FORMAT_XML:
+        $doc = new DOMDocument();
+        if(!$doc->load($file)) throw new DOMException();
+        $this->import($doc->documentElement, $this);
+        break;
+    }
+  }
+
+  /**
+   * Parse a plist string.
+   * Parse and import a plist string.
+   * @param string $str String containing the PropertyList, defaults to {@link $content}
+   * @param integer $format The format of the property list, see {@link FORMAT_XML}, {@link FORMAT_BINARY} and {@link FORMAT_AUTO}, defaults to {@link $format}
+   * @return void
+   * @throws PListException if file format version is not 00
+   * @throws IOException if file could not be read
+   * @throws DOMException if plist file could not be parsed properly
+   * @uses $content if argument $str was not specified
+   * @uses $value reset to empty array
+   * @uses import() for importing the values
+   */
+  public function parse($str=NULL,$format=NULL) {
+    $format = $format !== null ? $format : $this->format;
+    $str = $str !== null ? $str : $this->content;
+    $this->value = array();
+
+    switch($format) {
+      case CFPropertyList::FORMAT_BINARY:
+        $this->parseBinary($str);
+        break;
+      case CFPropertyList::FORMAT_AUTO: // what we now do is ugly, but neccessary to recognize the file format
+        if(($magic_number = substr($str,0,8)) === false) throw IOException::notReadable("<string>");
+
+        $filetype = substr($magic_number,0,6);
+        $version  = substr($magic_number,-2);
+
+        if($filetype == "bplist") {
+          if($version != "00") throw new PListException("Wrong file format version! Expected 00, got $version!");
+          $this->parseBinary($str);
+          break;
+        }
+        // else: xml format, break not neccessary
+      case CFPropertyList::FORMAT_XML:
+        $doc = new DOMDocument();
+        if(!$doc->loadXML($str)) throw new DOMException();
+        $this->import($doc->documentElement, $this);
+        break;
+    }
+  }
+
+  /**
+   * Convert a DOMNode into a CFType.
+   * @param DOMNode $node Node to import children of
+   * @param CFDictionary|CFArray|CFPropertyList $parent
+   * @return void
+   */
+  protected function import(DOMNode $node, $parent) {
+    // abort if there are no children
+    if(!$node->childNodes->length) return;
+
+    foreach($node->childNodes as $n) {
+      // skip if we can't handle the element
+      if(!isset(self::$types[$n->nodeName])) continue;
+
+      $class = self::$types[$n->nodeName];
+      $key = null;
+
+      // find previous <key> if possible
+      $ps = $n->previousSibling;
+      while($ps && $ps->nodeName == '#text' && $ps->previousSibling) $ps = $ps->previousSibling;
+
+      // read <key> if possible
+      if($ps && $ps->nodeName == 'key') $key = $ps->firstChild->nodeValue;
+
+      switch($n->nodeName) {
+        case 'date':
+          $value = new $class(CFDate::dateValue($n->nodeValue));
+          break;
+        case 'data':
+          $value = new $class($n->nodeValue,true);
+          break;
+        case 'string':
+          $value = new $class($n->nodeValue);
+          break;
+
+        case 'real':
+        case 'integer':
+          $value = new $class($n->nodeName == 'real' ? floatval($n->nodeValue) : intval($n->nodeValue));
+          break;
+
+        case 'true':
+        case 'false':
+          $value = new $class($n->nodeName == 'true');
+          break;
+
+        case 'array':
+        case 'dict':
+          $value = new $class();
+          $this->import($n, $value);
+          break;
+      }
+
+      // Dictionaries need a key
+      if($parent instanceof CFDictionary) $parent->add($key, $value);
+      // others don't
+      else $parent->add($value);
+    }
+  }
+
+  /**
+   * Convert CFPropertyList to XML and save to file.
+   * @param string $file Path of PropertyList, defaults to {@link $file}
+   * @return void
+   * @throws IOException if file could not be read
+   * @uses $file if $file was not specified
+   */
+  public function saveXML($file) {
+    $this->save($file,CFPropertyList::FORMAT_XML);
+  }
+
+  /**
+   * Convert CFPropertyList to binary format (bplist00) and save to file.
+   * @param string $file Path of PropertyList, defaults to {@link $file}
+   * @return void
+   * @throws IOException if file could not be read
+   * @uses $file if $file was not specified
+   */
+  public function saveBinary($file) {
+    $this->save($file,CFPropertyList::FORMAT_BINARY);
+  }
+
+  /**
+   * Convert CFPropertyList to XML or binary and save to file.
+   * @param string $file Path of PropertyList, defaults to {@link $file}
+   * @param string $format Format of PropertyList, defaults to {@link $format}
+   * @return void
+   * @throws IOException if file could not be read
+   * @throws PListException if evaluated $format is neither {@link FORMAT_XML} nor {@link FORMAL_BINARY}
+   * @uses $file if $file was not specified
+   * @uses $format if $format was not specified
+   */
+  public function save($file=null,$format=null) {
+    $file = $file ? $file : $this->file;
+    $format = $format ? $format : $this->format;
+
+    if( !in_array( $format, array( self::FORMAT_BINARY, self::FORMAT_XML ) ) )
+      throw new PListException( "format {$format} is not supported, use CFPropertyList::FORMAT_BINARY or CFPropertyList::FORMAT_XML" );
+
+    if(!file_exists($file)) {
+      // dirname("file.xml") == "" and is treated as the current working directory
+      if(!is_writable(dirname($file))) throw IOException::notWritable($file);
+    }
+    else if(!is_writable($file)) throw IOException::notWritable($file);
+
+    $content = $format == self::FORMAT_BINARY ? $this->toBinary() : $this->toXML();
+
+    $fh = fopen($file, 'wb');
+    fwrite($fh,$content);
+    fclose($fh);
+  }
+
+  /**
+   * Convert CFPropertyList to XML
+   * @param bool $formatted Print plist formatted (i.e. with newlines and whitespace indention) if true; defaults to false
+   * @return string The XML content
+   */
+  public function toXML($formatted=false) {
+    $domimpl = new DOMImplementation();
+    // <!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+    $dtd = $domimpl->createDocumentType('plist', '-//Apple Computer//DTD PLIST 1.0//EN', 'http://www.apple.com/DTDs/PropertyList-1.0.dtd');
+    $doc = $domimpl->createDocument(null, "plist", $dtd);
+    $doc->encoding = "UTF-8";
+
+    // format output
+    if($formatted) {
+      $doc->formatOutput = true;
+      $doc->preserveWhiteSpace = true;
+    }
+
+    // get documentElement and set attribs
+    $plist = $doc->documentElement;
+    $plist->setAttribute('version', '1.0');
+
+    // add PropertyList's children
+    $plist->appendChild($this->getValue(true)->toXML($doc));
+
+    return $doc->saveXML();
+  }
+
+
+  /************************************************************************************************
+   *    M A N I P U L A T I O N
+   ************************************************************************************************/
+
+  /**
+   * Add CFType to collection.
+   * @param CFType $value CFType to add to collection
+   * @return void
+   * @uses $value for adding $value
+   */
+  public function add(CFType $value=null) {
+    // anything but CFType is null, null is an empty string - sad but true
+    if( !$value )
+      $value = new CFString();
+
+    $this->value[] = $value;
+  }
+
+  /**
+   * Get CFType from collection.
+   * @param integer $key Key of CFType to retrieve from collection
+   * @return CFType CFType found at $key, null else
+   * @uses $value for retrieving CFType of $key
+   */
+  public function get($key) {
+    if(isset($this->value[$key])) return $this->value[$key];
+    return null;
+  }
+
+  /**
+   * Generic getter (magic)
+   *
+   * @param integer $key Key of CFType to retrieve from collection
+   * @return CFType CFType found at $key, null else
+   * @author Sean Coates <sean@php.net>
+   * @link http://php.net/oop5.overloading
+   */
+  public function __get($key) {
+    return $this->get($key);
+  }
+
+  /**
+   * Remove CFType from collection.
+   * @param integer $key Key of CFType to removes from collection
+   * @return CFType removed CFType, null else
+   * @uses $value for removing CFType of $key
+   */
+  public function del($key) {
+    if(isset($this->value[$key])) {
+      $t = $this->value[$key];
+      unset($this->value[$key]);
+      return $t;
+    }
+
+    return null;
+  }
+
+  /**
+   * Empty the collection
+   * @return array the removed CFTypes
+   * @uses $value for removing CFType of $key
+   */
+  public function purge() {
+    $t = $this->value;
+    $this->value = array();
+    return $t;
+  }
+
+  /**
+   * Get first (and only) child, or complete collection.
+   * @param string $cftype if set to true returned value will be CFArray instead of an array in case of a collection
+   * @return CFType|array CFType or list of CFTypes known to the PropertyList
+   * @uses $value for retrieving CFTypes
+   */
+  public function getValue($cftype=false) {
+    if(count($this->value) === 1) {
+      $t = array_values( $this->value );
+      return $t[0];
+	}
+    if($cftype) {
+      $t = new CFArray();
+      foreach( $this->value as $value ) {
+        if( $value instanceof CFType ) $t->add($value);
+      }
+      return $t;
+    }
+    return $this->value;
+  }
+
+  /**
+   * Create CFType-structure from guessing the data-types.
+   * The functionality has been moved to the more flexible {@link CFTypeDetector} facility.
+   * @param mixed $value Value to convert to CFType
+   * @param boolean $autoDictionary if true {@link CFArray}-detection is bypassed and arrays will be returned as {@link CFDictionary}.
+   * @return CFType CFType based on guessed type
+   * @uses CFTypeDetector for actual type detection
+   * @deprecated
+   */
+  public static function guess($value, $autoDictionary=false) {
+    static $t = null;
+    if( $t === null )
+      $t = new CFTypeDetector( $autoDictionary );
+
+    return $t->toCFType( $value );
+  }
+
+
+  /************************************************************************************************
+   *    S E R I A L I Z I N G
+   ************************************************************************************************/
+
+  /**
+   * Get PropertyList as array.
+   * @return mixed primitive value of first (and only) CFType, or array of primitive values of collection
+   * @uses $value for retrieving CFTypes
+   */
+  public function toArray() {
+    $a = array();
+    foreach($this->value as $value) $a[] = $value->toArray();
+    if(count($a) === 1) return $a[0];
+
+    return $a;
+  }
+
+
+  /************************************************************************************************
+   *    I T E R A T O R   I N T E R F A C E
+   ************************************************************************************************/
+
+  /**
+   * Rewind {@link $iteratorPosition} to first position (being 0)
+   * @link http://php.net/manual/en/iterator.rewind.php
+   * @return void
+   * @uses $iteratorPosition set to 0
+   * @uses $iteratorKeys store keys of {@link $value}
+   */
+  public function rewind() {
+    $this->iteratorPosition = 0;
+    $this->iteratorKeys = array_keys($this->value);
+  }
+
+  /**
+   * Get Iterator's current {@link CFType} identified by {@link $iteratorPosition}
+   * @link http://php.net/manual/en/iterator.current.php
+   * @return CFType current Item
+   * @uses $iteratorPosition identify current key
+   * @uses $iteratorKeys identify current value
+   */
+  public function current() {
+    return $this->value[$this->iteratorKeys[$this->iteratorPosition]];
+  }
+
+  /**
+   * Get Iterator's current key identified by {@link $iteratorPosition}
+   * @link http://php.net/manual/en/iterator.key.php
+   * @return string key of the current Item
+   * @uses $iteratorPosition identify current key
+   * @uses $iteratorKeys identify current value
+   */
+  public function key() {
+    return $this->iteratorKeys[$this->iteratorPosition];
+  }
+
+  /**
+   * Increment {@link $iteratorPosition} to address next {@see CFType}
+   * @link http://php.net/manual/en/iterator.next.php
+   * @return void
+   * @uses $iteratorPosition increment by 1
+   */
+  public function next() {
+    $this->iteratorPosition++;
+  }
+
+  /**
+   * Test if {@link $iteratorPosition} addresses a valid element of {@link $value}
+   * @link http://php.net/manual/en/iterator.valid.php
+   * @return boolean true if current position is valid, false else
+   * @uses $iteratorPosition test if within {@link $iteratorKeys}
+   * @uses $iteratorPosition test if within {@link $value}
+   */
+  public function valid() {
+    return isset($this->iteratorKeys[$this->iteratorPosition]) && isset($this->value[$this->iteratorKeys[$this->iteratorPosition]]);
+  }
+
+}
+
+
+?>
\ No newline at end of file
diff --git a/restler/plistformat/CFType.php b/restler/plistformat/CFType.php
new file mode 100644
index 000000000..246c22177
--- /dev/null
+++ b/restler/plistformat/CFType.php
@@ -0,0 +1,742 @@
+<?php
+/**
+ * Data-Types for CFPropertyList as defined by Apple.
+ * {@link http://developer.apple.com/documentation/Darwin/Reference/ManPages/man5/plist.5.html Property Lists}
+ * @author Rodney Rehm <rodney.rehm@medialize.de>
+ * @author Christian Kruse <cjk@wwwtech.de>
+ * @package plist
+ * @subpackage plist.types
+ * @version $Id$
+ */
+
+/**
+ * Base-Class of all CFTypes used by CFPropertyList 
+ * @author Rodney Rehm <rodney.rehm@medialize.de>
+ * @author Christian Kruse <cjk@wwwtech.de>
+ * @package plist
+ * @subpackage plist.types
+ * @version $Id$
+ * @example example-create-01.php Using the CFPropertyList API
+ * @example example-create-02.php Using CFPropertyList::guess()
+ * @example example-create-03.php Using CFPropertyList::guess() with {@link CFDate} and {@link CFData}
+ */
+abstract class CFType {
+  /**
+   * CFType nodes
+   * @var array
+   */
+  protected $value = null;
+
+  /**
+   * Create new CFType.
+   * @param mixed $value Value of CFType
+   */
+  public function __construct($value=null) {
+    $this->setValue($value);
+  }
+
+  /************************************************************************************************
+   *    M A G I C   P R O P E R T I E S
+   ************************************************************************************************/
+  
+  /**
+   * Get the CFType's value
+   * @return mixed CFType's value
+   */
+  public function getValue() {
+    return $this->value;
+  }
+
+  /**
+   * Set the CFType's value
+   * @return void
+   */
+  public function setValue($value) {
+    $this->value = $value;
+  }
+
+  /************************************************************************************************
+   *    S E R I A L I Z I N G
+   ************************************************************************************************/
+
+  /**
+   * Get XML-Node.
+   * @param DOMDocument $doc DOMDocument to create DOMNode in
+   * @param string $nodeName Name of element to create
+   * @return DOMNode Node created based on CType
+   * @uses $value as nodeValue
+   */
+  public function toXML(DOMDocument $doc, $nodeName) {
+    $text = $doc->createTextNode($this->value);
+    $node = $doc->createElement($nodeName);
+    $node->appendChild($text);
+    return $node;
+  }
+
+  /**
+   * convert value to binary representation
+   * @param CFBinaryPropertyList The binary property list object
+   * @return The offset in the object table
+   */
+  public abstract function toBinary(CFBinaryPropertyList &$bplist);
+
+  /**
+   * Get CFType's value.
+   * @return mixed primitive value
+   * @uses $value for retrieving primitive of CFType
+   */
+  public function toArray() {
+    return $this->getValue();
+  }
+
+}
+
+/**
+ * String Type of CFPropertyList
+ * @author Rodney Rehm <rodney.rehm@medialize.de>
+ * @author Christian Kruse <cjk@wwwtech.de>
+ * @package plist
+ * @subpackage plist.types
+ */
+class CFString extends CFType {
+  /**
+   * Get XML-Node.
+   * @param DOMDocument $doc DOMDocument to create DOMNode in
+   * @param string $nodeName For compatibility reasons; just ignore it
+   * @return DOMNode &lt;string&gt;-Element
+   */
+  public function toXML(DOMDocument $doc,$nodeName="") {
+    return parent::toXML($doc, 'string');
+  }
+
+  /**
+   * convert value to binary representation
+   * @param CFBinaryPropertyList The binary property list object
+   * @return The offset in the object table
+   */
+  public function toBinary(CFBinaryPropertyList &$bplist) {
+    return $bplist->stringToBinary($this->value);
+  }
+}
+
+/**
+ * Number Type of CFPropertyList
+ * @author Rodney Rehm <rodney.rehm@medialize.de>
+ * @author Christian Kruse <cjk@wwwtech.de>
+ * @package plist
+ * @subpackage plist.types
+ */
+class CFNumber extends CFType {
+  /**
+   * Get XML-Node.
+   * Returns &lt;real&gt; if $value is a float, &lt;integer&gt; if $value is an integer.
+   * @param DOMDocument $doc DOMDocument to create DOMNode in
+   * @param string $nodeName For compatibility reasons; just ignore it
+   * @return DOMNode &lt;real&gt; or &lt;integer&gt;-Element 
+   */
+  public function toXML(DOMDocument $doc,$nodeName="") {
+    $ret = 'real';
+    if(intval($this->value) == $this->value && !is_float($this->value) && strpos($this->value,'.') === false) {
+      $this->value = intval($this->value);
+      $ret = 'integer';
+    }
+    return parent::toXML($doc, $ret);
+  }
+
+  /**
+   * convert value to binary representation
+   * @param CFBinaryPropertyList The binary property list object
+   * @return The offset in the object table
+   */
+  public function toBinary(CFBinaryPropertyList &$bplist) {
+    return $bplist->numToBinary($this->value);
+  }
+}
+
+/**
+ * Date Type of CFPropertyList
+ * Note: CFDate uses Unix timestamp (epoch) to store dates internally
+ * @author Rodney Rehm <rodney.rehm@medialize.de>
+ * @author Christian Kruse <cjk@wwwtech.de>
+ * @package plist
+ * @subpackage plist.types
+ */
+class CFDate extends CFType {
+  const TIMESTAMP_APPLE = 0;
+  const TIMESTAMP_UNIX  = 1;
+  const DATE_DIFF_APPLE_UNIX = 978307200;
+
+  /**
+   * Create new Date CFType.
+   * @param integer $value timestamp to set
+   * @param integer $format format the timestamp is specified in, use {@link TIMESTAMP_APPLE} or {@link TIMESTAMP_UNIX}, defaults to {@link TIMESTAMP_APPLE}
+   * @uses setValue() to convert the timestamp
+   */
+  function __construct($value,$format=CFDate::TIMESTAMP_UNIX) {
+    $this->setValue($value,$format);
+  }
+
+  /**
+   * Set the Date CFType's value.
+   * @param integer $value timestamp to set
+   * @param integer $format format the timestamp is specified in, use {@link TIMESTAMP_APPLE} or {@link TIMESTAMP_UNIX}, defaults to {@link TIMESTAMP_UNIX}
+   * @return void
+   * @uses TIMESTAMP_APPLE to determine timestamp type
+   * @uses TIMESTAMP_UNIX to determine timestamp type
+   * @uses DATE_DIFF_APPLE_UNIX to convert Apple-timestamp to Unix-timestamp
+   */
+  function setValue($value,$format=CFDate::TIMESTAMP_UNIX) {
+    if($format == CFDate::TIMESTAMP_UNIX) $this->value = $value;
+    else $this->value = $value + CFDate::DATE_DIFF_APPLE_UNIX;
+  }
+  
+  /**
+   * Get the Date CFType's value.
+   * @param integer $format format the timestamp is specified in, use {@link TIMESTAMP_APPLE} or {@link TIMESTAMP_UNIX}, defaults to {@link TIMESTAMP_UNIX}
+   * @return integer Unix timestamp
+   * @uses TIMESTAMP_APPLE to determine timestamp type
+   * @uses TIMESTAMP_UNIX to determine timestamp type
+   * @uses DATE_DIFF_APPLE_UNIX to convert Unix-timestamp to Apple-timestamp
+   */
+  function getValue($format=CFDate::TIMESTAMP_UNIX) {
+    if($format == CFDate::TIMESTAMP_UNIX) return $this->value;
+    else return $this->value - CFDate::DATE_DIFF_APPLE_UNIX;
+  }
+
+  /**
+   * Get XML-Node.
+   * @param DOMDocument $doc DOMDocument to create DOMNode in
+   * @param string $nodeName For compatibility reasons; just ignore it
+   * @return DOMNode &lt;date&gt;-Element
+   */
+  public function toXML(DOMDocument $doc,$nodeName="") {
+    $text = $doc->createTextNode(gmdate("Y-m-d\TH:i:s\Z",$this->getValue()));
+    $node = $doc->createElement("date");
+    $node->appendChild($text);
+    return $node;
+  }
+
+  /**
+   * convert value to binary representation
+   * @param CFBinaryPropertyList The binary property list object
+   * @return The offset in the object table
+   */
+  public function toBinary(CFBinaryPropertyList &$bplist) {
+    return $bplist->dateToBinary($this->value);
+  }
+  
+  /**
+   * Create a UNIX timestamp from a PList date string
+   * @param string $val The date string (e.g. "2009-05-13T20:23:43Z")
+   * @return integer The UNIX timestamp
+   * @throws PListException when encountering an unknown date string format
+   */
+  public static function dateValue($val) {
+    //2009-05-13T20:23:43Z
+    if(!preg_match('/^(\d{4})-(\d{2})-(\d{2})T(\d{2}):(\d{2}):(\d{2})Z/',$val,$matches)) throw new PListException("Unknown date format: $val");
+    return gmmktime($matches[4],$matches[5],$matches[6],$matches[2],$matches[3],$matches[1]);
+  }
+}
+
+/**
+ * Boolean Type of CFPropertyList
+ * @author Rodney Rehm <rodney.rehm@medialize.de>
+ * @author Christian Kruse <cjk@wwwtech.de>
+ * @package plist
+ * @subpackage plist.types
+ */
+class CFBoolean extends CFType {
+  /**
+   * Get XML-Node.
+   * Returns &lt;true&gt; if $value is a true, &lt;false&gt; if $value is false.
+   * @param DOMDocument $doc DOMDocument to create DOMNode in
+   * @param string $nodeName For compatibility reasons; just ignore it
+   * @return DOMNode &lt;true&gt; or &lt;false&gt;-Element 
+   */
+  public function toXML(DOMDocument $doc,$nodeName="") {
+    return $doc->createElement($this->value ? 'true' : 'false');
+  }
+
+  /**
+   * convert value to binary representation
+   * @param CFBinaryPropertyList The binary property list object
+   * @return The offset in the object table
+   */
+  public function toBinary(CFBinaryPropertyList &$bplist) {
+    return $bplist->boolToBinary($this->value);
+  }
+
+}
+
+/**
+ * Data Type of CFPropertyList
+ * Note: Binary data is base64-encoded.
+ * @author Rodney Rehm <rodney.rehm@medialize.de>
+ * @author Christian Kruse <cjk@wwwtech.de>
+ * @package plist
+ * @subpackage plist.types
+ */
+class CFData extends CFType {
+  /**
+   * Create new Data CFType
+   * @param string $value data to be contained by new object
+   * @param boolean $already_coded if true $value will not be base64-encoded, defaults to false
+   */
+  public function __construct($value=null,$already_coded=false) {
+    if($already_coded) $this->value = $value;
+    else $this->setValue($value);
+  }
+
+  /**
+   * Set the CFType's value and base64-encode it.
+   * <b>Note:</b> looks like base64_encode has troubles with UTF-8 encoded strings
+   * @return void
+   */
+  public function setValue($value) {
+    //if(function_exists('mb_check_encoding') && mb_check_encoding($value, 'UTF-8')) $value = utf8_decode($value);
+    $this->value = base64_encode($value);
+  }
+
+  /**
+   * Get base64 encoded data
+   * @return string The base64 encoded data value
+   */
+  public function getCodedValue() {
+    return $this->value;
+  }
+
+  /**
+   * Get the base64-decoded CFType's value.
+   * @return mixed CFType's value
+   */
+  public function getValue() {
+    return base64_decode($this->value);
+  }
+
+  /**
+   * Get XML-Node.
+   * @param DOMDocument $doc DOMDocument to create DOMNode in
+   * @param string $nodeName For compatibility reasons; just ignore it
+   * @return DOMNode &lt;data&gt;-Element
+   */
+  public function toXML(DOMDocument $doc,$nodeName="") {
+    return parent::toXML($doc, 'data');
+  }
+
+  /**
+   * convert value to binary representation
+   * @param CFBinaryPropertyList The binary property list object
+   * @return The offset in the object table
+   */
+  public function toBinary(CFBinaryPropertyList &$bplist) {
+    return $bplist->dataToBinary($this->getValue());
+  }
+}
+
+/**
+ * Array Type of CFPropertyList
+ * @author Rodney Rehm <rodney.rehm@medialize.de>
+ * @author Christian Kruse <cjk@wwwtech.de>
+ * @package plist
+ * @subpackage plist.types
+ */
+class CFArray extends CFType implements Iterator, ArrayAccess {
+  /**
+   * Position of iterator {@link http://php.net/manual/en/class.iterator.php}
+   * @var integer
+   */
+  protected $iteratorPosition = 0;
+
+
+  /**
+   * Create new CFType.
+   * @param array $value Value of CFType
+   */
+  public function __construct($value=array()) {
+    $this->value = $value;
+  }
+
+  /**
+   * Set the CFType's value
+   * <b>Note:</b> this dummy does nothing
+   * @return void
+   */
+  public function setValue($value) {
+  }
+
+  /**
+   * Add CFType to collection.
+   * @param CFType $value CFType to add to collection, defaults to null which results in an empty {@link CFString}
+   * @return void
+   * @uses $value for adding $value
+   */
+  public function add(CFType $value=null) {
+    // anything but CFType is null, null is an empty string - sad but true
+    if( !$value )
+      $value = new CFString();
+
+    $this->value[] = $value;
+  }
+
+  /**
+   * Get CFType from collection.
+   * @param integer $key Key of CFType to retrieve from collection
+   * @return CFType CFType found at $key, null else
+   * @uses $value for retrieving CFType of $key
+   */
+  public function get($key) {
+    if(isset($this->value[$key])) return $this->value[$key];
+    return null;
+  }
+
+  /**
+   * Remove CFType from collection.
+   * @param integer $key Key of CFType to removes from collection
+   * @return CFType removed CFType, null else
+   * @uses $value for removing CFType of $key
+   */
+  public function del($key) {
+    if(isset($this->value[$key])) unset($this->value[$key]);
+  }
+
+
+  /************************************************************************************************
+   *    S E R I A L I Z I N G
+   ************************************************************************************************/
+
+  /**
+   * Get XML-Node.
+   * @param DOMDocument $doc DOMDocument to create DOMNode in
+   * @param string $nodeName For compatibility reasons; just ignore it
+   * @return DOMNode &lt;array&gt;-Element
+   */
+  public function toXML(DOMDocument $doc,$nodeName="") {
+    $node = $doc->createElement('array');
+
+    foreach($this->value as $value) $node->appendChild($value->toXML($doc));
+    return $node;
+  }
+
+  /**
+   * convert value to binary representation
+   * @param CFBinaryPropertyList The binary property list object
+   * @return The offset in the object table
+   */
+  public function toBinary(CFBinaryPropertyList &$bplist) {
+    return $bplist->arrayToBinary($this);
+  }
+
+  /**
+   * Get CFType's value.
+   * @return array primitive value
+   * @uses $value for retrieving primitive of CFType
+   */
+  public function toArray() {
+    $a = array();
+    foreach($this->value as $value) $a[] = $value->toArray();
+    return $a;
+  }
+
+
+  /************************************************************************************************
+   *    I T E R A T O R   I N T E R F A C E
+   ************************************************************************************************/
+
+  /**
+   * Rewind {@link $iteratorPosition} to first position (being 0)
+   * @link http://php.net/manual/en/iterator.rewind.php
+   * @return void
+   * @uses $iteratorPosition set to 0
+   */
+  public function rewind() {
+    $this->iteratorPosition = 0;
+  }
+
+  /**
+   * Get Iterator's current {@link CFType} identified by {@link $iteratorPosition}
+   * @link http://php.net/manual/en/iterator.current.php
+   * @return CFType current Item
+   * @uses $iteratorPosition identify current key
+   */
+  public function current() {
+    return $this->value[$this->iteratorPosition];
+  }
+
+  /**
+   * Get Iterator's current key identified by {@link $iteratorPosition}
+   * @link http://php.net/manual/en/iterator.key.php
+   * @return string key of the current Item
+   * @uses $iteratorPosition identify current key
+   */
+  public function key() {
+    return $this->iteratorPosition;
+  }
+
+  /**
+   * Increment {@link $iteratorPosition} to address next {@see CFType}
+   * @link http://php.net/manual/en/iterator.next.php
+   * @return void
+   * @uses $iteratorPosition increment by 1
+   */
+  public function next() {
+    $this->iteratorPosition++;
+  }
+
+  /**
+   * Test if {@link $iteratorPosition} addresses a valid element of {@link $value}
+   * @link http://php.net/manual/en/iterator.valid.php
+   * @return boolean true if current position is valid, false else
+   * @uses $iteratorPosition test if within {@link $iteratorKeys}
+   * @uses $iteratorPosition test if within {@link $value}
+   */
+  public function valid() {
+    return isset($this->value[$this->iteratorPosition]);
+  }
+
+  /************************************************************************************************
+   *    ArrayAccess   I N T E R F A C E
+   ************************************************************************************************/
+  
+  /**
+   * Determine if the array's key exists
+   * @param string $key the key to check
+   * @return bool true if the offset exists, false if not
+   * @link http://php.net/manual/en/arrayaccess.offsetexists.php
+   * @uses $value to check if $key exists
+   * @author Sean Coates <sean@php.net>
+   */
+  public function offsetExists($key) {
+    return isset($this->value[$key]);
+  }
+  
+  /**
+   * Fetch a specific key from the CFArray
+   * @param string $key the key to check
+   * @return mixed the value associated with the key; null if the key is not found
+   * @link http://php.net/manual/en/arrayaccess.offsetget.php
+   * @uses get() to get the key's value
+   * @author Sean Coates <sean@php.net>
+   */
+  public function offsetGet($key) {
+    return $this->get($key);
+  }
+  
+  /**
+   * Set a value in the array
+   * @param string $key the key to set
+   * @param string $value the value to set
+   * @return void
+   * @link http://php.net/manual/en/arrayaccess.offsetset.php
+   * @uses setValue() to set the key's new value
+   * @author Sean Coates <sean@php.net>
+   */
+  public function offsetSet($key, $value) {
+    return $this->setValue($value);
+  }
+  
+  /**
+   * Unsets a value in the array
+   * <b>Note:</b> this dummy does nothing
+   * @param string $key the key to set
+   * @return void
+   * @link http://php.net/manual/en/arrayaccess.offsetunset.php
+   * @author Sean Coates <sean@php.net>
+   */
+  public function offsetUnset($key) {
+    
+  }
+  
+  
+}
+
+/**
+ * Array Type of CFPropertyList
+ * @author Rodney Rehm <rodney.rehm@medialize.de>
+ * @author Christian Kruse <cjk@wwwtech.de>
+ * @package plist
+ * @subpackage plist.types
+ */
+class CFDictionary extends CFType implements Iterator {
+  /**
+   * Position of iterator {@link http://php.net/manual/en/class.iterator.php}
+   * @var integer
+   */
+  protected $iteratorPosition = 0;
+
+  /**
+   * List of Keys for numerical iterator access {@link http://php.net/manual/en/class.iterator.php}
+   * @var array
+   */
+  protected $iteratorKeys = null;
+
+
+  /**
+   * Create new CFType.
+   * @param array $value Value of CFType
+   */
+  public function __construct($value=array()) {
+    $this->value = $value;
+  }
+
+  /**
+   * Set the CFType's value
+   * <b>Note:</b> this dummy does nothing
+   * @return void
+   */
+  public function setValue($value) {
+  }
+
+  /**
+   * Add CFType to collection.
+   * @param string $key Key to add to collection
+   * @param CFType $value CFType to add to collection, defaults to null which results in an empty {@link CFString}
+   * @return void
+   * @uses $value for adding $key $value pair
+   */
+  public function add($key, CFType $value=null) {
+    // anything but CFType is null, null is an empty string - sad but true
+    if( !$value )
+      $value = new CFString();
+
+    $this->value[$key] = $value;
+  }
+
+  /**
+   * Get CFType from collection.
+   * @param string $key Key of CFType to retrieve from collection
+   * @return CFType CFType found at $key, null else
+   * @uses $value for retrieving CFType of $key
+   */
+  public function get($key) {
+    if(isset($this->value[$key])) return $this->value[$key];
+    return null;
+  }
+
+  /**
+   * Generic getter (magic)
+   * @param integer $key Key of CFType to retrieve from collection
+   * @return CFType CFType found at $key, null else
+   * @link http://php.net/oop5.overloading
+   * @uses get() to retrieve the key's value
+   * @author Sean Coates <sean@php.net>
+   */
+  public function __get($key) {
+    return $this->get($key);
+  }
+
+  /**
+   * Remove CFType from collection.
+   * @param string $key Key of CFType to removes from collection
+   * @return CFType removed CFType, null else
+   * @uses $value for removing CFType of $key
+   */
+  public function del($key) {
+    if(isset($this->value[$key])) unset($this->value[$key]);
+  }
+
+
+  /************************************************************************************************
+   *    S E R I A L I Z I N G
+   ************************************************************************************************/
+
+  /**
+   * Get XML-Node.
+   * @param DOMDocument $doc DOMDocument to create DOMNode in
+   * @param string $nodeName For compatibility reasons; just ignore it
+   * @return DOMNode &lt;dict&gt;-Element
+   */
+  public function toXML(DOMDocument $doc,$nodeName="") {
+    $node = $doc->createElement('dict');
+
+    foreach($this->value as $key => $value) {
+      $node->appendChild($doc->createElement('key', $key));
+      $node->appendChild($value->toXML($doc));
+    }
+
+    return $node;
+  }
+
+  /**
+   * convert value to binary representation
+   * @param CFBinaryPropertyList The binary property list object
+   * @return The offset in the object table
+   */
+  public function toBinary(CFBinaryPropertyList &$bplist) {
+    return $bplist->dictToBinary($this);
+  }
+
+  /**
+   * Get CFType's value.
+   * @return array primitive value
+   * @uses $value for retrieving primitive of CFType
+   */
+  public function toArray() {
+    $a = array();
+
+    foreach($this->value as $key => $value) $a[$key] = $value->toArray();
+    return $a;
+  }
+
+
+  /************************************************************************************************
+   *    I T E R A T O R   I N T E R F A C E
+   ************************************************************************************************/
+
+  /**
+   * Rewind {@link $iteratorPosition} to first position (being 0)
+   * @link http://php.net/manual/en/iterator.rewind.php
+   * @return void
+   * @uses $iteratorPosition set to 0
+   * @uses $iteratorKeys store keys of {@link $value}
+   */
+  public function rewind() {
+    $this->iteratorPosition = 0;
+    $this->iteratorKeys = array_keys($this->value);
+  }
+
+  /**
+   * Get Iterator's current {@link CFType} identified by {@link $iteratorPosition}
+   * @link http://php.net/manual/en/iterator.current.php
+   * @return CFType current Item
+   * @uses $iteratorPosition identify current key
+   * @uses $iteratorKeys identify current value
+   */
+  public function current() {
+    return $this->value[$this->iteratorKeys[$this->iteratorPosition]];
+  }
+
+  /**
+   * Get Iterator's current key identified by {@link $iteratorPosition}
+   * @link http://php.net/manual/en/iterator.key.php
+   * @return string key of the current Item
+   * @uses $iteratorPosition identify current key
+   * @uses $iteratorKeys identify current value
+   */
+  public function key() {
+    return $this->iteratorKeys[$this->iteratorPosition];
+  }
+
+  /**
+   * Increment {@link $iteratorPosition} to address next {@see CFType}
+   * @link http://php.net/manual/en/iterator.next.php
+   * @return void
+   * @uses $iteratorPosition increment by 1
+   */
+  public function next() {
+    $this->iteratorPosition++;
+  }
+
+  /**
+   * Test if {@link $iteratorPosition} addresses a valid element of {@link $value}
+   * @link http://php.net/manual/en/iterator.valid.php
+   * @return boolean true if current position is valid, false else
+   * @uses $iteratorPosition test if within {@link $iteratorKeys}
+   * @uses $iteratorPosition test if within {@link $value}
+   */
+  public function valid() {
+    return isset($this->iteratorKeys[$this->iteratorPosition]) && isset($this->value[$this->iteratorKeys[$this->iteratorPosition]]);
+  }
+
+}
+
+?>
\ No newline at end of file
diff --git a/restler/plistformat/CFTypeDetector.php b/restler/plistformat/CFTypeDetector.php
new file mode 100644
index 000000000..996439326
--- /dev/null
+++ b/restler/plistformat/CFTypeDetector.php
@@ -0,0 +1,167 @@
+<?php
+
+ /**
+  * CFTypeDetector
+  * Interface for converting native PHP data structures to CFPropertyList objects.
+  * @author Rodney Rehm <rodney.rehm@medialize.de>
+  * @author Christian Kruse <cjk@wwwtech.de>
+  * @package plist
+  * @subpackage plist.types
+  * @example example-create-02.php Using {@link CFTypeDetector}
+  * @example example-create-03.php Using {@link CFTypeDetector} with {@link CFDate} and {@link CFData}
+  * @example example-create-04.php Using and extended {@link CFTypeDetector}
+  */
+class CFTypeDetector {
+  
+  /**
+   * flag stating if all arrays should automatically be converted to {@link CFDictionary}
+   * @var boolean
+   */
+  protected $autoDictionary = false;
+  
+  /**
+   * flag stating if exceptions should be suppressed or thrown
+   * @var boolean
+   */
+  protected $suppressExceptions = false;
+
+  /**
+   * name of a method that will be used for array to object conversations
+   * @var boolean
+   */
+  protected $objectToArrayMethod = false;
+
+
+  /**
+   * Create new CFTypeDetector
+   * @param boolean $autoDicitionary if set to true all arrays will be converted to {@link CFDictionary}
+   * @param boolean $suppressExceptions if set to true toCFType() will not throw any exceptions
+   * @param boolean $objectToArrayMethod if non-null, this method will be called on objects (if possible) to convert the object to an array
+   */
+  public function __construct($autoDicitionary=false,$suppressExceptions=false,$objectToArrayMethod=null) {
+    $this->autoDicitionary = $autoDicitionary;
+    $this->suppressExceptions = $suppressExceptions;
+    $this->objectToArrayMethod = $objectToArrayMethod;
+  }
+  
+  /**
+   * Determine if an array is associative or numerical.
+   * Numerical Arrays have incrementing index-numbers that don't contain gaps.
+   * @param array $value Array to check indexes of
+   * @return boolean true if array is associative, false if array has numeric indexes
+   */
+  protected function isAssociativeArray($value) {
+    $numericKeys = true;
+    $previousKey = null;
+    foreach($value as $key => $v) {
+      if(!is_numeric($key) || ($previousKey !== null && $previousKey != $key-1)) {
+        $numericKeys = false;
+        break;
+      }
+
+      $previousKey = $key;
+    }
+    return !$numericKeys;
+  }
+  
+  /**
+   * Get the default value
+   * @return CFType the default value to return if no suitable type could be determined
+   */
+  protected function defaultValue() {
+    return new CFString();
+  }
+  
+  /**
+   * Create CFType-structure by guessing the data-types.
+   * {@link CFArray}, {@link CFDictionary}, {@link CFBoolean}, {@link CFNumber} and {@link CFString} can be created, {@link CFDate} and {@link CFData} cannot.
+   * <br /><b>Note:</b>Distinguishing between {@link CFArray} and {@link CFDictionary} is done by examining the keys. 
+   * Keys must be strictly incrementing integers to evaluate to a {@link CFArray}. 
+   * Since PHP does not offer a function to test for associative arrays, 
+   * this test causes the input array to be walked twice and thus work rather slow on large collections. 
+   * If you work with large arrays and can live with all arrays evaluating to {@link CFDictionary}, 
+   * feel free to set the appropriate flag.
+   * <br /><b>Note:</b> If $value is an instance of CFType it is simply returned.
+   * <br /><b>Note:</b> If $value is neither a CFType, array, numeric, boolean nor string, it is omitted.
+   * @param mixed $value Value to convert to CFType
+   * @param boolean $autoDictionary if true {@link CFArray}-detection is bypassed and arrays will be returned as {@link CFDictionary}.
+   * @return CFType CFType based on guessed type
+   * @uses isAssociativeArray() to check if an array only has numeric indexes
+   */
+  public function toCFType($value) {
+    switch(true) {
+      case $value instanceof CFType:
+        return $value;
+      break;
+
+      case is_object($value):
+        // DateTime should be CFDate
+        if(class_exists( 'DateTime' ) && $value instanceof DateTime){
+          return new CFDate($value->getTimestamp());
+        }
+        
+        // convert possible objects to arrays, arrays will be arrays
+        if($this->objectToArrayMethod && is_callable(array($value, $this->objectToArrayMethod))){
+          $value = call_user_func( array( $value, $this->objectToArrayMethod ) );
+        }
+        
+        if(!is_array($value)){
+          if($this->suppressExceptions)
+            return $this->defaultValue();
+
+          throw new PListException('Could not determine CFType for object of type '. get_class($value));
+        }
+      /* break; omitted */
+
+      case $value instanceof Iterator:
+      case is_array($value):
+        // test if $value is simple or associative array
+        if(!$this->autoDictionary) {
+          if(!$this->isAssociativeArray($value)) {
+            $t = new CFArray();
+            foreach($value as $v) $t->add($this->toCFType($v));
+            return $t;
+          }
+        }
+
+        $t = new CFDictionary();
+        foreach($value as $k => $v) $t->add($k, $this->toCFType($v));
+
+        return $t;
+      break;
+
+      case is_numeric($value):
+        return new CFNumber($value);
+      break;
+
+      case is_bool($value):
+        return new CFBoolean($value);
+      break;
+
+      case is_string($value):
+        return new CFString($value);
+      break;
+
+      case is_null($value):
+        return new CFString();
+      break;
+
+      case is_resource($value):
+        if( $this->suppressExceptions )
+          return $this->defaultValue();
+
+        throw new PListException('Could not determine CFType for resource of type '. get_resource_type($value));
+      break;
+      
+      default:
+        if( $this->suppressExceptions )
+          return $this->defaultValue();
+
+        throw new PListException('Could not determine CFType for '. gettype($value));
+      break;
+    }
+  }
+
+}
+
+?>
\ No newline at end of file
diff --git a/restler/plistformat/IOException.php b/restler/plistformat/IOException.php
new file mode 100644
index 000000000..991855394
--- /dev/null
+++ b/restler/plistformat/IOException.php
@@ -0,0 +1,99 @@
+<?php
+/**
+ * CFPropertyList
+ * {@link http://developer.apple.com/documentation/Darwin/Reference/ManPages/man5/plist.5.html Property Lists}
+ * @author Rodney Rehm <rodney.rehm@medialize.de>
+ * @author Christian Kruse <cjk@wwwtech.de>
+ * @package plist
+ * @version $Id$
+ */
+
+/**
+ * Basic Input / Output Exception
+ * @author Rodney Rehm <rodney.rehm@medialize.de>
+ * @author Christian Kruse <cjk@wwwtech.de>
+ * @package plist
+ */
+class IOException extends Exception {
+  /**
+   * Flag telling the File could not be found
+   */
+  const NOT_FOUND = 1;
+  
+  /**
+   * Flag telling the File is not readable
+   */
+  const NOT_READABLE = 2;
+  
+  /**
+   * Flag telling the File is not writable
+   */
+  const NOT_WRITABLE = 3;
+
+  /**
+   * Flag telling there was a read error
+   */
+  const READ_ERROR = 4;
+
+  /**
+   * Flag telling there was a read error
+   */
+  const WRITE_ERROR = 5;
+
+  /**
+   * Create new IOException
+   * @param string $path Source of the problem
+   * @param integer $type Type of the problem
+   */
+  public function __construct($path, $type=null) {
+    parent::__construct( $path, $type );
+  }
+  
+  /**
+   * Create new FileNotFound-Exception
+   * @param string $path Source of the problem
+   * @return IOException new FileNotFound-Exception
+   */
+  public static function notFound($path) {
+    return new IOException( $path, self::NOT_FOUND );
+  }
+
+  /**
+   * Create new FileNotReadable-Exception
+   * @param string $path Source of the problem
+   * @return IOException new FileNotReadable-Exception
+   */
+  public static function notReadable($path) {
+    return new IOException( $path, self::NOT_READABLE );
+  }
+
+  /**
+   * Create new FileNotWritable-Exception
+   * @param string $path Source of the problem
+   * @return IOException new FileNotWritable-Exception
+   */
+  public static function notWritable($path) {
+    return new IOException( $path, self::NOT_WRITABLE );
+  }
+
+  /**
+   * Create new ReadError-Exception
+   * @param string $path Source of the problem
+   * @return IOException new ReadError-Exception
+   */
+  public static function readError($path) {
+    return new IOException( $path, self::READ_ERROR );
+  }
+
+  /**
+   * Create new WriteError-Exception
+   * @param string $path Source of the problem
+   * @return IOException new WriteError-Exception
+   */
+  public static function writeError($path) {
+    return new IOException( $path, self::WRITE_ERROR );
+  }
+}
+
+
+?>
\ No newline at end of file
diff --git a/restler/plistformat/PListException.php b/restler/plistformat/PListException.php
new file mode 100644
index 000000000..b738d2382
--- /dev/null
+++ b/restler/plistformat/PListException.php
@@ -0,0 +1,22 @@
+<?php
+/**
+ * CFPropertyList
+ * {@link http://developer.apple.com/documentation/Darwin/Reference/ManPages/man5/plist.5.html Property Lists}
+ * @author Rodney Rehm <rodney.rehm@medialize.de>
+ * @author Christian Kruse <cjk@wwwtech.de>
+ * @package plist
+ * @version $Id$
+ */
+
+/**
+ * Exception for errors with the PList format
+ * @author Rodney Rehm <rodney.rehm@medialize.de>
+ * @author Christian Kruse <cjk@wwwtech.de>
+ * @package plist
+ */
+class PListException extends Exception {
+
+}
+
+
+?>
\ No newline at end of file
diff --git a/restler/plistformat/plistformat.php b/restler/plistformat/plistformat.php
new file mode 100644
index 000000000..a68c9e78d
--- /dev/null
+++ b/restler/plistformat/plistformat.php
@@ -0,0 +1,86 @@
+<?php
+/**
+ * Plist Format for Restler Framework.
+ * Plist is the native data exchange format for Apple iOS and Mac platform.
+ * Use this format to talk to mac applications and iOS devices.
+ * This class is capable of serving both xml plist and binary plist.
+ * @category   Framework
+ * @package    restler
+ * @subpackage format
+ * @author     R.Arul Kumaran <arul@luracast.com>
+ * @copyright  2010 Luracast
+ * @license    http://www.opensource.org/licenses/lgpl-license.php LGPL
+ * @link       http://luracast.com/products/restler/
+ */
+class PlistFormat implements iFormat
+{
+	public static $binary_mode = false;
+
+	const MIME_BINARY = 'application/x-plist';
+	const MIME_XML = 'application/xml';
+
+	const EXTENSION_BINARY = 'bplist';
+	const EXTENSION_XML = 'plist';
+
+	public function getMIMEMap(){
+		return array(
+		PlistFormat::EXTENSION_BINARY=>PlistFormat::MIME_BINARY,
+		PlistFormat::EXTENSION_XML=>PlistFormat::MIME_XML
+		);
+	}
+
+	public function getMIME(){
+		return  PlistFormat::$binary_mode ? PlistFormat::MIME_BINARY : PlistFormat::MIME_XML;
+	}
+	public function getExtension(){
+		return PlistFormat::$binary_mode ? PlistFormat::EXTENSION_BINARY : PlistFormat::EXTENSION_XML;
+	}
+	public function setMIME($mime){
+		PlistFormat::$binary_mode = $mime==PlistFormat::MIME_BINARY;
+	}
+	public function setExtension($extension){
+		PlistFormat::$binary_mode = $extension==PlistFormat::EXTENSION_BINARY;
+	}
+
+	/**
+	 * Encode the given data in plist format
+	 * @param array $data resulting data that needs to
+	 * be encoded in plist format
+	 * @param boolean $human_readable set to true when restler
+	 * is not running in production mode. Formatter has to
+	 * make the encoded output more human readable
+	 * @return string encoded string
+	 */
+	public function encode($data, $human_readable=false){
+		require_once'CFPropertyList.php';
+		if(!PlistFormat::$binary_mode) {
+			PlistFormat::$binary_mode = !$human_readable;
+		} else {
+			$human_readable=false;
+		}
+		/**
+		 * @var CFPropertyList
+		 */
+		$plist = new CFPropertyList();
+		$td = new CFTypeDetector();
+		$guessedStructure = $td->toCFType(object_to_array($data));
+		$plist->add( $guessedStructure );
+		return $human_readable ? $plist->toXML(true) : $plist->toBinary();
+	}
+
+	/**
+	 * Decode the given data from plist format
+	 * @param string $data data sent from client to
+	 * the api in the given format.
+	 * @return array associative array of the parsed data
+	 */
+	public function decode($data){
+		require_once'CFPropertyList.php';
+		$plist = new CFPropertyList();
+		$plist->parse($data);
+		return $plist->toArray();
+	}
+	public function __toString(){
+		return $this->getExtension();
+	}
+}
\ No newline at end of file
diff --git a/restler/restler.php b/restler/restler.php
index 93d7dc2cf..fce778b20 100644
--- a/restler/restler.php
+++ b/restler/restler.php
@@ -10,11 +10,10 @@
  * @copyright  2010 Luracast
  * @license    http://www.opensource.org/licenses/lgpl-license.php LGPL
  * @link       http://luracast.com/products/restler/
- * @version    1.0.20 beta
+ * @version    2.0.0
  */
-
-class Restler
-{
+class Restler {
+	const VERSION = '2.0.0';
 	/**
 	 * URL of the currently mapped service
 	 * @var string
@@ -38,15 +37,27 @@ class Restler
 
 	/**
 	 * Data sent to the service
-	 * @var string
+	 * @var array
 	 */
-	public $request_data;
+	public $request_data=array();
 
 	/**
 	 * Used in production mode to store the URL Map to disk
 	 * @var string
 	 */
-	public $cache_dir = '.';
+	public $cache_dir;
+
+	/**
+	 * base directory to locate format and auth files
+	 * @var string
+	 */
+	public $base_dir;
+
+	/**
+	 * Name of an iRespond implementation class
+	 * @var string
+	 */
+	public $response = 'DefaultResponse';
 
 	/**
 	 * Response data format. Instance of the current format class
@@ -59,18 +70,17 @@ class Restler
 	///////////////////////////////////////
 
 	/**
-	 * When set to false, it will run in debug mode and parse the
+	 * When set to FALSE, it will run in debug mode and parse the
 	 * class files every time to map it to the URL
 	 * @var boolean
 	 */
 	protected $production_mode;
 
-
 	/**
-	 * Associated array that maps urls to their respective service and function
+	 * Associated array that maps urls to their respective class and method
 	 * @var array
 	 */
-	protected $url_map = array();
+	protected $routes= array();
 
 	/**
 	 * Associated array that maps formats to their respective format class name
@@ -82,7 +92,7 @@ class Restler
 	 * Instance of the current api service class
 	 * @var object
 	 */
-	protected $service_class;
+	protected $service_class_instance;
 
 	/**
 	 * Name of the api method being called
@@ -90,9 +100,66 @@ class Restler
 	 */
 	protected $service_method;
 
+	/**
+	 * list of authentication classes
+	 * @var array
+	 */
 	protected $auth_classes = array();
+
+	/**
+	 * list of error handling classes
+	 * @var array
+	 */
 	protected $error_classes = array();
 
+	/**
+	 * HTTP status codes
+	 * @var array
+	 */
+	private $codes = array(
+	100 => 'Continue',
+	101 => 'Switching Protocols',
+	200 => 'OK',
+	201 => 'Created',
+	202 => 'Accepted',
+	203 => 'Non-Authoritative Information',
+	204 => 'No Content',
+	205 => 'Reset Content',
+	206 => 'Partial Content',
+	300 => 'Multiple Choices',
+	301 => 'Moved Permanently',
+	302 => 'Found',
+	303 => 'See Other',
+	304 => 'Not Modified',
+	305 => 'Use Proxy',
+	306 => '(Unused)',
+	307 => 'Temporary Redirect',
+	400 => 'Bad Request',
+	401 => 'Unauthorized',
+	402 => 'Payment Required',
+	403 => 'Forbidden',
+	404 => 'Not Found',
+	405 => 'Method Not Allowed',
+	406 => 'Not Acceptable',
+	407 => 'Proxy Authentication Required',
+	408 => 'Request Timeout',
+	409 => 'Conflict',
+	410 => 'Gone',
+	411 => 'Length Required',
+	412 => 'Precondition Failed',
+	413 => 'Request Entity Too Large',
+	414 => 'Request-URI Too Long',
+	415 => 'Unsupported Media Type',
+	416 => 'Requested Range Not Satisfiable',
+	417 => 'Expectation Failed',
+	500 => 'Internal Server Error',
+	501 => 'Not Implemented',
+	502 => 'Bad Gateway',
+	503 => 'Service Unavailable',
+	504 => 'Gateway Timeout',
+	505 => 'HTTP Version Not Supported'
+	);
+
 	/**
 	 * Caching of url map is enabled or not
 	 * @var boolean
@@ -101,117 +168,104 @@ class Restler
 
 	/**
 	 * Constructor
-	 * @param boolean $production_mode When set to false, it will run in
+	 * @param boolean $production_mode When set to FALSE, it will run in
 	 * debug mode and parse the class files every time to map it to the URL
 	 */
-	public function  __construct($production_mode = false)
-	{
+	public function __construct ($production_mode = FALSE) {
 		$this->production_mode = $production_mode;
-		$this->cache_dir = $this->cache_dir == '.' ? getcwd() : $this->cache_dir;
+		$this->cache_dir = getcwd();
+		$this->base_dir = RESTLER_PATH;
 	}
 
 	/**
 	 * Store the url map cache if needed
 	 */
-	public function  __destruct()
-	{
+	public function __destruct () {
 		if ($this->production_mode && !$this->cached) {
-			if (function_exists('apc_store')) {
-				apc_store('urlMap', $this->url_map);
-			} else {
-				file_put_contents($this->cache_dir . '/urlMap.cache', serialize($this->url_map));
-			}
+			$this->saveCache();
 		}
 	}
 
 	/**
 	 * Use it in production mode to refresh the url map cache
 	 */
-	public function refreshCache()
-	{
-		$this->url_map = array();
-		$this->cached = false;
+	public function refreshCache () {
+		$this->routes = array();
+		$this->cached = FALSE;
 	}
 
 	/**
 	 * Call this method and pass all the formats that should be
 	 * supported by the API. Accepts multiple parameters
-	 * @param string class name of the format class (iFormat)
+	 * @param string class name of the format class that implements iFormat
 	 * @example $restler->setSupportedFormats('JsonFormat', 'XmlFormat'...);
 	 */
-	public function setSupportedFormats()
-	{
+	public function setSupportedFormats () {
 		$args = func_get_args();
-		foreach ($args as $class) {
-			if (is_string($class) && !class_exists($class)){
-				throw new Exception('Invalid format class');
-			} elseif (!is_string($class) && !is_object($class)) {
-				throw new Exception('Invalid format class; must be a classname or object');
+		$extensions = array();
+		foreach ($args as $class_name) {
+			if(!is_string($class_name) || !class_exists($class_name)){
+				throw new Exception("$class_name is not a vaild Format Class.");
 			}
-			/**
-			 * Format Instance
-			 * @var iFormat
-			 */
-			$obj = is_string($class) ? new $class() : $class;
+			$obj = new $class_name;
 			if(! $obj instanceof iFormat){
-				throw new Exception('Invalid format class; must be implementing iFormat');
+				throw new Exception('Invalid format class; must implement '.
+				'iFormat interface');
 			}
-			foreach ($obj->getMIMEMap() as $key => $value) {
-				if(!isset($this->format_map[$key]))$this->format_map[$key]=$class;
-				if(!isset($this->format_map[$value]))$this->format_map[$value]=$class;
+			foreach ($obj->getMIMEMap() as $extension => $mime) {
+				if(!isset($this->format_map[$extension]))
+				$this->format_map[$extension]=$class_name;
+				if(!isset($this->format_map[$mime]))
+				$this->format_map[$mime]=$class_name;
+				$extensions[".$extension"]=TRUE;
 			}
 		}
 		$this->format_map['default']=$args[0];
+		$this->format_map['extensions']=array_keys($extensions);
 	}
 
 	/**
-	 * Add api classes throgh this function. All the public methods which have
-	 * url comment will be exposed as the public api.
-	 * All the protected methods with url comment will exposed as protected api
-	 * which will require authentication
+	 * Add api classes throgh this method. All the public methods
+	 * that do not start with _ (underscore) will be  will be exposed
+	 * as the public api by default.
+	 *
+	 * All the protected methods that do not start with _ (underscore)
+	 * will exposed as protected api which will require authentication
 	 * @param string $class name of the service class
-	 * @param string $basePath optional url prefix for mapping
+	 * @param string $basePath optional url prefix for mapping, uses
+	 * lowercase version of the class name when not specified
 	 * @throws Exception when supplied with invalid class name
 	 */
-	public function addAPIClass($class, $basePath = '')
-	{
+	public function addAPIClass($class_name, $base_path = NULL) {
+		if(!class_exists($class_name)){
+			throw new Exception("API class $class_name is missing.");
+		}
 		$this->loadCache();
-		if (!$this->cached) {
-			if (is_string($class) && !class_exists($class)){
-				throw new Exception('Invalid method or class');
-			} elseif (!is_string($class) && !is_object($class)) {
-				throw new Exception('Invalid method or class; must be a classname or object');
-			}
-
-			if (strlen($basePath) > 0 && $basePath[0] == '/') {
-				$basePath = substr($basePath, 1);
-			}
-			if (strlen($basePath) > 0 && $basePath[strlen($basePath) - 1] != '/') {
-				$basePath .= '/';
-			}
-
-			$this->generateMap($class, $basePath);
+		if(!$this->cached){
+			if(is_null($base_path))$base_path=strtolower($class_name);
+			$base_path = trim($base_path,'/');
+			if(strlen($base_path)>0)$base_path .= '/';
+			$this->generateMap($class_name, $base_path);
 		}
 	}
 
 	/**
 	 * protected methods will need atleast one authentication class to be set
 	 * in order to allow that method to be executed
-	 * @param string $class name of the authentication class
+	 * @param string $class_name of the authentication class
+	 * @param string $base_path optional url prefix for mapping
 	 */
-	public function addAuthenticationClass($class)
-	{
-		$this->auth_classes[] = $class;
-		$this->addAPIClass($class);
+	public function addAuthenticationClass ($class_name, $base_path = NULL) {
+		$this->auth_classes[] = $class_name;
+		$this->addAPIClass($class_name, $base_path);
 	}
 
 	/**
 	 * Add class for custom error handling
-	 * @param string $class name of the error handling class
+	 * @param string $class_name of the error handling class
 	 */
-	public function addErrorClass($class)
-	{
-		$this->errorClasses[] = $class;
+	public function addErrorClass ($class_name) {
+		$this->error_classes[] = $class_name;
 	}
 
 	/**
@@ -219,20 +273,25 @@ public function addErrorClass($class)
 	 * @param int $statusCode http error code
 	 * @param string $errorMessage optional custom error message
 	 */
-	public function handleError($statusCode, $errorMessage = null)
-	{
-		$method = "handle$statusCode";
-		foreach ($this->error_classes as $class) {
-			$obj = is_string($class) ? new $class() : $class;
-			if (!method_exists($obj, $method)) {
+	public function handleError ($status_code, $error_message = NULL) {
+		$method = "handle$status_code";
+		$handled = FALSE;
+		foreach ($this->error_classes as $class_name) {
+			if (method_exists($class_name, $method)) {
+				$obj = new $class_name();
+				$obj->restler = $this;
 				$obj->$method();
-				return;
+				$handled = TRUE;
 			}
 		}
-		$message = $this->codes[$statusCode] . (!$errorMessage || $this->production_mode ? '' : ': ' . $errorMessage);
-
-		$this->setStatus($statusCode);
-		$this->sendData(array('error' => array('code' => $statusCode, 'message' => $message)));
+		if($handled)return;
+		$message = $this->codes[$status_code] .
+		(!$error_message ? '' : ': ' . $error_message);
+		$this->setStatus($status_code);
+		$this->sendData(
+		call_user_func(
+		array($this->response, '__formatError'), $status_code, $message)
+		);
 	}
 
 	/**
@@ -241,59 +300,68 @@ public function handleError($statusCode, $errorMessage = null)
 	 * @throws Exception when the api service class is missing
 	 * @throws RestException to send error response
 	 */
-	public function handle()
-	{
+	public function handle () {
 		$this->url = $this->getPath();
 		$this->request_method = $this->getRequestMethod();
-
 		if(empty($this->format_map))$this->setSupportedFormats('JsonFormat');
 		$this->response_format = $this->getResponseFormat();
 		$this->request_format = $this->getRequestFormat();
-		if($this->request_format==null)$this->request_format = $this->response_format;
-		//echo $this->request_format;
-
-		if($this->request_method == 'PUT' || $this->request_method == 'POST')	{
+		if(is_null($this->request_format)){
+			$this->request_format = $this->response_format;
+		}
+		if($this->request_method == 'PUT' || $this->request_method == 'POST'){
 			$this->request_data = $this->getRequestData();
 		}
-		list($class, $method, $params, $is_public) = $this->mapUrlToMethod();
-
-		if($class) {
-			if(is_string($class) && class_exists($class)){
-				$this->service_class=$obj=new $class();
-				$this->service_method=$method;
-			}else{
-				throw new Exception("Class $class does not exist");
-			}
-		}else{
+		$o = $this->mapUrlToMethod();
+		if(!isset($o->class_name)){
 			$this->handleError(404);
-			return;
-		}
-		$obj->restler = $this;
-
-		$pre_process = $this->request_format->getExtension().'_'.$method;
-		if(method_exists($obj,$pre_process)) {
-			call_user_func_array(array($obj, $pre_process), $params);
-		}
-		try {
-			if($is_public) {
-				$result = call_user_func_array(array($obj,$method), $params);
-			}else{
-				$auth_method = 'isAuthenticated';
-				if(!count($this->auth_classes))throw new RestException(401);
-				foreach ($this->auth_classes as $auth_class) {
-					$auth_obj = is_string($auth_class) ? new $auth_class() : $auth_class;
-					if (!method_exists($auth_obj, $auth_method) || !$auth_obj->$auth_method()) {
-						throw new RestException(401);
+		}else{
+			try {
+				if($o->method_flag){
+					$auth_method = '__isAuthenticated';
+					if(!count($this->auth_classes))throw new RestException(401);
+					foreach ($this->auth_classes as $auth_class) {
+						$auth_obj = new $auth_class();
+						$auth_obj->restler=$this;
+						$this->applyClassMetadata($auth_class, $auth_obj, $o);
+						if (!method_exists($auth_obj, $auth_method)) {
+							throw new RestException(401, 'Authentication Class '.
+							'should implement iAuthenticate');
+						}elseif(!$auth_obj->$auth_method()){
+							throw new RestException(401);
+						}
 					}
 				}
-				$reflection_method = new ReflectionMethod($class, $method);
-				$reflection_method->setAccessible(true);
-				$result = $reflection_method->invokeArgs($obj, $params);
+				$this->applyClassMetadata(get_class($this->request_format),
+				$this->request_format, $o);
+				$pre_process = '_'.$this->request_format->getExtension().'_'.
+				$o->method_name;
+				$this->service_method = $o->method_name;
+				if($o->method_flag==2)$o=unprotect($o);
+				$object = $this->service_class_instance = new $o->class_name();
+				if(method_exists($o->class_name, $pre_process)) {
+					call_user_func_array(array($object, $pre_process),
+					$o->arguments);
+				}
+				switch ($o->method_flag) {
+					case 3:
+						$reflection_method = new ReflectionMethod($object,
+						$o->method_name);
+						$reflection_method->setAccessible(TRUE);
+						$result = $reflection_method->invokeArgs($object,
+						$o->arguments);
+						break;
+					case 2:
+					case 1:
+					default:
+						$result = call_user_func_array(array($object,
+						$o->method_name), $o->arguments);
+				}
+			} catch (RestException $e) {
+				$this->handleError($e->getCode(), $e->getMessage());
 			}
-		} catch (RestException $e) {
-			$this->handleError($e->getCode(), $e->getMessage());
 		}
-		if (isset($result) && $result !== null) {
+		if (isset($result) && $result !== NULL) {
 			$this->sendData($result);
 		}
 	}
@@ -306,14 +374,18 @@ public function handle()
 	public function sendData($data)
 	{
 		$data =  $this->response_format->encode($data, !$this->production_mode);
-		$post_process =  $this->service_method .'_'.$this->response_format->getExtension();
-		if(isset($this->service_class) && method_exists($this->service_class,$post_process)){
-			$data = call_user_method($post_process, $this->service_class, $data);
+		$post_process =  '_'.$this->service_method .'_'.
+		$this->response_format->getExtension();
+		if(isset($this->service_class_instance) &&
+		method_exists($this->service_class_instance,$post_process)){
+			$data = call_user_func(array($this->service_class_instance,
+			$post_process), $data);
 		}
 		header("Cache-Control: no-cache, must-revalidate");
 		header("Expires: 0");
 		header('Content-Type: ' . $this->response_format->getMIME());
-		echo $data;
+		header("X-Powered-By: Luracast Restler v".Restler::VERSION);
+		die($data);
 	}
 
 	/**
@@ -322,14 +394,16 @@ public function sendData($data)
 	 */
 	public function setStatus($code)
 	{
-		header("{$_SERVER['SERVER_PROTOCOL']} $code ".$this->codes[strval($code)]);
+		header("{$_SERVER['SERVER_PROTOCOL']} $code ".
+		$this->codes[strval($code)]);
 	}
+
 	/**
-	 * Compare two strings and remove the common 
+	 * Compare two strings and remove the common
 	 * sub string from the first string and return it
-	 * @param string $first 
+	 * @param string $first
 	 * @param string $second
-	 * @param string $char optional, set it as 
+	 * @param string $char optional, set it as
 	 * blank string for char by char comparison
 	 * @return string
 	 */
@@ -344,17 +418,39 @@ public function removeCommonPath($first, $second, $char='/'){
 		}
 		return implode($char, $first);
 	}
-	
+
+	public function saveCache() {
+		$file = $this->cache_dir . '/routes.php';
+		$s = '$o=array();'.PHP_EOL;
+		foreach ($this->routes as $key => $value) {
+			$s .= PHP_EOL.PHP_EOL.PHP_EOL."############### $key ###############"
+			.PHP_EOL.PHP_EOL;
+			$s .= '$o[\''.$key.'\']=array();';
+			foreach ($value as $ke => $va) {
+				$s .= PHP_EOL.PHP_EOL."#==== $key $ke".PHP_EOL.PHP_EOL;
+				$s .= '$o[\''.$key.'\'][\''.$ke.'\']='.str_replace(PHP_EOL,
+				PHP_EOL."\t", var_export($va, TRUE)).';';
+			}
+		}
+		$s .= PHP_EOL.'return $o;';
+		$r=@file_put_contents($file, "<?php $s");
+		@chmod($file, 0777);
+		if($r===FALSE)throw new Exception(
+			"The cache directory located at '$this->cache_dir' needs to have ".
+			"the permissions set to read/write/execute for everyone in order ".
+			"to save cache and improve performance.");
+	}
+
 	///////////////////////////////////////////////////////////////
 	/**
-	 * Parses the requst url and get the api path
-	 * @return string api path
-	 */
-	protected function getPath()
-	{
-		$path = $this->removeCommonPath($_SERVER['REQUEST_URI'], $_SERVER['SCRIPT_NAME']);
-		$path = preg_replace('/(\.\w+)|(\?.*$)/', '', $path);
-		//echo $path;
+	* Parses the requst url and get the api path
+	* @return string api path
+	*/
+	protected function getPath () {
+		$path = urldecode($this->removeCommonPath($_SERVER['REQUEST_URI'], 
+		$_SERVER['SCRIPT_NAME']));
+		$path = preg_replace('/(\/*\?.*$)|(\/$)/', '', $path);
+		$path = str_replace($this->format_map['extensions'], '', $path);
 		return $path;
 	}
 
@@ -364,17 +460,10 @@ protected function getPath()
 	 * [GET, POST, PUT, DELETE]
 	 * @example GET
 	 */
-	protected function getRequestMethod()
-	{
+	protected function getRequestMethod () {
 		$method = $_SERVER['REQUEST_METHOD'];
 		if (isset($_SERVER['HTTP_X_HTTP_METHOD_OVERRIDE'])){
 			$method = $_SERVER['HTTP_X_HTTP_METHOD_OVERRIDE'];
-		}elseif ($method == 'POST' && isset($_GET['method'])){
-			switch ($_GET['method']){
-				case 'PUT':
-				case 'DELETE':
-					$method = $_GET['method'];
-			}
 		}
 		return $method;
 	}
@@ -384,19 +473,19 @@ protected function getRequestMethod()
 	 * @return iFormat any class that implements iFormat
 	 * @example JsonFormat
 	 */
-	protected function getRequestFormat(){
-		$format=null;
+	protected function getRequestFormat () {
+		$format=NULL;
 		//check if client has sent any information on request format
 		if(isset($_SERVER['CONTENT_TYPE'])){
-			$mime = $_SERVER['CONTENT_TYPE'];
+			$mime = explode(';', $_SERVER['CONTENT_TYPE']);
+			$mime = $mime[0];
 			if($mime==UrlEncodedFormat::MIME){
 				$format = new UrlEncodedFormat();
 			}else{
 				if(isset($this->format_map[$mime])){
 					$format = $this->format_map[$mime];
 					$format = is_string($format) ? new $format: $format;
-					$format->setMIME($accept);
-					return $format;
+					$format->setMIME($mime);
 				}
 			}
 		}
@@ -408,14 +497,15 @@ protected function getRequestFormat(){
 	 * @return iFormat any class that implements iFormat
 	 * @example JsonFormat
 	 */
-	protected function getResponseFormat()
-	{
+	protected function getResponseFormat () {
 		//check if client has specified an extension
 		/**
 		* @var iFormat
 		*/
 		$format;
-		$extension = array_pop(explode('.', parse_url($_SERVER['REQUEST_URI'],PHP_URL_PATH)));
+		$extension = explode('.', parse_url($_SERVER['REQUEST_URI'],
+		PHP_URL_PATH));
+		$extension = array_pop($extension);
 		if($extension && isset($this->format_map[$extension])){
 			$format = $this->format_map[$extension];
 			$format = is_string($format) ? new $format: $format;
@@ -439,7 +529,6 @@ protected function getResponseFormat()
 		$format = $this->format_map['default'];
 		//echo "DEFAULT ".$this->format_map['default'];
 		return is_string($format) ? new $format: $format;
-
 	}
 
 	/**
@@ -451,174 +540,177 @@ protected function getRequestData()
 		try{
 			$r = file_get_contents('php://input');
 			if(is_null($r))return $_GET;
-			return $this->request_format->decode($r);
+			$r =$this->request_format->decode($r);
+			return is_null($r) ? array(): $r;
 		} catch (RestException $e) {
 			$this->handleError($e->getCode(), $e->getMessage());
 		}
 	}
 
-	protected function loadCache()
-	{
-		if ($this->cached !== null) {
-			return;
+	protected function mapUrlToMethod () {
+		if(!isset($this->routes[$this->request_method])){
+			return array();
 		}
+		$urls = $this->routes[$this->request_method];
+		if(!$urls)return array();
 
-		$this->cached = false;
-
-		if ($this->production_mode) {
-			if (function_exists('apc_fetch')) {
-				$map = apc_fetch('urlMap');
-			} elseif (file_exists($this->cache_dir . '/urlMap.cache')) {
-				$map = unserialize(file_get_contents($this->cache_dir . '/urlMap.cache'));
-			}
-			if (isset($map) && is_array($map)) {
-				$this->url_map = $map;
-				$this->cached = true;
-			}
-		} else {
-			if (function_exists('apc_store')) {
-				apc_delete('urlMap');
-			} else {
-				@unlink($this->cache_dir . '/urlMap.cache');
-			}
-		}
-	}
-
-
-	protected function mapUrlToMethod()
-	{
-		if(!isset($this->url_map[$this->request_method])){
-			return array(null,null,null,null,null,null);
-		}
-		$urls = $this->url_map[$this->request_method];
-		if (!$urls)return array(null,null,null,null,null,null);
-
-		$found=false;
-
+		$found = FALSE;
+		$this->request_data += $_GET;
+		$params = array('request_data'=>$this->request_data);
+		$params += $this->request_data;
 		foreach ($urls as $url => $call) {
-			$params = array('data'=>$this->request_data);
-			if(is_array($this->request_data))$params+=$this->request_data;
-			//use query parameters
-			$params+=$_GET;
-			$args = $call[2];
-			//if it has url based parameters
-			if (strstr($url, ':')) {
-				$regex = preg_replace('/\\\:([^\/]+)/', '(?P<$1>[^/]+)', preg_quote($url));
+			//echo PHP_EOL.$url.' = '.$this->url.PHP_EOL;
+			$call = (object)$call;
+			if(strstr($url, ':')){
+				$regex = preg_replace('/\\\:([^\/]+)/', '(?P<$1>[^/]+)', 
+				preg_quote($url));
 				if (preg_match(":^$regex$:", $this->url, $matches)) {
 					foreach ($matches as $arg => $match) {
-						//echo "$arg => $match $args[$arg] \n";
-						if (isset($args[$arg]))$params[$arg] = $match;
+						if (isset($call->arguments[$arg])){
+							//flog("$arg => $match $args[$arg]");
+							$params[$arg] = $match;
+						}
 					}
-					$found=true;
+					$found = TRUE;
 					break;
 				}
 			}elseif ($url == $this->url){
-				$found=true;
+				$found = TRUE;
 				break;
 			}
 		}
 		if($found){
-			$p = is_null($call[5]) ? array() : $call[5];
-			foreach ($args as $key => $value) {
+			//echo PHP_EOL."Found $url ";
+			//print_r($call);
+			$p = is_null($call->defaults) ? array() : $call->defaults;
+			foreach ($call->arguments as $key => $value) {
 				//echo "$key => $value \n";
 				if(isset($params[$key]))$p[$value] = $params[$key];
 			}
-			$call[2]=$p;
+			$call->arguments=$p;
 			return $call;
+		}
 
+	}
+	/**
+	 * Apply static and non-static properties defined in
+	 * the method information anotation
+	 * @param String $class_name
+	 * @param Object $instance instance of that class
+	 * @param Object $method_info method information and metadata
+	 */
+	protected function applyClassMetadata($class_name, $instance, $method_info){
+		if(isset($method_info->metadata[$class_name]) && 
+		is_array($method_info->metadata[$class_name])){
+			foreach ($method_info->metadata[$class_name] 
+			as $property => $value){
+				if(property_exists($class_name, $property)){
+					$reflection_property = 
+					new ReflectionProperty($class_name, $property);
+					$reflection_property->setValue($instance, $value);
+				}
+			}
 		}
 	}
 
-	protected function generateMap($class, $basePath = '')
+	protected function loadCache()
 	{
-		if (is_object($class)) {
-			$reflection = new ReflectionObject($class);
-		} elseif (class_exists($class)) {
-			$reflection = new ReflectionClass($class);
+		if ($this->cached !== NULL) {
+			return;
 		}
+		$file = $this->cache_dir . '/routes.php';
 
-		$methods = $reflection->getMethods(
-		ReflectionMethod::IS_PUBLIC +
-		ReflectionMethod::IS_PROTECTED
-		);
+		$this->cached = FALSE;
 
+		if ($this->production_mode) {
+			if (file_exists($file)) {
+				$routes = include($file);
+			}
+			if (isset($routes) && is_array($routes)) {
+				$this->routes = $routes;
+				$this->cached = TRUE;
+			}
+		} else {
+			#@unlink($this->cache_dir . "/$name.php");
+		}
+	}
+
+	/**
+	 * Generates cachable url to method mapping
+	 * @param string $class_name
+	 * @param string $base_path
+	 */
+	protected function generateMap ($class_name, $base_path = "") {
+		$reflection = new ReflectionClass($class_name);
+		$class_metadata = parse_doc($reflection->getDocComment());
+		$methods = $reflection->getMethods(
+		ReflectionMethod::IS_PUBLIC + ReflectionMethod::IS_PROTECTED);
 		foreach ($methods as $method) {
 			$doc = $method->getDocComment();
-			if (preg_match_all('/@url\s+(GET|POST|PUT|DELETE|HEAD|OPTIONS)[ \t]*\/?(\S*)/s', $doc, $matches, PREG_SET_ORDER)) {
-
-				$params = $method->getParameters();
-
+			$arguments = array();
+			$defaults = array();
+			$metadata = $class_metadata+parse_doc($doc);
+			$params = $method->getParameters();
+			$position=0;
+			foreach ($params as $param){
+				$arguments[$param->getName()] = $position;
+				if($param->isDefaultValueAvailable()){
+					$defaults[$position] = $param->getDefaultValue();
+				}
+				$position++;
+			}
+			$method_flag = $method->isProtected() ?
+			(isRestlerCompatibilityModeEnabled() ? 2 :  3) :
+			(isset($metadata['protected']) ? 1 : 0);
+
+			#take note of the order
+			$call = array(
+			'class_name'=>$class_name,
+			'method_name'=>$method->getName(),
+			'arguments'=>$arguments,
+			'defaults'=>$defaults,
+			'metadata'=>$metadata,
+			'method_flag'=>$method_flag
+			);
+			$method_url = strtolower($method->getName());
+			if (preg_match_all(
+			'/@url\s+(GET|POST|PUT|DELETE|HEAD|OPTIONS)[ \t]*\/?(\S*)/s', 
+			$doc, $matches, PREG_SET_ORDER)) {
 				foreach ($matches as $match) {
-					$httpMethod = $match[1];
-					$url = $basePath . $match[2];
-					if (strlen($url)>0 && $url[strlen($url) - 1] == '/') {
-						$url = substr($url, 0, -1);
-					}
-					$call = array($class, $method->getName());
-					$args = array();
-					$defaults = array();
-					$optional_index = $method->getNumberOfRequiredParameters();
-					foreach ($params as $param){
-						$args[$param->getName()] = $param->getPosition();
-						if($param->isDefaultValueAvailable()){
-							$defaults[$param->getPosition()]=$param->getDefaultValue();
-						}
+					$http_method = $match[1];
+					$url = rtrim($base_path . $match[2],'/');
+					$this->routes[$http_method][$url] = $call;
+				}
+			}elseif($method_url[0] != '_'){ //not prefixed with underscore
+				// no configuration found so use convention
+				if (preg_match_all('/^(GET|POST|PUT|DELETE|HEAD|OPTIONS)/i', 
+				$method_url, $matches)) {
+					$http_method = strtoupper($matches[0][0]);
+					$method_url = substr($method_url, strlen($http_method));
+				}else{
+					$http_method = 'GET';
+				}
+				$url = $base_path. ($method_url=='index' || 
+				$method_url=='default' ? '' : $method_url);
+				$url = rtrim($url,'/');
+				$this->routes[$http_method][$url] = $call;
+				foreach ($params as $param){
+					if($param->getName()=='request_data'){
+						break;
 					}
-					$call[] = $args;
-					$call[] = $method->isPublic();
-					$call[] = @$optional_index;
-					$call[] = $defaults;
-
-					$this->url_map[$httpMethod][$url] = $call;
+					$url .= $url=='' ? ':' : '/:';
+					$url .= $param->getName();
+					$this->routes[$http_method][$url] = $call;
 				}
 			}
 		}
 	}
+}
 
-	private $codes = array(
-	100 => 'Continue',
-	101 => 'Switching Protocols',
-	200 => 'OK',
-	201 => 'Created',
-	202 => 'Accepted',
-	203 => 'Non-Authoritative Information',
-	204 => 'No Content',
-	205 => 'Reset Content',
-	206 => 'Partial Content',
-	300 => 'Multiple Choices',
-	301 => 'Moved Permanently',
-	302 => 'Found',
-	303 => 'See Other',
-	304 => 'Not Modified',
-	305 => 'Use Proxy',
-	306 => '(Unused)',
-	307 => 'Temporary Redirect',
-	400 => 'Bad Request',
-	401 => 'Unauthorized',
-	402 => 'Payment Required',
-	403 => 'Forbidden',
-	404 => 'Not Found',
-	405 => 'Method Not Allowed',
-	406 => 'Not Acceptable',
-	407 => 'Proxy Authentication Required',
-	408 => 'Request Timeout',
-	409 => 'Conflict',
-	410 => 'Gone',
-	411 => 'Length Required',
-	412 => 'Precondition Failed',
-	413 => 'Request Entity Too Large',
-	414 => 'Request-URI Too Long',
-	415 => 'Unsupported Media Type',
-	416 => 'Requested Range Not Satisfiable',
-	417 => 'Expectation Failed',
-	500 => 'Internal Server Error',
-	501 => 'Not Implemented',
-	502 => 'Bad Gateway',
-	503 => 'Service Unavailable',
-	504 => 'Gateway Timeout',
-	505 => 'HTTP Version Not Supported'
-	);
+if(version_compare(PHP_VERSION, '5.3.0') < 0){
+	require_once 'compat.php';
 }
+
 /**
  * Special Exception for raising API errors
  * that can be used in API methods
@@ -633,41 +725,57 @@ protected function generateMap($class, $basePath = '')
 class RestException extends Exception
 {
 
-	public function __construct($code, $message = null)
+	public function __construct($http_status_code, $error_message = NULL)
 	{
-		parent::__construct($message, $code);
+		parent::__construct($error_message, $http_status_code);
 	}
 
 }
 
 /**
- * Conveniance function that converts the given object
- * in to associative array
- * @param object $object that needs to be converted
+ * Interface for creating response classes
  * @category   Framework
  * @package    restler
- * @subpackage format
+ * @subpackage result
  * @author     R.Arul Kumaran <arul@luracast.com>
  * @copyright  2010 Luracast
  * @license    http://www.opensource.org/licenses/lgpl-license.php LGPL
  * @link       http://luracast.com/products/restler/
  */
-function object_to_array($object, $utf_encode=true)
+interface iRespond
 {
-	if(is_array($object) || is_object($object))
-	{
-		$array = array();
-		foreach($object as $key => $value)
-		{
-			$value = object_to_array($value, $utf_encode);
-			if($utf_encode && is_string($value)){
-				$value = utf8_encode($value);
-			}
-			$array[$key] = $value;
-		}
-		return $array;
+	/**
+	 * Result of an api call is passed to this method
+	 * to create a standard structure for the data
+	 * @param unknown_type $result can be a primitive or array or object
+	 */
+	public function __formatResponse($result);
+	/**
+	 * When the api call results in RestException this method
+	 * will be called to return the error message
+	 * @param int $status_code
+	 * @param String $message
+	 */
+	public function __formatError($status_code, $message);
+}
+/**
+ * Default response formating class
+ * @category   Framework
+ * @package    restler
+ * @subpackage result
+ * @author     R.Arul Kumaran <arul@luracast.com>
+ * @copyright  2010 Luracast
+ * @license    http://www.opensource.org/licenses/lgpl-license.php LGPL
+ * @link       http://luracast.com/products/restler/
+ */
+class DefaultResponse implements iRespond {
+	function __formatResponse($result) {
+		return $result;
+	}
+	function __formatError($statusCode, $message) {
+		return array('error' => array('code' => $statusCode, 
+		'message' => $message));
 	}
-	return $object;
 }
 
 /**
@@ -684,12 +792,11 @@ interface iAuthenticate
 {
 	/**
 	 * Auth function that is called when a protected method is requested
-	 * @return boolean true or false
+	 * @return boolean TRUE or FALSE
 	 */
-	public function isAuthenticated();
+	public function __isAuthenticated();
 }
 
-
 /**
  * Interface for creating custom data formats
  * like xml, json, yaml, amf etc
@@ -736,12 +843,12 @@ public function getExtension();
 	 * Encode the given data in the format
 	 * @param array $data resulting data that needs to
 	 * be encoded in the given format
-	 * @param boolean $human_readable set to true when restler
+	 * @param boolean $human_readable set to TRUE when restler
 	 * is not running in production mode. Formatter has to
 	 * make the encoded output more human readable
 	 * @return string encoded string
 	 */
-	public function encode($data, $human_readable=false);
+	public function encode($data, $human_readable=FALSE);
 
 	/**
 	 * Decode the given data from the format
@@ -782,7 +889,7 @@ public function setMIME($mime){
 	public function setExtension($extension){
 		//do nothing
 	}
-	public function encode($data, $human_readable=false){
+	public function encode($data, $human_readable=FALSE){
 		return http_build_query($data);
 	}
 	public function decode($data){
@@ -824,11 +931,13 @@ public function setMIME($mime){
 	public function setExtension($extension){
 		//do nothing
 	}
-	public function encode($data, $human_readable=false){
-		return $human_readable ? $this->json_format(json_encode(object_to_array($data))) : json_encode(object_to_array($data));
+	public function encode($data, $human_readable=FALSE){
+		return $human_readable ? 
+		$this->json_format(json_encode(object_to_array($data))) : 
+		json_encode(object_to_array($data));
 	}
 	public function decode($data){
-		return json_decode($data);
+		return object_to_array(json_decode($data));
 	}
 
 	/**
@@ -841,7 +950,7 @@ private function json_format($json)
 		$tab = "  ";
 		$new_json = "";
 		$indent_level = 0;
-		$in_string = false;
+		$in_string = FALSE;
 
 		$len = strlen($json);
 
@@ -851,7 +960,8 @@ private function json_format($json)
 				case '{':
 				case '[':
 					if(!$in_string) {
-						$new_json .= $char . "\n" . str_repeat($tab, $indent_level+1);
+						$new_json .= $char . "\n" . 
+						str_repeat($tab, $indent_level+1);
 						$indent_level++;
 					} else {
 						$new_json .= $char;
@@ -861,7 +971,7 @@ private function json_format($json)
 				case ']':
 					if(!$in_string) {
 						$indent_level--;
-						$new_json .= "\n" . str_repeat($tab, $indent_level) . $char;
+						$new_json .= "\n".str_repeat($tab, $indent_level).$char;
 					} else {
 						$new_json .= $char;
 					}
@@ -881,7 +991,9 @@ private function json_format($json)
 					}
 					break;
 				case '"':
-					if($c > 0 && $json[$c-1] != '\\') {
+					if($c==0){
+						$in_string = TRUE;
+					}elseif($c > 0 && $json[$c-1] != '\\') {
 						$in_string = !$in_string;
 					}
 				default:
@@ -896,4 +1008,187 @@ private function json_format($json)
 	public function __toString(){
 		return $this->getExtension();
 	}
-}
\ No newline at end of file
+}
+
+/**
+ * Parses the PHPDoc comments for metadata. Inspired by Documentor code base
+ * @category   Framework
+ * @package    restler
+ * @subpackage helper
+ * @author     Murray Picton <info@murraypicton.com>
+ * @author     R.Arul Kumaran <arul@luracast.com>
+ * @copyright  2010 Luracast
+ * @license    http://www.gnu.org/licenses/ GNU General Public License
+ * @link       https://github.com/murraypicton/Doqumentor
+ */
+class DocParser {
+	private $params=array();
+	function parse($doc='') {
+		if($doc==''){
+			return $this->params;
+		}
+		//Get the comment
+		if(preg_match('#^/\*\*(.*)\*/#s', $doc, $comment) === false)
+		return  $this->params;
+		$comment = trim($comment[1]);
+		//Get all the lines and strip the * from the first character
+		if(preg_match_all('#^\s*\*(.*)#m', $comment, $lines) === false)
+		return  $this->params;
+		$this->parseLines($lines[1]);
+		return  $this->params;
+	}
+
+	private function parseLines($lines) {
+		foreach($lines as $line) {
+			$parsedLine = $this->parseLine($line); //Parse the line
+
+			if($parsedLine === false && !isset($this->params['description'])) {
+				if(isset($desc)){
+					//Store the first line in the short description
+					$this->params['description'] = implode(PHP_EOL, $desc); 
+				}
+				$desc = array();
+			} elseif($parsedLine !== false) {
+				$desc[] = $parsedLine; //Store the line in the long description
+			}
+		}
+		$desc = implode(' ', $desc);
+		if(!empty($desc))$this->params['long_description'] = $desc;
+	}
+
+	private function parseLine($line) {
+		//trim the whitespace from the line
+		$line = trim($line);
+
+		if(empty($line)) return false; //Empty line
+
+		if(strpos($line, '@') === 0) {
+			if(strpos($line, ' ')>0){
+				//Get the parameter name
+				$param = substr($line, 1, strpos($line, ' ') - 1); 
+				$value = substr($line, strlen($param) + 2); //Get the value
+			}else{
+				$param = substr($line, 1);
+				$value = '';
+			}
+			//Parse the line and return false if the parameter is valid
+			if($this->setParam($param, $value)) return false; 
+		}
+
+		return $line;
+	}
+	private function setParam($param, $value) {
+		if($param == 'param' || $param == 'return') 
+		$value = $this->formatParamOrReturn($value);
+		if($param == 'class') 
+		list($param, $value) = $this->formatClass($value);
+
+		if(empty($this->params[$param])) {
+			$this->params[$param] = $value;
+		} else if($param == 'param'){
+			$arr = array($this->params[$param], $value);
+			$this->params[$param] = $arr;
+		} else {
+			$this->params[$param] = $value + $this->params[$param];
+		}
+		return true;
+	}
+	private function formatClass($value) {
+		$r = preg_split("[\(|\)]",$value);
+		if(is_array($r)){
+			$param = $r[0];
+			parse_str($r[1],$value);
+			foreach ($value as $key => $val) {
+				$val = explode(',', $val);
+				if(count($val)>1)$value[$key]=$val;
+			}
+		}else{
+			$param='Unknown';
+		}
+		return array($param, $value);
+	}
+	private function formatParamOrReturn($string) {
+
+		$pos = strpos($string, ' ');
+
+		$type = substr($string, 0, $pos);
+		return '(' . $type . ')' . substr($string, $pos+1);
+	}
+}
+
+function parse_doc($php_doc_comment){
+	$p = new DocParser();
+	return $p->parse($php_doc_comment);
+	$p = new Parser($php_doc_comment);
+	return $p;
+	$php_doc_comment = preg_replace("/(^[\\s]*\\/\\*\\*)
+                                 |(^[\\s]\\*\\/)
+                                 |(^[\\s]*\\*?\\s)
+                                 |(^[\\s]*)
+                                 |(^[\\t]*)/ixm", "", $php_doc_comment);
+
+	$php_doc_comment = str_replace("\r", "", $php_doc_comment);
+	$php_doc_comment = preg_replace("/([\\t])+/", "\t", $php_doc_comment);
+	return explode("\n", $php_doc_comment);
+
+
+	$php_doc_comment =  trim(preg_replace('/\r?\n *\* */', ' ',
+	 $php_doc_comment));
+	return $php_doc_comment;
+	preg_match_all('/@([a-z]+)\s+(.*?)\s*(?=$|@[a-z]+\s)/s', 
+	$php_doc_comment, $matches);
+	return array_combine($matches[1], $matches[2]);
+}
+
+/**
+ * Conveniance function that converts the given object
+ * in to associative array
+ * @param object $object that needs to be converted
+ * @category   Framework
+ * @package    restler
+ * @subpackage format
+ * @author     R.Arul Kumaran <arul@luracast.com>
+ * @copyright  2010 Luracast
+ * @license    http://www.opensource.org/licenses/lgpl-license.php LGPL
+ * @link       http://luracast.com/products/restler/
+ */
+function object_to_array($object, $utf_encode=TRUE)
+{
+	if(is_array($object) || is_object($object))
+	{
+		$array = array();
+		foreach($object as $key => $value)
+		{
+			$value = object_to_array($value, $utf_encode);
+			if($utf_encode && is_string($value)){
+				$value = utf8_encode($value);
+			}
+			$array[$key] = $value;
+		}
+		return $array;
+	}
+	return $object;
+}
+/**
+ * an autoloader function for loading format classes
+ * @param String $class_name class name of a class that implements iFormat
+ */
+function autoload_formats($class_name)
+{
+	$class_name=strtolower($class_name);
+	$file = RESTLER_PATH."/$class_name/$class_name.php";
+	if (file_exists($file))
+	{
+		require_once($file);
+	}
+}
+spl_autoload_register('autoload_formats');
+/**
+ * Manage compatibility with PHP 5 < PHP 5.3
+ */
+if(!function_exists('isRestlerCompatibilityModeEnabled')){
+	function isRestlerCompatibilityModeEnabled(){
+		return FALSE;
+	}
+}
+define('RESTLER_PATH', dirname(__FILE__));
\ No newline at end of file
diff --git a/restler/xmlformat.php b/restler/xmlformat.php
index a3244416a..3f809976b 100644
--- a/restler/xmlformat.php
+++ b/restler/xmlformat.php
@@ -18,7 +18,7 @@ class XmlFormat implements iFormat
 	 * Default name for the root node.
 	 * @var string $rootNodeName
 	 */
-	public static  $root_name='result';
+	public static  $root_name='response';
 	public static  $default_tag_name='item';
 
 	const MIME ='application/xml';
@@ -42,7 +42,8 @@ public function setExtension($extension){
 	}
 
 	public function encode($data, $human_readable=false){
-		return $this->toXML( object_to_array($data, false),XmlFormat::$root_name, $human_readable);
+		return $this->toXML( object_to_array($data, false),
+		XmlFormat::$root_name, $human_readable);
 	}
 
 	public function decode($data){
@@ -50,7 +51,8 @@ public function decode($data){
 			if($data=='')return array();
 			return $this->toArray($data);
 		} catch (Exception $e) {
-			throw new RestException(400, "Error decoding request. ".$e->getMessage());
+			throw new RestException(400, "Error decoding request. ".
+			$e->getMessage());
 		}
 	}
 
@@ -62,23 +64,30 @@ public function __toString(){
 	 * determine if a variable is an associative array
 	 */
 	public function isAssoc( $array ) {
-		return (is_array($array) && 0 !== count(array_diff_key($array, array_keys(array_keys($array)))));
+		return (is_array($array) && 0 !== count(array_diff_key($array,
+		array_keys(array_keys($array)))));
 	}
 
 	/**
 	 * The main function for converting to an XML document.
-	 * Pass in a multi dimensional array and this recrusively loops through and builds up an XML document.
+	 * Pass in a multi dimensional array and this recrusively loops through
+	 * and builds up an XML document.
 	 * @param array $data
-	 * @param string $rootNodeName - what you want the root node to be - defaults to data.
+	 * @param string $rootNodeName - what you want the root node to be -
+	 * defaults to data.
 	 * @param SimpleXMLElement $xml - should only be used recursively
 	 * @return string XML
-	 * @link http://snipplr.com/view/3491/convert-php-array-to-xml-or-simple-xml-object-if-you-wish/
+	 * @link http://bit.ly/n85yLi
 	 */
-	public function toXML( $data, $root_node_name = 'result', $human_readable=false, &$xml=null) {
+	public function toXML( $data, $root_node_name = 'result',
+	$human_readable=false, &$xml=null) {
 
-		// turn off compatibility mode as simple xml throws a wobbly if you don't.
-		if ( ini_get('zend.ze1_compatibility_mode') == 1 ) ini_set ( 'zend.ze1_compatibility_mode', 0 );
-		if ( is_null( $xml ) ) $xml = @simplexml_load_string( "<$root_node_name/>" );
+		// turn off compatibility mode as simple xml
+		//throws a wobbly if you don't.
+		if (ini_get('zend.ze1_compatibility_mode') == 1)
+		ini_set ('zend.ze1_compatibility_mode', 0);
+		if (is_null($xml))
+		$xml = @simplexml_load_string("<$root_node_name/>");
 
 		if(is_array($data)){
 			$numeric=0;
@@ -88,15 +97,18 @@ public function toXML( $data, $root_node_name = 'result', $human_readable=false,
 				// no numeric keys in our xml please!
 				if ( is_numeric( $key ) ) {
 					$numeric = 1;
-					$key = XmlFormat::$root_name == $root_node_name ? XmlFormat::$default_tag_name : $root_node_name;
+					$key = XmlFormat::$root_name == $root_node_name ?
+					XmlFormat::$default_tag_name : $root_node_name;
 				}
 
 				// delete any char not allowed in XML element names
 				$key = preg_replace('/[^a-z0-9\-\_\.\:]/i', '', $key);
 
-				// if there is another array found recrusively call this function
+				// if there is another array found recrusively
+				//call this function
 				if ( is_array( $value ) ) {
-					$node = $this->isAssoc( $value ) || $numeric ? $xml->addChild( $key ) : $xml;
+					$node = $this->isAssoc( $value ) || $numeric ?
+					$xml->addChild( $key ) : $xml;
 
 					// recrusive call.
 					if ( $numeric ) $key = 'anon';
@@ -106,16 +118,20 @@ public function toXML( $data, $root_node_name = 'result', $human_readable=false,
 					// add single node.
 					$value = utf8_encode(htmlentities($value));
 					//$xml->addChild( $key, $value );
-					in_array($key,XmlFormat::$attribute_names) ? $xml->addAttribute($key,$value) : $xml->addChild( $key, $value);
+					in_array($key,XmlFormat::$attribute_names) ?
+					$xml->addAttribute($key,$value) :
+					$xml->addChild( $key, $value);
 				}
 			}
 		}else{ //if given data is a string or number
 			//simply wrap it as text node to root
 			if(is_bool($data)) $data = $data ? 'true' : 'false';
-			$xml->{0} = $data;
+			$xml = @simplexml_load_string(
+			"<$root_node_name>$data</$root_node_name>");
+			//$xml->{0} = $data;
 		}
 		if(!$human_readable){
-			return $xml->saveXML();
+			return $xml->asXML();
 		}else{
 			$dom = dom_import_simplexml($xml)->ownerDocument;
 			$dom->formatOutput = true;
@@ -128,9 +144,10 @@ public function toXML( $data, $root_node_name = 'result', $human_readable=false,
 	 * Pass in an XML document (or SimpleXMLElement object) and this
 	 * recrusively loops through and builds a representative array
 	 *
-	 * @param string $xml - XML document - can optionally be a SimpleXMLElement object
+	 * @param string $xml - XML document - can optionally be a
+	 * SimpleXMLElement object
 	 * @return array ARRAY
-	 * @link http://snipplr.com/view/3491/convert-php-array-to-xml-or-simple-xml-object-if-you-wish/
+	 * @link http://bit.ly/n85yLi
 	 */
 	public function toArray( $xml, $firstCall=true) {
 		if ( is_string( $xml ) ) $xml = new SimpleXMLElement( $xml );
@@ -148,7 +165,8 @@ public function toArray( $xml, $firstCall=true) {
 			XmlFormat::$root_name = $xml->getName();
 			if (XmlFormat::$parse_namespaces){
 				foreach($xml->getDocNamespaces(TRUE) as $namepace => $uri) {
-					$arr[$namepace=='' ? 'xmlns' : 'xmlns:'.$namepace] = (string)$uri;
+					$arr[$namepace=='' ? 'xmlns' :
+					'xmlns:'.$namepace] = (string)$uri;
 				}
 			}
 		}
@@ -159,14 +177,15 @@ public function toArray( $xml, $firstCall=true) {
 				XmlFormat::$attribute_names[]=$attName;
 			}
 		}
-		foreach ( $children as $key => $node ) {
+		foreach ($children as $key => $node) {
 			$node = $this->toArray($node, false);
 			// support for 'anon' non-associative arrays
-			if ( $key == 'anon' ) $key = count( $arr );
+			if ($key == 'anon') $key = count($arr);
 
 			// if the node is already set, put it into an array
-			if ( isset( $arr[$key] ) ) {
-				if ( !is_array( $arr[$key] ) || @$arr[$key][0] == null ) $arr[$key] = array( $arr[$key] );
+			if (isset($arr[$key])) {
+				if ( !is_array($arr[$key]) || @$arr[$key][0] == null )
+				$arr[$key] = array($arr[$key]);
 				$arr[$key][] = $node;
 			} else {
 				$arr[$key] = $node;
@@ -182,11 +201,16 @@ public function toArray( $xml, $firstCall=true) {
 	 * @return string PHP source code to reproduce the configuration
 	 */
 	public static function exportCurrentSettings() {
-		$s = 'XmlFormat::$root_name = "'.(XmlFormat::$root_name)."\";\n";
-		$s .= 'XmlFormat::$attribute_names = '.(var_export(XmlFormat::$attribute_names, true)).";\n";
-		$s .= 'XmlFormat::$default_tag_name = "'.XmlFormat::$default_tag_name."\";\n";
-		$s .= 'XmlFormat::$parse_attributes = '.(XmlFormat::$parse_attributes ? 'true' : 'false').";\n";
-		$s .= 'XmlFormat::$parse_namespaces = '.(XmlFormat::$parse_namespaces ? 'true' : 'false').";\n\n\n";
+		$s = 'XmlFormat::$root_name = "'.
+		(XmlFormat::$root_name)."\";\n";
+		$s .= 'XmlFormat::$attribute_names = '.
+		(var_export(XmlFormat::$attribute_names, true)).";\n";
+		$s .= 'XmlFormat::$default_tag_name = "'.
+		XmlFormat::$default_tag_name."\";\n";
+		$s .= 'XmlFormat::$parse_attributes = '.
+		(XmlFormat::$parse_attributes ? 'true' : 'false').";\n";
+		$s .= 'XmlFormat::$parse_namespaces = '.
+		(XmlFormat::$parse_namespaces ? 'true' : 'false').";\n\n\n";
 		return $s;
 	}
 
diff --git a/restler/yamlformat/LICENSE b/restler/yamlformat/LICENSE
new file mode 100755
index 000000000..3cef85317
--- /dev/null
+++ b/restler/yamlformat/LICENSE
@@ -0,0 +1,19 @@
+Copyright (c) 2008-2009 Fabien Potencier
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is furnished
+to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
diff --git a/restler/yamlformat/README.markdown b/restler/yamlformat/README.markdown
new file mode 100755
index 000000000..e4f80cfba
--- /dev/null
+++ b/restler/yamlformat/README.markdown
@@ -0,0 +1,15 @@
+Symfony YAML: A PHP library that speaks YAML
+============================================
+
+Symfony YAML is a PHP library that parses YAML strings and converts them to
+PHP arrays. It can also converts PHP arrays to YAML strings. Its official
+website is at http://components.symfony-project.org/yaml/.
+
+The documentation is to be found in the `doc/` directory.
+
+Symfony YAML is licensed under the MIT license (see LICENSE file).
+
+The Symfony YAML library is developed and maintained by the
+[symfony](http://www.symfony-project.org/) project team. It has been extracted
+from symfony to be used as a standalone library. Symfony YAML is part of the
+[symfony components project](http://components.symfony-project.org/).
diff --git a/restler/yamlformat/sfyaml.php b/restler/yamlformat/sfyaml.php
new file mode 100755
index 000000000..9fd4670c0
--- /dev/null
+++ b/restler/yamlformat/sfyaml.php
@@ -0,0 +1,137 @@
+<?php
+
+/*
+ * This file is part of the symfony package.
+ * (c) 2004-2006 Fabien Potencier <fabien.potencier@symfony-project.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+include_once 'sfyamlinline.php';
+
+/**
+ * sfYaml offers convenience methods to load and dump YAML.
+ *
+ * @package    symfony
+ * @subpackage yaml
+ * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
+ * @version    SVN: $Id: sfYaml.class.php 8988 2008-05-15 20:24:26Z fabien $
+ */
+class sfYaml
+{
+  static protected
+    $spec = '1.2';
+
+  /**
+   * Sets the YAML specification version to use.
+   *
+   * @param string $version The YAML specification version
+   */
+  static public function setSpecVersion($version)
+  {
+    if (!in_array($version, array('1.1', '1.2')))
+    {
+      throw new InvalidArgumentException(sprintf('Version %s of the YAML specifications is not supported', $version));
+    }
+
+    self::$spec = $version;
+  }
+
+  /**
+   * Gets the YAML specification version to use.
+   *
+   * @return string The YAML specification version
+   */
+  static public function getSpecVersion()
+  {
+    return self::$spec;
+  }
+
+  /**
+   * Loads YAML into a PHP array.
+   *
+   * The load method, when supplied with a YAML stream (string or file),
+   * will do its best to convert YAML in a file into a PHP array.
+   *
+   *  Usage:
+   *  <code>
+   *   $array = sfYaml::load('config.yml');
+   *   print_r($array);
+   *  </code>
+   *
+   * @param string $input Path of YAML file or string containing YAML
+   *
+   * @return array The YAML converted to a PHP array
+   *
+   * @throws InvalidArgumentException If the YAML is not valid
+   */
+  public static function load($input)
+  {
+    $file = '';
+
+    // if input is a file, process it
+    if (strpos($input, "\n") === false && is_file($input))
+    {
+      $file = $input;
+
+      ob_start();
+      $retval = include($input);
+      $content = ob_get_clean();
+
+      // if an array is returned by the config file assume it's in plain php form else in YAML
+      $input = is_array($retval) ? $retval : $content;
+    }
+
+    // if an array is returned by the config file assume it's in plain php form else in YAML
+    if (is_array($input))
+    {
+      return $input;
+    }
+
+    require_once dirname(__FILE__).'/sfYamlParser.php';
+
+    $yaml = new sfYamlParser();
+
+    try
+    {
+      $ret = $yaml->parse($input);
+    }
+    catch (Exception $e)
+    {
+      throw new InvalidArgumentException(sprintf('Unable to parse %s: %s', $file ? sprintf('file "%s"', $file) : 'string', $e->getMessage()));
+    }
+
+    return $ret;
+  }
+
+  /**
+   * Dumps a PHP array to a YAML string.
+   *
+   * The dump method, when supplied with an array, will do its best
+   * to convert the array into friendly YAML.
+   *
+   * @param array   $array PHP array
+   * @param integer $inline The level where you switch to inline YAML
+   *
+   * @return string A YAML string representing the original PHP array
+   */
+  public static function dump($array, $inline = 2)
+  {
+    require_once dirname(__FILE__).'/sfYamlDumper.php';
+
+    $yaml = new sfYamlDumper();
+
+    return $yaml->dump($array, $inline);
+  }
+}
+
+/**
+ * Wraps echo to automatically provide a newline.
+ *
+ * @param string $string The string to echo with new line
+ */
+function echoln($string)
+{
+  echo $string."\n";
+}
diff --git a/restler/yamlformat/sfyamlInline.php b/restler/yamlformat/sfyamlInline.php
new file mode 100755
index 000000000..bc8397ab4
--- /dev/null
+++ b/restler/yamlformat/sfyamlInline.php
@@ -0,0 +1,442 @@
+<?php
+
+/*
+ * This file is part of the symfony package.
+ * (c) Fabien Potencier <fabien.potencier@symfony-project.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+//require_once dirname(__FILE__).'/sfYaml.php';
+
+/**
+ * sfYamlInline implements a YAML parser/dumper for the YAML inline syntax.
+ *
+ * @package    symfony
+ * @subpackage yaml
+ * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
+ * @version    SVN: $Id: sfYamlInline.class.php 16177 2009-03-11 08:32:48Z fabien $
+ */
+class sfYamlInline
+{
+  const REGEX_QUOTED_STRING = '(?:"([^"\\\\]*(?:\\\\.[^"\\\\]*)*)"|\'([^\']*(?:\'\'[^\']*)*)\')';
+
+  /**
+   * Convert a YAML string to a PHP array.
+   *
+   * @param string $value A YAML string
+   *
+   * @return array A PHP array representing the YAML string
+   */
+  static public function load($value)
+  {
+    $value = trim($value);
+
+    if (0 == strlen($value))
+    {
+      return '';
+    }
+
+    if (function_exists('mb_internal_encoding') && ((int) ini_get('mbstring.func_overload')) & 2)
+    {
+      $mbEncoding = mb_internal_encoding();
+      mb_internal_encoding('ASCII');
+    }
+
+    switch ($value[0])
+    {
+      case '[':
+        $result = self::parseSequence($value);
+        break;
+      case '{':
+        $result = self::parseMapping($value);
+        break;
+      default:
+        $result = self::parseScalar($value);
+    }
+
+    if (isset($mbEncoding))
+    {
+      mb_internal_encoding($mbEncoding);
+    }
+
+    return $result;
+  }
+
+  /**
+   * Dumps a given PHP variable to a YAML string.
+   *
+   * @param mixed $value The PHP variable to convert
+   *
+   * @return string The YAML string representing the PHP array
+   */
+  static public function dump($value)
+  {
+    if ('1.1' === sfYaml::getSpecVersion())
+    {
+      $trueValues = array('true', 'on', '+', 'yes', 'y');
+      $falseValues = array('false', 'off', '-', 'no', 'n');
+    }
+    else
+    {
+      $trueValues = array('true');
+      $falseValues = array('false');
+    }
+
+    switch (true)
+    {
+      case is_resource($value):
+        throw new InvalidArgumentException('Unable to dump PHP resources in a YAML file.');
+      case is_object($value):
+        return '!!php/object:'.serialize($value);
+      case is_array($value):
+        return self::dumpArray($value);
+      case null === $value:
+        return 'null';
+      case true === $value:
+        return 'true';
+      case false === $value:
+        return 'false';
+      case ctype_digit($value):
+        return is_string($value) ? "'$value'" : (int) $value;
+      case is_numeric($value):
+        return is_infinite($value) ? str_ireplace('INF', '.Inf', strval($value)) : (is_string($value) ? "'$value'" : $value);
+      case false !== strpos($value, "\n") || false !== strpos($value, "\r"):
+        return sprintf('"%s"', str_replace(array('"', "\n", "\r"), array('\\"', '\n', '\r'), $value));
+      case preg_match('/[ \s \' " \: \{ \} \[ \] , & \* \# \?] | \A[ - ? | < > = ! % @ ` ]/x', $value):
+        return sprintf("'%s'", str_replace('\'', '\'\'', $value));
+      case '' == $value:
+        return "''";
+      case preg_match(self::getTimestampRegex(), $value):
+        return "'$value'";
+      case in_array(strtolower($value), $trueValues):
+        return "'$value'";
+      case in_array(strtolower($value), $falseValues):
+        return "'$value'";
+      case in_array(strtolower($value), array('null', '~')):
+        return "'$value'";
+      default:
+        return $value;
+    }
+  }
+
+  /**
+   * Dumps a PHP array to a YAML string.
+   *
+   * @param array $value The PHP array to dump
+   *
+   * @return string The YAML string representing the PHP array
+   */
+  static protected function dumpArray($value)
+  {
+    // array
+    $keys = array_keys($value);
+    if (
+      (1 == count($keys) && '0' == $keys[0])
+      ||
+      (count($keys) > 1 && array_reduce($keys, create_function('$v,$w', 'return (integer) $v + $w;'), 0) == count($keys) * (count($keys) - 1) / 2))
+    {
+      $output = array();
+      foreach ($value as $val)
+      {
+        $output[] = self::dump($val);
+      }
+
+      return sprintf('[%s]', implode(', ', $output));
+    }
+
+    // mapping
+    $output = array();
+    foreach ($value as $key => $val)
+    {
+      $output[] = sprintf('%s: %s', self::dump($key), self::dump($val));
+    }
+
+    return sprintf('{ %s }', implode(', ', $output));
+  }
+
+  /**
+   * Parses a scalar to a YAML string.
+   *
+   * @param scalar  $scalar
+   * @param string  $delimiters
+   * @param array   $stringDelimiter
+   * @param integer $i
+   * @param boolean $evaluate
+   *
+   * @return string A YAML string
+   */
+  static public function parseScalar($scalar, $delimiters = null, $stringDelimiters = array('"', "'"), &$i = 0, $evaluate = true)
+  {
+    if (in_array($scalar[$i], $stringDelimiters))
+    {
+      // quoted scalar
+      $output = self::parseQuotedScalar($scalar, $i);
+    }
+    else
+    {
+      // "normal" string
+      if (!$delimiters)
+      {
+        $output = substr($scalar, $i);
+        $i += strlen($output);
+
+        // remove comments
+        if (false !== $strpos = strpos($output, ' #'))
+        {
+          $output = rtrim(substr($output, 0, $strpos));
+        }
+      }
+      else if (preg_match('/^(.+?)('.implode('|', $delimiters).')/', substr($scalar, $i), $match))
+      {
+        $output = $match[1];
+        $i += strlen($output);
+      }
+      else
+      {
+        throw new InvalidArgumentException(sprintf('Malformed inline YAML string (%s).', $scalar));
+      }
+
+      $output = $evaluate ? self::evaluateScalar($output) : $output;
+    }
+
+    return $output;
+  }
+
+  /**
+   * Parses a quoted scalar to YAML.
+   *
+   * @param string  $scalar
+   * @param integer $i
+   *
+   * @return string A YAML string
+   */
+  static protected function parseQuotedScalar($scalar, &$i)
+  {
+    if (!preg_match('/'.self::REGEX_QUOTED_STRING.'/Au', substr($scalar, $i), $match))
+    {
+      throw new InvalidArgumentException(sprintf('Malformed inline YAML string (%s).', substr($scalar, $i)));
+    }
+
+    $output = substr($match[0], 1, strlen($match[0]) - 2);
+
+    if ('"' == $scalar[$i])
+    {
+      // evaluate the string
+      $output = str_replace(array('\\"', '\\n', '\\r'), array('"', "\n", "\r"), $output);
+    }
+    else
+    {
+      // unescape '
+      $output = str_replace('\'\'', '\'', $output);
+    }
+
+    $i += strlen($match[0]);
+
+    return $output;
+  }
+
+  /**
+   * Parses a sequence to a YAML string.
+   *
+   * @param string  $sequence
+   * @param integer $i
+   *
+   * @return string A YAML string
+   */
+  static protected function parseSequence($sequence, &$i = 0)
+  {
+    $output = array();
+    $len = strlen($sequence);
+    $i += 1;
+
+    // [foo, bar, ...]
+    while ($i < $len)
+    {
+      switch ($sequence[$i])
+      {
+        case '[':
+          // nested sequence
+          $output[] = self::parseSequence($sequence, $i);
+          break;
+        case '{':
+          // nested mapping
+          $output[] = self::parseMapping($sequence, $i);
+          break;
+        case ']':
+          return $output;
+        case ',':
+        case ' ':
+          break;
+        default:
+          $isQuoted = in_array($sequence[$i], array('"', "'"));
+          $value = self::parseScalar($sequence, array(',', ']'), array('"', "'"), $i);
+
+          if (!$isQuoted && false !== strpos($value, ': '))
+          {
+            // embedded mapping?
+            try
+            {
+              $value = self::parseMapping('{'.$value.'}');
+            }
+            catch (InvalidArgumentException $e)
+            {
+              // no, it's not
+            }
+          }
+
+          $output[] = $value;
+
+          --$i;
+      }
+
+      ++$i;
+    }
+
+    throw new InvalidArgumentException(sprintf('Malformed inline YAML string %s', $sequence));
+  }
+
+  /**
+   * Parses a mapping to a YAML string.
+   *
+   * @param string  $mapping
+   * @param integer $i
+   *
+   * @return string A YAML string
+   */
+  static protected function parseMapping($mapping, &$i = 0)
+  {
+    $output = array();
+    $len = strlen($mapping);
+    $i += 1;
+
+    // {foo: bar, bar:foo, ...}
+    while ($i < $len)
+    {
+      switch ($mapping[$i])
+      {
+        case ' ':
+        case ',':
+          ++$i;
+          continue 2;
+        case '}':
+          return $output;
+      }
+
+      // key
+      $key = self::parseScalar($mapping, array(':', ' '), array('"', "'"), $i, false);
+
+      // value
+      $done = false;
+      while ($i < $len)
+      {
+        switch ($mapping[$i])
+        {
+          case '[':
+            // nested sequence
+            $output[$key] = self::parseSequence($mapping, $i);
+            $done = true;
+            break;
+          case '{':
+            // nested mapping
+            $output[$key] = self::parseMapping($mapping, $i);
+            $done = true;
+            break;
+          case ':':
+          case ' ':
+            break;
+          default:
+            $output[$key] = self::parseScalar($mapping, array(',', '}'), array('"', "'"), $i);
+            $done = true;
+            --$i;
+        }
+
+        ++$i;
+
+        if ($done)
+        {
+          continue 2;
+        }
+      }
+    }
+
+    throw new InvalidArgumentException(sprintf('Malformed inline YAML string %s', $mapping));
+  }
+
+  /**
+   * Evaluates scalars and replaces magic values.
+   *
+   * @param string $scalar
+   *
+   * @return string A YAML string
+   */
+  static protected function evaluateScalar($scalar)
+  {
+    $scalar = trim($scalar);
+
+    if ('1.1' === sfYaml::getSpecVersion())
+    {
+      $trueValues = array('true', 'on', '+', 'yes', 'y');
+      $falseValues = array('false', 'off', '-', 'no', 'n');
+    }
+    else
+    {
+      $trueValues = array('true');
+      $falseValues = array('false');
+    }
+
+    switch (true)
+    {
+      case 'null' == strtolower($scalar):
+      case '' == $scalar:
+      case '~' == $scalar:
+        return null;
+      case 0 === strpos($scalar, '!str'):
+        return (string) substr($scalar, 5);
+      case 0 === strpos($scalar, '! '):
+        return intval(self::parseScalar(substr($scalar, 2)));
+      case 0 === strpos($scalar, '!!php/object:'):
+        return unserialize(substr($scalar, 13));
+      case ctype_digit($scalar):
+        $raw = $scalar;
+        $cast = intval($scalar);
+        return '0' == $scalar[0] ? octdec($scalar) : (((string) $raw == (string) $cast) ? $cast : $raw);
+      case in_array(strtolower($scalar), $trueValues):
+        return true;
+      case in_array(strtolower($scalar), $falseValues):
+        return false;
+      case is_numeric($scalar):
+        return '0x' == $scalar[0].$scalar[1] ? hexdec($scalar) : floatval($scalar);
+      case 0 == strcasecmp($scalar, '.inf'):
+      case 0 == strcasecmp($scalar, '.NaN'):
+        return -log(0);
+      case 0 == strcasecmp($scalar, '-.inf'):
+        return log(0);
+      case preg_match('/^(-|\+)?[0-9,]+(\.[0-9]+)?$/', $scalar):
+        return floatval(str_replace(',', '', $scalar));
+      case preg_match(self::getTimestampRegex(), $scalar):
+        return strtotime($scalar);
+      default:
+        return (string) $scalar;
+    }
+  }
+
+  static protected function getTimestampRegex()
+  {
+    return <<<EOF
+    ~^
+    (?P<year>[0-9][0-9][0-9][0-9])
+    -(?P<month>[0-9][0-9]?)
+    -(?P<day>[0-9][0-9]?)
+    (?:(?:[Tt]|[ \t]+)
+    (?P<hour>[0-9][0-9]?)
+    :(?P<minute>[0-9][0-9])
+    :(?P<second>[0-9][0-9])
+    (?:\.(?P<fraction>[0-9]*))?
+    (?:[ \t]*(?P<tz>Z|(?P<tz_sign>[-+])(?P<tz_hour>[0-9][0-9]?)
+    (?::(?P<tz_minute>[0-9][0-9]))?))?)?
+    $~x
+EOF;
+  }
+}
diff --git a/restler/yamlformat/sfyamldumper.php b/restler/yamlformat/sfyamldumper.php
new file mode 100755
index 000000000..56e4a234f
--- /dev/null
+++ b/restler/yamlformat/sfyamldumper.php
@@ -0,0 +1,60 @@
+<?php
+
+/*
+ * This file is part of the symfony package.
+ * (c) Fabien Potencier <fabien.potencier@symfony-project.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+//require_once(dirname(__FILE__).'/sfYamlInline.php');
+
+/**
+ * sfYamlDumper dumps PHP variables to YAML strings.
+ *
+ * @package    symfony
+ * @subpackage yaml
+ * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
+ * @version    SVN: $Id: sfYamlDumper.class.php 10575 2008-08-01 13:08:42Z nicolas $
+ */
+class sfYamlDumper
+{
+  /**
+   * Dumps a PHP value to YAML.
+   *
+   * @param  mixed   $input  The PHP value
+   * @param  integer $inline The level where you switch to inline YAML
+   * @param  integer $indent The level o indentation indentation (used internally)
+   *
+   * @return string  The YAML representation of the PHP value
+   */
+  public function dump($input, $inline = 0, $indent = 0)
+  {
+    $output = '';
+    $prefix = $indent ? str_repeat(' ', $indent) : '';
+
+    if ($inline <= 0 || !is_array($input) || empty($input))
+    {
+      $output .= $prefix.sfYamlInline::dump($input);
+    }
+    else
+    {
+      $isAHash = array_keys($input) !== range(0, count($input) - 1);
+
+      foreach ($input as $key => $value)
+      {
+        $willBeInlined = $inline - 1 <= 0 || !is_array($value) || empty($value);
+
+        $output .= sprintf('%s%s%s%s',
+          $prefix,
+          $isAHash ? sfYamlInline::dump($key).':' : '-',
+          $willBeInlined ? ' ' : "\n",
+          $this->dump($value, $inline - 1, $willBeInlined ? 0 : $indent + 2)
+        ).($willBeInlined ? "\n" : '');
+      }
+    }
+
+    return $output;
+  }
+}
diff --git a/restler/yamlformat/sfyamlparser.php b/restler/yamlformat/sfyamlparser.php
new file mode 100755
index 000000000..a10286b2d
--- /dev/null
+++ b/restler/yamlformat/sfyamlparser.php
@@ -0,0 +1,622 @@
+<?php
+
+/*
+ * This file is part of the symfony package.
+ * (c) Fabien Potencier <fabien.potencier@symfony-project.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+//require_once(dirname(__FILE__).'/sfYamlInline.php');
+
+if (!defined('PREG_BAD_UTF8_OFFSET_ERROR'))
+{
+  define('PREG_BAD_UTF8_OFFSET_ERROR', 5);
+}
+
+/**
+ * sfYamlParser parses YAML strings to convert them to PHP arrays.
+ *
+ * @package    symfony
+ * @subpackage yaml
+ * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
+ * @version    SVN: $Id: sfYamlParser.class.php 10832 2008-08-13 07:46:08Z fabien $
+ */
+class sfYamlParser
+{
+  protected
+    $offset        = 0,
+    $lines         = array(),
+    $currentLineNb = -1,
+    $currentLine   = '',
+    $refs          = array();
+
+  /**
+   * Constructor
+   *
+   * @param integer $offset The offset of YAML document (used for line numbers in error messages)
+   */
+  public function __construct($offset = 0)
+  {
+    $this->offset = $offset;
+  }
+
+  /**
+   * Parses a YAML string to a PHP value.
+   *
+   * @param  string $value A YAML string
+   *
+   * @return mixed  A PHP value
+   *
+   * @throws InvalidArgumentException If the YAML is not valid
+   */
+  public function parse($value)
+  {
+    $this->currentLineNb = -1;
+    $this->currentLine = '';
+    $this->lines = explode("\n", $this->cleanup($value));
+
+    if (function_exists('mb_internal_encoding') && ((int) ini_get('mbstring.func_overload')) & 2)
+    {
+      $mbEncoding = mb_internal_encoding();
+      mb_internal_encoding('UTF-8');
+    }
+
+    $data = array();
+    while ($this->moveToNextLine())
+    {
+      if ($this->isCurrentLineEmpty())
+      {
+        continue;
+      }
+
+      // tab?
+      if (preg_match('#^\t+#', $this->currentLine))
+      {
+        throw new InvalidArgumentException(sprintf('A YAML file cannot contain tabs as indentation at line %d (%s).', $this->getRealCurrentLineNb() + 1, $this->currentLine));
+      }
+
+      $isRef = $isInPlace = $isProcessed = false;
+      if (preg_match('#^\-((?P<leadspaces>\s+)(?P<value>.+?))?\s*$#u', $this->currentLine, $values))
+      {
+        if (isset($values['value']) && preg_match('#^&(?P<ref>[^ ]+) *(?P<value>.*)#u', $values['value'], $matches))
+        {
+          $isRef = $matches['ref'];
+          $values['value'] = $matches['value'];
+        }
+
+        // array
+        if (!isset($values['value']) || '' == trim($values['value'], ' ') || 0 === strpos(ltrim($values['value'], ' '), '#'))
+        {
+          $c = $this->getRealCurrentLineNb() + 1;
+          $parser = new sfYamlParser($c);
+          $parser->refs =& $this->refs;
+          $data[] = $parser->parse($this->getNextEmbedBlock());
+        }
+        else
+        {
+          if (isset($values['leadspaces'])
+            && ' ' == $values['leadspaces']
+            && preg_match('#^(?P<key>'.sfYamlInline::REGEX_QUOTED_STRING.'|[^ \'"\{].*?) *\:(\s+(?P<value>.+?))?\s*$#u', $values['value'], $matches))
+          {
+            // this is a compact notation element, add to next block and parse
+            $c = $this->getRealCurrentLineNb();
+            $parser = new sfYamlParser($c);
+            $parser->refs =& $this->refs;
+
+            $block = $values['value'];
+            if (!$this->isNextLineIndented())
+            {
+              $block .= "\n".$this->getNextEmbedBlock($this->getCurrentLineIndentation() + 2);
+            }
+
+            $data[] = $parser->parse($block);
+          }
+          else
+          {
+            $data[] = $this->parseValue($values['value']);
+          }
+        }
+      }
+      else if (preg_match('#^(?P<key>'.sfYamlInline::REGEX_QUOTED_STRING.'|[^ \'"].*?) *\:(\s+(?P<value>.+?))?\s*$#u', $this->currentLine, $values))
+      {
+        $key = sfYamlInline::parseScalar($values['key']);
+
+        if ('<<' === $key)
+        {
+          if (isset($values['value']) && '*' === substr($values['value'], 0, 1))
+          {
+            $isInPlace = substr($values['value'], 1);
+            if (!array_key_exists($isInPlace, $this->refs))
+            {
+              throw new InvalidArgumentException(sprintf('Reference "%s" does not exist at line %s (%s).', $isInPlace, $this->getRealCurrentLineNb() + 1, $this->currentLine));
+            }
+          }
+          else
+          {
+            if (isset($values['value']) && $values['value'] !== '')
+            {
+              $value = $values['value'];
+            }
+            else
+            {
+              $value = $this->getNextEmbedBlock();
+            }
+            $c = $this->getRealCurrentLineNb() + 1;
+            $parser = new sfYamlParser($c);
+            $parser->refs =& $this->refs;
+            $parsed = $parser->parse($value);
+
+            $merged = array();
+            if (!is_array($parsed))
+            {
+              throw new InvalidArgumentException(sprintf("YAML merge keys used with a scalar value instead of an array at line %s (%s)", $this->getRealCurrentLineNb() + 1, $this->currentLine));
+            }
+            else if (isset($parsed[0]))
+            {
+              // Numeric array, merge individual elements
+              foreach (array_reverse($parsed) as $parsedItem)
+              {
+                if (!is_array($parsedItem))
+                {
+                  throw new InvalidArgumentException(sprintf("Merge items must be arrays at line %s (%s).", $this->getRealCurrentLineNb() + 1, $parsedItem));
+                }
+                $merged = array_merge($parsedItem, $merged);
+              }
+            }
+            else
+            {
+              // Associative array, merge
+              $merged = array_merge($merged, $parsed);
+            }
+
+            $isProcessed = $merged;
+          }
+        }
+        else if (isset($values['value']) && preg_match('#^&(?P<ref>[^ ]+) *(?P<value>.*)#u', $values['value'], $matches))
+        {
+          $isRef = $matches['ref'];
+          $values['value'] = $matches['value'];
+        }
+
+        if ($isProcessed)
+        {
+          // Merge keys
+          $data = $isProcessed;
+        }
+        // hash
+        else if (!isset($values['value']) || '' == trim($values['value'], ' ') || 0 === strpos(ltrim($values['value'], ' '), '#'))
+        {
+          // if next line is less indented or equal, then it means that the current value is null
+          if ($this->isNextLineIndented())
+          {
+            $data[$key] = null;
+          }
+          else
+          {
+            $c = $this->getRealCurrentLineNb() + 1;
+            $parser = new sfYamlParser($c);
+            $parser->refs =& $this->refs;
+            $data[$key] = $parser->parse($this->getNextEmbedBlock());
+          }
+        }
+        else
+        {
+          if ($isInPlace)
+          {
+            $data = $this->refs[$isInPlace];
+          }
+          else
+          {
+            $data[$key] = $this->parseValue($values['value']);
+          }
+        }
+      }
+      else
+      {
+        // 1-liner followed by newline
+        if (2 == count($this->lines) && empty($this->lines[1]))
+        {
+          $value = sfYamlInline::load($this->lines[0]);
+          if (is_array($value))
+          {
+            $first = reset($value);
+            if ('*' === substr($first, 0, 1))
+            {
+              $data = array();
+              foreach ($value as $alias)
+              {
+                $data[] = $this->refs[substr($alias, 1)];
+              }
+              $value = $data;
+            }
+          }
+
+          if (isset($mbEncoding))
+          {
+            mb_internal_encoding($mbEncoding);
+          }
+
+          return $value;
+        }
+
+        switch (preg_last_error())
+        {
+          case PREG_INTERNAL_ERROR:
+            $error = 'Internal PCRE error on line';
+            break;
+          case PREG_BACKTRACK_LIMIT_ERROR:
+            $error = 'pcre.backtrack_limit reached on line';
+            break;
+          case PREG_RECURSION_LIMIT_ERROR:
+            $error = 'pcre.recursion_limit reached on line';
+            break;
+          case PREG_BAD_UTF8_ERROR:
+            $error = 'Malformed UTF-8 data on line';
+            break;
+          case PREG_BAD_UTF8_OFFSET_ERROR:
+            $error = 'Offset doesn\'t correspond to the begin of a valid UTF-8 code point on line';
+            break;
+          default:
+            $error = 'Unable to parse line';
+        }
+
+        throw new InvalidArgumentException(sprintf('%s %d (%s).', $error, $this->getRealCurrentLineNb() + 1, $this->currentLine));
+      }
+
+      if ($isRef)
+      {
+        $this->refs[$isRef] = end($data);
+      }
+    }
+
+    if (isset($mbEncoding))
+    {
+      mb_internal_encoding($mbEncoding);
+    }
+
+    return empty($data) ? null : $data;
+  }
+
+  /**
+   * Returns the current line number (takes the offset into account).
+   *
+   * @return integer The current line number
+   */
+  protected function getRealCurrentLineNb()
+  {
+    return $this->currentLineNb + $this->offset;
+  }
+
+  /**
+   * Returns the current line indentation.
+   *
+   * @return integer The current line indentation
+   */
+  protected function getCurrentLineIndentation()
+  {
+    return strlen($this->currentLine) - strlen(ltrim($this->currentLine, ' '));
+  }
+
+  /**
+   * Returns the next embed block of YAML.
+   *
+   * @param integer $indentation The indent level at which the block is to be read, or null for default
+   *
+   * @return string A YAML string
+   */
+  protected function getNextEmbedBlock($indentation = null)
+  {
+    $this->moveToNextLine();
+
+    if (null === $indentation)
+    {
+      $newIndent = $this->getCurrentLineIndentation();
+
+      if (!$this->isCurrentLineEmpty() && 0 == $newIndent)
+      {
+        throw new InvalidArgumentException(sprintf('Indentation problem at line %d (%s)', $this->getRealCurrentLineNb() + 1, $this->currentLine));
+      }
+    }
+    else
+    {
+      $newIndent = $indentation;
+    }
+
+    $data = array(substr($this->currentLine, $newIndent));
+
+    while ($this->moveToNextLine())
+    {
+      if ($this->isCurrentLineEmpty())
+      {
+        if ($this->isCurrentLineBlank())
+        {
+          $data[] = substr($this->currentLine, $newIndent);
+        }
+
+        continue;
+      }
+
+      $indent = $this->getCurrentLineIndentation();
+
+      if (preg_match('#^(?P<text> *)$#', $this->currentLine, $match))
+      {
+        // empty line
+        $data[] = $match['text'];
+      }
+      else if ($indent >= $newIndent)
+      {
+        $data[] = substr($this->currentLine, $newIndent);
+      }
+      else if (0 == $indent)
+      {
+        $this->moveToPreviousLine();
+
+        break;
+      }
+      else
+      {
+        throw new InvalidArgumentException(sprintf('Indentation problem at line %d (%s)', $this->getRealCurrentLineNb() + 1, $this->currentLine));
+      }
+    }
+
+    return implode("\n", $data);
+  }
+
+  /**
+   * Moves the parser to the next line.
+   */
+  protected function moveToNextLine()
+  {
+    if ($this->currentLineNb >= count($this->lines) - 1)
+    {
+      return false;
+    }
+
+    $this->currentLine = $this->lines[++$this->currentLineNb];
+
+    return true;
+  }
+
+  /**
+   * Moves the parser to the previous line.
+   */
+  protected function moveToPreviousLine()
+  {
+    $this->currentLine = $this->lines[--$this->currentLineNb];
+  }
+
+  /**
+   * Parses a YAML value.
+   *
+   * @param  string $value A YAML value
+   *
+   * @return mixed  A PHP value
+   */
+  protected function parseValue($value)
+  {
+    if ('*' === substr($value, 0, 1))
+    {
+      if (false !== $pos = strpos($value, '#'))
+      {
+        $value = substr($value, 1, $pos - 2);
+      }
+      else
+      {
+        $value = substr($value, 1);
+      }
+
+      if (!array_key_exists($value, $this->refs))
+      {
+        throw new InvalidArgumentException(sprintf('Reference "%s" does not exist (%s).', $value, $this->currentLine));
+      }
+      return $this->refs[$value];
+    }
+
+    if (preg_match('/^(?P<separator>\||>)(?P<modifiers>\+|\-|\d+|\+\d+|\-\d+|\d+\+|\d+\-)?(?P<comments> +#.*)?$/', $value, $matches))
+    {
+      $modifiers = isset($matches['modifiers']) ? $matches['modifiers'] : '';
+
+      return $this->parseFoldedScalar($matches['separator'], preg_replace('#\d+#', '', $modifiers), intval(abs($modifiers)));
+    }
+    else
+    {
+      return sfYamlInline::load($value);
+    }
+  }
+
+  /**
+   * Parses a folded scalar.
+   *
+   * @param  string  $separator   The separator that was used to begin this folded scalar (| or >)
+   * @param  string  $indicator   The indicator that was used to begin this folded scalar (+ or -)
+   * @param  integer $indentation The indentation that was used to begin this folded scalar
+   *
+   * @return string  The text value
+   */
+  protected function parseFoldedScalar($separator, $indicator = '', $indentation = 0)
+  {
+    $separator = '|' == $separator ? "\n" : ' ';
+    $text = '';
+
+    $notEOF = $this->moveToNextLine();
+
+    while ($notEOF && $this->isCurrentLineBlank())
+    {
+      $text .= "\n";
+
+      $notEOF = $this->moveToNextLine();
+    }
+
+    if (!$notEOF)
+    {
+      return '';
+    }
+
+    if (!preg_match('#^(?P<indent>'.($indentation ? str_repeat(' ', $indentation) : ' +').')(?P<text>.*)$#u', $this->currentLine, $matches))
+    {
+      $this->moveToPreviousLine();
+
+      return '';
+    }
+
+    $textIndent = $matches['indent'];
+    $previousIndent = 0;
+
+    $text .= $matches['text'].$separator;
+    while ($this->currentLineNb + 1 < count($this->lines))
+    {
+      $this->moveToNextLine();
+
+      if (preg_match('#^(?P<indent> {'.strlen($textIndent).',})(?P<text>.+)$#u', $this->currentLine, $matches))
+      {
+        if (' ' == $separator && $previousIndent != $matches['indent'])
+        {
+          $text = substr($text, 0, -1)."\n";
+        }
+        $previousIndent = $matches['indent'];
+
+        $text .= str_repeat(' ', $diff = strlen($matches['indent']) - strlen($textIndent)).$matches['text'].($diff ? "\n" : $separator);
+      }
+      else if (preg_match('#^(?P<text> *)$#', $this->currentLine, $matches))
+      {
+        $text .= preg_replace('#^ {1,'.strlen($textIndent).'}#', '', $matches['text'])."\n";
+      }
+      else
+      {
+        $this->moveToPreviousLine();
+
+        break;
+      }
+    }
+
+    if (' ' == $separator)
+    {
+      // replace last separator by a newline
+      $text = preg_replace('/ (\n*)$/', "\n$1", $text);
+    }
+
+    switch ($indicator)
+    {
+      case '':
+        $text = preg_replace('#\n+$#s', "\n", $text);
+        break;
+      case '+':
+        break;
+      case '-':
+        $text = preg_replace('#\n+$#s', '', $text);
+        break;
+    }
+
+    return $text;
+  }
+
+  /**
+   * Returns true if the next line is indented.
+   *
+   * @return Boolean Returns true if the next line is indented, false otherwise
+   */
+  protected function isNextLineIndented()
+  {
+    $currentIndentation = $this->getCurrentLineIndentation();
+    $notEOF = $this->moveToNextLine();
+
+    while ($notEOF && $this->isCurrentLineEmpty())
+    {
+      $notEOF = $this->moveToNextLine();
+    }
+
+    if (false === $notEOF)
+    {
+      return false;
+    }
+
+    $ret = false;
+    if ($this->getCurrentLineIndentation() <= $currentIndentation)
+    {
+      $ret = true;
+    }
+
+    $this->moveToPreviousLine();
+
+    return $ret;
+  }
+
+  /**
+   * Returns true if the current line is blank or if it is a comment line.
+   *
+   * @return Boolean Returns true if the current line is empty or if it is a comment line, false otherwise
+   */
+  protected function isCurrentLineEmpty()
+  {
+    return $this->isCurrentLineBlank() || $this->isCurrentLineComment();
+  }
+
+  /**
+   * Returns true if the current line is blank.
+   *
+   * @return Boolean Returns true if the current line is blank, false otherwise
+   */
+  protected function isCurrentLineBlank()
+  {
+    return '' == trim($this->currentLine, ' ');
+  }
+
+  /**
+   * Returns true if the current line is a comment line.
+   *
+   * @return Boolean Returns true if the current line is a comment line, false otherwise
+   */
+  protected function isCurrentLineComment()
+  {
+    //checking explicitly the first char of the trim is faster than loops or strpos
+    $ltrimmedLine = ltrim($this->currentLine, ' ');
+    return $ltrimmedLine[0] === '#';
+  }
+
+  /**
+   * Cleanups a YAML string to be parsed.
+   *
+   * @param  string $value The input YAML string
+   *
+   * @return string A cleaned up YAML string
+   */
+  protected function cleanup($value)
+  {
+    $value = str_replace(array("\r\n", "\r"), "\n", $value);
+
+    if (!preg_match("#\n$#", $value))
+    {
+      $value .= "\n";
+    }
+
+    // strip YAML header
+    $count = 0;
+    $value = preg_replace('#^\%YAML[: ][\d\.]+.*\n#su', '', $value, -1, $count);
+    $this->offset += $count;
+
+    // remove leading comments
+    $trimmedValue = preg_replace('#^(\#.*?\n)+#s', '', $value, -1, $count);
+    if ($count == 1)
+    {
+      // items have been removed, update the offset
+      $this->offset += substr_count($value, "\n") - substr_count($trimmedValue, "\n");
+      $value = $trimmedValue;
+    }
+
+    // remove start of the document marker (---)
+    $trimmedValue = preg_replace('#^\-\-\-.*?\n#s', '', $value, -1, $count);
+    if ($count == 1)
+    {
+      // items have been removed, update the offset
+      $this->offset += substr_count($value, "\n") - substr_count($trimmedValue, "\n");
+      $value = $trimmedValue;
+
+      // remove end of the document marker (...)
+      $value = preg_replace('#\.\.\.\s*$#s', '', $value);
+    }
+
+    return $value;
+  }
+}
diff --git a/restler/yamlformat/yamlformat.php b/restler/yamlformat/yamlformat.php
new file mode 100644
index 000000000..52abcbf1b
--- /dev/null
+++ b/restler/yamlformat/yamlformat.php
@@ -0,0 +1,47 @@
+<?php
+/**
+ * YAML Format for Restler Framework
+ * @category   Framework
+ * @package    restler
+ * @subpackage format
+ * @author     R.Arul Kumaran <arul@luracast.com>
+ * @copyright  2010 Luracast
+ * @license    http://www.opensource.org/licenses/lgpl-license.php LGPL
+ * @link       http://luracast.com/products/restler/
+ */
+class YamlFormat implements iFormat
+{
+	const MIME ='text/plain';
+	const EXTENSION = 'yaml';
+
+	public function getMIMEMap()
+	{
+		return array(YamlFormat::EXTENSION=>YamlFormat::MIME);
+	}
+	public function getMIME(){
+		return  YamlFormat::MIME;
+	}
+	public function getExtension(){
+		return YamlFormat::EXTENSION;
+	}
+	public function setMIME($mime){
+		//do nothing
+	}
+	public function setExtension($extension){
+		//do nothing
+	}
+
+	public function encode($data, $human_readable=false){
+		require_once 'sfyaml.php';
+		return sfYaml::dump(object_to_array($data));
+	}
+
+	public function decode($data){
+		require_once 'sfyaml.php';
+		return sfYaml::load($data);
+	}
+
+	public function __toString(){
+		return $this->getExtension();
+	}
+}
\ No newline at end of file

From 3aade21ec5eefa0fb315ff7459eb490ad290af21 Mon Sep 17 00:00:00 2001
From: Luracast <arul@luracast.com>
Date: Thu, 25 Aug 2011 22:29:23 +0800
Subject: [PATCH 12/61] Adding minified version of RESTler 2 php files to
 `restler_minified` folder for use on production server.

---
 .../amfformat/Zend/Amf/Constants.php             |  2 ++
 .../Zend/Amf/Parse/Amf3/Deserializer.php         |  2 ++
 .../amfformat/Zend/Amf/Parse/Amf3/Serializer.php |  2 ++
 .../amfformat/Zend/Amf/Parse/Deserializer.php    |  2 ++
 .../amfformat/Zend/Amf/Parse/InputStream.php     |  2 ++
 .../amfformat/Zend/Amf/Parse/OutputStream.php    |  2 ++
 .../amfformat/Zend/Amf/Parse/Serializer.php      |  2 ++
 .../amfformat/Zend/Amf/Parse/TypeLoader.php      |  2 ++
 .../amfformat/Zend/Amf/Util/BinaryStream.php     |  2 ++
 .../Zend/Amf/Value/Messaging/AbstractMessage.php |  2 ++
 .../Amf/Value/Messaging/AcknowledgeMessage.php   |  2 ++
 .../Zend/Amf/Value/Messaging/AsyncMessage.php    |  2 ++
 .../Zend/Amf/Value/Messaging/CommandMessage.php  |  2 ++
 .../Zend/Amf/Value/Messaging/ErrorMessage.php    |  2 ++
 .../Zend/Amf/Value/Messaging/RemotingMessage.php |  2 ++
 restler_minified/amfformat/amfformat.php         |  2 ++
 restler_minified/compat.php                      |  2 ++
 .../plistformat/CFBinaryPropertyList.php         |  2 ++
 restler_minified/plistformat/CFPropertyList.php  |  2 ++
 restler_minified/plistformat/CFType.php          |  2 ++
 restler_minified/plistformat/CFTypeDetector.php  |  2 ++
 restler_minified/plistformat/IOException.php     |  2 ++
 restler_minified/plistformat/PListException.php  |  2 ++
 restler_minified/plistformat/plistformat.php     |  2 ++
 restler_minified/restler.php                     |  6 ++++++
 restler_minified/xmlformat.php                   |  2 ++
 restler_minified/yamlformat/sfyaml.php           |  2 ++
 restler_minified/yamlformat/sfyamlInline.php     | 16 ++++++++++++++++
 restler_minified/yamlformat/sfyamldumper.php     |  2 ++
 restler_minified/yamlformat/sfyamlparser.php     |  2 ++
 restler_minified/yamlformat/yamlformat.php       |  2 ++
 31 files changed, 80 insertions(+)
 create mode 100644 restler_minified/amfformat/Zend/Amf/Constants.php
 create mode 100644 restler_minified/amfformat/Zend/Amf/Parse/Amf3/Deserializer.php
 create mode 100644 restler_minified/amfformat/Zend/Amf/Parse/Amf3/Serializer.php
 create mode 100644 restler_minified/amfformat/Zend/Amf/Parse/Deserializer.php
 create mode 100644 restler_minified/amfformat/Zend/Amf/Parse/InputStream.php
 create mode 100644 restler_minified/amfformat/Zend/Amf/Parse/OutputStream.php
 create mode 100644 restler_minified/amfformat/Zend/Amf/Parse/Serializer.php
 create mode 100644 restler_minified/amfformat/Zend/Amf/Parse/TypeLoader.php
 create mode 100644 restler_minified/amfformat/Zend/Amf/Util/BinaryStream.php
 create mode 100644 restler_minified/amfformat/Zend/Amf/Value/Messaging/AbstractMessage.php
 create mode 100644 restler_minified/amfformat/Zend/Amf/Value/Messaging/AcknowledgeMessage.php
 create mode 100644 restler_minified/amfformat/Zend/Amf/Value/Messaging/AsyncMessage.php
 create mode 100644 restler_minified/amfformat/Zend/Amf/Value/Messaging/CommandMessage.php
 create mode 100644 restler_minified/amfformat/Zend/Amf/Value/Messaging/ErrorMessage.php
 create mode 100644 restler_minified/amfformat/Zend/Amf/Value/Messaging/RemotingMessage.php
 create mode 100644 restler_minified/amfformat/amfformat.php
 create mode 100644 restler_minified/compat.php
 create mode 100644 restler_minified/plistformat/CFBinaryPropertyList.php
 create mode 100644 restler_minified/plistformat/CFPropertyList.php
 create mode 100644 restler_minified/plistformat/CFType.php
 create mode 100644 restler_minified/plistformat/CFTypeDetector.php
 create mode 100644 restler_minified/plistformat/IOException.php
 create mode 100644 restler_minified/plistformat/PListException.php
 create mode 100644 restler_minified/plistformat/plistformat.php
 create mode 100644 restler_minified/restler.php
 create mode 100644 restler_minified/xmlformat.php
 create mode 100644 restler_minified/yamlformat/sfyaml.php
 create mode 100644 restler_minified/yamlformat/sfyamlInline.php
 create mode 100644 restler_minified/yamlformat/sfyamldumper.php
 create mode 100644 restler_minified/yamlformat/sfyamlparser.php
 create mode 100644 restler_minified/yamlformat/yamlformat.php

diff --git a/restler_minified/amfformat/Zend/Amf/Constants.php b/restler_minified/amfformat/Zend/Amf/Constants.php
new file mode 100644
index 000000000..ce84d2112
--- /dev/null
+++ b/restler_minified/amfformat/Zend/Amf/Constants.php
@@ -0,0 +1,2 @@
+<?php
+ final class Zend_Amf_Constants { const AMF0_NUMBER = 0x00; const AMF0_BOOLEAN = 0x01; const AMF0_STRING = 0x02; const AMF0_OBJECT = 0x03; const AMF0_MOVIECLIP = 0x04; const AMF0_NULL = 0x05; const AMF0_UNDEFINED = 0x06; const AMF0_REFERENCE = 0x07; const AMF0_MIXEDARRAY = 0x08; const AMF0_OBJECTTERM = 0x09; const AMF0_ARRAY = 0x0a; const AMF0_DATE = 0x0b; const AMF0_LONGSTRING = 0x0c; const AMF0_UNSUPPORTED = 0x0e; const AMF0_XML = 0x0f; const AMF0_TYPEDOBJECT = 0x10; const AMF0_AMF3 = 0x11; const AMF0_OBJECT_ENCODING = 0x00; const AMF3_UNDEFINED = 0x00; const AMF3_NULL = 0x01; const AMF3_BOOLEAN_FALSE = 0x02; const AMF3_BOOLEAN_TRUE = 0x03; const AMF3_INTEGER = 0x04; const AMF3_NUMBER = 0x05; const AMF3_STRING = 0x06; const AMF3_XML = 0x07; const AMF3_DATE = 0x08; const AMF3_ARRAY = 0x09; const AMF3_OBJECT = 0x0A; const AMF3_XMLSTRING = 0x0B; const AMF3_BYTEARRAY = 0x0C; const AMF3_OBJECT_ENCODING = 0x03; const ET_PROPLIST = 0x00; const ET_EXTERNAL = 0x01; const ET_DYNAMIC = 0x02; const ET_PROXY = 0x03; const FMS_OBJECT_ENCODING = 0x01; const UNKNOWN_CONTENT_LENGTH = -1; const URL_APPEND_HEADER = 'AppendToGatewayUrl'; const RESULT_METHOD = '/onResult'; const STATUS_METHOD = '/onStatus'; const CREDENTIALS_HEADER = 'Credentials'; const PERSISTENT_HEADER = 'RequestPersistentHeader'; const DESCRIBE_HEADER = 'DescribeService'; const GUEST_ROLE = 'anonymous'; } 
\ No newline at end of file
diff --git a/restler_minified/amfformat/Zend/Amf/Parse/Amf3/Deserializer.php b/restler_minified/amfformat/Zend/Amf/Parse/Amf3/Deserializer.php
new file mode 100644
index 000000000..e579265d5
--- /dev/null
+++ b/restler_minified/amfformat/Zend/Amf/Parse/Amf3/Deserializer.php
@@ -0,0 +1,2 @@
+<?php
+ require_once 'Zend/Amf/Constants.php'; require_once 'Zend/Amf/Parse/Deserializer.php'; require_once 'Zend/Amf/Parse/TypeLoader.php'; class Zend_Amf_Parse_Amf3_Deserializer extends Zend_Amf_Parse_Deserializer { protected $_objectCount; protected $_referenceObjects = array(); protected $_referenceStrings = array(); protected $_referenceDefinitions = array(); public function readTypeMarker($typeMarker = null) { if(null === $typeMarker) { $typeMarker = $this->_stream->readByte(); } switch($typeMarker) { case Zend_Amf_Constants::AMF3_UNDEFINED: return null; case Zend_Amf_Constants::AMF3_NULL: return null; case Zend_Amf_Constants::AMF3_BOOLEAN_FALSE: return false; case Zend_Amf_Constants::AMF3_BOOLEAN_TRUE: return true; case Zend_Amf_Constants::AMF3_INTEGER: return $this->readInteger(); case Zend_Amf_Constants::AMF3_NUMBER: return $this->_stream->readDouble(); case Zend_Amf_Constants::AMF3_STRING: return $this->readString(); case Zend_Amf_Constants::AMF3_DATE: return $this->readDate(); case Zend_Amf_Constants::AMF3_ARRAY: return $this->readArray(); case Zend_Amf_Constants::AMF3_OBJECT: return $this->readObject(); case Zend_Amf_Constants::AMF3_XML: case Zend_Amf_Constants::AMF3_XMLSTRING: return $this->readXmlString(); case Zend_Amf_Constants::AMF3_BYTEARRAY: return $this->readString(); default: require_once 'Zend/Amf/Exception.php'; throw new Zend_Amf_Exception('Unsupported type marker: ' . $typeMarker); } } public function readInteger() { $count = 1; $intReference = $this->_stream->readByte(); $result = 0; while ((($intReference & 0x80) != 0) && $count < 4) { $result <<= 7; $result |= ($intReference & 0x7f); $intReference = $this->_stream->readByte(); $count++; } if ($count < 4) { $result <<= 7; $result |= $intReference; } else { $result <<= 8; $result |= $intReference; if (($result & 0x10000000) != 0) { $result |= ~0xFFFFFFF; } } return $result; } public function readString() { $stringReference = $this->readInteger(); if (($stringReference & 0x01) == 0) { $stringReference = $stringReference >> 1; if ($stringReference >= count($this->_referenceStrings)) { require_once 'Zend/Amf/Exception.php'; throw new Zend_Amf_Exception('Undefined string reference: ' . $stringReference); } return $this->_referenceStrings[$stringReference]; } $length = $stringReference >> 1; if ($length) { $string = $this->_stream->readBytes($length); $this->_referenceStrings[] = $string; } else { $string = ""; } return $string; } public function readDate() { $dateReference = $this->readInteger(); if (($dateReference & 0x01) == 0) { $dateReference = $dateReference >> 1; if ($dateReference>=count($this->_referenceObjects)) { require_once 'Zend/Amf/Exception.php'; throw new Zend_Amf_Exception('Undefined date reference: ' . $dateReference); } return $this->_referenceObjects[$dateReference]; } $timestamp = floor($this->_stream->readDouble() / 1000); require_once 'Zend/Date.php'; $dateTime = new Zend_Date((int) $timestamp); $this->_referenceObjects[] = $dateTime; return $dateTime; } public function readArray() { $arrayReference = $this->readInteger(); if (($arrayReference & 0x01)==0){ $arrayReference = $arrayReference >> 1; if ($arrayReference>=count($this->_referenceObjects)) { require_once 'Zend/Amf/Exception.php'; throw new Zend_Amf_Exception('Unknow array reference: ' . $arrayReference); } return $this->_referenceObjects[$arrayReference]; } $data = array(); $this->_referenceObjects[] =& $data; $key = $this->readString(); while ($key != '') { $data[$key] = $this->readTypeMarker(); $key = $this->readString(); } $arrayReference = $arrayReference >>1; for ($i=0; $i < $arrayReference; $i++) { $data[] = $this->readTypeMarker(); } return $data; } public function readObject() { $traitsInfo = $this->readInteger(); $storedObject = ($traitsInfo & 0x01)==0; $traitsInfo = $traitsInfo >> 1; if ($storedObject) { $ref = $traitsInfo; if (!isset($this->_referenceObjects[$ref])) { require_once 'Zend/Amf/Exception.php'; throw new Zend_Amf_Exception('Unknown Object reference: ' . $ref); } $returnObject = $this->_referenceObjects[$ref]; } else { $storedClass = ($traitsInfo & 0x01) == 0; $traitsInfo = $traitsInfo >> 1; if ($storedClass) { $ref = $traitsInfo; if (!isset($this->_referenceDefinitions[$ref])) { require_once 'Zend/Amf/Exception.php'; throw new Zend_Amf_Exception('Unknows Definition reference: '. $ref); } $className = $this->_referenceDefinitions[$ref]['className']; $encoding = $this->_referenceDefinitions[$ref]['encoding']; $propertyNames = $this->_referenceDefinitions[$ref]['propertyNames']; } else { $className = $this->readString(); $encoding = $traitsInfo & 0x03; $propertyNames = array(); $traitsInfo = $traitsInfo >> 2; } if (!$className) { $returnObject = new stdClass(); } else { if ($loader = Zend_Amf_Parse_TypeLoader::loadType($className)) { $returnObject = new $loader(); } else { require_once 'Zend/Amf/Exception.php'; throw new Zend_Amf_Exception('Typed object not found: '. $className . ' '); } } $this->_referenceObjects[] = $returnObject; $properties = array(); switch ($encoding) { case (Zend_Amf_Constants::ET_EXTERNAL): if (!$storedClass) { $this->_referenceDefinitions[] = array( 'className' => $className, 'encoding' => $encoding, 'propertyNames' => $propertyNames, ); } $returnObject->externalizedData = $this->readTypeMarker(); break; case (Zend_Amf_Constants::ET_DYNAMIC): if (!$storedClass) { $this->_referenceDefinitions[] = array( 'className' => $className, 'encoding' => $encoding, 'propertyNames' => $propertyNames, ); } do { $property = $this->readString(); if ($property != "") { $propertyNames[] = $property; $properties[$property] = $this->readTypeMarker(); } } while ($property !=""); break; default: if (!$storedClass) { $count = $traitsInfo; for($i=0; $i< $count; $i++) { $propertyNames[] = $this->readString(); } $this->_referenceDefinitions[] = array( 'className' => $className, 'encoding' => $encoding, 'propertyNames' => $propertyNames, ); } foreach ($propertyNames as $property) { $properties[$property] = $this->readTypeMarker(); } break; } foreach($properties as $key=>$value) { if($key) { $returnObject->$key = $value; } } } if($returnObject instanceof Zend_Amf_Value_Messaging_ArrayCollection) { if(isset($returnObject->externalizedData)) { $returnObject = $returnObject->externalizedData; } else { $returnObject = get_object_vars($returnObject); } } return $returnObject; } public function readXmlString() { $xmlReference = $this->readInteger(); $length = $xmlReference >> 1; $string = $this->_stream->readBytes($length); return simplexml_load_string($string); } } 
\ No newline at end of file
diff --git a/restler_minified/amfformat/Zend/Amf/Parse/Amf3/Serializer.php b/restler_minified/amfformat/Zend/Amf/Parse/Amf3/Serializer.php
new file mode 100644
index 000000000..d20cd2121
--- /dev/null
+++ b/restler_minified/amfformat/Zend/Amf/Parse/Amf3/Serializer.php
@@ -0,0 +1,2 @@
+<?php
+ require_once 'Zend/Amf/Constants.php'; require_once 'Zend/Amf/Parse/Serializer.php'; require_once 'Zend/Amf/Parse/TypeLoader.php'; class Zend_Amf_Parse_Amf3_Serializer extends Zend_Amf_Parse_Serializer { protected $_referenceObjects = array(); protected $_referenceStrings = array(); protected $_referenceDefinitions = array(); public function writeTypeMarker($data, $markerType=null) { if (null !== $markerType) { $this->_stream->writeByte($markerType); switch ($markerType) { case Zend_Amf_Constants::AMF3_NULL: break; case Zend_Amf_Constants::AMF3_BOOLEAN_FALSE: break; case Zend_Amf_Constants::AMF3_BOOLEAN_TRUE: break; case Zend_Amf_Constants::AMF3_INTEGER: $this->writeInteger($data); break; case Zend_Amf_Constants::AMF3_NUMBER: $this->_stream->writeDouble($data); break; case Zend_Amf_Constants::AMF3_STRING: $this->writeString($data); break; case Zend_Amf_Constants::AMF3_DATE: $this->writeDate($data); break; case Zend_Amf_Constants::AMF3_ARRAY: $this->writeArray($data); break; case Zend_Amf_Constants::AMF3_OBJECT: $this->writeObject($data); break; case Zend_Amf_Constants::AMF3_BYTEARRAY: $this->writeByteArray($data); break; case Zend_Amf_Constants::AMF3_XMLSTRING; $this->writeXml($data); break; default: require_once 'Zend/Amf/Exception.php'; throw new Zend_Amf_Exception('Unknown Type Marker: ' . $markerType); } } else { if(is_resource($data)) { $data = Zend_Amf_Parse_TypeLoader::handleResource($data); } switch (true) { case (null === $data): $markerType = Zend_Amf_Constants::AMF3_NULL; break; case (is_bool($data)): if ($data){ $markerType = Zend_Amf_Constants::AMF3_BOOLEAN_TRUE; } else { $markerType = Zend_Amf_Constants::AMF3_BOOLEAN_FALSE; } break; case (is_int($data)): if (($data > 0xFFFFFFF) || ($data < -268435456)) { $markerType = Zend_Amf_Constants::AMF3_NUMBER; } else { $markerType = Zend_Amf_Constants::AMF3_INTEGER; } break; case (is_float($data)): $markerType = Zend_Amf_Constants::AMF3_NUMBER; break; case (is_string($data)): $markerType = Zend_Amf_Constants::AMF3_STRING; break; case (is_array($data)): $markerType = Zend_Amf_Constants::AMF3_ARRAY; break; case (is_object($data)): if (($data instanceof DateTime) || ($data instanceof Zend_Date)) { $markerType = Zend_Amf_Constants::AMF3_DATE; } else if ($data instanceof Zend_Amf_Value_ByteArray) { $markerType = Zend_Amf_Constants::AMF3_BYTEARRAY; } else if (($data instanceof DOMDocument) || ($data instanceof SimpleXMLElement)) { $markerType = Zend_Amf_Constants::AMF3_XMLSTRING; } else { $markerType = Zend_Amf_Constants::AMF3_OBJECT; } break; default: require_once 'Zend/Amf/Exception.php'; throw new Zend_Amf_Exception('Unsupported data type: ' . gettype($data)); } $this->writeTypeMarker($data, $markerType); } } public function writeInteger($int) { if (($int & 0xffffff80) == 0) { $this->_stream->writeByte($int & 0x7f); return $this; } if (($int & 0xffffc000) == 0 ) { $this->_stream->writeByte(($int >> 7 ) | 0x80); $this->_stream->writeByte($int & 0x7f); return $this; } if (($int & 0xffe00000) == 0) { $this->_stream->writeByte(($int >> 14 ) | 0x80); $this->_stream->writeByte(($int >> 7 ) | 0x80); $this->_stream->writeByte($int & 0x7f); return $this; } $this->_stream->writeByte(($int >> 22 ) | 0x80); $this->_stream->writeByte(($int >> 15 ) | 0x80); $this->_stream->writeByte(($int >> 8 ) | 0x80); $this->_stream->writeByte($int & 0xff); return $this; } protected function writeBinaryString($string){ $ref = strlen($string) << 1 | 0x01; $this->writeInteger($ref); $this->_stream->writeBytes($string); return $this; } public function writeString($string) { $len = strlen($string); if(!$len){ $this->writeInteger(0x01); return $this; } $ref = array_search($string, $this->_referenceStrings, true); if($ref === false){ $this->_referenceStrings[] = $string; $this->writeBinaryString($string); } else { $ref <<= 1; $this->writeInteger($ref); } return $this; } public function writeByteArray($data){ if($this->writeObjectReference($data)){ return $this; } if(is_string($data)) { } else if ($data instanceof Zend_Amf_Value_ByteArray) { $data = $data->getData(); } else { require_once 'Zend/Amf/Exception.php'; throw new Zend_Amf_Exception('Invalid ByteArray specified; must be a string or Zend_Amf_Value_ByteArray'); } $this->writeBinaryString($data); return $this; } public function writeXml($xml) { if($this->writeObjectReference($xml)){ return $this; } if(is_string($xml)) { } else if ($xml instanceof DOMDocument) { $xml = $xml->saveXml(); } else if ($xml instanceof SimpleXMLElement) { $xml = $xml->asXML(); } else { require_once 'Zend/Amf/Exception.php'; throw new Zend_Amf_Exception('Invalid xml specified; must be a DOMDocument or SimpleXMLElement'); } $this->writeBinaryString($xml); return $this; } public function writeDate($date) { if($this->writeObjectReference($date)){ return $this; } if ($date instanceof DateTime) { $dateString = $date->format('U') * 1000; } elseif ($date instanceof Zend_Date) { $dateString = $date->toString('U') * 1000; } else { require_once 'Zend/Amf/Exception.php'; throw new Zend_Amf_Exception('Invalid date specified; must be a string DateTime or Zend_Date object'); } $this->writeInteger(0x01); $this->_stream->writeDouble($dateString); return $this; } public function writeArray(array $array) { $this->_referenceObjects[] = $array; $numeric = array(); $string = array(); foreach ($array as $key => $value) { if (is_int($key)) { $numeric[] = $value; } else { $string[$key] = $value; } } $length = count($numeric); $id = ($length << 1) | 0x01; $this->writeInteger($id); foreach($string as $key => $value) { $this->writeString($key) ->writeTypeMarker($value); } $this->writeString(''); foreach($numeric as $value) { $this->writeTypeMarker($value); } return $this; } protected function writeObjectReference($object) { $ref = array_search($object, $this->_referenceObjects,true); if($ref !== false){ $ref <<= 1; $this->writeInteger($ref); return true; } $this->_referenceObjects[] = $object; return false; } public function writeObject($object) { if($this->writeObjectReference($object)){ return $this; } $className = ''; switch (true) { case ($className = Zend_Amf_Parse_TypeLoader::getMappedClassName(get_class($object))): break; case isset($object->_explicitType): $className = $object->_explicitType; break; case method_exists($object, 'getASClassName'): $className = $object->getASClassName(); break; case ($object instanceof stdClass): $className = ''; break; default: $className = get_class($object); break; } $writeTraits = true; if(array_key_exists($className, $this->_referenceDefinitions)){ $traitsInfo = $this->_referenceDefinitions[$className]['id']; $encoding = $this->_referenceDefinitions[$className]['encoding']; $propertyNames = $this->_referenceDefinitions[$className]['propertyNames']; $traitsInfo = ($traitsInfo << 2) | 0x01; $writeTraits = false; } else { $propertyNames = array(); if($className == ''){ $encoding = Zend_Amf_Constants::ET_DYNAMIC; } else { $encoding = Zend_Amf_Constants::ET_PROPLIST; foreach($object as $key => $value) { if( $key[0] != "_") { $propertyNames[] = $key; } } } $this->_referenceDefinitions[$className] = array( 'id' => count($this->_referenceDefinitions), 'encoding' => $encoding, 'propertyNames' => $propertyNames, ); $traitsInfo = Zend_Amf_Constants::AMF3_OBJECT_ENCODING; $traitsInfo |= $encoding << 2; $traitsInfo |= (count($propertyNames) << 4); } $this->writeInteger($traitsInfo); if($writeTraits){ $this->writeString($className); foreach ($propertyNames as $value) { $this->writeString($value); } } try { switch($encoding) { case Zend_Amf_Constants::ET_PROPLIST: foreach ($propertyNames as $key) { $this->writeTypeMarker($object->$key); } break; case Zend_Amf_Constants::ET_DYNAMIC: foreach ($propertyNames as $key) { $this->writeTypeMarker($object->$key); } foreach($object as $key => $value){ if(!in_array($key,$propertyNames) && $key[0] != "_"){ $this->writeString($key); $this->writeTypeMarker($value); } } $this->writeString(''); break; case Zend_Amf_Constants::ET_EXTERNAL: require_once 'Zend/Amf/Exception.php'; throw new Zend_Amf_Exception('External Object Encoding not implemented'); break; default: require_once 'Zend/Amf/Exception.php'; throw new Zend_Amf_Exception('Unknown Object Encoding type: ' . $encoding); } } catch (Exception $e) { require_once 'Zend/Amf/Exception.php'; throw new Zend_Amf_Exception('Unable to writeObject output: ' . $e->getMessage(), 0, $e); } return $this; } } 
\ No newline at end of file
diff --git a/restler_minified/amfformat/Zend/Amf/Parse/Deserializer.php b/restler_minified/amfformat/Zend/Amf/Parse/Deserializer.php
new file mode 100644
index 000000000..58e896eaa
--- /dev/null
+++ b/restler_minified/amfformat/Zend/Amf/Parse/Deserializer.php
@@ -0,0 +1,2 @@
+<?php
+ abstract class Zend_Amf_Parse_Deserializer { protected $_stream; public function __construct(Zend_Amf_Parse_InputStream $stream) { $this->_stream = $stream; } public abstract function readTypeMarker($markerType = null); } 
\ No newline at end of file
diff --git a/restler_minified/amfformat/Zend/Amf/Parse/InputStream.php b/restler_minified/amfformat/Zend/Amf/Parse/InputStream.php
new file mode 100644
index 000000000..bacecc04a
--- /dev/null
+++ b/restler_minified/amfformat/Zend/Amf/Parse/InputStream.php
@@ -0,0 +1,2 @@
+<?php
+ require_once 'Zend/Amf/Util/BinaryStream.php'; class Zend_Amf_Parse_InputStream extends Zend_Amf_Util_BinaryStream { } 
\ No newline at end of file
diff --git a/restler_minified/amfformat/Zend/Amf/Parse/OutputStream.php b/restler_minified/amfformat/Zend/Amf/Parse/OutputStream.php
new file mode 100644
index 000000000..7797bf93a
--- /dev/null
+++ b/restler_minified/amfformat/Zend/Amf/Parse/OutputStream.php
@@ -0,0 +1,2 @@
+<?php
+ require_once 'Zend/Amf/Util/BinaryStream.php'; class Zend_Amf_Parse_OutputStream extends Zend_Amf_Util_BinaryStream { public function __construct() { parent::__construct(''); } } 
\ No newline at end of file
diff --git a/restler_minified/amfformat/Zend/Amf/Parse/Serializer.php b/restler_minified/amfformat/Zend/Amf/Parse/Serializer.php
new file mode 100644
index 000000000..f755d63db
--- /dev/null
+++ b/restler_minified/amfformat/Zend/Amf/Parse/Serializer.php
@@ -0,0 +1,2 @@
+<?php
+ abstract class Zend_Amf_Parse_Serializer { protected $_stream; public function __construct(Zend_Amf_Parse_OutputStream $stream) { $this->_stream = $stream; } public abstract function writeTypeMarker($content, $markerType=null); } 
\ No newline at end of file
diff --git a/restler_minified/amfformat/Zend/Amf/Parse/TypeLoader.php b/restler_minified/amfformat/Zend/Amf/Parse/TypeLoader.php
new file mode 100644
index 000000000..970a577a3
--- /dev/null
+++ b/restler_minified/amfformat/Zend/Amf/Parse/TypeLoader.php
@@ -0,0 +1,2 @@
+<?php
+ require_once 'Zend/Amf/Value/Messaging/AcknowledgeMessage.php'; require_once 'Zend/Amf/Value/Messaging/AsyncMessage.php'; require_once 'Zend/Amf/Value/Messaging/CommandMessage.php'; require_once 'Zend/Amf/Value/Messaging/ErrorMessage.php'; require_once 'Zend/Amf/Value/Messaging/RemotingMessage.php'; final class Zend_Amf_Parse_TypeLoader { public static $callbackClass; public static $classMap = array ( 'flex.messaging.messages.AcknowledgeMessage' => 'Zend_Amf_Value_Messaging_AcknowledgeMessage', 'flex.messaging.messages.ErrorMessage' => 'Zend_Amf_Value_Messaging_AsyncMessage', 'flex.messaging.messages.CommandMessage' => 'Zend_Amf_Value_Messaging_CommandMessage', 'flex.messaging.messages.ErrorMessage' => 'Zend_Amf_Value_Messaging_ErrorMessage', 'flex.messaging.messages.RemotingMessage' => 'Zend_Amf_Value_Messaging_RemotingMessage', 'flex.messaging.io.ArrayCollection' => 'Zend_Amf_Value_Messaging_ArrayCollection', ); protected static $_defaultClassMap = array( 'flex.messaging.messages.AcknowledgeMessage' => 'Zend_Amf_Value_Messaging_AcknowledgeMessage', 'flex.messaging.messages.ErrorMessage' => 'Zend_Amf_Value_Messaging_AsyncMessage', 'flex.messaging.messages.CommandMessage' => 'Zend_Amf_Value_Messaging_CommandMessage', 'flex.messaging.messages.ErrorMessage' => 'Zend_Amf_Value_Messaging_ErrorMessage', 'flex.messaging.messages.RemotingMessage' => 'Zend_Amf_Value_Messaging_RemotingMessage', 'flex.messaging.io.ArrayCollection' => 'Zend_Amf_Value_Messaging_ArrayCollection', ); protected static $_resourceLoader = null; public static function loadType($className) { $class = self::getMappedClassName($className); if(!$class) { $class = str_replace('.', '_', $className); } if (!class_exists($class)) { return "stdClass"; } return $class; } public static function getMappedClassName($className) { $mappedName = array_search($className, self::$classMap); if ($mappedName) { return $mappedName; } $mappedName = array_search($className, array_flip(self::$classMap)); if ($mappedName) { return $mappedName; } return false; } public static function setMapping($asClassName, $phpClassName) { self::$classMap[$asClassName] = $phpClassName; } public static function resetMap() { self::$classMap = self::$_defaultClassMap; } public static function setResourceLoader(Zend_Loader_PluginLoader_Interface $loader) { self::$_resourceLoader = $loader; } public static function addResourceDirectory($prefix, $dir) { if(self::$_resourceLoader) { self::$_resourceLoader->addPrefixPath($prefix, $dir); } } public static function getResourceParser($resource) { if(self::$_resourceLoader) { $type = preg_replace("/[^A-Za-z0-9_]/", " ", get_resource_type($resource)); $type = str_replace(" ","", ucwords($type)); return self::$_resourceLoader->load($type); } return false; } public static function handleResource($resource) { if(!self::$_resourceLoader) { require_once 'Zend/Amf/Exception.php'; throw new Zend_Amf_Exception('Unable to handle resources - resource plugin loader not set'); } try { while(is_resource($resource)) { $resclass = self::getResourceParser($resource); if(!$resclass) { require_once 'Zend/Amf/Exception.php'; throw new Zend_Amf_Exception('Can not serialize resource type: '. get_resource_type($resource)); } $parser = new $resclass(); if(is_callable(array($parser, 'parse'))) { $resource = $parser->parse($resource); } else { require_once 'Zend/Amf/Exception.php'; throw new Zend_Amf_Exception("Could not call parse() method on class $resclass"); } } return $resource; } catch(Zend_Amf_Exception $e) { throw new Zend_Amf_Exception($e->getMessage(), $e->getCode(), $e); } catch(Exception $e) { require_once 'Zend/Amf/Exception.php'; throw new Zend_Amf_Exception('Can not serialize resource type: '. get_resource_type($resource), 0, $e); } } } 
\ No newline at end of file
diff --git a/restler_minified/amfformat/Zend/Amf/Util/BinaryStream.php b/restler_minified/amfformat/Zend/Amf/Util/BinaryStream.php
new file mode 100644
index 000000000..4ef41d656
--- /dev/null
+++ b/restler_minified/amfformat/Zend/Amf/Util/BinaryStream.php
@@ -0,0 +1,2 @@
+<?php
+ class Zend_Amf_Util_BinaryStream { protected $_stream; protected $_streamLength; protected $_bigEndian; protected $_needle; public function __construct($stream) { if (!is_string($stream)) { require_once 'Zend/Amf/Exception.php'; throw new Zend_Amf_Exception('Inputdata is not of type String'); } $this->_stream = $stream; $this->_needle = 0; $this->_streamLength = strlen($stream); $this->_bigEndian = (pack('l', 1) === "\x00\x00\x00\x01"); } public function getStream() { return $this->_stream; } public function readBytes($length) { if (($length + $this->_needle) > $this->_streamLength) { require_once 'Zend/Amf/Exception.php'; throw new Zend_Amf_Exception('Buffer underrun at needle position: ' . $this->_needle . ' while requesting length: ' . $length); } $bytes = substr($this->_stream, $this->_needle, $length); $this->_needle+= $length; return $bytes; } public function writeBytes($bytes) { $this->_stream.= $bytes; return $this; } public function readByte() { if (($this->_needle + 1) > $this->_streamLength) { require_once 'Zend/Amf/Exception.php'; throw new Zend_Amf_Exception('Buffer underrun at needle position: ' . $this->_needle . ' while requesting length: ' . $length); } return ord($this->_stream{$this->_needle++}); } public function writeByte($stream) { $this->_stream.= pack('c', $stream); return $this; } public function readInt() { return ($this->readByte() << 8) + $this->readByte(); } public function writeInt($stream) { $this->_stream.= pack('n', $stream); return $this; } public function readUtf() { $length = $this->readInt(); return $this->readBytes($length); } public function writeUtf($stream) { $this->writeInt(strlen($stream)); $this->_stream.= $stream; return $this; } public function readLongUtf() { $length = $this->readLong(); return $this->readBytes($length); } public function writeLongUtf($stream) { $this->writeLong(strlen($stream)); $this->_stream.= $stream; } public function readLong() { return ($this->readByte() << 24) + ($this->readByte() << 16) + ($this->readByte() << 8) + $this->readByte(); } public function writeLong($stream) { $this->_stream.= pack('N', $stream); return $this; } public function readUnsignedShort() { $byte1 = $this->readByte(); $byte2 = $this->readByte(); return (($byte1 << 8) | $byte2); } public function readDouble() { $bytes = substr($this->_stream, $this->_needle, 8); $this->_needle+= 8; if (!$this->_bigEndian) { $bytes = strrev($bytes); } $double = unpack('dflt', $bytes); return $double['flt']; } public function writeDouble($stream) { $stream = pack('d', $stream); if (!$this->_bigEndian) { $stream = strrev($stream); } $this->_stream.= $stream; return $this; } } 
\ No newline at end of file
diff --git a/restler_minified/amfformat/Zend/Amf/Value/Messaging/AbstractMessage.php b/restler_minified/amfformat/Zend/Amf/Value/Messaging/AbstractMessage.php
new file mode 100644
index 000000000..abd569a53
--- /dev/null
+++ b/restler_minified/amfformat/Zend/Amf/Value/Messaging/AbstractMessage.php
@@ -0,0 +1,2 @@
+<?php
+ class Zend_Amf_Value_Messaging_AbstractMessage { public $clientId; public $destination; public $messageId; public $timestamp; public $timeToLive; public $headers; public $body; public function generateId() { return sprintf( '%08X-%04X-%04X-%02X%02X-%012X', mt_rand(), mt_rand(0, 65535), bindec(substr_replace( sprintf('%016b', mt_rand(0, 65535)), '0100', 11, 4) ), bindec(substr_replace(sprintf('%08b', mt_rand(0, 255)), '01', 5, 2)), mt_rand(0, 255), mt_rand() ); } } 
\ No newline at end of file
diff --git a/restler_minified/amfformat/Zend/Amf/Value/Messaging/AcknowledgeMessage.php b/restler_minified/amfformat/Zend/Amf/Value/Messaging/AcknowledgeMessage.php
new file mode 100644
index 000000000..9e496cd61
--- /dev/null
+++ b/restler_minified/amfformat/Zend/Amf/Value/Messaging/AcknowledgeMessage.php
@@ -0,0 +1,2 @@
+<?php
+ require_once 'Zend/Amf/Value/Messaging/AsyncMessage.php'; class Zend_Amf_Value_Messaging_AcknowledgeMessage extends Zend_Amf_Value_Messaging_AsyncMessage { public function __construct($message) { $this->clientId = $this->generateId(); $this->destination = null; $this->messageId = $this->generateId(); $this->timestamp = time().'00'; $this->timeToLive = 0; $this->headers = new STDClass(); $this->body = null; if ($message && isset($message->messageId)) { $this->correlationId = $message->messageId; } } } 
\ No newline at end of file
diff --git a/restler_minified/amfformat/Zend/Amf/Value/Messaging/AsyncMessage.php b/restler_minified/amfformat/Zend/Amf/Value/Messaging/AsyncMessage.php
new file mode 100644
index 000000000..2a5e5614a
--- /dev/null
+++ b/restler_minified/amfformat/Zend/Amf/Value/Messaging/AsyncMessage.php
@@ -0,0 +1,2 @@
+<?php
+ require_once 'Zend/Amf/Value/Messaging/AbstractMessage.php'; class Zend_Amf_Value_Messaging_AsyncMessage extends Zend_Amf_Value_Messaging_AbstractMessage { public $correlationId; } 
\ No newline at end of file
diff --git a/restler_minified/amfformat/Zend/Amf/Value/Messaging/CommandMessage.php b/restler_minified/amfformat/Zend/Amf/Value/Messaging/CommandMessage.php
new file mode 100644
index 000000000..166825db5
--- /dev/null
+++ b/restler_minified/amfformat/Zend/Amf/Value/Messaging/CommandMessage.php
@@ -0,0 +1,2 @@
+<?php
+ require_once 'Zend/Amf/Value/Messaging/AsyncMessage.php'; class Zend_Amf_Value_Messaging_CommandMessage extends Zend_Amf_Value_Messaging_AsyncMessage { const SUBSCRIBE_OPERATION = 0; const UNSUSBSCRIBE_OPERATION = 1; const POLL_OPERATION = 2; const CLIENT_SYNC_OPERATION = 4; const CLIENT_PING_OPERATION = 5; const CLUSTER_REQUEST_OPERATION = 7; const LOGIN_OPERATION = 8; const LOGOUT_OPERATION = 9; const SESSION_INVALIDATE_OPERATION = 10; const MULTI_SUBSCRIBE_OPERATION = 11; const DISCONNECT_OPERATION = 12; const UNKNOWN_OPERATION = 10000; public $operation = self::UNKNOWN_OPERATION; } 
\ No newline at end of file
diff --git a/restler_minified/amfformat/Zend/Amf/Value/Messaging/ErrorMessage.php b/restler_minified/amfformat/Zend/Amf/Value/Messaging/ErrorMessage.php
new file mode 100644
index 000000000..0b8926dfc
--- /dev/null
+++ b/restler_minified/amfformat/Zend/Amf/Value/Messaging/ErrorMessage.php
@@ -0,0 +1,2 @@
+<?php
+ require_once 'Zend/Amf/Value/Messaging/AcknowledgeMessage.php'; class Zend_Amf_Value_Messaging_ErrorMessage extends Zend_Amf_Value_Messaging_AcknowledgeMessage { public $extendedData = null; public $faultCode; public $faultDetail; public $faultString = ''; public $rootCause = null; } 
\ No newline at end of file
diff --git a/restler_minified/amfformat/Zend/Amf/Value/Messaging/RemotingMessage.php b/restler_minified/amfformat/Zend/Amf/Value/Messaging/RemotingMessage.php
new file mode 100644
index 000000000..a84e07974
--- /dev/null
+++ b/restler_minified/amfformat/Zend/Amf/Value/Messaging/RemotingMessage.php
@@ -0,0 +1,2 @@
+<?php
+ require_once 'Zend/Amf/Value/Messaging/AbstractMessage.php'; class Zend_Amf_Value_Messaging_RemotingMessage extends Zend_Amf_Value_Messaging_AbstractMessage { public $source; public $operation; public $parameters; public function __construct() { $this->clientId = $this->generateId(); $this->destination = null; $this->messageId = $this->generateId(); $this->timestamp = time().'00'; $this->timeToLive = 0; $this->headers = new stdClass(); $this->body = null; } } 
\ No newline at end of file
diff --git a/restler_minified/amfformat/amfformat.php b/restler_minified/amfformat/amfformat.php
new file mode 100644
index 000000000..351fd094c
--- /dev/null
+++ b/restler_minified/amfformat/amfformat.php
@@ -0,0 +1,2 @@
+<?php
+ class AmfFormat implements iFormat { const PATH = '/Zend/Amf/Parse/'; const MIME = 'application/x-amf'; const EXTENSION = 'amf'; public $path = ''; public function init(){ $this->path = dirname(__FILE__); $include_path = get_include_path(); if(strpos($include_path, 'Zend')===FALSE){ set_include_path($this->path.':'.$include_path); } $this->path .= AmfFormat::PATH; } public function getMIMEMap() { return array(AmfFormat::EXTENSION=>AmfFormat::MIME); } public function getMIME(){ return AmfFormat::MIME; } public function getExtension(){ return AmfFormat::EXTENSION; } public function setMIME($mime){ } public function setExtension($extension){ } public function encode($data, $human_readable=false){ $this->init(); require_once $this->path . 'OutputStream.php'; require_once $this->path . 'Amf3/Serializer.php'; $stream = new Zend_Amf_Parse_OutputStream(); $serializer = new Zend_Amf_Parse_Amf3_Serializer($stream); $serializer->writeTypeMarker($data); return $stream->getStream(); } public function decode($data){ $this->init(); require_once $this->path .'InputStream.php'; require_once $this->path .'Amf3/Deserializer.php'; $stream = new Zend_Amf_Parse_InputStream(substr($data, 1)); $deserializer = new Zend_Amf_Parse_Amf3_Deserializer($stream); return $deserializer->readTypeMarker(); } public function __toString(){ return $this->getExtension(); } }
\ No newline at end of file
diff --git a/restler_minified/compat.php b/restler_minified/compat.php
new file mode 100644
index 000000000..0d1548f65
--- /dev/null
+++ b/restler_minified/compat.php
@@ -0,0 +1,2 @@
+<?php
+if(version_compare('5.0.0',PHP_VERSION)>0){ die('Restler requires PHP 5.x.x'); } if(!method_exists('ReflectionMethod', 'setAccessible')){ function isRestlerCompatibilityModeEnabled(){ return TRUE; } function unprotect($method_info){ $class_name = $method_info->class_name; $method = $method_info->method_name; $params = $method_info->arguments; $unique = uniqid('Dynamic')."_"; $class_code = "class $unique$class_name extends $class_name {"; $p = array(); for ($i = 0; $i < count($params); $i++) { $p[]='$'."P$i"; } $p = implode(',', $p); $class_code .= "function $unique$method($p){return parent::$method($p);}"; $class_code .= "}"; eval($class_code); $method_info->class_name = "$unique$class_name"; $method_info->method_name = "$unique$method"; return $method_info; } function call_protected_user_method_array($class_name, $method, $params) { if(is_object($class_name))$class_name = get_class($class_name); $unique = uniqid('Dynamic')."_"; $class_code = "class $unique$class_name  extends  $class_name {"; $p = array(); for ($i = 0; $i < count($params); $i++) { $p[]='$'."P$i"; } $p = implode(',', $p); $class_code .= "function $unique$method($p){return parent::$method($p);}"; $class_code .= "}"; eval($class_code); $obj = $unique.$class_name; $obj = new $obj(); return call_user_func_array(array($obj,$unique.$method), $params); } } 
\ No newline at end of file
diff --git a/restler_minified/plistformat/CFBinaryPropertyList.php b/restler_minified/plistformat/CFBinaryPropertyList.php
new file mode 100644
index 000000000..57ef82ee2
--- /dev/null
+++ b/restler_minified/plistformat/CFBinaryPropertyList.php
@@ -0,0 +1,2 @@
+<?php
+ abstract class CFBinaryPropertyList { protected $content = NULL; protected $pos = 0; protected $uniqueTable = Array(); protected $countObjects = 0; protected $stringSize = 0; protected $intSize = 0; protected $miscSize = 0; protected $objectRefs = 0; protected $writtenObjectCount = 0; protected $objectTable = Array(); protected $objectRefSize = 0; protected $offsets = Array(); protected function readBinaryNullType($length) { switch($length) { case 0: return 0; case 8: return new CFBoolean(false); case 9: return new CFBoolean(true); case 15: return 15; } throw new PListException("unknown null type: $length"); } protected static function make64Int($hi,$lo) { if(PHP_INT_SIZE > 4) return (((int)$hi)<<32) | ((int)$lo); $lo = sprintf("%u", $lo); if(function_exists("gmp_mul")) return gmp_strval(gmp_add(gmp_mul($hi, "4294967296"), $lo)); if(function_exists("bcmul")) return bcadd(bcmul($hi,"4294967296"), $lo); if(class_exists('Math_BigInteger')) { $bi = new Math_BigInteger($hi); return $bi->multiply("4294967296")->add($lo)->toString(); } throw new PListException("either gmp or bc has to be installed, or the Math_BigInteger has to be available!"); } protected function readBinaryInt($length) { if($length > 3) throw new PListException("Integer greater than 8 bytes: $length"); $nbytes = 1 << $length; $val = null; if(strlen($buff = substr($this->content, $this->pos, $nbytes)) != $nbytes) throw IOException::readError(""); $this->pos += $nbytes; switch($length) { case 0: $val = unpack("C", $buff); $val = $val[1]; break; case 1: $val = unpack("n", $buff); $val = $val[1]; break; case 2: $val = unpack("N", $buff); $val = $val[1]; break; case 3: $words = unpack("Nhighword/Nlowword",$buff); $val = self::make64Int($words['highword'],$words['lowword']); break; } return new CFNumber($val); } protected function readBinaryReal($length) { if($length > 3) throw new PListException("Real greater than 8 bytes: $length"); $nbytes = 1 << $length; $val = null; if(strlen($buff = substr($this->content,$this->pos, $nbytes)) != $nbytes) throw IOException::readError(""); $this->pos += $nbytes; switch($length) { case 0: case 1: $x = $length + 1; throw new PListException("got {$x} byte float, must be an error!"); case 2: $val = unpack("f", strrev($buff)); $val = $val[1]; break; case 3: $val = unpack("d", strrev($buff)); $val = $val[1]; break; } return new CFNumber($val); } protected function readBinaryDate($length) { if($length > 3) throw new PListException("Date greater than 8 bytes: $length"); $nbytes = 1 << $length; $val = null; if(strlen($buff = substr($this->content, $this->pos, $nbytes)) != $nbytes) throw IOException::readError(""); $this->pos += $nbytes; switch($length) { case 0: case 1: $x = $length + 1; throw new PListException("{$x} byte CFdate, error"); case 2: $val = unpack("f", strrev($buff)); $val = $val[1]; break; case 3: $val = unpack("d", strrev($buff)); $val = $val[1]; break; } return new CFDate($val,CFDate::TIMESTAMP_APPLE); } protected function readBinaryData($length) { if($length == 0) $buff = ""; else { $buff = substr($this->content, $this->pos, $length); if(strlen($buff) != $length) throw IOException::readError(""); $this->pos += $length; } return new CFData($buff,false); } protected function readBinaryString($length) { if($length == 0) $buff = ""; else { if(strlen($buff = substr($this->content, $this->pos, $length)) != $length) throw IOException::readError(""); $this->pos += $length; } if(!isset($this->uniqueTable[$buff])) $this->uniqueTable[$buff] = true; return new CFString($buff); } public static function convertCharset($string, $fromCharset, $toCharset='UTF-8') { if(function_exists('mb_convert_encoding')) return mb_convert_encoding($string, $toCharset, $fromCharset); if(function_exists('iconv')) return iconv($fromCharset, $toCharset, $string); if(function_exists('recode_string')) return recode_string($fromCharset .'..'. $toCharset, $string); throw new PListException('neither iconv nor mbstring supported. how are we supposed to work on strings here?'); } public static function charsetStrlen($string,$charset="UTF-8") { if(function_exists('mb_strlen')) return mb_strlen($string, $charset); if(function_exists('iconv_strlen')) return iconv_strlen($string,$charset); throw new PListException('neither iconv nor mbstring supported. how are we supposed to work on strings here?'); } protected function readBinaryUnicodeString($length) { if(strlen($buff = substr($this->content, $this->pos, 2*$length)) != 2*$length) throw IOException::readError(""); $this->pos += 2 * $length; if(!isset($this->uniqueTable[$buff])) $this->uniqueTable[$buff] = true; return new CFString(self::convertCharset($buff, "UTF-16BE", "UTF-8")); } protected function readBinaryArray($length) { $ary = new CFArray(); if($length != 0) { if(strlen($buff = substr($this->content, $this->pos, $length * $this->objectRefSize)) != $length * $this->objectRefSize) throw IOException::readError(""); $this->pos += $length * $this->objectRefSize; $objects = unpack($this->objectRefSize == 1 ? "C*" : "n*", $buff); for($i=0;$i<$length;++$i) { $object = $this->readBinaryObjectAt($objects[$i+1]+1,$this->objectRefSize); $ary->add($object); } } return $ary; } protected function readBinaryDict($length) { $dict = new CFDictionary(); if($length != 0) { if(strlen($buff = substr($this->content, $this->pos, $length * $this->objectRefSize)) != $length * $this->objectRefSize) throw IOException::readError(""); $this->pos += $length * $this->objectRefSize; $keys = unpack(($this->objectRefSize == 1 ? "C*" : "n*"), $buff); if(strlen($buff = substr($this->content, $this->pos, $length * $this->objectRefSize)) != $length * $this->objectRefSize) throw IOException::readError(""); $this->pos += $length * $this->objectRefSize; $objects = unpack(($this->objectRefSize == 1 ? "C*" : "n*"), $buff); for($i=0;$i<$length;++$i) { $key = $this->readBinaryObjectAt($keys[$i+1]+1); $object = $this->readBinaryObjectAt($objects[$i+1]+1); $dict->add($key->getValue(),$object); } } return $dict; } function readBinaryObject() { if(strlen($buff = substr($this->content,$this->pos,1)) != 1) throw IOException::readError(""); $this->pos++; $object_length = unpack("C*", $buff); $object_length = $object_length[1] & 0xF; $buff = unpack("H*", $buff); $buff = $buff[1]; $object_type = substr($buff, 0, 1); if($object_type != "0" && $object_length == 15) { $object_length = $this->readBinaryObject($this->objectRefSize); $object_length = $object_length->getValue(); } $retval = null; switch($object_type) { case '0': $retval = $this->readBinaryNullType($object_length); break; case '1': $retval = $this->readBinaryInt($object_length); break; case '2': $retval = $this->readBinaryReal($object_length); break; case '3': $retval = $this->readBinaryDate($object_length); break; case '4': $retval = $this->readBinaryData($object_length); break; case '5': $retval = $this->readBinaryString($object_length); break; case '6': $retval = $this->readBinaryUnicodeString($object_length); break; case 'a': $retval = $this->readBinaryArray($object_length); break; case 'd': $retval = $this->readBinaryDict($object_length); break; } return $retval; } function readBinaryObjectAt($pos) { $this->pos = $this->offsets[$pos]; return $this->readBinaryObject(); } public function parseBinaryString() { $this->uniqueTable = Array(); $this->countObjects = 0; $this->stringSize = 0; $this->intSize = 0; $this->miscSize = 0; $this->objectRefs = 0; $this->writtenObjectCount = 0; $this->objectTable = Array(); $this->objectRefSize = 0; $this->offsets = Array(); $buff = substr($this->content,-32); $infos = unpack("x6/Coffset_size/Cobject_ref_size/x4/Nnumber_of_objects/x4/Ntop_object/x4/Ntable_offset",$buff); $coded_offset_table = substr($this->content,$infos['table_offset'],$infos['number_of_objects'] * $infos['offset_size']); if(strlen($coded_offset_table) != $infos['number_of_objects'] * $infos['offset_size']) throw IOException::readError(""); $this->countObjects = $infos['number_of_objects']; $formats = Array("","C*","n*",NULL,"N*"); if($infos['offset_size'] == 3) { $this->offsets = array(NULL); while($coded_offset_table) { $str = unpack("H6",$coded_offset_table); $this->offsets[] = hexdec($str[1]); $coded_offset_table = substr($coded_offset_table,3); } } else $this->offsets = unpack($formats[$infos['offset_size']],$coded_offset_table); $this->uniqueTable = Array(); $this->objectRefSize = $infos['object_ref_size']; $top = $this->readBinaryObjectAt($infos['top_object']+1); $this->add($top); } function readBinaryStream($stream) { $str = stream_get_contents($stream); $this->parseBinary($str); } function parseBinary($content=NULL) { if($content !== NULL) $this->content = $content; $this->pos = 0; $this->parseBinaryString(); } function readBinary($file) { if(!($fd = fopen($file,"rb"))) throw new IOException("Could not open file {$file}!"); $this->readBinaryStream($fd); fclose($fd); } public static function bytesSizeInt($int) { $nbytes = 0; if($int > 0xE) $nbytes += 2; if($int > 0xFF) $nbytes += 1; if($int > 0xFFFF) $nbytes += 2; return $nbytes; } public static function bytesInt($int) { $nbytes = 1; if($int > 0xFF) $nbytes += 1; if($int > 0xFFFF) $nbytes += 2; if($int > 0xFFFFFFFF) $nbytes += 4; if($int < 0) $nbytes += 7; return $nbytes + 1; } public static function packItWithSize($nbytes,$int) { $formats = Array("C", "n", "N", "N"); $format = $formats[$nbytes-1]; $ret = ''; if($nbytes == 3) return substr(pack($format, $int), -3); return pack($format, $int); } public static function bytesNeeded($count_objects) { $nbytes = 0; while($count_objects >= 1) { $nbytes++; $count_objects /= 256; } return $nbytes; } public static function intBytes($int) { $intbytes = ""; if($int > 0xFFFF) $intbytes = "\x12".pack("N", $int); elseif($int > 0xFF) $intbytes = "\x11".pack("n", $int); else $intbytes = "\x10".pack("C", $int); return $intbytes; } public static function typeBytes($type,$type_len) { $optional_int = ""; if($type_len < 15) $type .= sprintf("%x", $type_len); else { $type .= "f"; $optional_int = self::intBytes($type_len); } return pack("H*", $type).$optional_int; } protected function uniqueAndCountValues($value) { if($value instanceof CFNumber) { $val = $value->getValue(); if(intval($val) == $val && !is_float($val) && strpos($val,'.') === false) $this->intSize += self::bytesInt($val); else $this->miscSize += 9; $this->countObjects++; return; } elseif($value instanceof CFDate) { $this->miscSize += 9; $this->countObjects++; return; } elseif($value instanceof CFBoolean) { $this->countObjects++; $this->miscSize += 1; return; } elseif($value instanceof CFArray) { $cnt = 0; foreach($value as $v) { ++$cnt; $this->uniqueAndCountValues($v); $this->objectRefs++; } $this->countObjects++; $this->intSize += self::bytesSizeInt($cnt); $this->miscSize++; return; } elseif($value instanceof CFDictionary) { $cnt = 0; foreach($value as $k => $v) { ++$cnt; if(!isset($this->uniqueTable[$k])) { $this->uniqueTable[$k] = 0; $len = self::binaryStrlen($k); $this->stringSize += $len + 1; $this->intSize += self::bytesSizeInt(self::charsetStrlen($k,'UTF-8')); } $this->objectRefs += 2; $this->uniqueTable[$k]++; $this->uniqueAndCountValues($v); } $this->countObjects++; $this->miscSize++; $this->intSize += self::bytesSizeInt($cnt); return; } elseif($value instanceOf CFData) { $val = $value->getValue(); $len = strlen($val); $this->intSize += self::bytesSizeInt($len); $this->miscSize += $len + 1; $this->countObjects++; return; } else $val = $value->getValue(); if(!isset($this->uniqueTable[$val])) { $this->uniqueTable[$val] = 0; $len = self::binaryStrlen($val); $this->stringSize += $len + 1; $this->intSize += self::bytesSizeInt(self::charsetStrlen($val,'UTF-8')); } $this->uniqueTable[$val]++; } public function toBinary() { $this->uniqueTable = Array(); $this->countObjects = 0; $this->stringSize = 0; $this->intSize = 0; $this->miscSize = 0; $this->objectRefs = 0; $this->writtenObjectCount = 0; $this->objectTable = Array(); $this->objectRefSize = 0; $this->offsets = Array(); $binary_str = "bplist00"; $value = $this->getValue(true); $this->uniqueAndCountValues($value); $this->countObjects += count($this->uniqueTable); $this->objectRefSize = self::bytesNeeded($this->countObjects); $file_size = $this->stringSize + $this->intSize + $this->miscSize + $this->objectRefs * $this->objectRefSize + 40; $offset_size = self::bytesNeeded($file_size); $table_offset = $file_size - 32; $this->objectTable = Array(); $this->writtenObjectCount = 0; $this->uniqueTable = Array(); $value->toBinary($this); $object_offset = 8; $offsets = Array(); for($i=0;$i<count($this->objectTable);++$i) { $binary_str .= $this->objectTable[$i]; $offsets[$i] = $object_offset; $object_offset += strlen($this->objectTable[$i]); } for($i=0;$i<count($offsets);++$i) { $binary_str .= self::packItWithSize($offset_size, $offsets[$i]); } $binary_str .= pack("x6CC", $offset_size, $this->objectRefSize); $binary_str .= pack("x4N", $this->countObjects); $binary_str .= pack("x4N", 0); $binary_str .= pack("x4N", $table_offset); return $binary_str; } protected static function binaryStrlen($val) { for($i=0;$i<strlen($val);++$i) { if(ord($val{$i}) >= 128) { $val = self::convertCharset($val, 'UTF-8', 'UTF-16BE'); return strlen($val); } } return strlen($val); } public function stringToBinary($val) { $saved_object_count = -1; if(!isset($this->uniqueTable[$val])) { $saved_object_count = $this->writtenObjectCount++; $this->uniqueTable[$val] = $saved_object_count; $utf16 = false; for($i=0;$i<strlen($val);++$i) { if(ord($val{$i}) >= 128) { $utf16 = true; break; } } if($utf16) { $bdata = self::typeBytes("6", mb_strlen($val,'UTF-8')); $val = self::convertCharset($val, 'UTF-8', 'UTF-16BE'); $this->objectTable[$saved_object_count] = $bdata.$val; } else { $bdata = self::typeBytes("5", strlen($val)); $this->objectTable[$saved_object_count] = $bdata.$val; } } else $saved_object_count = $this->uniqueTable[$val]; return $saved_object_count; } protected function intToBinary($value) { $nbytes = 0; if($value > 0xFF) $nbytes = 1; if($value > 0xFFFF) $nbytes += 1; if($value > 0xFFFFFFFF) $nbytes += 1; if($value < 0) $nbytes = 3; $bdata = self::typeBytes("1", $nbytes); $buff = ""; if($nbytes < 3) { if($nbytes == 0) $fmt = "C"; elseif($nbytes == 1) $fmt = "n"; else $fmt = "N"; $buff = pack($fmt, $value); } else { if(PHP_INT_SIZE > 4) { $high_word = $value >> 32; $low_word = $value & 0xFFFFFFFF; } else { if($value < 0) $high_word = 0xFFFFFFFF; else $high_word = 0; $low_word = $value; } $buff = pack("N", $high_word).pack("N", $low_word); } return $bdata.$buff; } protected function realToBinary($val) { $bdata = self::typeBytes("2", 3); return $bdata.strrev(pack("d", (float)$val)); } public function numToBinary($value) { $saved_object_count = $this->writtenObjectCount++; $val = ""; if(intval($value) == $value && !is_float($value) && strpos($value,'.') === false) $val = $this->intToBinary($value); else $val = $this->realToBinary($value); $this->objectTable[$saved_object_count] = $val; return $saved_object_count; } public function dateToBinary($val) { $saved_object_count = $this->writtenObjectCount++; $hour = gmdate("H",$val); $min = gmdate("i",$val); $sec = gmdate("s",$val); $mday = gmdate("j",$val); $mon = gmdate("n",$val); $year = gmdate("Y",$val); $val = gmmktime($hour,$min,$sec,$mon,$mday,$year) - CFDate::DATE_DIFF_APPLE_UNIX; $bdata = self::typeBytes("3", 3); $this->objectTable[$saved_object_count] = $bdata.strrev(pack("d", $val)); return $saved_object_count; } public function boolToBinary($val) { $saved_object_count = $this->writtenObjectCount++; $this->objectTable[$saved_object_count] = $val ? "\x9" : "\x8"; return $saved_object_count; } public function dataToBinary($val) { $saved_object_count = $this->writtenObjectCount++; $bdata = self::typeBytes("4", strlen($val)); $this->objectTable[$saved_object_count] = $bdata.$val; return $saved_object_count; } public function arrayToBinary($val) { $saved_object_count = $this->writtenObjectCount++; $bdata = self::typeBytes("a", count($val->getValue())); foreach($val as $v) { $bval = $v->toBinary($this); $bdata .= self::packItWithSize($this->objectRefSize, $bval); } $this->objectTable[$saved_object_count] = $bdata; return $saved_object_count; } public function dictToBinary($val) { $saved_object_count = $this->writtenObjectCount++; $bdata = self::typeBytes("d", count($val->getValue())); foreach($val as $k => $v) { $str = new CFString($k); $key = $str->toBinary($this); $bdata .= self::packItWithSize($this->objectRefSize, $key); } foreach($val as $k => $v) { $bval = $v->toBinary($this); $bdata .= self::packItWithSize($this->objectRefSize, $bval); } $this->objectTable[$saved_object_count] = $bdata; return $saved_object_count; } } ?>
diff --git a/restler_minified/plistformat/CFPropertyList.php b/restler_minified/plistformat/CFPropertyList.php
new file mode 100644
index 000000000..0d7d5ebcc
--- /dev/null
+++ b/restler_minified/plistformat/CFPropertyList.php
@@ -0,0 +1,2 @@
+<?php
+ require_once('IOException.php'); require_once('PListException.php'); require_once('CFType.php'); require_once('CFBinaryPropertyList.php'); require_once('CFTypeDetector.php'); class CFPropertyList extends CFBinaryPropertyList implements Iterator { const FORMAT_BINARY = 1; const FORMAT_XML = 2; const FORMAT_AUTO = 0; protected $file = null; protected $format = null; protected $value = array(); protected $iteratorPosition = 0; protected $iteratorKeys = null; protected static $types = array( 'string' => 'CFString', 'real' => 'CFNumber', 'integer' => 'CFNumber', 'date' => 'CFDate', 'true' => 'CFBoolean', 'false' => 'CFBoolean', 'data' => 'CFData', 'array' => 'CFArray', 'dict' => 'CFDictionary' ); public function __construct($file=null,$format=self::FORMAT_AUTO) { $this->file = $file; $this->format = $format; if($this->file) $this->load(); } public function loadXML($file=null) { $this->load($file,CFPropertyList::FORMAT_XML); } public function loadXMLStream($stream) { if(($contents = stream_get_contents($stream)) === FALSE) throw IOException::notReadable('<stream>'); $this->parse($content,CFPropertyList::FORMAT_XML); } public function loadBinary($file=null) { $this->load($file,CFPropertyList::FORMAT_BINARY); } public function loadBinaryStream($stream) { if(($contents = stream_get_contents($stream)) === FALSE) throw IOException::notReadable('<stream>'); $this->parse($content,CFPropertyList::FORMAT_BINARY); } public function load($file=null,$format=null) { $file = $file ? $file : $this->file; $format = $format !== null ? $format : $this->format; $this->value = array(); if(!is_readable($file)) throw IOException::notReadable($file); switch($format) { case CFPropertyList::FORMAT_BINARY: $this->readBinary($file); break; case CFPropertyList::FORMAT_AUTO: $fd = fopen($file,"rb"); if(($magic_number = fread($fd,8)) === false) throw IOException::notReadable($file); fclose($fd); $filetype = substr($magic_number,0,6); $version = substr($magic_number,-2); if($filetype == "bplist") { if($version != "00") throw new PListException("Wrong file format version! Expected 00, got $version!"); $this->readBinary($file); break; } case CFPropertyList::FORMAT_XML: $doc = new DOMDocument(); if(!$doc->load($file)) throw new DOMException(); $this->import($doc->documentElement, $this); break; } } public function parse($str=NULL,$format=NULL) { $format = $format !== null ? $format : $this->format; $str = $str !== null ? $str : $this->content; $this->value = array(); switch($format) { case CFPropertyList::FORMAT_BINARY: $this->parseBinary($str); break; case CFPropertyList::FORMAT_AUTO: if(($magic_number = substr($str,0,8)) === false) throw IOException::notReadable("<string>"); $filetype = substr($magic_number,0,6); $version = substr($magic_number,-2); if($filetype == "bplist") { if($version != "00") throw new PListException("Wrong file format version! Expected 00, got $version!"); $this->parseBinary($str); break; } case CFPropertyList::FORMAT_XML: $doc = new DOMDocument(); if(!$doc->loadXML($str)) throw new DOMException(); $this->import($doc->documentElement, $this); break; } } protected function import(DOMNode $node, $parent) { if(!$node->childNodes->length) return; foreach($node->childNodes as $n) { if(!isset(self::$types[$n->nodeName])) continue; $class = self::$types[$n->nodeName]; $key = null; $ps = $n->previousSibling; while($ps && $ps->nodeName == '#text' && $ps->previousSibling) $ps = $ps->previousSibling; if($ps && $ps->nodeName == 'key') $key = $ps->firstChild->nodeValue; switch($n->nodeName) { case 'date': $value = new $class(CFDate::dateValue($n->nodeValue)); break; case 'data': $value = new $class($n->nodeValue,true); break; case 'string': $value = new $class($n->nodeValue); break; case 'real': case 'integer': $value = new $class($n->nodeName == 'real' ? floatval($n->nodeValue) : intval($n->nodeValue)); break; case 'true': case 'false': $value = new $class($n->nodeName == 'true'); break; case 'array': case 'dict': $value = new $class(); $this->import($n, $value); break; } if($parent instanceof CFDictionary) $parent->add($key, $value); else $parent->add($value); } } public function saveXML($file) { $this->save($file,CFPropertyList::FORMAT_XML); } public function saveBinary($file) { $this->save($file,CFPropertyList::FORMAT_BINARY); } public function save($file=null,$format=null) { $file = $file ? $file : $this->file; $format = $format ? $format : $this->format; if( !in_array( $format, array( self::FORMAT_BINARY, self::FORMAT_XML ) ) ) throw new PListException( "format {$format} is not supported, use CFPropertyList::FORMAT_BINARY or CFPropertyList::FORMAT_XML" ); if(!file_exists($file)) { if(!is_writable(dirname($file))) throw IOException::notWritable($file); } else if(!is_writable($file)) throw IOException::notWritable($file); $content = $format == self::FORMAT_BINARY ? $this->toBinary() : $this->toXML(); $fh = fopen($file, 'wb'); fwrite($fh,$content); fclose($fh); } public function toXML($formatted=false) { $domimpl = new DOMImplementation(); $dtd = $domimpl->createDocumentType('plist', '-//Apple Computer//DTD PLIST 1.0//EN', 'http://www.apple.com/DTDs/PropertyList-1.0.dtd'); $doc = $domimpl->createDocument(null, "plist", $dtd); $doc->encoding = "UTF-8"; if($formatted) { $doc->formatOutput = true; $doc->preserveWhiteSpace = true; } $plist = $doc->documentElement; $plist->setAttribute('version', '1.0'); $plist->appendChild($this->getValue(true)->toXML($doc)); return $doc->saveXML(); } public function add(CFType $value=null) { if( !$value ) $value = new CFString(); $this->value[] = $value; } public function get($key) { if(isset($this->value[$key])) return $this->value[$key]; return null; } public function __get($key) { return $this->get($key); } public function del($key) { if(isset($this->value[$key])) { $t = $this->value[$key]; unset($this->value[$key]); return $t; } return null; } public function purge() { $t = $this->value; $this->value = array(); return $t; } public function getValue($cftype=false) { if(count($this->value) === 1) { $t = array_values( $this->value ); return $t[0]; } if($cftype) { $t = new CFArray(); foreach( $this->value as $value ) { if( $value instanceof CFType ) $t->add($value); } return $t; } return $this->value; } public static function guess($value, $autoDictionary=false) { static $t = null; if( $t === null ) $t = new CFTypeDetector( $autoDictionary ); return $t->toCFType( $value ); } public function toArray() { $a = array(); foreach($this->value as $value) $a[] = $value->toArray(); if(count($a) === 1) return $a[0]; return $a; } public function rewind() { $this->iteratorPosition = 0; $this->iteratorKeys = array_keys($this->value); } public function current() { return $this->value[$this->iteratorKeys[$this->iteratorPosition]]; } public function key() { return $this->iteratorKeys[$this->iteratorPosition]; } public function next() { $this->iteratorPosition++; } public function valid() { return isset($this->iteratorKeys[$this->iteratorPosition]) && isset($this->value[$this->iteratorKeys[$this->iteratorPosition]]); } } ?>
\ No newline at end of file
diff --git a/restler_minified/plistformat/CFType.php b/restler_minified/plistformat/CFType.php
new file mode 100644
index 000000000..b896b5f64
--- /dev/null
+++ b/restler_minified/plistformat/CFType.php
@@ -0,0 +1,2 @@
+<?php
+ abstract class CFType { protected $value = null; public function __construct($value=null) { $this->setValue($value); } public function getValue() { return $this->value; } public function setValue($value) { $this->value = $value; } public function toXML(DOMDocument $doc, $nodeName) { $text = $doc->createTextNode($this->value); $node = $doc->createElement($nodeName); $node->appendChild($text); return $node; } public abstract function toBinary(CFBinaryPropertyList &$bplist); public function toArray() { return $this->getValue(); } } class CFString extends CFType { public function toXML(DOMDocument $doc,$nodeName="") { return parent::toXML($doc, 'string'); } public function toBinary(CFBinaryPropertyList &$bplist) { return $bplist->stringToBinary($this->value); } } class CFNumber extends CFType { public function toXML(DOMDocument $doc,$nodeName="") { $ret = 'real'; if(intval($this->value) == $this->value && !is_float($this->value) && strpos($this->value,'.') === false) { $this->value = intval($this->value); $ret = 'integer'; } return parent::toXML($doc, $ret); } public function toBinary(CFBinaryPropertyList &$bplist) { return $bplist->numToBinary($this->value); } } class CFDate extends CFType { const TIMESTAMP_APPLE = 0; const TIMESTAMP_UNIX = 1; const DATE_DIFF_APPLE_UNIX = 978307200; function __construct($value,$format=CFDate::TIMESTAMP_UNIX) { $this->setValue($value,$format); } function setValue($value,$format=CFDate::TIMESTAMP_UNIX) { if($format == CFDate::TIMESTAMP_UNIX) $this->value = $value; else $this->value = $value + CFDate::DATE_DIFF_APPLE_UNIX; } function getValue($format=CFDate::TIMESTAMP_UNIX) { if($format == CFDate::TIMESTAMP_UNIX) return $this->value; else return $this->value - CFDate::DATE_DIFF_APPLE_UNIX; } public function toXML(DOMDocument $doc,$nodeName="") { $text = $doc->createTextNode(gmdate("Y-m-d\TH:i:s\Z",$this->getValue())); $node = $doc->createElement("date"); $node->appendChild($text); return $node; } public function toBinary(CFBinaryPropertyList &$bplist) { return $bplist->dateToBinary($this->value); } public static function dateValue($val) { if(!preg_match('/^(\d{4})-(\d{2})-(\d{2})T(\d{2}):(\d{2}):(\d{2})Z/',$val,$matches)) throw new PListException("Unknown date format: $val"); return gmmktime($matches[4],$matches[5],$matches[6],$matches[2],$matches[3],$matches[1]); } } class CFBoolean extends CFType { public function toXML(DOMDocument $doc,$nodeName="") { return $doc->createElement($this->value ? 'true' : 'false'); } public function toBinary(CFBinaryPropertyList &$bplist) { return $bplist->boolToBinary($this->value); } } class CFData extends CFType { public function __construct($value=null,$already_coded=false) { if($already_coded) $this->value = $value; else $this->setValue($value); } public function setValue($value) { $this->value = base64_encode($value); } public function getCodedValue() { return $this->value; } public function getValue() { return base64_decode($this->value); } public function toXML(DOMDocument $doc,$nodeName="") { return parent::toXML($doc, 'data'); } public function toBinary(CFBinaryPropertyList &$bplist) { return $bplist->dataToBinary($this->getValue()); } } class CFArray extends CFType implements Iterator, ArrayAccess { protected $iteratorPosition = 0; public function __construct($value=array()) { $this->value = $value; } public function setValue($value) { } public function add(CFType $value=null) { if( !$value ) $value = new CFString(); $this->value[] = $value; } public function get($key) { if(isset($this->value[$key])) return $this->value[$key]; return null; } public function del($key) { if(isset($this->value[$key])) unset($this->value[$key]); } public function toXML(DOMDocument $doc,$nodeName="") { $node = $doc->createElement('array'); foreach($this->value as $value) $node->appendChild($value->toXML($doc)); return $node; } public function toBinary(CFBinaryPropertyList &$bplist) { return $bplist->arrayToBinary($this); } public function toArray() { $a = array(); foreach($this->value as $value) $a[] = $value->toArray(); return $a; } public function rewind() { $this->iteratorPosition = 0; } public function current() { return $this->value[$this->iteratorPosition]; } public function key() { return $this->iteratorPosition; } public function next() { $this->iteratorPosition++; } public function valid() { return isset($this->value[$this->iteratorPosition]); } public function offsetExists($key) { return isset($this->value[$key]); } public function offsetGet($key) { return $this->get($key); } public function offsetSet($key, $value) { return $this->setValue($value); } public function offsetUnset($key) { } } class CFDictionary extends CFType implements Iterator { protected $iteratorPosition = 0; protected $iteratorKeys = null; public function __construct($value=array()) { $this->value = $value; } public function setValue($value) { } public function add($key, CFType $value=null) { if( !$value ) $value = new CFString(); $this->value[$key] = $value; } public function get($key) { if(isset($this->value[$key])) return $this->value[$key]; return null; } public function __get($key) { return $this->get($key); } public function del($key) { if(isset($this->value[$key])) unset($this->value[$key]); } public function toXML(DOMDocument $doc,$nodeName="") { $node = $doc->createElement('dict'); foreach($this->value as $key => $value) { $node->appendChild($doc->createElement('key', $key)); $node->appendChild($value->toXML($doc)); } return $node; } public function toBinary(CFBinaryPropertyList &$bplist) { return $bplist->dictToBinary($this); } public function toArray() { $a = array(); foreach($this->value as $key => $value) $a[$key] = $value->toArray(); return $a; } public function rewind() { $this->iteratorPosition = 0; $this->iteratorKeys = array_keys($this->value); } public function current() { return $this->value[$this->iteratorKeys[$this->iteratorPosition]]; } public function key() { return $this->iteratorKeys[$this->iteratorPosition]; } public function next() { $this->iteratorPosition++; } public function valid() { return isset($this->iteratorKeys[$this->iteratorPosition]) && isset($this->value[$this->iteratorKeys[$this->iteratorPosition]]); } } ?>
\ No newline at end of file
diff --git a/restler_minified/plistformat/CFTypeDetector.php b/restler_minified/plistformat/CFTypeDetector.php
new file mode 100644
index 000000000..4f50a079b
--- /dev/null
+++ b/restler_minified/plistformat/CFTypeDetector.php
@@ -0,0 +1,2 @@
+<?php
+ class CFTypeDetector { protected $autoDictionary = false; protected $suppressExceptions = false; protected $objectToArrayMethod = false; public function __construct($autoDicitionary=false,$suppressExceptions=false,$objectToArrayMethod=null) { $this->autoDicitionary = $autoDicitionary; $this->suppressExceptions = $suppressExceptions; $this->objectToArrayMethod = $objectToArrayMethod; } protected function isAssociativeArray($value) { $numericKeys = true; $previousKey = null; foreach($value as $key => $v) { if(!is_numeric($key) || ($previousKey !== null && $previousKey != $key-1)) { $numericKeys = false; break; } $previousKey = $key; } return !$numericKeys; } protected function defaultValue() { return new CFString(); } public function toCFType($value) { switch(true) { case $value instanceof CFType: return $value; break; case is_object($value): if(class_exists( 'DateTime' ) && $value instanceof DateTime){ return new CFDate($value->getTimestamp()); } if($this->objectToArrayMethod && is_callable(array($value, $this->objectToArrayMethod))){ $value = call_user_func( array( $value, $this->objectToArrayMethod ) ); } if(!is_array($value)){ if($this->suppressExceptions) return $this->defaultValue(); throw new PListException('Could not determine CFType for object of type '. get_class($value)); } case $value instanceof Iterator: case is_array($value): if(!$this->autoDictionary) { if(!$this->isAssociativeArray($value)) { $t = new CFArray(); foreach($value as $v) $t->add($this->toCFType($v)); return $t; } } $t = new CFDictionary(); foreach($value as $k => $v) $t->add($k, $this->toCFType($v)); return $t; break; case is_numeric($value): return new CFNumber($value); break; case is_bool($value): return new CFBoolean($value); break; case is_string($value): return new CFString($value); break; case is_null($value): return new CFString(); break; case is_resource($value): if( $this->suppressExceptions ) return $this->defaultValue(); throw new PListException('Could not determine CFType for resource of type '. get_resource_type($value)); break; default: if( $this->suppressExceptions ) return $this->defaultValue(); throw new PListException('Could not determine CFType for '. gettype($value)); break; } } } ?>
\ No newline at end of file
diff --git a/restler_minified/plistformat/IOException.php b/restler_minified/plistformat/IOException.php
new file mode 100644
index 000000000..59366c60c
--- /dev/null
+++ b/restler_minified/plistformat/IOException.php
@@ -0,0 +1,2 @@
+<?php
+ class IOException extends Exception { const NOT_FOUND = 1; const NOT_READABLE = 2; const NOT_WRITABLE = 3; const READ_ERROR = 4; const WRITE_ERROR = 5; public function __construct($path, $type=null) { parent::__construct( $path, $type ); } public static function notFound($path) { return new IOException( $path, self::NOT_FOUND ); } public static function notReadable($path) { return new IOException( $path, self::NOT_READABLE ); } public static function notWritable($path) { return new IOException( $path, self::NOT_WRITABLE ); } public static function readError($path) { return new IOException( $path, self::READ_ERROR ); } public static function writeError($path) { return new IOException( $path, self::WRITE_ERROR ); } } ?>
\ No newline at end of file
diff --git a/restler_minified/plistformat/PListException.php b/restler_minified/plistformat/PListException.php
new file mode 100644
index 000000000..95d5d2220
--- /dev/null
+++ b/restler_minified/plistformat/PListException.php
@@ -0,0 +1,2 @@
+<?php
+ class PListException extends Exception { } ?>
\ No newline at end of file
diff --git a/restler_minified/plistformat/plistformat.php b/restler_minified/plistformat/plistformat.php
new file mode 100644
index 000000000..ccc86d015
--- /dev/null
+++ b/restler_minified/plistformat/plistformat.php
@@ -0,0 +1,2 @@
+<?php
+ class PlistFormat implements iFormat { public static $binary_mode = false; const MIME_BINARY = 'application/x-plist'; const MIME_XML = 'application/xml'; const EXTENSION_BINARY = 'bplist'; const EXTENSION_XML = 'plist'; public function getMIMEMap(){ return array( PlistFormat::EXTENSION_BINARY=>PlistFormat::MIME_BINARY, PlistFormat::EXTENSION_XML=>PlistFormat::MIME_XML ); } public function getMIME(){ return PlistFormat::$binary_mode ? PlistFormat::MIME_BINARY : PlistFormat::MIME_XML; } public function getExtension(){ return PlistFormat::$binary_mode ? PlistFormat::EXTENSION_BINARY : PlistFormat::EXTENSION_XML; } public function setMIME($mime){ PlistFormat::$binary_mode = $mime==PlistFormat::MIME_BINARY; } public function setExtension($extension){ PlistFormat::$binary_mode = $extension==PlistFormat::EXTENSION_BINARY; } public function encode($data, $human_readable=false){ require_once'CFPropertyList.php'; if(!PlistFormat::$binary_mode) { PlistFormat::$binary_mode = !$human_readable; } else { $human_readable=false; } $plist = new CFPropertyList(); $td = new CFTypeDetector(); $guessedStructure = $td->toCFType(object_to_array($data)); $plist->add( $guessedStructure ); return $human_readable ? $plist->toXML(true) : $plist->toBinary(); } public function decode($data){ require_once'CFPropertyList.php'; $plist = new CFPropertyList(); $plist->parse($data); return $plist->toArray(); } public function __toString(){ return $this->getExtension(); } }
\ No newline at end of file
diff --git a/restler_minified/restler.php b/restler_minified/restler.php
new file mode 100644
index 000000000..cef9b364e
--- /dev/null
+++ b/restler_minified/restler.php
@@ -0,0 +1,6 @@
+<?php
+ class Restler { const VERSION = '2.0.0'; public $url; public $request_method; public $request_format; public $request_data=array(); public $cache_dir; public $base_dir; public $response = 'DefaultResponse'; public $response_format; protected $production_mode; protected $routes= array(); protected $format_map = array(); protected $service_class_instance; protected $service_method; protected $auth_classes = array(); protected $error_classes = array(); private $codes = array( 100 => 'Continue', 101 => 'Switching Protocols', 200 => 'OK', 201 => 'Created', 202 => 'Accepted', 203 => 'Non-Authoritative Information', 204 => 'No Content', 205 => 'Reset Content', 206 => 'Partial Content', 300 => 'Multiple Choices', 301 => 'Moved Permanently', 302 => 'Found', 303 => 'See Other', 304 => 'Not Modified', 305 => 'Use Proxy', 306 => '(Unused)', 307 => 'Temporary Redirect', 400 => 'Bad Request', 401 => 'Unauthorized', 402 => 'Payment Required', 403 => 'Forbidden', 404 => 'Not Found', 405 => 'Method Not Allowed', 406 => 'Not Acceptable', 407 => 'Proxy Authentication Required', 408 => 'Request Timeout', 409 => 'Conflict', 410 => 'Gone', 411 => 'Length Required', 412 => 'Precondition Failed', 413 => 'Request Entity Too Large', 414 => 'Request-URI Too Long', 415 => 'Unsupported Media Type', 416 => 'Requested Range Not Satisfiable', 417 => 'Expectation Failed', 500 => 'Internal Server Error', 501 => 'Not Implemented', 502 => 'Bad Gateway', 503 => 'Service Unavailable', 504 => 'Gateway Timeout', 505 => 'HTTP Version Not Supported' ); protected $cached; public function __construct ($production_mode = FALSE) { $this->production_mode = $production_mode; $this->cache_dir = getcwd(); $this->base_dir = RESTLER_PATH; } public function __destruct () { if ($this->production_mode && !$this->cached) { $this->saveCache(); } } public function refreshCache () { $this->routes = array(); $this->cached = FALSE; } public function setSupportedFormats () { $args = func_get_args(); $extensions = array(); foreach ($args as $class_name) { if(!is_string($class_name) || !class_exists($class_name)){ throw new Exception("$class_name is not a vaild Format Class."); } $obj = new $class_name; if(! $obj instanceof iFormat){ throw new Exception('Invalid format class; must implement '. 'iFormat interface'); } foreach ($obj->getMIMEMap() as $extension => $mime) { if(!isset($this->format_map[$extension])) $this->format_map[$extension]=$class_name; if(!isset($this->format_map[$mime])) $this->format_map[$mime]=$class_name; $extensions[".$extension"]=TRUE; } } $this->format_map['default']=$args[0]; $this->format_map['extensions']=array_keys($extensions); } public function addAPIClass($class_name, $base_path = NULL) { if(!class_exists($class_name)){ throw new Exception("API class $class_name is missing."); } $this->loadCache(); if(!$this->cached){ if(is_null($base_path))$base_path=strtolower($class_name); $base_path = trim($base_path,'/'); if(strlen($base_path)>0)$base_path .= '/'; $this->generateMap($class_name, $base_path); } } public function addAuthenticationClass ($class_name, $base_path = NULL) { $this->auth_classes[] = $class_name; $this->addAPIClass($class_name, $base_path); } public function addErrorClass ($class_name) { $this->error_classes[] = $class_name; } public function handleError ($status_code, $error_message = NULL) { $method = "handle$status_code"; $handled = FALSE; foreach ($this->error_classes as $class_name) { if (method_exists($class_name, $method)) { $obj = new $class_name(); $obj->restler = $this; $obj->$method(); $handled = TRUE; } } if($handled)return; $message = $this->codes[$status_code] . (!$error_message ? '' : ': ' . $error_message); $this->setStatus($status_code); $this->sendData( call_user_func( array($this->response, '__formatError'), $status_code, $message) ); } public function handle () { $this->url = $this->getPath(); $this->request_method = $this->getRequestMethod(); if(empty($this->format_map))$this->setSupportedFormats('JsonFormat'); $this->response_format = $this->getResponseFormat(); $this->request_format = $this->getRequestFormat(); if(is_null($this->request_format)){ $this->request_format = $this->response_format; } if($this->request_method == 'PUT' || $this->request_method == 'POST'){ $this->request_data = $this->getRequestData(); } $o = $this->mapUrlToMethod(); if(!isset($o->class_name)){ $this->handleError(404); }else{ try { if($o->method_flag){ $auth_method = '__isAuthenticated'; if(!count($this->auth_classes))throw new RestException(401); foreach ($this->auth_classes as $auth_class) { $auth_obj = new $auth_class(); $auth_obj->restler=$this; $this->applyClassMetadata($auth_class, $auth_obj, $o); if (!method_exists($auth_obj, $auth_method)) { throw new RestException(401, 'Authentication Class '. 'should implement iAuthenticate'); }elseif(!$auth_obj->$auth_method()){ throw new RestException(401); } } } $this->applyClassMetadata(get_class($this->request_format), $this->request_format, $o); $pre_process = '_'.$this->request_format->getExtension().'_'. $o->method_name; $this->service_method = $o->method_name; if($o->method_flag==2)$o=unprotect($o); $object = $this->service_class_instance = new $o->class_name(); if(method_exists($o->class_name, $pre_process)) { call_user_func_array(array($object, $pre_process), $o->arguments); } switch ($o->method_flag) { case 3: $reflection_method = new ReflectionMethod($object, $o->method_name); $reflection_method->setAccessible(TRUE); $result = $reflection_method->invokeArgs($object, $o->arguments); break; case 2: case 1: default: $result = call_user_func_array(array($object, $o->method_name), $o->arguments); } } catch (RestException $e) { $this->handleError($e->getCode(), $e->getMessage()); } } if (isset($result) && $result !== NULL) { $this->sendData($result); } } public function sendData($data) { $data = $this->response_format->encode($data, !$this->production_mode); $post_process = '_'.$this->service_method .'_'. $this->response_format->getExtension(); if(isset($this->service_class_instance) && method_exists($this->service_class_instance,$post_process)){ $data = call_user_func(array($this->service_class_instance, $post_process), $data); } header("Cache-Control: no-cache, must-revalidate"); header("Expires: 0"); header('Content-Type: ' . $this->response_format->getMIME()); header("X-Powered-By: Luracast Restler v".Restler::VERSION); die($data); } public function setStatus($code) { header("{$_SERVER['SERVER_PROTOCOL']} $code ". $this->codes[strval($code)]); } public function removeCommonPath($first, $second, $char='/'){ $first = explode($char, $first); $second = explode($char, $second); while (count($second)){ if($first[0]==$second[0]){ array_shift($first); } else break; array_shift($second); } return implode($char, $first); } public function saveCache() { $file = $this->cache_dir . '/routes.php'; $s = '$o=array();'.PHP_EOL; foreach ($this->routes as $key => $value) { $s .= PHP_EOL.PHP_EOL.PHP_EOL."############### $key ###############" .PHP_EOL.PHP_EOL; $s .= '$o[\''.$key.'\']=array();'; foreach ($value as $ke => $va) { $s .= PHP_EOL.PHP_EOL."#==== $key $ke".PHP_EOL.PHP_EOL; $s .= '$o[\''.$key.'\'][\''.$ke.'\']='.str_replace(PHP_EOL, PHP_EOL."\t", var_export($va, TRUE)).';'; } } $s .= PHP_EOL.'return $o;'; $r=@file_put_contents($file, "<?php $s"); @chmod($file, 0777); if($r===FALSE)throw new Exception( "The cache directory located at '$this->cache_dir' needs to have ". "the permissions set to read/write/execute for everyone in order ". "to save cache and improve performance."); } protected function getPath () { $path = urldecode($this->removeCommonPath($_SERVER['REQUEST_URI'], $_SERVER['SCRIPT_NAME'])); $path = preg_replace('/(\/*\?.*$)|(\/$)/', '', $path); $path = str_replace($this->format_map['extensions'], '', $path); return $path; } protected function getRequestMethod () { $method = $_SERVER['REQUEST_METHOD']; if (isset($_SERVER['HTTP_X_HTTP_METHOD_OVERRIDE'])){ $method = $_SERVER['HTTP_X_HTTP_METHOD_OVERRIDE']; } return $method; } protected function getRequestFormat () { $format=NULL; if(isset($_SERVER['CONTENT_TYPE'])){ $mime = explode(';', $_SERVER['CONTENT_TYPE']); $mime = $mime[0]; if($mime==UrlEncodedFormat::MIME){ $format = new UrlEncodedFormat(); }else{ if(isset($this->format_map[$mime])){ $format = $this->format_map[$mime]; $format = is_string($format) ? new $format: $format; $format->setMIME($mime); } } } return $format; } protected function getResponseFormat () { $format; $extension = explode('.', parse_url($_SERVER['REQUEST_URI'], PHP_URL_PATH)); $extension = array_pop($extension); if($extension && isset($this->format_map[$extension])){ $format = $this->format_map[$extension]; $format = is_string($format) ? new $format: $format; $format->setExtension($extension); return $format; } if(isset($_SERVER['HTTP_ACCEPT'])){ $accepts = explode(',', $_SERVER['HTTP_ACCEPT']); foreach ($accepts as $accept) { if($extension && isset($this->format_map[$accept])){ $format = $this->format_map[$accept]; $format = is_string($format) ? new $format: $format; $format->setMIME($accept); return $format; } } } $format = $this->format_map['default']; return is_string($format) ? new $format: $format; } protected function getRequestData() { try{ $r = file_get_contents('php://input'); if(is_null($r))return $_GET; $r =$this->request_format->decode($r); return is_null($r) ? array(): $r; } catch (RestException $e) { $this->handleError($e->getCode(), $e->getMessage()); } } protected function mapUrlToMethod () { if(!isset($this->routes[$this->request_method])){ return array(); } $urls = $this->routes[$this->request_method]; if(!$urls)return array(); $found = FALSE; $this->request_data += $_GET; $params = array('request_data'=>$this->request_data); $params += $this->request_data; foreach ($urls as $url => $call) { $call = (object)$call; if(strstr($url, ':')){ $regex = preg_replace('/\\\:([^\/]+)/', '(?P<$1>[^/]+)', preg_quote($url)); if (preg_match(":^$regex$:", $this->url, $matches)) { foreach ($matches as $arg => $match) { if (isset($call->arguments[$arg])){ $params[$arg] = $match; } } $found = TRUE; break; } }elseif ($url == $this->url){ $found = TRUE; break; } } if($found){ $p = is_null($call->defaults) ? array() : $call->defaults; foreach ($call->arguments as $key => $value) { if(isset($params[$key]))$p[$value] = $params[$key]; } $call->arguments=$p; return $call; } } protected function applyClassMetadata($class_name, $instance, $method_info){ if(isset($method_info->metadata[$class_name]) && is_array($method_info->metadata[$class_name])){ foreach ($method_info->metadata[$class_name] as $property => $value){ if(property_exists($class_name, $property)){ $reflection_property = new ReflectionProperty($class_name, $property); $reflection_property->setValue($instance, $value); } } } } protected function loadCache() { if ($this->cached !== NULL) { return; } $file = $this->cache_dir . '/routes.php'; $this->cached = FALSE; if ($this->production_mode) { if (file_exists($file)) { $routes = include($file); } if (isset($routes) && is_array($routes)) { $this->routes = $routes; $this->cached = TRUE; } } else { } } protected function generateMap ($class_name, $base_path = "") { $reflection = new ReflectionClass($class_name); $class_metadata = parse_doc($reflection->getDocComment()); $methods = $reflection->getMethods( ReflectionMethod::IS_PUBLIC + ReflectionMethod::IS_PROTECTED); foreach ($methods as $method) { $doc = $method->getDocComment(); $arguments = array(); $defaults = array(); $metadata = $class_metadata+parse_doc($doc); $params = $method->getParameters(); $position=0; foreach ($params as $param){ $arguments[$param->getName()] = $position; if($param->isDefaultValueAvailable()){ $defaults[$position] = $param->getDefaultValue(); } $position++; } $method_flag = $method->isProtected() ? (isRestlerCompatibilityModeEnabled() ? 2 : 3) : (isset($metadata['protected']) ? 1 : 0); $call = array( 'class_name'=>$class_name, 'method_name'=>$method->getName(), 'arguments'=>$arguments, 'defaults'=>$defaults, 'metadata'=>$metadata, 'method_flag'=>$method_flag ); $method_url = strtolower($method->getName()); if (preg_match_all( '/@url\s+(GET|POST|PUT|DELETE|HEAD|OPTIONS)[ \t]*\/?(\S*)/s', $doc, $matches, PREG_SET_ORDER)) { foreach ($matches as $match) { $http_method = $match[1]; $url = rtrim($base_path . $match[2],'/'); $this->routes[$http_method][$url] = $call; } }elseif($method_url[0] != '_'){ if (preg_match_all('/^(GET|POST|PUT|DELETE|HEAD|OPTIONS)/i', $method_url, $matches)) { $http_method = strtoupper($matches[0][0]); $method_url = substr($method_url, strlen($http_method)); }else{ $http_method = 'GET'; } $url = $base_path. ($method_url=='index' || $method_url=='default' ? '' : $method_url); $url = rtrim($url,'/'); $this->routes[$http_method][$url] = $call; foreach ($params as $param){ if($param->getName()=='request_data'){ break; } $url .= $url=='' ? ':' : '/:'; $url .= $param->getName(); $this->routes[$http_method][$url] = $call; } } } } } if(version_compare(PHP_VERSION, '5.3.0') < 0){ require_once 'compat.php'; } class RestException extends Exception { public function __construct($http_status_code, $error_message = NULL) { parent::__construct($error_message, $http_status_code); } } interface iRespond { public function __formatResponse($result); public function __formatError($status_code, $message); } class DefaultResponse implements iRespond { function __formatResponse($result) { return $result; } function __formatError($statusCode, $message) { return array('error' => array('code' => $statusCode, 'message' => $message)); } } interface iAuthenticate { public function __isAuthenticated(); } interface iFormat { public function getMIMEMap(); public function setMIME($mime); public function getMIME(); public function setExtension($extension); public function getExtension(); public function encode($data, $human_readable=FALSE); public function decode($data); } class UrlEncodedFormat implements iFormat { const MIME = 'application/x-www-form-urlencoded'; const EXTENSION = 'post'; public function getMIMEMap() { return array(UrlEncodedFormat::EXTENSION=>UrlEncodedFormat::MIME); } public function getMIME(){ return UrlEncodedFormat::MIME; } public function getExtension(){ return UrlEncodedFormat::EXTENSION; } public function setMIME($mime){ } public function setExtension($extension){ } public function encode($data, $human_readable=FALSE){ return http_build_query($data); } public function decode($data){ parse_str($data,$r); return $r; } public function __toString(){ return $this->getExtension(); } } class JsonFormat implements iFormat { const MIME ='application/json'; const EXTENSION = 'json'; public function getMIMEMap() { return array(JsonFormat::EXTENSION=>JsonFormat::MIME); } public function getMIME(){ return JsonFormat::MIME; } public function getExtension(){ return JsonFormat::EXTENSION; } public function setMIME($mime){ } public function setExtension($extension){ } public function encode($data, $human_readable=FALSE){ return $human_readable ? $this->json_format(json_encode(object_to_array($data))) : json_encode(object_to_array($data)); } public function decode($data){ return object_to_array(json_decode($data)); } private function json_format($json) { $tab = "  "; $new_json = ""; $indent_level = 0; $in_string = FALSE; $len = strlen($json); for($c = 0; $c < $len; $c++) { $char = $json[$c]; switch($char) { case '{': case '[': if(!$in_string) { $new_json .= $char . "\n" . str_repeat($tab, $indent_level+1); $indent_level++; } else { $new_json .= $char; } break; case '}': case ']': if(!$in_string) { $indent_level--; $new_json .= "\n".str_repeat($tab, $indent_level).$char; } else { $new_json .= $char; } break; case ',': if(!$in_string) { $new_json .= ",\n" . str_repeat($tab, $indent_level); } else { $new_json .= $char; } break; case ':': if(!$in_string) { $new_json .= ": "; } else { $new_json .= $char; } break; case '"': if($c==0){ $in_string = TRUE; }elseif($c > 0 && $json[$c-1] != '\\') { $in_string = !$in_string; } default: $new_json .= $char; break; } } return $new_json; } public function __toString(){ return $this->getExtension(); } } class DocParser { private $params=array(); function parse($doc='') { if($doc==''){ return $this->params; } if(preg_match('#^/\*\*(.*)\*/#s', $doc, $comment) === false) return $this->params; $comment = trim($comment[1]); if(preg_match_all('#^\s*\*(.*)#m', $comment, $lines) === false) return $this->params; $this->parseLines($lines[1]); return $this->params; } private function parseLines($lines) { foreach($lines as $line) { $parsedLine = $this->parseLine($line); if($parsedLine === false && !isset($this->params['description'])) { if(isset($desc)){ $this->params['description'] = implode(PHP_EOL, $desc); } $desc = array(); } elseif($parsedLine !== false) { $desc[] = $parsedLine; } } $desc = implode(' ', $desc); if(!empty($desc))$this->params['long_description'] = $desc; } private function parseLine($line) { $line = trim($line); if(empty($line)) return false; if(strpos($line, '@') === 0) { if(strpos($line, ' ')>0){ $param = substr($line, 1, strpos($line, ' ') - 1); $value = substr($line, strlen($param) + 2); }else{ $param = substr($line, 1); $value = ''; } if($this->setParam($param, $value)) return false; } return $line; } private function setParam($param, $value) { if($param == 'param' || $param == 'return') $value = $this->formatParamOrReturn($value); if($param == 'class') list($param, $value) = $this->formatClass($value); if(empty($this->params[$param])) { $this->params[$param] = $value; } else if($param == 'param'){ $arr = array($this->params[$param], $value); $this->params[$param] = $arr; } else { $this->params[$param] = $value + $this->params[$param]; } return true; } private function formatClass($value) { $r = preg_split("[\(|\)]",$value); if(is_array($r)){ $param = $r[0]; parse_str($r[1],$value); foreach ($value as $key => $val) { $val = explode(',', $val); if(count($val)>1)$value[$key]=$val; } }else{ $param='Unknown'; } return array($param, $value); } private function formatParamOrReturn($string) { $pos = strpos($string, ' '); $type = substr($string, 0, $pos); return '(' . $type . ')' . substr($string, $pos+1); } } function parse_doc($php_doc_comment){ $p = new DocParser(); return $p->parse($php_doc_comment); $p = new Parser($php_doc_comment); return $p; $php_doc_comment = preg_replace("/(^[\\s]*\\/\\*\\*)
+                                 |(^[\\s]\\*\\/)
+                                 |(^[\\s]*\\*?\\s)
+                                 |(^[\\s]*)
+                                 |(^[\\t]*)/ixm", "", $php_doc_comment); $php_doc_comment = str_replace("\r", "", $php_doc_comment); $php_doc_comment = preg_replace("/([\\t])+/", "\t", $php_doc_comment); return explode("\n", $php_doc_comment); $php_doc_comment = trim(preg_replace('/\r?\n *\* */', ' ', $php_doc_comment)); return $php_doc_comment; preg_match_all('/@([a-z]+)\s+(.*?)\s*(?=$|@[a-z]+\s)/s', $php_doc_comment, $matches); return array_combine($matches[1], $matches[2]); } function object_to_array($object, $utf_encode=TRUE) { if(is_array($object) || is_object($object)) { $array = array(); foreach($object as $key => $value) { $value = object_to_array($value, $utf_encode); if($utf_encode && is_string($value)){ $value = utf8_encode($value); } $array[$key] = $value; } return $array; } return $object; } function autoload_formats($class_name) { $class_name=strtolower($class_name); $file = RESTLER_PATH."/$class_name/$class_name.php"; if (file_exists($file)) { require_once($file); } } spl_autoload_register('autoload_formats'); if(!function_exists('isRestlerCompatibilityModeEnabled')){ function isRestlerCompatibilityModeEnabled(){ return FALSE; } } define('RESTLER_PATH', dirname(__FILE__));
\ No newline at end of file
diff --git a/restler_minified/xmlformat.php b/restler_minified/xmlformat.php
new file mode 100644
index 000000000..27d081756
--- /dev/null
+++ b/restler_minified/xmlformat.php
@@ -0,0 +1,2 @@
+<?php
+ class XmlFormat implements iFormat { public static $parse_attributes=true; public static $parse_namespaces=false; public static $attribute_names=array('xmlns'); public static $root_name='response'; public static $default_tag_name='item'; const MIME ='application/xml'; const EXTENSION = 'xml'; public function getMIMEMap() { return array(XmlFormat::EXTENSION=>XmlFormat::MIME); } public function getMIME(){ return XmlFormat::MIME; } public function getExtension(){ return XmlFormat::EXTENSION; } public function setMIME($mime){ } public function setExtension($extension){ } public function encode($data, $human_readable=false){ return $this->toXML( object_to_array($data, false), XmlFormat::$root_name, $human_readable); } public function decode($data){ try { if($data=='')return array(); return $this->toArray($data); } catch (Exception $e) { throw new RestException(400, "Error decoding request. ". $e->getMessage()); } } public function __toString(){ return $this->getExtension(); } public function isAssoc( $array ) { return (is_array($array) && 0 !== count(array_diff_key($array, array_keys(array_keys($array))))); } public function toXML( $data, $root_node_name = 'result', $human_readable=false, &$xml=null) { if (ini_get('zend.ze1_compatibility_mode') == 1) ini_set ('zend.ze1_compatibility_mode', 0); if (is_null($xml)) $xml = @simplexml_load_string("<$root_node_name/>"); if(is_array($data)){ $numeric=0; foreach( $data as $key => $value ) { if ( is_numeric( $key ) ) { $numeric = 1; $key = XmlFormat::$root_name == $root_node_name ? XmlFormat::$default_tag_name : $root_node_name; } $key = preg_replace('/[^a-z0-9\-\_\.\:]/i', '', $key); if ( is_array( $value ) ) { $node = $this->isAssoc( $value ) || $numeric ? $xml->addChild( $key ) : $xml; if ( $numeric ) $key = 'anon'; $this->toXML($value, $key, $human_readable, $node); } else { $value = utf8_encode(htmlentities($value)); in_array($key,XmlFormat::$attribute_names) ? $xml->addAttribute($key,$value) : $xml->addChild( $key, $value); } } }else{ if(is_bool($data)) $data = $data ? 'true' : 'false'; $xml = @simplexml_load_string( "<$root_node_name>$data</$root_node_name>"); } if(!$human_readable){ return $xml->asXML(); }else{ $dom = dom_import_simplexml($xml)->ownerDocument; $dom->formatOutput = true; return $dom->saveXML(); } } public function toArray( $xml, $firstCall=true) { if ( is_string( $xml ) ) $xml = new SimpleXMLElement( $xml ); $children = $xml->children(); if ( !$children ) { $r = (string) $xml; if($r=='true' || $r=='false')$r=$r=='true'; return $r; } $arr = array(); if($firstCall){ XmlFormat::$attribute_names=array(); XmlFormat::$root_name = $xml->getName(); if (XmlFormat::$parse_namespaces){ foreach($xml->getDocNamespaces(TRUE) as $namepace => $uri) { $arr[$namepace=='' ? 'xmlns' : 'xmlns:'.$namepace] = (string)$uri; } } } if(XmlFormat::$parse_attributes){ foreach($xml->attributes() as $attName => $attValue) { $arr[$attName] = (string)$attValue; XmlFormat::$attribute_names[]=$attName; } } foreach ($children as $key => $node) { $node = $this->toArray($node, false); if ($key == 'anon') $key = count($arr); if (isset($arr[$key])) { if ( !is_array($arr[$key]) || @$arr[$key][0] == null ) $arr[$key] = array($arr[$key]); $arr[$key][] = $node; } else { $arr[$key] = $node; } } return $arr; } public static function exportCurrentSettings() { $s = 'XmlFormat::$root_name = "'. (XmlFormat::$root_name)."\";\n"; $s .= 'XmlFormat::$attribute_names = '. (var_export(XmlFormat::$attribute_names, true)).";\n"; $s .= 'XmlFormat::$default_tag_name = "'. XmlFormat::$default_tag_name."\";\n"; $s .= 'XmlFormat::$parse_attributes = '. (XmlFormat::$parse_attributes ? 'true' : 'false').";\n"; $s .= 'XmlFormat::$parse_namespaces = '. (XmlFormat::$parse_namespaces ? 'true' : 'false').";\n\n\n"; return $s; } } 
\ No newline at end of file
diff --git a/restler_minified/yamlformat/sfyaml.php b/restler_minified/yamlformat/sfyaml.php
new file mode 100644
index 000000000..69c5c15f9
--- /dev/null
+++ b/restler_minified/yamlformat/sfyaml.php
@@ -0,0 +1,2 @@
+<?php
+ include_once 'sfyamlinline.php'; class sfYaml { static protected $spec = '1.2'; static public function setSpecVersion($version) { if (!in_array($version, array('1.1', '1.2'))) { throw new InvalidArgumentException(sprintf('Version %s of the YAML specifications is not supported', $version)); } self::$spec = $version; } static public function getSpecVersion() { return self::$spec; } public static function load($input) { $file = ''; if (strpos($input, "\n") === false && is_file($input)) { $file = $input; ob_start(); $retval = include($input); $content = ob_get_clean(); $input = is_array($retval) ? $retval : $content; } if (is_array($input)) { return $input; } require_once dirname(__FILE__).'/sfYamlParser.php'; $yaml = new sfYamlParser(); try { $ret = $yaml->parse($input); } catch (Exception $e) { throw new InvalidArgumentException(sprintf('Unable to parse %s: %s', $file ? sprintf('file "%s"', $file) : 'string', $e->getMessage())); } return $ret; } public static function dump($array, $inline = 2) { require_once dirname(__FILE__).'/sfYamlDumper.php'; $yaml = new sfYamlDumper(); return $yaml->dump($array, $inline); } } function echoln($string) { echo $string."\n"; } 
\ No newline at end of file
diff --git a/restler_minified/yamlformat/sfyamlInline.php b/restler_minified/yamlformat/sfyamlInline.php
new file mode 100644
index 000000000..f1ba37a53
--- /dev/null
+++ b/restler_minified/yamlformat/sfyamlInline.php
@@ -0,0 +1,16 @@
+<?php
+ class sfYamlInline { const REGEX_QUOTED_STRING = '(?:"([^"\\\\]*(?:\\\\.[^"\\\\]*)*)"|\'([^\']*(?:\'\'[^\']*)*)\')'; static public function load($value) { $value = trim($value); if (0 == strlen($value)) { return ''; } if (function_exists('mb_internal_encoding') && ((int) ini_get('mbstring.func_overload')) & 2) { $mbEncoding = mb_internal_encoding(); mb_internal_encoding('ASCII'); } switch ($value[0]) { case '[': $result = self::parseSequence($value); break; case '{': $result = self::parseMapping($value); break; default: $result = self::parseScalar($value); } if (isset($mbEncoding)) { mb_internal_encoding($mbEncoding); } return $result; } static public function dump($value) { if ('1.1' === sfYaml::getSpecVersion()) { $trueValues = array('true', 'on', '+', 'yes', 'y'); $falseValues = array('false', 'off', '-', 'no', 'n'); } else { $trueValues = array('true'); $falseValues = array('false'); } switch (true) { case is_resource($value): throw new InvalidArgumentException('Unable to dump PHP resources in a YAML file.'); case is_object($value): return '!!php/object:'.serialize($value); case is_array($value): return self::dumpArray($value); case null === $value: return 'null'; case true === $value: return 'true'; case false === $value: return 'false'; case ctype_digit($value): return is_string($value) ? "'$value'" : (int) $value; case is_numeric($value): return is_infinite($value) ? str_ireplace('INF', '.Inf', strval($value)) : (is_string($value) ? "'$value'" : $value); case false !== strpos($value, "\n") || false !== strpos($value, "\r"): return sprintf('"%s"', str_replace(array('"', "\n", "\r"), array('\\"', '\n', '\r'), $value)); case preg_match('/[ \s \' " \: \{ \} \[ \] , & \* \# \?] | \A[ - ? | < > = ! % @ ` ]/x', $value): return sprintf("'%s'", str_replace('\'', '\'\'', $value)); case '' == $value: return "''"; case preg_match(self::getTimestampRegex(), $value): return "'$value'"; case in_array(strtolower($value), $trueValues): return "'$value'"; case in_array(strtolower($value), $falseValues): return "'$value'"; case in_array(strtolower($value), array('null', '~')): return "'$value'"; default: return $value; } } static protected function dumpArray($value) { $keys = array_keys($value); if ( (1 == count($keys) && '0' == $keys[0]) || (count($keys) > 1 && array_reduce($keys, create_function('$v,$w', 'return (integer) $v + $w;'), 0) == count($keys) * (count($keys) - 1) / 2)) { $output = array(); foreach ($value as $val) { $output[] = self::dump($val); } return sprintf('[%s]', implode(', ', $output)); } $output = array(); foreach ($value as $key => $val) { $output[] = sprintf('%s: %s', self::dump($key), self::dump($val)); } return sprintf('{ %s }', implode(', ', $output)); } static public function parseScalar($scalar, $delimiters = null, $stringDelimiters = array('"', "'"), &$i = 0, $evaluate = true) { if (in_array($scalar[$i], $stringDelimiters)) { $output = self::parseQuotedScalar($scalar, $i); } else { if (!$delimiters) { $output = substr($scalar, $i); $i += strlen($output); if (false !== $strpos = strpos($output, ' #')) { $output = rtrim(substr($output, 0, $strpos)); } } else if (preg_match('/^(.+?)('.implode('|', $delimiters).')/', substr($scalar, $i), $match)) { $output = $match[1]; $i += strlen($output); } else { throw new InvalidArgumentException(sprintf('Malformed inline YAML string (%s).', $scalar)); } $output = $evaluate ? self::evaluateScalar($output) : $output; } return $output; } static protected function parseQuotedScalar($scalar, &$i) { if (!preg_match('/'.self::REGEX_QUOTED_STRING.'/Au', substr($scalar, $i), $match)) { throw new InvalidArgumentException(sprintf('Malformed inline YAML string (%s).', substr($scalar, $i))); } $output = substr($match[0], 1, strlen($match[0]) - 2); if ('"' == $scalar[$i]) { $output = str_replace(array('\\"', '\\n', '\\r'), array('"', "\n", "\r"), $output); } else { $output = str_replace('\'\'', '\'', $output); } $i += strlen($match[0]); return $output; } static protected function parseSequence($sequence, &$i = 0) { $output = array(); $len = strlen($sequence); $i += 1; while ($i < $len) { switch ($sequence[$i]) { case '[': $output[] = self::parseSequence($sequence, $i); break; case '{': $output[] = self::parseMapping($sequence, $i); break; case ']': return $output; case ',': case ' ': break; default: $isQuoted = in_array($sequence[$i], array('"', "'")); $value = self::parseScalar($sequence, array(',', ']'), array('"', "'"), $i); if (!$isQuoted && false !== strpos($value, ': ')) { try { $value = self::parseMapping('{'.$value.'}'); } catch (InvalidArgumentException $e) { } } $output[] = $value; --$i; } ++$i; } throw new InvalidArgumentException(sprintf('Malformed inline YAML string %s', $sequence)); } static protected function parseMapping($mapping, &$i = 0) { $output = array(); $len = strlen($mapping); $i += 1; while ($i < $len) { switch ($mapping[$i]) { case ' ': case ',': ++$i; continue 2; case '}': return $output; } $key = self::parseScalar($mapping, array(':', ' '), array('"', "'"), $i, false); $done = false; while ($i < $len) { switch ($mapping[$i]) { case '[': $output[$key] = self::parseSequence($mapping, $i); $done = true; break; case '{': $output[$key] = self::parseMapping($mapping, $i); $done = true; break; case ':': case ' ': break; default: $output[$key] = self::parseScalar($mapping, array(',', '}'), array('"', "'"), $i); $done = true; --$i; } ++$i; if ($done) { continue 2; } } } throw new InvalidArgumentException(sprintf('Malformed inline YAML string %s', $mapping)); } static protected function evaluateScalar($scalar) { $scalar = trim($scalar); if ('1.1' === sfYaml::getSpecVersion()) { $trueValues = array('true', 'on', '+', 'yes', 'y'); $falseValues = array('false', 'off', '-', 'no', 'n'); } else { $trueValues = array('true'); $falseValues = array('false'); } switch (true) { case 'null' == strtolower($scalar): case '' == $scalar: case '~' == $scalar: return null; case 0 === strpos($scalar, '!str'): return (string) substr($scalar, 5); case 0 === strpos($scalar, '! '): return intval(self::parseScalar(substr($scalar, 2))); case 0 === strpos($scalar, '!!php/object:'): return unserialize(substr($scalar, 13)); case ctype_digit($scalar): $raw = $scalar; $cast = intval($scalar); return '0' == $scalar[0] ? octdec($scalar) : (((string) $raw == (string) $cast) ? $cast : $raw); case in_array(strtolower($scalar), $trueValues): return true; case in_array(strtolower($scalar), $falseValues): return false; case is_numeric($scalar): return '0x' == $scalar[0].$scalar[1] ? hexdec($scalar) : floatval($scalar); case 0 == strcasecmp($scalar, '.inf'): case 0 == strcasecmp($scalar, '.NaN'): return -log(0); case 0 == strcasecmp($scalar, '-.inf'): return log(0); case preg_match('/^(-|\+)?[0-9,]+(\.[0-9]+)?$/', $scalar): return floatval(str_replace(',', '', $scalar)); case preg_match(self::getTimestampRegex(), $scalar): return strtotime($scalar); default: return (string) $scalar; } } static protected function getTimestampRegex() { return <<<EOF
+    ~^
+    (?P<year>[0-9][0-9][0-9][0-9])
+    -(?P<month>[0-9][0-9]?)
+    -(?P<day>[0-9][0-9]?)
+    (?:(?:[Tt]|[ \t]+)
+    (?P<hour>[0-9][0-9]?)
+    :(?P<minute>[0-9][0-9])
+    :(?P<second>[0-9][0-9])
+    (?:\.(?P<fraction>[0-9]*))?
+    (?:[ \t]*(?P<tz>Z|(?P<tz_sign>[-+])(?P<tz_hour>[0-9][0-9]?)
+    (?::(?P<tz_minute>[0-9][0-9]))?))?)?
+    $~x
+EOF;
+} } 
\ No newline at end of file
diff --git a/restler_minified/yamlformat/sfyamldumper.php b/restler_minified/yamlformat/sfyamldumper.php
new file mode 100644
index 000000000..7b7c1158f
--- /dev/null
+++ b/restler_minified/yamlformat/sfyamldumper.php
@@ -0,0 +1,2 @@
+<?php
+ class sfYamlDumper { public function dump($input, $inline = 0, $indent = 0) { $output = ''; $prefix = $indent ? str_repeat(' ', $indent) : ''; if ($inline <= 0 || !is_array($input) || empty($input)) { $output .= $prefix.sfYamlInline::dump($input); } else { $isAHash = array_keys($input) !== range(0, count($input) - 1); foreach ($input as $key => $value) { $willBeInlined = $inline - 1 <= 0 || !is_array($value) || empty($value); $output .= sprintf('%s%s%s%s', $prefix, $isAHash ? sfYamlInline::dump($key).':' : '-', $willBeInlined ? ' ' : "\n", $this->dump($value, $inline - 1, $willBeInlined ? 0 : $indent + 2) ).($willBeInlined ? "\n" : ''); } } return $output; } } 
\ No newline at end of file
diff --git a/restler_minified/yamlformat/sfyamlparser.php b/restler_minified/yamlformat/sfyamlparser.php
new file mode 100644
index 000000000..20f5dbb0d
--- /dev/null
+++ b/restler_minified/yamlformat/sfyamlparser.php
@@ -0,0 +1,2 @@
+<?php
+ if (!defined('PREG_BAD_UTF8_OFFSET_ERROR')) { define('PREG_BAD_UTF8_OFFSET_ERROR', 5); } class sfYamlParser { protected $offset = 0, $lines = array(), $currentLineNb = -1, $currentLine = '', $refs = array(); public function __construct($offset = 0) { $this->offset = $offset; } public function parse($value) { $this->currentLineNb = -1; $this->currentLine = ''; $this->lines = explode("\n", $this->cleanup($value)); if (function_exists('mb_internal_encoding') && ((int) ini_get('mbstring.func_overload')) & 2) { $mbEncoding = mb_internal_encoding(); mb_internal_encoding('UTF-8'); } $data = array(); while ($this->moveToNextLine()) { if ($this->isCurrentLineEmpty()) { continue; } if (preg_match('#^\t+#', $this->currentLine)) { throw new InvalidArgumentException(sprintf('A YAML file cannot contain tabs as indentation at line %d (%s).', $this->getRealCurrentLineNb() + 1, $this->currentLine)); } $isRef = $isInPlace = $isProcessed = false; if (preg_match('#^\-((?P<leadspaces>\s+)(?P<value>.+?))?\s*$#u', $this->currentLine, $values)) { if (isset($values['value']) && preg_match('#^&(?P<ref>[^ ]+) *(?P<value>.*)#u', $values['value'], $matches)) { $isRef = $matches['ref']; $values['value'] = $matches['value']; } if (!isset($values['value']) || '' == trim($values['value'], ' ') || 0 === strpos(ltrim($values['value'], ' '), '#')) { $c = $this->getRealCurrentLineNb() + 1; $parser = new sfYamlParser($c); $parser->refs =& $this->refs; $data[] = $parser->parse($this->getNextEmbedBlock()); } else { if (isset($values['leadspaces']) && ' ' == $values['leadspaces'] && preg_match('#^(?P<key>'.sfYamlInline::REGEX_QUOTED_STRING.'|[^ \'"\{].*?) *\:(\s+(?P<value>.+?))?\s*$#u', $values['value'], $matches)) { $c = $this->getRealCurrentLineNb(); $parser = new sfYamlParser($c); $parser->refs =& $this->refs; $block = $values['value']; if (!$this->isNextLineIndented()) { $block .= "\n".$this->getNextEmbedBlock($this->getCurrentLineIndentation() + 2); } $data[] = $parser->parse($block); } else { $data[] = $this->parseValue($values['value']); } } } else if (preg_match('#^(?P<key>'.sfYamlInline::REGEX_QUOTED_STRING.'|[^ \'"].*?) *\:(\s+(?P<value>.+?))?\s*$#u', $this->currentLine, $values)) { $key = sfYamlInline::parseScalar($values['key']); if ('<<' === $key) { if (isset($values['value']) && '*' === substr($values['value'], 0, 1)) { $isInPlace = substr($values['value'], 1); if (!array_key_exists($isInPlace, $this->refs)) { throw new InvalidArgumentException(sprintf('Reference "%s" does not exist at line %s (%s).', $isInPlace, $this->getRealCurrentLineNb() + 1, $this->currentLine)); } } else { if (isset($values['value']) && $values['value'] !== '') { $value = $values['value']; } else { $value = $this->getNextEmbedBlock(); } $c = $this->getRealCurrentLineNb() + 1; $parser = new sfYamlParser($c); $parser->refs =& $this->refs; $parsed = $parser->parse($value); $merged = array(); if (!is_array($parsed)) { throw new InvalidArgumentException(sprintf("YAML merge keys used with a scalar value instead of an array at line %s (%s)", $this->getRealCurrentLineNb() + 1, $this->currentLine)); } else if (isset($parsed[0])) { foreach (array_reverse($parsed) as $parsedItem) { if (!is_array($parsedItem)) { throw new InvalidArgumentException(sprintf("Merge items must be arrays at line %s (%s).", $this->getRealCurrentLineNb() + 1, $parsedItem)); } $merged = array_merge($parsedItem, $merged); } } else { $merged = array_merge($merged, $parsed); } $isProcessed = $merged; } } else if (isset($values['value']) && preg_match('#^&(?P<ref>[^ ]+) *(?P<value>.*)#u', $values['value'], $matches)) { $isRef = $matches['ref']; $values['value'] = $matches['value']; } if ($isProcessed) { $data = $isProcessed; } else if (!isset($values['value']) || '' == trim($values['value'], ' ') || 0 === strpos(ltrim($values['value'], ' '), '#')) { if ($this->isNextLineIndented()) { $data[$key] = null; } else { $c = $this->getRealCurrentLineNb() + 1; $parser = new sfYamlParser($c); $parser->refs =& $this->refs; $data[$key] = $parser->parse($this->getNextEmbedBlock()); } } else { if ($isInPlace) { $data = $this->refs[$isInPlace]; } else { $data[$key] = $this->parseValue($values['value']); } } } else { if (2 == count($this->lines) && empty($this->lines[1])) { $value = sfYamlInline::load($this->lines[0]); if (is_array($value)) { $first = reset($value); if ('*' === substr($first, 0, 1)) { $data = array(); foreach ($value as $alias) { $data[] = $this->refs[substr($alias, 1)]; } $value = $data; } } if (isset($mbEncoding)) { mb_internal_encoding($mbEncoding); } return $value; } switch (preg_last_error()) { case PREG_INTERNAL_ERROR: $error = 'Internal PCRE error on line'; break; case PREG_BACKTRACK_LIMIT_ERROR: $error = 'pcre.backtrack_limit reached on line'; break; case PREG_RECURSION_LIMIT_ERROR: $error = 'pcre.recursion_limit reached on line'; break; case PREG_BAD_UTF8_ERROR: $error = 'Malformed UTF-8 data on line'; break; case PREG_BAD_UTF8_OFFSET_ERROR: $error = 'Offset doesn\'t correspond to the begin of a valid UTF-8 code point on line'; break; default: $error = 'Unable to parse line'; } throw new InvalidArgumentException(sprintf('%s %d (%s).', $error, $this->getRealCurrentLineNb() + 1, $this->currentLine)); } if ($isRef) { $this->refs[$isRef] = end($data); } } if (isset($mbEncoding)) { mb_internal_encoding($mbEncoding); } return empty($data) ? null : $data; } protected function getRealCurrentLineNb() { return $this->currentLineNb + $this->offset; } protected function getCurrentLineIndentation() { return strlen($this->currentLine) - strlen(ltrim($this->currentLine, ' ')); } protected function getNextEmbedBlock($indentation = null) { $this->moveToNextLine(); if (null === $indentation) { $newIndent = $this->getCurrentLineIndentation(); if (!$this->isCurrentLineEmpty() && 0 == $newIndent) { throw new InvalidArgumentException(sprintf('Indentation problem at line %d (%s)', $this->getRealCurrentLineNb() + 1, $this->currentLine)); } } else { $newIndent = $indentation; } $data = array(substr($this->currentLine, $newIndent)); while ($this->moveToNextLine()) { if ($this->isCurrentLineEmpty()) { if ($this->isCurrentLineBlank()) { $data[] = substr($this->currentLine, $newIndent); } continue; } $indent = $this->getCurrentLineIndentation(); if (preg_match('#^(?P<text> *)$#', $this->currentLine, $match)) { $data[] = $match['text']; } else if ($indent >= $newIndent) { $data[] = substr($this->currentLine, $newIndent); } else if (0 == $indent) { $this->moveToPreviousLine(); break; } else { throw new InvalidArgumentException(sprintf('Indentation problem at line %d (%s)', $this->getRealCurrentLineNb() + 1, $this->currentLine)); } } return implode("\n", $data); } protected function moveToNextLine() { if ($this->currentLineNb >= count($this->lines) - 1) { return false; } $this->currentLine = $this->lines[++$this->currentLineNb]; return true; } protected function moveToPreviousLine() { $this->currentLine = $this->lines[--$this->currentLineNb]; } protected function parseValue($value) { if ('*' === substr($value, 0, 1)) { if (false !== $pos = strpos($value, '#')) { $value = substr($value, 1, $pos - 2); } else { $value = substr($value, 1); } if (!array_key_exists($value, $this->refs)) { throw new InvalidArgumentException(sprintf('Reference "%s" does not exist (%s).', $value, $this->currentLine)); } return $this->refs[$value]; } if (preg_match('/^(?P<separator>\||>)(?P<modifiers>\+|\-|\d+|\+\d+|\-\d+|\d+\+|\d+\-)?(?P<comments> +#.*)?$/', $value, $matches)) { $modifiers = isset($matches['modifiers']) ? $matches['modifiers'] : ''; return $this->parseFoldedScalar($matches['separator'], preg_replace('#\d+#', '', $modifiers), intval(abs($modifiers))); } else { return sfYamlInline::load($value); } } protected function parseFoldedScalar($separator, $indicator = '', $indentation = 0) { $separator = '|' == $separator ? "\n" : ' '; $text = ''; $notEOF = $this->moveToNextLine(); while ($notEOF && $this->isCurrentLineBlank()) { $text .= "\n"; $notEOF = $this->moveToNextLine(); } if (!$notEOF) { return ''; } if (!preg_match('#^(?P<indent>'.($indentation ? str_repeat(' ', $indentation) : ' +').')(?P<text>.*)$#u', $this->currentLine, $matches)) { $this->moveToPreviousLine(); return ''; } $textIndent = $matches['indent']; $previousIndent = 0; $text .= $matches['text'].$separator; while ($this->currentLineNb + 1 < count($this->lines)) { $this->moveToNextLine(); if (preg_match('#^(?P<indent> {'.strlen($textIndent).',})(?P<text>.+)$#u', $this->currentLine, $matches)) { if (' ' == $separator && $previousIndent != $matches['indent']) { $text = substr($text, 0, -1)."\n"; } $previousIndent = $matches['indent']; $text .= str_repeat(' ', $diff = strlen($matches['indent']) - strlen($textIndent)).$matches['text'].($diff ? "\n" : $separator); } else if (preg_match('#^(?P<text> *)$#', $this->currentLine, $matches)) { $text .= preg_replace('#^ {1,'.strlen($textIndent).'}#', '', $matches['text'])."\n"; } else { $this->moveToPreviousLine(); break; } } if (' ' == $separator) { $text = preg_replace('/ (\n*)$/', "\n$1", $text); } switch ($indicator) { case '': $text = preg_replace('#\n+$#s', "\n", $text); break; case '+': break; case '-': $text = preg_replace('#\n+$#s', '', $text); break; } return $text; } protected function isNextLineIndented() { $currentIndentation = $this->getCurrentLineIndentation(); $notEOF = $this->moveToNextLine(); while ($notEOF && $this->isCurrentLineEmpty()) { $notEOF = $this->moveToNextLine(); } if (false === $notEOF) { return false; } $ret = false; if ($this->getCurrentLineIndentation() <= $currentIndentation) { $ret = true; } $this->moveToPreviousLine(); return $ret; } protected function isCurrentLineEmpty() { return $this->isCurrentLineBlank() || $this->isCurrentLineComment(); } protected function isCurrentLineBlank() { return '' == trim($this->currentLine, ' '); } protected function isCurrentLineComment() { $ltrimmedLine = ltrim($this->currentLine, ' '); return $ltrimmedLine[0] === '#'; } protected function cleanup($value) { $value = str_replace(array("\r\n", "\r"), "\n", $value); if (!preg_match("#\n$#", $value)) { $value .= "\n"; } $count = 0; $value = preg_replace('#^\%YAML[: ][\d\.]+.*\n#su', '', $value, -1, $count); $this->offset += $count; $trimmedValue = preg_replace('#^(\#.*?\n)+#s', '', $value, -1, $count); if ($count == 1) { $this->offset += substr_count($value, "\n") - substr_count($trimmedValue, "\n"); $value = $trimmedValue; } $trimmedValue = preg_replace('#^\-\-\-.*?\n#s', '', $value, -1, $count); if ($count == 1) { $this->offset += substr_count($value, "\n") - substr_count($trimmedValue, "\n"); $value = $trimmedValue; $value = preg_replace('#\.\.\.\s*$#s', '', $value); } return $value; } } 
\ No newline at end of file
diff --git a/restler_minified/yamlformat/yamlformat.php b/restler_minified/yamlformat/yamlformat.php
new file mode 100644
index 000000000..330daf849
--- /dev/null
+++ b/restler_minified/yamlformat/yamlformat.php
@@ -0,0 +1,2 @@
+<?php
+ class YamlFormat implements iFormat { const MIME ='text/plain'; const EXTENSION = 'yaml'; public function getMIMEMap() { return array(YamlFormat::EXTENSION=>YamlFormat::MIME); } public function getMIME(){ return YamlFormat::MIME; } public function getExtension(){ return YamlFormat::EXTENSION; } public function setMIME($mime){ } public function setExtension($extension){ } public function encode($data, $human_readable=false){ require_once 'sfyaml.php'; return sfYaml::dump(object_to_array($data)); } public function decode($data){ require_once 'sfyaml.php'; return sfYaml::load($data); } public function __toString(){ return $this->getExtension(); } }
\ No newline at end of file

From e5da63d87bceb7b5d997cd1be1d59618a586524c Mon Sep 17 00:00:00 2001
From: Luracast <arul@luracast.com>
Date: Fri, 9 Sep 2011 11:46:32 +0800
Subject: [PATCH 13/61] Fix for wrong parameter order when api methods use
 parameters without default values. Thanks to @serrynaimo for finding this
 bug. Now parameters with out default vales will be set to NULL

---
 restler/restler.php          | 13 ++++++-------
 restler_minified/restler.php |  2 +-
 2 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/restler/restler.php b/restler/restler.php
index fce778b20..d80989d73 100644
--- a/restler/restler.php
+++ b/restler/restler.php
@@ -10,10 +10,10 @@
  * @copyright  2010 Luracast
  * @license    http://www.opensource.org/licenses/lgpl-license.php LGPL
  * @link       http://luracast.com/products/restler/
- * @version    2.0.0
+ * @version    2.0.1
  */
 class Restler {
-	const VERSION = '2.0.0';
+	const VERSION = '2.0.1';
 	/**
 	 * URL of the currently mapped service
 	 * @var string
@@ -301,9 +301,9 @@ public function handleError ($status_code, $error_message = NULL) {
 	 * @throws RestException to send error response
 	 */
 	public function handle () {
+		if(empty($this->format_map))$this->setSupportedFormats('JsonFormat');
 		$this->url = $this->getPath();
 		$this->request_method = $this->getRequestMethod();
-		if(empty($this->format_map))$this->setSupportedFormats('JsonFormat');
 		$this->response_format = $this->getResponseFormat();
 		$this->request_format = $this->getRequestFormat();
 		if(is_null($this->request_format)){
@@ -582,7 +582,7 @@ protected function mapUrlToMethod () {
 		if($found){
 			//echo PHP_EOL."Found $url ";
 			//print_r($call);
-			$p = is_null($call->defaults) ? array() : $call->defaults;
+			$p = $call->defaults;
 			foreach ($call->arguments as $key => $value) {
 				//echo "$key => $value \n";
 				if(isset($params[$key]))$p[$value] = $params[$key];
@@ -654,9 +654,8 @@ protected function generateMap ($class_name, $base_path = "") {
 			$position=0;
 			foreach ($params as $param){
 				$arguments[$param->getName()] = $position;
-				if($param->isDefaultValueAvailable()){
-					$defaults[$position] = $param->getDefaultValue();
-				}
+				$defaults[$position] = $param->isDefaultValueAvailable() ?
+					$param->getDefaultValue() : NULL;
 				$position++;
 			}
 			$method_flag = $method->isProtected() ?
diff --git a/restler_minified/restler.php b/restler_minified/restler.php
index cef9b364e..8d2cc0a06 100644
--- a/restler_minified/restler.php
+++ b/restler_minified/restler.php
@@ -1,5 +1,5 @@
 <?php
- class Restler { const VERSION = '2.0.0'; public $url; public $request_method; public $request_format; public $request_data=array(); public $cache_dir; public $base_dir; public $response = 'DefaultResponse'; public $response_format; protected $production_mode; protected $routes= array(); protected $format_map = array(); protected $service_class_instance; protected $service_method; protected $auth_classes = array(); protected $error_classes = array(); private $codes = array( 100 => 'Continue', 101 => 'Switching Protocols', 200 => 'OK', 201 => 'Created', 202 => 'Accepted', 203 => 'Non-Authoritative Information', 204 => 'No Content', 205 => 'Reset Content', 206 => 'Partial Content', 300 => 'Multiple Choices', 301 => 'Moved Permanently', 302 => 'Found', 303 => 'See Other', 304 => 'Not Modified', 305 => 'Use Proxy', 306 => '(Unused)', 307 => 'Temporary Redirect', 400 => 'Bad Request', 401 => 'Unauthorized', 402 => 'Payment Required', 403 => 'Forbidden', 404 => 'Not Found', 405 => 'Method Not Allowed', 406 => 'Not Acceptable', 407 => 'Proxy Authentication Required', 408 => 'Request Timeout', 409 => 'Conflict', 410 => 'Gone', 411 => 'Length Required', 412 => 'Precondition Failed', 413 => 'Request Entity Too Large', 414 => 'Request-URI Too Long', 415 => 'Unsupported Media Type', 416 => 'Requested Range Not Satisfiable', 417 => 'Expectation Failed', 500 => 'Internal Server Error', 501 => 'Not Implemented', 502 => 'Bad Gateway', 503 => 'Service Unavailable', 504 => 'Gateway Timeout', 505 => 'HTTP Version Not Supported' ); protected $cached; public function __construct ($production_mode = FALSE) { $this->production_mode = $production_mode; $this->cache_dir = getcwd(); $this->base_dir = RESTLER_PATH; } public function __destruct () { if ($this->production_mode && !$this->cached) { $this->saveCache(); } } public function refreshCache () { $this->routes = array(); $this->cached = FALSE; } public function setSupportedFormats () { $args = func_get_args(); $extensions = array(); foreach ($args as $class_name) { if(!is_string($class_name) || !class_exists($class_name)){ throw new Exception("$class_name is not a vaild Format Class."); } $obj = new $class_name; if(! $obj instanceof iFormat){ throw new Exception('Invalid format class; must implement '. 'iFormat interface'); } foreach ($obj->getMIMEMap() as $extension => $mime) { if(!isset($this->format_map[$extension])) $this->format_map[$extension]=$class_name; if(!isset($this->format_map[$mime])) $this->format_map[$mime]=$class_name; $extensions[".$extension"]=TRUE; } } $this->format_map['default']=$args[0]; $this->format_map['extensions']=array_keys($extensions); } public function addAPIClass($class_name, $base_path = NULL) { if(!class_exists($class_name)){ throw new Exception("API class $class_name is missing."); } $this->loadCache(); if(!$this->cached){ if(is_null($base_path))$base_path=strtolower($class_name); $base_path = trim($base_path,'/'); if(strlen($base_path)>0)$base_path .= '/'; $this->generateMap($class_name, $base_path); } } public function addAuthenticationClass ($class_name, $base_path = NULL) { $this->auth_classes[] = $class_name; $this->addAPIClass($class_name, $base_path); } public function addErrorClass ($class_name) { $this->error_classes[] = $class_name; } public function handleError ($status_code, $error_message = NULL) { $method = "handle$status_code"; $handled = FALSE; foreach ($this->error_classes as $class_name) { if (method_exists($class_name, $method)) { $obj = new $class_name(); $obj->restler = $this; $obj->$method(); $handled = TRUE; } } if($handled)return; $message = $this->codes[$status_code] . (!$error_message ? '' : ': ' . $error_message); $this->setStatus($status_code); $this->sendData( call_user_func( array($this->response, '__formatError'), $status_code, $message) ); } public function handle () { $this->url = $this->getPath(); $this->request_method = $this->getRequestMethod(); if(empty($this->format_map))$this->setSupportedFormats('JsonFormat'); $this->response_format = $this->getResponseFormat(); $this->request_format = $this->getRequestFormat(); if(is_null($this->request_format)){ $this->request_format = $this->response_format; } if($this->request_method == 'PUT' || $this->request_method == 'POST'){ $this->request_data = $this->getRequestData(); } $o = $this->mapUrlToMethod(); if(!isset($o->class_name)){ $this->handleError(404); }else{ try { if($o->method_flag){ $auth_method = '__isAuthenticated'; if(!count($this->auth_classes))throw new RestException(401); foreach ($this->auth_classes as $auth_class) { $auth_obj = new $auth_class(); $auth_obj->restler=$this; $this->applyClassMetadata($auth_class, $auth_obj, $o); if (!method_exists($auth_obj, $auth_method)) { throw new RestException(401, 'Authentication Class '. 'should implement iAuthenticate'); }elseif(!$auth_obj->$auth_method()){ throw new RestException(401); } } } $this->applyClassMetadata(get_class($this->request_format), $this->request_format, $o); $pre_process = '_'.$this->request_format->getExtension().'_'. $o->method_name; $this->service_method = $o->method_name; if($o->method_flag==2)$o=unprotect($o); $object = $this->service_class_instance = new $o->class_name(); if(method_exists($o->class_name, $pre_process)) { call_user_func_array(array($object, $pre_process), $o->arguments); } switch ($o->method_flag) { case 3: $reflection_method = new ReflectionMethod($object, $o->method_name); $reflection_method->setAccessible(TRUE); $result = $reflection_method->invokeArgs($object, $o->arguments); break; case 2: case 1: default: $result = call_user_func_array(array($object, $o->method_name), $o->arguments); } } catch (RestException $e) { $this->handleError($e->getCode(), $e->getMessage()); } } if (isset($result) && $result !== NULL) { $this->sendData($result); } } public function sendData($data) { $data = $this->response_format->encode($data, !$this->production_mode); $post_process = '_'.$this->service_method .'_'. $this->response_format->getExtension(); if(isset($this->service_class_instance) && method_exists($this->service_class_instance,$post_process)){ $data = call_user_func(array($this->service_class_instance, $post_process), $data); } header("Cache-Control: no-cache, must-revalidate"); header("Expires: 0"); header('Content-Type: ' . $this->response_format->getMIME()); header("X-Powered-By: Luracast Restler v".Restler::VERSION); die($data); } public function setStatus($code) { header("{$_SERVER['SERVER_PROTOCOL']} $code ". $this->codes[strval($code)]); } public function removeCommonPath($first, $second, $char='/'){ $first = explode($char, $first); $second = explode($char, $second); while (count($second)){ if($first[0]==$second[0]){ array_shift($first); } else break; array_shift($second); } return implode($char, $first); } public function saveCache() { $file = $this->cache_dir . '/routes.php'; $s = '$o=array();'.PHP_EOL; foreach ($this->routes as $key => $value) { $s .= PHP_EOL.PHP_EOL.PHP_EOL."############### $key ###############" .PHP_EOL.PHP_EOL; $s .= '$o[\''.$key.'\']=array();'; foreach ($value as $ke => $va) { $s .= PHP_EOL.PHP_EOL."#==== $key $ke".PHP_EOL.PHP_EOL; $s .= '$o[\''.$key.'\'][\''.$ke.'\']='.str_replace(PHP_EOL, PHP_EOL."\t", var_export($va, TRUE)).';'; } } $s .= PHP_EOL.'return $o;'; $r=@file_put_contents($file, "<?php $s"); @chmod($file, 0777); if($r===FALSE)throw new Exception( "The cache directory located at '$this->cache_dir' needs to have ". "the permissions set to read/write/execute for everyone in order ". "to save cache and improve performance."); } protected function getPath () { $path = urldecode($this->removeCommonPath($_SERVER['REQUEST_URI'], $_SERVER['SCRIPT_NAME'])); $path = preg_replace('/(\/*\?.*$)|(\/$)/', '', $path); $path = str_replace($this->format_map['extensions'], '', $path); return $path; } protected function getRequestMethod () { $method = $_SERVER['REQUEST_METHOD']; if (isset($_SERVER['HTTP_X_HTTP_METHOD_OVERRIDE'])){ $method = $_SERVER['HTTP_X_HTTP_METHOD_OVERRIDE']; } return $method; } protected function getRequestFormat () { $format=NULL; if(isset($_SERVER['CONTENT_TYPE'])){ $mime = explode(';', $_SERVER['CONTENT_TYPE']); $mime = $mime[0]; if($mime==UrlEncodedFormat::MIME){ $format = new UrlEncodedFormat(); }else{ if(isset($this->format_map[$mime])){ $format = $this->format_map[$mime]; $format = is_string($format) ? new $format: $format; $format->setMIME($mime); } } } return $format; } protected function getResponseFormat () { $format; $extension = explode('.', parse_url($_SERVER['REQUEST_URI'], PHP_URL_PATH)); $extension = array_pop($extension); if($extension && isset($this->format_map[$extension])){ $format = $this->format_map[$extension]; $format = is_string($format) ? new $format: $format; $format->setExtension($extension); return $format; } if(isset($_SERVER['HTTP_ACCEPT'])){ $accepts = explode(',', $_SERVER['HTTP_ACCEPT']); foreach ($accepts as $accept) { if($extension && isset($this->format_map[$accept])){ $format = $this->format_map[$accept]; $format = is_string($format) ? new $format: $format; $format->setMIME($accept); return $format; } } } $format = $this->format_map['default']; return is_string($format) ? new $format: $format; } protected function getRequestData() { try{ $r = file_get_contents('php://input'); if(is_null($r))return $_GET; $r =$this->request_format->decode($r); return is_null($r) ? array(): $r; } catch (RestException $e) { $this->handleError($e->getCode(), $e->getMessage()); } } protected function mapUrlToMethod () { if(!isset($this->routes[$this->request_method])){ return array(); } $urls = $this->routes[$this->request_method]; if(!$urls)return array(); $found = FALSE; $this->request_data += $_GET; $params = array('request_data'=>$this->request_data); $params += $this->request_data; foreach ($urls as $url => $call) { $call = (object)$call; if(strstr($url, ':')){ $regex = preg_replace('/\\\:([^\/]+)/', '(?P<$1>[^/]+)', preg_quote($url)); if (preg_match(":^$regex$:", $this->url, $matches)) { foreach ($matches as $arg => $match) { if (isset($call->arguments[$arg])){ $params[$arg] = $match; } } $found = TRUE; break; } }elseif ($url == $this->url){ $found = TRUE; break; } } if($found){ $p = is_null($call->defaults) ? array() : $call->defaults; foreach ($call->arguments as $key => $value) { if(isset($params[$key]))$p[$value] = $params[$key]; } $call->arguments=$p; return $call; } } protected function applyClassMetadata($class_name, $instance, $method_info){ if(isset($method_info->metadata[$class_name]) && is_array($method_info->metadata[$class_name])){ foreach ($method_info->metadata[$class_name] as $property => $value){ if(property_exists($class_name, $property)){ $reflection_property = new ReflectionProperty($class_name, $property); $reflection_property->setValue($instance, $value); } } } } protected function loadCache() { if ($this->cached !== NULL) { return; } $file = $this->cache_dir . '/routes.php'; $this->cached = FALSE; if ($this->production_mode) { if (file_exists($file)) { $routes = include($file); } if (isset($routes) && is_array($routes)) { $this->routes = $routes; $this->cached = TRUE; } } else { } } protected function generateMap ($class_name, $base_path = "") { $reflection = new ReflectionClass($class_name); $class_metadata = parse_doc($reflection->getDocComment()); $methods = $reflection->getMethods( ReflectionMethod::IS_PUBLIC + ReflectionMethod::IS_PROTECTED); foreach ($methods as $method) { $doc = $method->getDocComment(); $arguments = array(); $defaults = array(); $metadata = $class_metadata+parse_doc($doc); $params = $method->getParameters(); $position=0; foreach ($params as $param){ $arguments[$param->getName()] = $position; if($param->isDefaultValueAvailable()){ $defaults[$position] = $param->getDefaultValue(); } $position++; } $method_flag = $method->isProtected() ? (isRestlerCompatibilityModeEnabled() ? 2 : 3) : (isset($metadata['protected']) ? 1 : 0); $call = array( 'class_name'=>$class_name, 'method_name'=>$method->getName(), 'arguments'=>$arguments, 'defaults'=>$defaults, 'metadata'=>$metadata, 'method_flag'=>$method_flag ); $method_url = strtolower($method->getName()); if (preg_match_all( '/@url\s+(GET|POST|PUT|DELETE|HEAD|OPTIONS)[ \t]*\/?(\S*)/s', $doc, $matches, PREG_SET_ORDER)) { foreach ($matches as $match) { $http_method = $match[1]; $url = rtrim($base_path . $match[2],'/'); $this->routes[$http_method][$url] = $call; } }elseif($method_url[0] != '_'){ if (preg_match_all('/^(GET|POST|PUT|DELETE|HEAD|OPTIONS)/i', $method_url, $matches)) { $http_method = strtoupper($matches[0][0]); $method_url = substr($method_url, strlen($http_method)); }else{ $http_method = 'GET'; } $url = $base_path. ($method_url=='index' || $method_url=='default' ? '' : $method_url); $url = rtrim($url,'/'); $this->routes[$http_method][$url] = $call; foreach ($params as $param){ if($param->getName()=='request_data'){ break; } $url .= $url=='' ? ':' : '/:'; $url .= $param->getName(); $this->routes[$http_method][$url] = $call; } } } } } if(version_compare(PHP_VERSION, '5.3.0') < 0){ require_once 'compat.php'; } class RestException extends Exception { public function __construct($http_status_code, $error_message = NULL) { parent::__construct($error_message, $http_status_code); } } interface iRespond { public function __formatResponse($result); public function __formatError($status_code, $message); } class DefaultResponse implements iRespond { function __formatResponse($result) { return $result; } function __formatError($statusCode, $message) { return array('error' => array('code' => $statusCode, 'message' => $message)); } } interface iAuthenticate { public function __isAuthenticated(); } interface iFormat { public function getMIMEMap(); public function setMIME($mime); public function getMIME(); public function setExtension($extension); public function getExtension(); public function encode($data, $human_readable=FALSE); public function decode($data); } class UrlEncodedFormat implements iFormat { const MIME = 'application/x-www-form-urlencoded'; const EXTENSION = 'post'; public function getMIMEMap() { return array(UrlEncodedFormat::EXTENSION=>UrlEncodedFormat::MIME); } public function getMIME(){ return UrlEncodedFormat::MIME; } public function getExtension(){ return UrlEncodedFormat::EXTENSION; } public function setMIME($mime){ } public function setExtension($extension){ } public function encode($data, $human_readable=FALSE){ return http_build_query($data); } public function decode($data){ parse_str($data,$r); return $r; } public function __toString(){ return $this->getExtension(); } } class JsonFormat implements iFormat { const MIME ='application/json'; const EXTENSION = 'json'; public function getMIMEMap() { return array(JsonFormat::EXTENSION=>JsonFormat::MIME); } public function getMIME(){ return JsonFormat::MIME; } public function getExtension(){ return JsonFormat::EXTENSION; } public function setMIME($mime){ } public function setExtension($extension){ } public function encode($data, $human_readable=FALSE){ return $human_readable ? $this->json_format(json_encode(object_to_array($data))) : json_encode(object_to_array($data)); } public function decode($data){ return object_to_array(json_decode($data)); } private function json_format($json) { $tab = "  "; $new_json = ""; $indent_level = 0; $in_string = FALSE; $len = strlen($json); for($c = 0; $c < $len; $c++) { $char = $json[$c]; switch($char) { case '{': case '[': if(!$in_string) { $new_json .= $char . "\n" . str_repeat($tab, $indent_level+1); $indent_level++; } else { $new_json .= $char; } break; case '}': case ']': if(!$in_string) { $indent_level--; $new_json .= "\n".str_repeat($tab, $indent_level).$char; } else { $new_json .= $char; } break; case ',': if(!$in_string) { $new_json .= ",\n" . str_repeat($tab, $indent_level); } else { $new_json .= $char; } break; case ':': if(!$in_string) { $new_json .= ": "; } else { $new_json .= $char; } break; case '"': if($c==0){ $in_string = TRUE; }elseif($c > 0 && $json[$c-1] != '\\') { $in_string = !$in_string; } default: $new_json .= $char; break; } } return $new_json; } public function __toString(){ return $this->getExtension(); } } class DocParser { private $params=array(); function parse($doc='') { if($doc==''){ return $this->params; } if(preg_match('#^/\*\*(.*)\*/#s', $doc, $comment) === false) return $this->params; $comment = trim($comment[1]); if(preg_match_all('#^\s*\*(.*)#m', $comment, $lines) === false) return $this->params; $this->parseLines($lines[1]); return $this->params; } private function parseLines($lines) { foreach($lines as $line) { $parsedLine = $this->parseLine($line); if($parsedLine === false && !isset($this->params['description'])) { if(isset($desc)){ $this->params['description'] = implode(PHP_EOL, $desc); } $desc = array(); } elseif($parsedLine !== false) { $desc[] = $parsedLine; } } $desc = implode(' ', $desc); if(!empty($desc))$this->params['long_description'] = $desc; } private function parseLine($line) { $line = trim($line); if(empty($line)) return false; if(strpos($line, '@') === 0) { if(strpos($line, ' ')>0){ $param = substr($line, 1, strpos($line, ' ') - 1); $value = substr($line, strlen($param) + 2); }else{ $param = substr($line, 1); $value = ''; } if($this->setParam($param, $value)) return false; } return $line; } private function setParam($param, $value) { if($param == 'param' || $param == 'return') $value = $this->formatParamOrReturn($value); if($param == 'class') list($param, $value) = $this->formatClass($value); if(empty($this->params[$param])) { $this->params[$param] = $value; } else if($param == 'param'){ $arr = array($this->params[$param], $value); $this->params[$param] = $arr; } else { $this->params[$param] = $value + $this->params[$param]; } return true; } private function formatClass($value) { $r = preg_split("[\(|\)]",$value); if(is_array($r)){ $param = $r[0]; parse_str($r[1],$value); foreach ($value as $key => $val) { $val = explode(',', $val); if(count($val)>1)$value[$key]=$val; } }else{ $param='Unknown'; } return array($param, $value); } private function formatParamOrReturn($string) { $pos = strpos($string, ' '); $type = substr($string, 0, $pos); return '(' . $type . ')' . substr($string, $pos+1); } } function parse_doc($php_doc_comment){ $p = new DocParser(); return $p->parse($php_doc_comment); $p = new Parser($php_doc_comment); return $p; $php_doc_comment = preg_replace("/(^[\\s]*\\/\\*\\*)
+ class Restler { const VERSION = '2.0.1'; public $url; public $request_method; public $request_format; public $request_data=array(); public $cache_dir; public $base_dir; public $response = 'DefaultResponse'; public $response_format; protected $production_mode; protected $routes= array(); protected $format_map = array(); protected $service_class_instance; protected $service_method; protected $auth_classes = array(); protected $error_classes = array(); private $codes = array( 100 => 'Continue', 101 => 'Switching Protocols', 200 => 'OK', 201 => 'Created', 202 => 'Accepted', 203 => 'Non-Authoritative Information', 204 => 'No Content', 205 => 'Reset Content', 206 => 'Partial Content', 300 => 'Multiple Choices', 301 => 'Moved Permanently', 302 => 'Found', 303 => 'See Other', 304 => 'Not Modified', 305 => 'Use Proxy', 306 => '(Unused)', 307 => 'Temporary Redirect', 400 => 'Bad Request', 401 => 'Unauthorized', 402 => 'Payment Required', 403 => 'Forbidden', 404 => 'Not Found', 405 => 'Method Not Allowed', 406 => 'Not Acceptable', 407 => 'Proxy Authentication Required', 408 => 'Request Timeout', 409 => 'Conflict', 410 => 'Gone', 411 => 'Length Required', 412 => 'Precondition Failed', 413 => 'Request Entity Too Large', 414 => 'Request-URI Too Long', 415 => 'Unsupported Media Type', 416 => 'Requested Range Not Satisfiable', 417 => 'Expectation Failed', 500 => 'Internal Server Error', 501 => 'Not Implemented', 502 => 'Bad Gateway', 503 => 'Service Unavailable', 504 => 'Gateway Timeout', 505 => 'HTTP Version Not Supported' ); protected $cached; public function __construct ($production_mode = FALSE) { $this->production_mode = $production_mode; $this->cache_dir = getcwd(); $this->base_dir = RESTLER_PATH; } public function __destruct () { if ($this->production_mode && !$this->cached) { $this->saveCache(); } } public function refreshCache () { $this->routes = array(); $this->cached = FALSE; } public function setSupportedFormats () { $args = func_get_args(); $extensions = array(); foreach ($args as $class_name) { if(!is_string($class_name) || !class_exists($class_name)){ throw new Exception("$class_name is not a vaild Format Class."); } $obj = new $class_name; if(! $obj instanceof iFormat){ throw new Exception('Invalid format class; must implement '. 'iFormat interface'); } foreach ($obj->getMIMEMap() as $extension => $mime) { if(!isset($this->format_map[$extension])) $this->format_map[$extension]=$class_name; if(!isset($this->format_map[$mime])) $this->format_map[$mime]=$class_name; $extensions[".$extension"]=TRUE; } } $this->format_map['default']=$args[0]; $this->format_map['extensions']=array_keys($extensions); } public function addAPIClass($class_name, $base_path = NULL) { if(!class_exists($class_name)){ throw new Exception("API class $class_name is missing."); } $this->loadCache(); if(!$this->cached){ if(is_null($base_path))$base_path=strtolower($class_name); $base_path = trim($base_path,'/'); if(strlen($base_path)>0)$base_path .= '/'; $this->generateMap($class_name, $base_path); } } public function addAuthenticationClass ($class_name, $base_path = NULL) { $this->auth_classes[] = $class_name; $this->addAPIClass($class_name, $base_path); } public function addErrorClass ($class_name) { $this->error_classes[] = $class_name; } public function handleError ($status_code, $error_message = NULL) { $method = "handle$status_code"; $handled = FALSE; foreach ($this->error_classes as $class_name) { if (method_exists($class_name, $method)) { $obj = new $class_name(); $obj->restler = $this; $obj->$method(); $handled = TRUE; } } if($handled)return; $message = $this->codes[$status_code] . (!$error_message ? '' : ': ' . $error_message); $this->setStatus($status_code); $this->sendData( call_user_func( array($this->response, '__formatError'), $status_code, $message) ); } public function handle () { if(empty($this->format_map))$this->setSupportedFormats('JsonFormat'); $this->url = $this->getPath(); $this->request_method = $this->getRequestMethod(); $this->response_format = $this->getResponseFormat(); $this->request_format = $this->getRequestFormat(); if(is_null($this->request_format)){ $this->request_format = $this->response_format; } if($this->request_method == 'PUT' || $this->request_method == 'POST'){ $this->request_data = $this->getRequestData(); } $o = $this->mapUrlToMethod(); if(!isset($o->class_name)){ $this->handleError(404); }else{ try { if($o->method_flag){ $auth_method = '__isAuthenticated'; if(!count($this->auth_classes))throw new RestException(401); foreach ($this->auth_classes as $auth_class) { $auth_obj = new $auth_class(); $auth_obj->restler=$this; $this->applyClassMetadata($auth_class, $auth_obj, $o); if (!method_exists($auth_obj, $auth_method)) { throw new RestException(401, 'Authentication Class '. 'should implement iAuthenticate'); }elseif(!$auth_obj->$auth_method()){ throw new RestException(401); } } } $this->applyClassMetadata(get_class($this->request_format), $this->request_format, $o); $pre_process = '_'.$this->request_format->getExtension().'_'. $o->method_name; $this->service_method = $o->method_name; if($o->method_flag==2)$o=unprotect($o); $object = $this->service_class_instance = new $o->class_name(); if(method_exists($o->class_name, $pre_process)) { call_user_func_array(array($object, $pre_process), $o->arguments); } switch ($o->method_flag) { case 3: $reflection_method = new ReflectionMethod($object, $o->method_name); $reflection_method->setAccessible(TRUE); $result = $reflection_method->invokeArgs($object, $o->arguments); break; case 2: case 1: default: $result = call_user_func_array(array($object, $o->method_name), $o->arguments); } } catch (RestException $e) { $this->handleError($e->getCode(), $e->getMessage()); } } if (isset($result) && $result !== NULL) { $this->sendData($result); } } public function sendData($data) { $data = $this->response_format->encode($data, !$this->production_mode); $post_process = '_'.$this->service_method .'_'. $this->response_format->getExtension(); if(isset($this->service_class_instance) && method_exists($this->service_class_instance,$post_process)){ $data = call_user_func(array($this->service_class_instance, $post_process), $data); } header("Cache-Control: no-cache, must-revalidate"); header("Expires: 0"); header('Content-Type: ' . $this->response_format->getMIME()); header("X-Powered-By: Luracast Restler v".Restler::VERSION); die($data); } public function setStatus($code) { header("{$_SERVER['SERVER_PROTOCOL']} $code ". $this->codes[strval($code)]); } public function removeCommonPath($first, $second, $char='/'){ $first = explode($char, $first); $second = explode($char, $second); while (count($second)){ if($first[0]==$second[0]){ array_shift($first); } else break; array_shift($second); } return implode($char, $first); } public function saveCache() { $file = $this->cache_dir . '/routes.php'; $s = '$o=array();'.PHP_EOL; foreach ($this->routes as $key => $value) { $s .= PHP_EOL.PHP_EOL.PHP_EOL."############### $key ###############" .PHP_EOL.PHP_EOL; $s .= '$o[\''.$key.'\']=array();'; foreach ($value as $ke => $va) { $s .= PHP_EOL.PHP_EOL."#==== $key $ke".PHP_EOL.PHP_EOL; $s .= '$o[\''.$key.'\'][\''.$ke.'\']='.str_replace(PHP_EOL, PHP_EOL."\t", var_export($va, TRUE)).';'; } } $s .= PHP_EOL.'return $o;'; $r=@file_put_contents($file, "<?php $s"); @chmod($file, 0777); if($r===FALSE)throw new Exception( "The cache directory located at '$this->cache_dir' needs to have ". "the permissions set to read/write/execute for everyone in order ". "to save cache and improve performance."); } protected function getPath () { $path = urldecode($this->removeCommonPath($_SERVER['REQUEST_URI'], $_SERVER['SCRIPT_NAME'])); $path = preg_replace('/(\/*\?.*$)|(\/$)/', '', $path); $path = str_replace($this->format_map['extensions'], '', $path); return $path; } protected function getRequestMethod () { $method = $_SERVER['REQUEST_METHOD']; if (isset($_SERVER['HTTP_X_HTTP_METHOD_OVERRIDE'])){ $method = $_SERVER['HTTP_X_HTTP_METHOD_OVERRIDE']; } return $method; } protected function getRequestFormat () { $format=NULL; if(isset($_SERVER['CONTENT_TYPE'])){ $mime = explode(';', $_SERVER['CONTENT_TYPE']); $mime = $mime[0]; if($mime==UrlEncodedFormat::MIME){ $format = new UrlEncodedFormat(); }else{ if(isset($this->format_map[$mime])){ $format = $this->format_map[$mime]; $format = is_string($format) ? new $format: $format; $format->setMIME($mime); } } } return $format; } protected function getResponseFormat () { $format; $extension = explode('.', parse_url($_SERVER['REQUEST_URI'], PHP_URL_PATH)); $extension = array_pop($extension); if($extension && isset($this->format_map[$extension])){ $format = $this->format_map[$extension]; $format = is_string($format) ? new $format: $format; $format->setExtension($extension); return $format; } if(isset($_SERVER['HTTP_ACCEPT'])){ $accepts = explode(',', $_SERVER['HTTP_ACCEPT']); foreach ($accepts as $accept) { if($extension && isset($this->format_map[$accept])){ $format = $this->format_map[$accept]; $format = is_string($format) ? new $format: $format; $format->setMIME($accept); return $format; } } } $format = $this->format_map['default']; return is_string($format) ? new $format: $format; } protected function getRequestData() { try{ $r = file_get_contents('php://input'); if(is_null($r))return $_GET; $r =$this->request_format->decode($r); return is_null($r) ? array(): $r; } catch (RestException $e) { $this->handleError($e->getCode(), $e->getMessage()); } } protected function mapUrlToMethod () { if(!isset($this->routes[$this->request_method])){ return array(); } $urls = $this->routes[$this->request_method]; if(!$urls)return array(); $found = FALSE; $this->request_data += $_GET; $params = array('request_data'=>$this->request_data); $params += $this->request_data; foreach ($urls as $url => $call) { $call = (object)$call; if(strstr($url, ':')){ $regex = preg_replace('/\\\:([^\/]+)/', '(?P<$1>[^/]+)', preg_quote($url)); if (preg_match(":^$regex$:", $this->url, $matches)) { foreach ($matches as $arg => $match) { if (isset($call->arguments[$arg])){ $params[$arg] = $match; } } $found = TRUE; break; } }elseif ($url == $this->url){ $found = TRUE; break; } } if($found){ $p = $call->defaults; foreach ($call->arguments as $key => $value) { if(isset($params[$key]))$p[$value] = $params[$key]; } $call->arguments=$p; return $call; } } protected function applyClassMetadata($class_name, $instance, $method_info){ if(isset($method_info->metadata[$class_name]) && is_array($method_info->metadata[$class_name])){ foreach ($method_info->metadata[$class_name] as $property => $value){ if(property_exists($class_name, $property)){ $reflection_property = new ReflectionProperty($class_name, $property); $reflection_property->setValue($instance, $value); } } } } protected function loadCache() { if ($this->cached !== NULL) { return; } $file = $this->cache_dir . '/routes.php'; $this->cached = FALSE; if ($this->production_mode) { if (file_exists($file)) { $routes = include($file); } if (isset($routes) && is_array($routes)) { $this->routes = $routes; $this->cached = TRUE; } } else { } } protected function generateMap ($class_name, $base_path = "") { $reflection = new ReflectionClass($class_name); $class_metadata = parse_doc($reflection->getDocComment()); $methods = $reflection->getMethods( ReflectionMethod::IS_PUBLIC + ReflectionMethod::IS_PROTECTED); foreach ($methods as $method) { $doc = $method->getDocComment(); $arguments = array(); $defaults = array(); $metadata = $class_metadata+parse_doc($doc); $params = $method->getParameters(); $position=0; foreach ($params as $param){ $arguments[$param->getName()] = $position; $defaults[$position] = $param->isDefaultValueAvailable() ? $param->getDefaultValue() : NULL; $position++; } $method_flag = $method->isProtected() ? (isRestlerCompatibilityModeEnabled() ? 2 : 3) : (isset($metadata['protected']) ? 1 : 0); $call = array( 'class_name'=>$class_name, 'method_name'=>$method->getName(), 'arguments'=>$arguments, 'defaults'=>$defaults, 'metadata'=>$metadata, 'method_flag'=>$method_flag ); $method_url = strtolower($method->getName()); if (preg_match_all( '/@url\s+(GET|POST|PUT|DELETE|HEAD|OPTIONS)[ \t]*\/?(\S*)/s', $doc, $matches, PREG_SET_ORDER)) { foreach ($matches as $match) { $http_method = $match[1]; $url = rtrim($base_path . $match[2],'/'); $this->routes[$http_method][$url] = $call; } }elseif($method_url[0] != '_'){ if (preg_match_all('/^(GET|POST|PUT|DELETE|HEAD|OPTIONS)/i', $method_url, $matches)) { $http_method = strtoupper($matches[0][0]); $method_url = substr($method_url, strlen($http_method)); }else{ $http_method = 'GET'; } $url = $base_path. ($method_url=='index' || $method_url=='default' ? '' : $method_url); $url = rtrim($url,'/'); $this->routes[$http_method][$url] = $call; foreach ($params as $param){ if($param->getName()=='request_data'){ break; } $url .= $url=='' ? ':' : '/:'; $url .= $param->getName(); $this->routes[$http_method][$url] = $call; } } } } } if(version_compare(PHP_VERSION, '5.3.0') < 0){ require_once 'compat.php'; } class RestException extends Exception { public function __construct($http_status_code, $error_message = NULL) { parent::__construct($error_message, $http_status_code); } } interface iRespond { public function __formatResponse($result); public function __formatError($status_code, $message); } class DefaultResponse implements iRespond { function __formatResponse($result) { return $result; } function __formatError($statusCode, $message) { return array('error' => array('code' => $statusCode, 'message' => $message)); } } interface iAuthenticate { public function __isAuthenticated(); } interface iFormat { public function getMIMEMap(); public function setMIME($mime); public function getMIME(); public function setExtension($extension); public function getExtension(); public function encode($data, $human_readable=FALSE); public function decode($data); } class UrlEncodedFormat implements iFormat { const MIME = 'application/x-www-form-urlencoded'; const EXTENSION = 'post'; public function getMIMEMap() { return array(UrlEncodedFormat::EXTENSION=>UrlEncodedFormat::MIME); } public function getMIME(){ return UrlEncodedFormat::MIME; } public function getExtension(){ return UrlEncodedFormat::EXTENSION; } public function setMIME($mime){ } public function setExtension($extension){ } public function encode($data, $human_readable=FALSE){ return http_build_query($data); } public function decode($data){ parse_str($data,$r); return $r; } public function __toString(){ return $this->getExtension(); } } class JsonFormat implements iFormat { const MIME ='application/json'; const EXTENSION = 'json'; public function getMIMEMap() { return array(JsonFormat::EXTENSION=>JsonFormat::MIME); } public function getMIME(){ return JsonFormat::MIME; } public function getExtension(){ return JsonFormat::EXTENSION; } public function setMIME($mime){ } public function setExtension($extension){ } public function encode($data, $human_readable=FALSE){ return $human_readable ? $this->json_format(json_encode(object_to_array($data))) : json_encode(object_to_array($data)); } public function decode($data){ return object_to_array(json_decode($data)); } private function json_format($json) { $tab = "  "; $new_json = ""; $indent_level = 0; $in_string = FALSE; $len = strlen($json); for($c = 0; $c < $len; $c++) { $char = $json[$c]; switch($char) { case '{': case '[': if(!$in_string) { $new_json .= $char . "\n" . str_repeat($tab, $indent_level+1); $indent_level++; } else { $new_json .= $char; } break; case '}': case ']': if(!$in_string) { $indent_level--; $new_json .= "\n".str_repeat($tab, $indent_level).$char; } else { $new_json .= $char; } break; case ',': if(!$in_string) { $new_json .= ",\n" . str_repeat($tab, $indent_level); } else { $new_json .= $char; } break; case ':': if(!$in_string) { $new_json .= ": "; } else { $new_json .= $char; } break; case '"': if($c==0){ $in_string = TRUE; }elseif($c > 0 && $json[$c-1] != '\\') { $in_string = !$in_string; } default: $new_json .= $char; break; } } return $new_json; } public function __toString(){ return $this->getExtension(); } } class DocParser { private $params=array(); function parse($doc='') { if($doc==''){ return $this->params; } if(preg_match('#^/\*\*(.*)\*/#s', $doc, $comment) === false) return $this->params; $comment = trim($comment[1]); if(preg_match_all('#^\s*\*(.*)#m', $comment, $lines) === false) return $this->params; $this->parseLines($lines[1]); return $this->params; } private function parseLines($lines) { foreach($lines as $line) { $parsedLine = $this->parseLine($line); if($parsedLine === false && !isset($this->params['description'])) { if(isset($desc)){ $this->params['description'] = implode(PHP_EOL, $desc); } $desc = array(); } elseif($parsedLine !== false) { $desc[] = $parsedLine; } } $desc = implode(' ', $desc); if(!empty($desc))$this->params['long_description'] = $desc; } private function parseLine($line) { $line = trim($line); if(empty($line)) return false; if(strpos($line, '@') === 0) { if(strpos($line, ' ')>0){ $param = substr($line, 1, strpos($line, ' ') - 1); $value = substr($line, strlen($param) + 2); }else{ $param = substr($line, 1); $value = ''; } if($this->setParam($param, $value)) return false; } return $line; } private function setParam($param, $value) { if($param == 'param' || $param == 'return') $value = $this->formatParamOrReturn($value); if($param == 'class') list($param, $value) = $this->formatClass($value); if(empty($this->params[$param])) { $this->params[$param] = $value; } else if($param == 'param'){ $arr = array($this->params[$param], $value); $this->params[$param] = $arr; } else { $this->params[$param] = $value + $this->params[$param]; } return true; } private function formatClass($value) { $r = preg_split("[\(|\)]",$value); if(is_array($r)){ $param = $r[0]; parse_str($r[1],$value); foreach ($value as $key => $val) { $val = explode(',', $val); if(count($val)>1)$value[$key]=$val; } }else{ $param='Unknown'; } return array($param, $value); } private function formatParamOrReturn($string) { $pos = strpos($string, ' '); $type = substr($string, 0, $pos); return '(' . $type . ')' . substr($string, $pos+1); } } function parse_doc($php_doc_comment){ $p = new DocParser(); return $p->parse($php_doc_comment); $p = new Parser($php_doc_comment); return $p; $php_doc_comment = preg_replace("/(^[\\s]*\\/\\*\\*)
                                  |(^[\\s]\\*\\/)
                                  |(^[\\s]*\\*?\\s)
                                  |(^[\\s]*)

From 9b4048db7229552282212573b890a5b5fb9b3149 Mon Sep 17 00:00:00 2001
From: Luracast <arul@luracast.com>
Date: Tue, 20 Sep 2011 23:29:35 +0800
Subject: [PATCH 14/61] Improved the Examples documentation. Made them cleaner,
 and added a fix for rendering HTML5 elements in IE8, added a menu bar to
 connect related urls

---
 examples/_001_helloworld/readme.html     |  30 +-
 examples/_002_minimal/readme.html        |  30 +-
 examples/_003_multiformat/readme.html    |  30 +-
 examples/_004_error_response/index.php   |   4 +-
 examples/_004_error_response/readme.html |  34 +-
 examples/_004_error_response/readme.md   |   4 +-
 examples/_005_protected_api/readme.html  |  30 +-
 examples/_006_crud/author.sql            |   4 -
 examples/_006_crud/author.sqlite         | Bin 163840 -> 0 bytes
 examples/_006_crud/filename.sqlite       | Bin 4096 -> 0 bytes
 examples/_006_crud/readme.html           |  46 ++-
 examples/_006_crud/readme.md             |  16 +-
 examples/_006_crud/sqlitedb.php          |  68 ----
 examples/index.html                      |  53 +--
 examples/resources/Luracast.png          | Bin 0 -> 2543 bytes
 examples/resources/Luracast_dark.png     | Bin 0 -> 1489 bytes
 examples/resources/style.css             | 432 +++++++++++++++++++++++
 17 files changed, 612 insertions(+), 169 deletions(-)
 delete mode 100755 examples/_006_crud/author.sql
 delete mode 100755 examples/_006_crud/author.sqlite
 delete mode 100755 examples/_006_crud/filename.sqlite
 delete mode 100755 examples/_006_crud/sqlitedb.php
 create mode 100644 examples/resources/Luracast.png
 create mode 100644 examples/resources/Luracast_dark.png
 create mode 100755 examples/resources/style.css

diff --git a/examples/_001_helloworld/readme.html b/examples/_001_helloworld/readme.html
index 8ed7126da..89c910261 100755
--- a/examples/_001_helloworld/readme.html
+++ b/examples/_001_helloworld/readme.html
@@ -3,7 +3,7 @@
 <head>
 <title>Luracast Restler 2.0 Example:- Hello World Example</title>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<link rel="stylesheet" type="text/css" href="../resources/markdown.css"/>
+<link rel="stylesheet" type="text/css" href="../resources/style.css"/>
 <link rel="stylesheet" type="text/css" href="../resources/jquery.snippet.min.css"/>
 <link rel="stylesheet" type="text/css" href="../resources/facebox.css"/>
 <link rel="stylesheet" type="text/css" href="../resources/hacks.css"/>
@@ -23,22 +23,31 @@
  	 });
  })
 </script>
+<!--[if lte IE 8]>
+<script type="text/javascript">
+(function(){if(!/*@cc_on!@*/0)return;var e = "abbr,article,aside,audio,bb,canvas,datagrid,datalist,details,dialog,eventsource,figure,footer,header,hgroup,mark,menu,meter,nav,output,progress,section,time,video".split(',');for(var i=0;i<e.length;i++){document.createElement(e[i])}})()
+</script>
+<![endif]-->
 </head>
 <body>
+<nav class="floating-menu">
+<ul>
+<li><a title="Restler Home" href="http://luracast.com/products/restler/">Home</a></li>
+<!--<li><a title="Using Restler" href="#">Guide</a></li><li><a title="Restler API Reference" href="#">API</a></li>-->
+<li><a class="active" href="../index.html">Examples</a></li>
+<li><a title="Share your knowledge by answering user questions in Stack Overflow." href="http://bit.ly/RestlerSupport">Support</a></li>
+<li><a title="Contribute and Fork Restler on GitHub" href="http://bit.ly/LuracastRestler">GitHub</a></li>
+<li><a title="Get updated on Twitter" href="http://twitter.com/Luracast">Twitter</a></li>
+</ul>
+</nav>
 <div id="codeviewer" style="display:none;"></div>
 <nav id="left">
 <img src="../resources/Restler2.gif" width="126" height="126" title="Luracast Restler 2.0"/>
 <h3><a href="../index.html">Examples</a></h3>
-<ul>
-<li><a href="../_001_helloworld/readme.html" title="Let's say hello!">Hello World</a></li>
-<li><a href="../_002_minimal/readme.html" title="Less is more">Minimal</a></li>
-<li><a href="../_003_multiformat/readme.html" title="Serving what the client wants">Multi-format</a></li>
-<li><a href="../_004_error_response/readme.html" title="Making use of HTTP status codes">Error Response</a></li>
-<li><a href="../_005_protected_api/readme.html" title="Creating restricted zone">Protected API</a></li>
-<li><a href="../_006_crud/readme.html" title="using POST, GET, PUT and DELETE">CRUD</a></li>
-<li>
+<ul><li><a href="../_001_helloworld/readme.html" title="Let's say hello!">Hello World</a></li><li><a href="../_002_minimal/readme.html" title="Less is more">Minimal</a></li><li><a href="../_003_multiformat/readme.html" title="Serving what the client wants">Multi-format</a></li><li><a href="../_004_error_response/readme.html" title="Making use of HTTP status codes">Error Response</a></li><li><a href="../_005_protected_api/readme.html" title="Creating restricted zone">Protected API</a></li><li><a href="../_006_crud/readme.html" title="using POST, GET, PUT and DELETE">CRUD</a></li></ul>
 </nav>
 <article id="right">
+<div class="right"><small>1</small></div>
 <h2>Hello World Example</h2>
 
 <p>Basic hello world example to get started with Restler 2.0</p>
@@ -103,5 +112,8 @@ <h2>Hello World Example</h2>
 </dl>
 
 </article>
+<footer>
+&#169; 2010 <a title="Luracast.com" href="http://luracast.com"><img src="../resources/Luracast_dark.png" width="180" height="32" title="Helping Developers with Tools, Utilities, Frameworks and Services"/></a>
+</footer>
 </body>
 </html>
\ No newline at end of file
diff --git a/examples/_002_minimal/readme.html b/examples/_002_minimal/readme.html
index 6df5e42a5..e54a3f873 100755
--- a/examples/_002_minimal/readme.html
+++ b/examples/_002_minimal/readme.html
@@ -3,7 +3,7 @@
 <head>
 <title>Luracast Restler 2.0 Example:- Minimal Example</title>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<link rel="stylesheet" type="text/css" href="../resources/markdown.css"/>
+<link rel="stylesheet" type="text/css" href="../resources/style.css"/>
 <link rel="stylesheet" type="text/css" href="../resources/jquery.snippet.min.css"/>
 <link rel="stylesheet" type="text/css" href="../resources/facebox.css"/>
 <link rel="stylesheet" type="text/css" href="../resources/hacks.css"/>
@@ -23,22 +23,31 @@
  	 });
  })
 </script>
+<!--[if lte IE 8]>
+<script type="text/javascript">
+(function(){if(!/*@cc_on!@*/0)return;var e = "abbr,article,aside,audio,bb,canvas,datagrid,datalist,details,dialog,eventsource,figure,footer,header,hgroup,mark,menu,meter,nav,output,progress,section,time,video".split(',');for(var i=0;i<e.length;i++){document.createElement(e[i])}})()
+</script>
+<![endif]-->
 </head>
 <body>
+<nav class="floating-menu">
+<ul>
+<li><a title="Restler Home" href="http://luracast.com/products/restler/">Home</a></li>
+<!--<li><a title="Using Restler" href="#">Guide</a></li><li><a title="Restler API Reference" href="#">API</a></li>-->
+<li><a class="active" href="../index.html">Examples</a></li>
+<li><a title="Share your knowledge by answering user questions in Stack Overflow." href="http://bit.ly/RestlerSupport">Support</a></li>
+<li><a title="Contribute and Fork Restler on GitHub" href="http://bit.ly/LuracastRestler">GitHub</a></li>
+<li><a title="Get updated on Twitter" href="http://twitter.com/Luracast">Twitter</a></li>
+</ul>
+</nav>
 <div id="codeviewer" style="display:none;"></div>
 <nav id="left">
 <img src="../resources/Restler2.gif" width="126" height="126" title="Luracast Restler 2.0"/>
 <h3><a href="../index.html">Examples</a></h3>
-<ul>
-<li><a href="../_001_helloworld/readme.html" title="Let's say hello!">Hello World</a></li>
-<li><a href="../_002_minimal/readme.html" title="Less is more">Minimal</a></li>
-<li><a href="../_003_multiformat/readme.html" title="Serving what the client wants">Multi-format</a></li>
-<li><a href="../_004_error_response/readme.html" title="Making use of HTTP status codes">Error Response</a></li>
-<li><a href="../_005_protected_api/readme.html" title="Creating restricted zone">Protected API</a></li>
-<li><a href="../_006_crud/readme.html" title="using POST, GET, PUT and DELETE">CRUD</a></li>
-<li>
+<ul><li><a href="../_001_helloworld/readme.html" title="Let's say hello!">Hello World</a></li><li><a href="../_002_minimal/readme.html" title="Less is more">Minimal</a></li><li><a href="../_003_multiformat/readme.html" title="Serving what the client wants">Multi-format</a></li><li><a href="../_004_error_response/readme.html" title="Making use of HTTP status codes">Error Response</a></li><li><a href="../_005_protected_api/readme.html" title="Creating restricted zone">Protected API</a></li><li><a href="../_006_crud/readme.html" title="using POST, GET, PUT and DELETE">CRUD</a></li></ul>
 </nav>
 <article id="right">
+<div class="right"><small>2</small></div>
 <h2>Minimal Example</h2>
 
 <p>Shows the bare minimum code needed to get your RESTful api server up and running</p>
@@ -99,5 +108,8 @@ <h2>Minimal Example</h2>
 </code></pre></dd>
 
 </article>
+<footer>
+&#169; 2010 <a title="Luracast.com" href="http://luracast.com"><img src="../resources/Luracast_dark.png" width="180" height="32" title="Helping Developers with Tools, Utilities, Frameworks and Services"/></a>
+</footer>
 </body>
 </html>
\ No newline at end of file
diff --git a/examples/_003_multiformat/readme.html b/examples/_003_multiformat/readme.html
index 5755f6cae..c2c7f927e 100755
--- a/examples/_003_multiformat/readme.html
+++ b/examples/_003_multiformat/readme.html
@@ -3,7 +3,7 @@
 <head>
 <title>Luracast Restler 2.0 Example:- Multi-format</title>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<link rel="stylesheet" type="text/css" href="../resources/markdown.css"/>
+<link rel="stylesheet" type="text/css" href="../resources/style.css"/>
 <link rel="stylesheet" type="text/css" href="../resources/jquery.snippet.min.css"/>
 <link rel="stylesheet" type="text/css" href="../resources/facebox.css"/>
 <link rel="stylesheet" type="text/css" href="../resources/hacks.css"/>
@@ -23,22 +23,31 @@
  	 });
  })
 </script>
+<!--[if lte IE 8]>
+<script type="text/javascript">
+(function(){if(!/*@cc_on!@*/0)return;var e = "abbr,article,aside,audio,bb,canvas,datagrid,datalist,details,dialog,eventsource,figure,footer,header,hgroup,mark,menu,meter,nav,output,progress,section,time,video".split(',');for(var i=0;i<e.length;i++){document.createElement(e[i])}})()
+</script>
+<![endif]-->
 </head>
 <body>
+<nav class="floating-menu">
+<ul>
+<li><a title="Restler Home" href="http://luracast.com/products/restler/">Home</a></li>
+<!--<li><a title="Using Restler" href="#">Guide</a></li><li><a title="Restler API Reference" href="#">API</a></li>-->
+<li><a class="active" href="../index.html">Examples</a></li>
+<li><a title="Share your knowledge by answering user questions in Stack Overflow." href="http://bit.ly/RestlerSupport">Support</a></li>
+<li><a title="Contribute and Fork Restler on GitHub" href="http://bit.ly/LuracastRestler">GitHub</a></li>
+<li><a title="Get updated on Twitter" href="http://twitter.com/Luracast">Twitter</a></li>
+</ul>
+</nav>
 <div id="codeviewer" style="display:none;"></div>
 <nav id="left">
 <img src="../resources/Restler2.gif" width="126" height="126" title="Luracast Restler 2.0"/>
 <h3><a href="../index.html">Examples</a></h3>
-<ul>
-<li><a href="../_001_helloworld/readme.html" title="Let's say hello!">Hello World</a></li>
-<li><a href="../_002_minimal/readme.html" title="Less is more">Minimal</a></li>
-<li><a href="../_003_multiformat/readme.html" title="Serving what the client wants">Multi-format</a></li>
-<li><a href="../_004_error_response/readme.html" title="Making use of HTTP status codes">Error Response</a></li>
-<li><a href="../_005_protected_api/readme.html" title="Creating restricted zone">Protected API</a></li>
-<li><a href="../_006_crud/readme.html" title="using POST, GET, PUT and DELETE">CRUD</a></li>
-<li>
+<ul><li><a href="../_001_helloworld/readme.html" title="Let's say hello!">Hello World</a></li><li><a href="../_002_minimal/readme.html" title="Less is more">Minimal</a></li><li><a href="../_003_multiformat/readme.html" title="Serving what the client wants">Multi-format</a></li><li><a href="../_004_error_response/readme.html" title="Making use of HTTP status codes">Error Response</a></li><li><a href="../_005_protected_api/readme.html" title="Creating restricted zone">Protected API</a></li><li><a href="../_006_crud/readme.html" title="using POST, GET, PUT and DELETE">CRUD</a></li></ul>
 </nav>
 <article id="right">
+<div class="right"><small>3</small></div>
 <h2>Multi-format</h2>
 
 <p>This BMI calculator service shows how you can serve data in different 
@@ -124,5 +133,8 @@ <h2>Multi-format</h2>
 </dl>
 
 </article>
+<footer>
+&#169; 2010 <a title="Luracast.com" href="http://luracast.com"><img src="../resources/Luracast_dark.png" width="180" height="32" title="Helping Developers with Tools, Utilities, Frameworks and Services"/></a>
+</footer>
 </body>
 </html>
\ No newline at end of file
diff --git a/examples/_004_error_response/index.php b/examples/_004_error_response/index.php
index 9367c9217..8a3415cd7 100755
--- a/examples/_004_error_response/index.php
+++ b/examples/_004_error_response/index.php
@@ -5,11 +5,11 @@
  Description: API methods can make use of RestException class to provide 
  error information to the user. 
  
- use `throw new RestException($http_status_code)` to send the error response 
+ use `throw new RestException($httpStatusCode)` to send the error response 
  to the client. 
  
  For the list of HTTP Status codes and their meaning take a look at 
- [Wikipedia](http://en.wikipedia.org/wiki/List_of_HTTP_status_codes).
+ [Wikipedia](http://en.wikipedia.org/wiki/List_of_httpStatusCodes).
  
  Example 1: GET currency/format returns 
  
diff --git a/examples/_004_error_response/readme.html b/examples/_004_error_response/readme.html
index 348f80669..70a625269 100755
--- a/examples/_004_error_response/readme.html
+++ b/examples/_004_error_response/readme.html
@@ -3,7 +3,7 @@
 <head>
 <title>Luracast Restler 2.0 Example:- Error Response</title>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<link rel="stylesheet" type="text/css" href="../resources/markdown.css"/>
+<link rel="stylesheet" type="text/css" href="../resources/style.css"/>
 <link rel="stylesheet" type="text/css" href="../resources/jquery.snippet.min.css"/>
 <link rel="stylesheet" type="text/css" href="../resources/facebox.css"/>
 <link rel="stylesheet" type="text/css" href="../resources/hacks.css"/>
@@ -23,32 +23,41 @@
  	 });
  })
 </script>
+<!--[if lte IE 8]>
+<script type="text/javascript">
+(function(){if(!/*@cc_on!@*/0)return;var e = "abbr,article,aside,audio,bb,canvas,datagrid,datalist,details,dialog,eventsource,figure,footer,header,hgroup,mark,menu,meter,nav,output,progress,section,time,video".split(',');for(var i=0;i<e.length;i++){document.createElement(e[i])}})()
+</script>
+<![endif]-->
 </head>
 <body>
+<nav class="floating-menu">
+<ul>
+<li><a title="Restler Home" href="http://luracast.com/products/restler/">Home</a></li>
+<!--<li><a title="Using Restler" href="#">Guide</a></li><li><a title="Restler API Reference" href="#">API</a></li>-->
+<li><a class="active" href="../index.html">Examples</a></li>
+<li><a title="Share your knowledge by answering user questions in Stack Overflow." href="http://bit.ly/RestlerSupport">Support</a></li>
+<li><a title="Contribute and Fork Restler on GitHub" href="http://bit.ly/LuracastRestler">GitHub</a></li>
+<li><a title="Get updated on Twitter" href="http://twitter.com/Luracast">Twitter</a></li>
+</ul>
+</nav>
 <div id="codeviewer" style="display:none;"></div>
 <nav id="left">
 <img src="../resources/Restler2.gif" width="126" height="126" title="Luracast Restler 2.0"/>
 <h3><a href="../index.html">Examples</a></h3>
-<ul>
-<li><a href="../_001_helloworld/readme.html" title="Let's say hello!">Hello World</a></li>
-<li><a href="../_002_minimal/readme.html" title="Less is more">Minimal</a></li>
-<li><a href="../_003_multiformat/readme.html" title="Serving what the client wants">Multi-format</a></li>
-<li><a href="../_004_error_response/readme.html" title="Making use of HTTP status codes">Error Response</a></li>
-<li><a href="../_005_protected_api/readme.html" title="Creating restricted zone">Protected API</a></li>
-<li><a href="../_006_crud/readme.html" title="using POST, GET, PUT and DELETE">CRUD</a></li>
-<li>
+<ul><li><a href="../_001_helloworld/readme.html" title="Let's say hello!">Hello World</a></li><li><a href="../_002_minimal/readme.html" title="Less is more">Minimal</a></li><li><a href="../_003_multiformat/readme.html" title="Serving what the client wants">Multi-format</a></li><li><a href="../_004_error_response/readme.html" title="Making use of HTTP status codes">Error Response</a></li><li><a href="../_005_protected_api/readme.html" title="Creating restricted zone">Protected API</a></li><li><a href="../_006_crud/readme.html" title="using POST, GET, PUT and DELETE">CRUD</a></li></ul>
 </nav>
 <article id="right">
+<div class="right"><small>4</small></div>
 <h2>Error Response</h2>
 
 <p>API methods can make use of RestException class to provide 
 error information to the user.</p>
 
-<p>use <code>throw new RestException($http_status_code)</code> to send the error response 
+<p>use <code>throw new RestException($httpStatusCode)</code> to send the error response 
 to the client.</p>
 
 <p>For the list of HTTP Status codes and their meaning take a look at 
-<a href="http://en.wikipedia.org/wiki/List_of_HTTP_status_codes" target="_blank">Wikipedia</a></p>
+<a href="http://en.wikipedia.org/wiki/List_of_httpStatusCodes" target="_blank">Wikipedia</a></p>
 
 <blockquote>
   <p>This API Server is made using the following php files/folders</p>
@@ -98,5 +107,8 @@ <h2>Error Response</h2>
 </dl>
 
 </article>
+<footer>
+&#169; 2010 <a title="Luracast.com" href="http://luracast.com"><img src="../resources/Luracast_dark.png" width="180" height="32" title="Helping Developers with Tools, Utilities, Frameworks and Services"/></a>
+</footer>
 </body>
 </html>
\ No newline at end of file
diff --git a/examples/_004_error_response/readme.md b/examples/_004_error_response/readme.md
index fba9f3c5d..254549a63 100755
--- a/examples/_004_error_response/readme.md
+++ b/examples/_004_error_response/readme.md
@@ -4,11 +4,11 @@ Error Response
 API methods can make use of RestException class to provide 
 error information to the user. 
 
-use `throw new RestException($http_status_code)` to send the error response 
+use `throw new RestException($httpStatusCode)` to send the error response 
 to the client. 
 
 For the list of HTTP Status codes and their meaning take a look at 
-[Wikipedia](http://en.wikipedia.org/wiki/List_of_HTTP_status_codes)
+[Wikipedia](http://en.wikipedia.org/wiki/List_of_httpStatusCodes)
 > This API Server is made using the following php files/folders
 
 > * index.php      (gateway)
diff --git a/examples/_005_protected_api/readme.html b/examples/_005_protected_api/readme.html
index c86aefcf0..59b00e71c 100755
--- a/examples/_005_protected_api/readme.html
+++ b/examples/_005_protected_api/readme.html
@@ -3,7 +3,7 @@
 <head>
 <title>Luracast Restler 2.0 Example:- Protected API</title>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<link rel="stylesheet" type="text/css" href="../resources/markdown.css"/>
+<link rel="stylesheet" type="text/css" href="../resources/style.css"/>
 <link rel="stylesheet" type="text/css" href="../resources/jquery.snippet.min.css"/>
 <link rel="stylesheet" type="text/css" href="../resources/facebox.css"/>
 <link rel="stylesheet" type="text/css" href="../resources/hacks.css"/>
@@ -23,22 +23,31 @@
  	 });
  })
 </script>
+<!--[if lte IE 8]>
+<script type="text/javascript">
+(function(){if(!/*@cc_on!@*/0)return;var e = "abbr,article,aside,audio,bb,canvas,datagrid,datalist,details,dialog,eventsource,figure,footer,header,hgroup,mark,menu,meter,nav,output,progress,section,time,video".split(',');for(var i=0;i<e.length;i++){document.createElement(e[i])}})()
+</script>
+<![endif]-->
 </head>
 <body>
+<nav class="floating-menu">
+<ul>
+<li><a title="Restler Home" href="http://luracast.com/products/restler/">Home</a></li>
+<!--<li><a title="Using Restler" href="#">Guide</a></li><li><a title="Restler API Reference" href="#">API</a></li>-->
+<li><a class="active" href="../index.html">Examples</a></li>
+<li><a title="Share your knowledge by answering user questions in Stack Overflow." href="http://bit.ly/RestlerSupport">Support</a></li>
+<li><a title="Contribute and Fork Restler on GitHub" href="http://bit.ly/LuracastRestler">GitHub</a></li>
+<li><a title="Get updated on Twitter" href="http://twitter.com/Luracast">Twitter</a></li>
+</ul>
+</nav>
 <div id="codeviewer" style="display:none;"></div>
 <nav id="left">
 <img src="../resources/Restler2.gif" width="126" height="126" title="Luracast Restler 2.0"/>
 <h3><a href="../index.html">Examples</a></h3>
-<ul>
-<li><a href="../_001_helloworld/readme.html" title="Let's say hello!">Hello World</a></li>
-<li><a href="../_002_minimal/readme.html" title="Less is more">Minimal</a></li>
-<li><a href="../_003_multiformat/readme.html" title="Serving what the client wants">Multi-format</a></li>
-<li><a href="../_004_error_response/readme.html" title="Making use of HTTP status codes">Error Response</a></li>
-<li><a href="../_005_protected_api/readme.html" title="Creating restricted zone">Protected API</a></li>
-<li><a href="../_006_crud/readme.html" title="using POST, GET, PUT and DELETE">CRUD</a></li>
-<li>
+<ul><li><a href="../_001_helloworld/readme.html" title="Let's say hello!">Hello World</a></li><li><a href="../_002_minimal/readme.html" title="Less is more">Minimal</a></li><li><a href="../_003_multiformat/readme.html" title="Serving what the client wants">Multi-format</a></li><li><a href="../_004_error_response/readme.html" title="Making use of HTTP status codes">Error Response</a></li><li><a href="../_005_protected_api/readme.html" title="Creating restricted zone">Protected API</a></li><li><a href="../_006_crud/readme.html" title="using POST, GET, PUT and DELETE">CRUD</a></li></ul>
 </nav>
 <article id="right">
+<div class="right"><small>5</small></div>
 <h2>Protected API</h2>
 
 <p>Not all the API exposed needs to be public, we need to protect some of our API. 
@@ -102,5 +111,8 @@ <h2>Protected API</h2>
 </dl>
 
 </article>
+<footer>
+&#169; 2010 <a title="Luracast.com" href="http://luracast.com"><img src="../resources/Luracast_dark.png" width="180" height="32" title="Helping Developers with Tools, Utilities, Frameworks and Services"/></a>
+</footer>
 </body>
 </html>
\ No newline at end of file
diff --git a/examples/_006_crud/author.sql b/examples/_006_crud/author.sql
deleted file mode 100755
index 9556f9c96..000000000
--- a/examples/_006_crud/author.sql
+++ /dev/null
@@ -1,4 +0,0 @@
-DROP TABLE IF EXISTS "author";
-CREATE TABLE "author" ("id" INTEGER PRIMARY KEY  AUTOINCREMENT  NOT NULL , "name" VARCHAR NOT NULL , "email" VARCHAR NOT NULL  UNIQUE );
-INSERT INTO "author" VALUES(1,'Jac Wright','jacwright@gmail.com');
-INSERT INTO "author" VALUES(2,'Arul Kumaran','arul@luracast.com');
diff --git a/examples/_006_crud/author.sqlite b/examples/_006_crud/author.sqlite
deleted file mode 100755
index d959af334d065a839a84e71dee026b09e8281086..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 163840
zcmeI*&u$w<7y$5H+YMEvoDhm4gfy`flqjZE$OAN{vf7Z;ZH)tpI7Cy&O}1Lw%6hHl
zR0DTjh?hX(gpjy!<jj!+n?FSfs<=~rpJr#jnc4kz=eG~AUp(8(%3*jhDMqmjTgf*`
znkL&JBuR3+I&M|Ro2XYw`eyKt{Mz)5^mg*eZyznr|4bUMzfb0^`H!!EsS-he009C7
z2oNAZfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+009C72oNAZfB*pk1PBlyK!5-N
z0t5&UAV7cs0RjXF5FkK+009C72oNAZfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+
z009C72oNAZfB*pk1PBlyK!5-N0t5&UAV7cs0RsOnu-jNzT3t=QF5~ljI6cj)Khqyh
z%UEt+&u=~Gb=v(-=(j)H>xAnoYvuF2l^vb6&hJ@&T3=Y&*hmj<6dRt-hU3BCwXcSa
zx0bwGTpP#Hur(c?u74ZS_m-BI)9*gKs2OMF$)vdKYd0!1FDIK}t(hG)!%nx~dD!WN
zr@fuW?cPDy?Hq*A-tRxz=~lNr?sWShbf5G?cYkj$v_kXzfz9w`yZ7KxyLV${IEq>R
zmZh-Y-Fdd(3F{lRg{Aw;X_AePhG$nc)yqsS#)p@$b+~zXu2&zUu~>Dr`47qb*Qyf)
z2oNAZfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+009C72oNAZfB*pk1PBlyK!5-N
z0t5&UAV7cs0RjXF5FkK+009C72oNAZfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+
z009C72oNAZfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF5FkL{KPRwKYb2}p+QlpnyR%U&
z;y70Mc0McOAWqA>gUM(mZ6qsOpT|M?s>qH{%9nBQ>LS@b9>pv_zvND}@7nyQWd3{A
z2?7KN5FkK+009C72oNAZfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+009C72oNAZ
zfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+009C72oNAZfB*pk1PBlyK!5-N0t5&U
zAV7cs0RjXF5FkK+009C72oNAZfB*pk1PBlyK!5-N0t5&UAn?uzEY-KtmvQi_$c|6S
z?c-6*^1Fk{DE***FO9`4-_B=69K>mPK3iL?_MOiENUA0X5FkK+009C72oNAZfB*pk
z1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+009C72oNAZfB*pk1PBlyK!5-N0t5&UAV7cs
z0RjXF5FkK+009C72oNAZfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+009C72oNAZ
zfB*pk1PBlyK!5-N0t5&UAV7e?|4QIaT3=4%tUQ?%wZ&@Z>HO!UYJva(0t5&UAV7cs
z0RjXF5FkK+009C72oNAZfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+009C72oNAZ
zfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+009C72oNAZfB*pk1PBlyK!5-N0t5&U
zAV7cs0RjXF5FkK+009C72oNAZfB*pk1PHuy0w1T1<@@i)S$Q%krl)yU4iBrrBpV+M
O&(5=I`f&5pu=y91*~Ur$

diff --git a/examples/_006_crud/filename.sqlite b/examples/_006_crud/filename.sqlite
deleted file mode 100755
index be89fb66dae6a1174e9a2ed5c64ac977243e886d..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 4096
zcmdPWQV7Y&ELKR%%t=*9&d)1J%*-oRNX%0R4)n<^NmVe?GgL@PEJ;jCEKXI>(qhmk
zeSC`n3c7(b3yd>LkA}c#2n@*(h+yDg5MVe1%*zsB_ct&wFoGD6ylub$<TJ7HsOT9O
zWag!$RxoG)i-Vlhyu{p8g~Za5e6XN`p(X=dn86sN9co?@NIxSRkC=i|5?BS2I)n}r
z2InAG#}HSA5Jx8;R|U9)f<|VFLS|lxjzUptVQFe{Nil>M5aj9W7!;}C?HUPEqN&L+
znahM3Z0#s98UmvsKtc#`Ferdkb3yea8MqrpfO9Pa!-LU0MM6l9Djf}hp%((M{12(`
b*}*xVnU&p;!D2N3553qNb@6Bj5FY{nVe&{n

diff --git a/examples/_006_crud/readme.html b/examples/_006_crud/readme.html
index 35608357c..4fc3e4968 100755
--- a/examples/_006_crud/readme.html
+++ b/examples/_006_crud/readme.html
@@ -3,7 +3,7 @@
 <head>
 <title>Luracast Restler 2.0 Example:- CRUD</title>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<link rel="stylesheet" type="text/css" href="../resources/markdown.css"/>
+<link rel="stylesheet" type="text/css" href="../resources/style.css"/>
 <link rel="stylesheet" type="text/css" href="../resources/jquery.snippet.min.css"/>
 <link rel="stylesheet" type="text/css" href="../resources/facebox.css"/>
 <link rel="stylesheet" type="text/css" href="../resources/hacks.css"/>
@@ -23,22 +23,31 @@
  	 });
  })
 </script>
+<!--[if lte IE 8]>
+<script type="text/javascript">
+(function(){if(!/*@cc_on!@*/0)return;var e = "abbr,article,aside,audio,bb,canvas,datagrid,datalist,details,dialog,eventsource,figure,footer,header,hgroup,mark,menu,meter,nav,output,progress,section,time,video".split(',');for(var i=0;i<e.length;i++){document.createElement(e[i])}})()
+</script>
+<![endif]-->
 </head>
 <body>
+<nav class="floating-menu">
+<ul>
+<li><a title="Restler Home" href="http://luracast.com/products/restler/">Home</a></li>
+<!--<li><a title="Using Restler" href="#">Guide</a></li><li><a title="Restler API Reference" href="#">API</a></li>-->
+<li><a class="active" href="../index.html">Examples</a></li>
+<li><a title="Share your knowledge by answering user questions in Stack Overflow." href="http://bit.ly/RestlerSupport">Support</a></li>
+<li><a title="Contribute and Fork Restler on GitHub" href="http://bit.ly/LuracastRestler">GitHub</a></li>
+<li><a title="Get updated on Twitter" href="http://twitter.com/Luracast">Twitter</a></li>
+</ul>
+</nav>
 <div id="codeviewer" style="display:none;"></div>
 <nav id="left">
 <img src="../resources/Restler2.gif" width="126" height="126" title="Luracast Restler 2.0"/>
 <h3><a href="../index.html">Examples</a></h3>
-<ul>
-<li><a href="../_001_helloworld/readme.html" title="Let's say hello!">Hello World</a></li>
-<li><a href="../_002_minimal/readme.html" title="Less is more">Minimal</a></li>
-<li><a href="../_003_multiformat/readme.html" title="Serving what the client wants">Multi-format</a></li>
-<li><a href="../_004_error_response/readme.html" title="Making use of HTTP status codes">Error Response</a></li>
-<li><a href="../_005_protected_api/readme.html" title="Creating restricted zone">Protected API</a></li>
-<li><a href="../_006_crud/readme.html" title="using POST, GET, PUT and DELETE">CRUD</a></li>
-<li>
+<ul><li><a href="../_001_helloworld/readme.html" title="Let's say hello!">Hello World</a></li><li><a href="../_002_minimal/readme.html" title="Less is more">Minimal</a></li><li><a href="../_003_multiformat/readme.html" title="Serving what the client wants">Multi-format</a></li><li><a href="../_004_error_response/readme.html" title="Making use of HTTP status codes">Error Response</a></li><li><a href="../_005_protected_api/readme.html" title="Creating restricted zone">Protected API</a></li><li><a href="../_006_crud/readme.html" title="using POST, GET, PUT and DELETE">CRUD</a></li></ul>
 </nav>
 <article id="right">
+<div class="right"><small>6</small></div>
 <h2>CRUD</h2>
 
 <p>Create, Retrive, Update and Delete using 
@@ -62,13 +71,15 @@ <h2>CRUD</h2>
 
 <p>This API Server exposes the following URIs</p>
 
-<pre><code>GET    author     ⇠ Author::get()
-GET    author/:id ⇠ Author::get()
-POST   author     ⇠ Author::post()
-PUT    author     ⇠ Author::put()
-PUT    author/:id ⇠ Author::put()
-DELETE author     ⇠ Author::delete()
-DELETE author/:id ⇠ Author::delete()
+<pre><code>GET    author                   ⇠ Author::get()
+GET    author/:id               ⇠ Author::get()
+POST   author                   ⇠ Author::post()
+POST   author/:request_data     ⇠ Author::post()
+PUT    author                   ⇠ Author::put()
+PUT    author/:id               ⇠ Author::put()
+PUT    author/:id/:request_data ⇠ Author::put()
+DELETE author                   ⇠ Author::delete()
+DELETE author/:id               ⇠ Author::delete()
 </code></pre>
 
 <p>Try the following links in your browser</p>
@@ -173,5 +184,8 @@ <h3>Creating new Author</h3>
 </code></pre>
 
 </article>
+<footer>
+&#169; 2010 <a title="Luracast.com" href="http://luracast.com"><img src="../resources/Luracast_dark.png" width="180" height="32" title="Helping Developers with Tools, Utilities, Frameworks and Services"/></a>
+</footer>
 </body>
 </html>
\ No newline at end of file
diff --git a/examples/_006_crud/readme.md b/examples/_006_crud/readme.md
index 4e0059815..2b9a7a3f6 100755
--- a/examples/_006_crud/readme.md
+++ b/examples/_006_crud/readme.md
@@ -17,13 +17,15 @@ a firefox extension
 
 This API Server exposes the following URIs
 
-	GET    author     ⇠ Author::get()
-	GET    author/:id ⇠ Author::get()
-	POST   author     ⇠ Author::post()
-	PUT    author     ⇠ Author::put()
-	PUT    author/:id ⇠ Author::put()
-	DELETE author     ⇠ Author::delete()
-	DELETE author/:id ⇠ Author::delete()
+	GET    author                   ⇠ Author::get()
+	GET    author/:id               ⇠ Author::get()
+	POST   author                   ⇠ Author::post()
+	POST   author/:request_data     ⇠ Author::post()
+	PUT    author                   ⇠ Author::put()
+	PUT    author/:id               ⇠ Author::put()
+	PUT    author/:id/:request_data ⇠ Author::put()
+	DELETE author                   ⇠ Author::delete()
+	DELETE author/:id               ⇠ Author::delete()
 
 
 Try the following links in your browser
diff --git a/examples/_006_crud/sqlitedb.php b/examples/_006_crud/sqlitedb.php
deleted file mode 100755
index 85f1caf7e..000000000
--- a/examples/_006_crud/sqlitedb.php
+++ /dev/null
@@ -1,68 +0,0 @@
-<?php
-/**
- * Sqlite database
- */
-class SqliteDB {
-	private $db;
-	function __construct() {
-		if ($db = new SQLiteDatabase(SqliteDB::NAME.'sqlite') {
-			$q = @$db->query('SELECT requests FROM tablename WHERE id = 1');
-			if ($q === false) {
-				$db->queryExec('CREATE TABLE tablename (id int, requests int, PRIMARY KEY (id)); INSERT INTO tablename VALUES (1,1)');
-				$hits = 1;
-			} else {
-				$result = $q->fetchSingle();
-				$hits = $result+1;
-			}
-			$db->queryExec("UPDATE tablename SET requests = '$hits' WHERE id = 1");
-		} else {
-			die($err);
-		}
-		$this->db = new SQLite3('author.sqlite');
-	}
-	private function find($id){
-		foreach ($_SESSION['rs'] as $index => $rec) {
-			if ($rec['id'] == $id) {
-				return $index;
-			}
-		}
-		return FALSE;
-	}
-	function get($id) {
-		$results = $this->db->query("SELECT * FROM author");
-		$r=array();
-		while ($row = $results->fetchArray()) {
-			print_r($row);
-			$r[]=$row;
-		}
-		return $row;
-	}
-	function getAll() {
-		return $_SESSION['rs'];
-	}
-	public function insert($rec) {
-		$rec['id']=$this->pk();
-		array_push($_SESSION['rs'], $rec);
-		return $rec;
-	}
-	public function update($id, $rec) {
-		$index = $this->find($id);
-		if($index===FALSE)return FALSE;
-		$rec['id']=$id;
-		$_SESSION['rs'][$index]=$rec;
-		return $rec;
-	}
-	public function delete($id) {
-		$index = $this->find($id);
-		if($index===FALSE)return FALSE;
-		return array_shift(array_splice($_SESSION['rs'], $index, 1));
-	}
-}
-
-// Sample data.
-function getData() {
-	return array(
-	array('id' => 1, 'name' => 'Jac Wright',   'email' => 'jacwright@gmail.com'),
-	array('id' => 2, 'name' => 'Arul Kumaran', 'email' => 'arul@luracast.com'  ),
-	);
-}
\ No newline at end of file
diff --git a/examples/index.html b/examples/index.html
index dce26a468..61cda3716 100755
--- a/examples/index.html
+++ b/examples/index.html
@@ -3,8 +3,9 @@
 <head>
 <title>Luracast Restler 2.0 Example:- </title>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<link rel="stylesheet" type="text/css" href="resources/markdown.css"/>
+<link rel="stylesheet" type="text/css" href="resources/style.css"/>
 
+<script type="text/javascript" src="resources/jquery-1.6.2.min.js"></script>
 
 <script type="text/javascript">
  $(document).ready(function(){
@@ -17,60 +18,64 @@
  	 });
  })
 </script>
+<!--[if lte IE 8]>
+<script type="text/javascript">
+(function(){if(!/*@cc_on!@*/0)return;var e = "abbr,article,aside,audio,bb,canvas,datagrid,datalist,details,dialog,eventsource,figure,footer,header,hgroup,mark,menu,meter,nav,output,progress,section,time,video".split(',');for(var i=0;i<e.length;i++){document.createElement(e[i])}})()
+</script>
+<![endif]-->
 </head>
 <body>
+<nav class="floating-menu">
+<ul>
+<li><a title="Restler Home" href="http://luracast.com/products/restler/">Home</a></li>
+<!--<li><a title="Using Restler" href="#">Guide</a></li><li><a title="Restler API Reference" href="#">API</a></li>-->
+<li><a class="active" href="index.html">Examples</a></li>
+<li><a title="Share your knowledge by answering user questions in Stack Overflow." href="http://bit.ly/RestlerSupport">Support</a></li>
+<li><a title="Contribute and Fork Restler on GitHub" href="http://bit.ly/LuracastRestler">GitHub</a></li>
+<li><a title="Get updated on Twitter" href="http://twitter.com/Luracast">Twitter</a></li>
+</ul>
+</nav>
 <div id="codeviewer" style="display:none;"></div>
 <nav id="left">
 <img src="resources/Restler2.gif" width="126" height="126" title="Luracast Restler 2.0"/>
 <h3><a href="index.html">Examples</a></h3>
-<ul>
-<li><a href="_001_helloworld/readme.html" title="Let's say hello!">Hello World</a></li>
-<li><a href="_002_minimal/readme.html" title="Less is more">Minimal</a></li>
-<li><a href="_003_multiformat/readme.html" title="Serving what the client wants">Multi-format</a></li>
-<li><a href="_004_error_response/readme.html" title="Making use of HTTP status codes">Error Response</a></li>
-<li><a href="_005_protected_api/readme.html" title="Creating restricted zone">Protected API</a></li>
-<li><a href="_006_crud/readme.html" title="using POST, GET, PUT and DELETE">CRUD</a></li>
-<li>
+<ul><li><a href="_001_helloworld/readme.html" title="Let's say hello!">Hello World</a></li><li><a href="_002_minimal/readme.html" title="Less is more">Minimal</a></li><li><a href="_003_multiformat/readme.html" title="Serving what the client wants">Multi-format</a></li><li><a href="_004_error_response/readme.html" title="Making use of HTTP status codes">Error Response</a></li><li><a href="_005_protected_api/readme.html" title="Creating restricted zone">Protected API</a></li><li><a href="_006_crud/readme.html" title="using POST, GET, PUT and DELETE">CRUD</a></li></ul>
 </nav>
 <article id="right">
 <h2>Examples</h2>
-<p>Luracast Restler is a microframework to expose php methods as RESTful API. Best way to learn is by examples, here are the examples that shows the features of Restler and how to use them.</p>
+<p>Luracast Restler is a microframework to expose php methods as RESTful API. Best way to learn is by examples, 
+here you can find the examples that shows every feature of Restler and how to use them.</p>
 <p>We have created it in such a way that they can be tested on your local host.</p>
 <p>You can check the source code, try some of the API's exposed at the comfort of your browser</p>
 <ol class="toc">
 	<li><a href="_001_helloworld/readme.html" title="Basic hello world example to get started with Restler 2.0">
 <span>Hello World 
 <small><i>Let's say hello!</i></small>
-</span> <right>Example 1</right>
-</a></li>
+</span> <span class="right">&nbsp;1</span></a></li>
 	<li><a href="_002_minimal/readme.html" title="Shows the bare minimum code needed to get your RESTful api server up and running">
 <span>Minimal 
 <small><i>Less is more</i></small>
-</span> <right>Example 2</right>
-</a></li>
+</span> <span class="right">&nbsp;2</span></a></li>
 	<li><a href="_003_multiformat/readme.html" title="This BMI calculator service shows how you can serve data in different 
 formats using Rester. This example uses JsonFormat (default) and XmlFormat">
 <span>Multi-format 
 <small><i>Serving what the client wants</i></small>
-</span> <right>Example 3</right>
-</a></li>
+</span> <span class="right">&nbsp;3</span></a></li>
 	<li><a href="_004_error_response/readme.html" title="API methods can make use of RestException class to provide 
 error information to the user. 
 
-use `throw new RestException($http_status_code)` to send the error response 
+use `throw new RestException($httpStatusCode)` to send the error response 
 to the client">
 <span>Error Response 
 <small><i>Making use of HTTP status codes</i></small>
-</span> <right>Example 4</right>
-</a></li>
+</span> <span class="right">&nbsp;4</span></a></li>
 	<li><a href="_005_protected_api/readme.html" title="Not all the API exposed needs to be public, we need to protect some of our API. 
 Here are three ways to protect a method
 
 1">
 <span>Protected API 
 <small><i>Creating restricted zone</i></small>
-</span> <right>Example 5</right>
-</a></li>
+</span> <span class="right">&nbsp;5</span></a></li>
 	<li><a href="_006_crud/readme.html" title="Create, Retrive, Update and Delete using 
 HTTP methods POST, GET, PUT and DELETE respectively. 
 For simplicity and making it work out of the box it is using
@@ -78,10 +83,12 @@ <h2>Examples</h2>
 supports PHP Session Cookies">
 <span>CRUD 
 <small><i>using POST, GET, PUT and DELETE</i></small>
-</span> <right>Example 6</right>
-</a></li>
+</span> <span class="right">&nbsp;6</span></a></li>
 
 </ol>
 </article>
+<footer>
+&#169; 2010 <a title="Luracast.com" href="http://luracast.com"><img src="resources/Luracast_dark.png" width="180" height="32" title="Helping Developers with Tools, Utilities, Frameworks and Services"/></a>
+</footer>
 </body>
 </html>
\ No newline at end of file
diff --git a/examples/resources/Luracast.png b/examples/resources/Luracast.png
new file mode 100644
index 0000000000000000000000000000000000000000..9ce8e0d1eb588637f89435f1965f6ee6e5cd0cc5
GIT binary patch
literal 2543
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

literal 0
HcmV?d00001

diff --git a/examples/resources/Luracast_dark.png b/examples/resources/Luracast_dark.png
new file mode 100644
index 0000000000000000000000000000000000000000..ea3bf268804b15a621f0c75ad9d2f93a0fe81cf1
GIT binary patch
literal 1489
zcmcJP`!^E|7{@1>x!+1yF_cpYbIWx!<}&weMq=i&#o1xZ+%HM)x7XpgrQAZ8OO54P
zNnRnfA>>xX>rRMjjJ<pRi1(c5`~9BhIiGXBzdh+r4pt(9a)JN=Km=)xaOP$kR}c^{
z*Rz(ZT)4p-YKBCEK%m)0#|7@{>12nt;BYu4B_#v`;s5Y=(=$ojA_a=G0}3D^p`@g(
zjX=1#5C{<wX=x=T4GrDhBO~+kJ3AcCMs2em7ZnJ$z7q-n2uc1Yp0W9OHurd*V&O(H
zC*!>-0i+-ZIv@}aFwoHCj%L+E0EG+4{|BH*1WJTA84rN_k$mtF%K$Pyf<z{ULd;RR
z>Y7vq>rDXQYylDhN4q7@7d;?@uL<7@EWp`ZQ@MEiT;d6*{0@&0VLA-V2%DJ;kYqF`
z{G*t3Su~ZC3fey+X&b9wmpqMl?zl=~6O$}c;S{<LE5^yQ`pbp`<44hl5(SFjTia9`
z-O1+c{oEk0-dWl2e`1IBbxpg|G(qMcd-kHUji~H*XS`G5qg6+We8YjDug?I$3uBIg
zCkNP)Z)9bQ%ug!((!>^qK%7Uh27_fUo*6zwZXaWVbb9{??;d~Z6Fy<|#j?syJXQDY
zF6E&Q+4fAx*{z-g93r66zh&5sn4J{Wf9j00dNY=$dr+_GRVI2R^2>s9Lz-5xT3eM&
z99Yz3po`WRZc^*^R|`}IRk&6oW4TLv9D&Ky^|~E%FC#iV5YiNeDa>&W$i@;)f?F%U
zeV}G9YgV*t%FI1*m?Ew*E9v;KVGf_WqA3RHcLd5UOKhD~HZ+j&O0EjGZp8Y4`4e%0
zkfQeC7w>BaO*@j>eDw~5-WZ6n7sWwwr&3`5S7J@7czRnky37|lQ1E_A0;fMg&^S{G
z+c=dl$C|ln#8)tvn;((M1pfTD>7}J{+e`!cMd%sJ>{0POY3lomY5E^~Kci<Akt$Lf
zKKr1QP?)cPEl`@E1FZ{u0Q|AB(t)QP!i^)=Pyv_4Ml;!~2rV(VRlcL>myxXuxuk3n
z_fdT{w+6l(l~znq5OY`|*)-K;@^8t~jfy__5`5OG0`<hxiLm3jFS!o_d7szk!;}li
zV>ZNHnH4kWZe~knVtcMp#{O=uWBwYf?wALK_D7=D>tc6W{2K-+$-m;CfOl?{iyiNK
z`+M|2MN+VKmliP6bM7|81Ud!>OVa@s%O1r%JpDzgEb18O(vhPBk-_m*RIgo8g1t!8
zqowcSj47t0$PvqUXk7l_iT;U{zl6}i%eFb%x$Gu6@f7V)z2Berw#inn*>ZBGLF-0L
zaM;670Um1!-TWaS1!9!J7W`hfqOb;d&B$b%u-eoVv?Q-;xLEiU3jeJ{${Y7wJH0+G
z9i1be*L(;WqlkMCP3F5d_8FAh()nS_{kNl`cg%SY6FjoIlGQ`H_-`ya3q=uhHxrGl
z%%E46({H|h8}yhHmC8EQH=CM)6lE-ADsJ*Hrh|ArwX0e@{k+wO@Eze8smZI0leL9|
z1;$U0*8xF}TZKmhk1M58t{XeyooO~#U9}E?kH(R;D$i=dDOA|y9F|#|t~Et9%zmj$
z&EiIVh|nv8tX1$&MQnGq&kN_i8uz|!_&s8Qdi^=-=LX~CN`C12T{j#ZJkiBeJMNu*
zd0#v;HcIwmtXwH@O{+6Fq`na4*L4>bCnToTrrv{mmA*-6%M)@?RP$+Bg)34k8#-?`
zx|FFK-t76RT5R~Mll-R4aTEADlCn2ZWZqfWU$Gq-D(j5h%p1&DTu~Cfu%QTvf*I1D
zyG;xhs71EgnRPaj@V~20>w@{d){vgQ#QdzKsU2MkiA(<8-|LDfC@`1uQf94GFYDZQ
zy)b8zKDKnSBC!%<%R1EC@fi4##m?6I&A4g`NDIs##n*Ita9<e!Y2koqHp3<U3yx&F
AJpcdz

literal 0
HcmV?d00001

diff --git a/examples/resources/style.css b/examples/resources/style.css
new file mode 100755
index 000000000..ae72031db
--- /dev/null
+++ b/examples/resources/style.css
@@ -0,0 +1,432 @@
+* { outline: 0; }
+html, body { min-height: 100%;  }
+body, ul, ol, dl { margin: 0; }
+img { border: 0; }
+article, aside, audio, footer, header, nav, section, video { display: block }
+input[type="submit"]::-moz-focus-inner, input[type="button"]::-moz-focus-inner { border : 0px; }
+input[type="search"] { -webkit-appearance: textfield; }
+input[type="submit"] { -webkit-appearance:none; }
+img.right { float: right; margin-left: 2em; clear: right; }
+img.left { float: left; margin-right: 2em; clear: left; }
+table { border-collapse: collapse; }
+th { background: #000; color: #fff; }
+td { padding: 1em; border: 1px solid black; }
+body {
+	margin: 0 auto;
+	font-family: Georgia, Palatino, serif;
+	color: #444444;
+	line-height: 1;
+	max-width: 960px;
+	padding: 0 30px 30px;
+	background-color: #E6E2DF;
+}
+
+h1,h2,h3,h4 {
+	color: #111111;
+	font-weight: 400;
+}
+
+h1,h2,h3,h4,h5,p {
+	margin-bottom: 24px;
+	padding: 0;
+}
+
+h1 {
+	font-size: 48px;
+}
+
+h2 {
+	font-size: 36px;
+	margin: 24px 0 6px;
+	margin-top: .5em !important;
+	border-top: 4px solid #E0E0E0 !important;
+	padding-top: .5em !important;
+}
+
+h3 {
+	font-size: 24px;
+}
+
+h4 {
+	font-size: 21px;
+}
+
+h5 {
+	font-size: 18px;
+}
+
+a {
+	color: #0099ff;
+	padding: 0;
+	vertical-align: baseline;
+	margin: 0;
+	text-decoration: none;
+}
+
+a:hover,a:active,a:focus {
+	background-color: #0099ff;
+	text-decoration: none;
+	color: white;
+}
+
+ul,ol {
+	padding: 4px 20px 0px;
+	margin: 0;
+}
+
+li {
+	line-height: 24px;
+}
+
+blockquote ul {
+	margin: 0 auto;
+	padding: 0;
+	overflow: hidden;
+}
+
+blockquote ul li {
+	text-align: left;
+	float: left;
+	list-style: none;
+	padding: 4px;
+	width: 220px;
+}
+p,article.ul,article.ol {
+	font-size: 16px;
+	line-height: 24px;
+	max-width: 540px;
+}
+
+footer {
+	margin-left: 120px;
+	padding: 0;
+	text-align: right;
+	max-width: 640px;
+}
+
+footer img{
+	vertical-align: text-bottom;
+}
+
+footer a, footer a:hover{
+	background: none;
+}
+
+article {
+	background: white;
+	position: relative;
+	padding: 25px 50px;
+	margin: 50px 0;
+	min-width: 380px;
+	max-width: 550px;
+	/*
+	padding: 25px 210px 0 30px;
+	*/
+	margin-left: 120px;
+	margin-bottom: 10px;
+	min-height: 600px;
+	background-repeat: no-repeat;
+	background-position: top right;
+	-moz-box-shadow: 5px 5px 5px #ccc;
+	-webkit-box-shadow: 5px 5px 5px #ccc;
+	box-shadow: 5px 5px 5px #ccc;
+}
+
+article:after {
+	content: "";
+	position: absolute;
+	top: 0;
+	left: 0;
+	width: 0;
+	height: 0;
+	border-top: 10px solid #E6E2DF;
+	border-left: 10px solid #E6E2DF;
+	border-bottom: 10px solid #d9d3cf;
+	border-right: 10px solid #d9d3cf;
+}
+
+article pre {
+	padding: 13px;
+	background: #f3f3f3;
+	border-style: dashed;
+	border-color: #DADADA;
+	border-width: 1px;
+	/* max-width: 600 px; */
+	overflow: auto;
+}
+code {
+	font-family: Consolas, Monaco, Andale Mono, monospace;
+	background: #ffffdd;
+	font-size: 15px;
+}
+
+pre code {
+	line-height: 1.5;
+	background-color: transparent;
+	font-size: 13px;
+}
+
+abbr {
+	border-radius: 3px;
+	-moz-border-radius: 3px;
+	-webkit-border-radius: 3px;
+	-khtml-border-radius: 3px;
+	background: blue;
+	opacity: 0.3;
+	color: white;
+	padding: 4px;
+	cursor: help;
+}
+
+abbr:HOVER {
+	opacity: 0.6;
+	background: black;
+}
+
+a abbr,a abbr:HOVER {
+	background: inherit;
+	color: inherit;
+	opacity: inherit;
+	border: inherit;
+	cursor: inherit;
+	padding: inherit;
+}
+
+aside {
+	display: block;
+	float: right;
+	width: 390px;
+}
+
+blockquote {
+	margin: 1em 2em;
+	max-width: 476px;
+	background: #ECEDE5;
+	border-left: 10px solid #ccc;
+	padding: .5em 10px;
+}
+
+blockquote p {
+	color: #666;
+	/* max-width: 460px; */
+	margin: 0;
+}
+
+hr {
+	width: 540px;
+	text-align: left;
+	margin: 0 auto 0 0;
+	color: #999;
+}
+
+dl {
+	margin: 2em 0;
+	padding: 0;
+	/* max-width: 476px; */
+}
+
+dt { 
+	font-family: Fixed, monospace;
+	padding: .5em;
+	border: 1px solid #131210;
+	border-right: 1px solid #131210;
+	border-top: 1px solid #131210;
+	padding: .5em;
+}
+
+dd {
+	margin: 0 0 1em 0;
+	padding: .5em;
+	border-left: 1px solid #131210;
+	border-right: 1px solid #131210;
+	border-bottom: 1px solid #131210;
+}
+
+dd pre {
+	border: none;
+	padding: 0;
+	background-color: transparent;
+}
+
+ol.toc li {
+	clear: left;
+	border-bottom: dashed 1px #aaa;
+	height: 1.05em;
+	margin-top: 20px;
+	position: relative;
+	margin-top: 20px;
+	height: 1.05em;
+}
+
+ol.toc li:HOVER {
+	color: #0099ff;
+	border-bottom: dashed 1px #0099ff;
+}
+
+ol.toc li:HOVER small {
+	color: #7FCCFF;
+}
+
+ol.toc a {
+	text-decoration: none;
+	color: inherit;
+}
+
+ol.toc .right,ol.toc span {
+	background: #fff;
+	padding: 0 3px 0 0;
+	float: left;
+	position: absolute;
+	text-decoration: none;
+}
+
+div.right {
+	float:right;
+}
+ol.toc .right {
+	padding: 0 0 0 3px;
+	right: 0;
+}
+
+ol.toc a:HOVER {
+	
+}
+
+ol.toc ol {
+	list-style: lower-roman;
+	margin: 1.5em 0 1em 5%;
+	padding: 0;
+	background: #fff;
+	float: left;
+	display: block;
+	width: 95%;
+}
+
+ol.toc small {
+	color: #a999a9;
+}
+
+/**
+ * Left side
+ */
+#left {
+	position: fixed;
+	top: 32px;
+	bottom: 0;
+	left: 0;
+	height: auto;
+	margin: 0;
+	padding: 7px;
+	overflow: auto;
+	background: black;
+	line-height: 1.6;
+}
+
+#left img {
+	margin-top: -10px;
+	margin-left: -10px;
+	margin-bottom: 0px;
+	padding-top: 0px;
+	padding-left: 0px;
+}
+
+#left h3 {
+	color: white;
+	border-bottom: 1px solid #aaaaaa;
+	border-top: 1px solid #aaaaaa;
+}
+
+#left a {
+	color: #bbccff;
+}
+
+#left a:hover {
+	color: white;
+}
+
+#left ul {
+	list-style: none;
+	padding: 0 0 0 0px;
+	margin: 0;
+	color: white;
+}
+
+#left li {
+	white-space: nowrap;
+}
+
+#left ul ul {
+	padding-left: 10px;
+}
+
+#left .active>a {
+	color: #333;
+	background: none;
+	font-weight: bold;
+}
+
+.collapsed {
+	display: none;
+}
+
+nav.floating-menu {
+	height: 32px;
+	top: 0;
+	left: 0;
+	padding: 0;
+	margin: 0;
+	position: fixed;
+	background: #000000;
+	border: 0;
+	width: 100%;
+	z-index: 100;
+	overflow: hidden;
+	background: -moz-linear-gradient(bottom, #aaa, #000 50%);
+	background: -webkit-gradient(linear, center bottom, center top, from(#aaa),
+		color-stop(50%, #000) );
+	-moz-box-shadow: 0 0 10px #000000;
+	-webkit-box-shadow: 0 0 10px #000000;
+	box-shadow: 0 0 10px #000000;
+}
+
+nav.floating-menu ul {
+	list-style-type: none;
+	margin: 0;
+	padding: 0;
+	overflow: hidden;
+}
+
+nav.floating-menu li {
+	float: left;
+}
+
+nav.floating-menu a:link,
+nav.floating-menu  a:visited {
+	font-family: Arial, Helvetica, sans-serif;
+	font-size: 12px;
+	font-weight: bold;
+	display: block;
+	width: 120px;
+	color: #cccccc;
+	text-align: center;
+	padding: 4px;
+	text-decoration: none;
+	text-transform: none;
+	border-left: 1px solid #222;
+	border-right: 1px solid #bbb;
+}
+
+nav.floating-menu a:hover,
+nav.floating-menu  a:active,
+nav.floating-menu  a.active {
+	color: #222;
+	background-color: #ddd;
+	border-top: 3px solid #aa0000;
+	background: -moz-linear-gradient(bottom, #ddd, #aaa 50%);
+	background: -webkit-gradient(linear, center bottom, center top, from(#ddd),
+		color-stop(50%, #aaa) );
+	-moz-box-shadow: 0 0 10px #000000;
+}
+nav.floating-menu  a.active {
+	border-top: 3px solid #ff0000;
+}

From e2913d4f18e6720c411f20fa18a9f75223b441ee Mon Sep 17 00:00:00 2001
From: Luracast <arul@luracast.com>
Date: Thu, 22 Sep 2011 01:34:21 +0800
Subject: [PATCH 15/61] Improved the minimal example to include parameter
 validation, .htaccess file now makes sure that php display_errors is turned
 off in the server

---
 examples/_001_helloworld/.htaccess     |  3 +++
 examples/_002_minimal/.htaccess        |  3 +++
 examples/_002_minimal/math.php         | 29 +++++++++++++++++++++-----
 examples/_003_multiformat/.htaccess    |  3 +++
 examples/_004_error_response/.htaccess |  3 +++
 examples/_005_protected_api/.htaccess  |  3 +++
 examples/_006_crud/.htaccess           |  3 +++
 7 files changed, 42 insertions(+), 5 deletions(-)

diff --git a/examples/_001_helloworld/.htaccess b/examples/_001_helloworld/.htaccess
index b766fc6f0..22c547c25 100755
--- a/examples/_001_helloworld/.htaccess
+++ b/examples/_001_helloworld/.htaccess
@@ -5,4 +5,7 @@ DirectoryIndex index.php
 	RewriteCond %{REQUEST_FILENAME} !-f
 	RewriteCond %{REQUEST_FILENAME} !-d
 	RewriteRule ^(.*)$ index.php [QSA,L]
+</IfModule>
+<ifModule mod_php5.c>
+	php_flag display_errors Off
 </IfModule>
\ No newline at end of file
diff --git a/examples/_002_minimal/.htaccess b/examples/_002_minimal/.htaccess
index b766fc6f0..22c547c25 100755
--- a/examples/_002_minimal/.htaccess
+++ b/examples/_002_minimal/.htaccess
@@ -5,4 +5,7 @@ DirectoryIndex index.php
 	RewriteCond %{REQUEST_FILENAME} !-f
 	RewriteCond %{REQUEST_FILENAME} !-d
 	RewriteRule ^(.*)$ index.php [QSA,L]
+</IfModule>
+<ifModule mod_php5.c>
+	php_flag display_errors Off
 </IfModule>
\ No newline at end of file
diff --git a/examples/_002_minimal/math.php b/examples/_002_minimal/math.php
index 9a17b3b8b..63eed0a43 100755
--- a/examples/_002_minimal/math.php
+++ b/examples/_002_minimal/math.php
@@ -1,9 +1,28 @@
 <?php
-class Math {
-    function add($n1=1, $n2=1) {
-        return $n1+$n2;
+class Math
+{
+    function add ($n1 = 1, $n2 = 1)
+    {
+        $this->_validate($n1, $n2);
+        return $n1 + $n2;
     }
-    function multiply($n1=5, $n2=2) {
-        return array('result'=>($n1*$n2));
+    function multiply ($n1 = 5, $n2 = 2)
+    {
+        $this->_validate(func_get_args());
+        return array('result' => ($n1 * $n2));
+    }
+    private function _validate ($numbers)
+    {
+        foreach ($numbers as $n) {
+            if (! is_numeric($n)) {
+                throw new RestException(400, 'parameter is not a number');
+            }
+            if (is_infinite($n)) {
+                throw new RestException(400, 'parameter is not finite');
+            }
+            if ($n > 5000) {
+                throw new RestException(416);
+            }
+        }
     }
 }
\ No newline at end of file
diff --git a/examples/_003_multiformat/.htaccess b/examples/_003_multiformat/.htaccess
index b766fc6f0..22c547c25 100755
--- a/examples/_003_multiformat/.htaccess
+++ b/examples/_003_multiformat/.htaccess
@@ -5,4 +5,7 @@ DirectoryIndex index.php
 	RewriteCond %{REQUEST_FILENAME} !-f
 	RewriteCond %{REQUEST_FILENAME} !-d
 	RewriteRule ^(.*)$ index.php [QSA,L]
+</IfModule>
+<ifModule mod_php5.c>
+	php_flag display_errors Off
 </IfModule>
\ No newline at end of file
diff --git a/examples/_004_error_response/.htaccess b/examples/_004_error_response/.htaccess
index b766fc6f0..22c547c25 100755
--- a/examples/_004_error_response/.htaccess
+++ b/examples/_004_error_response/.htaccess
@@ -5,4 +5,7 @@ DirectoryIndex index.php
 	RewriteCond %{REQUEST_FILENAME} !-f
 	RewriteCond %{REQUEST_FILENAME} !-d
 	RewriteRule ^(.*)$ index.php [QSA,L]
+</IfModule>
+<ifModule mod_php5.c>
+	php_flag display_errors Off
 </IfModule>
\ No newline at end of file
diff --git a/examples/_005_protected_api/.htaccess b/examples/_005_protected_api/.htaccess
index b766fc6f0..22c547c25 100755
--- a/examples/_005_protected_api/.htaccess
+++ b/examples/_005_protected_api/.htaccess
@@ -5,4 +5,7 @@ DirectoryIndex index.php
 	RewriteCond %{REQUEST_FILENAME} !-f
 	RewriteCond %{REQUEST_FILENAME} !-d
 	RewriteRule ^(.*)$ index.php [QSA,L]
+</IfModule>
+<ifModule mod_php5.c>
+	php_flag display_errors Off
 </IfModule>
\ No newline at end of file
diff --git a/examples/_006_crud/.htaccess b/examples/_006_crud/.htaccess
index b766fc6f0..22c547c25 100755
--- a/examples/_006_crud/.htaccess
+++ b/examples/_006_crud/.htaccess
@@ -5,4 +5,7 @@ DirectoryIndex index.php
 	RewriteCond %{REQUEST_FILENAME} !-f
 	RewriteCond %{REQUEST_FILENAME} !-d
 	RewriteRule ^(.*)$ index.php [QSA,L]
+</IfModule>
+<ifModule mod_php5.c>
+	php_flag display_errors Off
 </IfModule>
\ No newline at end of file

From b079fd29e553fa3d370f8814a09342e47b8fbdfa Mon Sep 17 00:00:00 2001
From: Luracast <arul@luracast.com>
Date: Fri, 23 Sep 2011 20:27:46 +0800
Subject: [PATCH 16/61] Fixed a bug in the minimal example that caused
 Math::add function to skip validation

---
 examples/_002_minimal/math.php  |   3 +-
 examples/resources/markdown.css | 403 --------------------------------
 2 files changed, 2 insertions(+), 404 deletions(-)
 delete mode 100755 examples/resources/markdown.css

diff --git a/examples/_002_minimal/math.php b/examples/_002_minimal/math.php
index 63eed0a43..c4f9a5524 100755
--- a/examples/_002_minimal/math.php
+++ b/examples/_002_minimal/math.php
@@ -1,9 +1,10 @@
 <?php
 class Math
 {
+    public $restler;
     function add ($n1 = 1, $n2 = 1)
     {
-        $this->_validate($n1, $n2);
+        $this->_validate(func_get_args());
         return $n1 + $n2;
     }
     function multiply ($n1 = 5, $n2 = 2)
diff --git a/examples/resources/markdown.css b/examples/resources/markdown.css
deleted file mode 100755
index be0ee0477..000000000
--- a/examples/resources/markdown.css
+++ /dev/null
@@ -1,403 +0,0 @@
-body {
-	margin: 0 auto;
-	font-family: Georgia, Palatino, serif;
-	color: #444444;
-	line-height: 1;
-	max-width: 960px;
-	padding: 0 30px 30px;
-	background-color: #E6E2DF;
-}
-
-h1,h2,h3,h4 {
-	color: #111111;
-	font-weight: 400;
-}
-
-h1,h2,h3,h4,h5,p {
-	margin-bottom: 24px;
-	padding: 0;
-}
-
-h1 {
-	font-size: 48px;
-}
-
-h2 {
-	font-size: 36px;
-	margin: 24px 0 6px;
-	margin-top: .5em !important;
-	border-top: 4px solid #E0E0E0 !important;
-	padding-top: .5em !important;
-}
-
-h3 {
-	font-size: 24px;
-}
-
-h4 {
-	font-size: 21px;
-}
-
-h5 {
-	font-size: 18px;
-}
-
-a {
-	color: #0099ff;
-	padding: 0;
-	vertical-align: baseline;
-	margin: 0;
-	text-decoration: none;
-}
-
-a:hover,a:active,a:focus {
-	background-color: #0099ff;
-	text-decoration: none;
-	color: white;
-}
-
-ul,ol {
-	padding: 4px 20px 0px;
-	margin: 0;
-}
-
-li {
-	line-height: 24px;
-}
-
-blockquote ul {
-	margin: 0 auto;
-	padding: 0;
-	overflow: hidden;
-}
-
-blockquote ul li {
-	text-align: left;
-	float: left;
-	list-style: none;
-	height: 30px;
-	width: 228px;
-}
-
-p,article.ul,article.ol {
-	font-size: 16px;
-	line-height: 24px;
-	max-width: 540px;
-}
-
-article pre {
-	padding: 13px;
-	/*
-	hyphens: all;
-	word-break-inside: hyphenate; 
-	overflow : hyphenate; 
-	hyphenate-character : "\2010"; 
-	white-space : pre-wrap;
-	white-space: -moz-pre-wrap;
-	white-space: -o-pre-wrap;
-	hyphenate-character: "\2010";
-	*/
-	background: #f3f3f3;
-	border-style: dashed;
-	border-color: #DADADA;
-	border-width: 1px;
-	max-width: 600 px;
-	overflow: auto;
-}
-
-code {
-	font-family: Consolas, Monaco, Andale Mono, monospace;
-	background: #ffffdd;
-	font-size: smaller;
-}
-
-pre code {
-	line-height: 1.5;
-	background-color: transparent;
-	font-size: 13px;
-}
-
-abbr {
-	border-radius: 3px;
-	-moz-border-radius: 3px;
-	-webkit-border-radius: 3px;
-	-khtml-border-radius: 3px;
-	background: blue;
-	opacity: 0.3;
-	color: white;
-	padding: 4px;
-	cursor: help;
-}
-
-abbr:HOVER {
-	opacity: 0.6;
-	background: black;
-}
-
-a abbr,a abbr:HOVER {
-	background: inherit;
-	color: inherit;
-	opacity: inherit;
-	border: inherit;
-	cursor: inherit;
-	padding: inherit;
-}
-
-aside {
-	display: block;
-	float: right;
-	width: 390px;
-}
-
-blockquote {
-	margin: 1em 2em;
-	max-width: 476px;
-	background: #ECEDE5;
-	border-left: 10px solid #ccc;
-	padding: .5em 10px;
-}
-
-blockquote p {
-	color: #666;
-	max-width: 460px;
-	margin: 0;
-}
-
-hr {
-	width: 540px;
-	text-align: left;
-	margin: 0 auto 0 0;
-	color: #999;
-}
-
-dl {
-	margin: 2em 0;
-	padding: 0;
-	max-width: 476px;
-}
-
-dt { /*
-	background-color: #131210;
-	font-weight: bold;
-	color: #959289;
-	text-align: center;
-	*/
-	font-family: Fixed, monospace;
-	padding: .5em;
-	border: 1px solid #131210;
-	border-right: 1px solid #131210;
-	border-top: 1px solid #131210;
-	padding: .5em;
-}
-
-dd {
-	margin: 0 0 1em 0;
-	/*
-	background: #DBD8D8;
-	font-style: italic;
-	text-align: center;
-	*/
-	padding: 1em .5em;
-	border-left: 1px solid #131210;
-	border-right: 1px solid #131210;
-	border-bottom: 1px solid #131210;
-}
-
-dd pre {
-	border: none;
-	background-color: transparent;
-}
-/**
- * Left side
- */
-#left {
-	position: fixed;
-	top: 0;
-	bottom: 0;
-	left: 0;
-	height: auto;
-	margin: 0;
-	padding: 7px;
-	overflow: auto;
-	background: black;
-	line-height: 1.6;
-}
-
-#left img {
-	margin-top: -10px;
-	margin-left: -10px;
-	margin-bottom: 0px;
-	padding-top: 0px;
-	padding-left: 0px;
-}
-
-#left h3 {
-	color: white;
-	border-bottom: 1px solid #aaaaaa;
-	border-top: 1px solid #aaaaaa;
-}
-
-#left a {
-	color: #bbccff;
-}
-
-#left a:hover {
-	color: white;
-}
-
-#left ul {
-	list-style: none;
-	padding: 0 0 0 0px;
-	margin: 0;
-	color: white;
-}
-
-#left li {
-	white-space: nowrap;
-}
-
-#left ul ul {
-	padding-left: 10px;
-}
-
-#left .active>a {
-	color: #333;
-	background: none;
-	font-weight: bold;
-}
-
-.collapsed {
-	display: none;
-}
-
-/**
- *	Right side
- */
-#right {
-	margin-left: 120px;
-	min-height: 600px;
-	background-repeat: no-repeat;
-	background-position: top right;
-	-moz-box-shadow: 5px 5px 5px #ccc;
-	-webkit-box-shadow: 5px 5px 5px #ccc;
-	box-shadow: 5px 5px 5px #ccc;
-}
-
-ol.toc li {
-	clear: left;
-	border-bottom: dashed 1px #aaa;
-	height: 1.05em;
-	margin-top: 20px;
-	position: relative;
-	margin-top: 20px;
-	height: 1.05em;
-}
-
-ol.toc li:HOVER {
-	color: #0099ff;
-	border-bottom: dashed 1px #0099ff;
-}
-
-ol.toc li:HOVER small {
-	color: #7FCCFF;
-}
-
-ol.toc a {
-	text-decoration: none;
-	color: inherit;
-}
-
-ol.toc right,ol.toc span {
-	background: #fff;
-	padding: 0 3px 0 0;
-	float: left;
-	position: absolute;
-	text-decoration: none;
-}
-
-ol.toc right {
-	padding: 0 0 0 3px;
-	right: 0;
-}
-
-ol.toc a:HOVER {
-	
-}
-
-ol.toc ol {
-	list-style: lower-roman;
-	margin: 1.5em 0 1em 5%;
-	padding: 0;
-	background: #fff;
-	float: left;
-	display: block;
-	width: 95%;
-}
-
-ol.toc small {
-	color: #a999a9;
-}
-
-article {
-	background: white;
-	position: relative;
-	padding: 25px 50px;
-	margin: 20px 0;
-	max-width: 550px;
-	/*
-	padding: 25px 210px 0 30px;
-	*/
-}
-
-article:after {
-	content: "";
-	position: absolute;
-	top: 0;
-	left: 0;
-	width: 0;
-	height: 0;
-	border-top: 10px solid #E6E2DF;
-	border-left: 10px solid #E6E2DF;
-	border-bottom: 10px solid #d9d3cf;
-	border-right: 10px solid #d9d3cf;
-}
-
-.menu {
-	margin: 0;
-	padding: 0;
-	width: px;
-	list-style: none;
-	background: rgb();
-}
-
-.menu li {
-	padding: 0;
-	margin: 0 0 1px 0;
-	height: 40px;
-	display: block;
-}
-
-.menu li a {
-	text-align: ;
-	height: 40px;
-	padding: 0px 25px;
-	font: 16px Verdana, Arial, Helvetica, sans-serif;
-	color: rgb();
-	display: block;
-	background: url('verMenuImages.png') 0px 0px no-repeat;
-	text-decoration: none;
-}
-
-.menu li a:hover {
-	background: url('verMenuImages.png') 0px -40px no-repeat;
-	color: rgb();
-}
-
-.menu li a.active,.menu li a.active:hover {
-	background: url('verMenuImages.png') 0px -80px no-repeat;
-	color: rgb();
-}
-
-.menu li a span {
-	line-height: 40px;
-}
\ No newline at end of file

From a752f6b61edbe0ca3f4d0b24655b7046ff955dcb Mon Sep 17 00:00:00 2001
From: Luracast <arul@luracast.com>
Date: Thu, 29 Sep 2011 11:39:24 +0800
Subject: [PATCH 17/61] API class was not getting an reference for Restler
 instance which is fixed in this patch and fixes #2 issue which required us to
 use spl_autoload or include_once to add the format file which is in the same
 folder as restler.php

---
 restler/restler.php          | 9 ++++++---
 restler_minified/restler.php | 4 ++--
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/restler/restler.php b/restler/restler.php
index d80989d73..5f36ae5b3 100644
--- a/restler/restler.php
+++ b/restler/restler.php
@@ -10,10 +10,10 @@
  * @copyright  2010 Luracast
  * @license    http://www.opensource.org/licenses/lgpl-license.php LGPL
  * @link       http://luracast.com/products/restler/
- * @version    2.0.1
+ * @version    2.0.2
  */
 class Restler {
-	const VERSION = '2.0.1';
+	const VERSION = '2.0.2';
 	/**
 	 * URL of the currently mapped service
 	 * @var string
@@ -339,6 +339,7 @@ public function handle () {
 				$this->service_method = $o->method_name;
 				if($o->method_flag==2)$o=unprotect($o);
 				$object = $this->service_class_instance = new $o->class_name();
+				$object->restler=$this;
 				if(method_exists($o->class_name, $pre_process)) {
 					call_user_func_array(array($object, $pre_process),
 					$o->arguments);
@@ -1179,7 +1180,9 @@ function autoload_formats($class_name)
 	if (file_exists($file))
 	{
 		require_once($file);
-	}
+	} elseif (file_exists("$class_name.php")) {
+        require_once ("$class_name.php");
+    }
 }
 spl_autoload_register('autoload_formats');
 /**
diff --git a/restler_minified/restler.php b/restler_minified/restler.php
index 8d2cc0a06..a9f9324ab 100644
--- a/restler_minified/restler.php
+++ b/restler_minified/restler.php
@@ -1,6 +1,6 @@
 <?php
- class Restler { const VERSION = '2.0.1'; public $url; public $request_method; public $request_format; public $request_data=array(); public $cache_dir; public $base_dir; public $response = 'DefaultResponse'; public $response_format; protected $production_mode; protected $routes= array(); protected $format_map = array(); protected $service_class_instance; protected $service_method; protected $auth_classes = array(); protected $error_classes = array(); private $codes = array( 100 => 'Continue', 101 => 'Switching Protocols', 200 => 'OK', 201 => 'Created', 202 => 'Accepted', 203 => 'Non-Authoritative Information', 204 => 'No Content', 205 => 'Reset Content', 206 => 'Partial Content', 300 => 'Multiple Choices', 301 => 'Moved Permanently', 302 => 'Found', 303 => 'See Other', 304 => 'Not Modified', 305 => 'Use Proxy', 306 => '(Unused)', 307 => 'Temporary Redirect', 400 => 'Bad Request', 401 => 'Unauthorized', 402 => 'Payment Required', 403 => 'Forbidden', 404 => 'Not Found', 405 => 'Method Not Allowed', 406 => 'Not Acceptable', 407 => 'Proxy Authentication Required', 408 => 'Request Timeout', 409 => 'Conflict', 410 => 'Gone', 411 => 'Length Required', 412 => 'Precondition Failed', 413 => 'Request Entity Too Large', 414 => 'Request-URI Too Long', 415 => 'Unsupported Media Type', 416 => 'Requested Range Not Satisfiable', 417 => 'Expectation Failed', 500 => 'Internal Server Error', 501 => 'Not Implemented', 502 => 'Bad Gateway', 503 => 'Service Unavailable', 504 => 'Gateway Timeout', 505 => 'HTTP Version Not Supported' ); protected $cached; public function __construct ($production_mode = FALSE) { $this->production_mode = $production_mode; $this->cache_dir = getcwd(); $this->base_dir = RESTLER_PATH; } public function __destruct () { if ($this->production_mode && !$this->cached) { $this->saveCache(); } } public function refreshCache () { $this->routes = array(); $this->cached = FALSE; } public function setSupportedFormats () { $args = func_get_args(); $extensions = array(); foreach ($args as $class_name) { if(!is_string($class_name) || !class_exists($class_name)){ throw new Exception("$class_name is not a vaild Format Class."); } $obj = new $class_name; if(! $obj instanceof iFormat){ throw new Exception('Invalid format class; must implement '. 'iFormat interface'); } foreach ($obj->getMIMEMap() as $extension => $mime) { if(!isset($this->format_map[$extension])) $this->format_map[$extension]=$class_name; if(!isset($this->format_map[$mime])) $this->format_map[$mime]=$class_name; $extensions[".$extension"]=TRUE; } } $this->format_map['default']=$args[0]; $this->format_map['extensions']=array_keys($extensions); } public function addAPIClass($class_name, $base_path = NULL) { if(!class_exists($class_name)){ throw new Exception("API class $class_name is missing."); } $this->loadCache(); if(!$this->cached){ if(is_null($base_path))$base_path=strtolower($class_name); $base_path = trim($base_path,'/'); if(strlen($base_path)>0)$base_path .= '/'; $this->generateMap($class_name, $base_path); } } public function addAuthenticationClass ($class_name, $base_path = NULL) { $this->auth_classes[] = $class_name; $this->addAPIClass($class_name, $base_path); } public function addErrorClass ($class_name) { $this->error_classes[] = $class_name; } public function handleError ($status_code, $error_message = NULL) { $method = "handle$status_code"; $handled = FALSE; foreach ($this->error_classes as $class_name) { if (method_exists($class_name, $method)) { $obj = new $class_name(); $obj->restler = $this; $obj->$method(); $handled = TRUE; } } if($handled)return; $message = $this->codes[$status_code] . (!$error_message ? '' : ': ' . $error_message); $this->setStatus($status_code); $this->sendData( call_user_func( array($this->response, '__formatError'), $status_code, $message) ); } public function handle () { if(empty($this->format_map))$this->setSupportedFormats('JsonFormat'); $this->url = $this->getPath(); $this->request_method = $this->getRequestMethod(); $this->response_format = $this->getResponseFormat(); $this->request_format = $this->getRequestFormat(); if(is_null($this->request_format)){ $this->request_format = $this->response_format; } if($this->request_method == 'PUT' || $this->request_method == 'POST'){ $this->request_data = $this->getRequestData(); } $o = $this->mapUrlToMethod(); if(!isset($o->class_name)){ $this->handleError(404); }else{ try { if($o->method_flag){ $auth_method = '__isAuthenticated'; if(!count($this->auth_classes))throw new RestException(401); foreach ($this->auth_classes as $auth_class) { $auth_obj = new $auth_class(); $auth_obj->restler=$this; $this->applyClassMetadata($auth_class, $auth_obj, $o); if (!method_exists($auth_obj, $auth_method)) { throw new RestException(401, 'Authentication Class '. 'should implement iAuthenticate'); }elseif(!$auth_obj->$auth_method()){ throw new RestException(401); } } } $this->applyClassMetadata(get_class($this->request_format), $this->request_format, $o); $pre_process = '_'.$this->request_format->getExtension().'_'. $o->method_name; $this->service_method = $o->method_name; if($o->method_flag==2)$o=unprotect($o); $object = $this->service_class_instance = new $o->class_name(); if(method_exists($o->class_name, $pre_process)) { call_user_func_array(array($object, $pre_process), $o->arguments); } switch ($o->method_flag) { case 3: $reflection_method = new ReflectionMethod($object, $o->method_name); $reflection_method->setAccessible(TRUE); $result = $reflection_method->invokeArgs($object, $o->arguments); break; case 2: case 1: default: $result = call_user_func_array(array($object, $o->method_name), $o->arguments); } } catch (RestException $e) { $this->handleError($e->getCode(), $e->getMessage()); } } if (isset($result) && $result !== NULL) { $this->sendData($result); } } public function sendData($data) { $data = $this->response_format->encode($data, !$this->production_mode); $post_process = '_'.$this->service_method .'_'. $this->response_format->getExtension(); if(isset($this->service_class_instance) && method_exists($this->service_class_instance,$post_process)){ $data = call_user_func(array($this->service_class_instance, $post_process), $data); } header("Cache-Control: no-cache, must-revalidate"); header("Expires: 0"); header('Content-Type: ' . $this->response_format->getMIME()); header("X-Powered-By: Luracast Restler v".Restler::VERSION); die($data); } public function setStatus($code) { header("{$_SERVER['SERVER_PROTOCOL']} $code ". $this->codes[strval($code)]); } public function removeCommonPath($first, $second, $char='/'){ $first = explode($char, $first); $second = explode($char, $second); while (count($second)){ if($first[0]==$second[0]){ array_shift($first); } else break; array_shift($second); } return implode($char, $first); } public function saveCache() { $file = $this->cache_dir . '/routes.php'; $s = '$o=array();'.PHP_EOL; foreach ($this->routes as $key => $value) { $s .= PHP_EOL.PHP_EOL.PHP_EOL."############### $key ###############" .PHP_EOL.PHP_EOL; $s .= '$o[\''.$key.'\']=array();'; foreach ($value as $ke => $va) { $s .= PHP_EOL.PHP_EOL."#==== $key $ke".PHP_EOL.PHP_EOL; $s .= '$o[\''.$key.'\'][\''.$ke.'\']='.str_replace(PHP_EOL, PHP_EOL."\t", var_export($va, TRUE)).';'; } } $s .= PHP_EOL.'return $o;'; $r=@file_put_contents($file, "<?php $s"); @chmod($file, 0777); if($r===FALSE)throw new Exception( "The cache directory located at '$this->cache_dir' needs to have ". "the permissions set to read/write/execute for everyone in order ". "to save cache and improve performance."); } protected function getPath () { $path = urldecode($this->removeCommonPath($_SERVER['REQUEST_URI'], $_SERVER['SCRIPT_NAME'])); $path = preg_replace('/(\/*\?.*$)|(\/$)/', '', $path); $path = str_replace($this->format_map['extensions'], '', $path); return $path; } protected function getRequestMethod () { $method = $_SERVER['REQUEST_METHOD']; if (isset($_SERVER['HTTP_X_HTTP_METHOD_OVERRIDE'])){ $method = $_SERVER['HTTP_X_HTTP_METHOD_OVERRIDE']; } return $method; } protected function getRequestFormat () { $format=NULL; if(isset($_SERVER['CONTENT_TYPE'])){ $mime = explode(';', $_SERVER['CONTENT_TYPE']); $mime = $mime[0]; if($mime==UrlEncodedFormat::MIME){ $format = new UrlEncodedFormat(); }else{ if(isset($this->format_map[$mime])){ $format = $this->format_map[$mime]; $format = is_string($format) ? new $format: $format; $format->setMIME($mime); } } } return $format; } protected function getResponseFormat () { $format; $extension = explode('.', parse_url($_SERVER['REQUEST_URI'], PHP_URL_PATH)); $extension = array_pop($extension); if($extension && isset($this->format_map[$extension])){ $format = $this->format_map[$extension]; $format = is_string($format) ? new $format: $format; $format->setExtension($extension); return $format; } if(isset($_SERVER['HTTP_ACCEPT'])){ $accepts = explode(',', $_SERVER['HTTP_ACCEPT']); foreach ($accepts as $accept) { if($extension && isset($this->format_map[$accept])){ $format = $this->format_map[$accept]; $format = is_string($format) ? new $format: $format; $format->setMIME($accept); return $format; } } } $format = $this->format_map['default']; return is_string($format) ? new $format: $format; } protected function getRequestData() { try{ $r = file_get_contents('php://input'); if(is_null($r))return $_GET; $r =$this->request_format->decode($r); return is_null($r) ? array(): $r; } catch (RestException $e) { $this->handleError($e->getCode(), $e->getMessage()); } } protected function mapUrlToMethod () { if(!isset($this->routes[$this->request_method])){ return array(); } $urls = $this->routes[$this->request_method]; if(!$urls)return array(); $found = FALSE; $this->request_data += $_GET; $params = array('request_data'=>$this->request_data); $params += $this->request_data; foreach ($urls as $url => $call) { $call = (object)$call; if(strstr($url, ':')){ $regex = preg_replace('/\\\:([^\/]+)/', '(?P<$1>[^/]+)', preg_quote($url)); if (preg_match(":^$regex$:", $this->url, $matches)) { foreach ($matches as $arg => $match) { if (isset($call->arguments[$arg])){ $params[$arg] = $match; } } $found = TRUE; break; } }elseif ($url == $this->url){ $found = TRUE; break; } } if($found){ $p = $call->defaults; foreach ($call->arguments as $key => $value) { if(isset($params[$key]))$p[$value] = $params[$key]; } $call->arguments=$p; return $call; } } protected function applyClassMetadata($class_name, $instance, $method_info){ if(isset($method_info->metadata[$class_name]) && is_array($method_info->metadata[$class_name])){ foreach ($method_info->metadata[$class_name] as $property => $value){ if(property_exists($class_name, $property)){ $reflection_property = new ReflectionProperty($class_name, $property); $reflection_property->setValue($instance, $value); } } } } protected function loadCache() { if ($this->cached !== NULL) { return; } $file = $this->cache_dir . '/routes.php'; $this->cached = FALSE; if ($this->production_mode) { if (file_exists($file)) { $routes = include($file); } if (isset($routes) && is_array($routes)) { $this->routes = $routes; $this->cached = TRUE; } } else { } } protected function generateMap ($class_name, $base_path = "") { $reflection = new ReflectionClass($class_name); $class_metadata = parse_doc($reflection->getDocComment()); $methods = $reflection->getMethods( ReflectionMethod::IS_PUBLIC + ReflectionMethod::IS_PROTECTED); foreach ($methods as $method) { $doc = $method->getDocComment(); $arguments = array(); $defaults = array(); $metadata = $class_metadata+parse_doc($doc); $params = $method->getParameters(); $position=0; foreach ($params as $param){ $arguments[$param->getName()] = $position; $defaults[$position] = $param->isDefaultValueAvailable() ? $param->getDefaultValue() : NULL; $position++; } $method_flag = $method->isProtected() ? (isRestlerCompatibilityModeEnabled() ? 2 : 3) : (isset($metadata['protected']) ? 1 : 0); $call = array( 'class_name'=>$class_name, 'method_name'=>$method->getName(), 'arguments'=>$arguments, 'defaults'=>$defaults, 'metadata'=>$metadata, 'method_flag'=>$method_flag ); $method_url = strtolower($method->getName()); if (preg_match_all( '/@url\s+(GET|POST|PUT|DELETE|HEAD|OPTIONS)[ \t]*\/?(\S*)/s', $doc, $matches, PREG_SET_ORDER)) { foreach ($matches as $match) { $http_method = $match[1]; $url = rtrim($base_path . $match[2],'/'); $this->routes[$http_method][$url] = $call; } }elseif($method_url[0] != '_'){ if (preg_match_all('/^(GET|POST|PUT|DELETE|HEAD|OPTIONS)/i', $method_url, $matches)) { $http_method = strtoupper($matches[0][0]); $method_url = substr($method_url, strlen($http_method)); }else{ $http_method = 'GET'; } $url = $base_path. ($method_url=='index' || $method_url=='default' ? '' : $method_url); $url = rtrim($url,'/'); $this->routes[$http_method][$url] = $call; foreach ($params as $param){ if($param->getName()=='request_data'){ break; } $url .= $url=='' ? ':' : '/:'; $url .= $param->getName(); $this->routes[$http_method][$url] = $call; } } } } } if(version_compare(PHP_VERSION, '5.3.0') < 0){ require_once 'compat.php'; } class RestException extends Exception { public function __construct($http_status_code, $error_message = NULL) { parent::__construct($error_message, $http_status_code); } } interface iRespond { public function __formatResponse($result); public function __formatError($status_code, $message); } class DefaultResponse implements iRespond { function __formatResponse($result) { return $result; } function __formatError($statusCode, $message) { return array('error' => array('code' => $statusCode, 'message' => $message)); } } interface iAuthenticate { public function __isAuthenticated(); } interface iFormat { public function getMIMEMap(); public function setMIME($mime); public function getMIME(); public function setExtension($extension); public function getExtension(); public function encode($data, $human_readable=FALSE); public function decode($data); } class UrlEncodedFormat implements iFormat { const MIME = 'application/x-www-form-urlencoded'; const EXTENSION = 'post'; public function getMIMEMap() { return array(UrlEncodedFormat::EXTENSION=>UrlEncodedFormat::MIME); } public function getMIME(){ return UrlEncodedFormat::MIME; } public function getExtension(){ return UrlEncodedFormat::EXTENSION; } public function setMIME($mime){ } public function setExtension($extension){ } public function encode($data, $human_readable=FALSE){ return http_build_query($data); } public function decode($data){ parse_str($data,$r); return $r; } public function __toString(){ return $this->getExtension(); } } class JsonFormat implements iFormat { const MIME ='application/json'; const EXTENSION = 'json'; public function getMIMEMap() { return array(JsonFormat::EXTENSION=>JsonFormat::MIME); } public function getMIME(){ return JsonFormat::MIME; } public function getExtension(){ return JsonFormat::EXTENSION; } public function setMIME($mime){ } public function setExtension($extension){ } public function encode($data, $human_readable=FALSE){ return $human_readable ? $this->json_format(json_encode(object_to_array($data))) : json_encode(object_to_array($data)); } public function decode($data){ return object_to_array(json_decode($data)); } private function json_format($json) { $tab = "  "; $new_json = ""; $indent_level = 0; $in_string = FALSE; $len = strlen($json); for($c = 0; $c < $len; $c++) { $char = $json[$c]; switch($char) { case '{': case '[': if(!$in_string) { $new_json .= $char . "\n" . str_repeat($tab, $indent_level+1); $indent_level++; } else { $new_json .= $char; } break; case '}': case ']': if(!$in_string) { $indent_level--; $new_json .= "\n".str_repeat($tab, $indent_level).$char; } else { $new_json .= $char; } break; case ',': if(!$in_string) { $new_json .= ",\n" . str_repeat($tab, $indent_level); } else { $new_json .= $char; } break; case ':': if(!$in_string) { $new_json .= ": "; } else { $new_json .= $char; } break; case '"': if($c==0){ $in_string = TRUE; }elseif($c > 0 && $json[$c-1] != '\\') { $in_string = !$in_string; } default: $new_json .= $char; break; } } return $new_json; } public function __toString(){ return $this->getExtension(); } } class DocParser { private $params=array(); function parse($doc='') { if($doc==''){ return $this->params; } if(preg_match('#^/\*\*(.*)\*/#s', $doc, $comment) === false) return $this->params; $comment = trim($comment[1]); if(preg_match_all('#^\s*\*(.*)#m', $comment, $lines) === false) return $this->params; $this->parseLines($lines[1]); return $this->params; } private function parseLines($lines) { foreach($lines as $line) { $parsedLine = $this->parseLine($line); if($parsedLine === false && !isset($this->params['description'])) { if(isset($desc)){ $this->params['description'] = implode(PHP_EOL, $desc); } $desc = array(); } elseif($parsedLine !== false) { $desc[] = $parsedLine; } } $desc = implode(' ', $desc); if(!empty($desc))$this->params['long_description'] = $desc; } private function parseLine($line) { $line = trim($line); if(empty($line)) return false; if(strpos($line, '@') === 0) { if(strpos($line, ' ')>0){ $param = substr($line, 1, strpos($line, ' ') - 1); $value = substr($line, strlen($param) + 2); }else{ $param = substr($line, 1); $value = ''; } if($this->setParam($param, $value)) return false; } return $line; } private function setParam($param, $value) { if($param == 'param' || $param == 'return') $value = $this->formatParamOrReturn($value); if($param == 'class') list($param, $value) = $this->formatClass($value); if(empty($this->params[$param])) { $this->params[$param] = $value; } else if($param == 'param'){ $arr = array($this->params[$param], $value); $this->params[$param] = $arr; } else { $this->params[$param] = $value + $this->params[$param]; } return true; } private function formatClass($value) { $r = preg_split("[\(|\)]",$value); if(is_array($r)){ $param = $r[0]; parse_str($r[1],$value); foreach ($value as $key => $val) { $val = explode(',', $val); if(count($val)>1)$value[$key]=$val; } }else{ $param='Unknown'; } return array($param, $value); } private function formatParamOrReturn($string) { $pos = strpos($string, ' '); $type = substr($string, 0, $pos); return '(' . $type . ')' . substr($string, $pos+1); } } function parse_doc($php_doc_comment){ $p = new DocParser(); return $p->parse($php_doc_comment); $p = new Parser($php_doc_comment); return $p; $php_doc_comment = preg_replace("/(^[\\s]*\\/\\*\\*)
+ class Restler { const VERSION = '2.0.2'; public $url; public $request_method; public $request_format; public $request_data=array(); public $cache_dir; public $base_dir; public $response = 'DefaultResponse'; public $response_format; protected $production_mode; protected $routes= array(); protected $format_map = array(); protected $service_class_instance; protected $service_method; protected $auth_classes = array(); protected $error_classes = array(); private $codes = array( 100 => 'Continue', 101 => 'Switching Protocols', 200 => 'OK', 201 => 'Created', 202 => 'Accepted', 203 => 'Non-Authoritative Information', 204 => 'No Content', 205 => 'Reset Content', 206 => 'Partial Content', 300 => 'Multiple Choices', 301 => 'Moved Permanently', 302 => 'Found', 303 => 'See Other', 304 => 'Not Modified', 305 => 'Use Proxy', 306 => '(Unused)', 307 => 'Temporary Redirect', 400 => 'Bad Request', 401 => 'Unauthorized', 402 => 'Payment Required', 403 => 'Forbidden', 404 => 'Not Found', 405 => 'Method Not Allowed', 406 => 'Not Acceptable', 407 => 'Proxy Authentication Required', 408 => 'Request Timeout', 409 => 'Conflict', 410 => 'Gone', 411 => 'Length Required', 412 => 'Precondition Failed', 413 => 'Request Entity Too Large', 414 => 'Request-URI Too Long', 415 => 'Unsupported Media Type', 416 => 'Requested Range Not Satisfiable', 417 => 'Expectation Failed', 500 => 'Internal Server Error', 501 => 'Not Implemented', 502 => 'Bad Gateway', 503 => 'Service Unavailable', 504 => 'Gateway Timeout', 505 => 'HTTP Version Not Supported' ); protected $cached; public function __construct ($production_mode = FALSE) { $this->production_mode = $production_mode; $this->cache_dir = getcwd(); $this->base_dir = RESTLER_PATH; } public function __destruct () { if ($this->production_mode && !$this->cached) { $this->saveCache(); } } public function refreshCache () { $this->routes = array(); $this->cached = FALSE; } public function setSupportedFormats () { $args = func_get_args(); $extensions = array(); foreach ($args as $class_name) { if(!is_string($class_name) || !class_exists($class_name)){ throw new Exception("$class_name is not a vaild Format Class."); } $obj = new $class_name; if(! $obj instanceof iFormat){ throw new Exception('Invalid format class; must implement '. 'iFormat interface'); } foreach ($obj->getMIMEMap() as $extension => $mime) { if(!isset($this->format_map[$extension])) $this->format_map[$extension]=$class_name; if(!isset($this->format_map[$mime])) $this->format_map[$mime]=$class_name; $extensions[".$extension"]=TRUE; } } $this->format_map['default']=$args[0]; $this->format_map['extensions']=array_keys($extensions); } public function addAPIClass($class_name, $base_path = NULL) { if(!class_exists($class_name)){ throw new Exception("API class $class_name is missing."); } $this->loadCache(); if(!$this->cached){ if(is_null($base_path))$base_path=strtolower($class_name); $base_path = trim($base_path,'/'); if(strlen($base_path)>0)$base_path .= '/'; $this->generateMap($class_name, $base_path); } } public function addAuthenticationClass ($class_name, $base_path = NULL) { $this->auth_classes[] = $class_name; $this->addAPIClass($class_name, $base_path); } public function addErrorClass ($class_name) { $this->error_classes[] = $class_name; } public function handleError ($status_code, $error_message = NULL) { $method = "handle$status_code"; $handled = FALSE; foreach ($this->error_classes as $class_name) { if (method_exists($class_name, $method)) { $obj = new $class_name(); $obj->restler = $this; $obj->$method(); $handled = TRUE; } } if($handled)return; $message = $this->codes[$status_code] . (!$error_message ? '' : ': ' . $error_message); $this->setStatus($status_code); $this->sendData( call_user_func( array($this->response, '__formatError'), $status_code, $message) ); } public function handle () { if(empty($this->format_map))$this->setSupportedFormats('JsonFormat'); $this->url = $this->getPath(); $this->request_method = $this->getRequestMethod(); $this->response_format = $this->getResponseFormat(); $this->request_format = $this->getRequestFormat(); if(is_null($this->request_format)){ $this->request_format = $this->response_format; } if($this->request_method == 'PUT' || $this->request_method == 'POST'){ $this->request_data = $this->getRequestData(); } $o = $this->mapUrlToMethod(); if(!isset($o->class_name)){ $this->handleError(404); }else{ try { if($o->method_flag){ $auth_method = '__isAuthenticated'; if(!count($this->auth_classes))throw new RestException(401); foreach ($this->auth_classes as $auth_class) { $auth_obj = new $auth_class(); $auth_obj->restler=$this; $this->applyClassMetadata($auth_class, $auth_obj, $o); if (!method_exists($auth_obj, $auth_method)) { throw new RestException(401, 'Authentication Class '. 'should implement iAuthenticate'); }elseif(!$auth_obj->$auth_method()){ throw new RestException(401); } } } $this->applyClassMetadata(get_class($this->request_format), $this->request_format, $o); $pre_process = '_'.$this->request_format->getExtension().'_'. $o->method_name; $this->service_method = $o->method_name; if($o->method_flag==2)$o=unprotect($o); $object = $this->service_class_instance = new $o->class_name(); $object->restler=$this; if(method_exists($o->class_name, $pre_process)) { call_user_func_array(array($object, $pre_process), $o->arguments); } switch ($o->method_flag) { case 3: $reflection_method = new ReflectionMethod($object, $o->method_name); $reflection_method->setAccessible(TRUE); $result = $reflection_method->invokeArgs($object, $o->arguments); break; case 2: case 1: default: $result = call_user_func_array(array($object, $o->method_name), $o->arguments); } } catch (RestException $e) { $this->handleError($e->getCode(), $e->getMessage()); } } if (isset($result) && $result !== NULL) { $this->sendData($result); } } public function sendData($data) { $data = $this->response_format->encode($data, !$this->production_mode); $post_process = '_'.$this->service_method .'_'. $this->response_format->getExtension(); if(isset($this->service_class_instance) && method_exists($this->service_class_instance,$post_process)){ $data = call_user_func(array($this->service_class_instance, $post_process), $data); } header("Cache-Control: no-cache, must-revalidate"); header("Expires: 0"); header('Content-Type: ' . $this->response_format->getMIME()); header("X-Powered-By: Luracast Restler v".Restler::VERSION); die($data); } public function setStatus($code) { header("{$_SERVER['SERVER_PROTOCOL']} $code ". $this->codes[strval($code)]); } public function removeCommonPath($first, $second, $char='/'){ $first = explode($char, $first); $second = explode($char, $second); while (count($second)){ if($first[0]==$second[0]){ array_shift($first); } else break; array_shift($second); } return implode($char, $first); } public function saveCache() { $file = $this->cache_dir . '/routes.php'; $s = '$o=array();'.PHP_EOL; foreach ($this->routes as $key => $value) { $s .= PHP_EOL.PHP_EOL.PHP_EOL."############### $key ###############" .PHP_EOL.PHP_EOL; $s .= '$o[\''.$key.'\']=array();'; foreach ($value as $ke => $va) { $s .= PHP_EOL.PHP_EOL."#==== $key $ke".PHP_EOL.PHP_EOL; $s .= '$o[\''.$key.'\'][\''.$ke.'\']='.str_replace(PHP_EOL, PHP_EOL."\t", var_export($va, TRUE)).';'; } } $s .= PHP_EOL.'return $o;'; $r=@file_put_contents($file, "<?php $s"); @chmod($file, 0777); if($r===FALSE)throw new Exception( "The cache directory located at '$this->cache_dir' needs to have ". "the permissions set to read/write/execute for everyone in order ". "to save cache and improve performance."); } protected function getPath () { $path = urldecode($this->removeCommonPath($_SERVER['REQUEST_URI'], $_SERVER['SCRIPT_NAME'])); $path = preg_replace('/(\/*\?.*$)|(\/$)/', '', $path); $path = str_replace($this->format_map['extensions'], '', $path); return $path; } protected function getRequestMethod () { $method = $_SERVER['REQUEST_METHOD']; if (isset($_SERVER['HTTP_X_HTTP_METHOD_OVERRIDE'])){ $method = $_SERVER['HTTP_X_HTTP_METHOD_OVERRIDE']; } return $method; } protected function getRequestFormat () { $format=NULL; if(isset($_SERVER['CONTENT_TYPE'])){ $mime = explode(';', $_SERVER['CONTENT_TYPE']); $mime = $mime[0]; if($mime==UrlEncodedFormat::MIME){ $format = new UrlEncodedFormat(); }else{ if(isset($this->format_map[$mime])){ $format = $this->format_map[$mime]; $format = is_string($format) ? new $format: $format; $format->setMIME($mime); } } } return $format; } protected function getResponseFormat () { $format; $extension = explode('.', parse_url($_SERVER['REQUEST_URI'], PHP_URL_PATH)); $extension = array_pop($extension); if($extension && isset($this->format_map[$extension])){ $format = $this->format_map[$extension]; $format = is_string($format) ? new $format: $format; $format->setExtension($extension); return $format; } if(isset($_SERVER['HTTP_ACCEPT'])){ $accepts = explode(',', $_SERVER['HTTP_ACCEPT']); foreach ($accepts as $accept) { if($extension && isset($this->format_map[$accept])){ $format = $this->format_map[$accept]; $format = is_string($format) ? new $format: $format; $format->setMIME($accept); return $format; } } } $format = $this->format_map['default']; return is_string($format) ? new $format: $format; } protected function getRequestData() { try{ $r = file_get_contents('php://input'); if(is_null($r))return $_GET; $r =$this->request_format->decode($r); return is_null($r) ? array(): $r; } catch (RestException $e) { $this->handleError($e->getCode(), $e->getMessage()); } } protected function mapUrlToMethod () { if(!isset($this->routes[$this->request_method])){ return array(); } $urls = $this->routes[$this->request_method]; if(!$urls)return array(); $found = FALSE; $this->request_data += $_GET; $params = array('request_data'=>$this->request_data); $params += $this->request_data; foreach ($urls as $url => $call) { $call = (object)$call; if(strstr($url, ':')){ $regex = preg_replace('/\\\:([^\/]+)/', '(?P<$1>[^/]+)', preg_quote($url)); if (preg_match(":^$regex$:", $this->url, $matches)) { foreach ($matches as $arg => $match) { if (isset($call->arguments[$arg])){ $params[$arg] = $match; } } $found = TRUE; break; } }elseif ($url == $this->url){ $found = TRUE; break; } } if($found){ $p = $call->defaults; foreach ($call->arguments as $key => $value) { if(isset($params[$key]))$p[$value] = $params[$key]; } $call->arguments=$p; return $call; } } protected function applyClassMetadata($class_name, $instance, $method_info){ if(isset($method_info->metadata[$class_name]) && is_array($method_info->metadata[$class_name])){ foreach ($method_info->metadata[$class_name] as $property => $value){ if(property_exists($class_name, $property)){ $reflection_property = new ReflectionProperty($class_name, $property); $reflection_property->setValue($instance, $value); } } } } protected function loadCache() { if ($this->cached !== NULL) { return; } $file = $this->cache_dir . '/routes.php'; $this->cached = FALSE; if ($this->production_mode) { if (file_exists($file)) { $routes = include($file); } if (isset($routes) && is_array($routes)) { $this->routes = $routes; $this->cached = TRUE; } } else { } } protected function generateMap ($class_name, $base_path = "") { $reflection = new ReflectionClass($class_name); $class_metadata = parse_doc($reflection->getDocComment()); $methods = $reflection->getMethods( ReflectionMethod::IS_PUBLIC + ReflectionMethod::IS_PROTECTED); foreach ($methods as $method) { $doc = $method->getDocComment(); $arguments = array(); $defaults = array(); $metadata = $class_metadata+parse_doc($doc); $params = $method->getParameters(); $position=0; foreach ($params as $param){ $arguments[$param->getName()] = $position; $defaults[$position] = $param->isDefaultValueAvailable() ? $param->getDefaultValue() : NULL; $position++; } $method_flag = $method->isProtected() ? (isRestlerCompatibilityModeEnabled() ? 2 : 3) : (isset($metadata['protected']) ? 1 : 0); $call = array( 'class_name'=>$class_name, 'method_name'=>$method->getName(), 'arguments'=>$arguments, 'defaults'=>$defaults, 'metadata'=>$metadata, 'method_flag'=>$method_flag ); $method_url = strtolower($method->getName()); if (preg_match_all( '/@url\s+(GET|POST|PUT|DELETE|HEAD|OPTIONS)[ \t]*\/?(\S*)/s', $doc, $matches, PREG_SET_ORDER)) { foreach ($matches as $match) { $http_method = $match[1]; $url = rtrim($base_path . $match[2],'/'); $this->routes[$http_method][$url] = $call; } }elseif($method_url[0] != '_'){ if (preg_match_all('/^(GET|POST|PUT|DELETE|HEAD|OPTIONS)/i', $method_url, $matches)) { $http_method = strtoupper($matches[0][0]); $method_url = substr($method_url, strlen($http_method)); }else{ $http_method = 'GET'; } $url = $base_path. ($method_url=='index' || $method_url=='default' ? '' : $method_url); $url = rtrim($url,'/'); $this->routes[$http_method][$url] = $call; foreach ($params as $param){ if($param->getName()=='request_data'){ break; } $url .= $url=='' ? ':' : '/:'; $url .= $param->getName(); $this->routes[$http_method][$url] = $call; } } } } } if(version_compare(PHP_VERSION, '5.3.0') < 0){ require_once 'compat.php'; } class RestException extends Exception { public function __construct($http_status_code, $error_message = NULL) { parent::__construct($error_message, $http_status_code); } } interface iRespond { public function __formatResponse($result); public function __formatError($status_code, $message); } class DefaultResponse implements iRespond { function __formatResponse($result) { return $result; } function __formatError($statusCode, $message) { return array('error' => array('code' => $statusCode, 'message' => $message)); } } interface iAuthenticate { public function __isAuthenticated(); } interface iFormat { public function getMIMEMap(); public function setMIME($mime); public function getMIME(); public function setExtension($extension); public function getExtension(); public function encode($data, $human_readable=FALSE); public function decode($data); } class UrlEncodedFormat implements iFormat { const MIME = 'application/x-www-form-urlencoded'; const EXTENSION = 'post'; public function getMIMEMap() { return array(UrlEncodedFormat::EXTENSION=>UrlEncodedFormat::MIME); } public function getMIME(){ return UrlEncodedFormat::MIME; } public function getExtension(){ return UrlEncodedFormat::EXTENSION; } public function setMIME($mime){ } public function setExtension($extension){ } public function encode($data, $human_readable=FALSE){ return http_build_query($data); } public function decode($data){ parse_str($data,$r); return $r; } public function __toString(){ return $this->getExtension(); } } class JsonFormat implements iFormat { const MIME ='application/json'; const EXTENSION = 'json'; public function getMIMEMap() { return array(JsonFormat::EXTENSION=>JsonFormat::MIME); } public function getMIME(){ return JsonFormat::MIME; } public function getExtension(){ return JsonFormat::EXTENSION; } public function setMIME($mime){ } public function setExtension($extension){ } public function encode($data, $human_readable=FALSE){ return $human_readable ? $this->json_format(json_encode(object_to_array($data))) : json_encode(object_to_array($data)); } public function decode($data){ return object_to_array(json_decode($data)); } private function json_format($json) { $tab = "  "; $new_json = ""; $indent_level = 0; $in_string = FALSE; $len = strlen($json); for($c = 0; $c < $len; $c++) { $char = $json[$c]; switch($char) { case '{': case '[': if(!$in_string) { $new_json .= $char . "\n" . str_repeat($tab, $indent_level+1); $indent_level++; } else { $new_json .= $char; } break; case '}': case ']': if(!$in_string) { $indent_level--; $new_json .= "\n".str_repeat($tab, $indent_level).$char; } else { $new_json .= $char; } break; case ',': if(!$in_string) { $new_json .= ",\n" . str_repeat($tab, $indent_level); } else { $new_json .= $char; } break; case ':': if(!$in_string) { $new_json .= ": "; } else { $new_json .= $char; } break; case '"': if($c==0){ $in_string = TRUE; }elseif($c > 0 && $json[$c-1] != '\\') { $in_string = !$in_string; } default: $new_json .= $char; break; } } return $new_json; } public function __toString(){ return $this->getExtension(); } } class DocParser { private $params=array(); function parse($doc='') { if($doc==''){ return $this->params; } if(preg_match('#^/\*\*(.*)\*/#s', $doc, $comment) === false) return $this->params; $comment = trim($comment[1]); if(preg_match_all('#^\s*\*(.*)#m', $comment, $lines) === false) return $this->params; $this->parseLines($lines[1]); return $this->params; } private function parseLines($lines) { foreach($lines as $line) { $parsedLine = $this->parseLine($line); if($parsedLine === false && !isset($this->params['description'])) { if(isset($desc)){ $this->params['description'] = implode(PHP_EOL, $desc); } $desc = array(); } elseif($parsedLine !== false) { $desc[] = $parsedLine; } } $desc = implode(' ', $desc); if(!empty($desc))$this->params['long_description'] = $desc; } private function parseLine($line) { $line = trim($line); if(empty($line)) return false; if(strpos($line, '@') === 0) { if(strpos($line, ' ')>0){ $param = substr($line, 1, strpos($line, ' ') - 1); $value = substr($line, strlen($param) + 2); }else{ $param = substr($line, 1); $value = ''; } if($this->setParam($param, $value)) return false; } return $line; } private function setParam($param, $value) { if($param == 'param' || $param == 'return') $value = $this->formatParamOrReturn($value); if($param == 'class') list($param, $value) = $this->formatClass($value); if(empty($this->params[$param])) { $this->params[$param] = $value; } else if($param == 'param'){ $arr = array($this->params[$param], $value); $this->params[$param] = $arr; } else { $this->params[$param] = $value + $this->params[$param]; } return true; } private function formatClass($value) { $r = preg_split("[\(|\)]",$value); if(is_array($r)){ $param = $r[0]; parse_str($r[1],$value); foreach ($value as $key => $val) { $val = explode(',', $val); if(count($val)>1)$value[$key]=$val; } }else{ $param='Unknown'; } return array($param, $value); } private function formatParamOrReturn($string) { $pos = strpos($string, ' '); $type = substr($string, 0, $pos); return '(' . $type . ')' . substr($string, $pos+1); } } function parse_doc($php_doc_comment){ $p = new DocParser(); return $p->parse($php_doc_comment); $p = new Parser($php_doc_comment); return $p; $php_doc_comment = preg_replace("/(^[\\s]*\\/\\*\\*)
                                  |(^[\\s]\\*\\/)
                                  |(^[\\s]*\\*?\\s)
                                  |(^[\\s]*)
-                                 |(^[\\t]*)/ixm", "", $php_doc_comment); $php_doc_comment = str_replace("\r", "", $php_doc_comment); $php_doc_comment = preg_replace("/([\\t])+/", "\t", $php_doc_comment); return explode("\n", $php_doc_comment); $php_doc_comment = trim(preg_replace('/\r?\n *\* */', ' ', $php_doc_comment)); return $php_doc_comment; preg_match_all('/@([a-z]+)\s+(.*?)\s*(?=$|@[a-z]+\s)/s', $php_doc_comment, $matches); return array_combine($matches[1], $matches[2]); } function object_to_array($object, $utf_encode=TRUE) { if(is_array($object) || is_object($object)) { $array = array(); foreach($object as $key => $value) { $value = object_to_array($value, $utf_encode); if($utf_encode && is_string($value)){ $value = utf8_encode($value); } $array[$key] = $value; } return $array; } return $object; } function autoload_formats($class_name) { $class_name=strtolower($class_name); $file = RESTLER_PATH."/$class_name/$class_name.php"; if (file_exists($file)) { require_once($file); } } spl_autoload_register('autoload_formats'); if(!function_exists('isRestlerCompatibilityModeEnabled')){ function isRestlerCompatibilityModeEnabled(){ return FALSE; } } define('RESTLER_PATH', dirname(__FILE__));
\ No newline at end of file
+                                 |(^[\\t]*)/ixm", "", $php_doc_comment); $php_doc_comment = str_replace("\r", "", $php_doc_comment); $php_doc_comment = preg_replace("/([\\t])+/", "\t", $php_doc_comment); return explode("\n", $php_doc_comment); $php_doc_comment = trim(preg_replace('/\r?\n *\* */', ' ', $php_doc_comment)); return $php_doc_comment; preg_match_all('/@([a-z]+)\s+(.*?)\s*(?=$|@[a-z]+\s)/s', $php_doc_comment, $matches); return array_combine($matches[1], $matches[2]); } function object_to_array($object, $utf_encode=TRUE) { if(is_array($object) || is_object($object)) { $array = array(); foreach($object as $key => $value) { $value = object_to_array($value, $utf_encode); if($utf_encode && is_string($value)){ $value = utf8_encode($value); } $array[$key] = $value; } return $array; } return $object; } function autoload_formats($class_name) { $class_name=strtolower($class_name); $file = RESTLER_PATH."/$class_name/$class_name.php"; if (file_exists($file)) { require_once($file); } elseif (file_exists("$class_name.php")) { require_once ("$class_name.php"); } } spl_autoload_register('autoload_formats'); if(!function_exists('isRestlerCompatibilityModeEnabled')){ function isRestlerCompatibilityModeEnabled(){ return FALSE; } } define('RESTLER_PATH', dirname(__FILE__));
\ No newline at end of file

From 9746eb821561013fb961f79eefbc135ab74a2b13 Mon Sep 17 00:00:00 2001
From: Luracast <arul@luracast.com>
Date: Thu, 29 Sep 2011 18:32:32 +0800
Subject: [PATCH 18/61] deleting .svn in plistformat folder. It fixes #4 issue

---
 restler/plistformat/.svn/entries              | 166 ---
 .../CFBinaryPropertyList.php.svn-base         | 970 ------------------
 .../text-base/CFPropertyList.php.svn-base     | 587 -----------
 .../.svn/text-base/CFType.php.svn-base        | 742 --------------
 .../text-base/CFTypeDetector.php.svn-base     | 167 ---
 .../.svn/text-base/IOException.php.svn-base   |  99 --
 .../text-base/PListException.php.svn-base     |  22 -
 7 files changed, 2753 deletions(-)
 delete mode 100644 restler/plistformat/.svn/entries
 delete mode 100644 restler/plistformat/.svn/text-base/CFBinaryPropertyList.php.svn-base
 delete mode 100644 restler/plistformat/.svn/text-base/CFPropertyList.php.svn-base
 delete mode 100644 restler/plistformat/.svn/text-base/CFType.php.svn-base
 delete mode 100644 restler/plistformat/.svn/text-base/CFTypeDetector.php.svn-base
 delete mode 100644 restler/plistformat/.svn/text-base/IOException.php.svn-base
 delete mode 100644 restler/plistformat/.svn/text-base/PListException.php.svn-base

diff --git a/restler/plistformat/.svn/entries b/restler/plistformat/.svn/entries
deleted file mode 100644
index 74a1b625b..000000000
--- a/restler/plistformat/.svn/entries
+++ /dev/null
@@ -1,166 +0,0 @@
-10
-
-dir
-0
-svn://localhost/Restler/trunk/Restler/plistformat
-svn://localhost/Restler
-add
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-ce0eef8e-4246-4db1-a4b2-968e926b47c2
-
-CFPropertyList.php
-file
-
-
-
-add
-
-0f1e8ab2446ca3efc549a0827098f007
-
-
-
-
-
-
-
-
-
-
-
-copied
-svn://localhost/Restler/trunk/Restler/plist/CFPropertyList.php
-12
-
-CFType.php
-file
-
-
-
-add
-
-cdea3ed5c0b042bb991dae717782054b
-
-
-
-
-
-
-
-
-
-
-
-copied
-svn://localhost/Restler/trunk/Restler/plist/CFType.php
-12
-
-PListException.php
-file
-
-
-
-add
-
-6aab48e2e1e2d38666e6dc0ebc644358
-
-
-
-
-
-
-
-
-
-
-
-copied
-svn://localhost/Restler/trunk/Restler/plist/PListException.php
-12
-
-CFBinaryPropertyList.php
-file
-
-
-
-add
-
-03b16947dab62b9f6484f8abdab84666
-
-
-
-
-
-
-
-
-
-
-
-copied
-svn://localhost/Restler/trunk/Restler/plist/CFBinaryPropertyList.php
-12
-
-CFTypeDetector.php
-file
-
-
-
-add
-
-1626382122aedd2aacb0fb6bede301ea
-
-
-
-
-
-
-
-
-
-
-
-copied
-svn://localhost/Restler/trunk/Restler/plist/CFTypeDetector.php
-12
-
-IOException.php
-file
-
-
-
-add
-
-0a452a75451b9e95e07cdc25e96cf1ea
-
-
-
-
-
-
-
-
-
-
-
-copied
-svn://localhost/Restler/trunk/Restler/plist/IOException.php
-12
-
diff --git a/restler/plistformat/.svn/text-base/CFBinaryPropertyList.php.svn-base b/restler/plistformat/.svn/text-base/CFBinaryPropertyList.php.svn-base
deleted file mode 100644
index f946193da..000000000
--- a/restler/plistformat/.svn/text-base/CFBinaryPropertyList.php.svn-base
+++ /dev/null
@@ -1,970 +0,0 @@
-<?php
-/**
- * CFPropertyList
- * {@link http://developer.apple.com/documentation/Darwin/Reference/ManPages/man5/plist.5.html Property Lists}
- * @author Rodney Rehm <rodney.rehm@medialize.de>
- * @author Christian Kruse <cjk@wwwtech.de>
- * @package plist
- * @version $Id$
- */
-
-/**
- * Facility for reading and writing binary PropertyLists. Ported from {@link http://www.opensource.apple.com/source/CF/CF-476.15/CFBinaryPList.c CFBinaryPList.c}.
- * @author Rodney Rehm <rodney.rehm@medialize.de>
- * @author Christian Kruse <cjk@wwwtech.de>
- * @package plist
- * @example example-read-02.php Read a Binary PropertyList
- * @example example-read-03.php Read a PropertyList without knowing the type
- */
-abstract class CFBinaryPropertyList {
-  /**
-   * Content of the plist (unparsed string)
-   * @var string
-   */
-  protected $content = NULL;
-
-  /**
-   * position in the (unparsed) string
-   * @var integer
-   */
-  protected $pos = 0;
-
-  /**
-   * Table containing uniqued objects
-   * @var array
-   */
-  protected $uniqueTable = Array();
-
-  /**
-   * Number of objects in file
-   * @var integer
-   */
-  protected $countObjects = 0;
-
-  /**
-   * The length of all strings in the file (byte length, not character length)
-   * @var integer
-   */
-  protected $stringSize = 0;
-
-  /**
-   * The length of all ints in file (byte length)
-   * @var integer
-   */
-  protected $intSize = 0;
-
-  /**
-   * The length of misc objects (i.e. not integer and not string) in file
-   * @var integer
-   */
-  protected $miscSize = 0;
-
-  /**
-   * Number of object references in file (needed to calculate reference byte length)
-   * @var integer
-   */
-  protected $objectRefs = 0;
-
-  /**
-   * Number of objects written during save phase; needed to calculate the size of the object table
-   * @var integer
-   */
-  protected $writtenObjectCount = 0;
-
-  /**
-   * Table containing all objects in the file
-   */
-  protected $objectTable = Array();
-
-  /**
-   * The size of object references
-   */
-  protected $objectRefSize = 0;
-
-  /**
-   * The „offsets” (i.e. the different entries) in the file
-   */
-  protected $offsets = Array();
-
-  /**
-   * Read a „null type” (filler byte, true, false, 0 byte)
-   * @param $length The byte itself
-   * @return the byte value (e.g. CFBoolean(true), CFBoolean(false), 0 or 15)
-   * @throws PListException on encountering an unknown null type
-   */
-  protected function readBinaryNullType($length) {
-    switch($length) {
-      case 0: return 0; // null type
-      case 8: return new CFBoolean(false);
-      case 9: return new CFBoolean(true);
-      case 15: return 15; // fill type
-    }
-
-    throw new PListException("unknown null type: $length");
-  }
-
-  /**
-   * Create an 64 bit integer using bcmath or gmp
-   * @param int $hi The higher word
-   * @param int $lo The lower word
-   * @return mixed The integer (as int if possible, as string if not possible)
-   * @throws PListException if neither gmp nor bc available
-   */
-  protected static function make64Int($hi,$lo) {
-    // on x64, we can just use int
-    if(PHP_INT_SIZE > 4) return (((int)$hi)<<32) | ((int)$lo);
-
-    // lower word has to be unsigned since we don't use bitwise or, we use bcadd/gmp_add
-    $lo = sprintf("%u", $lo);
-
-    // use GMP or bcmath if possible
-    if(function_exists("gmp_mul")) return gmp_strval(gmp_add(gmp_mul($hi, "4294967296"), $lo));
-
-    if(function_exists("bcmul")) return bcadd(bcmul($hi,"4294967296"), $lo);
-
-    if(class_exists('Math_BigInteger')) {
-      $bi = new Math_BigInteger($hi);
-      return $bi->multiply("4294967296")->add($lo)->toString();
-    }
-
-    throw new PListException("either gmp or bc has to be installed, or the Math_BigInteger has to be available!");
-  }
-
-  /**
-   * Read an integer value
-   * @param integer $length The length (in bytes) of the integer value, coded as „set bit $length to 1”
-   * @return CFNumber The integer value
-   * @throws PListException if integer val is invalid
-   * @throws IOException if read error occurs
-   * @uses make64Int() to overcome PHP's big integer problems
-   */
-  protected function readBinaryInt($length) {
-    if($length > 3) throw new PListException("Integer greater than 8 bytes: $length");
-
-    $nbytes = 1 << $length;
-
-    $val = null;
-    if(strlen($buff = substr($this->content, $this->pos, $nbytes)) != $nbytes) throw IOException::readError("");
-    $this->pos += $nbytes;
-
-    switch($length) {
-      case 0:
-        $val = unpack("C", $buff);
-        $val = $val[1];
-        break;
-      case 1:
-        $val = unpack("n", $buff);
-        $val = $val[1];
-        break;
-      case 2:
-        $val = unpack("N", $buff);
-        $val = $val[1];
-        break;
-      case 3:
-        $words = unpack("Nhighword/Nlowword",$buff);
-        //$val = $words['highword'] << 32 | $words['lowword'];
-        $val = self::make64Int($words['highword'],$words['lowword']);
-        break;
-    }
-
-    return new CFNumber($val);
-  }
-
-  /**
-   * Read a real value
-   * @param integer $length The length (in bytes) of the integer value, coded as „set bit $length to 1”
-   * @return CFNumber The real value
-   * @throws PListException if real val is invalid
-   * @throws IOException if read error occurs
-   */
-  protected function readBinaryReal($length) {
-    if($length > 3) throw new PListException("Real greater than 8 bytes: $length");
-
-    $nbytes = 1 << $length;
-    $val = null;
-    if(strlen($buff = substr($this->content,$this->pos, $nbytes)) != $nbytes) throw IOException::readError("");
-    $this->pos += $nbytes;
-
-    switch($length) {
-      case 0: // 1 byte float? must be an error
-      case 1: // 2 byte float? must be an error
-        $x = $length + 1;
-        throw new PListException("got {$x} byte float, must be an error!");
-      case 2:
-        $val = unpack("f", strrev($buff));
-        $val = $val[1];
-        break;
-      case 3:
-        $val = unpack("d", strrev($buff));
-        $val = $val[1];
-        break;
-    }
-
-    return new CFNumber($val);
-  }
-
-  /**
-   * Read a date value
-   * @param integer $length The length (in bytes) of the integer value, coded as „set bit $length to 1”
-   * @return CFDate The date value
-   * @throws PListException if date val is invalid
-   * @throws IOException if read error occurs
-   */
-  protected function readBinaryDate($length) {
-    if($length > 3) throw new PListException("Date greater than 8 bytes: $length");
-
-    $nbytes = 1 << $length;
-    $val = null;
-    if(strlen($buff = substr($this->content, $this->pos, $nbytes)) != $nbytes) throw IOException::readError("");
-    $this->pos += $nbytes;
-
-    switch($length) {
-      case 0: // 1 byte CFDate is an error
-      case 1: // 2 byte CFDate is an error
-        $x = $length + 1;
-        throw new PListException("{$x} byte CFdate, error");
-
-      case 2:
-        $val = unpack("f", strrev($buff));
-        $val = $val[1];
-        break;
-      case 3:
-        $val = unpack("d", strrev($buff));
-        $val = $val[1];
-        break;
-    }
-
-    return new CFDate($val,CFDate::TIMESTAMP_APPLE);
-  }
-
-  /**
-   * Read a data value
-   * @param integer $length The length (in bytes) of the integer value, coded as „set bit $length to 1”
-   * @return CFData The data value
-   * @throws IOException if read error occurs
-   */
-  protected function readBinaryData($length) {
-    if($length == 0) $buff = "";
-    else {
-      $buff = substr($this->content, $this->pos, $length);
-      if(strlen($buff) != $length) throw IOException::readError("");
-      $this->pos += $length;
-    }
-
-    return new CFData($buff,false);
-  }
-
-  /**
-   * Read a string value, usually coded as utf8
-   * @param integer $length The length (in bytes) of the string value
-   * @return CFString The string value, utf8 encoded
-   * @throws IOException if read error occurs
-   */
-  protected function readBinaryString($length) {
-    if($length == 0) $buff = "";
-    else {
-      if(strlen($buff = substr($this->content, $this->pos, $length)) != $length) throw IOException::readError("");
-      $this->pos += $length;
-    }
-
-    if(!isset($this->uniqueTable[$buff])) $this->uniqueTable[$buff] = true;
-    return new CFString($buff);
-  }
-
-  /**
-   * Convert the given string from one charset to another.
-   * Trying to use MBString, Iconv, Recode - in that particular order.
-   * @param string $string the string to convert
-   * @param string $fromCharset the charset the given string is currently encoded in
-   * @param string $toCharset the charset to convert to, defaults to UTF-8
-   * @return string the converted string
-   * @throws PListException on neither MBString, Iconv, Recode being available
-   */
-  public static function convertCharset($string, $fromCharset, $toCharset='UTF-8') {
-    if(function_exists('mb_convert_encoding')) return mb_convert_encoding($string, $toCharset, $fromCharset);
-    if(function_exists('iconv')) return iconv($fromCharset, $toCharset, $string);
-    if(function_exists('recode_string')) return recode_string($fromCharset .'..'. $toCharset, $string);
-
-    throw new PListException('neither iconv nor mbstring supported. how are we supposed to work on strings here?');
-  }
-
-  /**
-   * Count characters considering character set
-   * Trying to use MBString, Iconv - in that particular order.
-   * @param string $string the string to convert
-   * @param string $charset the charset the given string is currently encoded in
-   * @return integer The number of characters in that string
-   * @throws PListException on neither MBString, Iconv being available
-   */
-  public static function charsetStrlen($string,$charset="UTF-8") {
-    if(function_exists('mb_strlen')) return mb_strlen($string, $charset);
-    if(function_exists('iconv_strlen')) return iconv_strlen($string,$charset);
-
-    throw new PListException('neither iconv nor mbstring supported. how are we supposed to work on strings here?');
-  }
-
-  /**
-   * Read a unicode string value, coded as UTF-16BE
-   * @param integer $length The length (in bytes) of the string value
-   * @return CFString The string value, utf8 encoded
-   * @throws IOException if read error occurs
-   */
-  protected function readBinaryUnicodeString($length) {
-    /* The problem is: we get the length of the string IN CHARACTERS;
-       since a char in UTF-16 can be 16 or 32 bit long, we don't really know
-       how long the string is in bytes */
-    if(strlen($buff = substr($this->content, $this->pos, 2*$length)) != 2*$length) throw IOException::readError("");
-    $this->pos += 2 * $length;
-
-    if(!isset($this->uniqueTable[$buff])) $this->uniqueTable[$buff] = true;
-    return new CFString(self::convertCharset($buff, "UTF-16BE", "UTF-8"));
-  }
-
-  /**
-   * Read an array value, including contained objects
-   * @param integer $length The number of contained objects
-   * @return CFArray The array value, including the objects
-   * @throws IOException if read error occurs
-   */
-  protected function readBinaryArray($length) {
-    $ary = new CFArray();
-
-    // first: read object refs
-    if($length != 0) {
-      if(strlen($buff = substr($this->content, $this->pos, $length * $this->objectRefSize)) != $length * $this->objectRefSize) throw IOException::readError("");
-      $this->pos += $length * $this->objectRefSize;
-
-      $objects = unpack($this->objectRefSize == 1 ? "C*" : "n*", $buff);
-
-      // now: read objects
-      for($i=0;$i<$length;++$i) {
-        $object = $this->readBinaryObjectAt($objects[$i+1]+1,$this->objectRefSize);
-        $ary->add($object);
-      }
-    }
-
-    return $ary;
-  }
-
-  /**
-   * Read a dictionary value, including contained objects
-   * @param integer $length The number of contained objects
-   * @return CFDictionary The dictionary value, including the objects
-   * @throws IOException if read error occurs
-   */
-  protected function readBinaryDict($length) {
-    $dict = new CFDictionary();
-
-    // first: read keys
-    if($length != 0) {
-      if(strlen($buff = substr($this->content, $this->pos, $length * $this->objectRefSize)) != $length * $this->objectRefSize) throw IOException::readError("");
-      $this->pos += $length * $this->objectRefSize;
-      $keys = unpack(($this->objectRefSize == 1 ? "C*" : "n*"), $buff);
-
-      // second: read object refs
-      if(strlen($buff = substr($this->content, $this->pos, $length * $this->objectRefSize)) != $length * $this->objectRefSize) throw IOException::readError("");
-      $this->pos += $length * $this->objectRefSize;
-      $objects = unpack(($this->objectRefSize == 1 ? "C*" : "n*"), $buff);
-
-      // read real keys and objects
-      for($i=0;$i<$length;++$i) {
-        $key = $this->readBinaryObjectAt($keys[$i+1]+1);
-        $object = $this->readBinaryObjectAt($objects[$i+1]+1);
-        $dict->add($key->getValue(),$object);
-      }
-    }
-
-    return $dict;
-  }
-
-  /**
-   * Read an object type byte, decode it and delegate to the correct reader function
-   * @return mixed The value of the delegate reader, so any of the CFType subclasses
-   * @throws IOException if read error occurs
-   */
-  function readBinaryObject() {
-    // first: read the marker byte
-    if(strlen($buff = substr($this->content,$this->pos,1)) != 1) throw IOException::readError("");
-    $this->pos++;
-
-    $object_length = unpack("C*", $buff);
-    $object_length = $object_length[1]  & 0xF;
-    $buff = unpack("H*", $buff);
-    $buff = $buff[1];
-
-    $object_type = substr($buff, 0, 1);
-    if($object_type != "0" && $object_length == 15) {
-      $object_length = $this->readBinaryObject($this->objectRefSize);
-      $object_length = $object_length->getValue();
-    }
-
-    $retval = null;
-    switch($object_type) {
-      case '0': // null, false, true, fillbyte
-        $retval = $this->readBinaryNullType($object_length);
-        break;
-      case '1': // integer
-        $retval = $this->readBinaryInt($object_length);
-        break;
-      case '2': // real
-        $retval = $this->readBinaryReal($object_length);
-        break;
-      case '3': // date
-        $retval = $this->readBinaryDate($object_length);
-        break;
-      case '4': // data
-        $retval = $this->readBinaryData($object_length);
-        break;
-      case '5': // byte string, usually utf8 encoded
-        $retval = $this->readBinaryString($object_length);
-        break;
-      case '6': // unicode string (utf16be)
-        $retval = $this->readBinaryUnicodeString($object_length);
-        break;
-      case 'a': // array
-        $retval = $this->readBinaryArray($object_length);
-        break;
-      case 'd': // dictionary
-        $retval = $this->readBinaryDict($object_length);
-        break;
-    }
-
-    return $retval;
-  }
-
-  /**
-   * Read an object type byte at position $pos, decode it and delegate to the correct reader function
-   * @param integer $pos The table position in the offsets table
-   * @return mixed The value of the delegate reader, so any of the CFType subclasses
-   */
-  function readBinaryObjectAt($pos) {
-    $this->pos = $this->offsets[$pos];
-    return $this->readBinaryObject();
-  }
-
-  /**
-   * Parse a binary plist string
-   * @return void
-   * @throws IOException if read error occurs
-   */
-  public function parseBinaryString() {
-    $this->uniqueTable = Array();
-    $this->countObjects = 0;
-    $this->stringSize = 0;
-    $this->intSize = 0;
-    $this->miscSize = 0;
-    $this->objectRefs = 0;
-
-    $this->writtenObjectCount = 0;
-    $this->objectTable = Array();
-    $this->objectRefSize = 0;
-
-    $this->offsets = Array();
-
-    // first, we read the trailer: 32 byte from the end
-    $buff = substr($this->content,-32);
-
-    $infos = unpack("x6/Coffset_size/Cobject_ref_size/x4/Nnumber_of_objects/x4/Ntop_object/x4/Ntable_offset",$buff);
-
-    // after that, get the offset table
-    $coded_offset_table = substr($this->content,$infos['table_offset'],$infos['number_of_objects'] * $infos['offset_size']);
-    if(strlen($coded_offset_table) != $infos['number_of_objects'] * $infos['offset_size']) throw IOException::readError("");
-    $this->countObjects = $infos['number_of_objects'];
-
-    // decode offset table
-    $formats = Array("","C*","n*",NULL,"N*");
-    if($infos['offset_size'] == 3) { # since PHP does not support parenthesis in pack/unpack expressions,
-                                     # "(H6)*" does not work and we have to work round this by repeating the
-                                     # expression as often as it fits in the string
-      $this->offsets = array(NULL);
-      while($coded_offset_table) {
-        $str = unpack("H6",$coded_offset_table);
-        $this->offsets[] = hexdec($str[1]);
-        $coded_offset_table = substr($coded_offset_table,3);
-      }
-    }
-    else $this->offsets = unpack($formats[$infos['offset_size']],$coded_offset_table);
-
-    $this->uniqueTable = Array();
-    $this->objectRefSize = $infos['object_ref_size'];
-
-    $top = $this->readBinaryObjectAt($infos['top_object']+1);
-    $this->add($top);
-  }
-
-  /**
-   * Read a binary plist stream
-   * @param resource $stream The stream to read
-   * @return void
-   * @throws IOException if read error occurs
-   */
-  function readBinaryStream($stream) {
-    $str = stream_get_contents($stream);
-    $this->parseBinary($str);
-  }
-
-  /**
-   * parse a binary plist string
-   * @param string $content The stream to read, defaults to {@link $this->content}
-   * @return void
-   * @throws IOException if read error occurs
-   */
-  function parseBinary($content=NULL) {
-    if($content !== NULL) $this->content = $content;
-    $this->pos = 0;
-
-    $this->parseBinaryString();
-  }
-
-  /**
-   * Read a binary plist file
-   * @param string $file The file to read
-   * @return void
-   * @throws IOException if read error occurs
-   */
-  function readBinary($file) {
-    if(!($fd = fopen($file,"rb"))) throw new IOException("Could not open file {$file}!");
-    $this->readBinaryStream($fd);
-    fclose($fd);
-  }
-
-  /**
-   * calculate the bytes needed for a size integer value
-   * @param integer $int The integer value to calculate
-   * @return integer The number of bytes needed
-   */
-  public static function bytesSizeInt($int) {
-    $nbytes = 0;
-
-    if($int > 0xE) $nbytes += 2; // 2 size-bytes
-    if($int > 0xFF) $nbytes += 1; // 3 size-bytes
-    if($int > 0xFFFF) $nbytes += 2; // 5 size-bytes
-
-    return $nbytes;
-  }
-
-  /**
-   * Calculate the byte needed for a „normal” integer value
-   * @param integer $int The integer value
-   * @return integer The number of bytes needed + 1 (because of the „marker byte”)
-   */
-  public static function bytesInt($int) {
-    $nbytes = 1;
-
-    if($int > 0xFF) $nbytes += 1; // 2 byte integer
-    if($int > 0xFFFF) $nbytes += 2; // 4 byte integer
-    if($int > 0xFFFFFFFF) $nbytes += 4; // 8 byte integer
-    if($int < 0) $nbytes += 7; // 8 byte integer (since it is signed)
-
-    return $nbytes + 1; // one „marker” byte
-  }
-
-  /**
-   * „pack” a value (i.e. write the binary representation as big endian to a string) with the specified size
-   * @param integer $nbytes The number of bytes to pack
-   * @param integer $int the integer value to pack
-   * @return string The packed value as string
-   */
-  public static function packItWithSize($nbytes,$int) {
-    $formats = Array("C", "n", "N", "N");
-    $format = $formats[$nbytes-1];
-    $ret = '';
-
-    if($nbytes == 3) return substr(pack($format, $int), -3);
-    return pack($format, $int);
-  }
-
-  /**
-   * Calculate the bytes needed to save the number of objects
-   * @param integer $count_objects The number of objects
-   * @return integer The number of bytes
-   */
-  public static function bytesNeeded($count_objects) {
-    $nbytes = 0;
-
-    while($count_objects >= 1) {
-      $nbytes++;
-      $count_objects /= 256;
-    }
-
-    return $nbytes;
-  }
-
-  /**
-   * Code an integer to byte representation
-   * @param integer $int The integer value
-   * @return string The packed byte value
-   */
-  public static function intBytes($int) {
-    $intbytes = "";
-
-    if($int > 0xFFFF) $intbytes = "\x12".pack("N", $int); // 4 byte integer
-    elseif($int > 0xFF) $intbytes = "\x11".pack("n", $int); // 2 byte integer
-    else $intbytes = "\x10".pack("C", $int); // 8 byte integer
-
-    return $intbytes;
-  }
-
-  /**
-   * Code an type byte, consisting of the type marker and the length of the type
-   * @param string $type The type byte value (i.e. "d" for dictionaries)
-   * @param integer $type_len The length of the type
-   * @return string The packed type byte value
-   */
-  public static function typeBytes($type,$type_len) {
-    $optional_int = "";
-
-    if($type_len < 15) $type .= sprintf("%x", $type_len);
-    else {
-      $type .= "f";
-      $optional_int = self::intBytes($type_len);
-    }
-
-    return pack("H*", $type).$optional_int;
-  }
-
-  /**
-   * Count number of objects and create a unique table for strings
-   * @param $value The value to count and unique
-   * @return void
-   */
-  protected function uniqueAndCountValues($value) {
-    // no uniquing for other types than CFString and CFData
-    if($value instanceof CFNumber) {
-      $val = $value->getValue();
-      if(intval($val) == $val && !is_float($val) && strpos($val,'.') === false) $this->intSize += self::bytesInt($val);
-      else $this->miscSize += 9; // 9 bytes (8 + marker byte) for real
-      $this->countObjects++;
-      return;
-    }
-    elseif($value instanceof CFDate) {
-      $this->miscSize += 9; // since date in plist is real, we need 9 byte (8 + marker byte)
-      $this->countObjects++;
-      return;
-    }
-    elseif($value instanceof CFBoolean) {
-      $this->countObjects++;
-      $this->miscSize += 1;
-      return;
-    }
-    elseif($value instanceof CFArray) {
-      $cnt = 0;
-      foreach($value as $v) {
-        ++$cnt;
-        $this->uniqueAndCountValues($v);
-        $this->objectRefs++; // each array member is a ref
-      }
-
-      $this->countObjects++;
-      $this->intSize += self::bytesSizeInt($cnt);
-      $this->miscSize++; // marker byte for array
-      return;
-    }
-    elseif($value instanceof CFDictionary) {
-      $cnt = 0;
-      foreach($value as $k => $v) {
-        ++$cnt;
-        if(!isset($this->uniqueTable[$k])) {
-          $this->uniqueTable[$k] = 0;
-          $len = self::binaryStrlen($k);
-          $this->stringSize += $len + 1;
-          $this->intSize += self::bytesSizeInt(self::charsetStrlen($k,'UTF-8'));
-        }
-
-        $this->objectRefs += 2; // both, key and value, are refs
-        $this->uniqueTable[$k]++;
-        $this->uniqueAndCountValues($v);
-      }
-
-      $this->countObjects++;
-      $this->miscSize++; // marker byte for dict
-      $this->intSize += self::bytesSizeInt($cnt);
-      return;
-    }
-    elseif($value instanceOf CFData) {
-      $val = $value->getValue();
-      $len = strlen($val);
-      $this->intSize += self::bytesSizeInt($len);
-      $this->miscSize += $len + 1;
-      $this->countObjects++;
-      return;
-    }
-    else $val = $value->getValue();
-
-    if(!isset($this->uniqueTable[$val])) {
-      $this->uniqueTable[$val] = 0;
-      $len = self::binaryStrlen($val);
-      $this->stringSize += $len + 1;
-      $this->intSize += self::bytesSizeInt(self::charsetStrlen($val,'UTF-8'));
-    }
-    $this->uniqueTable[$val]++;
-  }
-
-  /**
-   * Convert CFPropertyList to binary format; since we have to count our objects we simply unique CFDictionary and CFArray
-   * @return string The binary plist content
-   */
-  public function toBinary() {
-    $this->uniqueTable = Array();
-    $this->countObjects = 0;
-    $this->stringSize = 0;
-    $this->intSize = 0;
-    $this->miscSize = 0;
-    $this->objectRefs = 0;
-
-    $this->writtenObjectCount = 0;
-    $this->objectTable = Array();
-    $this->objectRefSize = 0;
-
-    $this->offsets = Array();
-
-    $binary_str = "bplist00";
-    $value = $this->getValue(true);
-    $this->uniqueAndCountValues($value);
-
-    $this->countObjects += count($this->uniqueTable);
-    $this->objectRefSize = self::bytesNeeded($this->countObjects);
-    $file_size = $this->stringSize + $this->intSize + $this->miscSize + $this->objectRefs * $this->objectRefSize + 40;
-    $offset_size = self::bytesNeeded($file_size);
-    $table_offset = $file_size - 32;
-
-    $this->objectTable = Array();
-    $this->writtenObjectCount = 0;
-    $this->uniqueTable = Array(); // we needed it to calculate several values
-    $value->toBinary($this);
-
-    $object_offset = 8;
-    $offsets = Array();
-
-    for($i=0;$i<count($this->objectTable);++$i) {
-      $binary_str .= $this->objectTable[$i];
-      $offsets[$i] = $object_offset;
-      $object_offset += strlen($this->objectTable[$i]);
-    }
-
-    for($i=0;$i<count($offsets);++$i) {
-      $binary_str .= self::packItWithSize($offset_size, $offsets[$i]);
-    }
-
-
-    $binary_str .= pack("x6CC", $offset_size, $this->objectRefSize);
-    $binary_str .= pack("x4N", $this->countObjects);
-    $binary_str .= pack("x4N", 0);
-    $binary_str .= pack("x4N", $table_offset);
-
-    return $binary_str;
-  }
-
-  /**
-   * Counts the number of bytes the string will have when coded; utf-16be if non-ascii characters are present.
-   * @param string $val The string value
-   * @return integer The length of the coded string in bytes
-   */
-  protected static function binaryStrlen($val) {
-    for($i=0;$i<strlen($val);++$i) {
-      if(ord($val{$i}) >= 128) {
-        $val = self::convertCharset($val, 'UTF-8', 'UTF-16BE');
-        return strlen($val);
-      }
-    }
-
-    return strlen($val);
-  }
-
-  /**
-   * Uniques and transforms a string value to binary format and adds it to the object table
-   * @param string $val The string value
-   * @return integer The position in the object table
-   */
-  public function stringToBinary($val) {
-    $saved_object_count = -1;
-
-    if(!isset($this->uniqueTable[$val])) {
-      $saved_object_count = $this->writtenObjectCount++;
-      $this->uniqueTable[$val] = $saved_object_count;
-      $utf16 = false;
-
-      for($i=0;$i<strlen($val);++$i) {
-        if(ord($val{$i}) >= 128) {
-          $utf16 = true;
-          break;
-        }
-      }
-
-      if($utf16) {
-        $bdata = self::typeBytes("6", mb_strlen($val,'UTF-8')); // 6 is 0110, unicode string (utf16be)
-        $val = self::convertCharset($val, 'UTF-8', 'UTF-16BE');
-        $this->objectTable[$saved_object_count] = $bdata.$val;
-      }
-      else {
-        $bdata = self::typeBytes("5", strlen($val)); // 5 is 0101 which is an ASCII string (seems to be ASCII encoded)
-        $this->objectTable[$saved_object_count] = $bdata.$val;
-      }
-    }
-    else $saved_object_count = $this->uniqueTable[$val];
-
-    return $saved_object_count;
-  }
-
-  /**
-   * Codes an integer to binary format
-   * @param integer $value The integer value
-   * @return string the coded integer
-   */
-  protected function intToBinary($value) {
-    $nbytes = 0;
-    if($value > 0xFF) $nbytes = 1; // 1 byte integer
-    if($value > 0xFFFF) $nbytes += 1; // 4 byte integer
-    if($value > 0xFFFFFFFF) $nbytes += 1; // 8 byte integer
-    if($value < 0) $nbytes = 3; // 8 byte integer, since signed
-
-    $bdata = self::typeBytes("1", $nbytes); // 1 is 0001, type indicator for integer
-    $buff = "";
-
-    if($nbytes < 3) {
-      if($nbytes == 0) $fmt = "C";
-      elseif($nbytes == 1) $fmt = "n";
-      else $fmt = "N";
-
-      $buff = pack($fmt, $value);
-    }
-    else {
-      if(PHP_INT_SIZE > 4) {
-        // 64 bit signed integer; we need the higher and the lower 32 bit of the value
-        $high_word = $value >> 32;
-        $low_word = $value & 0xFFFFFFFF;
-      }
-      else {
-        // since PHP can only handle 32bit signed, we can only get 32bit signed values at this point - values above 0x7FFFFFFF are
-        // floats. So we ignore the existance of 64bit on non-64bit-machines
-        if($value < 0) $high_word = 0xFFFFFFFF;
-        else $high_word = 0;
-        $low_word = $value;
-      }
-      $buff = pack("N", $high_word).pack("N", $low_word);
-    }
-
-    return $bdata.$buff;
-  }
-
-  /**
-   * Codes a real value to binary format
-   * @param float $val The real value
-   * @return string The coded real
-   */
-  protected function realToBinary($val) {
-    $bdata = self::typeBytes("2", 3); // 2 is 0010, type indicator for reals
-    return $bdata.strrev(pack("d", (float)$val));
-  }
-
-  /**
-   * Converts a numeric value to binary and adds it to the object table
-   * @param numeric $value The numeric value
-   * @return integer The position in the object table
-   */
-  public function numToBinary($value) {
-    $saved_object_count = $this->writtenObjectCount++;
-
-    $val = "";
-    if(intval($value) == $value && !is_float($value) && strpos($value,'.') === false) $val = $this->intToBinary($value);
-    else $val = $this->realToBinary($value);
-
-    $this->objectTable[$saved_object_count] = $val;
-    return $saved_object_count;
-  }
-
-  /**
-   * Convert date value (apple format) to binary and adds it to the object table
-   * @param integer $value The date value
-   * @return integer The position of the coded value in the object table
-   */
-  public function dateToBinary($val) {
-    $saved_object_count = $this->writtenObjectCount++;
-
-    $hour = gmdate("H",$val);
-    $min = gmdate("i",$val);
-    $sec = gmdate("s",$val);
-    $mday = gmdate("j",$val);
-    $mon = gmdate("n",$val);
-    $year = gmdate("Y",$val);
-
-    $val = gmmktime($hour,$min,$sec,$mon,$mday,$year) - CFDate::DATE_DIFF_APPLE_UNIX; // CFDate is a real, number of seconds since 01/01/2001 00:00:00 GMT
-
-    $bdata = self::typeBytes("3", 3); // 3 is 0011, type indicator for date
-    $this->objectTable[$saved_object_count] = $bdata.strrev(pack("d", $val));
-
-    return $saved_object_count;
-  }
-
-  /**
-   * Convert a bool value to binary and add it to the object table
-   * @param bool $val The boolean value
-   * @return integer The position in the object table
-   */
-  public function boolToBinary($val) {
-    $saved_object_count = $this->writtenObjectCount++;
-    $this->objectTable[$saved_object_count] = $val ? "\x9" : "\x8"; // 0x9 is 1001, type indicator for true; 0x8 is 1000, type indicator for false
-    return $saved_object_count;
-  }
-
-  /**
-   * Convert data value to binary format and add it to the object table
-   * @param string $val The data value
-   * @return integer The position in the object table
-   */
-  public function dataToBinary($val) {
-    $saved_object_count = $this->writtenObjectCount++;
-
-    $bdata = self::typeBytes("4", strlen($val)); // a is 1000, type indicator for data
-    $this->objectTable[$saved_object_count] = $bdata.$val;
-
-    return $saved_object_count;
-  }
-
-  /**
-   * Convert array to binary format and add it to the object table
-   * @param CFArray $val The array to convert
-   * @return integer The position in the object table
-   */
-  public function arrayToBinary($val) {
-    $saved_object_count = $this->writtenObjectCount++;
-
-    $bdata = self::typeBytes("a", count($val->getValue())); // a is 1010, type indicator for arrays
-
-    foreach($val as $v) {
-      $bval = $v->toBinary($this);
-      $bdata .= self::packItWithSize($this->objectRefSize, $bval);
-    }
-
-    $this->objectTable[$saved_object_count] = $bdata;
-    return $saved_object_count;
-  }
-
-  /**
-   * Convert dictionary to binary format and add it to the object table
-   * @param CFDictionary $val The dict to convert
-   * @return integer The position in the object table
-   */
-  public function dictToBinary($val) {
-    $saved_object_count = $this->writtenObjectCount++;
-    $bdata = self::typeBytes("d", count($val->getValue())); // d=1101, type indicator for dictionary
-
-    foreach($val as $k => $v) {
-      $str = new CFString($k);
-      $key = $str->toBinary($this);
-      $bdata .= self::packItWithSize($this->objectRefSize, $key);
-    }
-
-    foreach($val as $k => $v) {
-      $bval = $v->toBinary($this);
-      $bdata .= self::packItWithSize($this->objectRefSize, $bval);
-    }
-
-    $this->objectTable[$saved_object_count] = $bdata;
-    return $saved_object_count;
-  }
-
-}
-
-
-?>
diff --git a/restler/plistformat/.svn/text-base/CFPropertyList.php.svn-base b/restler/plistformat/.svn/text-base/CFPropertyList.php.svn-base
deleted file mode 100644
index 6366be48c..000000000
--- a/restler/plistformat/.svn/text-base/CFPropertyList.php.svn-base
+++ /dev/null
@@ -1,587 +0,0 @@
-<?php
-/**
- * CFPropertyList
- * {@link http://developer.apple.com/documentation/Darwin/Reference/ManPages/man5/plist.5.html Property Lists}
- * @author Rodney Rehm <rodney.rehm@medialize.de>
- * @author Christian Kruse <cjk@wwwtech.de>
- * @package plist
- * @version $Id$
- * @example example-read-01.php Read an XML PropertyList
- * @example example-read-02.php Read a Binary PropertyList
- * @example example-read-03.php Read a PropertyList without knowing the type
- * @example example-create-01.php Using the CFPropertyList API
- * @example example-create-02.php Using {@link CFTypeDetector}
- * @example example-create-03.php Using {@link CFTypeDetector} with {@link CFDate} and {@link CFData}
- * @example example-modify-01.php Read, modify and save a PropertyList
- */
-
-/**
- * Require IOException, PListException, CFType and CFBinaryPropertyList
- */
-$plistDirectory = dirname(__FILE__);
-require_once($plistDirectory.'/IOException.php');
-require_once($plistDirectory.'/PListException.php');
-require_once($plistDirectory.'/CFType.php');
-require_once($plistDirectory.'/CFBinaryPropertyList.php');
-require_once($plistDirectory.'/CFTypeDetector.php');
-
-/**
- * Property List
- * Interface for handling reading, editing and saving Property Lists as defined by Apple.
- * @author Rodney Rehm <rodney.rehm@medialize.de>
- * @author Christian Kruse <cjk@wwwtech.de>
- * @package plist
- * @example example-read-01.php Read an XML PropertyList
- * @example example-read-02.php Read a Binary PropertyList
- * @example example-read-03.php Read a PropertyList without knowing the type
- * @example example-create-01.php Using the CFPropertyList API
- * @example example-create-02.php Using {@link CFTypeDetector}
- * @example example-create-03.php Using {@link CFTypeDetector} with {@link CFDate} and {@link CFData}
- * @example example-create-04.php Using and extended {@link CFTypeDetector}
- */
-class CFPropertyList extends CFBinaryPropertyList implements Iterator {
-  /**
-   * Format constant for binary format
-   * @var integer
-   */
-  const FORMAT_BINARY = 1;
-
-  /**
-   * Format constant for xml format
-   * @var integer
-   */
-  const FORMAT_XML = 2;
-
-  /**
-   * Format constant for automatic format recognizing
-   * @var integer
-   */
-  const FORMAT_AUTO = 0;
-
-  /**
-   * Path of PropertyList
-   * @var string
-   */
-  protected $file = null;
-
-  /**
-   * Path of PropertyList
-   * @var integer
-   */
-  protected $format = null;
-
-  /**
-   * CFType nodes
-   * @var array
-   */
-  protected $value = array();
-
-  /**
-   * Position of iterator {@link http://php.net/manual/en/class.iterator.php}
-   * @var integer
-   */
-  protected $iteratorPosition = 0;
-
-  /**
-   * List of Keys for numerical iterator access {@link http://php.net/manual/en/class.iterator.php}
-   * @var array
-   */
-  protected $iteratorKeys = null;
-
-  /**
-   * List of NodeNames to ClassNames for resolving plist-files
-   * @var array
-   */
-  protected static $types = array(
-    'string' => 'CFString',
-    'real' => 'CFNumber',
-    'integer' => 'CFNumber',
-    'date' => 'CFDate',
-    'true' => 'CFBoolean',
-    'false' => 'CFBoolean',
-    'data' => 'CFData',
-    'array' => 'CFArray',
-    'dict' => 'CFDictionary'
- );
-
-
-  /**
-   * Create new CFPropertyList.
-   * If a path to a PropertyList is specified, it is loaded automatically.
-   * @param string $file Path of PropertyList
-   * @param integer $format he format of the property list, see {@link FORMAT_XML}, {@link FORMAT_BINARY} and {@link FORMAT_AUTO}, defaults to {@link FORMAT_AUTO}
-   * @throws IOException if file could not be read by {@link load()}
-   * @uses $file for storing the current file, if specified
-   * @uses load() for loading the plist-file
-   */
-  public function __construct($file=null,$format=self::FORMAT_AUTO) {
-    $this->file = $file;
-    $this->format = $format;
-    if($this->file) $this->load();
-  }
-
-  /**
-   * Load an XML PropertyList.
-   * @param string $file Path of PropertyList, defaults to {@link $file}
-   * @return void
-   * @throws IOException if file could not be read
-   * @throws DOMException if XML-file could not be read properly
-   * @uses load() to actually load the file
-   */
-  public function loadXML($file=null) {
-    $this->load($file,CFPropertyList::FORMAT_XML);
-  }
-
-  /**
-   * Load an XML PropertyList.
-   * @param resource $stream A stream containing the xml document.
-   * @return void
-   * @throws IOException if stream could not be read
-   * @throws DOMException if XML-stream could not be read properly
-   */
-  public function loadXMLStream($stream) {
-    if(($contents = stream_get_contents($stream)) === FALSE) throw IOException::notReadable('<stream>');
-    $this->parse($content,CFPropertyList::FORMAT_XML);
-  }
-
-  /**
-   * Load an binary PropertyList.
-   * @param string $file Path of PropertyList, defaults to {@link $file}
-   * @return void
-   * @throws IOException if file could not be read
-   * @throws PListException if binary plist-file could not be read properly
-   * @uses load() to actually load the file
-   */
-  public function loadBinary($file=null) {
-    $this->load($file,CFPropertyList::FORMAT_BINARY);
-  }
-
-  /**
-   * Load an binary PropertyList.
-   * @param stream $stream Stream containing the PropertyList
-   * @return void
-   * @throws IOException if file could not be read
-   * @throws PListException if binary plist-file could not be read properly
-   * @uses parse() to actually load the file
-   */
-  public function loadBinaryStream($stream) {
-    if(($contents = stream_get_contents($stream)) === FALSE) throw IOException::notReadable('<stream>');
-    $this->parse($content,CFPropertyList::FORMAT_BINARY);
-  }
-
-  /**
-   * Load a plist file.
-   * Load and import a plist file.
-   * @param string $file Path of PropertyList, defaults to {@link $file}
-   * @param integer $format The format of the property list, see {@link FORMAT_XML}, {@link FORMAT_BINARY} and {@link FORMAT_AUTO}, defaults to {@link $format}
-   * @return void
-   * @throws PListException if file format version is not 00
-   * @throws IOException if file could not be read
-   * @throws DOMException if plist file could not be parsed properly
-   * @uses $file if argument $file was not specified
-   * @uses $value reset to empty array
-   * @uses import() for importing the values
-   */
-  public function load($file=null,$format=null) {
-    $file = $file ? $file : $this->file;
-    $format = $format !== null ? $format : $this->format;
-    $this->value = array();
-
-    if(!is_readable($file)) throw IOException::notReadable($file);
-
-    switch($format) {
-      case CFPropertyList::FORMAT_BINARY:
-        $this->readBinary($file);
-        break;
-      case CFPropertyList::FORMAT_AUTO: // what we now do is ugly, but neccessary to recognize the file format
-        $fd = fopen($file,"rb");
-        if(($magic_number = fread($fd,8)) === false) throw IOException::notReadable($file);
-        fclose($fd);
-
-        $filetype = substr($magic_number,0,6);
-        $version  = substr($magic_number,-2);
-
-        if($filetype == "bplist") {
-          if($version != "00") throw new PListException("Wrong file format version! Expected 00, got $version!");
-          $this->readBinary($file);
-          break;
-        }
-        // else: xml format, break not neccessary
-      case CFPropertyList::FORMAT_XML:
-        $doc = new DOMDocument();
-        if(!$doc->load($file)) throw new DOMException();
-        $this->import($doc->documentElement, $this);
-        break;
-    }
-  }
-
-  /**
-   * Parse a plist string.
-   * Parse and import a plist string.
-   * @param string $str String containing the PropertyList, defaults to {@link $content}
-   * @param integer $format The format of the property list, see {@link FORMAT_XML}, {@link FORMAT_BINARY} and {@link FORMAT_AUTO}, defaults to {@link $format}
-   * @return void
-   * @throws PListException if file format version is not 00
-   * @throws IOException if file could not be read
-   * @throws DOMException if plist file could not be parsed properly
-   * @uses $content if argument $str was not specified
-   * @uses $value reset to empty array
-   * @uses import() for importing the values
-   */
-  public function parse($str=NULL,$format=NULL) {
-    $format = $format !== null ? $format : $this->format;
-    $str = $str !== null ? $str : $this->content;
-    $this->value = array();
-
-    switch($format) {
-      case CFPropertyList::FORMAT_BINARY:
-        $this->parseBinary($str);
-        break;
-      case CFPropertyList::FORMAT_AUTO: // what we now do is ugly, but neccessary to recognize the file format
-        if(($magic_number = substr($str,0,8)) === false) throw IOException::notReadable("<string>");
-
-        $filetype = substr($magic_number,0,6);
-        $version  = substr($magic_number,-2);
-
-        if($filetype == "bplist") {
-          if($version != "00") throw new PListException("Wrong file format version! Expected 00, got $version!");
-          $this->parseBinary($str);
-          break;
-        }
-        // else: xml format, break not neccessary
-      case CFPropertyList::FORMAT_XML:
-        $doc = new DOMDocument();
-        if(!$doc->loadXML($str)) throw new DOMException();
-        $this->import($doc->documentElement, $this);
-        break;
-    }
-  }
-
-  /**
-   * Convert a DOMNode into a CFType.
-   * @param DOMNode $node Node to import children of
-   * @param CFDictionary|CFArray|CFPropertyList $parent
-   * @return void
-   */
-  protected function import(DOMNode $node, $parent) {
-    // abort if there are no children
-    if(!$node->childNodes->length) return;
-
-    foreach($node->childNodes as $n) {
-      // skip if we can't handle the element
-      if(!isset(self::$types[$n->nodeName])) continue;
-
-      $class = self::$types[$n->nodeName];
-      $key = null;
-
-      // find previous <key> if possible
-      $ps = $n->previousSibling;
-      while($ps && $ps->nodeName == '#text' && $ps->previousSibling) $ps = $ps->previousSibling;
-
-      // read <key> if possible
-      if($ps && $ps->nodeName == 'key') $key = $ps->firstChild->nodeValue;
-
-      switch($n->nodeName) {
-        case 'date':
-          $value = new $class(CFDate::dateValue($n->nodeValue));
-          break;
-        case 'data':
-          $value = new $class($n->nodeValue,true);
-          break;
-        case 'string':
-          $value = new $class($n->nodeValue);
-          break;
-
-        case 'real':
-        case 'integer':
-          $value = new $class($n->nodeName == 'real' ? floatval($n->nodeValue) : intval($n->nodeValue));
-          break;
-
-        case 'true':
-        case 'false':
-          $value = new $class($n->nodeName == 'true');
-          break;
-
-        case 'array':
-        case 'dict':
-          $value = new $class();
-          $this->import($n, $value);
-          break;
-      }
-
-      // Dictionaries need a key
-      if($parent instanceof CFDictionary) $parent->add($key, $value);
-      // others don't
-      else $parent->add($value);
-    }
-  }
-
-  /**
-   * Convert CFPropertyList to XML and save to file.
-   * @param string $file Path of PropertyList, defaults to {@link $file}
-   * @return void
-   * @throws IOException if file could not be read
-   * @uses $file if $file was not specified
-   */
-  public function saveXML($file) {
-    $this->save($file,CFPropertyList::FORMAT_XML);
-  }
-
-  /**
-   * Convert CFPropertyList to binary format (bplist00) and save to file.
-   * @param string $file Path of PropertyList, defaults to {@link $file}
-   * @return void
-   * @throws IOException if file could not be read
-   * @uses $file if $file was not specified
-   */
-  public function saveBinary($file) {
-    $this->save($file,CFPropertyList::FORMAT_BINARY);
-  }
-
-  /**
-   * Convert CFPropertyList to XML or binary and save to file.
-   * @param string $file Path of PropertyList, defaults to {@link $file}
-   * @param string $format Format of PropertyList, defaults to {@link $format}
-   * @return void
-   * @throws IOException if file could not be read
-   * @throws PListException if evaluated $format is neither {@link FORMAT_XML} nor {@link FORMAL_BINARY}
-   * @uses $file if $file was not specified
-   * @uses $format if $format was not specified
-   */
-  public function save($file=null,$format=null) {
-    $file = $file ? $file : $this->file;
-    $format = $format ? $format : $this->format;
-
-    if( !in_array( $format, array( self::FORMAT_BINARY, self::FORMAT_XML ) ) )
-      throw new PListException( "format {$format} is not supported, use CFPropertyList::FORMAT_BINARY or CFPropertyList::FORMAT_XML" );
-
-    if(!file_exists($file)) {
-      // dirname("file.xml") == "" and is treated as the current working directory
-      if(!is_writable(dirname($file))) throw IOException::notWritable($file);
-    }
-    else if(!is_writable($file)) throw IOException::notWritable($file);
-
-    $content = $format == self::FORMAT_BINARY ? $this->toBinary() : $this->toXML();
-
-    $fh = fopen($file, 'wb');
-    fwrite($fh,$content);
-    fclose($fh);
-  }
-
-  /**
-   * Convert CFPropertyList to XML
-   * @param bool $formatted Print plist formatted (i.e. with newlines and whitespace indention) if true; defaults to false
-   * @return string The XML content
-   */
-  public function toXML($formatted=false) {
-    $domimpl = new DOMImplementation();
-    // <!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-    $dtd = $domimpl->createDocumentType('plist', '-//Apple Computer//DTD PLIST 1.0//EN', 'http://www.apple.com/DTDs/PropertyList-1.0.dtd');
-    $doc = $domimpl->createDocument(null, "plist", $dtd);
-    $doc->encoding = "UTF-8";
-
-    // format output
-    if($formatted) {
-      $doc->formatOutput = true;
-      $doc->preserveWhiteSpace = true;
-    }
-
-    // get documentElement and set attribs
-    $plist = $doc->documentElement;
-    $plist->setAttribute('version', '1.0');
-
-    // add PropertyList's children
-    $plist->appendChild($this->getValue(true)->toXML($doc));
-
-    return $doc->saveXML();
-  }
-
-
-  /************************************************************************************************
-   *    M A N I P U L A T I O N
-   ************************************************************************************************/
-
-  /**
-   * Add CFType to collection.
-   * @param CFType $value CFType to add to collection
-   * @return void
-   * @uses $value for adding $value
-   */
-  public function add(CFType $value=null) {
-    // anything but CFType is null, null is an empty string - sad but true
-    if( !$value )
-      $value = new CFString();
-
-    $this->value[] = $value;
-  }
-
-  /**
-   * Get CFType from collection.
-   * @param integer $key Key of CFType to retrieve from collection
-   * @return CFType CFType found at $key, null else
-   * @uses $value for retrieving CFType of $key
-   */
-  public function get($key) {
-    if(isset($this->value[$key])) return $this->value[$key];
-    return null;
-  }
-
-  /**
-   * Generic getter (magic)
-   *
-   * @param integer $key Key of CFType to retrieve from collection
-   * @return CFType CFType found at $key, null else
-   * @author Sean Coates <sean@php.net>
-   * @link http://php.net/oop5.overloading
-   */
-  public function __get($key) {
-    return $this->get($key);
-  }
-
-  /**
-   * Remove CFType from collection.
-   * @param integer $key Key of CFType to removes from collection
-   * @return CFType removed CFType, null else
-   * @uses $value for removing CFType of $key
-   */
-  public function del($key) {
-    if(isset($this->value[$key])) {
-      $t = $this->value[$key];
-      unset($this->value[$key]);
-      return $t;
-    }
-
-    return null;
-  }
-
-  /**
-   * Empty the collection
-   * @return array the removed CFTypes
-   * @uses $value for removing CFType of $key
-   */
-  public function purge() {
-    $t = $this->value;
-    $this->value = array();
-    return $t;
-  }
-
-  /**
-   * Get first (and only) child, or complete collection.
-   * @param string $cftype if set to true returned value will be CFArray instead of an array in case of a collection
-   * @return CFType|array CFType or list of CFTypes known to the PropertyList
-   * @uses $value for retrieving CFTypes
-   */
-  public function getValue($cftype=false) {
-    if(count($this->value) === 1) {
-      $t = array_values( $this->value );
-      return $t[0];
-	}
-    if($cftype) {
-      $t = new CFArray();
-      foreach( $this->value as $value ) {
-        if( $value instanceof CFType ) $t->add($value);
-      }
-      return $t;
-    }
-    return $this->value;
-  }
-
-  /**
-   * Create CFType-structure from guessing the data-types.
-   * The functionality has been moved to the more flexible {@link CFTypeDetector} facility.
-   * @param mixed $value Value to convert to CFType
-   * @param boolean $autoDictionary if true {@link CFArray}-detection is bypassed and arrays will be returned as {@link CFDictionary}.
-   * @return CFType CFType based on guessed type
-   * @uses CFTypeDetector for actual type detection
-   * @deprecated
-   */
-  public static function guess($value, $autoDictionary=false) {
-    static $t = null;
-    if( $t === null )
-      $t = new CFTypeDetector( $autoDictionary );
-
-    return $t->toCFType( $value );
-  }
-
-
-  /************************************************************************************************
-   *    S E R I A L I Z I N G
-   ************************************************************************************************/
-
-  /**
-   * Get PropertyList as array.
-   * @return mixed primitive value of first (and only) CFType, or array of primitive values of collection
-   * @uses $value for retrieving CFTypes
-   */
-  public function toArray() {
-    $a = array();
-    foreach($this->value as $value) $a[] = $value->toArray();
-    if(count($a) === 1) return $a[0];
-
-    return $a;
-  }
-
-
-  /************************************************************************************************
-   *    I T E R A T O R   I N T E R F A C E
-   ************************************************************************************************/
-
-  /**
-   * Rewind {@link $iteratorPosition} to first position (being 0)
-   * @link http://php.net/manual/en/iterator.rewind.php
-   * @return void
-   * @uses $iteratorPosition set to 0
-   * @uses $iteratorKeys store keys of {@link $value}
-   */
-  public function rewind() {
-    $this->iteratorPosition = 0;
-    $this->iteratorKeys = array_keys($this->value);
-  }
-
-  /**
-   * Get Iterator's current {@link CFType} identified by {@link $iteratorPosition}
-   * @link http://php.net/manual/en/iterator.current.php
-   * @return CFType current Item
-   * @uses $iteratorPosition identify current key
-   * @uses $iteratorKeys identify current value
-   */
-  public function current() {
-    return $this->value[$this->iteratorKeys[$this->iteratorPosition]];
-  }
-
-  /**
-   * Get Iterator's current key identified by {@link $iteratorPosition}
-   * @link http://php.net/manual/en/iterator.key.php
-   * @return string key of the current Item
-   * @uses $iteratorPosition identify current key
-   * @uses $iteratorKeys identify current value
-   */
-  public function key() {
-    return $this->iteratorKeys[$this->iteratorPosition];
-  }
-
-  /**
-   * Increment {@link $iteratorPosition} to address next {@see CFType}
-   * @link http://php.net/manual/en/iterator.next.php
-   * @return void
-   * @uses $iteratorPosition increment by 1
-   */
-  public function next() {
-    $this->iteratorPosition++;
-  }
-
-  /**
-   * Test if {@link $iteratorPosition} addresses a valid element of {@link $value}
-   * @link http://php.net/manual/en/iterator.valid.php
-   * @return boolean true if current position is valid, false else
-   * @uses $iteratorPosition test if within {@link $iteratorKeys}
-   * @uses $iteratorPosition test if within {@link $value}
-   */
-  public function valid() {
-    return isset($this->iteratorKeys[$this->iteratorPosition]) && isset($this->value[$this->iteratorKeys[$this->iteratorPosition]]);
-  }
-
-}
-
-
-?>
\ No newline at end of file
diff --git a/restler/plistformat/.svn/text-base/CFType.php.svn-base b/restler/plistformat/.svn/text-base/CFType.php.svn-base
deleted file mode 100644
index 246c22177..000000000
--- a/restler/plistformat/.svn/text-base/CFType.php.svn-base
+++ /dev/null
@@ -1,742 +0,0 @@
-<?php
-/**
- * Data-Types for CFPropertyList as defined by Apple.
- * {@link http://developer.apple.com/documentation/Darwin/Reference/ManPages/man5/plist.5.html Property Lists}
- * @author Rodney Rehm <rodney.rehm@medialize.de>
- * @author Christian Kruse <cjk@wwwtech.de>
- * @package plist
- * @subpackage plist.types
- * @version $Id$
- */
-
-/**
- * Base-Class of all CFTypes used by CFPropertyList 
- * @author Rodney Rehm <rodney.rehm@medialize.de>
- * @author Christian Kruse <cjk@wwwtech.de>
- * @package plist
- * @subpackage plist.types
- * @version $Id$
- * @example example-create-01.php Using the CFPropertyList API
- * @example example-create-02.php Using CFPropertyList::guess()
- * @example example-create-03.php Using CFPropertyList::guess() with {@link CFDate} and {@link CFData}
- */
-abstract class CFType {
-  /**
-   * CFType nodes
-   * @var array
-   */
-  protected $value = null;
-
-  /**
-   * Create new CFType.
-   * @param mixed $value Value of CFType
-   */
-  public function __construct($value=null) {
-    $this->setValue($value);
-  }
-
-  /************************************************************************************************
-   *    M A G I C   P R O P E R T I E S
-   ************************************************************************************************/
-  
-  /**
-   * Get the CFType's value
-   * @return mixed CFType's value
-   */
-  public function getValue() {
-    return $this->value;
-  }
-
-  /**
-   * Set the CFType's value
-   * @return void
-   */
-  public function setValue($value) {
-    $this->value = $value;
-  }
-
-  /************************************************************************************************
-   *    S E R I A L I Z I N G
-   ************************************************************************************************/
-
-  /**
-   * Get XML-Node.
-   * @param DOMDocument $doc DOMDocument to create DOMNode in
-   * @param string $nodeName Name of element to create
-   * @return DOMNode Node created based on CType
-   * @uses $value as nodeValue
-   */
-  public function toXML(DOMDocument $doc, $nodeName) {
-    $text = $doc->createTextNode($this->value);
-    $node = $doc->createElement($nodeName);
-    $node->appendChild($text);
-    return $node;
-  }
-
-  /**
-   * convert value to binary representation
-   * @param CFBinaryPropertyList The binary property list object
-   * @return The offset in the object table
-   */
-  public abstract function toBinary(CFBinaryPropertyList &$bplist);
-
-  /**
-   * Get CFType's value.
-   * @return mixed primitive value
-   * @uses $value for retrieving primitive of CFType
-   */
-  public function toArray() {
-    return $this->getValue();
-  }
-
-}
-
-/**
- * String Type of CFPropertyList
- * @author Rodney Rehm <rodney.rehm@medialize.de>
- * @author Christian Kruse <cjk@wwwtech.de>
- * @package plist
- * @subpackage plist.types
- */
-class CFString extends CFType {
-  /**
-   * Get XML-Node.
-   * @param DOMDocument $doc DOMDocument to create DOMNode in
-   * @param string $nodeName For compatibility reasons; just ignore it
-   * @return DOMNode &lt;string&gt;-Element
-   */
-  public function toXML(DOMDocument $doc,$nodeName="") {
-    return parent::toXML($doc, 'string');
-  }
-
-  /**
-   * convert value to binary representation
-   * @param CFBinaryPropertyList The binary property list object
-   * @return The offset in the object table
-   */
-  public function toBinary(CFBinaryPropertyList &$bplist) {
-    return $bplist->stringToBinary($this->value);
-  }
-}
-
-/**
- * Number Type of CFPropertyList
- * @author Rodney Rehm <rodney.rehm@medialize.de>
- * @author Christian Kruse <cjk@wwwtech.de>
- * @package plist
- * @subpackage plist.types
- */
-class CFNumber extends CFType {
-  /**
-   * Get XML-Node.
-   * Returns &lt;real&gt; if $value is a float, &lt;integer&gt; if $value is an integer.
-   * @param DOMDocument $doc DOMDocument to create DOMNode in
-   * @param string $nodeName For compatibility reasons; just ignore it
-   * @return DOMNode &lt;real&gt; or &lt;integer&gt;-Element 
-   */
-  public function toXML(DOMDocument $doc,$nodeName="") {
-    $ret = 'real';
-    if(intval($this->value) == $this->value && !is_float($this->value) && strpos($this->value,'.') === false) {
-      $this->value = intval($this->value);
-      $ret = 'integer';
-    }
-    return parent::toXML($doc, $ret);
-  }
-
-  /**
-   * convert value to binary representation
-   * @param CFBinaryPropertyList The binary property list object
-   * @return The offset in the object table
-   */
-  public function toBinary(CFBinaryPropertyList &$bplist) {
-    return $bplist->numToBinary($this->value);
-  }
-}
-
-/**
- * Date Type of CFPropertyList
- * Note: CFDate uses Unix timestamp (epoch) to store dates internally
- * @author Rodney Rehm <rodney.rehm@medialize.de>
- * @author Christian Kruse <cjk@wwwtech.de>
- * @package plist
- * @subpackage plist.types
- */
-class CFDate extends CFType {
-  const TIMESTAMP_APPLE = 0;
-  const TIMESTAMP_UNIX  = 1;
-  const DATE_DIFF_APPLE_UNIX = 978307200;
-
-  /**
-   * Create new Date CFType.
-   * @param integer $value timestamp to set
-   * @param integer $format format the timestamp is specified in, use {@link TIMESTAMP_APPLE} or {@link TIMESTAMP_UNIX}, defaults to {@link TIMESTAMP_APPLE}
-   * @uses setValue() to convert the timestamp
-   */
-  function __construct($value,$format=CFDate::TIMESTAMP_UNIX) {
-    $this->setValue($value,$format);
-  }
-
-  /**
-   * Set the Date CFType's value.
-   * @param integer $value timestamp to set
-   * @param integer $format format the timestamp is specified in, use {@link TIMESTAMP_APPLE} or {@link TIMESTAMP_UNIX}, defaults to {@link TIMESTAMP_UNIX}
-   * @return void
-   * @uses TIMESTAMP_APPLE to determine timestamp type
-   * @uses TIMESTAMP_UNIX to determine timestamp type
-   * @uses DATE_DIFF_APPLE_UNIX to convert Apple-timestamp to Unix-timestamp
-   */
-  function setValue($value,$format=CFDate::TIMESTAMP_UNIX) {
-    if($format == CFDate::TIMESTAMP_UNIX) $this->value = $value;
-    else $this->value = $value + CFDate::DATE_DIFF_APPLE_UNIX;
-  }
-  
-  /**
-   * Get the Date CFType's value.
-   * @param integer $format format the timestamp is specified in, use {@link TIMESTAMP_APPLE} or {@link TIMESTAMP_UNIX}, defaults to {@link TIMESTAMP_UNIX}
-   * @return integer Unix timestamp
-   * @uses TIMESTAMP_APPLE to determine timestamp type
-   * @uses TIMESTAMP_UNIX to determine timestamp type
-   * @uses DATE_DIFF_APPLE_UNIX to convert Unix-timestamp to Apple-timestamp
-   */
-  function getValue($format=CFDate::TIMESTAMP_UNIX) {
-    if($format == CFDate::TIMESTAMP_UNIX) return $this->value;
-    else return $this->value - CFDate::DATE_DIFF_APPLE_UNIX;
-  }
-
-  /**
-   * Get XML-Node.
-   * @param DOMDocument $doc DOMDocument to create DOMNode in
-   * @param string $nodeName For compatibility reasons; just ignore it
-   * @return DOMNode &lt;date&gt;-Element
-   */
-  public function toXML(DOMDocument $doc,$nodeName="") {
-    $text = $doc->createTextNode(gmdate("Y-m-d\TH:i:s\Z",$this->getValue()));
-    $node = $doc->createElement("date");
-    $node->appendChild($text);
-    return $node;
-  }
-
-  /**
-   * convert value to binary representation
-   * @param CFBinaryPropertyList The binary property list object
-   * @return The offset in the object table
-   */
-  public function toBinary(CFBinaryPropertyList &$bplist) {
-    return $bplist->dateToBinary($this->value);
-  }
-  
-  /**
-   * Create a UNIX timestamp from a PList date string
-   * @param string $val The date string (e.g. "2009-05-13T20:23:43Z")
-   * @return integer The UNIX timestamp
-   * @throws PListException when encountering an unknown date string format
-   */
-  public static function dateValue($val) {
-    //2009-05-13T20:23:43Z
-    if(!preg_match('/^(\d{4})-(\d{2})-(\d{2})T(\d{2}):(\d{2}):(\d{2})Z/',$val,$matches)) throw new PListException("Unknown date format: $val");
-    return gmmktime($matches[4],$matches[5],$matches[6],$matches[2],$matches[3],$matches[1]);
-  }
-}
-
-/**
- * Boolean Type of CFPropertyList
- * @author Rodney Rehm <rodney.rehm@medialize.de>
- * @author Christian Kruse <cjk@wwwtech.de>
- * @package plist
- * @subpackage plist.types
- */
-class CFBoolean extends CFType {
-  /**
-   * Get XML-Node.
-   * Returns &lt;true&gt; if $value is a true, &lt;false&gt; if $value is false.
-   * @param DOMDocument $doc DOMDocument to create DOMNode in
-   * @param string $nodeName For compatibility reasons; just ignore it
-   * @return DOMNode &lt;true&gt; or &lt;false&gt;-Element 
-   */
-  public function toXML(DOMDocument $doc,$nodeName="") {
-    return $doc->createElement($this->value ? 'true' : 'false');
-  }
-
-  /**
-   * convert value to binary representation
-   * @param CFBinaryPropertyList The binary property list object
-   * @return The offset in the object table
-   */
-  public function toBinary(CFBinaryPropertyList &$bplist) {
-    return $bplist->boolToBinary($this->value);
-  }
-
-}
-
-/**
- * Data Type of CFPropertyList
- * Note: Binary data is base64-encoded.
- * @author Rodney Rehm <rodney.rehm@medialize.de>
- * @author Christian Kruse <cjk@wwwtech.de>
- * @package plist
- * @subpackage plist.types
- */
-class CFData extends CFType {
-  /**
-   * Create new Data CFType
-   * @param string $value data to be contained by new object
-   * @param boolean $already_coded if true $value will not be base64-encoded, defaults to false
-   */
-  public function __construct($value=null,$already_coded=false) {
-    if($already_coded) $this->value = $value;
-    else $this->setValue($value);
-  }
-
-  /**
-   * Set the CFType's value and base64-encode it.
-   * <b>Note:</b> looks like base64_encode has troubles with UTF-8 encoded strings
-   * @return void
-   */
-  public function setValue($value) {
-    //if(function_exists('mb_check_encoding') && mb_check_encoding($value, 'UTF-8')) $value = utf8_decode($value);
-    $this->value = base64_encode($value);
-  }
-
-  /**
-   * Get base64 encoded data
-   * @return string The base64 encoded data value
-   */
-  public function getCodedValue() {
-    return $this->value;
-  }
-
-  /**
-   * Get the base64-decoded CFType's value.
-   * @return mixed CFType's value
-   */
-  public function getValue() {
-    return base64_decode($this->value);
-  }
-
-  /**
-   * Get XML-Node.
-   * @param DOMDocument $doc DOMDocument to create DOMNode in
-   * @param string $nodeName For compatibility reasons; just ignore it
-   * @return DOMNode &lt;data&gt;-Element
-   */
-  public function toXML(DOMDocument $doc,$nodeName="") {
-    return parent::toXML($doc, 'data');
-  }
-
-  /**
-   * convert value to binary representation
-   * @param CFBinaryPropertyList The binary property list object
-   * @return The offset in the object table
-   */
-  public function toBinary(CFBinaryPropertyList &$bplist) {
-    return $bplist->dataToBinary($this->getValue());
-  }
-}
-
-/**
- * Array Type of CFPropertyList
- * @author Rodney Rehm <rodney.rehm@medialize.de>
- * @author Christian Kruse <cjk@wwwtech.de>
- * @package plist
- * @subpackage plist.types
- */
-class CFArray extends CFType implements Iterator, ArrayAccess {
-  /**
-   * Position of iterator {@link http://php.net/manual/en/class.iterator.php}
-   * @var integer
-   */
-  protected $iteratorPosition = 0;
-
-
-  /**
-   * Create new CFType.
-   * @param array $value Value of CFType
-   */
-  public function __construct($value=array()) {
-    $this->value = $value;
-  }
-
-  /**
-   * Set the CFType's value
-   * <b>Note:</b> this dummy does nothing
-   * @return void
-   */
-  public function setValue($value) {
-  }
-
-  /**
-   * Add CFType to collection.
-   * @param CFType $value CFType to add to collection, defaults to null which results in an empty {@link CFString}
-   * @return void
-   * @uses $value for adding $value
-   */
-  public function add(CFType $value=null) {
-    // anything but CFType is null, null is an empty string - sad but true
-    if( !$value )
-      $value = new CFString();
-
-    $this->value[] = $value;
-  }
-
-  /**
-   * Get CFType from collection.
-   * @param integer $key Key of CFType to retrieve from collection
-   * @return CFType CFType found at $key, null else
-   * @uses $value for retrieving CFType of $key
-   */
-  public function get($key) {
-    if(isset($this->value[$key])) return $this->value[$key];
-    return null;
-  }
-
-  /**
-   * Remove CFType from collection.
-   * @param integer $key Key of CFType to removes from collection
-   * @return CFType removed CFType, null else
-   * @uses $value for removing CFType of $key
-   */
-  public function del($key) {
-    if(isset($this->value[$key])) unset($this->value[$key]);
-  }
-
-
-  /************************************************************************************************
-   *    S E R I A L I Z I N G
-   ************************************************************************************************/
-
-  /**
-   * Get XML-Node.
-   * @param DOMDocument $doc DOMDocument to create DOMNode in
-   * @param string $nodeName For compatibility reasons; just ignore it
-   * @return DOMNode &lt;array&gt;-Element
-   */
-  public function toXML(DOMDocument $doc,$nodeName="") {
-    $node = $doc->createElement('array');
-
-    foreach($this->value as $value) $node->appendChild($value->toXML($doc));
-    return $node;
-  }
-
-  /**
-   * convert value to binary representation
-   * @param CFBinaryPropertyList The binary property list object
-   * @return The offset in the object table
-   */
-  public function toBinary(CFBinaryPropertyList &$bplist) {
-    return $bplist->arrayToBinary($this);
-  }
-
-  /**
-   * Get CFType's value.
-   * @return array primitive value
-   * @uses $value for retrieving primitive of CFType
-   */
-  public function toArray() {
-    $a = array();
-    foreach($this->value as $value) $a[] = $value->toArray();
-    return $a;
-  }
-
-
-  /************************************************************************************************
-   *    I T E R A T O R   I N T E R F A C E
-   ************************************************************************************************/
-
-  /**
-   * Rewind {@link $iteratorPosition} to first position (being 0)
-   * @link http://php.net/manual/en/iterator.rewind.php
-   * @return void
-   * @uses $iteratorPosition set to 0
-   */
-  public function rewind() {
-    $this->iteratorPosition = 0;
-  }
-
-  /**
-   * Get Iterator's current {@link CFType} identified by {@link $iteratorPosition}
-   * @link http://php.net/manual/en/iterator.current.php
-   * @return CFType current Item
-   * @uses $iteratorPosition identify current key
-   */
-  public function current() {
-    return $this->value[$this->iteratorPosition];
-  }
-
-  /**
-   * Get Iterator's current key identified by {@link $iteratorPosition}
-   * @link http://php.net/manual/en/iterator.key.php
-   * @return string key of the current Item
-   * @uses $iteratorPosition identify current key
-   */
-  public function key() {
-    return $this->iteratorPosition;
-  }
-
-  /**
-   * Increment {@link $iteratorPosition} to address next {@see CFType}
-   * @link http://php.net/manual/en/iterator.next.php
-   * @return void
-   * @uses $iteratorPosition increment by 1
-   */
-  public function next() {
-    $this->iteratorPosition++;
-  }
-
-  /**
-   * Test if {@link $iteratorPosition} addresses a valid element of {@link $value}
-   * @link http://php.net/manual/en/iterator.valid.php
-   * @return boolean true if current position is valid, false else
-   * @uses $iteratorPosition test if within {@link $iteratorKeys}
-   * @uses $iteratorPosition test if within {@link $value}
-   */
-  public function valid() {
-    return isset($this->value[$this->iteratorPosition]);
-  }
-
-  /************************************************************************************************
-   *    ArrayAccess   I N T E R F A C E
-   ************************************************************************************************/
-  
-  /**
-   * Determine if the array's key exists
-   * @param string $key the key to check
-   * @return bool true if the offset exists, false if not
-   * @link http://php.net/manual/en/arrayaccess.offsetexists.php
-   * @uses $value to check if $key exists
-   * @author Sean Coates <sean@php.net>
-   */
-  public function offsetExists($key) {
-    return isset($this->value[$key]);
-  }
-  
-  /**
-   * Fetch a specific key from the CFArray
-   * @param string $key the key to check
-   * @return mixed the value associated with the key; null if the key is not found
-   * @link http://php.net/manual/en/arrayaccess.offsetget.php
-   * @uses get() to get the key's value
-   * @author Sean Coates <sean@php.net>
-   */
-  public function offsetGet($key) {
-    return $this->get($key);
-  }
-  
-  /**
-   * Set a value in the array
-   * @param string $key the key to set
-   * @param string $value the value to set
-   * @return void
-   * @link http://php.net/manual/en/arrayaccess.offsetset.php
-   * @uses setValue() to set the key's new value
-   * @author Sean Coates <sean@php.net>
-   */
-  public function offsetSet($key, $value) {
-    return $this->setValue($value);
-  }
-  
-  /**
-   * Unsets a value in the array
-   * <b>Note:</b> this dummy does nothing
-   * @param string $key the key to set
-   * @return void
-   * @link http://php.net/manual/en/arrayaccess.offsetunset.php
-   * @author Sean Coates <sean@php.net>
-   */
-  public function offsetUnset($key) {
-    
-  }
-  
-  
-}
-
-/**
- * Array Type of CFPropertyList
- * @author Rodney Rehm <rodney.rehm@medialize.de>
- * @author Christian Kruse <cjk@wwwtech.de>
- * @package plist
- * @subpackage plist.types
- */
-class CFDictionary extends CFType implements Iterator {
-  /**
-   * Position of iterator {@link http://php.net/manual/en/class.iterator.php}
-   * @var integer
-   */
-  protected $iteratorPosition = 0;
-
-  /**
-   * List of Keys for numerical iterator access {@link http://php.net/manual/en/class.iterator.php}
-   * @var array
-   */
-  protected $iteratorKeys = null;
-
-
-  /**
-   * Create new CFType.
-   * @param array $value Value of CFType
-   */
-  public function __construct($value=array()) {
-    $this->value = $value;
-  }
-
-  /**
-   * Set the CFType's value
-   * <b>Note:</b> this dummy does nothing
-   * @return void
-   */
-  public function setValue($value) {
-  }
-
-  /**
-   * Add CFType to collection.
-   * @param string $key Key to add to collection
-   * @param CFType $value CFType to add to collection, defaults to null which results in an empty {@link CFString}
-   * @return void
-   * @uses $value for adding $key $value pair
-   */
-  public function add($key, CFType $value=null) {
-    // anything but CFType is null, null is an empty string - sad but true
-    if( !$value )
-      $value = new CFString();
-
-    $this->value[$key] = $value;
-  }
-
-  /**
-   * Get CFType from collection.
-   * @param string $key Key of CFType to retrieve from collection
-   * @return CFType CFType found at $key, null else
-   * @uses $value for retrieving CFType of $key
-   */
-  public function get($key) {
-    if(isset($this->value[$key])) return $this->value[$key];
-    return null;
-  }
-
-  /**
-   * Generic getter (magic)
-   * @param integer $key Key of CFType to retrieve from collection
-   * @return CFType CFType found at $key, null else
-   * @link http://php.net/oop5.overloading
-   * @uses get() to retrieve the key's value
-   * @author Sean Coates <sean@php.net>
-   */
-  public function __get($key) {
-    return $this->get($key);
-  }
-
-  /**
-   * Remove CFType from collection.
-   * @param string $key Key of CFType to removes from collection
-   * @return CFType removed CFType, null else
-   * @uses $value for removing CFType of $key
-   */
-  public function del($key) {
-    if(isset($this->value[$key])) unset($this->value[$key]);
-  }
-
-
-  /************************************************************************************************
-   *    S E R I A L I Z I N G
-   ************************************************************************************************/
-
-  /**
-   * Get XML-Node.
-   * @param DOMDocument $doc DOMDocument to create DOMNode in
-   * @param string $nodeName For compatibility reasons; just ignore it
-   * @return DOMNode &lt;dict&gt;-Element
-   */
-  public function toXML(DOMDocument $doc,$nodeName="") {
-    $node = $doc->createElement('dict');
-
-    foreach($this->value as $key => $value) {
-      $node->appendChild($doc->createElement('key', $key));
-      $node->appendChild($value->toXML($doc));
-    }
-
-    return $node;
-  }
-
-  /**
-   * convert value to binary representation
-   * @param CFBinaryPropertyList The binary property list object
-   * @return The offset in the object table
-   */
-  public function toBinary(CFBinaryPropertyList &$bplist) {
-    return $bplist->dictToBinary($this);
-  }
-
-  /**
-   * Get CFType's value.
-   * @return array primitive value
-   * @uses $value for retrieving primitive of CFType
-   */
-  public function toArray() {
-    $a = array();
-
-    foreach($this->value as $key => $value) $a[$key] = $value->toArray();
-    return $a;
-  }
-
-
-  /************************************************************************************************
-   *    I T E R A T O R   I N T E R F A C E
-   ************************************************************************************************/
-
-  /**
-   * Rewind {@link $iteratorPosition} to first position (being 0)
-   * @link http://php.net/manual/en/iterator.rewind.php
-   * @return void
-   * @uses $iteratorPosition set to 0
-   * @uses $iteratorKeys store keys of {@link $value}
-   */
-  public function rewind() {
-    $this->iteratorPosition = 0;
-    $this->iteratorKeys = array_keys($this->value);
-  }
-
-  /**
-   * Get Iterator's current {@link CFType} identified by {@link $iteratorPosition}
-   * @link http://php.net/manual/en/iterator.current.php
-   * @return CFType current Item
-   * @uses $iteratorPosition identify current key
-   * @uses $iteratorKeys identify current value
-   */
-  public function current() {
-    return $this->value[$this->iteratorKeys[$this->iteratorPosition]];
-  }
-
-  /**
-   * Get Iterator's current key identified by {@link $iteratorPosition}
-   * @link http://php.net/manual/en/iterator.key.php
-   * @return string key of the current Item
-   * @uses $iteratorPosition identify current key
-   * @uses $iteratorKeys identify current value
-   */
-  public function key() {
-    return $this->iteratorKeys[$this->iteratorPosition];
-  }
-
-  /**
-   * Increment {@link $iteratorPosition} to address next {@see CFType}
-   * @link http://php.net/manual/en/iterator.next.php
-   * @return void
-   * @uses $iteratorPosition increment by 1
-   */
-  public function next() {
-    $this->iteratorPosition++;
-  }
-
-  /**
-   * Test if {@link $iteratorPosition} addresses a valid element of {@link $value}
-   * @link http://php.net/manual/en/iterator.valid.php
-   * @return boolean true if current position is valid, false else
-   * @uses $iteratorPosition test if within {@link $iteratorKeys}
-   * @uses $iteratorPosition test if within {@link $value}
-   */
-  public function valid() {
-    return isset($this->iteratorKeys[$this->iteratorPosition]) && isset($this->value[$this->iteratorKeys[$this->iteratorPosition]]);
-  }
-
-}
-
-?>
\ No newline at end of file
diff --git a/restler/plistformat/.svn/text-base/CFTypeDetector.php.svn-base b/restler/plistformat/.svn/text-base/CFTypeDetector.php.svn-base
deleted file mode 100644
index 996439326..000000000
--- a/restler/plistformat/.svn/text-base/CFTypeDetector.php.svn-base
+++ /dev/null
@@ -1,167 +0,0 @@
-<?php
-
- /**
-  * CFTypeDetector
-  * Interface for converting native PHP data structures to CFPropertyList objects.
-  * @author Rodney Rehm <rodney.rehm@medialize.de>
-  * @author Christian Kruse <cjk@wwwtech.de>
-  * @package plist
-  * @subpackage plist.types
-  * @example example-create-02.php Using {@link CFTypeDetector}
-  * @example example-create-03.php Using {@link CFTypeDetector} with {@link CFDate} and {@link CFData}
-  * @example example-create-04.php Using and extended {@link CFTypeDetector}
-  */
-class CFTypeDetector {
-  
-  /**
-   * flag stating if all arrays should automatically be converted to {@link CFDictionary}
-   * @var boolean
-   */
-  protected $autoDictionary = false;
-  
-  /**
-   * flag stating if exceptions should be suppressed or thrown
-   * @var boolean
-   */
-  protected $suppressExceptions = false;
-
-  /**
-   * name of a method that will be used for array to object conversations
-   * @var boolean
-   */
-  protected $objectToArrayMethod = false;
-
-
-  /**
-   * Create new CFTypeDetector
-   * @param boolean $autoDicitionary if set to true all arrays will be converted to {@link CFDictionary}
-   * @param boolean $suppressExceptions if set to true toCFType() will not throw any exceptions
-   * @param boolean $objectToArrayMethod if non-null, this method will be called on objects (if possible) to convert the object to an array
-   */
-  public function __construct($autoDicitionary=false,$suppressExceptions=false,$objectToArrayMethod=null) {
-    $this->autoDicitionary = $autoDicitionary;
-    $this->suppressExceptions = $suppressExceptions;
-    $this->objectToArrayMethod = $objectToArrayMethod;
-  }
-  
-  /**
-   * Determine if an array is associative or numerical.
-   * Numerical Arrays have incrementing index-numbers that don't contain gaps.
-   * @param array $value Array to check indexes of
-   * @return boolean true if array is associative, false if array has numeric indexes
-   */
-  protected function isAssociativeArray($value) {
-    $numericKeys = true;
-    $previousKey = null;
-    foreach($value as $key => $v) {
-      if(!is_numeric($key) || ($previousKey !== null && $previousKey != $key-1)) {
-        $numericKeys = false;
-        break;
-      }
-
-      $previousKey = $key;
-    }
-    return !$numericKeys;
-  }
-  
-  /**
-   * Get the default value
-   * @return CFType the default value to return if no suitable type could be determined
-   */
-  protected function defaultValue() {
-    return new CFString();
-  }
-  
-  /**
-   * Create CFType-structure by guessing the data-types.
-   * {@link CFArray}, {@link CFDictionary}, {@link CFBoolean}, {@link CFNumber} and {@link CFString} can be created, {@link CFDate} and {@link CFData} cannot.
-   * <br /><b>Note:</b>Distinguishing between {@link CFArray} and {@link CFDictionary} is done by examining the keys. 
-   * Keys must be strictly incrementing integers to evaluate to a {@link CFArray}. 
-   * Since PHP does not offer a function to test for associative arrays, 
-   * this test causes the input array to be walked twice and thus work rather slow on large collections. 
-   * If you work with large arrays and can live with all arrays evaluating to {@link CFDictionary}, 
-   * feel free to set the appropriate flag.
-   * <br /><b>Note:</b> If $value is an instance of CFType it is simply returned.
-   * <br /><b>Note:</b> If $value is neither a CFType, array, numeric, boolean nor string, it is omitted.
-   * @param mixed $value Value to convert to CFType
-   * @param boolean $autoDictionary if true {@link CFArray}-detection is bypassed and arrays will be returned as {@link CFDictionary}.
-   * @return CFType CFType based on guessed type
-   * @uses isAssociativeArray() to check if an array only has numeric indexes
-   */
-  public function toCFType($value) {
-    switch(true) {
-      case $value instanceof CFType:
-        return $value;
-      break;
-
-      case is_object($value):
-        // DateTime should be CFDate
-        if(class_exists( 'DateTime' ) && $value instanceof DateTime){
-          return new CFDate($value->getTimestamp());
-        }
-        
-        // convert possible objects to arrays, arrays will be arrays
-        if($this->objectToArrayMethod && is_callable(array($value, $this->objectToArrayMethod))){
-          $value = call_user_func( array( $value, $this->objectToArrayMethod ) );
-        }
-        
-        if(!is_array($value)){
-          if($this->suppressExceptions)
-            return $this->defaultValue();
-
-          throw new PListException('Could not determine CFType for object of type '. get_class($value));
-        }
-      /* break; omitted */
-
-      case $value instanceof Iterator:
-      case is_array($value):
-        // test if $value is simple or associative array
-        if(!$this->autoDictionary) {
-          if(!$this->isAssociativeArray($value)) {
-            $t = new CFArray();
-            foreach($value as $v) $t->add($this->toCFType($v));
-            return $t;
-          }
-        }
-
-        $t = new CFDictionary();
-        foreach($value as $k => $v) $t->add($k, $this->toCFType($v));
-
-        return $t;
-      break;
-
-      case is_numeric($value):
-        return new CFNumber($value);
-      break;
-
-      case is_bool($value):
-        return new CFBoolean($value);
-      break;
-
-      case is_string($value):
-        return new CFString($value);
-      break;
-
-      case is_null($value):
-        return new CFString();
-      break;
-
-      case is_resource($value):
-        if( $this->suppressExceptions )
-          return $this->defaultValue();
-
-        throw new PListException('Could not determine CFType for resource of type '. get_resource_type($value));
-      break;
-      
-      default:
-        if( $this->suppressExceptions )
-          return $this->defaultValue();
-
-        throw new PListException('Could not determine CFType for '. gettype($value));
-      break;
-    }
-  }
-
-}
-
-?>
\ No newline at end of file
diff --git a/restler/plistformat/.svn/text-base/IOException.php.svn-base b/restler/plistformat/.svn/text-base/IOException.php.svn-base
deleted file mode 100644
index 991855394..000000000
--- a/restler/plistformat/.svn/text-base/IOException.php.svn-base
+++ /dev/null
@@ -1,99 +0,0 @@
-<?php
-/**
- * CFPropertyList
- * {@link http://developer.apple.com/documentation/Darwin/Reference/ManPages/man5/plist.5.html Property Lists}
- * @author Rodney Rehm <rodney.rehm@medialize.de>
- * @author Christian Kruse <cjk@wwwtech.de>
- * @package plist
- * @version $Id$
- */
-
-/**
- * Basic Input / Output Exception
- * @author Rodney Rehm <rodney.rehm@medialize.de>
- * @author Christian Kruse <cjk@wwwtech.de>
- * @package plist
- */
-class IOException extends Exception {
-  /**
-   * Flag telling the File could not be found
-   */
-  const NOT_FOUND = 1;
-  
-  /**
-   * Flag telling the File is not readable
-   */
-  const NOT_READABLE = 2;
-  
-  /**
-   * Flag telling the File is not writable
-   */
-  const NOT_WRITABLE = 3;
-
-  /**
-   * Flag telling there was a read error
-   */
-  const READ_ERROR = 4;
-
-  /**
-   * Flag telling there was a read error
-   */
-  const WRITE_ERROR = 5;
-
-  /**
-   * Create new IOException
-   * @param string $path Source of the problem
-   * @param integer $type Type of the problem
-   */
-  public function __construct($path, $type=null) {
-    parent::__construct( $path, $type );
-  }
-  
-  /**
-   * Create new FileNotFound-Exception
-   * @param string $path Source of the problem
-   * @return IOException new FileNotFound-Exception
-   */
-  public static function notFound($path) {
-    return new IOException( $path, self::NOT_FOUND );
-  }
-
-  /**
-   * Create new FileNotReadable-Exception
-   * @param string $path Source of the problem
-   * @return IOException new FileNotReadable-Exception
-   */
-  public static function notReadable($path) {
-    return new IOException( $path, self::NOT_READABLE );
-  }
-
-  /**
-   * Create new FileNotWritable-Exception
-   * @param string $path Source of the problem
-   * @return IOException new FileNotWritable-Exception
-   */
-  public static function notWritable($path) {
-    return new IOException( $path, self::NOT_WRITABLE );
-  }
-
-  /**
-   * Create new ReadError-Exception
-   * @param string $path Source of the problem
-   * @return IOException new ReadError-Exception
-   */
-  public static function readError($path) {
-    return new IOException( $path, self::READ_ERROR );
-  }
-
-  /**
-   * Create new WriteError-Exception
-   * @param string $path Source of the problem
-   * @return IOException new WriteError-Exception
-   */
-  public static function writeError($path) {
-    return new IOException( $path, self::WRITE_ERROR );
-  }
-}
-
-
-?>
\ No newline at end of file
diff --git a/restler/plistformat/.svn/text-base/PListException.php.svn-base b/restler/plistformat/.svn/text-base/PListException.php.svn-base
deleted file mode 100644
index b738d2382..000000000
--- a/restler/plistformat/.svn/text-base/PListException.php.svn-base
+++ /dev/null
@@ -1,22 +0,0 @@
-<?php
-/**
- * CFPropertyList
- * {@link http://developer.apple.com/documentation/Darwin/Reference/ManPages/man5/plist.5.html Property Lists}
- * @author Rodney Rehm <rodney.rehm@medialize.de>
- * @author Christian Kruse <cjk@wwwtech.de>
- * @package plist
- * @version $Id$
- */
-
-/**
- * Exception for errors with the PList format
- * @author Rodney Rehm <rodney.rehm@medialize.de>
- * @author Christian Kruse <cjk@wwwtech.de>
- * @package plist
- */
-class PListException extends Exception {
-
-}
-
-
-?>
\ No newline at end of file

From 4cd3439876118599b117bf062b02efaa509f0c26 Mon Sep 17 00:00:00 2001
From: Luracast <arul@luracast.com>
Date: Sat, 15 Oct 2011 00:18:34 +0800
Subject: [PATCH 19/61] cleaned up the code to remove comments with # and
 initialize variable at line 506 properly with the value null and unwanted
 object creation

---
 restler/restler.php          | 12 ++++++------
 restler_minified/restler.php |  2 +-
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/restler/restler.php b/restler/restler.php
index 5f36ae5b3..d838f4a56 100644
--- a/restler/restler.php
+++ b/restler/restler.php
@@ -10,10 +10,10 @@
  * @copyright  2010 Luracast
  * @license    http://www.opensource.org/licenses/lgpl-license.php LGPL
  * @link       http://luracast.com/products/restler/
- * @version    2.0.2
+ * @version    2.0.3
  */
 class Restler {
-	const VERSION = '2.0.2';
+	const VERSION = '2.0.3';
 	/**
 	 * URL of the currently mapped service
 	 * @var string
@@ -503,7 +503,7 @@ protected function getResponseFormat () {
 		/**
 		* @var iFormat
 		*/
-		$format;
+		$format=NULL;
 		$extension = explode('.', parse_url($_SERVER['REQUEST_URI'],
 		PHP_URL_PATH));
 		$extension = array_pop($extension);
@@ -529,7 +529,7 @@ protected function getResponseFormat () {
 		}
 		$format = $this->format_map['default'];
 		//echo "DEFAULT ".$this->format_map['default'];
-		return is_string($format) ? new $format: $format;
+		return $format;
 	}
 
 	/**
@@ -632,7 +632,7 @@ protected function loadCache()
 				$this->cached = TRUE;
 			}
 		} else {
-			#@unlink($this->cache_dir . "/$name.php");
+			//@unlink($this->cache_dir . "/$name.php");
 		}
 	}
 
@@ -663,7 +663,7 @@ protected function generateMap ($class_name, $base_path = "") {
 			(isRestlerCompatibilityModeEnabled() ? 2 :  3) :
 			(isset($metadata['protected']) ? 1 : 0);
 
-			#take note of the order
+			//take note of the order
 			$call = array(
 			'class_name'=>$class_name,
 			'method_name'=>$method->getName(),
diff --git a/restler_minified/restler.php b/restler_minified/restler.php
index a9f9324ab..1d51cc071 100644
--- a/restler_minified/restler.php
+++ b/restler_minified/restler.php
@@ -1,5 +1,5 @@
 <?php
- class Restler { const VERSION = '2.0.2'; public $url; public $request_method; public $request_format; public $request_data=array(); public $cache_dir; public $base_dir; public $response = 'DefaultResponse'; public $response_format; protected $production_mode; protected $routes= array(); protected $format_map = array(); protected $service_class_instance; protected $service_method; protected $auth_classes = array(); protected $error_classes = array(); private $codes = array( 100 => 'Continue', 101 => 'Switching Protocols', 200 => 'OK', 201 => 'Created', 202 => 'Accepted', 203 => 'Non-Authoritative Information', 204 => 'No Content', 205 => 'Reset Content', 206 => 'Partial Content', 300 => 'Multiple Choices', 301 => 'Moved Permanently', 302 => 'Found', 303 => 'See Other', 304 => 'Not Modified', 305 => 'Use Proxy', 306 => '(Unused)', 307 => 'Temporary Redirect', 400 => 'Bad Request', 401 => 'Unauthorized', 402 => 'Payment Required', 403 => 'Forbidden', 404 => 'Not Found', 405 => 'Method Not Allowed', 406 => 'Not Acceptable', 407 => 'Proxy Authentication Required', 408 => 'Request Timeout', 409 => 'Conflict', 410 => 'Gone', 411 => 'Length Required', 412 => 'Precondition Failed', 413 => 'Request Entity Too Large', 414 => 'Request-URI Too Long', 415 => 'Unsupported Media Type', 416 => 'Requested Range Not Satisfiable', 417 => 'Expectation Failed', 500 => 'Internal Server Error', 501 => 'Not Implemented', 502 => 'Bad Gateway', 503 => 'Service Unavailable', 504 => 'Gateway Timeout', 505 => 'HTTP Version Not Supported' ); protected $cached; public function __construct ($production_mode = FALSE) { $this->production_mode = $production_mode; $this->cache_dir = getcwd(); $this->base_dir = RESTLER_PATH; } public function __destruct () { if ($this->production_mode && !$this->cached) { $this->saveCache(); } } public function refreshCache () { $this->routes = array(); $this->cached = FALSE; } public function setSupportedFormats () { $args = func_get_args(); $extensions = array(); foreach ($args as $class_name) { if(!is_string($class_name) || !class_exists($class_name)){ throw new Exception("$class_name is not a vaild Format Class."); } $obj = new $class_name; if(! $obj instanceof iFormat){ throw new Exception('Invalid format class; must implement '. 'iFormat interface'); } foreach ($obj->getMIMEMap() as $extension => $mime) { if(!isset($this->format_map[$extension])) $this->format_map[$extension]=$class_name; if(!isset($this->format_map[$mime])) $this->format_map[$mime]=$class_name; $extensions[".$extension"]=TRUE; } } $this->format_map['default']=$args[0]; $this->format_map['extensions']=array_keys($extensions); } public function addAPIClass($class_name, $base_path = NULL) { if(!class_exists($class_name)){ throw new Exception("API class $class_name is missing."); } $this->loadCache(); if(!$this->cached){ if(is_null($base_path))$base_path=strtolower($class_name); $base_path = trim($base_path,'/'); if(strlen($base_path)>0)$base_path .= '/'; $this->generateMap($class_name, $base_path); } } public function addAuthenticationClass ($class_name, $base_path = NULL) { $this->auth_classes[] = $class_name; $this->addAPIClass($class_name, $base_path); } public function addErrorClass ($class_name) { $this->error_classes[] = $class_name; } public function handleError ($status_code, $error_message = NULL) { $method = "handle$status_code"; $handled = FALSE; foreach ($this->error_classes as $class_name) { if (method_exists($class_name, $method)) { $obj = new $class_name(); $obj->restler = $this; $obj->$method(); $handled = TRUE; } } if($handled)return; $message = $this->codes[$status_code] . (!$error_message ? '' : ': ' . $error_message); $this->setStatus($status_code); $this->sendData( call_user_func( array($this->response, '__formatError'), $status_code, $message) ); } public function handle () { if(empty($this->format_map))$this->setSupportedFormats('JsonFormat'); $this->url = $this->getPath(); $this->request_method = $this->getRequestMethod(); $this->response_format = $this->getResponseFormat(); $this->request_format = $this->getRequestFormat(); if(is_null($this->request_format)){ $this->request_format = $this->response_format; } if($this->request_method == 'PUT' || $this->request_method == 'POST'){ $this->request_data = $this->getRequestData(); } $o = $this->mapUrlToMethod(); if(!isset($o->class_name)){ $this->handleError(404); }else{ try { if($o->method_flag){ $auth_method = '__isAuthenticated'; if(!count($this->auth_classes))throw new RestException(401); foreach ($this->auth_classes as $auth_class) { $auth_obj = new $auth_class(); $auth_obj->restler=$this; $this->applyClassMetadata($auth_class, $auth_obj, $o); if (!method_exists($auth_obj, $auth_method)) { throw new RestException(401, 'Authentication Class '. 'should implement iAuthenticate'); }elseif(!$auth_obj->$auth_method()){ throw new RestException(401); } } } $this->applyClassMetadata(get_class($this->request_format), $this->request_format, $o); $pre_process = '_'.$this->request_format->getExtension().'_'. $o->method_name; $this->service_method = $o->method_name; if($o->method_flag==2)$o=unprotect($o); $object = $this->service_class_instance = new $o->class_name(); $object->restler=$this; if(method_exists($o->class_name, $pre_process)) { call_user_func_array(array($object, $pre_process), $o->arguments); } switch ($o->method_flag) { case 3: $reflection_method = new ReflectionMethod($object, $o->method_name); $reflection_method->setAccessible(TRUE); $result = $reflection_method->invokeArgs($object, $o->arguments); break; case 2: case 1: default: $result = call_user_func_array(array($object, $o->method_name), $o->arguments); } } catch (RestException $e) { $this->handleError($e->getCode(), $e->getMessage()); } } if (isset($result) && $result !== NULL) { $this->sendData($result); } } public function sendData($data) { $data = $this->response_format->encode($data, !$this->production_mode); $post_process = '_'.$this->service_method .'_'. $this->response_format->getExtension(); if(isset($this->service_class_instance) && method_exists($this->service_class_instance,$post_process)){ $data = call_user_func(array($this->service_class_instance, $post_process), $data); } header("Cache-Control: no-cache, must-revalidate"); header("Expires: 0"); header('Content-Type: ' . $this->response_format->getMIME()); header("X-Powered-By: Luracast Restler v".Restler::VERSION); die($data); } public function setStatus($code) { header("{$_SERVER['SERVER_PROTOCOL']} $code ". $this->codes[strval($code)]); } public function removeCommonPath($first, $second, $char='/'){ $first = explode($char, $first); $second = explode($char, $second); while (count($second)){ if($first[0]==$second[0]){ array_shift($first); } else break; array_shift($second); } return implode($char, $first); } public function saveCache() { $file = $this->cache_dir . '/routes.php'; $s = '$o=array();'.PHP_EOL; foreach ($this->routes as $key => $value) { $s .= PHP_EOL.PHP_EOL.PHP_EOL."############### $key ###############" .PHP_EOL.PHP_EOL; $s .= '$o[\''.$key.'\']=array();'; foreach ($value as $ke => $va) { $s .= PHP_EOL.PHP_EOL."#==== $key $ke".PHP_EOL.PHP_EOL; $s .= '$o[\''.$key.'\'][\''.$ke.'\']='.str_replace(PHP_EOL, PHP_EOL."\t", var_export($va, TRUE)).';'; } } $s .= PHP_EOL.'return $o;'; $r=@file_put_contents($file, "<?php $s"); @chmod($file, 0777); if($r===FALSE)throw new Exception( "The cache directory located at '$this->cache_dir' needs to have ". "the permissions set to read/write/execute for everyone in order ". "to save cache and improve performance."); } protected function getPath () { $path = urldecode($this->removeCommonPath($_SERVER['REQUEST_URI'], $_SERVER['SCRIPT_NAME'])); $path = preg_replace('/(\/*\?.*$)|(\/$)/', '', $path); $path = str_replace($this->format_map['extensions'], '', $path); return $path; } protected function getRequestMethod () { $method = $_SERVER['REQUEST_METHOD']; if (isset($_SERVER['HTTP_X_HTTP_METHOD_OVERRIDE'])){ $method = $_SERVER['HTTP_X_HTTP_METHOD_OVERRIDE']; } return $method; } protected function getRequestFormat () { $format=NULL; if(isset($_SERVER['CONTENT_TYPE'])){ $mime = explode(';', $_SERVER['CONTENT_TYPE']); $mime = $mime[0]; if($mime==UrlEncodedFormat::MIME){ $format = new UrlEncodedFormat(); }else{ if(isset($this->format_map[$mime])){ $format = $this->format_map[$mime]; $format = is_string($format) ? new $format: $format; $format->setMIME($mime); } } } return $format; } protected function getResponseFormat () { $format; $extension = explode('.', parse_url($_SERVER['REQUEST_URI'], PHP_URL_PATH)); $extension = array_pop($extension); if($extension && isset($this->format_map[$extension])){ $format = $this->format_map[$extension]; $format = is_string($format) ? new $format: $format; $format->setExtension($extension); return $format; } if(isset($_SERVER['HTTP_ACCEPT'])){ $accepts = explode(',', $_SERVER['HTTP_ACCEPT']); foreach ($accepts as $accept) { if($extension && isset($this->format_map[$accept])){ $format = $this->format_map[$accept]; $format = is_string($format) ? new $format: $format; $format->setMIME($accept); return $format; } } } $format = $this->format_map['default']; return is_string($format) ? new $format: $format; } protected function getRequestData() { try{ $r = file_get_contents('php://input'); if(is_null($r))return $_GET; $r =$this->request_format->decode($r); return is_null($r) ? array(): $r; } catch (RestException $e) { $this->handleError($e->getCode(), $e->getMessage()); } } protected function mapUrlToMethod () { if(!isset($this->routes[$this->request_method])){ return array(); } $urls = $this->routes[$this->request_method]; if(!$urls)return array(); $found = FALSE; $this->request_data += $_GET; $params = array('request_data'=>$this->request_data); $params += $this->request_data; foreach ($urls as $url => $call) { $call = (object)$call; if(strstr($url, ':')){ $regex = preg_replace('/\\\:([^\/]+)/', '(?P<$1>[^/]+)', preg_quote($url)); if (preg_match(":^$regex$:", $this->url, $matches)) { foreach ($matches as $arg => $match) { if (isset($call->arguments[$arg])){ $params[$arg] = $match; } } $found = TRUE; break; } }elseif ($url == $this->url){ $found = TRUE; break; } } if($found){ $p = $call->defaults; foreach ($call->arguments as $key => $value) { if(isset($params[$key]))$p[$value] = $params[$key]; } $call->arguments=$p; return $call; } } protected function applyClassMetadata($class_name, $instance, $method_info){ if(isset($method_info->metadata[$class_name]) && is_array($method_info->metadata[$class_name])){ foreach ($method_info->metadata[$class_name] as $property => $value){ if(property_exists($class_name, $property)){ $reflection_property = new ReflectionProperty($class_name, $property); $reflection_property->setValue($instance, $value); } } } } protected function loadCache() { if ($this->cached !== NULL) { return; } $file = $this->cache_dir . '/routes.php'; $this->cached = FALSE; if ($this->production_mode) { if (file_exists($file)) { $routes = include($file); } if (isset($routes) && is_array($routes)) { $this->routes = $routes; $this->cached = TRUE; } } else { } } protected function generateMap ($class_name, $base_path = "") { $reflection = new ReflectionClass($class_name); $class_metadata = parse_doc($reflection->getDocComment()); $methods = $reflection->getMethods( ReflectionMethod::IS_PUBLIC + ReflectionMethod::IS_PROTECTED); foreach ($methods as $method) { $doc = $method->getDocComment(); $arguments = array(); $defaults = array(); $metadata = $class_metadata+parse_doc($doc); $params = $method->getParameters(); $position=0; foreach ($params as $param){ $arguments[$param->getName()] = $position; $defaults[$position] = $param->isDefaultValueAvailable() ? $param->getDefaultValue() : NULL; $position++; } $method_flag = $method->isProtected() ? (isRestlerCompatibilityModeEnabled() ? 2 : 3) : (isset($metadata['protected']) ? 1 : 0); $call = array( 'class_name'=>$class_name, 'method_name'=>$method->getName(), 'arguments'=>$arguments, 'defaults'=>$defaults, 'metadata'=>$metadata, 'method_flag'=>$method_flag ); $method_url = strtolower($method->getName()); if (preg_match_all( '/@url\s+(GET|POST|PUT|DELETE|HEAD|OPTIONS)[ \t]*\/?(\S*)/s', $doc, $matches, PREG_SET_ORDER)) { foreach ($matches as $match) { $http_method = $match[1]; $url = rtrim($base_path . $match[2],'/'); $this->routes[$http_method][$url] = $call; } }elseif($method_url[0] != '_'){ if (preg_match_all('/^(GET|POST|PUT|DELETE|HEAD|OPTIONS)/i', $method_url, $matches)) { $http_method = strtoupper($matches[0][0]); $method_url = substr($method_url, strlen($http_method)); }else{ $http_method = 'GET'; } $url = $base_path. ($method_url=='index' || $method_url=='default' ? '' : $method_url); $url = rtrim($url,'/'); $this->routes[$http_method][$url] = $call; foreach ($params as $param){ if($param->getName()=='request_data'){ break; } $url .= $url=='' ? ':' : '/:'; $url .= $param->getName(); $this->routes[$http_method][$url] = $call; } } } } } if(version_compare(PHP_VERSION, '5.3.0') < 0){ require_once 'compat.php'; } class RestException extends Exception { public function __construct($http_status_code, $error_message = NULL) { parent::__construct($error_message, $http_status_code); } } interface iRespond { public function __formatResponse($result); public function __formatError($status_code, $message); } class DefaultResponse implements iRespond { function __formatResponse($result) { return $result; } function __formatError($statusCode, $message) { return array('error' => array('code' => $statusCode, 'message' => $message)); } } interface iAuthenticate { public function __isAuthenticated(); } interface iFormat { public function getMIMEMap(); public function setMIME($mime); public function getMIME(); public function setExtension($extension); public function getExtension(); public function encode($data, $human_readable=FALSE); public function decode($data); } class UrlEncodedFormat implements iFormat { const MIME = 'application/x-www-form-urlencoded'; const EXTENSION = 'post'; public function getMIMEMap() { return array(UrlEncodedFormat::EXTENSION=>UrlEncodedFormat::MIME); } public function getMIME(){ return UrlEncodedFormat::MIME; } public function getExtension(){ return UrlEncodedFormat::EXTENSION; } public function setMIME($mime){ } public function setExtension($extension){ } public function encode($data, $human_readable=FALSE){ return http_build_query($data); } public function decode($data){ parse_str($data,$r); return $r; } public function __toString(){ return $this->getExtension(); } } class JsonFormat implements iFormat { const MIME ='application/json'; const EXTENSION = 'json'; public function getMIMEMap() { return array(JsonFormat::EXTENSION=>JsonFormat::MIME); } public function getMIME(){ return JsonFormat::MIME; } public function getExtension(){ return JsonFormat::EXTENSION; } public function setMIME($mime){ } public function setExtension($extension){ } public function encode($data, $human_readable=FALSE){ return $human_readable ? $this->json_format(json_encode(object_to_array($data))) : json_encode(object_to_array($data)); } public function decode($data){ return object_to_array(json_decode($data)); } private function json_format($json) { $tab = "  "; $new_json = ""; $indent_level = 0; $in_string = FALSE; $len = strlen($json); for($c = 0; $c < $len; $c++) { $char = $json[$c]; switch($char) { case '{': case '[': if(!$in_string) { $new_json .= $char . "\n" . str_repeat($tab, $indent_level+1); $indent_level++; } else { $new_json .= $char; } break; case '}': case ']': if(!$in_string) { $indent_level--; $new_json .= "\n".str_repeat($tab, $indent_level).$char; } else { $new_json .= $char; } break; case ',': if(!$in_string) { $new_json .= ",\n" . str_repeat($tab, $indent_level); } else { $new_json .= $char; } break; case ':': if(!$in_string) { $new_json .= ": "; } else { $new_json .= $char; } break; case '"': if($c==0){ $in_string = TRUE; }elseif($c > 0 && $json[$c-1] != '\\') { $in_string = !$in_string; } default: $new_json .= $char; break; } } return $new_json; } public function __toString(){ return $this->getExtension(); } } class DocParser { private $params=array(); function parse($doc='') { if($doc==''){ return $this->params; } if(preg_match('#^/\*\*(.*)\*/#s', $doc, $comment) === false) return $this->params; $comment = trim($comment[1]); if(preg_match_all('#^\s*\*(.*)#m', $comment, $lines) === false) return $this->params; $this->parseLines($lines[1]); return $this->params; } private function parseLines($lines) { foreach($lines as $line) { $parsedLine = $this->parseLine($line); if($parsedLine === false && !isset($this->params['description'])) { if(isset($desc)){ $this->params['description'] = implode(PHP_EOL, $desc); } $desc = array(); } elseif($parsedLine !== false) { $desc[] = $parsedLine; } } $desc = implode(' ', $desc); if(!empty($desc))$this->params['long_description'] = $desc; } private function parseLine($line) { $line = trim($line); if(empty($line)) return false; if(strpos($line, '@') === 0) { if(strpos($line, ' ')>0){ $param = substr($line, 1, strpos($line, ' ') - 1); $value = substr($line, strlen($param) + 2); }else{ $param = substr($line, 1); $value = ''; } if($this->setParam($param, $value)) return false; } return $line; } private function setParam($param, $value) { if($param == 'param' || $param == 'return') $value = $this->formatParamOrReturn($value); if($param == 'class') list($param, $value) = $this->formatClass($value); if(empty($this->params[$param])) { $this->params[$param] = $value; } else if($param == 'param'){ $arr = array($this->params[$param], $value); $this->params[$param] = $arr; } else { $this->params[$param] = $value + $this->params[$param]; } return true; } private function formatClass($value) { $r = preg_split("[\(|\)]",$value); if(is_array($r)){ $param = $r[0]; parse_str($r[1],$value); foreach ($value as $key => $val) { $val = explode(',', $val); if(count($val)>1)$value[$key]=$val; } }else{ $param='Unknown'; } return array($param, $value); } private function formatParamOrReturn($string) { $pos = strpos($string, ' '); $type = substr($string, 0, $pos); return '(' . $type . ')' . substr($string, $pos+1); } } function parse_doc($php_doc_comment){ $p = new DocParser(); return $p->parse($php_doc_comment); $p = new Parser($php_doc_comment); return $p; $php_doc_comment = preg_replace("/(^[\\s]*\\/\\*\\*)
+ class Restler { const VERSION = '2.0.3'; public $url; public $request_method; public $request_format; public $request_data=array(); public $cache_dir; public $base_dir; public $response = 'DefaultResponse'; public $response_format; protected $production_mode; protected $routes= array(); protected $format_map = array(); protected $service_class_instance; protected $service_method; protected $auth_classes = array(); protected $error_classes = array(); private $codes = array( 100 => 'Continue', 101 => 'Switching Protocols', 200 => 'OK', 201 => 'Created', 202 => 'Accepted', 203 => 'Non-Authoritative Information', 204 => 'No Content', 205 => 'Reset Content', 206 => 'Partial Content', 300 => 'Multiple Choices', 301 => 'Moved Permanently', 302 => 'Found', 303 => 'See Other', 304 => 'Not Modified', 305 => 'Use Proxy', 306 => '(Unused)', 307 => 'Temporary Redirect', 400 => 'Bad Request', 401 => 'Unauthorized', 402 => 'Payment Required', 403 => 'Forbidden', 404 => 'Not Found', 405 => 'Method Not Allowed', 406 => 'Not Acceptable', 407 => 'Proxy Authentication Required', 408 => 'Request Timeout', 409 => 'Conflict', 410 => 'Gone', 411 => 'Length Required', 412 => 'Precondition Failed', 413 => 'Request Entity Too Large', 414 => 'Request-URI Too Long', 415 => 'Unsupported Media Type', 416 => 'Requested Range Not Satisfiable', 417 => 'Expectation Failed', 500 => 'Internal Server Error', 501 => 'Not Implemented', 502 => 'Bad Gateway', 503 => 'Service Unavailable', 504 => 'Gateway Timeout', 505 => 'HTTP Version Not Supported' ); protected $cached; public function __construct ($production_mode = FALSE) { $this->production_mode = $production_mode; $this->cache_dir = getcwd(); $this->base_dir = RESTLER_PATH; } public function __destruct () { if ($this->production_mode && !$this->cached) { $this->saveCache(); } } public function refreshCache () { $this->routes = array(); $this->cached = FALSE; } public function setSupportedFormats () { $args = func_get_args(); $extensions = array(); foreach ($args as $class_name) { if(!is_string($class_name) || !class_exists($class_name)){ throw new Exception("$class_name is not a vaild Format Class."); } $obj = new $class_name; if(! $obj instanceof iFormat){ throw new Exception('Invalid format class; must implement '. 'iFormat interface'); } foreach ($obj->getMIMEMap() as $extension => $mime) { if(!isset($this->format_map[$extension])) $this->format_map[$extension]=$class_name; if(!isset($this->format_map[$mime])) $this->format_map[$mime]=$class_name; $extensions[".$extension"]=TRUE; } } $this->format_map['default']=$args[0]; $this->format_map['extensions']=array_keys($extensions); } public function addAPIClass($class_name, $base_path = NULL) { if(!class_exists($class_name)){ throw new Exception("API class $class_name is missing."); } $this->loadCache(); if(!$this->cached){ if(is_null($base_path))$base_path=strtolower($class_name); $base_path = trim($base_path,'/'); if(strlen($base_path)>0)$base_path .= '/'; $this->generateMap($class_name, $base_path); } } public function addAuthenticationClass ($class_name, $base_path = NULL) { $this->auth_classes[] = $class_name; $this->addAPIClass($class_name, $base_path); } public function addErrorClass ($class_name) { $this->error_classes[] = $class_name; } public function handleError ($status_code, $error_message = NULL) { $method = "handle$status_code"; $handled = FALSE; foreach ($this->error_classes as $class_name) { if (method_exists($class_name, $method)) { $obj = new $class_name(); $obj->restler = $this; $obj->$method(); $handled = TRUE; } } if($handled)return; $message = $this->codes[$status_code] . (!$error_message ? '' : ': ' . $error_message); $this->setStatus($status_code); $this->sendData( call_user_func( array($this->response, '__formatError'), $status_code, $message) ); } public function handle () { if(empty($this->format_map))$this->setSupportedFormats('JsonFormat'); $this->url = $this->getPath(); $this->request_method = $this->getRequestMethod(); $this->response_format = $this->getResponseFormat(); $this->request_format = $this->getRequestFormat(); if(is_null($this->request_format)){ $this->request_format = $this->response_format; } if($this->request_method == 'PUT' || $this->request_method == 'POST'){ $this->request_data = $this->getRequestData(); } $o = $this->mapUrlToMethod(); if(!isset($o->class_name)){ $this->handleError(404); }else{ try { if($o->method_flag){ $auth_method = '__isAuthenticated'; if(!count($this->auth_classes))throw new RestException(401); foreach ($this->auth_classes as $auth_class) { $auth_obj = new $auth_class(); $auth_obj->restler=$this; $this->applyClassMetadata($auth_class, $auth_obj, $o); if (!method_exists($auth_obj, $auth_method)) { throw new RestException(401, 'Authentication Class '. 'should implement iAuthenticate'); }elseif(!$auth_obj->$auth_method()){ throw new RestException(401); } } } $this->applyClassMetadata(get_class($this->request_format), $this->request_format, $o); $pre_process = '_'.$this->request_format->getExtension().'_'. $o->method_name; $this->service_method = $o->method_name; if($o->method_flag==2)$o=unprotect($o); $object = $this->service_class_instance = new $o->class_name(); $object->restler=$this; if(method_exists($o->class_name, $pre_process)) { call_user_func_array(array($object, $pre_process), $o->arguments); } switch ($o->method_flag) { case 3: $reflection_method = new ReflectionMethod($object, $o->method_name); $reflection_method->setAccessible(TRUE); $result = $reflection_method->invokeArgs($object, $o->arguments); break; case 2: case 1: default: $result = call_user_func_array(array($object, $o->method_name), $o->arguments); } } catch (RestException $e) { $this->handleError($e->getCode(), $e->getMessage()); } } if (isset($result) && $result !== NULL) { $this->sendData($result); } } public function sendData($data) { $data = $this->response_format->encode($data, !$this->production_mode); $post_process = '_'.$this->service_method .'_'. $this->response_format->getExtension(); if(isset($this->service_class_instance) && method_exists($this->service_class_instance,$post_process)){ $data = call_user_func(array($this->service_class_instance, $post_process), $data); } header("Cache-Control: no-cache, must-revalidate"); header("Expires: 0"); header('Content-Type: ' . $this->response_format->getMIME()); header("X-Powered-By: Luracast Restler v".Restler::VERSION); die($data); } public function setStatus($code) { header("{$_SERVER['SERVER_PROTOCOL']} $code ". $this->codes[strval($code)]); } public function removeCommonPath($first, $second, $char='/'){ $first = explode($char, $first); $second = explode($char, $second); while (count($second)){ if($first[0]==$second[0]){ array_shift($first); } else break; array_shift($second); } return implode($char, $first); } public function saveCache() { $file = $this->cache_dir . '/routes.php'; $s = '$o=array();'.PHP_EOL; foreach ($this->routes as $key => $value) { $s .= PHP_EOL.PHP_EOL.PHP_EOL."############### $key ###############" .PHP_EOL.PHP_EOL; $s .= '$o[\''.$key.'\']=array();'; foreach ($value as $ke => $va) { $s .= PHP_EOL.PHP_EOL."#==== $key $ke".PHP_EOL.PHP_EOL; $s .= '$o[\''.$key.'\'][\''.$ke.'\']='.str_replace(PHP_EOL, PHP_EOL."\t", var_export($va, TRUE)).';'; } } $s .= PHP_EOL.'return $o;'; $r=@file_put_contents($file, "<?php $s"); @chmod($file, 0777); if($r===FALSE)throw new Exception( "The cache directory located at '$this->cache_dir' needs to have ". "the permissions set to read/write/execute for everyone in order ". "to save cache and improve performance."); } protected function getPath () { $path = urldecode($this->removeCommonPath($_SERVER['REQUEST_URI'], $_SERVER['SCRIPT_NAME'])); $path = preg_replace('/(\/*\?.*$)|(\/$)/', '', $path); $path = str_replace($this->format_map['extensions'], '', $path); return $path; } protected function getRequestMethod () { $method = $_SERVER['REQUEST_METHOD']; if (isset($_SERVER['HTTP_X_HTTP_METHOD_OVERRIDE'])){ $method = $_SERVER['HTTP_X_HTTP_METHOD_OVERRIDE']; } return $method; } protected function getRequestFormat () { $format=NULL; if(isset($_SERVER['CONTENT_TYPE'])){ $mime = explode(';', $_SERVER['CONTENT_TYPE']); $mime = $mime[0]; if($mime==UrlEncodedFormat::MIME){ $format = new UrlEncodedFormat(); }else{ if(isset($this->format_map[$mime])){ $format = $this->format_map[$mime]; $format = is_string($format) ? new $format: $format; $format->setMIME($mime); } } } return $format; } protected function getResponseFormat () { $format=NULL; $extension = explode('.', parse_url($_SERVER['REQUEST_URI'], PHP_URL_PATH)); $extension = array_pop($extension); if($extension && isset($this->format_map[$extension])){ $format = $this->format_map[$extension]; $format = is_string($format) ? new $format: $format; $format->setExtension($extension); return $format; } if(isset($_SERVER['HTTP_ACCEPT'])){ $accepts = explode(',', $_SERVER['HTTP_ACCEPT']); foreach ($accepts as $accept) { if($extension && isset($this->format_map[$accept])){ $format = $this->format_map[$accept]; $format = is_string($format) ? new $format: $format; $format->setMIME($accept); return $format; } } } $format = $this->format_map['default']; return $format; } protected function getRequestData() { try{ $r = file_get_contents('php://input'); if(is_null($r))return $_GET; $r =$this->request_format->decode($r); return is_null($r) ? array(): $r; } catch (RestException $e) { $this->handleError($e->getCode(), $e->getMessage()); } } protected function mapUrlToMethod () { if(!isset($this->routes[$this->request_method])){ return array(); } $urls = $this->routes[$this->request_method]; if(!$urls)return array(); $found = FALSE; $this->request_data += $_GET; $params = array('request_data'=>$this->request_data); $params += $this->request_data; foreach ($urls as $url => $call) { $call = (object)$call; if(strstr($url, ':')){ $regex = preg_replace('/\\\:([^\/]+)/', '(?P<$1>[^/]+)', preg_quote($url)); if (preg_match(":^$regex$:", $this->url, $matches)) { foreach ($matches as $arg => $match) { if (isset($call->arguments[$arg])){ $params[$arg] = $match; } } $found = TRUE; break; } }elseif ($url == $this->url){ $found = TRUE; break; } } if($found){ $p = $call->defaults; foreach ($call->arguments as $key => $value) { if(isset($params[$key]))$p[$value] = $params[$key]; } $call->arguments=$p; return $call; } } protected function applyClassMetadata($class_name, $instance, $method_info){ if(isset($method_info->metadata[$class_name]) && is_array($method_info->metadata[$class_name])){ foreach ($method_info->metadata[$class_name] as $property => $value){ if(property_exists($class_name, $property)){ $reflection_property = new ReflectionProperty($class_name, $property); $reflection_property->setValue($instance, $value); } } } } protected function loadCache() { if ($this->cached !== NULL) { return; } $file = $this->cache_dir . '/routes.php'; $this->cached = FALSE; if ($this->production_mode) { if (file_exists($file)) { $routes = include($file); } if (isset($routes) && is_array($routes)) { $this->routes = $routes; $this->cached = TRUE; } } else { } } protected function generateMap ($class_name, $base_path = "") { $reflection = new ReflectionClass($class_name); $class_metadata = parse_doc($reflection->getDocComment()); $methods = $reflection->getMethods( ReflectionMethod::IS_PUBLIC + ReflectionMethod::IS_PROTECTED); foreach ($methods as $method) { $doc = $method->getDocComment(); $arguments = array(); $defaults = array(); $metadata = $class_metadata+parse_doc($doc); $params = $method->getParameters(); $position=0; foreach ($params as $param){ $arguments[$param->getName()] = $position; $defaults[$position] = $param->isDefaultValueAvailable() ? $param->getDefaultValue() : NULL; $position++; } $method_flag = $method->isProtected() ? (isRestlerCompatibilityModeEnabled() ? 2 : 3) : (isset($metadata['protected']) ? 1 : 0); $call = array( 'class_name'=>$class_name, 'method_name'=>$method->getName(), 'arguments'=>$arguments, 'defaults'=>$defaults, 'metadata'=>$metadata, 'method_flag'=>$method_flag ); $method_url = strtolower($method->getName()); if (preg_match_all( '/@url\s+(GET|POST|PUT|DELETE|HEAD|OPTIONS)[ \t]*\/?(\S*)/s', $doc, $matches, PREG_SET_ORDER)) { foreach ($matches as $match) { $http_method = $match[1]; $url = rtrim($base_path . $match[2],'/'); $this->routes[$http_method][$url] = $call; } }elseif($method_url[0] != '_'){ if (preg_match_all('/^(GET|POST|PUT|DELETE|HEAD|OPTIONS)/i', $method_url, $matches)) { $http_method = strtoupper($matches[0][0]); $method_url = substr($method_url, strlen($http_method)); }else{ $http_method = 'GET'; } $url = $base_path. ($method_url=='index' || $method_url=='default' ? '' : $method_url); $url = rtrim($url,'/'); $this->routes[$http_method][$url] = $call; foreach ($params as $param){ if($param->getName()=='request_data'){ break; } $url .= $url=='' ? ':' : '/:'; $url .= $param->getName(); $this->routes[$http_method][$url] = $call; } } } } } if(version_compare(PHP_VERSION, '5.3.0') < 0){ require_once 'compat.php'; } class RestException extends Exception { public function __construct($http_status_code, $error_message = NULL) { parent::__construct($error_message, $http_status_code); } } interface iRespond { public function __formatResponse($result); public function __formatError($status_code, $message); } class DefaultResponse implements iRespond { function __formatResponse($result) { return $result; } function __formatError($statusCode, $message) { return array('error' => array('code' => $statusCode, 'message' => $message)); } } interface iAuthenticate { public function __isAuthenticated(); } interface iFormat { public function getMIMEMap(); public function setMIME($mime); public function getMIME(); public function setExtension($extension); public function getExtension(); public function encode($data, $human_readable=FALSE); public function decode($data); } class UrlEncodedFormat implements iFormat { const MIME = 'application/x-www-form-urlencoded'; const EXTENSION = 'post'; public function getMIMEMap() { return array(UrlEncodedFormat::EXTENSION=>UrlEncodedFormat::MIME); } public function getMIME(){ return UrlEncodedFormat::MIME; } public function getExtension(){ return UrlEncodedFormat::EXTENSION; } public function setMIME($mime){ } public function setExtension($extension){ } public function encode($data, $human_readable=FALSE){ return http_build_query($data); } public function decode($data){ parse_str($data,$r); return $r; } public function __toString(){ return $this->getExtension(); } } class JsonFormat implements iFormat { const MIME ='application/json'; const EXTENSION = 'json'; public function getMIMEMap() { return array(JsonFormat::EXTENSION=>JsonFormat::MIME); } public function getMIME(){ return JsonFormat::MIME; } public function getExtension(){ return JsonFormat::EXTENSION; } public function setMIME($mime){ } public function setExtension($extension){ } public function encode($data, $human_readable=FALSE){ return $human_readable ? $this->json_format(json_encode(object_to_array($data))) : json_encode(object_to_array($data)); } public function decode($data){ return object_to_array(json_decode($data)); } private function json_format($json) { $tab = "  "; $new_json = ""; $indent_level = 0; $in_string = FALSE; $len = strlen($json); for($c = 0; $c < $len; $c++) { $char = $json[$c]; switch($char) { case '{': case '[': if(!$in_string) { $new_json .= $char . "\n" . str_repeat($tab, $indent_level+1); $indent_level++; } else { $new_json .= $char; } break; case '}': case ']': if(!$in_string) { $indent_level--; $new_json .= "\n".str_repeat($tab, $indent_level).$char; } else { $new_json .= $char; } break; case ',': if(!$in_string) { $new_json .= ",\n" . str_repeat($tab, $indent_level); } else { $new_json .= $char; } break; case ':': if(!$in_string) { $new_json .= ": "; } else { $new_json .= $char; } break; case '"': if($c==0){ $in_string = TRUE; }elseif($c > 0 && $json[$c-1] != '\\') { $in_string = !$in_string; } default: $new_json .= $char; break; } } return $new_json; } public function __toString(){ return $this->getExtension(); } } class DocParser { private $params=array(); function parse($doc='') { if($doc==''){ return $this->params; } if(preg_match('#^/\*\*(.*)\*/#s', $doc, $comment) === false) return $this->params; $comment = trim($comment[1]); if(preg_match_all('#^\s*\*(.*)#m', $comment, $lines) === false) return $this->params; $this->parseLines($lines[1]); return $this->params; } private function parseLines($lines) { foreach($lines as $line) { $parsedLine = $this->parseLine($line); if($parsedLine === false && !isset($this->params['description'])) { if(isset($desc)){ $this->params['description'] = implode(PHP_EOL, $desc); } $desc = array(); } elseif($parsedLine !== false) { $desc[] = $parsedLine; } } $desc = implode(' ', $desc); if(!empty($desc))$this->params['long_description'] = $desc; } private function parseLine($line) { $line = trim($line); if(empty($line)) return false; if(strpos($line, '@') === 0) { if(strpos($line, ' ')>0){ $param = substr($line, 1, strpos($line, ' ') - 1); $value = substr($line, strlen($param) + 2); }else{ $param = substr($line, 1); $value = ''; } if($this->setParam($param, $value)) return false; } return $line; } private function setParam($param, $value) { if($param == 'param' || $param == 'return') $value = $this->formatParamOrReturn($value); if($param == 'class') list($param, $value) = $this->formatClass($value); if(empty($this->params[$param])) { $this->params[$param] = $value; } else if($param == 'param'){ $arr = array($this->params[$param], $value); $this->params[$param] = $arr; } else { $this->params[$param] = $value + $this->params[$param]; } return true; } private function formatClass($value) { $r = preg_split("[\(|\)]",$value); if(is_array($r)){ $param = $r[0]; parse_str($r[1],$value); foreach ($value as $key => $val) { $val = explode(',', $val); if(count($val)>1)$value[$key]=$val; } }else{ $param='Unknown'; } return array($param, $value); } private function formatParamOrReturn($string) { $pos = strpos($string, ' '); $type = substr($string, 0, $pos); return '(' . $type . ')' . substr($string, $pos+1); } } function parse_doc($php_doc_comment){ $p = new DocParser(); return $p->parse($php_doc_comment); $p = new Parser($php_doc_comment); return $p; $php_doc_comment = preg_replace("/(^[\\s]*\\/\\*\\*)
                                  |(^[\\s]\\*\\/)
                                  |(^[\\s]*\\*?\\s)
                                  |(^[\\s]*)

From c4717ca20b0c00c0eb8d047f244ad31240448212 Mon Sep 17 00:00:00 2001
From: Luracast <arul@luracast.com>
Date: Tue, 18 Oct 2011 20:56:05 +0800
Subject: [PATCH 20/61] Fixes #11 a bug that is introduced in v2.0.3 which
 makes restler fail with the error "get_class() expects param 1 to be object,
 string given in restler.php on line 335"

---
 restler/restler.php          | 6 +++---
 restler_minified/restler.php | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/restler/restler.php b/restler/restler.php
index d838f4a56..d072c6908 100644
--- a/restler/restler.php
+++ b/restler/restler.php
@@ -10,10 +10,10 @@
  * @copyright  2010 Luracast
  * @license    http://www.opensource.org/licenses/lgpl-license.php LGPL
  * @link       http://luracast.com/products/restler/
- * @version    2.0.3
+ * @version    2.0.4
  */
 class Restler {
-	const VERSION = '2.0.3';
+	const VERSION = '2.0.4';
 	/**
 	 * URL of the currently mapped service
 	 * @var string
@@ -527,7 +527,7 @@ protected function getResponseFormat () {
 				}
 			}
 		}
-		$format = $this->format_map['default'];
+		$format = new $this->format_map['default'];
 		//echo "DEFAULT ".$this->format_map['default'];
 		return $format;
 	}
diff --git a/restler_minified/restler.php b/restler_minified/restler.php
index 1d51cc071..92c262fb0 100644
--- a/restler_minified/restler.php
+++ b/restler_minified/restler.php
@@ -1,5 +1,5 @@
 <?php
- class Restler { const VERSION = '2.0.3'; public $url; public $request_method; public $request_format; public $request_data=array(); public $cache_dir; public $base_dir; public $response = 'DefaultResponse'; public $response_format; protected $production_mode; protected $routes= array(); protected $format_map = array(); protected $service_class_instance; protected $service_method; protected $auth_classes = array(); protected $error_classes = array(); private $codes = array( 100 => 'Continue', 101 => 'Switching Protocols', 200 => 'OK', 201 => 'Created', 202 => 'Accepted', 203 => 'Non-Authoritative Information', 204 => 'No Content', 205 => 'Reset Content', 206 => 'Partial Content', 300 => 'Multiple Choices', 301 => 'Moved Permanently', 302 => 'Found', 303 => 'See Other', 304 => 'Not Modified', 305 => 'Use Proxy', 306 => '(Unused)', 307 => 'Temporary Redirect', 400 => 'Bad Request', 401 => 'Unauthorized', 402 => 'Payment Required', 403 => 'Forbidden', 404 => 'Not Found', 405 => 'Method Not Allowed', 406 => 'Not Acceptable', 407 => 'Proxy Authentication Required', 408 => 'Request Timeout', 409 => 'Conflict', 410 => 'Gone', 411 => 'Length Required', 412 => 'Precondition Failed', 413 => 'Request Entity Too Large', 414 => 'Request-URI Too Long', 415 => 'Unsupported Media Type', 416 => 'Requested Range Not Satisfiable', 417 => 'Expectation Failed', 500 => 'Internal Server Error', 501 => 'Not Implemented', 502 => 'Bad Gateway', 503 => 'Service Unavailable', 504 => 'Gateway Timeout', 505 => 'HTTP Version Not Supported' ); protected $cached; public function __construct ($production_mode = FALSE) { $this->production_mode = $production_mode; $this->cache_dir = getcwd(); $this->base_dir = RESTLER_PATH; } public function __destruct () { if ($this->production_mode && !$this->cached) { $this->saveCache(); } } public function refreshCache () { $this->routes = array(); $this->cached = FALSE; } public function setSupportedFormats () { $args = func_get_args(); $extensions = array(); foreach ($args as $class_name) { if(!is_string($class_name) || !class_exists($class_name)){ throw new Exception("$class_name is not a vaild Format Class."); } $obj = new $class_name; if(! $obj instanceof iFormat){ throw new Exception('Invalid format class; must implement '. 'iFormat interface'); } foreach ($obj->getMIMEMap() as $extension => $mime) { if(!isset($this->format_map[$extension])) $this->format_map[$extension]=$class_name; if(!isset($this->format_map[$mime])) $this->format_map[$mime]=$class_name; $extensions[".$extension"]=TRUE; } } $this->format_map['default']=$args[0]; $this->format_map['extensions']=array_keys($extensions); } public function addAPIClass($class_name, $base_path = NULL) { if(!class_exists($class_name)){ throw new Exception("API class $class_name is missing."); } $this->loadCache(); if(!$this->cached){ if(is_null($base_path))$base_path=strtolower($class_name); $base_path = trim($base_path,'/'); if(strlen($base_path)>0)$base_path .= '/'; $this->generateMap($class_name, $base_path); } } public function addAuthenticationClass ($class_name, $base_path = NULL) { $this->auth_classes[] = $class_name; $this->addAPIClass($class_name, $base_path); } public function addErrorClass ($class_name) { $this->error_classes[] = $class_name; } public function handleError ($status_code, $error_message = NULL) { $method = "handle$status_code"; $handled = FALSE; foreach ($this->error_classes as $class_name) { if (method_exists($class_name, $method)) { $obj = new $class_name(); $obj->restler = $this; $obj->$method(); $handled = TRUE; } } if($handled)return; $message = $this->codes[$status_code] . (!$error_message ? '' : ': ' . $error_message); $this->setStatus($status_code); $this->sendData( call_user_func( array($this->response, '__formatError'), $status_code, $message) ); } public function handle () { if(empty($this->format_map))$this->setSupportedFormats('JsonFormat'); $this->url = $this->getPath(); $this->request_method = $this->getRequestMethod(); $this->response_format = $this->getResponseFormat(); $this->request_format = $this->getRequestFormat(); if(is_null($this->request_format)){ $this->request_format = $this->response_format; } if($this->request_method == 'PUT' || $this->request_method == 'POST'){ $this->request_data = $this->getRequestData(); } $o = $this->mapUrlToMethod(); if(!isset($o->class_name)){ $this->handleError(404); }else{ try { if($o->method_flag){ $auth_method = '__isAuthenticated'; if(!count($this->auth_classes))throw new RestException(401); foreach ($this->auth_classes as $auth_class) { $auth_obj = new $auth_class(); $auth_obj->restler=$this; $this->applyClassMetadata($auth_class, $auth_obj, $o); if (!method_exists($auth_obj, $auth_method)) { throw new RestException(401, 'Authentication Class '. 'should implement iAuthenticate'); }elseif(!$auth_obj->$auth_method()){ throw new RestException(401); } } } $this->applyClassMetadata(get_class($this->request_format), $this->request_format, $o); $pre_process = '_'.$this->request_format->getExtension().'_'. $o->method_name; $this->service_method = $o->method_name; if($o->method_flag==2)$o=unprotect($o); $object = $this->service_class_instance = new $o->class_name(); $object->restler=$this; if(method_exists($o->class_name, $pre_process)) { call_user_func_array(array($object, $pre_process), $o->arguments); } switch ($o->method_flag) { case 3: $reflection_method = new ReflectionMethod($object, $o->method_name); $reflection_method->setAccessible(TRUE); $result = $reflection_method->invokeArgs($object, $o->arguments); break; case 2: case 1: default: $result = call_user_func_array(array($object, $o->method_name), $o->arguments); } } catch (RestException $e) { $this->handleError($e->getCode(), $e->getMessage()); } } if (isset($result) && $result !== NULL) { $this->sendData($result); } } public function sendData($data) { $data = $this->response_format->encode($data, !$this->production_mode); $post_process = '_'.$this->service_method .'_'. $this->response_format->getExtension(); if(isset($this->service_class_instance) && method_exists($this->service_class_instance,$post_process)){ $data = call_user_func(array($this->service_class_instance, $post_process), $data); } header("Cache-Control: no-cache, must-revalidate"); header("Expires: 0"); header('Content-Type: ' . $this->response_format->getMIME()); header("X-Powered-By: Luracast Restler v".Restler::VERSION); die($data); } public function setStatus($code) { header("{$_SERVER['SERVER_PROTOCOL']} $code ". $this->codes[strval($code)]); } public function removeCommonPath($first, $second, $char='/'){ $first = explode($char, $first); $second = explode($char, $second); while (count($second)){ if($first[0]==$second[0]){ array_shift($first); } else break; array_shift($second); } return implode($char, $first); } public function saveCache() { $file = $this->cache_dir . '/routes.php'; $s = '$o=array();'.PHP_EOL; foreach ($this->routes as $key => $value) { $s .= PHP_EOL.PHP_EOL.PHP_EOL."############### $key ###############" .PHP_EOL.PHP_EOL; $s .= '$o[\''.$key.'\']=array();'; foreach ($value as $ke => $va) { $s .= PHP_EOL.PHP_EOL."#==== $key $ke".PHP_EOL.PHP_EOL; $s .= '$o[\''.$key.'\'][\''.$ke.'\']='.str_replace(PHP_EOL, PHP_EOL."\t", var_export($va, TRUE)).';'; } } $s .= PHP_EOL.'return $o;'; $r=@file_put_contents($file, "<?php $s"); @chmod($file, 0777); if($r===FALSE)throw new Exception( "The cache directory located at '$this->cache_dir' needs to have ". "the permissions set to read/write/execute for everyone in order ". "to save cache and improve performance."); } protected function getPath () { $path = urldecode($this->removeCommonPath($_SERVER['REQUEST_URI'], $_SERVER['SCRIPT_NAME'])); $path = preg_replace('/(\/*\?.*$)|(\/$)/', '', $path); $path = str_replace($this->format_map['extensions'], '', $path); return $path; } protected function getRequestMethod () { $method = $_SERVER['REQUEST_METHOD']; if (isset($_SERVER['HTTP_X_HTTP_METHOD_OVERRIDE'])){ $method = $_SERVER['HTTP_X_HTTP_METHOD_OVERRIDE']; } return $method; } protected function getRequestFormat () { $format=NULL; if(isset($_SERVER['CONTENT_TYPE'])){ $mime = explode(';', $_SERVER['CONTENT_TYPE']); $mime = $mime[0]; if($mime==UrlEncodedFormat::MIME){ $format = new UrlEncodedFormat(); }else{ if(isset($this->format_map[$mime])){ $format = $this->format_map[$mime]; $format = is_string($format) ? new $format: $format; $format->setMIME($mime); } } } return $format; } protected function getResponseFormat () { $format=NULL; $extension = explode('.', parse_url($_SERVER['REQUEST_URI'], PHP_URL_PATH)); $extension = array_pop($extension); if($extension && isset($this->format_map[$extension])){ $format = $this->format_map[$extension]; $format = is_string($format) ? new $format: $format; $format->setExtension($extension); return $format; } if(isset($_SERVER['HTTP_ACCEPT'])){ $accepts = explode(',', $_SERVER['HTTP_ACCEPT']); foreach ($accepts as $accept) { if($extension && isset($this->format_map[$accept])){ $format = $this->format_map[$accept]; $format = is_string($format) ? new $format: $format; $format->setMIME($accept); return $format; } } } $format = $this->format_map['default']; return $format; } protected function getRequestData() { try{ $r = file_get_contents('php://input'); if(is_null($r))return $_GET; $r =$this->request_format->decode($r); return is_null($r) ? array(): $r; } catch (RestException $e) { $this->handleError($e->getCode(), $e->getMessage()); } } protected function mapUrlToMethod () { if(!isset($this->routes[$this->request_method])){ return array(); } $urls = $this->routes[$this->request_method]; if(!$urls)return array(); $found = FALSE; $this->request_data += $_GET; $params = array('request_data'=>$this->request_data); $params += $this->request_data; foreach ($urls as $url => $call) { $call = (object)$call; if(strstr($url, ':')){ $regex = preg_replace('/\\\:([^\/]+)/', '(?P<$1>[^/]+)', preg_quote($url)); if (preg_match(":^$regex$:", $this->url, $matches)) { foreach ($matches as $arg => $match) { if (isset($call->arguments[$arg])){ $params[$arg] = $match; } } $found = TRUE; break; } }elseif ($url == $this->url){ $found = TRUE; break; } } if($found){ $p = $call->defaults; foreach ($call->arguments as $key => $value) { if(isset($params[$key]))$p[$value] = $params[$key]; } $call->arguments=$p; return $call; } } protected function applyClassMetadata($class_name, $instance, $method_info){ if(isset($method_info->metadata[$class_name]) && is_array($method_info->metadata[$class_name])){ foreach ($method_info->metadata[$class_name] as $property => $value){ if(property_exists($class_name, $property)){ $reflection_property = new ReflectionProperty($class_name, $property); $reflection_property->setValue($instance, $value); } } } } protected function loadCache() { if ($this->cached !== NULL) { return; } $file = $this->cache_dir . '/routes.php'; $this->cached = FALSE; if ($this->production_mode) { if (file_exists($file)) { $routes = include($file); } if (isset($routes) && is_array($routes)) { $this->routes = $routes; $this->cached = TRUE; } } else { } } protected function generateMap ($class_name, $base_path = "") { $reflection = new ReflectionClass($class_name); $class_metadata = parse_doc($reflection->getDocComment()); $methods = $reflection->getMethods( ReflectionMethod::IS_PUBLIC + ReflectionMethod::IS_PROTECTED); foreach ($methods as $method) { $doc = $method->getDocComment(); $arguments = array(); $defaults = array(); $metadata = $class_metadata+parse_doc($doc); $params = $method->getParameters(); $position=0; foreach ($params as $param){ $arguments[$param->getName()] = $position; $defaults[$position] = $param->isDefaultValueAvailable() ? $param->getDefaultValue() : NULL; $position++; } $method_flag = $method->isProtected() ? (isRestlerCompatibilityModeEnabled() ? 2 : 3) : (isset($metadata['protected']) ? 1 : 0); $call = array( 'class_name'=>$class_name, 'method_name'=>$method->getName(), 'arguments'=>$arguments, 'defaults'=>$defaults, 'metadata'=>$metadata, 'method_flag'=>$method_flag ); $method_url = strtolower($method->getName()); if (preg_match_all( '/@url\s+(GET|POST|PUT|DELETE|HEAD|OPTIONS)[ \t]*\/?(\S*)/s', $doc, $matches, PREG_SET_ORDER)) { foreach ($matches as $match) { $http_method = $match[1]; $url = rtrim($base_path . $match[2],'/'); $this->routes[$http_method][$url] = $call; } }elseif($method_url[0] != '_'){ if (preg_match_all('/^(GET|POST|PUT|DELETE|HEAD|OPTIONS)/i', $method_url, $matches)) { $http_method = strtoupper($matches[0][0]); $method_url = substr($method_url, strlen($http_method)); }else{ $http_method = 'GET'; } $url = $base_path. ($method_url=='index' || $method_url=='default' ? '' : $method_url); $url = rtrim($url,'/'); $this->routes[$http_method][$url] = $call; foreach ($params as $param){ if($param->getName()=='request_data'){ break; } $url .= $url=='' ? ':' : '/:'; $url .= $param->getName(); $this->routes[$http_method][$url] = $call; } } } } } if(version_compare(PHP_VERSION, '5.3.0') < 0){ require_once 'compat.php'; } class RestException extends Exception { public function __construct($http_status_code, $error_message = NULL) { parent::__construct($error_message, $http_status_code); } } interface iRespond { public function __formatResponse($result); public function __formatError($status_code, $message); } class DefaultResponse implements iRespond { function __formatResponse($result) { return $result; } function __formatError($statusCode, $message) { return array('error' => array('code' => $statusCode, 'message' => $message)); } } interface iAuthenticate { public function __isAuthenticated(); } interface iFormat { public function getMIMEMap(); public function setMIME($mime); public function getMIME(); public function setExtension($extension); public function getExtension(); public function encode($data, $human_readable=FALSE); public function decode($data); } class UrlEncodedFormat implements iFormat { const MIME = 'application/x-www-form-urlencoded'; const EXTENSION = 'post'; public function getMIMEMap() { return array(UrlEncodedFormat::EXTENSION=>UrlEncodedFormat::MIME); } public function getMIME(){ return UrlEncodedFormat::MIME; } public function getExtension(){ return UrlEncodedFormat::EXTENSION; } public function setMIME($mime){ } public function setExtension($extension){ } public function encode($data, $human_readable=FALSE){ return http_build_query($data); } public function decode($data){ parse_str($data,$r); return $r; } public function __toString(){ return $this->getExtension(); } } class JsonFormat implements iFormat { const MIME ='application/json'; const EXTENSION = 'json'; public function getMIMEMap() { return array(JsonFormat::EXTENSION=>JsonFormat::MIME); } public function getMIME(){ return JsonFormat::MIME; } public function getExtension(){ return JsonFormat::EXTENSION; } public function setMIME($mime){ } public function setExtension($extension){ } public function encode($data, $human_readable=FALSE){ return $human_readable ? $this->json_format(json_encode(object_to_array($data))) : json_encode(object_to_array($data)); } public function decode($data){ return object_to_array(json_decode($data)); } private function json_format($json) { $tab = "  "; $new_json = ""; $indent_level = 0; $in_string = FALSE; $len = strlen($json); for($c = 0; $c < $len; $c++) { $char = $json[$c]; switch($char) { case '{': case '[': if(!$in_string) { $new_json .= $char . "\n" . str_repeat($tab, $indent_level+1); $indent_level++; } else { $new_json .= $char; } break; case '}': case ']': if(!$in_string) { $indent_level--; $new_json .= "\n".str_repeat($tab, $indent_level).$char; } else { $new_json .= $char; } break; case ',': if(!$in_string) { $new_json .= ",\n" . str_repeat($tab, $indent_level); } else { $new_json .= $char; } break; case ':': if(!$in_string) { $new_json .= ": "; } else { $new_json .= $char; } break; case '"': if($c==0){ $in_string = TRUE; }elseif($c > 0 && $json[$c-1] != '\\') { $in_string = !$in_string; } default: $new_json .= $char; break; } } return $new_json; } public function __toString(){ return $this->getExtension(); } } class DocParser { private $params=array(); function parse($doc='') { if($doc==''){ return $this->params; } if(preg_match('#^/\*\*(.*)\*/#s', $doc, $comment) === false) return $this->params; $comment = trim($comment[1]); if(preg_match_all('#^\s*\*(.*)#m', $comment, $lines) === false) return $this->params; $this->parseLines($lines[1]); return $this->params; } private function parseLines($lines) { foreach($lines as $line) { $parsedLine = $this->parseLine($line); if($parsedLine === false && !isset($this->params['description'])) { if(isset($desc)){ $this->params['description'] = implode(PHP_EOL, $desc); } $desc = array(); } elseif($parsedLine !== false) { $desc[] = $parsedLine; } } $desc = implode(' ', $desc); if(!empty($desc))$this->params['long_description'] = $desc; } private function parseLine($line) { $line = trim($line); if(empty($line)) return false; if(strpos($line, '@') === 0) { if(strpos($line, ' ')>0){ $param = substr($line, 1, strpos($line, ' ') - 1); $value = substr($line, strlen($param) + 2); }else{ $param = substr($line, 1); $value = ''; } if($this->setParam($param, $value)) return false; } return $line; } private function setParam($param, $value) { if($param == 'param' || $param == 'return') $value = $this->formatParamOrReturn($value); if($param == 'class') list($param, $value) = $this->formatClass($value); if(empty($this->params[$param])) { $this->params[$param] = $value; } else if($param == 'param'){ $arr = array($this->params[$param], $value); $this->params[$param] = $arr; } else { $this->params[$param] = $value + $this->params[$param]; } return true; } private function formatClass($value) { $r = preg_split("[\(|\)]",$value); if(is_array($r)){ $param = $r[0]; parse_str($r[1],$value); foreach ($value as $key => $val) { $val = explode(',', $val); if(count($val)>1)$value[$key]=$val; } }else{ $param='Unknown'; } return array($param, $value); } private function formatParamOrReturn($string) { $pos = strpos($string, ' '); $type = substr($string, 0, $pos); return '(' . $type . ')' . substr($string, $pos+1); } } function parse_doc($php_doc_comment){ $p = new DocParser(); return $p->parse($php_doc_comment); $p = new Parser($php_doc_comment); return $p; $php_doc_comment = preg_replace("/(^[\\s]*\\/\\*\\*)
+ class Restler { const VERSION = '2.0.4'; public $url; public $request_method; public $request_format; public $request_data=array(); public $cache_dir; public $base_dir; public $response = 'DefaultResponse'; public $response_format; protected $production_mode; protected $routes= array(); protected $format_map = array(); protected $service_class_instance; protected $service_method; protected $auth_classes = array(); protected $error_classes = array(); private $codes = array( 100 => 'Continue', 101 => 'Switching Protocols', 200 => 'OK', 201 => 'Created', 202 => 'Accepted', 203 => 'Non-Authoritative Information', 204 => 'No Content', 205 => 'Reset Content', 206 => 'Partial Content', 300 => 'Multiple Choices', 301 => 'Moved Permanently', 302 => 'Found', 303 => 'See Other', 304 => 'Not Modified', 305 => 'Use Proxy', 306 => '(Unused)', 307 => 'Temporary Redirect', 400 => 'Bad Request', 401 => 'Unauthorized', 402 => 'Payment Required', 403 => 'Forbidden', 404 => 'Not Found', 405 => 'Method Not Allowed', 406 => 'Not Acceptable', 407 => 'Proxy Authentication Required', 408 => 'Request Timeout', 409 => 'Conflict', 410 => 'Gone', 411 => 'Length Required', 412 => 'Precondition Failed', 413 => 'Request Entity Too Large', 414 => 'Request-URI Too Long', 415 => 'Unsupported Media Type', 416 => 'Requested Range Not Satisfiable', 417 => 'Expectation Failed', 500 => 'Internal Server Error', 501 => 'Not Implemented', 502 => 'Bad Gateway', 503 => 'Service Unavailable', 504 => 'Gateway Timeout', 505 => 'HTTP Version Not Supported' ); protected $cached; public function __construct ($production_mode = FALSE) { $this->production_mode = $production_mode; $this->cache_dir = getcwd(); $this->base_dir = RESTLER_PATH; } public function __destruct () { if ($this->production_mode && !$this->cached) { $this->saveCache(); } } public function refreshCache () { $this->routes = array(); $this->cached = FALSE; } public function setSupportedFormats () { $args = func_get_args(); $extensions = array(); foreach ($args as $class_name) { if(!is_string($class_name) || !class_exists($class_name)){ throw new Exception("$class_name is not a vaild Format Class."); } $obj = new $class_name; if(! $obj instanceof iFormat){ throw new Exception('Invalid format class; must implement '. 'iFormat interface'); } foreach ($obj->getMIMEMap() as $extension => $mime) { if(!isset($this->format_map[$extension])) $this->format_map[$extension]=$class_name; if(!isset($this->format_map[$mime])) $this->format_map[$mime]=$class_name; $extensions[".$extension"]=TRUE; } } $this->format_map['default']=$args[0]; $this->format_map['extensions']=array_keys($extensions); } public function addAPIClass($class_name, $base_path = NULL) { if(!class_exists($class_name)){ throw new Exception("API class $class_name is missing."); } $this->loadCache(); if(!$this->cached){ if(is_null($base_path))$base_path=strtolower($class_name); $base_path = trim($base_path,'/'); if(strlen($base_path)>0)$base_path .= '/'; $this->generateMap($class_name, $base_path); } } public function addAuthenticationClass ($class_name, $base_path = NULL) { $this->auth_classes[] = $class_name; $this->addAPIClass($class_name, $base_path); } public function addErrorClass ($class_name) { $this->error_classes[] = $class_name; } public function handleError ($status_code, $error_message = NULL) { $method = "handle$status_code"; $handled = FALSE; foreach ($this->error_classes as $class_name) { if (method_exists($class_name, $method)) { $obj = new $class_name(); $obj->restler = $this; $obj->$method(); $handled = TRUE; } } if($handled)return; $message = $this->codes[$status_code] . (!$error_message ? '' : ': ' . $error_message); $this->setStatus($status_code); $this->sendData( call_user_func( array($this->response, '__formatError'), $status_code, $message) ); } public function handle () { if(empty($this->format_map))$this->setSupportedFormats('JsonFormat'); $this->url = $this->getPath(); $this->request_method = $this->getRequestMethod(); $this->response_format = $this->getResponseFormat(); $this->request_format = $this->getRequestFormat(); if(is_null($this->request_format)){ $this->request_format = $this->response_format; } if($this->request_method == 'PUT' || $this->request_method == 'POST'){ $this->request_data = $this->getRequestData(); } $o = $this->mapUrlToMethod(); if(!isset($o->class_name)){ $this->handleError(404); }else{ try { if($o->method_flag){ $auth_method = '__isAuthenticated'; if(!count($this->auth_classes))throw new RestException(401); foreach ($this->auth_classes as $auth_class) { $auth_obj = new $auth_class(); $auth_obj->restler=$this; $this->applyClassMetadata($auth_class, $auth_obj, $o); if (!method_exists($auth_obj, $auth_method)) { throw new RestException(401, 'Authentication Class '. 'should implement iAuthenticate'); }elseif(!$auth_obj->$auth_method()){ throw new RestException(401); } } } $this->applyClassMetadata(get_class($this->request_format), $this->request_format, $o); $pre_process = '_'.$this->request_format->getExtension().'_'. $o->method_name; $this->service_method = $o->method_name; if($o->method_flag==2)$o=unprotect($o); $object = $this->service_class_instance = new $o->class_name(); $object->restler=$this; if(method_exists($o->class_name, $pre_process)) { call_user_func_array(array($object, $pre_process), $o->arguments); } switch ($o->method_flag) { case 3: $reflection_method = new ReflectionMethod($object, $o->method_name); $reflection_method->setAccessible(TRUE); $result = $reflection_method->invokeArgs($object, $o->arguments); break; case 2: case 1: default: $result = call_user_func_array(array($object, $o->method_name), $o->arguments); } } catch (RestException $e) { $this->handleError($e->getCode(), $e->getMessage()); } } if (isset($result) && $result !== NULL) { $this->sendData($result); } } public function sendData($data) { $data = $this->response_format->encode($data, !$this->production_mode); $post_process = '_'.$this->service_method .'_'. $this->response_format->getExtension(); if(isset($this->service_class_instance) && method_exists($this->service_class_instance,$post_process)){ $data = call_user_func(array($this->service_class_instance, $post_process), $data); } header("Cache-Control: no-cache, must-revalidate"); header("Expires: 0"); header('Content-Type: ' . $this->response_format->getMIME()); header("X-Powered-By: Luracast Restler v".Restler::VERSION); die($data); } public function setStatus($code) { header("{$_SERVER['SERVER_PROTOCOL']} $code ". $this->codes[strval($code)]); } public function removeCommonPath($first, $second, $char='/'){ $first = explode($char, $first); $second = explode($char, $second); while (count($second)){ if($first[0]==$second[0]){ array_shift($first); } else break; array_shift($second); } return implode($char, $first); } public function saveCache() { $file = $this->cache_dir . '/routes.php'; $s = '$o=array();'.PHP_EOL; foreach ($this->routes as $key => $value) { $s .= PHP_EOL.PHP_EOL.PHP_EOL."############### $key ###############" .PHP_EOL.PHP_EOL; $s .= '$o[\''.$key.'\']=array();'; foreach ($value as $ke => $va) { $s .= PHP_EOL.PHP_EOL."#==== $key $ke".PHP_EOL.PHP_EOL; $s .= '$o[\''.$key.'\'][\''.$ke.'\']='.str_replace(PHP_EOL, PHP_EOL."\t", var_export($va, TRUE)).';'; } } $s .= PHP_EOL.'return $o;'; $r=@file_put_contents($file, "<?php $s"); @chmod($file, 0777); if($r===FALSE)throw new Exception( "The cache directory located at '$this->cache_dir' needs to have ". "the permissions set to read/write/execute for everyone in order ". "to save cache and improve performance."); } protected function getPath () { $path = urldecode($this->removeCommonPath($_SERVER['REQUEST_URI'], $_SERVER['SCRIPT_NAME'])); $path = preg_replace('/(\/*\?.*$)|(\/$)/', '', $path); $path = str_replace($this->format_map['extensions'], '', $path); return $path; } protected function getRequestMethod () { $method = $_SERVER['REQUEST_METHOD']; if (isset($_SERVER['HTTP_X_HTTP_METHOD_OVERRIDE'])){ $method = $_SERVER['HTTP_X_HTTP_METHOD_OVERRIDE']; } return $method; } protected function getRequestFormat () { $format=NULL; if(isset($_SERVER['CONTENT_TYPE'])){ $mime = explode(';', $_SERVER['CONTENT_TYPE']); $mime = $mime[0]; if($mime==UrlEncodedFormat::MIME){ $format = new UrlEncodedFormat(); }else{ if(isset($this->format_map[$mime])){ $format = $this->format_map[$mime]; $format = is_string($format) ? new $format: $format; $format->setMIME($mime); } } } return $format; } protected function getResponseFormat () { $format=NULL; $extension = explode('.', parse_url($_SERVER['REQUEST_URI'], PHP_URL_PATH)); $extension = array_pop($extension); if($extension && isset($this->format_map[$extension])){ $format = $this->format_map[$extension]; $format = is_string($format) ? new $format: $format; $format->setExtension($extension); return $format; } if(isset($_SERVER['HTTP_ACCEPT'])){ $accepts = explode(',', $_SERVER['HTTP_ACCEPT']); foreach ($accepts as $accept) { if($extension && isset($this->format_map[$accept])){ $format = $this->format_map[$accept]; $format = is_string($format) ? new $format: $format; $format->setMIME($accept); return $format; } } } $format = new $this->format_map['default']; return $format; } protected function getRequestData() { try{ $r = file_get_contents('php://input'); if(is_null($r))return $_GET; $r =$this->request_format->decode($r); return is_null($r) ? array(): $r; } catch (RestException $e) { $this->handleError($e->getCode(), $e->getMessage()); } } protected function mapUrlToMethod () { if(!isset($this->routes[$this->request_method])){ return array(); } $urls = $this->routes[$this->request_method]; if(!$urls)return array(); $found = FALSE; $this->request_data += $_GET; $params = array('request_data'=>$this->request_data); $params += $this->request_data; foreach ($urls as $url => $call) { $call = (object)$call; if(strstr($url, ':')){ $regex = preg_replace('/\\\:([^\/]+)/', '(?P<$1>[^/]+)', preg_quote($url)); if (preg_match(":^$regex$:", $this->url, $matches)) { foreach ($matches as $arg => $match) { if (isset($call->arguments[$arg])){ $params[$arg] = $match; } } $found = TRUE; break; } }elseif ($url == $this->url){ $found = TRUE; break; } } if($found){ $p = $call->defaults; foreach ($call->arguments as $key => $value) { if(isset($params[$key]))$p[$value] = $params[$key]; } $call->arguments=$p; return $call; } } protected function applyClassMetadata($class_name, $instance, $method_info){ if(isset($method_info->metadata[$class_name]) && is_array($method_info->metadata[$class_name])){ foreach ($method_info->metadata[$class_name] as $property => $value){ if(property_exists($class_name, $property)){ $reflection_property = new ReflectionProperty($class_name, $property); $reflection_property->setValue($instance, $value); } } } } protected function loadCache() { if ($this->cached !== NULL) { return; } $file = $this->cache_dir . '/routes.php'; $this->cached = FALSE; if ($this->production_mode) { if (file_exists($file)) { $routes = include($file); } if (isset($routes) && is_array($routes)) { $this->routes = $routes; $this->cached = TRUE; } } else { } } protected function generateMap ($class_name, $base_path = "") { $reflection = new ReflectionClass($class_name); $class_metadata = parse_doc($reflection->getDocComment()); $methods = $reflection->getMethods( ReflectionMethod::IS_PUBLIC + ReflectionMethod::IS_PROTECTED); foreach ($methods as $method) { $doc = $method->getDocComment(); $arguments = array(); $defaults = array(); $metadata = $class_metadata+parse_doc($doc); $params = $method->getParameters(); $position=0; foreach ($params as $param){ $arguments[$param->getName()] = $position; $defaults[$position] = $param->isDefaultValueAvailable() ? $param->getDefaultValue() : NULL; $position++; } $method_flag = $method->isProtected() ? (isRestlerCompatibilityModeEnabled() ? 2 : 3) : (isset($metadata['protected']) ? 1 : 0); $call = array( 'class_name'=>$class_name, 'method_name'=>$method->getName(), 'arguments'=>$arguments, 'defaults'=>$defaults, 'metadata'=>$metadata, 'method_flag'=>$method_flag ); $method_url = strtolower($method->getName()); if (preg_match_all( '/@url\s+(GET|POST|PUT|DELETE|HEAD|OPTIONS)[ \t]*\/?(\S*)/s', $doc, $matches, PREG_SET_ORDER)) { foreach ($matches as $match) { $http_method = $match[1]; $url = rtrim($base_path . $match[2],'/'); $this->routes[$http_method][$url] = $call; } }elseif($method_url[0] != '_'){ if (preg_match_all('/^(GET|POST|PUT|DELETE|HEAD|OPTIONS)/i', $method_url, $matches)) { $http_method = strtoupper($matches[0][0]); $method_url = substr($method_url, strlen($http_method)); }else{ $http_method = 'GET'; } $url = $base_path. ($method_url=='index' || $method_url=='default' ? '' : $method_url); $url = rtrim($url,'/'); $this->routes[$http_method][$url] = $call; foreach ($params as $param){ if($param->getName()=='request_data'){ break; } $url .= $url=='' ? ':' : '/:'; $url .= $param->getName(); $this->routes[$http_method][$url] = $call; } } } } } if(version_compare(PHP_VERSION, '5.3.0') < 0){ require_once 'compat.php'; } class RestException extends Exception { public function __construct($http_status_code, $error_message = NULL) { parent::__construct($error_message, $http_status_code); } } interface iRespond { public function __formatResponse($result); public function __formatError($status_code, $message); } class DefaultResponse implements iRespond { function __formatResponse($result) { return $result; } function __formatError($statusCode, $message) { return array('error' => array('code' => $statusCode, 'message' => $message)); } } interface iAuthenticate { public function __isAuthenticated(); } interface iFormat { public function getMIMEMap(); public function setMIME($mime); public function getMIME(); public function setExtension($extension); public function getExtension(); public function encode($data, $human_readable=FALSE); public function decode($data); } class UrlEncodedFormat implements iFormat { const MIME = 'application/x-www-form-urlencoded'; const EXTENSION = 'post'; public function getMIMEMap() { return array(UrlEncodedFormat::EXTENSION=>UrlEncodedFormat::MIME); } public function getMIME(){ return UrlEncodedFormat::MIME; } public function getExtension(){ return UrlEncodedFormat::EXTENSION; } public function setMIME($mime){ } public function setExtension($extension){ } public function encode($data, $human_readable=FALSE){ return http_build_query($data); } public function decode($data){ parse_str($data,$r); return $r; } public function __toString(){ return $this->getExtension(); } } class JsonFormat implements iFormat { const MIME ='application/json'; const EXTENSION = 'json'; public function getMIMEMap() { return array(JsonFormat::EXTENSION=>JsonFormat::MIME); } public function getMIME(){ return JsonFormat::MIME; } public function getExtension(){ return JsonFormat::EXTENSION; } public function setMIME($mime){ } public function setExtension($extension){ } public function encode($data, $human_readable=FALSE){ return $human_readable ? $this->json_format(json_encode(object_to_array($data))) : json_encode(object_to_array($data)); } public function decode($data){ return object_to_array(json_decode($data)); } private function json_format($json) { $tab = "  "; $new_json = ""; $indent_level = 0; $in_string = FALSE; $len = strlen($json); for($c = 0; $c < $len; $c++) { $char = $json[$c]; switch($char) { case '{': case '[': if(!$in_string) { $new_json .= $char . "\n" . str_repeat($tab, $indent_level+1); $indent_level++; } else { $new_json .= $char; } break; case '}': case ']': if(!$in_string) { $indent_level--; $new_json .= "\n".str_repeat($tab, $indent_level).$char; } else { $new_json .= $char; } break; case ',': if(!$in_string) { $new_json .= ",\n" . str_repeat($tab, $indent_level); } else { $new_json .= $char; } break; case ':': if(!$in_string) { $new_json .= ": "; } else { $new_json .= $char; } break; case '"': if($c==0){ $in_string = TRUE; }elseif($c > 0 && $json[$c-1] != '\\') { $in_string = !$in_string; } default: $new_json .= $char; break; } } return $new_json; } public function __toString(){ return $this->getExtension(); } } class DocParser { private $params=array(); function parse($doc='') { if($doc==''){ return $this->params; } if(preg_match('#^/\*\*(.*)\*/#s', $doc, $comment) === false) return $this->params; $comment = trim($comment[1]); if(preg_match_all('#^\s*\*(.*)#m', $comment, $lines) === false) return $this->params; $this->parseLines($lines[1]); return $this->params; } private function parseLines($lines) { foreach($lines as $line) { $parsedLine = $this->parseLine($line); if($parsedLine === false && !isset($this->params['description'])) { if(isset($desc)){ $this->params['description'] = implode(PHP_EOL, $desc); } $desc = array(); } elseif($parsedLine !== false) { $desc[] = $parsedLine; } } $desc = implode(' ', $desc); if(!empty($desc))$this->params['long_description'] = $desc; } private function parseLine($line) { $line = trim($line); if(empty($line)) return false; if(strpos($line, '@') === 0) { if(strpos($line, ' ')>0){ $param = substr($line, 1, strpos($line, ' ') - 1); $value = substr($line, strlen($param) + 2); }else{ $param = substr($line, 1); $value = ''; } if($this->setParam($param, $value)) return false; } return $line; } private function setParam($param, $value) { if($param == 'param' || $param == 'return') $value = $this->formatParamOrReturn($value); if($param == 'class') list($param, $value) = $this->formatClass($value); if(empty($this->params[$param])) { $this->params[$param] = $value; } else if($param == 'param'){ $arr = array($this->params[$param], $value); $this->params[$param] = $arr; } else { $this->params[$param] = $value + $this->params[$param]; } return true; } private function formatClass($value) { $r = preg_split("[\(|\)]",$value); if(is_array($r)){ $param = $r[0]; parse_str($r[1],$value); foreach ($value as $key => $val) { $val = explode(',', $val); if(count($val)>1)$value[$key]=$val; } }else{ $param='Unknown'; } return array($param, $value); } private function formatParamOrReturn($string) { $pos = strpos($string, ' '); $type = substr($string, 0, $pos); return '(' . $type . ')' . substr($string, $pos+1); } } function parse_doc($php_doc_comment){ $p = new DocParser(); return $p->parse($php_doc_comment); $p = new Parser($php_doc_comment); return $p; $php_doc_comment = preg_replace("/(^[\\s]*\\/\\*\\*)
                                  |(^[\\s]\\*\\/)
                                  |(^[\\s]*\\*?\\s)
                                  |(^[\\s]*)

From f8fac79bb50a99416212e57dcb126f8d6d5e7a5d Mon Sep 17 00:00:00 2001
From: Luracast <arul@luracast.com>
Date: Sun, 30 Oct 2011 23:45:22 +0800
Subject: [PATCH 21/61] improved the examples documentation, corrected the
 stack overflow support url in the live examples

---
 examples/_001_helloworld/readme.html     |   2 +-
 examples/_001_helloworld/readme.md       |   0
 examples/_002_minimal/readme.html        |   2 +-
 examples/_002_minimal/readme.md          |   0
 examples/_003_multiformat/readme.html    |   2 +-
 examples/_004_error_response/readme.html |   2 +-
 examples/_005_protected_api/readme.html  |   2 +-
 examples/_006_crud/index.php             |  44 +++++++++++++--
 examples/_006_crud/readme.html           |  66 +++++++++++++++++------
 examples/_006_crud/readme.md             |  59 +++++++++++++++-----
 examples/index.html                      |  33 ++++++++----
 examples/resources/restler_flow.png      | Bin 0 -> 98875 bytes
 12 files changed, 166 insertions(+), 46 deletions(-)
 mode change 100755 => 100644 examples/_001_helloworld/readme.md
 mode change 100755 => 100644 examples/_002_minimal/readme.md
 mode change 100755 => 100644 examples/index.html
 create mode 100644 examples/resources/restler_flow.png

diff --git a/examples/_001_helloworld/readme.html b/examples/_001_helloworld/readme.html
index 89c910261..91aea97f0 100755
--- a/examples/_001_helloworld/readme.html
+++ b/examples/_001_helloworld/readme.html
@@ -35,7 +35,7 @@
 <li><a title="Restler Home" href="http://luracast.com/products/restler/">Home</a></li>
 <!--<li><a title="Using Restler" href="#">Guide</a></li><li><a title="Restler API Reference" href="#">API</a></li>-->
 <li><a class="active" href="../index.html">Examples</a></li>
-<li><a title="Share your knowledge by answering user questions in Stack Overflow." href="http://bit.ly/RestlerSupport">Support</a></li>
+<li><a title="Share your knowledge by answering user questions in Stack Overflow." href="http://bit.ly/Restler-QA">Support</a></li>
 <li><a title="Contribute and Fork Restler on GitHub" href="http://bit.ly/LuracastRestler">GitHub</a></li>
 <li><a title="Get updated on Twitter" href="http://twitter.com/Luracast">Twitter</a></li>
 </ul>
diff --git a/examples/_001_helloworld/readme.md b/examples/_001_helloworld/readme.md
old mode 100755
new mode 100644
diff --git a/examples/_002_minimal/readme.html b/examples/_002_minimal/readme.html
index e54a3f873..835b8d1aa 100755
--- a/examples/_002_minimal/readme.html
+++ b/examples/_002_minimal/readme.html
@@ -35,7 +35,7 @@
 <li><a title="Restler Home" href="http://luracast.com/products/restler/">Home</a></li>
 <!--<li><a title="Using Restler" href="#">Guide</a></li><li><a title="Restler API Reference" href="#">API</a></li>-->
 <li><a class="active" href="../index.html">Examples</a></li>
-<li><a title="Share your knowledge by answering user questions in Stack Overflow." href="http://bit.ly/RestlerSupport">Support</a></li>
+<li><a title="Share your knowledge by answering user questions in Stack Overflow." href="http://bit.ly/Restler-QA">Support</a></li>
 <li><a title="Contribute and Fork Restler on GitHub" href="http://bit.ly/LuracastRestler">GitHub</a></li>
 <li><a title="Get updated on Twitter" href="http://twitter.com/Luracast">Twitter</a></li>
 </ul>
diff --git a/examples/_002_minimal/readme.md b/examples/_002_minimal/readme.md
old mode 100755
new mode 100644
diff --git a/examples/_003_multiformat/readme.html b/examples/_003_multiformat/readme.html
index c2c7f927e..d75e12251 100755
--- a/examples/_003_multiformat/readme.html
+++ b/examples/_003_multiformat/readme.html
@@ -35,7 +35,7 @@
 <li><a title="Restler Home" href="http://luracast.com/products/restler/">Home</a></li>
 <!--<li><a title="Using Restler" href="#">Guide</a></li><li><a title="Restler API Reference" href="#">API</a></li>-->
 <li><a class="active" href="../index.html">Examples</a></li>
-<li><a title="Share your knowledge by answering user questions in Stack Overflow." href="http://bit.ly/RestlerSupport">Support</a></li>
+<li><a title="Share your knowledge by answering user questions in Stack Overflow." href="http://bit.ly/Restler-QA">Support</a></li>
 <li><a title="Contribute and Fork Restler on GitHub" href="http://bit.ly/LuracastRestler">GitHub</a></li>
 <li><a title="Get updated on Twitter" href="http://twitter.com/Luracast">Twitter</a></li>
 </ul>
diff --git a/examples/_004_error_response/readme.html b/examples/_004_error_response/readme.html
index 70a625269..d8394abf1 100755
--- a/examples/_004_error_response/readme.html
+++ b/examples/_004_error_response/readme.html
@@ -35,7 +35,7 @@
 <li><a title="Restler Home" href="http://luracast.com/products/restler/">Home</a></li>
 <!--<li><a title="Using Restler" href="#">Guide</a></li><li><a title="Restler API Reference" href="#">API</a></li>-->
 <li><a class="active" href="../index.html">Examples</a></li>
-<li><a title="Share your knowledge by answering user questions in Stack Overflow." href="http://bit.ly/RestlerSupport">Support</a></li>
+<li><a title="Share your knowledge by answering user questions in Stack Overflow." href="http://bit.ly/Restler-QA">Support</a></li>
 <li><a title="Contribute and Fork Restler on GitHub" href="http://bit.ly/LuracastRestler">GitHub</a></li>
 <li><a title="Get updated on Twitter" href="http://twitter.com/Luracast">Twitter</a></li>
 </ul>
diff --git a/examples/_005_protected_api/readme.html b/examples/_005_protected_api/readme.html
index 59b00e71c..347604cd6 100755
--- a/examples/_005_protected_api/readme.html
+++ b/examples/_005_protected_api/readme.html
@@ -35,7 +35,7 @@
 <li><a title="Restler Home" href="http://luracast.com/products/restler/">Home</a></li>
 <!--<li><a title="Using Restler" href="#">Guide</a></li><li><a title="Restler API Reference" href="#">API</a></li>-->
 <li><a class="active" href="../index.html">Examples</a></li>
-<li><a title="Share your knowledge by answering user questions in Stack Overflow." href="http://bit.ly/RestlerSupport">Support</a></li>
+<li><a title="Share your knowledge by answering user questions in Stack Overflow." href="http://bit.ly/Restler-QA">Support</a></li>
 <li><a title="Contribute and Fork Restler on GitHub" href="http://bit.ly/LuracastRestler">GitHub</a></li>
 <li><a title="Get updated on Twitter" href="http://twitter.com/Luracast">Twitter</a></li>
 </ul>
diff --git a/examples/_006_crud/index.php b/examples/_006_crud/index.php
index aa2eb85d0..4aef23de3 100755
--- a/examples/_006_crud/index.php
+++ b/examples/_006_crud/index.php
@@ -4,12 +4,48 @@
  Tagline: using POST, GET, PUT and DELETE.
  Description: Create, Retrive, Update and Delete using 
  HTTP methods POST, GET, PUT and DELETE respectively. 
- For simplicity and making it work out of the box it is using
+ 
+**How the automatic routing is done?**
+
+Restler uses *get, put, post, and delete* as prefix to map PHP methods to 
+respective HTTP methods. When they are the only method names they map at
+the class level similar to *index* and *default*
+
+	GET/POST/PUT/DELETE class_name
+
+
+GET is the default HTTP method so all public functions without any of 
+these prefixes will be mapped to GET request. This means functions 
+*getResult* and *result* will both be mapped to
+
+	GET class_name/result
+
+Similarly method *postSomething* will be mapped to 
+
+	POST class_name/something
+
+For simplicity and making it work out of the box this example is using
  a session based fake database, thus depending on a client that
- supports PHP Session Cookies. You may use [REST Console](https://chrome.google.com/webstore/detail/faceofpmfclkengnkgkgjkcibdbhemoc#)
- an extension for Chrome or [RESTClient](https://addons.mozilla.org/en-US/firefox/addon/restclient/) 
- a firefox extension.
+ supports PHP Session Cookies. You may use 
+ [REST Console](https://chrome.google.com/webstore/detail/faceofpmfclkengnkgkgjkcibdbhemoc#)
+ an extension for Chrome or 
+ [RESTClient](https://addons.mozilla.org/en-US/firefox/addon/restclient/) 
+ a firefox extension. 
  
+ Alternatively you can use [cURL](http://en.wikipedia.org/wiki/CURL) on the command line. 
+ 
+ 	curl-X POST http://help.luracast.com/restler/examples/_006_crud/index.php/author -H "Content-Type: application/json" -d '{"name": "Another", "email": "another@email.com"}'
+ 	
+ 	{
+      "name": "Another",
+      "email": "another@email.com",
+      "id": 5
+	}
+
+But since the session wont be working next request wont reflect the 
+change done by previous request, anyway you get the idea. 
+.
+
  Example 1: GET author returns 
  
 [
diff --git a/examples/_006_crud/readme.html b/examples/_006_crud/readme.html
index 4fc3e4968..9c1794a42 100755
--- a/examples/_006_crud/readme.html
+++ b/examples/_006_crud/readme.html
@@ -35,7 +35,7 @@
 <li><a title="Restler Home" href="http://luracast.com/products/restler/">Home</a></li>
 <!--<li><a title="Using Restler" href="#">Guide</a></li><li><a title="Restler API Reference" href="#">API</a></li>-->
 <li><a class="active" href="../index.html">Examples</a></li>
-<li><a title="Share your knowledge by answering user questions in Stack Overflow." href="http://bit.ly/RestlerSupport">Support</a></li>
+<li><a title="Share your knowledge by answering user questions in Stack Overflow." href="http://bit.ly/Restler-QA">Support</a></li>
 <li><a title="Contribute and Fork Restler on GitHub" href="http://bit.ly/LuracastRestler">GitHub</a></li>
 <li><a title="Get updated on Twitter" href="http://twitter.com/Luracast">Twitter</a></li>
 </ul>
@@ -51,12 +51,50 @@ <h3><a href="../index.html">Examples</a></h3>
 <h2>CRUD</h2>
 
 <p>Create, Retrive, Update and Delete using 
-HTTP methods POST, GET, PUT and DELETE respectively. 
-For simplicity and making it work out of the box it is using
+HTTP methods POST, GET, PUT and DELETE respectively.</p>
+
+<p><strong>How the automatic routing is done?</strong></p>
+
+<p>Restler uses <em>get, put, post, and delete</em> as prefix to map PHP methods to 
+respective HTTP methods. When they are the only method names they map at
+the class level similar to <em>index</em> and <em>default</em></p>
+
+<pre><code>GET/POST/PUT/DELETE class_name
+</code></pre>
+
+<p>GET is the default HTTP method so all public functions without any of 
+these prefixes will be mapped to GET request. This means functions 
+<em>getResult</em> and <em>result</em> will both be mapped to</p>
+
+<pre><code>GET class_name/result
+</code></pre>
+
+<p>Similarly method <em>postSomething</em> will be mapped to</p>
+
+<pre><code>POST class_name/something
+</code></pre>
+
+<p>For simplicity and making it work out of the box this example is using
 a session based fake database, thus depending on a client that
-supports PHP Session Cookies. You may use <a href="https://chrome.google.com/webstore/detail/faceofpmfclkengnkgkgjkcibdbhemoc#" target="_blank">REST Console</a>
-an extension for Chrome or <a href="https://addons.mozilla.org/en-US/firefox/addon/restclient/" target="_blank">RESTClient</a> 
-a firefox extension</p>
+supports PHP Session Cookies. You may use 
+<a href="https://chrome.google.com/webstore/detail/faceofpmfclkengnkgkgjkcibdbhemoc#" target="_blank">REST Console</a>
+an extension for Chrome or 
+<a href="https://addons.mozilla.org/en-US/firefox/addon/restclient/" target="_blank">RESTClient</a> 
+a firefox extension.</p>
+
+<p>Alternatively you can use <a href="http://en.wikipedia.org/wiki/CURL" target="_blank">cURL</a> on the command line.</p>
+
+<pre><code>curl-X POST http://help.luracast.com/restler/examples/_006_crud/index.php/author -H "Content-Type: application/json" -d '{"name": "Another", "email": "another@email.com"}'
+
+{
+ "name": "Another",
+ "email": "another@email.com",
+ "id": 5
+}
+</code></pre>
+
+<p>But since the session wont be working next request wont reflect the 
+change done by previous request, anyway you get the idea.</p>
 
 <blockquote>
   <p>This API Server is made using the following php files/folders</p>
@@ -71,15 +109,13 @@ <h2>CRUD</h2>
 
 <p>This API Server exposes the following URIs</p>
 
-<pre><code>GET    author                   ⇠ Author::get()
-GET    author/:id               ⇠ Author::get()
-POST   author                   ⇠ Author::post()
-POST   author/:request_data     ⇠ Author::post()
-PUT    author                   ⇠ Author::put()
-PUT    author/:id               ⇠ Author::put()
-PUT    author/:id/:request_data ⇠ Author::put()
-DELETE author                   ⇠ Author::delete()
-DELETE author/:id               ⇠ Author::delete()
+<pre><code>GET    author     ⇠ Author::get()
+GET    author/:id ⇠ Author::get()
+POST   author     ⇠ Author::post()
+PUT    author     ⇠ Author::put()
+PUT    author/:id ⇠ Author::put()
+DELETE author     ⇠ Author::delete()
+DELETE author/:id ⇠ Author::delete()
 </code></pre>
 
 <p>Try the following links in your browser</p>
diff --git a/examples/_006_crud/readme.md b/examples/_006_crud/readme.md
index 2b9a7a3f6..b54de64e5 100755
--- a/examples/_006_crud/readme.md
+++ b/examples/_006_crud/readme.md
@@ -3,11 +3,46 @@ CRUD
 
 Create, Retrive, Update and Delete using 
 HTTP methods POST, GET, PUT and DELETE respectively. 
-For simplicity and making it work out of the box it is using
+
+**How the automatic routing is done?**
+
+Restler uses *get, put, post, and delete* as prefix to map PHP methods to 
+respective HTTP methods. When they are the only method names they map at
+the class level similar to *index* and *default*
+
+	GET/POST/PUT/DELETE class_name
+
+
+GET is the default HTTP method so all public functions without any of 
+these prefixes will be mapped to GET request. This means functions 
+*getResult* and *result* will both be mapped to
+
+	GET class_name/result
+
+Similarly method *postSomething* will be mapped to 
+
+	POST class_name/something
+
+For simplicity and making it work out of the box this example is using
 a session based fake database, thus depending on a client that
-supports PHP Session Cookies. You may use [REST Console](https://chrome.google.com/webstore/detail/faceofpmfclkengnkgkgjkcibdbhemoc#)
-an extension for Chrome or [RESTClient](https://addons.mozilla.org/en-US/firefox/addon/restclient/) 
-a firefox extension
+supports PHP Session Cookies. You may use 
+[REST Console](https://chrome.google.com/webstore/detail/faceofpmfclkengnkgkgjkcibdbhemoc#)
+an extension for Chrome or 
+[RESTClient](https://addons.mozilla.org/en-US/firefox/addon/restclient/) 
+a firefox extension. 
+
+Alternatively you can use [cURL](http://en.wikipedia.org/wiki/CURL) on the command line. 
+
+	curl-X POST http://help.luracast.com/restler/examples/_006_crud/index.php/author -H "Content-Type: application/json" -d '{"name": "Another", "email": "another@email.com"}'
+	
+	{
+     "name": "Another",
+     "email": "another@email.com",
+     "id": 5
+	}
+
+But since the session wont be working next request wont reflect the 
+change done by previous request, anyway you get the idea.
 > This API Server is made using the following php files/folders
 
 > * index.php      (gateway)
@@ -17,15 +52,13 @@ a firefox extension
 
 This API Server exposes the following URIs
 
-	GET    author                   ⇠ Author::get()
-	GET    author/:id               ⇠ Author::get()
-	POST   author                   ⇠ Author::post()
-	POST   author/:request_data     ⇠ Author::post()
-	PUT    author                   ⇠ Author::put()
-	PUT    author/:id               ⇠ Author::put()
-	PUT    author/:id/:request_data ⇠ Author::put()
-	DELETE author                   ⇠ Author::delete()
-	DELETE author/:id               ⇠ Author::delete()
+	GET    author     ⇠ Author::get()
+	GET    author/:id ⇠ Author::get()
+	POST   author     ⇠ Author::post()
+	PUT    author     ⇠ Author::put()
+	PUT    author/:id ⇠ Author::put()
+	DELETE author     ⇠ Author::delete()
+	DELETE author/:id ⇠ Author::delete()
 
 
 Try the following links in your browser
diff --git a/examples/index.html b/examples/index.html
old mode 100755
new mode 100644
index 61cda3716..346317a98
--- a/examples/index.html
+++ b/examples/index.html
@@ -30,7 +30,7 @@
 <li><a title="Restler Home" href="http://luracast.com/products/restler/">Home</a></li>
 <!--<li><a title="Using Restler" href="#">Guide</a></li><li><a title="Restler API Reference" href="#">API</a></li>-->
 <li><a class="active" href="index.html">Examples</a></li>
-<li><a title="Share your knowledge by answering user questions in Stack Overflow." href="http://bit.ly/RestlerSupport">Support</a></li>
+<li><a title="Share your knowledge by answering user questions in Stack Overflow." href="http://bit.ly/Restler-QA">Support</a></li>
 <li><a title="Contribute and Fork Restler on GitHub" href="http://bit.ly/LuracastRestler">GitHub</a></li>
 <li><a title="Get updated on Twitter" href="http://twitter.com/Luracast">Twitter</a></li>
 </ul>
@@ -42,11 +42,17 @@ <h3><a href="index.html">Examples</a></h3>
 <ul><li><a href="_001_helloworld/readme.html" title="Let's say hello!">Hello World</a></li><li><a href="_002_minimal/readme.html" title="Less is more">Minimal</a></li><li><a href="_003_multiformat/readme.html" title="Serving what the client wants">Multi-format</a></li><li><a href="_004_error_response/readme.html" title="Making use of HTTP status codes">Error Response</a></li><li><a href="_005_protected_api/readme.html" title="Creating restricted zone">Protected API</a></li><li><a href="_006_crud/readme.html" title="using POST, GET, PUT and DELETE">CRUD</a></li></ul>
 </nav>
 <article id="right">
-<h2>Examples</h2>
-<p>Luracast Restler is a microframework to expose php methods as RESTful API. Best way to learn is by examples, 
-here you can find the examples that shows every feature of Restler and how to use them.</p>
-<p>We have created it in such a way that they can be tested on your local host.</p>
-<p>You can check the source code, try some of the API's exposed at the comfort of your browser</p>
+<h2>Live Examples</h2>
+
+<p>Luracast Restler is a single file framework that can expose any PHP class (with zero arguments constructor)
+and its public and protected methods (that manage their own dependencies) as RESTful API.</p>
+
+<p><strong>Learn by the examples</strong></p>
+
+<p>Here you can find the examples that shows many features of Restler and 
+how to use them. It is created in such a way that they can be tested 
+on your local host. You can check the source code, try some of the API's 
+exposed all at the comfort of your browser</p>
 <ol class="toc">
 	<li><a href="_001_helloworld/readme.html" title="Basic hello world example to get started with Restler 2.0">
 <span>Hello World 
@@ -78,14 +84,23 @@ <h2>Examples</h2>
 </span> <span class="right">&nbsp;5</span></a></li>
 	<li><a href="_006_crud/readme.html" title="Create, Retrive, Update and Delete using 
 HTTP methods POST, GET, PUT and DELETE respectively. 
-For simplicity and making it work out of the box it is using
-a session based fake database, thus depending on a client that
-supports PHP Session Cookies">
+
+**How the automatic routing is done?**
+
+Restler uses *get, put, post, and delete* as prefix to map PHP methods to 
+respective HTTP methods">
 <span>CRUD 
 <small><i>using POST, GET, PUT and DELETE</i></small>
 </span> <span class="right">&nbsp;6</span></a></li>
 
 </ol>
+<p> </p>
+<p> <img src="resources/restler_flow.png" alt="Restler Flow Diagram" title="Restler Flow" width="100%">
+<strong>Restler Execution Flow</strong>
+</p>
+<p> </p>
+<p> </p>
+<p> </p>
 </article>
 <footer>
 &#169; 2010 <a title="Luracast.com" href="http://luracast.com"><img src="resources/Luracast_dark.png" width="180" height="32" title="Helping Developers with Tools, Utilities, Frameworks and Services"/></a>
diff --git a/examples/resources/restler_flow.png b/examples/resources/restler_flow.png
new file mode 100644
index 0000000000000000000000000000000000000000..ac8b2412fe6200d76e95cbb7381e443f28dc69e6
GIT binary patch
literal 98875
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

literal 0
HcmV?d00001


From e16417dec33749a0f395e324e4a25d2b709b9316 Mon Sep 17 00:00:00 2001
From: Ragunathan Arul Kumaran <arul@luracast.com>
Date: Wed, 9 Nov 2011 16:29:22 +0800
Subject: [PATCH 22/61] Improved JsonFormat to throw meaningful error messages
 when the JSON request is malformed. It will work on PHP 3.3 and above. Older
 versions will retain previous behavior.

---
 restler/restler.php          | 36 ++++++++++++++++++++++++++++++++----
 restler_minified/restler.php |  2 +-
 2 files changed, 33 insertions(+), 5 deletions(-)

diff --git a/restler/restler.php b/restler/restler.php
index d072c6908..e3ba7dfdd 100644
--- a/restler/restler.php
+++ b/restler/restler.php
@@ -10,10 +10,10 @@
  * @copyright  2010 Luracast
  * @license    http://www.opensource.org/licenses/lgpl-license.php LGPL
  * @link       http://luracast.com/products/restler/
- * @version    2.0.4
+ * @version    2.0.5
  */
 class Restler {
-	const VERSION = '2.0.4';
+	const VERSION = '2.0.5';
 	/**
 	 * URL of the currently mapped service
 	 * @var string
@@ -936,8 +936,36 @@ public function encode($data, $human_readable=FALSE){
 		$this->json_format(json_encode(object_to_array($data))) : 
 		json_encode(object_to_array($data));
 	}
-	public function decode($data){
-		return object_to_array(json_decode($data));
+	public function decode($data) {
+		$decoded = json_decode ( $data );
+		if (function_exists ( 'json_last_error' )) {
+			$message = '';
+			switch (json_last_error ()) {
+				case JSON_ERROR_NONE :
+					return object_to_array ( $decoded );
+					break;
+				case JSON_ERROR_DEPTH :
+					$message = 'maximum stack depth exceeded';
+					break;
+				case JSON_ERROR_STATE_MISMATCH :
+					$message = 'underflow or the modes mismatch';
+					break;
+				case JSON_ERROR_CTRL_CHAR :
+					$message = 'unexpected control character found';
+					break;
+				case JSON_ERROR_SYNTAX :
+					$message = 'malformed JSON';
+					break;
+				case JSON_ERROR_UTF8 :
+					$message = 'malformed UTF-8 characters, possibly incorrectly encoded';
+					break;
+				default :
+					$message = 'unknown error';
+					break;
+			}
+			throw new RestException ( 400, 'Error parsing JSON, ' . $message );
+		}
+		return object_to_array ( $decoded );
 	}
 
 	/**
diff --git a/restler_minified/restler.php b/restler_minified/restler.php
index 92c262fb0..54537c2c9 100644
--- a/restler_minified/restler.php
+++ b/restler_minified/restler.php
@@ -1,5 +1,5 @@
 <?php
- class Restler { const VERSION = '2.0.4'; public $url; public $request_method; public $request_format; public $request_data=array(); public $cache_dir; public $base_dir; public $response = 'DefaultResponse'; public $response_format; protected $production_mode; protected $routes= array(); protected $format_map = array(); protected $service_class_instance; protected $service_method; protected $auth_classes = array(); protected $error_classes = array(); private $codes = array( 100 => 'Continue', 101 => 'Switching Protocols', 200 => 'OK', 201 => 'Created', 202 => 'Accepted', 203 => 'Non-Authoritative Information', 204 => 'No Content', 205 => 'Reset Content', 206 => 'Partial Content', 300 => 'Multiple Choices', 301 => 'Moved Permanently', 302 => 'Found', 303 => 'See Other', 304 => 'Not Modified', 305 => 'Use Proxy', 306 => '(Unused)', 307 => 'Temporary Redirect', 400 => 'Bad Request', 401 => 'Unauthorized', 402 => 'Payment Required', 403 => 'Forbidden', 404 => 'Not Found', 405 => 'Method Not Allowed', 406 => 'Not Acceptable', 407 => 'Proxy Authentication Required', 408 => 'Request Timeout', 409 => 'Conflict', 410 => 'Gone', 411 => 'Length Required', 412 => 'Precondition Failed', 413 => 'Request Entity Too Large', 414 => 'Request-URI Too Long', 415 => 'Unsupported Media Type', 416 => 'Requested Range Not Satisfiable', 417 => 'Expectation Failed', 500 => 'Internal Server Error', 501 => 'Not Implemented', 502 => 'Bad Gateway', 503 => 'Service Unavailable', 504 => 'Gateway Timeout', 505 => 'HTTP Version Not Supported' ); protected $cached; public function __construct ($production_mode = FALSE) { $this->production_mode = $production_mode; $this->cache_dir = getcwd(); $this->base_dir = RESTLER_PATH; } public function __destruct () { if ($this->production_mode && !$this->cached) { $this->saveCache(); } } public function refreshCache () { $this->routes = array(); $this->cached = FALSE; } public function setSupportedFormats () { $args = func_get_args(); $extensions = array(); foreach ($args as $class_name) { if(!is_string($class_name) || !class_exists($class_name)){ throw new Exception("$class_name is not a vaild Format Class."); } $obj = new $class_name; if(! $obj instanceof iFormat){ throw new Exception('Invalid format class; must implement '. 'iFormat interface'); } foreach ($obj->getMIMEMap() as $extension => $mime) { if(!isset($this->format_map[$extension])) $this->format_map[$extension]=$class_name; if(!isset($this->format_map[$mime])) $this->format_map[$mime]=$class_name; $extensions[".$extension"]=TRUE; } } $this->format_map['default']=$args[0]; $this->format_map['extensions']=array_keys($extensions); } public function addAPIClass($class_name, $base_path = NULL) { if(!class_exists($class_name)){ throw new Exception("API class $class_name is missing."); } $this->loadCache(); if(!$this->cached){ if(is_null($base_path))$base_path=strtolower($class_name); $base_path = trim($base_path,'/'); if(strlen($base_path)>0)$base_path .= '/'; $this->generateMap($class_name, $base_path); } } public function addAuthenticationClass ($class_name, $base_path = NULL) { $this->auth_classes[] = $class_name; $this->addAPIClass($class_name, $base_path); } public function addErrorClass ($class_name) { $this->error_classes[] = $class_name; } public function handleError ($status_code, $error_message = NULL) { $method = "handle$status_code"; $handled = FALSE; foreach ($this->error_classes as $class_name) { if (method_exists($class_name, $method)) { $obj = new $class_name(); $obj->restler = $this; $obj->$method(); $handled = TRUE; } } if($handled)return; $message = $this->codes[$status_code] . (!$error_message ? '' : ': ' . $error_message); $this->setStatus($status_code); $this->sendData( call_user_func( array($this->response, '__formatError'), $status_code, $message) ); } public function handle () { if(empty($this->format_map))$this->setSupportedFormats('JsonFormat'); $this->url = $this->getPath(); $this->request_method = $this->getRequestMethod(); $this->response_format = $this->getResponseFormat(); $this->request_format = $this->getRequestFormat(); if(is_null($this->request_format)){ $this->request_format = $this->response_format; } if($this->request_method == 'PUT' || $this->request_method == 'POST'){ $this->request_data = $this->getRequestData(); } $o = $this->mapUrlToMethod(); if(!isset($o->class_name)){ $this->handleError(404); }else{ try { if($o->method_flag){ $auth_method = '__isAuthenticated'; if(!count($this->auth_classes))throw new RestException(401); foreach ($this->auth_classes as $auth_class) { $auth_obj = new $auth_class(); $auth_obj->restler=$this; $this->applyClassMetadata($auth_class, $auth_obj, $o); if (!method_exists($auth_obj, $auth_method)) { throw new RestException(401, 'Authentication Class '. 'should implement iAuthenticate'); }elseif(!$auth_obj->$auth_method()){ throw new RestException(401); } } } $this->applyClassMetadata(get_class($this->request_format), $this->request_format, $o); $pre_process = '_'.$this->request_format->getExtension().'_'. $o->method_name; $this->service_method = $o->method_name; if($o->method_flag==2)$o=unprotect($o); $object = $this->service_class_instance = new $o->class_name(); $object->restler=$this; if(method_exists($o->class_name, $pre_process)) { call_user_func_array(array($object, $pre_process), $o->arguments); } switch ($o->method_flag) { case 3: $reflection_method = new ReflectionMethod($object, $o->method_name); $reflection_method->setAccessible(TRUE); $result = $reflection_method->invokeArgs($object, $o->arguments); break; case 2: case 1: default: $result = call_user_func_array(array($object, $o->method_name), $o->arguments); } } catch (RestException $e) { $this->handleError($e->getCode(), $e->getMessage()); } } if (isset($result) && $result !== NULL) { $this->sendData($result); } } public function sendData($data) { $data = $this->response_format->encode($data, !$this->production_mode); $post_process = '_'.$this->service_method .'_'. $this->response_format->getExtension(); if(isset($this->service_class_instance) && method_exists($this->service_class_instance,$post_process)){ $data = call_user_func(array($this->service_class_instance, $post_process), $data); } header("Cache-Control: no-cache, must-revalidate"); header("Expires: 0"); header('Content-Type: ' . $this->response_format->getMIME()); header("X-Powered-By: Luracast Restler v".Restler::VERSION); die($data); } public function setStatus($code) { header("{$_SERVER['SERVER_PROTOCOL']} $code ". $this->codes[strval($code)]); } public function removeCommonPath($first, $second, $char='/'){ $first = explode($char, $first); $second = explode($char, $second); while (count($second)){ if($first[0]==$second[0]){ array_shift($first); } else break; array_shift($second); } return implode($char, $first); } public function saveCache() { $file = $this->cache_dir . '/routes.php'; $s = '$o=array();'.PHP_EOL; foreach ($this->routes as $key => $value) { $s .= PHP_EOL.PHP_EOL.PHP_EOL."############### $key ###############" .PHP_EOL.PHP_EOL; $s .= '$o[\''.$key.'\']=array();'; foreach ($value as $ke => $va) { $s .= PHP_EOL.PHP_EOL."#==== $key $ke".PHP_EOL.PHP_EOL; $s .= '$o[\''.$key.'\'][\''.$ke.'\']='.str_replace(PHP_EOL, PHP_EOL."\t", var_export($va, TRUE)).';'; } } $s .= PHP_EOL.'return $o;'; $r=@file_put_contents($file, "<?php $s"); @chmod($file, 0777); if($r===FALSE)throw new Exception( "The cache directory located at '$this->cache_dir' needs to have ". "the permissions set to read/write/execute for everyone in order ". "to save cache and improve performance."); } protected function getPath () { $path = urldecode($this->removeCommonPath($_SERVER['REQUEST_URI'], $_SERVER['SCRIPT_NAME'])); $path = preg_replace('/(\/*\?.*$)|(\/$)/', '', $path); $path = str_replace($this->format_map['extensions'], '', $path); return $path; } protected function getRequestMethod () { $method = $_SERVER['REQUEST_METHOD']; if (isset($_SERVER['HTTP_X_HTTP_METHOD_OVERRIDE'])){ $method = $_SERVER['HTTP_X_HTTP_METHOD_OVERRIDE']; } return $method; } protected function getRequestFormat () { $format=NULL; if(isset($_SERVER['CONTENT_TYPE'])){ $mime = explode(';', $_SERVER['CONTENT_TYPE']); $mime = $mime[0]; if($mime==UrlEncodedFormat::MIME){ $format = new UrlEncodedFormat(); }else{ if(isset($this->format_map[$mime])){ $format = $this->format_map[$mime]; $format = is_string($format) ? new $format: $format; $format->setMIME($mime); } } } return $format; } protected function getResponseFormat () { $format=NULL; $extension = explode('.', parse_url($_SERVER['REQUEST_URI'], PHP_URL_PATH)); $extension = array_pop($extension); if($extension && isset($this->format_map[$extension])){ $format = $this->format_map[$extension]; $format = is_string($format) ? new $format: $format; $format->setExtension($extension); return $format; } if(isset($_SERVER['HTTP_ACCEPT'])){ $accepts = explode(',', $_SERVER['HTTP_ACCEPT']); foreach ($accepts as $accept) { if($extension && isset($this->format_map[$accept])){ $format = $this->format_map[$accept]; $format = is_string($format) ? new $format: $format; $format->setMIME($accept); return $format; } } } $format = new $this->format_map['default']; return $format; } protected function getRequestData() { try{ $r = file_get_contents('php://input'); if(is_null($r))return $_GET; $r =$this->request_format->decode($r); return is_null($r) ? array(): $r; } catch (RestException $e) { $this->handleError($e->getCode(), $e->getMessage()); } } protected function mapUrlToMethod () { if(!isset($this->routes[$this->request_method])){ return array(); } $urls = $this->routes[$this->request_method]; if(!$urls)return array(); $found = FALSE; $this->request_data += $_GET; $params = array('request_data'=>$this->request_data); $params += $this->request_data; foreach ($urls as $url => $call) { $call = (object)$call; if(strstr($url, ':')){ $regex = preg_replace('/\\\:([^\/]+)/', '(?P<$1>[^/]+)', preg_quote($url)); if (preg_match(":^$regex$:", $this->url, $matches)) { foreach ($matches as $arg => $match) { if (isset($call->arguments[$arg])){ $params[$arg] = $match; } } $found = TRUE; break; } }elseif ($url == $this->url){ $found = TRUE; break; } } if($found){ $p = $call->defaults; foreach ($call->arguments as $key => $value) { if(isset($params[$key]))$p[$value] = $params[$key]; } $call->arguments=$p; return $call; } } protected function applyClassMetadata($class_name, $instance, $method_info){ if(isset($method_info->metadata[$class_name]) && is_array($method_info->metadata[$class_name])){ foreach ($method_info->metadata[$class_name] as $property => $value){ if(property_exists($class_name, $property)){ $reflection_property = new ReflectionProperty($class_name, $property); $reflection_property->setValue($instance, $value); } } } } protected function loadCache() { if ($this->cached !== NULL) { return; } $file = $this->cache_dir . '/routes.php'; $this->cached = FALSE; if ($this->production_mode) { if (file_exists($file)) { $routes = include($file); } if (isset($routes) && is_array($routes)) { $this->routes = $routes; $this->cached = TRUE; } } else { } } protected function generateMap ($class_name, $base_path = "") { $reflection = new ReflectionClass($class_name); $class_metadata = parse_doc($reflection->getDocComment()); $methods = $reflection->getMethods( ReflectionMethod::IS_PUBLIC + ReflectionMethod::IS_PROTECTED); foreach ($methods as $method) { $doc = $method->getDocComment(); $arguments = array(); $defaults = array(); $metadata = $class_metadata+parse_doc($doc); $params = $method->getParameters(); $position=0; foreach ($params as $param){ $arguments[$param->getName()] = $position; $defaults[$position] = $param->isDefaultValueAvailable() ? $param->getDefaultValue() : NULL; $position++; } $method_flag = $method->isProtected() ? (isRestlerCompatibilityModeEnabled() ? 2 : 3) : (isset($metadata['protected']) ? 1 : 0); $call = array( 'class_name'=>$class_name, 'method_name'=>$method->getName(), 'arguments'=>$arguments, 'defaults'=>$defaults, 'metadata'=>$metadata, 'method_flag'=>$method_flag ); $method_url = strtolower($method->getName()); if (preg_match_all( '/@url\s+(GET|POST|PUT|DELETE|HEAD|OPTIONS)[ \t]*\/?(\S*)/s', $doc, $matches, PREG_SET_ORDER)) { foreach ($matches as $match) { $http_method = $match[1]; $url = rtrim($base_path . $match[2],'/'); $this->routes[$http_method][$url] = $call; } }elseif($method_url[0] != '_'){ if (preg_match_all('/^(GET|POST|PUT|DELETE|HEAD|OPTIONS)/i', $method_url, $matches)) { $http_method = strtoupper($matches[0][0]); $method_url = substr($method_url, strlen($http_method)); }else{ $http_method = 'GET'; } $url = $base_path. ($method_url=='index' || $method_url=='default' ? '' : $method_url); $url = rtrim($url,'/'); $this->routes[$http_method][$url] = $call; foreach ($params as $param){ if($param->getName()=='request_data'){ break; } $url .= $url=='' ? ':' : '/:'; $url .= $param->getName(); $this->routes[$http_method][$url] = $call; } } } } } if(version_compare(PHP_VERSION, '5.3.0') < 0){ require_once 'compat.php'; } class RestException extends Exception { public function __construct($http_status_code, $error_message = NULL) { parent::__construct($error_message, $http_status_code); } } interface iRespond { public function __formatResponse($result); public function __formatError($status_code, $message); } class DefaultResponse implements iRespond { function __formatResponse($result) { return $result; } function __formatError($statusCode, $message) { return array('error' => array('code' => $statusCode, 'message' => $message)); } } interface iAuthenticate { public function __isAuthenticated(); } interface iFormat { public function getMIMEMap(); public function setMIME($mime); public function getMIME(); public function setExtension($extension); public function getExtension(); public function encode($data, $human_readable=FALSE); public function decode($data); } class UrlEncodedFormat implements iFormat { const MIME = 'application/x-www-form-urlencoded'; const EXTENSION = 'post'; public function getMIMEMap() { return array(UrlEncodedFormat::EXTENSION=>UrlEncodedFormat::MIME); } public function getMIME(){ return UrlEncodedFormat::MIME; } public function getExtension(){ return UrlEncodedFormat::EXTENSION; } public function setMIME($mime){ } public function setExtension($extension){ } public function encode($data, $human_readable=FALSE){ return http_build_query($data); } public function decode($data){ parse_str($data,$r); return $r; } public function __toString(){ return $this->getExtension(); } } class JsonFormat implements iFormat { const MIME ='application/json'; const EXTENSION = 'json'; public function getMIMEMap() { return array(JsonFormat::EXTENSION=>JsonFormat::MIME); } public function getMIME(){ return JsonFormat::MIME; } public function getExtension(){ return JsonFormat::EXTENSION; } public function setMIME($mime){ } public function setExtension($extension){ } public function encode($data, $human_readable=FALSE){ return $human_readable ? $this->json_format(json_encode(object_to_array($data))) : json_encode(object_to_array($data)); } public function decode($data){ return object_to_array(json_decode($data)); } private function json_format($json) { $tab = "  "; $new_json = ""; $indent_level = 0; $in_string = FALSE; $len = strlen($json); for($c = 0; $c < $len; $c++) { $char = $json[$c]; switch($char) { case '{': case '[': if(!$in_string) { $new_json .= $char . "\n" . str_repeat($tab, $indent_level+1); $indent_level++; } else { $new_json .= $char; } break; case '}': case ']': if(!$in_string) { $indent_level--; $new_json .= "\n".str_repeat($tab, $indent_level).$char; } else { $new_json .= $char; } break; case ',': if(!$in_string) { $new_json .= ",\n" . str_repeat($tab, $indent_level); } else { $new_json .= $char; } break; case ':': if(!$in_string) { $new_json .= ": "; } else { $new_json .= $char; } break; case '"': if($c==0){ $in_string = TRUE; }elseif($c > 0 && $json[$c-1] != '\\') { $in_string = !$in_string; } default: $new_json .= $char; break; } } return $new_json; } public function __toString(){ return $this->getExtension(); } } class DocParser { private $params=array(); function parse($doc='') { if($doc==''){ return $this->params; } if(preg_match('#^/\*\*(.*)\*/#s', $doc, $comment) === false) return $this->params; $comment = trim($comment[1]); if(preg_match_all('#^\s*\*(.*)#m', $comment, $lines) === false) return $this->params; $this->parseLines($lines[1]); return $this->params; } private function parseLines($lines) { foreach($lines as $line) { $parsedLine = $this->parseLine($line); if($parsedLine === false && !isset($this->params['description'])) { if(isset($desc)){ $this->params['description'] = implode(PHP_EOL, $desc); } $desc = array(); } elseif($parsedLine !== false) { $desc[] = $parsedLine; } } $desc = implode(' ', $desc); if(!empty($desc))$this->params['long_description'] = $desc; } private function parseLine($line) { $line = trim($line); if(empty($line)) return false; if(strpos($line, '@') === 0) { if(strpos($line, ' ')>0){ $param = substr($line, 1, strpos($line, ' ') - 1); $value = substr($line, strlen($param) + 2); }else{ $param = substr($line, 1); $value = ''; } if($this->setParam($param, $value)) return false; } return $line; } private function setParam($param, $value) { if($param == 'param' || $param == 'return') $value = $this->formatParamOrReturn($value); if($param == 'class') list($param, $value) = $this->formatClass($value); if(empty($this->params[$param])) { $this->params[$param] = $value; } else if($param == 'param'){ $arr = array($this->params[$param], $value); $this->params[$param] = $arr; } else { $this->params[$param] = $value + $this->params[$param]; } return true; } private function formatClass($value) { $r = preg_split("[\(|\)]",$value); if(is_array($r)){ $param = $r[0]; parse_str($r[1],$value); foreach ($value as $key => $val) { $val = explode(',', $val); if(count($val)>1)$value[$key]=$val; } }else{ $param='Unknown'; } return array($param, $value); } private function formatParamOrReturn($string) { $pos = strpos($string, ' '); $type = substr($string, 0, $pos); return '(' . $type . ')' . substr($string, $pos+1); } } function parse_doc($php_doc_comment){ $p = new DocParser(); return $p->parse($php_doc_comment); $p = new Parser($php_doc_comment); return $p; $php_doc_comment = preg_replace("/(^[\\s]*\\/\\*\\*)
+ class Restler { const VERSION = '2.0.5'; public $url; public $request_method; public $request_format; public $request_data=array(); public $cache_dir; public $base_dir; public $response = 'DefaultResponse'; public $response_format; protected $production_mode; protected $routes= array(); protected $format_map = array(); protected $service_class_instance; protected $service_method; protected $auth_classes = array(); protected $error_classes = array(); private $codes = array( 100 => 'Continue', 101 => 'Switching Protocols', 200 => 'OK', 201 => 'Created', 202 => 'Accepted', 203 => 'Non-Authoritative Information', 204 => 'No Content', 205 => 'Reset Content', 206 => 'Partial Content', 300 => 'Multiple Choices', 301 => 'Moved Permanently', 302 => 'Found', 303 => 'See Other', 304 => 'Not Modified', 305 => 'Use Proxy', 306 => '(Unused)', 307 => 'Temporary Redirect', 400 => 'Bad Request', 401 => 'Unauthorized', 402 => 'Payment Required', 403 => 'Forbidden', 404 => 'Not Found', 405 => 'Method Not Allowed', 406 => 'Not Acceptable', 407 => 'Proxy Authentication Required', 408 => 'Request Timeout', 409 => 'Conflict', 410 => 'Gone', 411 => 'Length Required', 412 => 'Precondition Failed', 413 => 'Request Entity Too Large', 414 => 'Request-URI Too Long', 415 => 'Unsupported Media Type', 416 => 'Requested Range Not Satisfiable', 417 => 'Expectation Failed', 500 => 'Internal Server Error', 501 => 'Not Implemented', 502 => 'Bad Gateway', 503 => 'Service Unavailable', 504 => 'Gateway Timeout', 505 => 'HTTP Version Not Supported' ); protected $cached; public function __construct ($production_mode = FALSE) { $this->production_mode = $production_mode; $this->cache_dir = getcwd(); $this->base_dir = RESTLER_PATH; } public function __destruct () { if ($this->production_mode && !$this->cached) { $this->saveCache(); } } public function refreshCache () { $this->routes = array(); $this->cached = FALSE; } public function setSupportedFormats () { $args = func_get_args(); $extensions = array(); foreach ($args as $class_name) { if(!is_string($class_name) || !class_exists($class_name)){ throw new Exception("$class_name is not a vaild Format Class."); } $obj = new $class_name; if(! $obj instanceof iFormat){ throw new Exception('Invalid format class; must implement '. 'iFormat interface'); } foreach ($obj->getMIMEMap() as $extension => $mime) { if(!isset($this->format_map[$extension])) $this->format_map[$extension]=$class_name; if(!isset($this->format_map[$mime])) $this->format_map[$mime]=$class_name; $extensions[".$extension"]=TRUE; } } $this->format_map['default']=$args[0]; $this->format_map['extensions']=array_keys($extensions); } public function addAPIClass($class_name, $base_path = NULL) { if(!class_exists($class_name)){ throw new Exception("API class $class_name is missing."); } $this->loadCache(); if(!$this->cached){ if(is_null($base_path))$base_path=strtolower($class_name); $base_path = trim($base_path,'/'); if(strlen($base_path)>0)$base_path .= '/'; $this->generateMap($class_name, $base_path); } } public function addAuthenticationClass ($class_name, $base_path = NULL) { $this->auth_classes[] = $class_name; $this->addAPIClass($class_name, $base_path); } public function addErrorClass ($class_name) { $this->error_classes[] = $class_name; } public function handleError ($status_code, $error_message = NULL) { $method = "handle$status_code"; $handled = FALSE; foreach ($this->error_classes as $class_name) { if (method_exists($class_name, $method)) { $obj = new $class_name(); $obj->restler = $this; $obj->$method(); $handled = TRUE; } } if($handled)return; $message = $this->codes[$status_code] . (!$error_message ? '' : ': ' . $error_message); $this->setStatus($status_code); $this->sendData( call_user_func( array($this->response, '__formatError'), $status_code, $message) ); } public function handle () { if(empty($this->format_map))$this->setSupportedFormats('JsonFormat'); $this->url = $this->getPath(); $this->request_method = $this->getRequestMethod(); $this->response_format = $this->getResponseFormat(); $this->request_format = $this->getRequestFormat(); if(is_null($this->request_format)){ $this->request_format = $this->response_format; } if($this->request_method == 'PUT' || $this->request_method == 'POST'){ $this->request_data = $this->getRequestData(); } $o = $this->mapUrlToMethod(); if(!isset($o->class_name)){ $this->handleError(404); }else{ try { if($o->method_flag){ $auth_method = '__isAuthenticated'; if(!count($this->auth_classes))throw new RestException(401); foreach ($this->auth_classes as $auth_class) { $auth_obj = new $auth_class(); $auth_obj->restler=$this; $this->applyClassMetadata($auth_class, $auth_obj, $o); if (!method_exists($auth_obj, $auth_method)) { throw new RestException(401, 'Authentication Class '. 'should implement iAuthenticate'); }elseif(!$auth_obj->$auth_method()){ throw new RestException(401); } } } $this->applyClassMetadata(get_class($this->request_format), $this->request_format, $o); $pre_process = '_'.$this->request_format->getExtension().'_'. $o->method_name; $this->service_method = $o->method_name; if($o->method_flag==2)$o=unprotect($o); $object = $this->service_class_instance = new $o->class_name(); $object->restler=$this; if(method_exists($o->class_name, $pre_process)) { call_user_func_array(array($object, $pre_process), $o->arguments); } switch ($o->method_flag) { case 3: $reflection_method = new ReflectionMethod($object, $o->method_name); $reflection_method->setAccessible(TRUE); $result = $reflection_method->invokeArgs($object, $o->arguments); break; case 2: case 1: default: $result = call_user_func_array(array($object, $o->method_name), $o->arguments); } } catch (RestException $e) { $this->handleError($e->getCode(), $e->getMessage()); } } if (isset($result) && $result !== NULL) { $this->sendData($result); } } public function sendData($data) { $data = $this->response_format->encode($data, !$this->production_mode); $post_process = '_'.$this->service_method .'_'. $this->response_format->getExtension(); if(isset($this->service_class_instance) && method_exists($this->service_class_instance,$post_process)){ $data = call_user_func(array($this->service_class_instance, $post_process), $data); } header("Cache-Control: no-cache, must-revalidate"); header("Expires: 0"); header('Content-Type: ' . $this->response_format->getMIME()); header("X-Powered-By: Luracast Restler v".Restler::VERSION); die($data); } public function setStatus($code) { header("{$_SERVER['SERVER_PROTOCOL']} $code ". $this->codes[strval($code)]); } public function removeCommonPath($first, $second, $char='/'){ $first = explode($char, $first); $second = explode($char, $second); while (count($second)){ if($first[0]==$second[0]){ array_shift($first); } else break; array_shift($second); } return implode($char, $first); } public function saveCache() { $file = $this->cache_dir . '/routes.php'; $s = '$o=array();'.PHP_EOL; foreach ($this->routes as $key => $value) { $s .= PHP_EOL.PHP_EOL.PHP_EOL."############### $key ###############" .PHP_EOL.PHP_EOL; $s .= '$o[\''.$key.'\']=array();'; foreach ($value as $ke => $va) { $s .= PHP_EOL.PHP_EOL."#==== $key $ke".PHP_EOL.PHP_EOL; $s .= '$o[\''.$key.'\'][\''.$ke.'\']='.str_replace(PHP_EOL, PHP_EOL."\t", var_export($va, TRUE)).';'; } } $s .= PHP_EOL.'return $o;'; $r=@file_put_contents($file, "<?php $s"); @chmod($file, 0777); if($r===FALSE)throw new Exception( "The cache directory located at '$this->cache_dir' needs to have ". "the permissions set to read/write/execute for everyone in order ". "to save cache and improve performance."); } protected function getPath () { $path = urldecode($this->removeCommonPath($_SERVER['REQUEST_URI'], $_SERVER['SCRIPT_NAME'])); $path = preg_replace('/(\/*\?.*$)|(\/$)/', '', $path); $path = str_replace($this->format_map['extensions'], '', $path); return $path; } protected function getRequestMethod () { $method = $_SERVER['REQUEST_METHOD']; if (isset($_SERVER['HTTP_X_HTTP_METHOD_OVERRIDE'])){ $method = $_SERVER['HTTP_X_HTTP_METHOD_OVERRIDE']; } return $method; } protected function getRequestFormat () { $format=NULL; if(isset($_SERVER['CONTENT_TYPE'])){ $mime = explode(';', $_SERVER['CONTENT_TYPE']); $mime = $mime[0]; if($mime==UrlEncodedFormat::MIME){ $format = new UrlEncodedFormat(); }else{ if(isset($this->format_map[$mime])){ $format = $this->format_map[$mime]; $format = is_string($format) ? new $format: $format; $format->setMIME($mime); } } } return $format; } protected function getResponseFormat () { $format=NULL; $extension = explode('.', parse_url($_SERVER['REQUEST_URI'], PHP_URL_PATH)); $extension = array_pop($extension); if($extension && isset($this->format_map[$extension])){ $format = $this->format_map[$extension]; $format = is_string($format) ? new $format: $format; $format->setExtension($extension); return $format; } if(isset($_SERVER['HTTP_ACCEPT'])){ $accepts = explode(',', $_SERVER['HTTP_ACCEPT']); foreach ($accepts as $accept) { if($extension && isset($this->format_map[$accept])){ $format = $this->format_map[$accept]; $format = is_string($format) ? new $format: $format; $format->setMIME($accept); return $format; } } } $format = new $this->format_map['default']; return $format; } protected function getRequestData() { try{ $r = file_get_contents('php://input'); if(is_null($r))return $_GET; $r =$this->request_format->decode($r); return is_null($r) ? array(): $r; } catch (RestException $e) { $this->handleError($e->getCode(), $e->getMessage()); } } protected function mapUrlToMethod () { if(!isset($this->routes[$this->request_method])){ return array(); } $urls = $this->routes[$this->request_method]; if(!$urls)return array(); $found = FALSE; $this->request_data += $_GET; $params = array('request_data'=>$this->request_data); $params += $this->request_data; foreach ($urls as $url => $call) { $call = (object)$call; if(strstr($url, ':')){ $regex = preg_replace('/\\\:([^\/]+)/', '(?P<$1>[^/]+)', preg_quote($url)); if (preg_match(":^$regex$:", $this->url, $matches)) { foreach ($matches as $arg => $match) { if (isset($call->arguments[$arg])){ $params[$arg] = $match; } } $found = TRUE; break; } }elseif ($url == $this->url){ $found = TRUE; break; } } if($found){ $p = $call->defaults; foreach ($call->arguments as $key => $value) { if(isset($params[$key]))$p[$value] = $params[$key]; } $call->arguments=$p; return $call; } } protected function applyClassMetadata($class_name, $instance, $method_info){ if(isset($method_info->metadata[$class_name]) && is_array($method_info->metadata[$class_name])){ foreach ($method_info->metadata[$class_name] as $property => $value){ if(property_exists($class_name, $property)){ $reflection_property = new ReflectionProperty($class_name, $property); $reflection_property->setValue($instance, $value); } } } } protected function loadCache() { if ($this->cached !== NULL) { return; } $file = $this->cache_dir . '/routes.php'; $this->cached = FALSE; if ($this->production_mode) { if (file_exists($file)) { $routes = include($file); } if (isset($routes) && is_array($routes)) { $this->routes = $routes; $this->cached = TRUE; } } else { } } protected function generateMap ($class_name, $base_path = "") { $reflection = new ReflectionClass($class_name); $class_metadata = parse_doc($reflection->getDocComment()); $methods = $reflection->getMethods( ReflectionMethod::IS_PUBLIC + ReflectionMethod::IS_PROTECTED); foreach ($methods as $method) { $doc = $method->getDocComment(); $arguments = array(); $defaults = array(); $metadata = $class_metadata+parse_doc($doc); $params = $method->getParameters(); $position=0; foreach ($params as $param){ $arguments[$param->getName()] = $position; $defaults[$position] = $param->isDefaultValueAvailable() ? $param->getDefaultValue() : NULL; $position++; } $method_flag = $method->isProtected() ? (isRestlerCompatibilityModeEnabled() ? 2 : 3) : (isset($metadata['protected']) ? 1 : 0); $call = array( 'class_name'=>$class_name, 'method_name'=>$method->getName(), 'arguments'=>$arguments, 'defaults'=>$defaults, 'metadata'=>$metadata, 'method_flag'=>$method_flag ); $method_url = strtolower($method->getName()); if (preg_match_all( '/@url\s+(GET|POST|PUT|DELETE|HEAD|OPTIONS)[ \t]*\/?(\S*)/s', $doc, $matches, PREG_SET_ORDER)) { foreach ($matches as $match) { $http_method = $match[1]; $url = rtrim($base_path . $match[2],'/'); $this->routes[$http_method][$url] = $call; } }elseif($method_url[0] != '_'){ if (preg_match_all('/^(GET|POST|PUT|DELETE|HEAD|OPTIONS)/i', $method_url, $matches)) { $http_method = strtoupper($matches[0][0]); $method_url = substr($method_url, strlen($http_method)); }else{ $http_method = 'GET'; } $url = $base_path. ($method_url=='index' || $method_url=='default' ? '' : $method_url); $url = rtrim($url,'/'); $this->routes[$http_method][$url] = $call; foreach ($params as $param){ if($param->getName()=='request_data'){ break; } $url .= $url=='' ? ':' : '/:'; $url .= $param->getName(); $this->routes[$http_method][$url] = $call; } } } } } if(version_compare(PHP_VERSION, '5.3.0') < 0){ require_once 'compat.php'; } class RestException extends Exception { public function __construct($http_status_code, $error_message = NULL) { parent::__construct($error_message, $http_status_code); } } interface iRespond { public function __formatResponse($result); public function __formatError($status_code, $message); } class DefaultResponse implements iRespond { function __formatResponse($result) { return $result; } function __formatError($statusCode, $message) { return array('error' => array('code' => $statusCode, 'message' => $message)); } } interface iAuthenticate { public function __isAuthenticated(); } interface iFormat { public function getMIMEMap(); public function setMIME($mime); public function getMIME(); public function setExtension($extension); public function getExtension(); public function encode($data, $human_readable=FALSE); public function decode($data); } class UrlEncodedFormat implements iFormat { const MIME = 'application/x-www-form-urlencoded'; const EXTENSION = 'post'; public function getMIMEMap() { return array(UrlEncodedFormat::EXTENSION=>UrlEncodedFormat::MIME); } public function getMIME(){ return UrlEncodedFormat::MIME; } public function getExtension(){ return UrlEncodedFormat::EXTENSION; } public function setMIME($mime){ } public function setExtension($extension){ } public function encode($data, $human_readable=FALSE){ return http_build_query($data); } public function decode($data){ parse_str($data,$r); return $r; } public function __toString(){ return $this->getExtension(); } } class JsonFormat implements iFormat { const MIME ='application/json'; const EXTENSION = 'json'; public function getMIMEMap() { return array(JsonFormat::EXTENSION=>JsonFormat::MIME); } public function getMIME(){ return JsonFormat::MIME; } public function getExtension(){ return JsonFormat::EXTENSION; } public function setMIME($mime){ } public function setExtension($extension){ } public function encode($data, $human_readable=FALSE){ return $human_readable ? $this->json_format(json_encode(object_to_array($data))) : json_encode(object_to_array($data)); } public function decode($data) { $decoded = json_decode ( $data ); if (function_exists ( 'json_last_error' )) { $message = ''; switch (json_last_error ()) { case JSON_ERROR_NONE : return object_to_array ( $decoded ); break; case JSON_ERROR_DEPTH : $message = 'maximum stack depth exceeded'; break; case JSON_ERROR_STATE_MISMATCH : $message = 'underflow or the modes mismatch'; break; case JSON_ERROR_CTRL_CHAR : $message = 'unexpected control character found'; break; case JSON_ERROR_SYNTAX : $message = 'malformed JSON'; break; case JSON_ERROR_UTF8 : $message = 'malformed UTF-8 characters, possibly incorrectly encoded'; break; default : $message = 'unknown error'; break; } throw new RestException ( 400, 'Error parsing JSON, ' . $message ); } return object_to_array ( $decoded ); } private function json_format($json) { $tab = "  "; $new_json = ""; $indent_level = 0; $in_string = FALSE; $len = strlen($json); for($c = 0; $c < $len; $c++) { $char = $json[$c]; switch($char) { case '{': case '[': if(!$in_string) { $new_json .= $char . "\n" . str_repeat($tab, $indent_level+1); $indent_level++; } else { $new_json .= $char; } break; case '}': case ']': if(!$in_string) { $indent_level--; $new_json .= "\n".str_repeat($tab, $indent_level).$char; } else { $new_json .= $char; } break; case ',': if(!$in_string) { $new_json .= ",\n" . str_repeat($tab, $indent_level); } else { $new_json .= $char; } break; case ':': if(!$in_string) { $new_json .= ": "; } else { $new_json .= $char; } break; case '"': if($c==0){ $in_string = TRUE; }elseif($c > 0 && $json[$c-1] != '\\') { $in_string = !$in_string; } default: $new_json .= $char; break; } } return $new_json; } public function __toString(){ return $this->getExtension(); } } class DocParser { private $params=array(); function parse($doc='') { if($doc==''){ return $this->params; } if(preg_match('#^/\*\*(.*)\*/#s', $doc, $comment) === false) return $this->params; $comment = trim($comment[1]); if(preg_match_all('#^\s*\*(.*)#m', $comment, $lines) === false) return $this->params; $this->parseLines($lines[1]); return $this->params; } private function parseLines($lines) { foreach($lines as $line) { $parsedLine = $this->parseLine($line); if($parsedLine === false && !isset($this->params['description'])) { if(isset($desc)){ $this->params['description'] = implode(PHP_EOL, $desc); } $desc = array(); } elseif($parsedLine !== false) { $desc[] = $parsedLine; } } $desc = implode(' ', $desc); if(!empty($desc))$this->params['long_description'] = $desc; } private function parseLine($line) { $line = trim($line); if(empty($line)) return false; if(strpos($line, '@') === 0) { if(strpos($line, ' ')>0){ $param = substr($line, 1, strpos($line, ' ') - 1); $value = substr($line, strlen($param) + 2); }else{ $param = substr($line, 1); $value = ''; } if($this->setParam($param, $value)) return false; } return $line; } private function setParam($param, $value) { if($param == 'param' || $param == 'return') $value = $this->formatParamOrReturn($value); if($param == 'class') list($param, $value) = $this->formatClass($value); if(empty($this->params[$param])) { $this->params[$param] = $value; } else if($param == 'param'){ $arr = array($this->params[$param], $value); $this->params[$param] = $arr; } else { $this->params[$param] = $value + $this->params[$param]; } return true; } private function formatClass($value) { $r = preg_split("[\(|\)]",$value); if(is_array($r)){ $param = $r[0]; parse_str($r[1],$value); foreach ($value as $key => $val) { $val = explode(',', $val); if(count($val)>1)$value[$key]=$val; } }else{ $param='Unknown'; } return array($param, $value); } private function formatParamOrReturn($string) { $pos = strpos($string, ' '); $type = substr($string, 0, $pos); return '(' . $type . ')' . substr($string, $pos+1); } } function parse_doc($php_doc_comment){ $p = new DocParser(); return $p->parse($php_doc_comment); $p = new Parser($php_doc_comment); return $p; $php_doc_comment = preg_replace("/(^[\\s]*\\/\\*\\*)
                                  |(^[\\s]\\*\\/)
                                  |(^[\\s]*\\*?\\s)
                                  |(^[\\s]*)

From f3dec8f9caf0ae5e6065d2a4a94ddd7357ac7e1f Mon Sep 17 00:00:00 2001
From: Ragunathan Arul Kumaran <arul@luracast.com>
Date: Wed, 9 Nov 2011 16:29:22 +0800
Subject: [PATCH 23/61] Improved JsonFormat to throw meaningful error messages
 when the JSON request is malformed. It will work on PHP 5.3 and above. Older
 versions will retain previous behavior

---
 restler/restler.php          | 36 ++++++++++++++++++++++++++++++++----
 restler_minified/restler.php |  2 +-
 2 files changed, 33 insertions(+), 5 deletions(-)

diff --git a/restler/restler.php b/restler/restler.php
index d072c6908..e3ba7dfdd 100644
--- a/restler/restler.php
+++ b/restler/restler.php
@@ -10,10 +10,10 @@
  * @copyright  2010 Luracast
  * @license    http://www.opensource.org/licenses/lgpl-license.php LGPL
  * @link       http://luracast.com/products/restler/
- * @version    2.0.4
+ * @version    2.0.5
  */
 class Restler {
-	const VERSION = '2.0.4';
+	const VERSION = '2.0.5';
 	/**
 	 * URL of the currently mapped service
 	 * @var string
@@ -936,8 +936,36 @@ public function encode($data, $human_readable=FALSE){
 		$this->json_format(json_encode(object_to_array($data))) : 
 		json_encode(object_to_array($data));
 	}
-	public function decode($data){
-		return object_to_array(json_decode($data));
+	public function decode($data) {
+		$decoded = json_decode ( $data );
+		if (function_exists ( 'json_last_error' )) {
+			$message = '';
+			switch (json_last_error ()) {
+				case JSON_ERROR_NONE :
+					return object_to_array ( $decoded );
+					break;
+				case JSON_ERROR_DEPTH :
+					$message = 'maximum stack depth exceeded';
+					break;
+				case JSON_ERROR_STATE_MISMATCH :
+					$message = 'underflow or the modes mismatch';
+					break;
+				case JSON_ERROR_CTRL_CHAR :
+					$message = 'unexpected control character found';
+					break;
+				case JSON_ERROR_SYNTAX :
+					$message = 'malformed JSON';
+					break;
+				case JSON_ERROR_UTF8 :
+					$message = 'malformed UTF-8 characters, possibly incorrectly encoded';
+					break;
+				default :
+					$message = 'unknown error';
+					break;
+			}
+			throw new RestException ( 400, 'Error parsing JSON, ' . $message );
+		}
+		return object_to_array ( $decoded );
 	}
 
 	/**
diff --git a/restler_minified/restler.php b/restler_minified/restler.php
index 92c262fb0..54537c2c9 100644
--- a/restler_minified/restler.php
+++ b/restler_minified/restler.php
@@ -1,5 +1,5 @@
 <?php
- class Restler { const VERSION = '2.0.4'; public $url; public $request_method; public $request_format; public $request_data=array(); public $cache_dir; public $base_dir; public $response = 'DefaultResponse'; public $response_format; protected $production_mode; protected $routes= array(); protected $format_map = array(); protected $service_class_instance; protected $service_method; protected $auth_classes = array(); protected $error_classes = array(); private $codes = array( 100 => 'Continue', 101 => 'Switching Protocols', 200 => 'OK', 201 => 'Created', 202 => 'Accepted', 203 => 'Non-Authoritative Information', 204 => 'No Content', 205 => 'Reset Content', 206 => 'Partial Content', 300 => 'Multiple Choices', 301 => 'Moved Permanently', 302 => 'Found', 303 => 'See Other', 304 => 'Not Modified', 305 => 'Use Proxy', 306 => '(Unused)', 307 => 'Temporary Redirect', 400 => 'Bad Request', 401 => 'Unauthorized', 402 => 'Payment Required', 403 => 'Forbidden', 404 => 'Not Found', 405 => 'Method Not Allowed', 406 => 'Not Acceptable', 407 => 'Proxy Authentication Required', 408 => 'Request Timeout', 409 => 'Conflict', 410 => 'Gone', 411 => 'Length Required', 412 => 'Precondition Failed', 413 => 'Request Entity Too Large', 414 => 'Request-URI Too Long', 415 => 'Unsupported Media Type', 416 => 'Requested Range Not Satisfiable', 417 => 'Expectation Failed', 500 => 'Internal Server Error', 501 => 'Not Implemented', 502 => 'Bad Gateway', 503 => 'Service Unavailable', 504 => 'Gateway Timeout', 505 => 'HTTP Version Not Supported' ); protected $cached; public function __construct ($production_mode = FALSE) { $this->production_mode = $production_mode; $this->cache_dir = getcwd(); $this->base_dir = RESTLER_PATH; } public function __destruct () { if ($this->production_mode && !$this->cached) { $this->saveCache(); } } public function refreshCache () { $this->routes = array(); $this->cached = FALSE; } public function setSupportedFormats () { $args = func_get_args(); $extensions = array(); foreach ($args as $class_name) { if(!is_string($class_name) || !class_exists($class_name)){ throw new Exception("$class_name is not a vaild Format Class."); } $obj = new $class_name; if(! $obj instanceof iFormat){ throw new Exception('Invalid format class; must implement '. 'iFormat interface'); } foreach ($obj->getMIMEMap() as $extension => $mime) { if(!isset($this->format_map[$extension])) $this->format_map[$extension]=$class_name; if(!isset($this->format_map[$mime])) $this->format_map[$mime]=$class_name; $extensions[".$extension"]=TRUE; } } $this->format_map['default']=$args[0]; $this->format_map['extensions']=array_keys($extensions); } public function addAPIClass($class_name, $base_path = NULL) { if(!class_exists($class_name)){ throw new Exception("API class $class_name is missing."); } $this->loadCache(); if(!$this->cached){ if(is_null($base_path))$base_path=strtolower($class_name); $base_path = trim($base_path,'/'); if(strlen($base_path)>0)$base_path .= '/'; $this->generateMap($class_name, $base_path); } } public function addAuthenticationClass ($class_name, $base_path = NULL) { $this->auth_classes[] = $class_name; $this->addAPIClass($class_name, $base_path); } public function addErrorClass ($class_name) { $this->error_classes[] = $class_name; } public function handleError ($status_code, $error_message = NULL) { $method = "handle$status_code"; $handled = FALSE; foreach ($this->error_classes as $class_name) { if (method_exists($class_name, $method)) { $obj = new $class_name(); $obj->restler = $this; $obj->$method(); $handled = TRUE; } } if($handled)return; $message = $this->codes[$status_code] . (!$error_message ? '' : ': ' . $error_message); $this->setStatus($status_code); $this->sendData( call_user_func( array($this->response, '__formatError'), $status_code, $message) ); } public function handle () { if(empty($this->format_map))$this->setSupportedFormats('JsonFormat'); $this->url = $this->getPath(); $this->request_method = $this->getRequestMethod(); $this->response_format = $this->getResponseFormat(); $this->request_format = $this->getRequestFormat(); if(is_null($this->request_format)){ $this->request_format = $this->response_format; } if($this->request_method == 'PUT' || $this->request_method == 'POST'){ $this->request_data = $this->getRequestData(); } $o = $this->mapUrlToMethod(); if(!isset($o->class_name)){ $this->handleError(404); }else{ try { if($o->method_flag){ $auth_method = '__isAuthenticated'; if(!count($this->auth_classes))throw new RestException(401); foreach ($this->auth_classes as $auth_class) { $auth_obj = new $auth_class(); $auth_obj->restler=$this; $this->applyClassMetadata($auth_class, $auth_obj, $o); if (!method_exists($auth_obj, $auth_method)) { throw new RestException(401, 'Authentication Class '. 'should implement iAuthenticate'); }elseif(!$auth_obj->$auth_method()){ throw new RestException(401); } } } $this->applyClassMetadata(get_class($this->request_format), $this->request_format, $o); $pre_process = '_'.$this->request_format->getExtension().'_'. $o->method_name; $this->service_method = $o->method_name; if($o->method_flag==2)$o=unprotect($o); $object = $this->service_class_instance = new $o->class_name(); $object->restler=$this; if(method_exists($o->class_name, $pre_process)) { call_user_func_array(array($object, $pre_process), $o->arguments); } switch ($o->method_flag) { case 3: $reflection_method = new ReflectionMethod($object, $o->method_name); $reflection_method->setAccessible(TRUE); $result = $reflection_method->invokeArgs($object, $o->arguments); break; case 2: case 1: default: $result = call_user_func_array(array($object, $o->method_name), $o->arguments); } } catch (RestException $e) { $this->handleError($e->getCode(), $e->getMessage()); } } if (isset($result) && $result !== NULL) { $this->sendData($result); } } public function sendData($data) { $data = $this->response_format->encode($data, !$this->production_mode); $post_process = '_'.$this->service_method .'_'. $this->response_format->getExtension(); if(isset($this->service_class_instance) && method_exists($this->service_class_instance,$post_process)){ $data = call_user_func(array($this->service_class_instance, $post_process), $data); } header("Cache-Control: no-cache, must-revalidate"); header("Expires: 0"); header('Content-Type: ' . $this->response_format->getMIME()); header("X-Powered-By: Luracast Restler v".Restler::VERSION); die($data); } public function setStatus($code) { header("{$_SERVER['SERVER_PROTOCOL']} $code ". $this->codes[strval($code)]); } public function removeCommonPath($first, $second, $char='/'){ $first = explode($char, $first); $second = explode($char, $second); while (count($second)){ if($first[0]==$second[0]){ array_shift($first); } else break; array_shift($second); } return implode($char, $first); } public function saveCache() { $file = $this->cache_dir . '/routes.php'; $s = '$o=array();'.PHP_EOL; foreach ($this->routes as $key => $value) { $s .= PHP_EOL.PHP_EOL.PHP_EOL."############### $key ###############" .PHP_EOL.PHP_EOL; $s .= '$o[\''.$key.'\']=array();'; foreach ($value as $ke => $va) { $s .= PHP_EOL.PHP_EOL."#==== $key $ke".PHP_EOL.PHP_EOL; $s .= '$o[\''.$key.'\'][\''.$ke.'\']='.str_replace(PHP_EOL, PHP_EOL."\t", var_export($va, TRUE)).';'; } } $s .= PHP_EOL.'return $o;'; $r=@file_put_contents($file, "<?php $s"); @chmod($file, 0777); if($r===FALSE)throw new Exception( "The cache directory located at '$this->cache_dir' needs to have ". "the permissions set to read/write/execute for everyone in order ". "to save cache and improve performance."); } protected function getPath () { $path = urldecode($this->removeCommonPath($_SERVER['REQUEST_URI'], $_SERVER['SCRIPT_NAME'])); $path = preg_replace('/(\/*\?.*$)|(\/$)/', '', $path); $path = str_replace($this->format_map['extensions'], '', $path); return $path; } protected function getRequestMethod () { $method = $_SERVER['REQUEST_METHOD']; if (isset($_SERVER['HTTP_X_HTTP_METHOD_OVERRIDE'])){ $method = $_SERVER['HTTP_X_HTTP_METHOD_OVERRIDE']; } return $method; } protected function getRequestFormat () { $format=NULL; if(isset($_SERVER['CONTENT_TYPE'])){ $mime = explode(';', $_SERVER['CONTENT_TYPE']); $mime = $mime[0]; if($mime==UrlEncodedFormat::MIME){ $format = new UrlEncodedFormat(); }else{ if(isset($this->format_map[$mime])){ $format = $this->format_map[$mime]; $format = is_string($format) ? new $format: $format; $format->setMIME($mime); } } } return $format; } protected function getResponseFormat () { $format=NULL; $extension = explode('.', parse_url($_SERVER['REQUEST_URI'], PHP_URL_PATH)); $extension = array_pop($extension); if($extension && isset($this->format_map[$extension])){ $format = $this->format_map[$extension]; $format = is_string($format) ? new $format: $format; $format->setExtension($extension); return $format; } if(isset($_SERVER['HTTP_ACCEPT'])){ $accepts = explode(',', $_SERVER['HTTP_ACCEPT']); foreach ($accepts as $accept) { if($extension && isset($this->format_map[$accept])){ $format = $this->format_map[$accept]; $format = is_string($format) ? new $format: $format; $format->setMIME($accept); return $format; } } } $format = new $this->format_map['default']; return $format; } protected function getRequestData() { try{ $r = file_get_contents('php://input'); if(is_null($r))return $_GET; $r =$this->request_format->decode($r); return is_null($r) ? array(): $r; } catch (RestException $e) { $this->handleError($e->getCode(), $e->getMessage()); } } protected function mapUrlToMethod () { if(!isset($this->routes[$this->request_method])){ return array(); } $urls = $this->routes[$this->request_method]; if(!$urls)return array(); $found = FALSE; $this->request_data += $_GET; $params = array('request_data'=>$this->request_data); $params += $this->request_data; foreach ($urls as $url => $call) { $call = (object)$call; if(strstr($url, ':')){ $regex = preg_replace('/\\\:([^\/]+)/', '(?P<$1>[^/]+)', preg_quote($url)); if (preg_match(":^$regex$:", $this->url, $matches)) { foreach ($matches as $arg => $match) { if (isset($call->arguments[$arg])){ $params[$arg] = $match; } } $found = TRUE; break; } }elseif ($url == $this->url){ $found = TRUE; break; } } if($found){ $p = $call->defaults; foreach ($call->arguments as $key => $value) { if(isset($params[$key]))$p[$value] = $params[$key]; } $call->arguments=$p; return $call; } } protected function applyClassMetadata($class_name, $instance, $method_info){ if(isset($method_info->metadata[$class_name]) && is_array($method_info->metadata[$class_name])){ foreach ($method_info->metadata[$class_name] as $property => $value){ if(property_exists($class_name, $property)){ $reflection_property = new ReflectionProperty($class_name, $property); $reflection_property->setValue($instance, $value); } } } } protected function loadCache() { if ($this->cached !== NULL) { return; } $file = $this->cache_dir . '/routes.php'; $this->cached = FALSE; if ($this->production_mode) { if (file_exists($file)) { $routes = include($file); } if (isset($routes) && is_array($routes)) { $this->routes = $routes; $this->cached = TRUE; } } else { } } protected function generateMap ($class_name, $base_path = "") { $reflection = new ReflectionClass($class_name); $class_metadata = parse_doc($reflection->getDocComment()); $methods = $reflection->getMethods( ReflectionMethod::IS_PUBLIC + ReflectionMethod::IS_PROTECTED); foreach ($methods as $method) { $doc = $method->getDocComment(); $arguments = array(); $defaults = array(); $metadata = $class_metadata+parse_doc($doc); $params = $method->getParameters(); $position=0; foreach ($params as $param){ $arguments[$param->getName()] = $position; $defaults[$position] = $param->isDefaultValueAvailable() ? $param->getDefaultValue() : NULL; $position++; } $method_flag = $method->isProtected() ? (isRestlerCompatibilityModeEnabled() ? 2 : 3) : (isset($metadata['protected']) ? 1 : 0); $call = array( 'class_name'=>$class_name, 'method_name'=>$method->getName(), 'arguments'=>$arguments, 'defaults'=>$defaults, 'metadata'=>$metadata, 'method_flag'=>$method_flag ); $method_url = strtolower($method->getName()); if (preg_match_all( '/@url\s+(GET|POST|PUT|DELETE|HEAD|OPTIONS)[ \t]*\/?(\S*)/s', $doc, $matches, PREG_SET_ORDER)) { foreach ($matches as $match) { $http_method = $match[1]; $url = rtrim($base_path . $match[2],'/'); $this->routes[$http_method][$url] = $call; } }elseif($method_url[0] != '_'){ if (preg_match_all('/^(GET|POST|PUT|DELETE|HEAD|OPTIONS)/i', $method_url, $matches)) { $http_method = strtoupper($matches[0][0]); $method_url = substr($method_url, strlen($http_method)); }else{ $http_method = 'GET'; } $url = $base_path. ($method_url=='index' || $method_url=='default' ? '' : $method_url); $url = rtrim($url,'/'); $this->routes[$http_method][$url] = $call; foreach ($params as $param){ if($param->getName()=='request_data'){ break; } $url .= $url=='' ? ':' : '/:'; $url .= $param->getName(); $this->routes[$http_method][$url] = $call; } } } } } if(version_compare(PHP_VERSION, '5.3.0') < 0){ require_once 'compat.php'; } class RestException extends Exception { public function __construct($http_status_code, $error_message = NULL) { parent::__construct($error_message, $http_status_code); } } interface iRespond { public function __formatResponse($result); public function __formatError($status_code, $message); } class DefaultResponse implements iRespond { function __formatResponse($result) { return $result; } function __formatError($statusCode, $message) { return array('error' => array('code' => $statusCode, 'message' => $message)); } } interface iAuthenticate { public function __isAuthenticated(); } interface iFormat { public function getMIMEMap(); public function setMIME($mime); public function getMIME(); public function setExtension($extension); public function getExtension(); public function encode($data, $human_readable=FALSE); public function decode($data); } class UrlEncodedFormat implements iFormat { const MIME = 'application/x-www-form-urlencoded'; const EXTENSION = 'post'; public function getMIMEMap() { return array(UrlEncodedFormat::EXTENSION=>UrlEncodedFormat::MIME); } public function getMIME(){ return UrlEncodedFormat::MIME; } public function getExtension(){ return UrlEncodedFormat::EXTENSION; } public function setMIME($mime){ } public function setExtension($extension){ } public function encode($data, $human_readable=FALSE){ return http_build_query($data); } public function decode($data){ parse_str($data,$r); return $r; } public function __toString(){ return $this->getExtension(); } } class JsonFormat implements iFormat { const MIME ='application/json'; const EXTENSION = 'json'; public function getMIMEMap() { return array(JsonFormat::EXTENSION=>JsonFormat::MIME); } public function getMIME(){ return JsonFormat::MIME; } public function getExtension(){ return JsonFormat::EXTENSION; } public function setMIME($mime){ } public function setExtension($extension){ } public function encode($data, $human_readable=FALSE){ return $human_readable ? $this->json_format(json_encode(object_to_array($data))) : json_encode(object_to_array($data)); } public function decode($data){ return object_to_array(json_decode($data)); } private function json_format($json) { $tab = "  "; $new_json = ""; $indent_level = 0; $in_string = FALSE; $len = strlen($json); for($c = 0; $c < $len; $c++) { $char = $json[$c]; switch($char) { case '{': case '[': if(!$in_string) { $new_json .= $char . "\n" . str_repeat($tab, $indent_level+1); $indent_level++; } else { $new_json .= $char; } break; case '}': case ']': if(!$in_string) { $indent_level--; $new_json .= "\n".str_repeat($tab, $indent_level).$char; } else { $new_json .= $char; } break; case ',': if(!$in_string) { $new_json .= ",\n" . str_repeat($tab, $indent_level); } else { $new_json .= $char; } break; case ':': if(!$in_string) { $new_json .= ": "; } else { $new_json .= $char; } break; case '"': if($c==0){ $in_string = TRUE; }elseif($c > 0 && $json[$c-1] != '\\') { $in_string = !$in_string; } default: $new_json .= $char; break; } } return $new_json; } public function __toString(){ return $this->getExtension(); } } class DocParser { private $params=array(); function parse($doc='') { if($doc==''){ return $this->params; } if(preg_match('#^/\*\*(.*)\*/#s', $doc, $comment) === false) return $this->params; $comment = trim($comment[1]); if(preg_match_all('#^\s*\*(.*)#m', $comment, $lines) === false) return $this->params; $this->parseLines($lines[1]); return $this->params; } private function parseLines($lines) { foreach($lines as $line) { $parsedLine = $this->parseLine($line); if($parsedLine === false && !isset($this->params['description'])) { if(isset($desc)){ $this->params['description'] = implode(PHP_EOL, $desc); } $desc = array(); } elseif($parsedLine !== false) { $desc[] = $parsedLine; } } $desc = implode(' ', $desc); if(!empty($desc))$this->params['long_description'] = $desc; } private function parseLine($line) { $line = trim($line); if(empty($line)) return false; if(strpos($line, '@') === 0) { if(strpos($line, ' ')>0){ $param = substr($line, 1, strpos($line, ' ') - 1); $value = substr($line, strlen($param) + 2); }else{ $param = substr($line, 1); $value = ''; } if($this->setParam($param, $value)) return false; } return $line; } private function setParam($param, $value) { if($param == 'param' || $param == 'return') $value = $this->formatParamOrReturn($value); if($param == 'class') list($param, $value) = $this->formatClass($value); if(empty($this->params[$param])) { $this->params[$param] = $value; } else if($param == 'param'){ $arr = array($this->params[$param], $value); $this->params[$param] = $arr; } else { $this->params[$param] = $value + $this->params[$param]; } return true; } private function formatClass($value) { $r = preg_split("[\(|\)]",$value); if(is_array($r)){ $param = $r[0]; parse_str($r[1],$value); foreach ($value as $key => $val) { $val = explode(',', $val); if(count($val)>1)$value[$key]=$val; } }else{ $param='Unknown'; } return array($param, $value); } private function formatParamOrReturn($string) { $pos = strpos($string, ' '); $type = substr($string, 0, $pos); return '(' . $type . ')' . substr($string, $pos+1); } } function parse_doc($php_doc_comment){ $p = new DocParser(); return $p->parse($php_doc_comment); $p = new Parser($php_doc_comment); return $p; $php_doc_comment = preg_replace("/(^[\\s]*\\/\\*\\*)
+ class Restler { const VERSION = '2.0.5'; public $url; public $request_method; public $request_format; public $request_data=array(); public $cache_dir; public $base_dir; public $response = 'DefaultResponse'; public $response_format; protected $production_mode; protected $routes= array(); protected $format_map = array(); protected $service_class_instance; protected $service_method; protected $auth_classes = array(); protected $error_classes = array(); private $codes = array( 100 => 'Continue', 101 => 'Switching Protocols', 200 => 'OK', 201 => 'Created', 202 => 'Accepted', 203 => 'Non-Authoritative Information', 204 => 'No Content', 205 => 'Reset Content', 206 => 'Partial Content', 300 => 'Multiple Choices', 301 => 'Moved Permanently', 302 => 'Found', 303 => 'See Other', 304 => 'Not Modified', 305 => 'Use Proxy', 306 => '(Unused)', 307 => 'Temporary Redirect', 400 => 'Bad Request', 401 => 'Unauthorized', 402 => 'Payment Required', 403 => 'Forbidden', 404 => 'Not Found', 405 => 'Method Not Allowed', 406 => 'Not Acceptable', 407 => 'Proxy Authentication Required', 408 => 'Request Timeout', 409 => 'Conflict', 410 => 'Gone', 411 => 'Length Required', 412 => 'Precondition Failed', 413 => 'Request Entity Too Large', 414 => 'Request-URI Too Long', 415 => 'Unsupported Media Type', 416 => 'Requested Range Not Satisfiable', 417 => 'Expectation Failed', 500 => 'Internal Server Error', 501 => 'Not Implemented', 502 => 'Bad Gateway', 503 => 'Service Unavailable', 504 => 'Gateway Timeout', 505 => 'HTTP Version Not Supported' ); protected $cached; public function __construct ($production_mode = FALSE) { $this->production_mode = $production_mode; $this->cache_dir = getcwd(); $this->base_dir = RESTLER_PATH; } public function __destruct () { if ($this->production_mode && !$this->cached) { $this->saveCache(); } } public function refreshCache () { $this->routes = array(); $this->cached = FALSE; } public function setSupportedFormats () { $args = func_get_args(); $extensions = array(); foreach ($args as $class_name) { if(!is_string($class_name) || !class_exists($class_name)){ throw new Exception("$class_name is not a vaild Format Class."); } $obj = new $class_name; if(! $obj instanceof iFormat){ throw new Exception('Invalid format class; must implement '. 'iFormat interface'); } foreach ($obj->getMIMEMap() as $extension => $mime) { if(!isset($this->format_map[$extension])) $this->format_map[$extension]=$class_name; if(!isset($this->format_map[$mime])) $this->format_map[$mime]=$class_name; $extensions[".$extension"]=TRUE; } } $this->format_map['default']=$args[0]; $this->format_map['extensions']=array_keys($extensions); } public function addAPIClass($class_name, $base_path = NULL) { if(!class_exists($class_name)){ throw new Exception("API class $class_name is missing."); } $this->loadCache(); if(!$this->cached){ if(is_null($base_path))$base_path=strtolower($class_name); $base_path = trim($base_path,'/'); if(strlen($base_path)>0)$base_path .= '/'; $this->generateMap($class_name, $base_path); } } public function addAuthenticationClass ($class_name, $base_path = NULL) { $this->auth_classes[] = $class_name; $this->addAPIClass($class_name, $base_path); } public function addErrorClass ($class_name) { $this->error_classes[] = $class_name; } public function handleError ($status_code, $error_message = NULL) { $method = "handle$status_code"; $handled = FALSE; foreach ($this->error_classes as $class_name) { if (method_exists($class_name, $method)) { $obj = new $class_name(); $obj->restler = $this; $obj->$method(); $handled = TRUE; } } if($handled)return; $message = $this->codes[$status_code] . (!$error_message ? '' : ': ' . $error_message); $this->setStatus($status_code); $this->sendData( call_user_func( array($this->response, '__formatError'), $status_code, $message) ); } public function handle () { if(empty($this->format_map))$this->setSupportedFormats('JsonFormat'); $this->url = $this->getPath(); $this->request_method = $this->getRequestMethod(); $this->response_format = $this->getResponseFormat(); $this->request_format = $this->getRequestFormat(); if(is_null($this->request_format)){ $this->request_format = $this->response_format; } if($this->request_method == 'PUT' || $this->request_method == 'POST'){ $this->request_data = $this->getRequestData(); } $o = $this->mapUrlToMethod(); if(!isset($o->class_name)){ $this->handleError(404); }else{ try { if($o->method_flag){ $auth_method = '__isAuthenticated'; if(!count($this->auth_classes))throw new RestException(401); foreach ($this->auth_classes as $auth_class) { $auth_obj = new $auth_class(); $auth_obj->restler=$this; $this->applyClassMetadata($auth_class, $auth_obj, $o); if (!method_exists($auth_obj, $auth_method)) { throw new RestException(401, 'Authentication Class '. 'should implement iAuthenticate'); }elseif(!$auth_obj->$auth_method()){ throw new RestException(401); } } } $this->applyClassMetadata(get_class($this->request_format), $this->request_format, $o); $pre_process = '_'.$this->request_format->getExtension().'_'. $o->method_name; $this->service_method = $o->method_name; if($o->method_flag==2)$o=unprotect($o); $object = $this->service_class_instance = new $o->class_name(); $object->restler=$this; if(method_exists($o->class_name, $pre_process)) { call_user_func_array(array($object, $pre_process), $o->arguments); } switch ($o->method_flag) { case 3: $reflection_method = new ReflectionMethod($object, $o->method_name); $reflection_method->setAccessible(TRUE); $result = $reflection_method->invokeArgs($object, $o->arguments); break; case 2: case 1: default: $result = call_user_func_array(array($object, $o->method_name), $o->arguments); } } catch (RestException $e) { $this->handleError($e->getCode(), $e->getMessage()); } } if (isset($result) && $result !== NULL) { $this->sendData($result); } } public function sendData($data) { $data = $this->response_format->encode($data, !$this->production_mode); $post_process = '_'.$this->service_method .'_'. $this->response_format->getExtension(); if(isset($this->service_class_instance) && method_exists($this->service_class_instance,$post_process)){ $data = call_user_func(array($this->service_class_instance, $post_process), $data); } header("Cache-Control: no-cache, must-revalidate"); header("Expires: 0"); header('Content-Type: ' . $this->response_format->getMIME()); header("X-Powered-By: Luracast Restler v".Restler::VERSION); die($data); } public function setStatus($code) { header("{$_SERVER['SERVER_PROTOCOL']} $code ". $this->codes[strval($code)]); } public function removeCommonPath($first, $second, $char='/'){ $first = explode($char, $first); $second = explode($char, $second); while (count($second)){ if($first[0]==$second[0]){ array_shift($first); } else break; array_shift($second); } return implode($char, $first); } public function saveCache() { $file = $this->cache_dir . '/routes.php'; $s = '$o=array();'.PHP_EOL; foreach ($this->routes as $key => $value) { $s .= PHP_EOL.PHP_EOL.PHP_EOL."############### $key ###############" .PHP_EOL.PHP_EOL; $s .= '$o[\''.$key.'\']=array();'; foreach ($value as $ke => $va) { $s .= PHP_EOL.PHP_EOL."#==== $key $ke".PHP_EOL.PHP_EOL; $s .= '$o[\''.$key.'\'][\''.$ke.'\']='.str_replace(PHP_EOL, PHP_EOL."\t", var_export($va, TRUE)).';'; } } $s .= PHP_EOL.'return $o;'; $r=@file_put_contents($file, "<?php $s"); @chmod($file, 0777); if($r===FALSE)throw new Exception( "The cache directory located at '$this->cache_dir' needs to have ". "the permissions set to read/write/execute for everyone in order ". "to save cache and improve performance."); } protected function getPath () { $path = urldecode($this->removeCommonPath($_SERVER['REQUEST_URI'], $_SERVER['SCRIPT_NAME'])); $path = preg_replace('/(\/*\?.*$)|(\/$)/', '', $path); $path = str_replace($this->format_map['extensions'], '', $path); return $path; } protected function getRequestMethod () { $method = $_SERVER['REQUEST_METHOD']; if (isset($_SERVER['HTTP_X_HTTP_METHOD_OVERRIDE'])){ $method = $_SERVER['HTTP_X_HTTP_METHOD_OVERRIDE']; } return $method; } protected function getRequestFormat () { $format=NULL; if(isset($_SERVER['CONTENT_TYPE'])){ $mime = explode(';', $_SERVER['CONTENT_TYPE']); $mime = $mime[0]; if($mime==UrlEncodedFormat::MIME){ $format = new UrlEncodedFormat(); }else{ if(isset($this->format_map[$mime])){ $format = $this->format_map[$mime]; $format = is_string($format) ? new $format: $format; $format->setMIME($mime); } } } return $format; } protected function getResponseFormat () { $format=NULL; $extension = explode('.', parse_url($_SERVER['REQUEST_URI'], PHP_URL_PATH)); $extension = array_pop($extension); if($extension && isset($this->format_map[$extension])){ $format = $this->format_map[$extension]; $format = is_string($format) ? new $format: $format; $format->setExtension($extension); return $format; } if(isset($_SERVER['HTTP_ACCEPT'])){ $accepts = explode(',', $_SERVER['HTTP_ACCEPT']); foreach ($accepts as $accept) { if($extension && isset($this->format_map[$accept])){ $format = $this->format_map[$accept]; $format = is_string($format) ? new $format: $format; $format->setMIME($accept); return $format; } } } $format = new $this->format_map['default']; return $format; } protected function getRequestData() { try{ $r = file_get_contents('php://input'); if(is_null($r))return $_GET; $r =$this->request_format->decode($r); return is_null($r) ? array(): $r; } catch (RestException $e) { $this->handleError($e->getCode(), $e->getMessage()); } } protected function mapUrlToMethod () { if(!isset($this->routes[$this->request_method])){ return array(); } $urls = $this->routes[$this->request_method]; if(!$urls)return array(); $found = FALSE; $this->request_data += $_GET; $params = array('request_data'=>$this->request_data); $params += $this->request_data; foreach ($urls as $url => $call) { $call = (object)$call; if(strstr($url, ':')){ $regex = preg_replace('/\\\:([^\/]+)/', '(?P<$1>[^/]+)', preg_quote($url)); if (preg_match(":^$regex$:", $this->url, $matches)) { foreach ($matches as $arg => $match) { if (isset($call->arguments[$arg])){ $params[$arg] = $match; } } $found = TRUE; break; } }elseif ($url == $this->url){ $found = TRUE; break; } } if($found){ $p = $call->defaults; foreach ($call->arguments as $key => $value) { if(isset($params[$key]))$p[$value] = $params[$key]; } $call->arguments=$p; return $call; } } protected function applyClassMetadata($class_name, $instance, $method_info){ if(isset($method_info->metadata[$class_name]) && is_array($method_info->metadata[$class_name])){ foreach ($method_info->metadata[$class_name] as $property => $value){ if(property_exists($class_name, $property)){ $reflection_property = new ReflectionProperty($class_name, $property); $reflection_property->setValue($instance, $value); } } } } protected function loadCache() { if ($this->cached !== NULL) { return; } $file = $this->cache_dir . '/routes.php'; $this->cached = FALSE; if ($this->production_mode) { if (file_exists($file)) { $routes = include($file); } if (isset($routes) && is_array($routes)) { $this->routes = $routes; $this->cached = TRUE; } } else { } } protected function generateMap ($class_name, $base_path = "") { $reflection = new ReflectionClass($class_name); $class_metadata = parse_doc($reflection->getDocComment()); $methods = $reflection->getMethods( ReflectionMethod::IS_PUBLIC + ReflectionMethod::IS_PROTECTED); foreach ($methods as $method) { $doc = $method->getDocComment(); $arguments = array(); $defaults = array(); $metadata = $class_metadata+parse_doc($doc); $params = $method->getParameters(); $position=0; foreach ($params as $param){ $arguments[$param->getName()] = $position; $defaults[$position] = $param->isDefaultValueAvailable() ? $param->getDefaultValue() : NULL; $position++; } $method_flag = $method->isProtected() ? (isRestlerCompatibilityModeEnabled() ? 2 : 3) : (isset($metadata['protected']) ? 1 : 0); $call = array( 'class_name'=>$class_name, 'method_name'=>$method->getName(), 'arguments'=>$arguments, 'defaults'=>$defaults, 'metadata'=>$metadata, 'method_flag'=>$method_flag ); $method_url = strtolower($method->getName()); if (preg_match_all( '/@url\s+(GET|POST|PUT|DELETE|HEAD|OPTIONS)[ \t]*\/?(\S*)/s', $doc, $matches, PREG_SET_ORDER)) { foreach ($matches as $match) { $http_method = $match[1]; $url = rtrim($base_path . $match[2],'/'); $this->routes[$http_method][$url] = $call; } }elseif($method_url[0] != '_'){ if (preg_match_all('/^(GET|POST|PUT|DELETE|HEAD|OPTIONS)/i', $method_url, $matches)) { $http_method = strtoupper($matches[0][0]); $method_url = substr($method_url, strlen($http_method)); }else{ $http_method = 'GET'; } $url = $base_path. ($method_url=='index' || $method_url=='default' ? '' : $method_url); $url = rtrim($url,'/'); $this->routes[$http_method][$url] = $call; foreach ($params as $param){ if($param->getName()=='request_data'){ break; } $url .= $url=='' ? ':' : '/:'; $url .= $param->getName(); $this->routes[$http_method][$url] = $call; } } } } } if(version_compare(PHP_VERSION, '5.3.0') < 0){ require_once 'compat.php'; } class RestException extends Exception { public function __construct($http_status_code, $error_message = NULL) { parent::__construct($error_message, $http_status_code); } } interface iRespond { public function __formatResponse($result); public function __formatError($status_code, $message); } class DefaultResponse implements iRespond { function __formatResponse($result) { return $result; } function __formatError($statusCode, $message) { return array('error' => array('code' => $statusCode, 'message' => $message)); } } interface iAuthenticate { public function __isAuthenticated(); } interface iFormat { public function getMIMEMap(); public function setMIME($mime); public function getMIME(); public function setExtension($extension); public function getExtension(); public function encode($data, $human_readable=FALSE); public function decode($data); } class UrlEncodedFormat implements iFormat { const MIME = 'application/x-www-form-urlencoded'; const EXTENSION = 'post'; public function getMIMEMap() { return array(UrlEncodedFormat::EXTENSION=>UrlEncodedFormat::MIME); } public function getMIME(){ return UrlEncodedFormat::MIME; } public function getExtension(){ return UrlEncodedFormat::EXTENSION; } public function setMIME($mime){ } public function setExtension($extension){ } public function encode($data, $human_readable=FALSE){ return http_build_query($data); } public function decode($data){ parse_str($data,$r); return $r; } public function __toString(){ return $this->getExtension(); } } class JsonFormat implements iFormat { const MIME ='application/json'; const EXTENSION = 'json'; public function getMIMEMap() { return array(JsonFormat::EXTENSION=>JsonFormat::MIME); } public function getMIME(){ return JsonFormat::MIME; } public function getExtension(){ return JsonFormat::EXTENSION; } public function setMIME($mime){ } public function setExtension($extension){ } public function encode($data, $human_readable=FALSE){ return $human_readable ? $this->json_format(json_encode(object_to_array($data))) : json_encode(object_to_array($data)); } public function decode($data) { $decoded = json_decode ( $data ); if (function_exists ( 'json_last_error' )) { $message = ''; switch (json_last_error ()) { case JSON_ERROR_NONE : return object_to_array ( $decoded ); break; case JSON_ERROR_DEPTH : $message = 'maximum stack depth exceeded'; break; case JSON_ERROR_STATE_MISMATCH : $message = 'underflow or the modes mismatch'; break; case JSON_ERROR_CTRL_CHAR : $message = 'unexpected control character found'; break; case JSON_ERROR_SYNTAX : $message = 'malformed JSON'; break; case JSON_ERROR_UTF8 : $message = 'malformed UTF-8 characters, possibly incorrectly encoded'; break; default : $message = 'unknown error'; break; } throw new RestException ( 400, 'Error parsing JSON, ' . $message ); } return object_to_array ( $decoded ); } private function json_format($json) { $tab = "  "; $new_json = ""; $indent_level = 0; $in_string = FALSE; $len = strlen($json); for($c = 0; $c < $len; $c++) { $char = $json[$c]; switch($char) { case '{': case '[': if(!$in_string) { $new_json .= $char . "\n" . str_repeat($tab, $indent_level+1); $indent_level++; } else { $new_json .= $char; } break; case '}': case ']': if(!$in_string) { $indent_level--; $new_json .= "\n".str_repeat($tab, $indent_level).$char; } else { $new_json .= $char; } break; case ',': if(!$in_string) { $new_json .= ",\n" . str_repeat($tab, $indent_level); } else { $new_json .= $char; } break; case ':': if(!$in_string) { $new_json .= ": "; } else { $new_json .= $char; } break; case '"': if($c==0){ $in_string = TRUE; }elseif($c > 0 && $json[$c-1] != '\\') { $in_string = !$in_string; } default: $new_json .= $char; break; } } return $new_json; } public function __toString(){ return $this->getExtension(); } } class DocParser { private $params=array(); function parse($doc='') { if($doc==''){ return $this->params; } if(preg_match('#^/\*\*(.*)\*/#s', $doc, $comment) === false) return $this->params; $comment = trim($comment[1]); if(preg_match_all('#^\s*\*(.*)#m', $comment, $lines) === false) return $this->params; $this->parseLines($lines[1]); return $this->params; } private function parseLines($lines) { foreach($lines as $line) { $parsedLine = $this->parseLine($line); if($parsedLine === false && !isset($this->params['description'])) { if(isset($desc)){ $this->params['description'] = implode(PHP_EOL, $desc); } $desc = array(); } elseif($parsedLine !== false) { $desc[] = $parsedLine; } } $desc = implode(' ', $desc); if(!empty($desc))$this->params['long_description'] = $desc; } private function parseLine($line) { $line = trim($line); if(empty($line)) return false; if(strpos($line, '@') === 0) { if(strpos($line, ' ')>0){ $param = substr($line, 1, strpos($line, ' ') - 1); $value = substr($line, strlen($param) + 2); }else{ $param = substr($line, 1); $value = ''; } if($this->setParam($param, $value)) return false; } return $line; } private function setParam($param, $value) { if($param == 'param' || $param == 'return') $value = $this->formatParamOrReturn($value); if($param == 'class') list($param, $value) = $this->formatClass($value); if(empty($this->params[$param])) { $this->params[$param] = $value; } else if($param == 'param'){ $arr = array($this->params[$param], $value); $this->params[$param] = $arr; } else { $this->params[$param] = $value + $this->params[$param]; } return true; } private function formatClass($value) { $r = preg_split("[\(|\)]",$value); if(is_array($r)){ $param = $r[0]; parse_str($r[1],$value); foreach ($value as $key => $val) { $val = explode(',', $val); if(count($val)>1)$value[$key]=$val; } }else{ $param='Unknown'; } return array($param, $value); } private function formatParamOrReturn($string) { $pos = strpos($string, ' '); $type = substr($string, 0, $pos); return '(' . $type . ')' . substr($string, $pos+1); } } function parse_doc($php_doc_comment){ $p = new DocParser(); return $p->parse($php_doc_comment); $p = new Parser($php_doc_comment); return $p; $php_doc_comment = preg_replace("/(^[\\s]*\\/\\*\\*)
                                  |(^[\\s]\\*\\/)
                                  |(^[\\s]*\\*?\\s)
                                  |(^[\\s]*)

From 0da14752c770f06d8a8251f0b94fd9030b173cf5 Mon Sep 17 00:00:00 2001
From: Luracast <arul@luracast.com>
Date: Wed, 9 Nov 2011 21:03:39 +0800
Subject: [PATCH 24/61] Malformed JSON Request Error support for PHP versions
 lesser than 5.3

---
 restler/restler.php          | 6 ++++--
 restler_minified/restler.php | 2 +-
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/restler/restler.php b/restler/restler.php
index e3ba7dfdd..30a88359f 100644
--- a/restler/restler.php
+++ b/restler/restler.php
@@ -10,10 +10,10 @@
  * @copyright  2010 Luracast
  * @license    http://www.opensource.org/licenses/lgpl-license.php LGPL
  * @link       http://luracast.com/products/restler/
- * @version    2.0.5
+ * @version    2.0.6
  */
 class Restler {
-	const VERSION = '2.0.5';
+	const VERSION = '2.0.6';
 	/**
 	 * URL of the currently mapped service
 	 * @var string
@@ -964,6 +964,8 @@ public function decode($data) {
 					break;
 			}
 			throw new RestException ( 400, 'Error parsing JSON, ' . $message );
+		} else if (strlen ( $data ) && $decoded === NULL || $decoded === $data) {
+			throw new RestException ( 400, 'Error parsing JSON' );
 		}
 		return object_to_array ( $decoded );
 	}
diff --git a/restler_minified/restler.php b/restler_minified/restler.php
index 54537c2c9..90f8db436 100644
--- a/restler_minified/restler.php
+++ b/restler_minified/restler.php
@@ -1,5 +1,5 @@
 <?php
- class Restler { const VERSION = '2.0.5'; public $url; public $request_method; public $request_format; public $request_data=array(); public $cache_dir; public $base_dir; public $response = 'DefaultResponse'; public $response_format; protected $production_mode; protected $routes= array(); protected $format_map = array(); protected $service_class_instance; protected $service_method; protected $auth_classes = array(); protected $error_classes = array(); private $codes = array( 100 => 'Continue', 101 => 'Switching Protocols', 200 => 'OK', 201 => 'Created', 202 => 'Accepted', 203 => 'Non-Authoritative Information', 204 => 'No Content', 205 => 'Reset Content', 206 => 'Partial Content', 300 => 'Multiple Choices', 301 => 'Moved Permanently', 302 => 'Found', 303 => 'See Other', 304 => 'Not Modified', 305 => 'Use Proxy', 306 => '(Unused)', 307 => 'Temporary Redirect', 400 => 'Bad Request', 401 => 'Unauthorized', 402 => 'Payment Required', 403 => 'Forbidden', 404 => 'Not Found', 405 => 'Method Not Allowed', 406 => 'Not Acceptable', 407 => 'Proxy Authentication Required', 408 => 'Request Timeout', 409 => 'Conflict', 410 => 'Gone', 411 => 'Length Required', 412 => 'Precondition Failed', 413 => 'Request Entity Too Large', 414 => 'Request-URI Too Long', 415 => 'Unsupported Media Type', 416 => 'Requested Range Not Satisfiable', 417 => 'Expectation Failed', 500 => 'Internal Server Error', 501 => 'Not Implemented', 502 => 'Bad Gateway', 503 => 'Service Unavailable', 504 => 'Gateway Timeout', 505 => 'HTTP Version Not Supported' ); protected $cached; public function __construct ($production_mode = FALSE) { $this->production_mode = $production_mode; $this->cache_dir = getcwd(); $this->base_dir = RESTLER_PATH; } public function __destruct () { if ($this->production_mode && !$this->cached) { $this->saveCache(); } } public function refreshCache () { $this->routes = array(); $this->cached = FALSE; } public function setSupportedFormats () { $args = func_get_args(); $extensions = array(); foreach ($args as $class_name) { if(!is_string($class_name) || !class_exists($class_name)){ throw new Exception("$class_name is not a vaild Format Class."); } $obj = new $class_name; if(! $obj instanceof iFormat){ throw new Exception('Invalid format class; must implement '. 'iFormat interface'); } foreach ($obj->getMIMEMap() as $extension => $mime) { if(!isset($this->format_map[$extension])) $this->format_map[$extension]=$class_name; if(!isset($this->format_map[$mime])) $this->format_map[$mime]=$class_name; $extensions[".$extension"]=TRUE; } } $this->format_map['default']=$args[0]; $this->format_map['extensions']=array_keys($extensions); } public function addAPIClass($class_name, $base_path = NULL) { if(!class_exists($class_name)){ throw new Exception("API class $class_name is missing."); } $this->loadCache(); if(!$this->cached){ if(is_null($base_path))$base_path=strtolower($class_name); $base_path = trim($base_path,'/'); if(strlen($base_path)>0)$base_path .= '/'; $this->generateMap($class_name, $base_path); } } public function addAuthenticationClass ($class_name, $base_path = NULL) { $this->auth_classes[] = $class_name; $this->addAPIClass($class_name, $base_path); } public function addErrorClass ($class_name) { $this->error_classes[] = $class_name; } public function handleError ($status_code, $error_message = NULL) { $method = "handle$status_code"; $handled = FALSE; foreach ($this->error_classes as $class_name) { if (method_exists($class_name, $method)) { $obj = new $class_name(); $obj->restler = $this; $obj->$method(); $handled = TRUE; } } if($handled)return; $message = $this->codes[$status_code] . (!$error_message ? '' : ': ' . $error_message); $this->setStatus($status_code); $this->sendData( call_user_func( array($this->response, '__formatError'), $status_code, $message) ); } public function handle () { if(empty($this->format_map))$this->setSupportedFormats('JsonFormat'); $this->url = $this->getPath(); $this->request_method = $this->getRequestMethod(); $this->response_format = $this->getResponseFormat(); $this->request_format = $this->getRequestFormat(); if(is_null($this->request_format)){ $this->request_format = $this->response_format; } if($this->request_method == 'PUT' || $this->request_method == 'POST'){ $this->request_data = $this->getRequestData(); } $o = $this->mapUrlToMethod(); if(!isset($o->class_name)){ $this->handleError(404); }else{ try { if($o->method_flag){ $auth_method = '__isAuthenticated'; if(!count($this->auth_classes))throw new RestException(401); foreach ($this->auth_classes as $auth_class) { $auth_obj = new $auth_class(); $auth_obj->restler=$this; $this->applyClassMetadata($auth_class, $auth_obj, $o); if (!method_exists($auth_obj, $auth_method)) { throw new RestException(401, 'Authentication Class '. 'should implement iAuthenticate'); }elseif(!$auth_obj->$auth_method()){ throw new RestException(401); } } } $this->applyClassMetadata(get_class($this->request_format), $this->request_format, $o); $pre_process = '_'.$this->request_format->getExtension().'_'. $o->method_name; $this->service_method = $o->method_name; if($o->method_flag==2)$o=unprotect($o); $object = $this->service_class_instance = new $o->class_name(); $object->restler=$this; if(method_exists($o->class_name, $pre_process)) { call_user_func_array(array($object, $pre_process), $o->arguments); } switch ($o->method_flag) { case 3: $reflection_method = new ReflectionMethod($object, $o->method_name); $reflection_method->setAccessible(TRUE); $result = $reflection_method->invokeArgs($object, $o->arguments); break; case 2: case 1: default: $result = call_user_func_array(array($object, $o->method_name), $o->arguments); } } catch (RestException $e) { $this->handleError($e->getCode(), $e->getMessage()); } } if (isset($result) && $result !== NULL) { $this->sendData($result); } } public function sendData($data) { $data = $this->response_format->encode($data, !$this->production_mode); $post_process = '_'.$this->service_method .'_'. $this->response_format->getExtension(); if(isset($this->service_class_instance) && method_exists($this->service_class_instance,$post_process)){ $data = call_user_func(array($this->service_class_instance, $post_process), $data); } header("Cache-Control: no-cache, must-revalidate"); header("Expires: 0"); header('Content-Type: ' . $this->response_format->getMIME()); header("X-Powered-By: Luracast Restler v".Restler::VERSION); die($data); } public function setStatus($code) { header("{$_SERVER['SERVER_PROTOCOL']} $code ". $this->codes[strval($code)]); } public function removeCommonPath($first, $second, $char='/'){ $first = explode($char, $first); $second = explode($char, $second); while (count($second)){ if($first[0]==$second[0]){ array_shift($first); } else break; array_shift($second); } return implode($char, $first); } public function saveCache() { $file = $this->cache_dir . '/routes.php'; $s = '$o=array();'.PHP_EOL; foreach ($this->routes as $key => $value) { $s .= PHP_EOL.PHP_EOL.PHP_EOL."############### $key ###############" .PHP_EOL.PHP_EOL; $s .= '$o[\''.$key.'\']=array();'; foreach ($value as $ke => $va) { $s .= PHP_EOL.PHP_EOL."#==== $key $ke".PHP_EOL.PHP_EOL; $s .= '$o[\''.$key.'\'][\''.$ke.'\']='.str_replace(PHP_EOL, PHP_EOL."\t", var_export($va, TRUE)).';'; } } $s .= PHP_EOL.'return $o;'; $r=@file_put_contents($file, "<?php $s"); @chmod($file, 0777); if($r===FALSE)throw new Exception( "The cache directory located at '$this->cache_dir' needs to have ". "the permissions set to read/write/execute for everyone in order ". "to save cache and improve performance."); } protected function getPath () { $path = urldecode($this->removeCommonPath($_SERVER['REQUEST_URI'], $_SERVER['SCRIPT_NAME'])); $path = preg_replace('/(\/*\?.*$)|(\/$)/', '', $path); $path = str_replace($this->format_map['extensions'], '', $path); return $path; } protected function getRequestMethod () { $method = $_SERVER['REQUEST_METHOD']; if (isset($_SERVER['HTTP_X_HTTP_METHOD_OVERRIDE'])){ $method = $_SERVER['HTTP_X_HTTP_METHOD_OVERRIDE']; } return $method; } protected function getRequestFormat () { $format=NULL; if(isset($_SERVER['CONTENT_TYPE'])){ $mime = explode(';', $_SERVER['CONTENT_TYPE']); $mime = $mime[0]; if($mime==UrlEncodedFormat::MIME){ $format = new UrlEncodedFormat(); }else{ if(isset($this->format_map[$mime])){ $format = $this->format_map[$mime]; $format = is_string($format) ? new $format: $format; $format->setMIME($mime); } } } return $format; } protected function getResponseFormat () { $format=NULL; $extension = explode('.', parse_url($_SERVER['REQUEST_URI'], PHP_URL_PATH)); $extension = array_pop($extension); if($extension && isset($this->format_map[$extension])){ $format = $this->format_map[$extension]; $format = is_string($format) ? new $format: $format; $format->setExtension($extension); return $format; } if(isset($_SERVER['HTTP_ACCEPT'])){ $accepts = explode(',', $_SERVER['HTTP_ACCEPT']); foreach ($accepts as $accept) { if($extension && isset($this->format_map[$accept])){ $format = $this->format_map[$accept]; $format = is_string($format) ? new $format: $format; $format->setMIME($accept); return $format; } } } $format = new $this->format_map['default']; return $format; } protected function getRequestData() { try{ $r = file_get_contents('php://input'); if(is_null($r))return $_GET; $r =$this->request_format->decode($r); return is_null($r) ? array(): $r; } catch (RestException $e) { $this->handleError($e->getCode(), $e->getMessage()); } } protected function mapUrlToMethod () { if(!isset($this->routes[$this->request_method])){ return array(); } $urls = $this->routes[$this->request_method]; if(!$urls)return array(); $found = FALSE; $this->request_data += $_GET; $params = array('request_data'=>$this->request_data); $params += $this->request_data; foreach ($urls as $url => $call) { $call = (object)$call; if(strstr($url, ':')){ $regex = preg_replace('/\\\:([^\/]+)/', '(?P<$1>[^/]+)', preg_quote($url)); if (preg_match(":^$regex$:", $this->url, $matches)) { foreach ($matches as $arg => $match) { if (isset($call->arguments[$arg])){ $params[$arg] = $match; } } $found = TRUE; break; } }elseif ($url == $this->url){ $found = TRUE; break; } } if($found){ $p = $call->defaults; foreach ($call->arguments as $key => $value) { if(isset($params[$key]))$p[$value] = $params[$key]; } $call->arguments=$p; return $call; } } protected function applyClassMetadata($class_name, $instance, $method_info){ if(isset($method_info->metadata[$class_name]) && is_array($method_info->metadata[$class_name])){ foreach ($method_info->metadata[$class_name] as $property => $value){ if(property_exists($class_name, $property)){ $reflection_property = new ReflectionProperty($class_name, $property); $reflection_property->setValue($instance, $value); } } } } protected function loadCache() { if ($this->cached !== NULL) { return; } $file = $this->cache_dir . '/routes.php'; $this->cached = FALSE; if ($this->production_mode) { if (file_exists($file)) { $routes = include($file); } if (isset($routes) && is_array($routes)) { $this->routes = $routes; $this->cached = TRUE; } } else { } } protected function generateMap ($class_name, $base_path = "") { $reflection = new ReflectionClass($class_name); $class_metadata = parse_doc($reflection->getDocComment()); $methods = $reflection->getMethods( ReflectionMethod::IS_PUBLIC + ReflectionMethod::IS_PROTECTED); foreach ($methods as $method) { $doc = $method->getDocComment(); $arguments = array(); $defaults = array(); $metadata = $class_metadata+parse_doc($doc); $params = $method->getParameters(); $position=0; foreach ($params as $param){ $arguments[$param->getName()] = $position; $defaults[$position] = $param->isDefaultValueAvailable() ? $param->getDefaultValue() : NULL; $position++; } $method_flag = $method->isProtected() ? (isRestlerCompatibilityModeEnabled() ? 2 : 3) : (isset($metadata['protected']) ? 1 : 0); $call = array( 'class_name'=>$class_name, 'method_name'=>$method->getName(), 'arguments'=>$arguments, 'defaults'=>$defaults, 'metadata'=>$metadata, 'method_flag'=>$method_flag ); $method_url = strtolower($method->getName()); if (preg_match_all( '/@url\s+(GET|POST|PUT|DELETE|HEAD|OPTIONS)[ \t]*\/?(\S*)/s', $doc, $matches, PREG_SET_ORDER)) { foreach ($matches as $match) { $http_method = $match[1]; $url = rtrim($base_path . $match[2],'/'); $this->routes[$http_method][$url] = $call; } }elseif($method_url[0] != '_'){ if (preg_match_all('/^(GET|POST|PUT|DELETE|HEAD|OPTIONS)/i', $method_url, $matches)) { $http_method = strtoupper($matches[0][0]); $method_url = substr($method_url, strlen($http_method)); }else{ $http_method = 'GET'; } $url = $base_path. ($method_url=='index' || $method_url=='default' ? '' : $method_url); $url = rtrim($url,'/'); $this->routes[$http_method][$url] = $call; foreach ($params as $param){ if($param->getName()=='request_data'){ break; } $url .= $url=='' ? ':' : '/:'; $url .= $param->getName(); $this->routes[$http_method][$url] = $call; } } } } } if(version_compare(PHP_VERSION, '5.3.0') < 0){ require_once 'compat.php'; } class RestException extends Exception { public function __construct($http_status_code, $error_message = NULL) { parent::__construct($error_message, $http_status_code); } } interface iRespond { public function __formatResponse($result); public function __formatError($status_code, $message); } class DefaultResponse implements iRespond { function __formatResponse($result) { return $result; } function __formatError($statusCode, $message) { return array('error' => array('code' => $statusCode, 'message' => $message)); } } interface iAuthenticate { public function __isAuthenticated(); } interface iFormat { public function getMIMEMap(); public function setMIME($mime); public function getMIME(); public function setExtension($extension); public function getExtension(); public function encode($data, $human_readable=FALSE); public function decode($data); } class UrlEncodedFormat implements iFormat { const MIME = 'application/x-www-form-urlencoded'; const EXTENSION = 'post'; public function getMIMEMap() { return array(UrlEncodedFormat::EXTENSION=>UrlEncodedFormat::MIME); } public function getMIME(){ return UrlEncodedFormat::MIME; } public function getExtension(){ return UrlEncodedFormat::EXTENSION; } public function setMIME($mime){ } public function setExtension($extension){ } public function encode($data, $human_readable=FALSE){ return http_build_query($data); } public function decode($data){ parse_str($data,$r); return $r; } public function __toString(){ return $this->getExtension(); } } class JsonFormat implements iFormat { const MIME ='application/json'; const EXTENSION = 'json'; public function getMIMEMap() { return array(JsonFormat::EXTENSION=>JsonFormat::MIME); } public function getMIME(){ return JsonFormat::MIME; } public function getExtension(){ return JsonFormat::EXTENSION; } public function setMIME($mime){ } public function setExtension($extension){ } public function encode($data, $human_readable=FALSE){ return $human_readable ? $this->json_format(json_encode(object_to_array($data))) : json_encode(object_to_array($data)); } public function decode($data) { $decoded = json_decode ( $data ); if (function_exists ( 'json_last_error' )) { $message = ''; switch (json_last_error ()) { case JSON_ERROR_NONE : return object_to_array ( $decoded ); break; case JSON_ERROR_DEPTH : $message = 'maximum stack depth exceeded'; break; case JSON_ERROR_STATE_MISMATCH : $message = 'underflow or the modes mismatch'; break; case JSON_ERROR_CTRL_CHAR : $message = 'unexpected control character found'; break; case JSON_ERROR_SYNTAX : $message = 'malformed JSON'; break; case JSON_ERROR_UTF8 : $message = 'malformed UTF-8 characters, possibly incorrectly encoded'; break; default : $message = 'unknown error'; break; } throw new RestException ( 400, 'Error parsing JSON, ' . $message ); } return object_to_array ( $decoded ); } private function json_format($json) { $tab = "  "; $new_json = ""; $indent_level = 0; $in_string = FALSE; $len = strlen($json); for($c = 0; $c < $len; $c++) { $char = $json[$c]; switch($char) { case '{': case '[': if(!$in_string) { $new_json .= $char . "\n" . str_repeat($tab, $indent_level+1); $indent_level++; } else { $new_json .= $char; } break; case '}': case ']': if(!$in_string) { $indent_level--; $new_json .= "\n".str_repeat($tab, $indent_level).$char; } else { $new_json .= $char; } break; case ',': if(!$in_string) { $new_json .= ",\n" . str_repeat($tab, $indent_level); } else { $new_json .= $char; } break; case ':': if(!$in_string) { $new_json .= ": "; } else { $new_json .= $char; } break; case '"': if($c==0){ $in_string = TRUE; }elseif($c > 0 && $json[$c-1] != '\\') { $in_string = !$in_string; } default: $new_json .= $char; break; } } return $new_json; } public function __toString(){ return $this->getExtension(); } } class DocParser { private $params=array(); function parse($doc='') { if($doc==''){ return $this->params; } if(preg_match('#^/\*\*(.*)\*/#s', $doc, $comment) === false) return $this->params; $comment = trim($comment[1]); if(preg_match_all('#^\s*\*(.*)#m', $comment, $lines) === false) return $this->params; $this->parseLines($lines[1]); return $this->params; } private function parseLines($lines) { foreach($lines as $line) { $parsedLine = $this->parseLine($line); if($parsedLine === false && !isset($this->params['description'])) { if(isset($desc)){ $this->params['description'] = implode(PHP_EOL, $desc); } $desc = array(); } elseif($parsedLine !== false) { $desc[] = $parsedLine; } } $desc = implode(' ', $desc); if(!empty($desc))$this->params['long_description'] = $desc; } private function parseLine($line) { $line = trim($line); if(empty($line)) return false; if(strpos($line, '@') === 0) { if(strpos($line, ' ')>0){ $param = substr($line, 1, strpos($line, ' ') - 1); $value = substr($line, strlen($param) + 2); }else{ $param = substr($line, 1); $value = ''; } if($this->setParam($param, $value)) return false; } return $line; } private function setParam($param, $value) { if($param == 'param' || $param == 'return') $value = $this->formatParamOrReturn($value); if($param == 'class') list($param, $value) = $this->formatClass($value); if(empty($this->params[$param])) { $this->params[$param] = $value; } else if($param == 'param'){ $arr = array($this->params[$param], $value); $this->params[$param] = $arr; } else { $this->params[$param] = $value + $this->params[$param]; } return true; } private function formatClass($value) { $r = preg_split("[\(|\)]",$value); if(is_array($r)){ $param = $r[0]; parse_str($r[1],$value); foreach ($value as $key => $val) { $val = explode(',', $val); if(count($val)>1)$value[$key]=$val; } }else{ $param='Unknown'; } return array($param, $value); } private function formatParamOrReturn($string) { $pos = strpos($string, ' '); $type = substr($string, 0, $pos); return '(' . $type . ')' . substr($string, $pos+1); } } function parse_doc($php_doc_comment){ $p = new DocParser(); return $p->parse($php_doc_comment); $p = new Parser($php_doc_comment); return $p; $php_doc_comment = preg_replace("/(^[\\s]*\\/\\*\\*)
+ class Restler { const VERSION = '2.0.6'; public $url; public $request_method; public $request_format; public $request_data=array(); public $cache_dir; public $base_dir; public $response = 'DefaultResponse'; public $response_format; protected $production_mode; protected $routes= array(); protected $format_map = array(); protected $service_class_instance; protected $service_method; protected $auth_classes = array(); protected $error_classes = array(); private $codes = array( 100 => 'Continue', 101 => 'Switching Protocols', 200 => 'OK', 201 => 'Created', 202 => 'Accepted', 203 => 'Non-Authoritative Information', 204 => 'No Content', 205 => 'Reset Content', 206 => 'Partial Content', 300 => 'Multiple Choices', 301 => 'Moved Permanently', 302 => 'Found', 303 => 'See Other', 304 => 'Not Modified', 305 => 'Use Proxy', 306 => '(Unused)', 307 => 'Temporary Redirect', 400 => 'Bad Request', 401 => 'Unauthorized', 402 => 'Payment Required', 403 => 'Forbidden', 404 => 'Not Found', 405 => 'Method Not Allowed', 406 => 'Not Acceptable', 407 => 'Proxy Authentication Required', 408 => 'Request Timeout', 409 => 'Conflict', 410 => 'Gone', 411 => 'Length Required', 412 => 'Precondition Failed', 413 => 'Request Entity Too Large', 414 => 'Request-URI Too Long', 415 => 'Unsupported Media Type', 416 => 'Requested Range Not Satisfiable', 417 => 'Expectation Failed', 500 => 'Internal Server Error', 501 => 'Not Implemented', 502 => 'Bad Gateway', 503 => 'Service Unavailable', 504 => 'Gateway Timeout', 505 => 'HTTP Version Not Supported' ); protected $cached; public function __construct ($production_mode = FALSE) { $this->production_mode = $production_mode; $this->cache_dir = getcwd(); $this->base_dir = RESTLER_PATH; } public function __destruct () { if ($this->production_mode && !$this->cached) { $this->saveCache(); } } public function refreshCache () { $this->routes = array(); $this->cached = FALSE; } public function setSupportedFormats () { $args = func_get_args(); $extensions = array(); foreach ($args as $class_name) { if(!is_string($class_name) || !class_exists($class_name)){ throw new Exception("$class_name is not a vaild Format Class."); } $obj = new $class_name; if(! $obj instanceof iFormat){ throw new Exception('Invalid format class; must implement '. 'iFormat interface'); } foreach ($obj->getMIMEMap() as $extension => $mime) { if(!isset($this->format_map[$extension])) $this->format_map[$extension]=$class_name; if(!isset($this->format_map[$mime])) $this->format_map[$mime]=$class_name; $extensions[".$extension"]=TRUE; } } $this->format_map['default']=$args[0]; $this->format_map['extensions']=array_keys($extensions); } public function addAPIClass($class_name, $base_path = NULL) { if(!class_exists($class_name)){ throw new Exception("API class $class_name is missing."); } $this->loadCache(); if(!$this->cached){ if(is_null($base_path))$base_path=strtolower($class_name); $base_path = trim($base_path,'/'); if(strlen($base_path)>0)$base_path .= '/'; $this->generateMap($class_name, $base_path); } } public function addAuthenticationClass ($class_name, $base_path = NULL) { $this->auth_classes[] = $class_name; $this->addAPIClass($class_name, $base_path); } public function addErrorClass ($class_name) { $this->error_classes[] = $class_name; } public function handleError ($status_code, $error_message = NULL) { $method = "handle$status_code"; $handled = FALSE; foreach ($this->error_classes as $class_name) { if (method_exists($class_name, $method)) { $obj = new $class_name(); $obj->restler = $this; $obj->$method(); $handled = TRUE; } } if($handled)return; $message = $this->codes[$status_code] . (!$error_message ? '' : ': ' . $error_message); $this->setStatus($status_code); $this->sendData( call_user_func( array($this->response, '__formatError'), $status_code, $message) ); } public function handle () { if(empty($this->format_map))$this->setSupportedFormats('JsonFormat'); $this->url = $this->getPath(); $this->request_method = $this->getRequestMethod(); $this->response_format = $this->getResponseFormat(); $this->request_format = $this->getRequestFormat(); if(is_null($this->request_format)){ $this->request_format = $this->response_format; } if($this->request_method == 'PUT' || $this->request_method == 'POST'){ $this->request_data = $this->getRequestData(); } $o = $this->mapUrlToMethod(); if(!isset($o->class_name)){ $this->handleError(404); }else{ try { if($o->method_flag){ $auth_method = '__isAuthenticated'; if(!count($this->auth_classes))throw new RestException(401); foreach ($this->auth_classes as $auth_class) { $auth_obj = new $auth_class(); $auth_obj->restler=$this; $this->applyClassMetadata($auth_class, $auth_obj, $o); if (!method_exists($auth_obj, $auth_method)) { throw new RestException(401, 'Authentication Class '. 'should implement iAuthenticate'); }elseif(!$auth_obj->$auth_method()){ throw new RestException(401); } } } $this->applyClassMetadata(get_class($this->request_format), $this->request_format, $o); $pre_process = '_'.$this->request_format->getExtension().'_'. $o->method_name; $this->service_method = $o->method_name; if($o->method_flag==2)$o=unprotect($o); $object = $this->service_class_instance = new $o->class_name(); $object->restler=$this; if(method_exists($o->class_name, $pre_process)) { call_user_func_array(array($object, $pre_process), $o->arguments); } switch ($o->method_flag) { case 3: $reflection_method = new ReflectionMethod($object, $o->method_name); $reflection_method->setAccessible(TRUE); $result = $reflection_method->invokeArgs($object, $o->arguments); break; case 2: case 1: default: $result = call_user_func_array(array($object, $o->method_name), $o->arguments); } } catch (RestException $e) { $this->handleError($e->getCode(), $e->getMessage()); } } if (isset($result) && $result !== NULL) { $this->sendData($result); } } public function sendData($data) { $data = $this->response_format->encode($data, !$this->production_mode); $post_process = '_'.$this->service_method .'_'. $this->response_format->getExtension(); if(isset($this->service_class_instance) && method_exists($this->service_class_instance,$post_process)){ $data = call_user_func(array($this->service_class_instance, $post_process), $data); } header("Cache-Control: no-cache, must-revalidate"); header("Expires: 0"); header('Content-Type: ' . $this->response_format->getMIME()); header("X-Powered-By: Luracast Restler v".Restler::VERSION); die($data); } public function setStatus($code) { header("{$_SERVER['SERVER_PROTOCOL']} $code ". $this->codes[strval($code)]); } public function removeCommonPath($first, $second, $char='/'){ $first = explode($char, $first); $second = explode($char, $second); while (count($second)){ if($first[0]==$second[0]){ array_shift($first); } else break; array_shift($second); } return implode($char, $first); } public function saveCache() { $file = $this->cache_dir . '/routes.php'; $s = '$o=array();'.PHP_EOL; foreach ($this->routes as $key => $value) { $s .= PHP_EOL.PHP_EOL.PHP_EOL."############### $key ###############" .PHP_EOL.PHP_EOL; $s .= '$o[\''.$key.'\']=array();'; foreach ($value as $ke => $va) { $s .= PHP_EOL.PHP_EOL."#==== $key $ke".PHP_EOL.PHP_EOL; $s .= '$o[\''.$key.'\'][\''.$ke.'\']='.str_replace(PHP_EOL, PHP_EOL."\t", var_export($va, TRUE)).';'; } } $s .= PHP_EOL.'return $o;'; $r=@file_put_contents($file, "<?php $s"); @chmod($file, 0777); if($r===FALSE)throw new Exception( "The cache directory located at '$this->cache_dir' needs to have ". "the permissions set to read/write/execute for everyone in order ". "to save cache and improve performance."); } protected function getPath () { $path = urldecode($this->removeCommonPath($_SERVER['REQUEST_URI'], $_SERVER['SCRIPT_NAME'])); $path = preg_replace('/(\/*\?.*$)|(\/$)/', '', $path); $path = str_replace($this->format_map['extensions'], '', $path); return $path; } protected function getRequestMethod () { $method = $_SERVER['REQUEST_METHOD']; if (isset($_SERVER['HTTP_X_HTTP_METHOD_OVERRIDE'])){ $method = $_SERVER['HTTP_X_HTTP_METHOD_OVERRIDE']; } return $method; } protected function getRequestFormat () { $format=NULL; if(isset($_SERVER['CONTENT_TYPE'])){ $mime = explode(';', $_SERVER['CONTENT_TYPE']); $mime = $mime[0]; if($mime==UrlEncodedFormat::MIME){ $format = new UrlEncodedFormat(); }else{ if(isset($this->format_map[$mime])){ $format = $this->format_map[$mime]; $format = is_string($format) ? new $format: $format; $format->setMIME($mime); } } } return $format; } protected function getResponseFormat () { $format=NULL; $extension = explode('.', parse_url($_SERVER['REQUEST_URI'], PHP_URL_PATH)); $extension = array_pop($extension); if($extension && isset($this->format_map[$extension])){ $format = $this->format_map[$extension]; $format = is_string($format) ? new $format: $format; $format->setExtension($extension); return $format; } if(isset($_SERVER['HTTP_ACCEPT'])){ $accepts = explode(',', $_SERVER['HTTP_ACCEPT']); foreach ($accepts as $accept) { if($extension && isset($this->format_map[$accept])){ $format = $this->format_map[$accept]; $format = is_string($format) ? new $format: $format; $format->setMIME($accept); return $format; } } } $format = new $this->format_map['default']; return $format; } protected function getRequestData() { try{ $r = file_get_contents('php://input'); if(is_null($r))return $_GET; $r =$this->request_format->decode($r); return is_null($r) ? array(): $r; } catch (RestException $e) { $this->handleError($e->getCode(), $e->getMessage()); } } protected function mapUrlToMethod () { if(!isset($this->routes[$this->request_method])){ return array(); } $urls = $this->routes[$this->request_method]; if(!$urls)return array(); $found = FALSE; $this->request_data += $_GET; $params = array('request_data'=>$this->request_data); $params += $this->request_data; foreach ($urls as $url => $call) { $call = (object)$call; if(strstr($url, ':')){ $regex = preg_replace('/\\\:([^\/]+)/', '(?P<$1>[^/]+)', preg_quote($url)); if (preg_match(":^$regex$:", $this->url, $matches)) { foreach ($matches as $arg => $match) { if (isset($call->arguments[$arg])){ $params[$arg] = $match; } } $found = TRUE; break; } }elseif ($url == $this->url){ $found = TRUE; break; } } if($found){ $p = $call->defaults; foreach ($call->arguments as $key => $value) { if(isset($params[$key]))$p[$value] = $params[$key]; } $call->arguments=$p; return $call; } } protected function applyClassMetadata($class_name, $instance, $method_info){ if(isset($method_info->metadata[$class_name]) && is_array($method_info->metadata[$class_name])){ foreach ($method_info->metadata[$class_name] as $property => $value){ if(property_exists($class_name, $property)){ $reflection_property = new ReflectionProperty($class_name, $property); $reflection_property->setValue($instance, $value); } } } } protected function loadCache() { if ($this->cached !== NULL) { return; } $file = $this->cache_dir . '/routes.php'; $this->cached = FALSE; if ($this->production_mode) { if (file_exists($file)) { $routes = include($file); } if (isset($routes) && is_array($routes)) { $this->routes = $routes; $this->cached = TRUE; } } else { } } protected function generateMap ($class_name, $base_path = "") { $reflection = new ReflectionClass($class_name); $class_metadata = parse_doc($reflection->getDocComment()); $methods = $reflection->getMethods( ReflectionMethod::IS_PUBLIC + ReflectionMethod::IS_PROTECTED); foreach ($methods as $method) { $doc = $method->getDocComment(); $arguments = array(); $defaults = array(); $metadata = $class_metadata+parse_doc($doc); $params = $method->getParameters(); $position=0; foreach ($params as $param){ $arguments[$param->getName()] = $position; $defaults[$position] = $param->isDefaultValueAvailable() ? $param->getDefaultValue() : NULL; $position++; } $method_flag = $method->isProtected() ? (isRestlerCompatibilityModeEnabled() ? 2 : 3) : (isset($metadata['protected']) ? 1 : 0); $call = array( 'class_name'=>$class_name, 'method_name'=>$method->getName(), 'arguments'=>$arguments, 'defaults'=>$defaults, 'metadata'=>$metadata, 'method_flag'=>$method_flag ); $method_url = strtolower($method->getName()); if (preg_match_all( '/@url\s+(GET|POST|PUT|DELETE|HEAD|OPTIONS)[ \t]*\/?(\S*)/s', $doc, $matches, PREG_SET_ORDER)) { foreach ($matches as $match) { $http_method = $match[1]; $url = rtrim($base_path . $match[2],'/'); $this->routes[$http_method][$url] = $call; } }elseif($method_url[0] != '_'){ if (preg_match_all('/^(GET|POST|PUT|DELETE|HEAD|OPTIONS)/i', $method_url, $matches)) { $http_method = strtoupper($matches[0][0]); $method_url = substr($method_url, strlen($http_method)); }else{ $http_method = 'GET'; } $url = $base_path. ($method_url=='index' || $method_url=='default' ? '' : $method_url); $url = rtrim($url,'/'); $this->routes[$http_method][$url] = $call; foreach ($params as $param){ if($param->getName()=='request_data'){ break; } $url .= $url=='' ? ':' : '/:'; $url .= $param->getName(); $this->routes[$http_method][$url] = $call; } } } } } if(version_compare(PHP_VERSION, '5.3.0') < 0){ require_once 'compat.php'; } class RestException extends Exception { public function __construct($http_status_code, $error_message = NULL) { parent::__construct($error_message, $http_status_code); } } interface iRespond { public function __formatResponse($result); public function __formatError($status_code, $message); } class DefaultResponse implements iRespond { function __formatResponse($result) { return $result; } function __formatError($statusCode, $message) { return array('error' => array('code' => $statusCode, 'message' => $message)); } } interface iAuthenticate { public function __isAuthenticated(); } interface iFormat { public function getMIMEMap(); public function setMIME($mime); public function getMIME(); public function setExtension($extension); public function getExtension(); public function encode($data, $human_readable=FALSE); public function decode($data); } class UrlEncodedFormat implements iFormat { const MIME = 'application/x-www-form-urlencoded'; const EXTENSION = 'post'; public function getMIMEMap() { return array(UrlEncodedFormat::EXTENSION=>UrlEncodedFormat::MIME); } public function getMIME(){ return UrlEncodedFormat::MIME; } public function getExtension(){ return UrlEncodedFormat::EXTENSION; } public function setMIME($mime){ } public function setExtension($extension){ } public function encode($data, $human_readable=FALSE){ return http_build_query($data); } public function decode($data){ parse_str($data,$r); return $r; } public function __toString(){ return $this->getExtension(); } } class JsonFormat implements iFormat { const MIME ='application/json'; const EXTENSION = 'json'; public function getMIMEMap() { return array(JsonFormat::EXTENSION=>JsonFormat::MIME); } public function getMIME(){ return JsonFormat::MIME; } public function getExtension(){ return JsonFormat::EXTENSION; } public function setMIME($mime){ } public function setExtension($extension){ } public function encode($data, $human_readable=FALSE){ return $human_readable ? $this->json_format(json_encode(object_to_array($data))) : json_encode(object_to_array($data)); } public function decode($data) { $decoded = json_decode ( $data ); if (function_exists ( 'json_last_error' )) { $message = ''; switch (json_last_error ()) { case JSON_ERROR_NONE : return object_to_array ( $decoded ); break; case JSON_ERROR_DEPTH : $message = 'maximum stack depth exceeded'; break; case JSON_ERROR_STATE_MISMATCH : $message = 'underflow or the modes mismatch'; break; case JSON_ERROR_CTRL_CHAR : $message = 'unexpected control character found'; break; case JSON_ERROR_SYNTAX : $message = 'malformed JSON'; break; case JSON_ERROR_UTF8 : $message = 'malformed UTF-8 characters, possibly incorrectly encoded'; break; default : $message = 'unknown error'; break; } throw new RestException ( 400, 'Error parsing JSON, ' . $message ); } else if (strlen ( $data ) && $decoded === NULL || $decoded === $data) { throw new RestException ( 400, 'Error parsing JSON' ); } return object_to_array ( $decoded ); } private function json_format($json) { $tab = "  "; $new_json = ""; $indent_level = 0; $in_string = FALSE; $len = strlen($json); for($c = 0; $c < $len; $c++) { $char = $json[$c]; switch($char) { case '{': case '[': if(!$in_string) { $new_json .= $char . "\n" . str_repeat($tab, $indent_level+1); $indent_level++; } else { $new_json .= $char; } break; case '}': case ']': if(!$in_string) { $indent_level--; $new_json .= "\n".str_repeat($tab, $indent_level).$char; } else { $new_json .= $char; } break; case ',': if(!$in_string) { $new_json .= ",\n" . str_repeat($tab, $indent_level); } else { $new_json .= $char; } break; case ':': if(!$in_string) { $new_json .= ": "; } else { $new_json .= $char; } break; case '"': if($c==0){ $in_string = TRUE; }elseif($c > 0 && $json[$c-1] != '\\') { $in_string = !$in_string; } default: $new_json .= $char; break; } } return $new_json; } public function __toString(){ return $this->getExtension(); } } class DocParser { private $params=array(); function parse($doc='') { if($doc==''){ return $this->params; } if(preg_match('#^/\*\*(.*)\*/#s', $doc, $comment) === false) return $this->params; $comment = trim($comment[1]); if(preg_match_all('#^\s*\*(.*)#m', $comment, $lines) === false) return $this->params; $this->parseLines($lines[1]); return $this->params; } private function parseLines($lines) { foreach($lines as $line) { $parsedLine = $this->parseLine($line); if($parsedLine === false && !isset($this->params['description'])) { if(isset($desc)){ $this->params['description'] = implode(PHP_EOL, $desc); } $desc = array(); } elseif($parsedLine !== false) { $desc[] = $parsedLine; } } $desc = implode(' ', $desc); if(!empty($desc))$this->params['long_description'] = $desc; } private function parseLine($line) { $line = trim($line); if(empty($line)) return false; if(strpos($line, '@') === 0) { if(strpos($line, ' ')>0){ $param = substr($line, 1, strpos($line, ' ') - 1); $value = substr($line, strlen($param) + 2); }else{ $param = substr($line, 1); $value = ''; } if($this->setParam($param, $value)) return false; } return $line; } private function setParam($param, $value) { if($param == 'param' || $param == 'return') $value = $this->formatParamOrReturn($value); if($param == 'class') list($param, $value) = $this->formatClass($value); if(empty($this->params[$param])) { $this->params[$param] = $value; } else if($param == 'param'){ $arr = array($this->params[$param], $value); $this->params[$param] = $arr; } else { $this->params[$param] = $value + $this->params[$param]; } return true; } private function formatClass($value) { $r = preg_split("[\(|\)]",$value); if(is_array($r)){ $param = $r[0]; parse_str($r[1],$value); foreach ($value as $key => $val) { $val = explode(',', $val); if(count($val)>1)$value[$key]=$val; } }else{ $param='Unknown'; } return array($param, $value); } private function formatParamOrReturn($string) { $pos = strpos($string, ' '); $type = substr($string, 0, $pos); return '(' . $type . ')' . substr($string, $pos+1); } } function parse_doc($php_doc_comment){ $p = new DocParser(); return $p->parse($php_doc_comment); $p = new Parser($php_doc_comment); return $p; $php_doc_comment = preg_replace("/(^[\\s]*\\/\\*\\*)
                                  |(^[\\s]\\*\\/)
                                  |(^[\\s]*\\*?\\s)
                                  |(^[\\s]*)

From 882cd4d31762034fb4fdb6940dd3ae86c7d31c82 Mon Sep 17 00:00:00 2001
From: Luracast <arul@luracast.com>
Date: Wed, 9 Nov 2011 21:44:33 +0800
Subject: [PATCH 25/61] removing unwanted file (routes.php) from the example to
 avoid confusion

---
 examples/_006_crud/routes.php | 160 ----------------------------------
 1 file changed, 160 deletions(-)
 delete mode 100755 examples/_006_crud/routes.php

diff --git a/examples/_006_crud/routes.php b/examples/_006_crud/routes.php
deleted file mode 100755
index bcd27129c..000000000
--- a/examples/_006_crud/routes.php
+++ /dev/null
@@ -1,160 +0,0 @@
-<?php $o=array();
-
-
-
-############### GET ###############
-
-$o['GET']=array();
-
-#==== GET author
-
-$o['GET']['author']=array (
-	  'class_name' => 'Author',
-	  'method_name' => 'get',
-	  'arguments' => 
-	  array (
-	    'id' => 0,
-	  ),
-	  'defaults' => 
-	  array (
-	    0 => NULL,
-	  ),
-	  'metadata' => 
-	  array (
-	  ),
-	  'method_flag' => 0,
-	);
-
-#==== GET author/:id
-
-$o['GET']['author/:id']=array (
-	  'class_name' => 'Author',
-	  'method_name' => 'get',
-	  'arguments' => 
-	  array (
-	    'id' => 0,
-	  ),
-	  'defaults' => 
-	  array (
-	    0 => NULL,
-	  ),
-	  'metadata' => 
-	  array (
-	  ),
-	  'method_flag' => 0,
-	);
-
-
-############### POST ###############
-
-$o['POST']=array();
-
-#==== POST author
-
-$o['POST']['author']=array (
-	  'class_name' => 'Author',
-	  'method_name' => 'post',
-	  'arguments' => 
-	  array (
-	    'request_data' => 0,
-	  ),
-	  'defaults' => 
-	  array (
-	    0 => NULL,
-	  ),
-	  'metadata' => 
-	  array (
-	  ),
-	  'method_flag' => 0,
-	);
-
-
-############### PUT ###############
-
-$o['PUT']=array();
-
-#==== PUT author
-
-$o['PUT']['author']=array (
-	  'class_name' => 'Author',
-	  'method_name' => 'put',
-	  'arguments' => 
-	  array (
-	    'id' => 0,
-	    'request_data' => 1,
-	  ),
-	  'defaults' => 
-	  array (
-	    0 => NULL,
-	    1 => NULL,
-	  ),
-	  'metadata' => 
-	  array (
-	  ),
-	  'method_flag' => 0,
-	);
-
-#==== PUT author/:id
-
-$o['PUT']['author/:id']=array (
-	  'class_name' => 'Author',
-	  'method_name' => 'put',
-	  'arguments' => 
-	  array (
-	    'id' => 0,
-	    'request_data' => 1,
-	  ),
-	  'defaults' => 
-	  array (
-	    0 => NULL,
-	    1 => NULL,
-	  ),
-	  'metadata' => 
-	  array (
-	  ),
-	  'method_flag' => 0,
-	);
-
-
-############### DELETE ###############
-
-$o['DELETE']=array();
-
-#==== DELETE author
-
-$o['DELETE']['author']=array (
-	  'class_name' => 'Author',
-	  'method_name' => 'delete',
-	  'arguments' => 
-	  array (
-	    'id' => 0,
-	  ),
-	  'defaults' => 
-	  array (
-	    0 => NULL,
-	  ),
-	  'metadata' => 
-	  array (
-	  ),
-	  'method_flag' => 0,
-	);
-
-#==== DELETE author/:id
-
-$o['DELETE']['author/:id']=array (
-	  'class_name' => 'Author',
-	  'method_name' => 'delete',
-	  'arguments' => 
-	  array (
-	    'id' => 0,
-	  ),
-	  'defaults' => 
-	  array (
-	    0 => NULL,
-	  ),
-	  'metadata' => 
-	  array (
-	  ),
-	  'method_flag' => 0,
-	);
-return $o;
\ No newline at end of file

From 7059926268051c29849377b06b807ed12e5a1fe4 Mon Sep 17 00:00:00 2001
From: Luracast <arul@luracast.com>
Date: Sun, 13 Nov 2011 12:47:19 +0800
Subject: [PATCH 26/61] Added support of HTTP HEAD request. Fixes issue #16

---
 restler/restler.php          | 4 +++-
 restler_minified/restler.php | 2 +-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/restler/restler.php b/restler/restler.php
index 30a88359f..80a4bed8d 100644
--- a/restler/restler.php
+++ b/restler/restler.php
@@ -13,7 +13,7 @@
  * @version    2.0.6
  */
 class Restler {
-	const VERSION = '2.0.6';
+	const VERSION = '2.0.7';
 	/**
 	 * URL of the currently mapped service
 	 * @var string
@@ -466,6 +466,8 @@ protected function getRequestMethod () {
 		if (isset($_SERVER['HTTP_X_HTTP_METHOD_OVERRIDE'])){
 			$method = $_SERVER['HTTP_X_HTTP_METHOD_OVERRIDE'];
 		}
+		//support for HEAD request
+		if($method=='HEAD')$method='GET';
 		return $method;
 	}
 
diff --git a/restler_minified/restler.php b/restler_minified/restler.php
index 90f8db436..d722dacbd 100644
--- a/restler_minified/restler.php
+++ b/restler_minified/restler.php
@@ -1,5 +1,5 @@
 <?php
- class Restler { const VERSION = '2.0.6'; public $url; public $request_method; public $request_format; public $request_data=array(); public $cache_dir; public $base_dir; public $response = 'DefaultResponse'; public $response_format; protected $production_mode; protected $routes= array(); protected $format_map = array(); protected $service_class_instance; protected $service_method; protected $auth_classes = array(); protected $error_classes = array(); private $codes = array( 100 => 'Continue', 101 => 'Switching Protocols', 200 => 'OK', 201 => 'Created', 202 => 'Accepted', 203 => 'Non-Authoritative Information', 204 => 'No Content', 205 => 'Reset Content', 206 => 'Partial Content', 300 => 'Multiple Choices', 301 => 'Moved Permanently', 302 => 'Found', 303 => 'See Other', 304 => 'Not Modified', 305 => 'Use Proxy', 306 => '(Unused)', 307 => 'Temporary Redirect', 400 => 'Bad Request', 401 => 'Unauthorized', 402 => 'Payment Required', 403 => 'Forbidden', 404 => 'Not Found', 405 => 'Method Not Allowed', 406 => 'Not Acceptable', 407 => 'Proxy Authentication Required', 408 => 'Request Timeout', 409 => 'Conflict', 410 => 'Gone', 411 => 'Length Required', 412 => 'Precondition Failed', 413 => 'Request Entity Too Large', 414 => 'Request-URI Too Long', 415 => 'Unsupported Media Type', 416 => 'Requested Range Not Satisfiable', 417 => 'Expectation Failed', 500 => 'Internal Server Error', 501 => 'Not Implemented', 502 => 'Bad Gateway', 503 => 'Service Unavailable', 504 => 'Gateway Timeout', 505 => 'HTTP Version Not Supported' ); protected $cached; public function __construct ($production_mode = FALSE) { $this->production_mode = $production_mode; $this->cache_dir = getcwd(); $this->base_dir = RESTLER_PATH; } public function __destruct () { if ($this->production_mode && !$this->cached) { $this->saveCache(); } } public function refreshCache () { $this->routes = array(); $this->cached = FALSE; } public function setSupportedFormats () { $args = func_get_args(); $extensions = array(); foreach ($args as $class_name) { if(!is_string($class_name) || !class_exists($class_name)){ throw new Exception("$class_name is not a vaild Format Class."); } $obj = new $class_name; if(! $obj instanceof iFormat){ throw new Exception('Invalid format class; must implement '. 'iFormat interface'); } foreach ($obj->getMIMEMap() as $extension => $mime) { if(!isset($this->format_map[$extension])) $this->format_map[$extension]=$class_name; if(!isset($this->format_map[$mime])) $this->format_map[$mime]=$class_name; $extensions[".$extension"]=TRUE; } } $this->format_map['default']=$args[0]; $this->format_map['extensions']=array_keys($extensions); } public function addAPIClass($class_name, $base_path = NULL) { if(!class_exists($class_name)){ throw new Exception("API class $class_name is missing."); } $this->loadCache(); if(!$this->cached){ if(is_null($base_path))$base_path=strtolower($class_name); $base_path = trim($base_path,'/'); if(strlen($base_path)>0)$base_path .= '/'; $this->generateMap($class_name, $base_path); } } public function addAuthenticationClass ($class_name, $base_path = NULL) { $this->auth_classes[] = $class_name; $this->addAPIClass($class_name, $base_path); } public function addErrorClass ($class_name) { $this->error_classes[] = $class_name; } public function handleError ($status_code, $error_message = NULL) { $method = "handle$status_code"; $handled = FALSE; foreach ($this->error_classes as $class_name) { if (method_exists($class_name, $method)) { $obj = new $class_name(); $obj->restler = $this; $obj->$method(); $handled = TRUE; } } if($handled)return; $message = $this->codes[$status_code] . (!$error_message ? '' : ': ' . $error_message); $this->setStatus($status_code); $this->sendData( call_user_func( array($this->response, '__formatError'), $status_code, $message) ); } public function handle () { if(empty($this->format_map))$this->setSupportedFormats('JsonFormat'); $this->url = $this->getPath(); $this->request_method = $this->getRequestMethod(); $this->response_format = $this->getResponseFormat(); $this->request_format = $this->getRequestFormat(); if(is_null($this->request_format)){ $this->request_format = $this->response_format; } if($this->request_method == 'PUT' || $this->request_method == 'POST'){ $this->request_data = $this->getRequestData(); } $o = $this->mapUrlToMethod(); if(!isset($o->class_name)){ $this->handleError(404); }else{ try { if($o->method_flag){ $auth_method = '__isAuthenticated'; if(!count($this->auth_classes))throw new RestException(401); foreach ($this->auth_classes as $auth_class) { $auth_obj = new $auth_class(); $auth_obj->restler=$this; $this->applyClassMetadata($auth_class, $auth_obj, $o); if (!method_exists($auth_obj, $auth_method)) { throw new RestException(401, 'Authentication Class '. 'should implement iAuthenticate'); }elseif(!$auth_obj->$auth_method()){ throw new RestException(401); } } } $this->applyClassMetadata(get_class($this->request_format), $this->request_format, $o); $pre_process = '_'.$this->request_format->getExtension().'_'. $o->method_name; $this->service_method = $o->method_name; if($o->method_flag==2)$o=unprotect($o); $object = $this->service_class_instance = new $o->class_name(); $object->restler=$this; if(method_exists($o->class_name, $pre_process)) { call_user_func_array(array($object, $pre_process), $o->arguments); } switch ($o->method_flag) { case 3: $reflection_method = new ReflectionMethod($object, $o->method_name); $reflection_method->setAccessible(TRUE); $result = $reflection_method->invokeArgs($object, $o->arguments); break; case 2: case 1: default: $result = call_user_func_array(array($object, $o->method_name), $o->arguments); } } catch (RestException $e) { $this->handleError($e->getCode(), $e->getMessage()); } } if (isset($result) && $result !== NULL) { $this->sendData($result); } } public function sendData($data) { $data = $this->response_format->encode($data, !$this->production_mode); $post_process = '_'.$this->service_method .'_'. $this->response_format->getExtension(); if(isset($this->service_class_instance) && method_exists($this->service_class_instance,$post_process)){ $data = call_user_func(array($this->service_class_instance, $post_process), $data); } header("Cache-Control: no-cache, must-revalidate"); header("Expires: 0"); header('Content-Type: ' . $this->response_format->getMIME()); header("X-Powered-By: Luracast Restler v".Restler::VERSION); die($data); } public function setStatus($code) { header("{$_SERVER['SERVER_PROTOCOL']} $code ". $this->codes[strval($code)]); } public function removeCommonPath($first, $second, $char='/'){ $first = explode($char, $first); $second = explode($char, $second); while (count($second)){ if($first[0]==$second[0]){ array_shift($first); } else break; array_shift($second); } return implode($char, $first); } public function saveCache() { $file = $this->cache_dir . '/routes.php'; $s = '$o=array();'.PHP_EOL; foreach ($this->routes as $key => $value) { $s .= PHP_EOL.PHP_EOL.PHP_EOL."############### $key ###############" .PHP_EOL.PHP_EOL; $s .= '$o[\''.$key.'\']=array();'; foreach ($value as $ke => $va) { $s .= PHP_EOL.PHP_EOL."#==== $key $ke".PHP_EOL.PHP_EOL; $s .= '$o[\''.$key.'\'][\''.$ke.'\']='.str_replace(PHP_EOL, PHP_EOL."\t", var_export($va, TRUE)).';'; } } $s .= PHP_EOL.'return $o;'; $r=@file_put_contents($file, "<?php $s"); @chmod($file, 0777); if($r===FALSE)throw new Exception( "The cache directory located at '$this->cache_dir' needs to have ". "the permissions set to read/write/execute for everyone in order ". "to save cache and improve performance."); } protected function getPath () { $path = urldecode($this->removeCommonPath($_SERVER['REQUEST_URI'], $_SERVER['SCRIPT_NAME'])); $path = preg_replace('/(\/*\?.*$)|(\/$)/', '', $path); $path = str_replace($this->format_map['extensions'], '', $path); return $path; } protected function getRequestMethod () { $method = $_SERVER['REQUEST_METHOD']; if (isset($_SERVER['HTTP_X_HTTP_METHOD_OVERRIDE'])){ $method = $_SERVER['HTTP_X_HTTP_METHOD_OVERRIDE']; } return $method; } protected function getRequestFormat () { $format=NULL; if(isset($_SERVER['CONTENT_TYPE'])){ $mime = explode(';', $_SERVER['CONTENT_TYPE']); $mime = $mime[0]; if($mime==UrlEncodedFormat::MIME){ $format = new UrlEncodedFormat(); }else{ if(isset($this->format_map[$mime])){ $format = $this->format_map[$mime]; $format = is_string($format) ? new $format: $format; $format->setMIME($mime); } } } return $format; } protected function getResponseFormat () { $format=NULL; $extension = explode('.', parse_url($_SERVER['REQUEST_URI'], PHP_URL_PATH)); $extension = array_pop($extension); if($extension && isset($this->format_map[$extension])){ $format = $this->format_map[$extension]; $format = is_string($format) ? new $format: $format; $format->setExtension($extension); return $format; } if(isset($_SERVER['HTTP_ACCEPT'])){ $accepts = explode(',', $_SERVER['HTTP_ACCEPT']); foreach ($accepts as $accept) { if($extension && isset($this->format_map[$accept])){ $format = $this->format_map[$accept]; $format = is_string($format) ? new $format: $format; $format->setMIME($accept); return $format; } } } $format = new $this->format_map['default']; return $format; } protected function getRequestData() { try{ $r = file_get_contents('php://input'); if(is_null($r))return $_GET; $r =$this->request_format->decode($r); return is_null($r) ? array(): $r; } catch (RestException $e) { $this->handleError($e->getCode(), $e->getMessage()); } } protected function mapUrlToMethod () { if(!isset($this->routes[$this->request_method])){ return array(); } $urls = $this->routes[$this->request_method]; if(!$urls)return array(); $found = FALSE; $this->request_data += $_GET; $params = array('request_data'=>$this->request_data); $params += $this->request_data; foreach ($urls as $url => $call) { $call = (object)$call; if(strstr($url, ':')){ $regex = preg_replace('/\\\:([^\/]+)/', '(?P<$1>[^/]+)', preg_quote($url)); if (preg_match(":^$regex$:", $this->url, $matches)) { foreach ($matches as $arg => $match) { if (isset($call->arguments[$arg])){ $params[$arg] = $match; } } $found = TRUE; break; } }elseif ($url == $this->url){ $found = TRUE; break; } } if($found){ $p = $call->defaults; foreach ($call->arguments as $key => $value) { if(isset($params[$key]))$p[$value] = $params[$key]; } $call->arguments=$p; return $call; } } protected function applyClassMetadata($class_name, $instance, $method_info){ if(isset($method_info->metadata[$class_name]) && is_array($method_info->metadata[$class_name])){ foreach ($method_info->metadata[$class_name] as $property => $value){ if(property_exists($class_name, $property)){ $reflection_property = new ReflectionProperty($class_name, $property); $reflection_property->setValue($instance, $value); } } } } protected function loadCache() { if ($this->cached !== NULL) { return; } $file = $this->cache_dir . '/routes.php'; $this->cached = FALSE; if ($this->production_mode) { if (file_exists($file)) { $routes = include($file); } if (isset($routes) && is_array($routes)) { $this->routes = $routes; $this->cached = TRUE; } } else { } } protected function generateMap ($class_name, $base_path = "") { $reflection = new ReflectionClass($class_name); $class_metadata = parse_doc($reflection->getDocComment()); $methods = $reflection->getMethods( ReflectionMethod::IS_PUBLIC + ReflectionMethod::IS_PROTECTED); foreach ($methods as $method) { $doc = $method->getDocComment(); $arguments = array(); $defaults = array(); $metadata = $class_metadata+parse_doc($doc); $params = $method->getParameters(); $position=0; foreach ($params as $param){ $arguments[$param->getName()] = $position; $defaults[$position] = $param->isDefaultValueAvailable() ? $param->getDefaultValue() : NULL; $position++; } $method_flag = $method->isProtected() ? (isRestlerCompatibilityModeEnabled() ? 2 : 3) : (isset($metadata['protected']) ? 1 : 0); $call = array( 'class_name'=>$class_name, 'method_name'=>$method->getName(), 'arguments'=>$arguments, 'defaults'=>$defaults, 'metadata'=>$metadata, 'method_flag'=>$method_flag ); $method_url = strtolower($method->getName()); if (preg_match_all( '/@url\s+(GET|POST|PUT|DELETE|HEAD|OPTIONS)[ \t]*\/?(\S*)/s', $doc, $matches, PREG_SET_ORDER)) { foreach ($matches as $match) { $http_method = $match[1]; $url = rtrim($base_path . $match[2],'/'); $this->routes[$http_method][$url] = $call; } }elseif($method_url[0] != '_'){ if (preg_match_all('/^(GET|POST|PUT|DELETE|HEAD|OPTIONS)/i', $method_url, $matches)) { $http_method = strtoupper($matches[0][0]); $method_url = substr($method_url, strlen($http_method)); }else{ $http_method = 'GET'; } $url = $base_path. ($method_url=='index' || $method_url=='default' ? '' : $method_url); $url = rtrim($url,'/'); $this->routes[$http_method][$url] = $call; foreach ($params as $param){ if($param->getName()=='request_data'){ break; } $url .= $url=='' ? ':' : '/:'; $url .= $param->getName(); $this->routes[$http_method][$url] = $call; } } } } } if(version_compare(PHP_VERSION, '5.3.0') < 0){ require_once 'compat.php'; } class RestException extends Exception { public function __construct($http_status_code, $error_message = NULL) { parent::__construct($error_message, $http_status_code); } } interface iRespond { public function __formatResponse($result); public function __formatError($status_code, $message); } class DefaultResponse implements iRespond { function __formatResponse($result) { return $result; } function __formatError($statusCode, $message) { return array('error' => array('code' => $statusCode, 'message' => $message)); } } interface iAuthenticate { public function __isAuthenticated(); } interface iFormat { public function getMIMEMap(); public function setMIME($mime); public function getMIME(); public function setExtension($extension); public function getExtension(); public function encode($data, $human_readable=FALSE); public function decode($data); } class UrlEncodedFormat implements iFormat { const MIME = 'application/x-www-form-urlencoded'; const EXTENSION = 'post'; public function getMIMEMap() { return array(UrlEncodedFormat::EXTENSION=>UrlEncodedFormat::MIME); } public function getMIME(){ return UrlEncodedFormat::MIME; } public function getExtension(){ return UrlEncodedFormat::EXTENSION; } public function setMIME($mime){ } public function setExtension($extension){ } public function encode($data, $human_readable=FALSE){ return http_build_query($data); } public function decode($data){ parse_str($data,$r); return $r; } public function __toString(){ return $this->getExtension(); } } class JsonFormat implements iFormat { const MIME ='application/json'; const EXTENSION = 'json'; public function getMIMEMap() { return array(JsonFormat::EXTENSION=>JsonFormat::MIME); } public function getMIME(){ return JsonFormat::MIME; } public function getExtension(){ return JsonFormat::EXTENSION; } public function setMIME($mime){ } public function setExtension($extension){ } public function encode($data, $human_readable=FALSE){ return $human_readable ? $this->json_format(json_encode(object_to_array($data))) : json_encode(object_to_array($data)); } public function decode($data) { $decoded = json_decode ( $data ); if (function_exists ( 'json_last_error' )) { $message = ''; switch (json_last_error ()) { case JSON_ERROR_NONE : return object_to_array ( $decoded ); break; case JSON_ERROR_DEPTH : $message = 'maximum stack depth exceeded'; break; case JSON_ERROR_STATE_MISMATCH : $message = 'underflow or the modes mismatch'; break; case JSON_ERROR_CTRL_CHAR : $message = 'unexpected control character found'; break; case JSON_ERROR_SYNTAX : $message = 'malformed JSON'; break; case JSON_ERROR_UTF8 : $message = 'malformed UTF-8 characters, possibly incorrectly encoded'; break; default : $message = 'unknown error'; break; } throw new RestException ( 400, 'Error parsing JSON, ' . $message ); } else if (strlen ( $data ) && $decoded === NULL || $decoded === $data) { throw new RestException ( 400, 'Error parsing JSON' ); } return object_to_array ( $decoded ); } private function json_format($json) { $tab = "  "; $new_json = ""; $indent_level = 0; $in_string = FALSE; $len = strlen($json); for($c = 0; $c < $len; $c++) { $char = $json[$c]; switch($char) { case '{': case '[': if(!$in_string) { $new_json .= $char . "\n" . str_repeat($tab, $indent_level+1); $indent_level++; } else { $new_json .= $char; } break; case '}': case ']': if(!$in_string) { $indent_level--; $new_json .= "\n".str_repeat($tab, $indent_level).$char; } else { $new_json .= $char; } break; case ',': if(!$in_string) { $new_json .= ",\n" . str_repeat($tab, $indent_level); } else { $new_json .= $char; } break; case ':': if(!$in_string) { $new_json .= ": "; } else { $new_json .= $char; } break; case '"': if($c==0){ $in_string = TRUE; }elseif($c > 0 && $json[$c-1] != '\\') { $in_string = !$in_string; } default: $new_json .= $char; break; } } return $new_json; } public function __toString(){ return $this->getExtension(); } } class DocParser { private $params=array(); function parse($doc='') { if($doc==''){ return $this->params; } if(preg_match('#^/\*\*(.*)\*/#s', $doc, $comment) === false) return $this->params; $comment = trim($comment[1]); if(preg_match_all('#^\s*\*(.*)#m', $comment, $lines) === false) return $this->params; $this->parseLines($lines[1]); return $this->params; } private function parseLines($lines) { foreach($lines as $line) { $parsedLine = $this->parseLine($line); if($parsedLine === false && !isset($this->params['description'])) { if(isset($desc)){ $this->params['description'] = implode(PHP_EOL, $desc); } $desc = array(); } elseif($parsedLine !== false) { $desc[] = $parsedLine; } } $desc = implode(' ', $desc); if(!empty($desc))$this->params['long_description'] = $desc; } private function parseLine($line) { $line = trim($line); if(empty($line)) return false; if(strpos($line, '@') === 0) { if(strpos($line, ' ')>0){ $param = substr($line, 1, strpos($line, ' ') - 1); $value = substr($line, strlen($param) + 2); }else{ $param = substr($line, 1); $value = ''; } if($this->setParam($param, $value)) return false; } return $line; } private function setParam($param, $value) { if($param == 'param' || $param == 'return') $value = $this->formatParamOrReturn($value); if($param == 'class') list($param, $value) = $this->formatClass($value); if(empty($this->params[$param])) { $this->params[$param] = $value; } else if($param == 'param'){ $arr = array($this->params[$param], $value); $this->params[$param] = $arr; } else { $this->params[$param] = $value + $this->params[$param]; } return true; } private function formatClass($value) { $r = preg_split("[\(|\)]",$value); if(is_array($r)){ $param = $r[0]; parse_str($r[1],$value); foreach ($value as $key => $val) { $val = explode(',', $val); if(count($val)>1)$value[$key]=$val; } }else{ $param='Unknown'; } return array($param, $value); } private function formatParamOrReturn($string) { $pos = strpos($string, ' '); $type = substr($string, 0, $pos); return '(' . $type . ')' . substr($string, $pos+1); } } function parse_doc($php_doc_comment){ $p = new DocParser(); return $p->parse($php_doc_comment); $p = new Parser($php_doc_comment); return $p; $php_doc_comment = preg_replace("/(^[\\s]*\\/\\*\\*)
+ class Restler { const VERSION = '2.0.7'; public $url; public $request_method; public $request_format; public $request_data=array(); public $cache_dir; public $base_dir; public $response = 'DefaultResponse'; public $response_format; protected $production_mode; protected $routes= array(); protected $format_map = array(); protected $service_class_instance; protected $service_method; protected $auth_classes = array(); protected $error_classes = array(); private $codes = array( 100 => 'Continue', 101 => 'Switching Protocols', 200 => 'OK', 201 => 'Created', 202 => 'Accepted', 203 => 'Non-Authoritative Information', 204 => 'No Content', 205 => 'Reset Content', 206 => 'Partial Content', 300 => 'Multiple Choices', 301 => 'Moved Permanently', 302 => 'Found', 303 => 'See Other', 304 => 'Not Modified', 305 => 'Use Proxy', 306 => '(Unused)', 307 => 'Temporary Redirect', 400 => 'Bad Request', 401 => 'Unauthorized', 402 => 'Payment Required', 403 => 'Forbidden', 404 => 'Not Found', 405 => 'Method Not Allowed', 406 => 'Not Acceptable', 407 => 'Proxy Authentication Required', 408 => 'Request Timeout', 409 => 'Conflict', 410 => 'Gone', 411 => 'Length Required', 412 => 'Precondition Failed', 413 => 'Request Entity Too Large', 414 => 'Request-URI Too Long', 415 => 'Unsupported Media Type', 416 => 'Requested Range Not Satisfiable', 417 => 'Expectation Failed', 500 => 'Internal Server Error', 501 => 'Not Implemented', 502 => 'Bad Gateway', 503 => 'Service Unavailable', 504 => 'Gateway Timeout', 505 => 'HTTP Version Not Supported' ); protected $cached; public function __construct ($production_mode = FALSE) { $this->production_mode = $production_mode; $this->cache_dir = getcwd(); $this->base_dir = RESTLER_PATH; } public function __destruct () { if ($this->production_mode && !$this->cached) { $this->saveCache(); } } public function refreshCache () { $this->routes = array(); $this->cached = FALSE; } public function setSupportedFormats () { $args = func_get_args(); $extensions = array(); foreach ($args as $class_name) { if(!is_string($class_name) || !class_exists($class_name)){ throw new Exception("$class_name is not a vaild Format Class."); } $obj = new $class_name; if(! $obj instanceof iFormat){ throw new Exception('Invalid format class; must implement '. 'iFormat interface'); } foreach ($obj->getMIMEMap() as $extension => $mime) { if(!isset($this->format_map[$extension])) $this->format_map[$extension]=$class_name; if(!isset($this->format_map[$mime])) $this->format_map[$mime]=$class_name; $extensions[".$extension"]=TRUE; } } $this->format_map['default']=$args[0]; $this->format_map['extensions']=array_keys($extensions); } public function addAPIClass($class_name, $base_path = NULL) { if(!class_exists($class_name)){ throw new Exception("API class $class_name is missing."); } $this->loadCache(); if(!$this->cached){ if(is_null($base_path))$base_path=strtolower($class_name); $base_path = trim($base_path,'/'); if(strlen($base_path)>0)$base_path .= '/'; $this->generateMap($class_name, $base_path); } } public function addAuthenticationClass ($class_name, $base_path = NULL) { $this->auth_classes[] = $class_name; $this->addAPIClass($class_name, $base_path); } public function addErrorClass ($class_name) { $this->error_classes[] = $class_name; } public function handleError ($status_code, $error_message = NULL) { $method = "handle$status_code"; $handled = FALSE; foreach ($this->error_classes as $class_name) { if (method_exists($class_name, $method)) { $obj = new $class_name(); $obj->restler = $this; $obj->$method(); $handled = TRUE; } } if($handled)return; $message = $this->codes[$status_code] . (!$error_message ? '' : ': ' . $error_message); $this->setStatus($status_code); $this->sendData( call_user_func( array($this->response, '__formatError'), $status_code, $message) ); } public function handle () { if(empty($this->format_map))$this->setSupportedFormats('JsonFormat'); $this->url = $this->getPath(); $this->request_method = $this->getRequestMethod(); $this->response_format = $this->getResponseFormat(); $this->request_format = $this->getRequestFormat(); if(is_null($this->request_format)){ $this->request_format = $this->response_format; } if($this->request_method == 'PUT' || $this->request_method == 'POST'){ $this->request_data = $this->getRequestData(); } $o = $this->mapUrlToMethod(); if(!isset($o->class_name)){ $this->handleError(404); }else{ try { if($o->method_flag){ $auth_method = '__isAuthenticated'; if(!count($this->auth_classes))throw new RestException(401); foreach ($this->auth_classes as $auth_class) { $auth_obj = new $auth_class(); $auth_obj->restler=$this; $this->applyClassMetadata($auth_class, $auth_obj, $o); if (!method_exists($auth_obj, $auth_method)) { throw new RestException(401, 'Authentication Class '. 'should implement iAuthenticate'); }elseif(!$auth_obj->$auth_method()){ throw new RestException(401); } } } $this->applyClassMetadata(get_class($this->request_format), $this->request_format, $o); $pre_process = '_'.$this->request_format->getExtension().'_'. $o->method_name; $this->service_method = $o->method_name; if($o->method_flag==2)$o=unprotect($o); $object = $this->service_class_instance = new $o->class_name(); $object->restler=$this; if(method_exists($o->class_name, $pre_process)) { call_user_func_array(array($object, $pre_process), $o->arguments); } switch ($o->method_flag) { case 3: $reflection_method = new ReflectionMethod($object, $o->method_name); $reflection_method->setAccessible(TRUE); $result = $reflection_method->invokeArgs($object, $o->arguments); break; case 2: case 1: default: $result = call_user_func_array(array($object, $o->method_name), $o->arguments); } } catch (RestException $e) { $this->handleError($e->getCode(), $e->getMessage()); } } if (isset($result) && $result !== NULL) { $this->sendData($result); } } public function sendData($data) { $data = $this->response_format->encode($data, !$this->production_mode); $post_process = '_'.$this->service_method .'_'. $this->response_format->getExtension(); if(isset($this->service_class_instance) && method_exists($this->service_class_instance,$post_process)){ $data = call_user_func(array($this->service_class_instance, $post_process), $data); } header("Cache-Control: no-cache, must-revalidate"); header("Expires: 0"); header('Content-Type: ' . $this->response_format->getMIME()); header("X-Powered-By: Luracast Restler v".Restler::VERSION); die($data); } public function setStatus($code) { header("{$_SERVER['SERVER_PROTOCOL']} $code ". $this->codes[strval($code)]); } public function removeCommonPath($first, $second, $char='/'){ $first = explode($char, $first); $second = explode($char, $second); while (count($second)){ if($first[0]==$second[0]){ array_shift($first); } else break; array_shift($second); } return implode($char, $first); } public function saveCache() { $file = $this->cache_dir . '/routes.php'; $s = '$o=array();'.PHP_EOL; foreach ($this->routes as $key => $value) { $s .= PHP_EOL.PHP_EOL.PHP_EOL."############### $key ###############" .PHP_EOL.PHP_EOL; $s .= '$o[\''.$key.'\']=array();'; foreach ($value as $ke => $va) { $s .= PHP_EOL.PHP_EOL."#==== $key $ke".PHP_EOL.PHP_EOL; $s .= '$o[\''.$key.'\'][\''.$ke.'\']='.str_replace(PHP_EOL, PHP_EOL."\t", var_export($va, TRUE)).';'; } } $s .= PHP_EOL.'return $o;'; $r=@file_put_contents($file, "<?php $s"); @chmod($file, 0777); if($r===FALSE)throw new Exception( "The cache directory located at '$this->cache_dir' needs to have ". "the permissions set to read/write/execute for everyone in order ". "to save cache and improve performance."); } protected function getPath () { $path = urldecode($this->removeCommonPath($_SERVER['REQUEST_URI'], $_SERVER['SCRIPT_NAME'])); $path = preg_replace('/(\/*\?.*$)|(\/$)/', '', $path); $path = str_replace($this->format_map['extensions'], '', $path); return $path; } protected function getRequestMethod () { $method = $_SERVER['REQUEST_METHOD']; if (isset($_SERVER['HTTP_X_HTTP_METHOD_OVERRIDE'])){ $method = $_SERVER['HTTP_X_HTTP_METHOD_OVERRIDE']; } if($method=='HEAD')$method='GET'; return $method; } protected function getRequestFormat () { $format=NULL; if(isset($_SERVER['CONTENT_TYPE'])){ $mime = explode(';', $_SERVER['CONTENT_TYPE']); $mime = $mime[0]; if($mime==UrlEncodedFormat::MIME){ $format = new UrlEncodedFormat(); }else{ if(isset($this->format_map[$mime])){ $format = $this->format_map[$mime]; $format = is_string($format) ? new $format: $format; $format->setMIME($mime); } } } return $format; } protected function getResponseFormat () { $format=NULL; $extension = explode('.', parse_url($_SERVER['REQUEST_URI'], PHP_URL_PATH)); $extension = array_pop($extension); if($extension && isset($this->format_map[$extension])){ $format = $this->format_map[$extension]; $format = is_string($format) ? new $format: $format; $format->setExtension($extension); return $format; } if(isset($_SERVER['HTTP_ACCEPT'])){ $accepts = explode(',', $_SERVER['HTTP_ACCEPT']); foreach ($accepts as $accept) { if($extension && isset($this->format_map[$accept])){ $format = $this->format_map[$accept]; $format = is_string($format) ? new $format: $format; $format->setMIME($accept); return $format; } } } $format = new $this->format_map['default']; return $format; } protected function getRequestData() { try { $r = file_get_contents ( 'php://input' ); if (is_null ( $r )) return $_GET; $r = $this->request_format->decode ( $r ); return is_null ( $r ) ? array () : $r; } catch ( RestException $e ) { $this->handleError ( $e->getCode (), $e->getMessage () ); } } protected function mapUrlToMethod () { if(!isset($this->routes[$this->request_method])){ return array(); } $urls = $this->routes[$this->request_method]; if(!$urls)return array(); $found = FALSE; $this->request_data += $_GET; $params = array('request_data'=>$this->request_data); $params += $this->request_data; foreach ($urls as $url => $call) { $call = (object)$call; if(strstr($url, ':')){ $regex = preg_replace('/\\\:([^\/]+)/', '(?P<$1>[^/]+)', preg_quote($url)); if (preg_match(":^$regex$:", $this->url, $matches)) { foreach ($matches as $arg => $match) { if (isset($call->arguments[$arg])){ $params[$arg] = $match; } } $found = TRUE; break; } }elseif ($url == $this->url){ $found = TRUE; break; } } if($found){ $p = $call->defaults; foreach ($call->arguments as $key => $value) { if(isset($params[$key]))$p[$value] = $params[$key]; } $call->arguments=$p; return $call; } } protected function applyClassMetadata($class_name, $instance, $method_info){ if(isset($method_info->metadata[$class_name]) && is_array($method_info->metadata[$class_name])){ foreach ($method_info->metadata[$class_name] as $property => $value){ if(property_exists($class_name, $property)){ $reflection_property = new ReflectionProperty($class_name, $property); $reflection_property->setValue($instance, $value); } } } } protected function loadCache() { if ($this->cached !== NULL) { return; } $file = $this->cache_dir . '/routes.php'; $this->cached = FALSE; if ($this->production_mode) { if (file_exists($file)) { $routes = include($file); } if (isset($routes) && is_array($routes)) { $this->routes = $routes; $this->cached = TRUE; } } else { } } protected function generateMap ($class_name, $base_path = "") { $reflection = new ReflectionClass($class_name); $class_metadata = parse_doc($reflection->getDocComment()); $methods = $reflection->getMethods( ReflectionMethod::IS_PUBLIC + ReflectionMethod::IS_PROTECTED); foreach ($methods as $method) { $doc = $method->getDocComment(); $arguments = array(); $defaults = array(); $metadata = $class_metadata+parse_doc($doc); $params = $method->getParameters(); $position=0; foreach ($params as $param){ $arguments[$param->getName()] = $position; $defaults[$position] = $param->isDefaultValueAvailable() ? $param->getDefaultValue() : NULL; $position++; } $method_flag = $method->isProtected() ? (isRestlerCompatibilityModeEnabled() ? 2 : 3) : (isset($metadata['protected']) ? 1 : 0); $call = array( 'class_name'=>$class_name, 'method_name'=>$method->getName(), 'arguments'=>$arguments, 'defaults'=>$defaults, 'metadata'=>$metadata, 'method_flag'=>$method_flag ); $method_url = strtolower($method->getName()); if (preg_match_all( '/@url\s+(GET|POST|PUT|DELETE|HEAD|OPTIONS)[ \t]*\/?(\S*)/s', $doc, $matches, PREG_SET_ORDER)) { foreach ($matches as $match) { $http_method = $match[1]; $url = rtrim($base_path . $match[2],'/'); $this->routes[$http_method][$url] = $call; } }elseif($method_url[0] != '_'){ if (preg_match_all('/^(GET|POST|PUT|DELETE|HEAD|OPTIONS)/i', $method_url, $matches)) { $http_method = strtoupper($matches[0][0]); $method_url = substr($method_url, strlen($http_method)); }else{ $http_method = 'GET'; } $url = $base_path. ($method_url=='index' || $method_url=='default' ? '' : $method_url); $url = rtrim($url,'/'); $this->routes[$http_method][$url] = $call; foreach ($params as $param){ if($param->getName()=='request_data'){ break; } $url .= $url=='' ? ':' : '/:'; $url .= $param->getName(); $this->routes[$http_method][$url] = $call; } } } } } if(version_compare(PHP_VERSION, '5.3.0') < 0){ require_once 'compat.php'; } class RestException extends Exception { public function __construct($http_status_code, $error_message = NULL) { parent::__construct($error_message, $http_status_code); } } interface iRespond { public function __formatResponse($result); public function __formatError($status_code, $message); } class DefaultResponse implements iRespond { function __formatResponse($result) { return $result; } function __formatError($statusCode, $message) { return array('error' => array('code' => $statusCode, 'message' => $message)); } } interface iAuthenticate { public function __isAuthenticated(); } interface iFormat { public function getMIMEMap(); public function setMIME($mime); public function getMIME(); public function setExtension($extension); public function getExtension(); public function encode($data, $human_readable=FALSE); public function decode($data); } class UrlEncodedFormat implements iFormat { const MIME = 'application/x-www-form-urlencoded'; const EXTENSION = 'post'; public function getMIMEMap() { return array(UrlEncodedFormat::EXTENSION=>UrlEncodedFormat::MIME); } public function getMIME(){ return UrlEncodedFormat::MIME; } public function getExtension(){ return UrlEncodedFormat::EXTENSION; } public function setMIME($mime){ } public function setExtension($extension){ } public function encode($data, $human_readable=FALSE){ return http_build_query($data); } public function decode($data){ parse_str($data,$r); return $r; } public function __toString(){ return $this->getExtension(); } } class JsonFormat implements iFormat { const MIME ='application/json'; const EXTENSION = 'json'; public function getMIMEMap() { return array(JsonFormat::EXTENSION=>JsonFormat::MIME); } public function getMIME(){ return JsonFormat::MIME; } public function getExtension(){ return JsonFormat::EXTENSION; } public function setMIME($mime){ } public function setExtension($extension){ } public function encode($data, $human_readable=FALSE){ return $human_readable ? $this->json_format(json_encode(object_to_array($data))) : json_encode(object_to_array($data)); } public function decode($data) { $decoded = json_decode ( $data ); if (function_exists ( 'json_last_error' )) { $message = ''; switch (json_last_error ()) { case JSON_ERROR_NONE : return object_to_array ( $decoded ); break; case JSON_ERROR_DEPTH : $message = 'maximum stack depth exceeded'; break; case JSON_ERROR_STATE_MISMATCH : $message = 'underflow or the modes mismatch'; break; case JSON_ERROR_CTRL_CHAR : $message = 'unexpected control character found'; break; case JSON_ERROR_SYNTAX : $message = 'malformed JSON'; break; case JSON_ERROR_UTF8 : $message = 'malformed UTF-8 characters, possibly incorrectly encoded'; break; default : $message = 'unknown error'; break; } throw new RestException ( 400, 'Error parsing JSON, ' . $message ); } else if (strlen ( $data ) && $decoded === NULL || $decoded === $data) { throw new RestException ( 400, 'Error parsing JSON' ); } return object_to_array ( $decoded ); } private function json_format($json) { $tab = "  "; $new_json = ""; $indent_level = 0; $in_string = FALSE; $len = strlen($json); for($c = 0; $c < $len; $c++) { $char = $json[$c]; switch($char) { case '{': case '[': if(!$in_string) { $new_json .= $char . "\n" . str_repeat($tab, $indent_level+1); $indent_level++; } else { $new_json .= $char; } break; case '}': case ']': if(!$in_string) { $indent_level--; $new_json .= "\n".str_repeat($tab, $indent_level).$char; } else { $new_json .= $char; } break; case ',': if(!$in_string) { $new_json .= ",\n" . str_repeat($tab, $indent_level); } else { $new_json .= $char; } break; case ':': if(!$in_string) { $new_json .= ": "; } else { $new_json .= $char; } break; case '"': if($c==0){ $in_string = TRUE; }elseif($c > 0 && $json[$c-1] != '\\') { $in_string = !$in_string; } default: $new_json .= $char; break; } } return $new_json; } public function __toString(){ return $this->getExtension(); } } class DocParser { private $params=array(); function parse($doc='') { if($doc==''){ return $this->params; } if(preg_match('#^/\*\*(.*)\*/#s', $doc, $comment) === false) return $this->params; $comment = trim($comment[1]); if(preg_match_all('#^\s*\*(.*)#m', $comment, $lines) === false) return $this->params; $this->parseLines($lines[1]); return $this->params; } private function parseLines($lines) { foreach($lines as $line) { $parsedLine = $this->parseLine($line); if($parsedLine === false && !isset($this->params['description'])) { if(isset($desc)){ $this->params['description'] = implode(PHP_EOL, $desc); } $desc = array(); } elseif($parsedLine !== false) { $desc[] = $parsedLine; } } $desc = implode(' ', $desc); if(!empty($desc))$this->params['long_description'] = $desc; } private function parseLine($line) { $line = trim($line); if(empty($line)) return false; if(strpos($line, '@') === 0) { if(strpos($line, ' ')>0){ $param = substr($line, 1, strpos($line, ' ') - 1); $value = substr($line, strlen($param) + 2); }else{ $param = substr($line, 1); $value = ''; } if($this->setParam($param, $value)) return false; } return $line; } private function setParam($param, $value) { if($param == 'param' || $param == 'return') $value = $this->formatParamOrReturn($value); if($param == 'class') list($param, $value) = $this->formatClass($value); if(empty($this->params[$param])) { $this->params[$param] = $value; } else if($param == 'param'){ $arr = array($this->params[$param], $value); $this->params[$param] = $arr; } else { $this->params[$param] = $value + $this->params[$param]; } return true; } private function formatClass($value) { $r = preg_split("[\(|\)]",$value); if(is_array($r)){ $param = $r[0]; parse_str($r[1],$value); foreach ($value as $key => $val) { $val = explode(',', $val); if(count($val)>1)$value[$key]=$val; } }else{ $param='Unknown'; } return array($param, $value); } private function formatParamOrReturn($string) { $pos = strpos($string, ' '); $type = substr($string, 0, $pos); return '(' . $type . ')' . substr($string, $pos+1); } } function parse_doc($php_doc_comment){ $p = new DocParser(); return $p->parse($php_doc_comment); $p = new Parser($php_doc_comment); return $p; $php_doc_comment = preg_replace("/(^[\\s]*\\/\\*\\*)
                                  |(^[\\s]\\*\\/)
                                  |(^[\\s]*\\*?\\s)
                                  |(^[\\s]*)

From f2ef823432f6e3c55c83d4960b91dffaf0774f65 Mon Sep 17 00:00:00 2001
From: Luracast <arul@luracast.com>
Date: Sat, 19 Nov 2011 21:54:44 +0800
Subject: [PATCH 27/61] UTF8 encoding is now turned off by default for
 object_to_array.

Extension in the middle of the URL is now supported.

XmlFormat now does not use htmlentities and utf8encode.

Fixes #6, Fixes #18, and Fixes #19
---
 restler/restler.php            | 23 +++++++++++++----------
 restler/xmlformat.php          |  4 +---
 restler_minified/restler.php   |  4 ++--
 restler_minified/xmlformat.php |  2 +-
 4 files changed, 17 insertions(+), 16 deletions(-)

diff --git a/restler/restler.php b/restler/restler.php
index 80a4bed8d..e82a8fb23 100644
--- a/restler/restler.php
+++ b/restler/restler.php
@@ -13,7 +13,7 @@
  * @version    2.0.6
  */
 class Restler {
-	const VERSION = '2.0.7';
+	const VERSION = '2.0.8';
 	/**
 	 * URL of the currently mapped service
 	 * @var string
@@ -506,15 +506,18 @@ protected function getResponseFormat () {
 		* @var iFormat
 		*/
 		$format=NULL;
-		$extension = explode('.', parse_url($_SERVER['REQUEST_URI'],
+		$extensions = explode('.', parse_url($_SERVER['REQUEST_URI'],
 		PHP_URL_PATH));
-		$extension = array_pop($extension);
-		if($extension && isset($this->format_map[$extension])){
-			$format = $this->format_map[$extension];
-			$format = is_string($format) ? new $format: $format;
-			$format->setExtension($extension);
-			//echo "Extension $extension";
-			return $format;
+		while($extensions){
+			$extension = array_pop($extensions);
+			$extension = array_shift(explode('/', $extension));
+			if($extension && isset($this->format_map[$extension])){
+				$format = $this->format_map[$extension];
+				$format = is_string($format) ? new $format: $format;
+				$format->setExtension($extension);
+				//echo "Extension $extension";
+				return $format;
+			}
 		}
 		//check if client has sent list of accepted data formats
 		if(isset($_SERVER['HTTP_ACCEPT'])){
@@ -1184,7 +1187,7 @@ function parse_doc($php_doc_comment){
  * @license    http://www.opensource.org/licenses/lgpl-license.php LGPL
  * @link       http://luracast.com/products/restler/
  */
-function object_to_array($object, $utf_encode=TRUE)
+function object_to_array($object, $utf_encode=FALSE)
 {
 	if(is_array($object) || is_object($object))
 	{
diff --git a/restler/xmlformat.php b/restler/xmlformat.php
index 3f809976b..7e21b7943 100644
--- a/restler/xmlformat.php
+++ b/restler/xmlformat.php
@@ -115,9 +115,7 @@ public function toXML( $data, $root_node_name = 'result',
 					$this->toXML($value, $key, $human_readable, $node);
 				} else {
 
-					// add single node.
-					$value = utf8_encode(htmlentities($value));
-					//$xml->addChild( $key, $value );
+					// add single node or attribute
 					in_array($key,XmlFormat::$attribute_names) ?
 					$xml->addAttribute($key,$value) :
 					$xml->addChild( $key, $value);
diff --git a/restler_minified/restler.php b/restler_minified/restler.php
index d722dacbd..48c0de3f3 100644
--- a/restler_minified/restler.php
+++ b/restler_minified/restler.php
@@ -1,6 +1,6 @@
 <?php
- class Restler { const VERSION = '2.0.7'; public $url; public $request_method; public $request_format; public $request_data=array(); public $cache_dir; public $base_dir; public $response = 'DefaultResponse'; public $response_format; protected $production_mode; protected $routes= array(); protected $format_map = array(); protected $service_class_instance; protected $service_method; protected $auth_classes = array(); protected $error_classes = array(); private $codes = array( 100 => 'Continue', 101 => 'Switching Protocols', 200 => 'OK', 201 => 'Created', 202 => 'Accepted', 203 => 'Non-Authoritative Information', 204 => 'No Content', 205 => 'Reset Content', 206 => 'Partial Content', 300 => 'Multiple Choices', 301 => 'Moved Permanently', 302 => 'Found', 303 => 'See Other', 304 => 'Not Modified', 305 => 'Use Proxy', 306 => '(Unused)', 307 => 'Temporary Redirect', 400 => 'Bad Request', 401 => 'Unauthorized', 402 => 'Payment Required', 403 => 'Forbidden', 404 => 'Not Found', 405 => 'Method Not Allowed', 406 => 'Not Acceptable', 407 => 'Proxy Authentication Required', 408 => 'Request Timeout', 409 => 'Conflict', 410 => 'Gone', 411 => 'Length Required', 412 => 'Precondition Failed', 413 => 'Request Entity Too Large', 414 => 'Request-URI Too Long', 415 => 'Unsupported Media Type', 416 => 'Requested Range Not Satisfiable', 417 => 'Expectation Failed', 500 => 'Internal Server Error', 501 => 'Not Implemented', 502 => 'Bad Gateway', 503 => 'Service Unavailable', 504 => 'Gateway Timeout', 505 => 'HTTP Version Not Supported' ); protected $cached; public function __construct ($production_mode = FALSE) { $this->production_mode = $production_mode; $this->cache_dir = getcwd(); $this->base_dir = RESTLER_PATH; } public function __destruct () { if ($this->production_mode && !$this->cached) { $this->saveCache(); } } public function refreshCache () { $this->routes = array(); $this->cached = FALSE; } public function setSupportedFormats () { $args = func_get_args(); $extensions = array(); foreach ($args as $class_name) { if(!is_string($class_name) || !class_exists($class_name)){ throw new Exception("$class_name is not a vaild Format Class."); } $obj = new $class_name; if(! $obj instanceof iFormat){ throw new Exception('Invalid format class; must implement '. 'iFormat interface'); } foreach ($obj->getMIMEMap() as $extension => $mime) { if(!isset($this->format_map[$extension])) $this->format_map[$extension]=$class_name; if(!isset($this->format_map[$mime])) $this->format_map[$mime]=$class_name; $extensions[".$extension"]=TRUE; } } $this->format_map['default']=$args[0]; $this->format_map['extensions']=array_keys($extensions); } public function addAPIClass($class_name, $base_path = NULL) { if(!class_exists($class_name)){ throw new Exception("API class $class_name is missing."); } $this->loadCache(); if(!$this->cached){ if(is_null($base_path))$base_path=strtolower($class_name); $base_path = trim($base_path,'/'); if(strlen($base_path)>0)$base_path .= '/'; $this->generateMap($class_name, $base_path); } } public function addAuthenticationClass ($class_name, $base_path = NULL) { $this->auth_classes[] = $class_name; $this->addAPIClass($class_name, $base_path); } public function addErrorClass ($class_name) { $this->error_classes[] = $class_name; } public function handleError ($status_code, $error_message = NULL) { $method = "handle$status_code"; $handled = FALSE; foreach ($this->error_classes as $class_name) { if (method_exists($class_name, $method)) { $obj = new $class_name(); $obj->restler = $this; $obj->$method(); $handled = TRUE; } } if($handled)return; $message = $this->codes[$status_code] . (!$error_message ? '' : ': ' . $error_message); $this->setStatus($status_code); $this->sendData( call_user_func( array($this->response, '__formatError'), $status_code, $message) ); } public function handle () { if(empty($this->format_map))$this->setSupportedFormats('JsonFormat'); $this->url = $this->getPath(); $this->request_method = $this->getRequestMethod(); $this->response_format = $this->getResponseFormat(); $this->request_format = $this->getRequestFormat(); if(is_null($this->request_format)){ $this->request_format = $this->response_format; } if($this->request_method == 'PUT' || $this->request_method == 'POST'){ $this->request_data = $this->getRequestData(); } $o = $this->mapUrlToMethod(); if(!isset($o->class_name)){ $this->handleError(404); }else{ try { if($o->method_flag){ $auth_method = '__isAuthenticated'; if(!count($this->auth_classes))throw new RestException(401); foreach ($this->auth_classes as $auth_class) { $auth_obj = new $auth_class(); $auth_obj->restler=$this; $this->applyClassMetadata($auth_class, $auth_obj, $o); if (!method_exists($auth_obj, $auth_method)) { throw new RestException(401, 'Authentication Class '. 'should implement iAuthenticate'); }elseif(!$auth_obj->$auth_method()){ throw new RestException(401); } } } $this->applyClassMetadata(get_class($this->request_format), $this->request_format, $o); $pre_process = '_'.$this->request_format->getExtension().'_'. $o->method_name; $this->service_method = $o->method_name; if($o->method_flag==2)$o=unprotect($o); $object = $this->service_class_instance = new $o->class_name(); $object->restler=$this; if(method_exists($o->class_name, $pre_process)) { call_user_func_array(array($object, $pre_process), $o->arguments); } switch ($o->method_flag) { case 3: $reflection_method = new ReflectionMethod($object, $o->method_name); $reflection_method->setAccessible(TRUE); $result = $reflection_method->invokeArgs($object, $o->arguments); break; case 2: case 1: default: $result = call_user_func_array(array($object, $o->method_name), $o->arguments); } } catch (RestException $e) { $this->handleError($e->getCode(), $e->getMessage()); } } if (isset($result) && $result !== NULL) { $this->sendData($result); } } public function sendData($data) { $data = $this->response_format->encode($data, !$this->production_mode); $post_process = '_'.$this->service_method .'_'. $this->response_format->getExtension(); if(isset($this->service_class_instance) && method_exists($this->service_class_instance,$post_process)){ $data = call_user_func(array($this->service_class_instance, $post_process), $data); } header("Cache-Control: no-cache, must-revalidate"); header("Expires: 0"); header('Content-Type: ' . $this->response_format->getMIME()); header("X-Powered-By: Luracast Restler v".Restler::VERSION); die($data); } public function setStatus($code) { header("{$_SERVER['SERVER_PROTOCOL']} $code ". $this->codes[strval($code)]); } public function removeCommonPath($first, $second, $char='/'){ $first = explode($char, $first); $second = explode($char, $second); while (count($second)){ if($first[0]==$second[0]){ array_shift($first); } else break; array_shift($second); } return implode($char, $first); } public function saveCache() { $file = $this->cache_dir . '/routes.php'; $s = '$o=array();'.PHP_EOL; foreach ($this->routes as $key => $value) { $s .= PHP_EOL.PHP_EOL.PHP_EOL."############### $key ###############" .PHP_EOL.PHP_EOL; $s .= '$o[\''.$key.'\']=array();'; foreach ($value as $ke => $va) { $s .= PHP_EOL.PHP_EOL."#==== $key $ke".PHP_EOL.PHP_EOL; $s .= '$o[\''.$key.'\'][\''.$ke.'\']='.str_replace(PHP_EOL, PHP_EOL."\t", var_export($va, TRUE)).';'; } } $s .= PHP_EOL.'return $o;'; $r=@file_put_contents($file, "<?php $s"); @chmod($file, 0777); if($r===FALSE)throw new Exception( "The cache directory located at '$this->cache_dir' needs to have ". "the permissions set to read/write/execute for everyone in order ". "to save cache and improve performance."); } protected function getPath () { $path = urldecode($this->removeCommonPath($_SERVER['REQUEST_URI'], $_SERVER['SCRIPT_NAME'])); $path = preg_replace('/(\/*\?.*$)|(\/$)/', '', $path); $path = str_replace($this->format_map['extensions'], '', $path); return $path; } protected function getRequestMethod () { $method = $_SERVER['REQUEST_METHOD']; if (isset($_SERVER['HTTP_X_HTTP_METHOD_OVERRIDE'])){ $method = $_SERVER['HTTP_X_HTTP_METHOD_OVERRIDE']; } if($method=='HEAD')$method='GET'; return $method; } protected function getRequestFormat () { $format=NULL; if(isset($_SERVER['CONTENT_TYPE'])){ $mime = explode(';', $_SERVER['CONTENT_TYPE']); $mime = $mime[0]; if($mime==UrlEncodedFormat::MIME){ $format = new UrlEncodedFormat(); }else{ if(isset($this->format_map[$mime])){ $format = $this->format_map[$mime]; $format = is_string($format) ? new $format: $format; $format->setMIME($mime); } } } return $format; } protected function getResponseFormat () { $format=NULL; $extension = explode('.', parse_url($_SERVER['REQUEST_URI'], PHP_URL_PATH)); $extension = array_pop($extension); if($extension && isset($this->format_map[$extension])){ $format = $this->format_map[$extension]; $format = is_string($format) ? new $format: $format; $format->setExtension($extension); return $format; } if(isset($_SERVER['HTTP_ACCEPT'])){ $accepts = explode(',', $_SERVER['HTTP_ACCEPT']); foreach ($accepts as $accept) { if($extension && isset($this->format_map[$accept])){ $format = $this->format_map[$accept]; $format = is_string($format) ? new $format: $format; $format->setMIME($accept); return $format; } } } $format = new $this->format_map['default']; return $format; } protected function getRequestData() { try { $r = file_get_contents ( 'php://input' ); if (is_null ( $r )) return $_GET; $r = $this->request_format->decode ( $r ); return is_null ( $r ) ? array () : $r; } catch ( RestException $e ) { $this->handleError ( $e->getCode (), $e->getMessage () ); } } protected function mapUrlToMethod () { if(!isset($this->routes[$this->request_method])){ return array(); } $urls = $this->routes[$this->request_method]; if(!$urls)return array(); $found = FALSE; $this->request_data += $_GET; $params = array('request_data'=>$this->request_data); $params += $this->request_data; foreach ($urls as $url => $call) { $call = (object)$call; if(strstr($url, ':')){ $regex = preg_replace('/\\\:([^\/]+)/', '(?P<$1>[^/]+)', preg_quote($url)); if (preg_match(":^$regex$:", $this->url, $matches)) { foreach ($matches as $arg => $match) { if (isset($call->arguments[$arg])){ $params[$arg] = $match; } } $found = TRUE; break; } }elseif ($url == $this->url){ $found = TRUE; break; } } if($found){ $p = $call->defaults; foreach ($call->arguments as $key => $value) { if(isset($params[$key]))$p[$value] = $params[$key]; } $call->arguments=$p; return $call; } } protected function applyClassMetadata($class_name, $instance, $method_info){ if(isset($method_info->metadata[$class_name]) && is_array($method_info->metadata[$class_name])){ foreach ($method_info->metadata[$class_name] as $property => $value){ if(property_exists($class_name, $property)){ $reflection_property = new ReflectionProperty($class_name, $property); $reflection_property->setValue($instance, $value); } } } } protected function loadCache() { if ($this->cached !== NULL) { return; } $file = $this->cache_dir . '/routes.php'; $this->cached = FALSE; if ($this->production_mode) { if (file_exists($file)) { $routes = include($file); } if (isset($routes) && is_array($routes)) { $this->routes = $routes; $this->cached = TRUE; } } else { } } protected function generateMap ($class_name, $base_path = "") { $reflection = new ReflectionClass($class_name); $class_metadata = parse_doc($reflection->getDocComment()); $methods = $reflection->getMethods( ReflectionMethod::IS_PUBLIC + ReflectionMethod::IS_PROTECTED); foreach ($methods as $method) { $doc = $method->getDocComment(); $arguments = array(); $defaults = array(); $metadata = $class_metadata+parse_doc($doc); $params = $method->getParameters(); $position=0; foreach ($params as $param){ $arguments[$param->getName()] = $position; $defaults[$position] = $param->isDefaultValueAvailable() ? $param->getDefaultValue() : NULL; $position++; } $method_flag = $method->isProtected() ? (isRestlerCompatibilityModeEnabled() ? 2 : 3) : (isset($metadata['protected']) ? 1 : 0); $call = array( 'class_name'=>$class_name, 'method_name'=>$method->getName(), 'arguments'=>$arguments, 'defaults'=>$defaults, 'metadata'=>$metadata, 'method_flag'=>$method_flag ); $method_url = strtolower($method->getName()); if (preg_match_all( '/@url\s+(GET|POST|PUT|DELETE|HEAD|OPTIONS)[ \t]*\/?(\S*)/s', $doc, $matches, PREG_SET_ORDER)) { foreach ($matches as $match) { $http_method = $match[1]; $url = rtrim($base_path . $match[2],'/'); $this->routes[$http_method][$url] = $call; } }elseif($method_url[0] != '_'){ if (preg_match_all('/^(GET|POST|PUT|DELETE|HEAD|OPTIONS)/i', $method_url, $matches)) { $http_method = strtoupper($matches[0][0]); $method_url = substr($method_url, strlen($http_method)); }else{ $http_method = 'GET'; } $url = $base_path. ($method_url=='index' || $method_url=='default' ? '' : $method_url); $url = rtrim($url,'/'); $this->routes[$http_method][$url] = $call; foreach ($params as $param){ if($param->getName()=='request_data'){ break; } $url .= $url=='' ? ':' : '/:'; $url .= $param->getName(); $this->routes[$http_method][$url] = $call; } } } } } if(version_compare(PHP_VERSION, '5.3.0') < 0){ require_once 'compat.php'; } class RestException extends Exception { public function __construct($http_status_code, $error_message = NULL) { parent::__construct($error_message, $http_status_code); } } interface iRespond { public function __formatResponse($result); public function __formatError($status_code, $message); } class DefaultResponse implements iRespond { function __formatResponse($result) { return $result; } function __formatError($statusCode, $message) { return array('error' => array('code' => $statusCode, 'message' => $message)); } } interface iAuthenticate { public function __isAuthenticated(); } interface iFormat { public function getMIMEMap(); public function setMIME($mime); public function getMIME(); public function setExtension($extension); public function getExtension(); public function encode($data, $human_readable=FALSE); public function decode($data); } class UrlEncodedFormat implements iFormat { const MIME = 'application/x-www-form-urlencoded'; const EXTENSION = 'post'; public function getMIMEMap() { return array(UrlEncodedFormat::EXTENSION=>UrlEncodedFormat::MIME); } public function getMIME(){ return UrlEncodedFormat::MIME; } public function getExtension(){ return UrlEncodedFormat::EXTENSION; } public function setMIME($mime){ } public function setExtension($extension){ } public function encode($data, $human_readable=FALSE){ return http_build_query($data); } public function decode($data){ parse_str($data,$r); return $r; } public function __toString(){ return $this->getExtension(); } } class JsonFormat implements iFormat { const MIME ='application/json'; const EXTENSION = 'json'; public function getMIMEMap() { return array(JsonFormat::EXTENSION=>JsonFormat::MIME); } public function getMIME(){ return JsonFormat::MIME; } public function getExtension(){ return JsonFormat::EXTENSION; } public function setMIME($mime){ } public function setExtension($extension){ } public function encode($data, $human_readable=FALSE){ return $human_readable ? $this->json_format(json_encode(object_to_array($data))) : json_encode(object_to_array($data)); } public function decode($data) { $decoded = json_decode ( $data ); if (function_exists ( 'json_last_error' )) { $message = ''; switch (json_last_error ()) { case JSON_ERROR_NONE : return object_to_array ( $decoded ); break; case JSON_ERROR_DEPTH : $message = 'maximum stack depth exceeded'; break; case JSON_ERROR_STATE_MISMATCH : $message = 'underflow or the modes mismatch'; break; case JSON_ERROR_CTRL_CHAR : $message = 'unexpected control character found'; break; case JSON_ERROR_SYNTAX : $message = 'malformed JSON'; break; case JSON_ERROR_UTF8 : $message = 'malformed UTF-8 characters, possibly incorrectly encoded'; break; default : $message = 'unknown error'; break; } throw new RestException ( 400, 'Error parsing JSON, ' . $message ); } else if (strlen ( $data ) && $decoded === NULL || $decoded === $data) { throw new RestException ( 400, 'Error parsing JSON' ); } return object_to_array ( $decoded ); } private function json_format($json) { $tab = "  "; $new_json = ""; $indent_level = 0; $in_string = FALSE; $len = strlen($json); for($c = 0; $c < $len; $c++) { $char = $json[$c]; switch($char) { case '{': case '[': if(!$in_string) { $new_json .= $char . "\n" . str_repeat($tab, $indent_level+1); $indent_level++; } else { $new_json .= $char; } break; case '}': case ']': if(!$in_string) { $indent_level--; $new_json .= "\n".str_repeat($tab, $indent_level).$char; } else { $new_json .= $char; } break; case ',': if(!$in_string) { $new_json .= ",\n" . str_repeat($tab, $indent_level); } else { $new_json .= $char; } break; case ':': if(!$in_string) { $new_json .= ": "; } else { $new_json .= $char; } break; case '"': if($c==0){ $in_string = TRUE; }elseif($c > 0 && $json[$c-1] != '\\') { $in_string = !$in_string; } default: $new_json .= $char; break; } } return $new_json; } public function __toString(){ return $this->getExtension(); } } class DocParser { private $params=array(); function parse($doc='') { if($doc==''){ return $this->params; } if(preg_match('#^/\*\*(.*)\*/#s', $doc, $comment) === false) return $this->params; $comment = trim($comment[1]); if(preg_match_all('#^\s*\*(.*)#m', $comment, $lines) === false) return $this->params; $this->parseLines($lines[1]); return $this->params; } private function parseLines($lines) { foreach($lines as $line) { $parsedLine = $this->parseLine($line); if($parsedLine === false && !isset($this->params['description'])) { if(isset($desc)){ $this->params['description'] = implode(PHP_EOL, $desc); } $desc = array(); } elseif($parsedLine !== false) { $desc[] = $parsedLine; } } $desc = implode(' ', $desc); if(!empty($desc))$this->params['long_description'] = $desc; } private function parseLine($line) { $line = trim($line); if(empty($line)) return false; if(strpos($line, '@') === 0) { if(strpos($line, ' ')>0){ $param = substr($line, 1, strpos($line, ' ') - 1); $value = substr($line, strlen($param) + 2); }else{ $param = substr($line, 1); $value = ''; } if($this->setParam($param, $value)) return false; } return $line; } private function setParam($param, $value) { if($param == 'param' || $param == 'return') $value = $this->formatParamOrReturn($value); if($param == 'class') list($param, $value) = $this->formatClass($value); if(empty($this->params[$param])) { $this->params[$param] = $value; } else if($param == 'param'){ $arr = array($this->params[$param], $value); $this->params[$param] = $arr; } else { $this->params[$param] = $value + $this->params[$param]; } return true; } private function formatClass($value) { $r = preg_split("[\(|\)]",$value); if(is_array($r)){ $param = $r[0]; parse_str($r[1],$value); foreach ($value as $key => $val) { $val = explode(',', $val); if(count($val)>1)$value[$key]=$val; } }else{ $param='Unknown'; } return array($param, $value); } private function formatParamOrReturn($string) { $pos = strpos($string, ' '); $type = substr($string, 0, $pos); return '(' . $type . ')' . substr($string, $pos+1); } } function parse_doc($php_doc_comment){ $p = new DocParser(); return $p->parse($php_doc_comment); $p = new Parser($php_doc_comment); return $p; $php_doc_comment = preg_replace("/(^[\\s]*\\/\\*\\*)
+ class Restler { const VERSION = '2.0.8'; public $url; public $request_method; public $request_format; public $request_data=array(); public $cache_dir; public $base_dir; public $response = 'DefaultResponse'; public $response_format; protected $production_mode; protected $routes= array(); protected $format_map = array(); protected $service_class_instance; protected $service_method; protected $auth_classes = array(); protected $error_classes = array(); private $codes = array( 100 => 'Continue', 101 => 'Switching Protocols', 200 => 'OK', 201 => 'Created', 202 => 'Accepted', 203 => 'Non-Authoritative Information', 204 => 'No Content', 205 => 'Reset Content', 206 => 'Partial Content', 300 => 'Multiple Choices', 301 => 'Moved Permanently', 302 => 'Found', 303 => 'See Other', 304 => 'Not Modified', 305 => 'Use Proxy', 306 => '(Unused)', 307 => 'Temporary Redirect', 400 => 'Bad Request', 401 => 'Unauthorized', 402 => 'Payment Required', 403 => 'Forbidden', 404 => 'Not Found', 405 => 'Method Not Allowed', 406 => 'Not Acceptable', 407 => 'Proxy Authentication Required', 408 => 'Request Timeout', 409 => 'Conflict', 410 => 'Gone', 411 => 'Length Required', 412 => 'Precondition Failed', 413 => 'Request Entity Too Large', 414 => 'Request-URI Too Long', 415 => 'Unsupported Media Type', 416 => 'Requested Range Not Satisfiable', 417 => 'Expectation Failed', 500 => 'Internal Server Error', 501 => 'Not Implemented', 502 => 'Bad Gateway', 503 => 'Service Unavailable', 504 => 'Gateway Timeout', 505 => 'HTTP Version Not Supported' ); protected $cached; public function __construct ($production_mode = FALSE) { $this->production_mode = $production_mode; $this->cache_dir = getcwd(); $this->base_dir = RESTLER_PATH; } public function __destruct () { if ($this->production_mode && !$this->cached) { $this->saveCache(); } } public function refreshCache () { $this->routes = array(); $this->cached = FALSE; } public function setSupportedFormats () { $args = func_get_args(); $extensions = array(); foreach ($args as $class_name) { if(!is_string($class_name) || !class_exists($class_name)){ throw new Exception("$class_name is not a vaild Format Class."); } $obj = new $class_name; if(! $obj instanceof iFormat){ throw new Exception('Invalid format class; must implement '. 'iFormat interface'); } foreach ($obj->getMIMEMap() as $extension => $mime) { if(!isset($this->format_map[$extension])) $this->format_map[$extension]=$class_name; if(!isset($this->format_map[$mime])) $this->format_map[$mime]=$class_name; $extensions[".$extension"]=TRUE; } } $this->format_map['default']=$args[0]; $this->format_map['extensions']=array_keys($extensions); } public function addAPIClass($class_name, $base_path = NULL) { if(!class_exists($class_name)){ throw new Exception("API class $class_name is missing."); } $this->loadCache(); if(!$this->cached){ if(is_null($base_path))$base_path=strtolower($class_name); $base_path = trim($base_path,'/'); if(strlen($base_path)>0)$base_path .= '/'; $this->generateMap($class_name, $base_path); } } public function addAuthenticationClass ($class_name, $base_path = NULL) { $this->auth_classes[] = $class_name; $this->addAPIClass($class_name, $base_path); } public function addErrorClass ($class_name) { $this->error_classes[] = $class_name; } public function handleError ($status_code, $error_message = NULL) { $method = "handle$status_code"; $handled = FALSE; foreach ($this->error_classes as $class_name) { if (method_exists($class_name, $method)) { $obj = new $class_name(); $obj->restler = $this; $obj->$method(); $handled = TRUE; } } if($handled)return; $message = $this->codes[$status_code] . (!$error_message ? '' : ': ' . $error_message); $this->setStatus($status_code); $this->sendData( call_user_func( array($this->response, '__formatError'), $status_code, $message) ); } public function handle () { if(empty($this->format_map))$this->setSupportedFormats('JsonFormat'); $this->url = $this->getPath(); $this->request_method = $this->getRequestMethod(); $this->response_format = $this->getResponseFormat(); $this->request_format = $this->getRequestFormat(); if(is_null($this->request_format)){ $this->request_format = $this->response_format; } if($this->request_method == 'PUT' || $this->request_method == 'POST'){ $this->request_data = $this->getRequestData(); } $o = $this->mapUrlToMethod(); if(!isset($o->class_name)){ $this->handleError(404); }else{ try { if($o->method_flag){ $auth_method = '__isAuthenticated'; if(!count($this->auth_classes))throw new RestException(401); foreach ($this->auth_classes as $auth_class) { $auth_obj = new $auth_class(); $auth_obj->restler=$this; $this->applyClassMetadata($auth_class, $auth_obj, $o); if (!method_exists($auth_obj, $auth_method)) { throw new RestException(401, 'Authentication Class '. 'should implement iAuthenticate'); }elseif(!$auth_obj->$auth_method()){ throw new RestException(401); } } } $this->applyClassMetadata(get_class($this->request_format), $this->request_format, $o); $pre_process = '_'.$this->request_format->getExtension().'_'. $o->method_name; $this->service_method = $o->method_name; if($o->method_flag==2)$o=unprotect($o); $object = $this->service_class_instance = new $o->class_name(); $object->restler=$this; if(method_exists($o->class_name, $pre_process)) { call_user_func_array(array($object, $pre_process), $o->arguments); } switch ($o->method_flag) { case 3: $reflection_method = new ReflectionMethod($object, $o->method_name); $reflection_method->setAccessible(TRUE); $result = $reflection_method->invokeArgs($object, $o->arguments); break; case 2: case 1: default: $result = call_user_func_array(array($object, $o->method_name), $o->arguments); } } catch (RestException $e) { $this->handleError($e->getCode(), $e->getMessage()); } } if (isset($result) && $result !== NULL) { $this->sendData($result); } } public function sendData($data) { $data = $this->response_format->encode($data, !$this->production_mode); $post_process = '_'.$this->service_method .'_'. $this->response_format->getExtension(); if(isset($this->service_class_instance) && method_exists($this->service_class_instance,$post_process)){ $data = call_user_func(array($this->service_class_instance, $post_process), $data); } header("Cache-Control: no-cache, must-revalidate"); header("Expires: 0"); header('Content-Type: ' . $this->response_format->getMIME()); header("X-Powered-By: Luracast Restler v".Restler::VERSION); die($data); } public function setStatus($code) { header("{$_SERVER['SERVER_PROTOCOL']} $code ". $this->codes[strval($code)]); } public function removeCommonPath($first, $second, $char='/'){ $first = explode($char, $first); $second = explode($char, $second); while (count($second)){ if($first[0]==$second[0]){ array_shift($first); } else break; array_shift($second); } return implode($char, $first); } public function saveCache() { $file = $this->cache_dir . '/routes.php'; $s = '$o=array();'.PHP_EOL; foreach ($this->routes as $key => $value) { $s .= PHP_EOL.PHP_EOL.PHP_EOL."############### $key ###############" .PHP_EOL.PHP_EOL; $s .= '$o[\''.$key.'\']=array();'; foreach ($value as $ke => $va) { $s .= PHP_EOL.PHP_EOL."#==== $key $ke".PHP_EOL.PHP_EOL; $s .= '$o[\''.$key.'\'][\''.$ke.'\']='.str_replace(PHP_EOL, PHP_EOL."\t", var_export($va, TRUE)).';'; } } $s .= PHP_EOL.'return $o;'; $r=@file_put_contents($file, "<?php $s"); @chmod($file, 0777); if($r===FALSE)throw new Exception( "The cache directory located at '$this->cache_dir' needs to have ". "the permissions set to read/write/execute for everyone in order ". "to save cache and improve performance."); } protected function getPath () { $path = urldecode($this->removeCommonPath($_SERVER['REQUEST_URI'], $_SERVER['SCRIPT_NAME'])); $path = preg_replace('/(\/*\?.*$)|(\/$)/', '', $path); $path = str_replace($this->format_map['extensions'], '', $path); return $path; } protected function getRequestMethod () { $method = $_SERVER['REQUEST_METHOD']; if (isset($_SERVER['HTTP_X_HTTP_METHOD_OVERRIDE'])){ $method = $_SERVER['HTTP_X_HTTP_METHOD_OVERRIDE']; } if($method=='HEAD')$method='GET'; return $method; } protected function getRequestFormat () { $format=NULL; if(isset($_SERVER['CONTENT_TYPE'])){ $mime = explode(';', $_SERVER['CONTENT_TYPE']); $mime = $mime[0]; if($mime==UrlEncodedFormat::MIME){ $format = new UrlEncodedFormat(); }else{ if(isset($this->format_map[$mime])){ $format = $this->format_map[$mime]; $format = is_string($format) ? new $format: $format; $format->setMIME($mime); } } } return $format; } protected function getResponseFormat () { $format=NULL; $extensions = explode('.', parse_url($_SERVER['REQUEST_URI'], PHP_URL_PATH)); while($extensions){ $extension = array_pop($extensions); $extension = array_shift(explode('/', $extension)); if($extension && isset($this->format_map[$extension])){ $format = $this->format_map[$extension]; $format = is_string($format) ? new $format: $format; $format->setExtension($extension); return $format; } } if(isset($_SERVER['HTTP_ACCEPT'])){ $accepts = explode(',', $_SERVER['HTTP_ACCEPT']); foreach ($accepts as $accept) { if($extension && isset($this->format_map[$accept])){ $format = $this->format_map[$accept]; $format = is_string($format) ? new $format: $format; $format->setMIME($accept); return $format; } } } $format = new $this->format_map['default']; return $format; } protected function getRequestData() { try { $r = file_get_contents ( 'php://input' ); if (is_null ( $r )) return $_GET; $r = $this->request_format->decode ( $r ); return is_null ( $r ) ? array () : $r; } catch ( RestException $e ) { $this->handleError ( $e->getCode (), $e->getMessage () ); } } protected function mapUrlToMethod () { if(!isset($this->routes[$this->request_method])){ return array(); } $urls = $this->routes[$this->request_method]; if(!$urls)return array(); $found = FALSE; $this->request_data += $_GET; $params = array('request_data'=>$this->request_data); $params += $this->request_data; foreach ($urls as $url => $call) { $call = (object)$call; if(strstr($url, ':')){ $regex = preg_replace('/\\\:([^\/]+)/', '(?P<$1>[^/]+)', preg_quote($url)); if (preg_match(":^$regex$:", $this->url, $matches)) { foreach ($matches as $arg => $match) { if (isset($call->arguments[$arg])){ $params[$arg] = $match; } } $found = TRUE; break; } }elseif ($url == $this->url){ $found = TRUE; break; } } if($found){ $p = $call->defaults; foreach ($call->arguments as $key => $value) { if(isset($params[$key]))$p[$value] = $params[$key]; } $call->arguments=$p; return $call; } } protected function applyClassMetadata($class_name, $instance, $method_info){ if(isset($method_info->metadata[$class_name]) && is_array($method_info->metadata[$class_name])){ foreach ($method_info->metadata[$class_name] as $property => $value){ if(property_exists($class_name, $property)){ $reflection_property = new ReflectionProperty($class_name, $property); $reflection_property->setValue($instance, $value); } } } } protected function loadCache() { if ($this->cached !== NULL) { return; } $file = $this->cache_dir . '/routes.php'; $this->cached = FALSE; if ($this->production_mode) { if (file_exists($file)) { $routes = include($file); } if (isset($routes) && is_array($routes)) { $this->routes = $routes; $this->cached = TRUE; } } else { } } protected function generateMap ($class_name, $base_path = "") { $reflection = new ReflectionClass($class_name); $class_metadata = parse_doc($reflection->getDocComment()); $methods = $reflection->getMethods( ReflectionMethod::IS_PUBLIC + ReflectionMethod::IS_PROTECTED); foreach ($methods as $method) { $doc = $method->getDocComment(); $arguments = array(); $defaults = array(); $metadata = $class_metadata+parse_doc($doc); $params = $method->getParameters(); $position=0; foreach ($params as $param){ $arguments[$param->getName()] = $position; $defaults[$position] = $param->isDefaultValueAvailable() ? $param->getDefaultValue() : NULL; $position++; } $method_flag = $method->isProtected() ? (isRestlerCompatibilityModeEnabled() ? 2 : 3) : (isset($metadata['protected']) ? 1 : 0); $call = array( 'class_name'=>$class_name, 'method_name'=>$method->getName(), 'arguments'=>$arguments, 'defaults'=>$defaults, 'metadata'=>$metadata, 'method_flag'=>$method_flag ); $method_url = strtolower($method->getName()); if (preg_match_all( '/@url\s+(GET|POST|PUT|DELETE|HEAD|OPTIONS)[ \t]*\/?(\S*)/s', $doc, $matches, PREG_SET_ORDER)) { foreach ($matches as $match) { $http_method = $match[1]; $url = rtrim($base_path . $match[2],'/'); $this->routes[$http_method][$url] = $call; } }elseif($method_url[0] != '_'){ if (preg_match_all('/^(GET|POST|PUT|DELETE|HEAD|OPTIONS)/i', $method_url, $matches)) { $http_method = strtoupper($matches[0][0]); $method_url = substr($method_url, strlen($http_method)); }else{ $http_method = 'GET'; } $url = $base_path. ($method_url=='index' || $method_url=='default' ? '' : $method_url); $url = rtrim($url,'/'); $this->routes[$http_method][$url] = $call; foreach ($params as $param){ if($param->getName()=='request_data'){ break; } $url .= $url=='' ? ':' : '/:'; $url .= $param->getName(); $this->routes[$http_method][$url] = $call; } } } } } if(version_compare(PHP_VERSION, '5.3.0') < 0){ require_once 'compat.php'; } class RestException extends Exception { public function __construct($http_status_code, $error_message = NULL) { parent::__construct($error_message, $http_status_code); } } interface iRespond { public function __formatResponse($result); public function __formatError($status_code, $message); } class DefaultResponse implements iRespond { function __formatResponse($result) { return $result; } function __formatError($statusCode, $message) { return array('error' => array('code' => $statusCode, 'message' => $message)); } } interface iAuthenticate { public function __isAuthenticated(); } interface iFormat { public function getMIMEMap(); public function setMIME($mime); public function getMIME(); public function setExtension($extension); public function getExtension(); public function encode($data, $human_readable=FALSE); public function decode($data); } class UrlEncodedFormat implements iFormat { const MIME = 'application/x-www-form-urlencoded'; const EXTENSION = 'post'; public function getMIMEMap() { return array(UrlEncodedFormat::EXTENSION=>UrlEncodedFormat::MIME); } public function getMIME(){ return UrlEncodedFormat::MIME; } public function getExtension(){ return UrlEncodedFormat::EXTENSION; } public function setMIME($mime){ } public function setExtension($extension){ } public function encode($data, $human_readable=FALSE){ return http_build_query($data); } public function decode($data){ parse_str($data,$r); return $r; } public function __toString(){ return $this->getExtension(); } } class JsonFormat implements iFormat { const MIME ='application/json'; const EXTENSION = 'json'; public function getMIMEMap() { return array(JsonFormat::EXTENSION=>JsonFormat::MIME); } public function getMIME(){ return JsonFormat::MIME; } public function getExtension(){ return JsonFormat::EXTENSION; } public function setMIME($mime){ } public function setExtension($extension){ } public function encode($data, $human_readable=FALSE){ return $human_readable ? $this->json_format(json_encode(object_to_array($data))) : json_encode(object_to_array($data)); } public function decode($data) { $decoded = json_decode ( $data ); if (function_exists ( 'json_last_error' )) { $message = ''; switch (json_last_error ()) { case JSON_ERROR_NONE : return object_to_array ( $decoded ); break; case JSON_ERROR_DEPTH : $message = 'maximum stack depth exceeded'; break; case JSON_ERROR_STATE_MISMATCH : $message = 'underflow or the modes mismatch'; break; case JSON_ERROR_CTRL_CHAR : $message = 'unexpected control character found'; break; case JSON_ERROR_SYNTAX : $message = 'malformed JSON'; break; case JSON_ERROR_UTF8 : $message = 'malformed UTF-8 characters, possibly incorrectly encoded'; break; default : $message = 'unknown error'; break; } throw new RestException ( 400, 'Error parsing JSON, ' . $message ); } else if (strlen ( $data ) && $decoded === NULL || $decoded === $data) { throw new RestException ( 400, 'Error parsing JSON' ); } return object_to_array ( $decoded ); } private function json_format($json) { $tab = "  "; $new_json = ""; $indent_level = 0; $in_string = FALSE; $len = strlen($json); for($c = 0; $c < $len; $c++) { $char = $json[$c]; switch($char) { case '{': case '[': if(!$in_string) { $new_json .= $char . "\n" . str_repeat($tab, $indent_level+1); $indent_level++; } else { $new_json .= $char; } break; case '}': case ']': if(!$in_string) { $indent_level--; $new_json .= "\n".str_repeat($tab, $indent_level).$char; } else { $new_json .= $char; } break; case ',': if(!$in_string) { $new_json .= ",\n" . str_repeat($tab, $indent_level); } else { $new_json .= $char; } break; case ':': if(!$in_string) { $new_json .= ": "; } else { $new_json .= $char; } break; case '"': if($c==0){ $in_string = TRUE; }elseif($c > 0 && $json[$c-1] != '\\') { $in_string = !$in_string; } default: $new_json .= $char; break; } } return $new_json; } public function __toString(){ return $this->getExtension(); } } class DocParser { private $params=array(); function parse($doc='') { if($doc==''){ return $this->params; } if(preg_match('#^/\*\*(.*)\*/#s', $doc, $comment) === false) return $this->params; $comment = trim($comment[1]); if(preg_match_all('#^\s*\*(.*)#m', $comment, $lines) === false) return $this->params; $this->parseLines($lines[1]); return $this->params; } private function parseLines($lines) { foreach($lines as $line) { $parsedLine = $this->parseLine($line); if($parsedLine === false && !isset($this->params['description'])) { if(isset($desc)){ $this->params['description'] = implode(PHP_EOL, $desc); } $desc = array(); } elseif($parsedLine !== false) { $desc[] = $parsedLine; } } $desc = implode(' ', $desc); if(!empty($desc))$this->params['long_description'] = $desc; } private function parseLine($line) { $line = trim($line); if(empty($line)) return false; if(strpos($line, '@') === 0) { if(strpos($line, ' ')>0){ $param = substr($line, 1, strpos($line, ' ') - 1); $value = substr($line, strlen($param) + 2); }else{ $param = substr($line, 1); $value = ''; } if($this->setParam($param, $value)) return false; } return $line; } private function setParam($param, $value) { if($param == 'param' || $param == 'return') $value = $this->formatParamOrReturn($value); if($param == 'class') list($param, $value) = $this->formatClass($value); if(empty($this->params[$param])) { $this->params[$param] = $value; } else if($param == 'param'){ $arr = array($this->params[$param], $value); $this->params[$param] = $arr; } else { $this->params[$param] = $value + $this->params[$param]; } return true; } private function formatClass($value) { $r = preg_split("[\(|\)]",$value); if(is_array($r)){ $param = $r[0]; parse_str($r[1],$value); foreach ($value as $key => $val) { $val = explode(',', $val); if(count($val)>1)$value[$key]=$val; } }else{ $param='Unknown'; } return array($param, $value); } private function formatParamOrReturn($string) { $pos = strpos($string, ' '); $type = substr($string, 0, $pos); return '(' . $type . ')' . substr($string, $pos+1); } } function parse_doc($php_doc_comment){ $p = new DocParser(); return $p->parse($php_doc_comment); $p = new Parser($php_doc_comment); return $p; $php_doc_comment = preg_replace("/(^[\\s]*\\/\\*\\*)
                                  |(^[\\s]\\*\\/)
                                  |(^[\\s]*\\*?\\s)
                                  |(^[\\s]*)
-                                 |(^[\\t]*)/ixm", "", $php_doc_comment); $php_doc_comment = str_replace("\r", "", $php_doc_comment); $php_doc_comment = preg_replace("/([\\t])+/", "\t", $php_doc_comment); return explode("\n", $php_doc_comment); $php_doc_comment = trim(preg_replace('/\r?\n *\* */', ' ', $php_doc_comment)); return $php_doc_comment; preg_match_all('/@([a-z]+)\s+(.*?)\s*(?=$|@[a-z]+\s)/s', $php_doc_comment, $matches); return array_combine($matches[1], $matches[2]); } function object_to_array($object, $utf_encode=TRUE) { if(is_array($object) || is_object($object)) { $array = array(); foreach($object as $key => $value) { $value = object_to_array($value, $utf_encode); if($utf_encode && is_string($value)){ $value = utf8_encode($value); } $array[$key] = $value; } return $array; } return $object; } function autoload_formats($class_name) { $class_name=strtolower($class_name); $file = RESTLER_PATH."/$class_name/$class_name.php"; if (file_exists($file)) { require_once($file); } elseif (file_exists("$class_name.php")) { require_once ("$class_name.php"); } } spl_autoload_register('autoload_formats'); if(!function_exists('isRestlerCompatibilityModeEnabled')){ function isRestlerCompatibilityModeEnabled(){ return FALSE; } } define('RESTLER_PATH', dirname(__FILE__));
\ No newline at end of file
+                                 |(^[\\t]*)/ixm", "", $php_doc_comment); $php_doc_comment = str_replace("\r", "", $php_doc_comment); $php_doc_comment = preg_replace("/([\\t])+/", "\t", $php_doc_comment); return explode("\n", $php_doc_comment); $php_doc_comment = trim(preg_replace('/\r?\n *\* */', ' ', $php_doc_comment)); return $php_doc_comment; preg_match_all('/@([a-z]+)\s+(.*?)\s*(?=$|@[a-z]+\s)/s', $php_doc_comment, $matches); return array_combine($matches[1], $matches[2]); } function object_to_array($object, $utf_encode=FALSE) { if(is_array($object) || is_object($object)) { $array = array(); foreach($object as $key => $value) { $value = object_to_array($value, $utf_encode); if($utf_encode && is_string($value)){ $value = utf8_encode($value); } $array[$key] = $value; } return $array; } return $object; } function autoload_formats($class_name) { $class_name=strtolower($class_name); $file = RESTLER_PATH."/$class_name/$class_name.php"; if (file_exists($file)) { require_once($file); } elseif (file_exists("$class_name.php")) { require_once ("$class_name.php"); } } spl_autoload_register('autoload_formats'); if(!function_exists('isRestlerCompatibilityModeEnabled')){ function isRestlerCompatibilityModeEnabled(){ return FALSE; } } define('RESTLER_PATH', dirname(__FILE__));
\ No newline at end of file
diff --git a/restler_minified/xmlformat.php b/restler_minified/xmlformat.php
index 27d081756..84e2bff9e 100644
--- a/restler_minified/xmlformat.php
+++ b/restler_minified/xmlformat.php
@@ -1,2 +1,2 @@
 <?php
- class XmlFormat implements iFormat { public static $parse_attributes=true; public static $parse_namespaces=false; public static $attribute_names=array('xmlns'); public static $root_name='response'; public static $default_tag_name='item'; const MIME ='application/xml'; const EXTENSION = 'xml'; public function getMIMEMap() { return array(XmlFormat::EXTENSION=>XmlFormat::MIME); } public function getMIME(){ return XmlFormat::MIME; } public function getExtension(){ return XmlFormat::EXTENSION; } public function setMIME($mime){ } public function setExtension($extension){ } public function encode($data, $human_readable=false){ return $this->toXML( object_to_array($data, false), XmlFormat::$root_name, $human_readable); } public function decode($data){ try { if($data=='')return array(); return $this->toArray($data); } catch (Exception $e) { throw new RestException(400, "Error decoding request. ". $e->getMessage()); } } public function __toString(){ return $this->getExtension(); } public function isAssoc( $array ) { return (is_array($array) && 0 !== count(array_diff_key($array, array_keys(array_keys($array))))); } public function toXML( $data, $root_node_name = 'result', $human_readable=false, &$xml=null) { if (ini_get('zend.ze1_compatibility_mode') == 1) ini_set ('zend.ze1_compatibility_mode', 0); if (is_null($xml)) $xml = @simplexml_load_string("<$root_node_name/>"); if(is_array($data)){ $numeric=0; foreach( $data as $key => $value ) { if ( is_numeric( $key ) ) { $numeric = 1; $key = XmlFormat::$root_name == $root_node_name ? XmlFormat::$default_tag_name : $root_node_name; } $key = preg_replace('/[^a-z0-9\-\_\.\:]/i', '', $key); if ( is_array( $value ) ) { $node = $this->isAssoc( $value ) || $numeric ? $xml->addChild( $key ) : $xml; if ( $numeric ) $key = 'anon'; $this->toXML($value, $key, $human_readable, $node); } else { $value = utf8_encode(htmlentities($value)); in_array($key,XmlFormat::$attribute_names) ? $xml->addAttribute($key,$value) : $xml->addChild( $key, $value); } } }else{ if(is_bool($data)) $data = $data ? 'true' : 'false'; $xml = @simplexml_load_string( "<$root_node_name>$data</$root_node_name>"); } if(!$human_readable){ return $xml->asXML(); }else{ $dom = dom_import_simplexml($xml)->ownerDocument; $dom->formatOutput = true; return $dom->saveXML(); } } public function toArray( $xml, $firstCall=true) { if ( is_string( $xml ) ) $xml = new SimpleXMLElement( $xml ); $children = $xml->children(); if ( !$children ) { $r = (string) $xml; if($r=='true' || $r=='false')$r=$r=='true'; return $r; } $arr = array(); if($firstCall){ XmlFormat::$attribute_names=array(); XmlFormat::$root_name = $xml->getName(); if (XmlFormat::$parse_namespaces){ foreach($xml->getDocNamespaces(TRUE) as $namepace => $uri) { $arr[$namepace=='' ? 'xmlns' : 'xmlns:'.$namepace] = (string)$uri; } } } if(XmlFormat::$parse_attributes){ foreach($xml->attributes() as $attName => $attValue) { $arr[$attName] = (string)$attValue; XmlFormat::$attribute_names[]=$attName; } } foreach ($children as $key => $node) { $node = $this->toArray($node, false); if ($key == 'anon') $key = count($arr); if (isset($arr[$key])) { if ( !is_array($arr[$key]) || @$arr[$key][0] == null ) $arr[$key] = array($arr[$key]); $arr[$key][] = $node; } else { $arr[$key] = $node; } } return $arr; } public static function exportCurrentSettings() { $s = 'XmlFormat::$root_name = "'. (XmlFormat::$root_name)."\";\n"; $s .= 'XmlFormat::$attribute_names = '. (var_export(XmlFormat::$attribute_names, true)).";\n"; $s .= 'XmlFormat::$default_tag_name = "'. XmlFormat::$default_tag_name."\";\n"; $s .= 'XmlFormat::$parse_attributes = '. (XmlFormat::$parse_attributes ? 'true' : 'false').";\n"; $s .= 'XmlFormat::$parse_namespaces = '. (XmlFormat::$parse_namespaces ? 'true' : 'false').";\n\n\n"; return $s; } } 
\ No newline at end of file
+ class XmlFormat implements iFormat { public static $parse_attributes=true; public static $parse_namespaces=false; public static $attribute_names=array('xmlns'); public static $root_name='response'; public static $default_tag_name='item'; const MIME ='application/xml'; const EXTENSION = 'xml'; public function getMIMEMap() { return array(XmlFormat::EXTENSION=>XmlFormat::MIME); } public function getMIME(){ return XmlFormat::MIME; } public function getExtension(){ return XmlFormat::EXTENSION; } public function setMIME($mime){ } public function setExtension($extension){ } public function encode($data, $human_readable=false){ return $this->toXML( object_to_array($data, false), XmlFormat::$root_name, $human_readable); } public function decode($data){ try { if($data=='')return array(); return $this->toArray($data); } catch (Exception $e) { throw new RestException(400, "Error decoding request. ". $e->getMessage()); } } public function __toString(){ return $this->getExtension(); } public function isAssoc( $array ) { return (is_array($array) && 0 !== count(array_diff_key($array, array_keys(array_keys($array))))); } public function toXML( $data, $root_node_name = 'result', $human_readable=false, &$xml=null) { if (ini_get('zend.ze1_compatibility_mode') == 1) ini_set ('zend.ze1_compatibility_mode', 0); if (is_null($xml)) $xml = @simplexml_load_string("<$root_node_name/>"); if(is_array($data)){ $numeric=0; foreach( $data as $key => $value ) { if ( is_numeric( $key ) ) { $numeric = 1; $key = XmlFormat::$root_name == $root_node_name ? XmlFormat::$default_tag_name : $root_node_name; } $key = preg_replace('/[^a-z0-9\-\_\.\:]/i', '', $key); if ( is_array( $value ) ) { $node = $this->isAssoc( $value ) || $numeric ? $xml->addChild( $key ) : $xml; if ( $numeric ) $key = 'anon'; $this->toXML($value, $key, $human_readable, $node); } else { in_array($key,XmlFormat::$attribute_names) ? $xml->addAttribute($key,$value) : $xml->addChild( $key, $value); } } }else{ if(is_bool($data)) $data = $data ? 'true' : 'false'; $xml = @simplexml_load_string( "<$root_node_name>$data</$root_node_name>"); } if(!$human_readable){ return $xml->asXML(); }else{ $dom = dom_import_simplexml($xml)->ownerDocument; $dom->formatOutput = true; return $dom->saveXML(); } } public function toArray( $xml, $firstCall=true) { if ( is_string( $xml ) ) $xml = new SimpleXMLElement( $xml ); $children = $xml->children(); if ( !$children ) { $r = (string) $xml; if($r=='true' || $r=='false')$r=$r=='true'; return $r; } $arr = array(); if($firstCall){ XmlFormat::$attribute_names=array(); XmlFormat::$root_name = $xml->getName(); if (XmlFormat::$parse_namespaces){ foreach($xml->getDocNamespaces(TRUE) as $namepace => $uri) { $arr[$namepace=='' ? 'xmlns' : 'xmlns:'.$namepace] = (string)$uri; } } } if(XmlFormat::$parse_attributes){ foreach($xml->attributes() as $attName => $attValue) { $arr[$attName] = (string)$attValue; XmlFormat::$attribute_names[]=$attName; } } foreach ($children as $key => $node) { $node = $this->toArray($node, false); if ($key == 'anon') $key = count($arr); if (isset($arr[$key])) { if ( !is_array($arr[$key]) || @$arr[$key][0] == null ) $arr[$key] = array($arr[$key]); $arr[$key][] = $node; } else { $arr[$key] = $node; } } return $arr; } public static function exportCurrentSettings() { $s = 'XmlFormat::$root_name = "'. (XmlFormat::$root_name)."\";\n"; $s .= 'XmlFormat::$attribute_names = '. (var_export(XmlFormat::$attribute_names, true)).";\n"; $s .= 'XmlFormat::$default_tag_name = "'. XmlFormat::$default_tag_name."\";\n"; $s .= 'XmlFormat::$parse_attributes = '. (XmlFormat::$parse_attributes ? 'true' : 'false').";\n"; $s .= 'XmlFormat::$parse_namespaces = '. (XmlFormat::$parse_namespaces ? 'true' : 'false').";\n\n\n"; return $s; } } 
\ No newline at end of file

From 175364fa9d5b3bd407692e1644d7fe321a06b448 Mon Sep 17 00:00:00 2001
From: Luracast <arul@luracast.com>
Date: Sun, 20 Nov 2011 21:16:34 +0800
Subject: [PATCH 28/61] Fix for XmlFormat, which fails when the data contains
 special chars. Fixes #20.

All format classes now use `self` instead of their classnames for static reference to improve portability.
---
 restler/restler.php            | 16 +++++------
 restler/xmlformat.php          | 50 ++++++++++++++++------------------
 restler_minified/restler.php   |  2 +-
 restler_minified/xmlformat.php |  2 +-
 4 files changed, 34 insertions(+), 36 deletions(-)

diff --git a/restler/restler.php b/restler/restler.php
index e82a8fb23..45f429341 100644
--- a/restler/restler.php
+++ b/restler/restler.php
@@ -13,7 +13,7 @@
  * @version    2.0.6
  */
 class Restler {
-	const VERSION = '2.0.8';
+	const VERSION = '2.0.9';
 	/**
 	 * URL of the currently mapped service
 	 * @var string
@@ -482,7 +482,7 @@ protected function getRequestFormat () {
 		if(isset($_SERVER['CONTENT_TYPE'])){
 			$mime = explode(';', $_SERVER['CONTENT_TYPE']);
 			$mime = $mime[0];
-			if($mime==UrlEncodedFormat::MIME){
+			if($mime==self::MIME){
 				$format = new UrlEncodedFormat();
 			}else{
 				if(isset($this->format_map[$mime])){
@@ -880,13 +880,13 @@ class UrlEncodedFormat implements iFormat
 	const EXTENSION = 'post';
 	public function getMIMEMap()
 	{
-		return array(UrlEncodedFormat::EXTENSION=>UrlEncodedFormat::MIME);
+		return array(self::EXTENSION=>self::MIME);
 	}
 	public function getMIME(){
-		return  UrlEncodedFormat::MIME;
+		return  self::MIME;
 	}
 	public function getExtension(){
-		return UrlEncodedFormat::EXTENSION;
+		return self::EXTENSION;
 	}
 	public function setMIME($mime){
 		//do nothing
@@ -922,13 +922,13 @@ class JsonFormat implements iFormat
 	const EXTENSION = 'json';
 	public function getMIMEMap()
 	{
-		return array(JsonFormat::EXTENSION=>JsonFormat::MIME);
+		return array(self::EXTENSION=>self::MIME);
 	}
 	public function getMIME(){
-		return  JsonFormat::MIME;
+		return  self::MIME;
 	}
 	public function getExtension(){
-		return JsonFormat::EXTENSION;
+		return self::EXTENSION;
 	}
 	public function setMIME($mime){
 		//do nothing
diff --git a/restler/xmlformat.php b/restler/xmlformat.php
index 7e21b7943..6dea474a5 100644
--- a/restler/xmlformat.php
+++ b/restler/xmlformat.php
@@ -26,13 +26,13 @@ class XmlFormat implements iFormat
 
 	public function getMIMEMap()
 	{
-		return array(XmlFormat::EXTENSION=>XmlFormat::MIME);
+		return array(self::EXTENSION=>self::MIME);
 	}
 	public function getMIME(){
-		return  XmlFormat::MIME;
+		return  self::MIME;
 	}
 	public function getExtension(){
-		return XmlFormat::EXTENSION;
+		return self::EXTENSION;
 	}
 	public function setMIME($mime){
 		//do nothing
@@ -43,7 +43,7 @@ public function setExtension($extension){
 
 	public function encode($data, $human_readable=false){
 		return $this->toXML( object_to_array($data, false),
-		XmlFormat::$root_name, $human_readable);
+		self::$root_name, $human_readable);
 	}
 
 	public function decode($data){
@@ -81,14 +81,12 @@ public function isAssoc( $array ) {
 	 */
 	public function toXML( $data, $root_node_name = 'result',
 	$human_readable=false, &$xml=null) {
-
 		// turn off compatibility mode as simple xml
 		//throws a wobbly if you don't.
 		if (ini_get('zend.ze1_compatibility_mode') == 1)
 		ini_set ('zend.ze1_compatibility_mode', 0);
 		if (is_null($xml))
 		$xml = @simplexml_load_string("<$root_node_name/>");
-
 		if(is_array($data)){
 			$numeric=0;
 			// loop through the data passed in.
@@ -97,8 +95,8 @@ public function toXML( $data, $root_node_name = 'result',
 				// no numeric keys in our xml please!
 				if ( is_numeric( $key ) ) {
 					$numeric = 1;
-					$key = XmlFormat::$root_name == $root_node_name ?
-					XmlFormat::$default_tag_name : $root_node_name;
+					$key = self::$root_name == $root_node_name ?
+					self::$default_tag_name : $root_node_name;
 				}
 
 				// delete any char not allowed in XML element names
@@ -114,9 +112,9 @@ public function toXML( $data, $root_node_name = 'result',
 					if ( $numeric ) $key = 'anon';
 					$this->toXML($value, $key, $human_readable, $node);
 				} else {
-
 					// add single node or attribute
-					in_array($key,XmlFormat::$attribute_names) ?
+					$value=htmlspecialchars($value);
+					in_array($key,self::$attribute_names) ?
 					$xml->addAttribute($key,$value) :
 					$xml->addChild( $key, $value);
 				}
@@ -125,7 +123,7 @@ public function toXML( $data, $root_node_name = 'result',
 			//simply wrap it as text node to root
 			if(is_bool($data)) $data = $data ? 'true' : 'false';
 			$xml = @simplexml_load_string(
-			"<$root_node_name>$data</$root_node_name>");
+			"<$root_node_name>".htmlspecialchars($data)."</$root_node_name>");
 			//$xml->{0} = $data;
 		}
 		if(!$human_readable){
@@ -159,20 +157,20 @@ public function toArray( $xml, $firstCall=true) {
 
 		if($firstCall){
 			//reset the attribute names list
-			XmlFormat::$attribute_names=array();
-			XmlFormat::$root_name = $xml->getName();
-			if (XmlFormat::$parse_namespaces){
+			self::$attribute_names=array();
+			self::$root_name = $xml->getName();
+			if (self::$parse_namespaces){
 				foreach($xml->getDocNamespaces(TRUE) as $namepace => $uri) {
 					$arr[$namepace=='' ? 'xmlns' :
 					'xmlns:'.$namepace] = (string)$uri;
 				}
 			}
 		}
-		if(XmlFormat::$parse_attributes){
+		if(self::$parse_attributes){
 			foreach($xml->attributes() as $attName => $attValue) {
 				$arr[$attName] = (string)$attValue;
 				//add to attribute list for round trip support
-				XmlFormat::$attribute_names[]=$attName;
+				self::$attribute_names[]=$attName;
 			}
 		}
 		foreach ($children as $key => $node) {
@@ -199,16 +197,16 @@ public function toArray( $xml, $firstCall=true) {
 	 * @return string PHP source code to reproduce the configuration
 	 */
 	public static function exportCurrentSettings() {
-		$s = 'XmlFormat::$root_name = "'.
-		(XmlFormat::$root_name)."\";\n";
-		$s .= 'XmlFormat::$attribute_names = '.
-		(var_export(XmlFormat::$attribute_names, true)).";\n";
-		$s .= 'XmlFormat::$default_tag_name = "'.
-		XmlFormat::$default_tag_name."\";\n";
-		$s .= 'XmlFormat::$parse_attributes = '.
-		(XmlFormat::$parse_attributes ? 'true' : 'false').";\n";
-		$s .= 'XmlFormat::$parse_namespaces = '.
-		(XmlFormat::$parse_namespaces ? 'true' : 'false').";\n\n\n";
+		$s = 'self::$root_name = "'.
+		(self::$root_name)."\";\n";
+		$s .= 'self::$attribute_names = '.
+		(var_export(self::$attribute_names, true)).";\n";
+		$s .= 'self::$default_tag_name = "'.
+		self::$default_tag_name."\";\n";
+		$s .= 'self::$parse_attributes = '.
+		(self::$parse_attributes ? 'true' : 'false').";\n";
+		$s .= 'self::$parse_namespaces = '.
+		(self::$parse_namespaces ? 'true' : 'false').";\n\n\n";
 		return $s;
 	}
 
diff --git a/restler_minified/restler.php b/restler_minified/restler.php
index 48c0de3f3..0013620ad 100644
--- a/restler_minified/restler.php
+++ b/restler_minified/restler.php
@@ -1,5 +1,5 @@
 <?php
- class Restler { const VERSION = '2.0.8'; public $url; public $request_method; public $request_format; public $request_data=array(); public $cache_dir; public $base_dir; public $response = 'DefaultResponse'; public $response_format; protected $production_mode; protected $routes= array(); protected $format_map = array(); protected $service_class_instance; protected $service_method; protected $auth_classes = array(); protected $error_classes = array(); private $codes = array( 100 => 'Continue', 101 => 'Switching Protocols', 200 => 'OK', 201 => 'Created', 202 => 'Accepted', 203 => 'Non-Authoritative Information', 204 => 'No Content', 205 => 'Reset Content', 206 => 'Partial Content', 300 => 'Multiple Choices', 301 => 'Moved Permanently', 302 => 'Found', 303 => 'See Other', 304 => 'Not Modified', 305 => 'Use Proxy', 306 => '(Unused)', 307 => 'Temporary Redirect', 400 => 'Bad Request', 401 => 'Unauthorized', 402 => 'Payment Required', 403 => 'Forbidden', 404 => 'Not Found', 405 => 'Method Not Allowed', 406 => 'Not Acceptable', 407 => 'Proxy Authentication Required', 408 => 'Request Timeout', 409 => 'Conflict', 410 => 'Gone', 411 => 'Length Required', 412 => 'Precondition Failed', 413 => 'Request Entity Too Large', 414 => 'Request-URI Too Long', 415 => 'Unsupported Media Type', 416 => 'Requested Range Not Satisfiable', 417 => 'Expectation Failed', 500 => 'Internal Server Error', 501 => 'Not Implemented', 502 => 'Bad Gateway', 503 => 'Service Unavailable', 504 => 'Gateway Timeout', 505 => 'HTTP Version Not Supported' ); protected $cached; public function __construct ($production_mode = FALSE) { $this->production_mode = $production_mode; $this->cache_dir = getcwd(); $this->base_dir = RESTLER_PATH; } public function __destruct () { if ($this->production_mode && !$this->cached) { $this->saveCache(); } } public function refreshCache () { $this->routes = array(); $this->cached = FALSE; } public function setSupportedFormats () { $args = func_get_args(); $extensions = array(); foreach ($args as $class_name) { if(!is_string($class_name) || !class_exists($class_name)){ throw new Exception("$class_name is not a vaild Format Class."); } $obj = new $class_name; if(! $obj instanceof iFormat){ throw new Exception('Invalid format class; must implement '. 'iFormat interface'); } foreach ($obj->getMIMEMap() as $extension => $mime) { if(!isset($this->format_map[$extension])) $this->format_map[$extension]=$class_name; if(!isset($this->format_map[$mime])) $this->format_map[$mime]=$class_name; $extensions[".$extension"]=TRUE; } } $this->format_map['default']=$args[0]; $this->format_map['extensions']=array_keys($extensions); } public function addAPIClass($class_name, $base_path = NULL) { if(!class_exists($class_name)){ throw new Exception("API class $class_name is missing."); } $this->loadCache(); if(!$this->cached){ if(is_null($base_path))$base_path=strtolower($class_name); $base_path = trim($base_path,'/'); if(strlen($base_path)>0)$base_path .= '/'; $this->generateMap($class_name, $base_path); } } public function addAuthenticationClass ($class_name, $base_path = NULL) { $this->auth_classes[] = $class_name; $this->addAPIClass($class_name, $base_path); } public function addErrorClass ($class_name) { $this->error_classes[] = $class_name; } public function handleError ($status_code, $error_message = NULL) { $method = "handle$status_code"; $handled = FALSE; foreach ($this->error_classes as $class_name) { if (method_exists($class_name, $method)) { $obj = new $class_name(); $obj->restler = $this; $obj->$method(); $handled = TRUE; } } if($handled)return; $message = $this->codes[$status_code] . (!$error_message ? '' : ': ' . $error_message); $this->setStatus($status_code); $this->sendData( call_user_func( array($this->response, '__formatError'), $status_code, $message) ); } public function handle () { if(empty($this->format_map))$this->setSupportedFormats('JsonFormat'); $this->url = $this->getPath(); $this->request_method = $this->getRequestMethod(); $this->response_format = $this->getResponseFormat(); $this->request_format = $this->getRequestFormat(); if(is_null($this->request_format)){ $this->request_format = $this->response_format; } if($this->request_method == 'PUT' || $this->request_method == 'POST'){ $this->request_data = $this->getRequestData(); } $o = $this->mapUrlToMethod(); if(!isset($o->class_name)){ $this->handleError(404); }else{ try { if($o->method_flag){ $auth_method = '__isAuthenticated'; if(!count($this->auth_classes))throw new RestException(401); foreach ($this->auth_classes as $auth_class) { $auth_obj = new $auth_class(); $auth_obj->restler=$this; $this->applyClassMetadata($auth_class, $auth_obj, $o); if (!method_exists($auth_obj, $auth_method)) { throw new RestException(401, 'Authentication Class '. 'should implement iAuthenticate'); }elseif(!$auth_obj->$auth_method()){ throw new RestException(401); } } } $this->applyClassMetadata(get_class($this->request_format), $this->request_format, $o); $pre_process = '_'.$this->request_format->getExtension().'_'. $o->method_name; $this->service_method = $o->method_name; if($o->method_flag==2)$o=unprotect($o); $object = $this->service_class_instance = new $o->class_name(); $object->restler=$this; if(method_exists($o->class_name, $pre_process)) { call_user_func_array(array($object, $pre_process), $o->arguments); } switch ($o->method_flag) { case 3: $reflection_method = new ReflectionMethod($object, $o->method_name); $reflection_method->setAccessible(TRUE); $result = $reflection_method->invokeArgs($object, $o->arguments); break; case 2: case 1: default: $result = call_user_func_array(array($object, $o->method_name), $o->arguments); } } catch (RestException $e) { $this->handleError($e->getCode(), $e->getMessage()); } } if (isset($result) && $result !== NULL) { $this->sendData($result); } } public function sendData($data) { $data = $this->response_format->encode($data, !$this->production_mode); $post_process = '_'.$this->service_method .'_'. $this->response_format->getExtension(); if(isset($this->service_class_instance) && method_exists($this->service_class_instance,$post_process)){ $data = call_user_func(array($this->service_class_instance, $post_process), $data); } header("Cache-Control: no-cache, must-revalidate"); header("Expires: 0"); header('Content-Type: ' . $this->response_format->getMIME()); header("X-Powered-By: Luracast Restler v".Restler::VERSION); die($data); } public function setStatus($code) { header("{$_SERVER['SERVER_PROTOCOL']} $code ". $this->codes[strval($code)]); } public function removeCommonPath($first, $second, $char='/'){ $first = explode($char, $first); $second = explode($char, $second); while (count($second)){ if($first[0]==$second[0]){ array_shift($first); } else break; array_shift($second); } return implode($char, $first); } public function saveCache() { $file = $this->cache_dir . '/routes.php'; $s = '$o=array();'.PHP_EOL; foreach ($this->routes as $key => $value) { $s .= PHP_EOL.PHP_EOL.PHP_EOL."############### $key ###############" .PHP_EOL.PHP_EOL; $s .= '$o[\''.$key.'\']=array();'; foreach ($value as $ke => $va) { $s .= PHP_EOL.PHP_EOL."#==== $key $ke".PHP_EOL.PHP_EOL; $s .= '$o[\''.$key.'\'][\''.$ke.'\']='.str_replace(PHP_EOL, PHP_EOL."\t", var_export($va, TRUE)).';'; } } $s .= PHP_EOL.'return $o;'; $r=@file_put_contents($file, "<?php $s"); @chmod($file, 0777); if($r===FALSE)throw new Exception( "The cache directory located at '$this->cache_dir' needs to have ". "the permissions set to read/write/execute for everyone in order ". "to save cache and improve performance."); } protected function getPath () { $path = urldecode($this->removeCommonPath($_SERVER['REQUEST_URI'], $_SERVER['SCRIPT_NAME'])); $path = preg_replace('/(\/*\?.*$)|(\/$)/', '', $path); $path = str_replace($this->format_map['extensions'], '', $path); return $path; } protected function getRequestMethod () { $method = $_SERVER['REQUEST_METHOD']; if (isset($_SERVER['HTTP_X_HTTP_METHOD_OVERRIDE'])){ $method = $_SERVER['HTTP_X_HTTP_METHOD_OVERRIDE']; } if($method=='HEAD')$method='GET'; return $method; } protected function getRequestFormat () { $format=NULL; if(isset($_SERVER['CONTENT_TYPE'])){ $mime = explode(';', $_SERVER['CONTENT_TYPE']); $mime = $mime[0]; if($mime==UrlEncodedFormat::MIME){ $format = new UrlEncodedFormat(); }else{ if(isset($this->format_map[$mime])){ $format = $this->format_map[$mime]; $format = is_string($format) ? new $format: $format; $format->setMIME($mime); } } } return $format; } protected function getResponseFormat () { $format=NULL; $extensions = explode('.', parse_url($_SERVER['REQUEST_URI'], PHP_URL_PATH)); while($extensions){ $extension = array_pop($extensions); $extension = array_shift(explode('/', $extension)); if($extension && isset($this->format_map[$extension])){ $format = $this->format_map[$extension]; $format = is_string($format) ? new $format: $format; $format->setExtension($extension); return $format; } } if(isset($_SERVER['HTTP_ACCEPT'])){ $accepts = explode(',', $_SERVER['HTTP_ACCEPT']); foreach ($accepts as $accept) { if($extension && isset($this->format_map[$accept])){ $format = $this->format_map[$accept]; $format = is_string($format) ? new $format: $format; $format->setMIME($accept); return $format; } } } $format = new $this->format_map['default']; return $format; } protected function getRequestData() { try { $r = file_get_contents ( 'php://input' ); if (is_null ( $r )) return $_GET; $r = $this->request_format->decode ( $r ); return is_null ( $r ) ? array () : $r; } catch ( RestException $e ) { $this->handleError ( $e->getCode (), $e->getMessage () ); } } protected function mapUrlToMethod () { if(!isset($this->routes[$this->request_method])){ return array(); } $urls = $this->routes[$this->request_method]; if(!$urls)return array(); $found = FALSE; $this->request_data += $_GET; $params = array('request_data'=>$this->request_data); $params += $this->request_data; foreach ($urls as $url => $call) { $call = (object)$call; if(strstr($url, ':')){ $regex = preg_replace('/\\\:([^\/]+)/', '(?P<$1>[^/]+)', preg_quote($url)); if (preg_match(":^$regex$:", $this->url, $matches)) { foreach ($matches as $arg => $match) { if (isset($call->arguments[$arg])){ $params[$arg] = $match; } } $found = TRUE; break; } }elseif ($url == $this->url){ $found = TRUE; break; } } if($found){ $p = $call->defaults; foreach ($call->arguments as $key => $value) { if(isset($params[$key]))$p[$value] = $params[$key]; } $call->arguments=$p; return $call; } } protected function applyClassMetadata($class_name, $instance, $method_info){ if(isset($method_info->metadata[$class_name]) && is_array($method_info->metadata[$class_name])){ foreach ($method_info->metadata[$class_name] as $property => $value){ if(property_exists($class_name, $property)){ $reflection_property = new ReflectionProperty($class_name, $property); $reflection_property->setValue($instance, $value); } } } } protected function loadCache() { if ($this->cached !== NULL) { return; } $file = $this->cache_dir . '/routes.php'; $this->cached = FALSE; if ($this->production_mode) { if (file_exists($file)) { $routes = include($file); } if (isset($routes) && is_array($routes)) { $this->routes = $routes; $this->cached = TRUE; } } else { } } protected function generateMap ($class_name, $base_path = "") { $reflection = new ReflectionClass($class_name); $class_metadata = parse_doc($reflection->getDocComment()); $methods = $reflection->getMethods( ReflectionMethod::IS_PUBLIC + ReflectionMethod::IS_PROTECTED); foreach ($methods as $method) { $doc = $method->getDocComment(); $arguments = array(); $defaults = array(); $metadata = $class_metadata+parse_doc($doc); $params = $method->getParameters(); $position=0; foreach ($params as $param){ $arguments[$param->getName()] = $position; $defaults[$position] = $param->isDefaultValueAvailable() ? $param->getDefaultValue() : NULL; $position++; } $method_flag = $method->isProtected() ? (isRestlerCompatibilityModeEnabled() ? 2 : 3) : (isset($metadata['protected']) ? 1 : 0); $call = array( 'class_name'=>$class_name, 'method_name'=>$method->getName(), 'arguments'=>$arguments, 'defaults'=>$defaults, 'metadata'=>$metadata, 'method_flag'=>$method_flag ); $method_url = strtolower($method->getName()); if (preg_match_all( '/@url\s+(GET|POST|PUT|DELETE|HEAD|OPTIONS)[ \t]*\/?(\S*)/s', $doc, $matches, PREG_SET_ORDER)) { foreach ($matches as $match) { $http_method = $match[1]; $url = rtrim($base_path . $match[2],'/'); $this->routes[$http_method][$url] = $call; } }elseif($method_url[0] != '_'){ if (preg_match_all('/^(GET|POST|PUT|DELETE|HEAD|OPTIONS)/i', $method_url, $matches)) { $http_method = strtoupper($matches[0][0]); $method_url = substr($method_url, strlen($http_method)); }else{ $http_method = 'GET'; } $url = $base_path. ($method_url=='index' || $method_url=='default' ? '' : $method_url); $url = rtrim($url,'/'); $this->routes[$http_method][$url] = $call; foreach ($params as $param){ if($param->getName()=='request_data'){ break; } $url .= $url=='' ? ':' : '/:'; $url .= $param->getName(); $this->routes[$http_method][$url] = $call; } } } } } if(version_compare(PHP_VERSION, '5.3.0') < 0){ require_once 'compat.php'; } class RestException extends Exception { public function __construct($http_status_code, $error_message = NULL) { parent::__construct($error_message, $http_status_code); } } interface iRespond { public function __formatResponse($result); public function __formatError($status_code, $message); } class DefaultResponse implements iRespond { function __formatResponse($result) { return $result; } function __formatError($statusCode, $message) { return array('error' => array('code' => $statusCode, 'message' => $message)); } } interface iAuthenticate { public function __isAuthenticated(); } interface iFormat { public function getMIMEMap(); public function setMIME($mime); public function getMIME(); public function setExtension($extension); public function getExtension(); public function encode($data, $human_readable=FALSE); public function decode($data); } class UrlEncodedFormat implements iFormat { const MIME = 'application/x-www-form-urlencoded'; const EXTENSION = 'post'; public function getMIMEMap() { return array(UrlEncodedFormat::EXTENSION=>UrlEncodedFormat::MIME); } public function getMIME(){ return UrlEncodedFormat::MIME; } public function getExtension(){ return UrlEncodedFormat::EXTENSION; } public function setMIME($mime){ } public function setExtension($extension){ } public function encode($data, $human_readable=FALSE){ return http_build_query($data); } public function decode($data){ parse_str($data,$r); return $r; } public function __toString(){ return $this->getExtension(); } } class JsonFormat implements iFormat { const MIME ='application/json'; const EXTENSION = 'json'; public function getMIMEMap() { return array(JsonFormat::EXTENSION=>JsonFormat::MIME); } public function getMIME(){ return JsonFormat::MIME; } public function getExtension(){ return JsonFormat::EXTENSION; } public function setMIME($mime){ } public function setExtension($extension){ } public function encode($data, $human_readable=FALSE){ return $human_readable ? $this->json_format(json_encode(object_to_array($data))) : json_encode(object_to_array($data)); } public function decode($data) { $decoded = json_decode ( $data ); if (function_exists ( 'json_last_error' )) { $message = ''; switch (json_last_error ()) { case JSON_ERROR_NONE : return object_to_array ( $decoded ); break; case JSON_ERROR_DEPTH : $message = 'maximum stack depth exceeded'; break; case JSON_ERROR_STATE_MISMATCH : $message = 'underflow or the modes mismatch'; break; case JSON_ERROR_CTRL_CHAR : $message = 'unexpected control character found'; break; case JSON_ERROR_SYNTAX : $message = 'malformed JSON'; break; case JSON_ERROR_UTF8 : $message = 'malformed UTF-8 characters, possibly incorrectly encoded'; break; default : $message = 'unknown error'; break; } throw new RestException ( 400, 'Error parsing JSON, ' . $message ); } else if (strlen ( $data ) && $decoded === NULL || $decoded === $data) { throw new RestException ( 400, 'Error parsing JSON' ); } return object_to_array ( $decoded ); } private function json_format($json) { $tab = "  "; $new_json = ""; $indent_level = 0; $in_string = FALSE; $len = strlen($json); for($c = 0; $c < $len; $c++) { $char = $json[$c]; switch($char) { case '{': case '[': if(!$in_string) { $new_json .= $char . "\n" . str_repeat($tab, $indent_level+1); $indent_level++; } else { $new_json .= $char; } break; case '}': case ']': if(!$in_string) { $indent_level--; $new_json .= "\n".str_repeat($tab, $indent_level).$char; } else { $new_json .= $char; } break; case ',': if(!$in_string) { $new_json .= ",\n" . str_repeat($tab, $indent_level); } else { $new_json .= $char; } break; case ':': if(!$in_string) { $new_json .= ": "; } else { $new_json .= $char; } break; case '"': if($c==0){ $in_string = TRUE; }elseif($c > 0 && $json[$c-1] != '\\') { $in_string = !$in_string; } default: $new_json .= $char; break; } } return $new_json; } public function __toString(){ return $this->getExtension(); } } class DocParser { private $params=array(); function parse($doc='') { if($doc==''){ return $this->params; } if(preg_match('#^/\*\*(.*)\*/#s', $doc, $comment) === false) return $this->params; $comment = trim($comment[1]); if(preg_match_all('#^\s*\*(.*)#m', $comment, $lines) === false) return $this->params; $this->parseLines($lines[1]); return $this->params; } private function parseLines($lines) { foreach($lines as $line) { $parsedLine = $this->parseLine($line); if($parsedLine === false && !isset($this->params['description'])) { if(isset($desc)){ $this->params['description'] = implode(PHP_EOL, $desc); } $desc = array(); } elseif($parsedLine !== false) { $desc[] = $parsedLine; } } $desc = implode(' ', $desc); if(!empty($desc))$this->params['long_description'] = $desc; } private function parseLine($line) { $line = trim($line); if(empty($line)) return false; if(strpos($line, '@') === 0) { if(strpos($line, ' ')>0){ $param = substr($line, 1, strpos($line, ' ') - 1); $value = substr($line, strlen($param) + 2); }else{ $param = substr($line, 1); $value = ''; } if($this->setParam($param, $value)) return false; } return $line; } private function setParam($param, $value) { if($param == 'param' || $param == 'return') $value = $this->formatParamOrReturn($value); if($param == 'class') list($param, $value) = $this->formatClass($value); if(empty($this->params[$param])) { $this->params[$param] = $value; } else if($param == 'param'){ $arr = array($this->params[$param], $value); $this->params[$param] = $arr; } else { $this->params[$param] = $value + $this->params[$param]; } return true; } private function formatClass($value) { $r = preg_split("[\(|\)]",$value); if(is_array($r)){ $param = $r[0]; parse_str($r[1],$value); foreach ($value as $key => $val) { $val = explode(',', $val); if(count($val)>1)$value[$key]=$val; } }else{ $param='Unknown'; } return array($param, $value); } private function formatParamOrReturn($string) { $pos = strpos($string, ' '); $type = substr($string, 0, $pos); return '(' . $type . ')' . substr($string, $pos+1); } } function parse_doc($php_doc_comment){ $p = new DocParser(); return $p->parse($php_doc_comment); $p = new Parser($php_doc_comment); return $p; $php_doc_comment = preg_replace("/(^[\\s]*\\/\\*\\*)
+ class Restler { const VERSION = '2.0.9'; public $url; public $request_method; public $request_format; public $request_data=array(); public $cache_dir; public $base_dir; public $response = 'DefaultResponse'; public $response_format; protected $production_mode; protected $routes= array(); protected $format_map = array(); protected $service_class_instance; protected $service_method; protected $auth_classes = array(); protected $error_classes = array(); private $codes = array( 100 => 'Continue', 101 => 'Switching Protocols', 200 => 'OK', 201 => 'Created', 202 => 'Accepted', 203 => 'Non-Authoritative Information', 204 => 'No Content', 205 => 'Reset Content', 206 => 'Partial Content', 300 => 'Multiple Choices', 301 => 'Moved Permanently', 302 => 'Found', 303 => 'See Other', 304 => 'Not Modified', 305 => 'Use Proxy', 306 => '(Unused)', 307 => 'Temporary Redirect', 400 => 'Bad Request', 401 => 'Unauthorized', 402 => 'Payment Required', 403 => 'Forbidden', 404 => 'Not Found', 405 => 'Method Not Allowed', 406 => 'Not Acceptable', 407 => 'Proxy Authentication Required', 408 => 'Request Timeout', 409 => 'Conflict', 410 => 'Gone', 411 => 'Length Required', 412 => 'Precondition Failed', 413 => 'Request Entity Too Large', 414 => 'Request-URI Too Long', 415 => 'Unsupported Media Type', 416 => 'Requested Range Not Satisfiable', 417 => 'Expectation Failed', 500 => 'Internal Server Error', 501 => 'Not Implemented', 502 => 'Bad Gateway', 503 => 'Service Unavailable', 504 => 'Gateway Timeout', 505 => 'HTTP Version Not Supported' ); protected $cached; public function __construct ($production_mode = FALSE) { $this->production_mode = $production_mode; $this->cache_dir = getcwd(); $this->base_dir = RESTLER_PATH; } public function __destruct () { if ($this->production_mode && !$this->cached) { $this->saveCache(); } } public function refreshCache () { $this->routes = array(); $this->cached = FALSE; } public function setSupportedFormats () { $args = func_get_args(); $extensions = array(); foreach ($args as $class_name) { if(!is_string($class_name) || !class_exists($class_name)){ throw new Exception("$class_name is not a vaild Format Class."); } $obj = new $class_name; if(! $obj instanceof iFormat){ throw new Exception('Invalid format class; must implement '. 'iFormat interface'); } foreach ($obj->getMIMEMap() as $extension => $mime) { if(!isset($this->format_map[$extension])) $this->format_map[$extension]=$class_name; if(!isset($this->format_map[$mime])) $this->format_map[$mime]=$class_name; $extensions[".$extension"]=TRUE; } } $this->format_map['default']=$args[0]; $this->format_map['extensions']=array_keys($extensions); } public function addAPIClass($class_name, $base_path = NULL) { if(!class_exists($class_name)){ throw new Exception("API class $class_name is missing."); } $this->loadCache(); if(!$this->cached){ if(is_null($base_path))$base_path=strtolower($class_name); $base_path = trim($base_path,'/'); if(strlen($base_path)>0)$base_path .= '/'; $this->generateMap($class_name, $base_path); } } public function addAuthenticationClass ($class_name, $base_path = NULL) { $this->auth_classes[] = $class_name; $this->addAPIClass($class_name, $base_path); } public function addErrorClass ($class_name) { $this->error_classes[] = $class_name; } public function handleError ($status_code, $error_message = NULL) { $method = "handle$status_code"; $handled = FALSE; foreach ($this->error_classes as $class_name) { if (method_exists($class_name, $method)) { $obj = new $class_name(); $obj->restler = $this; $obj->$method(); $handled = TRUE; } } if($handled)return; $message = $this->codes[$status_code] . (!$error_message ? '' : ': ' . $error_message); $this->setStatus($status_code); $this->sendData( call_user_func( array($this->response, '__formatError'), $status_code, $message) ); } public function handle () { if(empty($this->format_map))$this->setSupportedFormats('JsonFormat'); $this->url = $this->getPath(); $this->request_method = $this->getRequestMethod(); $this->response_format = $this->getResponseFormat(); $this->request_format = $this->getRequestFormat(); if(is_null($this->request_format)){ $this->request_format = $this->response_format; } if($this->request_method == 'PUT' || $this->request_method == 'POST'){ $this->request_data = $this->getRequestData(); } $o = $this->mapUrlToMethod(); if(!isset($o->class_name)){ $this->handleError(404); }else{ try { if($o->method_flag){ $auth_method = '__isAuthenticated'; if(!count($this->auth_classes))throw new RestException(401); foreach ($this->auth_classes as $auth_class) { $auth_obj = new $auth_class(); $auth_obj->restler=$this; $this->applyClassMetadata($auth_class, $auth_obj, $o); if (!method_exists($auth_obj, $auth_method)) { throw new RestException(401, 'Authentication Class '. 'should implement iAuthenticate'); }elseif(!$auth_obj->$auth_method()){ throw new RestException(401); } } } $this->applyClassMetadata(get_class($this->request_format), $this->request_format, $o); $pre_process = '_'.$this->request_format->getExtension().'_'. $o->method_name; $this->service_method = $o->method_name; if($o->method_flag==2)$o=unprotect($o); $object = $this->service_class_instance = new $o->class_name(); $object->restler=$this; if(method_exists($o->class_name, $pre_process)) { call_user_func_array(array($object, $pre_process), $o->arguments); } switch ($o->method_flag) { case 3: $reflection_method = new ReflectionMethod($object, $o->method_name); $reflection_method->setAccessible(TRUE); $result = $reflection_method->invokeArgs($object, $o->arguments); break; case 2: case 1: default: $result = call_user_func_array(array($object, $o->method_name), $o->arguments); } } catch (RestException $e) { $this->handleError($e->getCode(), $e->getMessage()); } } if (isset($result) && $result !== NULL) { $this->sendData($result); } } public function sendData($data) { $data = $this->response_format->encode($data, !$this->production_mode); $post_process = '_'.$this->service_method .'_'. $this->response_format->getExtension(); if(isset($this->service_class_instance) && method_exists($this->service_class_instance,$post_process)){ $data = call_user_func(array($this->service_class_instance, $post_process), $data); } header("Cache-Control: no-cache, must-revalidate"); header("Expires: 0"); header('Content-Type: ' . $this->response_format->getMIME()); header("X-Powered-By: Luracast Restler v".Restler::VERSION); die($data); } public function setStatus($code) { header("{$_SERVER['SERVER_PROTOCOL']} $code ". $this->codes[strval($code)]); } public function removeCommonPath($first, $second, $char='/'){ $first = explode($char, $first); $second = explode($char, $second); while (count($second)){ if($first[0]==$second[0]){ array_shift($first); } else break; array_shift($second); } return implode($char, $first); } public function saveCache() { $file = $this->cache_dir . '/routes.php'; $s = '$o=array();'.PHP_EOL; foreach ($this->routes as $key => $value) { $s .= PHP_EOL.PHP_EOL.PHP_EOL."############### $key ###############" .PHP_EOL.PHP_EOL; $s .= '$o[\''.$key.'\']=array();'; foreach ($value as $ke => $va) { $s .= PHP_EOL.PHP_EOL."#==== $key $ke".PHP_EOL.PHP_EOL; $s .= '$o[\''.$key.'\'][\''.$ke.'\']='.str_replace(PHP_EOL, PHP_EOL."\t", var_export($va, TRUE)).';'; } } $s .= PHP_EOL.'return $o;'; $r=@file_put_contents($file, "<?php $s"); @chmod($file, 0777); if($r===FALSE)throw new Exception( "The cache directory located at '$this->cache_dir' needs to have ". "the permissions set to read/write/execute for everyone in order ". "to save cache and improve performance."); } protected function getPath () { $path = urldecode($this->removeCommonPath($_SERVER['REQUEST_URI'], $_SERVER['SCRIPT_NAME'])); $path = preg_replace('/(\/*\?.*$)|(\/$)/', '', $path); $path = str_replace($this->format_map['extensions'], '', $path); return $path; } protected function getRequestMethod () { $method = $_SERVER['REQUEST_METHOD']; if (isset($_SERVER['HTTP_X_HTTP_METHOD_OVERRIDE'])){ $method = $_SERVER['HTTP_X_HTTP_METHOD_OVERRIDE']; } if($method=='HEAD')$method='GET'; return $method; } protected function getRequestFormat () { $format=NULL; if(isset($_SERVER['CONTENT_TYPE'])){ $mime = explode(';', $_SERVER['CONTENT_TYPE']); $mime = $mime[0]; if($mime==self::MIME){ $format = new UrlEncodedFormat(); }else{ if(isset($this->format_map[$mime])){ $format = $this->format_map[$mime]; $format = is_string($format) ? new $format: $format; $format->setMIME($mime); } } } return $format; } protected function getResponseFormat () { $format=NULL; $extensions = explode('.', parse_url($_SERVER['REQUEST_URI'], PHP_URL_PATH)); while($extensions){ $extension = array_pop($extensions); $extension = array_shift(explode('/', $extension)); if($extension && isset($this->format_map[$extension])){ $format = $this->format_map[$extension]; $format = is_string($format) ? new $format: $format; $format->setExtension($extension); return $format; } } if(isset($_SERVER['HTTP_ACCEPT'])){ $accepts = explode(',', $_SERVER['HTTP_ACCEPT']); foreach ($accepts as $accept) { if($extension && isset($this->format_map[$accept])){ $format = $this->format_map[$accept]; $format = is_string($format) ? new $format: $format; $format->setMIME($accept); return $format; } } } $format = new $this->format_map['default']; return $format; } protected function getRequestData() { try { $r = file_get_contents ( 'php://input' ); if (is_null ( $r )) return $_GET; $r = $this->request_format->decode ( $r ); return is_null ( $r ) ? array () : $r; } catch ( RestException $e ) { $this->handleError ( $e->getCode (), $e->getMessage () ); } } protected function mapUrlToMethod () { if(!isset($this->routes[$this->request_method])){ return array(); } $urls = $this->routes[$this->request_method]; if(!$urls)return array(); $found = FALSE; $this->request_data += $_GET; $params = array('request_data'=>$this->request_data); $params += $this->request_data; foreach ($urls as $url => $call) { $call = (object)$call; if(strstr($url, ':')){ $regex = preg_replace('/\\\:([^\/]+)/', '(?P<$1>[^/]+)', preg_quote($url)); if (preg_match(":^$regex$:", $this->url, $matches)) { foreach ($matches as $arg => $match) { if (isset($call->arguments[$arg])){ $params[$arg] = $match; } } $found = TRUE; break; } }elseif ($url == $this->url){ $found = TRUE; break; } } if($found){ $p = $call->defaults; foreach ($call->arguments as $key => $value) { if(isset($params[$key]))$p[$value] = $params[$key]; } $call->arguments=$p; return $call; } } protected function applyClassMetadata($class_name, $instance, $method_info){ if(isset($method_info->metadata[$class_name]) && is_array($method_info->metadata[$class_name])){ foreach ($method_info->metadata[$class_name] as $property => $value){ if(property_exists($class_name, $property)){ $reflection_property = new ReflectionProperty($class_name, $property); $reflection_property->setValue($instance, $value); } } } } protected function loadCache() { if ($this->cached !== NULL) { return; } $file = $this->cache_dir . '/routes.php'; $this->cached = FALSE; if ($this->production_mode) { if (file_exists($file)) { $routes = include($file); } if (isset($routes) && is_array($routes)) { $this->routes = $routes; $this->cached = TRUE; } } else { } } protected function generateMap ($class_name, $base_path = "") { $reflection = new ReflectionClass($class_name); $class_metadata = parse_doc($reflection->getDocComment()); $methods = $reflection->getMethods( ReflectionMethod::IS_PUBLIC + ReflectionMethod::IS_PROTECTED); foreach ($methods as $method) { $doc = $method->getDocComment(); $arguments = array(); $defaults = array(); $metadata = $class_metadata+parse_doc($doc); $params = $method->getParameters(); $position=0; foreach ($params as $param){ $arguments[$param->getName()] = $position; $defaults[$position] = $param->isDefaultValueAvailable() ? $param->getDefaultValue() : NULL; $position++; } $method_flag = $method->isProtected() ? (isRestlerCompatibilityModeEnabled() ? 2 : 3) : (isset($metadata['protected']) ? 1 : 0); $call = array( 'class_name'=>$class_name, 'method_name'=>$method->getName(), 'arguments'=>$arguments, 'defaults'=>$defaults, 'metadata'=>$metadata, 'method_flag'=>$method_flag ); $method_url = strtolower($method->getName()); if (preg_match_all( '/@url\s+(GET|POST|PUT|DELETE|HEAD|OPTIONS)[ \t]*\/?(\S*)/s', $doc, $matches, PREG_SET_ORDER)) { foreach ($matches as $match) { $http_method = $match[1]; $url = rtrim($base_path . $match[2],'/'); $this->routes[$http_method][$url] = $call; } }elseif($method_url[0] != '_'){ if (preg_match_all('/^(GET|POST|PUT|DELETE|HEAD|OPTIONS)/i', $method_url, $matches)) { $http_method = strtoupper($matches[0][0]); $method_url = substr($method_url, strlen($http_method)); }else{ $http_method = 'GET'; } $url = $base_path. ($method_url=='index' || $method_url=='default' ? '' : $method_url); $url = rtrim($url,'/'); $this->routes[$http_method][$url] = $call; foreach ($params as $param){ if($param->getName()=='request_data'){ break; } $url .= $url=='' ? ':' : '/:'; $url .= $param->getName(); $this->routes[$http_method][$url] = $call; } } } } } if(version_compare(PHP_VERSION, '5.3.0') < 0){ require_once 'compat.php'; } class RestException extends Exception { public function __construct($http_status_code, $error_message = NULL) { parent::__construct($error_message, $http_status_code); } } interface iRespond { public function __formatResponse($result); public function __formatError($status_code, $message); } class DefaultResponse implements iRespond { function __formatResponse($result) { return $result; } function __formatError($statusCode, $message) { return array('error' => array('code' => $statusCode, 'message' => $message)); } } interface iAuthenticate { public function __isAuthenticated(); } interface iFormat { public function getMIMEMap(); public function setMIME($mime); public function getMIME(); public function setExtension($extension); public function getExtension(); public function encode($data, $human_readable=FALSE); public function decode($data); } class UrlEncodedFormat implements iFormat { const MIME = 'application/x-www-form-urlencoded'; const EXTENSION = 'post'; public function getMIMEMap() { return array(self::EXTENSION=>self::MIME); } public function getMIME(){ return self::MIME; } public function getExtension(){ return self::EXTENSION; } public function setMIME($mime){ } public function setExtension($extension){ } public function encode($data, $human_readable=FALSE){ return http_build_query($data); } public function decode($data){ parse_str($data,$r); return $r; } public function __toString(){ return $this->getExtension(); } } class JsonFormat implements iFormat { const MIME ='application/json'; const EXTENSION = 'json'; public function getMIMEMap() { return array(self::EXTENSION=>self::MIME); } public function getMIME(){ return self::MIME; } public function getExtension(){ return self::EXTENSION; } public function setMIME($mime){ } public function setExtension($extension){ } public function encode($data, $human_readable=FALSE){ return $human_readable ? $this->json_format(json_encode(object_to_array($data))) : json_encode(object_to_array($data)); } public function decode($data) { $decoded = json_decode ( $data ); if (function_exists ( 'json_last_error' )) { $message = ''; switch (json_last_error ()) { case JSON_ERROR_NONE : return object_to_array ( $decoded ); break; case JSON_ERROR_DEPTH : $message = 'maximum stack depth exceeded'; break; case JSON_ERROR_STATE_MISMATCH : $message = 'underflow or the modes mismatch'; break; case JSON_ERROR_CTRL_CHAR : $message = 'unexpected control character found'; break; case JSON_ERROR_SYNTAX : $message = 'malformed JSON'; break; case JSON_ERROR_UTF8 : $message = 'malformed UTF-8 characters, possibly incorrectly encoded'; break; default : $message = 'unknown error'; break; } throw new RestException ( 400, 'Error parsing JSON, ' . $message ); } else if (strlen ( $data ) && $decoded === NULL || $decoded === $data) { throw new RestException ( 400, 'Error parsing JSON' ); } return object_to_array ( $decoded ); } private function json_format($json) { $tab = "  "; $new_json = ""; $indent_level = 0; $in_string = FALSE; $len = strlen($json); for($c = 0; $c < $len; $c++) { $char = $json[$c]; switch($char) { case '{': case '[': if(!$in_string) { $new_json .= $char . "\n" . str_repeat($tab, $indent_level+1); $indent_level++; } else { $new_json .= $char; } break; case '}': case ']': if(!$in_string) { $indent_level--; $new_json .= "\n".str_repeat($tab, $indent_level).$char; } else { $new_json .= $char; } break; case ',': if(!$in_string) { $new_json .= ",\n" . str_repeat($tab, $indent_level); } else { $new_json .= $char; } break; case ':': if(!$in_string) { $new_json .= ": "; } else { $new_json .= $char; } break; case '"': if($c==0){ $in_string = TRUE; }elseif($c > 0 && $json[$c-1] != '\\') { $in_string = !$in_string; } default: $new_json .= $char; break; } } return $new_json; } public function __toString(){ return $this->getExtension(); } } class DocParser { private $params=array(); function parse($doc='') { if($doc==''){ return $this->params; } if(preg_match('#^/\*\*(.*)\*/#s', $doc, $comment) === false) return $this->params; $comment = trim($comment[1]); if(preg_match_all('#^\s*\*(.*)#m', $comment, $lines) === false) return $this->params; $this->parseLines($lines[1]); return $this->params; } private function parseLines($lines) { foreach($lines as $line) { $parsedLine = $this->parseLine($line); if($parsedLine === false && !isset($this->params['description'])) { if(isset($desc)){ $this->params['description'] = implode(PHP_EOL, $desc); } $desc = array(); } elseif($parsedLine !== false) { $desc[] = $parsedLine; } } $desc = implode(' ', $desc); if(!empty($desc))$this->params['long_description'] = $desc; } private function parseLine($line) { $line = trim($line); if(empty($line)) return false; if(strpos($line, '@') === 0) { if(strpos($line, ' ')>0){ $param = substr($line, 1, strpos($line, ' ') - 1); $value = substr($line, strlen($param) + 2); }else{ $param = substr($line, 1); $value = ''; } if($this->setParam($param, $value)) return false; } return $line; } private function setParam($param, $value) { if($param == 'param' || $param == 'return') $value = $this->formatParamOrReturn($value); if($param == 'class') list($param, $value) = $this->formatClass($value); if(empty($this->params[$param])) { $this->params[$param] = $value; } else if($param == 'param'){ $arr = array($this->params[$param], $value); $this->params[$param] = $arr; } else { $this->params[$param] = $value + $this->params[$param]; } return true; } private function formatClass($value) { $r = preg_split("[\(|\)]",$value); if(is_array($r)){ $param = $r[0]; parse_str($r[1],$value); foreach ($value as $key => $val) { $val = explode(',', $val); if(count($val)>1)$value[$key]=$val; } }else{ $param='Unknown'; } return array($param, $value); } private function formatParamOrReturn($string) { $pos = strpos($string, ' '); $type = substr($string, 0, $pos); return '(' . $type . ')' . substr($string, $pos+1); } } function parse_doc($php_doc_comment){ $p = new DocParser(); return $p->parse($php_doc_comment); $p = new Parser($php_doc_comment); return $p; $php_doc_comment = preg_replace("/(^[\\s]*\\/\\*\\*)
                                  |(^[\\s]\\*\\/)
                                  |(^[\\s]*\\*?\\s)
                                  |(^[\\s]*)
diff --git a/restler_minified/xmlformat.php b/restler_minified/xmlformat.php
index 84e2bff9e..03e862aef 100644
--- a/restler_minified/xmlformat.php
+++ b/restler_minified/xmlformat.php
@@ -1,2 +1,2 @@
 <?php
- class XmlFormat implements iFormat { public static $parse_attributes=true; public static $parse_namespaces=false; public static $attribute_names=array('xmlns'); public static $root_name='response'; public static $default_tag_name='item'; const MIME ='application/xml'; const EXTENSION = 'xml'; public function getMIMEMap() { return array(XmlFormat::EXTENSION=>XmlFormat::MIME); } public function getMIME(){ return XmlFormat::MIME; } public function getExtension(){ return XmlFormat::EXTENSION; } public function setMIME($mime){ } public function setExtension($extension){ } public function encode($data, $human_readable=false){ return $this->toXML( object_to_array($data, false), XmlFormat::$root_name, $human_readable); } public function decode($data){ try { if($data=='')return array(); return $this->toArray($data); } catch (Exception $e) { throw new RestException(400, "Error decoding request. ". $e->getMessage()); } } public function __toString(){ return $this->getExtension(); } public function isAssoc( $array ) { return (is_array($array) && 0 !== count(array_diff_key($array, array_keys(array_keys($array))))); } public function toXML( $data, $root_node_name = 'result', $human_readable=false, &$xml=null) { if (ini_get('zend.ze1_compatibility_mode') == 1) ini_set ('zend.ze1_compatibility_mode', 0); if (is_null($xml)) $xml = @simplexml_load_string("<$root_node_name/>"); if(is_array($data)){ $numeric=0; foreach( $data as $key => $value ) { if ( is_numeric( $key ) ) { $numeric = 1; $key = XmlFormat::$root_name == $root_node_name ? XmlFormat::$default_tag_name : $root_node_name; } $key = preg_replace('/[^a-z0-9\-\_\.\:]/i', '', $key); if ( is_array( $value ) ) { $node = $this->isAssoc( $value ) || $numeric ? $xml->addChild( $key ) : $xml; if ( $numeric ) $key = 'anon'; $this->toXML($value, $key, $human_readable, $node); } else { in_array($key,XmlFormat::$attribute_names) ? $xml->addAttribute($key,$value) : $xml->addChild( $key, $value); } } }else{ if(is_bool($data)) $data = $data ? 'true' : 'false'; $xml = @simplexml_load_string( "<$root_node_name>$data</$root_node_name>"); } if(!$human_readable){ return $xml->asXML(); }else{ $dom = dom_import_simplexml($xml)->ownerDocument; $dom->formatOutput = true; return $dom->saveXML(); } } public function toArray( $xml, $firstCall=true) { if ( is_string( $xml ) ) $xml = new SimpleXMLElement( $xml ); $children = $xml->children(); if ( !$children ) { $r = (string) $xml; if($r=='true' || $r=='false')$r=$r=='true'; return $r; } $arr = array(); if($firstCall){ XmlFormat::$attribute_names=array(); XmlFormat::$root_name = $xml->getName(); if (XmlFormat::$parse_namespaces){ foreach($xml->getDocNamespaces(TRUE) as $namepace => $uri) { $arr[$namepace=='' ? 'xmlns' : 'xmlns:'.$namepace] = (string)$uri; } } } if(XmlFormat::$parse_attributes){ foreach($xml->attributes() as $attName => $attValue) { $arr[$attName] = (string)$attValue; XmlFormat::$attribute_names[]=$attName; } } foreach ($children as $key => $node) { $node = $this->toArray($node, false); if ($key == 'anon') $key = count($arr); if (isset($arr[$key])) { if ( !is_array($arr[$key]) || @$arr[$key][0] == null ) $arr[$key] = array($arr[$key]); $arr[$key][] = $node; } else { $arr[$key] = $node; } } return $arr; } public static function exportCurrentSettings() { $s = 'XmlFormat::$root_name = "'. (XmlFormat::$root_name)."\";\n"; $s .= 'XmlFormat::$attribute_names = '. (var_export(XmlFormat::$attribute_names, true)).";\n"; $s .= 'XmlFormat::$default_tag_name = "'. XmlFormat::$default_tag_name."\";\n"; $s .= 'XmlFormat::$parse_attributes = '. (XmlFormat::$parse_attributes ? 'true' : 'false').";\n"; $s .= 'XmlFormat::$parse_namespaces = '. (XmlFormat::$parse_namespaces ? 'true' : 'false').";\n\n\n"; return $s; } } 
\ No newline at end of file
+ class XmlFormat implements iFormat { public static $parse_attributes=true; public static $parse_namespaces=false; public static $attribute_names=array('xmlns'); public static $root_name='response'; public static $default_tag_name='item'; const MIME ='application/xml'; const EXTENSION = 'xml'; public function getMIMEMap() { return array(self::EXTENSION=>self::MIME); } public function getMIME(){ return self::MIME; } public function getExtension(){ return self::EXTENSION; } public function setMIME($mime){ } public function setExtension($extension){ } public function encode($data, $human_readable=false){ return $this->toXML( object_to_array($data, false), self::$root_name, $human_readable); } public function decode($data){ try { if($data=='')return array(); return $this->toArray($data); } catch (Exception $e) { throw new RestException(400, "Error decoding request. ". $e->getMessage()); } } public function __toString(){ return $this->getExtension(); } public function isAssoc( $array ) { return (is_array($array) && 0 !== count(array_diff_key($array, array_keys(array_keys($array))))); } public function toXML( $data, $root_node_name = 'result', $human_readable=false, &$xml=null) { if (ini_get('zend.ze1_compatibility_mode') == 1) ini_set ('zend.ze1_compatibility_mode', 0); if (is_null($xml)) $xml = @simplexml_load_string("<$root_node_name/>"); if(is_array($data)){ $numeric=0; foreach( $data as $key => $value ) { if ( is_numeric( $key ) ) { $numeric = 1; $key = self::$root_name == $root_node_name ? self::$default_tag_name : $root_node_name; } $key = preg_replace('/[^a-z0-9\-\_\.\:]/i', '', $key); if ( is_array( $value ) ) { $node = $this->isAssoc( $value ) || $numeric ? $xml->addChild( $key ) : $xml; if ( $numeric ) $key = 'anon'; $this->toXML($value, $key, $human_readable, $node); } else { $value=htmlspecialchars($value); in_array($key,self::$attribute_names) ? $xml->addAttribute($key,$value) : $xml->addChild( $key, $value); } } }else{ if(is_bool($data)) $data = $data ? 'true' : 'false'; $xml = @simplexml_load_string( "<$root_node_name>".htmlspecialchars($data)."</$root_node_name>"); } if(!$human_readable){ return $xml->asXML(); }else{ $dom = dom_import_simplexml($xml)->ownerDocument; $dom->formatOutput = true; return $dom->saveXML(); } } public function toArray( $xml, $firstCall=true) { if ( is_string( $xml ) ) $xml = new SimpleXMLElement( $xml ); $children = $xml->children(); if ( !$children ) { $r = (string) $xml; if($r=='true' || $r=='false')$r=$r=='true'; return $r; } $arr = array(); if($firstCall){ self::$attribute_names=array(); self::$root_name = $xml->getName(); if (self::$parse_namespaces){ foreach($xml->getDocNamespaces(TRUE) as $namepace => $uri) { $arr[$namepace=='' ? 'xmlns' : 'xmlns:'.$namepace] = (string)$uri; } } } if(self::$parse_attributes){ foreach($xml->attributes() as $attName => $attValue) { $arr[$attName] = (string)$attValue; self::$attribute_names[]=$attName; } } foreach ($children as $key => $node) { $node = $this->toArray($node, false); if ($key == 'anon') $key = count($arr); if (isset($arr[$key])) { if ( !is_array($arr[$key]) || @$arr[$key][0] == null ) $arr[$key] = array($arr[$key]); $arr[$key][] = $node; } else { $arr[$key] = $node; } } return $arr; } public static function exportCurrentSettings() { $s = 'self::$root_name = "'. (self::$root_name)."\";\n"; $s .= 'self::$attribute_names = '. (var_export(self::$attribute_names, true)).";\n"; $s .= 'self::$default_tag_name = "'. self::$default_tag_name."\";\n"; $s .= 'self::$parse_attributes = '. (self::$parse_attributes ? 'true' : 'false').";\n"; $s .= 'self::$parse_namespaces = '. (self::$parse_namespaces ? 'true' : 'false').";\n\n\n"; return $s; } } 
\ No newline at end of file

From 4111ec122027d2a740945bdf34462df61b3d938e Mon Sep 17 00:00:00 2001
From: Luracast <arul@luracast.com>
Date: Sun, 20 Nov 2011 22:00:16 +0800
Subject: [PATCH 29/61] Fixes the critical bug that brakes the previous
 version. If you have downloaded 2.0.9, you must update to this release
 (2.1.0)

---
 restler/restler.php          | 6 +++---
 restler_minified/restler.php | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/restler/restler.php b/restler/restler.php
index 45f429341..fecf400a4 100644
--- a/restler/restler.php
+++ b/restler/restler.php
@@ -10,10 +10,10 @@
  * @copyright  2010 Luracast
  * @license    http://www.opensource.org/licenses/lgpl-license.php LGPL
  * @link       http://luracast.com/products/restler/
- * @version    2.0.6
+ * @version    2.1.0
  */
 class Restler {
-	const VERSION = '2.0.9';
+	const VERSION = '2.1.0';
 	/**
 	 * URL of the currently mapped service
 	 * @var string
@@ -482,7 +482,7 @@ protected function getRequestFormat () {
 		if(isset($_SERVER['CONTENT_TYPE'])){
 			$mime = explode(';', $_SERVER['CONTENT_TYPE']);
 			$mime = $mime[0];
-			if($mime==self::MIME){
+			if($mime==UrlEncodedFormat::MIME){
 				$format = new UrlEncodedFormat();
 			}else{
 				if(isset($this->format_map[$mime])){
diff --git a/restler_minified/restler.php b/restler_minified/restler.php
index 0013620ad..9c6b9f6a0 100644
--- a/restler_minified/restler.php
+++ b/restler_minified/restler.php
@@ -1,5 +1,5 @@
 <?php
- class Restler { const VERSION = '2.0.9'; public $url; public $request_method; public $request_format; public $request_data=array(); public $cache_dir; public $base_dir; public $response = 'DefaultResponse'; public $response_format; protected $production_mode; protected $routes= array(); protected $format_map = array(); protected $service_class_instance; protected $service_method; protected $auth_classes = array(); protected $error_classes = array(); private $codes = array( 100 => 'Continue', 101 => 'Switching Protocols', 200 => 'OK', 201 => 'Created', 202 => 'Accepted', 203 => 'Non-Authoritative Information', 204 => 'No Content', 205 => 'Reset Content', 206 => 'Partial Content', 300 => 'Multiple Choices', 301 => 'Moved Permanently', 302 => 'Found', 303 => 'See Other', 304 => 'Not Modified', 305 => 'Use Proxy', 306 => '(Unused)', 307 => 'Temporary Redirect', 400 => 'Bad Request', 401 => 'Unauthorized', 402 => 'Payment Required', 403 => 'Forbidden', 404 => 'Not Found', 405 => 'Method Not Allowed', 406 => 'Not Acceptable', 407 => 'Proxy Authentication Required', 408 => 'Request Timeout', 409 => 'Conflict', 410 => 'Gone', 411 => 'Length Required', 412 => 'Precondition Failed', 413 => 'Request Entity Too Large', 414 => 'Request-URI Too Long', 415 => 'Unsupported Media Type', 416 => 'Requested Range Not Satisfiable', 417 => 'Expectation Failed', 500 => 'Internal Server Error', 501 => 'Not Implemented', 502 => 'Bad Gateway', 503 => 'Service Unavailable', 504 => 'Gateway Timeout', 505 => 'HTTP Version Not Supported' ); protected $cached; public function __construct ($production_mode = FALSE) { $this->production_mode = $production_mode; $this->cache_dir = getcwd(); $this->base_dir = RESTLER_PATH; } public function __destruct () { if ($this->production_mode && !$this->cached) { $this->saveCache(); } } public function refreshCache () { $this->routes = array(); $this->cached = FALSE; } public function setSupportedFormats () { $args = func_get_args(); $extensions = array(); foreach ($args as $class_name) { if(!is_string($class_name) || !class_exists($class_name)){ throw new Exception("$class_name is not a vaild Format Class."); } $obj = new $class_name; if(! $obj instanceof iFormat){ throw new Exception('Invalid format class; must implement '. 'iFormat interface'); } foreach ($obj->getMIMEMap() as $extension => $mime) { if(!isset($this->format_map[$extension])) $this->format_map[$extension]=$class_name; if(!isset($this->format_map[$mime])) $this->format_map[$mime]=$class_name; $extensions[".$extension"]=TRUE; } } $this->format_map['default']=$args[0]; $this->format_map['extensions']=array_keys($extensions); } public function addAPIClass($class_name, $base_path = NULL) { if(!class_exists($class_name)){ throw new Exception("API class $class_name is missing."); } $this->loadCache(); if(!$this->cached){ if(is_null($base_path))$base_path=strtolower($class_name); $base_path = trim($base_path,'/'); if(strlen($base_path)>0)$base_path .= '/'; $this->generateMap($class_name, $base_path); } } public function addAuthenticationClass ($class_name, $base_path = NULL) { $this->auth_classes[] = $class_name; $this->addAPIClass($class_name, $base_path); } public function addErrorClass ($class_name) { $this->error_classes[] = $class_name; } public function handleError ($status_code, $error_message = NULL) { $method = "handle$status_code"; $handled = FALSE; foreach ($this->error_classes as $class_name) { if (method_exists($class_name, $method)) { $obj = new $class_name(); $obj->restler = $this; $obj->$method(); $handled = TRUE; } } if($handled)return; $message = $this->codes[$status_code] . (!$error_message ? '' : ': ' . $error_message); $this->setStatus($status_code); $this->sendData( call_user_func( array($this->response, '__formatError'), $status_code, $message) ); } public function handle () { if(empty($this->format_map))$this->setSupportedFormats('JsonFormat'); $this->url = $this->getPath(); $this->request_method = $this->getRequestMethod(); $this->response_format = $this->getResponseFormat(); $this->request_format = $this->getRequestFormat(); if(is_null($this->request_format)){ $this->request_format = $this->response_format; } if($this->request_method == 'PUT' || $this->request_method == 'POST'){ $this->request_data = $this->getRequestData(); } $o = $this->mapUrlToMethod(); if(!isset($o->class_name)){ $this->handleError(404); }else{ try { if($o->method_flag){ $auth_method = '__isAuthenticated'; if(!count($this->auth_classes))throw new RestException(401); foreach ($this->auth_classes as $auth_class) { $auth_obj = new $auth_class(); $auth_obj->restler=$this; $this->applyClassMetadata($auth_class, $auth_obj, $o); if (!method_exists($auth_obj, $auth_method)) { throw new RestException(401, 'Authentication Class '. 'should implement iAuthenticate'); }elseif(!$auth_obj->$auth_method()){ throw new RestException(401); } } } $this->applyClassMetadata(get_class($this->request_format), $this->request_format, $o); $pre_process = '_'.$this->request_format->getExtension().'_'. $o->method_name; $this->service_method = $o->method_name; if($o->method_flag==2)$o=unprotect($o); $object = $this->service_class_instance = new $o->class_name(); $object->restler=$this; if(method_exists($o->class_name, $pre_process)) { call_user_func_array(array($object, $pre_process), $o->arguments); } switch ($o->method_flag) { case 3: $reflection_method = new ReflectionMethod($object, $o->method_name); $reflection_method->setAccessible(TRUE); $result = $reflection_method->invokeArgs($object, $o->arguments); break; case 2: case 1: default: $result = call_user_func_array(array($object, $o->method_name), $o->arguments); } } catch (RestException $e) { $this->handleError($e->getCode(), $e->getMessage()); } } if (isset($result) && $result !== NULL) { $this->sendData($result); } } public function sendData($data) { $data = $this->response_format->encode($data, !$this->production_mode); $post_process = '_'.$this->service_method .'_'. $this->response_format->getExtension(); if(isset($this->service_class_instance) && method_exists($this->service_class_instance,$post_process)){ $data = call_user_func(array($this->service_class_instance, $post_process), $data); } header("Cache-Control: no-cache, must-revalidate"); header("Expires: 0"); header('Content-Type: ' . $this->response_format->getMIME()); header("X-Powered-By: Luracast Restler v".Restler::VERSION); die($data); } public function setStatus($code) { header("{$_SERVER['SERVER_PROTOCOL']} $code ". $this->codes[strval($code)]); } public function removeCommonPath($first, $second, $char='/'){ $first = explode($char, $first); $second = explode($char, $second); while (count($second)){ if($first[0]==$second[0]){ array_shift($first); } else break; array_shift($second); } return implode($char, $first); } public function saveCache() { $file = $this->cache_dir . '/routes.php'; $s = '$o=array();'.PHP_EOL; foreach ($this->routes as $key => $value) { $s .= PHP_EOL.PHP_EOL.PHP_EOL."############### $key ###############" .PHP_EOL.PHP_EOL; $s .= '$o[\''.$key.'\']=array();'; foreach ($value as $ke => $va) { $s .= PHP_EOL.PHP_EOL."#==== $key $ke".PHP_EOL.PHP_EOL; $s .= '$o[\''.$key.'\'][\''.$ke.'\']='.str_replace(PHP_EOL, PHP_EOL."\t", var_export($va, TRUE)).';'; } } $s .= PHP_EOL.'return $o;'; $r=@file_put_contents($file, "<?php $s"); @chmod($file, 0777); if($r===FALSE)throw new Exception( "The cache directory located at '$this->cache_dir' needs to have ". "the permissions set to read/write/execute for everyone in order ". "to save cache and improve performance."); } protected function getPath () { $path = urldecode($this->removeCommonPath($_SERVER['REQUEST_URI'], $_SERVER['SCRIPT_NAME'])); $path = preg_replace('/(\/*\?.*$)|(\/$)/', '', $path); $path = str_replace($this->format_map['extensions'], '', $path); return $path; } protected function getRequestMethod () { $method = $_SERVER['REQUEST_METHOD']; if (isset($_SERVER['HTTP_X_HTTP_METHOD_OVERRIDE'])){ $method = $_SERVER['HTTP_X_HTTP_METHOD_OVERRIDE']; } if($method=='HEAD')$method='GET'; return $method; } protected function getRequestFormat () { $format=NULL; if(isset($_SERVER['CONTENT_TYPE'])){ $mime = explode(';', $_SERVER['CONTENT_TYPE']); $mime = $mime[0]; if($mime==self::MIME){ $format = new UrlEncodedFormat(); }else{ if(isset($this->format_map[$mime])){ $format = $this->format_map[$mime]; $format = is_string($format) ? new $format: $format; $format->setMIME($mime); } } } return $format; } protected function getResponseFormat () { $format=NULL; $extensions = explode('.', parse_url($_SERVER['REQUEST_URI'], PHP_URL_PATH)); while($extensions){ $extension = array_pop($extensions); $extension = array_shift(explode('/', $extension)); if($extension && isset($this->format_map[$extension])){ $format = $this->format_map[$extension]; $format = is_string($format) ? new $format: $format; $format->setExtension($extension); return $format; } } if(isset($_SERVER['HTTP_ACCEPT'])){ $accepts = explode(',', $_SERVER['HTTP_ACCEPT']); foreach ($accepts as $accept) { if($extension && isset($this->format_map[$accept])){ $format = $this->format_map[$accept]; $format = is_string($format) ? new $format: $format; $format->setMIME($accept); return $format; } } } $format = new $this->format_map['default']; return $format; } protected function getRequestData() { try { $r = file_get_contents ( 'php://input' ); if (is_null ( $r )) return $_GET; $r = $this->request_format->decode ( $r ); return is_null ( $r ) ? array () : $r; } catch ( RestException $e ) { $this->handleError ( $e->getCode (), $e->getMessage () ); } } protected function mapUrlToMethod () { if(!isset($this->routes[$this->request_method])){ return array(); } $urls = $this->routes[$this->request_method]; if(!$urls)return array(); $found = FALSE; $this->request_data += $_GET; $params = array('request_data'=>$this->request_data); $params += $this->request_data; foreach ($urls as $url => $call) { $call = (object)$call; if(strstr($url, ':')){ $regex = preg_replace('/\\\:([^\/]+)/', '(?P<$1>[^/]+)', preg_quote($url)); if (preg_match(":^$regex$:", $this->url, $matches)) { foreach ($matches as $arg => $match) { if (isset($call->arguments[$arg])){ $params[$arg] = $match; } } $found = TRUE; break; } }elseif ($url == $this->url){ $found = TRUE; break; } } if($found){ $p = $call->defaults; foreach ($call->arguments as $key => $value) { if(isset($params[$key]))$p[$value] = $params[$key]; } $call->arguments=$p; return $call; } } protected function applyClassMetadata($class_name, $instance, $method_info){ if(isset($method_info->metadata[$class_name]) && is_array($method_info->metadata[$class_name])){ foreach ($method_info->metadata[$class_name] as $property => $value){ if(property_exists($class_name, $property)){ $reflection_property = new ReflectionProperty($class_name, $property); $reflection_property->setValue($instance, $value); } } } } protected function loadCache() { if ($this->cached !== NULL) { return; } $file = $this->cache_dir . '/routes.php'; $this->cached = FALSE; if ($this->production_mode) { if (file_exists($file)) { $routes = include($file); } if (isset($routes) && is_array($routes)) { $this->routes = $routes; $this->cached = TRUE; } } else { } } protected function generateMap ($class_name, $base_path = "") { $reflection = new ReflectionClass($class_name); $class_metadata = parse_doc($reflection->getDocComment()); $methods = $reflection->getMethods( ReflectionMethod::IS_PUBLIC + ReflectionMethod::IS_PROTECTED); foreach ($methods as $method) { $doc = $method->getDocComment(); $arguments = array(); $defaults = array(); $metadata = $class_metadata+parse_doc($doc); $params = $method->getParameters(); $position=0; foreach ($params as $param){ $arguments[$param->getName()] = $position; $defaults[$position] = $param->isDefaultValueAvailable() ? $param->getDefaultValue() : NULL; $position++; } $method_flag = $method->isProtected() ? (isRestlerCompatibilityModeEnabled() ? 2 : 3) : (isset($metadata['protected']) ? 1 : 0); $call = array( 'class_name'=>$class_name, 'method_name'=>$method->getName(), 'arguments'=>$arguments, 'defaults'=>$defaults, 'metadata'=>$metadata, 'method_flag'=>$method_flag ); $method_url = strtolower($method->getName()); if (preg_match_all( '/@url\s+(GET|POST|PUT|DELETE|HEAD|OPTIONS)[ \t]*\/?(\S*)/s', $doc, $matches, PREG_SET_ORDER)) { foreach ($matches as $match) { $http_method = $match[1]; $url = rtrim($base_path . $match[2],'/'); $this->routes[$http_method][$url] = $call; } }elseif($method_url[0] != '_'){ if (preg_match_all('/^(GET|POST|PUT|DELETE|HEAD|OPTIONS)/i', $method_url, $matches)) { $http_method = strtoupper($matches[0][0]); $method_url = substr($method_url, strlen($http_method)); }else{ $http_method = 'GET'; } $url = $base_path. ($method_url=='index' || $method_url=='default' ? '' : $method_url); $url = rtrim($url,'/'); $this->routes[$http_method][$url] = $call; foreach ($params as $param){ if($param->getName()=='request_data'){ break; } $url .= $url=='' ? ':' : '/:'; $url .= $param->getName(); $this->routes[$http_method][$url] = $call; } } } } } if(version_compare(PHP_VERSION, '5.3.0') < 0){ require_once 'compat.php'; } class RestException extends Exception { public function __construct($http_status_code, $error_message = NULL) { parent::__construct($error_message, $http_status_code); } } interface iRespond { public function __formatResponse($result); public function __formatError($status_code, $message); } class DefaultResponse implements iRespond { function __formatResponse($result) { return $result; } function __formatError($statusCode, $message) { return array('error' => array('code' => $statusCode, 'message' => $message)); } } interface iAuthenticate { public function __isAuthenticated(); } interface iFormat { public function getMIMEMap(); public function setMIME($mime); public function getMIME(); public function setExtension($extension); public function getExtension(); public function encode($data, $human_readable=FALSE); public function decode($data); } class UrlEncodedFormat implements iFormat { const MIME = 'application/x-www-form-urlencoded'; const EXTENSION = 'post'; public function getMIMEMap() { return array(self::EXTENSION=>self::MIME); } public function getMIME(){ return self::MIME; } public function getExtension(){ return self::EXTENSION; } public function setMIME($mime){ } public function setExtension($extension){ } public function encode($data, $human_readable=FALSE){ return http_build_query($data); } public function decode($data){ parse_str($data,$r); return $r; } public function __toString(){ return $this->getExtension(); } } class JsonFormat implements iFormat { const MIME ='application/json'; const EXTENSION = 'json'; public function getMIMEMap() { return array(self::EXTENSION=>self::MIME); } public function getMIME(){ return self::MIME; } public function getExtension(){ return self::EXTENSION; } public function setMIME($mime){ } public function setExtension($extension){ } public function encode($data, $human_readable=FALSE){ return $human_readable ? $this->json_format(json_encode(object_to_array($data))) : json_encode(object_to_array($data)); } public function decode($data) { $decoded = json_decode ( $data ); if (function_exists ( 'json_last_error' )) { $message = ''; switch (json_last_error ()) { case JSON_ERROR_NONE : return object_to_array ( $decoded ); break; case JSON_ERROR_DEPTH : $message = 'maximum stack depth exceeded'; break; case JSON_ERROR_STATE_MISMATCH : $message = 'underflow or the modes mismatch'; break; case JSON_ERROR_CTRL_CHAR : $message = 'unexpected control character found'; break; case JSON_ERROR_SYNTAX : $message = 'malformed JSON'; break; case JSON_ERROR_UTF8 : $message = 'malformed UTF-8 characters, possibly incorrectly encoded'; break; default : $message = 'unknown error'; break; } throw new RestException ( 400, 'Error parsing JSON, ' . $message ); } else if (strlen ( $data ) && $decoded === NULL || $decoded === $data) { throw new RestException ( 400, 'Error parsing JSON' ); } return object_to_array ( $decoded ); } private function json_format($json) { $tab = "  "; $new_json = ""; $indent_level = 0; $in_string = FALSE; $len = strlen($json); for($c = 0; $c < $len; $c++) { $char = $json[$c]; switch($char) { case '{': case '[': if(!$in_string) { $new_json .= $char . "\n" . str_repeat($tab, $indent_level+1); $indent_level++; } else { $new_json .= $char; } break; case '}': case ']': if(!$in_string) { $indent_level--; $new_json .= "\n".str_repeat($tab, $indent_level).$char; } else { $new_json .= $char; } break; case ',': if(!$in_string) { $new_json .= ",\n" . str_repeat($tab, $indent_level); } else { $new_json .= $char; } break; case ':': if(!$in_string) { $new_json .= ": "; } else { $new_json .= $char; } break; case '"': if($c==0){ $in_string = TRUE; }elseif($c > 0 && $json[$c-1] != '\\') { $in_string = !$in_string; } default: $new_json .= $char; break; } } return $new_json; } public function __toString(){ return $this->getExtension(); } } class DocParser { private $params=array(); function parse($doc='') { if($doc==''){ return $this->params; } if(preg_match('#^/\*\*(.*)\*/#s', $doc, $comment) === false) return $this->params; $comment = trim($comment[1]); if(preg_match_all('#^\s*\*(.*)#m', $comment, $lines) === false) return $this->params; $this->parseLines($lines[1]); return $this->params; } private function parseLines($lines) { foreach($lines as $line) { $parsedLine = $this->parseLine($line); if($parsedLine === false && !isset($this->params['description'])) { if(isset($desc)){ $this->params['description'] = implode(PHP_EOL, $desc); } $desc = array(); } elseif($parsedLine !== false) { $desc[] = $parsedLine; } } $desc = implode(' ', $desc); if(!empty($desc))$this->params['long_description'] = $desc; } private function parseLine($line) { $line = trim($line); if(empty($line)) return false; if(strpos($line, '@') === 0) { if(strpos($line, ' ')>0){ $param = substr($line, 1, strpos($line, ' ') - 1); $value = substr($line, strlen($param) + 2); }else{ $param = substr($line, 1); $value = ''; } if($this->setParam($param, $value)) return false; } return $line; } private function setParam($param, $value) { if($param == 'param' || $param == 'return') $value = $this->formatParamOrReturn($value); if($param == 'class') list($param, $value) = $this->formatClass($value); if(empty($this->params[$param])) { $this->params[$param] = $value; } else if($param == 'param'){ $arr = array($this->params[$param], $value); $this->params[$param] = $arr; } else { $this->params[$param] = $value + $this->params[$param]; } return true; } private function formatClass($value) { $r = preg_split("[\(|\)]",$value); if(is_array($r)){ $param = $r[0]; parse_str($r[1],$value); foreach ($value as $key => $val) { $val = explode(',', $val); if(count($val)>1)$value[$key]=$val; } }else{ $param='Unknown'; } return array($param, $value); } private function formatParamOrReturn($string) { $pos = strpos($string, ' '); $type = substr($string, 0, $pos); return '(' . $type . ')' . substr($string, $pos+1); } } function parse_doc($php_doc_comment){ $p = new DocParser(); return $p->parse($php_doc_comment); $p = new Parser($php_doc_comment); return $p; $php_doc_comment = preg_replace("/(^[\\s]*\\/\\*\\*)
+ class Restler { const VERSION = '2.1.0'; public $url; public $request_method; public $request_format; public $request_data=array(); public $cache_dir; public $base_dir; public $response = 'DefaultResponse'; public $response_format; protected $production_mode; protected $routes= array(); protected $format_map = array(); protected $service_class_instance; protected $service_method; protected $auth_classes = array(); protected $error_classes = array(); private $codes = array( 100 => 'Continue', 101 => 'Switching Protocols', 200 => 'OK', 201 => 'Created', 202 => 'Accepted', 203 => 'Non-Authoritative Information', 204 => 'No Content', 205 => 'Reset Content', 206 => 'Partial Content', 300 => 'Multiple Choices', 301 => 'Moved Permanently', 302 => 'Found', 303 => 'See Other', 304 => 'Not Modified', 305 => 'Use Proxy', 306 => '(Unused)', 307 => 'Temporary Redirect', 400 => 'Bad Request', 401 => 'Unauthorized', 402 => 'Payment Required', 403 => 'Forbidden', 404 => 'Not Found', 405 => 'Method Not Allowed', 406 => 'Not Acceptable', 407 => 'Proxy Authentication Required', 408 => 'Request Timeout', 409 => 'Conflict', 410 => 'Gone', 411 => 'Length Required', 412 => 'Precondition Failed', 413 => 'Request Entity Too Large', 414 => 'Request-URI Too Long', 415 => 'Unsupported Media Type', 416 => 'Requested Range Not Satisfiable', 417 => 'Expectation Failed', 500 => 'Internal Server Error', 501 => 'Not Implemented', 502 => 'Bad Gateway', 503 => 'Service Unavailable', 504 => 'Gateway Timeout', 505 => 'HTTP Version Not Supported' ); protected $cached; public function __construct ($production_mode = FALSE) { $this->production_mode = $production_mode; $this->cache_dir = getcwd(); $this->base_dir = RESTLER_PATH; } public function __destruct () { if ($this->production_mode && !$this->cached) { $this->saveCache(); } } public function refreshCache () { $this->routes = array(); $this->cached = FALSE; } public function setSupportedFormats () { $args = func_get_args(); $extensions = array(); foreach ($args as $class_name) { if(!is_string($class_name) || !class_exists($class_name)){ throw new Exception("$class_name is not a vaild Format Class."); } $obj = new $class_name; if(! $obj instanceof iFormat){ throw new Exception('Invalid format class; must implement '. 'iFormat interface'); } foreach ($obj->getMIMEMap() as $extension => $mime) { if(!isset($this->format_map[$extension])) $this->format_map[$extension]=$class_name; if(!isset($this->format_map[$mime])) $this->format_map[$mime]=$class_name; $extensions[".$extension"]=TRUE; } } $this->format_map['default']=$args[0]; $this->format_map['extensions']=array_keys($extensions); } public function addAPIClass($class_name, $base_path = NULL) { if(!class_exists($class_name)){ throw new Exception("API class $class_name is missing."); } $this->loadCache(); if(!$this->cached){ if(is_null($base_path))$base_path=strtolower($class_name); $base_path = trim($base_path,'/'); if(strlen($base_path)>0)$base_path .= '/'; $this->generateMap($class_name, $base_path); } } public function addAuthenticationClass ($class_name, $base_path = NULL) { $this->auth_classes[] = $class_name; $this->addAPIClass($class_name, $base_path); } public function addErrorClass ($class_name) { $this->error_classes[] = $class_name; } public function handleError ($status_code, $error_message = NULL) { $method = "handle$status_code"; $handled = FALSE; foreach ($this->error_classes as $class_name) { if (method_exists($class_name, $method)) { $obj = new $class_name(); $obj->restler = $this; $obj->$method(); $handled = TRUE; } } if($handled)return; $message = $this->codes[$status_code] . (!$error_message ? '' : ': ' . $error_message); $this->setStatus($status_code); $this->sendData( call_user_func( array($this->response, '__formatError'), $status_code, $message) ); } public function handle () { if(empty($this->format_map))$this->setSupportedFormats('JsonFormat'); $this->url = $this->getPath(); $this->request_method = $this->getRequestMethod(); $this->response_format = $this->getResponseFormat(); $this->request_format = $this->getRequestFormat(); if(is_null($this->request_format)){ $this->request_format = $this->response_format; } if($this->request_method == 'PUT' || $this->request_method == 'POST'){ $this->request_data = $this->getRequestData(); } $o = $this->mapUrlToMethod(); if(!isset($o->class_name)){ $this->handleError(404); }else{ try { if($o->method_flag){ $auth_method = '__isAuthenticated'; if(!count($this->auth_classes))throw new RestException(401); foreach ($this->auth_classes as $auth_class) { $auth_obj = new $auth_class(); $auth_obj->restler=$this; $this->applyClassMetadata($auth_class, $auth_obj, $o); if (!method_exists($auth_obj, $auth_method)) { throw new RestException(401, 'Authentication Class '. 'should implement iAuthenticate'); }elseif(!$auth_obj->$auth_method()){ throw new RestException(401); } } } $this->applyClassMetadata(get_class($this->request_format), $this->request_format, $o); $pre_process = '_'.$this->request_format->getExtension().'_'. $o->method_name; $this->service_method = $o->method_name; if($o->method_flag==2)$o=unprotect($o); $object = $this->service_class_instance = new $o->class_name(); $object->restler=$this; if(method_exists($o->class_name, $pre_process)) { call_user_func_array(array($object, $pre_process), $o->arguments); } switch ($o->method_flag) { case 3: $reflection_method = new ReflectionMethod($object, $o->method_name); $reflection_method->setAccessible(TRUE); $result = $reflection_method->invokeArgs($object, $o->arguments); break; case 2: case 1: default: $result = call_user_func_array(array($object, $o->method_name), $o->arguments); } } catch (RestException $e) { $this->handleError($e->getCode(), $e->getMessage()); } } if (isset($result) && $result !== NULL) { $this->sendData($result); } } public function sendData($data) { $data = $this->response_format->encode($data, !$this->production_mode); $post_process = '_'.$this->service_method .'_'. $this->response_format->getExtension(); if(isset($this->service_class_instance) && method_exists($this->service_class_instance,$post_process)){ $data = call_user_func(array($this->service_class_instance, $post_process), $data); } header("Cache-Control: no-cache, must-revalidate"); header("Expires: 0"); header('Content-Type: ' . $this->response_format->getMIME()); header("X-Powered-By: Luracast Restler v".Restler::VERSION); die($data); } public function setStatus($code) { header("{$_SERVER['SERVER_PROTOCOL']} $code ". $this->codes[strval($code)]); } public function removeCommonPath($first, $second, $char='/'){ $first = explode($char, $first); $second = explode($char, $second); while (count($second)){ if($first[0]==$second[0]){ array_shift($first); } else break; array_shift($second); } return implode($char, $first); } public function saveCache() { $file = $this->cache_dir . '/routes.php'; $s = '$o=array();'.PHP_EOL; foreach ($this->routes as $key => $value) { $s .= PHP_EOL.PHP_EOL.PHP_EOL."############### $key ###############" .PHP_EOL.PHP_EOL; $s .= '$o[\''.$key.'\']=array();'; foreach ($value as $ke => $va) { $s .= PHP_EOL.PHP_EOL."#==== $key $ke".PHP_EOL.PHP_EOL; $s .= '$o[\''.$key.'\'][\''.$ke.'\']='.str_replace(PHP_EOL, PHP_EOL."\t", var_export($va, TRUE)).';'; } } $s .= PHP_EOL.'return $o;'; $r=@file_put_contents($file, "<?php $s"); @chmod($file, 0777); if($r===FALSE)throw new Exception( "The cache directory located at '$this->cache_dir' needs to have ". "the permissions set to read/write/execute for everyone in order ". "to save cache and improve performance."); } protected function getPath () { $path = urldecode($this->removeCommonPath($_SERVER['REQUEST_URI'], $_SERVER['SCRIPT_NAME'])); $path = preg_replace('/(\/*\?.*$)|(\/$)/', '', $path); $path = str_replace($this->format_map['extensions'], '', $path); return $path; } protected function getRequestMethod () { $method = $_SERVER['REQUEST_METHOD']; if (isset($_SERVER['HTTP_X_HTTP_METHOD_OVERRIDE'])){ $method = $_SERVER['HTTP_X_HTTP_METHOD_OVERRIDE']; } if($method=='HEAD')$method='GET'; return $method; } protected function getRequestFormat () { $format=NULL; if(isset($_SERVER['CONTENT_TYPE'])){ $mime = explode(';', $_SERVER['CONTENT_TYPE']); $mime = $mime[0]; if($mime==UrlEncodedFormat::MIME){ $format = new UrlEncodedFormat(); }else{ if(isset($this->format_map[$mime])){ $format = $this->format_map[$mime]; $format = is_string($format) ? new $format: $format; $format->setMIME($mime); } } } return $format; } protected function getResponseFormat () { $format=NULL; $extensions = explode('.', parse_url($_SERVER['REQUEST_URI'], PHP_URL_PATH)); while($extensions){ $extension = array_pop($extensions); $extension = array_shift(explode('/', $extension)); if($extension && isset($this->format_map[$extension])){ $format = $this->format_map[$extension]; $format = is_string($format) ? new $format: $format; $format->setExtension($extension); return $format; } } if(isset($_SERVER['HTTP_ACCEPT'])){ $accepts = explode(',', $_SERVER['HTTP_ACCEPT']); foreach ($accepts as $accept) { if($extension && isset($this->format_map[$accept])){ $format = $this->format_map[$accept]; $format = is_string($format) ? new $format: $format; $format->setMIME($accept); return $format; } } } $format = new $this->format_map['default']; return $format; } protected function getRequestData() { try { $r = file_get_contents ( 'php://input' ); if (is_null ( $r )) return $_GET; $r = $this->request_format->decode ( $r ); return is_null ( $r ) ? array () : $r; } catch ( RestException $e ) { $this->handleError ( $e->getCode (), $e->getMessage () ); } } protected function mapUrlToMethod () { if(!isset($this->routes[$this->request_method])){ return array(); } $urls = $this->routes[$this->request_method]; if(!$urls)return array(); $found = FALSE; $this->request_data += $_GET; $params = array('request_data'=>$this->request_data); $params += $this->request_data; foreach ($urls as $url => $call) { $call = (object)$call; if(strstr($url, ':')){ $regex = preg_replace('/\\\:([^\/]+)/', '(?P<$1>[^/]+)', preg_quote($url)); if (preg_match(":^$regex$:", $this->url, $matches)) { foreach ($matches as $arg => $match) { if (isset($call->arguments[$arg])){ $params[$arg] = $match; } } $found = TRUE; break; } }elseif ($url == $this->url){ $found = TRUE; break; } } if($found){ $p = $call->defaults; foreach ($call->arguments as $key => $value) { if(isset($params[$key]))$p[$value] = $params[$key]; } $call->arguments=$p; return $call; } } protected function applyClassMetadata($class_name, $instance, $method_info){ if(isset($method_info->metadata[$class_name]) && is_array($method_info->metadata[$class_name])){ foreach ($method_info->metadata[$class_name] as $property => $value){ if(property_exists($class_name, $property)){ $reflection_property = new ReflectionProperty($class_name, $property); $reflection_property->setValue($instance, $value); } } } } protected function loadCache() { if ($this->cached !== NULL) { return; } $file = $this->cache_dir . '/routes.php'; $this->cached = FALSE; if ($this->production_mode) { if (file_exists($file)) { $routes = include($file); } if (isset($routes) && is_array($routes)) { $this->routes = $routes; $this->cached = TRUE; } } else { } } protected function generateMap ($class_name, $base_path = "") { $reflection = new ReflectionClass($class_name); $class_metadata = parse_doc($reflection->getDocComment()); $methods = $reflection->getMethods( ReflectionMethod::IS_PUBLIC + ReflectionMethod::IS_PROTECTED); foreach ($methods as $method) { $doc = $method->getDocComment(); $arguments = array(); $defaults = array(); $metadata = $class_metadata+parse_doc($doc); $params = $method->getParameters(); $position=0; foreach ($params as $param){ $arguments[$param->getName()] = $position; $defaults[$position] = $param->isDefaultValueAvailable() ? $param->getDefaultValue() : NULL; $position++; } $method_flag = $method->isProtected() ? (isRestlerCompatibilityModeEnabled() ? 2 : 3) : (isset($metadata['protected']) ? 1 : 0); $call = array( 'class_name'=>$class_name, 'method_name'=>$method->getName(), 'arguments'=>$arguments, 'defaults'=>$defaults, 'metadata'=>$metadata, 'method_flag'=>$method_flag ); $method_url = strtolower($method->getName()); if (preg_match_all( '/@url\s+(GET|POST|PUT|DELETE|HEAD|OPTIONS)[ \t]*\/?(\S*)/s', $doc, $matches, PREG_SET_ORDER)) { foreach ($matches as $match) { $http_method = $match[1]; $url = rtrim($base_path . $match[2],'/'); $this->routes[$http_method][$url] = $call; } }elseif($method_url[0] != '_'){ if (preg_match_all('/^(GET|POST|PUT|DELETE|HEAD|OPTIONS)/i', $method_url, $matches)) { $http_method = strtoupper($matches[0][0]); $method_url = substr($method_url, strlen($http_method)); }else{ $http_method = 'GET'; } $url = $base_path. ($method_url=='index' || $method_url=='default' ? '' : $method_url); $url = rtrim($url,'/'); $this->routes[$http_method][$url] = $call; foreach ($params as $param){ if($param->getName()=='request_data'){ break; } $url .= $url=='' ? ':' : '/:'; $url .= $param->getName(); $this->routes[$http_method][$url] = $call; } } } } } if(version_compare(PHP_VERSION, '5.3.0') < 0){ require_once 'compat.php'; } class RestException extends Exception { public function __construct($http_status_code, $error_message = NULL) { parent::__construct($error_message, $http_status_code); } } interface iRespond { public function __formatResponse($result); public function __formatError($status_code, $message); } class DefaultResponse implements iRespond { function __formatResponse($result) { return $result; } function __formatError($statusCode, $message) { return array('error' => array('code' => $statusCode, 'message' => $message)); } } interface iAuthenticate { public function __isAuthenticated(); } interface iFormat { public function getMIMEMap(); public function setMIME($mime); public function getMIME(); public function setExtension($extension); public function getExtension(); public function encode($data, $human_readable=FALSE); public function decode($data); } class UrlEncodedFormat implements iFormat { const MIME = 'application/x-www-form-urlencoded'; const EXTENSION = 'post'; public function getMIMEMap() { return array(self::EXTENSION=>self::MIME); } public function getMIME(){ return self::MIME; } public function getExtension(){ return self::EXTENSION; } public function setMIME($mime){ } public function setExtension($extension){ } public function encode($data, $human_readable=FALSE){ return http_build_query($data); } public function decode($data){ parse_str($data,$r); return $r; } public function __toString(){ return $this->getExtension(); } } class JsonFormat implements iFormat { const MIME ='application/json'; const EXTENSION = 'json'; public function getMIMEMap() { return array(self::EXTENSION=>self::MIME); } public function getMIME(){ return self::MIME; } public function getExtension(){ return self::EXTENSION; } public function setMIME($mime){ } public function setExtension($extension){ } public function encode($data, $human_readable=FALSE){ return $human_readable ? $this->json_format(json_encode(object_to_array($data))) : json_encode(object_to_array($data)); } public function decode($data) { $decoded = json_decode ( $data ); if (function_exists ( 'json_last_error' )) { $message = ''; switch (json_last_error ()) { case JSON_ERROR_NONE : return object_to_array ( $decoded ); break; case JSON_ERROR_DEPTH : $message = 'maximum stack depth exceeded'; break; case JSON_ERROR_STATE_MISMATCH : $message = 'underflow or the modes mismatch'; break; case JSON_ERROR_CTRL_CHAR : $message = 'unexpected control character found'; break; case JSON_ERROR_SYNTAX : $message = 'malformed JSON'; break; case JSON_ERROR_UTF8 : $message = 'malformed UTF-8 characters, possibly incorrectly encoded'; break; default : $message = 'unknown error'; break; } throw new RestException ( 400, 'Error parsing JSON, ' . $message ); } else if (strlen ( $data ) && $decoded === NULL || $decoded === $data) { throw new RestException ( 400, 'Error parsing JSON' ); } return object_to_array ( $decoded ); } private function json_format($json) { $tab = "  "; $new_json = ""; $indent_level = 0; $in_string = FALSE; $len = strlen($json); for($c = 0; $c < $len; $c++) { $char = $json[$c]; switch($char) { case '{': case '[': if(!$in_string) { $new_json .= $char . "\n" . str_repeat($tab, $indent_level+1); $indent_level++; } else { $new_json .= $char; } break; case '}': case ']': if(!$in_string) { $indent_level--; $new_json .= "\n".str_repeat($tab, $indent_level).$char; } else { $new_json .= $char; } break; case ',': if(!$in_string) { $new_json .= ",\n" . str_repeat($tab, $indent_level); } else { $new_json .= $char; } break; case ':': if(!$in_string) { $new_json .= ": "; } else { $new_json .= $char; } break; case '"': if($c==0){ $in_string = TRUE; }elseif($c > 0 && $json[$c-1] != '\\') { $in_string = !$in_string; } default: $new_json .= $char; break; } } return $new_json; } public function __toString(){ return $this->getExtension(); } } class DocParser { private $params=array(); function parse($doc='') { if($doc==''){ return $this->params; } if(preg_match('#^/\*\*(.*)\*/#s', $doc, $comment) === false) return $this->params; $comment = trim($comment[1]); if(preg_match_all('#^\s*\*(.*)#m', $comment, $lines) === false) return $this->params; $this->parseLines($lines[1]); return $this->params; } private function parseLines($lines) { foreach($lines as $line) { $parsedLine = $this->parseLine($line); if($parsedLine === false && !isset($this->params['description'])) { if(isset($desc)){ $this->params['description'] = implode(PHP_EOL, $desc); } $desc = array(); } elseif($parsedLine !== false) { $desc[] = $parsedLine; } } $desc = implode(' ', $desc); if(!empty($desc))$this->params['long_description'] = $desc; } private function parseLine($line) { $line = trim($line); if(empty($line)) return false; if(strpos($line, '@') === 0) { if(strpos($line, ' ')>0){ $param = substr($line, 1, strpos($line, ' ') - 1); $value = substr($line, strlen($param) + 2); }else{ $param = substr($line, 1); $value = ''; } if($this->setParam($param, $value)) return false; } return $line; } private function setParam($param, $value) { if($param == 'param' || $param == 'return') $value = $this->formatParamOrReturn($value); if($param == 'class') list($param, $value) = $this->formatClass($value); if(empty($this->params[$param])) { $this->params[$param] = $value; } else if($param == 'param'){ $arr = array($this->params[$param], $value); $this->params[$param] = $arr; } else { $this->params[$param] = $value + $this->params[$param]; } return true; } private function formatClass($value) { $r = preg_split("[\(|\)]",$value); if(is_array($r)){ $param = $r[0]; parse_str($r[1],$value); foreach ($value as $key => $val) { $val = explode(',', $val); if(count($val)>1)$value[$key]=$val; } }else{ $param='Unknown'; } return array($param, $value); } private function formatParamOrReturn($string) { $pos = strpos($string, ' '); $type = substr($string, 0, $pos); return '(' . $type . ')' . substr($string, $pos+1); } } function parse_doc($php_doc_comment){ $p = new DocParser(); return $p->parse($php_doc_comment); $p = new Parser($php_doc_comment); return $p; $php_doc_comment = preg_replace("/(^[\\s]*\\/\\*\\*)
                                  |(^[\\s]\\*\\/)
                                  |(^[\\s]*\\*?\\s)
                                  |(^[\\s]*)

From 08bc8ddb4c1a4158f20dc699ba3c013d80b5da39 Mon Sep 17 00:00:00 2001
From: Luracast <arul@luracast.com>
Date: Sun, 4 Dec 2011 14:32:39 +0800
Subject: [PATCH 30/61] Updated the CRUD example with alternative DB options
 using Serialized File, SQLite, MySQL. Closes #7 which asks for persistent DB
 example.

---
 examples/_006_crud/author.php             |   7 +-
 examples/_006_crud/db_pdo_mysql.php       | 110 ++++++++++++++++++++++
 examples/_006_crud/db_pdo_sqlite.php      |  85 +++++++++++++++++
 examples/_006_crud/db_serialized_file.php |  96 +++++++++++++++++++
 examples/_006_crud/db_session.php         |  70 ++++++++++++++
 examples/_006_crud/index.php              |  30 ++++--
 examples/_006_crud/readme.html            |  44 ++++++---
 examples/_006_crud/readme.md              |  25 +++--
 examples/_006_crud/sessiondb.php          |  57 -----------
 examples/index.html                       |  23 +++--
 10 files changed, 452 insertions(+), 95 deletions(-)
 create mode 100755 examples/_006_crud/db_pdo_mysql.php
 create mode 100755 examples/_006_crud/db_pdo_sqlite.php
 create mode 100755 examples/_006_crud/db_serialized_file.php
 create mode 100755 examples/_006_crud/db_session.php
 delete mode 100755 examples/_006_crud/sessiondb.php
 mode change 100644 => 100755 examples/index.html

diff --git a/examples/_006_crud/author.php b/examples/_006_crud/author.php
index 49a85a63d..7b7e6677c 100755
--- a/examples/_006_crud/author.php
+++ b/examples/_006_crud/author.php
@@ -5,7 +5,12 @@ class Author {
 	static $FIELDS = array('name', 'email');
 
 	function __construct(){
-		$this->dp = new SessionDB();
+	    /**
+		* $this->dp = new DB_PDO_Sqlite();
+		* $this->dp = new DB_PDO_MySQL();
+		* $this->dp = new DB_Serialized_File();
+		*/
+		$this->dp = new DB_Session();
 	}
 
 	function get($id=NULL) {
diff --git a/examples/_006_crud/db_pdo_mysql.php b/examples/_006_crud/db_pdo_mysql.php
new file mode 100755
index 000000000..85751db7b
--- /dev/null
+++ b/examples/_006_crud/db_pdo_mysql.php
@@ -0,0 +1,110 @@
+<?php
+/**
+ * MySQL DB. All data is stored in data_pdo_mysql database
+ * Create an empty MySQL database and set the dbname, username
+ * and password below
+ * 
+ * This class will create the table with sample data
+ * automatically on first `get` or `get($id)` request
+ */
+class DB_PDO_MySQL
+{
+    private $db;
+    function __construct ()
+    {
+        try {
+//update the dbname username and password to suit your server
+            $this->db = new PDO(
+            'mysql:host=localhost;dbname=data_pdo_mysql', 'username', 'password');
+            $this->db->setAttribute(PDO::ATTR_DEFAULT_FETCH_MODE, 
+            PDO::FETCH_ASSOC);
+        } catch (PDOException $e) {
+            throw new RestException(501, 'MySQL: ' . $e->getMessage());
+        }
+    }
+    function get ($id, $installTableOnFailure = FALSE)
+    {
+        $this->db->setAttribute(PDO::ATTR_ERRMODE, PDO::ERRMODE_EXCEPTION);
+        try {
+            $sql = 'SELECT * FROM authors WHERE id = ' . mysql_escape_string(
+            $id);
+            return $this->id2int($this->db->query($sql)
+                ->fetch());
+        } catch (PDOException $e) {
+            if (! $installTableOnFailure && $e->getCode() == '42S02') {
+//SQLSTATE[42S02]: Base table or view not found: 1146 Table 'authors' doesn't exist
+                $this->install();
+                return $this->get($id, TRUE);
+            }
+            throw new RestException(501, 'MySQL: ' . $e->getMessage());
+        }
+    }
+    function getAll ($installTableOnFailure = FALSE)
+    {
+        $this->db->setAttribute(PDO::ATTR_ERRMODE, PDO::ERRMODE_EXCEPTION);
+        try {
+            $stmt = $this->db->query('SELECT * FROM authors');
+            return $this->id2int($stmt->fetchAll());
+        } catch (PDOException $e) {
+            if (! $installTableOnFailure && $e->getCode() == '42S02') {
+//SQLSTATE[42S02]: Base table or view not found: 1146 Table 'authors' doesn't exist
+                $this->install();
+                return $this->getAll(TRUE);
+            }
+            throw new RestException(501, 'MySQL: ' . $e->getMessage());
+        }
+    }
+    function insert ($rec)
+    {
+        $name = mysql_escape_string($rec['name']);
+        $email = mysql_escape_string($rec['email']);
+        $sql = "INSERT INTO authors (name, email) VALUES ('$name', '$email')";
+        if (! $this->db->query($sql))
+            return FALSE;
+        return $this->get($this->db->lastInsertId());
+    }
+    function update ($id, $rec)
+    {
+        $id = mysql_escape_string($id);
+        $name = mysql_escape_string($rec['name']);
+        $email = mysql_escape_string($rec['email']);
+        $sql = "UPDATE authors SET name = '$name', email ='$email' WHERE id = $id";
+        if (! $this->db->query($sql))
+            return FALSE;
+        return $this->get($id);
+    }
+    function delete ($id)
+    {
+        $r = $this->get($id);
+        if (! $r || ! $this->db->query(
+        'DELETE FROM authors WHERE id = ' . mysql_escape_string($id)))
+            return FALSE;
+        return $r;
+    }
+    private function id2int ($r)
+    {
+        if (is_array($r)) {
+            if (isset($r['id'])) {
+                $r['id'] = intval($r['id']);
+            } else {
+                foreach ($r as &$r0) {
+                    $r0['id'] = intval($r0['id']);
+                }
+            }
+        }
+        return $r;
+    }
+    private function install ()
+    {
+        $this->db->exec(
+        "CREATE TABLE authors (
+            id INT AUTO_INCREMENT PRIMARY KEY ,
+            name TEXT NOT NULL ,
+            email TEXT NOT NULL
+        );");
+        $this->db->exec(
+        "INSERT INTO authors (name, email) VALUES ('Jac Wright', 'jacwright@gmail.com');
+         INSERT INTO authors (name, email) VALUES ('Arul Kumaran', 'arul@luracast.com');
+        ");
+    }
+}
\ No newline at end of file
diff --git a/examples/_006_crud/db_pdo_sqlite.php b/examples/_006_crud/db_pdo_sqlite.php
new file mode 100755
index 000000000..3df81f8f1
--- /dev/null
+++ b/examples/_006_crud/db_pdo_sqlite.php
@@ -0,0 +1,85 @@
+<?php
+/**
+ * SQLite DB. All data is stored in data_pdo_sqlite.sq3 file
+ * This file will be automatically created when missing
+ * Make sure this folder has sufficient write permission 
+ * for this page to create the file.
+ */
+class DB_PDO_Sqlite
+{
+    private $db;
+    function __construct ()
+    {
+        $file = dirname(__FILE__) . '/data_pdo_sqlite.sq3';
+        $db_found = file_exists($file);
+        $this->db = new PDO('sqlite:' . $file);
+        $this->db->setAttribute(PDO::ATTR_DEFAULT_FETCH_MODE, PDO::FETCH_ASSOC);
+        if (! $db_found)
+            $this->install();
+    }
+    function get ($id)
+    {
+        $sql = 'SELECT * FROM authors WHERE id = ' . mysql_escape_string($id);
+        return $this->id2int($this->db->query($sql)
+            ->fetch());
+    }
+    function getAll ()
+    {
+        $stmt = $this->db->query('SELECT * FROM authors');
+        return $this->id2int($stmt->fetchAll());
+    }
+    function insert ($rec)
+    {
+        $name = mysql_escape_string($rec['name']);
+        $email = mysql_escape_string($rec['email']);
+        $sql = "INSERT INTO authors (name, email) VALUES ('$name', '$email')";
+        if (! $this->db->query($sql))
+            return FALSE;
+        return $this->get($this->db->lastInsertId());
+    }
+    function update ($id, $rec)
+    {
+        $id = mysql_escape_string($id);
+        $name = mysql_escape_string($rec['name']);
+        $email = mysql_escape_string($rec['email']);
+        $sql = "UPDATE authors SET name = '$name', email ='$email' WHERE id = $id";
+        if (! $this->db->query($sql))
+            return FALSE;
+        return $this->get($id);
+    }
+    function delete ($id)
+    {
+        $r = $this->get($id);
+        if (! $r ||
+         ! $this->db->query(
+        'DELETE FROM authors WHERE id = ' . mysql_escape_string($id)))
+            return FALSE;
+        return $r;
+    }
+    private function id2int ($r)
+    {
+        if (is_array($r)) {
+            if (isset($r['id'])) {
+                $r['id'] = intval($r['id']);
+            } else {
+                foreach ($r as &$r0) {
+                    $r0['id'] = intval($r0['id']);
+                }
+            }
+        }
+        return $r;
+    }
+    private function install ()
+    {
+        $this->db->exec(
+        "CREATE TABLE authors(
+            'id' INTEGER PRIMARY KEY AUTOINCREMENT,
+            'name' TEXT,
+            'email' TEXT
+        )");
+        $this->db->exec(
+        "INSERT INTO authors (name, email) VALUES ('Jac Wright', 'jacwright@gmail.com');
+         INSERT INTO authors (name, email) VALUES ('Arul Kumaran', 'arul@luracast.com');
+        ");
+    }
+}
\ No newline at end of file
diff --git a/examples/_006_crud/db_serialized_file.php b/examples/_006_crud/db_serialized_file.php
new file mode 100755
index 000000000..c24250c14
--- /dev/null
+++ b/examples/_006_crud/db_serialized_file.php
@@ -0,0 +1,96 @@
+<?php
+/**
+ * Flat File DB. All data is serialized and stored in data_serialized.php
+ * This file will be automatically created when missing
+ * Make sure this folder has sufficient write permission 
+ * for this script to create the file.
+ */
+class DB_Serialized_File
+{
+    private $arr;
+    private $modifed = FALSE;
+    private $file;
+    function __construct ()
+    {
+        $this->file = $file = dirname(__FILE__) . DIRECTORY_SEPARATOR .
+         'data_serialized.php';
+        /** load data from file **/
+        if (file_exists($file)) {
+            $this->arr = require_once $file;
+        } else {
+            $this->install();
+        }
+    }
+    function __destruct ()
+    {
+        if ($this->modifed) {
+            /** save data **/
+            $content = "<?php\n";
+            $content .= 'return ' . var_export($this->arr, TRUE) . ';';
+            file_put_contents($this->file, $content);
+        }
+    }
+    private function pk ()
+    {
+        return $this->arr['pk'] ++;
+    }
+    private function find ($id)
+    {
+        foreach ($this->arr['rs'] as $index => $rec) {
+            if ($rec['id'] == $id) {
+                return $index;
+            }
+        }
+        return FALSE;
+    }
+    function get ($id)
+    {
+        $index = $this->find($id);
+        if ($index === FALSE)
+            return FALSE;
+        return $this->arr['rs'][$index];
+    }
+    function getAll ()
+    {
+        return $this->arr['rs'];
+    }
+    function insert ($rec)
+    {
+        $rec['id'] = $this->pk();
+        $this->modifed = TRUE;
+        array_push($this->arr['rs'], $rec);
+        return $rec;
+    }
+    function update ($id, $rec)
+    {
+        $index = $this->find($id);
+        if ($index === FALSE)
+            return FALSE;
+        $rec['id'] = $id;
+        $this->modifed = TRUE;
+        $this->arr['rs'][$index] = $rec;
+        return $rec;
+    }
+    function delete ($id)
+    {
+        $index = $this->find($id);
+        if ($index === FALSE)
+            return FALSE;
+        $this->modifed = TRUE;
+        return array_shift(array_splice($this->arr['rs'], $index, 1));
+    }
+    private function install ()
+    {
+        /** install initial data **/
+        $this->arr = array();
+        $this->arr['rs'] = array(
+        array('id' => 1, 
+        'name' => 'Jac Wright', 
+        'email' => 'jacwright@gmail.com'), 
+        array('id' => 2, 
+        'name' => 'Arul Kumaran', 
+        'email' => 'arul@luracast.com'));
+        $this->arr['pk'] = 5;
+        $this->modifed = TRUE;
+    }
+}
\ No newline at end of file
diff --git a/examples/_006_crud/db_session.php b/examples/_006_crud/db_session.php
new file mode 100755
index 000000000..84ccd8c9b
--- /dev/null
+++ b/examples/_006_crud/db_session.php
@@ -0,0 +1,70 @@
+<?php
+/**
+ * Fake Database. All records are stored in $_SESSION
+ */
+class DB_Session
+{
+    function __construct ()
+    {
+        session_start();
+        if (! isset($_SESSION['pk'])) {
+            $this->install();
+        }
+    }
+    private function pk ()
+    {
+        return $_SESSION['pk'] ++;
+    }
+    private function find ($id)
+    {
+        foreach ($_SESSION['rs'] as $index => $rec) {
+            if ($rec['id'] == $id) {
+                return $index;
+            }
+        }
+        return FALSE;
+    }
+    function get ($id)
+    {
+        $index = $this->find($id);
+        if ($index === FALSE)
+            return FALSE;
+        return $_SESSION['rs'][$index];
+    }
+    function getAll ()
+    {
+        return $_SESSION['rs'];
+    }
+    function insert ($rec)
+    {
+        $rec['id'] = $this->pk();
+        array_push($_SESSION['rs'], $rec);
+        return $rec;
+    }
+    function update ($id, $rec)
+    {
+        $index = $this->find($id);
+        if ($index === FALSE)
+            return FALSE;
+        $rec['id'] = $id;
+        $_SESSION['rs'][$index] = $rec;
+        return $rec;
+    }
+    function delete ($id)
+    {
+        $index = $this->find($id);
+        if ($index === FALSE)
+            return FALSE;
+        return array_shift(array_splice($_SESSION['rs'], $index, 1));
+    }
+    private function install ()
+    {
+        /** install initial data **/
+        $_SESSION['pk'] = 5;
+        $_SESSION['rs'] = array(
+        array('id' => 1, 'name' => 'Jac Wright', 
+        'email' => 'jacwright@gmail.com'), 
+        array('id' => 2, 'name' => 'Arul Kumaran', 
+        'email' => 'arul@luracast.com'));
+    }
+}
\ No newline at end of file
diff --git a/examples/_006_crud/index.php b/examples/_006_crud/index.php
index 4aef23de3..89028131d 100755
--- a/examples/_006_crud/index.php
+++ b/examples/_006_crud/index.php
@@ -2,14 +2,14 @@
 /*
  Title: CRUD.
  Tagline: using POST, GET, PUT and DELETE.
- Description: Create, Retrive, Update and Delete using 
+ Description: Create, Retrieve, Update and Delete using 
  HTTP methods POST, GET, PUT and DELETE respectively. 
  
 **How the automatic routing is done?**
 
 Restler uses *get, put, post, and delete* as prefix to map PHP methods to 
 respective HTTP methods. When they are the only method names they map at
-the class level similar to *index* and *default*
+the class level similar to *index*
 
 	GET/POST/PUT/DELETE class_name
 
@@ -34,7 +34,7 @@
  
  Alternatively you can use [cURL](http://en.wikipedia.org/wiki/CURL) on the command line. 
  
- 	curl-X POST http://help.luracast.com/restler/examples/_006_crud/index.php/author -H "Content-Type: application/json" -d '{"name": "Another", "email": "another@email.com"}'
+ 	curl -X POST http://help.luracast.com/restler/examples/_006_crud/index.php/author -H "Content-Type: application/json" -d '{"name": "Another", "email": "another@email.com"}'
  	
  	{
       "name": "Another",
@@ -42,8 +42,15 @@
       "id": 5
 	}
 
-But since the session wont be working next request wont reflect the 
-change done by previous request, anyway you get the idea. 
+But since the session wont be working, next request wont reflect the 
+change done by previous request, anyway you get the idea. You may use any of the following files 
+instead of db_session.php to get full functionality. 
+
+> * db_serialized_file.php (File)
+> * db_pdo_sqlite.php      (SQlite)
+> * db_pdo_mysql.php      (MySQL)
+
+by uncommenting the respective line in author.php and commenting others. 
 .
 
  Example 1: GET author returns 
@@ -140,10 +147,15 @@
 	  "name": "Another",
 	  "email": "another@email.com",
 	  "id": 7
-	}.
-	
- Helper Classes: SessionDB.
- */
+	}
+ 
+ *[db_pdo_sqlite.php]: _006_crud/db_pdo_sqlite.php
+ *[db_serialized_file.php]: _006_crud/db_serialized_file.php
+ *[db_pdo_mysql.php]: _006_crud/db_pdo_mysql.php
+	.
+ 
+ Helper Classes: DB_Session.
+  */
 
 require_once '../../restler/restler.php';
 
diff --git a/examples/_006_crud/readme.html b/examples/_006_crud/readme.html
index 9c1794a42..dddc0a8ad 100755
--- a/examples/_006_crud/readme.html
+++ b/examples/_006_crud/readme.html
@@ -14,13 +14,20 @@
 
 <script type="text/javascript">
  $(document).ready(function(){
- 	 //$('a[target*=_blank]').facebox();
-	 $("abbr").click(function(){
-	 	$('#codeviewer').load('../resources/getsource.php?file='+$(this).attr("title"), function(){
-	 		$("pre#php").snippet("php",{style:"acid",showNum:false});
-	 		jQuery.facebox({ div: '#codeviewer' });
-	 	});
- 	 });
+    //$('a[target*=_blank]').facebox();
+    $("abbr").click(function(){
+        $('#codeviewer').load('../resources/getsource.php?file='+$(this).attr("title"), function(){
+        	$("pre#php").snippet("php",{style:"acid",showNum:false});
+        	jQuery.facebox({ div: '#codeviewer' });
+        });
+    });
+    var curURL = window.location.pathname.split('/examples/')[1];
+    if(curURL=='')curURL='index.html';
+    $("a").each(function(){
+        if ($(this).attr("href").indexOf(curURL)>-1){
+            $(this).addClass("active");
+        }  
+    });
  })
 </script>
 <!--[if lte IE 8]>
@@ -50,14 +57,14 @@ <h3><a href="../index.html">Examples</a></h3>
 <div class="right"><small>6</small></div>
 <h2>CRUD</h2>
 
-<p>Create, Retrive, Update and Delete using 
+<p>Create, Retrieve, Update and Delete using 
 HTTP methods POST, GET, PUT and DELETE respectively.</p>
 
 <p><strong>How the automatic routing is done?</strong></p>
 
 <p>Restler uses <em>get, put, post, and delete</em> as prefix to map PHP methods to 
 respective HTTP methods. When they are the only method names they map at
-the class level similar to <em>index</em> and <em>default</em></p>
+the class level similar to <em>index</em></p>
 
 <pre><code>GET/POST/PUT/DELETE class_name
 </code></pre>
@@ -84,7 +91,7 @@ <h2>CRUD</h2>
 
 <p>Alternatively you can use <a href="http://en.wikipedia.org/wiki/CURL" target="_blank">cURL</a> on the command line.</p>
 
-<pre><code>curl-X POST http://help.luracast.com/restler/examples/_006_crud/index.php/author -H "Content-Type: application/json" -d '{"name": "Another", "email": "another@email.com"}'
+<pre><code>curl -X POST http://help.luracast.com/restler/examples/_006_crud/index.php/author -H "Content-Type: application/json" -d '{"name": "Another", "email": "another@email.com"}'
 
 {
  "name": "Another",
@@ -93,8 +100,19 @@ <h2>CRUD</h2>
 }
 </code></pre>
 
-<p>But since the session wont be working next request wont reflect the 
-change done by previous request, anyway you get the idea.</p>
+<p>But since the session wont be working, next request wont reflect the 
+change done by previous request, anyway you get the idea. You may use any of the following files 
+instead of <abbr title="_006_crud/db_session.php">db_session.php</abbr> to get full functionality.</p>
+
+<blockquote>
+  <ul>
+  <li><abbr title="_006_crud/db_serialized_file.php">db_serialized_file.php</abbr> (File)</li>
+  <li><abbr title="_006_crud/db_pdo_sqlite.php">db_pdo_sqlite.php</abbr>      (SQlite)</li>
+  <li><abbr title="_006_crud/db_pdo_mysql.php">db_pdo_mysql.php</abbr>      (MySQL)</li>
+  </ul>
+</blockquote>
+
+<p>by uncommenting the respective line in <abbr title="_006_crud/author.php">author.php</abbr> and commenting others.</p>
 
 <blockquote>
   <p>This API Server is made using the following php files/folders</p>
@@ -102,7 +120,7 @@ <h2>CRUD</h2>
   <ul>
   <li><abbr title="_006_crud/index.php">index.php</abbr>      (gateway)</li>
   <li><abbr title="_006_crud/author.php">author.php</abbr>      (api)</li>
-  <li><abbr title="_006_crud/sessiondb.php">sessiondb.php</abbr>      (helper)</li>
+  <li><abbr title="_006_crud/db_session.php">db_session.php</abbr>      (helper)</li>
   <li><abbr title="../restler/restler.php">restler.php</abbr>      (framework)</li>
   </ul>
 </blockquote>
diff --git a/examples/_006_crud/readme.md b/examples/_006_crud/readme.md
index b54de64e5..4cd52fa80 100755
--- a/examples/_006_crud/readme.md
+++ b/examples/_006_crud/readme.md
@@ -1,14 +1,14 @@
 CRUD
 ----
 
-Create, Retrive, Update and Delete using 
+Create, Retrieve, Update and Delete using 
 HTTP methods POST, GET, PUT and DELETE respectively. 
 
 **How the automatic routing is done?**
 
 Restler uses *get, put, post, and delete* as prefix to map PHP methods to 
 respective HTTP methods. When they are the only method names they map at
-the class level similar to *index* and *default*
+the class level similar to *index*
 
 	GET/POST/PUT/DELETE class_name
 
@@ -33,7 +33,7 @@ a firefox extension.
 
 Alternatively you can use [cURL](http://en.wikipedia.org/wiki/CURL) on the command line. 
 
-	curl-X POST http://help.luracast.com/restler/examples/_006_crud/index.php/author -H "Content-Type: application/json" -d '{"name": "Another", "email": "another@email.com"}'
+	curl -X POST http://help.luracast.com/restler/examples/_006_crud/index.php/author -H "Content-Type: application/json" -d '{"name": "Another", "email": "another@email.com"}'
 	
 	{
      "name": "Another",
@@ -41,13 +41,20 @@ Alternatively you can use [cURL](http://en.wikipedia.org/wiki/CURL) on the comma
      "id": 5
 	}
 
-But since the session wont be working next request wont reflect the 
-change done by previous request, anyway you get the idea.
+But since the session wont be working, next request wont reflect the 
+change done by previous request, anyway you get the idea. You may use any of the following files 
+instead of db_session.php to get full functionality. 
+
+> * db_serialized_file.php (File)
+> * db_pdo_sqlite.php      (SQlite)
+> * db_pdo_mysql.php      (MySQL)
+
+by uncommenting the respective line in author.php and commenting others.
 > This API Server is made using the following php files/folders
 
 > * index.php      (gateway)
 > * author.php      (api)
-> * sessiondb.php      (helper)
+> * db_session.php      (helper)
 > * restler.php      (framework)
 
 This API Server exposes the following URIs
@@ -162,7 +169,11 @@ and the response could be
 	  "id": 7
 	}
 
+*[db_pdo_sqlite.php]: _006_crud/db_pdo_sqlite.php
+*[db_serialized_file.php]: _006_crud/db_serialized_file.php
+*[db_pdo_mysql.php]: _006_crud/db_pdo_mysql.php
+
 *[index.php]: _006_crud/index.php
 *[author.php]: _006_crud/author.php
-*[sessiondb.php]: _006_crud/sessiondb.php
+*[db_session.php]: _006_crud/db_session.php
 *[restler.php]: ../restler/restler.php
diff --git a/examples/_006_crud/sessiondb.php b/examples/_006_crud/sessiondb.php
deleted file mode 100755
index 1cef0dcec..000000000
--- a/examples/_006_crud/sessiondb.php
+++ /dev/null
@@ -1,57 +0,0 @@
-<?php
-/**
- * Fake Database. All records are stored in $_SESSION
- */
-class SessionDB {
-	function __construct() {
-		session_start();
-		if (!isset($_SESSION['pk'])) {
-			$_SESSION['pk'] = 5;
-			$_SESSION['rs'] = getData();
-		}
-	}
-	private function pk() {
-		return $_SESSION['pk']++;
-	}
-	private function find($id){
-		foreach ($_SESSION['rs'] as $index=>$rec) {
-			if ($rec['id'] == $id) {
-				return $index;
-			}
-		}
-		return FALSE;
-	}
-	function get($id) {
-		$index = $this->find($id);
-		if($index===FALSE)return FALSE;
-		return $_SESSION['rs'][$index];
-	}
-	function getAll() {
-		return $_SESSION['rs'];
-	}
-	public function insert($rec) {
-		$rec['id']=$this->pk();
-		array_push($_SESSION['rs'], $rec);
-		return $rec;
-	}
-	public function update($id, $rec) {
-		$index = $this->find($id);
-		if($index===FALSE)return FALSE;
-		$rec['id']=$id;
-		$_SESSION['rs'][$index]=$rec;
-		return $rec;
-	}
-	public function delete($id) {
-		$index = $this->find($id);
-		if($index===FALSE)return FALSE;
-		return array_shift(array_splice($_SESSION['rs'], $index, 1));
-	}
-}
-
-// Sample data.
-function getData() {
-	return array(
-	array('id'=>1,	'name'=>'Jac Wright',   'email'=>'jacwright@gmail.com'),
-	array('id'=>2,	'name'=>'Arul Kumaran', 'email'=>'arul@luracast.com'  ),
-	);
-}
\ No newline at end of file
diff --git a/examples/index.html b/examples/index.html
old mode 100644
new mode 100755
index 346317a98..2e3268cc9
--- a/examples/index.html
+++ b/examples/index.html
@@ -9,13 +9,20 @@
 
 <script type="text/javascript">
  $(document).ready(function(){
- 	 //$('a[target*=_blank]').facebox();
-	 $("abbr").click(function(){
-	 	$('#codeviewer').load('resources/getsource.php?file='+$(this).attr("title"), function(){
-	 		$("pre#php").snippet("php",{style:"acid",showNum:false});
-	 		jQuery.facebox({ div: '#codeviewer' });
-	 	});
- 	 });
+    //$('a[target*=_blank]').facebox();
+    $("abbr").click(function(){
+        $('#codeviewer').load('resources/getsource.php?file='+$(this).attr("title"), function(){
+        	$("pre#php").snippet("php",{style:"acid",showNum:false});
+        	jQuery.facebox({ div: '#codeviewer' });
+        });
+    });
+    var curURL = window.location.pathname.split('/examples/')[1];
+    if(curURL=='')curURL='index.html';
+    $("a").each(function(){
+        if ($(this).attr("href").indexOf(curURL)>-1){
+            $(this).addClass("active");
+        }  
+    });
  })
 </script>
 <!--[if lte IE 8]>
@@ -82,7 +89,7 @@ <h2>Live Examples</h2>
 <span>Protected API 
 <small><i>Creating restricted zone</i></small>
 </span> <span class="right">&nbsp;5</span></a></li>
-	<li><a href="_006_crud/readme.html" title="Create, Retrive, Update and Delete using 
+	<li><a href="_006_crud/readme.html" title="Create, Retrieve, Update and Delete using 
 HTTP methods POST, GET, PUT and DELETE respectively. 
 
 **How the automatic routing is done?**

From 9fb97cc206d31eb349c5273a652dd12d6f4ad9bb Mon Sep 17 00:00:00 2001
From: Luracast <arul@luracast.com>
Date: Sat, 28 Jan 2012 11:57:33 +0800
Subject: [PATCH 31/61] Fixes #25 YAML format not working on case sensitive
 file systems. Renamed the files to all lowercase and updated the include
 statements

---
 restler/yamlformat/sfyaml.php                                   | 2 +-
 restler/yamlformat/{sfyamlInline.php => sfyamlinline.php}       | 0
 restler_minified/yamlformat/sfyaml.php                          | 2 +-
 .../yamlformat/{sfyamlInline.php => sfyamlinline.php}           | 0
 4 files changed, 2 insertions(+), 2 deletions(-)
 rename restler/yamlformat/{sfyamlInline.php => sfyamlinline.php} (100%)
 rename restler_minified/yamlformat/{sfyamlInline.php => sfyamlinline.php} (100%)

diff --git a/restler/yamlformat/sfyaml.php b/restler/yamlformat/sfyaml.php
index 9fd4670c0..9e4b46203 100755
--- a/restler/yamlformat/sfyaml.php
+++ b/restler/yamlformat/sfyaml.php
@@ -118,7 +118,7 @@ public static function load($input)
    */
   public static function dump($array, $inline = 2)
   {
-    require_once dirname(__FILE__).'/sfYamlDumper.php';
+    require_once dirname(__FILE__).'/sfyamldumper.php';
 
     $yaml = new sfYamlDumper();
 
diff --git a/restler/yamlformat/sfyamlInline.php b/restler/yamlformat/sfyamlinline.php
similarity index 100%
rename from restler/yamlformat/sfyamlInline.php
rename to restler/yamlformat/sfyamlinline.php
diff --git a/restler_minified/yamlformat/sfyaml.php b/restler_minified/yamlformat/sfyaml.php
index 69c5c15f9..6dbc3dddc 100644
--- a/restler_minified/yamlformat/sfyaml.php
+++ b/restler_minified/yamlformat/sfyaml.php
@@ -1,2 +1,2 @@
 <?php
- include_once 'sfyamlinline.php'; class sfYaml { static protected $spec = '1.2'; static public function setSpecVersion($version) { if (!in_array($version, array('1.1', '1.2'))) { throw new InvalidArgumentException(sprintf('Version %s of the YAML specifications is not supported', $version)); } self::$spec = $version; } static public function getSpecVersion() { return self::$spec; } public static function load($input) { $file = ''; if (strpos($input, "\n") === false && is_file($input)) { $file = $input; ob_start(); $retval = include($input); $content = ob_get_clean(); $input = is_array($retval) ? $retval : $content; } if (is_array($input)) { return $input; } require_once dirname(__FILE__).'/sfYamlParser.php'; $yaml = new sfYamlParser(); try { $ret = $yaml->parse($input); } catch (Exception $e) { throw new InvalidArgumentException(sprintf('Unable to parse %s: %s', $file ? sprintf('file "%s"', $file) : 'string', $e->getMessage())); } return $ret; } public static function dump($array, $inline = 2) { require_once dirname(__FILE__).'/sfYamlDumper.php'; $yaml = new sfYamlDumper(); return $yaml->dump($array, $inline); } } function echoln($string) { echo $string."\n"; } 
\ No newline at end of file
+ include_once 'sfyamlinline.php'; class sfYaml { static protected $spec = '1.2'; static public function setSpecVersion($version) { if (!in_array($version, array('1.1', '1.2'))) { throw new InvalidArgumentException(sprintf('Version %s of the YAML specifications is not supported', $version)); } self::$spec = $version; } static public function getSpecVersion() { return self::$spec; } public static function load($input) { $file = ''; if (strpos($input, "\n") === false && is_file($input)) { $file = $input; ob_start(); $retval = include($input); $content = ob_get_clean(); $input = is_array($retval) ? $retval : $content; } if (is_array($input)) { return $input; } require_once dirname(__FILE__).'/sfYamlParser.php'; $yaml = new sfYamlParser(); try { $ret = $yaml->parse($input); } catch (Exception $e) { throw new InvalidArgumentException(sprintf('Unable to parse %s: %s', $file ? sprintf('file "%s"', $file) : 'string', $e->getMessage())); } return $ret; } public static function dump($array, $inline = 2) { require_once dirname(__FILE__).'/sfyamldumper.php'; $yaml = new sfYamlDumper(); return $yaml->dump($array, $inline); } } function echoln($string) { echo $string."\n"; } 
\ No newline at end of file
diff --git a/restler_minified/yamlformat/sfyamlInline.php b/restler_minified/yamlformat/sfyamlinline.php
similarity index 100%
rename from restler_minified/yamlformat/sfyamlInline.php
rename to restler_minified/yamlformat/sfyamlinline.php

From 0d1cc7e7b1cf4cff01f4e2d01df27363b8bd6846 Mon Sep 17 00:00:00 2001
From: Luracast <arul@luracast.com>
Date: Wed, 1 Feb 2012 01:04:23 +0800
Subject: [PATCH 32/61] Wikipedia link for the HTTP Status codes updated

---
 examples/_004_error_response/index.php   |  2 +-
 examples/_004_error_response/readme.html | 23 +++++++++++++++--------
 examples/_004_error_response/readme.md   |  2 +-
 3 files changed, 17 insertions(+), 10 deletions(-)

diff --git a/examples/_004_error_response/index.php b/examples/_004_error_response/index.php
index 8a3415cd7..91e0c40af 100755
--- a/examples/_004_error_response/index.php
+++ b/examples/_004_error_response/index.php
@@ -9,7 +9,7 @@
  to the client. 
  
  For the list of HTTP Status codes and their meaning take a look at 
- [Wikipedia](http://en.wikipedia.org/wiki/List_of_httpStatusCodes).
+ [Wikipedia](http://en.wikipedia.org/wiki/Http_status_codes).
  
  Example 1: GET currency/format returns 
  
diff --git a/examples/_004_error_response/readme.html b/examples/_004_error_response/readme.html
index d8394abf1..97229163d 100755
--- a/examples/_004_error_response/readme.html
+++ b/examples/_004_error_response/readme.html
@@ -14,13 +14,20 @@
 
 <script type="text/javascript">
  $(document).ready(function(){
- 	 //$('a[target*=_blank]').facebox();
-	 $("abbr").click(function(){
-	 	$('#codeviewer').load('../resources/getsource.php?file='+$(this).attr("title"), function(){
-	 		$("pre#php").snippet("php",{style:"acid",showNum:false});
-	 		jQuery.facebox({ div: '#codeviewer' });
-	 	});
- 	 });
+    //$('a[target*=_blank]').facebox();
+    $("abbr").click(function(){
+        $('#codeviewer').load('../resources/getsource.php?file='+$(this).attr("title"), function(){
+        	$("pre#php").snippet("php",{style:"acid",showNum:false});
+        	jQuery.facebox({ div: '#codeviewer' });
+        });
+    });
+    var curURL = window.location.pathname.split('/examples/')[1];
+    if(curURL=='')curURL='index.html';
+    $("a").each(function(){
+        if ($(this).attr("href").indexOf(curURL)>-1){
+            $(this).addClass("active");
+        }  
+    });
  })
 </script>
 <!--[if lte IE 8]>
@@ -57,7 +64,7 @@ <h2>Error Response</h2>
 to the client.</p>
 
 <p>For the list of HTTP Status codes and their meaning take a look at 
-<a href="http://en.wikipedia.org/wiki/List_of_httpStatusCodes" target="_blank">Wikipedia</a></p>
+<a href="http://en.wikipedia.org/wiki/Http_status_codes" target="_blank">Wikipedia</a></p>
 
 <blockquote>
   <p>This API Server is made using the following php files/folders</p>
diff --git a/examples/_004_error_response/readme.md b/examples/_004_error_response/readme.md
index 254549a63..276609b54 100755
--- a/examples/_004_error_response/readme.md
+++ b/examples/_004_error_response/readme.md
@@ -8,7 +8,7 @@ use `throw new RestException($httpStatusCode)` to send the error response
 to the client. 
 
 For the list of HTTP Status codes and their meaning take a look at 
-[Wikipedia](http://en.wikipedia.org/wiki/List_of_httpStatusCodes)
+[Wikipedia](http://en.wikipedia.org/wiki/Http_status_codes)
 > This API Server is made using the following php files/folders
 
 > * index.php      (gateway)

From acb96dd9881078b76a9ed66808365f8520eb06a4 Mon Sep 17 00:00:00 2001
From: Luracast <arul@luracast.com>
Date: Sun, 12 Feb 2012 00:43:04 +0800
Subject: [PATCH 33/61] Fixes #27 PHP Strict Standards: Only variables should
 be passed by reference

---
 restler/restler.php          | 9 +++++----
 restler_minified/restler.php | 2 +-
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/restler/restler.php b/restler/restler.php
index fecf400a4..979105bba 100644
--- a/restler/restler.php
+++ b/restler/restler.php
@@ -10,10 +10,10 @@
  * @copyright  2010 Luracast
  * @license    http://www.opensource.org/licenses/lgpl-license.php LGPL
  * @link       http://luracast.com/products/restler/
- * @version    2.1.0
+ * @version    2.1.2
  */
 class Restler {
-	const VERSION = '2.1.0';
+	const VERSION = '2.1.2';
 	/**
 	 * URL of the currently mapped service
 	 * @var string
@@ -510,7 +510,8 @@ protected function getResponseFormat () {
 		PHP_URL_PATH));
 		while($extensions){
 			$extension = array_pop($extensions);
-			$extension = array_shift(explode('/', $extension));
+            $extension = explode('/', $extension);
+            $extension = array_shift($extensions);
 			if($extension && isset($this->format_map[$extension])){
 				$format = $this->format_map[$extension];
 				$format = is_string($format) ? new $format: $format;
@@ -646,7 +647,7 @@ protected function loadCache()
 	 * @param string $class_name
 	 * @param string $base_path
 	 */
-	protected function generateMap ($class_name, $base_path = "") {
+	protected function generateMap ($class_name, $base_path = '') {
 		$reflection = new ReflectionClass($class_name);
 		$class_metadata = parse_doc($reflection->getDocComment());
 		$methods = $reflection->getMethods(
diff --git a/restler_minified/restler.php b/restler_minified/restler.php
index 9c6b9f6a0..7cecdfaa9 100644
--- a/restler_minified/restler.php
+++ b/restler_minified/restler.php
@@ -1,5 +1,5 @@
 <?php
- class Restler { const VERSION = '2.1.0'; public $url; public $request_method; public $request_format; public $request_data=array(); public $cache_dir; public $base_dir; public $response = 'DefaultResponse'; public $response_format; protected $production_mode; protected $routes= array(); protected $format_map = array(); protected $service_class_instance; protected $service_method; protected $auth_classes = array(); protected $error_classes = array(); private $codes = array( 100 => 'Continue', 101 => 'Switching Protocols', 200 => 'OK', 201 => 'Created', 202 => 'Accepted', 203 => 'Non-Authoritative Information', 204 => 'No Content', 205 => 'Reset Content', 206 => 'Partial Content', 300 => 'Multiple Choices', 301 => 'Moved Permanently', 302 => 'Found', 303 => 'See Other', 304 => 'Not Modified', 305 => 'Use Proxy', 306 => '(Unused)', 307 => 'Temporary Redirect', 400 => 'Bad Request', 401 => 'Unauthorized', 402 => 'Payment Required', 403 => 'Forbidden', 404 => 'Not Found', 405 => 'Method Not Allowed', 406 => 'Not Acceptable', 407 => 'Proxy Authentication Required', 408 => 'Request Timeout', 409 => 'Conflict', 410 => 'Gone', 411 => 'Length Required', 412 => 'Precondition Failed', 413 => 'Request Entity Too Large', 414 => 'Request-URI Too Long', 415 => 'Unsupported Media Type', 416 => 'Requested Range Not Satisfiable', 417 => 'Expectation Failed', 500 => 'Internal Server Error', 501 => 'Not Implemented', 502 => 'Bad Gateway', 503 => 'Service Unavailable', 504 => 'Gateway Timeout', 505 => 'HTTP Version Not Supported' ); protected $cached; public function __construct ($production_mode = FALSE) { $this->production_mode = $production_mode; $this->cache_dir = getcwd(); $this->base_dir = RESTLER_PATH; } public function __destruct () { if ($this->production_mode && !$this->cached) { $this->saveCache(); } } public function refreshCache () { $this->routes = array(); $this->cached = FALSE; } public function setSupportedFormats () { $args = func_get_args(); $extensions = array(); foreach ($args as $class_name) { if(!is_string($class_name) || !class_exists($class_name)){ throw new Exception("$class_name is not a vaild Format Class."); } $obj = new $class_name; if(! $obj instanceof iFormat){ throw new Exception('Invalid format class; must implement '. 'iFormat interface'); } foreach ($obj->getMIMEMap() as $extension => $mime) { if(!isset($this->format_map[$extension])) $this->format_map[$extension]=$class_name; if(!isset($this->format_map[$mime])) $this->format_map[$mime]=$class_name; $extensions[".$extension"]=TRUE; } } $this->format_map['default']=$args[0]; $this->format_map['extensions']=array_keys($extensions); } public function addAPIClass($class_name, $base_path = NULL) { if(!class_exists($class_name)){ throw new Exception("API class $class_name is missing."); } $this->loadCache(); if(!$this->cached){ if(is_null($base_path))$base_path=strtolower($class_name); $base_path = trim($base_path,'/'); if(strlen($base_path)>0)$base_path .= '/'; $this->generateMap($class_name, $base_path); } } public function addAuthenticationClass ($class_name, $base_path = NULL) { $this->auth_classes[] = $class_name; $this->addAPIClass($class_name, $base_path); } public function addErrorClass ($class_name) { $this->error_classes[] = $class_name; } public function handleError ($status_code, $error_message = NULL) { $method = "handle$status_code"; $handled = FALSE; foreach ($this->error_classes as $class_name) { if (method_exists($class_name, $method)) { $obj = new $class_name(); $obj->restler = $this; $obj->$method(); $handled = TRUE; } } if($handled)return; $message = $this->codes[$status_code] . (!$error_message ? '' : ': ' . $error_message); $this->setStatus($status_code); $this->sendData( call_user_func( array($this->response, '__formatError'), $status_code, $message) ); } public function handle () { if(empty($this->format_map))$this->setSupportedFormats('JsonFormat'); $this->url = $this->getPath(); $this->request_method = $this->getRequestMethod(); $this->response_format = $this->getResponseFormat(); $this->request_format = $this->getRequestFormat(); if(is_null($this->request_format)){ $this->request_format = $this->response_format; } if($this->request_method == 'PUT' || $this->request_method == 'POST'){ $this->request_data = $this->getRequestData(); } $o = $this->mapUrlToMethod(); if(!isset($o->class_name)){ $this->handleError(404); }else{ try { if($o->method_flag){ $auth_method = '__isAuthenticated'; if(!count($this->auth_classes))throw new RestException(401); foreach ($this->auth_classes as $auth_class) { $auth_obj = new $auth_class(); $auth_obj->restler=$this; $this->applyClassMetadata($auth_class, $auth_obj, $o); if (!method_exists($auth_obj, $auth_method)) { throw new RestException(401, 'Authentication Class '. 'should implement iAuthenticate'); }elseif(!$auth_obj->$auth_method()){ throw new RestException(401); } } } $this->applyClassMetadata(get_class($this->request_format), $this->request_format, $o); $pre_process = '_'.$this->request_format->getExtension().'_'. $o->method_name; $this->service_method = $o->method_name; if($o->method_flag==2)$o=unprotect($o); $object = $this->service_class_instance = new $o->class_name(); $object->restler=$this; if(method_exists($o->class_name, $pre_process)) { call_user_func_array(array($object, $pre_process), $o->arguments); } switch ($o->method_flag) { case 3: $reflection_method = new ReflectionMethod($object, $o->method_name); $reflection_method->setAccessible(TRUE); $result = $reflection_method->invokeArgs($object, $o->arguments); break; case 2: case 1: default: $result = call_user_func_array(array($object, $o->method_name), $o->arguments); } } catch (RestException $e) { $this->handleError($e->getCode(), $e->getMessage()); } } if (isset($result) && $result !== NULL) { $this->sendData($result); } } public function sendData($data) { $data = $this->response_format->encode($data, !$this->production_mode); $post_process = '_'.$this->service_method .'_'. $this->response_format->getExtension(); if(isset($this->service_class_instance) && method_exists($this->service_class_instance,$post_process)){ $data = call_user_func(array($this->service_class_instance, $post_process), $data); } header("Cache-Control: no-cache, must-revalidate"); header("Expires: 0"); header('Content-Type: ' . $this->response_format->getMIME()); header("X-Powered-By: Luracast Restler v".Restler::VERSION); die($data); } public function setStatus($code) { header("{$_SERVER['SERVER_PROTOCOL']} $code ". $this->codes[strval($code)]); } public function removeCommonPath($first, $second, $char='/'){ $first = explode($char, $first); $second = explode($char, $second); while (count($second)){ if($first[0]==$second[0]){ array_shift($first); } else break; array_shift($second); } return implode($char, $first); } public function saveCache() { $file = $this->cache_dir . '/routes.php'; $s = '$o=array();'.PHP_EOL; foreach ($this->routes as $key => $value) { $s .= PHP_EOL.PHP_EOL.PHP_EOL."############### $key ###############" .PHP_EOL.PHP_EOL; $s .= '$o[\''.$key.'\']=array();'; foreach ($value as $ke => $va) { $s .= PHP_EOL.PHP_EOL."#==== $key $ke".PHP_EOL.PHP_EOL; $s .= '$o[\''.$key.'\'][\''.$ke.'\']='.str_replace(PHP_EOL, PHP_EOL."\t", var_export($va, TRUE)).';'; } } $s .= PHP_EOL.'return $o;'; $r=@file_put_contents($file, "<?php $s"); @chmod($file, 0777); if($r===FALSE)throw new Exception( "The cache directory located at '$this->cache_dir' needs to have ". "the permissions set to read/write/execute for everyone in order ". "to save cache and improve performance."); } protected function getPath () { $path = urldecode($this->removeCommonPath($_SERVER['REQUEST_URI'], $_SERVER['SCRIPT_NAME'])); $path = preg_replace('/(\/*\?.*$)|(\/$)/', '', $path); $path = str_replace($this->format_map['extensions'], '', $path); return $path; } protected function getRequestMethod () { $method = $_SERVER['REQUEST_METHOD']; if (isset($_SERVER['HTTP_X_HTTP_METHOD_OVERRIDE'])){ $method = $_SERVER['HTTP_X_HTTP_METHOD_OVERRIDE']; } if($method=='HEAD')$method='GET'; return $method; } protected function getRequestFormat () { $format=NULL; if(isset($_SERVER['CONTENT_TYPE'])){ $mime = explode(';', $_SERVER['CONTENT_TYPE']); $mime = $mime[0]; if($mime==UrlEncodedFormat::MIME){ $format = new UrlEncodedFormat(); }else{ if(isset($this->format_map[$mime])){ $format = $this->format_map[$mime]; $format = is_string($format) ? new $format: $format; $format->setMIME($mime); } } } return $format; } protected function getResponseFormat () { $format=NULL; $extensions = explode('.', parse_url($_SERVER['REQUEST_URI'], PHP_URL_PATH)); while($extensions){ $extension = array_pop($extensions); $extension = array_shift(explode('/', $extension)); if($extension && isset($this->format_map[$extension])){ $format = $this->format_map[$extension]; $format = is_string($format) ? new $format: $format; $format->setExtension($extension); return $format; } } if(isset($_SERVER['HTTP_ACCEPT'])){ $accepts = explode(',', $_SERVER['HTTP_ACCEPT']); foreach ($accepts as $accept) { if($extension && isset($this->format_map[$accept])){ $format = $this->format_map[$accept]; $format = is_string($format) ? new $format: $format; $format->setMIME($accept); return $format; } } } $format = new $this->format_map['default']; return $format; } protected function getRequestData() { try { $r = file_get_contents ( 'php://input' ); if (is_null ( $r )) return $_GET; $r = $this->request_format->decode ( $r ); return is_null ( $r ) ? array () : $r; } catch ( RestException $e ) { $this->handleError ( $e->getCode (), $e->getMessage () ); } } protected function mapUrlToMethod () { if(!isset($this->routes[$this->request_method])){ return array(); } $urls = $this->routes[$this->request_method]; if(!$urls)return array(); $found = FALSE; $this->request_data += $_GET; $params = array('request_data'=>$this->request_data); $params += $this->request_data; foreach ($urls as $url => $call) { $call = (object)$call; if(strstr($url, ':')){ $regex = preg_replace('/\\\:([^\/]+)/', '(?P<$1>[^/]+)', preg_quote($url)); if (preg_match(":^$regex$:", $this->url, $matches)) { foreach ($matches as $arg => $match) { if (isset($call->arguments[$arg])){ $params[$arg] = $match; } } $found = TRUE; break; } }elseif ($url == $this->url){ $found = TRUE; break; } } if($found){ $p = $call->defaults; foreach ($call->arguments as $key => $value) { if(isset($params[$key]))$p[$value] = $params[$key]; } $call->arguments=$p; return $call; } } protected function applyClassMetadata($class_name, $instance, $method_info){ if(isset($method_info->metadata[$class_name]) && is_array($method_info->metadata[$class_name])){ foreach ($method_info->metadata[$class_name] as $property => $value){ if(property_exists($class_name, $property)){ $reflection_property = new ReflectionProperty($class_name, $property); $reflection_property->setValue($instance, $value); } } } } protected function loadCache() { if ($this->cached !== NULL) { return; } $file = $this->cache_dir . '/routes.php'; $this->cached = FALSE; if ($this->production_mode) { if (file_exists($file)) { $routes = include($file); } if (isset($routes) && is_array($routes)) { $this->routes = $routes; $this->cached = TRUE; } } else { } } protected function generateMap ($class_name, $base_path = "") { $reflection = new ReflectionClass($class_name); $class_metadata = parse_doc($reflection->getDocComment()); $methods = $reflection->getMethods( ReflectionMethod::IS_PUBLIC + ReflectionMethod::IS_PROTECTED); foreach ($methods as $method) { $doc = $method->getDocComment(); $arguments = array(); $defaults = array(); $metadata = $class_metadata+parse_doc($doc); $params = $method->getParameters(); $position=0; foreach ($params as $param){ $arguments[$param->getName()] = $position; $defaults[$position] = $param->isDefaultValueAvailable() ? $param->getDefaultValue() : NULL; $position++; } $method_flag = $method->isProtected() ? (isRestlerCompatibilityModeEnabled() ? 2 : 3) : (isset($metadata['protected']) ? 1 : 0); $call = array( 'class_name'=>$class_name, 'method_name'=>$method->getName(), 'arguments'=>$arguments, 'defaults'=>$defaults, 'metadata'=>$metadata, 'method_flag'=>$method_flag ); $method_url = strtolower($method->getName()); if (preg_match_all( '/@url\s+(GET|POST|PUT|DELETE|HEAD|OPTIONS)[ \t]*\/?(\S*)/s', $doc, $matches, PREG_SET_ORDER)) { foreach ($matches as $match) { $http_method = $match[1]; $url = rtrim($base_path . $match[2],'/'); $this->routes[$http_method][$url] = $call; } }elseif($method_url[0] != '_'){ if (preg_match_all('/^(GET|POST|PUT|DELETE|HEAD|OPTIONS)/i', $method_url, $matches)) { $http_method = strtoupper($matches[0][0]); $method_url = substr($method_url, strlen($http_method)); }else{ $http_method = 'GET'; } $url = $base_path. ($method_url=='index' || $method_url=='default' ? '' : $method_url); $url = rtrim($url,'/'); $this->routes[$http_method][$url] = $call; foreach ($params as $param){ if($param->getName()=='request_data'){ break; } $url .= $url=='' ? ':' : '/:'; $url .= $param->getName(); $this->routes[$http_method][$url] = $call; } } } } } if(version_compare(PHP_VERSION, '5.3.0') < 0){ require_once 'compat.php'; } class RestException extends Exception { public function __construct($http_status_code, $error_message = NULL) { parent::__construct($error_message, $http_status_code); } } interface iRespond { public function __formatResponse($result); public function __formatError($status_code, $message); } class DefaultResponse implements iRespond { function __formatResponse($result) { return $result; } function __formatError($statusCode, $message) { return array('error' => array('code' => $statusCode, 'message' => $message)); } } interface iAuthenticate { public function __isAuthenticated(); } interface iFormat { public function getMIMEMap(); public function setMIME($mime); public function getMIME(); public function setExtension($extension); public function getExtension(); public function encode($data, $human_readable=FALSE); public function decode($data); } class UrlEncodedFormat implements iFormat { const MIME = 'application/x-www-form-urlencoded'; const EXTENSION = 'post'; public function getMIMEMap() { return array(self::EXTENSION=>self::MIME); } public function getMIME(){ return self::MIME; } public function getExtension(){ return self::EXTENSION; } public function setMIME($mime){ } public function setExtension($extension){ } public function encode($data, $human_readable=FALSE){ return http_build_query($data); } public function decode($data){ parse_str($data,$r); return $r; } public function __toString(){ return $this->getExtension(); } } class JsonFormat implements iFormat { const MIME ='application/json'; const EXTENSION = 'json'; public function getMIMEMap() { return array(self::EXTENSION=>self::MIME); } public function getMIME(){ return self::MIME; } public function getExtension(){ return self::EXTENSION; } public function setMIME($mime){ } public function setExtension($extension){ } public function encode($data, $human_readable=FALSE){ return $human_readable ? $this->json_format(json_encode(object_to_array($data))) : json_encode(object_to_array($data)); } public function decode($data) { $decoded = json_decode ( $data ); if (function_exists ( 'json_last_error' )) { $message = ''; switch (json_last_error ()) { case JSON_ERROR_NONE : return object_to_array ( $decoded ); break; case JSON_ERROR_DEPTH : $message = 'maximum stack depth exceeded'; break; case JSON_ERROR_STATE_MISMATCH : $message = 'underflow or the modes mismatch'; break; case JSON_ERROR_CTRL_CHAR : $message = 'unexpected control character found'; break; case JSON_ERROR_SYNTAX : $message = 'malformed JSON'; break; case JSON_ERROR_UTF8 : $message = 'malformed UTF-8 characters, possibly incorrectly encoded'; break; default : $message = 'unknown error'; break; } throw new RestException ( 400, 'Error parsing JSON, ' . $message ); } else if (strlen ( $data ) && $decoded === NULL || $decoded === $data) { throw new RestException ( 400, 'Error parsing JSON' ); } return object_to_array ( $decoded ); } private function json_format($json) { $tab = "  "; $new_json = ""; $indent_level = 0; $in_string = FALSE; $len = strlen($json); for($c = 0; $c < $len; $c++) { $char = $json[$c]; switch($char) { case '{': case '[': if(!$in_string) { $new_json .= $char . "\n" . str_repeat($tab, $indent_level+1); $indent_level++; } else { $new_json .= $char; } break; case '}': case ']': if(!$in_string) { $indent_level--; $new_json .= "\n".str_repeat($tab, $indent_level).$char; } else { $new_json .= $char; } break; case ',': if(!$in_string) { $new_json .= ",\n" . str_repeat($tab, $indent_level); } else { $new_json .= $char; } break; case ':': if(!$in_string) { $new_json .= ": "; } else { $new_json .= $char; } break; case '"': if($c==0){ $in_string = TRUE; }elseif($c > 0 && $json[$c-1] != '\\') { $in_string = !$in_string; } default: $new_json .= $char; break; } } return $new_json; } public function __toString(){ return $this->getExtension(); } } class DocParser { private $params=array(); function parse($doc='') { if($doc==''){ return $this->params; } if(preg_match('#^/\*\*(.*)\*/#s', $doc, $comment) === false) return $this->params; $comment = trim($comment[1]); if(preg_match_all('#^\s*\*(.*)#m', $comment, $lines) === false) return $this->params; $this->parseLines($lines[1]); return $this->params; } private function parseLines($lines) { foreach($lines as $line) { $parsedLine = $this->parseLine($line); if($parsedLine === false && !isset($this->params['description'])) { if(isset($desc)){ $this->params['description'] = implode(PHP_EOL, $desc); } $desc = array(); } elseif($parsedLine !== false) { $desc[] = $parsedLine; } } $desc = implode(' ', $desc); if(!empty($desc))$this->params['long_description'] = $desc; } private function parseLine($line) { $line = trim($line); if(empty($line)) return false; if(strpos($line, '@') === 0) { if(strpos($line, ' ')>0){ $param = substr($line, 1, strpos($line, ' ') - 1); $value = substr($line, strlen($param) + 2); }else{ $param = substr($line, 1); $value = ''; } if($this->setParam($param, $value)) return false; } return $line; } private function setParam($param, $value) { if($param == 'param' || $param == 'return') $value = $this->formatParamOrReturn($value); if($param == 'class') list($param, $value) = $this->formatClass($value); if(empty($this->params[$param])) { $this->params[$param] = $value; } else if($param == 'param'){ $arr = array($this->params[$param], $value); $this->params[$param] = $arr; } else { $this->params[$param] = $value + $this->params[$param]; } return true; } private function formatClass($value) { $r = preg_split("[\(|\)]",$value); if(is_array($r)){ $param = $r[0]; parse_str($r[1],$value); foreach ($value as $key => $val) { $val = explode(',', $val); if(count($val)>1)$value[$key]=$val; } }else{ $param='Unknown'; } return array($param, $value); } private function formatParamOrReturn($string) { $pos = strpos($string, ' '); $type = substr($string, 0, $pos); return '(' . $type . ')' . substr($string, $pos+1); } } function parse_doc($php_doc_comment){ $p = new DocParser(); return $p->parse($php_doc_comment); $p = new Parser($php_doc_comment); return $p; $php_doc_comment = preg_replace("/(^[\\s]*\\/\\*\\*)
+ class Restler { const VERSION = '2.1.2'; public $url; public $request_method; public $request_format; public $request_data=array(); public $cache_dir; public $base_dir; public $response = 'DefaultResponse'; public $response_format; protected $production_mode; protected $routes= array(); protected $format_map = array(); protected $service_class_instance; protected $service_method; protected $auth_classes = array(); protected $error_classes = array(); private $codes = array( 100 => 'Continue', 101 => 'Switching Protocols', 200 => 'OK', 201 => 'Created', 202 => 'Accepted', 203 => 'Non-Authoritative Information', 204 => 'No Content', 205 => 'Reset Content', 206 => 'Partial Content', 300 => 'Multiple Choices', 301 => 'Moved Permanently', 302 => 'Found', 303 => 'See Other', 304 => 'Not Modified', 305 => 'Use Proxy', 306 => '(Unused)', 307 => 'Temporary Redirect', 400 => 'Bad Request', 401 => 'Unauthorized', 402 => 'Payment Required', 403 => 'Forbidden', 404 => 'Not Found', 405 => 'Method Not Allowed', 406 => 'Not Acceptable', 407 => 'Proxy Authentication Required', 408 => 'Request Timeout', 409 => 'Conflict', 410 => 'Gone', 411 => 'Length Required', 412 => 'Precondition Failed', 413 => 'Request Entity Too Large', 414 => 'Request-URI Too Long', 415 => 'Unsupported Media Type', 416 => 'Requested Range Not Satisfiable', 417 => 'Expectation Failed', 500 => 'Internal Server Error', 501 => 'Not Implemented', 502 => 'Bad Gateway', 503 => 'Service Unavailable', 504 => 'Gateway Timeout', 505 => 'HTTP Version Not Supported' ); protected $cached; public function __construct ($production_mode = FALSE) { $this->production_mode = $production_mode; $this->cache_dir = getcwd(); $this->base_dir = RESTLER_PATH; } public function __destruct () { if ($this->production_mode && !$this->cached) { $this->saveCache(); } } public function refreshCache () { $this->routes = array(); $this->cached = FALSE; } public function setSupportedFormats () { $args = func_get_args(); $extensions = array(); foreach ($args as $class_name) { if(!is_string($class_name) || !class_exists($class_name)){ throw new Exception("$class_name is not a vaild Format Class."); } $obj = new $class_name; if(! $obj instanceof iFormat){ throw new Exception('Invalid format class; must implement '. 'iFormat interface'); } foreach ($obj->getMIMEMap() as $extension => $mime) { if(!isset($this->format_map[$extension])) $this->format_map[$extension]=$class_name; if(!isset($this->format_map[$mime])) $this->format_map[$mime]=$class_name; $extensions[".$extension"]=TRUE; } } $this->format_map['default']=$args[0]; $this->format_map['extensions']=array_keys($extensions); } public function addAPIClass($class_name, $base_path = NULL) { if(!class_exists($class_name)){ throw new Exception("API class $class_name is missing."); } $this->loadCache(); if(!$this->cached){ if(is_null($base_path))$base_path=strtolower($class_name); $base_path = trim($base_path,'/'); if(strlen($base_path)>0)$base_path .= '/'; $this->generateMap($class_name, $base_path); } } public function addAuthenticationClass ($class_name, $base_path = NULL) { $this->auth_classes[] = $class_name; $this->addAPIClass($class_name, $base_path); } public function addErrorClass ($class_name) { $this->error_classes[] = $class_name; } public function handleError ($status_code, $error_message = NULL) { $method = "handle$status_code"; $handled = FALSE; foreach ($this->error_classes as $class_name) { if (method_exists($class_name, $method)) { $obj = new $class_name(); $obj->restler = $this; $obj->$method(); $handled = TRUE; } } if($handled)return; $message = $this->codes[$status_code] . (!$error_message ? '' : ': ' . $error_message); $this->setStatus($status_code); $this->sendData( call_user_func( array($this->response, '__formatError'), $status_code, $message) ); } public function handle () { if(empty($this->format_map))$this->setSupportedFormats('JsonFormat'); $this->url = $this->getPath(); $this->request_method = $this->getRequestMethod(); $this->response_format = $this->getResponseFormat(); $this->request_format = $this->getRequestFormat(); if(is_null($this->request_format)){ $this->request_format = $this->response_format; } if($this->request_method == 'PUT' || $this->request_method == 'POST'){ $this->request_data = $this->getRequestData(); } $o = $this->mapUrlToMethod(); if(!isset($o->class_name)){ $this->handleError(404); }else{ try { if($o->method_flag){ $auth_method = '__isAuthenticated'; if(!count($this->auth_classes))throw new RestException(401); foreach ($this->auth_classes as $auth_class) { $auth_obj = new $auth_class(); $auth_obj->restler=$this; $this->applyClassMetadata($auth_class, $auth_obj, $o); if (!method_exists($auth_obj, $auth_method)) { throw new RestException(401, 'Authentication Class '. 'should implement iAuthenticate'); }elseif(!$auth_obj->$auth_method()){ throw new RestException(401); } } } $this->applyClassMetadata(get_class($this->request_format), $this->request_format, $o); $pre_process = '_'.$this->request_format->getExtension().'_'. $o->method_name; $this->service_method = $o->method_name; if($o->method_flag==2)$o=unprotect($o); $object = $this->service_class_instance = new $o->class_name(); $object->restler=$this; if(method_exists($o->class_name, $pre_process)) { call_user_func_array(array($object, $pre_process), $o->arguments); } switch ($o->method_flag) { case 3: $reflection_method = new ReflectionMethod($object, $o->method_name); $reflection_method->setAccessible(TRUE); $result = $reflection_method->invokeArgs($object, $o->arguments); break; case 2: case 1: default: $result = call_user_func_array(array($object, $o->method_name), $o->arguments); } } catch (RestException $e) { $this->handleError($e->getCode(), $e->getMessage()); } } if (isset($result) && $result !== NULL) { $this->sendData($result); } } public function sendData($data) { $data = $this->response_format->encode($data, !$this->production_mode); $post_process = '_'.$this->service_method .'_'. $this->response_format->getExtension(); if(isset($this->service_class_instance) && method_exists($this->service_class_instance,$post_process)){ $data = call_user_func(array($this->service_class_instance, $post_process), $data); } header("Cache-Control: no-cache, must-revalidate"); header("Expires: 0"); header('Content-Type: ' . $this->response_format->getMIME()); header("X-Powered-By: Luracast Restler v".Restler::VERSION); die($data); } public function setStatus($code) { header("{$_SERVER['SERVER_PROTOCOL']} $code ". $this->codes[strval($code)]); } public function removeCommonPath($first, $second, $char='/'){ $first = explode($char, $first); $second = explode($char, $second); while (count($second)){ if($first[0]==$second[0]){ array_shift($first); } else break; array_shift($second); } return implode($char, $first); } public function saveCache() { $file = $this->cache_dir . '/routes.php'; $s = '$o=array();'.PHP_EOL; foreach ($this->routes as $key => $value) { $s .= PHP_EOL.PHP_EOL.PHP_EOL."############### $key ###############" .PHP_EOL.PHP_EOL; $s .= '$o[\''.$key.'\']=array();'; foreach ($value as $ke => $va) { $s .= PHP_EOL.PHP_EOL."#==== $key $ke".PHP_EOL.PHP_EOL; $s .= '$o[\''.$key.'\'][\''.$ke.'\']='.str_replace(PHP_EOL, PHP_EOL."\t", var_export($va, TRUE)).';'; } } $s .= PHP_EOL.'return $o;'; $r=@file_put_contents($file, "<?php $s"); @chmod($file, 0777); if($r===FALSE)throw new Exception( "The cache directory located at '$this->cache_dir' needs to have ". "the permissions set to read/write/execute for everyone in order ". "to save cache and improve performance."); } protected function getPath () { $path = urldecode($this->removeCommonPath($_SERVER['REQUEST_URI'], $_SERVER['SCRIPT_NAME'])); $path = preg_replace('/(\/*\?.*$)|(\/$)/', '', $path); $path = str_replace($this->format_map['extensions'], '', $path); return $path; } protected function getRequestMethod () { $method = $_SERVER['REQUEST_METHOD']; if (isset($_SERVER['HTTP_X_HTTP_METHOD_OVERRIDE'])){ $method = $_SERVER['HTTP_X_HTTP_METHOD_OVERRIDE']; } if($method=='HEAD')$method='GET'; return $method; } protected function getRequestFormat () { $format=NULL; if(isset($_SERVER['CONTENT_TYPE'])){ $mime = explode(';', $_SERVER['CONTENT_TYPE']); $mime = $mime[0]; if($mime==UrlEncodedFormat::MIME){ $format = new UrlEncodedFormat(); }else{ if(isset($this->format_map[$mime])){ $format = $this->format_map[$mime]; $format = is_string($format) ? new $format: $format; $format->setMIME($mime); } } } return $format; } protected function getResponseFormat () { $format=NULL; $extensions = explode('.', parse_url($_SERVER['REQUEST_URI'], PHP_URL_PATH)); while($extensions){ $extension = array_pop($extensions); $extension = explode('/', $extension); $extension = array_shift($extensions); if($extension && isset($this->format_map[$extension])){ $format = $this->format_map[$extension]; $format = is_string($format) ? new $format: $format; $format->setExtension($extension); return $format; } } if(isset($_SERVER['HTTP_ACCEPT'])){ $accepts = explode(',', $_SERVER['HTTP_ACCEPT']); foreach ($accepts as $accept) { if($extension && isset($this->format_map[$accept])){ $format = $this->format_map[$accept]; $format = is_string($format) ? new $format: $format; $format->setMIME($accept); return $format; } } } $format = new $this->format_map['default']; return $format; } protected function getRequestData() { try{ $r = file_get_contents('php://input'); if(is_null($r))return $_GET; $r =$this->request_format->decode($r); return is_null($r) ? array(): $r; } catch (RestException $e) { $this->handleError($e->getCode(), $e->getMessage()); } } protected function mapUrlToMethod () { if(!isset($this->routes[$this->request_method])){ return array(); } $urls = $this->routes[$this->request_method]; if(!$urls)return array(); $found = FALSE; $this->request_data += $_GET; $params = array('request_data'=>$this->request_data); $params += $this->request_data; foreach ($urls as $url => $call) { $call = (object)$call; if(strstr($url, ':')){ $regex = preg_replace('/\\\:([^\/]+)/', '(?P<$1>[^/]+)', preg_quote($url)); if (preg_match(":^$regex$:", $this->url, $matches)) { foreach ($matches as $arg => $match) { if (isset($call->arguments[$arg])){ $params[$arg] = $match; } } $found = TRUE; break; } }elseif ($url == $this->url){ $found = TRUE; break; } } if($found){ $p = $call->defaults; foreach ($call->arguments as $key => $value) { if(isset($params[$key]))$p[$value] = $params[$key]; } $call->arguments=$p; return $call; } } protected function applyClassMetadata($class_name, $instance, $method_info){ if(isset($method_info->metadata[$class_name]) && is_array($method_info->metadata[$class_name])){ foreach ($method_info->metadata[$class_name] as $property => $value){ if(property_exists($class_name, $property)){ $reflection_property = new ReflectionProperty($class_name, $property); $reflection_property->setValue($instance, $value); } } } } protected function loadCache() { if ($this->cached !== NULL) { return; } $file = $this->cache_dir . '/routes.php'; $this->cached = FALSE; if ($this->production_mode) { if (file_exists($file)) { $routes = include($file); } if (isset($routes) && is_array($routes)) { $this->routes = $routes; $this->cached = TRUE; } } else { } } protected function generateMap ($class_name, $base_path = '') { $reflection = new ReflectionClass($class_name); $class_metadata = parse_doc($reflection->getDocComment()); $methods = $reflection->getMethods( ReflectionMethod::IS_PUBLIC + ReflectionMethod::IS_PROTECTED); foreach ($methods as $method) { $doc = $method->getDocComment(); $arguments = array(); $defaults = array(); $metadata = $class_metadata+parse_doc($doc); $params = $method->getParameters(); $position=0; foreach ($params as $param){ $arguments[$param->getName()] = $position; $defaults[$position] = $param->isDefaultValueAvailable() ? $param->getDefaultValue() : NULL; $position++; } $method_flag = $method->isProtected() ? (isRestlerCompatibilityModeEnabled() ? 2 : 3) : (isset($metadata['protected']) ? 1 : 0); $call = array( 'class_name'=>$class_name, 'method_name'=>$method->getName(), 'arguments'=>$arguments, 'defaults'=>$defaults, 'metadata'=>$metadata, 'method_flag'=>$method_flag ); $method_url = strtolower($method->getName()); if (preg_match_all( '/@url\s+(GET|POST|PUT|DELETE|HEAD|OPTIONS)[ \t]*\/?(\S*)/s', $doc, $matches, PREG_SET_ORDER)) { foreach ($matches as $match) { $http_method = $match[1]; $url = rtrim($base_path . $match[2],'/'); $this->routes[$http_method][$url] = $call; } }elseif($method_url[0] != '_'){ if (preg_match_all('/^(GET|POST|PUT|DELETE|HEAD|OPTIONS)/i', $method_url, $matches)) { $http_method = strtoupper($matches[0][0]); $method_url = substr($method_url, strlen($http_method)); }else{ $http_method = 'GET'; } $url = $base_path. ($method_url=='index' || $method_url=='default' ? '' : $method_url); $url = rtrim($url,'/'); $this->routes[$http_method][$url] = $call; foreach ($params as $param){ if($param->getName()=='request_data'){ break; } $url .= $url=='' ? ':' : '/:'; $url .= $param->getName(); $this->routes[$http_method][$url] = $call; } } } } } if(version_compare(PHP_VERSION, '5.3.0') < 0){ require_once 'compat.php'; } class RestException extends Exception { public function __construct($http_status_code, $error_message = NULL) { parent::__construct($error_message, $http_status_code); } } interface iRespond { public function __formatResponse($result); public function __formatError($status_code, $message); } class DefaultResponse implements iRespond { function __formatResponse($result) { return $result; } function __formatError($statusCode, $message) { return array('error' => array('code' => $statusCode, 'message' => $message)); } } interface iAuthenticate { public function __isAuthenticated(); } interface iFormat { public function getMIMEMap(); public function setMIME($mime); public function getMIME(); public function setExtension($extension); public function getExtension(); public function encode($data, $human_readable=FALSE); public function decode($data); } class UrlEncodedFormat implements iFormat { const MIME = 'application/x-www-form-urlencoded'; const EXTENSION = 'post'; public function getMIMEMap() { return array(self::EXTENSION=>self::MIME); } public function getMIME(){ return self::MIME; } public function getExtension(){ return self::EXTENSION; } public function setMIME($mime){ } public function setExtension($extension){ } public function encode($data, $human_readable=FALSE){ return http_build_query($data); } public function decode($data){ parse_str($data,$r); return $r; } public function __toString(){ return $this->getExtension(); } } class JsonFormat implements iFormat { const MIME ='application/json'; const EXTENSION = 'json'; public function getMIMEMap() { return array(self::EXTENSION=>self::MIME); } public function getMIME(){ return self::MIME; } public function getExtension(){ return self::EXTENSION; } public function setMIME($mime){ } public function setExtension($extension){ } public function encode($data, $human_readable=FALSE){ return $human_readable ? $this->json_format(json_encode(object_to_array($data))) : json_encode(object_to_array($data)); } public function decode($data) { $decoded = json_decode ( $data ); if (function_exists ( 'json_last_error' )) { $message = ''; switch (json_last_error ()) { case JSON_ERROR_NONE : return object_to_array ( $decoded ); break; case JSON_ERROR_DEPTH : $message = 'maximum stack depth exceeded'; break; case JSON_ERROR_STATE_MISMATCH : $message = 'underflow or the modes mismatch'; break; case JSON_ERROR_CTRL_CHAR : $message = 'unexpected control character found'; break; case JSON_ERROR_SYNTAX : $message = 'malformed JSON'; break; case JSON_ERROR_UTF8 : $message = 'malformed UTF-8 characters, possibly incorrectly encoded'; break; default : $message = 'unknown error'; break; } throw new RestException ( 400, 'Error parsing JSON, ' . $message ); } else if (strlen ( $data ) && $decoded === NULL || $decoded === $data) { throw new RestException ( 400, 'Error parsing JSON' ); } return object_to_array ( $decoded ); } private function json_format($json) { $tab = "  "; $new_json = ""; $indent_level = 0; $in_string = FALSE; $len = strlen($json); for($c = 0; $c < $len; $c++) { $char = $json[$c]; switch($char) { case '{': case '[': if(!$in_string) { $new_json .= $char . "\n" . str_repeat($tab, $indent_level+1); $indent_level++; } else { $new_json .= $char; } break; case '}': case ']': if(!$in_string) { $indent_level--; $new_json .= "\n".str_repeat($tab, $indent_level).$char; } else { $new_json .= $char; } break; case ',': if(!$in_string) { $new_json .= ",\n" . str_repeat($tab, $indent_level); } else { $new_json .= $char; } break; case ':': if(!$in_string) { $new_json .= ": "; } else { $new_json .= $char; } break; case '"': if($c==0){ $in_string = TRUE; }elseif($c > 0 && $json[$c-1] != '\\') { $in_string = !$in_string; } default: $new_json .= $char; break; } } return $new_json; } public function __toString(){ return $this->getExtension(); } } class DocParser { private $params=array(); function parse($doc='') { if($doc==''){ return $this->params; } if(preg_match('#^/\*\*(.*)\*/#s', $doc, $comment) === false) return $this->params; $comment = trim($comment[1]); if(preg_match_all('#^\s*\*(.*)#m', $comment, $lines) === false) return $this->params; $this->parseLines($lines[1]); return $this->params; } private function parseLines($lines) { foreach($lines as $line) { $parsedLine = $this->parseLine($line); if($parsedLine === false && !isset($this->params['description'])) { if(isset($desc)){ $this->params['description'] = implode(PHP_EOL, $desc); } $desc = array(); } elseif($parsedLine !== false) { $desc[] = $parsedLine; } } $desc = implode(' ', $desc); if(!empty($desc))$this->params['long_description'] = $desc; } private function parseLine($line) { $line = trim($line); if(empty($line)) return false; if(strpos($line, '@') === 0) { if(strpos($line, ' ')>0){ $param = substr($line, 1, strpos($line, ' ') - 1); $value = substr($line, strlen($param) + 2); }else{ $param = substr($line, 1); $value = ''; } if($this->setParam($param, $value)) return false; } return $line; } private function setParam($param, $value) { if($param == 'param' || $param == 'return') $value = $this->formatParamOrReturn($value); if($param == 'class') list($param, $value) = $this->formatClass($value); if(empty($this->params[$param])) { $this->params[$param] = $value; } else if($param == 'param'){ $arr = array($this->params[$param], $value); $this->params[$param] = $arr; } else { $this->params[$param] = $value + $this->params[$param]; } return true; } private function formatClass($value) { $r = preg_split("[\(|\)]",$value); if(is_array($r)){ $param = $r[0]; parse_str($r[1],$value); foreach ($value as $key => $val) { $val = explode(',', $val); if(count($val)>1)$value[$key]=$val; } }else{ $param='Unknown'; } return array($param, $value); } private function formatParamOrReturn($string) { $pos = strpos($string, ' '); $type = substr($string, 0, $pos); return '(' . $type . ')' . substr($string, $pos+1); } } function parse_doc($php_doc_comment){ $p = new DocParser(); return $p->parse($php_doc_comment); $p = new Parser($php_doc_comment); return $p; $php_doc_comment = preg_replace("/(^[\\s]*\\/\\*\\*)
                                  |(^[\\s]\\*\\/)
                                  |(^[\\s]*\\*?\\s)
                                  |(^[\\s]*)

From c334e7e7ed45d09bf03954521f1c21226d72e99b Mon Sep 17 00:00:00 2001
From: Luracast <arul@luracast.com>
Date: Wed, 22 Feb 2012 11:56:31 +0800
Subject: [PATCH 34/61] Fixes the format issue reported in stack overflow
 http://bit.ly/w79odT

---
 restler/restler.php          | 6 +++---
 restler_minified/restler.php | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/restler/restler.php b/restler/restler.php
index 979105bba..4d168cf77 100644
--- a/restler/restler.php
+++ b/restler/restler.php
@@ -10,10 +10,10 @@
  * @copyright  2010 Luracast
  * @license    http://www.opensource.org/licenses/lgpl-license.php LGPL
  * @link       http://luracast.com/products/restler/
- * @version    2.1.2
+ * @version    2.1.3
  */
 class Restler {
-	const VERSION = '2.1.2';
+	const VERSION = '2.1.3';
 	/**
 	 * URL of the currently mapped service
 	 * @var string
@@ -511,7 +511,7 @@ protected function getResponseFormat () {
 		while($extensions){
 			$extension = array_pop($extensions);
             $extension = explode('/', $extension);
-            $extension = array_shift($extensions);
+            $extension = array_shift($extension);
 			if($extension && isset($this->format_map[$extension])){
 				$format = $this->format_map[$extension];
 				$format = is_string($format) ? new $format: $format;
diff --git a/restler_minified/restler.php b/restler_minified/restler.php
index 7cecdfaa9..b37f1808f 100644
--- a/restler_minified/restler.php
+++ b/restler_minified/restler.php
@@ -1,5 +1,5 @@
 <?php
- class Restler { const VERSION = '2.1.2'; public $url; public $request_method; public $request_format; public $request_data=array(); public $cache_dir; public $base_dir; public $response = 'DefaultResponse'; public $response_format; protected $production_mode; protected $routes= array(); protected $format_map = array(); protected $service_class_instance; protected $service_method; protected $auth_classes = array(); protected $error_classes = array(); private $codes = array( 100 => 'Continue', 101 => 'Switching Protocols', 200 => 'OK', 201 => 'Created', 202 => 'Accepted', 203 => 'Non-Authoritative Information', 204 => 'No Content', 205 => 'Reset Content', 206 => 'Partial Content', 300 => 'Multiple Choices', 301 => 'Moved Permanently', 302 => 'Found', 303 => 'See Other', 304 => 'Not Modified', 305 => 'Use Proxy', 306 => '(Unused)', 307 => 'Temporary Redirect', 400 => 'Bad Request', 401 => 'Unauthorized', 402 => 'Payment Required', 403 => 'Forbidden', 404 => 'Not Found', 405 => 'Method Not Allowed', 406 => 'Not Acceptable', 407 => 'Proxy Authentication Required', 408 => 'Request Timeout', 409 => 'Conflict', 410 => 'Gone', 411 => 'Length Required', 412 => 'Precondition Failed', 413 => 'Request Entity Too Large', 414 => 'Request-URI Too Long', 415 => 'Unsupported Media Type', 416 => 'Requested Range Not Satisfiable', 417 => 'Expectation Failed', 500 => 'Internal Server Error', 501 => 'Not Implemented', 502 => 'Bad Gateway', 503 => 'Service Unavailable', 504 => 'Gateway Timeout', 505 => 'HTTP Version Not Supported' ); protected $cached; public function __construct ($production_mode = FALSE) { $this->production_mode = $production_mode; $this->cache_dir = getcwd(); $this->base_dir = RESTLER_PATH; } public function __destruct () { if ($this->production_mode && !$this->cached) { $this->saveCache(); } } public function refreshCache () { $this->routes = array(); $this->cached = FALSE; } public function setSupportedFormats () { $args = func_get_args(); $extensions = array(); foreach ($args as $class_name) { if(!is_string($class_name) || !class_exists($class_name)){ throw new Exception("$class_name is not a vaild Format Class."); } $obj = new $class_name; if(! $obj instanceof iFormat){ throw new Exception('Invalid format class; must implement '. 'iFormat interface'); } foreach ($obj->getMIMEMap() as $extension => $mime) { if(!isset($this->format_map[$extension])) $this->format_map[$extension]=$class_name; if(!isset($this->format_map[$mime])) $this->format_map[$mime]=$class_name; $extensions[".$extension"]=TRUE; } } $this->format_map['default']=$args[0]; $this->format_map['extensions']=array_keys($extensions); } public function addAPIClass($class_name, $base_path = NULL) { if(!class_exists($class_name)){ throw new Exception("API class $class_name is missing."); } $this->loadCache(); if(!$this->cached){ if(is_null($base_path))$base_path=strtolower($class_name); $base_path = trim($base_path,'/'); if(strlen($base_path)>0)$base_path .= '/'; $this->generateMap($class_name, $base_path); } } public function addAuthenticationClass ($class_name, $base_path = NULL) { $this->auth_classes[] = $class_name; $this->addAPIClass($class_name, $base_path); } public function addErrorClass ($class_name) { $this->error_classes[] = $class_name; } public function handleError ($status_code, $error_message = NULL) { $method = "handle$status_code"; $handled = FALSE; foreach ($this->error_classes as $class_name) { if (method_exists($class_name, $method)) { $obj = new $class_name(); $obj->restler = $this; $obj->$method(); $handled = TRUE; } } if($handled)return; $message = $this->codes[$status_code] . (!$error_message ? '' : ': ' . $error_message); $this->setStatus($status_code); $this->sendData( call_user_func( array($this->response, '__formatError'), $status_code, $message) ); } public function handle () { if(empty($this->format_map))$this->setSupportedFormats('JsonFormat'); $this->url = $this->getPath(); $this->request_method = $this->getRequestMethod(); $this->response_format = $this->getResponseFormat(); $this->request_format = $this->getRequestFormat(); if(is_null($this->request_format)){ $this->request_format = $this->response_format; } if($this->request_method == 'PUT' || $this->request_method == 'POST'){ $this->request_data = $this->getRequestData(); } $o = $this->mapUrlToMethod(); if(!isset($o->class_name)){ $this->handleError(404); }else{ try { if($o->method_flag){ $auth_method = '__isAuthenticated'; if(!count($this->auth_classes))throw new RestException(401); foreach ($this->auth_classes as $auth_class) { $auth_obj = new $auth_class(); $auth_obj->restler=$this; $this->applyClassMetadata($auth_class, $auth_obj, $o); if (!method_exists($auth_obj, $auth_method)) { throw new RestException(401, 'Authentication Class '. 'should implement iAuthenticate'); }elseif(!$auth_obj->$auth_method()){ throw new RestException(401); } } } $this->applyClassMetadata(get_class($this->request_format), $this->request_format, $o); $pre_process = '_'.$this->request_format->getExtension().'_'. $o->method_name; $this->service_method = $o->method_name; if($o->method_flag==2)$o=unprotect($o); $object = $this->service_class_instance = new $o->class_name(); $object->restler=$this; if(method_exists($o->class_name, $pre_process)) { call_user_func_array(array($object, $pre_process), $o->arguments); } switch ($o->method_flag) { case 3: $reflection_method = new ReflectionMethod($object, $o->method_name); $reflection_method->setAccessible(TRUE); $result = $reflection_method->invokeArgs($object, $o->arguments); break; case 2: case 1: default: $result = call_user_func_array(array($object, $o->method_name), $o->arguments); } } catch (RestException $e) { $this->handleError($e->getCode(), $e->getMessage()); } } if (isset($result) && $result !== NULL) { $this->sendData($result); } } public function sendData($data) { $data = $this->response_format->encode($data, !$this->production_mode); $post_process = '_'.$this->service_method .'_'. $this->response_format->getExtension(); if(isset($this->service_class_instance) && method_exists($this->service_class_instance,$post_process)){ $data = call_user_func(array($this->service_class_instance, $post_process), $data); } header("Cache-Control: no-cache, must-revalidate"); header("Expires: 0"); header('Content-Type: ' . $this->response_format->getMIME()); header("X-Powered-By: Luracast Restler v".Restler::VERSION); die($data); } public function setStatus($code) { header("{$_SERVER['SERVER_PROTOCOL']} $code ". $this->codes[strval($code)]); } public function removeCommonPath($first, $second, $char='/'){ $first = explode($char, $first); $second = explode($char, $second); while (count($second)){ if($first[0]==$second[0]){ array_shift($first); } else break; array_shift($second); } return implode($char, $first); } public function saveCache() { $file = $this->cache_dir . '/routes.php'; $s = '$o=array();'.PHP_EOL; foreach ($this->routes as $key => $value) { $s .= PHP_EOL.PHP_EOL.PHP_EOL."############### $key ###############" .PHP_EOL.PHP_EOL; $s .= '$o[\''.$key.'\']=array();'; foreach ($value as $ke => $va) { $s .= PHP_EOL.PHP_EOL."#==== $key $ke".PHP_EOL.PHP_EOL; $s .= '$o[\''.$key.'\'][\''.$ke.'\']='.str_replace(PHP_EOL, PHP_EOL."\t", var_export($va, TRUE)).';'; } } $s .= PHP_EOL.'return $o;'; $r=@file_put_contents($file, "<?php $s"); @chmod($file, 0777); if($r===FALSE)throw new Exception( "The cache directory located at '$this->cache_dir' needs to have ". "the permissions set to read/write/execute for everyone in order ". "to save cache and improve performance."); } protected function getPath () { $path = urldecode($this->removeCommonPath($_SERVER['REQUEST_URI'], $_SERVER['SCRIPT_NAME'])); $path = preg_replace('/(\/*\?.*$)|(\/$)/', '', $path); $path = str_replace($this->format_map['extensions'], '', $path); return $path; } protected function getRequestMethod () { $method = $_SERVER['REQUEST_METHOD']; if (isset($_SERVER['HTTP_X_HTTP_METHOD_OVERRIDE'])){ $method = $_SERVER['HTTP_X_HTTP_METHOD_OVERRIDE']; } if($method=='HEAD')$method='GET'; return $method; } protected function getRequestFormat () { $format=NULL; if(isset($_SERVER['CONTENT_TYPE'])){ $mime = explode(';', $_SERVER['CONTENT_TYPE']); $mime = $mime[0]; if($mime==UrlEncodedFormat::MIME){ $format = new UrlEncodedFormat(); }else{ if(isset($this->format_map[$mime])){ $format = $this->format_map[$mime]; $format = is_string($format) ? new $format: $format; $format->setMIME($mime); } } } return $format; } protected function getResponseFormat () { $format=NULL; $extensions = explode('.', parse_url($_SERVER['REQUEST_URI'], PHP_URL_PATH)); while($extensions){ $extension = array_pop($extensions); $extension = explode('/', $extension); $extension = array_shift($extensions); if($extension && isset($this->format_map[$extension])){ $format = $this->format_map[$extension]; $format = is_string($format) ? new $format: $format; $format->setExtension($extension); return $format; } } if(isset($_SERVER['HTTP_ACCEPT'])){ $accepts = explode(',', $_SERVER['HTTP_ACCEPT']); foreach ($accepts as $accept) { if($extension && isset($this->format_map[$accept])){ $format = $this->format_map[$accept]; $format = is_string($format) ? new $format: $format; $format->setMIME($accept); return $format; } } } $format = new $this->format_map['default']; return $format; } protected function getRequestData() { try{ $r = file_get_contents('php://input'); if(is_null($r))return $_GET; $r =$this->request_format->decode($r); return is_null($r) ? array(): $r; } catch (RestException $e) { $this->handleError($e->getCode(), $e->getMessage()); } } protected function mapUrlToMethod () { if(!isset($this->routes[$this->request_method])){ return array(); } $urls = $this->routes[$this->request_method]; if(!$urls)return array(); $found = FALSE; $this->request_data += $_GET; $params = array('request_data'=>$this->request_data); $params += $this->request_data; foreach ($urls as $url => $call) { $call = (object)$call; if(strstr($url, ':')){ $regex = preg_replace('/\\\:([^\/]+)/', '(?P<$1>[^/]+)', preg_quote($url)); if (preg_match(":^$regex$:", $this->url, $matches)) { foreach ($matches as $arg => $match) { if (isset($call->arguments[$arg])){ $params[$arg] = $match; } } $found = TRUE; break; } }elseif ($url == $this->url){ $found = TRUE; break; } } if($found){ $p = $call->defaults; foreach ($call->arguments as $key => $value) { if(isset($params[$key]))$p[$value] = $params[$key]; } $call->arguments=$p; return $call; } } protected function applyClassMetadata($class_name, $instance, $method_info){ if(isset($method_info->metadata[$class_name]) && is_array($method_info->metadata[$class_name])){ foreach ($method_info->metadata[$class_name] as $property => $value){ if(property_exists($class_name, $property)){ $reflection_property = new ReflectionProperty($class_name, $property); $reflection_property->setValue($instance, $value); } } } } protected function loadCache() { if ($this->cached !== NULL) { return; } $file = $this->cache_dir . '/routes.php'; $this->cached = FALSE; if ($this->production_mode) { if (file_exists($file)) { $routes = include($file); } if (isset($routes) && is_array($routes)) { $this->routes = $routes; $this->cached = TRUE; } } else { } } protected function generateMap ($class_name, $base_path = '') { $reflection = new ReflectionClass($class_name); $class_metadata = parse_doc($reflection->getDocComment()); $methods = $reflection->getMethods( ReflectionMethod::IS_PUBLIC + ReflectionMethod::IS_PROTECTED); foreach ($methods as $method) { $doc = $method->getDocComment(); $arguments = array(); $defaults = array(); $metadata = $class_metadata+parse_doc($doc); $params = $method->getParameters(); $position=0; foreach ($params as $param){ $arguments[$param->getName()] = $position; $defaults[$position] = $param->isDefaultValueAvailable() ? $param->getDefaultValue() : NULL; $position++; } $method_flag = $method->isProtected() ? (isRestlerCompatibilityModeEnabled() ? 2 : 3) : (isset($metadata['protected']) ? 1 : 0); $call = array( 'class_name'=>$class_name, 'method_name'=>$method->getName(), 'arguments'=>$arguments, 'defaults'=>$defaults, 'metadata'=>$metadata, 'method_flag'=>$method_flag ); $method_url = strtolower($method->getName()); if (preg_match_all( '/@url\s+(GET|POST|PUT|DELETE|HEAD|OPTIONS)[ \t]*\/?(\S*)/s', $doc, $matches, PREG_SET_ORDER)) { foreach ($matches as $match) { $http_method = $match[1]; $url = rtrim($base_path . $match[2],'/'); $this->routes[$http_method][$url] = $call; } }elseif($method_url[0] != '_'){ if (preg_match_all('/^(GET|POST|PUT|DELETE|HEAD|OPTIONS)/i', $method_url, $matches)) { $http_method = strtoupper($matches[0][0]); $method_url = substr($method_url, strlen($http_method)); }else{ $http_method = 'GET'; } $url = $base_path. ($method_url=='index' || $method_url=='default' ? '' : $method_url); $url = rtrim($url,'/'); $this->routes[$http_method][$url] = $call; foreach ($params as $param){ if($param->getName()=='request_data'){ break; } $url .= $url=='' ? ':' : '/:'; $url .= $param->getName(); $this->routes[$http_method][$url] = $call; } } } } } if(version_compare(PHP_VERSION, '5.3.0') < 0){ require_once 'compat.php'; } class RestException extends Exception { public function __construct($http_status_code, $error_message = NULL) { parent::__construct($error_message, $http_status_code); } } interface iRespond { public function __formatResponse($result); public function __formatError($status_code, $message); } class DefaultResponse implements iRespond { function __formatResponse($result) { return $result; } function __formatError($statusCode, $message) { return array('error' => array('code' => $statusCode, 'message' => $message)); } } interface iAuthenticate { public function __isAuthenticated(); } interface iFormat { public function getMIMEMap(); public function setMIME($mime); public function getMIME(); public function setExtension($extension); public function getExtension(); public function encode($data, $human_readable=FALSE); public function decode($data); } class UrlEncodedFormat implements iFormat { const MIME = 'application/x-www-form-urlencoded'; const EXTENSION = 'post'; public function getMIMEMap() { return array(self::EXTENSION=>self::MIME); } public function getMIME(){ return self::MIME; } public function getExtension(){ return self::EXTENSION; } public function setMIME($mime){ } public function setExtension($extension){ } public function encode($data, $human_readable=FALSE){ return http_build_query($data); } public function decode($data){ parse_str($data,$r); return $r; } public function __toString(){ return $this->getExtension(); } } class JsonFormat implements iFormat { const MIME ='application/json'; const EXTENSION = 'json'; public function getMIMEMap() { return array(self::EXTENSION=>self::MIME); } public function getMIME(){ return self::MIME; } public function getExtension(){ return self::EXTENSION; } public function setMIME($mime){ } public function setExtension($extension){ } public function encode($data, $human_readable=FALSE){ return $human_readable ? $this->json_format(json_encode(object_to_array($data))) : json_encode(object_to_array($data)); } public function decode($data) { $decoded = json_decode ( $data ); if (function_exists ( 'json_last_error' )) { $message = ''; switch (json_last_error ()) { case JSON_ERROR_NONE : return object_to_array ( $decoded ); break; case JSON_ERROR_DEPTH : $message = 'maximum stack depth exceeded'; break; case JSON_ERROR_STATE_MISMATCH : $message = 'underflow or the modes mismatch'; break; case JSON_ERROR_CTRL_CHAR : $message = 'unexpected control character found'; break; case JSON_ERROR_SYNTAX : $message = 'malformed JSON'; break; case JSON_ERROR_UTF8 : $message = 'malformed UTF-8 characters, possibly incorrectly encoded'; break; default : $message = 'unknown error'; break; } throw new RestException ( 400, 'Error parsing JSON, ' . $message ); } else if (strlen ( $data ) && $decoded === NULL || $decoded === $data) { throw new RestException ( 400, 'Error parsing JSON' ); } return object_to_array ( $decoded ); } private function json_format($json) { $tab = "  "; $new_json = ""; $indent_level = 0; $in_string = FALSE; $len = strlen($json); for($c = 0; $c < $len; $c++) { $char = $json[$c]; switch($char) { case '{': case '[': if(!$in_string) { $new_json .= $char . "\n" . str_repeat($tab, $indent_level+1); $indent_level++; } else { $new_json .= $char; } break; case '}': case ']': if(!$in_string) { $indent_level--; $new_json .= "\n".str_repeat($tab, $indent_level).$char; } else { $new_json .= $char; } break; case ',': if(!$in_string) { $new_json .= ",\n" . str_repeat($tab, $indent_level); } else { $new_json .= $char; } break; case ':': if(!$in_string) { $new_json .= ": "; } else { $new_json .= $char; } break; case '"': if($c==0){ $in_string = TRUE; }elseif($c > 0 && $json[$c-1] != '\\') { $in_string = !$in_string; } default: $new_json .= $char; break; } } return $new_json; } public function __toString(){ return $this->getExtension(); } } class DocParser { private $params=array(); function parse($doc='') { if($doc==''){ return $this->params; } if(preg_match('#^/\*\*(.*)\*/#s', $doc, $comment) === false) return $this->params; $comment = trim($comment[1]); if(preg_match_all('#^\s*\*(.*)#m', $comment, $lines) === false) return $this->params; $this->parseLines($lines[1]); return $this->params; } private function parseLines($lines) { foreach($lines as $line) { $parsedLine = $this->parseLine($line); if($parsedLine === false && !isset($this->params['description'])) { if(isset($desc)){ $this->params['description'] = implode(PHP_EOL, $desc); } $desc = array(); } elseif($parsedLine !== false) { $desc[] = $parsedLine; } } $desc = implode(' ', $desc); if(!empty($desc))$this->params['long_description'] = $desc; } private function parseLine($line) { $line = trim($line); if(empty($line)) return false; if(strpos($line, '@') === 0) { if(strpos($line, ' ')>0){ $param = substr($line, 1, strpos($line, ' ') - 1); $value = substr($line, strlen($param) + 2); }else{ $param = substr($line, 1); $value = ''; } if($this->setParam($param, $value)) return false; } return $line; } private function setParam($param, $value) { if($param == 'param' || $param == 'return') $value = $this->formatParamOrReturn($value); if($param == 'class') list($param, $value) = $this->formatClass($value); if(empty($this->params[$param])) { $this->params[$param] = $value; } else if($param == 'param'){ $arr = array($this->params[$param], $value); $this->params[$param] = $arr; } else { $this->params[$param] = $value + $this->params[$param]; } return true; } private function formatClass($value) { $r = preg_split("[\(|\)]",$value); if(is_array($r)){ $param = $r[0]; parse_str($r[1],$value); foreach ($value as $key => $val) { $val = explode(',', $val); if(count($val)>1)$value[$key]=$val; } }else{ $param='Unknown'; } return array($param, $value); } private function formatParamOrReturn($string) { $pos = strpos($string, ' '); $type = substr($string, 0, $pos); return '(' . $type . ')' . substr($string, $pos+1); } } function parse_doc($php_doc_comment){ $p = new DocParser(); return $p->parse($php_doc_comment); $p = new Parser($php_doc_comment); return $p; $php_doc_comment = preg_replace("/(^[\\s]*\\/\\*\\*)
+ class Restler { const VERSION = '2.1.3'; public $url; public $request_method; public $request_format; public $request_data=array(); public $cache_dir; public $base_dir; public $response = 'DefaultResponse'; public $response_format; protected $production_mode; protected $routes= array(); protected $format_map = array(); protected $service_class_instance; protected $service_method; protected $auth_classes = array(); protected $error_classes = array(); private $codes = array( 100 => 'Continue', 101 => 'Switching Protocols', 200 => 'OK', 201 => 'Created', 202 => 'Accepted', 203 => 'Non-Authoritative Information', 204 => 'No Content', 205 => 'Reset Content', 206 => 'Partial Content', 300 => 'Multiple Choices', 301 => 'Moved Permanently', 302 => 'Found', 303 => 'See Other', 304 => 'Not Modified', 305 => 'Use Proxy', 306 => '(Unused)', 307 => 'Temporary Redirect', 400 => 'Bad Request', 401 => 'Unauthorized', 402 => 'Payment Required', 403 => 'Forbidden', 404 => 'Not Found', 405 => 'Method Not Allowed', 406 => 'Not Acceptable', 407 => 'Proxy Authentication Required', 408 => 'Request Timeout', 409 => 'Conflict', 410 => 'Gone', 411 => 'Length Required', 412 => 'Precondition Failed', 413 => 'Request Entity Too Large', 414 => 'Request-URI Too Long', 415 => 'Unsupported Media Type', 416 => 'Requested Range Not Satisfiable', 417 => 'Expectation Failed', 500 => 'Internal Server Error', 501 => 'Not Implemented', 502 => 'Bad Gateway', 503 => 'Service Unavailable', 504 => 'Gateway Timeout', 505 => 'HTTP Version Not Supported' ); protected $cached; public function __construct ($production_mode = FALSE) { $this->production_mode = $production_mode; $this->cache_dir = getcwd(); $this->base_dir = RESTLER_PATH; } public function __destruct () { if ($this->production_mode && !$this->cached) { $this->saveCache(); } } public function refreshCache () { $this->routes = array(); $this->cached = FALSE; } public function setSupportedFormats () { $args = func_get_args(); $extensions = array(); foreach ($args as $class_name) { if(!is_string($class_name) || !class_exists($class_name)){ throw new Exception("$class_name is not a vaild Format Class."); } $obj = new $class_name; if(! $obj instanceof iFormat){ throw new Exception('Invalid format class; must implement '. 'iFormat interface'); } foreach ($obj->getMIMEMap() as $extension => $mime) { if(!isset($this->format_map[$extension])) $this->format_map[$extension]=$class_name; if(!isset($this->format_map[$mime])) $this->format_map[$mime]=$class_name; $extensions[".$extension"]=TRUE; } } $this->format_map['default']=$args[0]; $this->format_map['extensions']=array_keys($extensions); } public function addAPIClass($class_name, $base_path = NULL) { if(!class_exists($class_name)){ throw new Exception("API class $class_name is missing."); } $this->loadCache(); if(!$this->cached){ if(is_null($base_path))$base_path=strtolower($class_name); $base_path = trim($base_path,'/'); if(strlen($base_path)>0)$base_path .= '/'; $this->generateMap($class_name, $base_path); } } public function addAuthenticationClass ($class_name, $base_path = NULL) { $this->auth_classes[] = $class_name; $this->addAPIClass($class_name, $base_path); } public function addErrorClass ($class_name) { $this->error_classes[] = $class_name; } public function handleError ($status_code, $error_message = NULL) { $method = "handle$status_code"; $handled = FALSE; foreach ($this->error_classes as $class_name) { if (method_exists($class_name, $method)) { $obj = new $class_name(); $obj->restler = $this; $obj->$method(); $handled = TRUE; } } if($handled)return; $message = $this->codes[$status_code] . (!$error_message ? '' : ': ' . $error_message); $this->setStatus($status_code); $this->sendData( call_user_func( array($this->response, '__formatError'), $status_code, $message) ); } public function handle () { if(empty($this->format_map))$this->setSupportedFormats('JsonFormat'); $this->url = $this->getPath(); $this->request_method = $this->getRequestMethod(); $this->response_format = $this->getResponseFormat(); $this->request_format = $this->getRequestFormat(); if(is_null($this->request_format)){ $this->request_format = $this->response_format; } if($this->request_method == 'PUT' || $this->request_method == 'POST'){ $this->request_data = $this->getRequestData(); } $o = $this->mapUrlToMethod(); if(!isset($o->class_name)){ $this->handleError(404); }else{ try { if($o->method_flag){ $auth_method = '__isAuthenticated'; if(!count($this->auth_classes))throw new RestException(401); foreach ($this->auth_classes as $auth_class) { $auth_obj = new $auth_class(); $auth_obj->restler=$this; $this->applyClassMetadata($auth_class, $auth_obj, $o); if (!method_exists($auth_obj, $auth_method)) { throw new RestException(401, 'Authentication Class '. 'should implement iAuthenticate'); }elseif(!$auth_obj->$auth_method()){ throw new RestException(401); } } } $this->applyClassMetadata(get_class($this->request_format), $this->request_format, $o); $pre_process = '_'.$this->request_format->getExtension().'_'. $o->method_name; $this->service_method = $o->method_name; if($o->method_flag==2)$o=unprotect($o); $object = $this->service_class_instance = new $o->class_name(); $object->restler=$this; if(method_exists($o->class_name, $pre_process)) { call_user_func_array(array($object, $pre_process), $o->arguments); } switch ($o->method_flag) { case 3: $reflection_method = new ReflectionMethod($object, $o->method_name); $reflection_method->setAccessible(TRUE); $result = $reflection_method->invokeArgs($object, $o->arguments); break; case 2: case 1: default: $result = call_user_func_array(array($object, $o->method_name), $o->arguments); } } catch (RestException $e) { $this->handleError($e->getCode(), $e->getMessage()); } } if (isset($result) && $result !== NULL) { $this->sendData($result); } } public function sendData($data) { $data = $this->response_format->encode($data, !$this->production_mode); $post_process = '_'.$this->service_method .'_'. $this->response_format->getExtension(); if(isset($this->service_class_instance) && method_exists($this->service_class_instance,$post_process)){ $data = call_user_func(array($this->service_class_instance, $post_process), $data); } header("Cache-Control: no-cache, must-revalidate"); header("Expires: 0"); header('Content-Type: ' . $this->response_format->getMIME()); header("X-Powered-By: Luracast Restler v".Restler::VERSION); die($data); } public function setStatus($code) { header("{$_SERVER['SERVER_PROTOCOL']} $code ". $this->codes[strval($code)]); } public function removeCommonPath($first, $second, $char='/'){ $first = explode($char, $first); $second = explode($char, $second); while (count($second)){ if($first[0]==$second[0]){ array_shift($first); } else break; array_shift($second); } return implode($char, $first); } public function saveCache() { $file = $this->cache_dir . '/routes.php'; $s = '$o=array();'.PHP_EOL; foreach ($this->routes as $key => $value) { $s .= PHP_EOL.PHP_EOL.PHP_EOL."############### $key ###############" .PHP_EOL.PHP_EOL; $s .= '$o[\''.$key.'\']=array();'; foreach ($value as $ke => $va) { $s .= PHP_EOL.PHP_EOL."#==== $key $ke".PHP_EOL.PHP_EOL; $s .= '$o[\''.$key.'\'][\''.$ke.'\']='.str_replace(PHP_EOL, PHP_EOL."\t", var_export($va, TRUE)).';'; } } $s .= PHP_EOL.'return $o;'; $r=@file_put_contents($file, "<?php $s"); @chmod($file, 0777); if($r===FALSE)throw new Exception( "The cache directory located at '$this->cache_dir' needs to have ". "the permissions set to read/write/execute for everyone in order ". "to save cache and improve performance."); } protected function getPath () { $path = urldecode($this->removeCommonPath($_SERVER['REQUEST_URI'], $_SERVER['SCRIPT_NAME'])); $path = preg_replace('/(\/*\?.*$)|(\/$)/', '', $path); $path = str_replace($this->format_map['extensions'], '', $path); return $path; } protected function getRequestMethod () { $method = $_SERVER['REQUEST_METHOD']; if (isset($_SERVER['HTTP_X_HTTP_METHOD_OVERRIDE'])){ $method = $_SERVER['HTTP_X_HTTP_METHOD_OVERRIDE']; } if($method=='HEAD')$method='GET'; return $method; } protected function getRequestFormat () { $format=NULL; if(isset($_SERVER['CONTENT_TYPE'])){ $mime = explode(';', $_SERVER['CONTENT_TYPE']); $mime = $mime[0]; if($mime==UrlEncodedFormat::MIME){ $format = new UrlEncodedFormat(); }else{ if(isset($this->format_map[$mime])){ $format = $this->format_map[$mime]; $format = is_string($format) ? new $format: $format; $format->setMIME($mime); } } } return $format; } protected function getResponseFormat () { $format=NULL; $extensions = explode('.', parse_url($_SERVER['REQUEST_URI'], PHP_URL_PATH)); while($extensions){ $extension = array_pop($extensions); $extension = explode('/', $extension); $extension = array_shift($extension); if($extension && isset($this->format_map[$extension])){ $format = $this->format_map[$extension]; $format = is_string($format) ? new $format: $format; $format->setExtension($extension); return $format; } } if(isset($_SERVER['HTTP_ACCEPT'])){ $accepts = explode(',', $_SERVER['HTTP_ACCEPT']); foreach ($accepts as $accept) { if($extension && isset($this->format_map[$accept])){ $format = $this->format_map[$accept]; $format = is_string($format) ? new $format: $format; $format->setMIME($accept); return $format; } } } $format = new $this->format_map['default']; return $format; } protected function getRequestData() { try{ $r = file_get_contents('php://input'); if(is_null($r))return $_GET; $r =$this->request_format->decode($r); return is_null($r) ? array(): $r; } catch (RestException $e) { $this->handleError($e->getCode(), $e->getMessage()); } } protected function mapUrlToMethod () { if(!isset($this->routes[$this->request_method])){ return array(); } $urls = $this->routes[$this->request_method]; if(!$urls)return array(); $found = FALSE; $this->request_data += $_GET; $params = array('request_data'=>$this->request_data); $params += $this->request_data; foreach ($urls as $url => $call) { $call = (object)$call; if(strstr($url, ':')){ $regex = preg_replace('/\\\:([^\/]+)/', '(?P<$1>[^/]+)', preg_quote($url)); if (preg_match(":^$regex$:", $this->url, $matches)) { foreach ($matches as $arg => $match) { if (isset($call->arguments[$arg])){ $params[$arg] = $match; } } $found = TRUE; break; } }elseif ($url == $this->url){ $found = TRUE; break; } } if($found){ $p = $call->defaults; foreach ($call->arguments as $key => $value) { if(isset($params[$key]))$p[$value] = $params[$key]; } $call->arguments=$p; return $call; } } protected function applyClassMetadata($class_name, $instance, $method_info){ if(isset($method_info->metadata[$class_name]) && is_array($method_info->metadata[$class_name])){ foreach ($method_info->metadata[$class_name] as $property => $value){ if(property_exists($class_name, $property)){ $reflection_property = new ReflectionProperty($class_name, $property); $reflection_property->setValue($instance, $value); } } } } protected function loadCache() { if ($this->cached !== NULL) { return; } $file = $this->cache_dir . '/routes.php'; $this->cached = FALSE; if ($this->production_mode) { if (file_exists($file)) { $routes = include($file); } if (isset($routes) && is_array($routes)) { $this->routes = $routes; $this->cached = TRUE; } } else { } } protected function generateMap ($class_name, $base_path = '') { $reflection = new ReflectionClass($class_name); $class_metadata = parse_doc($reflection->getDocComment()); $methods = $reflection->getMethods( ReflectionMethod::IS_PUBLIC + ReflectionMethod::IS_PROTECTED); foreach ($methods as $method) { $doc = $method->getDocComment(); $arguments = array(); $defaults = array(); $metadata = $class_metadata+parse_doc($doc); $params = $method->getParameters(); $position=0; foreach ($params as $param){ $arguments[$param->getName()] = $position; $defaults[$position] = $param->isDefaultValueAvailable() ? $param->getDefaultValue() : NULL; $position++; } $method_flag = $method->isProtected() ? (isRestlerCompatibilityModeEnabled() ? 2 : 3) : (isset($metadata['protected']) ? 1 : 0); $call = array( 'class_name'=>$class_name, 'method_name'=>$method->getName(), 'arguments'=>$arguments, 'defaults'=>$defaults, 'metadata'=>$metadata, 'method_flag'=>$method_flag ); $method_url = strtolower($method->getName()); if (preg_match_all( '/@url\s+(GET|POST|PUT|DELETE|HEAD|OPTIONS)[ \t]*\/?(\S*)/s', $doc, $matches, PREG_SET_ORDER)) { foreach ($matches as $match) { $http_method = $match[1]; $url = rtrim($base_path . $match[2],'/'); $this->routes[$http_method][$url] = $call; } }elseif($method_url[0] != '_'){ if (preg_match_all('/^(GET|POST|PUT|DELETE|HEAD|OPTIONS)/i', $method_url, $matches)) { $http_method = strtoupper($matches[0][0]); $method_url = substr($method_url, strlen($http_method)); }else{ $http_method = 'GET'; } $url = $base_path. ($method_url=='index' || $method_url=='default' ? '' : $method_url); $url = rtrim($url,'/'); $this->routes[$http_method][$url] = $call; foreach ($params as $param){ if($param->getName()=='request_data'){ break; } $url .= $url=='' ? ':' : '/:'; $url .= $param->getName(); $this->routes[$http_method][$url] = $call; } } } } } if(version_compare(PHP_VERSION, '5.3.0') < 0){ require_once 'compat.php'; } class RestException extends Exception { public function __construct($http_status_code, $error_message = NULL) { parent::__construct($error_message, $http_status_code); } } interface iRespond { public function __formatResponse($result); public function __formatError($status_code, $message); } class DefaultResponse implements iRespond { function __formatResponse($result) { return $result; } function __formatError($statusCode, $message) { return array('error' => array('code' => $statusCode, 'message' => $message)); } } interface iAuthenticate { public function __isAuthenticated(); } interface iFormat { public function getMIMEMap(); public function setMIME($mime); public function getMIME(); public function setExtension($extension); public function getExtension(); public function encode($data, $human_readable=FALSE); public function decode($data); } class UrlEncodedFormat implements iFormat { const MIME = 'application/x-www-form-urlencoded'; const EXTENSION = 'post'; public function getMIMEMap() { return array(self::EXTENSION=>self::MIME); } public function getMIME(){ return self::MIME; } public function getExtension(){ return self::EXTENSION; } public function setMIME($mime){ } public function setExtension($extension){ } public function encode($data, $human_readable=FALSE){ return http_build_query($data); } public function decode($data){ parse_str($data,$r); return $r; } public function __toString(){ return $this->getExtension(); } } class JsonFormat implements iFormat { const MIME ='application/json'; const EXTENSION = 'json'; public function getMIMEMap() { return array(self::EXTENSION=>self::MIME); } public function getMIME(){ return self::MIME; } public function getExtension(){ return self::EXTENSION; } public function setMIME($mime){ } public function setExtension($extension){ } public function encode($data, $human_readable=FALSE){ return $human_readable ? $this->json_format(json_encode(object_to_array($data))) : json_encode(object_to_array($data)); } public function decode($data) { $decoded = json_decode ( $data ); if (function_exists ( 'json_last_error' )) { $message = ''; switch (json_last_error ()) { case JSON_ERROR_NONE : return object_to_array ( $decoded ); break; case JSON_ERROR_DEPTH : $message = 'maximum stack depth exceeded'; break; case JSON_ERROR_STATE_MISMATCH : $message = 'underflow or the modes mismatch'; break; case JSON_ERROR_CTRL_CHAR : $message = 'unexpected control character found'; break; case JSON_ERROR_SYNTAX : $message = 'malformed JSON'; break; case JSON_ERROR_UTF8 : $message = 'malformed UTF-8 characters, possibly incorrectly encoded'; break; default : $message = 'unknown error'; break; } throw new RestException ( 400, 'Error parsing JSON, ' . $message ); } else if (strlen ( $data ) && $decoded === NULL || $decoded === $data) { throw new RestException ( 400, 'Error parsing JSON' ); } return object_to_array ( $decoded ); } private function json_format($json) { $tab = "  "; $new_json = ""; $indent_level = 0; $in_string = FALSE; $len = strlen($json); for($c = 0; $c < $len; $c++) { $char = $json[$c]; switch($char) { case '{': case '[': if(!$in_string) { $new_json .= $char . "\n" . str_repeat($tab, $indent_level+1); $indent_level++; } else { $new_json .= $char; } break; case '}': case ']': if(!$in_string) { $indent_level--; $new_json .= "\n".str_repeat($tab, $indent_level).$char; } else { $new_json .= $char; } break; case ',': if(!$in_string) { $new_json .= ",\n" . str_repeat($tab, $indent_level); } else { $new_json .= $char; } break; case ':': if(!$in_string) { $new_json .= ": "; } else { $new_json .= $char; } break; case '"': if($c==0){ $in_string = TRUE; }elseif($c > 0 && $json[$c-1] != '\\') { $in_string = !$in_string; } default: $new_json .= $char; break; } } return $new_json; } public function __toString(){ return $this->getExtension(); } } class DocParser { private $params=array(); function parse($doc='') { if($doc==''){ return $this->params; } if(preg_match('#^/\*\*(.*)\*/#s', $doc, $comment) === false) return $this->params; $comment = trim($comment[1]); if(preg_match_all('#^\s*\*(.*)#m', $comment, $lines) === false) return $this->params; $this->parseLines($lines[1]); return $this->params; } private function parseLines($lines) { foreach($lines as $line) { $parsedLine = $this->parseLine($line); if($parsedLine === false && !isset($this->params['description'])) { if(isset($desc)){ $this->params['description'] = implode(PHP_EOL, $desc); } $desc = array(); } elseif($parsedLine !== false) { $desc[] = $parsedLine; } } $desc = implode(' ', $desc); if(!empty($desc))$this->params['long_description'] = $desc; } private function parseLine($line) { $line = trim($line); if(empty($line)) return false; if(strpos($line, '@') === 0) { if(strpos($line, ' ')>0){ $param = substr($line, 1, strpos($line, ' ') - 1); $value = substr($line, strlen($param) + 2); }else{ $param = substr($line, 1); $value = ''; } if($this->setParam($param, $value)) return false; } return $line; } private function setParam($param, $value) { if($param == 'param' || $param == 'return') $value = $this->formatParamOrReturn($value); if($param == 'class') list($param, $value) = $this->formatClass($value); if(empty($this->params[$param])) { $this->params[$param] = $value; } else if($param == 'param'){ $arr = array($this->params[$param], $value); $this->params[$param] = $arr; } else { $this->params[$param] = $value + $this->params[$param]; } return true; } private function formatClass($value) { $r = preg_split("[\(|\)]",$value); if(is_array($r)){ $param = $r[0]; parse_str($r[1],$value); foreach ($value as $key => $val) { $val = explode(',', $val); if(count($val)>1)$value[$key]=$val; } }else{ $param='Unknown'; } return array($param, $value); } private function formatParamOrReturn($string) { $pos = strpos($string, ' '); $type = substr($string, 0, $pos); return '(' . $type . ')' . substr($string, $pos+1); } } function parse_doc($php_doc_comment){ $p = new DocParser(); return $p->parse($php_doc_comment); $p = new Parser($php_doc_comment); return $p; $php_doc_comment = preg_replace("/(^[\\s]*\\/\\*\\*)
                                  |(^[\\s]\\*\\/)
                                  |(^[\\s]*\\*?\\s)
                                  |(^[\\s]*)

From 08232869d1b5f3dcaf54ac950514556e50701884 Mon Sep 17 00:00:00 2001
From: Luracast <arul@luracast.com>
Date: Sun, 4 Mar 2012 20:57:36 +0800
Subject: [PATCH 35/61] Fully implemented iResponse. Now we can globally
 customize the response structure for both success and error responses. Fixes
 #29

---
 restler/restler.php          | 15 +++++++++------
 restler_minified/restler.php |  2 +-
 2 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/restler/restler.php b/restler/restler.php
index 4d168cf77..6c5014bb5 100644
--- a/restler/restler.php
+++ b/restler/restler.php
@@ -10,10 +10,10 @@
  * @copyright  2010 Luracast
  * @license    http://www.opensource.org/licenses/lgpl-license.php LGPL
  * @link       http://luracast.com/products/restler/
- * @version    2.1.3
+ * @version    2.1.4
  */
 class Restler {
-	const VERSION = '2.1.3';
+	const VERSION = '2.1.4';
 	/**
 	 * URL of the currently mapped service
 	 * @var string
@@ -288,10 +288,9 @@ public function handleError ($status_code, $error_message = NULL) {
 		$message = $this->codes[$status_code] .
 		(!$error_message ? '' : ': ' . $error_message);
 		$this->setStatus($status_code);
-		$this->sendData(
-		call_user_func(
-		array($this->response, '__formatError'), $status_code, $message)
-		);
+		$responder = new $this->response();
+		$responder->restler = $this;
+		$this->sendData($responder->__formatError($status_code, $message));
 	}
 
 	/**
@@ -362,6 +361,10 @@ public function handle () {
 				$this->handleError($e->getCode(), $e->getMessage());
 			}
 		}
+		$responder = new $this->response();
+		$responder->restler = $this;
+		$this->applyClassMetadata($this->response, $responder, $o);
+		$result = $responder->__formatResponse($result);
 		if (isset($result) && $result !== NULL) {
 			$this->sendData($result);
 		}
diff --git a/restler_minified/restler.php b/restler_minified/restler.php
index b37f1808f..238165584 100644
--- a/restler_minified/restler.php
+++ b/restler_minified/restler.php
@@ -1,5 +1,5 @@
 <?php
- class Restler { const VERSION = '2.1.3'; public $url; public $request_method; public $request_format; public $request_data=array(); public $cache_dir; public $base_dir; public $response = 'DefaultResponse'; public $response_format; protected $production_mode; protected $routes= array(); protected $format_map = array(); protected $service_class_instance; protected $service_method; protected $auth_classes = array(); protected $error_classes = array(); private $codes = array( 100 => 'Continue', 101 => 'Switching Protocols', 200 => 'OK', 201 => 'Created', 202 => 'Accepted', 203 => 'Non-Authoritative Information', 204 => 'No Content', 205 => 'Reset Content', 206 => 'Partial Content', 300 => 'Multiple Choices', 301 => 'Moved Permanently', 302 => 'Found', 303 => 'See Other', 304 => 'Not Modified', 305 => 'Use Proxy', 306 => '(Unused)', 307 => 'Temporary Redirect', 400 => 'Bad Request', 401 => 'Unauthorized', 402 => 'Payment Required', 403 => 'Forbidden', 404 => 'Not Found', 405 => 'Method Not Allowed', 406 => 'Not Acceptable', 407 => 'Proxy Authentication Required', 408 => 'Request Timeout', 409 => 'Conflict', 410 => 'Gone', 411 => 'Length Required', 412 => 'Precondition Failed', 413 => 'Request Entity Too Large', 414 => 'Request-URI Too Long', 415 => 'Unsupported Media Type', 416 => 'Requested Range Not Satisfiable', 417 => 'Expectation Failed', 500 => 'Internal Server Error', 501 => 'Not Implemented', 502 => 'Bad Gateway', 503 => 'Service Unavailable', 504 => 'Gateway Timeout', 505 => 'HTTP Version Not Supported' ); protected $cached; public function __construct ($production_mode = FALSE) { $this->production_mode = $production_mode; $this->cache_dir = getcwd(); $this->base_dir = RESTLER_PATH; } public function __destruct () { if ($this->production_mode && !$this->cached) { $this->saveCache(); } } public function refreshCache () { $this->routes = array(); $this->cached = FALSE; } public function setSupportedFormats () { $args = func_get_args(); $extensions = array(); foreach ($args as $class_name) { if(!is_string($class_name) || !class_exists($class_name)){ throw new Exception("$class_name is not a vaild Format Class."); } $obj = new $class_name; if(! $obj instanceof iFormat){ throw new Exception('Invalid format class; must implement '. 'iFormat interface'); } foreach ($obj->getMIMEMap() as $extension => $mime) { if(!isset($this->format_map[$extension])) $this->format_map[$extension]=$class_name; if(!isset($this->format_map[$mime])) $this->format_map[$mime]=$class_name; $extensions[".$extension"]=TRUE; } } $this->format_map['default']=$args[0]; $this->format_map['extensions']=array_keys($extensions); } public function addAPIClass($class_name, $base_path = NULL) { if(!class_exists($class_name)){ throw new Exception("API class $class_name is missing."); } $this->loadCache(); if(!$this->cached){ if(is_null($base_path))$base_path=strtolower($class_name); $base_path = trim($base_path,'/'); if(strlen($base_path)>0)$base_path .= '/'; $this->generateMap($class_name, $base_path); } } public function addAuthenticationClass ($class_name, $base_path = NULL) { $this->auth_classes[] = $class_name; $this->addAPIClass($class_name, $base_path); } public function addErrorClass ($class_name) { $this->error_classes[] = $class_name; } public function handleError ($status_code, $error_message = NULL) { $method = "handle$status_code"; $handled = FALSE; foreach ($this->error_classes as $class_name) { if (method_exists($class_name, $method)) { $obj = new $class_name(); $obj->restler = $this; $obj->$method(); $handled = TRUE; } } if($handled)return; $message = $this->codes[$status_code] . (!$error_message ? '' : ': ' . $error_message); $this->setStatus($status_code); $this->sendData( call_user_func( array($this->response, '__formatError'), $status_code, $message) ); } public function handle () { if(empty($this->format_map))$this->setSupportedFormats('JsonFormat'); $this->url = $this->getPath(); $this->request_method = $this->getRequestMethod(); $this->response_format = $this->getResponseFormat(); $this->request_format = $this->getRequestFormat(); if(is_null($this->request_format)){ $this->request_format = $this->response_format; } if($this->request_method == 'PUT' || $this->request_method == 'POST'){ $this->request_data = $this->getRequestData(); } $o = $this->mapUrlToMethod(); if(!isset($o->class_name)){ $this->handleError(404); }else{ try { if($o->method_flag){ $auth_method = '__isAuthenticated'; if(!count($this->auth_classes))throw new RestException(401); foreach ($this->auth_classes as $auth_class) { $auth_obj = new $auth_class(); $auth_obj->restler=$this; $this->applyClassMetadata($auth_class, $auth_obj, $o); if (!method_exists($auth_obj, $auth_method)) { throw new RestException(401, 'Authentication Class '. 'should implement iAuthenticate'); }elseif(!$auth_obj->$auth_method()){ throw new RestException(401); } } } $this->applyClassMetadata(get_class($this->request_format), $this->request_format, $o); $pre_process = '_'.$this->request_format->getExtension().'_'. $o->method_name; $this->service_method = $o->method_name; if($o->method_flag==2)$o=unprotect($o); $object = $this->service_class_instance = new $o->class_name(); $object->restler=$this; if(method_exists($o->class_name, $pre_process)) { call_user_func_array(array($object, $pre_process), $o->arguments); } switch ($o->method_flag) { case 3: $reflection_method = new ReflectionMethod($object, $o->method_name); $reflection_method->setAccessible(TRUE); $result = $reflection_method->invokeArgs($object, $o->arguments); break; case 2: case 1: default: $result = call_user_func_array(array($object, $o->method_name), $o->arguments); } } catch (RestException $e) { $this->handleError($e->getCode(), $e->getMessage()); } } if (isset($result) && $result !== NULL) { $this->sendData($result); } } public function sendData($data) { $data = $this->response_format->encode($data, !$this->production_mode); $post_process = '_'.$this->service_method .'_'. $this->response_format->getExtension(); if(isset($this->service_class_instance) && method_exists($this->service_class_instance,$post_process)){ $data = call_user_func(array($this->service_class_instance, $post_process), $data); } header("Cache-Control: no-cache, must-revalidate"); header("Expires: 0"); header('Content-Type: ' . $this->response_format->getMIME()); header("X-Powered-By: Luracast Restler v".Restler::VERSION); die($data); } public function setStatus($code) { header("{$_SERVER['SERVER_PROTOCOL']} $code ". $this->codes[strval($code)]); } public function removeCommonPath($first, $second, $char='/'){ $first = explode($char, $first); $second = explode($char, $second); while (count($second)){ if($first[0]==$second[0]){ array_shift($first); } else break; array_shift($second); } return implode($char, $first); } public function saveCache() { $file = $this->cache_dir . '/routes.php'; $s = '$o=array();'.PHP_EOL; foreach ($this->routes as $key => $value) { $s .= PHP_EOL.PHP_EOL.PHP_EOL."############### $key ###############" .PHP_EOL.PHP_EOL; $s .= '$o[\''.$key.'\']=array();'; foreach ($value as $ke => $va) { $s .= PHP_EOL.PHP_EOL."#==== $key $ke".PHP_EOL.PHP_EOL; $s .= '$o[\''.$key.'\'][\''.$ke.'\']='.str_replace(PHP_EOL, PHP_EOL."\t", var_export($va, TRUE)).';'; } } $s .= PHP_EOL.'return $o;'; $r=@file_put_contents($file, "<?php $s"); @chmod($file, 0777); if($r===FALSE)throw new Exception( "The cache directory located at '$this->cache_dir' needs to have ". "the permissions set to read/write/execute for everyone in order ". "to save cache and improve performance."); } protected function getPath () { $path = urldecode($this->removeCommonPath($_SERVER['REQUEST_URI'], $_SERVER['SCRIPT_NAME'])); $path = preg_replace('/(\/*\?.*$)|(\/$)/', '', $path); $path = str_replace($this->format_map['extensions'], '', $path); return $path; } protected function getRequestMethod () { $method = $_SERVER['REQUEST_METHOD']; if (isset($_SERVER['HTTP_X_HTTP_METHOD_OVERRIDE'])){ $method = $_SERVER['HTTP_X_HTTP_METHOD_OVERRIDE']; } if($method=='HEAD')$method='GET'; return $method; } protected function getRequestFormat () { $format=NULL; if(isset($_SERVER['CONTENT_TYPE'])){ $mime = explode(';', $_SERVER['CONTENT_TYPE']); $mime = $mime[0]; if($mime==UrlEncodedFormat::MIME){ $format = new UrlEncodedFormat(); }else{ if(isset($this->format_map[$mime])){ $format = $this->format_map[$mime]; $format = is_string($format) ? new $format: $format; $format->setMIME($mime); } } } return $format; } protected function getResponseFormat () { $format=NULL; $extensions = explode('.', parse_url($_SERVER['REQUEST_URI'], PHP_URL_PATH)); while($extensions){ $extension = array_pop($extensions); $extension = explode('/', $extension); $extension = array_shift($extension); if($extension && isset($this->format_map[$extension])){ $format = $this->format_map[$extension]; $format = is_string($format) ? new $format: $format; $format->setExtension($extension); return $format; } } if(isset($_SERVER['HTTP_ACCEPT'])){ $accepts = explode(',', $_SERVER['HTTP_ACCEPT']); foreach ($accepts as $accept) { if($extension && isset($this->format_map[$accept])){ $format = $this->format_map[$accept]; $format = is_string($format) ? new $format: $format; $format->setMIME($accept); return $format; } } } $format = new $this->format_map['default']; return $format; } protected function getRequestData() { try{ $r = file_get_contents('php://input'); if(is_null($r))return $_GET; $r =$this->request_format->decode($r); return is_null($r) ? array(): $r; } catch (RestException $e) { $this->handleError($e->getCode(), $e->getMessage()); } } protected function mapUrlToMethod () { if(!isset($this->routes[$this->request_method])){ return array(); } $urls = $this->routes[$this->request_method]; if(!$urls)return array(); $found = FALSE; $this->request_data += $_GET; $params = array('request_data'=>$this->request_data); $params += $this->request_data; foreach ($urls as $url => $call) { $call = (object)$call; if(strstr($url, ':')){ $regex = preg_replace('/\\\:([^\/]+)/', '(?P<$1>[^/]+)', preg_quote($url)); if (preg_match(":^$regex$:", $this->url, $matches)) { foreach ($matches as $arg => $match) { if (isset($call->arguments[$arg])){ $params[$arg] = $match; } } $found = TRUE; break; } }elseif ($url == $this->url){ $found = TRUE; break; } } if($found){ $p = $call->defaults; foreach ($call->arguments as $key => $value) { if(isset($params[$key]))$p[$value] = $params[$key]; } $call->arguments=$p; return $call; } } protected function applyClassMetadata($class_name, $instance, $method_info){ if(isset($method_info->metadata[$class_name]) && is_array($method_info->metadata[$class_name])){ foreach ($method_info->metadata[$class_name] as $property => $value){ if(property_exists($class_name, $property)){ $reflection_property = new ReflectionProperty($class_name, $property); $reflection_property->setValue($instance, $value); } } } } protected function loadCache() { if ($this->cached !== NULL) { return; } $file = $this->cache_dir . '/routes.php'; $this->cached = FALSE; if ($this->production_mode) { if (file_exists($file)) { $routes = include($file); } if (isset($routes) && is_array($routes)) { $this->routes = $routes; $this->cached = TRUE; } } else { } } protected function generateMap ($class_name, $base_path = '') { $reflection = new ReflectionClass($class_name); $class_metadata = parse_doc($reflection->getDocComment()); $methods = $reflection->getMethods( ReflectionMethod::IS_PUBLIC + ReflectionMethod::IS_PROTECTED); foreach ($methods as $method) { $doc = $method->getDocComment(); $arguments = array(); $defaults = array(); $metadata = $class_metadata+parse_doc($doc); $params = $method->getParameters(); $position=0; foreach ($params as $param){ $arguments[$param->getName()] = $position; $defaults[$position] = $param->isDefaultValueAvailable() ? $param->getDefaultValue() : NULL; $position++; } $method_flag = $method->isProtected() ? (isRestlerCompatibilityModeEnabled() ? 2 : 3) : (isset($metadata['protected']) ? 1 : 0); $call = array( 'class_name'=>$class_name, 'method_name'=>$method->getName(), 'arguments'=>$arguments, 'defaults'=>$defaults, 'metadata'=>$metadata, 'method_flag'=>$method_flag ); $method_url = strtolower($method->getName()); if (preg_match_all( '/@url\s+(GET|POST|PUT|DELETE|HEAD|OPTIONS)[ \t]*\/?(\S*)/s', $doc, $matches, PREG_SET_ORDER)) { foreach ($matches as $match) { $http_method = $match[1]; $url = rtrim($base_path . $match[2],'/'); $this->routes[$http_method][$url] = $call; } }elseif($method_url[0] != '_'){ if (preg_match_all('/^(GET|POST|PUT|DELETE|HEAD|OPTIONS)/i', $method_url, $matches)) { $http_method = strtoupper($matches[0][0]); $method_url = substr($method_url, strlen($http_method)); }else{ $http_method = 'GET'; } $url = $base_path. ($method_url=='index' || $method_url=='default' ? '' : $method_url); $url = rtrim($url,'/'); $this->routes[$http_method][$url] = $call; foreach ($params as $param){ if($param->getName()=='request_data'){ break; } $url .= $url=='' ? ':' : '/:'; $url .= $param->getName(); $this->routes[$http_method][$url] = $call; } } } } } if(version_compare(PHP_VERSION, '5.3.0') < 0){ require_once 'compat.php'; } class RestException extends Exception { public function __construct($http_status_code, $error_message = NULL) { parent::__construct($error_message, $http_status_code); } } interface iRespond { public function __formatResponse($result); public function __formatError($status_code, $message); } class DefaultResponse implements iRespond { function __formatResponse($result) { return $result; } function __formatError($statusCode, $message) { return array('error' => array('code' => $statusCode, 'message' => $message)); } } interface iAuthenticate { public function __isAuthenticated(); } interface iFormat { public function getMIMEMap(); public function setMIME($mime); public function getMIME(); public function setExtension($extension); public function getExtension(); public function encode($data, $human_readable=FALSE); public function decode($data); } class UrlEncodedFormat implements iFormat { const MIME = 'application/x-www-form-urlencoded'; const EXTENSION = 'post'; public function getMIMEMap() { return array(self::EXTENSION=>self::MIME); } public function getMIME(){ return self::MIME; } public function getExtension(){ return self::EXTENSION; } public function setMIME($mime){ } public function setExtension($extension){ } public function encode($data, $human_readable=FALSE){ return http_build_query($data); } public function decode($data){ parse_str($data,$r); return $r; } public function __toString(){ return $this->getExtension(); } } class JsonFormat implements iFormat { const MIME ='application/json'; const EXTENSION = 'json'; public function getMIMEMap() { return array(self::EXTENSION=>self::MIME); } public function getMIME(){ return self::MIME; } public function getExtension(){ return self::EXTENSION; } public function setMIME($mime){ } public function setExtension($extension){ } public function encode($data, $human_readable=FALSE){ return $human_readable ? $this->json_format(json_encode(object_to_array($data))) : json_encode(object_to_array($data)); } public function decode($data) { $decoded = json_decode ( $data ); if (function_exists ( 'json_last_error' )) { $message = ''; switch (json_last_error ()) { case JSON_ERROR_NONE : return object_to_array ( $decoded ); break; case JSON_ERROR_DEPTH : $message = 'maximum stack depth exceeded'; break; case JSON_ERROR_STATE_MISMATCH : $message = 'underflow or the modes mismatch'; break; case JSON_ERROR_CTRL_CHAR : $message = 'unexpected control character found'; break; case JSON_ERROR_SYNTAX : $message = 'malformed JSON'; break; case JSON_ERROR_UTF8 : $message = 'malformed UTF-8 characters, possibly incorrectly encoded'; break; default : $message = 'unknown error'; break; } throw new RestException ( 400, 'Error parsing JSON, ' . $message ); } else if (strlen ( $data ) && $decoded === NULL || $decoded === $data) { throw new RestException ( 400, 'Error parsing JSON' ); } return object_to_array ( $decoded ); } private function json_format($json) { $tab = "  "; $new_json = ""; $indent_level = 0; $in_string = FALSE; $len = strlen($json); for($c = 0; $c < $len; $c++) { $char = $json[$c]; switch($char) { case '{': case '[': if(!$in_string) { $new_json .= $char . "\n" . str_repeat($tab, $indent_level+1); $indent_level++; } else { $new_json .= $char; } break; case '}': case ']': if(!$in_string) { $indent_level--; $new_json .= "\n".str_repeat($tab, $indent_level).$char; } else { $new_json .= $char; } break; case ',': if(!$in_string) { $new_json .= ",\n" . str_repeat($tab, $indent_level); } else { $new_json .= $char; } break; case ':': if(!$in_string) { $new_json .= ": "; } else { $new_json .= $char; } break; case '"': if($c==0){ $in_string = TRUE; }elseif($c > 0 && $json[$c-1] != '\\') { $in_string = !$in_string; } default: $new_json .= $char; break; } } return $new_json; } public function __toString(){ return $this->getExtension(); } } class DocParser { private $params=array(); function parse($doc='') { if($doc==''){ return $this->params; } if(preg_match('#^/\*\*(.*)\*/#s', $doc, $comment) === false) return $this->params; $comment = trim($comment[1]); if(preg_match_all('#^\s*\*(.*)#m', $comment, $lines) === false) return $this->params; $this->parseLines($lines[1]); return $this->params; } private function parseLines($lines) { foreach($lines as $line) { $parsedLine = $this->parseLine($line); if($parsedLine === false && !isset($this->params['description'])) { if(isset($desc)){ $this->params['description'] = implode(PHP_EOL, $desc); } $desc = array(); } elseif($parsedLine !== false) { $desc[] = $parsedLine; } } $desc = implode(' ', $desc); if(!empty($desc))$this->params['long_description'] = $desc; } private function parseLine($line) { $line = trim($line); if(empty($line)) return false; if(strpos($line, '@') === 0) { if(strpos($line, ' ')>0){ $param = substr($line, 1, strpos($line, ' ') - 1); $value = substr($line, strlen($param) + 2); }else{ $param = substr($line, 1); $value = ''; } if($this->setParam($param, $value)) return false; } return $line; } private function setParam($param, $value) { if($param == 'param' || $param == 'return') $value = $this->formatParamOrReturn($value); if($param == 'class') list($param, $value) = $this->formatClass($value); if(empty($this->params[$param])) { $this->params[$param] = $value; } else if($param == 'param'){ $arr = array($this->params[$param], $value); $this->params[$param] = $arr; } else { $this->params[$param] = $value + $this->params[$param]; } return true; } private function formatClass($value) { $r = preg_split("[\(|\)]",$value); if(is_array($r)){ $param = $r[0]; parse_str($r[1],$value); foreach ($value as $key => $val) { $val = explode(',', $val); if(count($val)>1)$value[$key]=$val; } }else{ $param='Unknown'; } return array($param, $value); } private function formatParamOrReturn($string) { $pos = strpos($string, ' '); $type = substr($string, 0, $pos); return '(' . $type . ')' . substr($string, $pos+1); } } function parse_doc($php_doc_comment){ $p = new DocParser(); return $p->parse($php_doc_comment); $p = new Parser($php_doc_comment); return $p; $php_doc_comment = preg_replace("/(^[\\s]*\\/\\*\\*)
+ class Restler { const VERSION = '2.1.4'; public $url; public $request_method; public $request_format; public $request_data=array(); public $cache_dir; public $base_dir; public $response = 'DefaultResponse'; public $response_format; protected $production_mode; protected $routes= array(); protected $format_map = array(); protected $service_class_instance; protected $service_method; protected $auth_classes = array(); protected $error_classes = array(); private $codes = array( 100 => 'Continue', 101 => 'Switching Protocols', 200 => 'OK', 201 => 'Created', 202 => 'Accepted', 203 => 'Non-Authoritative Information', 204 => 'No Content', 205 => 'Reset Content', 206 => 'Partial Content', 300 => 'Multiple Choices', 301 => 'Moved Permanently', 302 => 'Found', 303 => 'See Other', 304 => 'Not Modified', 305 => 'Use Proxy', 306 => '(Unused)', 307 => 'Temporary Redirect', 400 => 'Bad Request', 401 => 'Unauthorized', 402 => 'Payment Required', 403 => 'Forbidden', 404 => 'Not Found', 405 => 'Method Not Allowed', 406 => 'Not Acceptable', 407 => 'Proxy Authentication Required', 408 => 'Request Timeout', 409 => 'Conflict', 410 => 'Gone', 411 => 'Length Required', 412 => 'Precondition Failed', 413 => 'Request Entity Too Large', 414 => 'Request-URI Too Long', 415 => 'Unsupported Media Type', 416 => 'Requested Range Not Satisfiable', 417 => 'Expectation Failed', 500 => 'Internal Server Error', 501 => 'Not Implemented', 502 => 'Bad Gateway', 503 => 'Service Unavailable', 504 => 'Gateway Timeout', 505 => 'HTTP Version Not Supported' ); protected $cached; public function __construct ($production_mode = FALSE) { $this->production_mode = $production_mode; $this->cache_dir = getcwd(); $this->base_dir = RESTLER_PATH; } public function __destruct () { if ($this->production_mode && !$this->cached) { $this->saveCache(); } } public function refreshCache () { $this->routes = array(); $this->cached = FALSE; } public function setSupportedFormats () { $args = func_get_args(); $extensions = array(); foreach ($args as $class_name) { if(!is_string($class_name) || !class_exists($class_name)){ throw new Exception("$class_name is not a vaild Format Class."); } $obj = new $class_name; if(! $obj instanceof iFormat){ throw new Exception('Invalid format class; must implement '. 'iFormat interface'); } foreach ($obj->getMIMEMap() as $extension => $mime) { if(!isset($this->format_map[$extension])) $this->format_map[$extension]=$class_name; if(!isset($this->format_map[$mime])) $this->format_map[$mime]=$class_name; $extensions[".$extension"]=TRUE; } } $this->format_map['default']=$args[0]; $this->format_map['extensions']=array_keys($extensions); } public function addAPIClass($class_name, $base_path = NULL) { if(!class_exists($class_name)){ throw new Exception("API class $class_name is missing."); } $this->loadCache(); if(!$this->cached){ if(is_null($base_path))$base_path=strtolower($class_name); $base_path = trim($base_path,'/'); if(strlen($base_path)>0)$base_path .= '/'; $this->generateMap($class_name, $base_path); } } public function addAuthenticationClass ($class_name, $base_path = NULL) { $this->auth_classes[] = $class_name; $this->addAPIClass($class_name, $base_path); } public function addErrorClass ($class_name) { $this->error_classes[] = $class_name; } public function handleError ($status_code, $error_message = NULL) { $method = "handle$status_code"; $handled = FALSE; foreach ($this->error_classes as $class_name) { if (method_exists($class_name, $method)) { $obj = new $class_name(); $obj->restler = $this; $obj->$method(); $handled = TRUE; } } if($handled)return; $message = $this->codes[$status_code] . (!$error_message ? '' : ': ' . $error_message); $this->setStatus($status_code); $responder = new $this->response(); $responder->restler = $this; $this->sendData($responder->__formatError($status_code, $message)); } public function handle () { if(empty($this->format_map))$this->setSupportedFormats('JsonFormat'); $this->url = $this->getPath(); $this->request_method = $this->getRequestMethod(); $this->response_format = $this->getResponseFormat(); $this->request_format = $this->getRequestFormat(); if(is_null($this->request_format)){ $this->request_format = $this->response_format; } if($this->request_method == 'PUT' || $this->request_method == 'POST'){ $this->request_data = $this->getRequestData(); } $o = $this->mapUrlToMethod(); if(!isset($o->class_name)){ $this->handleError(404); }else{ try { if($o->method_flag){ $auth_method = '__isAuthenticated'; if(!count($this->auth_classes))throw new RestException(401); foreach ($this->auth_classes as $auth_class) { $auth_obj = new $auth_class(); $auth_obj->restler=$this; $this->applyClassMetadata($auth_class, $auth_obj, $o); if (!method_exists($auth_obj, $auth_method)) { throw new RestException(401, 'Authentication Class '. 'should implement iAuthenticate'); }elseif(!$auth_obj->$auth_method()){ throw new RestException(401); } } } $this->applyClassMetadata(get_class($this->request_format), $this->request_format, $o); $pre_process = '_'.$this->request_format->getExtension().'_'. $o->method_name; $this->service_method = $o->method_name; if($o->method_flag==2)$o=unprotect($o); $object = $this->service_class_instance = new $o->class_name(); $object->restler=$this; if(method_exists($o->class_name, $pre_process)) { call_user_func_array(array($object, $pre_process), $o->arguments); } switch ($o->method_flag) { case 3: $reflection_method = new ReflectionMethod($object, $o->method_name); $reflection_method->setAccessible(TRUE); $result = $reflection_method->invokeArgs($object, $o->arguments); break; case 2: case 1: default: $result = call_user_func_array(array($object, $o->method_name), $o->arguments); } } catch (RestException $e) { $this->handleError($e->getCode(), $e->getMessage()); } } $responder = new $this->response(); $responder->restler = $this; $this->applyClassMetadata($this->response, $responder, $o); $result = $responder->__formatResponse($result); if (isset($result) && $result !== NULL) { $this->sendData($result); } } public function sendData($data) { $data = $this->response_format->encode($data, !$this->production_mode); $post_process = '_'.$this->service_method .'_'. $this->response_format->getExtension(); if(isset($this->service_class_instance) && method_exists($this->service_class_instance,$post_process)){ $data = call_user_func(array($this->service_class_instance, $post_process), $data); } header("Cache-Control: no-cache, must-revalidate"); header("Expires: 0"); header('Content-Type: ' . $this->response_format->getMIME()); header("X-Powered-By: Luracast Restler v".Restler::VERSION); die($data); } public function setStatus($code) { header("{$_SERVER['SERVER_PROTOCOL']} $code ". $this->codes[strval($code)]); } public function removeCommonPath($first, $second, $char='/'){ $first = explode($char, $first); $second = explode($char, $second); while (count($second)){ if($first[0]==$second[0]){ array_shift($first); } else break; array_shift($second); } return implode($char, $first); } public function saveCache() { $file = $this->cache_dir . '/routes.php'; $s = '$o=array();'.PHP_EOL; foreach ($this->routes as $key => $value) { $s .= PHP_EOL.PHP_EOL.PHP_EOL."############### $key ###############" .PHP_EOL.PHP_EOL; $s .= '$o[\''.$key.'\']=array();'; foreach ($value as $ke => $va) { $s .= PHP_EOL.PHP_EOL."#==== $key $ke".PHP_EOL.PHP_EOL; $s .= '$o[\''.$key.'\'][\''.$ke.'\']='.str_replace(PHP_EOL, PHP_EOL."\t", var_export($va, TRUE)).';'; } } $s .= PHP_EOL.'return $o;'; $r=@file_put_contents($file, "<?php $s"); @chmod($file, 0777); if($r===FALSE)throw new Exception( "The cache directory located at '$this->cache_dir' needs to have ". "the permissions set to read/write/execute for everyone in order ". "to save cache and improve performance."); } protected function getPath () { $path = urldecode($this->removeCommonPath($_SERVER['REQUEST_URI'], $_SERVER['SCRIPT_NAME'])); $path = preg_replace('/(\/*\?.*$)|(\/$)/', '', $path); $path = str_replace($this->format_map['extensions'], '', $path); return $path; } protected function getRequestMethod () { $method = $_SERVER['REQUEST_METHOD']; if (isset($_SERVER['HTTP_X_HTTP_METHOD_OVERRIDE'])){ $method = $_SERVER['HTTP_X_HTTP_METHOD_OVERRIDE']; } if($method=='HEAD')$method='GET'; return $method; } protected function getRequestFormat () { $format=NULL; if(isset($_SERVER['CONTENT_TYPE'])){ $mime = explode(';', $_SERVER['CONTENT_TYPE']); $mime = $mime[0]; if($mime==UrlEncodedFormat::MIME){ $format = new UrlEncodedFormat(); }else{ if(isset($this->format_map[$mime])){ $format = $this->format_map[$mime]; $format = is_string($format) ? new $format: $format; $format->setMIME($mime); } } } return $format; } protected function getResponseFormat () { $format=NULL; $extensions = explode('.', parse_url($_SERVER['REQUEST_URI'], PHP_URL_PATH)); while($extensions){ $extension = array_pop($extensions); $extension = explode('/', $extension); $extension = array_shift($extension); if($extension && isset($this->format_map[$extension])){ $format = $this->format_map[$extension]; $format = is_string($format) ? new $format: $format; $format->setExtension($extension); return $format; } } if(isset($_SERVER['HTTP_ACCEPT'])){ $accepts = explode(',', $_SERVER['HTTP_ACCEPT']); foreach ($accepts as $accept) { if($extension && isset($this->format_map[$accept])){ $format = $this->format_map[$accept]; $format = is_string($format) ? new $format: $format; $format->setMIME($accept); return $format; } } } $format = new $this->format_map['default']; return $format; } protected function getRequestData() { try{ $r = file_get_contents('php://input'); if(is_null($r))return $_GET; $r =$this->request_format->decode($r); return is_null($r) ? array(): $r; } catch (RestException $e) { $this->handleError($e->getCode(), $e->getMessage()); } } protected function mapUrlToMethod () { if(!isset($this->routes[$this->request_method])){ return array(); } $urls = $this->routes[$this->request_method]; if(!$urls)return array(); $found = FALSE; $this->request_data += $_GET; $params = array('request_data'=>$this->request_data); $params += $this->request_data; foreach ($urls as $url => $call) { $call = (object)$call; if(strstr($url, ':')){ $regex = preg_replace('/\\\:([^\/]+)/', '(?P<$1>[^/]+)', preg_quote($url)); if (preg_match(":^$regex$:", $this->url, $matches)) { foreach ($matches as $arg => $match) { if (isset($call->arguments[$arg])){ $params[$arg] = $match; } } $found = TRUE; break; } }elseif ($url == $this->url){ $found = TRUE; break; } } if($found){ $p = $call->defaults; foreach ($call->arguments as $key => $value) { if(isset($params[$key]))$p[$value] = $params[$key]; } $call->arguments=$p; return $call; } } protected function applyClassMetadata($class_name, $instance, $method_info){ if(isset($method_info->metadata[$class_name]) && is_array($method_info->metadata[$class_name])){ foreach ($method_info->metadata[$class_name] as $property => $value){ if(property_exists($class_name, $property)){ $reflection_property = new ReflectionProperty($class_name, $property); $reflection_property->setValue($instance, $value); } } } } protected function loadCache() { if ($this->cached !== NULL) { return; } $file = $this->cache_dir . '/routes.php'; $this->cached = FALSE; if ($this->production_mode) { if (file_exists($file)) { $routes = include($file); } if (isset($routes) && is_array($routes)) { $this->routes = $routes; $this->cached = TRUE; } } else { } } protected function generateMap ($class_name, $base_path = '') { $reflection = new ReflectionClass($class_name); $class_metadata = parse_doc($reflection->getDocComment()); $methods = $reflection->getMethods( ReflectionMethod::IS_PUBLIC + ReflectionMethod::IS_PROTECTED); foreach ($methods as $method) { $doc = $method->getDocComment(); $arguments = array(); $defaults = array(); $metadata = $class_metadata+parse_doc($doc); $params = $method->getParameters(); $position=0; foreach ($params as $param){ $arguments[$param->getName()] = $position; $defaults[$position] = $param->isDefaultValueAvailable() ? $param->getDefaultValue() : NULL; $position++; } $method_flag = $method->isProtected() ? (isRestlerCompatibilityModeEnabled() ? 2 : 3) : (isset($metadata['protected']) ? 1 : 0); $call = array( 'class_name'=>$class_name, 'method_name'=>$method->getName(), 'arguments'=>$arguments, 'defaults'=>$defaults, 'metadata'=>$metadata, 'method_flag'=>$method_flag ); $method_url = strtolower($method->getName()); if (preg_match_all( '/@url\s+(GET|POST|PUT|DELETE|HEAD|OPTIONS)[ \t]*\/?(\S*)/s', $doc, $matches, PREG_SET_ORDER)) { foreach ($matches as $match) { $http_method = $match[1]; $url = rtrim($base_path . $match[2],'/'); $this->routes[$http_method][$url] = $call; } }elseif($method_url[0] != '_'){ if (preg_match_all('/^(GET|POST|PUT|DELETE|HEAD|OPTIONS)/i', $method_url, $matches)) { $http_method = strtoupper($matches[0][0]); $method_url = substr($method_url, strlen($http_method)); }else{ $http_method = 'GET'; } $url = $base_path. ($method_url=='index' || $method_url=='default' ? '' : $method_url); $url = rtrim($url,'/'); $this->routes[$http_method][$url] = $call; foreach ($params as $param){ if($param->getName()=='request_data'){ break; } $url .= $url=='' ? ':' : '/:'; $url .= $param->getName(); $this->routes[$http_method][$url] = $call; } } } } } if(version_compare(PHP_VERSION, '5.3.0') < 0){ require_once 'compat.php'; } class RestException extends Exception { public function __construct($http_status_code, $error_message = NULL) { parent::__construct($error_message, $http_status_code); } } interface iRespond { public function __formatResponse($result); public function __formatError($status_code, $message); } class DefaultResponse implements iRespond { function __formatResponse($result) { return $result; } function __formatError($statusCode, $message) { return array('error' => array('code' => $statusCode, 'message' => $message)); } } interface iAuthenticate { public function __isAuthenticated(); } interface iFormat { public function getMIMEMap(); public function setMIME($mime); public function getMIME(); public function setExtension($extension); public function getExtension(); public function encode($data, $human_readable=FALSE); public function decode($data); } class UrlEncodedFormat implements iFormat { const MIME = 'application/x-www-form-urlencoded'; const EXTENSION = 'post'; public function getMIMEMap() { return array(self::EXTENSION=>self::MIME); } public function getMIME(){ return self::MIME; } public function getExtension(){ return self::EXTENSION; } public function setMIME($mime){ } public function setExtension($extension){ } public function encode($data, $human_readable=FALSE){ return http_build_query($data); } public function decode($data){ parse_str($data,$r); return $r; } public function __toString(){ return $this->getExtension(); } } class JsonFormat implements iFormat { const MIME ='application/json'; const EXTENSION = 'json'; public function getMIMEMap() { return array(self::EXTENSION=>self::MIME); } public function getMIME(){ return self::MIME; } public function getExtension(){ return self::EXTENSION; } public function setMIME($mime){ } public function setExtension($extension){ } public function encode($data, $human_readable=FALSE){ return $human_readable ? $this->json_format(json_encode(object_to_array($data))) : json_encode(object_to_array($data)); } public function decode($data) { $decoded = json_decode ( $data ); if (function_exists ( 'json_last_error' )) { $message = ''; switch (json_last_error ()) { case JSON_ERROR_NONE : return object_to_array ( $decoded ); break; case JSON_ERROR_DEPTH : $message = 'maximum stack depth exceeded'; break; case JSON_ERROR_STATE_MISMATCH : $message = 'underflow or the modes mismatch'; break; case JSON_ERROR_CTRL_CHAR : $message = 'unexpected control character found'; break; case JSON_ERROR_SYNTAX : $message = 'malformed JSON'; break; case JSON_ERROR_UTF8 : $message = 'malformed UTF-8 characters, possibly incorrectly encoded'; break; default : $message = 'unknown error'; break; } throw new RestException ( 400, 'Error parsing JSON, ' . $message ); } else if (strlen ( $data ) && $decoded === NULL || $decoded === $data) { throw new RestException ( 400, 'Error parsing JSON' ); } return object_to_array ( $decoded ); } private function json_format($json) { $tab = "  "; $new_json = ""; $indent_level = 0; $in_string = FALSE; $len = strlen($json); for($c = 0; $c < $len; $c++) { $char = $json[$c]; switch($char) { case '{': case '[': if(!$in_string) { $new_json .= $char . "\n" . str_repeat($tab, $indent_level+1); $indent_level++; } else { $new_json .= $char; } break; case '}': case ']': if(!$in_string) { $indent_level--; $new_json .= "\n".str_repeat($tab, $indent_level).$char; } else { $new_json .= $char; } break; case ',': if(!$in_string) { $new_json .= ",\n" . str_repeat($tab, $indent_level); } else { $new_json .= $char; } break; case ':': if(!$in_string) { $new_json .= ": "; } else { $new_json .= $char; } break; case '"': if($c==0){ $in_string = TRUE; }elseif($c > 0 && $json[$c-1] != '\\') { $in_string = !$in_string; } default: $new_json .= $char; break; } } return $new_json; } public function __toString(){ return $this->getExtension(); } } class DocParser { private $params=array(); function parse($doc='') { if($doc==''){ return $this->params; } if(preg_match('#^/\*\*(.*)\*/#s', $doc, $comment) === false) return $this->params; $comment = trim($comment[1]); if(preg_match_all('#^\s*\*(.*)#m', $comment, $lines) === false) return $this->params; $this->parseLines($lines[1]); return $this->params; } private function parseLines($lines) { foreach($lines as $line) { $parsedLine = $this->parseLine($line); if($parsedLine === false && !isset($this->params['description'])) { if(isset($desc)){ $this->params['description'] = implode(PHP_EOL, $desc); } $desc = array(); } elseif($parsedLine !== false) { $desc[] = $parsedLine; } } $desc = implode(' ', $desc); if(!empty($desc))$this->params['long_description'] = $desc; } private function parseLine($line) { $line = trim($line); if(empty($line)) return false; if(strpos($line, '@') === 0) { if(strpos($line, ' ')>0){ $param = substr($line, 1, strpos($line, ' ') - 1); $value = substr($line, strlen($param) + 2); }else{ $param = substr($line, 1); $value = ''; } if($this->setParam($param, $value)) return false; } return $line; } private function setParam($param, $value) { if($param == 'param' || $param == 'return') $value = $this->formatParamOrReturn($value); if($param == 'class') list($param, $value) = $this->formatClass($value); if(empty($this->params[$param])) { $this->params[$param] = $value; } else if($param == 'param'){ $arr = array($this->params[$param], $value); $this->params[$param] = $arr; } else { $this->params[$param] = $value + $this->params[$param]; } return true; } private function formatClass($value) { $r = preg_split("[\(|\)]",$value); if(is_array($r)){ $param = $r[0]; parse_str($r[1],$value); foreach ($value as $key => $val) { $val = explode(',', $val); if(count($val)>1)$value[$key]=$val; } }else{ $param='Unknown'; } return array($param, $value); } private function formatParamOrReturn($string) { $pos = strpos($string, ' '); $type = substr($string, 0, $pos); return '(' . $type . ')' . substr($string, $pos+1); } } function parse_doc($php_doc_comment){ $p = new DocParser(); return $p->parse($php_doc_comment); $p = new Parser($php_doc_comment); return $p; $php_doc_comment = preg_replace("/(^[\\s]*\\/\\*\\*)
                                  |(^[\\s]\\*\\/)
                                  |(^[\\s]*\\*?\\s)
                                  |(^[\\s]*)

From daa024e9c6d53360c948325e642734c6b74f40e6 Mon Sep 17 00:00:00 2001
From: Luracast <arul@luracast.com>
Date: Sat, 21 Apr 2012 15:18:40 +0800
Subject: [PATCH 36/61] Minor update: Replaced ifModule in .htaccess files with
 IfModule (upper case I). This fixes #41

---
 examples/_001_helloworld/.htaccess     | 2 +-
 examples/_002_minimal/.htaccess        | 2 +-
 examples/_003_multiformat/.htaccess    | 2 +-
 examples/_004_error_response/.htaccess | 2 +-
 examples/_005_protected_api/.htaccess  | 2 +-
 examples/_006_crud/.htaccess           | 2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/examples/_001_helloworld/.htaccess b/examples/_001_helloworld/.htaccess
index 22c547c25..0704f6941 100755
--- a/examples/_001_helloworld/.htaccess
+++ b/examples/_001_helloworld/.htaccess
@@ -6,6 +6,6 @@ DirectoryIndex index.php
 	RewriteCond %{REQUEST_FILENAME} !-d
 	RewriteRule ^(.*)$ index.php [QSA,L]
 </IfModule>
-<ifModule mod_php5.c>
+<IfModule mod_php5.c>
 	php_flag display_errors Off
 </IfModule>
\ No newline at end of file
diff --git a/examples/_002_minimal/.htaccess b/examples/_002_minimal/.htaccess
index 22c547c25..0704f6941 100755
--- a/examples/_002_minimal/.htaccess
+++ b/examples/_002_minimal/.htaccess
@@ -6,6 +6,6 @@ DirectoryIndex index.php
 	RewriteCond %{REQUEST_FILENAME} !-d
 	RewriteRule ^(.*)$ index.php [QSA,L]
 </IfModule>
-<ifModule mod_php5.c>
+<IfModule mod_php5.c>
 	php_flag display_errors Off
 </IfModule>
\ No newline at end of file
diff --git a/examples/_003_multiformat/.htaccess b/examples/_003_multiformat/.htaccess
index 22c547c25..0704f6941 100755
--- a/examples/_003_multiformat/.htaccess
+++ b/examples/_003_multiformat/.htaccess
@@ -6,6 +6,6 @@ DirectoryIndex index.php
 	RewriteCond %{REQUEST_FILENAME} !-d
 	RewriteRule ^(.*)$ index.php [QSA,L]
 </IfModule>
-<ifModule mod_php5.c>
+<IfModule mod_php5.c>
 	php_flag display_errors Off
 </IfModule>
\ No newline at end of file
diff --git a/examples/_004_error_response/.htaccess b/examples/_004_error_response/.htaccess
index 22c547c25..0704f6941 100755
--- a/examples/_004_error_response/.htaccess
+++ b/examples/_004_error_response/.htaccess
@@ -6,6 +6,6 @@ DirectoryIndex index.php
 	RewriteCond %{REQUEST_FILENAME} !-d
 	RewriteRule ^(.*)$ index.php [QSA,L]
 </IfModule>
-<ifModule mod_php5.c>
+<IfModule mod_php5.c>
 	php_flag display_errors Off
 </IfModule>
\ No newline at end of file
diff --git a/examples/_005_protected_api/.htaccess b/examples/_005_protected_api/.htaccess
index 22c547c25..0704f6941 100755
--- a/examples/_005_protected_api/.htaccess
+++ b/examples/_005_protected_api/.htaccess
@@ -6,6 +6,6 @@ DirectoryIndex index.php
 	RewriteCond %{REQUEST_FILENAME} !-d
 	RewriteRule ^(.*)$ index.php [QSA,L]
 </IfModule>
-<ifModule mod_php5.c>
+<IfModule mod_php5.c>
 	php_flag display_errors Off
 </IfModule>
\ No newline at end of file
diff --git a/examples/_006_crud/.htaccess b/examples/_006_crud/.htaccess
index 22c547c25..0704f6941 100755
--- a/examples/_006_crud/.htaccess
+++ b/examples/_006_crud/.htaccess
@@ -6,6 +6,6 @@ DirectoryIndex index.php
 	RewriteCond %{REQUEST_FILENAME} !-d
 	RewriteRule ^(.*)$ index.php [QSA,L]
 </IfModule>
-<ifModule mod_php5.c>
+<IfModule mod_php5.c>
 	php_flag display_errors Off
 </IfModule>
\ No newline at end of file

From b5bd1e18780585b171e4645915f654b6a19dbc1b Mon Sep 17 00:00:00 2001
From: Luracast <arul@luracast.com>
Date: Sun, 6 May 2012 15:44:05 -0500
Subject: [PATCH 37/61] Minor fixes to remove php error notifications in
 Restler::handle() (thrown on some use cases) and DocParser:: formatClass()
 (thrown when @class doc comment is used). Closes #42

---
 restler/restler.php          | 10 +++++-----
 restler_minified/restler.php |  2 +-
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/restler/restler.php b/restler/restler.php
index 6c5014bb5..cd99ee434 100644
--- a/restler/restler.php
+++ b/restler/restler.php
@@ -10,10 +10,10 @@
  * @copyright  2010 Luracast
  * @license    http://www.opensource.org/licenses/lgpl-license.php LGPL
  * @link       http://luracast.com/products/restler/
- * @version    2.1.4
+ * @version    2.1.5
  */
 class Restler {
-	const VERSION = '2.1.4';
+	const VERSION = '2.1.5';
 	/**
 	 * URL of the currently mapped service
 	 * @var string
@@ -364,8 +364,8 @@ public function handle () {
 		$responder = new $this->response();
 		$responder->restler = $this;
 		$this->applyClassMetadata($this->response, $responder, $o);
-		$result = $responder->__formatResponse($result);
 		if (isset($result) && $result !== NULL) {
+			$result = $responder->__formatResponse($result);
 			$this->sendData($result);
 		}
 	}
@@ -1133,8 +1133,8 @@ private function setParam($param, $value) {
 		return true;
 	}
 	private function formatClass($value) {
-		$r = preg_split("[\(|\)]",$value);
-		if(is_array($r)){
+		$r = preg_split("[\(|\)]", $value);
+		if(count($r)>1){
 			$param = $r[0];
 			parse_str($r[1],$value);
 			foreach ($value as $key => $val) {
diff --git a/restler_minified/restler.php b/restler_minified/restler.php
index 238165584..64ef89d4a 100644
--- a/restler_minified/restler.php
+++ b/restler_minified/restler.php
@@ -1,5 +1,5 @@
 <?php
- class Restler { const VERSION = '2.1.4'; public $url; public $request_method; public $request_format; public $request_data=array(); public $cache_dir; public $base_dir; public $response = 'DefaultResponse'; public $response_format; protected $production_mode; protected $routes= array(); protected $format_map = array(); protected $service_class_instance; protected $service_method; protected $auth_classes = array(); protected $error_classes = array(); private $codes = array( 100 => 'Continue', 101 => 'Switching Protocols', 200 => 'OK', 201 => 'Created', 202 => 'Accepted', 203 => 'Non-Authoritative Information', 204 => 'No Content', 205 => 'Reset Content', 206 => 'Partial Content', 300 => 'Multiple Choices', 301 => 'Moved Permanently', 302 => 'Found', 303 => 'See Other', 304 => 'Not Modified', 305 => 'Use Proxy', 306 => '(Unused)', 307 => 'Temporary Redirect', 400 => 'Bad Request', 401 => 'Unauthorized', 402 => 'Payment Required', 403 => 'Forbidden', 404 => 'Not Found', 405 => 'Method Not Allowed', 406 => 'Not Acceptable', 407 => 'Proxy Authentication Required', 408 => 'Request Timeout', 409 => 'Conflict', 410 => 'Gone', 411 => 'Length Required', 412 => 'Precondition Failed', 413 => 'Request Entity Too Large', 414 => 'Request-URI Too Long', 415 => 'Unsupported Media Type', 416 => 'Requested Range Not Satisfiable', 417 => 'Expectation Failed', 500 => 'Internal Server Error', 501 => 'Not Implemented', 502 => 'Bad Gateway', 503 => 'Service Unavailable', 504 => 'Gateway Timeout', 505 => 'HTTP Version Not Supported' ); protected $cached; public function __construct ($production_mode = FALSE) { $this->production_mode = $production_mode; $this->cache_dir = getcwd(); $this->base_dir = RESTLER_PATH; } public function __destruct () { if ($this->production_mode && !$this->cached) { $this->saveCache(); } } public function refreshCache () { $this->routes = array(); $this->cached = FALSE; } public function setSupportedFormats () { $args = func_get_args(); $extensions = array(); foreach ($args as $class_name) { if(!is_string($class_name) || !class_exists($class_name)){ throw new Exception("$class_name is not a vaild Format Class."); } $obj = new $class_name; if(! $obj instanceof iFormat){ throw new Exception('Invalid format class; must implement '. 'iFormat interface'); } foreach ($obj->getMIMEMap() as $extension => $mime) { if(!isset($this->format_map[$extension])) $this->format_map[$extension]=$class_name; if(!isset($this->format_map[$mime])) $this->format_map[$mime]=$class_name; $extensions[".$extension"]=TRUE; } } $this->format_map['default']=$args[0]; $this->format_map['extensions']=array_keys($extensions); } public function addAPIClass($class_name, $base_path = NULL) { if(!class_exists($class_name)){ throw new Exception("API class $class_name is missing."); } $this->loadCache(); if(!$this->cached){ if(is_null($base_path))$base_path=strtolower($class_name); $base_path = trim($base_path,'/'); if(strlen($base_path)>0)$base_path .= '/'; $this->generateMap($class_name, $base_path); } } public function addAuthenticationClass ($class_name, $base_path = NULL) { $this->auth_classes[] = $class_name; $this->addAPIClass($class_name, $base_path); } public function addErrorClass ($class_name) { $this->error_classes[] = $class_name; } public function handleError ($status_code, $error_message = NULL) { $method = "handle$status_code"; $handled = FALSE; foreach ($this->error_classes as $class_name) { if (method_exists($class_name, $method)) { $obj = new $class_name(); $obj->restler = $this; $obj->$method(); $handled = TRUE; } } if($handled)return; $message = $this->codes[$status_code] . (!$error_message ? '' : ': ' . $error_message); $this->setStatus($status_code); $responder = new $this->response(); $responder->restler = $this; $this->sendData($responder->__formatError($status_code, $message)); } public function handle () { if(empty($this->format_map))$this->setSupportedFormats('JsonFormat'); $this->url = $this->getPath(); $this->request_method = $this->getRequestMethod(); $this->response_format = $this->getResponseFormat(); $this->request_format = $this->getRequestFormat(); if(is_null($this->request_format)){ $this->request_format = $this->response_format; } if($this->request_method == 'PUT' || $this->request_method == 'POST'){ $this->request_data = $this->getRequestData(); } $o = $this->mapUrlToMethod(); if(!isset($o->class_name)){ $this->handleError(404); }else{ try { if($o->method_flag){ $auth_method = '__isAuthenticated'; if(!count($this->auth_classes))throw new RestException(401); foreach ($this->auth_classes as $auth_class) { $auth_obj = new $auth_class(); $auth_obj->restler=$this; $this->applyClassMetadata($auth_class, $auth_obj, $o); if (!method_exists($auth_obj, $auth_method)) { throw new RestException(401, 'Authentication Class '. 'should implement iAuthenticate'); }elseif(!$auth_obj->$auth_method()){ throw new RestException(401); } } } $this->applyClassMetadata(get_class($this->request_format), $this->request_format, $o); $pre_process = '_'.$this->request_format->getExtension().'_'. $o->method_name; $this->service_method = $o->method_name; if($o->method_flag==2)$o=unprotect($o); $object = $this->service_class_instance = new $o->class_name(); $object->restler=$this; if(method_exists($o->class_name, $pre_process)) { call_user_func_array(array($object, $pre_process), $o->arguments); } switch ($o->method_flag) { case 3: $reflection_method = new ReflectionMethod($object, $o->method_name); $reflection_method->setAccessible(TRUE); $result = $reflection_method->invokeArgs($object, $o->arguments); break; case 2: case 1: default: $result = call_user_func_array(array($object, $o->method_name), $o->arguments); } } catch (RestException $e) { $this->handleError($e->getCode(), $e->getMessage()); } } $responder = new $this->response(); $responder->restler = $this; $this->applyClassMetadata($this->response, $responder, $o); $result = $responder->__formatResponse($result); if (isset($result) && $result !== NULL) { $this->sendData($result); } } public function sendData($data) { $data = $this->response_format->encode($data, !$this->production_mode); $post_process = '_'.$this->service_method .'_'. $this->response_format->getExtension(); if(isset($this->service_class_instance) && method_exists($this->service_class_instance,$post_process)){ $data = call_user_func(array($this->service_class_instance, $post_process), $data); } header("Cache-Control: no-cache, must-revalidate"); header("Expires: 0"); header('Content-Type: ' . $this->response_format->getMIME()); header("X-Powered-By: Luracast Restler v".Restler::VERSION); die($data); } public function setStatus($code) { header("{$_SERVER['SERVER_PROTOCOL']} $code ". $this->codes[strval($code)]); } public function removeCommonPath($first, $second, $char='/'){ $first = explode($char, $first); $second = explode($char, $second); while (count($second)){ if($first[0]==$second[0]){ array_shift($first); } else break; array_shift($second); } return implode($char, $first); } public function saveCache() { $file = $this->cache_dir . '/routes.php'; $s = '$o=array();'.PHP_EOL; foreach ($this->routes as $key => $value) { $s .= PHP_EOL.PHP_EOL.PHP_EOL."############### $key ###############" .PHP_EOL.PHP_EOL; $s .= '$o[\''.$key.'\']=array();'; foreach ($value as $ke => $va) { $s .= PHP_EOL.PHP_EOL."#==== $key $ke".PHP_EOL.PHP_EOL; $s .= '$o[\''.$key.'\'][\''.$ke.'\']='.str_replace(PHP_EOL, PHP_EOL."\t", var_export($va, TRUE)).';'; } } $s .= PHP_EOL.'return $o;'; $r=@file_put_contents($file, "<?php $s"); @chmod($file, 0777); if($r===FALSE)throw new Exception( "The cache directory located at '$this->cache_dir' needs to have ". "the permissions set to read/write/execute for everyone in order ". "to save cache and improve performance."); } protected function getPath () { $path = urldecode($this->removeCommonPath($_SERVER['REQUEST_URI'], $_SERVER['SCRIPT_NAME'])); $path = preg_replace('/(\/*\?.*$)|(\/$)/', '', $path); $path = str_replace($this->format_map['extensions'], '', $path); return $path; } protected function getRequestMethod () { $method = $_SERVER['REQUEST_METHOD']; if (isset($_SERVER['HTTP_X_HTTP_METHOD_OVERRIDE'])){ $method = $_SERVER['HTTP_X_HTTP_METHOD_OVERRIDE']; } if($method=='HEAD')$method='GET'; return $method; } protected function getRequestFormat () { $format=NULL; if(isset($_SERVER['CONTENT_TYPE'])){ $mime = explode(';', $_SERVER['CONTENT_TYPE']); $mime = $mime[0]; if($mime==UrlEncodedFormat::MIME){ $format = new UrlEncodedFormat(); }else{ if(isset($this->format_map[$mime])){ $format = $this->format_map[$mime]; $format = is_string($format) ? new $format: $format; $format->setMIME($mime); } } } return $format; } protected function getResponseFormat () { $format=NULL; $extensions = explode('.', parse_url($_SERVER['REQUEST_URI'], PHP_URL_PATH)); while($extensions){ $extension = array_pop($extensions); $extension = explode('/', $extension); $extension = array_shift($extension); if($extension && isset($this->format_map[$extension])){ $format = $this->format_map[$extension]; $format = is_string($format) ? new $format: $format; $format->setExtension($extension); return $format; } } if(isset($_SERVER['HTTP_ACCEPT'])){ $accepts = explode(',', $_SERVER['HTTP_ACCEPT']); foreach ($accepts as $accept) { if($extension && isset($this->format_map[$accept])){ $format = $this->format_map[$accept]; $format = is_string($format) ? new $format: $format; $format->setMIME($accept); return $format; } } } $format = new $this->format_map['default']; return $format; } protected function getRequestData() { try{ $r = file_get_contents('php://input'); if(is_null($r))return $_GET; $r =$this->request_format->decode($r); return is_null($r) ? array(): $r; } catch (RestException $e) { $this->handleError($e->getCode(), $e->getMessage()); } } protected function mapUrlToMethod () { if(!isset($this->routes[$this->request_method])){ return array(); } $urls = $this->routes[$this->request_method]; if(!$urls)return array(); $found = FALSE; $this->request_data += $_GET; $params = array('request_data'=>$this->request_data); $params += $this->request_data; foreach ($urls as $url => $call) { $call = (object)$call; if(strstr($url, ':')){ $regex = preg_replace('/\\\:([^\/]+)/', '(?P<$1>[^/]+)', preg_quote($url)); if (preg_match(":^$regex$:", $this->url, $matches)) { foreach ($matches as $arg => $match) { if (isset($call->arguments[$arg])){ $params[$arg] = $match; } } $found = TRUE; break; } }elseif ($url == $this->url){ $found = TRUE; break; } } if($found){ $p = $call->defaults; foreach ($call->arguments as $key => $value) { if(isset($params[$key]))$p[$value] = $params[$key]; } $call->arguments=$p; return $call; } } protected function applyClassMetadata($class_name, $instance, $method_info){ if(isset($method_info->metadata[$class_name]) && is_array($method_info->metadata[$class_name])){ foreach ($method_info->metadata[$class_name] as $property => $value){ if(property_exists($class_name, $property)){ $reflection_property = new ReflectionProperty($class_name, $property); $reflection_property->setValue($instance, $value); } } } } protected function loadCache() { if ($this->cached !== NULL) { return; } $file = $this->cache_dir . '/routes.php'; $this->cached = FALSE; if ($this->production_mode) { if (file_exists($file)) { $routes = include($file); } if (isset($routes) && is_array($routes)) { $this->routes = $routes; $this->cached = TRUE; } } else { } } protected function generateMap ($class_name, $base_path = '') { $reflection = new ReflectionClass($class_name); $class_metadata = parse_doc($reflection->getDocComment()); $methods = $reflection->getMethods( ReflectionMethod::IS_PUBLIC + ReflectionMethod::IS_PROTECTED); foreach ($methods as $method) { $doc = $method->getDocComment(); $arguments = array(); $defaults = array(); $metadata = $class_metadata+parse_doc($doc); $params = $method->getParameters(); $position=0; foreach ($params as $param){ $arguments[$param->getName()] = $position; $defaults[$position] = $param->isDefaultValueAvailable() ? $param->getDefaultValue() : NULL; $position++; } $method_flag = $method->isProtected() ? (isRestlerCompatibilityModeEnabled() ? 2 : 3) : (isset($metadata['protected']) ? 1 : 0); $call = array( 'class_name'=>$class_name, 'method_name'=>$method->getName(), 'arguments'=>$arguments, 'defaults'=>$defaults, 'metadata'=>$metadata, 'method_flag'=>$method_flag ); $method_url = strtolower($method->getName()); if (preg_match_all( '/@url\s+(GET|POST|PUT|DELETE|HEAD|OPTIONS)[ \t]*\/?(\S*)/s', $doc, $matches, PREG_SET_ORDER)) { foreach ($matches as $match) { $http_method = $match[1]; $url = rtrim($base_path . $match[2],'/'); $this->routes[$http_method][$url] = $call; } }elseif($method_url[0] != '_'){ if (preg_match_all('/^(GET|POST|PUT|DELETE|HEAD|OPTIONS)/i', $method_url, $matches)) { $http_method = strtoupper($matches[0][0]); $method_url = substr($method_url, strlen($http_method)); }else{ $http_method = 'GET'; } $url = $base_path. ($method_url=='index' || $method_url=='default' ? '' : $method_url); $url = rtrim($url,'/'); $this->routes[$http_method][$url] = $call; foreach ($params as $param){ if($param->getName()=='request_data'){ break; } $url .= $url=='' ? ':' : '/:'; $url .= $param->getName(); $this->routes[$http_method][$url] = $call; } } } } } if(version_compare(PHP_VERSION, '5.3.0') < 0){ require_once 'compat.php'; } class RestException extends Exception { public function __construct($http_status_code, $error_message = NULL) { parent::__construct($error_message, $http_status_code); } } interface iRespond { public function __formatResponse($result); public function __formatError($status_code, $message); } class DefaultResponse implements iRespond { function __formatResponse($result) { return $result; } function __formatError($statusCode, $message) { return array('error' => array('code' => $statusCode, 'message' => $message)); } } interface iAuthenticate { public function __isAuthenticated(); } interface iFormat { public function getMIMEMap(); public function setMIME($mime); public function getMIME(); public function setExtension($extension); public function getExtension(); public function encode($data, $human_readable=FALSE); public function decode($data); } class UrlEncodedFormat implements iFormat { const MIME = 'application/x-www-form-urlencoded'; const EXTENSION = 'post'; public function getMIMEMap() { return array(self::EXTENSION=>self::MIME); } public function getMIME(){ return self::MIME; } public function getExtension(){ return self::EXTENSION; } public function setMIME($mime){ } public function setExtension($extension){ } public function encode($data, $human_readable=FALSE){ return http_build_query($data); } public function decode($data){ parse_str($data,$r); return $r; } public function __toString(){ return $this->getExtension(); } } class JsonFormat implements iFormat { const MIME ='application/json'; const EXTENSION = 'json'; public function getMIMEMap() { return array(self::EXTENSION=>self::MIME); } public function getMIME(){ return self::MIME; } public function getExtension(){ return self::EXTENSION; } public function setMIME($mime){ } public function setExtension($extension){ } public function encode($data, $human_readable=FALSE){ return $human_readable ? $this->json_format(json_encode(object_to_array($data))) : json_encode(object_to_array($data)); } public function decode($data) { $decoded = json_decode ( $data ); if (function_exists ( 'json_last_error' )) { $message = ''; switch (json_last_error ()) { case JSON_ERROR_NONE : return object_to_array ( $decoded ); break; case JSON_ERROR_DEPTH : $message = 'maximum stack depth exceeded'; break; case JSON_ERROR_STATE_MISMATCH : $message = 'underflow or the modes mismatch'; break; case JSON_ERROR_CTRL_CHAR : $message = 'unexpected control character found'; break; case JSON_ERROR_SYNTAX : $message = 'malformed JSON'; break; case JSON_ERROR_UTF8 : $message = 'malformed UTF-8 characters, possibly incorrectly encoded'; break; default : $message = 'unknown error'; break; } throw new RestException ( 400, 'Error parsing JSON, ' . $message ); } else if (strlen ( $data ) && $decoded === NULL || $decoded === $data) { throw new RestException ( 400, 'Error parsing JSON' ); } return object_to_array ( $decoded ); } private function json_format($json) { $tab = "  "; $new_json = ""; $indent_level = 0; $in_string = FALSE; $len = strlen($json); for($c = 0; $c < $len; $c++) { $char = $json[$c]; switch($char) { case '{': case '[': if(!$in_string) { $new_json .= $char . "\n" . str_repeat($tab, $indent_level+1); $indent_level++; } else { $new_json .= $char; } break; case '}': case ']': if(!$in_string) { $indent_level--; $new_json .= "\n".str_repeat($tab, $indent_level).$char; } else { $new_json .= $char; } break; case ',': if(!$in_string) { $new_json .= ",\n" . str_repeat($tab, $indent_level); } else { $new_json .= $char; } break; case ':': if(!$in_string) { $new_json .= ": "; } else { $new_json .= $char; } break; case '"': if($c==0){ $in_string = TRUE; }elseif($c > 0 && $json[$c-1] != '\\') { $in_string = !$in_string; } default: $new_json .= $char; break; } } return $new_json; } public function __toString(){ return $this->getExtension(); } } class DocParser { private $params=array(); function parse($doc='') { if($doc==''){ return $this->params; } if(preg_match('#^/\*\*(.*)\*/#s', $doc, $comment) === false) return $this->params; $comment = trim($comment[1]); if(preg_match_all('#^\s*\*(.*)#m', $comment, $lines) === false) return $this->params; $this->parseLines($lines[1]); return $this->params; } private function parseLines($lines) { foreach($lines as $line) { $parsedLine = $this->parseLine($line); if($parsedLine === false && !isset($this->params['description'])) { if(isset($desc)){ $this->params['description'] = implode(PHP_EOL, $desc); } $desc = array(); } elseif($parsedLine !== false) { $desc[] = $parsedLine; } } $desc = implode(' ', $desc); if(!empty($desc))$this->params['long_description'] = $desc; } private function parseLine($line) { $line = trim($line); if(empty($line)) return false; if(strpos($line, '@') === 0) { if(strpos($line, ' ')>0){ $param = substr($line, 1, strpos($line, ' ') - 1); $value = substr($line, strlen($param) + 2); }else{ $param = substr($line, 1); $value = ''; } if($this->setParam($param, $value)) return false; } return $line; } private function setParam($param, $value) { if($param == 'param' || $param == 'return') $value = $this->formatParamOrReturn($value); if($param == 'class') list($param, $value) = $this->formatClass($value); if(empty($this->params[$param])) { $this->params[$param] = $value; } else if($param == 'param'){ $arr = array($this->params[$param], $value); $this->params[$param] = $arr; } else { $this->params[$param] = $value + $this->params[$param]; } return true; } private function formatClass($value) { $r = preg_split("[\(|\)]",$value); if(is_array($r)){ $param = $r[0]; parse_str($r[1],$value); foreach ($value as $key => $val) { $val = explode(',', $val); if(count($val)>1)$value[$key]=$val; } }else{ $param='Unknown'; } return array($param, $value); } private function formatParamOrReturn($string) { $pos = strpos($string, ' '); $type = substr($string, 0, $pos); return '(' . $type . ')' . substr($string, $pos+1); } } function parse_doc($php_doc_comment){ $p = new DocParser(); return $p->parse($php_doc_comment); $p = new Parser($php_doc_comment); return $p; $php_doc_comment = preg_replace("/(^[\\s]*\\/\\*\\*)
+ class Restler { const VERSION = '2.1.5'; public $url; public $request_method; public $request_format; public $request_data=array(); public $cache_dir; public $base_dir; public $response = 'DefaultResponse'; public $response_format; protected $production_mode; protected $routes= array(); protected $format_map = array(); protected $service_class_instance; protected $service_method; protected $auth_classes = array(); protected $error_classes = array(); private $codes = array( 100 => 'Continue', 101 => 'Switching Protocols', 200 => 'OK', 201 => 'Created', 202 => 'Accepted', 203 => 'Non-Authoritative Information', 204 => 'No Content', 205 => 'Reset Content', 206 => 'Partial Content', 300 => 'Multiple Choices', 301 => 'Moved Permanently', 302 => 'Found', 303 => 'See Other', 304 => 'Not Modified', 305 => 'Use Proxy', 306 => '(Unused)', 307 => 'Temporary Redirect', 400 => 'Bad Request', 401 => 'Unauthorized', 402 => 'Payment Required', 403 => 'Forbidden', 404 => 'Not Found', 405 => 'Method Not Allowed', 406 => 'Not Acceptable', 407 => 'Proxy Authentication Required', 408 => 'Request Timeout', 409 => 'Conflict', 410 => 'Gone', 411 => 'Length Required', 412 => 'Precondition Failed', 413 => 'Request Entity Too Large', 414 => 'Request-URI Too Long', 415 => 'Unsupported Media Type', 416 => 'Requested Range Not Satisfiable', 417 => 'Expectation Failed', 500 => 'Internal Server Error', 501 => 'Not Implemented', 502 => 'Bad Gateway', 503 => 'Service Unavailable', 504 => 'Gateway Timeout', 505 => 'HTTP Version Not Supported' ); protected $cached; public function __construct ($production_mode = FALSE) { $this->production_mode = $production_mode; $this->cache_dir = getcwd(); $this->base_dir = RESTLER_PATH; } public function __destruct () { if ($this->production_mode && !$this->cached) { $this->saveCache(); } } public function refreshCache () { $this->routes = array(); $this->cached = FALSE; } public function setSupportedFormats () { $args = func_get_args(); $extensions = array(); foreach ($args as $class_name) { if(!is_string($class_name) || !class_exists($class_name)){ throw new Exception("$class_name is not a vaild Format Class."); } $obj = new $class_name; if(! $obj instanceof iFormat){ throw new Exception('Invalid format class; must implement '. 'iFormat interface'); } foreach ($obj->getMIMEMap() as $extension => $mime) { if(!isset($this->format_map[$extension])) $this->format_map[$extension]=$class_name; if(!isset($this->format_map[$mime])) $this->format_map[$mime]=$class_name; $extensions[".$extension"]=TRUE; } } $this->format_map['default']=$args[0]; $this->format_map['extensions']=array_keys($extensions); } public function addAPIClass($class_name, $base_path = NULL) { if(!class_exists($class_name)){ throw new Exception("API class $class_name is missing."); } $this->loadCache(); if(!$this->cached){ if(is_null($base_path))$base_path=strtolower($class_name); $base_path = trim($base_path,'/'); if(strlen($base_path)>0)$base_path .= '/'; $this->generateMap($class_name, $base_path); } } public function addAuthenticationClass ($class_name, $base_path = NULL) { $this->auth_classes[] = $class_name; $this->addAPIClass($class_name, $base_path); } public function addErrorClass ($class_name) { $this->error_classes[] = $class_name; } public function handleError ($status_code, $error_message = NULL) { $method = "handle$status_code"; $handled = FALSE; foreach ($this->error_classes as $class_name) { if (method_exists($class_name, $method)) { $obj = new $class_name(); $obj->restler = $this; $obj->$method(); $handled = TRUE; } } if($handled)return; $message = $this->codes[$status_code] . (!$error_message ? '' : ': ' . $error_message); $this->setStatus($status_code); $responder = new $this->response(); $responder->restler = $this; $this->sendData($responder->__formatError($status_code, $message)); } public function handle () { if(empty($this->format_map))$this->setSupportedFormats('JsonFormat'); $this->url = $this->getPath(); $this->request_method = $this->getRequestMethod(); $this->response_format = $this->getResponseFormat(); $this->request_format = $this->getRequestFormat(); if(is_null($this->request_format)){ $this->request_format = $this->response_format; } if($this->request_method == 'PUT' || $this->request_method == 'POST'){ $this->request_data = $this->getRequestData(); } $o = $this->mapUrlToMethod(); if(!isset($o->class_name)){ $this->handleError(404); }else{ try { if($o->method_flag){ $auth_method = '__isAuthenticated'; if(!count($this->auth_classes))throw new RestException(401); foreach ($this->auth_classes as $auth_class) { $auth_obj = new $auth_class(); $auth_obj->restler=$this; $this->applyClassMetadata($auth_class, $auth_obj, $o); if (!method_exists($auth_obj, $auth_method)) { throw new RestException(401, 'Authentication Class '. 'should implement iAuthenticate'); }elseif(!$auth_obj->$auth_method()){ throw new RestException(401); } } } $this->applyClassMetadata(get_class($this->request_format), $this->request_format, $o); $pre_process = '_'.$this->request_format->getExtension().'_'. $o->method_name; $this->service_method = $o->method_name; if($o->method_flag==2)$o=unprotect($o); $object = $this->service_class_instance = new $o->class_name(); $object->restler=$this; if(method_exists($o->class_name, $pre_process)) { call_user_func_array(array($object, $pre_process), $o->arguments); } switch ($o->method_flag) { case 3: $reflection_method = new ReflectionMethod($object, $o->method_name); $reflection_method->setAccessible(TRUE); $result = $reflection_method->invokeArgs($object, $o->arguments); break; case 2: case 1: default: $result = call_user_func_array(array($object, $o->method_name), $o->arguments); } } catch (RestException $e) { $this->handleError($e->getCode(), $e->getMessage()); } } $responder = new $this->response(); $responder->restler = $this; $this->applyClassMetadata($this->response, $responder, $o); if (isset($result) && $result !== NULL) { $result = $responder->__formatResponse($result); $this->sendData($result); } } public function sendData($data) { $data = $this->response_format->encode($data, !$this->production_mode); $post_process = '_'.$this->service_method .'_'. $this->response_format->getExtension(); if(isset($this->service_class_instance) && method_exists($this->service_class_instance,$post_process)){ $data = call_user_func(array($this->service_class_instance, $post_process), $data); } header("Cache-Control: no-cache, must-revalidate"); header("Expires: 0"); header('Content-Type: ' . $this->response_format->getMIME()); header("X-Powered-By: Luracast Restler v".Restler::VERSION); die($data); } public function setStatus($code) { header("{$_SERVER['SERVER_PROTOCOL']} $code ". $this->codes[strval($code)]); } public function removeCommonPath($first, $second, $char='/'){ $first = explode($char, $first); $second = explode($char, $second); while (count($second)){ if($first[0]==$second[0]){ array_shift($first); } else break; array_shift($second); } return implode($char, $first); } public function saveCache() { $file = $this->cache_dir . '/routes.php'; $s = '$o=array();'.PHP_EOL; foreach ($this->routes as $key => $value) { $s .= PHP_EOL.PHP_EOL.PHP_EOL."############### $key ###############" .PHP_EOL.PHP_EOL; $s .= '$o[\''.$key.'\']=array();'; foreach ($value as $ke => $va) { $s .= PHP_EOL.PHP_EOL."#==== $key $ke".PHP_EOL.PHP_EOL; $s .= '$o[\''.$key.'\'][\''.$ke.'\']='.str_replace(PHP_EOL, PHP_EOL."\t", var_export($va, TRUE)).';'; } } $s .= PHP_EOL.'return $o;'; $r=@file_put_contents($file, "<?php $s"); @chmod($file, 0777); if($r===FALSE)throw new Exception( "The cache directory located at '$this->cache_dir' needs to have ". "the permissions set to read/write/execute for everyone in order ". "to save cache and improve performance."); } protected function getPath () { $path = urldecode($this->removeCommonPath($_SERVER['REQUEST_URI'], $_SERVER['SCRIPT_NAME'])); $path = preg_replace('/(\/*\?.*$)|(\/$)/', '', $path); $path = str_replace($this->format_map['extensions'], '', $path); return $path; } protected function getRequestMethod () { $method = $_SERVER['REQUEST_METHOD']; if (isset($_SERVER['HTTP_X_HTTP_METHOD_OVERRIDE'])){ $method = $_SERVER['HTTP_X_HTTP_METHOD_OVERRIDE']; } if($method=='HEAD')$method='GET'; return $method; } protected function getRequestFormat () { $format=NULL; if(isset($_SERVER['CONTENT_TYPE'])){ $mime = explode(';', $_SERVER['CONTENT_TYPE']); $mime = $mime[0]; if($mime==UrlEncodedFormat::MIME){ $format = new UrlEncodedFormat(); }else{ if(isset($this->format_map[$mime])){ $format = $this->format_map[$mime]; $format = is_string($format) ? new $format: $format; $format->setMIME($mime); } } } return $format; } protected function getResponseFormat () { $format=NULL; $extensions = explode('.', parse_url($_SERVER['REQUEST_URI'], PHP_URL_PATH)); while($extensions){ $extension = array_pop($extensions); $extension = explode('/', $extension); $extension = array_shift($extension); if($extension && isset($this->format_map[$extension])){ $format = $this->format_map[$extension]; $format = is_string($format) ? new $format: $format; $format->setExtension($extension); return $format; } } if(isset($_SERVER['HTTP_ACCEPT'])){ $accepts = explode(',', $_SERVER['HTTP_ACCEPT']); foreach ($accepts as $accept) { if($extension && isset($this->format_map[$accept])){ $format = $this->format_map[$accept]; $format = is_string($format) ? new $format: $format; $format->setMIME($accept); return $format; } } } $format = new $this->format_map['default']; return $format; } protected function getRequestData() { try{ $r = file_get_contents('php://input'); if(is_null($r))return $_GET; $r =$this->request_format->decode($r); return is_null($r) ? array(): $r; } catch (RestException $e) { $this->handleError($e->getCode(), $e->getMessage()); } } protected function mapUrlToMethod () { if(!isset($this->routes[$this->request_method])){ return array(); } $urls = $this->routes[$this->request_method]; if(!$urls)return array(); $found = FALSE; $this->request_data += $_GET; $params = array('request_data'=>$this->request_data); $params += $this->request_data; foreach ($urls as $url => $call) { $call = (object)$call; if(strstr($url, ':')){ $regex = preg_replace('/\\\:([^\/]+)/', '(?P<$1>[^/]+)', preg_quote($url)); if (preg_match(":^$regex$:", $this->url, $matches)) { foreach ($matches as $arg => $match) { if (isset($call->arguments[$arg])){ $params[$arg] = $match; } } $found = TRUE; break; } }elseif ($url == $this->url){ $found = TRUE; break; } } if($found){ $p = $call->defaults; foreach ($call->arguments as $key => $value) { if(isset($params[$key]))$p[$value] = $params[$key]; } $call->arguments=$p; return $call; } } protected function applyClassMetadata($class_name, $instance, $method_info){ if(isset($method_info->metadata[$class_name]) && is_array($method_info->metadata[$class_name])){ foreach ($method_info->metadata[$class_name] as $property => $value){ if(property_exists($class_name, $property)){ $reflection_property = new ReflectionProperty($class_name, $property); $reflection_property->setValue($instance, $value); } } } } protected function loadCache() { if ($this->cached !== NULL) { return; } $file = $this->cache_dir . '/routes.php'; $this->cached = FALSE; if ($this->production_mode) { if (file_exists($file)) { $routes = include($file); } if (isset($routes) && is_array($routes)) { $this->routes = $routes; $this->cached = TRUE; } } else { } } protected function generateMap ($class_name, $base_path = '') { $reflection = new ReflectionClass($class_name); $class_metadata = parse_doc($reflection->getDocComment()); $methods = $reflection->getMethods( ReflectionMethod::IS_PUBLIC + ReflectionMethod::IS_PROTECTED); foreach ($methods as $method) { $doc = $method->getDocComment(); $arguments = array(); $defaults = array(); $metadata = $class_metadata+parse_doc($doc); $params = $method->getParameters(); $position=0; foreach ($params as $param){ $arguments[$param->getName()] = $position; $defaults[$position] = $param->isDefaultValueAvailable() ? $param->getDefaultValue() : NULL; $position++; } $method_flag = $method->isProtected() ? (isRestlerCompatibilityModeEnabled() ? 2 : 3) : (isset($metadata['protected']) ? 1 : 0); $call = array( 'class_name'=>$class_name, 'method_name'=>$method->getName(), 'arguments'=>$arguments, 'defaults'=>$defaults, 'metadata'=>$metadata, 'method_flag'=>$method_flag ); $method_url = strtolower($method->getName()); if (preg_match_all( '/@url\s+(GET|POST|PUT|DELETE|HEAD|OPTIONS)[ \t]*\/?(\S*)/s', $doc, $matches, PREG_SET_ORDER)) { foreach ($matches as $match) { $http_method = $match[1]; $url = rtrim($base_path . $match[2],'/'); $this->routes[$http_method][$url] = $call; } }elseif($method_url[0] != '_'){ if (preg_match_all('/^(GET|POST|PUT|DELETE|HEAD|OPTIONS)/i', $method_url, $matches)) { $http_method = strtoupper($matches[0][0]); $method_url = substr($method_url, strlen($http_method)); }else{ $http_method = 'GET'; } $url = $base_path. ($method_url=='index' || $method_url=='default' ? '' : $method_url); $url = rtrim($url,'/'); $this->routes[$http_method][$url] = $call; foreach ($params as $param){ if($param->getName()=='request_data'){ break; } $url .= $url=='' ? ':' : '/:'; $url .= $param->getName(); $this->routes[$http_method][$url] = $call; } } } } } if(version_compare(PHP_VERSION, '5.3.0') < 0){ require_once 'compat.php'; } class RestException extends Exception { public function __construct($http_status_code, $error_message = NULL) { parent::__construct($error_message, $http_status_code); } } interface iRespond { public function __formatResponse($result); public function __formatError($status_code, $message); } class DefaultResponse implements iRespond { function __formatResponse($result) { return $result; } function __formatError($statusCode, $message) { return array('error' => array('code' => $statusCode, 'message' => $message)); } } interface iAuthenticate { public function __isAuthenticated(); } interface iFormat { public function getMIMEMap(); public function setMIME($mime); public function getMIME(); public function setExtension($extension); public function getExtension(); public function encode($data, $human_readable=FALSE); public function decode($data); } class UrlEncodedFormat implements iFormat { const MIME = 'application/x-www-form-urlencoded'; const EXTENSION = 'post'; public function getMIMEMap() { return array(self::EXTENSION=>self::MIME); } public function getMIME(){ return self::MIME; } public function getExtension(){ return self::EXTENSION; } public function setMIME($mime){ } public function setExtension($extension){ } public function encode($data, $human_readable=FALSE){ return http_build_query($data); } public function decode($data){ parse_str($data,$r); return $r; } public function __toString(){ return $this->getExtension(); } } class JsonFormat implements iFormat { const MIME ='application/json'; const EXTENSION = 'json'; public function getMIMEMap() { return array(self::EXTENSION=>self::MIME); } public function getMIME(){ return self::MIME; } public function getExtension(){ return self::EXTENSION; } public function setMIME($mime){ } public function setExtension($extension){ } public function encode($data, $human_readable=FALSE){ return $human_readable ? $this->json_format(json_encode(object_to_array($data))) : json_encode(object_to_array($data)); } public function decode($data) { $decoded = json_decode ( $data ); if (function_exists ( 'json_last_error' )) { $message = ''; switch (json_last_error ()) { case JSON_ERROR_NONE : return object_to_array ( $decoded ); break; case JSON_ERROR_DEPTH : $message = 'maximum stack depth exceeded'; break; case JSON_ERROR_STATE_MISMATCH : $message = 'underflow or the modes mismatch'; break; case JSON_ERROR_CTRL_CHAR : $message = 'unexpected control character found'; break; case JSON_ERROR_SYNTAX : $message = 'malformed JSON'; break; case JSON_ERROR_UTF8 : $message = 'malformed UTF-8 characters, possibly incorrectly encoded'; break; default : $message = 'unknown error'; break; } throw new RestException ( 400, 'Error parsing JSON, ' . $message ); } else if (strlen ( $data ) && $decoded === NULL || $decoded === $data) { throw new RestException ( 400, 'Error parsing JSON' ); } return object_to_array ( $decoded ); } private function json_format($json) { $tab = "  "; $new_json = ""; $indent_level = 0; $in_string = FALSE; $len = strlen($json); for($c = 0; $c < $len; $c++) { $char = $json[$c]; switch($char) { case '{': case '[': if(!$in_string) { $new_json .= $char . "\n" . str_repeat($tab, $indent_level+1); $indent_level++; } else { $new_json .= $char; } break; case '}': case ']': if(!$in_string) { $indent_level--; $new_json .= "\n".str_repeat($tab, $indent_level).$char; } else { $new_json .= $char; } break; case ',': if(!$in_string) { $new_json .= ",\n" . str_repeat($tab, $indent_level); } else { $new_json .= $char; } break; case ':': if(!$in_string) { $new_json .= ": "; } else { $new_json .= $char; } break; case '"': if($c==0){ $in_string = TRUE; }elseif($c > 0 && $json[$c-1] != '\\') { $in_string = !$in_string; } default: $new_json .= $char; break; } } return $new_json; } public function __toString(){ return $this->getExtension(); } } class DocParser { private $params=array(); function parse($doc='') { if($doc==''){ return $this->params; } if(preg_match('#^/\*\*(.*)\*/#s', $doc, $comment) === false) return $this->params; $comment = trim($comment[1]); if(preg_match_all('#^\s*\*(.*)#m', $comment, $lines) === false) return $this->params; $this->parseLines($lines[1]); return $this->params; } private function parseLines($lines) { foreach($lines as $line) { $parsedLine = $this->parseLine($line); if($parsedLine === false && !isset($this->params['description'])) { if(isset($desc)){ $this->params['description'] = implode(PHP_EOL, $desc); } $desc = array(); } elseif($parsedLine !== false) { $desc[] = $parsedLine; } } $desc = implode(' ', $desc); if(!empty($desc))$this->params['long_description'] = $desc; } private function parseLine($line) { $line = trim($line); if(empty($line)) return false; if(strpos($line, '@') === 0) { if(strpos($line, ' ')>0){ $param = substr($line, 1, strpos($line, ' ') - 1); $value = substr($line, strlen($param) + 2); }else{ $param = substr($line, 1); $value = ''; } if($this->setParam($param, $value)) return false; } return $line; } private function setParam($param, $value) { if($param == 'param' || $param == 'return') $value = $this->formatParamOrReturn($value); if($param == 'class') list($param, $value) = $this->formatClass($value); if(empty($this->params[$param])) { $this->params[$param] = $value; } else if($param == 'param'){ $arr = array($this->params[$param], $value); $this->params[$param] = $arr; } else { $this->params[$param] = $value + $this->params[$param]; } return true; } private function formatClass($value) { $r = preg_split("[\(|\)]", $value); if(count($r)>1){ $param = $r[0]; parse_str($r[1],$value); foreach ($value as $key => $val) { $val = explode(',', $val); if(count($val)>1)$value[$key]=$val; } }else{ $param='Unknown'; } return array($param, $value); } private function formatParamOrReturn($string) { $pos = strpos($string, ' '); $type = substr($string, 0, $pos); return '(' . $type . ')' . substr($string, $pos+1); } } function parse_doc($php_doc_comment){ $p = new DocParser(); return $p->parse($php_doc_comment); $p = new Parser($php_doc_comment); return $p; $php_doc_comment = preg_replace("/(^[\\s]*\\/\\*\\*)
                                  |(^[\\s]\\*\\/)
                                  |(^[\\s]*\\*?\\s)
                                  |(^[\\s]*)

From 8ca901a16cde10b7e1c80bb2a7a494284fabccff Mon Sep 17 00:00:00 2001
From: Luracast <arul@luracast.com>
Date: Mon, 14 May 2012 19:55:45 -0500
Subject: [PATCH 38/61] This update makes class name, method name and parameter
 names case insensitive in the url for better matching. Requested on
 http://bit.ly/MeaJkU

---
 restler/restler.php          | 7 ++++---
 restler_minified/restler.php | 2 +-
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/restler/restler.php b/restler/restler.php
index cd99ee434..62f615f91 100644
--- a/restler/restler.php
+++ b/restler/restler.php
@@ -10,10 +10,10 @@
  * @copyright  2010 Luracast
  * @license    http://www.opensource.org/licenses/lgpl-license.php LGPL
  * @link       http://luracast.com/products/restler/
- * @version    2.1.5
+ * @version    2.1.6
  */
 class Restler {
-	const VERSION = '2.1.5';
+	const VERSION = '2.1.6';
 	/**
 	 * URL of the currently mapped service
 	 * @var string
@@ -301,7 +301,7 @@ public function handleError ($status_code, $error_message = NULL) {
 	 */
 	public function handle () {
 		if(empty($this->format_map))$this->setSupportedFormats('JsonFormat');
-		$this->url = $this->getPath();
+		$this->url = strtolower($this->getPath());
 		$this->request_method = $this->getRequestMethod();
 		$this->response_format = $this->getResponseFormat();
 		$this->request_format = $this->getRequestFormat();
@@ -388,6 +388,7 @@ public function sendData($data)
 		header("Cache-Control: no-cache, must-revalidate");
 		header("Expires: 0");
 		header('Content-Type: ' . $this->response_format->getMIME());
+		//header('Content-Type: ' . $this->response_format->getMIME().'; charset=utf-8');
 		header("X-Powered-By: Luracast Restler v".Restler::VERSION);
 		die($data);
 	}
diff --git a/restler_minified/restler.php b/restler_minified/restler.php
index 64ef89d4a..ee621cf9e 100644
--- a/restler_minified/restler.php
+++ b/restler_minified/restler.php
@@ -1,5 +1,5 @@
 <?php
- class Restler { const VERSION = '2.1.5'; public $url; public $request_method; public $request_format; public $request_data=array(); public $cache_dir; public $base_dir; public $response = 'DefaultResponse'; public $response_format; protected $production_mode; protected $routes= array(); protected $format_map = array(); protected $service_class_instance; protected $service_method; protected $auth_classes = array(); protected $error_classes = array(); private $codes = array( 100 => 'Continue', 101 => 'Switching Protocols', 200 => 'OK', 201 => 'Created', 202 => 'Accepted', 203 => 'Non-Authoritative Information', 204 => 'No Content', 205 => 'Reset Content', 206 => 'Partial Content', 300 => 'Multiple Choices', 301 => 'Moved Permanently', 302 => 'Found', 303 => 'See Other', 304 => 'Not Modified', 305 => 'Use Proxy', 306 => '(Unused)', 307 => 'Temporary Redirect', 400 => 'Bad Request', 401 => 'Unauthorized', 402 => 'Payment Required', 403 => 'Forbidden', 404 => 'Not Found', 405 => 'Method Not Allowed', 406 => 'Not Acceptable', 407 => 'Proxy Authentication Required', 408 => 'Request Timeout', 409 => 'Conflict', 410 => 'Gone', 411 => 'Length Required', 412 => 'Precondition Failed', 413 => 'Request Entity Too Large', 414 => 'Request-URI Too Long', 415 => 'Unsupported Media Type', 416 => 'Requested Range Not Satisfiable', 417 => 'Expectation Failed', 500 => 'Internal Server Error', 501 => 'Not Implemented', 502 => 'Bad Gateway', 503 => 'Service Unavailable', 504 => 'Gateway Timeout', 505 => 'HTTP Version Not Supported' ); protected $cached; public function __construct ($production_mode = FALSE) { $this->production_mode = $production_mode; $this->cache_dir = getcwd(); $this->base_dir = RESTLER_PATH; } public function __destruct () { if ($this->production_mode && !$this->cached) { $this->saveCache(); } } public function refreshCache () { $this->routes = array(); $this->cached = FALSE; } public function setSupportedFormats () { $args = func_get_args(); $extensions = array(); foreach ($args as $class_name) { if(!is_string($class_name) || !class_exists($class_name)){ throw new Exception("$class_name is not a vaild Format Class."); } $obj = new $class_name; if(! $obj instanceof iFormat){ throw new Exception('Invalid format class; must implement '. 'iFormat interface'); } foreach ($obj->getMIMEMap() as $extension => $mime) { if(!isset($this->format_map[$extension])) $this->format_map[$extension]=$class_name; if(!isset($this->format_map[$mime])) $this->format_map[$mime]=$class_name; $extensions[".$extension"]=TRUE; } } $this->format_map['default']=$args[0]; $this->format_map['extensions']=array_keys($extensions); } public function addAPIClass($class_name, $base_path = NULL) { if(!class_exists($class_name)){ throw new Exception("API class $class_name is missing."); } $this->loadCache(); if(!$this->cached){ if(is_null($base_path))$base_path=strtolower($class_name); $base_path = trim($base_path,'/'); if(strlen($base_path)>0)$base_path .= '/'; $this->generateMap($class_name, $base_path); } } public function addAuthenticationClass ($class_name, $base_path = NULL) { $this->auth_classes[] = $class_name; $this->addAPIClass($class_name, $base_path); } public function addErrorClass ($class_name) { $this->error_classes[] = $class_name; } public function handleError ($status_code, $error_message = NULL) { $method = "handle$status_code"; $handled = FALSE; foreach ($this->error_classes as $class_name) { if (method_exists($class_name, $method)) { $obj = new $class_name(); $obj->restler = $this; $obj->$method(); $handled = TRUE; } } if($handled)return; $message = $this->codes[$status_code] . (!$error_message ? '' : ': ' . $error_message); $this->setStatus($status_code); $responder = new $this->response(); $responder->restler = $this; $this->sendData($responder->__formatError($status_code, $message)); } public function handle () { if(empty($this->format_map))$this->setSupportedFormats('JsonFormat'); $this->url = $this->getPath(); $this->request_method = $this->getRequestMethod(); $this->response_format = $this->getResponseFormat(); $this->request_format = $this->getRequestFormat(); if(is_null($this->request_format)){ $this->request_format = $this->response_format; } if($this->request_method == 'PUT' || $this->request_method == 'POST'){ $this->request_data = $this->getRequestData(); } $o = $this->mapUrlToMethod(); if(!isset($o->class_name)){ $this->handleError(404); }else{ try { if($o->method_flag){ $auth_method = '__isAuthenticated'; if(!count($this->auth_classes))throw new RestException(401); foreach ($this->auth_classes as $auth_class) { $auth_obj = new $auth_class(); $auth_obj->restler=$this; $this->applyClassMetadata($auth_class, $auth_obj, $o); if (!method_exists($auth_obj, $auth_method)) { throw new RestException(401, 'Authentication Class '. 'should implement iAuthenticate'); }elseif(!$auth_obj->$auth_method()){ throw new RestException(401); } } } $this->applyClassMetadata(get_class($this->request_format), $this->request_format, $o); $pre_process = '_'.$this->request_format->getExtension().'_'. $o->method_name; $this->service_method = $o->method_name; if($o->method_flag==2)$o=unprotect($o); $object = $this->service_class_instance = new $o->class_name(); $object->restler=$this; if(method_exists($o->class_name, $pre_process)) { call_user_func_array(array($object, $pre_process), $o->arguments); } switch ($o->method_flag) { case 3: $reflection_method = new ReflectionMethod($object, $o->method_name); $reflection_method->setAccessible(TRUE); $result = $reflection_method->invokeArgs($object, $o->arguments); break; case 2: case 1: default: $result = call_user_func_array(array($object, $o->method_name), $o->arguments); } } catch (RestException $e) { $this->handleError($e->getCode(), $e->getMessage()); } } $responder = new $this->response(); $responder->restler = $this; $this->applyClassMetadata($this->response, $responder, $o); if (isset($result) && $result !== NULL) { $result = $responder->__formatResponse($result); $this->sendData($result); } } public function sendData($data) { $data = $this->response_format->encode($data, !$this->production_mode); $post_process = '_'.$this->service_method .'_'. $this->response_format->getExtension(); if(isset($this->service_class_instance) && method_exists($this->service_class_instance,$post_process)){ $data = call_user_func(array($this->service_class_instance, $post_process), $data); } header("Cache-Control: no-cache, must-revalidate"); header("Expires: 0"); header('Content-Type: ' . $this->response_format->getMIME()); header("X-Powered-By: Luracast Restler v".Restler::VERSION); die($data); } public function setStatus($code) { header("{$_SERVER['SERVER_PROTOCOL']} $code ". $this->codes[strval($code)]); } public function removeCommonPath($first, $second, $char='/'){ $first = explode($char, $first); $second = explode($char, $second); while (count($second)){ if($first[0]==$second[0]){ array_shift($first); } else break; array_shift($second); } return implode($char, $first); } public function saveCache() { $file = $this->cache_dir . '/routes.php'; $s = '$o=array();'.PHP_EOL; foreach ($this->routes as $key => $value) { $s .= PHP_EOL.PHP_EOL.PHP_EOL."############### $key ###############" .PHP_EOL.PHP_EOL; $s .= '$o[\''.$key.'\']=array();'; foreach ($value as $ke => $va) { $s .= PHP_EOL.PHP_EOL."#==== $key $ke".PHP_EOL.PHP_EOL; $s .= '$o[\''.$key.'\'][\''.$ke.'\']='.str_replace(PHP_EOL, PHP_EOL."\t", var_export($va, TRUE)).';'; } } $s .= PHP_EOL.'return $o;'; $r=@file_put_contents($file, "<?php $s"); @chmod($file, 0777); if($r===FALSE)throw new Exception( "The cache directory located at '$this->cache_dir' needs to have ". "the permissions set to read/write/execute for everyone in order ". "to save cache and improve performance."); } protected function getPath () { $path = urldecode($this->removeCommonPath($_SERVER['REQUEST_URI'], $_SERVER['SCRIPT_NAME'])); $path = preg_replace('/(\/*\?.*$)|(\/$)/', '', $path); $path = str_replace($this->format_map['extensions'], '', $path); return $path; } protected function getRequestMethod () { $method = $_SERVER['REQUEST_METHOD']; if (isset($_SERVER['HTTP_X_HTTP_METHOD_OVERRIDE'])){ $method = $_SERVER['HTTP_X_HTTP_METHOD_OVERRIDE']; } if($method=='HEAD')$method='GET'; return $method; } protected function getRequestFormat () { $format=NULL; if(isset($_SERVER['CONTENT_TYPE'])){ $mime = explode(';', $_SERVER['CONTENT_TYPE']); $mime = $mime[0]; if($mime==UrlEncodedFormat::MIME){ $format = new UrlEncodedFormat(); }else{ if(isset($this->format_map[$mime])){ $format = $this->format_map[$mime]; $format = is_string($format) ? new $format: $format; $format->setMIME($mime); } } } return $format; } protected function getResponseFormat () { $format=NULL; $extensions = explode('.', parse_url($_SERVER['REQUEST_URI'], PHP_URL_PATH)); while($extensions){ $extension = array_pop($extensions); $extension = explode('/', $extension); $extension = array_shift($extension); if($extension && isset($this->format_map[$extension])){ $format = $this->format_map[$extension]; $format = is_string($format) ? new $format: $format; $format->setExtension($extension); return $format; } } if(isset($_SERVER['HTTP_ACCEPT'])){ $accepts = explode(',', $_SERVER['HTTP_ACCEPT']); foreach ($accepts as $accept) { if($extension && isset($this->format_map[$accept])){ $format = $this->format_map[$accept]; $format = is_string($format) ? new $format: $format; $format->setMIME($accept); return $format; } } } $format = new $this->format_map['default']; return $format; } protected function getRequestData() { try{ $r = file_get_contents('php://input'); if(is_null($r))return $_GET; $r =$this->request_format->decode($r); return is_null($r) ? array(): $r; } catch (RestException $e) { $this->handleError($e->getCode(), $e->getMessage()); } } protected function mapUrlToMethod () { if(!isset($this->routes[$this->request_method])){ return array(); } $urls = $this->routes[$this->request_method]; if(!$urls)return array(); $found = FALSE; $this->request_data += $_GET; $params = array('request_data'=>$this->request_data); $params += $this->request_data; foreach ($urls as $url => $call) { $call = (object)$call; if(strstr($url, ':')){ $regex = preg_replace('/\\\:([^\/]+)/', '(?P<$1>[^/]+)', preg_quote($url)); if (preg_match(":^$regex$:", $this->url, $matches)) { foreach ($matches as $arg => $match) { if (isset($call->arguments[$arg])){ $params[$arg] = $match; } } $found = TRUE; break; } }elseif ($url == $this->url){ $found = TRUE; break; } } if($found){ $p = $call->defaults; foreach ($call->arguments as $key => $value) { if(isset($params[$key]))$p[$value] = $params[$key]; } $call->arguments=$p; return $call; } } protected function applyClassMetadata($class_name, $instance, $method_info){ if(isset($method_info->metadata[$class_name]) && is_array($method_info->metadata[$class_name])){ foreach ($method_info->metadata[$class_name] as $property => $value){ if(property_exists($class_name, $property)){ $reflection_property = new ReflectionProperty($class_name, $property); $reflection_property->setValue($instance, $value); } } } } protected function loadCache() { if ($this->cached !== NULL) { return; } $file = $this->cache_dir . '/routes.php'; $this->cached = FALSE; if ($this->production_mode) { if (file_exists($file)) { $routes = include($file); } if (isset($routes) && is_array($routes)) { $this->routes = $routes; $this->cached = TRUE; } } else { } } protected function generateMap ($class_name, $base_path = '') { $reflection = new ReflectionClass($class_name); $class_metadata = parse_doc($reflection->getDocComment()); $methods = $reflection->getMethods( ReflectionMethod::IS_PUBLIC + ReflectionMethod::IS_PROTECTED); foreach ($methods as $method) { $doc = $method->getDocComment(); $arguments = array(); $defaults = array(); $metadata = $class_metadata+parse_doc($doc); $params = $method->getParameters(); $position=0; foreach ($params as $param){ $arguments[$param->getName()] = $position; $defaults[$position] = $param->isDefaultValueAvailable() ? $param->getDefaultValue() : NULL; $position++; } $method_flag = $method->isProtected() ? (isRestlerCompatibilityModeEnabled() ? 2 : 3) : (isset($metadata['protected']) ? 1 : 0); $call = array( 'class_name'=>$class_name, 'method_name'=>$method->getName(), 'arguments'=>$arguments, 'defaults'=>$defaults, 'metadata'=>$metadata, 'method_flag'=>$method_flag ); $method_url = strtolower($method->getName()); if (preg_match_all( '/@url\s+(GET|POST|PUT|DELETE|HEAD|OPTIONS)[ \t]*\/?(\S*)/s', $doc, $matches, PREG_SET_ORDER)) { foreach ($matches as $match) { $http_method = $match[1]; $url = rtrim($base_path . $match[2],'/'); $this->routes[$http_method][$url] = $call; } }elseif($method_url[0] != '_'){ if (preg_match_all('/^(GET|POST|PUT|DELETE|HEAD|OPTIONS)/i', $method_url, $matches)) { $http_method = strtoupper($matches[0][0]); $method_url = substr($method_url, strlen($http_method)); }else{ $http_method = 'GET'; } $url = $base_path. ($method_url=='index' || $method_url=='default' ? '' : $method_url); $url = rtrim($url,'/'); $this->routes[$http_method][$url] = $call; foreach ($params as $param){ if($param->getName()=='request_data'){ break; } $url .= $url=='' ? ':' : '/:'; $url .= $param->getName(); $this->routes[$http_method][$url] = $call; } } } } } if(version_compare(PHP_VERSION, '5.3.0') < 0){ require_once 'compat.php'; } class RestException extends Exception { public function __construct($http_status_code, $error_message = NULL) { parent::__construct($error_message, $http_status_code); } } interface iRespond { public function __formatResponse($result); public function __formatError($status_code, $message); } class DefaultResponse implements iRespond { function __formatResponse($result) { return $result; } function __formatError($statusCode, $message) { return array('error' => array('code' => $statusCode, 'message' => $message)); } } interface iAuthenticate { public function __isAuthenticated(); } interface iFormat { public function getMIMEMap(); public function setMIME($mime); public function getMIME(); public function setExtension($extension); public function getExtension(); public function encode($data, $human_readable=FALSE); public function decode($data); } class UrlEncodedFormat implements iFormat { const MIME = 'application/x-www-form-urlencoded'; const EXTENSION = 'post'; public function getMIMEMap() { return array(self::EXTENSION=>self::MIME); } public function getMIME(){ return self::MIME; } public function getExtension(){ return self::EXTENSION; } public function setMIME($mime){ } public function setExtension($extension){ } public function encode($data, $human_readable=FALSE){ return http_build_query($data); } public function decode($data){ parse_str($data,$r); return $r; } public function __toString(){ return $this->getExtension(); } } class JsonFormat implements iFormat { const MIME ='application/json'; const EXTENSION = 'json'; public function getMIMEMap() { return array(self::EXTENSION=>self::MIME); } public function getMIME(){ return self::MIME; } public function getExtension(){ return self::EXTENSION; } public function setMIME($mime){ } public function setExtension($extension){ } public function encode($data, $human_readable=FALSE){ return $human_readable ? $this->json_format(json_encode(object_to_array($data))) : json_encode(object_to_array($data)); } public function decode($data) { $decoded = json_decode ( $data ); if (function_exists ( 'json_last_error' )) { $message = ''; switch (json_last_error ()) { case JSON_ERROR_NONE : return object_to_array ( $decoded ); break; case JSON_ERROR_DEPTH : $message = 'maximum stack depth exceeded'; break; case JSON_ERROR_STATE_MISMATCH : $message = 'underflow or the modes mismatch'; break; case JSON_ERROR_CTRL_CHAR : $message = 'unexpected control character found'; break; case JSON_ERROR_SYNTAX : $message = 'malformed JSON'; break; case JSON_ERROR_UTF8 : $message = 'malformed UTF-8 characters, possibly incorrectly encoded'; break; default : $message = 'unknown error'; break; } throw new RestException ( 400, 'Error parsing JSON, ' . $message ); } else if (strlen ( $data ) && $decoded === NULL || $decoded === $data) { throw new RestException ( 400, 'Error parsing JSON' ); } return object_to_array ( $decoded ); } private function json_format($json) { $tab = "  "; $new_json = ""; $indent_level = 0; $in_string = FALSE; $len = strlen($json); for($c = 0; $c < $len; $c++) { $char = $json[$c]; switch($char) { case '{': case '[': if(!$in_string) { $new_json .= $char . "\n" . str_repeat($tab, $indent_level+1); $indent_level++; } else { $new_json .= $char; } break; case '}': case ']': if(!$in_string) { $indent_level--; $new_json .= "\n".str_repeat($tab, $indent_level).$char; } else { $new_json .= $char; } break; case ',': if(!$in_string) { $new_json .= ",\n" . str_repeat($tab, $indent_level); } else { $new_json .= $char; } break; case ':': if(!$in_string) { $new_json .= ": "; } else { $new_json .= $char; } break; case '"': if($c==0){ $in_string = TRUE; }elseif($c > 0 && $json[$c-1] != '\\') { $in_string = !$in_string; } default: $new_json .= $char; break; } } return $new_json; } public function __toString(){ return $this->getExtension(); } } class DocParser { private $params=array(); function parse($doc='') { if($doc==''){ return $this->params; } if(preg_match('#^/\*\*(.*)\*/#s', $doc, $comment) === false) return $this->params; $comment = trim($comment[1]); if(preg_match_all('#^\s*\*(.*)#m', $comment, $lines) === false) return $this->params; $this->parseLines($lines[1]); return $this->params; } private function parseLines($lines) { foreach($lines as $line) { $parsedLine = $this->parseLine($line); if($parsedLine === false && !isset($this->params['description'])) { if(isset($desc)){ $this->params['description'] = implode(PHP_EOL, $desc); } $desc = array(); } elseif($parsedLine !== false) { $desc[] = $parsedLine; } } $desc = implode(' ', $desc); if(!empty($desc))$this->params['long_description'] = $desc; } private function parseLine($line) { $line = trim($line); if(empty($line)) return false; if(strpos($line, '@') === 0) { if(strpos($line, ' ')>0){ $param = substr($line, 1, strpos($line, ' ') - 1); $value = substr($line, strlen($param) + 2); }else{ $param = substr($line, 1); $value = ''; } if($this->setParam($param, $value)) return false; } return $line; } private function setParam($param, $value) { if($param == 'param' || $param == 'return') $value = $this->formatParamOrReturn($value); if($param == 'class') list($param, $value) = $this->formatClass($value); if(empty($this->params[$param])) { $this->params[$param] = $value; } else if($param == 'param'){ $arr = array($this->params[$param], $value); $this->params[$param] = $arr; } else { $this->params[$param] = $value + $this->params[$param]; } return true; } private function formatClass($value) { $r = preg_split("[\(|\)]", $value); if(count($r)>1){ $param = $r[0]; parse_str($r[1],$value); foreach ($value as $key => $val) { $val = explode(',', $val); if(count($val)>1)$value[$key]=$val; } }else{ $param='Unknown'; } return array($param, $value); } private function formatParamOrReturn($string) { $pos = strpos($string, ' '); $type = substr($string, 0, $pos); return '(' . $type . ')' . substr($string, $pos+1); } } function parse_doc($php_doc_comment){ $p = new DocParser(); return $p->parse($php_doc_comment); $p = new Parser($php_doc_comment); return $p; $php_doc_comment = preg_replace("/(^[\\s]*\\/\\*\\*)
+ class Restler { const VERSION = '2.1.6'; public $url; public $request_method; public $request_format; public $request_data=array(); public $cache_dir; public $base_dir; public $response = 'DefaultResponse'; public $response_format; protected $production_mode; protected $routes= array(); protected $format_map = array(); protected $service_class_instance; protected $service_method; protected $auth_classes = array(); protected $error_classes = array(); private $codes = array( 100 => 'Continue', 101 => 'Switching Protocols', 200 => 'OK', 201 => 'Created', 202 => 'Accepted', 203 => 'Non-Authoritative Information', 204 => 'No Content', 205 => 'Reset Content', 206 => 'Partial Content', 300 => 'Multiple Choices', 301 => 'Moved Permanently', 302 => 'Found', 303 => 'See Other', 304 => 'Not Modified', 305 => 'Use Proxy', 306 => '(Unused)', 307 => 'Temporary Redirect', 400 => 'Bad Request', 401 => 'Unauthorized', 402 => 'Payment Required', 403 => 'Forbidden', 404 => 'Not Found', 405 => 'Method Not Allowed', 406 => 'Not Acceptable', 407 => 'Proxy Authentication Required', 408 => 'Request Timeout', 409 => 'Conflict', 410 => 'Gone', 411 => 'Length Required', 412 => 'Precondition Failed', 413 => 'Request Entity Too Large', 414 => 'Request-URI Too Long', 415 => 'Unsupported Media Type', 416 => 'Requested Range Not Satisfiable', 417 => 'Expectation Failed', 500 => 'Internal Server Error', 501 => 'Not Implemented', 502 => 'Bad Gateway', 503 => 'Service Unavailable', 504 => 'Gateway Timeout', 505 => 'HTTP Version Not Supported' ); protected $cached; public function __construct ($production_mode = FALSE) { $this->production_mode = $production_mode; $this->cache_dir = getcwd(); $this->base_dir = RESTLER_PATH; } public function __destruct () { if ($this->production_mode && !$this->cached) { $this->saveCache(); } } public function refreshCache () { $this->routes = array(); $this->cached = FALSE; } public function setSupportedFormats () { $args = func_get_args(); $extensions = array(); foreach ($args as $class_name) { if(!is_string($class_name) || !class_exists($class_name)){ throw new Exception("$class_name is not a vaild Format Class."); } $obj = new $class_name; if(! $obj instanceof iFormat){ throw new Exception('Invalid format class; must implement '. 'iFormat interface'); } foreach ($obj->getMIMEMap() as $extension => $mime) { if(!isset($this->format_map[$extension])) $this->format_map[$extension]=$class_name; if(!isset($this->format_map[$mime])) $this->format_map[$mime]=$class_name; $extensions[".$extension"]=TRUE; } } $this->format_map['default']=$args[0]; $this->format_map['extensions']=array_keys($extensions); } public function addAPIClass($class_name, $base_path = NULL) { if(!class_exists($class_name)){ throw new Exception("API class $class_name is missing."); } $this->loadCache(); if(!$this->cached){ if(is_null($base_path))$base_path=strtolower($class_name); $base_path = trim($base_path,'/'); if(strlen($base_path)>0)$base_path .= '/'; $this->generateMap($class_name, $base_path); } } public function addAuthenticationClass ($class_name, $base_path = NULL) { $this->auth_classes[] = $class_name; $this->addAPIClass($class_name, $base_path); } public function addErrorClass ($class_name) { $this->error_classes[] = $class_name; } public function handleError ($status_code, $error_message = NULL) { $method = "handle$status_code"; $handled = FALSE; foreach ($this->error_classes as $class_name) { if (method_exists($class_name, $method)) { $obj = new $class_name(); $obj->restler = $this; $obj->$method(); $handled = TRUE; } } if($handled)return; $message = $this->codes[$status_code] . (!$error_message ? '' : ': ' . $error_message); $this->setStatus($status_code); $responder = new $this->response(); $responder->restler = $this; $this->sendData($responder->__formatError($status_code, $message)); } public function handle () { if(empty($this->format_map))$this->setSupportedFormats('JsonFormat'); $this->url = strtolower($this->getPath()); $this->request_method = $this->getRequestMethod(); $this->response_format = $this->getResponseFormat(); $this->request_format = $this->getRequestFormat(); if(is_null($this->request_format)){ $this->request_format = $this->response_format; } if($this->request_method == 'PUT' || $this->request_method == 'POST'){ $this->request_data = $this->getRequestData(); } $o = $this->mapUrlToMethod(); if(!isset($o->class_name)){ $this->handleError(404); }else{ try { if($o->method_flag){ $auth_method = '__isAuthenticated'; if(!count($this->auth_classes))throw new RestException(401); foreach ($this->auth_classes as $auth_class) { $auth_obj = new $auth_class(); $auth_obj->restler=$this; $this->applyClassMetadata($auth_class, $auth_obj, $o); if (!method_exists($auth_obj, $auth_method)) { throw new RestException(401, 'Authentication Class '. 'should implement iAuthenticate'); }elseif(!$auth_obj->$auth_method()){ throw new RestException(401); } } } $this->applyClassMetadata(get_class($this->request_format), $this->request_format, $o); $pre_process = '_'.$this->request_format->getExtension().'_'. $o->method_name; $this->service_method = $o->method_name; if($o->method_flag==2)$o=unprotect($o); $object = $this->service_class_instance = new $o->class_name(); $object->restler=$this; if(method_exists($o->class_name, $pre_process)) { call_user_func_array(array($object, $pre_process), $o->arguments); } switch ($o->method_flag) { case 3: $reflection_method = new ReflectionMethod($object, $o->method_name); $reflection_method->setAccessible(TRUE); $result = $reflection_method->invokeArgs($object, $o->arguments); break; case 2: case 1: default: $result = call_user_func_array(array($object, $o->method_name), $o->arguments); } } catch (RestException $e) { $this->handleError($e->getCode(), $e->getMessage()); } } $responder = new $this->response(); $responder->restler = $this; $this->applyClassMetadata($this->response, $responder, $o); if (isset($result) && $result !== NULL) { $result = $responder->__formatResponse($result); $this->sendData($result); } } public function sendData($data) { $data = $this->response_format->encode($data, !$this->production_mode); $post_process = '_'.$this->service_method .'_'. $this->response_format->getExtension(); if(isset($this->service_class_instance) && method_exists($this->service_class_instance,$post_process)){ $data = call_user_func(array($this->service_class_instance, $post_process), $data); } header("Cache-Control: no-cache, must-revalidate"); header("Expires: 0"); header('Content-Type: ' . $this->response_format->getMIME()); header("X-Powered-By: Luracast Restler v".Restler::VERSION); die($data); } public function setStatus($code) { header("{$_SERVER['SERVER_PROTOCOL']} $code ". $this->codes[strval($code)]); } public function removeCommonPath($first, $second, $char='/'){ $first = explode($char, $first); $second = explode($char, $second); while (count($second)){ if($first[0]==$second[0]){ array_shift($first); } else break; array_shift($second); } return implode($char, $first); } public function saveCache() { $file = $this->cache_dir . '/routes.php'; $s = '$o=array();'.PHP_EOL; foreach ($this->routes as $key => $value) { $s .= PHP_EOL.PHP_EOL.PHP_EOL."############### $key ###############" .PHP_EOL.PHP_EOL; $s .= '$o[\''.$key.'\']=array();'; foreach ($value as $ke => $va) { $s .= PHP_EOL.PHP_EOL."#==== $key $ke".PHP_EOL.PHP_EOL; $s .= '$o[\''.$key.'\'][\''.$ke.'\']='.str_replace(PHP_EOL, PHP_EOL."\t", var_export($va, TRUE)).';'; } } $s .= PHP_EOL.'return $o;'; $r=@file_put_contents($file, "<?php $s"); @chmod($file, 0777); if($r===FALSE)throw new Exception( "The cache directory located at '$this->cache_dir' needs to have ". "the permissions set to read/write/execute for everyone in order ". "to save cache and improve performance."); } protected function getPath () { $path = urldecode($this->removeCommonPath($_SERVER['REQUEST_URI'], $_SERVER['SCRIPT_NAME'])); $path = preg_replace('/(\/*\?.*$)|(\/$)/', '', $path); $path = str_replace($this->format_map['extensions'], '', $path); return $path; } protected function getRequestMethod () { $method = $_SERVER['REQUEST_METHOD']; if (isset($_SERVER['HTTP_X_HTTP_METHOD_OVERRIDE'])){ $method = $_SERVER['HTTP_X_HTTP_METHOD_OVERRIDE']; } if($method=='HEAD')$method='GET'; return $method; } protected function getRequestFormat () { $format=NULL; if(isset($_SERVER['CONTENT_TYPE'])){ $mime = explode(';', $_SERVER['CONTENT_TYPE']); $mime = $mime[0]; if($mime==UrlEncodedFormat::MIME){ $format = new UrlEncodedFormat(); }else{ if(isset($this->format_map[$mime])){ $format = $this->format_map[$mime]; $format = is_string($format) ? new $format: $format; $format->setMIME($mime); } } } return $format; } protected function getResponseFormat () { $format=NULL; $extensions = explode('.', parse_url($_SERVER['REQUEST_URI'], PHP_URL_PATH)); while($extensions){ $extension = array_pop($extensions); $extension = explode('/', $extension); $extension = array_shift($extension); if($extension && isset($this->format_map[$extension])){ $format = $this->format_map[$extension]; $format = is_string($format) ? new $format: $format; $format->setExtension($extension); return $format; } } if(isset($_SERVER['HTTP_ACCEPT'])){ $accepts = explode(',', $_SERVER['HTTP_ACCEPT']); foreach ($accepts as $accept) { if($extension && isset($this->format_map[$accept])){ $format = $this->format_map[$accept]; $format = is_string($format) ? new $format: $format; $format->setMIME($accept); return $format; } } } $format = new $this->format_map['default']; return $format; } protected function getRequestData() { try{ $r = file_get_contents('php://input'); if(is_null($r))return $_GET; $r =$this->request_format->decode($r); return is_null($r) ? array(): $r; } catch (RestException $e) { $this->handleError($e->getCode(), $e->getMessage()); } } protected function mapUrlToMethod () { if(!isset($this->routes[$this->request_method])){ return array(); } $urls = $this->routes[$this->request_method]; if(!$urls)return array(); $found = FALSE; $this->request_data += $_GET; $params = array('request_data'=>$this->request_data); $params += $this->request_data; foreach ($urls as $url => $call) { $call = (object)$call; if(strstr($url, ':')){ $regex = preg_replace('/\\\:([^\/]+)/', '(?P<$1>[^/]+)', preg_quote($url)); if (preg_match(":^$regex$:", $this->url, $matches)) { foreach ($matches as $arg => $match) { if (isset($call->arguments[$arg])){ $params[$arg] = $match; } } $found = TRUE; break; } }elseif ($url == $this->url){ $found = TRUE; break; } } if($found){ $p = $call->defaults; foreach ($call->arguments as $key => $value) { if(isset($params[$key]))$p[$value] = $params[$key]; } $call->arguments=$p; return $call; } } protected function applyClassMetadata($class_name, $instance, $method_info){ if(isset($method_info->metadata[$class_name]) && is_array($method_info->metadata[$class_name])){ foreach ($method_info->metadata[$class_name] as $property => $value){ if(property_exists($class_name, $property)){ $reflection_property = new ReflectionProperty($class_name, $property); $reflection_property->setValue($instance, $value); } } } } protected function loadCache() { if ($this->cached !== NULL) { return; } $file = $this->cache_dir . '/routes.php'; $this->cached = FALSE; if ($this->production_mode) { if (file_exists($file)) { $routes = include($file); } if (isset($routes) && is_array($routes)) { $this->routes = $routes; $this->cached = TRUE; } } else { } } protected function generateMap ($class_name, $base_path = '') { $reflection = new ReflectionClass($class_name); $class_metadata = parse_doc($reflection->getDocComment()); $methods = $reflection->getMethods( ReflectionMethod::IS_PUBLIC + ReflectionMethod::IS_PROTECTED); foreach ($methods as $method) { $doc = $method->getDocComment(); $arguments = array(); $defaults = array(); $metadata = $class_metadata+parse_doc($doc); $params = $method->getParameters(); $position=0; foreach ($params as $param){ $arguments[$param->getName()] = $position; $defaults[$position] = $param->isDefaultValueAvailable() ? $param->getDefaultValue() : NULL; $position++; } $method_flag = $method->isProtected() ? (isRestlerCompatibilityModeEnabled() ? 2 : 3) : (isset($metadata['protected']) ? 1 : 0); $call = array( 'class_name'=>$class_name, 'method_name'=>$method->getName(), 'arguments'=>$arguments, 'defaults'=>$defaults, 'metadata'=>$metadata, 'method_flag'=>$method_flag ); $method_url = strtolower($method->getName()); if (preg_match_all( '/@url\s+(GET|POST|PUT|DELETE|HEAD|OPTIONS)[ \t]*\/?(\S*)/s', $doc, $matches, PREG_SET_ORDER)) { foreach ($matches as $match) { $http_method = $match[1]; $url = rtrim($base_path . $match[2],'/'); $this->routes[$http_method][$url] = $call; } }elseif($method_url[0] != '_'){ if (preg_match_all('/^(GET|POST|PUT|DELETE|HEAD|OPTIONS)/i', $method_url, $matches)) { $http_method = strtoupper($matches[0][0]); $method_url = substr($method_url, strlen($http_method)); }else{ $http_method = 'GET'; } $url = $base_path. ($method_url=='index' || $method_url=='default' ? '' : $method_url); $url = rtrim($url,'/'); $this->routes[$http_method][$url] = $call; foreach ($params as $param){ if($param->getName()=='request_data'){ break; } $url .= $url=='' ? ':' : '/:'; $url .= $param->getName(); $this->routes[$http_method][$url] = $call; } } } } } if(version_compare(PHP_VERSION, '5.3.0') < 0){ require_once 'compat.php'; } class RestException extends Exception { public function __construct($http_status_code, $error_message = NULL) { parent::__construct($error_message, $http_status_code); } } interface iRespond { public function __formatResponse($result); public function __formatError($status_code, $message); } class DefaultResponse implements iRespond { function __formatResponse($result) { return $result; } function __formatError($statusCode, $message) { return array('error' => array('code' => $statusCode, 'message' => $message)); } } interface iAuthenticate { public function __isAuthenticated(); } interface iFormat { public function getMIMEMap(); public function setMIME($mime); public function getMIME(); public function setExtension($extension); public function getExtension(); public function encode($data, $human_readable=FALSE); public function decode($data); } class UrlEncodedFormat implements iFormat { const MIME = 'application/x-www-form-urlencoded'; const EXTENSION = 'post'; public function getMIMEMap() { return array(self::EXTENSION=>self::MIME); } public function getMIME(){ return self::MIME; } public function getExtension(){ return self::EXTENSION; } public function setMIME($mime){ } public function setExtension($extension){ } public function encode($data, $human_readable=FALSE){ return http_build_query($data); } public function decode($data){ parse_str($data,$r); return $r; } public function __toString(){ return $this->getExtension(); } } class JsonFormat implements iFormat { const MIME ='application/json'; const EXTENSION = 'json'; public function getMIMEMap() { return array(self::EXTENSION=>self::MIME); } public function getMIME(){ return self::MIME; } public function getExtension(){ return self::EXTENSION; } public function setMIME($mime){ } public function setExtension($extension){ } public function encode($data, $human_readable=FALSE){ return $human_readable ? $this->json_format(json_encode(object_to_array($data))) : json_encode(object_to_array($data)); } public function decode($data) { $decoded = json_decode ( $data ); if (function_exists ( 'json_last_error' )) { $message = ''; switch (json_last_error ()) { case JSON_ERROR_NONE : return object_to_array ( $decoded ); break; case JSON_ERROR_DEPTH : $message = 'maximum stack depth exceeded'; break; case JSON_ERROR_STATE_MISMATCH : $message = 'underflow or the modes mismatch'; break; case JSON_ERROR_CTRL_CHAR : $message = 'unexpected control character found'; break; case JSON_ERROR_SYNTAX : $message = 'malformed JSON'; break; case JSON_ERROR_UTF8 : $message = 'malformed UTF-8 characters, possibly incorrectly encoded'; break; default : $message = 'unknown error'; break; } throw new RestException ( 400, 'Error parsing JSON, ' . $message ); } else if (strlen ( $data ) && $decoded === NULL || $decoded === $data) { throw new RestException ( 400, 'Error parsing JSON' ); } return object_to_array ( $decoded ); } private function json_format($json) { $tab = "  "; $new_json = ""; $indent_level = 0; $in_string = FALSE; $len = strlen($json); for($c = 0; $c < $len; $c++) { $char = $json[$c]; switch($char) { case '{': case '[': if(!$in_string) { $new_json .= $char . "\n" . str_repeat($tab, $indent_level+1); $indent_level++; } else { $new_json .= $char; } break; case '}': case ']': if(!$in_string) { $indent_level--; $new_json .= "\n".str_repeat($tab, $indent_level).$char; } else { $new_json .= $char; } break; case ',': if(!$in_string) { $new_json .= ",\n" . str_repeat($tab, $indent_level); } else { $new_json .= $char; } break; case ':': if(!$in_string) { $new_json .= ": "; } else { $new_json .= $char; } break; case '"': if($c==0){ $in_string = TRUE; }elseif($c > 0 && $json[$c-1] != '\\') { $in_string = !$in_string; } default: $new_json .= $char; break; } } return $new_json; } public function __toString(){ return $this->getExtension(); } } class DocParser { private $params=array(); function parse($doc='') { if($doc==''){ return $this->params; } if(preg_match('#^/\*\*(.*)\*/#s', $doc, $comment) === false) return $this->params; $comment = trim($comment[1]); if(preg_match_all('#^\s*\*(.*)#m', $comment, $lines) === false) return $this->params; $this->parseLines($lines[1]); return $this->params; } private function parseLines($lines) { foreach($lines as $line) { $parsedLine = $this->parseLine($line); if($parsedLine === false && !isset($this->params['description'])) { if(isset($desc)){ $this->params['description'] = implode(PHP_EOL, $desc); } $desc = array(); } elseif($parsedLine !== false) { $desc[] = $parsedLine; } } $desc = implode(' ', $desc); if(!empty($desc))$this->params['long_description'] = $desc; } private function parseLine($line) { $line = trim($line); if(empty($line)) return false; if(strpos($line, '@') === 0) { if(strpos($line, ' ')>0){ $param = substr($line, 1, strpos($line, ' ') - 1); $value = substr($line, strlen($param) + 2); }else{ $param = substr($line, 1); $value = ''; } if($this->setParam($param, $value)) return false; } return $line; } private function setParam($param, $value) { if($param == 'param' || $param == 'return') $value = $this->formatParamOrReturn($value); if($param == 'class') list($param, $value) = $this->formatClass($value); if(empty($this->params[$param])) { $this->params[$param] = $value; } else if($param == 'param'){ $arr = array($this->params[$param], $value); $this->params[$param] = $arr; } else { $this->params[$param] = $value + $this->params[$param]; } return true; } private function formatClass($value) { $r = preg_split("[\(|\)]", $value); if(count($r)>1){ $param = $r[0]; parse_str($r[1],$value); foreach ($value as $key => $val) { $val = explode(',', $val); if(count($val)>1)$value[$key]=$val; } }else{ $param='Unknown'; } return array($param, $value); } private function formatParamOrReturn($string) { $pos = strpos($string, ' '); $type = substr($string, 0, $pos); return '(' . $type . ')' . substr($string, $pos+1); } } function parse_doc($php_doc_comment){ $p = new DocParser(); return $p->parse($php_doc_comment); $p = new Parser($php_doc_comment); return $p; $php_doc_comment = preg_replace("/(^[\\s]*\\/\\*\\*)
                                  |(^[\\s]\\*\\/)
                                  |(^[\\s]*\\*?\\s)
                                  |(^[\\s]*)

From 987b4fe0c3673d5cd9d447e372ea501c16e0bdb8 Mon Sep 17 00:00:00 2001
From: Luracast <arul@luracast.com>
Date: Wed, 23 May 2012 02:35:56 +0800
Subject: [PATCH 39/61] Added support for namespaces (PHP 5.3 and above). Now
 you can use $r->addApiClass('fully\qualified\path\Foo');

---
 restler/restler.php          | 16 +++++++++++-----
 restler_minified/restler.php |  2 +-
 2 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/restler/restler.php b/restler/restler.php
index 62f615f91..26835073f 100644
--- a/restler/restler.php
+++ b/restler/restler.php
@@ -10,10 +10,10 @@
  * @copyright  2010 Luracast
  * @license    http://www.opensource.org/licenses/lgpl-license.php LGPL
  * @link       http://luracast.com/products/restler/
- * @version    2.1.6
+ * @version    2.1.7
  */
-class Restler {
-	const VERSION = '2.1.6';
+class Restler { 
+	const VERSION = '2.1.7';
 	/**
 	 * URL of the currently mapped service
 	 * @var string
@@ -242,8 +242,14 @@ public function addAPIClass($class_name, $base_path = NULL) {
 		}
 		$this->loadCache();
 		if(!$this->cached){
-			if(is_null($base_path))$base_path=strtolower($class_name);
-			$base_path = trim($base_path,'/');
+			if(is_null($base_path)){
+				$base_path=strtolower($class_name);
+				$index = strrpos($class_name, '\\');
+				if($index!==FALSE){
+					$base_path=substr($base_path, $index+1);
+				}
+			}else			
+				$base_path = trim($base_path,'/');
 			if(strlen($base_path)>0)$base_path .= '/';
 			$this->generateMap($class_name, $base_path);
 		}
diff --git a/restler_minified/restler.php b/restler_minified/restler.php
index ee621cf9e..6aa8c6379 100644
--- a/restler_minified/restler.php
+++ b/restler_minified/restler.php
@@ -1,5 +1,5 @@
 <?php
- class Restler { const VERSION = '2.1.6'; public $url; public $request_method; public $request_format; public $request_data=array(); public $cache_dir; public $base_dir; public $response = 'DefaultResponse'; public $response_format; protected $production_mode; protected $routes= array(); protected $format_map = array(); protected $service_class_instance; protected $service_method; protected $auth_classes = array(); protected $error_classes = array(); private $codes = array( 100 => 'Continue', 101 => 'Switching Protocols', 200 => 'OK', 201 => 'Created', 202 => 'Accepted', 203 => 'Non-Authoritative Information', 204 => 'No Content', 205 => 'Reset Content', 206 => 'Partial Content', 300 => 'Multiple Choices', 301 => 'Moved Permanently', 302 => 'Found', 303 => 'See Other', 304 => 'Not Modified', 305 => 'Use Proxy', 306 => '(Unused)', 307 => 'Temporary Redirect', 400 => 'Bad Request', 401 => 'Unauthorized', 402 => 'Payment Required', 403 => 'Forbidden', 404 => 'Not Found', 405 => 'Method Not Allowed', 406 => 'Not Acceptable', 407 => 'Proxy Authentication Required', 408 => 'Request Timeout', 409 => 'Conflict', 410 => 'Gone', 411 => 'Length Required', 412 => 'Precondition Failed', 413 => 'Request Entity Too Large', 414 => 'Request-URI Too Long', 415 => 'Unsupported Media Type', 416 => 'Requested Range Not Satisfiable', 417 => 'Expectation Failed', 500 => 'Internal Server Error', 501 => 'Not Implemented', 502 => 'Bad Gateway', 503 => 'Service Unavailable', 504 => 'Gateway Timeout', 505 => 'HTTP Version Not Supported' ); protected $cached; public function __construct ($production_mode = FALSE) { $this->production_mode = $production_mode; $this->cache_dir = getcwd(); $this->base_dir = RESTLER_PATH; } public function __destruct () { if ($this->production_mode && !$this->cached) { $this->saveCache(); } } public function refreshCache () { $this->routes = array(); $this->cached = FALSE; } public function setSupportedFormats () { $args = func_get_args(); $extensions = array(); foreach ($args as $class_name) { if(!is_string($class_name) || !class_exists($class_name)){ throw new Exception("$class_name is not a vaild Format Class."); } $obj = new $class_name; if(! $obj instanceof iFormat){ throw new Exception('Invalid format class; must implement '. 'iFormat interface'); } foreach ($obj->getMIMEMap() as $extension => $mime) { if(!isset($this->format_map[$extension])) $this->format_map[$extension]=$class_name; if(!isset($this->format_map[$mime])) $this->format_map[$mime]=$class_name; $extensions[".$extension"]=TRUE; } } $this->format_map['default']=$args[0]; $this->format_map['extensions']=array_keys($extensions); } public function addAPIClass($class_name, $base_path = NULL) { if(!class_exists($class_name)){ throw new Exception("API class $class_name is missing."); } $this->loadCache(); if(!$this->cached){ if(is_null($base_path))$base_path=strtolower($class_name); $base_path = trim($base_path,'/'); if(strlen($base_path)>0)$base_path .= '/'; $this->generateMap($class_name, $base_path); } } public function addAuthenticationClass ($class_name, $base_path = NULL) { $this->auth_classes[] = $class_name; $this->addAPIClass($class_name, $base_path); } public function addErrorClass ($class_name) { $this->error_classes[] = $class_name; } public function handleError ($status_code, $error_message = NULL) { $method = "handle$status_code"; $handled = FALSE; foreach ($this->error_classes as $class_name) { if (method_exists($class_name, $method)) { $obj = new $class_name(); $obj->restler = $this; $obj->$method(); $handled = TRUE; } } if($handled)return; $message = $this->codes[$status_code] . (!$error_message ? '' : ': ' . $error_message); $this->setStatus($status_code); $responder = new $this->response(); $responder->restler = $this; $this->sendData($responder->__formatError($status_code, $message)); } public function handle () { if(empty($this->format_map))$this->setSupportedFormats('JsonFormat'); $this->url = strtolower($this->getPath()); $this->request_method = $this->getRequestMethod(); $this->response_format = $this->getResponseFormat(); $this->request_format = $this->getRequestFormat(); if(is_null($this->request_format)){ $this->request_format = $this->response_format; } if($this->request_method == 'PUT' || $this->request_method == 'POST'){ $this->request_data = $this->getRequestData(); } $o = $this->mapUrlToMethod(); if(!isset($o->class_name)){ $this->handleError(404); }else{ try { if($o->method_flag){ $auth_method = '__isAuthenticated'; if(!count($this->auth_classes))throw new RestException(401); foreach ($this->auth_classes as $auth_class) { $auth_obj = new $auth_class(); $auth_obj->restler=$this; $this->applyClassMetadata($auth_class, $auth_obj, $o); if (!method_exists($auth_obj, $auth_method)) { throw new RestException(401, 'Authentication Class '. 'should implement iAuthenticate'); }elseif(!$auth_obj->$auth_method()){ throw new RestException(401); } } } $this->applyClassMetadata(get_class($this->request_format), $this->request_format, $o); $pre_process = '_'.$this->request_format->getExtension().'_'. $o->method_name; $this->service_method = $o->method_name; if($o->method_flag==2)$o=unprotect($o); $object = $this->service_class_instance = new $o->class_name(); $object->restler=$this; if(method_exists($o->class_name, $pre_process)) { call_user_func_array(array($object, $pre_process), $o->arguments); } switch ($o->method_flag) { case 3: $reflection_method = new ReflectionMethod($object, $o->method_name); $reflection_method->setAccessible(TRUE); $result = $reflection_method->invokeArgs($object, $o->arguments); break; case 2: case 1: default: $result = call_user_func_array(array($object, $o->method_name), $o->arguments); } } catch (RestException $e) { $this->handleError($e->getCode(), $e->getMessage()); } } $responder = new $this->response(); $responder->restler = $this; $this->applyClassMetadata($this->response, $responder, $o); if (isset($result) && $result !== NULL) { $result = $responder->__formatResponse($result); $this->sendData($result); } } public function sendData($data) { $data = $this->response_format->encode($data, !$this->production_mode); $post_process = '_'.$this->service_method .'_'. $this->response_format->getExtension(); if(isset($this->service_class_instance) && method_exists($this->service_class_instance,$post_process)){ $data = call_user_func(array($this->service_class_instance, $post_process), $data); } header("Cache-Control: no-cache, must-revalidate"); header("Expires: 0"); header('Content-Type: ' . $this->response_format->getMIME()); header("X-Powered-By: Luracast Restler v".Restler::VERSION); die($data); } public function setStatus($code) { header("{$_SERVER['SERVER_PROTOCOL']} $code ". $this->codes[strval($code)]); } public function removeCommonPath($first, $second, $char='/'){ $first = explode($char, $first); $second = explode($char, $second); while (count($second)){ if($first[0]==$second[0]){ array_shift($first); } else break; array_shift($second); } return implode($char, $first); } public function saveCache() { $file = $this->cache_dir . '/routes.php'; $s = '$o=array();'.PHP_EOL; foreach ($this->routes as $key => $value) { $s .= PHP_EOL.PHP_EOL.PHP_EOL."############### $key ###############" .PHP_EOL.PHP_EOL; $s .= '$o[\''.$key.'\']=array();'; foreach ($value as $ke => $va) { $s .= PHP_EOL.PHP_EOL."#==== $key $ke".PHP_EOL.PHP_EOL; $s .= '$o[\''.$key.'\'][\''.$ke.'\']='.str_replace(PHP_EOL, PHP_EOL."\t", var_export($va, TRUE)).';'; } } $s .= PHP_EOL.'return $o;'; $r=@file_put_contents($file, "<?php $s"); @chmod($file, 0777); if($r===FALSE)throw new Exception( "The cache directory located at '$this->cache_dir' needs to have ". "the permissions set to read/write/execute for everyone in order ". "to save cache and improve performance."); } protected function getPath () { $path = urldecode($this->removeCommonPath($_SERVER['REQUEST_URI'], $_SERVER['SCRIPT_NAME'])); $path = preg_replace('/(\/*\?.*$)|(\/$)/', '', $path); $path = str_replace($this->format_map['extensions'], '', $path); return $path; } protected function getRequestMethod () { $method = $_SERVER['REQUEST_METHOD']; if (isset($_SERVER['HTTP_X_HTTP_METHOD_OVERRIDE'])){ $method = $_SERVER['HTTP_X_HTTP_METHOD_OVERRIDE']; } if($method=='HEAD')$method='GET'; return $method; } protected function getRequestFormat () { $format=NULL; if(isset($_SERVER['CONTENT_TYPE'])){ $mime = explode(';', $_SERVER['CONTENT_TYPE']); $mime = $mime[0]; if($mime==UrlEncodedFormat::MIME){ $format = new UrlEncodedFormat(); }else{ if(isset($this->format_map[$mime])){ $format = $this->format_map[$mime]; $format = is_string($format) ? new $format: $format; $format->setMIME($mime); } } } return $format; } protected function getResponseFormat () { $format=NULL; $extensions = explode('.', parse_url($_SERVER['REQUEST_URI'], PHP_URL_PATH)); while($extensions){ $extension = array_pop($extensions); $extension = explode('/', $extension); $extension = array_shift($extension); if($extension && isset($this->format_map[$extension])){ $format = $this->format_map[$extension]; $format = is_string($format) ? new $format: $format; $format->setExtension($extension); return $format; } } if(isset($_SERVER['HTTP_ACCEPT'])){ $accepts = explode(',', $_SERVER['HTTP_ACCEPT']); foreach ($accepts as $accept) { if($extension && isset($this->format_map[$accept])){ $format = $this->format_map[$accept]; $format = is_string($format) ? new $format: $format; $format->setMIME($accept); return $format; } } } $format = new $this->format_map['default']; return $format; } protected function getRequestData() { try{ $r = file_get_contents('php://input'); if(is_null($r))return $_GET; $r =$this->request_format->decode($r); return is_null($r) ? array(): $r; } catch (RestException $e) { $this->handleError($e->getCode(), $e->getMessage()); } } protected function mapUrlToMethod () { if(!isset($this->routes[$this->request_method])){ return array(); } $urls = $this->routes[$this->request_method]; if(!$urls)return array(); $found = FALSE; $this->request_data += $_GET; $params = array('request_data'=>$this->request_data); $params += $this->request_data; foreach ($urls as $url => $call) { $call = (object)$call; if(strstr($url, ':')){ $regex = preg_replace('/\\\:([^\/]+)/', '(?P<$1>[^/]+)', preg_quote($url)); if (preg_match(":^$regex$:", $this->url, $matches)) { foreach ($matches as $arg => $match) { if (isset($call->arguments[$arg])){ $params[$arg] = $match; } } $found = TRUE; break; } }elseif ($url == $this->url){ $found = TRUE; break; } } if($found){ $p = $call->defaults; foreach ($call->arguments as $key => $value) { if(isset($params[$key]))$p[$value] = $params[$key]; } $call->arguments=$p; return $call; } } protected function applyClassMetadata($class_name, $instance, $method_info){ if(isset($method_info->metadata[$class_name]) && is_array($method_info->metadata[$class_name])){ foreach ($method_info->metadata[$class_name] as $property => $value){ if(property_exists($class_name, $property)){ $reflection_property = new ReflectionProperty($class_name, $property); $reflection_property->setValue($instance, $value); } } } } protected function loadCache() { if ($this->cached !== NULL) { return; } $file = $this->cache_dir . '/routes.php'; $this->cached = FALSE; if ($this->production_mode) { if (file_exists($file)) { $routes = include($file); } if (isset($routes) && is_array($routes)) { $this->routes = $routes; $this->cached = TRUE; } } else { } } protected function generateMap ($class_name, $base_path = '') { $reflection = new ReflectionClass($class_name); $class_metadata = parse_doc($reflection->getDocComment()); $methods = $reflection->getMethods( ReflectionMethod::IS_PUBLIC + ReflectionMethod::IS_PROTECTED); foreach ($methods as $method) { $doc = $method->getDocComment(); $arguments = array(); $defaults = array(); $metadata = $class_metadata+parse_doc($doc); $params = $method->getParameters(); $position=0; foreach ($params as $param){ $arguments[$param->getName()] = $position; $defaults[$position] = $param->isDefaultValueAvailable() ? $param->getDefaultValue() : NULL; $position++; } $method_flag = $method->isProtected() ? (isRestlerCompatibilityModeEnabled() ? 2 : 3) : (isset($metadata['protected']) ? 1 : 0); $call = array( 'class_name'=>$class_name, 'method_name'=>$method->getName(), 'arguments'=>$arguments, 'defaults'=>$defaults, 'metadata'=>$metadata, 'method_flag'=>$method_flag ); $method_url = strtolower($method->getName()); if (preg_match_all( '/@url\s+(GET|POST|PUT|DELETE|HEAD|OPTIONS)[ \t]*\/?(\S*)/s', $doc, $matches, PREG_SET_ORDER)) { foreach ($matches as $match) { $http_method = $match[1]; $url = rtrim($base_path . $match[2],'/'); $this->routes[$http_method][$url] = $call; } }elseif($method_url[0] != '_'){ if (preg_match_all('/^(GET|POST|PUT|DELETE|HEAD|OPTIONS)/i', $method_url, $matches)) { $http_method = strtoupper($matches[0][0]); $method_url = substr($method_url, strlen($http_method)); }else{ $http_method = 'GET'; } $url = $base_path. ($method_url=='index' || $method_url=='default' ? '' : $method_url); $url = rtrim($url,'/'); $this->routes[$http_method][$url] = $call; foreach ($params as $param){ if($param->getName()=='request_data'){ break; } $url .= $url=='' ? ':' : '/:'; $url .= $param->getName(); $this->routes[$http_method][$url] = $call; } } } } } if(version_compare(PHP_VERSION, '5.3.0') < 0){ require_once 'compat.php'; } class RestException extends Exception { public function __construct($http_status_code, $error_message = NULL) { parent::__construct($error_message, $http_status_code); } } interface iRespond { public function __formatResponse($result); public function __formatError($status_code, $message); } class DefaultResponse implements iRespond { function __formatResponse($result) { return $result; } function __formatError($statusCode, $message) { return array('error' => array('code' => $statusCode, 'message' => $message)); } } interface iAuthenticate { public function __isAuthenticated(); } interface iFormat { public function getMIMEMap(); public function setMIME($mime); public function getMIME(); public function setExtension($extension); public function getExtension(); public function encode($data, $human_readable=FALSE); public function decode($data); } class UrlEncodedFormat implements iFormat { const MIME = 'application/x-www-form-urlencoded'; const EXTENSION = 'post'; public function getMIMEMap() { return array(self::EXTENSION=>self::MIME); } public function getMIME(){ return self::MIME; } public function getExtension(){ return self::EXTENSION; } public function setMIME($mime){ } public function setExtension($extension){ } public function encode($data, $human_readable=FALSE){ return http_build_query($data); } public function decode($data){ parse_str($data,$r); return $r; } public function __toString(){ return $this->getExtension(); } } class JsonFormat implements iFormat { const MIME ='application/json'; const EXTENSION = 'json'; public function getMIMEMap() { return array(self::EXTENSION=>self::MIME); } public function getMIME(){ return self::MIME; } public function getExtension(){ return self::EXTENSION; } public function setMIME($mime){ } public function setExtension($extension){ } public function encode($data, $human_readable=FALSE){ return $human_readable ? $this->json_format(json_encode(object_to_array($data))) : json_encode(object_to_array($data)); } public function decode($data) { $decoded = json_decode ( $data ); if (function_exists ( 'json_last_error' )) { $message = ''; switch (json_last_error ()) { case JSON_ERROR_NONE : return object_to_array ( $decoded ); break; case JSON_ERROR_DEPTH : $message = 'maximum stack depth exceeded'; break; case JSON_ERROR_STATE_MISMATCH : $message = 'underflow or the modes mismatch'; break; case JSON_ERROR_CTRL_CHAR : $message = 'unexpected control character found'; break; case JSON_ERROR_SYNTAX : $message = 'malformed JSON'; break; case JSON_ERROR_UTF8 : $message = 'malformed UTF-8 characters, possibly incorrectly encoded'; break; default : $message = 'unknown error'; break; } throw new RestException ( 400, 'Error parsing JSON, ' . $message ); } else if (strlen ( $data ) && $decoded === NULL || $decoded === $data) { throw new RestException ( 400, 'Error parsing JSON' ); } return object_to_array ( $decoded ); } private function json_format($json) { $tab = "  "; $new_json = ""; $indent_level = 0; $in_string = FALSE; $len = strlen($json); for($c = 0; $c < $len; $c++) { $char = $json[$c]; switch($char) { case '{': case '[': if(!$in_string) { $new_json .= $char . "\n" . str_repeat($tab, $indent_level+1); $indent_level++; } else { $new_json .= $char; } break; case '}': case ']': if(!$in_string) { $indent_level--; $new_json .= "\n".str_repeat($tab, $indent_level).$char; } else { $new_json .= $char; } break; case ',': if(!$in_string) { $new_json .= ",\n" . str_repeat($tab, $indent_level); } else { $new_json .= $char; } break; case ':': if(!$in_string) { $new_json .= ": "; } else { $new_json .= $char; } break; case '"': if($c==0){ $in_string = TRUE; }elseif($c > 0 && $json[$c-1] != '\\') { $in_string = !$in_string; } default: $new_json .= $char; break; } } return $new_json; } public function __toString(){ return $this->getExtension(); } } class DocParser { private $params=array(); function parse($doc='') { if($doc==''){ return $this->params; } if(preg_match('#^/\*\*(.*)\*/#s', $doc, $comment) === false) return $this->params; $comment = trim($comment[1]); if(preg_match_all('#^\s*\*(.*)#m', $comment, $lines) === false) return $this->params; $this->parseLines($lines[1]); return $this->params; } private function parseLines($lines) { foreach($lines as $line) { $parsedLine = $this->parseLine($line); if($parsedLine === false && !isset($this->params['description'])) { if(isset($desc)){ $this->params['description'] = implode(PHP_EOL, $desc); } $desc = array(); } elseif($parsedLine !== false) { $desc[] = $parsedLine; } } $desc = implode(' ', $desc); if(!empty($desc))$this->params['long_description'] = $desc; } private function parseLine($line) { $line = trim($line); if(empty($line)) return false; if(strpos($line, '@') === 0) { if(strpos($line, ' ')>0){ $param = substr($line, 1, strpos($line, ' ') - 1); $value = substr($line, strlen($param) + 2); }else{ $param = substr($line, 1); $value = ''; } if($this->setParam($param, $value)) return false; } return $line; } private function setParam($param, $value) { if($param == 'param' || $param == 'return') $value = $this->formatParamOrReturn($value); if($param == 'class') list($param, $value) = $this->formatClass($value); if(empty($this->params[$param])) { $this->params[$param] = $value; } else if($param == 'param'){ $arr = array($this->params[$param], $value); $this->params[$param] = $arr; } else { $this->params[$param] = $value + $this->params[$param]; } return true; } private function formatClass($value) { $r = preg_split("[\(|\)]", $value); if(count($r)>1){ $param = $r[0]; parse_str($r[1],$value); foreach ($value as $key => $val) { $val = explode(',', $val); if(count($val)>1)$value[$key]=$val; } }else{ $param='Unknown'; } return array($param, $value); } private function formatParamOrReturn($string) { $pos = strpos($string, ' '); $type = substr($string, 0, $pos); return '(' . $type . ')' . substr($string, $pos+1); } } function parse_doc($php_doc_comment){ $p = new DocParser(); return $p->parse($php_doc_comment); $p = new Parser($php_doc_comment); return $p; $php_doc_comment = preg_replace("/(^[\\s]*\\/\\*\\*)
+ class Restler { const VERSION = '2.1.7'; public $url; public $request_method; public $request_format; public $request_data=array(); public $cache_dir; public $base_dir; public $response = 'DefaultResponse'; public $response_format; protected $production_mode; protected $routes= array(); protected $format_map = array(); protected $service_class_instance; protected $service_method; protected $auth_classes = array(); protected $error_classes = array(); private $codes = array( 100 => 'Continue', 101 => 'Switching Protocols', 200 => 'OK', 201 => 'Created', 202 => 'Accepted', 203 => 'Non-Authoritative Information', 204 => 'No Content', 205 => 'Reset Content', 206 => 'Partial Content', 300 => 'Multiple Choices', 301 => 'Moved Permanently', 302 => 'Found', 303 => 'See Other', 304 => 'Not Modified', 305 => 'Use Proxy', 306 => '(Unused)', 307 => 'Temporary Redirect', 400 => 'Bad Request', 401 => 'Unauthorized', 402 => 'Payment Required', 403 => 'Forbidden', 404 => 'Not Found', 405 => 'Method Not Allowed', 406 => 'Not Acceptable', 407 => 'Proxy Authentication Required', 408 => 'Request Timeout', 409 => 'Conflict', 410 => 'Gone', 411 => 'Length Required', 412 => 'Precondition Failed', 413 => 'Request Entity Too Large', 414 => 'Request-URI Too Long', 415 => 'Unsupported Media Type', 416 => 'Requested Range Not Satisfiable', 417 => 'Expectation Failed', 500 => 'Internal Server Error', 501 => 'Not Implemented', 502 => 'Bad Gateway', 503 => 'Service Unavailable', 504 => 'Gateway Timeout', 505 => 'HTTP Version Not Supported' ); protected $cached; public function __construct ($production_mode = FALSE) { $this->production_mode = $production_mode; $this->cache_dir = getcwd(); $this->base_dir = RESTLER_PATH; } public function __destruct () { if ($this->production_mode && !$this->cached) { $this->saveCache(); } } public function refreshCache () { $this->routes = array(); $this->cached = FALSE; } public function setSupportedFormats () { $args = func_get_args(); $extensions = array(); foreach ($args as $class_name) { if(!is_string($class_name) || !class_exists($class_name)){ throw new Exception("$class_name is not a vaild Format Class."); } $obj = new $class_name; if(! $obj instanceof iFormat){ throw new Exception('Invalid format class; must implement '. 'iFormat interface'); } foreach ($obj->getMIMEMap() as $extension => $mime) { if(!isset($this->format_map[$extension])) $this->format_map[$extension]=$class_name; if(!isset($this->format_map[$mime])) $this->format_map[$mime]=$class_name; $extensions[".$extension"]=TRUE; } } $this->format_map['default']=$args[0]; $this->format_map['extensions']=array_keys($extensions); } public function addAPIClass($class_name, $base_path = NULL) { if(!class_exists($class_name)){ throw new Exception("API class $class_name is missing."); } $this->loadCache(); if(!$this->cached){ if(is_null($base_path)){ $base_path=strtolower($class_name); $index = strrpos($class_name, '\\'); if($index!==FALSE){ $base_path=substr($base_path, $index+1); } }else $base_path = trim($base_path,'/'); if(strlen($base_path)>0)$base_path .= '/'; $this->generateMap($class_name, $base_path); } } public function addAuthenticationClass ($class_name, $base_path = NULL) { $this->auth_classes[] = $class_name; $this->addAPIClass($class_name, $base_path); } public function addErrorClass ($class_name) { $this->error_classes[] = $class_name; } public function handleError ($status_code, $error_message = NULL) { $method = "handle$status_code"; $handled = FALSE; foreach ($this->error_classes as $class_name) { if (method_exists($class_name, $method)) { $obj = new $class_name(); $obj->restler = $this; $obj->$method(); $handled = TRUE; } } if($handled)return; $message = $this->codes[$status_code] . (!$error_message ? '' : ': ' . $error_message); $this->setStatus($status_code); $responder = new $this->response(); $responder->restler = $this; $this->sendData($responder->__formatError($status_code, $message)); } public function handle () { if(empty($this->format_map))$this->setSupportedFormats('JsonFormat'); $this->url = strtolower($this->getPath()); $this->request_method = $this->getRequestMethod(); $this->response_format = $this->getResponseFormat(); $this->request_format = $this->getRequestFormat(); if(is_null($this->request_format)){ $this->request_format = $this->response_format; } if($this->request_method == 'PUT' || $this->request_method == 'POST'){ $this->request_data = $this->getRequestData(); } $o = $this->mapUrlToMethod(); if(!isset($o->class_name)){ $this->handleError(404); }else{ try { if($o->method_flag){ $auth_method = '__isAuthenticated'; if(!count($this->auth_classes))throw new RestException(401); foreach ($this->auth_classes as $auth_class) { $auth_obj = new $auth_class(); $auth_obj->restler=$this; $this->applyClassMetadata($auth_class, $auth_obj, $o); if (!method_exists($auth_obj, $auth_method)) { throw new RestException(401, 'Authentication Class '. 'should implement iAuthenticate'); }elseif(!$auth_obj->$auth_method()){ throw new RestException(401); } } } $this->applyClassMetadata(get_class($this->request_format), $this->request_format, $o); $pre_process = '_'.$this->request_format->getExtension().'_'. $o->method_name; $this->service_method = $o->method_name; if($o->method_flag==2)$o=unprotect($o); $object = $this->service_class_instance = new $o->class_name(); $object->restler=$this; if(method_exists($o->class_name, $pre_process)) { call_user_func_array(array($object, $pre_process), $o->arguments); } switch ($o->method_flag) { case 3: $reflection_method = new ReflectionMethod($object, $o->method_name); $reflection_method->setAccessible(TRUE); $result = $reflection_method->invokeArgs($object, $o->arguments); break; case 2: case 1: default: $result = call_user_func_array(array($object, $o->method_name), $o->arguments); } } catch (RestException $e) { $this->handleError($e->getCode(), $e->getMessage()); } } $responder = new $this->response(); $responder->restler = $this; $this->applyClassMetadata($this->response, $responder, $o); if (isset($result) && $result !== NULL) { $result = $responder->__formatResponse($result); $this->sendData($result); } } public function sendData($data) { $data = $this->response_format->encode($data, !$this->production_mode); $post_process = '_'.$this->service_method .'_'. $this->response_format->getExtension(); if(isset($this->service_class_instance) && method_exists($this->service_class_instance,$post_process)){ $data = call_user_func(array($this->service_class_instance, $post_process), $data); } header("Cache-Control: no-cache, must-revalidate"); header("Expires: 0"); header('Content-Type: ' . $this->response_format->getMIME()); header("X-Powered-By: Luracast Restler v".Restler::VERSION); die($data); } public function setStatus($code) { header("{$_SERVER['SERVER_PROTOCOL']} $code ". $this->codes[strval($code)]); } public function removeCommonPath($first, $second, $char='/'){ $first = explode($char, $first); $second = explode($char, $second); while (count($second)){ if($first[0]==$second[0]){ array_shift($first); } else break; array_shift($second); } return implode($char, $first); } public function saveCache() { $file = $this->cache_dir . '/routes.php'; $s = '$o=array();'.PHP_EOL; foreach ($this->routes as $key => $value) { $s .= PHP_EOL.PHP_EOL.PHP_EOL."############### $key ###############" .PHP_EOL.PHP_EOL; $s .= '$o[\''.$key.'\']=array();'; foreach ($value as $ke => $va) { $s .= PHP_EOL.PHP_EOL."#==== $key $ke".PHP_EOL.PHP_EOL; $s .= '$o[\''.$key.'\'][\''.$ke.'\']='.str_replace(PHP_EOL, PHP_EOL."\t", var_export($va, TRUE)).';'; } } $s .= PHP_EOL.'return $o;'; $r=@file_put_contents($file, "<?php $s"); @chmod($file, 0777); if($r===FALSE)throw new Exception( "The cache directory located at '$this->cache_dir' needs to have ". "the permissions set to read/write/execute for everyone in order ". "to save cache and improve performance."); } protected function getPath () { $path = urldecode($this->removeCommonPath($_SERVER['REQUEST_URI'], $_SERVER['SCRIPT_NAME'])); $path = preg_replace('/(\/*\?.*$)|(\/$)/', '', $path); $path = str_replace($this->format_map['extensions'], '', $path); return $path; } protected function getRequestMethod () { $method = $_SERVER['REQUEST_METHOD']; if (isset($_SERVER['HTTP_X_HTTP_METHOD_OVERRIDE'])){ $method = $_SERVER['HTTP_X_HTTP_METHOD_OVERRIDE']; } if($method=='HEAD')$method='GET'; return $method; } protected function getRequestFormat () { $format=NULL; if(isset($_SERVER['CONTENT_TYPE'])){ $mime = explode(';', $_SERVER['CONTENT_TYPE']); $mime = $mime[0]; if($mime==UrlEncodedFormat::MIME){ $format = new UrlEncodedFormat(); }else{ if(isset($this->format_map[$mime])){ $format = $this->format_map[$mime]; $format = is_string($format) ? new $format: $format; $format->setMIME($mime); } } } return $format; } protected function getResponseFormat () { $format=NULL; $extensions = explode('.', parse_url($_SERVER['REQUEST_URI'], PHP_URL_PATH)); while($extensions){ $extension = array_pop($extensions); $extension = explode('/', $extension); $extension = array_shift($extension); if($extension && isset($this->format_map[$extension])){ $format = $this->format_map[$extension]; $format = is_string($format) ? new $format: $format; $format->setExtension($extension); return $format; } } if(isset($_SERVER['HTTP_ACCEPT'])){ $accepts = explode(',', $_SERVER['HTTP_ACCEPT']); foreach ($accepts as $accept) { if($extension && isset($this->format_map[$accept])){ $format = $this->format_map[$accept]; $format = is_string($format) ? new $format: $format; $format->setMIME($accept); return $format; } } } $format = new $this->format_map['default']; return $format; } protected function getRequestData() { try{ $r = file_get_contents('php://input'); if(is_null($r))return $_GET; $r =$this->request_format->decode($r); return is_null($r) ? array(): $r; } catch (RestException $e) { $this->handleError($e->getCode(), $e->getMessage()); } } protected function mapUrlToMethod () { if(!isset($this->routes[$this->request_method])){ return array(); } $urls = $this->routes[$this->request_method]; if(!$urls)return array(); $found = FALSE; $this->request_data += $_GET; $params = array('request_data'=>$this->request_data); $params += $this->request_data; foreach ($urls as $url => $call) { $call = (object)$call; if(strstr($url, ':')){ $regex = preg_replace('/\\\:([^\/]+)/', '(?P<$1>[^/]+)', preg_quote($url)); if (preg_match(":^$regex$:", $this->url, $matches)) { foreach ($matches as $arg => $match) { if (isset($call->arguments[$arg])){ $params[$arg] = $match; } } $found = TRUE; break; } }elseif ($url == $this->url){ $found = TRUE; break; } } if($found){ $p = $call->defaults; foreach ($call->arguments as $key => $value) { if(isset($params[$key]))$p[$value] = $params[$key]; } $call->arguments=$p; return $call; } } protected function applyClassMetadata($class_name, $instance, $method_info){ if(isset($method_info->metadata[$class_name]) && is_array($method_info->metadata[$class_name])){ foreach ($method_info->metadata[$class_name] as $property => $value){ if(property_exists($class_name, $property)){ $reflection_property = new ReflectionProperty($class_name, $property); $reflection_property->setValue($instance, $value); } } } } protected function loadCache() { if ($this->cached !== NULL) { return; } $file = $this->cache_dir . '/routes.php'; $this->cached = FALSE; if ($this->production_mode) { if (file_exists($file)) { $routes = include($file); } if (isset($routes) && is_array($routes)) { $this->routes = $routes; $this->cached = TRUE; } } else { } } protected function generateMap ($class_name, $base_path = '') { $reflection = new ReflectionClass($class_name); $class_metadata = parse_doc($reflection->getDocComment()); $methods = $reflection->getMethods( ReflectionMethod::IS_PUBLIC + ReflectionMethod::IS_PROTECTED); foreach ($methods as $method) { $doc = $method->getDocComment(); $arguments = array(); $defaults = array(); $metadata = $class_metadata+parse_doc($doc); $params = $method->getParameters(); $position=0; foreach ($params as $param){ $arguments[$param->getName()] = $position; $defaults[$position] = $param->isDefaultValueAvailable() ? $param->getDefaultValue() : NULL; $position++; } $method_flag = $method->isProtected() ? (isRestlerCompatibilityModeEnabled() ? 2 : 3) : (isset($metadata['protected']) ? 1 : 0); $call = array( 'class_name'=>$class_name, 'method_name'=>$method->getName(), 'arguments'=>$arguments, 'defaults'=>$defaults, 'metadata'=>$metadata, 'method_flag'=>$method_flag ); $method_url = strtolower($method->getName()); if (preg_match_all( '/@url\s+(GET|POST|PUT|DELETE|HEAD|OPTIONS)[ \t]*\/?(\S*)/s', $doc, $matches, PREG_SET_ORDER)) { foreach ($matches as $match) { $http_method = $match[1]; $url = rtrim($base_path . $match[2],'/'); $this->routes[$http_method][$url] = $call; } }elseif($method_url[0] != '_'){ if (preg_match_all('/^(GET|POST|PUT|DELETE|HEAD|OPTIONS)/i', $method_url, $matches)) { $http_method = strtoupper($matches[0][0]); $method_url = substr($method_url, strlen($http_method)); }else{ $http_method = 'GET'; } $url = $base_path. ($method_url=='index' || $method_url=='default' ? '' : $method_url); $url = rtrim($url,'/'); $this->routes[$http_method][$url] = $call; foreach ($params as $param){ if($param->getName()=='request_data'){ break; } $url .= $url=='' ? ':' : '/:'; $url .= $param->getName(); $this->routes[$http_method][$url] = $call; } } } } } if(version_compare(PHP_VERSION, '5.3.0') < 0){ require_once 'compat.php'; } class RestException extends Exception { public function __construct($http_status_code, $error_message = NULL) { parent::__construct($error_message, $http_status_code); } } interface iRespond { public function __formatResponse($result); public function __formatError($status_code, $message); } class DefaultResponse implements iRespond { function __formatResponse($result) { return $result; } function __formatError($statusCode, $message) { return array('error' => array('code' => $statusCode, 'message' => $message)); } } interface iAuthenticate { public function __isAuthenticated(); } interface iFormat { public function getMIMEMap(); public function setMIME($mime); public function getMIME(); public function setExtension($extension); public function getExtension(); public function encode($data, $human_readable=FALSE); public function decode($data); } class UrlEncodedFormat implements iFormat { const MIME = 'application/x-www-form-urlencoded'; const EXTENSION = 'post'; public function getMIMEMap() { return array(self::EXTENSION=>self::MIME); } public function getMIME(){ return self::MIME; } public function getExtension(){ return self::EXTENSION; } public function setMIME($mime){ } public function setExtension($extension){ } public function encode($data, $human_readable=FALSE){ return http_build_query($data); } public function decode($data){ parse_str($data,$r); return $r; } public function __toString(){ return $this->getExtension(); } } class JsonFormat implements iFormat { const MIME ='application/json'; const EXTENSION = 'json'; public function getMIMEMap() { return array(self::EXTENSION=>self::MIME); } public function getMIME(){ return self::MIME; } public function getExtension(){ return self::EXTENSION; } public function setMIME($mime){ } public function setExtension($extension){ } public function encode($data, $human_readable=FALSE){ return $human_readable ? $this->json_format(json_encode(object_to_array($data))) : json_encode(object_to_array($data)); } public function decode($data) { $decoded = json_decode ( $data ); if (function_exists ( 'json_last_error' )) { $message = ''; switch (json_last_error ()) { case JSON_ERROR_NONE : return object_to_array ( $decoded ); break; case JSON_ERROR_DEPTH : $message = 'maximum stack depth exceeded'; break; case JSON_ERROR_STATE_MISMATCH : $message = 'underflow or the modes mismatch'; break; case JSON_ERROR_CTRL_CHAR : $message = 'unexpected control character found'; break; case JSON_ERROR_SYNTAX : $message = 'malformed JSON'; break; case JSON_ERROR_UTF8 : $message = 'malformed UTF-8 characters, possibly incorrectly encoded'; break; default : $message = 'unknown error'; break; } throw new RestException ( 400, 'Error parsing JSON, ' . $message ); } else if (strlen ( $data ) && $decoded === NULL || $decoded === $data) { throw new RestException ( 400, 'Error parsing JSON' ); } return object_to_array ( $decoded ); } private function json_format($json) { $tab = "  "; $new_json = ""; $indent_level = 0; $in_string = FALSE; $len = strlen($json); for($c = 0; $c < $len; $c++) { $char = $json[$c]; switch($char) { case '{': case '[': if(!$in_string) { $new_json .= $char . "\n" . str_repeat($tab, $indent_level+1); $indent_level++; } else { $new_json .= $char; } break; case '}': case ']': if(!$in_string) { $indent_level--; $new_json .= "\n".str_repeat($tab, $indent_level).$char; } else { $new_json .= $char; } break; case ',': if(!$in_string) { $new_json .= ",\n" . str_repeat($tab, $indent_level); } else { $new_json .= $char; } break; case ':': if(!$in_string) { $new_json .= ": "; } else { $new_json .= $char; } break; case '"': if($c==0){ $in_string = TRUE; }elseif($c > 0 && $json[$c-1] != '\\') { $in_string = !$in_string; } default: $new_json .= $char; break; } } return $new_json; } public function __toString(){ return $this->getExtension(); } } class DocParser { private $params=array(); function parse($doc='') { if($doc==''){ return $this->params; } if(preg_match('#^/\*\*(.*)\*/#s', $doc, $comment) === false) return $this->params; $comment = trim($comment[1]); if(preg_match_all('#^\s*\*(.*)#m', $comment, $lines) === false) return $this->params; $this->parseLines($lines[1]); return $this->params; } private function parseLines($lines) { foreach($lines as $line) { $parsedLine = $this->parseLine($line); if($parsedLine === false && !isset($this->params['description'])) { if(isset($desc)){ $this->params['description'] = implode(PHP_EOL, $desc); } $desc = array(); } elseif($parsedLine !== false) { $desc[] = $parsedLine; } } $desc = implode(' ', $desc); if(!empty($desc))$this->params['long_description'] = $desc; } private function parseLine($line) { $line = trim($line); if(empty($line)) return false; if(strpos($line, '@') === 0) { if(strpos($line, ' ')>0){ $param = substr($line, 1, strpos($line, ' ') - 1); $value = substr($line, strlen($param) + 2); }else{ $param = substr($line, 1); $value = ''; } if($this->setParam($param, $value)) return false; } return $line; } private function setParam($param, $value) { if($param == 'param' || $param == 'return') $value = $this->formatParamOrReturn($value); if($param == 'class') list($param, $value) = $this->formatClass($value); if(empty($this->params[$param])) { $this->params[$param] = $value; } else if($param == 'param'){ $arr = array($this->params[$param], $value); $this->params[$param] = $arr; } else { $this->params[$param] = $value + $this->params[$param]; } return true; } private function formatClass($value) { $r = preg_split("[\(|\)]", $value); if(count($r)>1){ $param = $r[0]; parse_str($r[1],$value); foreach ($value as $key => $val) { $val = explode(',', $val); if(count($val)>1)$value[$key]=$val; } }else{ $param='Unknown'; } return array($param, $value); } private function formatParamOrReturn($string) { $pos = strpos($string, ' '); $type = substr($string, 0, $pos); return '(' . $type . ')' . substr($string, $pos+1); } } function parse_doc($php_doc_comment){ $p = new DocParser(); return $p->parse($php_doc_comment); $p = new Parser($php_doc_comment); return $p; $php_doc_comment = preg_replace("/(^[\\s]*\\/\\*\\*)
                                  |(^[\\s]\\*\\/)
                                  |(^[\\s]*\\*?\\s)
                                  |(^[\\s]*)

From 24d9d18e36e3acc9ef66abe6eb2f5afeb3755849 Mon Sep 17 00:00:00 2001
From: nickl- <nick@jigsoft.co.za>
Date: Fri, 1 Jun 2012 00:07:53 +0200
Subject: [PATCH 40/61] Handle Accept headers.

Application will now conneg on Accept headers as expectied.
Also ensured that we only validate lower case values so client can send any mixture of case and it still works.
Allow xml to be presented as text/xml as well as application/xml
JSON can be requested as both application/jsot or application/javascript
---
 restler/restler.php   | 20 +++++++++++++-------
 restler/xmlformat.php |  8 ++++----
 2 files changed, 17 insertions(+), 11 deletions(-)

diff --git a/restler/restler.php b/restler/restler.php
index 26835073f..13d01c172 100644
--- a/restler/restler.php
+++ b/restler/restler.php
@@ -215,8 +215,12 @@ public function setSupportedFormats () {
 			foreach ($obj->getMIMEMap() as $extension => $mime) {
 				if(!isset($this->format_map[$extension]))
 				$this->format_map[$extension]=$class_name;
-				if(!isset($this->format_map[$mime]))
-				$this->format_map[$mime]=$class_name;
+				$mime = explode(',', $mime);
+				if (!is_array($mime)) $mime = array($mime);
+				foreach ($mime as $value) {
+				if(!isset($this->format_map[$value]))
+					$this->format_map[$value]=$class_name;
+				}
 				$extensions[".$extension"]=TRUE;
 			}
 		}
@@ -532,9 +536,10 @@ protected function getResponseFormat () {
 		}
 		//check if client has sent list of accepted data formats
 		if(isset($_SERVER['HTTP_ACCEPT'])){
-			$accepts = explode(',', $_SERVER['HTTP_ACCEPT']);
+			$accepts = explode(',', strtolower($_SERVER['HTTP_ACCEPT']));
+			if (!is_array($accepts)) $accepts = array($accepts);
 			foreach ($accepts as $accept) {
-				if($extension && isset($this->format_map[$accept])){
+				if(isset($this->format_map[$accept])){
 					$format = $this->format_map[$accept];
 					$format = is_string($format) ? new $format: $format;
 					$format->setMIME($accept);
@@ -929,20 +934,21 @@ public function __toString(){
  */
 class JsonFormat implements iFormat
 {
-	const MIME ='application/json';
+	const MIME ='application/json,application/javascript';
+	static $mime = 'application/json';
 	const EXTENSION = 'json';
 	public function getMIMEMap()
 	{
 		return array(self::EXTENSION=>self::MIME);
 	}
 	public function getMIME(){
-		return  self::MIME;
+		return  self::$mime;
 	}
 	public function getExtension(){
 		return self::EXTENSION;
 	}
 	public function setMIME($mime){
-		//do nothing
+		self::$mime = $mime;
 	}
 	public function setExtension($extension){
 		//do nothing
diff --git a/restler/xmlformat.php b/restler/xmlformat.php
index 6dea474a5..67465d651 100644
--- a/restler/xmlformat.php
+++ b/restler/xmlformat.php
@@ -20,8 +20,8 @@ class XmlFormat implements iFormat
 	 */
 	public static  $root_name='response';
 	public static  $default_tag_name='item';
-
-	const MIME ='application/xml';
+	public static  $mime = 'application/xml';
+	const MIME = 'application/xml,text/xml';
 	const EXTENSION = 'xml';
 
 	public function getMIMEMap()
@@ -29,13 +29,13 @@ public function getMIMEMap()
 		return array(self::EXTENSION=>self::MIME);
 	}
 	public function getMIME(){
-		return  self::MIME;
+		return  self::$mime;
 	}
 	public function getExtension(){
 		return self::EXTENSION;
 	}
 	public function setMIME($mime){
-		//do nothing
+		self::$mime = $mime;
 	}
 	public function setExtension($extension){
 		//do nothing

From e740546886ab73e220937915196d0a8be9f907fe Mon Sep 17 00:00:00 2001
From: nickl- <nick@jigsoft.co.za>
Date: Fri, 1 Jun 2012 02:03:52 +0200
Subject: [PATCH 41/61] Conneg based on q level.

Included functionality to properly interpret the q=level supplied with multi-part Accept headers.
---
 restler/restler.php | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/restler/restler.php b/restler/restler.php
index 13d01c172..e8d4ed083 100644
--- a/restler/restler.php
+++ b/restler/restler.php
@@ -536,10 +536,18 @@ protected function getResponseFormat () {
 		}
 		//check if client has sent list of accepted data formats
 		if(isset($_SERVER['HTTP_ACCEPT'])){
+			$acceptList = array();
 			$accepts = explode(',', strtolower($_SERVER['HTTP_ACCEPT']));
 			if (!is_array($accepts)) $accepts = array($accepts);
-			foreach ($accepts as $accept) {
-				if(isset($this->format_map[$accept])){
+			foreach ($accepts as $pos => $accept) {
+				$parts = explode(';q=', trim($accept));
+				$type = array_shift($parts);
+				$quality = array_shift($parts) ? : (1000 - $pos) / 1000;
+				$acceptList[$type] = $quality;
+			}
+			arsort($acceptList);
+			foreach ($acceptList as $accept => $quality) {
+			if(isset($this->format_map[$accept])){
 					$format = $this->format_map[$accept];
 					$format = is_string($format) ? new $format: $format;
 					$format->setMIME($accept);

From 7329dd43342b052edf1f23d13bdd71b5789ee921 Mon Sep 17 00:00:00 2001
From: nickl- <nick@jigsoft.co.za>
Date: Fri, 1 Jun 2012 02:58:03 +0200
Subject: [PATCH 42/61] RFC 2616 conneg compliance and Vary definition.

If no Accept header field is present, then it is assumed that the client accepts all media types. If an Accept header field is present, and if the server cannot send a response which is acceptable according to the combined Accept field value, then the server SHOULD send a 406 (not acceptable) response.

A Vary field value consisting of a list of field-names signals that the representation selected for the response is based on a selection algorithm which considers ONLY the listed request-header field values in selecting the most appropriate representation. A cache MAY assume that the same selection will be made for future requests with the same values for the listed field names, for the duration of time for which the response is fresh.
---
 restler/restler.php | 32 +++++++++++++++++++++++++++++---
 1 file changed, 29 insertions(+), 3 deletions(-)

diff --git a/restler/restler.php b/restler/restler.php
index e8d4ed083..458b4d2c2 100644
--- a/restler/restler.php
+++ b/restler/restler.php
@@ -552,13 +552,39 @@ protected function getResponseFormat () {
 					$format = is_string($format) ? new $format: $format;
 					$format->setMIME($accept);
 					//echo "MIME $accept";
+					header("Vary: Accept"); // Tell cache content is based ot Accept header
 					return $format;
 				}
 			}
 		}
-		$format = new $this->format_map['default'];
-		//echo "DEFAULT ".$this->format_map['default'];
-		return $format;
+		else {
+			$_SERVER['HTTP_ACCEPT'] = '*/*'; // RFC 2616: If no Accept header field is
+							 // present, then it is assumed that the
+							 // client accepts all media types.
+		}
+		if (strpos($_SERVER['HTTP_ACCEPT'], '*') !== FALSE) {
+			if (strpos($_SERVER['HTTP_ACCEPT'], 'application/*') !== FALSE) {
+				$format = new JsonFormat;
+			}
+			elseif (strpos($_SERVER['HTTP_ACCEPT'], 'text/*') !== FALSE) {
+				$format = new XmlFormat;
+			}
+			elseif (strpos($_SERVER['HTTP_ACCEPT'], '*/*') !== FALSE) {
+				$format = new $this->format_map['default'];
+			}
+		}
+		if (empty($format)) {
+			// RFC 2616: If an Accept header field is present, and if the server
+			// cannot send a response which is acceptable according to the combined
+			// Accept field value, then the server SHOULD send a 406 (not acceptable)
+			// response.
+			header('HTTP/1.1 406 Not Acceptable');
+			die('406 Not Acceptable: The server was unable to negotiate content for this request.');
+		}
+		else {
+			header("Vary: Accept"); // Tell cache content is based ot Accept header
+			return $format;
+		}
 	}
 
 	/**

From 66c7e0fd8db6c5f84bd5591727e82406a5d07d4b Mon Sep 17 00:00:00 2001
From: Nigil Lee <nigil.lee@gmail.com>
Date: Sun, 3 Jun 2012 17:04:25 -0400
Subject: [PATCH 43/61] Added a method for object which impliment
 JsonSerializable to not be auto converted to associative arrays

---
 restler/restler.php          | 5 +++--
 restler_minified/restler.php | 2 +-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/restler/restler.php b/restler/restler.php
index 458b4d2c2..d32365f7f 100644
--- a/restler/restler.php
+++ b/restler/restler.php
@@ -1228,7 +1228,8 @@ function parse_doc($php_doc_comment){
 
 /**
  * Conveniance function that converts the given object
- * in to associative array
+ * in to associative array, leaves object alone if
+ * JsonSerializable interface is detected
  * @param object $object that needs to be converted
  * @category   Framework
  * @package    restler
@@ -1240,7 +1241,7 @@ function parse_doc($php_doc_comment){
  */
 function object_to_array($object, $utf_encode=FALSE)
 {
-	if(is_array($object) || is_object($object))
+	if(is_array($object) || (is_object($object) && !($object instanceof JsonSerializable)))
 	{
 		$array = array();
 		foreach($object as $key => $value)
diff --git a/restler_minified/restler.php b/restler_minified/restler.php
index 6aa8c6379..484bcb4b8 100644
--- a/restler_minified/restler.php
+++ b/restler_minified/restler.php
@@ -3,4 +3,4 @@ class Restler { const VERSION = '2.1.7'; public $url; public $request_method; pu
                                  |(^[\\s]\\*\\/)
                                  |(^[\\s]*\\*?\\s)
                                  |(^[\\s]*)
-                                 |(^[\\t]*)/ixm", "", $php_doc_comment); $php_doc_comment = str_replace("\r", "", $php_doc_comment); $php_doc_comment = preg_replace("/([\\t])+/", "\t", $php_doc_comment); return explode("\n", $php_doc_comment); $php_doc_comment = trim(preg_replace('/\r?\n *\* */', ' ', $php_doc_comment)); return $php_doc_comment; preg_match_all('/@([a-z]+)\s+(.*?)\s*(?=$|@[a-z]+\s)/s', $php_doc_comment, $matches); return array_combine($matches[1], $matches[2]); } function object_to_array($object, $utf_encode=FALSE) { if(is_array($object) || is_object($object)) { $array = array(); foreach($object as $key => $value) { $value = object_to_array($value, $utf_encode); if($utf_encode && is_string($value)){ $value = utf8_encode($value); } $array[$key] = $value; } return $array; } return $object; } function autoload_formats($class_name) { $class_name=strtolower($class_name); $file = RESTLER_PATH."/$class_name/$class_name.php"; if (file_exists($file)) { require_once($file); } elseif (file_exists("$class_name.php")) { require_once ("$class_name.php"); } } spl_autoload_register('autoload_formats'); if(!function_exists('isRestlerCompatibilityModeEnabled')){ function isRestlerCompatibilityModeEnabled(){ return FALSE; } } define('RESTLER_PATH', dirname(__FILE__));
\ No newline at end of file
+                                 |(^[\\t]*)/ixm", "", $php_doc_comment); $php_doc_comment = str_replace("\r", "", $php_doc_comment); $php_doc_comment = preg_replace("/([\\t])+/", "\t", $php_doc_comment); return explode("\n", $php_doc_comment); $php_doc_comment = trim(preg_replace('/\r?\n *\* */', ' ', $php_doc_comment)); return $php_doc_comment; preg_match_all('/@([a-z]+)\s+(.*?)\s*(?=$|@[a-z]+\s)/s', $php_doc_comment, $matches); return array_combine($matches[1], $matches[2]); } function object_to_array($object, $utf_encode=FALSE) { if(is_array($object) || (is_object($object) && !($object instanceof JsonSerializable))){ $array = array(); foreach($object as $key => $value) { $value = object_to_array($value, $utf_encode); if($utf_encode && is_string($value)){ $value = utf8_encode($value); } $array[$key] = $value; } return $array; } return $object; } function autoload_formats($class_name) { $class_name=strtolower($class_name); $file = RESTLER_PATH."/$class_name/$class_name.php"; if (file_exists($file)) { require_once($file); } elseif (file_exists("$class_name.php")) { require_once ("$class_name.php"); } } spl_autoload_register('autoload_formats'); if(!function_exists('isRestlerCompatibilityModeEnabled')){ function isRestlerCompatibilityModeEnabled(){ return FALSE; } } define('RESTLER_PATH', dirname(__FILE__));
\ No newline at end of file

From b31ad22edba7d873a79adf75a59da02cfe006672 Mon Sep 17 00:00:00 2001
From: Luracast <arul@luracast.com>
Date: Thu, 14 Jun 2012 14:12:28 +0530
Subject: [PATCH 44/61] Fixes #50 Syntax error, unexpected ':' in
 /home/dgersh/Restler/restler/restler.php on line 545. Also updates version
 number to 2.1.8

---
 restler/restler.php          | 15 ++++++++-------
 restler_minified/restler.php |  4 ++--
 2 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/restler/restler.php b/restler/restler.php
index d32365f7f..b33ec7311 100644
--- a/restler/restler.php
+++ b/restler/restler.php
@@ -10,10 +10,10 @@
  * @copyright  2010 Luracast
  * @license    http://www.opensource.org/licenses/lgpl-license.php LGPL
  * @link       http://luracast.com/products/restler/
- * @version    2.1.7
+ * @version    2.1.8
  */
 class Restler { 
-	const VERSION = '2.1.7';
+	const VERSION = '2.1.8';
 	/**
 	 * URL of the currently mapped service
 	 * @var string
@@ -542,7 +542,7 @@ protected function getResponseFormat () {
 			foreach ($accepts as $pos => $accept) {
 				$parts = explode(';q=', trim($accept));
 				$type = array_shift($parts);
-				$quality = array_shift($parts) ? : (1000 - $pos) / 1000;
+				$quality = count($parts) ? floatval(array_shift($parts)) : (1000 - $pos) / 1000;
 				$acceptList[$type] = $quality;
 			}
 			arsort($acceptList);
@@ -552,15 +552,16 @@ protected function getResponseFormat () {
 					$format = is_string($format) ? new $format: $format;
 					$format->setMIME($accept);
 					//echo "MIME $accept";
-					header("Vary: Accept"); // Tell cache content is based ot Accept header
+					header("Vary: Accept"); // Tell cache content is based on Accept header
 					return $format;
 				}
 			}
 		}
 		else {
-			$_SERVER['HTTP_ACCEPT'] = '*/*'; // RFC 2616: If no Accept header field is
-							 // present, then it is assumed that the
-							 // client accepts all media types.
+			// RFC 2616: If no Accept header field is
+			// present, then it is assumed that the
+			// client accepts all media types.
+			$_SERVER['HTTP_ACCEPT'] = '*/*'; 
 		}
 		if (strpos($_SERVER['HTTP_ACCEPT'], '*') !== FALSE) {
 			if (strpos($_SERVER['HTTP_ACCEPT'], 'application/*') !== FALSE) {
diff --git a/restler_minified/restler.php b/restler_minified/restler.php
index 484bcb4b8..9ea4cc72f 100644
--- a/restler_minified/restler.php
+++ b/restler_minified/restler.php
@@ -1,6 +1,6 @@
 <?php
- class Restler { const VERSION = '2.1.7'; public $url; public $request_method; public $request_format; public $request_data=array(); public $cache_dir; public $base_dir; public $response = 'DefaultResponse'; public $response_format; protected $production_mode; protected $routes= array(); protected $format_map = array(); protected $service_class_instance; protected $service_method; protected $auth_classes = array(); protected $error_classes = array(); private $codes = array( 100 => 'Continue', 101 => 'Switching Protocols', 200 => 'OK', 201 => 'Created', 202 => 'Accepted', 203 => 'Non-Authoritative Information', 204 => 'No Content', 205 => 'Reset Content', 206 => 'Partial Content', 300 => 'Multiple Choices', 301 => 'Moved Permanently', 302 => 'Found', 303 => 'See Other', 304 => 'Not Modified', 305 => 'Use Proxy', 306 => '(Unused)', 307 => 'Temporary Redirect', 400 => 'Bad Request', 401 => 'Unauthorized', 402 => 'Payment Required', 403 => 'Forbidden', 404 => 'Not Found', 405 => 'Method Not Allowed', 406 => 'Not Acceptable', 407 => 'Proxy Authentication Required', 408 => 'Request Timeout', 409 => 'Conflict', 410 => 'Gone', 411 => 'Length Required', 412 => 'Precondition Failed', 413 => 'Request Entity Too Large', 414 => 'Request-URI Too Long', 415 => 'Unsupported Media Type', 416 => 'Requested Range Not Satisfiable', 417 => 'Expectation Failed', 500 => 'Internal Server Error', 501 => 'Not Implemented', 502 => 'Bad Gateway', 503 => 'Service Unavailable', 504 => 'Gateway Timeout', 505 => 'HTTP Version Not Supported' ); protected $cached; public function __construct ($production_mode = FALSE) { $this->production_mode = $production_mode; $this->cache_dir = getcwd(); $this->base_dir = RESTLER_PATH; } public function __destruct () { if ($this->production_mode && !$this->cached) { $this->saveCache(); } } public function refreshCache () { $this->routes = array(); $this->cached = FALSE; } public function setSupportedFormats () { $args = func_get_args(); $extensions = array(); foreach ($args as $class_name) { if(!is_string($class_name) || !class_exists($class_name)){ throw new Exception("$class_name is not a vaild Format Class."); } $obj = new $class_name; if(! $obj instanceof iFormat){ throw new Exception('Invalid format class; must implement '. 'iFormat interface'); } foreach ($obj->getMIMEMap() as $extension => $mime) { if(!isset($this->format_map[$extension])) $this->format_map[$extension]=$class_name; if(!isset($this->format_map[$mime])) $this->format_map[$mime]=$class_name; $extensions[".$extension"]=TRUE; } } $this->format_map['default']=$args[0]; $this->format_map['extensions']=array_keys($extensions); } public function addAPIClass($class_name, $base_path = NULL) { if(!class_exists($class_name)){ throw new Exception("API class $class_name is missing."); } $this->loadCache(); if(!$this->cached){ if(is_null($base_path)){ $base_path=strtolower($class_name); $index = strrpos($class_name, '\\'); if($index!==FALSE){ $base_path=substr($base_path, $index+1); } }else $base_path = trim($base_path,'/'); if(strlen($base_path)>0)$base_path .= '/'; $this->generateMap($class_name, $base_path); } } public function addAuthenticationClass ($class_name, $base_path = NULL) { $this->auth_classes[] = $class_name; $this->addAPIClass($class_name, $base_path); } public function addErrorClass ($class_name) { $this->error_classes[] = $class_name; } public function handleError ($status_code, $error_message = NULL) { $method = "handle$status_code"; $handled = FALSE; foreach ($this->error_classes as $class_name) { if (method_exists($class_name, $method)) { $obj = new $class_name(); $obj->restler = $this; $obj->$method(); $handled = TRUE; } } if($handled)return; $message = $this->codes[$status_code] . (!$error_message ? '' : ': ' . $error_message); $this->setStatus($status_code); $responder = new $this->response(); $responder->restler = $this; $this->sendData($responder->__formatError($status_code, $message)); } public function handle () { if(empty($this->format_map))$this->setSupportedFormats('JsonFormat'); $this->url = strtolower($this->getPath()); $this->request_method = $this->getRequestMethod(); $this->response_format = $this->getResponseFormat(); $this->request_format = $this->getRequestFormat(); if(is_null($this->request_format)){ $this->request_format = $this->response_format; } if($this->request_method == 'PUT' || $this->request_method == 'POST'){ $this->request_data = $this->getRequestData(); } $o = $this->mapUrlToMethod(); if(!isset($o->class_name)){ $this->handleError(404); }else{ try { if($o->method_flag){ $auth_method = '__isAuthenticated'; if(!count($this->auth_classes))throw new RestException(401); foreach ($this->auth_classes as $auth_class) { $auth_obj = new $auth_class(); $auth_obj->restler=$this; $this->applyClassMetadata($auth_class, $auth_obj, $o); if (!method_exists($auth_obj, $auth_method)) { throw new RestException(401, 'Authentication Class '. 'should implement iAuthenticate'); }elseif(!$auth_obj->$auth_method()){ throw new RestException(401); } } } $this->applyClassMetadata(get_class($this->request_format), $this->request_format, $o); $pre_process = '_'.$this->request_format->getExtension().'_'. $o->method_name; $this->service_method = $o->method_name; if($o->method_flag==2)$o=unprotect($o); $object = $this->service_class_instance = new $o->class_name(); $object->restler=$this; if(method_exists($o->class_name, $pre_process)) { call_user_func_array(array($object, $pre_process), $o->arguments); } switch ($o->method_flag) { case 3: $reflection_method = new ReflectionMethod($object, $o->method_name); $reflection_method->setAccessible(TRUE); $result = $reflection_method->invokeArgs($object, $o->arguments); break; case 2: case 1: default: $result = call_user_func_array(array($object, $o->method_name), $o->arguments); } } catch (RestException $e) { $this->handleError($e->getCode(), $e->getMessage()); } } $responder = new $this->response(); $responder->restler = $this; $this->applyClassMetadata($this->response, $responder, $o); if (isset($result) && $result !== NULL) { $result = $responder->__formatResponse($result); $this->sendData($result); } } public function sendData($data) { $data = $this->response_format->encode($data, !$this->production_mode); $post_process = '_'.$this->service_method .'_'. $this->response_format->getExtension(); if(isset($this->service_class_instance) && method_exists($this->service_class_instance,$post_process)){ $data = call_user_func(array($this->service_class_instance, $post_process), $data); } header("Cache-Control: no-cache, must-revalidate"); header("Expires: 0"); header('Content-Type: ' . $this->response_format->getMIME()); header("X-Powered-By: Luracast Restler v".Restler::VERSION); die($data); } public function setStatus($code) { header("{$_SERVER['SERVER_PROTOCOL']} $code ". $this->codes[strval($code)]); } public function removeCommonPath($first, $second, $char='/'){ $first = explode($char, $first); $second = explode($char, $second); while (count($second)){ if($first[0]==$second[0]){ array_shift($first); } else break; array_shift($second); } return implode($char, $first); } public function saveCache() { $file = $this->cache_dir . '/routes.php'; $s = '$o=array();'.PHP_EOL; foreach ($this->routes as $key => $value) { $s .= PHP_EOL.PHP_EOL.PHP_EOL."############### $key ###############" .PHP_EOL.PHP_EOL; $s .= '$o[\''.$key.'\']=array();'; foreach ($value as $ke => $va) { $s .= PHP_EOL.PHP_EOL."#==== $key $ke".PHP_EOL.PHP_EOL; $s .= '$o[\''.$key.'\'][\''.$ke.'\']='.str_replace(PHP_EOL, PHP_EOL."\t", var_export($va, TRUE)).';'; } } $s .= PHP_EOL.'return $o;'; $r=@file_put_contents($file, "<?php $s"); @chmod($file, 0777); if($r===FALSE)throw new Exception( "The cache directory located at '$this->cache_dir' needs to have ". "the permissions set to read/write/execute for everyone in order ". "to save cache and improve performance."); } protected function getPath () { $path = urldecode($this->removeCommonPath($_SERVER['REQUEST_URI'], $_SERVER['SCRIPT_NAME'])); $path = preg_replace('/(\/*\?.*$)|(\/$)/', '', $path); $path = str_replace($this->format_map['extensions'], '', $path); return $path; } protected function getRequestMethod () { $method = $_SERVER['REQUEST_METHOD']; if (isset($_SERVER['HTTP_X_HTTP_METHOD_OVERRIDE'])){ $method = $_SERVER['HTTP_X_HTTP_METHOD_OVERRIDE']; } if($method=='HEAD')$method='GET'; return $method; } protected function getRequestFormat () { $format=NULL; if(isset($_SERVER['CONTENT_TYPE'])){ $mime = explode(';', $_SERVER['CONTENT_TYPE']); $mime = $mime[0]; if($mime==UrlEncodedFormat::MIME){ $format = new UrlEncodedFormat(); }else{ if(isset($this->format_map[$mime])){ $format = $this->format_map[$mime]; $format = is_string($format) ? new $format: $format; $format->setMIME($mime); } } } return $format; } protected function getResponseFormat () { $format=NULL; $extensions = explode('.', parse_url($_SERVER['REQUEST_URI'], PHP_URL_PATH)); while($extensions){ $extension = array_pop($extensions); $extension = explode('/', $extension); $extension = array_shift($extension); if($extension && isset($this->format_map[$extension])){ $format = $this->format_map[$extension]; $format = is_string($format) ? new $format: $format; $format->setExtension($extension); return $format; } } if(isset($_SERVER['HTTP_ACCEPT'])){ $accepts = explode(',', $_SERVER['HTTP_ACCEPT']); foreach ($accepts as $accept) { if($extension && isset($this->format_map[$accept])){ $format = $this->format_map[$accept]; $format = is_string($format) ? new $format: $format; $format->setMIME($accept); return $format; } } } $format = new $this->format_map['default']; return $format; } protected function getRequestData() { try{ $r = file_get_contents('php://input'); if(is_null($r))return $_GET; $r =$this->request_format->decode($r); return is_null($r) ? array(): $r; } catch (RestException $e) { $this->handleError($e->getCode(), $e->getMessage()); } } protected function mapUrlToMethod () { if(!isset($this->routes[$this->request_method])){ return array(); } $urls = $this->routes[$this->request_method]; if(!$urls)return array(); $found = FALSE; $this->request_data += $_GET; $params = array('request_data'=>$this->request_data); $params += $this->request_data; foreach ($urls as $url => $call) { $call = (object)$call; if(strstr($url, ':')){ $regex = preg_replace('/\\\:([^\/]+)/', '(?P<$1>[^/]+)', preg_quote($url)); if (preg_match(":^$regex$:", $this->url, $matches)) { foreach ($matches as $arg => $match) { if (isset($call->arguments[$arg])){ $params[$arg] = $match; } } $found = TRUE; break; } }elseif ($url == $this->url){ $found = TRUE; break; } } if($found){ $p = $call->defaults; foreach ($call->arguments as $key => $value) { if(isset($params[$key]))$p[$value] = $params[$key]; } $call->arguments=$p; return $call; } } protected function applyClassMetadata($class_name, $instance, $method_info){ if(isset($method_info->metadata[$class_name]) && is_array($method_info->metadata[$class_name])){ foreach ($method_info->metadata[$class_name] as $property => $value){ if(property_exists($class_name, $property)){ $reflection_property = new ReflectionProperty($class_name, $property); $reflection_property->setValue($instance, $value); } } } } protected function loadCache() { if ($this->cached !== NULL) { return; } $file = $this->cache_dir . '/routes.php'; $this->cached = FALSE; if ($this->production_mode) { if (file_exists($file)) { $routes = include($file); } if (isset($routes) && is_array($routes)) { $this->routes = $routes; $this->cached = TRUE; } } else { } } protected function generateMap ($class_name, $base_path = '') { $reflection = new ReflectionClass($class_name); $class_metadata = parse_doc($reflection->getDocComment()); $methods = $reflection->getMethods( ReflectionMethod::IS_PUBLIC + ReflectionMethod::IS_PROTECTED); foreach ($methods as $method) { $doc = $method->getDocComment(); $arguments = array(); $defaults = array(); $metadata = $class_metadata+parse_doc($doc); $params = $method->getParameters(); $position=0; foreach ($params as $param){ $arguments[$param->getName()] = $position; $defaults[$position] = $param->isDefaultValueAvailable() ? $param->getDefaultValue() : NULL; $position++; } $method_flag = $method->isProtected() ? (isRestlerCompatibilityModeEnabled() ? 2 : 3) : (isset($metadata['protected']) ? 1 : 0); $call = array( 'class_name'=>$class_name, 'method_name'=>$method->getName(), 'arguments'=>$arguments, 'defaults'=>$defaults, 'metadata'=>$metadata, 'method_flag'=>$method_flag ); $method_url = strtolower($method->getName()); if (preg_match_all( '/@url\s+(GET|POST|PUT|DELETE|HEAD|OPTIONS)[ \t]*\/?(\S*)/s', $doc, $matches, PREG_SET_ORDER)) { foreach ($matches as $match) { $http_method = $match[1]; $url = rtrim($base_path . $match[2],'/'); $this->routes[$http_method][$url] = $call; } }elseif($method_url[0] != '_'){ if (preg_match_all('/^(GET|POST|PUT|DELETE|HEAD|OPTIONS)/i', $method_url, $matches)) { $http_method = strtoupper($matches[0][0]); $method_url = substr($method_url, strlen($http_method)); }else{ $http_method = 'GET'; } $url = $base_path. ($method_url=='index' || $method_url=='default' ? '' : $method_url); $url = rtrim($url,'/'); $this->routes[$http_method][$url] = $call; foreach ($params as $param){ if($param->getName()=='request_data'){ break; } $url .= $url=='' ? ':' : '/:'; $url .= $param->getName(); $this->routes[$http_method][$url] = $call; } } } } } if(version_compare(PHP_VERSION, '5.3.0') < 0){ require_once 'compat.php'; } class RestException extends Exception { public function __construct($http_status_code, $error_message = NULL) { parent::__construct($error_message, $http_status_code); } } interface iRespond { public function __formatResponse($result); public function __formatError($status_code, $message); } class DefaultResponse implements iRespond { function __formatResponse($result) { return $result; } function __formatError($statusCode, $message) { return array('error' => array('code' => $statusCode, 'message' => $message)); } } interface iAuthenticate { public function __isAuthenticated(); } interface iFormat { public function getMIMEMap(); public function setMIME($mime); public function getMIME(); public function setExtension($extension); public function getExtension(); public function encode($data, $human_readable=FALSE); public function decode($data); } class UrlEncodedFormat implements iFormat { const MIME = 'application/x-www-form-urlencoded'; const EXTENSION = 'post'; public function getMIMEMap() { return array(self::EXTENSION=>self::MIME); } public function getMIME(){ return self::MIME; } public function getExtension(){ return self::EXTENSION; } public function setMIME($mime){ } public function setExtension($extension){ } public function encode($data, $human_readable=FALSE){ return http_build_query($data); } public function decode($data){ parse_str($data,$r); return $r; } public function __toString(){ return $this->getExtension(); } } class JsonFormat implements iFormat { const MIME ='application/json'; const EXTENSION = 'json'; public function getMIMEMap() { return array(self::EXTENSION=>self::MIME); } public function getMIME(){ return self::MIME; } public function getExtension(){ return self::EXTENSION; } public function setMIME($mime){ } public function setExtension($extension){ } public function encode($data, $human_readable=FALSE){ return $human_readable ? $this->json_format(json_encode(object_to_array($data))) : json_encode(object_to_array($data)); } public function decode($data) { $decoded = json_decode ( $data ); if (function_exists ( 'json_last_error' )) { $message = ''; switch (json_last_error ()) { case JSON_ERROR_NONE : return object_to_array ( $decoded ); break; case JSON_ERROR_DEPTH : $message = 'maximum stack depth exceeded'; break; case JSON_ERROR_STATE_MISMATCH : $message = 'underflow or the modes mismatch'; break; case JSON_ERROR_CTRL_CHAR : $message = 'unexpected control character found'; break; case JSON_ERROR_SYNTAX : $message = 'malformed JSON'; break; case JSON_ERROR_UTF8 : $message = 'malformed UTF-8 characters, possibly incorrectly encoded'; break; default : $message = 'unknown error'; break; } throw new RestException ( 400, 'Error parsing JSON, ' . $message ); } else if (strlen ( $data ) && $decoded === NULL || $decoded === $data) { throw new RestException ( 400, 'Error parsing JSON' ); } return object_to_array ( $decoded ); } private function json_format($json) { $tab = "  "; $new_json = ""; $indent_level = 0; $in_string = FALSE; $len = strlen($json); for($c = 0; $c < $len; $c++) { $char = $json[$c]; switch($char) { case '{': case '[': if(!$in_string) { $new_json .= $char . "\n" . str_repeat($tab, $indent_level+1); $indent_level++; } else { $new_json .= $char; } break; case '}': case ']': if(!$in_string) { $indent_level--; $new_json .= "\n".str_repeat($tab, $indent_level).$char; } else { $new_json .= $char; } break; case ',': if(!$in_string) { $new_json .= ",\n" . str_repeat($tab, $indent_level); } else { $new_json .= $char; } break; case ':': if(!$in_string) { $new_json .= ": "; } else { $new_json .= $char; } break; case '"': if($c==0){ $in_string = TRUE; }elseif($c > 0 && $json[$c-1] != '\\') { $in_string = !$in_string; } default: $new_json .= $char; break; } } return $new_json; } public function __toString(){ return $this->getExtension(); } } class DocParser { private $params=array(); function parse($doc='') { if($doc==''){ return $this->params; } if(preg_match('#^/\*\*(.*)\*/#s', $doc, $comment) === false) return $this->params; $comment = trim($comment[1]); if(preg_match_all('#^\s*\*(.*)#m', $comment, $lines) === false) return $this->params; $this->parseLines($lines[1]); return $this->params; } private function parseLines($lines) { foreach($lines as $line) { $parsedLine = $this->parseLine($line); if($parsedLine === false && !isset($this->params['description'])) { if(isset($desc)){ $this->params['description'] = implode(PHP_EOL, $desc); } $desc = array(); } elseif($parsedLine !== false) { $desc[] = $parsedLine; } } $desc = implode(' ', $desc); if(!empty($desc))$this->params['long_description'] = $desc; } private function parseLine($line) { $line = trim($line); if(empty($line)) return false; if(strpos($line, '@') === 0) { if(strpos($line, ' ')>0){ $param = substr($line, 1, strpos($line, ' ') - 1); $value = substr($line, strlen($param) + 2); }else{ $param = substr($line, 1); $value = ''; } if($this->setParam($param, $value)) return false; } return $line; } private function setParam($param, $value) { if($param == 'param' || $param == 'return') $value = $this->formatParamOrReturn($value); if($param == 'class') list($param, $value) = $this->formatClass($value); if(empty($this->params[$param])) { $this->params[$param] = $value; } else if($param == 'param'){ $arr = array($this->params[$param], $value); $this->params[$param] = $arr; } else { $this->params[$param] = $value + $this->params[$param]; } return true; } private function formatClass($value) { $r = preg_split("[\(|\)]", $value); if(count($r)>1){ $param = $r[0]; parse_str($r[1],$value); foreach ($value as $key => $val) { $val = explode(',', $val); if(count($val)>1)$value[$key]=$val; } }else{ $param='Unknown'; } return array($param, $value); } private function formatParamOrReturn($string) { $pos = strpos($string, ' '); $type = substr($string, 0, $pos); return '(' . $type . ')' . substr($string, $pos+1); } } function parse_doc($php_doc_comment){ $p = new DocParser(); return $p->parse($php_doc_comment); $p = new Parser($php_doc_comment); return $p; $php_doc_comment = preg_replace("/(^[\\s]*\\/\\*\\*)
+ class Restler { const VERSION = '2.1.8'; public $url; public $request_method; public $request_format; public $request_data=array(); public $cache_dir; public $base_dir; public $response = 'DefaultResponse'; public $response_format; protected $production_mode; protected $routes= array(); protected $format_map = array(); protected $service_class_instance; protected $service_method; protected $auth_classes = array(); protected $error_classes = array(); private $codes = array( 100 => 'Continue', 101 => 'Switching Protocols', 200 => 'OK', 201 => 'Created', 202 => 'Accepted', 203 => 'Non-Authoritative Information', 204 => 'No Content', 205 => 'Reset Content', 206 => 'Partial Content', 300 => 'Multiple Choices', 301 => 'Moved Permanently', 302 => 'Found', 303 => 'See Other', 304 => 'Not Modified', 305 => 'Use Proxy', 306 => '(Unused)', 307 => 'Temporary Redirect', 400 => 'Bad Request', 401 => 'Unauthorized', 402 => 'Payment Required', 403 => 'Forbidden', 404 => 'Not Found', 405 => 'Method Not Allowed', 406 => 'Not Acceptable', 407 => 'Proxy Authentication Required', 408 => 'Request Timeout', 409 => 'Conflict', 410 => 'Gone', 411 => 'Length Required', 412 => 'Precondition Failed', 413 => 'Request Entity Too Large', 414 => 'Request-URI Too Long', 415 => 'Unsupported Media Type', 416 => 'Requested Range Not Satisfiable', 417 => 'Expectation Failed', 500 => 'Internal Server Error', 501 => 'Not Implemented', 502 => 'Bad Gateway', 503 => 'Service Unavailable', 504 => 'Gateway Timeout', 505 => 'HTTP Version Not Supported' ); protected $cached; public function __construct ($production_mode = FALSE) { $this->production_mode = $production_mode; $this->cache_dir = getcwd(); $this->base_dir = RESTLER_PATH; } public function __destruct () { if ($this->production_mode && !$this->cached) { $this->saveCache(); } } public function refreshCache () { $this->routes = array(); $this->cached = FALSE; } public function setSupportedFormats () { $args = func_get_args(); $extensions = array(); foreach ($args as $class_name) { if(!is_string($class_name) || !class_exists($class_name)){ throw new Exception("$class_name is not a vaild Format Class."); } $obj = new $class_name; if(! $obj instanceof iFormat){ throw new Exception('Invalid format class; must implement '. 'iFormat interface'); } foreach ($obj->getMIMEMap() as $extension => $mime) { if(!isset($this->format_map[$extension])) $this->format_map[$extension]=$class_name; $mime = explode(',', $mime); if (!is_array($mime)) $mime = array($mime); foreach ($mime as $value) { if(!isset($this->format_map[$value])) $this->format_map[$value]=$class_name; } $extensions[".$extension"]=TRUE; } } $this->format_map['default']=$args[0]; $this->format_map['extensions']=array_keys($extensions); } public function addAPIClass($class_name, $base_path = NULL) { if(!class_exists($class_name)){ throw new Exception("API class $class_name is missing."); } $this->loadCache(); if(!$this->cached){ if(is_null($base_path)){ $base_path=strtolower($class_name); $index = strrpos($class_name, '\\'); if($index!==FALSE){ $base_path=substr($base_path, $index+1); } }else $base_path = trim($base_path,'/'); if(strlen($base_path)>0)$base_path .= '/'; $this->generateMap($class_name, $base_path); } } public function addAuthenticationClass ($class_name, $base_path = NULL) { $this->auth_classes[] = $class_name; $this->addAPIClass($class_name, $base_path); } public function addErrorClass ($class_name) { $this->error_classes[] = $class_name; } public function handleError ($status_code, $error_message = NULL) { $method = "handle$status_code"; $handled = FALSE; foreach ($this->error_classes as $class_name) { if (method_exists($class_name, $method)) { $obj = new $class_name(); $obj->restler = $this; $obj->$method(); $handled = TRUE; } } if($handled)return; $message = $this->codes[$status_code] . (!$error_message ? '' : ': ' . $error_message); $this->setStatus($status_code); $responder = new $this->response(); $responder->restler = $this; $this->sendData($responder->__formatError($status_code, $message)); } public function handle () { if(empty($this->format_map))$this->setSupportedFormats('JsonFormat'); $this->url = strtolower($this->getPath()); $this->request_method = $this->getRequestMethod(); $this->response_format = $this->getResponseFormat(); $this->request_format = $this->getRequestFormat(); if(is_null($this->request_format)){ $this->request_format = $this->response_format; } if($this->request_method == 'PUT' || $this->request_method == 'POST'){ $this->request_data = $this->getRequestData(); } $o = $this->mapUrlToMethod(); if(!isset($o->class_name)){ $this->handleError(404); }else{ try { if($o->method_flag){ $auth_method = '__isAuthenticated'; if(!count($this->auth_classes))throw new RestException(401); foreach ($this->auth_classes as $auth_class) { $auth_obj = new $auth_class(); $auth_obj->restler=$this; $this->applyClassMetadata($auth_class, $auth_obj, $o); if (!method_exists($auth_obj, $auth_method)) { throw new RestException(401, 'Authentication Class '. 'should implement iAuthenticate'); }elseif(!$auth_obj->$auth_method()){ throw new RestException(401); } } } $this->applyClassMetadata(get_class($this->request_format), $this->request_format, $o); $pre_process = '_'.$this->request_format->getExtension().'_'. $o->method_name; $this->service_method = $o->method_name; if($o->method_flag==2)$o=unprotect($o); $object = $this->service_class_instance = new $o->class_name(); $object->restler=$this; if(method_exists($o->class_name, $pre_process)) { call_user_func_array(array($object, $pre_process), $o->arguments); } switch ($o->method_flag) { case 3: $reflection_method = new ReflectionMethod($object, $o->method_name); $reflection_method->setAccessible(TRUE); $result = $reflection_method->invokeArgs($object, $o->arguments); break; case 2: case 1: default: $result = call_user_func_array(array($object, $o->method_name), $o->arguments); } } catch (RestException $e) { $this->handleError($e->getCode(), $e->getMessage()); } } $responder = new $this->response(); $responder->restler = $this; $this->applyClassMetadata($this->response, $responder, $o); if (isset($result) && $result !== NULL) { $result = $responder->__formatResponse($result); $this->sendData($result); } } public function sendData($data) { $data = $this->response_format->encode($data, !$this->production_mode); $post_process = '_'.$this->service_method .'_'. $this->response_format->getExtension(); if(isset($this->service_class_instance) && method_exists($this->service_class_instance,$post_process)){ $data = call_user_func(array($this->service_class_instance, $post_process), $data); } header("Cache-Control: no-cache, must-revalidate"); header("Expires: 0"); header('Content-Type: ' . $this->response_format->getMIME()); header("X-Powered-By: Luracast Restler v".Restler::VERSION); die($data); } public function setStatus($code) { header("{$_SERVER['SERVER_PROTOCOL']} $code ". $this->codes[strval($code)]); } public function removeCommonPath($first, $second, $char='/'){ $first = explode($char, $first); $second = explode($char, $second); while (count($second)){ if($first[0]==$second[0]){ array_shift($first); } else break; array_shift($second); } return implode($char, $first); } public function saveCache() { $file = $this->cache_dir . '/routes.php'; $s = '$o=array();'.PHP_EOL; foreach ($this->routes as $key => $value) { $s .= PHP_EOL.PHP_EOL.PHP_EOL."############### $key ###############" .PHP_EOL.PHP_EOL; $s .= '$o[\''.$key.'\']=array();'; foreach ($value as $ke => $va) { $s .= PHP_EOL.PHP_EOL."#==== $key $ke".PHP_EOL.PHP_EOL; $s .= '$o[\''.$key.'\'][\''.$ke.'\']='.str_replace(PHP_EOL, PHP_EOL."\t", var_export($va, TRUE)).';'; } } $s .= PHP_EOL.'return $o;'; $r=@file_put_contents($file, "<?php $s"); @chmod($file, 0777); if($r===FALSE)throw new Exception( "The cache directory located at '$this->cache_dir' needs to have ". "the permissions set to read/write/execute for everyone in order ". "to save cache and improve performance."); } protected function getPath () { $path = urldecode($this->removeCommonPath($_SERVER['REQUEST_URI'], $_SERVER['SCRIPT_NAME'])); $path = preg_replace('/(\/*\?.*$)|(\/$)/', '', $path); $path = str_replace($this->format_map['extensions'], '', $path); return $path; } protected function getRequestMethod () { $method = $_SERVER['REQUEST_METHOD']; if (isset($_SERVER['HTTP_X_HTTP_METHOD_OVERRIDE'])){ $method = $_SERVER['HTTP_X_HTTP_METHOD_OVERRIDE']; } if($method=='HEAD')$method='GET'; return $method; } protected function getRequestFormat () { $format=NULL; if(isset($_SERVER['CONTENT_TYPE'])){ $mime = explode(';', $_SERVER['CONTENT_TYPE']); $mime = $mime[0]; if($mime==UrlEncodedFormat::MIME){ $format = new UrlEncodedFormat(); }else{ if(isset($this->format_map[$mime])){ $format = $this->format_map[$mime]; $format = is_string($format) ? new $format: $format; $format->setMIME($mime); } } } return $format; } protected function getResponseFormat () { $format=NULL; $extensions = explode('.', parse_url($_SERVER['REQUEST_URI'], PHP_URL_PATH)); while($extensions){ $extension = array_pop($extensions); $extension = explode('/', $extension); $extension = array_shift($extension); if($extension && isset($this->format_map[$extension])){ $format = $this->format_map[$extension]; $format = is_string($format) ? new $format: $format; $format->setExtension($extension); return $format; } } if(isset($_SERVER['HTTP_ACCEPT'])){ $acceptList = array(); $accepts = explode(',', strtolower($_SERVER['HTTP_ACCEPT'])); if (!is_array($accepts)) $accepts = array($accepts); foreach ($accepts as $pos => $accept) { $parts = explode(';q=', trim($accept)); $type = array_shift($parts); $quality = count($parts) ? floatval(array_shift($parts)) : (1000 - $pos) / 1000; $acceptList[$type] = $quality; } arsort($acceptList); foreach ($acceptList as $accept => $quality) { if(isset($this->format_map[$accept])){ $format = $this->format_map[$accept]; $format = is_string($format) ? new $format: $format; $format->setMIME($accept); header("Vary: Accept"); return $format; } } } else { $_SERVER['HTTP_ACCEPT'] = '*/*'; } if (strpos($_SERVER['HTTP_ACCEPT'], '*') !== FALSE) { if (strpos($_SERVER['HTTP_ACCEPT'], 'application/*') !== FALSE) { $format = new JsonFormat; } elseif (strpos($_SERVER['HTTP_ACCEPT'], 'text/*') !== FALSE) { $format = new XmlFormat; } elseif (strpos($_SERVER['HTTP_ACCEPT'], '*/*') !== FALSE) { $format = new $this->format_map['default']; } } if (empty($format)) { header('HTTP/1.1 406 Not Acceptable'); die('406 Not Acceptable: The server was unable to negotiate content for this request.'); } else { header("Vary: Accept"); return $format; } } protected function getRequestData() { try{ $r = file_get_contents('php://input'); if(is_null($r))return $_GET; $r =$this->request_format->decode($r); return is_null($r) ? array(): $r; } catch (RestException $e) { $this->handleError($e->getCode(), $e->getMessage()); } } protected function mapUrlToMethod () { if(!isset($this->routes[$this->request_method])){ return array(); } $urls = $this->routes[$this->request_method]; if(!$urls)return array(); $found = FALSE; $this->request_data += $_GET; $params = array('request_data'=>$this->request_data); $params += $this->request_data; foreach ($urls as $url => $call) { $call = (object)$call; if(strstr($url, ':')){ $regex = preg_replace('/\\\:([^\/]+)/', '(?P<$1>[^/]+)', preg_quote($url)); if (preg_match(":^$regex$:", $this->url, $matches)) { foreach ($matches as $arg => $match) { if (isset($call->arguments[$arg])){ $params[$arg] = $match; } } $found = TRUE; break; } }elseif ($url == $this->url){ $found = TRUE; break; } } if($found){ $p = $call->defaults; foreach ($call->arguments as $key => $value) { if(isset($params[$key]))$p[$value] = $params[$key]; } $call->arguments=$p; return $call; } } protected function applyClassMetadata($class_name, $instance, $method_info){ if(isset($method_info->metadata[$class_name]) && is_array($method_info->metadata[$class_name])){ foreach ($method_info->metadata[$class_name] as $property => $value){ if(property_exists($class_name, $property)){ $reflection_property = new ReflectionProperty($class_name, $property); $reflection_property->setValue($instance, $value); } } } } protected function loadCache() { if ($this->cached !== NULL) { return; } $file = $this->cache_dir . '/routes.php'; $this->cached = FALSE; if ($this->production_mode) { if (file_exists($file)) { $routes = include($file); } if (isset($routes) && is_array($routes)) { $this->routes = $routes; $this->cached = TRUE; } } else { } } protected function generateMap ($class_name, $base_path = '') { $reflection = new ReflectionClass($class_name); $class_metadata = parse_doc($reflection->getDocComment()); $methods = $reflection->getMethods( ReflectionMethod::IS_PUBLIC + ReflectionMethod::IS_PROTECTED); foreach ($methods as $method) { $doc = $method->getDocComment(); $arguments = array(); $defaults = array(); $metadata = $class_metadata+parse_doc($doc); $params = $method->getParameters(); $position=0; foreach ($params as $param){ $arguments[$param->getName()] = $position; $defaults[$position] = $param->isDefaultValueAvailable() ? $param->getDefaultValue() : NULL; $position++; } $method_flag = $method->isProtected() ? (isRestlerCompatibilityModeEnabled() ? 2 : 3) : (isset($metadata['protected']) ? 1 : 0); $call = array( 'class_name'=>$class_name, 'method_name'=>$method->getName(), 'arguments'=>$arguments, 'defaults'=>$defaults, 'metadata'=>$metadata, 'method_flag'=>$method_flag ); $method_url = strtolower($method->getName()); if (preg_match_all( '/@url\s+(GET|POST|PUT|DELETE|HEAD|OPTIONS)[ \t]*\/?(\S*)/s', $doc, $matches, PREG_SET_ORDER)) { foreach ($matches as $match) { $http_method = $match[1]; $url = rtrim($base_path . $match[2],'/'); $this->routes[$http_method][$url] = $call; } }elseif($method_url[0] != '_'){ if (preg_match_all('/^(GET|POST|PUT|DELETE|HEAD|OPTIONS)/i', $method_url, $matches)) { $http_method = strtoupper($matches[0][0]); $method_url = substr($method_url, strlen($http_method)); }else{ $http_method = 'GET'; } $url = $base_path. ($method_url=='index' || $method_url=='default' ? '' : $method_url); $url = rtrim($url,'/'); $this->routes[$http_method][$url] = $call; foreach ($params as $param){ if($param->getName()=='request_data'){ break; } $url .= $url=='' ? ':' : '/:'; $url .= $param->getName(); $this->routes[$http_method][$url] = $call; } } } } } if(version_compare(PHP_VERSION, '5.3.0') < 0){ require_once 'compat.php'; } class RestException extends Exception { public function __construct($http_status_code, $error_message = NULL) { parent::__construct($error_message, $http_status_code); } } interface iRespond { public function __formatResponse($result); public function __formatError($status_code, $message); } class DefaultResponse implements iRespond { function __formatResponse($result) { return $result; } function __formatError($statusCode, $message) { return array('error' => array('code' => $statusCode, 'message' => $message)); } } interface iAuthenticate { public function __isAuthenticated(); } interface iFormat { public function getMIMEMap(); public function setMIME($mime); public function getMIME(); public function setExtension($extension); public function getExtension(); public function encode($data, $human_readable=FALSE); public function decode($data); } class UrlEncodedFormat implements iFormat { const MIME = 'application/x-www-form-urlencoded'; const EXTENSION = 'post'; public function getMIMEMap() { return array(self::EXTENSION=>self::MIME); } public function getMIME(){ return self::MIME; } public function getExtension(){ return self::EXTENSION; } public function setMIME($mime){ } public function setExtension($extension){ } public function encode($data, $human_readable=FALSE){ return http_build_query($data); } public function decode($data){ parse_str($data,$r); return $r; } public function __toString(){ return $this->getExtension(); } } class JsonFormat implements iFormat { const MIME ='application/json,application/javascript'; static $mime = 'application/json'; const EXTENSION = 'json'; public function getMIMEMap() { return array(self::EXTENSION=>self::MIME); } public function getMIME(){ return self::$mime; } public function getExtension(){ return self::EXTENSION; } public function setMIME($mime){ self::$mime = $mime; } public function setExtension($extension){ } public function encode($data, $human_readable=FALSE){ return $human_readable ? $this->json_format(json_encode(object_to_array($data))) : json_encode(object_to_array($data)); } public function decode($data) { $decoded = json_decode ( $data ); if (function_exists ( 'json_last_error' )) { $message = ''; switch (json_last_error ()) { case JSON_ERROR_NONE : return object_to_array ( $decoded ); break; case JSON_ERROR_DEPTH : $message = 'maximum stack depth exceeded'; break; case JSON_ERROR_STATE_MISMATCH : $message = 'underflow or the modes mismatch'; break; case JSON_ERROR_CTRL_CHAR : $message = 'unexpected control character found'; break; case JSON_ERROR_SYNTAX : $message = 'malformed JSON'; break; case JSON_ERROR_UTF8 : $message = 'malformed UTF-8 characters, possibly incorrectly encoded'; break; default : $message = 'unknown error'; break; } throw new RestException ( 400, 'Error parsing JSON, ' . $message ); } else if (strlen ( $data ) && $decoded === NULL || $decoded === $data) { throw new RestException ( 400, 'Error parsing JSON' ); } return object_to_array ( $decoded ); } private function json_format($json) { $tab = "  "; $new_json = ""; $indent_level = 0; $in_string = FALSE; $len = strlen($json); for($c = 0; $c < $len; $c++) { $char = $json[$c]; switch($char) { case '{': case '[': if(!$in_string) { $new_json .= $char . "\n" . str_repeat($tab, $indent_level+1); $indent_level++; } else { $new_json .= $char; } break; case '}': case ']': if(!$in_string) { $indent_level--; $new_json .= "\n".str_repeat($tab, $indent_level).$char; } else { $new_json .= $char; } break; case ',': if(!$in_string) { $new_json .= ",\n" . str_repeat($tab, $indent_level); } else { $new_json .= $char; } break; case ':': if(!$in_string) { $new_json .= ": "; } else { $new_json .= $char; } break; case '"': if($c==0){ $in_string = TRUE; }elseif($c > 0 && $json[$c-1] != '\\') { $in_string = !$in_string; } default: $new_json .= $char; break; } } return $new_json; } public function __toString(){ return $this->getExtension(); } } class DocParser { private $params=array(); function parse($doc='') { if($doc==''){ return $this->params; } if(preg_match('#^/\*\*(.*)\*/#s', $doc, $comment) === false) return $this->params; $comment = trim($comment[1]); if(preg_match_all('#^\s*\*(.*)#m', $comment, $lines) === false) return $this->params; $this->parseLines($lines[1]); return $this->params; } private function parseLines($lines) { foreach($lines as $line) { $parsedLine = $this->parseLine($line); if($parsedLine === false && !isset($this->params['description'])) { if(isset($desc)){ $this->params['description'] = implode(PHP_EOL, $desc); } $desc = array(); } elseif($parsedLine !== false) { $desc[] = $parsedLine; } } $desc = implode(' ', $desc); if(!empty($desc))$this->params['long_description'] = $desc; } private function parseLine($line) { $line = trim($line); if(empty($line)) return false; if(strpos($line, '@') === 0) { if(strpos($line, ' ')>0){ $param = substr($line, 1, strpos($line, ' ') - 1); $value = substr($line, strlen($param) + 2); }else{ $param = substr($line, 1); $value = ''; } if($this->setParam($param, $value)) return false; } return $line; } private function setParam($param, $value) { if($param == 'param' || $param == 'return') $value = $this->formatParamOrReturn($value); if($param == 'class') list($param, $value) = $this->formatClass($value); if(empty($this->params[$param])) { $this->params[$param] = $value; } else if($param == 'param'){ $arr = array($this->params[$param], $value); $this->params[$param] = $arr; } else { $this->params[$param] = $value + $this->params[$param]; } return true; } private function formatClass($value) { $r = preg_split("[\(|\)]", $value); if(count($r)>1){ $param = $r[0]; parse_str($r[1],$value); foreach ($value as $key => $val) { $val = explode(',', $val); if(count($val)>1)$value[$key]=$val; } }else{ $param='Unknown'; } return array($param, $value); } private function formatParamOrReturn($string) { $pos = strpos($string, ' '); $type = substr($string, 0, $pos); return '(' . $type . ')' . substr($string, $pos+1); } } function parse_doc($php_doc_comment){ $p = new DocParser(); return $p->parse($php_doc_comment); $p = new Parser($php_doc_comment); return $p; $php_doc_comment = preg_replace("/(^[\\s]*\\/\\*\\*)
                                  |(^[\\s]\\*\\/)
                                  |(^[\\s]*\\*?\\s)
                                  |(^[\\s]*)
-                                 |(^[\\t]*)/ixm", "", $php_doc_comment); $php_doc_comment = str_replace("\r", "", $php_doc_comment); $php_doc_comment = preg_replace("/([\\t])+/", "\t", $php_doc_comment); return explode("\n", $php_doc_comment); $php_doc_comment = trim(preg_replace('/\r?\n *\* */', ' ', $php_doc_comment)); return $php_doc_comment; preg_match_all('/@([a-z]+)\s+(.*?)\s*(?=$|@[a-z]+\s)/s', $php_doc_comment, $matches); return array_combine($matches[1], $matches[2]); } function object_to_array($object, $utf_encode=FALSE) { if(is_array($object) || (is_object($object) && !($object instanceof JsonSerializable))){ $array = array(); foreach($object as $key => $value) { $value = object_to_array($value, $utf_encode); if($utf_encode && is_string($value)){ $value = utf8_encode($value); } $array[$key] = $value; } return $array; } return $object; } function autoload_formats($class_name) { $class_name=strtolower($class_name); $file = RESTLER_PATH."/$class_name/$class_name.php"; if (file_exists($file)) { require_once($file); } elseif (file_exists("$class_name.php")) { require_once ("$class_name.php"); } } spl_autoload_register('autoload_formats'); if(!function_exists('isRestlerCompatibilityModeEnabled')){ function isRestlerCompatibilityModeEnabled(){ return FALSE; } } define('RESTLER_PATH', dirname(__FILE__));
\ No newline at end of file
+                                 |(^[\\t]*)/ixm", "", $php_doc_comment); $php_doc_comment = str_replace("\r", "", $php_doc_comment); $php_doc_comment = preg_replace("/([\\t])+/", "\t", $php_doc_comment); return explode("\n", $php_doc_comment); $php_doc_comment = trim(preg_replace('/\r?\n *\* */', ' ', $php_doc_comment)); return $php_doc_comment; preg_match_all('/@([a-z]+)\s+(.*?)\s*(?=$|@[a-z]+\s)/s', $php_doc_comment, $matches); return array_combine($matches[1], $matches[2]); } function object_to_array($object, $utf_encode=FALSE) { if(is_array($object) || (is_object($object) && !($object instanceof JsonSerializable))) { $array = array(); foreach($object as $key => $value) { $value = object_to_array($value, $utf_encode); if($utf_encode && is_string($value)){ $value = utf8_encode($value); } $array[$key] = $value; } return $array; } return $object; } function autoload_formats($class_name) { $class_name=strtolower($class_name); $file = RESTLER_PATH."/$class_name/$class_name.php"; if (file_exists($file)) { require_once($file); } elseif (file_exists("$class_name.php")) { require_once ("$class_name.php"); } } spl_autoload_register('autoload_formats'); if(!function_exists('isRestlerCompatibilityModeEnabled')){ function isRestlerCompatibilityModeEnabled(){ return FALSE; } } define('RESTLER_PATH', dirname(__FILE__));
\ No newline at end of file

From 73b8e8a816d9c1ac13a89de74ebbc0b6bc5ef7a2 Mon Sep 17 00:00:00 2001
From: Luracast <arul@luracast.com>
Date: Wed, 20 Jun 2012 09:26:59 +0530
Subject: [PATCH 45/61] Fixes #51 Case isn't preserved in url parameters since
 Restler 2.1.7

---
 restler/restler.php          | 11 ++++++-----
 restler_minified/restler.php |  2 +-
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/restler/restler.php b/restler/restler.php
index b33ec7311..782ad870e 100644
--- a/restler/restler.php
+++ b/restler/restler.php
@@ -10,10 +10,10 @@
  * @copyright  2010 Luracast
  * @license    http://www.opensource.org/licenses/lgpl-license.php LGPL
  * @link       http://luracast.com/products/restler/
- * @version    2.1.8
+ * @version    2.1.9
  */
 class Restler { 
-	const VERSION = '2.1.8';
+	const VERSION = '2.1.9';
 	/**
 	 * URL of the currently mapped service
 	 * @var string
@@ -311,7 +311,7 @@ public function handleError ($status_code, $error_message = NULL) {
 	 */
 	public function handle () {
 		if(empty($this->format_map))$this->setSupportedFormats('JsonFormat');
-		$this->url = strtolower($this->getPath());
+		$this->url = $this->getPath();
 		$this->request_method = $this->getRequestMethod();
 		$this->response_format = $this->getResponseFormat();
 		$this->request_format = $this->getRequestFormat();
@@ -615,13 +615,14 @@ protected function mapUrlToMethod () {
 		$this->request_data += $_GET;
 		$params = array('request_data'=>$this->request_data);
 		$params += $this->request_data;
+		$lc = strtolower($this->url);
 		foreach ($urls as $url => $call) {
 			//echo PHP_EOL.$url.' = '.$this->url.PHP_EOL;
 			$call = (object)$call;
 			if(strstr($url, ':')){
 				$regex = preg_replace('/\\\:([^\/]+)/', '(?P<$1>[^/]+)', 
 				preg_quote($url));
-				if (preg_match(":^$regex$:", $this->url, $matches)) {
+				if (preg_match(":^$regex$:i", $this->url, $matches)) {
 					foreach ($matches as $arg => $match) {
 						if (isset($call->arguments[$arg])){
 							//flog("$arg => $match $args[$arg]");
@@ -631,7 +632,7 @@ protected function mapUrlToMethod () {
 					$found = TRUE;
 					break;
 				}
-			}elseif ($url == $this->url){
+			}elseif ($url == $lc){
 				$found = TRUE;
 				break;
 			}
diff --git a/restler_minified/restler.php b/restler_minified/restler.php
index 9ea4cc72f..ee76c3dde 100644
--- a/restler_minified/restler.php
+++ b/restler_minified/restler.php
@@ -1,5 +1,5 @@
 <?php
- class Restler { const VERSION = '2.1.8'; public $url; public $request_method; public $request_format; public $request_data=array(); public $cache_dir; public $base_dir; public $response = 'DefaultResponse'; public $response_format; protected $production_mode; protected $routes= array(); protected $format_map = array(); protected $service_class_instance; protected $service_method; protected $auth_classes = array(); protected $error_classes = array(); private $codes = array( 100 => 'Continue', 101 => 'Switching Protocols', 200 => 'OK', 201 => 'Created', 202 => 'Accepted', 203 => 'Non-Authoritative Information', 204 => 'No Content', 205 => 'Reset Content', 206 => 'Partial Content', 300 => 'Multiple Choices', 301 => 'Moved Permanently', 302 => 'Found', 303 => 'See Other', 304 => 'Not Modified', 305 => 'Use Proxy', 306 => '(Unused)', 307 => 'Temporary Redirect', 400 => 'Bad Request', 401 => 'Unauthorized', 402 => 'Payment Required', 403 => 'Forbidden', 404 => 'Not Found', 405 => 'Method Not Allowed', 406 => 'Not Acceptable', 407 => 'Proxy Authentication Required', 408 => 'Request Timeout', 409 => 'Conflict', 410 => 'Gone', 411 => 'Length Required', 412 => 'Precondition Failed', 413 => 'Request Entity Too Large', 414 => 'Request-URI Too Long', 415 => 'Unsupported Media Type', 416 => 'Requested Range Not Satisfiable', 417 => 'Expectation Failed', 500 => 'Internal Server Error', 501 => 'Not Implemented', 502 => 'Bad Gateway', 503 => 'Service Unavailable', 504 => 'Gateway Timeout', 505 => 'HTTP Version Not Supported' ); protected $cached; public function __construct ($production_mode = FALSE) { $this->production_mode = $production_mode; $this->cache_dir = getcwd(); $this->base_dir = RESTLER_PATH; } public function __destruct () { if ($this->production_mode && !$this->cached) { $this->saveCache(); } } public function refreshCache () { $this->routes = array(); $this->cached = FALSE; } public function setSupportedFormats () { $args = func_get_args(); $extensions = array(); foreach ($args as $class_name) { if(!is_string($class_name) || !class_exists($class_name)){ throw new Exception("$class_name is not a vaild Format Class."); } $obj = new $class_name; if(! $obj instanceof iFormat){ throw new Exception('Invalid format class; must implement '. 'iFormat interface'); } foreach ($obj->getMIMEMap() as $extension => $mime) { if(!isset($this->format_map[$extension])) $this->format_map[$extension]=$class_name; $mime = explode(',', $mime); if (!is_array($mime)) $mime = array($mime); foreach ($mime as $value) { if(!isset($this->format_map[$value])) $this->format_map[$value]=$class_name; } $extensions[".$extension"]=TRUE; } } $this->format_map['default']=$args[0]; $this->format_map['extensions']=array_keys($extensions); } public function addAPIClass($class_name, $base_path = NULL) { if(!class_exists($class_name)){ throw new Exception("API class $class_name is missing."); } $this->loadCache(); if(!$this->cached){ if(is_null($base_path)){ $base_path=strtolower($class_name); $index = strrpos($class_name, '\\'); if($index!==FALSE){ $base_path=substr($base_path, $index+1); } }else $base_path = trim($base_path,'/'); if(strlen($base_path)>0)$base_path .= '/'; $this->generateMap($class_name, $base_path); } } public function addAuthenticationClass ($class_name, $base_path = NULL) { $this->auth_classes[] = $class_name; $this->addAPIClass($class_name, $base_path); } public function addErrorClass ($class_name) { $this->error_classes[] = $class_name; } public function handleError ($status_code, $error_message = NULL) { $method = "handle$status_code"; $handled = FALSE; foreach ($this->error_classes as $class_name) { if (method_exists($class_name, $method)) { $obj = new $class_name(); $obj->restler = $this; $obj->$method(); $handled = TRUE; } } if($handled)return; $message = $this->codes[$status_code] . (!$error_message ? '' : ': ' . $error_message); $this->setStatus($status_code); $responder = new $this->response(); $responder->restler = $this; $this->sendData($responder->__formatError($status_code, $message)); } public function handle () { if(empty($this->format_map))$this->setSupportedFormats('JsonFormat'); $this->url = strtolower($this->getPath()); $this->request_method = $this->getRequestMethod(); $this->response_format = $this->getResponseFormat(); $this->request_format = $this->getRequestFormat(); if(is_null($this->request_format)){ $this->request_format = $this->response_format; } if($this->request_method == 'PUT' || $this->request_method == 'POST'){ $this->request_data = $this->getRequestData(); } $o = $this->mapUrlToMethod(); if(!isset($o->class_name)){ $this->handleError(404); }else{ try { if($o->method_flag){ $auth_method = '__isAuthenticated'; if(!count($this->auth_classes))throw new RestException(401); foreach ($this->auth_classes as $auth_class) { $auth_obj = new $auth_class(); $auth_obj->restler=$this; $this->applyClassMetadata($auth_class, $auth_obj, $o); if (!method_exists($auth_obj, $auth_method)) { throw new RestException(401, 'Authentication Class '. 'should implement iAuthenticate'); }elseif(!$auth_obj->$auth_method()){ throw new RestException(401); } } } $this->applyClassMetadata(get_class($this->request_format), $this->request_format, $o); $pre_process = '_'.$this->request_format->getExtension().'_'. $o->method_name; $this->service_method = $o->method_name; if($o->method_flag==2)$o=unprotect($o); $object = $this->service_class_instance = new $o->class_name(); $object->restler=$this; if(method_exists($o->class_name, $pre_process)) { call_user_func_array(array($object, $pre_process), $o->arguments); } switch ($o->method_flag) { case 3: $reflection_method = new ReflectionMethod($object, $o->method_name); $reflection_method->setAccessible(TRUE); $result = $reflection_method->invokeArgs($object, $o->arguments); break; case 2: case 1: default: $result = call_user_func_array(array($object, $o->method_name), $o->arguments); } } catch (RestException $e) { $this->handleError($e->getCode(), $e->getMessage()); } } $responder = new $this->response(); $responder->restler = $this; $this->applyClassMetadata($this->response, $responder, $o); if (isset($result) && $result !== NULL) { $result = $responder->__formatResponse($result); $this->sendData($result); } } public function sendData($data) { $data = $this->response_format->encode($data, !$this->production_mode); $post_process = '_'.$this->service_method .'_'. $this->response_format->getExtension(); if(isset($this->service_class_instance) && method_exists($this->service_class_instance,$post_process)){ $data = call_user_func(array($this->service_class_instance, $post_process), $data); } header("Cache-Control: no-cache, must-revalidate"); header("Expires: 0"); header('Content-Type: ' . $this->response_format->getMIME()); header("X-Powered-By: Luracast Restler v".Restler::VERSION); die($data); } public function setStatus($code) { header("{$_SERVER['SERVER_PROTOCOL']} $code ". $this->codes[strval($code)]); } public function removeCommonPath($first, $second, $char='/'){ $first = explode($char, $first); $second = explode($char, $second); while (count($second)){ if($first[0]==$second[0]){ array_shift($first); } else break; array_shift($second); } return implode($char, $first); } public function saveCache() { $file = $this->cache_dir . '/routes.php'; $s = '$o=array();'.PHP_EOL; foreach ($this->routes as $key => $value) { $s .= PHP_EOL.PHP_EOL.PHP_EOL."############### $key ###############" .PHP_EOL.PHP_EOL; $s .= '$o[\''.$key.'\']=array();'; foreach ($value as $ke => $va) { $s .= PHP_EOL.PHP_EOL."#==== $key $ke".PHP_EOL.PHP_EOL; $s .= '$o[\''.$key.'\'][\''.$ke.'\']='.str_replace(PHP_EOL, PHP_EOL."\t", var_export($va, TRUE)).';'; } } $s .= PHP_EOL.'return $o;'; $r=@file_put_contents($file, "<?php $s"); @chmod($file, 0777); if($r===FALSE)throw new Exception( "The cache directory located at '$this->cache_dir' needs to have ". "the permissions set to read/write/execute for everyone in order ". "to save cache and improve performance."); } protected function getPath () { $path = urldecode($this->removeCommonPath($_SERVER['REQUEST_URI'], $_SERVER['SCRIPT_NAME'])); $path = preg_replace('/(\/*\?.*$)|(\/$)/', '', $path); $path = str_replace($this->format_map['extensions'], '', $path); return $path; } protected function getRequestMethod () { $method = $_SERVER['REQUEST_METHOD']; if (isset($_SERVER['HTTP_X_HTTP_METHOD_OVERRIDE'])){ $method = $_SERVER['HTTP_X_HTTP_METHOD_OVERRIDE']; } if($method=='HEAD')$method='GET'; return $method; } protected function getRequestFormat () { $format=NULL; if(isset($_SERVER['CONTENT_TYPE'])){ $mime = explode(';', $_SERVER['CONTENT_TYPE']); $mime = $mime[0]; if($mime==UrlEncodedFormat::MIME){ $format = new UrlEncodedFormat(); }else{ if(isset($this->format_map[$mime])){ $format = $this->format_map[$mime]; $format = is_string($format) ? new $format: $format; $format->setMIME($mime); } } } return $format; } protected function getResponseFormat () { $format=NULL; $extensions = explode('.', parse_url($_SERVER['REQUEST_URI'], PHP_URL_PATH)); while($extensions){ $extension = array_pop($extensions); $extension = explode('/', $extension); $extension = array_shift($extension); if($extension && isset($this->format_map[$extension])){ $format = $this->format_map[$extension]; $format = is_string($format) ? new $format: $format; $format->setExtension($extension); return $format; } } if(isset($_SERVER['HTTP_ACCEPT'])){ $acceptList = array(); $accepts = explode(',', strtolower($_SERVER['HTTP_ACCEPT'])); if (!is_array($accepts)) $accepts = array($accepts); foreach ($accepts as $pos => $accept) { $parts = explode(';q=', trim($accept)); $type = array_shift($parts); $quality = count($parts) ? floatval(array_shift($parts)) : (1000 - $pos) / 1000; $acceptList[$type] = $quality; } arsort($acceptList); foreach ($acceptList as $accept => $quality) { if(isset($this->format_map[$accept])){ $format = $this->format_map[$accept]; $format = is_string($format) ? new $format: $format; $format->setMIME($accept); header("Vary: Accept"); return $format; } } } else { $_SERVER['HTTP_ACCEPT'] = '*/*'; } if (strpos($_SERVER['HTTP_ACCEPT'], '*') !== FALSE) { if (strpos($_SERVER['HTTP_ACCEPT'], 'application/*') !== FALSE) { $format = new JsonFormat; } elseif (strpos($_SERVER['HTTP_ACCEPT'], 'text/*') !== FALSE) { $format = new XmlFormat; } elseif (strpos($_SERVER['HTTP_ACCEPT'], '*/*') !== FALSE) { $format = new $this->format_map['default']; } } if (empty($format)) { header('HTTP/1.1 406 Not Acceptable'); die('406 Not Acceptable: The server was unable to negotiate content for this request.'); } else { header("Vary: Accept"); return $format; } } protected function getRequestData() { try{ $r = file_get_contents('php://input'); if(is_null($r))return $_GET; $r =$this->request_format->decode($r); return is_null($r) ? array(): $r; } catch (RestException $e) { $this->handleError($e->getCode(), $e->getMessage()); } } protected function mapUrlToMethod () { if(!isset($this->routes[$this->request_method])){ return array(); } $urls = $this->routes[$this->request_method]; if(!$urls)return array(); $found = FALSE; $this->request_data += $_GET; $params = array('request_data'=>$this->request_data); $params += $this->request_data; foreach ($urls as $url => $call) { $call = (object)$call; if(strstr($url, ':')){ $regex = preg_replace('/\\\:([^\/]+)/', '(?P<$1>[^/]+)', preg_quote($url)); if (preg_match(":^$regex$:", $this->url, $matches)) { foreach ($matches as $arg => $match) { if (isset($call->arguments[$arg])){ $params[$arg] = $match; } } $found = TRUE; break; } }elseif ($url == $this->url){ $found = TRUE; break; } } if($found){ $p = $call->defaults; foreach ($call->arguments as $key => $value) { if(isset($params[$key]))$p[$value] = $params[$key]; } $call->arguments=$p; return $call; } } protected function applyClassMetadata($class_name, $instance, $method_info){ if(isset($method_info->metadata[$class_name]) && is_array($method_info->metadata[$class_name])){ foreach ($method_info->metadata[$class_name] as $property => $value){ if(property_exists($class_name, $property)){ $reflection_property = new ReflectionProperty($class_name, $property); $reflection_property->setValue($instance, $value); } } } } protected function loadCache() { if ($this->cached !== NULL) { return; } $file = $this->cache_dir . '/routes.php'; $this->cached = FALSE; if ($this->production_mode) { if (file_exists($file)) { $routes = include($file); } if (isset($routes) && is_array($routes)) { $this->routes = $routes; $this->cached = TRUE; } } else { } } protected function generateMap ($class_name, $base_path = '') { $reflection = new ReflectionClass($class_name); $class_metadata = parse_doc($reflection->getDocComment()); $methods = $reflection->getMethods( ReflectionMethod::IS_PUBLIC + ReflectionMethod::IS_PROTECTED); foreach ($methods as $method) { $doc = $method->getDocComment(); $arguments = array(); $defaults = array(); $metadata = $class_metadata+parse_doc($doc); $params = $method->getParameters(); $position=0; foreach ($params as $param){ $arguments[$param->getName()] = $position; $defaults[$position] = $param->isDefaultValueAvailable() ? $param->getDefaultValue() : NULL; $position++; } $method_flag = $method->isProtected() ? (isRestlerCompatibilityModeEnabled() ? 2 : 3) : (isset($metadata['protected']) ? 1 : 0); $call = array( 'class_name'=>$class_name, 'method_name'=>$method->getName(), 'arguments'=>$arguments, 'defaults'=>$defaults, 'metadata'=>$metadata, 'method_flag'=>$method_flag ); $method_url = strtolower($method->getName()); if (preg_match_all( '/@url\s+(GET|POST|PUT|DELETE|HEAD|OPTIONS)[ \t]*\/?(\S*)/s', $doc, $matches, PREG_SET_ORDER)) { foreach ($matches as $match) { $http_method = $match[1]; $url = rtrim($base_path . $match[2],'/'); $this->routes[$http_method][$url] = $call; } }elseif($method_url[0] != '_'){ if (preg_match_all('/^(GET|POST|PUT|DELETE|HEAD|OPTIONS)/i', $method_url, $matches)) { $http_method = strtoupper($matches[0][0]); $method_url = substr($method_url, strlen($http_method)); }else{ $http_method = 'GET'; } $url = $base_path. ($method_url=='index' || $method_url=='default' ? '' : $method_url); $url = rtrim($url,'/'); $this->routes[$http_method][$url] = $call; foreach ($params as $param){ if($param->getName()=='request_data'){ break; } $url .= $url=='' ? ':' : '/:'; $url .= $param->getName(); $this->routes[$http_method][$url] = $call; } } } } } if(version_compare(PHP_VERSION, '5.3.0') < 0){ require_once 'compat.php'; } class RestException extends Exception { public function __construct($http_status_code, $error_message = NULL) { parent::__construct($error_message, $http_status_code); } } interface iRespond { public function __formatResponse($result); public function __formatError($status_code, $message); } class DefaultResponse implements iRespond { function __formatResponse($result) { return $result; } function __formatError($statusCode, $message) { return array('error' => array('code' => $statusCode, 'message' => $message)); } } interface iAuthenticate { public function __isAuthenticated(); } interface iFormat { public function getMIMEMap(); public function setMIME($mime); public function getMIME(); public function setExtension($extension); public function getExtension(); public function encode($data, $human_readable=FALSE); public function decode($data); } class UrlEncodedFormat implements iFormat { const MIME = 'application/x-www-form-urlencoded'; const EXTENSION = 'post'; public function getMIMEMap() { return array(self::EXTENSION=>self::MIME); } public function getMIME(){ return self::MIME; } public function getExtension(){ return self::EXTENSION; } public function setMIME($mime){ } public function setExtension($extension){ } public function encode($data, $human_readable=FALSE){ return http_build_query($data); } public function decode($data){ parse_str($data,$r); return $r; } public function __toString(){ return $this->getExtension(); } } class JsonFormat implements iFormat { const MIME ='application/json,application/javascript'; static $mime = 'application/json'; const EXTENSION = 'json'; public function getMIMEMap() { return array(self::EXTENSION=>self::MIME); } public function getMIME(){ return self::$mime; } public function getExtension(){ return self::EXTENSION; } public function setMIME($mime){ self::$mime = $mime; } public function setExtension($extension){ } public function encode($data, $human_readable=FALSE){ return $human_readable ? $this->json_format(json_encode(object_to_array($data))) : json_encode(object_to_array($data)); } public function decode($data) { $decoded = json_decode ( $data ); if (function_exists ( 'json_last_error' )) { $message = ''; switch (json_last_error ()) { case JSON_ERROR_NONE : return object_to_array ( $decoded ); break; case JSON_ERROR_DEPTH : $message = 'maximum stack depth exceeded'; break; case JSON_ERROR_STATE_MISMATCH : $message = 'underflow or the modes mismatch'; break; case JSON_ERROR_CTRL_CHAR : $message = 'unexpected control character found'; break; case JSON_ERROR_SYNTAX : $message = 'malformed JSON'; break; case JSON_ERROR_UTF8 : $message = 'malformed UTF-8 characters, possibly incorrectly encoded'; break; default : $message = 'unknown error'; break; } throw new RestException ( 400, 'Error parsing JSON, ' . $message ); } else if (strlen ( $data ) && $decoded === NULL || $decoded === $data) { throw new RestException ( 400, 'Error parsing JSON' ); } return object_to_array ( $decoded ); } private function json_format($json) { $tab = "  "; $new_json = ""; $indent_level = 0; $in_string = FALSE; $len = strlen($json); for($c = 0; $c < $len; $c++) { $char = $json[$c]; switch($char) { case '{': case '[': if(!$in_string) { $new_json .= $char . "\n" . str_repeat($tab, $indent_level+1); $indent_level++; } else { $new_json .= $char; } break; case '}': case ']': if(!$in_string) { $indent_level--; $new_json .= "\n".str_repeat($tab, $indent_level).$char; } else { $new_json .= $char; } break; case ',': if(!$in_string) { $new_json .= ",\n" . str_repeat($tab, $indent_level); } else { $new_json .= $char; } break; case ':': if(!$in_string) { $new_json .= ": "; } else { $new_json .= $char; } break; case '"': if($c==0){ $in_string = TRUE; }elseif($c > 0 && $json[$c-1] != '\\') { $in_string = !$in_string; } default: $new_json .= $char; break; } } return $new_json; } public function __toString(){ return $this->getExtension(); } } class DocParser { private $params=array(); function parse($doc='') { if($doc==''){ return $this->params; } if(preg_match('#^/\*\*(.*)\*/#s', $doc, $comment) === false) return $this->params; $comment = trim($comment[1]); if(preg_match_all('#^\s*\*(.*)#m', $comment, $lines) === false) return $this->params; $this->parseLines($lines[1]); return $this->params; } private function parseLines($lines) { foreach($lines as $line) { $parsedLine = $this->parseLine($line); if($parsedLine === false && !isset($this->params['description'])) { if(isset($desc)){ $this->params['description'] = implode(PHP_EOL, $desc); } $desc = array(); } elseif($parsedLine !== false) { $desc[] = $parsedLine; } } $desc = implode(' ', $desc); if(!empty($desc))$this->params['long_description'] = $desc; } private function parseLine($line) { $line = trim($line); if(empty($line)) return false; if(strpos($line, '@') === 0) { if(strpos($line, ' ')>0){ $param = substr($line, 1, strpos($line, ' ') - 1); $value = substr($line, strlen($param) + 2); }else{ $param = substr($line, 1); $value = ''; } if($this->setParam($param, $value)) return false; } return $line; } private function setParam($param, $value) { if($param == 'param' || $param == 'return') $value = $this->formatParamOrReturn($value); if($param == 'class') list($param, $value) = $this->formatClass($value); if(empty($this->params[$param])) { $this->params[$param] = $value; } else if($param == 'param'){ $arr = array($this->params[$param], $value); $this->params[$param] = $arr; } else { $this->params[$param] = $value + $this->params[$param]; } return true; } private function formatClass($value) { $r = preg_split("[\(|\)]", $value); if(count($r)>1){ $param = $r[0]; parse_str($r[1],$value); foreach ($value as $key => $val) { $val = explode(',', $val); if(count($val)>1)$value[$key]=$val; } }else{ $param='Unknown'; } return array($param, $value); } private function formatParamOrReturn($string) { $pos = strpos($string, ' '); $type = substr($string, 0, $pos); return '(' . $type . ')' . substr($string, $pos+1); } } function parse_doc($php_doc_comment){ $p = new DocParser(); return $p->parse($php_doc_comment); $p = new Parser($php_doc_comment); return $p; $php_doc_comment = preg_replace("/(^[\\s]*\\/\\*\\*)
+ class Restler { const VERSION = '2.1.9'; public $url; public $request_method; public $request_format; public $request_data=array(); public $cache_dir; public $base_dir; public $response = 'DefaultResponse'; public $response_format; protected $production_mode; protected $routes= array(); protected $format_map = array(); protected $service_class_instance; protected $service_method; protected $auth_classes = array(); protected $error_classes = array(); private $codes = array( 100 => 'Continue', 101 => 'Switching Protocols', 200 => 'OK', 201 => 'Created', 202 => 'Accepted', 203 => 'Non-Authoritative Information', 204 => 'No Content', 205 => 'Reset Content', 206 => 'Partial Content', 300 => 'Multiple Choices', 301 => 'Moved Permanently', 302 => 'Found', 303 => 'See Other', 304 => 'Not Modified', 305 => 'Use Proxy', 306 => '(Unused)', 307 => 'Temporary Redirect', 400 => 'Bad Request', 401 => 'Unauthorized', 402 => 'Payment Required', 403 => 'Forbidden', 404 => 'Not Found', 405 => 'Method Not Allowed', 406 => 'Not Acceptable', 407 => 'Proxy Authentication Required', 408 => 'Request Timeout', 409 => 'Conflict', 410 => 'Gone', 411 => 'Length Required', 412 => 'Precondition Failed', 413 => 'Request Entity Too Large', 414 => 'Request-URI Too Long', 415 => 'Unsupported Media Type', 416 => 'Requested Range Not Satisfiable', 417 => 'Expectation Failed', 500 => 'Internal Server Error', 501 => 'Not Implemented', 502 => 'Bad Gateway', 503 => 'Service Unavailable', 504 => 'Gateway Timeout', 505 => 'HTTP Version Not Supported' ); protected $cached; public function __construct ($production_mode = FALSE) { $this->production_mode = $production_mode; $this->cache_dir = getcwd(); $this->base_dir = RESTLER_PATH; } public function __destruct () { if ($this->production_mode && !$this->cached) { $this->saveCache(); } } public function refreshCache () { $this->routes = array(); $this->cached = FALSE; } public function setSupportedFormats () { $args = func_get_args(); $extensions = array(); foreach ($args as $class_name) { if(!is_string($class_name) || !class_exists($class_name)){ throw new Exception("$class_name is not a vaild Format Class."); } $obj = new $class_name; if(! $obj instanceof iFormat){ throw new Exception('Invalid format class; must implement '. 'iFormat interface'); } foreach ($obj->getMIMEMap() as $extension => $mime) { if(!isset($this->format_map[$extension])) $this->format_map[$extension]=$class_name; $mime = explode(',', $mime); if (!is_array($mime)) $mime = array($mime); foreach ($mime as $value) { if(!isset($this->format_map[$value])) $this->format_map[$value]=$class_name; } $extensions[".$extension"]=TRUE; } } $this->format_map['default']=$args[0]; $this->format_map['extensions']=array_keys($extensions); } public function addAPIClass($class_name, $base_path = NULL) { if(!class_exists($class_name)){ throw new Exception("API class $class_name is missing."); } $this->loadCache(); if(!$this->cached){ if(is_null($base_path)){ $base_path=strtolower($class_name); $index = strrpos($class_name, '\\'); if($index!==FALSE){ $base_path=substr($base_path, $index+1); } }else $base_path = trim($base_path,'/'); if(strlen($base_path)>0)$base_path .= '/'; $this->generateMap($class_name, $base_path); } } public function addAuthenticationClass ($class_name, $base_path = NULL) { $this->auth_classes[] = $class_name; $this->addAPIClass($class_name, $base_path); } public function addErrorClass ($class_name) { $this->error_classes[] = $class_name; } public function handleError ($status_code, $error_message = NULL) { $method = "handle$status_code"; $handled = FALSE; foreach ($this->error_classes as $class_name) { if (method_exists($class_name, $method)) { $obj = new $class_name(); $obj->restler = $this; $obj->$method(); $handled = TRUE; } } if($handled)return; $message = $this->codes[$status_code] . (!$error_message ? '' : ': ' . $error_message); $this->setStatus($status_code); $responder = new $this->response(); $responder->restler = $this; $this->sendData($responder->__formatError($status_code, $message)); } public function handle () { if(empty($this->format_map))$this->setSupportedFormats('JsonFormat'); $this->url = $this->getPath(); $this->request_method = $this->getRequestMethod(); $this->response_format = $this->getResponseFormat(); $this->request_format = $this->getRequestFormat(); if(is_null($this->request_format)){ $this->request_format = $this->response_format; } if($this->request_method == 'PUT' || $this->request_method == 'POST'){ $this->request_data = $this->getRequestData(); } $o = $this->mapUrlToMethod(); if(!isset($o->class_name)){ $this->handleError(404); }else{ try { if($o->method_flag){ $auth_method = '__isAuthenticated'; if(!count($this->auth_classes))throw new RestException(401); foreach ($this->auth_classes as $auth_class) { $auth_obj = new $auth_class(); $auth_obj->restler=$this; $this->applyClassMetadata($auth_class, $auth_obj, $o); if (!method_exists($auth_obj, $auth_method)) { throw new RestException(401, 'Authentication Class '. 'should implement iAuthenticate'); }elseif(!$auth_obj->$auth_method()){ throw new RestException(401); } } } $this->applyClassMetadata(get_class($this->request_format), $this->request_format, $o); $pre_process = '_'.$this->request_format->getExtension().'_'. $o->method_name; $this->service_method = $o->method_name; if($o->method_flag==2)$o=unprotect($o); $object = $this->service_class_instance = new $o->class_name(); $object->restler=$this; if(method_exists($o->class_name, $pre_process)) { call_user_func_array(array($object, $pre_process), $o->arguments); } switch ($o->method_flag) { case 3: $reflection_method = new ReflectionMethod($object, $o->method_name); $reflection_method->setAccessible(TRUE); $result = $reflection_method->invokeArgs($object, $o->arguments); break; case 2: case 1: default: $result = call_user_func_array(array($object, $o->method_name), $o->arguments); } } catch (RestException $e) { $this->handleError($e->getCode(), $e->getMessage()); } } $responder = new $this->response(); $responder->restler = $this; $this->applyClassMetadata($this->response, $responder, $o); if (isset($result) && $result !== NULL) { $result = $responder->__formatResponse($result); $this->sendData($result); } } public function sendData($data) { $data = $this->response_format->encode($data, !$this->production_mode); $post_process = '_'.$this->service_method .'_'. $this->response_format->getExtension(); if(isset($this->service_class_instance) && method_exists($this->service_class_instance,$post_process)){ $data = call_user_func(array($this->service_class_instance, $post_process), $data); } header("Cache-Control: no-cache, must-revalidate"); header("Expires: 0"); header('Content-Type: ' . $this->response_format->getMIME()); header("X-Powered-By: Luracast Restler v".Restler::VERSION); die($data); } public function setStatus($code) { header("{$_SERVER['SERVER_PROTOCOL']} $code ". $this->codes[strval($code)]); } public function removeCommonPath($first, $second, $char='/'){ $first = explode($char, $first); $second = explode($char, $second); while (count($second)){ if($first[0]==$second[0]){ array_shift($first); } else break; array_shift($second); } return implode($char, $first); } public function saveCache() { $file = $this->cache_dir . '/routes.php'; $s = '$o=array();'.PHP_EOL; foreach ($this->routes as $key => $value) { $s .= PHP_EOL.PHP_EOL.PHP_EOL."############### $key ###############" .PHP_EOL.PHP_EOL; $s .= '$o[\''.$key.'\']=array();'; foreach ($value as $ke => $va) { $s .= PHP_EOL.PHP_EOL."#==== $key $ke".PHP_EOL.PHP_EOL; $s .= '$o[\''.$key.'\'][\''.$ke.'\']='.str_replace(PHP_EOL, PHP_EOL."\t", var_export($va, TRUE)).';'; } } $s .= PHP_EOL.'return $o;'; $r=@file_put_contents($file, "<?php $s"); @chmod($file, 0777); if($r===FALSE)throw new Exception( "The cache directory located at '$this->cache_dir' needs to have ". "the permissions set to read/write/execute for everyone in order ". "to save cache and improve performance."); } protected function getPath () { $path = urldecode($this->removeCommonPath($_SERVER['REQUEST_URI'], $_SERVER['SCRIPT_NAME'])); $path = preg_replace('/(\/*\?.*$)|(\/$)/', '', $path); $path = str_replace($this->format_map['extensions'], '', $path); return $path; } protected function getRequestMethod () { $method = $_SERVER['REQUEST_METHOD']; if (isset($_SERVER['HTTP_X_HTTP_METHOD_OVERRIDE'])){ $method = $_SERVER['HTTP_X_HTTP_METHOD_OVERRIDE']; } if($method=='HEAD')$method='GET'; return $method; } protected function getRequestFormat () { $format=NULL; if(isset($_SERVER['CONTENT_TYPE'])){ $mime = explode(';', $_SERVER['CONTENT_TYPE']); $mime = $mime[0]; if($mime==UrlEncodedFormat::MIME){ $format = new UrlEncodedFormat(); }else{ if(isset($this->format_map[$mime])){ $format = $this->format_map[$mime]; $format = is_string($format) ? new $format: $format; $format->setMIME($mime); } } } return $format; } protected function getResponseFormat () { $format=NULL; $extensions = explode('.', parse_url($_SERVER['REQUEST_URI'], PHP_URL_PATH)); while($extensions){ $extension = array_pop($extensions); $extension = explode('/', $extension); $extension = array_shift($extension); if($extension && isset($this->format_map[$extension])){ $format = $this->format_map[$extension]; $format = is_string($format) ? new $format: $format; $format->setExtension($extension); return $format; } } if(isset($_SERVER['HTTP_ACCEPT'])){ $acceptList = array(); $accepts = explode(',', strtolower($_SERVER['HTTP_ACCEPT'])); if (!is_array($accepts)) $accepts = array($accepts); foreach ($accepts as $pos => $accept) { $parts = explode(';q=', trim($accept)); $type = array_shift($parts); $quality = count($parts) ? floatval(array_shift($parts)) : (1000 - $pos) / 1000; $acceptList[$type] = $quality; } arsort($acceptList); foreach ($acceptList as $accept => $quality) { if(isset($this->format_map[$accept])){ $format = $this->format_map[$accept]; $format = is_string($format) ? new $format: $format; $format->setMIME($accept); header("Vary: Accept"); return $format; } } } else { $_SERVER['HTTP_ACCEPT'] = '*/*'; } if (strpos($_SERVER['HTTP_ACCEPT'], '*') !== FALSE) { if (strpos($_SERVER['HTTP_ACCEPT'], 'application/*') !== FALSE) { $format = new JsonFormat; } elseif (strpos($_SERVER['HTTP_ACCEPT'], 'text/*') !== FALSE) { $format = new XmlFormat; } elseif (strpos($_SERVER['HTTP_ACCEPT'], '*/*') !== FALSE) { $format = new $this->format_map['default']; } } if (empty($format)) { header('HTTP/1.1 406 Not Acceptable'); die('406 Not Acceptable: The server was unable to negotiate content for this request.'); } else { header("Vary: Accept"); return $format; } } protected function getRequestData() { try{ $r = file_get_contents('php://input'); if(is_null($r))return $_GET; $r =$this->request_format->decode($r); return is_null($r) ? array(): $r; } catch (RestException $e) { $this->handleError($e->getCode(), $e->getMessage()); } } protected function mapUrlToMethod () { if(!isset($this->routes[$this->request_method])){ return array(); } $urls = $this->routes[$this->request_method]; if(!$urls)return array(); $found = FALSE; $this->request_data += $_GET; $params = array('request_data'=>$this->request_data); $params += $this->request_data; $lc = strtolower($this->url); foreach ($urls as $url => $call) { $call = (object)$call; if(strstr($url, ':')){ $regex = preg_replace('/\\\:([^\/]+)/', '(?P<$1>[^/]+)', preg_quote($url)); if (preg_match(":^$regex$:i", $this->url, $matches)) { foreach ($matches as $arg => $match) { if (isset($call->arguments[$arg])){ $params[$arg] = $match; } } $found = TRUE; break; } }elseif ($url == $lc){ $found = TRUE; break; } } if($found){ $p = $call->defaults; foreach ($call->arguments as $key => $value) { if(isset($params[$key]))$p[$value] = $params[$key]; } $call->arguments=$p; return $call; } } protected function applyClassMetadata($class_name, $instance, $method_info){ if(isset($method_info->metadata[$class_name]) && is_array($method_info->metadata[$class_name])){ foreach ($method_info->metadata[$class_name] as $property => $value){ if(property_exists($class_name, $property)){ $reflection_property = new ReflectionProperty($class_name, $property); $reflection_property->setValue($instance, $value); } } } } protected function loadCache() { if ($this->cached !== NULL) { return; } $file = $this->cache_dir . '/routes.php'; $this->cached = FALSE; if ($this->production_mode) { if (file_exists($file)) { $routes = include($file); } if (isset($routes) && is_array($routes)) { $this->routes = $routes; $this->cached = TRUE; } } else { } } protected function generateMap ($class_name, $base_path = '') { $reflection = new ReflectionClass($class_name); $class_metadata = parse_doc($reflection->getDocComment()); $methods = $reflection->getMethods( ReflectionMethod::IS_PUBLIC + ReflectionMethod::IS_PROTECTED); foreach ($methods as $method) { $doc = $method->getDocComment(); $arguments = array(); $defaults = array(); $metadata = $class_metadata+parse_doc($doc); $params = $method->getParameters(); $position=0; foreach ($params as $param){ $arguments[$param->getName()] = $position; $defaults[$position] = $param->isDefaultValueAvailable() ? $param->getDefaultValue() : NULL; $position++; } $method_flag = $method->isProtected() ? (isRestlerCompatibilityModeEnabled() ? 2 : 3) : (isset($metadata['protected']) ? 1 : 0); $call = array( 'class_name'=>$class_name, 'method_name'=>$method->getName(), 'arguments'=>$arguments, 'defaults'=>$defaults, 'metadata'=>$metadata, 'method_flag'=>$method_flag ); $method_url = strtolower($method->getName()); if (preg_match_all( '/@url\s+(GET|POST|PUT|DELETE|HEAD|OPTIONS)[ \t]*\/?(\S*)/s', $doc, $matches, PREG_SET_ORDER)) { foreach ($matches as $match) { $http_method = $match[1]; $url = rtrim($base_path . $match[2],'/'); $this->routes[$http_method][$url] = $call; } }elseif($method_url[0] != '_'){ if (preg_match_all('/^(GET|POST|PUT|DELETE|HEAD|OPTIONS)/i', $method_url, $matches)) { $http_method = strtoupper($matches[0][0]); $method_url = substr($method_url, strlen($http_method)); }else{ $http_method = 'GET'; } $url = $base_path. ($method_url=='index' || $method_url=='default' ? '' : $method_url); $url = rtrim($url,'/'); $this->routes[$http_method][$url] = $call; foreach ($params as $param){ if($param->getName()=='request_data'){ break; } $url .= $url=='' ? ':' : '/:'; $url .= $param->getName(); $this->routes[$http_method][$url] = $call; } } } } } if(version_compare(PHP_VERSION, '5.3.0') < 0){ require_once 'compat.php'; } class RestException extends Exception { public function __construct($http_status_code, $error_message = NULL) { parent::__construct($error_message, $http_status_code); } } interface iRespond { public function __formatResponse($result); public function __formatError($status_code, $message); } class DefaultResponse implements iRespond { function __formatResponse($result) { return $result; } function __formatError($statusCode, $message) { return array('error' => array('code' => $statusCode, 'message' => $message)); } } interface iAuthenticate { public function __isAuthenticated(); } interface iFormat { public function getMIMEMap(); public function setMIME($mime); public function getMIME(); public function setExtension($extension); public function getExtension(); public function encode($data, $human_readable=FALSE); public function decode($data); } class UrlEncodedFormat implements iFormat { const MIME = 'application/x-www-form-urlencoded'; const EXTENSION = 'post'; public function getMIMEMap() { return array(self::EXTENSION=>self::MIME); } public function getMIME(){ return self::MIME; } public function getExtension(){ return self::EXTENSION; } public function setMIME($mime){ } public function setExtension($extension){ } public function encode($data, $human_readable=FALSE){ return http_build_query($data); } public function decode($data){ parse_str($data,$r); return $r; } public function __toString(){ return $this->getExtension(); } } class JsonFormat implements iFormat { const MIME ='application/json,application/javascript'; static $mime = 'application/json'; const EXTENSION = 'json'; public function getMIMEMap() { return array(self::EXTENSION=>self::MIME); } public function getMIME(){ return self::$mime; } public function getExtension(){ return self::EXTENSION; } public function setMIME($mime){ self::$mime = $mime; } public function setExtension($extension){ } public function encode($data, $human_readable=FALSE){ return $human_readable ? $this->json_format(json_encode(object_to_array($data))) : json_encode(object_to_array($data)); } public function decode($data) { $decoded = json_decode ( $data ); if (function_exists ( 'json_last_error' )) { $message = ''; switch (json_last_error ()) { case JSON_ERROR_NONE : return object_to_array ( $decoded ); break; case JSON_ERROR_DEPTH : $message = 'maximum stack depth exceeded'; break; case JSON_ERROR_STATE_MISMATCH : $message = 'underflow or the modes mismatch'; break; case JSON_ERROR_CTRL_CHAR : $message = 'unexpected control character found'; break; case JSON_ERROR_SYNTAX : $message = 'malformed JSON'; break; case JSON_ERROR_UTF8 : $message = 'malformed UTF-8 characters, possibly incorrectly encoded'; break; default : $message = 'unknown error'; break; } throw new RestException ( 400, 'Error parsing JSON, ' . $message ); } else if (strlen ( $data ) && $decoded === NULL || $decoded === $data) { throw new RestException ( 400, 'Error parsing JSON' ); } return object_to_array ( $decoded ); } private function json_format($json) { $tab = "  "; $new_json = ""; $indent_level = 0; $in_string = FALSE; $len = strlen($json); for($c = 0; $c < $len; $c++) { $char = $json[$c]; switch($char) { case '{': case '[': if(!$in_string) { $new_json .= $char . "\n" . str_repeat($tab, $indent_level+1); $indent_level++; } else { $new_json .= $char; } break; case '}': case ']': if(!$in_string) { $indent_level--; $new_json .= "\n".str_repeat($tab, $indent_level).$char; } else { $new_json .= $char; } break; case ',': if(!$in_string) { $new_json .= ",\n" . str_repeat($tab, $indent_level); } else { $new_json .= $char; } break; case ':': if(!$in_string) { $new_json .= ": "; } else { $new_json .= $char; } break; case '"': if($c==0){ $in_string = TRUE; }elseif($c > 0 && $json[$c-1] != '\\') { $in_string = !$in_string; } default: $new_json .= $char; break; } } return $new_json; } public function __toString(){ return $this->getExtension(); } } class DocParser { private $params=array(); function parse($doc='') { if($doc==''){ return $this->params; } if(preg_match('#^/\*\*(.*)\*/#s', $doc, $comment) === false) return $this->params; $comment = trim($comment[1]); if(preg_match_all('#^\s*\*(.*)#m', $comment, $lines) === false) return $this->params; $this->parseLines($lines[1]); return $this->params; } private function parseLines($lines) { foreach($lines as $line) { $parsedLine = $this->parseLine($line); if($parsedLine === false && !isset($this->params['description'])) { if(isset($desc)){ $this->params['description'] = implode(PHP_EOL, $desc); } $desc = array(); } elseif($parsedLine !== false) { $desc[] = $parsedLine; } } $desc = implode(' ', $desc); if(!empty($desc))$this->params['long_description'] = $desc; } private function parseLine($line) { $line = trim($line); if(empty($line)) return false; if(strpos($line, '@') === 0) { if(strpos($line, ' ')>0){ $param = substr($line, 1, strpos($line, ' ') - 1); $value = substr($line, strlen($param) + 2); }else{ $param = substr($line, 1); $value = ''; } if($this->setParam($param, $value)) return false; } return $line; } private function setParam($param, $value) { if($param == 'param' || $param == 'return') $value = $this->formatParamOrReturn($value); if($param == 'class') list($param, $value) = $this->formatClass($value); if(empty($this->params[$param])) { $this->params[$param] = $value; } else if($param == 'param'){ $arr = array($this->params[$param], $value); $this->params[$param] = $arr; } else { $this->params[$param] = $value + $this->params[$param]; } return true; } private function formatClass($value) { $r = preg_split("[\(|\)]", $value); if(count($r)>1){ $param = $r[0]; parse_str($r[1],$value); foreach ($value as $key => $val) { $val = explode(',', $val); if(count($val)>1)$value[$key]=$val; } }else{ $param='Unknown'; } return array($param, $value); } private function formatParamOrReturn($string) { $pos = strpos($string, ' '); $type = substr($string, 0, $pos); return '(' . $type . ')' . substr($string, $pos+1); } } function parse_doc($php_doc_comment){ $p = new DocParser(); return $p->parse($php_doc_comment); $p = new Parser($php_doc_comment); return $p; $php_doc_comment = preg_replace("/(^[\\s]*\\/\\*\\*)
                                  |(^[\\s]\\*\\/)
                                  |(^[\\s]*\\*?\\s)
                                  |(^[\\s]*)

From 0027ad80df270e86562fd138d9f4b9bc9f0af434 Mon Sep 17 00:00:00 2001
From: Nick Adams <nick89@zoho.com>
Date: Sun, 1 Jul 2012 01:13:45 +1200
Subject: [PATCH 46/61] Formatted restler.php (by hand)

---
 restler/restler.php | 2406 +++++++++++++++++++++++--------------------
 1 file changed, 1285 insertions(+), 1121 deletions(-)

diff --git a/restler/restler.php b/restler/restler.php
index 782ad870e..d1e793c90 100644
--- a/restler/restler.php
+++ b/restler/restler.php
@@ -12,762 +12,852 @@
  * @link       http://luracast.com/products/restler/
  * @version    2.1.9
  */
-class Restler { 
-	const VERSION = '2.1.9';
-	/**
-	 * URL of the currently mapped service
-	 * @var string
-	 */
-	public $url;
-
-	/**
-	 * Http request method of the current request.
-	 * Any value between [GET, PUT, POST, DELETE]
-	 * @var string
-	 */
-	public $request_method;
-
-	/**
-	 * Requested data format. Instance of the current format class
-	 * which implements the iFormat interface
-	 * @var iFormat
-	 * @example jsonFormat, xmlFormat, yamlFormat etc
-	 */
-	public $request_format;
-
-	/**
-	 * Data sent to the service
-	 * @var array
-	 */
-	public $request_data=array();
-
-	/**
-	 * Used in production mode to store the URL Map to disk
-	 * @var string
-	 */
-	public $cache_dir;
-
-	/**
-	 * base directory to locate format and auth files
-	 * @var string
-	 */
-	public $base_dir;
-
-	/**
-	 * Name of an iRespond implementation class
-	 * @var string
-	 */
-	public $response = 'DefaultResponse';
-
-	/**
-	 * Response data format. Instance of the current format class
-	 * which implements the iFormat interface
-	 * @var iFormat
-	 * @example jsonFormat, xmlFormat, yamlFormat etc
-	 */
-	public $response_format;
-
-	///////////////////////////////////////
-
-	/**
-	 * When set to FALSE, it will run in debug mode and parse the
-	 * class files every time to map it to the URL
-	 * @var boolean
-	 */
-	protected $production_mode;
-
-	/**
-	 * Associated array that maps urls to their respective class and method
-	 * @var array
-	 */
-	protected $routes= array();
-
-	/**
-	 * Associated array that maps formats to their respective format class name
-	 * @var array
-	 */
-	protected $format_map = array();
-
-	/**
-	 * Instance of the current api service class
-	 * @var object
-	 */
-	protected $service_class_instance;
-
-	/**
-	 * Name of the api method being called
-	 * @var string
-	 */
-	protected $service_method;
-
-	/**
-	 * list of authentication classes
-	 * @var array
-	 */
-	protected $auth_classes = array();
-
-	/**
-	 * list of error handling classes
-	 * @var array
-	 */
-	protected $error_classes = array();
-
-	/**
-	 * HTTP status codes
-	 * @var array
-	 */
-	private $codes = array(
-	100 => 'Continue',
-	101 => 'Switching Protocols',
-	200 => 'OK',
-	201 => 'Created',
-	202 => 'Accepted',
-	203 => 'Non-Authoritative Information',
-	204 => 'No Content',
-	205 => 'Reset Content',
-	206 => 'Partial Content',
-	300 => 'Multiple Choices',
-	301 => 'Moved Permanently',
-	302 => 'Found',
-	303 => 'See Other',
-	304 => 'Not Modified',
-	305 => 'Use Proxy',
-	306 => '(Unused)',
-	307 => 'Temporary Redirect',
-	400 => 'Bad Request',
-	401 => 'Unauthorized',
-	402 => 'Payment Required',
-	403 => 'Forbidden',
-	404 => 'Not Found',
-	405 => 'Method Not Allowed',
-	406 => 'Not Acceptable',
-	407 => 'Proxy Authentication Required',
-	408 => 'Request Timeout',
-	409 => 'Conflict',
-	410 => 'Gone',
-	411 => 'Length Required',
-	412 => 'Precondition Failed',
-	413 => 'Request Entity Too Large',
-	414 => 'Request-URI Too Long',
-	415 => 'Unsupported Media Type',
-	416 => 'Requested Range Not Satisfiable',
-	417 => 'Expectation Failed',
-	500 => 'Internal Server Error',
-	501 => 'Not Implemented',
-	502 => 'Bad Gateway',
-	503 => 'Service Unavailable',
-	504 => 'Gateway Timeout',
-	505 => 'HTTP Version Not Supported'
-	);
-
-	/**
-	 * Caching of url map is enabled or not
-	 * @var boolean
-	 */
-	protected $cached;
-
-	/**
-	 * Constructor
-	 * @param boolean $production_mode When set to FALSE, it will run in
-	 * debug mode and parse the class files every time to map it to the URL
-	 */
-	public function __construct ($production_mode = FALSE) {
-		$this->production_mode = $production_mode;
-		$this->cache_dir = getcwd();
-		$this->base_dir = RESTLER_PATH;
-	}
-
-	/**
-	 * Store the url map cache if needed
-	 */
-	public function __destruct () {
-		if ($this->production_mode && !$this->cached) {
-			$this->saveCache();
-		}
-	}
-
-	/**
-	 * Use it in production mode to refresh the url map cache
-	 */
-	public function refreshCache () {
-		$this->routes = array();
-		$this->cached = FALSE;
-	}
-
-	/**
-	 * Call this method and pass all the formats that should be
-	 * supported by the API. Accepts multiple parameters
-	 * @param string class name of the format class that implements iFormat
-	 * @example $restler->setSupportedFormats('JsonFormat', 'XmlFormat'...);
-	 */
-	public function setSupportedFormats () {
-		$args = func_get_args();
-		$extensions = array();
-		foreach ($args as $class_name) {
-			if(!is_string($class_name) || !class_exists($class_name)){
-				throw new Exception("$class_name is not a vaild Format Class.");
-			}
-			$obj = new $class_name;
-			if(! $obj instanceof iFormat){
-				throw new Exception('Invalid format class; must implement '.
-				'iFormat interface');
-			}
-			foreach ($obj->getMIMEMap() as $extension => $mime) {
-				if(!isset($this->format_map[$extension]))
-				$this->format_map[$extension]=$class_name;
-				$mime = explode(',', $mime);
-				if (!is_array($mime)) $mime = array($mime);
-				foreach ($mime as $value) {
-				if(!isset($this->format_map[$value]))
-					$this->format_map[$value]=$class_name;
-				}
-				$extensions[".$extension"]=TRUE;
-			}
-		}
-		$this->format_map['default']=$args[0];
-		$this->format_map['extensions']=array_keys($extensions);
-	}
-
-	/**
-	 * Add api classes throgh this method. All the public methods
-	 * that do not start with _ (underscore) will be  will be exposed
-	 * as the public api by default.
-	 *
-	 * All the protected methods that do not start with _ (underscore)
-	 * will exposed as protected api which will require authentication
-	 * @param string $class name of the service class
-	 * @param string $basePath optional url prefix for mapping, uses
-	 * lowercase version of the class name when not specified
-	 * @throws Exception when supplied with invalid class name
-	 */
-	public function addAPIClass($class_name, $base_path = NULL) {
-		if(!class_exists($class_name)){
-			throw new Exception("API class $class_name is missing.");
-		}
-		$this->loadCache();
-		if(!$this->cached){
-			if(is_null($base_path)){
-				$base_path=strtolower($class_name);
-				$index = strrpos($class_name, '\\');
-				if($index!==FALSE){
-					$base_path=substr($base_path, $index+1);
-				}
-			}else			
-				$base_path = trim($base_path,'/');
-			if(strlen($base_path)>0)$base_path .= '/';
-			$this->generateMap($class_name, $base_path);
-		}
-	}
-
-	/**
-	 * protected methods will need atleast one authentication class to be set
-	 * in order to allow that method to be executed
-	 * @param string $class_name of the authentication class
-	 * @param string $base_path optional url prefix for mapping
-	 */
-	public function addAuthenticationClass ($class_name, $base_path = NULL) {
-		$this->auth_classes[] = $class_name;
-		$this->addAPIClass($class_name, $base_path);
-	}
-
-	/**
-	 * Add class for custom error handling
-	 * @param string $class_name of the error handling class
-	 */
-	public function addErrorClass ($class_name) {
-		$this->error_classes[] = $class_name;
-	}
-
-	/**
-	 * Convenience method to respond with an error message
-	 * @param int $statusCode http error code
-	 * @param string $errorMessage optional custom error message
-	 */
-	public function handleError ($status_code, $error_message = NULL) {
-		$method = "handle$status_code";
-		$handled = FALSE;
-		foreach ($this->error_classes as $class_name) {
-			if (method_exists($class_name, $method)) {
-				$obj = new $class_name();
-				$obj->restler = $this;
-				$obj->$method();
-				$handled = TRUE;
-			}
-		}
-		if($handled)return;
-		$message = $this->codes[$status_code] .
-		(!$error_message ? '' : ': ' . $error_message);
-		$this->setStatus($status_code);
-		$responder = new $this->response();
-		$responder->restler = $this;
-		$this->sendData($responder->__formatError($status_code, $message));
-	}
-
-	/**
-	 * Main function for processing the api request
-	 * and return the response
-	 * @throws Exception when the api service class is missing
-	 * @throws RestException to send error response
-	 */
-	public function handle () {
-		if(empty($this->format_map))$this->setSupportedFormats('JsonFormat');
-		$this->url = $this->getPath();
-		$this->request_method = $this->getRequestMethod();
-		$this->response_format = $this->getResponseFormat();
-		$this->request_format = $this->getRequestFormat();
-		if(is_null($this->request_format)){
-			$this->request_format = $this->response_format;
-		}
-		if($this->request_method == 'PUT' || $this->request_method == 'POST'){
-			$this->request_data = $this->getRequestData();
-		}
-		$o = $this->mapUrlToMethod();
-		if(!isset($o->class_name)){
-			$this->handleError(404);
-		}else{
-			try {
-				if($o->method_flag){
-					$auth_method = '__isAuthenticated';
-					if(!count($this->auth_classes))throw new RestException(401);
-					foreach ($this->auth_classes as $auth_class) {
-						$auth_obj = new $auth_class();
-						$auth_obj->restler=$this;
-						$this->applyClassMetadata($auth_class, $auth_obj, $o);
-						if (!method_exists($auth_obj, $auth_method)) {
-							throw new RestException(401, 'Authentication Class '.
-							'should implement iAuthenticate');
-						}elseif(!$auth_obj->$auth_method()){
-							throw new RestException(401);
-						}
-					}
-				}
-				$this->applyClassMetadata(get_class($this->request_format),
-				$this->request_format, $o);
-				$pre_process = '_'.$this->request_format->getExtension().'_'.
-				$o->method_name;
-				$this->service_method = $o->method_name;
-				if($o->method_flag==2)$o=unprotect($o);
-				$object = $this->service_class_instance = new $o->class_name();
-				$object->restler=$this;
-				if(method_exists($o->class_name, $pre_process)) {
-					call_user_func_array(array($object, $pre_process),
-					$o->arguments);
-				}
-				switch ($o->method_flag) {
-					case 3:
-						$reflection_method = new ReflectionMethod($object,
-						$o->method_name);
-						$reflection_method->setAccessible(TRUE);
-						$result = $reflection_method->invokeArgs($object,
-						$o->arguments);
-						break;
-					case 2:
-					case 1:
-					default:
-						$result = call_user_func_array(array($object,
-						$o->method_name), $o->arguments);
-				}
-			} catch (RestException $e) {
-				$this->handleError($e->getCode(), $e->getMessage());
-			}
-		}
-		$responder = new $this->response();
-		$responder->restler = $this;
-		$this->applyClassMetadata($this->response, $responder, $o);
-		if (isset($result) && $result !== NULL) {
-			$result = $responder->__formatResponse($result);
-			$this->sendData($result);
-		}
-	}
-
-	/**
-	 * Encodes the response in the prefered format
-	 * and sends back
-	 * @param $data array php data
-	 */
-	public function sendData($data)
-	{
-		$data =  $this->response_format->encode($data, !$this->production_mode);
-		$post_process =  '_'.$this->service_method .'_'.
-		$this->response_format->getExtension();
-		if(isset($this->service_class_instance) &&
-		method_exists($this->service_class_instance,$post_process)){
-			$data = call_user_func(array($this->service_class_instance,
-			$post_process), $data);
-		}
-		header("Cache-Control: no-cache, must-revalidate");
-		header("Expires: 0");
-		header('Content-Type: ' . $this->response_format->getMIME());
-		//header('Content-Type: ' . $this->response_format->getMIME().'; charset=utf-8');
-		header("X-Powered-By: Luracast Restler v".Restler::VERSION);
-		die($data);
-	}
-
-	/**
-	 * Sets the HTTP response status
-	 * @param int $code response code
-	 */
-	public function setStatus($code)
-	{
-		header("{$_SERVER['SERVER_PROTOCOL']} $code ".
-		$this->codes[strval($code)]);
-	}
-
-	/**
-	 * Compare two strings and remove the common
-	 * sub string from the first string and return it
-	 * @param string $first
-	 * @param string $second
-	 * @param string $char optional, set it as
-	 * blank string for char by char comparison
-	 * @return string
-	 */
-	public function removeCommonPath($first, $second, $char='/'){
-		$first = explode($char, $first);
-		$second = explode($char, $second);
-		while (count($second)){
-			if($first[0]==$second[0]){
-				array_shift($first);
-			} else break;
-			array_shift($second);
-		}
-		return implode($char, $first);
-	}
-
-	public function saveCache() {
-		$file = $this->cache_dir . '/routes.php';
-		$s = '$o=array();'.PHP_EOL;
-		foreach ($this->routes as $key => $value) {
-			$s .= PHP_EOL.PHP_EOL.PHP_EOL."############### $key ###############"
-			.PHP_EOL.PHP_EOL;
-			$s .= '$o[\''.$key.'\']=array();';
-			foreach ($value as $ke => $va) {
-				$s .= PHP_EOL.PHP_EOL."#==== $key $ke".PHP_EOL.PHP_EOL;
-				$s .= '$o[\''.$key.'\'][\''.$ke.'\']='.str_replace(PHP_EOL,
-				PHP_EOL."\t", var_export($va, TRUE)).';';
-			}
-		}
-		$s .= PHP_EOL.'return $o;';
-		$r=@file_put_contents($file, "<?php $s");
-		@chmod($file, 0777);
-		if($r===FALSE)throw new Exception(
-			"The cache directory located at '$this->cache_dir' needs to have ".
-			"the permissions set to read/write/execute for everyone in order ".
-			"to save cache and improve performance.");
-	}
-
-	///////////////////////////////////////////////////////////////
-	/**
-	* Parses the requst url and get the api path
-	* @return string api path
-	*/
-	protected function getPath () {
-		$path = urldecode($this->removeCommonPath($_SERVER['REQUEST_URI'], 
-		$_SERVER['SCRIPT_NAME']));
-		$path = preg_replace('/(\/*\?.*$)|(\/$)/', '', $path);
-		$path = str_replace($this->format_map['extensions'], '', $path);
-		return $path;
-	}
-
-	/**
-	 * Parses the request to figure out the http request type
-	 * @return string which will be one of the following
-	 * [GET, POST, PUT, DELETE]
-	 * @example GET
-	 */
-	protected function getRequestMethod () {
-		$method = $_SERVER['REQUEST_METHOD'];
-		if (isset($_SERVER['HTTP_X_HTTP_METHOD_OVERRIDE'])){
-			$method = $_SERVER['HTTP_X_HTTP_METHOD_OVERRIDE'];
-		}
-		//support for HEAD request
-		if($method=='HEAD')$method='GET';
-		return $method;
-	}
-
-	/**
-	 * Parses the request to figure out format of the request data
-	 * @return iFormat any class that implements iFormat
-	 * @example JsonFormat
-	 */
-	protected function getRequestFormat () {
-		$format=NULL;
-		//check if client has sent any information on request format
-		if(isset($_SERVER['CONTENT_TYPE'])){
-			$mime = explode(';', $_SERVER['CONTENT_TYPE']);
-			$mime = $mime[0];
-			if($mime==UrlEncodedFormat::MIME){
-				$format = new UrlEncodedFormat();
-			}else{
-				if(isset($this->format_map[$mime])){
-					$format = $this->format_map[$mime];
-					$format = is_string($format) ? new $format: $format;
-					$format->setMIME($mime);
-				}
-			}
-		}
-		return $format;
-	}
-
-	/**
-	 * Parses the request to figure out the best format for response
-	 * @return iFormat any class that implements iFormat
-	 * @example JsonFormat
-	 */
-	protected function getResponseFormat () {
-		//check if client has specified an extension
-		/**
-		* @var iFormat
-		*/
-		$format=NULL;
-		$extensions = explode('.', parse_url($_SERVER['REQUEST_URI'],
-		PHP_URL_PATH));
-		while($extensions){
-			$extension = array_pop($extensions);
+class Restler
+{
+    // ==================================================================
+    //
+    // Public variables
+    //
+    // ------------------------------------------------------------------
+
+    const VERSION = '2.1.9';
+
+    /**
+     * URL of the currently mapped service
+     * @var string
+     */
+    public $url;
+
+    /**
+     * Http request method of the current request.
+     * Any value between [GET, PUT, POST, DELETE]
+     * @var string
+     */
+    public $request_method;
+
+    /**
+     * Requested data format. Instance of the current format class
+     * which implements the iFormat interface
+     * @var iFormat
+     * @example jsonFormat, xmlFormat, yamlFormat etc
+     */
+    public $request_format;
+
+    /**
+     * Data sent to the service
+     * @var array
+     */
+    public $request_data = array();
+
+    /**
+     * Used in production mode to store the URL Map to disk
+     * @var string
+     */
+    public $cache_dir;
+
+    /**
+     * base directory to locate format and auth files
+     * @var string
+     */
+    public $base_dir;
+
+    /**
+     * Name of an iRespond implementation class
+     * @var string
+     */
+    public $response = 'DefaultResponse';
+
+    /**
+     * Response data format. Instance of the current format class
+     * which implements the iFormat interface
+     * @var iFormat
+     * @example jsonFormat, xmlFormat, yamlFormat etc
+     */
+    public $response_format;
+
+    // ==================================================================
+    //
+    // Private & Protected variables
+    //
+    // ------------------------------------------------------------------
+
+    /**
+     * When set to FALSE, it will run in debug mode and parse the
+     * class files every time to map it to the URL
+     * @var boolean
+     */
+    protected $production_mode;
+
+    /**
+     * Associated array that maps urls to their respective class and method
+     * @var array
+     */
+    protected $routes = array();
+
+    /**
+     * Associated array that maps formats to their respective format class name
+     * @var array
+     */
+    protected $format_map = array();
+
+    /**
+     * Instance of the current api service class
+     * @var object
+     */
+    protected $service_class_instance;
+
+    /**
+     * Name of the api method being called
+     * @var string
+     */
+    protected $service_method;
+
+    /**
+     * list of authentication classes
+     * @var array
+     */
+    protected $auth_classes = array();
+
+    /**
+     * list of error handling classes
+     * @var array
+     */
+    protected $error_classes = array();
+
+    /**
+     * HTTP status codes
+     * @var array
+     */
+    private $codes = array(
+        100 => 'Continue',
+        101 => 'Switching Protocols',
+        200 => 'OK',
+        201 => 'Created',
+        202 => 'Accepted',
+        203 => 'Non-Authoritative Information',
+        204 => 'No Content',
+        205 => 'Reset Content',
+        206 => 'Partial Content',
+        300 => 'Multiple Choices',
+        301 => 'Moved Permanently',
+        302 => 'Found',
+        303 => 'See Other',
+        304 => 'Not Modified',
+        305 => 'Use Proxy',
+        306 => '(Unused)',
+        307 => 'Temporary Redirect',
+        400 => 'Bad Request',
+        401 => 'Unauthorized',
+        402 => 'Payment Required',
+        403 => 'Forbidden',
+        404 => 'Not Found',
+        405 => 'Method Not Allowed',
+        406 => 'Not Acceptable',
+        407 => 'Proxy Authentication Required',
+        408 => 'Request Timeout',
+        409 => 'Conflict',
+        410 => 'Gone',
+        411 => 'Length Required',
+        412 => 'Precondition Failed',
+        413 => 'Request Entity Too Large',
+        414 => 'Request-URI Too Long',
+        415 => 'Unsupported Media Type',
+        416 => 'Requested Range Not Satisfiable',
+        417 => 'Expectation Failed',
+        500 => 'Internal Server Error',
+        501 => 'Not Implemented',
+        502 => 'Bad Gateway',
+        503 => 'Service Unavailable',
+        504 => 'Gateway Timeout',
+        505 => 'HTTP Version Not Supported'
+    );
+
+    /**
+     * Caching of url map is enabled or not
+     * @var boolean
+     */
+    protected $cached;
+
+    // ==================================================================
+    //
+    // Public functions
+    //
+    // ------------------------------------------------------------------
+
+    /**
+     * Constructor
+     * @param boolean $production_mode When set to FALSE, it will run in
+     * debug mode and parse the class files every time to map it to the URL
+     */
+    public function __construct($production_mode = FALSE)
+    {
+        $this->production_mode = $production_mode;
+        $this->cache_dir       = getcwd();
+        $this->base_dir        = RESTLER_PATH;
+    }
+
+    /**
+     * Store the url map cache if needed
+     */
+    public function __destruct()
+    {
+        if ($this->production_mode && !($this->cached)) {
+            $this->saveCache();
+        }
+    }
+
+    /**
+     * Use it in production mode to refresh the url map cache
+     */
+    public function refreshCache()
+    {
+        $this->routes = array();
+        $this->cached = FALSE;
+    }
+
+    /**
+     * Call this method and pass all the formats that should be
+     * supported by the API. Accepts multiple parameters
+     * @param string class name of the format class that implements iFormat
+     * @example $restler->setSupportedFormats('JsonFormat', 'XmlFormat'...);
+     */
+    public function setSupportedFormats()
+    {
+        $args = func_get_args();
+        $extensions = array();
+        foreach ($args as $class_name) {
+            if (!is_string($class_name) || !class_exists($class_name)) {
+                throw new Exception("$class_name is not a vaild Format Class.");
+            }
+            $obj = new $class_name;
+            if (!($obj instanceof iFormat)) {
+                throw new Exception('Invalid format class; must implement '
+                    . 'iFormat interface');
+            }
+            foreach ($obj->getMIMEMap() as $extension => $mime) {
+                if (!isset($this->format_map[$extension])) {
+                    $this->format_map[$extension] = $class_name;
+                }
+                $mime = explode(',', $mime);
+                if (!is_array($mime)) {
+                    $mime = array($mime);
+                }
+                foreach ($mime as $value) {
+                    if (!isset($this->format_map[$value]))
+                        $this->format_map[$value] = $class_name;
+                    }
+                $extensions[".$extension"] = TRUE;
+            }
+        }
+        $this->format_map['default']    = $args[0];
+        $this->format_map['extensions'] = array_keys($extensions);
+    }
+
+    /**
+     * Add api classes throgh this method. All the public methods
+     * that do not start with _ (underscore) will be  will be exposed
+     * as the public api by default.
+     *
+     * All the protected methods that do not start with _ (underscore)
+     * will exposed as protected api which will require authentication
+     * @param string $class name of the service class
+     * @param string $basePath optional url prefix for mapping, uses
+     * lowercase version of the class name when not specified
+     * @throws Exception when supplied with invalid class name
+     */
+    public function addAPIClass($class_name, $base_path = NULL)
+    {
+        if (!class_exists($class_name)) {
+            throw new Exception("API class $class_name is missing.");
+        }
+        $this->loadCache();
+        if (!$this->cached) {
+            if (is_null($base_path)) {
+                $base_path = strtolower($class_name);
+                $index = strrpos($class_name, '\\');
+                if ($index !== FALSE) {
+                    $base_path = substr($base_path, $index + 1);
+                }
+            } else {
+                $base_path = trim($base_path,'/');
+            }
+            if (strlen($base_path) > 0) {
+                $base_path .= '/';
+            }
+            $this->generateMap($class_name, $base_path);
+        }
+    }
+
+    /**
+     * protected methods will need atleast one authentication class to be set
+     * in order to allow that method to be executed
+     * @param string $class_name of the authentication class
+     * @param string $base_path optional url prefix for mapping
+     */
+    public function addAuthenticationClass($class_name, $base_path = NULL)
+    {
+        $this->auth_classes[] = $class_name;
+        $this->addAPIClass($class_name, $base_path);
+    }
+
+    /**
+     * Add class for custom error handling
+     * @param string $class_name of the error handling class
+     */
+    public function addErrorClass($class_name)
+    {
+        $this->error_classes[] = $class_name;
+    }
+
+    /**
+     * Convenience method to respond with an error message
+     * @param int $statusCode http error code
+     * @param string $errorMessage optional custom error message
+     */
+    public function handleError($status_code, $error_message = NULL)
+    {
+        $method  = "handle$status_code";
+        $handled = FALSE;
+        foreach ($this->error_classes as $class_name) {
+            if (method_exists($class_name, $method)) {
+                $obj          = new $class_name();
+                $obj->restler = $this;
+                $obj->$method();
+                $handled      = TRUE;
+            }
+        }
+        if ($handled) {
+            return;
+        }
+        $message = $this->codes[$status_code]
+            . (!$error_message ? '' : ': ' . $error_message);
+        $this->setStatus($status_code);
+        $responder          = new $this->response();
+        $responder->restler = $this;
+        $this->sendData($responder->__formatError($status_code, $message));
+    }
+
+    /**
+     * Main function for processing the api request
+     * and return the response
+     * @throws Exception when the api service class is missing
+     * @throws RestException to send error response
+     */
+    public function handle()
+    {
+        if (empty($this->format_map)) {
+            $this->setSupportedFormats('JsonFormat');
+        }
+        $this->url             = $this->getPath();
+        $this->request_method  = $this->getRequestMethod();
+        $this->response_format = $this->getResponseFormat();
+        $this->request_format  = $this->getRequestFormat();
+        if (is_null($this->request_format)) {
+            $this->request_format = $this->response_format;
+        }
+        if ($this->request_method == 'PUT' || $this->request_method == 'POST') {
+            $this->request_data = $this->getRequestData();
+        }
+        $o = $this->mapUrlToMethod();
+        if (!isset($o->class_name)) {
+            $this->handleError(404);
+        } else {
+            try {
+                if ($o->method_flag) {
+                    $auth_method = '__isAuthenticated';
+                    if (!count($this->auth_classes)) {
+                        throw new RestException(401);
+                    }
+                    foreach ($this->auth_classes as $auth_class) {
+                        $auth_obj          = new $auth_class();
+                        $auth_obj->restler = $this;
+                        $this->applyClassMetadata($auth_class, $auth_obj, $o);
+                        if (!method_exists($auth_obj, $auth_method)) {
+                            throw new RestException(401, 'Authentication Class '
+                                . 'should implement iAuthenticate');
+                        } else if (!$auth_obj->$auth_method()) {
+                            throw new RestException(401);
+                        }
+                    }
+                }
+                $this->applyClassMetadata(get_class($this->request_format),
+                $this->request_format, $o);
+                $pre_process = '_' . $this->request_format->getExtension() . '_'
+                    . $o->method_name;
+                $this->service_method = $o->method_name;
+                if ($o->method_flag == 2) {
+                    $o = unprotect($o);
+                }
+                $object = $this->service_class_instance = new $o->class_name();
+                $object->restler = $this;
+                if (method_exists($o->class_name, $pre_process)) {
+                    call_user_func_array(array($object, $pre_process),
+                                               $o->arguments);
+                }
+                switch ($o->method_flag) {
+                    case 3:
+                        $reflection_method = new ReflectionMethod($object,
+                                                                  $o->method_name);
+                        $reflection_method->setAccessible(TRUE);
+                        $result = $reflection_method->invokeArgs($object,
+                                                                 $o->arguments);
+                        break;
+                    case 2:
+                    case 1:
+                    default:
+                        $result = call_user_func_array(array(
+                            $object,
+                            $o->method_name),
+                            $o->arguments
+                        );
+                        break;
+                }
+            } catch (RestException $e) {
+                $this->handleError($e->getCode(), $e->getMessage());
+            }
+        }
+        $responder = new $this->response();
+        $responder->restler = $this;
+        $this->applyClassMetadata($this->response, $responder, $o);
+        if (isset($result) && $result !== NULL) {
+            $result = $responder->__formatResponse($result);
+            $this->sendData($result);
+        }
+    }
+
+    /**
+     * Encodes the response in the prefered format
+     * and sends back
+     * @param $data array php data
+     */
+    public function sendData($data)
+    {
+        $data =  $this->response_format->encode($data, !($this->production_mode));
+        $post_process =  '_' . $this->service_method . '_'
+            . $this->response_format->getExtension();
+        if (isset($this->service_class_instance)
+            && method_exists($this->service_class_instance,$post_process)
+        ) {
+            $data = call_user_func(array($this->service_class_instance,
+            $post_process), $data);
+        }
+        header("Cache-Control: no-cache, must-revalidate");
+        header("Expires: 0");
+        header('Content-Type: ' . $this->response_format->getMIME());
+        //header('Content-Type: ' . $this->response_format->getMIME().'; charset=utf-8');
+        header("X-Powered-By: Luracast Restler v" . Restler::VERSION);
+        die($data);
+    }
+
+    /**
+     * Sets the HTTP response status
+     * @param int $code response code
+     */
+    public function setStatus($code)
+    {
+        header("{$_SERVER['SERVER_PROTOCOL']} $code " . $this->codes[strval($code)]);
+    }
+
+    /**
+     * Compare two strings and remove the common
+     * sub string from the first string and return it
+     * @param string $first
+     * @param string $second
+     * @param string $char optional, set it as
+     * blank string for char by char comparison
+     * @return string
+     */
+    public function removeCommonPath($first, $second, $char = '/')
+    {
+        $first  = explode($char, $first);
+        $second = explode($char, $second);
+        while (count($second)) {
+            if ($first[0] == $second[0]) {
+                array_shift($first);
+            } else {
+                break;
+            }
+            array_shift($second);
+        }
+        return implode($char, $first);
+    }
+
+    /**
+     * Save cache to file
+     */
+    public function saveCache()
+    {
+        $file = $this->cache_dir . '/routes.php';
+        $s    = '$o=array();' . PHP_EOL;
+        foreach ($this->routes as $key => $value) {
+            $s .= PHP_EOL . PHP_EOL . PHP_EOL . "############### $key ###############"
+                . PHP_EOL . PHP_EOL;
+            $s .= '$o[\'' . $key . '\']=array();';
+            foreach ($value as $ke => $va) {
+                $s .= PHP_EOL . PHP_EOL . "#==== $key $ke" . PHP_EOL . PHP_EOL;
+                $s .= '$o[\'' . $key . '\'][\'' . $ke . '\']=' . str_replace(
+                    PHP_EOL,
+                    PHP_EOL . "\t",
+                    var_export($va, TRUE)
+                ) . ';';
+            }
+        }
+        $s .= PHP_EOL . 'return $o;';
+        $r  = @file_put_contents($file, "<?php $s");
+        @chmod($file, 0777);
+        if ($r === FALSE) {
+            throw new Exception(
+                "The cache directory located at '$this->cache_dir' needs to have "
+                    . "the permissions set to read/write/execute for everyone in order "
+                    . "to save cache and improve performance.");
+        }
+    }
+
+    // ==================================================================
+    //
+    // Protected functions
+    //
+    // ------------------------------------------------------------------
+
+    /**
+    * Parses the requst url and get the api path
+    * @return string api path
+    */
+    protected function getPath()
+    {
+        $path = urldecode($this->removeCommonPath($_SERVER['REQUEST_URI'],
+                                                  $_SERVER['SCRIPT_NAME']));
+        $path = preg_replace('/(\/*\?.*$)|(\/$)/', '', $path);
+        $path = str_replace($this->format_map['extensions'], '', $path);
+        return $path;
+    }
+
+    /**
+     * Parses the request to figure out the http request type
+     * @return string which will be one of the following
+     * [GET, POST, PUT, DELETE]
+     * @example GET
+     */
+    protected function getRequestMethod()
+    {
+        $method = $_SERVER['REQUEST_METHOD'];
+        if (isset($_SERVER['HTTP_X_HTTP_METHOD_OVERRIDE'])) {
+            $method = $_SERVER['HTTP_X_HTTP_METHOD_OVERRIDE'];
+        }
+        //support for HEAD request
+        if ($method == 'HEAD') {
+            $method = 'GET';
+        }
+        return $method;
+    }
+
+    /**
+     * Parses the request to figure out format of the request data
+     * @return iFormat any class that implements iFormat
+     * @example JsonFormat
+     */
+    protected function getRequestFormat()
+    {
+        $format = NULL;
+        //check if client has sent any information on request format
+        if (isset($_SERVER['CONTENT_TYPE'])) {
+            $mime = explode(';', $_SERVER['CONTENT_TYPE']);
+            $mime = $mime[0];
+            if ($mime == UrlEncodedFormat::MIME) {
+                $format = new UrlEncodedFormat();
+            } else {
+                if (isset($this->format_map[$mime])) {
+                    $format = $this->format_map[$mime];
+                    $format = is_string($format) ? new $format : $format;
+                    $format->setMIME($mime);
+                }
+            }
+        }
+        return $format;
+    }
+
+    /**
+     * Parses the request to figure out the best format for response
+     * @return iFormat any class that implements iFormat
+     * @example JsonFormat
+     */
+    protected function getResponseFormat()
+    {
+        //check if client has specified an extension
+        /**
+        * @var iFormat
+        */
+        $format = NULL;
+        $extensions = explode('.', parse_url($_SERVER['REQUEST_URI'],
+                                             PHP_URL_PATH));
+        while($extensions) {
+            $extension = array_pop($extensions);
             $extension = explode('/', $extension);
             $extension = array_shift($extension);
-			if($extension && isset($this->format_map[$extension])){
-				$format = $this->format_map[$extension];
-				$format = is_string($format) ? new $format: $format;
-				$format->setExtension($extension);
-				//echo "Extension $extension";
-				return $format;
-			}
-		}
-		//check if client has sent list of accepted data formats
-		if(isset($_SERVER['HTTP_ACCEPT'])){
-			$acceptList = array();
-			$accepts = explode(',', strtolower($_SERVER['HTTP_ACCEPT']));
-			if (!is_array($accepts)) $accepts = array($accepts);
-			foreach ($accepts as $pos => $accept) {
-				$parts = explode(';q=', trim($accept));
-				$type = array_shift($parts);
-				$quality = count($parts) ? floatval(array_shift($parts)) : (1000 - $pos) / 1000;
-				$acceptList[$type] = $quality;
-			}
-			arsort($acceptList);
-			foreach ($acceptList as $accept => $quality) {
-			if(isset($this->format_map[$accept])){
-					$format = $this->format_map[$accept];
-					$format = is_string($format) ? new $format: $format;
-					$format->setMIME($accept);
-					//echo "MIME $accept";
-					header("Vary: Accept"); // Tell cache content is based on Accept header
-					return $format;
-				}
-			}
-		}
-		else {
-			// RFC 2616: If no Accept header field is
-			// present, then it is assumed that the
-			// client accepts all media types.
-			$_SERVER['HTTP_ACCEPT'] = '*/*'; 
-		}
-		if (strpos($_SERVER['HTTP_ACCEPT'], '*') !== FALSE) {
-			if (strpos($_SERVER['HTTP_ACCEPT'], 'application/*') !== FALSE) {
-				$format = new JsonFormat;
-			}
-			elseif (strpos($_SERVER['HTTP_ACCEPT'], 'text/*') !== FALSE) {
-				$format = new XmlFormat;
-			}
-			elseif (strpos($_SERVER['HTTP_ACCEPT'], '*/*') !== FALSE) {
-				$format = new $this->format_map['default'];
-			}
-		}
-		if (empty($format)) {
-			// RFC 2616: If an Accept header field is present, and if the server
-			// cannot send a response which is acceptable according to the combined
-			// Accept field value, then the server SHOULD send a 406 (not acceptable)
-			// response.
-			header('HTTP/1.1 406 Not Acceptable');
-			die('406 Not Acceptable: The server was unable to negotiate content for this request.');
-		}
-		else {
-			header("Vary: Accept"); // Tell cache content is based ot Accept header
-			return $format;
-		}
-	}
-
-	/**
-	 * Parses the request data and returns it
-	 * @return array php data
-	 */
-	protected function getRequestData()
-	{
-		try{
-			$r = file_get_contents('php://input');
-			if(is_null($r))return $_GET;
-			$r =$this->request_format->decode($r);
-			return is_null($r) ? array(): $r;
-		} catch (RestException $e) {
-			$this->handleError($e->getCode(), $e->getMessage());
-		}
-	}
-
-	protected function mapUrlToMethod () {
-		if(!isset($this->routes[$this->request_method])){
-			return array();
-		}
-		$urls = $this->routes[$this->request_method];
-		if(!$urls)return array();
-
-		$found = FALSE;
-		$this->request_data += $_GET;
-		$params = array('request_data'=>$this->request_data);
-		$params += $this->request_data;
-		$lc = strtolower($this->url);
-		foreach ($urls as $url => $call) {
-			//echo PHP_EOL.$url.' = '.$this->url.PHP_EOL;
-			$call = (object)$call;
-			if(strstr($url, ':')){
-				$regex = preg_replace('/\\\:([^\/]+)/', '(?P<$1>[^/]+)', 
-				preg_quote($url));
-				if (preg_match(":^$regex$:i", $this->url, $matches)) {
-					foreach ($matches as $arg => $match) {
-						if (isset($call->arguments[$arg])){
-							//flog("$arg => $match $args[$arg]");
-							$params[$arg] = $match;
-						}
-					}
-					$found = TRUE;
-					break;
-				}
-			}elseif ($url == $lc){
-				$found = TRUE;
-				break;
-			}
-		}
-		if($found){
-			//echo PHP_EOL."Found $url ";
-			//print_r($call);
-			$p = $call->defaults;
-			foreach ($call->arguments as $key => $value) {
-				//echo "$key => $value \n";
-				if(isset($params[$key]))$p[$value] = $params[$key];
-			}
-			$call->arguments=$p;
-			return $call;
-		}
-
-	}
-	/**
-	 * Apply static and non-static properties defined in
-	 * the method information anotation
-	 * @param String $class_name
-	 * @param Object $instance instance of that class
-	 * @param Object $method_info method information and metadata
-	 */
-	protected function applyClassMetadata($class_name, $instance, $method_info){
-		if(isset($method_info->metadata[$class_name]) && 
-		is_array($method_info->metadata[$class_name])){
-			foreach ($method_info->metadata[$class_name] 
-			as $property => $value){
-				if(property_exists($class_name, $property)){
-					$reflection_property = 
-					new ReflectionProperty($class_name, $property);
-					$reflection_property->setValue($instance, $value);
-				}
-			}
-		}
-	}
-
-	protected function loadCache()
-	{
-		if ($this->cached !== NULL) {
-			return;
-		}
-		$file = $this->cache_dir . '/routes.php';
-
-		$this->cached = FALSE;
-
-		if ($this->production_mode) {
-			if (file_exists($file)) {
-				$routes = include($file);
-			}
-			if (isset($routes) && is_array($routes)) {
-				$this->routes = $routes;
-				$this->cached = TRUE;
-			}
-		} else {
-			//@unlink($this->cache_dir . "/$name.php");
-		}
-	}
-
-	/**
-	 * Generates cachable url to method mapping
-	 * @param string $class_name
-	 * @param string $base_path
-	 */
-	protected function generateMap ($class_name, $base_path = '') {
-		$reflection = new ReflectionClass($class_name);
-		$class_metadata = parse_doc($reflection->getDocComment());
-		$methods = $reflection->getMethods(
-		ReflectionMethod::IS_PUBLIC + ReflectionMethod::IS_PROTECTED);
-		foreach ($methods as $method) {
-			$doc = $method->getDocComment();
-			$arguments = array();
-			$defaults = array();
-			$metadata = $class_metadata+parse_doc($doc);
-			$params = $method->getParameters();
-			$position=0;
-			foreach ($params as $param){
-				$arguments[$param->getName()] = $position;
-				$defaults[$position] = $param->isDefaultValueAvailable() ?
-					$param->getDefaultValue() : NULL;
-				$position++;
-			}
-			$method_flag = $method->isProtected() ?
-			(isRestlerCompatibilityModeEnabled() ? 2 :  3) :
-			(isset($metadata['protected']) ? 1 : 0);
-
-			//take note of the order
-			$call = array(
-			'class_name'=>$class_name,
-			'method_name'=>$method->getName(),
-			'arguments'=>$arguments,
-			'defaults'=>$defaults,
-			'metadata'=>$metadata,
-			'method_flag'=>$method_flag
-			);
-			$method_url = strtolower($method->getName());
-			if (preg_match_all(
-			'/@url\s+(GET|POST|PUT|DELETE|HEAD|OPTIONS)[ \t]*\/?(\S*)/s', 
-			$doc, $matches, PREG_SET_ORDER)) {
-				foreach ($matches as $match) {
-					$http_method = $match[1];
-					$url = rtrim($base_path . $match[2],'/');
-					$this->routes[$http_method][$url] = $call;
-				}
-			}elseif($method_url[0] != '_'){ //not prefixed with underscore
-				// no configuration found so use convention
-				if (preg_match_all('/^(GET|POST|PUT|DELETE|HEAD|OPTIONS)/i', 
-				$method_url, $matches)) {
-					$http_method = strtoupper($matches[0][0]);
-					$method_url = substr($method_url, strlen($http_method));
-				}else{
-					$http_method = 'GET';
-				}
-				$url = $base_path. ($method_url=='index' || 
-				$method_url=='default' ? '' : $method_url);
-				$url = rtrim($url,'/');
-				$this->routes[$http_method][$url] = $call;
-				foreach ($params as $param){
-					if($param->getName()=='request_data'){
-						break;
-					}
-					$url .= $url=='' ? ':' : '/:';
-					$url .= $param->getName();
-					$this->routes[$http_method][$url] = $call;
-				}
-			}
-		}
-	}
+            if ($extension && isset($this->format_map[$extension])) {
+                $format = $this->format_map[$extension];
+                $format = is_string($format) ? new $format : $format;
+                $format->setExtension($extension);
+                //echo "Extension $extension";
+                return $format;
+            }
+        }
+        //check if client has sent list of accepted data formats
+        if (isset($_SERVER['HTTP_ACCEPT'])) {
+            $acceptList = array();
+            $accepts    = explode(',', strtolower($_SERVER['HTTP_ACCEPT']));
+            if (!is_array($accepts)) {
+                $accepts = array($accepts);
+            }
+            foreach ($accepts as $pos => $accept) {
+                $parts   = explode(';q=', trim($accept));
+                $type    = array_shift($parts);
+                $quality = count($parts)
+                    ? floatval(array_shift($parts))
+                    : (1000 - $pos) / 1000;
+                $acceptList[$type] = $quality;
+            }
+            arsort($acceptList);
+            foreach ($acceptList as $accept => $quality) {
+                if (isset($this->format_map[$accept])) {
+                        $format = $this->format_map[$accept];
+                        $format = is_string($format) ? new $format : $format;
+                        $format->setMIME($accept);
+                        //echo "MIME $accept";
+                        header("Vary: Accept"); // Tell cache content is based on Accept header
+                        return $format;
+                    }
+            }
+        } else {
+            // RFC 2616: If no Accept header field is
+            // present, then it is assumed that the
+            // client accepts all media types.
+            $_SERVER['HTTP_ACCEPT'] = '*/*';
+        }
+        if (strpos($_SERVER['HTTP_ACCEPT'], '*') !== FALSE) {
+            if (strpos($_SERVER['HTTP_ACCEPT'], 'application/*') !== FALSE) {
+                $format = new JsonFormat;
+            }
+            else if (strpos($_SERVER['HTTP_ACCEPT'], 'text/*') !== FALSE) {
+                $format = new XmlFormat;
+            }
+            else if (strpos($_SERVER['HTTP_ACCEPT'], '*/*') !== FALSE) {
+                $format = new $this->format_map['default'];
+            }
+        }
+        if (empty($format)) {
+            // RFC 2616: If an Accept header field is present, and if the server
+            // cannot send a response which is acceptable according to the combined
+            // Accept field value, then the server SHOULD send a 406 (not acceptable)
+            // response.
+            header('HTTP/1.1 406 Not Acceptable');
+            die('406 Not Acceptable: The server was unable to negotiate content for this request.');
+        } else {
+            header("Vary: Accept"); // Tell cache content is based ot Accept header
+            return $format;
+        }
+    }
+
+    /**
+     * Parses the request data and returns it
+     * @return array php data
+     */
+    protected function getRequestData()
+    {
+        try{
+            $r = file_get_contents('php://input');
+            if (is_null($r)) {
+                return $_GET;
+            }
+            $r = $this->request_format->decode($r);
+            return is_null($r) ? array() : $r;
+        } catch (RestException $e) {
+            $this->handleError($e->getCode(), $e->getMessage());
+        }
+    }
+
+    protected function mapUrlToMethod()
+    {
+        if (!isset($this->routes[$this->request_method])) {
+            return array();
+        }
+        $urls = $this->routes[$this->request_method];
+        if (!$urls) {
+            return array();
+        }
+
+        $found               = FALSE;
+        $this->request_data += $_GET;
+        $params              = array('request_data' => $this->request_data);
+        $params             += $this->request_data;
+        $lc                  = strtolower($this->url);
+        foreach ($urls as $url => $call) {
+            //echo PHP_EOL.$url.' = '.$this->url.PHP_EOL;
+            $call = (object) $call;
+            if (strstr($url, ':')) {
+                $regex = preg_replace('/\\\:([^\/]+)/', '(?P<$1>[^/]+)',
+                                      preg_quote($url));
+                if (preg_match(":^$regex$:i", $this->url, $matches)) {
+                    foreach ($matches as $arg => $match) {
+                        if (isset($call->arguments[$arg])) {
+                            //flog("$arg => $match $args[$arg]");
+                            $params[$arg] = $match;
+                        }
+                    }
+                    $found = TRUE;
+                    break;
+                }
+            } else if ($url == $lc) {
+                $found = TRUE;
+                break;
+            }
+        }
+        if ($found) {
+            //echo PHP_EOL."Found $url ";
+            //print_r($call);
+            $p = $call->defaults;
+            foreach ($call->arguments as $key => $value) {
+                //echo "$key => $value \n";
+                if (isset($params[$key])) {
+                    $p[$value] = $params[$key];
+                }
+            }
+            $call->arguments = $p;
+            return $call;
+        }
+
+    }
+
+    /**
+     * Apply static and non-static properties defined in
+     * the method information anotation
+     * @param String $class_name
+     * @param Object $instance instance of that class
+     * @param Object $method_info method information and metadata
+     */
+    protected function applyClassMetadata($class_name, $instance, $method_info)
+    {
+        if (isset($method_info->metadata[$class_name])
+            && is_array($method_info->metadata[$class_name])
+        ) {
+            foreach ($method_info->metadata[$class_name] as $property => $value ) {
+                if (property_exists($class_name, $property)) {
+                    $reflection_property = new ReflectionProperty($class_name, $property);
+                    $reflection_property->setValue($instance, $value);
+                }
+            }
+        }
+    }
+
+    protected function loadCache()
+    {
+        if ($this->cached !== NULL) {
+            return;
+        }
+        $file = $this->cache_dir . '/routes.php';
+        $this->cached = FALSE;
+
+        if ($this->production_mode) {
+            if (file_exists($file)) {
+                $routes = include($file);
+            }
+            if (isset($routes) && is_array($routes)) {
+                $this->routes = $routes;
+                $this->cached = TRUE;
+            }
+        } else {
+            //@unlink($this->cache_dir . "/$name.php");
+        }
+    }
+
+    /**
+     * Generates cachable url to method mapping
+     * @param string $class_name
+     * @param string $base_path
+     */
+    protected function generateMap ($class_name, $base_path = '')
+    {
+        $reflection     = new ReflectionClass($class_name);
+        $class_metadata = parse_doc($reflection->getDocComment());
+        $methods        = $reflection->getMethods(
+            ReflectionMethod::IS_PUBLIC + ReflectionMethod::IS_PROTECTED
+        );
+        foreach ($methods as $method) {
+            $doc       = $method->getDocComment();
+            $arguments = array();
+            $defaults  = array();
+            $metadata  = $class_metadata + parse_doc($doc);
+            $params    = $method->getParameters();
+            $position  = 0;
+            foreach ($params as $param) {
+                $arguments[$param->getName()] = $position;
+                $defaults[$position] = $param->isDefaultValueAvailable()
+                    ? $param->getDefaultValue() : NULL;
+                $position++;
+            }
+            $method_flag = $method->isProtected()
+                ? (isRestlerCompatibilityModeEnabled() ? 2 :  3)
+                : (isset($metadata['protected']) ? 1 : 0);
+
+            //take note of the order
+            $call = array(
+                'class_name'  => $class_name,
+                'method_name' => $method->getName(),
+                'arguments'   => $arguments,
+                'defaults'    => $defaults,
+                'metadata'    => $metadata,
+                'method_flag' => $method_flag
+            );
+            $method_url = strtolower($method->getName());
+            if (preg_match_all(
+                '/@url\s+(GET|POST|PUT|DELETE|HEAD|OPTIONS)[ \t]*\/?(\S*)/s',
+                $doc,
+                $matches,
+                PREG_SET_ORDER)
+            ) {
+                foreach ($matches as $match) {
+                    $http_method = $match[1];
+                    $url = rtrim($base_path . $match[2],'/');
+                    $this->routes[$http_method][$url] = $call;
+                }
+            } else if ($method_url[0] != '_') { //not prefixed with underscore
+                // no configuration found so use convention
+                if (preg_match_all('/^(GET|POST|PUT|DELETE|HEAD|OPTIONS)/i',
+                                   $method_url,
+                                   $matches)
+                ) {
+                    $http_method = strtoupper($matches[0][0]);
+                    $method_url  = substr($method_url, strlen($http_method));
+                } else {
+                    $http_method = 'GET';
+                }
+                $url = $base_path
+                    . ($method_url == 'index' || $method_url == 'default' ? '' : $method_url);
+                $url = rtrim($url,'/');
+                $this->routes[$http_method][$url] = $call;
+                foreach ($params as $param) {
+                    if ($param->getName() == 'request_data') {
+                        break;
+                    }
+                    $url .= $url == '' ? ':' : '/:';
+                    $url .= $param->getName();
+                    $this->routes[$http_method][$url] = $call;
+                }
+            }
+        }
+    }
 }
 
-if(version_compare(PHP_VERSION, '5.3.0') < 0){
-	require_once 'compat.php';
+if (version_compare(PHP_VERSION, '5.3.0') < 0) {
+    require_once 'compat.php';
 }
 
+// ==================================================================
+//
+// Secondary classes
+//
+// ------------------------------------------------------------------
+
 /**
  * Special Exception for raising API errors
  * that can be used in API methods
@@ -782,10 +872,10 @@ protected function generateMap ($class_name, $base_path = '') {
 class RestException extends Exception
 {
 
-	public function __construct($http_status_code, $error_message = NULL)
-	{
-		parent::__construct($error_message, $http_status_code);
-	}
+    public function __construct($http_status_code, $error_message = NULL)
+    {
+        parent::__construct($error_message, $http_status_code);
+    }
 
 }
 
@@ -801,20 +891,22 @@ public function __construct($http_status_code, $error_message = NULL)
  */
 interface iRespond
 {
-	/**
-	 * Result of an api call is passed to this method
-	 * to create a standard structure for the data
-	 * @param unknown_type $result can be a primitive or array or object
-	 */
-	public function __formatResponse($result);
-	/**
-	 * When the api call results in RestException this method
-	 * will be called to return the error message
-	 * @param int $status_code
-	 * @param String $message
-	 */
-	public function __formatError($status_code, $message);
+    /**
+     * Result of an api call is passed to this method
+     * to create a standard structure for the data
+     * @param unknown_type $result can be a primitive or array or object
+     */
+    public function __formatResponse($result);
+
+    /**
+     * When the api call results in RestException this method
+     * will be called to return the error message
+     * @param int $status_code
+     * @param String $message
+     */
+    public function __formatError($status_code, $message);
 }
+
 /**
  * Default response formating class
  * @category   Framework
@@ -825,14 +917,21 @@ public function __formatError($status_code, $message);
  * @license    http://www.opensource.org/licenses/lgpl-license.php LGPL
  * @link       http://luracast.com/products/restler/
  */
-class DefaultResponse implements iRespond {
-	function __formatResponse($result) {
-		return $result;
-	}
-	function __formatError($statusCode, $message) {
-		return array('error' => array('code' => $statusCode, 
-		'message' => $message));
-	}
+class DefaultResponse implements iRespond
+{
+    function __formatResponse($result)
+    {
+        return $result;
+    }
+    function __formatError($statusCode, $message)
+    {
+        return array(
+            'error' => array(
+                'code' => $statusCode,
+                'message' => $message
+            )
+        );
+    }
 }
 
 /**
@@ -847,11 +946,11 @@ function __formatError($statusCode, $message) {
  */
 interface iAuthenticate
 {
-	/**
-	 * Auth function that is called when a protected method is requested
-	 * @return boolean TRUE or FALSE
-	 */
-	public function __isAuthenticated();
+    /**
+     * Auth function that is called when a protected method is requested
+     * @return boolean TRUE or FALSE
+     */
+    public function __isAuthenticated();
 }
 
 /**
@@ -867,53 +966,53 @@ public function __isAuthenticated();
  */
 interface iFormat
 {
-	/**
-	 * Get Extension => MIME type mappings as an associative array
-	 * @return array list of mime strings for the format
-	 * @example array('json'=>'application/json');
-	 */
-	public function getMIMEMap();
-
-	/**
-	 * Set the selected MIME type
-	 * @param string $mime MIME type
-	 */
-	public function setMIME($mime);
-	/**
-	 * Get selected MIME type
-	 */
-	public function getMIME();
-
-	/**
-	 * Set the selected file extension
-	 * @param string $extension file extension
-	 */
-	public function setExtension($extension);
-	/**
-	 * Get the selected file extension
-	 * @return string file extension
-	 */
-	public function getExtension();
-
-
-	/**
-	 * Encode the given data in the format
-	 * @param array $data resulting data that needs to
-	 * be encoded in the given format
-	 * @param boolean $human_readable set to TRUE when restler
-	 * is not running in production mode. Formatter has to
-	 * make the encoded output more human readable
-	 * @return string encoded string
-	 */
-	public function encode($data, $human_readable=FALSE);
-
-	/**
-	 * Decode the given data from the format
-	 * @param string $data data sent from client to
-	 * the api in the given format.
-	 * @return array associative array of the parsed data
-	 */
-	public function decode($data);
+    /**
+     * Get Extension => MIME type mappings as an associative array
+     * @return array list of mime strings for the format
+     * @example array('json'=>'application/json');
+     */
+    public function getMIMEMap();
+
+    /**
+     * Set the selected MIME type
+     * @param string $mime MIME type
+     */
+    public function setMIME($mime);
+    /**
+     * Get selected MIME type
+     */
+    public function getMIME();
+
+    /**
+     * Set the selected file extension
+     * @param string $extension file extension
+     */
+    public function setExtension($extension);
+
+    /**
+     * Get the selected file extension
+     * @return string file extension
+     */
+    public function getExtension();
+
+    /**
+     * Encode the given data in the format
+     * @param array $data resulting data that needs to
+     * be encoded in the given format
+     * @param boolean $human_readable set to TRUE when restler
+     * is not running in production mode. Formatter has to
+     * make the encoded output more human readable
+     * @return string encoded string
+     */
+    public function encode($data, $human_readable = FALSE);
+
+    /**
+     * Decode the given data from the format
+     * @param string $data data sent from client to
+     * the api in the given format.
+     * @return array associative array of the parsed data
+     */
+    public function decode($data);
 }
 
 /**
@@ -928,34 +1027,49 @@ public function decode($data);
  */
 class UrlEncodedFormat implements iFormat
 {
-	const MIME = 'application/x-www-form-urlencoded';
-	const EXTENSION = 'post';
-	public function getMIMEMap()
-	{
-		return array(self::EXTENSION=>self::MIME);
-	}
-	public function getMIME(){
-		return  self::MIME;
-	}
-	public function getExtension(){
-		return self::EXTENSION;
-	}
-	public function setMIME($mime){
-		//do nothing
-	}
-	public function setExtension($extension){
-		//do nothing
-	}
-	public function encode($data, $human_readable=FALSE){
-		return http_build_query($data);
-	}
-	public function decode($data){
-		parse_str($data,$r);
-		return $r;
-	}
-	public function __toString(){
-		return $this->getExtension();
-	}
+    const MIME      = 'application/x-www-form-urlencoded';
+    const EXTENSION = 'post';
+
+    public function getMIMEMap()
+    {
+        return array(self::EXTENSION => self::MIME);
+    }
+
+    public function getMIME()
+    {
+        return  self::MIME;
+    }
+
+    public function getExtension()
+    {
+        return self::EXTENSION;
+    }
+
+    public function setMIME($mime)
+    {
+        //do nothing
+    }
+
+    public function setExtension($extension)
+    {
+        //do nothing
+    }
+
+    public function encode($data, $human_readable = FALSE)
+    {
+        return http_build_query($data);
+    }
+
+    public function decode($data)
+    {
+        parse_str($data,$r);
+        return $r;
+    }
+
+    public function __toString()
+    {
+        return $this->getExtension();
+    }
 }
 
 /**
@@ -970,132 +1084,145 @@ public function __toString(){
  */
 class JsonFormat implements iFormat
 {
-	const MIME ='application/json,application/javascript';
-	static $mime = 'application/json';
-	const EXTENSION = 'json';
-	public function getMIMEMap()
-	{
-		return array(self::EXTENSION=>self::MIME);
-	}
-	public function getMIME(){
-		return  self::$mime;
-	}
-	public function getExtension(){
-		return self::EXTENSION;
-	}
-	public function setMIME($mime){
-		self::$mime = $mime;
-	}
-	public function setExtension($extension){
-		//do nothing
-	}
-	public function encode($data, $human_readable=FALSE){
-		return $human_readable ? 
-		$this->json_format(json_encode(object_to_array($data))) : 
-		json_encode(object_to_array($data));
-	}
-	public function decode($data) {
-		$decoded = json_decode ( $data );
-		if (function_exists ( 'json_last_error' )) {
-			$message = '';
-			switch (json_last_error ()) {
-				case JSON_ERROR_NONE :
-					return object_to_array ( $decoded );
-					break;
-				case JSON_ERROR_DEPTH :
-					$message = 'maximum stack depth exceeded';
-					break;
-				case JSON_ERROR_STATE_MISMATCH :
-					$message = 'underflow or the modes mismatch';
-					break;
-				case JSON_ERROR_CTRL_CHAR :
-					$message = 'unexpected control character found';
-					break;
-				case JSON_ERROR_SYNTAX :
-					$message = 'malformed JSON';
-					break;
-				case JSON_ERROR_UTF8 :
-					$message = 'malformed UTF-8 characters, possibly incorrectly encoded';
-					break;
-				default :
-					$message = 'unknown error';
-					break;
-			}
-			throw new RestException ( 400, 'Error parsing JSON, ' . $message );
-		} else if (strlen ( $data ) && $decoded === NULL || $decoded === $data) {
-			throw new RestException ( 400, 'Error parsing JSON' );
-		}
-		return object_to_array ( $decoded );
-	}
-
-	/**
-	 * Pretty print JSON string
-	 * @param string $json
-	 * @return string formated json
-	 */
-	private function json_format($json)
-	{
-		$tab = "  ";
-		$new_json = "";
-		$indent_level = 0;
-		$in_string = FALSE;
-
-		$len = strlen($json);
-
-		for($c = 0; $c < $len; $c++) {
-			$char = $json[$c];
-			switch($char) {
-				case '{':
-				case '[':
-					if(!$in_string) {
-						$new_json .= $char . "\n" . 
-						str_repeat($tab, $indent_level+1);
-						$indent_level++;
-					} else {
-						$new_json .= $char;
-					}
-					break;
-				case '}':
-				case ']':
-					if(!$in_string) {
-						$indent_level--;
-						$new_json .= "\n".str_repeat($tab, $indent_level).$char;
-					} else {
-						$new_json .= $char;
-					}
-					break;
-				case ',':
-					if(!$in_string) {
-						$new_json .= ",\n" . str_repeat($tab, $indent_level);
-					} else {
-						$new_json .= $char;
-					}
-					break;
-				case ':':
-					if(!$in_string) {
-						$new_json .= ": ";
-					} else {
-						$new_json .= $char;
-					}
-					break;
-				case '"':
-					if($c==0){
-						$in_string = TRUE;
-					}elseif($c > 0 && $json[$c-1] != '\\') {
-						$in_string = !$in_string;
-					}
-				default:
-					$new_json .= $char;
-					break;
-			}
-		}
-
-		return $new_json;
-	}
-
-	public function __toString(){
-		return $this->getExtension();
-	}
+    const MIME      = 'application/json,application/javascript';
+    static $mime    = 'application/json';
+    const EXTENSION = 'json';
+
+    public function getMIMEMap()
+    {
+        return array(self::EXTENSION => self::MIME);
+    }
+
+    public function getMIME()
+    {
+        return  self::$mime;
+    }
+
+    public function getExtension()
+    {
+        return self::EXTENSION;
+    }
+
+    public function setMIME($mime)
+    {
+        self::$mime = $mime;
+    }
+
+    public function setExtension($extension)
+    {
+        //do nothing
+    }
+
+    public function encode($data, $human_readable = FALSE)
+    {
+        return $human_readable
+            ? $this->json_format(json_encode(object_to_array($data)))
+            : json_encode(object_to_array($data));
+    }
+
+    public function decode($data)
+    {
+        $decoded = json_decode ($data);
+        if (function_exists ('json_last_error')) {
+            $message = '';
+            switch (json_last_error ()) {
+                case JSON_ERROR_NONE:
+                    return object_to_array ($decoded);
+                    break;
+                case JSON_ERROR_DEPTH:
+                    $message = 'maximum stack depth exceeded';
+                    break;
+                case JSON_ERROR_STATE_MISMATCH:
+                    $message = 'underflow or the modes mismatch';
+                    break;
+                case JSON_ERROR_CTRL_CHAR:
+                    $message = 'unexpected control character found';
+                    break;
+                case JSON_ERROR_SYNTAX:
+                    $message = 'malformed JSON';
+                    break;
+                case JSON_ERROR_UTF8:
+                    $message = 'malformed UTF-8 characters, possibly incorrectly encoded';
+                    break;
+                default:
+                    $message = 'unknown error';
+                    break;
+            }
+            throw new RestException (400, 'Error parsing JSON, ' . $message);
+        } else if (strlen ($data) && $decoded === NULL || $decoded === $data) {
+            throw new RestException (400, 'Error parsing JSON');
+        }
+        return object_to_array ($decoded);
+    }
+
+    /**
+     * Pretty print JSON string
+     * @param string $json
+     * @return string formated json
+     */
+    private function json_format($json)
+    {
+        $tab          = "  ";
+        $new_json     = "";
+        $indent_level = 0;
+        $in_string    = FALSE;
+        $len          = strlen($json);
+
+        for($c = 0; $c < $len; $c++) {
+            $char = $json[$c];
+            switch($char) {
+                case '{':
+                case '[':
+                    if (!$in_string) {
+                        $new_json .= $char . "\n" .
+                        str_repeat($tab, $indent_level + 1);
+                        $indent_level++;
+                    } else {
+                        $new_json .= $char;
+                    }
+                    break;
+                case '}':
+                case ']':
+                    if (!$in_string) {
+                        $indent_level--;
+                        $new_json .= "\n" . str_repeat($tab, $indent_level) . $char;
+                    } else {
+                        $new_json .= $char;
+                    }
+                    break;
+                case ',':
+                    if (!$in_string) {
+                        $new_json .= ",\n" . str_repeat($tab, $indent_level);
+                    } else {
+                        $new_json .= $char;
+                    }
+                    break;
+                case ':':
+                    if (!$in_string) {
+                        $new_json .= ": ";
+                    } else {
+                        $new_json .= $char;
+                    }
+                    break;
+                case '"':
+                    if ($c==0) {
+                        $in_string = TRUE;
+                    } else if ($c > 0 && $json[$c-1] != '\\') {
+                        $in_string = !$in_string;
+                    }
+                default:
+                    $new_json .= $char;
+                    break;
+            }
+        }
+
+        return $new_json;
+    }
+
+    public function __toString()
+    {
+        return $this->getExtension();
+    }
 }
 
 /**
@@ -1109,123 +1236,150 @@ public function __toString(){
  * @license    http://www.gnu.org/licenses/ GNU General Public License
  * @link       https://github.com/murraypicton/Doqumentor
  */
-class DocParser {
-	private $params=array();
-	function parse($doc='') {
-		if($doc==''){
-			return $this->params;
-		}
-		//Get the comment
-		if(preg_match('#^/\*\*(.*)\*/#s', $doc, $comment) === false)
-		return  $this->params;
-		$comment = trim($comment[1]);
-		//Get all the lines and strip the * from the first character
-		if(preg_match_all('#^\s*\*(.*)#m', $comment, $lines) === false)
-		return  $this->params;
-		$this->parseLines($lines[1]);
-		return  $this->params;
-	}
-
-	private function parseLines($lines) {
-		foreach($lines as $line) {
-			$parsedLine = $this->parseLine($line); //Parse the line
-
-			if($parsedLine === false && !isset($this->params['description'])) {
-				if(isset($desc)){
-					//Store the first line in the short description
-					$this->params['description'] = implode(PHP_EOL, $desc); 
-				}
-				$desc = array();
-			} elseif($parsedLine !== false) {
-				$desc[] = $parsedLine; //Store the line in the long description
-			}
-		}
-		$desc = implode(' ', $desc);
-		if(!empty($desc))$this->params['long_description'] = $desc;
-	}
-
-	private function parseLine($line) {
-		//trim the whitespace from the line
-		$line = trim($line);
-
-		if(empty($line)) return false; //Empty line
-
-		if(strpos($line, '@') === 0) {
-			if(strpos($line, ' ')>0){
-				//Get the parameter name
-				$param = substr($line, 1, strpos($line, ' ') - 1); 
-				$value = substr($line, strlen($param) + 2); //Get the value
-			}else{
-				$param = substr($line, 1);
-				$value = '';
-			}
-			//Parse the line and return false if the parameter is valid
-			if($this->setParam($param, $value)) return false; 
-		}
-
-		return $line;
-	}
-	private function setParam($param, $value) {
-		if($param == 'param' || $param == 'return') 
-		$value = $this->formatParamOrReturn($value);
-		if($param == 'class') 
-		list($param, $value) = $this->formatClass($value);
-
-		if(empty($this->params[$param])) {
-			$this->params[$param] = $value;
-		} else if($param == 'param'){
-			$arr = array($this->params[$param], $value);
-			$this->params[$param] = $arr;
-		} else {
-			$this->params[$param] = $value + $this->params[$param];
-		}
-		return true;
-	}
-	private function formatClass($value) {
-		$r = preg_split("[\(|\)]", $value);
-		if(count($r)>1){
-			$param = $r[0];
-			parse_str($r[1],$value);
-			foreach ($value as $key => $val) {
-				$val = explode(',', $val);
-				if(count($val)>1)$value[$key]=$val;
-			}
-		}else{
-			$param='Unknown';
-		}
-		return array($param, $value);
-	}
-	private function formatParamOrReturn($string) {
-
-		$pos = strpos($string, ' ');
-
-		$type = substr($string, 0, $pos);
-		return '(' . $type . ')' . substr($string, $pos+1);
-	}
+class DocParser
+{
+    private $params = array();
+
+    function parse($doc = '') {
+        if ($doc == '') {
+            return $this->params;
+        }
+        //Get the comment
+        if (preg_match('#^/\*\*(.*)\*/#s', $doc, $comment) === false) {
+            return  $this->params;
+        }
+        $comment = trim($comment[1]);
+        //Get all the lines and strip the * from the first character
+        if (preg_match_all('#^\s*\*(.*)#m', $comment, $lines) === false) {
+            return  $this->params;
+        }
+        $this->parseLines($lines[1]);
+        return  $this->params;
+    }
+
+    private function parseLines($lines)
+    {
+        foreach($lines as $line) {
+            $parsedLine = $this->parseLine($line); //Parse the line
+
+            if ($parsedLine === false && !isset($this->params['description'])) {
+                if (isset($desc)) {
+                    //Store the first line in the short description
+                    $this->params['description'] = implode(PHP_EOL, $desc);
+                }
+                $desc = array();
+            } else if ($parsedLine !== false) {
+                $desc[] = $parsedLine; //Store the line in the long description
+            }
+        }
+        $desc = implode(' ', $desc);
+        if (!empty($desc)) {
+            $this->params['long_description'] = $desc;
+        }
+    }
+
+    private function parseLine($line)
+    {
+        //trim the whitespace from the line
+        $line = trim($line);
+
+        if (empty($line)) {
+            return false; //Empty line
+        }
+
+        if (strpos($line, '@') === 0) {
+            if (strpos($line, ' ') > 0) {
+                //Get the parameter name
+                $param = substr($line, 1, strpos($line, ' ') - 1);
+                $value = substr($line, strlen($param) + 2); //Get the value
+            } else {
+                $param = substr($line, 1);
+                $value = '';
+            }
+            //Parse the line and return false if the parameter is valid
+            if ($this->setParam($param, $value)) return false;
+        }
+        return $line;
+    }
+
+    private function setParam($param, $value)
+    {
+        if ($param == 'param' || $param == 'return') {
+            $value = $this->formatParamOrReturn($value);
+        }
+        if ($param == 'class') {
+            list($param, $value) = $this->formatClass($value);
+        }
+
+        if (empty($this->params[$param])) {
+            $this->params[$param] = $value;
+        } else if ($param == 'param') {
+            $arr = array($this->params[$param], $value);
+            $this->params[$param] = $arr;
+        } else {
+            $this->params[$param] = $value + $this->params[$param];
+        }
+        return true;
+    }
+
+    private function formatClass($value)
+    {
+        $r = preg_split("[\(|\)]", $value);
+        if (count($r) > 1) {
+            $param = $r[0];
+            parse_str($r[1],$value);
+            foreach ($value as $key => $val) {
+                $val = explode(',', $val);
+                if (count($val) > 1) {
+                    $value[$key] = $val;
+                }
+            }
+        } else {
+            $param = 'Unknown';
+        }
+        return array($param, $value);
+    }
+
+    private function formatParamOrReturn($string)
+    {
+        $pos  = strpos($string, ' ');
+        $type = substr($string, 0, $pos);
+        return '(' . $type . ')' . substr($string, $pos + 1);
+    }
 }
 
-function parse_doc($php_doc_comment){
-	$p = new DocParser();
-	return $p->parse($php_doc_comment);
-	$p = new Parser($php_doc_comment);
-	return $p;
-	$php_doc_comment = preg_replace("/(^[\\s]*\\/\\*\\*)
-                                 |(^[\\s]\\*\\/)
-                                 |(^[\\s]*\\*?\\s)
-                                 |(^[\\s]*)
-                                 |(^[\\t]*)/ixm", "", $php_doc_comment);
-
-	$php_doc_comment = str_replace("\r", "", $php_doc_comment);
-	$php_doc_comment = preg_replace("/([\\t])+/", "\t", $php_doc_comment);
-	return explode("\n", $php_doc_comment);
-
-
-	$php_doc_comment =  trim(preg_replace('/\r?\n *\* */', ' ',
-	 $php_doc_comment));
-	return $php_doc_comment;
-	preg_match_all('/@([a-z]+)\s+(.*?)\s*(?=$|@[a-z]+\s)/s', 
-	$php_doc_comment, $matches);
-	return array_combine($matches[1], $matches[2]);
+
+// ==================================================================
+//
+// Individual functions
+//
+// ------------------------------------------------------------------
+
+function parse_doc($php_doc_comment)
+{
+    $p = new DocParser();
+    return $p->parse($php_doc_comment);
+
+    $p = new Parser($php_doc_comment);
+    return $p;
+
+    $php_doc_comment = preg_replace(
+        "/(^[\\s]*\\/\\*\\*)
+        |(^[\\s]\\*\\/)
+        |(^[\\s]*\\*?\\s)
+        |(^[\\s]*)
+        |(^[\\t]*)/ixm", "", $php_doc_comment);
+    $php_doc_comment = str_replace("\r", "", $php_doc_comment);
+    $php_doc_comment = preg_replace("/([\\t])+/", "\t", $php_doc_comment);
+    return explode("\n", $php_doc_comment);
+
+    $php_doc_comment =  trim(preg_replace('/\r?\n *\* */', ' ',
+                                          $php_doc_comment));
+    return $php_doc_comment;
+
+    preg_match_all('/@([a-z]+)\s+(.*?)\s*(?=$|@[a-z]+\s)/s',
+                   $php_doc_comment, $matches);
+    return array_combine($matches[1], $matches[2]);
 }
 
 /**
@@ -1241,45 +1395,55 @@ function parse_doc($php_doc_comment){
  * @license    http://www.opensource.org/licenses/lgpl-license.php LGPL
  * @link       http://luracast.com/products/restler/
  */
-function object_to_array($object, $utf_encode=FALSE)
+function object_to_array($object, $utf_encode = FALSE)
 {
-	if(is_array($object) || (is_object($object) && !($object instanceof JsonSerializable)))
-	{
-		$array = array();
-		foreach($object as $key => $value)
-		{
-			$value = object_to_array($value, $utf_encode);
-			if($utf_encode && is_string($value)){
-				$value = utf8_encode($value);
-			}
-			$array[$key] = $value;
-		}
-		return $array;
-	}
-	return $object;
+    if (is_array($object)
+        || (is_object($object)
+        && !($object instanceof JsonSerializable))
+    ) {
+        $array = array();
+        foreach($object as $key => $value) {
+            $value = object_to_array($value, $utf_encode);
+            if ($utf_encode && is_string($value)) {
+                $value = utf8_encode($value);
+            }
+            $array[$key] = $value;
+        }
+        return $array;
+    }
+    return $object;
 }
+
 /**
  * an autoloader function for loading format classes
  * @param String $class_name class name of a class that implements iFormat
  */
 function autoload_formats($class_name)
 {
-	$class_name=strtolower($class_name);
-	$file = RESTLER_PATH."/$class_name/$class_name.php";
-	if (file_exists($file))
-	{
-		require_once($file);
-	} elseif (file_exists("$class_name.php")) {
+    $class_name = strtolower($class_name);
+    $file = RESTLER_PATH . "/$class_name/$class_name.php";
+    if (file_exists($file)) {
+        require_once($file);
+    } else if (file_exists("$class_name.php")) {
         require_once ("$class_name.php");
     }
 }
+
+// ==================================================================
+//
+// Autoload
+//
+// ------------------------------------------------------------------
+
 spl_autoload_register('autoload_formats');
+
 /**
  * Manage compatibility with PHP 5 < PHP 5.3
  */
-if(!function_exists('isRestlerCompatibilityModeEnabled')){
-	function isRestlerCompatibilityModeEnabled(){
-		return FALSE;
-	}
+if (!function_exists('isRestlerCompatibilityModeEnabled')) {
+    function isRestlerCompatibilityModeEnabled()
+    {
+        return FALSE;
+    }
 }
 define('RESTLER_PATH', dirname(__FILE__));
\ No newline at end of file

From 2aa120774128cff56b53558ad8999d04c29d3d6d Mon Sep 17 00:00:00 2001
From: Nick Adams <nick89@zoho.com>
Date: Sun, 1 Jul 2012 02:22:33 +1200
Subject: [PATCH 47/61] Added Nginx .conf example

---
 examples/sample.nginx.conf | 27 +++++++++++++++++++++++++++
 1 file changed, 27 insertions(+)
 create mode 100644 examples/sample.nginx.conf

diff --git a/examples/sample.nginx.conf b/examples/sample.nginx.conf
new file mode 100644
index 000000000..62cfc2d9c
--- /dev/null
+++ b/examples/sample.nginx.conf
@@ -0,0 +1,27 @@
+server {
+    listen       80;
+    server_name  domain1.com www.domain1.com;
+    root         /var/www;
+
+    ###
+    # Using '/api' as the subdirectory.
+    # If api is at root, change ALL '/api' to '/'.
+    ###
+    location /api {
+        ###
+        # By default, Nginx will serve xml; rewrite to index instead.
+        ###
+        location ~* \.(xml) {
+            rewrite ^ /api/index.php?$uri.xml last;
+        }
+
+        ###
+        # Enable 'pretty urls'.
+        ###
+        try_files $uri $uri/ /api/index.php?$uri;
+    }
+
+    ###
+    # ... Rest of .conf ...
+    ###
+}
\ No newline at end of file

From dd8b62c52ceaafc6a612f8775e04361360eaa469 Mon Sep 17 00:00:00 2001
From: Nick Adams <nick89@zoho.com>
Date: Sun, 1 Jul 2012 05:01:19 +1200
Subject: [PATCH 48/61] Nginx conf: Added support for authentication module

---
 examples/sample.nginx.conf | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/examples/sample.nginx.conf b/examples/sample.nginx.conf
index 62cfc2d9c..b5ee3dcf0 100644
--- a/examples/sample.nginx.conf
+++ b/examples/sample.nginx.conf
@@ -12,13 +12,13 @@ server {
         # By default, Nginx will serve xml; rewrite to index instead.
         ###
         location ~* \.(xml) {
-            rewrite ^ /api/index.php?$uri.xml last;
+            rewrite ^ /api/index.php?$uri&$args.xml last;
         }
 
         ###
         # Enable 'pretty urls'.
         ###
-        try_files $uri $uri/ /api/index.php?$uri;
+        try_files $uri $uri/ /api/index.php?$uri&$args;
     }
 
     ###

From d0b28572cc3b1ceb58c0dc682e66b70a17138df9 Mon Sep 17 00:00:00 2001
From: Luracast <arul@luracast.com>
Date: Mon, 2 Jul 2012 21:15:57 +0800
Subject: [PATCH 49/61] fixed a mistake in hello world example

---
 examples/_001_helloworld/index.php   | 2 +-
 examples/_001_helloworld/readme.html | 4 ++--
 examples/_001_helloworld/readme.md   | 4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/examples/_001_helloworld/index.php b/examples/_001_helloworld/index.php
index 34d44b636..3c5bf60ca 100755
--- a/examples/_001_helloworld/index.php
+++ b/examples/_001_helloworld/index.php
@@ -4,7 +4,7 @@
  Tagline: Let's say hello!.
  Description: Basic hello world example to get started with Restler 2.0.
  Example 1: GET say/hello returns "Hello world!".
- Example 2: GET say/hello/restler2.0 returns "Hello Restler2.0!".
+ Example 2: GET say/hello/Restler2.0 returns "Hello Restler2.0!".
  Example 3: GET say/hello?to=R.Arul%20Kumaran returns "Hello R.Arul Kumaran!".
  */
 require_once '../../restler/restler.php';
diff --git a/examples/_001_helloworld/readme.html b/examples/_001_helloworld/readme.html
index 91aea97f0..e55f82730 100755
--- a/examples/_001_helloworld/readme.html
+++ b/examples/_001_helloworld/readme.html
@@ -77,7 +77,7 @@ <h2>Hello World Example</h2>
 </code></pre>
 </dd>
 
-<dt>GET <a href="say/hello/restler2.0" target="_blank">say/hello/restler2.0</a></dt>
+<dt>GET <a href="say/hello/Restler2.0" target="_blank">say/hello/Restler2.0</a></dt>
 <dd><pre><code>"Hello Restler2.0!"
 </code></pre></dd>
 
@@ -99,7 +99,7 @@ <h2>Hello World Example</h2>
 </code></pre>
 </dd>
 
-<dt>GET <a href="index.php/say/hello/restler2.0" target="_blank"><abbr title="_001_helloworld/index.php">index.php</abbr>/say/hello/restler2.0</a></dt>
+<dt>GET <a href="index.php/say/hello/Restler2.0" target="_blank"><abbr title="_001_helloworld/index.php">index.php</abbr>/say/hello/Restler2.0</a></dt>
 <dd><pre><code>"Hello Restler2.0!"
 </code></pre></dd>
 
diff --git a/examples/_001_helloworld/readme.md b/examples/_001_helloworld/readme.md
index 7ec0dfba9..c17e4fd3d 100644
--- a/examples/_001_helloworld/readme.md
+++ b/examples/_001_helloworld/readme.md
@@ -22,7 +22,7 @@ GET [say/hello](say/hello)
 "Hello world!"
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-GET [say/hello/restler2.0](say/hello/restler2.0)
+GET [say/hello/Restler2.0](say/hello/Restler2.0)
 :	
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 "Hello Restler2.0!"
@@ -44,7 +44,7 @@ GET [index.php/say/hello](index.php/say/hello)
 "Hello world!"
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-GET [index.php/say/hello/restler2.0](index.php/say/hello/restler2.0)
+GET [index.php/say/hello/Restler2.0](index.php/say/hello/Restler2.0)
 :	
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 "Hello Restler2.0!"

From 9ddd9f2b289ac81f0202a059fe26a7932ebb41ea Mon Sep 17 00:00:00 2001
From: Luracast <arul@luracast.com>
Date: Wed, 4 Jul 2012 18:09:25 +0800
Subject: [PATCH 50/61] Fixes the bug with autoloading format classes and thus
 fixes issue #59 allowing us to subclass format classes with out manually
 including them

---
 restler/restler.php          | 17 +++++++++++------
 restler_minified/restler.php | 10 +++++-----
 2 files changed, 16 insertions(+), 11 deletions(-)

diff --git a/restler/restler.php b/restler/restler.php
index d1e793c90..1451ce7c1 100644
--- a/restler/restler.php
+++ b/restler/restler.php
@@ -10,7 +10,7 @@
  * @copyright  2010 Luracast
  * @license    http://www.opensource.org/licenses/lgpl-license.php LGPL
  * @link       http://luracast.com/products/restler/
- * @version    2.1.9
+ * @version    2.2.0
  */
 class Restler
 {
@@ -20,7 +20,7 @@ class Restler
     //
     // ------------------------------------------------------------------
 
-    const VERSION = '2.1.9';
+    const VERSION = '2.2.0';
 
     /**
      * URL of the currently mapped service
@@ -1422,10 +1422,15 @@ function autoload_formats($class_name)
 {
     $class_name = strtolower($class_name);
     $file = RESTLER_PATH . "/$class_name/$class_name.php";
-    if (file_exists($file)) {
-        require_once($file);
-    } else if (file_exists("$class_name.php")) {
-        require_once ("$class_name.php");
+    if (file_exists ($file)) {
+        require_once ($file);
+    } else {
+        $file = RESTLER_PATH . "/$class_name.php";
+        if (file_exists ($file)) {
+            require_once ($file);
+        } elseif (file_exists ("$class_name.php")) {
+            require_once ("$class_name.php");
+        }
     }
 }
 
diff --git a/restler_minified/restler.php b/restler_minified/restler.php
index ee76c3dde..ab2139ec1 100644
--- a/restler_minified/restler.php
+++ b/restler_minified/restler.php
@@ -1,6 +1,6 @@
 <?php
- class Restler { const VERSION = '2.1.9'; public $url; public $request_method; public $request_format; public $request_data=array(); public $cache_dir; public $base_dir; public $response = 'DefaultResponse'; public $response_format; protected $production_mode; protected $routes= array(); protected $format_map = array(); protected $service_class_instance; protected $service_method; protected $auth_classes = array(); protected $error_classes = array(); private $codes = array( 100 => 'Continue', 101 => 'Switching Protocols', 200 => 'OK', 201 => 'Created', 202 => 'Accepted', 203 => 'Non-Authoritative Information', 204 => 'No Content', 205 => 'Reset Content', 206 => 'Partial Content', 300 => 'Multiple Choices', 301 => 'Moved Permanently', 302 => 'Found', 303 => 'See Other', 304 => 'Not Modified', 305 => 'Use Proxy', 306 => '(Unused)', 307 => 'Temporary Redirect', 400 => 'Bad Request', 401 => 'Unauthorized', 402 => 'Payment Required', 403 => 'Forbidden', 404 => 'Not Found', 405 => 'Method Not Allowed', 406 => 'Not Acceptable', 407 => 'Proxy Authentication Required', 408 => 'Request Timeout', 409 => 'Conflict', 410 => 'Gone', 411 => 'Length Required', 412 => 'Precondition Failed', 413 => 'Request Entity Too Large', 414 => 'Request-URI Too Long', 415 => 'Unsupported Media Type', 416 => 'Requested Range Not Satisfiable', 417 => 'Expectation Failed', 500 => 'Internal Server Error', 501 => 'Not Implemented', 502 => 'Bad Gateway', 503 => 'Service Unavailable', 504 => 'Gateway Timeout', 505 => 'HTTP Version Not Supported' ); protected $cached; public function __construct ($production_mode = FALSE) { $this->production_mode = $production_mode; $this->cache_dir = getcwd(); $this->base_dir = RESTLER_PATH; } public function __destruct () { if ($this->production_mode && !$this->cached) { $this->saveCache(); } } public function refreshCache () { $this->routes = array(); $this->cached = FALSE; } public function setSupportedFormats () { $args = func_get_args(); $extensions = array(); foreach ($args as $class_name) { if(!is_string($class_name) || !class_exists($class_name)){ throw new Exception("$class_name is not a vaild Format Class."); } $obj = new $class_name; if(! $obj instanceof iFormat){ throw new Exception('Invalid format class; must implement '. 'iFormat interface'); } foreach ($obj->getMIMEMap() as $extension => $mime) { if(!isset($this->format_map[$extension])) $this->format_map[$extension]=$class_name; $mime = explode(',', $mime); if (!is_array($mime)) $mime = array($mime); foreach ($mime as $value) { if(!isset($this->format_map[$value])) $this->format_map[$value]=$class_name; } $extensions[".$extension"]=TRUE; } } $this->format_map['default']=$args[0]; $this->format_map['extensions']=array_keys($extensions); } public function addAPIClass($class_name, $base_path = NULL) { if(!class_exists($class_name)){ throw new Exception("API class $class_name is missing."); } $this->loadCache(); if(!$this->cached){ if(is_null($base_path)){ $base_path=strtolower($class_name); $index = strrpos($class_name, '\\'); if($index!==FALSE){ $base_path=substr($base_path, $index+1); } }else $base_path = trim($base_path,'/'); if(strlen($base_path)>0)$base_path .= '/'; $this->generateMap($class_name, $base_path); } } public function addAuthenticationClass ($class_name, $base_path = NULL) { $this->auth_classes[] = $class_name; $this->addAPIClass($class_name, $base_path); } public function addErrorClass ($class_name) { $this->error_classes[] = $class_name; } public function handleError ($status_code, $error_message = NULL) { $method = "handle$status_code"; $handled = FALSE; foreach ($this->error_classes as $class_name) { if (method_exists($class_name, $method)) { $obj = new $class_name(); $obj->restler = $this; $obj->$method(); $handled = TRUE; } } if($handled)return; $message = $this->codes[$status_code] . (!$error_message ? '' : ': ' . $error_message); $this->setStatus($status_code); $responder = new $this->response(); $responder->restler = $this; $this->sendData($responder->__formatError($status_code, $message)); } public function handle () { if(empty($this->format_map))$this->setSupportedFormats('JsonFormat'); $this->url = $this->getPath(); $this->request_method = $this->getRequestMethod(); $this->response_format = $this->getResponseFormat(); $this->request_format = $this->getRequestFormat(); if(is_null($this->request_format)){ $this->request_format = $this->response_format; } if($this->request_method == 'PUT' || $this->request_method == 'POST'){ $this->request_data = $this->getRequestData(); } $o = $this->mapUrlToMethod(); if(!isset($o->class_name)){ $this->handleError(404); }else{ try { if($o->method_flag){ $auth_method = '__isAuthenticated'; if(!count($this->auth_classes))throw new RestException(401); foreach ($this->auth_classes as $auth_class) { $auth_obj = new $auth_class(); $auth_obj->restler=$this; $this->applyClassMetadata($auth_class, $auth_obj, $o); if (!method_exists($auth_obj, $auth_method)) { throw new RestException(401, 'Authentication Class '. 'should implement iAuthenticate'); }elseif(!$auth_obj->$auth_method()){ throw new RestException(401); } } } $this->applyClassMetadata(get_class($this->request_format), $this->request_format, $o); $pre_process = '_'.$this->request_format->getExtension().'_'. $o->method_name; $this->service_method = $o->method_name; if($o->method_flag==2)$o=unprotect($o); $object = $this->service_class_instance = new $o->class_name(); $object->restler=$this; if(method_exists($o->class_name, $pre_process)) { call_user_func_array(array($object, $pre_process), $o->arguments); } switch ($o->method_flag) { case 3: $reflection_method = new ReflectionMethod($object, $o->method_name); $reflection_method->setAccessible(TRUE); $result = $reflection_method->invokeArgs($object, $o->arguments); break; case 2: case 1: default: $result = call_user_func_array(array($object, $o->method_name), $o->arguments); } } catch (RestException $e) { $this->handleError($e->getCode(), $e->getMessage()); } } $responder = new $this->response(); $responder->restler = $this; $this->applyClassMetadata($this->response, $responder, $o); if (isset($result) && $result !== NULL) { $result = $responder->__formatResponse($result); $this->sendData($result); } } public function sendData($data) { $data = $this->response_format->encode($data, !$this->production_mode); $post_process = '_'.$this->service_method .'_'. $this->response_format->getExtension(); if(isset($this->service_class_instance) && method_exists($this->service_class_instance,$post_process)){ $data = call_user_func(array($this->service_class_instance, $post_process), $data); } header("Cache-Control: no-cache, must-revalidate"); header("Expires: 0"); header('Content-Type: ' . $this->response_format->getMIME()); header("X-Powered-By: Luracast Restler v".Restler::VERSION); die($data); } public function setStatus($code) { header("{$_SERVER['SERVER_PROTOCOL']} $code ". $this->codes[strval($code)]); } public function removeCommonPath($first, $second, $char='/'){ $first = explode($char, $first); $second = explode($char, $second); while (count($second)){ if($first[0]==$second[0]){ array_shift($first); } else break; array_shift($second); } return implode($char, $first); } public function saveCache() { $file = $this->cache_dir . '/routes.php'; $s = '$o=array();'.PHP_EOL; foreach ($this->routes as $key => $value) { $s .= PHP_EOL.PHP_EOL.PHP_EOL."############### $key ###############" .PHP_EOL.PHP_EOL; $s .= '$o[\''.$key.'\']=array();'; foreach ($value as $ke => $va) { $s .= PHP_EOL.PHP_EOL."#==== $key $ke".PHP_EOL.PHP_EOL; $s .= '$o[\''.$key.'\'][\''.$ke.'\']='.str_replace(PHP_EOL, PHP_EOL."\t", var_export($va, TRUE)).';'; } } $s .= PHP_EOL.'return $o;'; $r=@file_put_contents($file, "<?php $s"); @chmod($file, 0777); if($r===FALSE)throw new Exception( "The cache directory located at '$this->cache_dir' needs to have ". "the permissions set to read/write/execute for everyone in order ". "to save cache and improve performance."); } protected function getPath () { $path = urldecode($this->removeCommonPath($_SERVER['REQUEST_URI'], $_SERVER['SCRIPT_NAME'])); $path = preg_replace('/(\/*\?.*$)|(\/$)/', '', $path); $path = str_replace($this->format_map['extensions'], '', $path); return $path; } protected function getRequestMethod () { $method = $_SERVER['REQUEST_METHOD']; if (isset($_SERVER['HTTP_X_HTTP_METHOD_OVERRIDE'])){ $method = $_SERVER['HTTP_X_HTTP_METHOD_OVERRIDE']; } if($method=='HEAD')$method='GET'; return $method; } protected function getRequestFormat () { $format=NULL; if(isset($_SERVER['CONTENT_TYPE'])){ $mime = explode(';', $_SERVER['CONTENT_TYPE']); $mime = $mime[0]; if($mime==UrlEncodedFormat::MIME){ $format = new UrlEncodedFormat(); }else{ if(isset($this->format_map[$mime])){ $format = $this->format_map[$mime]; $format = is_string($format) ? new $format: $format; $format->setMIME($mime); } } } return $format; } protected function getResponseFormat () { $format=NULL; $extensions = explode('.', parse_url($_SERVER['REQUEST_URI'], PHP_URL_PATH)); while($extensions){ $extension = array_pop($extensions); $extension = explode('/', $extension); $extension = array_shift($extension); if($extension && isset($this->format_map[$extension])){ $format = $this->format_map[$extension]; $format = is_string($format) ? new $format: $format; $format->setExtension($extension); return $format; } } if(isset($_SERVER['HTTP_ACCEPT'])){ $acceptList = array(); $accepts = explode(',', strtolower($_SERVER['HTTP_ACCEPT'])); if (!is_array($accepts)) $accepts = array($accepts); foreach ($accepts as $pos => $accept) { $parts = explode(';q=', trim($accept)); $type = array_shift($parts); $quality = count($parts) ? floatval(array_shift($parts)) : (1000 - $pos) / 1000; $acceptList[$type] = $quality; } arsort($acceptList); foreach ($acceptList as $accept => $quality) { if(isset($this->format_map[$accept])){ $format = $this->format_map[$accept]; $format = is_string($format) ? new $format: $format; $format->setMIME($accept); header("Vary: Accept"); return $format; } } } else { $_SERVER['HTTP_ACCEPT'] = '*/*'; } if (strpos($_SERVER['HTTP_ACCEPT'], '*') !== FALSE) { if (strpos($_SERVER['HTTP_ACCEPT'], 'application/*') !== FALSE) { $format = new JsonFormat; } elseif (strpos($_SERVER['HTTP_ACCEPT'], 'text/*') !== FALSE) { $format = new XmlFormat; } elseif (strpos($_SERVER['HTTP_ACCEPT'], '*/*') !== FALSE) { $format = new $this->format_map['default']; } } if (empty($format)) { header('HTTP/1.1 406 Not Acceptable'); die('406 Not Acceptable: The server was unable to negotiate content for this request.'); } else { header("Vary: Accept"); return $format; } } protected function getRequestData() { try{ $r = file_get_contents('php://input'); if(is_null($r))return $_GET; $r =$this->request_format->decode($r); return is_null($r) ? array(): $r; } catch (RestException $e) { $this->handleError($e->getCode(), $e->getMessage()); } } protected function mapUrlToMethod () { if(!isset($this->routes[$this->request_method])){ return array(); } $urls = $this->routes[$this->request_method]; if(!$urls)return array(); $found = FALSE; $this->request_data += $_GET; $params = array('request_data'=>$this->request_data); $params += $this->request_data; $lc = strtolower($this->url); foreach ($urls as $url => $call) { $call = (object)$call; if(strstr($url, ':')){ $regex = preg_replace('/\\\:([^\/]+)/', '(?P<$1>[^/]+)', preg_quote($url)); if (preg_match(":^$regex$:i", $this->url, $matches)) { foreach ($matches as $arg => $match) { if (isset($call->arguments[$arg])){ $params[$arg] = $match; } } $found = TRUE; break; } }elseif ($url == $lc){ $found = TRUE; break; } } if($found){ $p = $call->defaults; foreach ($call->arguments as $key => $value) { if(isset($params[$key]))$p[$value] = $params[$key]; } $call->arguments=$p; return $call; } } protected function applyClassMetadata($class_name, $instance, $method_info){ if(isset($method_info->metadata[$class_name]) && is_array($method_info->metadata[$class_name])){ foreach ($method_info->metadata[$class_name] as $property => $value){ if(property_exists($class_name, $property)){ $reflection_property = new ReflectionProperty($class_name, $property); $reflection_property->setValue($instance, $value); } } } } protected function loadCache() { if ($this->cached !== NULL) { return; } $file = $this->cache_dir . '/routes.php'; $this->cached = FALSE; if ($this->production_mode) { if (file_exists($file)) { $routes = include($file); } if (isset($routes) && is_array($routes)) { $this->routes = $routes; $this->cached = TRUE; } } else { } } protected function generateMap ($class_name, $base_path = '') { $reflection = new ReflectionClass($class_name); $class_metadata = parse_doc($reflection->getDocComment()); $methods = $reflection->getMethods( ReflectionMethod::IS_PUBLIC + ReflectionMethod::IS_PROTECTED); foreach ($methods as $method) { $doc = $method->getDocComment(); $arguments = array(); $defaults = array(); $metadata = $class_metadata+parse_doc($doc); $params = $method->getParameters(); $position=0; foreach ($params as $param){ $arguments[$param->getName()] = $position; $defaults[$position] = $param->isDefaultValueAvailable() ? $param->getDefaultValue() : NULL; $position++; } $method_flag = $method->isProtected() ? (isRestlerCompatibilityModeEnabled() ? 2 : 3) : (isset($metadata['protected']) ? 1 : 0); $call = array( 'class_name'=>$class_name, 'method_name'=>$method->getName(), 'arguments'=>$arguments, 'defaults'=>$defaults, 'metadata'=>$metadata, 'method_flag'=>$method_flag ); $method_url = strtolower($method->getName()); if (preg_match_all( '/@url\s+(GET|POST|PUT|DELETE|HEAD|OPTIONS)[ \t]*\/?(\S*)/s', $doc, $matches, PREG_SET_ORDER)) { foreach ($matches as $match) { $http_method = $match[1]; $url = rtrim($base_path . $match[2],'/'); $this->routes[$http_method][$url] = $call; } }elseif($method_url[0] != '_'){ if (preg_match_all('/^(GET|POST|PUT|DELETE|HEAD|OPTIONS)/i', $method_url, $matches)) { $http_method = strtoupper($matches[0][0]); $method_url = substr($method_url, strlen($http_method)); }else{ $http_method = 'GET'; } $url = $base_path. ($method_url=='index' || $method_url=='default' ? '' : $method_url); $url = rtrim($url,'/'); $this->routes[$http_method][$url] = $call; foreach ($params as $param){ if($param->getName()=='request_data'){ break; } $url .= $url=='' ? ':' : '/:'; $url .= $param->getName(); $this->routes[$http_method][$url] = $call; } } } } } if(version_compare(PHP_VERSION, '5.3.0') < 0){ require_once 'compat.php'; } class RestException extends Exception { public function __construct($http_status_code, $error_message = NULL) { parent::__construct($error_message, $http_status_code); } } interface iRespond { public function __formatResponse($result); public function __formatError($status_code, $message); } class DefaultResponse implements iRespond { function __formatResponse($result) { return $result; } function __formatError($statusCode, $message) { return array('error' => array('code' => $statusCode, 'message' => $message)); } } interface iAuthenticate { public function __isAuthenticated(); } interface iFormat { public function getMIMEMap(); public function setMIME($mime); public function getMIME(); public function setExtension($extension); public function getExtension(); public function encode($data, $human_readable=FALSE); public function decode($data); } class UrlEncodedFormat implements iFormat { const MIME = 'application/x-www-form-urlencoded'; const EXTENSION = 'post'; public function getMIMEMap() { return array(self::EXTENSION=>self::MIME); } public function getMIME(){ return self::MIME; } public function getExtension(){ return self::EXTENSION; } public function setMIME($mime){ } public function setExtension($extension){ } public function encode($data, $human_readable=FALSE){ return http_build_query($data); } public function decode($data){ parse_str($data,$r); return $r; } public function __toString(){ return $this->getExtension(); } } class JsonFormat implements iFormat { const MIME ='application/json,application/javascript'; static $mime = 'application/json'; const EXTENSION = 'json'; public function getMIMEMap() { return array(self::EXTENSION=>self::MIME); } public function getMIME(){ return self::$mime; } public function getExtension(){ return self::EXTENSION; } public function setMIME($mime){ self::$mime = $mime; } public function setExtension($extension){ } public function encode($data, $human_readable=FALSE){ return $human_readable ? $this->json_format(json_encode(object_to_array($data))) : json_encode(object_to_array($data)); } public function decode($data) { $decoded = json_decode ( $data ); if (function_exists ( 'json_last_error' )) { $message = ''; switch (json_last_error ()) { case JSON_ERROR_NONE : return object_to_array ( $decoded ); break; case JSON_ERROR_DEPTH : $message = 'maximum stack depth exceeded'; break; case JSON_ERROR_STATE_MISMATCH : $message = 'underflow or the modes mismatch'; break; case JSON_ERROR_CTRL_CHAR : $message = 'unexpected control character found'; break; case JSON_ERROR_SYNTAX : $message = 'malformed JSON'; break; case JSON_ERROR_UTF8 : $message = 'malformed UTF-8 characters, possibly incorrectly encoded'; break; default : $message = 'unknown error'; break; } throw new RestException ( 400, 'Error parsing JSON, ' . $message ); } else if (strlen ( $data ) && $decoded === NULL || $decoded === $data) { throw new RestException ( 400, 'Error parsing JSON' ); } return object_to_array ( $decoded ); } private function json_format($json) { $tab = "  "; $new_json = ""; $indent_level = 0; $in_string = FALSE; $len = strlen($json); for($c = 0; $c < $len; $c++) { $char = $json[$c]; switch($char) { case '{': case '[': if(!$in_string) { $new_json .= $char . "\n" . str_repeat($tab, $indent_level+1); $indent_level++; } else { $new_json .= $char; } break; case '}': case ']': if(!$in_string) { $indent_level--; $new_json .= "\n".str_repeat($tab, $indent_level).$char; } else { $new_json .= $char; } break; case ',': if(!$in_string) { $new_json .= ",\n" . str_repeat($tab, $indent_level); } else { $new_json .= $char; } break; case ':': if(!$in_string) { $new_json .= ": "; } else { $new_json .= $char; } break; case '"': if($c==0){ $in_string = TRUE; }elseif($c > 0 && $json[$c-1] != '\\') { $in_string = !$in_string; } default: $new_json .= $char; break; } } return $new_json; } public function __toString(){ return $this->getExtension(); } } class DocParser { private $params=array(); function parse($doc='') { if($doc==''){ return $this->params; } if(preg_match('#^/\*\*(.*)\*/#s', $doc, $comment) === false) return $this->params; $comment = trim($comment[1]); if(preg_match_all('#^\s*\*(.*)#m', $comment, $lines) === false) return $this->params; $this->parseLines($lines[1]); return $this->params; } private function parseLines($lines) { foreach($lines as $line) { $parsedLine = $this->parseLine($line); if($parsedLine === false && !isset($this->params['description'])) { if(isset($desc)){ $this->params['description'] = implode(PHP_EOL, $desc); } $desc = array(); } elseif($parsedLine !== false) { $desc[] = $parsedLine; } } $desc = implode(' ', $desc); if(!empty($desc))$this->params['long_description'] = $desc; } private function parseLine($line) { $line = trim($line); if(empty($line)) return false; if(strpos($line, '@') === 0) { if(strpos($line, ' ')>0){ $param = substr($line, 1, strpos($line, ' ') - 1); $value = substr($line, strlen($param) + 2); }else{ $param = substr($line, 1); $value = ''; } if($this->setParam($param, $value)) return false; } return $line; } private function setParam($param, $value) { if($param == 'param' || $param == 'return') $value = $this->formatParamOrReturn($value); if($param == 'class') list($param, $value) = $this->formatClass($value); if(empty($this->params[$param])) { $this->params[$param] = $value; } else if($param == 'param'){ $arr = array($this->params[$param], $value); $this->params[$param] = $arr; } else { $this->params[$param] = $value + $this->params[$param]; } return true; } private function formatClass($value) { $r = preg_split("[\(|\)]", $value); if(count($r)>1){ $param = $r[0]; parse_str($r[1],$value); foreach ($value as $key => $val) { $val = explode(',', $val); if(count($val)>1)$value[$key]=$val; } }else{ $param='Unknown'; } return array($param, $value); } private function formatParamOrReturn($string) { $pos = strpos($string, ' '); $type = substr($string, 0, $pos); return '(' . $type . ')' . substr($string, $pos+1); } } function parse_doc($php_doc_comment){ $p = new DocParser(); return $p->parse($php_doc_comment); $p = new Parser($php_doc_comment); return $p; $php_doc_comment = preg_replace("/(^[\\s]*\\/\\*\\*)
-                                 |(^[\\s]\\*\\/)
-                                 |(^[\\s]*\\*?\\s)
-                                 |(^[\\s]*)
-                                 |(^[\\t]*)/ixm", "", $php_doc_comment); $php_doc_comment = str_replace("\r", "", $php_doc_comment); $php_doc_comment = preg_replace("/([\\t])+/", "\t", $php_doc_comment); return explode("\n", $php_doc_comment); $php_doc_comment = trim(preg_replace('/\r?\n *\* */', ' ', $php_doc_comment)); return $php_doc_comment; preg_match_all('/@([a-z]+)\s+(.*?)\s*(?=$|@[a-z]+\s)/s', $php_doc_comment, $matches); return array_combine($matches[1], $matches[2]); } function object_to_array($object, $utf_encode=FALSE) { if(is_array($object) || (is_object($object) && !($object instanceof JsonSerializable))) { $array = array(); foreach($object as $key => $value) { $value = object_to_array($value, $utf_encode); if($utf_encode && is_string($value)){ $value = utf8_encode($value); } $array[$key] = $value; } return $array; } return $object; } function autoload_formats($class_name) { $class_name=strtolower($class_name); $file = RESTLER_PATH."/$class_name/$class_name.php"; if (file_exists($file)) { require_once($file); } elseif (file_exists("$class_name.php")) { require_once ("$class_name.php"); } } spl_autoload_register('autoload_formats'); if(!function_exists('isRestlerCompatibilityModeEnabled')){ function isRestlerCompatibilityModeEnabled(){ return FALSE; } } define('RESTLER_PATH', dirname(__FILE__));
\ No newline at end of file
+ class Restler { const VERSION = '2.2.0'; public $url; public $request_method; public $request_format; public $request_data = array(); public $cache_dir; public $base_dir; public $response = 'DefaultResponse'; public $response_format; protected $production_mode; protected $routes = array(); protected $format_map = array(); protected $service_class_instance; protected $service_method; protected $auth_classes = array(); protected $error_classes = array(); private $codes = array( 100 => 'Continue', 101 => 'Switching Protocols', 200 => 'OK', 201 => 'Created', 202 => 'Accepted', 203 => 'Non-Authoritative Information', 204 => 'No Content', 205 => 'Reset Content', 206 => 'Partial Content', 300 => 'Multiple Choices', 301 => 'Moved Permanently', 302 => 'Found', 303 => 'See Other', 304 => 'Not Modified', 305 => 'Use Proxy', 306 => '(Unused)', 307 => 'Temporary Redirect', 400 => 'Bad Request', 401 => 'Unauthorized', 402 => 'Payment Required', 403 => 'Forbidden', 404 => 'Not Found', 405 => 'Method Not Allowed', 406 => 'Not Acceptable', 407 => 'Proxy Authentication Required', 408 => 'Request Timeout', 409 => 'Conflict', 410 => 'Gone', 411 => 'Length Required', 412 => 'Precondition Failed', 413 => 'Request Entity Too Large', 414 => 'Request-URI Too Long', 415 => 'Unsupported Media Type', 416 => 'Requested Range Not Satisfiable', 417 => 'Expectation Failed', 500 => 'Internal Server Error', 501 => 'Not Implemented', 502 => 'Bad Gateway', 503 => 'Service Unavailable', 504 => 'Gateway Timeout', 505 => 'HTTP Version Not Supported' ); protected $cached; public function __construct($production_mode = FALSE) { $this->production_mode = $production_mode; $this->cache_dir = getcwd(); $this->base_dir = RESTLER_PATH; } public function __destruct() { if ($this->production_mode && !($this->cached)) { $this->saveCache(); } } public function refreshCache() { $this->routes = array(); $this->cached = FALSE; } public function setSupportedFormats() { $args = func_get_args(); $extensions = array(); foreach ($args as $class_name) { if (!is_string($class_name) || !class_exists($class_name)) { throw new Exception("$class_name is not a vaild Format Class."); } $obj = new $class_name; if (!($obj instanceof iFormat)) { throw new Exception('Invalid format class; must implement ' . 'iFormat interface'); } foreach ($obj->getMIMEMap() as $extension => $mime) { if (!isset($this->format_map[$extension])) { $this->format_map[$extension] = $class_name; } $mime = explode(',', $mime); if (!is_array($mime)) { $mime = array($mime); } foreach ($mime as $value) { if (!isset($this->format_map[$value])) $this->format_map[$value] = $class_name; } $extensions[".$extension"] = TRUE; } } $this->format_map['default'] = $args[0]; $this->format_map['extensions'] = array_keys($extensions); } public function addAPIClass($class_name, $base_path = NULL) { if (!class_exists($class_name)) { throw new Exception("API class $class_name is missing."); } $this->loadCache(); if (!$this->cached) { if (is_null($base_path)) { $base_path = strtolower($class_name); $index = strrpos($class_name, '\\'); if ($index !== FALSE) { $base_path = substr($base_path, $index + 1); } } else { $base_path = trim($base_path,'/'); } if (strlen($base_path) > 0) { $base_path .= '/'; } $this->generateMap($class_name, $base_path); } } public function addAuthenticationClass($class_name, $base_path = NULL) { $this->auth_classes[] = $class_name; $this->addAPIClass($class_name, $base_path); } public function addErrorClass($class_name) { $this->error_classes[] = $class_name; } public function handleError($status_code, $error_message = NULL) { $method = "handle$status_code"; $handled = FALSE; foreach ($this->error_classes as $class_name) { if (method_exists($class_name, $method)) { $obj = new $class_name(); $obj->restler = $this; $obj->$method(); $handled = TRUE; } } if ($handled) { return; } $message = $this->codes[$status_code] . (!$error_message ? '' : ': ' . $error_message); $this->setStatus($status_code); $responder = new $this->response(); $responder->restler = $this; $this->sendData($responder->__formatError($status_code, $message)); } public function handle() { if (empty($this->format_map)) { $this->setSupportedFormats('JsonFormat'); } $this->url = $this->getPath(); $this->request_method = $this->getRequestMethod(); $this->response_format = $this->getResponseFormat(); $this->request_format = $this->getRequestFormat(); if (is_null($this->request_format)) { $this->request_format = $this->response_format; } if ($this->request_method == 'PUT' || $this->request_method == 'POST') { $this->request_data = $this->getRequestData(); } $o = $this->mapUrlToMethod(); if (!isset($o->class_name)) { $this->handleError(404); } else { try { if ($o->method_flag) { $auth_method = '__isAuthenticated'; if (!count($this->auth_classes)) { throw new RestException(401); } foreach ($this->auth_classes as $auth_class) { $auth_obj = new $auth_class(); $auth_obj->restler = $this; $this->applyClassMetadata($auth_class, $auth_obj, $o); if (!method_exists($auth_obj, $auth_method)) { throw new RestException(401, 'Authentication Class ' . 'should implement iAuthenticate'); } else if (!$auth_obj->$auth_method()) { throw new RestException(401); } } } $this->applyClassMetadata(get_class($this->request_format), $this->request_format, $o); $pre_process = '_' . $this->request_format->getExtension() . '_' . $o->method_name; $this->service_method = $o->method_name; if ($o->method_flag == 2) { $o = unprotect($o); } $object = $this->service_class_instance = new $o->class_name(); $object->restler = $this; if (method_exists($o->class_name, $pre_process)) { call_user_func_array(array($object, $pre_process), $o->arguments); } switch ($o->method_flag) { case 3: $reflection_method = new ReflectionMethod($object, $o->method_name); $reflection_method->setAccessible(TRUE); $result = $reflection_method->invokeArgs($object, $o->arguments); break; case 2: case 1: default: $result = call_user_func_array(array( $object, $o->method_name), $o->arguments ); break; } } catch (RestException $e) { $this->handleError($e->getCode(), $e->getMessage()); } } $responder = new $this->response(); $responder->restler = $this; $this->applyClassMetadata($this->response, $responder, $o); if (isset($result) && $result !== NULL) { $result = $responder->__formatResponse($result); $this->sendData($result); } } public function sendData($data) { $data = $this->response_format->encode($data, !($this->production_mode)); $post_process = '_' . $this->service_method . '_' . $this->response_format->getExtension(); if (isset($this->service_class_instance) && method_exists($this->service_class_instance,$post_process) ) { $data = call_user_func(array($this->service_class_instance, $post_process), $data); } header("Cache-Control: no-cache, must-revalidate"); header("Expires: 0"); header('Content-Type: ' . $this->response_format->getMIME()); header("X-Powered-By: Luracast Restler v" . Restler::VERSION); die($data); } public function setStatus($code) { header("{$_SERVER['SERVER_PROTOCOL']} $code " . $this->codes[strval($code)]); } public function removeCommonPath($first, $second, $char = '/') { $first = explode($char, $first); $second = explode($char, $second); while (count($second)) { if ($first[0] == $second[0]) { array_shift($first); } else { break; } array_shift($second); } return implode($char, $first); } public function saveCache() { $file = $this->cache_dir . '/routes.php'; $s = '$o=array();' . PHP_EOL; foreach ($this->routes as $key => $value) { $s .= PHP_EOL . PHP_EOL . PHP_EOL . "############### $key ###############" . PHP_EOL . PHP_EOL; $s .= '$o[\'' . $key . '\']=array();'; foreach ($value as $ke => $va) { $s .= PHP_EOL . PHP_EOL . "#==== $key $ke" . PHP_EOL . PHP_EOL; $s .= '$o[\'' . $key . '\'][\'' . $ke . '\']=' . str_replace( PHP_EOL, PHP_EOL . "\t", var_export($va, TRUE) ) . ';'; } } $s .= PHP_EOL . 'return $o;'; $r = @file_put_contents($file, "<?php $s"); @chmod($file, 0777); if ($r === FALSE) { throw new Exception( "The cache directory located at '$this->cache_dir' needs to have " . "the permissions set to read/write/execute for everyone in order " . "to save cache and improve performance."); } } protected function getPath() { $path = urldecode($this->removeCommonPath($_SERVER['REQUEST_URI'], $_SERVER['SCRIPT_NAME'])); $path = preg_replace('/(\/*\?.*$)|(\/$)/', '', $path); $path = str_replace($this->format_map['extensions'], '', $path); return $path; } protected function getRequestMethod() { $method = $_SERVER['REQUEST_METHOD']; if (isset($_SERVER['HTTP_X_HTTP_METHOD_OVERRIDE'])) { $method = $_SERVER['HTTP_X_HTTP_METHOD_OVERRIDE']; } if ($method == 'HEAD') { $method = 'GET'; } return $method; } protected function getRequestFormat() { $format = NULL; if (isset($_SERVER['CONTENT_TYPE'])) { $mime = explode(';', $_SERVER['CONTENT_TYPE']); $mime = $mime[0]; if ($mime == UrlEncodedFormat::MIME) { $format = new UrlEncodedFormat(); } else { if (isset($this->format_map[$mime])) { $format = $this->format_map[$mime]; $format = is_string($format) ? new $format : $format; $format->setMIME($mime); } } } return $format; } protected function getResponseFormat() { $format = NULL; $extensions = explode('.', parse_url($_SERVER['REQUEST_URI'], PHP_URL_PATH)); while($extensions) { $extension = array_pop($extensions); $extension = explode('/', $extension); $extension = array_shift($extension); if ($extension && isset($this->format_map[$extension])) { $format = $this->format_map[$extension]; $format = is_string($format) ? new $format : $format; $format->setExtension($extension); return $format; } } if (isset($_SERVER['HTTP_ACCEPT'])) { $acceptList = array(); $accepts = explode(',', strtolower($_SERVER['HTTP_ACCEPT'])); if (!is_array($accepts)) { $accepts = array($accepts); } foreach ($accepts as $pos => $accept) { $parts = explode(';q=', trim($accept)); $type = array_shift($parts); $quality = count($parts) ? floatval(array_shift($parts)) : (1000 - $pos) / 1000; $acceptList[$type] = $quality; } arsort($acceptList); foreach ($acceptList as $accept => $quality) { if (isset($this->format_map[$accept])) { $format = $this->format_map[$accept]; $format = is_string($format) ? new $format : $format; $format->setMIME($accept); header("Vary: Accept"); return $format; } } } else { $_SERVER['HTTP_ACCEPT'] = '*/*'; } if (strpos($_SERVER['HTTP_ACCEPT'], '*') !== FALSE) { if (strpos($_SERVER['HTTP_ACCEPT'], 'application/*') !== FALSE) { $format = new JsonFormat; } else if (strpos($_SERVER['HTTP_ACCEPT'], 'text/*') !== FALSE) { $format = new XmlFormat; } else if (strpos($_SERVER['HTTP_ACCEPT'], '*/*') !== FALSE) { $format = new $this->format_map['default']; } } if (empty($format)) { header('HTTP/1.1 406 Not Acceptable'); die('406 Not Acceptable: The server was unable to negotiate content for this request.'); } else { header("Vary: Accept"); return $format; } } protected function getRequestData() { try{ $r = file_get_contents('php://input'); if (is_null($r)) { return $_GET; } $r = $this->request_format->decode($r); return is_null($r) ? array() : $r; } catch (RestException $e) { $this->handleError($e->getCode(), $e->getMessage()); } } protected function mapUrlToMethod() { if (!isset($this->routes[$this->request_method])) { return array(); } $urls = $this->routes[$this->request_method]; if (!$urls) { return array(); } $found = FALSE; $this->request_data += $_GET; $params = array('request_data' => $this->request_data); $params += $this->request_data; $lc = strtolower($this->url); foreach ($urls as $url => $call) { $call = (object) $call; if (strstr($url, ':')) { $regex = preg_replace('/\\\:([^\/]+)/', '(?P<$1>[^/]+)', preg_quote($url)); if (preg_match(":^$regex$:i", $this->url, $matches)) { foreach ($matches as $arg => $match) { if (isset($call->arguments[$arg])) { $params[$arg] = $match; } } $found = TRUE; break; } } else if ($url == $lc) { $found = TRUE; break; } } if ($found) { $p = $call->defaults; foreach ($call->arguments as $key => $value) { if (isset($params[$key])) { $p[$value] = $params[$key]; } } $call->arguments = $p; return $call; } } protected function applyClassMetadata($class_name, $instance, $method_info) { if (isset($method_info->metadata[$class_name]) && is_array($method_info->metadata[$class_name]) ) { foreach ($method_info->metadata[$class_name] as $property => $value ) { if (property_exists($class_name, $property)) { $reflection_property = new ReflectionProperty($class_name, $property); $reflection_property->setValue($instance, $value); } } } } protected function loadCache() { if ($this->cached !== NULL) { return; } $file = $this->cache_dir . '/routes.php'; $this->cached = FALSE; if ($this->production_mode) { if (file_exists($file)) { $routes = include($file); } if (isset($routes) && is_array($routes)) { $this->routes = $routes; $this->cached = TRUE; } } else { } } protected function generateMap ($class_name, $base_path = '') { $reflection = new ReflectionClass($class_name); $class_metadata = parse_doc($reflection->getDocComment()); $methods = $reflection->getMethods( ReflectionMethod::IS_PUBLIC + ReflectionMethod::IS_PROTECTED ); foreach ($methods as $method) { $doc = $method->getDocComment(); $arguments = array(); $defaults = array(); $metadata = $class_metadata + parse_doc($doc); $params = $method->getParameters(); $position = 0; foreach ($params as $param) { $arguments[$param->getName()] = $position; $defaults[$position] = $param->isDefaultValueAvailable() ? $param->getDefaultValue() : NULL; $position++; } $method_flag = $method->isProtected() ? (isRestlerCompatibilityModeEnabled() ? 2 : 3) : (isset($metadata['protected']) ? 1 : 0); $call = array( 'class_name' => $class_name, 'method_name' => $method->getName(), 'arguments' => $arguments, 'defaults' => $defaults, 'metadata' => $metadata, 'method_flag' => $method_flag ); $method_url = strtolower($method->getName()); if (preg_match_all( '/@url\s+(GET|POST|PUT|DELETE|HEAD|OPTIONS)[ \t]*\/?(\S*)/s', $doc, $matches, PREG_SET_ORDER) ) { foreach ($matches as $match) { $http_method = $match[1]; $url = rtrim($base_path . $match[2],'/'); $this->routes[$http_method][$url] = $call; } } else if ($method_url[0] != '_') { if (preg_match_all('/^(GET|POST|PUT|DELETE|HEAD|OPTIONS)/i', $method_url, $matches) ) { $http_method = strtoupper($matches[0][0]); $method_url = substr($method_url, strlen($http_method)); } else { $http_method = 'GET'; } $url = $base_path . ($method_url == 'index' || $method_url == 'default' ? '' : $method_url); $url = rtrim($url,'/'); $this->routes[$http_method][$url] = $call; foreach ($params as $param) { if ($param->getName() == 'request_data') { break; } $url .= $url == '' ? ':' : '/:'; $url .= $param->getName(); $this->routes[$http_method][$url] = $call; } } } } } if (version_compare(PHP_VERSION, '5.3.0') < 0) { require_once 'compat.php'; } class RestException extends Exception { public function __construct($http_status_code, $error_message = NULL) { parent::__construct($error_message, $http_status_code); } } interface iRespond { public function __formatResponse($result); public function __formatError($status_code, $message); } class DefaultResponse implements iRespond { function __formatResponse($result) { return $result; } function __formatError($statusCode, $message) { return array( 'error' => array( 'code' => $statusCode, 'message' => $message ) ); } } interface iAuthenticate { public function __isAuthenticated(); } interface iFormat { public function getMIMEMap(); public function setMIME($mime); public function getMIME(); public function setExtension($extension); public function getExtension(); public function encode($data, $human_readable = FALSE); public function decode($data); } class UrlEncodedFormat implements iFormat { const MIME = 'application/x-www-form-urlencoded'; const EXTENSION = 'post'; public function getMIMEMap() { return array(self::EXTENSION => self::MIME); } public function getMIME() { return self::MIME; } public function getExtension() { return self::EXTENSION; } public function setMIME($mime) { } public function setExtension($extension) { } public function encode($data, $human_readable = FALSE) { return http_build_query($data); } public function decode($data) { parse_str($data,$r); return $r; } public function __toString() { return $this->getExtension(); } } class JsonFormat implements iFormat { const MIME = 'application/json,application/javascript'; static $mime = 'application/json'; const EXTENSION = 'json'; public function getMIMEMap() { return array(self::EXTENSION => self::MIME); } public function getMIME() { return self::$mime; } public function getExtension() { return self::EXTENSION; } public function setMIME($mime) { self::$mime = $mime; } public function setExtension($extension) { } public function encode($data, $human_readable = FALSE) { return $human_readable ? $this->json_format(json_encode(object_to_array($data))) : json_encode(object_to_array($data)); } public function decode($data) { $decoded = json_decode ($data); if (function_exists ('json_last_error')) { $message = ''; switch (json_last_error ()) { case JSON_ERROR_NONE: return object_to_array ($decoded); break; case JSON_ERROR_DEPTH: $message = 'maximum stack depth exceeded'; break; case JSON_ERROR_STATE_MISMATCH: $message = 'underflow or the modes mismatch'; break; case JSON_ERROR_CTRL_CHAR: $message = 'unexpected control character found'; break; case JSON_ERROR_SYNTAX: $message = 'malformed JSON'; break; case JSON_ERROR_UTF8: $message = 'malformed UTF-8 characters, possibly incorrectly encoded'; break; default: $message = 'unknown error'; break; } throw new RestException (400, 'Error parsing JSON, ' . $message); } else if (strlen ($data) && $decoded === NULL || $decoded === $data) { throw new RestException (400, 'Error parsing JSON'); } return object_to_array ($decoded); } private function json_format($json) { $tab = "  "; $new_json = ""; $indent_level = 0; $in_string = FALSE; $len = strlen($json); for($c = 0; $c < $len; $c++) { $char = $json[$c]; switch($char) { case '{': case '[': if (!$in_string) { $new_json .= $char . "\n" . str_repeat($tab, $indent_level + 1); $indent_level++; } else { $new_json .= $char; } break; case '}': case ']': if (!$in_string) { $indent_level--; $new_json .= "\n" . str_repeat($tab, $indent_level) . $char; } else { $new_json .= $char; } break; case ',': if (!$in_string) { $new_json .= ",\n" . str_repeat($tab, $indent_level); } else { $new_json .= $char; } break; case ':': if (!$in_string) { $new_json .= ": "; } else { $new_json .= $char; } break; case '"': if ($c==0) { $in_string = TRUE; } else if ($c > 0 && $json[$c-1] != '\\') { $in_string = !$in_string; } default: $new_json .= $char; break; } } return $new_json; } public function __toString() { return $this->getExtension(); } } class DocParser { private $params = array(); function parse($doc = '') { if ($doc == '') { return $this->params; } if (preg_match('#^/\*\*(.*)\*/#s', $doc, $comment) === false) { return $this->params; } $comment = trim($comment[1]); if (preg_match_all('#^\s*\*(.*)#m', $comment, $lines) === false) { return $this->params; } $this->parseLines($lines[1]); return $this->params; } private function parseLines($lines) { foreach($lines as $line) { $parsedLine = $this->parseLine($line); if ($parsedLine === false && !isset($this->params['description'])) { if (isset($desc)) { $this->params['description'] = implode(PHP_EOL, $desc); } $desc = array(); } else if ($parsedLine !== false) { $desc[] = $parsedLine; } } $desc = implode(' ', $desc); if (!empty($desc)) { $this->params['long_description'] = $desc; } } private function parseLine($line) { $line = trim($line); if (empty($line)) { return false; } if (strpos($line, '@') === 0) { if (strpos($line, ' ') > 0) { $param = substr($line, 1, strpos($line, ' ') - 1); $value = substr($line, strlen($param) + 2); } else { $param = substr($line, 1); $value = ''; } if ($this->setParam($param, $value)) return false; } return $line; } private function setParam($param, $value) { if ($param == 'param' || $param == 'return') { $value = $this->formatParamOrReturn($value); } if ($param == 'class') { list($param, $value) = $this->formatClass($value); } if (empty($this->params[$param])) { $this->params[$param] = $value; } else if ($param == 'param') { $arr = array($this->params[$param], $value); $this->params[$param] = $arr; } else { $this->params[$param] = $value + $this->params[$param]; } return true; } private function formatClass($value) { $r = preg_split("[\(|\)]", $value); if (count($r) > 1) { $param = $r[0]; parse_str($r[1],$value); foreach ($value as $key => $val) { $val = explode(',', $val); if (count($val) > 1) { $value[$key] = $val; } } } else { $param = 'Unknown'; } return array($param, $value); } private function formatParamOrReturn($string) { $pos = strpos($string, ' '); $type = substr($string, 0, $pos); return '(' . $type . ')' . substr($string, $pos + 1); } } function parse_doc($php_doc_comment) { $p = new DocParser(); return $p->parse($php_doc_comment); $p = new Parser($php_doc_comment); return $p; $php_doc_comment = preg_replace( "/(^[\\s]*\\/\\*\\*)
+        |(^[\\s]\\*\\/)
+        |(^[\\s]*\\*?\\s)
+        |(^[\\s]*)
+        |(^[\\t]*)/ixm", "", $php_doc_comment); $php_doc_comment = str_replace("\r", "", $php_doc_comment); $php_doc_comment = preg_replace("/([\\t])+/", "\t", $php_doc_comment); return explode("\n", $php_doc_comment); $php_doc_comment = trim(preg_replace('/\r?\n *\* */', ' ', $php_doc_comment)); return $php_doc_comment; preg_match_all('/@([a-z]+)\s+(.*?)\s*(?=$|@[a-z]+\s)/s', $php_doc_comment, $matches); return array_combine($matches[1], $matches[2]); } function object_to_array($object, $utf_encode = FALSE) { if (is_array($object) || (is_object($object) && !($object instanceof JsonSerializable)) ) { $array = array(); foreach($object as $key => $value) { $value = object_to_array($value, $utf_encode); if ($utf_encode && is_string($value)) { $value = utf8_encode($value); } $array[$key] = $value; } return $array; } return $object; } function autoload_formats($class_name) { $class_name = strtolower($class_name); $file = RESTLER_PATH . "/$class_name/$class_name.php"; if (file_exists ($file)) { require_once ($file); } else { $file = RESTLER_PATH . "/$class_name.php"; if (file_exists ($file)) { require_once ($file); } elseif (file_exists ("$class_name.php")) { require_once ("$class_name.php"); } } } spl_autoload_register('autoload_formats'); if (!function_exists('isRestlerCompatibilityModeEnabled')) { function isRestlerCompatibilityModeEnabled() { return FALSE; } } define('RESTLER_PATH', dirname(__FILE__));
\ No newline at end of file

From fdad39877689ab1883aa04436ffb7805787be680 Mon Sep 17 00:00:00 2001
From: Joel Simpson <joel.simpson@gmail.com>
Date: Wed, 4 Jul 2012 09:28:44 -0700
Subject: [PATCH 51/61] fixed change that broke APIs that are not at the root
 path

---
 restler/restler.php | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/restler/restler.php b/restler/restler.php
index d1e793c90..8b9113b68 100644
--- a/restler/restler.php
+++ b/restler/restler.php
@@ -707,7 +707,11 @@ protected function mapUrlToMethod()
                     $found = TRUE;
                     break;
                 }
-            } else if ($url == $lc) {
+            // The commented line replaced the following line, but it breaks for
+            // for cases where the api is not at the root uri.
+            // we aren't necessarily looking for an exact match!
+            //} else if ($url == $lc) {
+            }elseif (strpos($lc,$url) !== false){
                 $found = TRUE;
                 break;
             }

From aae754af919da791931cf9c09ae67af0c13bd0b8 Mon Sep 17 00:00:00 2001
From: Joel Simpson <joel.simpson@gmail.com>
Date: Wed, 4 Jul 2012 09:36:10 -0700
Subject: [PATCH 52/61] added init() that can be called prior to handle() in
 order to generate error responses that happen during prerouting

---
 restler/restler.php | 46 +++++++++++++++++++++++++--------------------
 1 file changed, 26 insertions(+), 20 deletions(-)

diff --git a/restler/restler.php b/restler/restler.php
index 9726149ac..628cffb26 100644
--- a/restler/restler.php
+++ b/restler/restler.php
@@ -338,27 +338,33 @@ public function handleError($status_code, $error_message = NULL)
     }
 
     /**
-     * Main function for processing the api request
-     * and return the response
-     * @throws Exception when the api service class is missing
-     * @throws RestException to send error response
+     * An initialize function to allow use of the restler error generation functions
+     * for pre-processing and pre-routing of requests.
      */
-    public function handle()
-    {
-        if (empty($this->format_map)) {
-            $this->setSupportedFormats('JsonFormat');
-        }
-        $this->url             = $this->getPath();
-        $this->request_method  = $this->getRequestMethod();
-        $this->response_format = $this->getResponseFormat();
-        $this->request_format  = $this->getRequestFormat();
-        if (is_null($this->request_format)) {
-            $this->request_format = $this->response_format;
-        }
-        if ($this->request_method == 'PUT' || $this->request_method == 'POST') {
-            $this->request_data = $this->getRequestData();
-        }
-        $o = $this->mapUrlToMethod();
+    public function init () {
+        if(empty($this->format_map))$this->setSupportedFormats('JsonFormat');
+                $this->url = $this->getPath();
+                $this->request_method = $this->getRequestMethod();
+                $this->response_format = $this->getResponseFormat();
+                $this->request_format = $this->getRequestFormat();
+                if(is_null($this->request_format)){
+                        $this->request_format = $this->response_format;
+                }
+                if($this->request_method == 'PUT' || $this->request_method == 'POST'){
+                        $this->request_data = $this->getRequestData();
+                }
+    }
+
+        /**
+         * Main function for processing the api request
+         * and return the response
+         * @throws Exception when the api service class is missing
+         * @throws RestException to send error response
+         */
+        public function handle () {
+                $this->init();
+                $o = $this->mapUrlToMethod();
+
         if (!isset($o->class_name)) {
             $this->handleError(404);
         } else {

From c51b3c70843d1c5b6bd432979c01454ec8424529 Mon Sep 17 00:00:00 2001
From: Joel Simpson <joel.simpson@gmail.com>
Date: Wed, 4 Jul 2012 09:37:19 -0700
Subject: [PATCH 53/61] fixed formatting using netbeans autoformatting

---
 restler/restler.php | 387 ++++++++++++++++++++++++++------------------
 1 file changed, 228 insertions(+), 159 deletions(-)

diff --git a/restler/restler.php b/restler/restler.php
index 628cffb26..9d77eb79c 100644
--- a/restler/restler.php
+++ b/restler/restler.php
@@ -1,4 +1,5 @@
 <?php
+
 /**
  * REST API Server. It is the server part of the Restler framework.
  * Based on the RestServer code from <http://jacwright.com/blog/resources/RestServer.txt>
@@ -184,6 +185,7 @@ class Restler
     //
     // ------------------------------------------------------------------
 
+
     /**
      * Constructor
      * @param boolean $production_mode When set to FALSE, it will run in
@@ -192,10 +194,11 @@ class Restler
     public function __construct($production_mode = FALSE)
     {
         $this->production_mode = $production_mode;
-        $this->cache_dir       = getcwd();
-        $this->base_dir        = RESTLER_PATH;
+        $this->cache_dir = getcwd();
+        $this->base_dir = RESTLER_PATH;
     }
 
+
     /**
      * Store the url map cache if needed
      */
@@ -206,6 +209,7 @@ public function __destruct()
         }
     }
 
+
     /**
      * Use it in production mode to refresh the url map cache
      */
@@ -215,6 +219,7 @@ public function refreshCache()
         $this->cached = FALSE;
     }
 
+
     /**
      * Call this method and pass all the formats that should be
      * supported by the API. Accepts multiple parameters
@@ -245,14 +250,15 @@ public function setSupportedFormats()
                 foreach ($mime as $value) {
                     if (!isset($this->format_map[$value]))
                         $this->format_map[$value] = $class_name;
-                    }
+                }
                 $extensions[".$extension"] = TRUE;
             }
         }
-        $this->format_map['default']    = $args[0];
+        $this->format_map['default'] = $args[0];
         $this->format_map['extensions'] = array_keys($extensions);
     }
 
+
     /**
      * Add api classes throgh this method. All the public methods
      * that do not start with _ (underscore) will be  will be exposed
@@ -279,7 +285,7 @@ public function addAPIClass($class_name, $base_path = NULL)
                     $base_path = substr($base_path, $index + 1);
                 }
             } else {
-                $base_path = trim($base_path,'/');
+                $base_path = trim($base_path, '/');
             }
             if (strlen($base_path) > 0) {
                 $base_path .= '/';
@@ -288,6 +294,7 @@ public function addAPIClass($class_name, $base_path = NULL)
         }
     }
 
+
     /**
      * protected methods will need atleast one authentication class to be set
      * in order to allow that method to be executed
@@ -300,6 +307,7 @@ public function addAuthenticationClass($class_name, $base_path = NULL)
         $this->addAPIClass($class_name, $base_path);
     }
 
+
     /**
      * Add class for custom error handling
      * @param string $class_name of the error handling class
@@ -309,6 +317,7 @@ public function addErrorClass($class_name)
         $this->error_classes[] = $class_name;
     }
 
+
     /**
      * Convenience method to respond with an error message
      * @param int $statusCode http error code
@@ -316,14 +325,14 @@ public function addErrorClass($class_name)
      */
     public function handleError($status_code, $error_message = NULL)
     {
-        $method  = "handle$status_code";
+        $method = "handle$status_code";
         $handled = FALSE;
         foreach ($this->error_classes as $class_name) {
             if (method_exists($class_name, $method)) {
-                $obj          = new $class_name();
+                $obj = new $class_name();
                 $obj->restler = $this;
                 $obj->$method();
-                $handled      = TRUE;
+                $handled = TRUE;
             }
         }
         if ($handled) {
@@ -332,38 +341,43 @@ public function handleError($status_code, $error_message = NULL)
         $message = $this->codes[$status_code]
             . (!$error_message ? '' : ': ' . $error_message);
         $this->setStatus($status_code);
-        $responder          = new $this->response();
+        $responder = new $this->response();
         $responder->restler = $this;
         $this->sendData($responder->__formatError($status_code, $message));
     }
 
+
     /**
      * An initialize function to allow use of the restler error generation functions
      * for pre-processing and pre-routing of requests.
      */
-    public function init () {
-        if(empty($this->format_map))$this->setSupportedFormats('JsonFormat');
-                $this->url = $this->getPath();
-                $this->request_method = $this->getRequestMethod();
-                $this->response_format = $this->getResponseFormat();
-                $this->request_format = $this->getRequestFormat();
-                if(is_null($this->request_format)){
-                        $this->request_format = $this->response_format;
-                }
-                if($this->request_method == 'PUT' || $this->request_method == 'POST'){
-                        $this->request_data = $this->getRequestData();
-                }
+    public function init()
+    {
+        if (empty($this->format_map))
+            $this->setSupportedFormats('JsonFormat');
+        $this->url = $this->getPath();
+        $this->request_method = $this->getRequestMethod();
+        $this->response_format = $this->getResponseFormat();
+        $this->request_format = $this->getRequestFormat();
+        if (is_null($this->request_format)) {
+            $this->request_format = $this->response_format;
+        }
+        if ($this->request_method == 'PUT' || $this->request_method == 'POST') {
+            $this->request_data = $this->getRequestData();
+        }
     }
 
-        /**
-         * Main function for processing the api request
-         * and return the response
-         * @throws Exception when the api service class is missing
-         * @throws RestException to send error response
-         */
-        public function handle () {
-                $this->init();
-                $o = $this->mapUrlToMethod();
+
+    /**
+     * Main function for processing the api request
+     * and return the response
+     * @throws Exception when the api service class is missing
+     * @throws RestException to send error response
+     */
+    public function handle()
+    {
+        $this->init();
+        $o = $this->mapUrlToMethod();
 
         if (!isset($o->class_name)) {
             $this->handleError(404);
@@ -375,7 +389,7 @@ public function handle () {
                         throw new RestException(401);
                     }
                     foreach ($this->auth_classes as $auth_class) {
-                        $auth_obj          = new $auth_class();
+                        $auth_obj = new $auth_class();
                         $auth_obj->restler = $this;
                         $this->applyClassMetadata($auth_class, $auth_obj, $o);
                         if (!method_exists($auth_obj, $auth_method)) {
@@ -387,7 +401,7 @@ public function handle () {
                     }
                 }
                 $this->applyClassMetadata(get_class($this->request_format),
-                $this->request_format, $o);
+                    $this->request_format, $o);
                 $pre_process = '_' . $this->request_format->getExtension() . '_'
                     . $o->method_name;
                 $this->service_method = $o->method_name;
@@ -397,24 +411,22 @@ public function handle () {
                 $object = $this->service_class_instance = new $o->class_name();
                 $object->restler = $this;
                 if (method_exists($o->class_name, $pre_process)) {
-                    call_user_func_array(array($object, $pre_process),
-                                               $o->arguments);
+                    call_user_func_array(array($object, $pre_process), $o->arguments);
                 }
                 switch ($o->method_flag) {
                     case 3:
                         $reflection_method = new ReflectionMethod($object,
-                                                                  $o->method_name);
+                                $o->method_name);
                         $reflection_method->setAccessible(TRUE);
                         $result = $reflection_method->invokeArgs($object,
-                                                                 $o->arguments);
+                            $o->arguments);
                         break;
                     case 2:
                     case 1:
                     default:
                         $result = call_user_func_array(array(
                             $object,
-                            $o->method_name),
-                            $o->arguments
+                            $o->method_name), $o->arguments
                         );
                         break;
                 }
@@ -431,6 +443,7 @@ public function handle () {
         }
     }
 
+
     /**
      * Encodes the response in the prefered format
      * and sends back
@@ -438,14 +451,14 @@ public function handle () {
      */
     public function sendData($data)
     {
-        $data =  $this->response_format->encode($data, !($this->production_mode));
-        $post_process =  '_' . $this->service_method . '_'
+        $data = $this->response_format->encode($data, !($this->production_mode));
+        $post_process = '_' . $this->service_method . '_'
             . $this->response_format->getExtension();
         if (isset($this->service_class_instance)
-            && method_exists($this->service_class_instance,$post_process)
+            && method_exists($this->service_class_instance, $post_process)
         ) {
             $data = call_user_func(array($this->service_class_instance,
-            $post_process), $data);
+                $post_process), $data);
         }
         header("Cache-Control: no-cache, must-revalidate");
         header("Expires: 0");
@@ -455,6 +468,7 @@ public function sendData($data)
         die($data);
     }
 
+
     /**
      * Sets the HTTP response status
      * @param int $code response code
@@ -464,6 +478,7 @@ public function setStatus($code)
         header("{$_SERVER['SERVER_PROTOCOL']} $code " . $this->codes[strval($code)]);
     }
 
+
     /**
      * Compare two strings and remove the common
      * sub string from the first string and return it
@@ -475,7 +490,7 @@ public function setStatus($code)
      */
     public function removeCommonPath($first, $second, $char = '/')
     {
-        $first  = explode($char, $first);
+        $first = explode($char, $first);
         $second = explode($char, $second);
         while (count($second)) {
             if ($first[0] == $second[0]) {
@@ -488,13 +503,14 @@ public function removeCommonPath($first, $second, $char = '/')
         return implode($char, $first);
     }
 
+
     /**
      * Save cache to file
      */
     public function saveCache()
     {
         $file = $this->cache_dir . '/routes.php';
-        $s    = '$o=array();' . PHP_EOL;
+        $s = '$o=array();' . PHP_EOL;
         foreach ($this->routes as $key => $value) {
             $s .= PHP_EOL . PHP_EOL . PHP_EOL . "############### $key ###############"
                 . PHP_EOL . PHP_EOL;
@@ -502,20 +518,18 @@ public function saveCache()
             foreach ($value as $ke => $va) {
                 $s .= PHP_EOL . PHP_EOL . "#==== $key $ke" . PHP_EOL . PHP_EOL;
                 $s .= '$o[\'' . $key . '\'][\'' . $ke . '\']=' . str_replace(
-                    PHP_EOL,
-                    PHP_EOL . "\t",
-                    var_export($va, TRUE)
-                ) . ';';
+                        PHP_EOL, PHP_EOL . "\t", var_export($va, TRUE)
+                    ) . ';';
             }
         }
         $s .= PHP_EOL . 'return $o;';
-        $r  = @file_put_contents($file, "<?php $s");
+        $r = @file_put_contents($file, "<?php $s");
         @chmod($file, 0777);
         if ($r === FALSE) {
             throw new Exception(
                 "The cache directory located at '$this->cache_dir' needs to have "
-                    . "the permissions set to read/write/execute for everyone in order "
-                    . "to save cache and improve performance.");
+                . "the permissions set to read/write/execute for everyone in order "
+                . "to save cache and improve performance.");
         }
     }
 
@@ -525,19 +539,21 @@ public function saveCache()
     //
     // ------------------------------------------------------------------
 
+
     /**
-    * Parses the requst url and get the api path
-    * @return string api path
-    */
+     * Parses the requst url and get the api path
+     * @return string api path
+     */
     protected function getPath()
     {
         $path = urldecode($this->removeCommonPath($_SERVER['REQUEST_URI'],
-                                                  $_SERVER['SCRIPT_NAME']));
+                $_SERVER['SCRIPT_NAME']));
         $path = preg_replace('/(\/*\?.*$)|(\/$)/', '', $path);
         $path = str_replace($this->format_map['extensions'], '', $path);
         return $path;
     }
 
+
     /**
      * Parses the request to figure out the http request type
      * @return string which will be one of the following
@@ -557,6 +573,7 @@ protected function getRequestMethod()
         return $method;
     }
 
+
     /**
      * Parses the request to figure out format of the request data
      * @return iFormat any class that implements iFormat
@@ -582,6 +599,7 @@ protected function getRequestFormat()
         return $format;
     }
 
+
     /**
      * Parses the request to figure out the best format for response
      * @return iFormat any class that implements iFormat
@@ -591,12 +609,12 @@ protected function getResponseFormat()
     {
         //check if client has specified an extension
         /**
-        * @var iFormat
-        */
+         * @var iFormat
+         */
         $format = NULL;
-        $extensions = explode('.', parse_url($_SERVER['REQUEST_URI'],
-                                             PHP_URL_PATH));
-        while($extensions) {
+        $extensions = explode('.',
+            parse_url($_SERVER['REQUEST_URI'], PHP_URL_PATH));
+        while ($extensions) {
             $extension = array_pop($extensions);
             $extension = explode('/', $extension);
             $extension = array_shift($extension);
@@ -611,28 +629,26 @@ protected function getResponseFormat()
         //check if client has sent list of accepted data formats
         if (isset($_SERVER['HTTP_ACCEPT'])) {
             $acceptList = array();
-            $accepts    = explode(',', strtolower($_SERVER['HTTP_ACCEPT']));
+            $accepts = explode(',', strtolower($_SERVER['HTTP_ACCEPT']));
             if (!is_array($accepts)) {
                 $accepts = array($accepts);
             }
             foreach ($accepts as $pos => $accept) {
-                $parts   = explode(';q=', trim($accept));
-                $type    = array_shift($parts);
-                $quality = count($parts)
-                    ? floatval(array_shift($parts))
-                    : (1000 - $pos) / 1000;
+                $parts = explode(';q=', trim($accept));
+                $type = array_shift($parts);
+                $quality = count($parts) ? floatval(array_shift($parts)) : (1000 - $pos) / 1000;
                 $acceptList[$type] = $quality;
             }
             arsort($acceptList);
             foreach ($acceptList as $accept => $quality) {
                 if (isset($this->format_map[$accept])) {
-                        $format = $this->format_map[$accept];
-                        $format = is_string($format) ? new $format : $format;
-                        $format->setMIME($accept);
-                        //echo "MIME $accept";
-                        header("Vary: Accept"); // Tell cache content is based on Accept header
-                        return $format;
-                    }
+                    $format = $this->format_map[$accept];
+                    $format = is_string($format) ? new $format : $format;
+                    $format->setMIME($accept);
+                    //echo "MIME $accept";
+                    header("Vary: Accept"); // Tell cache content is based on Accept header
+                    return $format;
+                }
             }
         } else {
             // RFC 2616: If no Accept header field is
@@ -643,11 +659,9 @@ protected function getResponseFormat()
         if (strpos($_SERVER['HTTP_ACCEPT'], '*') !== FALSE) {
             if (strpos($_SERVER['HTTP_ACCEPT'], 'application/*') !== FALSE) {
                 $format = new JsonFormat;
-            }
-            else if (strpos($_SERVER['HTTP_ACCEPT'], 'text/*') !== FALSE) {
+            } else if (strpos($_SERVER['HTTP_ACCEPT'], 'text/*') !== FALSE) {
                 $format = new XmlFormat;
-            }
-            else if (strpos($_SERVER['HTTP_ACCEPT'], '*/*') !== FALSE) {
+            } else if (strpos($_SERVER['HTTP_ACCEPT'], '*/*') !== FALSE) {
                 $format = new $this->format_map['default'];
             }
         }
@@ -664,13 +678,14 @@ protected function getResponseFormat()
         }
     }
 
+
     /**
      * Parses the request data and returns it
      * @return array php data
      */
     protected function getRequestData()
     {
-        try{
+        try {
             $r = file_get_contents('php://input');
             if (is_null($r)) {
                 return $_GET;
@@ -682,6 +697,7 @@ protected function getRequestData()
         }
     }
 
+
     protected function mapUrlToMethod()
     {
         if (!isset($this->routes[$this->request_method])) {
@@ -692,17 +708,17 @@ protected function mapUrlToMethod()
             return array();
         }
 
-        $found               = FALSE;
+        $found = FALSE;
         $this->request_data += $_GET;
-        $params              = array('request_data' => $this->request_data);
-        $params             += $this->request_data;
-        $lc                  = strtolower($this->url);
+        $params = array('request_data' => $this->request_data);
+        $params += $this->request_data;
+        $lc = strtolower($this->url);
         foreach ($urls as $url => $call) {
             //echo PHP_EOL.$url.' = '.$this->url.PHP_EOL;
             $call = (object) $call;
             if (strstr($url, ':')) {
                 $regex = preg_replace('/\\\:([^\/]+)/', '(?P<$1>[^/]+)',
-                                      preg_quote($url));
+                    preg_quote($url));
                 if (preg_match(":^$regex$:i", $this->url, $matches)) {
                     foreach ($matches as $arg => $match) {
                         if (isset($call->arguments[$arg])) {
@@ -713,11 +729,11 @@ protected function mapUrlToMethod()
                     $found = TRUE;
                     break;
                 }
-            // The commented line replaced the following line, but it breaks for
-            // for cases where the api is not at the root uri.
-            // we aren't necessarily looking for an exact match!
-            //} else if ($url == $lc) {
-            }elseif (strpos($lc,$url) !== false){
+                // The commented line replaced the following line, but it breaks for
+                // for cases where the api is not at the root uri.
+                // we aren't necessarily looking for an exact match!
+                //} else if ($url == $lc) {
+            } elseif (strpos($lc, $url) !== false) {
                 $found = TRUE;
                 break;
             }
@@ -735,9 +751,9 @@ protected function mapUrlToMethod()
             $call->arguments = $p;
             return $call;
         }
-
     }
 
+
     /**
      * Apply static and non-static properties defined in
      * the method information anotation
@@ -750,7 +766,7 @@ protected function applyClassMetadata($class_name, $instance, $method_info)
         if (isset($method_info->metadata[$class_name])
             && is_array($method_info->metadata[$class_name])
         ) {
-            foreach ($method_info->metadata[$class_name] as $property => $value ) {
+            foreach ($method_info->metadata[$class_name] as $property => $value) {
                 if (property_exists($class_name, $property)) {
                     $reflection_property = new ReflectionProperty($class_name, $property);
                     $reflection_property->setValue($instance, $value);
@@ -759,6 +775,7 @@ protected function applyClassMetadata($class_name, $instance, $method_info)
         }
     }
 
+
     protected function loadCache()
     {
         if ($this->cached !== NULL) {
@@ -780,70 +797,65 @@ protected function loadCache()
         }
     }
 
+
     /**
      * Generates cachable url to method mapping
      * @param string $class_name
      * @param string $base_path
      */
-    protected function generateMap ($class_name, $base_path = '')
+    protected function generateMap($class_name, $base_path = '')
     {
-        $reflection     = new ReflectionClass($class_name);
+        $reflection = new ReflectionClass($class_name);
         $class_metadata = parse_doc($reflection->getDocComment());
-        $methods        = $reflection->getMethods(
+        $methods = $reflection->getMethods(
             ReflectionMethod::IS_PUBLIC + ReflectionMethod::IS_PROTECTED
         );
         foreach ($methods as $method) {
-            $doc       = $method->getDocComment();
+            $doc = $method->getDocComment();
             $arguments = array();
-            $defaults  = array();
-            $metadata  = $class_metadata + parse_doc($doc);
-            $params    = $method->getParameters();
-            $position  = 0;
+            $defaults = array();
+            $metadata = $class_metadata + parse_doc($doc);
+            $params = $method->getParameters();
+            $position = 0;
             foreach ($params as $param) {
                 $arguments[$param->getName()] = $position;
-                $defaults[$position] = $param->isDefaultValueAvailable()
-                    ? $param->getDefaultValue() : NULL;
+                $defaults[$position] = $param->isDefaultValueAvailable() ? $param->getDefaultValue() : NULL;
                 $position++;
             }
-            $method_flag = $method->isProtected()
-                ? (isRestlerCompatibilityModeEnabled() ? 2 :  3)
-                : (isset($metadata['protected']) ? 1 : 0);
+            $method_flag = $method->isProtected() ? (isRestlerCompatibilityModeEnabled() ? 2 : 3) : (isset($metadata['protected']) ? 1 : 0);
 
             //take note of the order
             $call = array(
-                'class_name'  => $class_name,
+                'class_name' => $class_name,
                 'method_name' => $method->getName(),
-                'arguments'   => $arguments,
-                'defaults'    => $defaults,
-                'metadata'    => $metadata,
+                'arguments' => $arguments,
+                'defaults' => $defaults,
+                'metadata' => $metadata,
                 'method_flag' => $method_flag
             );
             $method_url = strtolower($method->getName());
             if (preg_match_all(
-                '/@url\s+(GET|POST|PUT|DELETE|HEAD|OPTIONS)[ \t]*\/?(\S*)/s',
-                $doc,
-                $matches,
-                PREG_SET_ORDER)
+                    '/@url\s+(GET|POST|PUT|DELETE|HEAD|OPTIONS)[ \t]*\/?(\S*)/s',
+                    $doc, $matches, PREG_SET_ORDER)
             ) {
                 foreach ($matches as $match) {
                     $http_method = $match[1];
-                    $url = rtrim($base_path . $match[2],'/');
+                    $url = rtrim($base_path . $match[2], '/');
                     $this->routes[$http_method][$url] = $call;
                 }
             } else if ($method_url[0] != '_') { //not prefixed with underscore
                 // no configuration found so use convention
                 if (preg_match_all('/^(GET|POST|PUT|DELETE|HEAD|OPTIONS)/i',
-                                   $method_url,
-                                   $matches)
+                        $method_url, $matches)
                 ) {
                     $http_method = strtoupper($matches[0][0]);
-                    $method_url  = substr($method_url, strlen($http_method));
+                    $method_url = substr($method_url, strlen($http_method));
                 } else {
                     $http_method = 'GET';
                 }
                 $url = $base_path
                     . ($method_url == 'index' || $method_url == 'default' ? '' : $method_url);
-                $url = rtrim($url,'/');
+                $url = rtrim($url, '/');
                 $this->routes[$http_method][$url] = $call;
                 foreach ($params as $param) {
                     if ($param->getName() == 'request_data') {
@@ -856,6 +868,7 @@ protected function generateMap ($class_name, $base_path = '')
             }
         }
     }
+
 }
 
 if (version_compare(PHP_VERSION, '5.3.0') < 0) {
@@ -882,6 +895,7 @@ protected function generateMap ($class_name, $base_path = '')
 class RestException extends Exception
 {
 
+
     public function __construct($http_status_code, $error_message = NULL)
     {
         parent::__construct($error_message, $http_status_code);
@@ -901,6 +915,8 @@ public function __construct($http_status_code, $error_message = NULL)
  */
 interface iRespond
 {
+
+
     /**
      * Result of an api call is passed to this method
      * to create a standard structure for the data
@@ -908,6 +924,7 @@ interface iRespond
      */
     public function __formatResponse($result);
 
+
     /**
      * When the api call results in RestException this method
      * will be called to return the error message
@@ -929,10 +946,14 @@ public function __formatError($status_code, $message);
  */
 class DefaultResponse implements iRespond
 {
+
+
     function __formatResponse($result)
     {
         return $result;
     }
+
+
     function __formatError($statusCode, $message)
     {
         return array(
@@ -942,6 +963,7 @@ function __formatError($statusCode, $message)
             )
         );
     }
+
 }
 
 /**
@@ -956,6 +978,8 @@ function __formatError($statusCode, $message)
  */
 interface iAuthenticate
 {
+
+
     /**
      * Auth function that is called when a protected method is requested
      * @return boolean TRUE or FALSE
@@ -976,6 +1000,8 @@ public function __isAuthenticated();
  */
 interface iFormat
 {
+
+
     /**
      * Get Extension => MIME type mappings as an associative array
      * @return array list of mime strings for the format
@@ -983,28 +1009,34 @@ interface iFormat
      */
     public function getMIMEMap();
 
+
     /**
      * Set the selected MIME type
      * @param string $mime MIME type
      */
     public function setMIME($mime);
+
+
     /**
      * Get selected MIME type
      */
     public function getMIME();
 
+
     /**
      * Set the selected file extension
      * @param string $extension file extension
      */
     public function setExtension($extension);
 
+
     /**
      * Get the selected file extension
      * @return string file extension
      */
     public function getExtension();
 
+
     /**
      * Encode the given data in the format
      * @param array $data resulting data that needs to
@@ -1016,6 +1048,7 @@ public function getExtension();
      */
     public function encode($data, $human_readable = FALSE);
 
+
     /**
      * Decode the given data from the format
      * @param string $data data sent from client to
@@ -1037,49 +1070,59 @@ public function decode($data);
  */
 class UrlEncodedFormat implements iFormat
 {
-    const MIME      = 'application/x-www-form-urlencoded';
+
+    const MIME = 'application/x-www-form-urlencoded';
     const EXTENSION = 'post';
 
+
     public function getMIMEMap()
     {
         return array(self::EXTENSION => self::MIME);
     }
 
+
     public function getMIME()
     {
-        return  self::MIME;
+        return self::MIME;
     }
 
+
     public function getExtension()
     {
         return self::EXTENSION;
     }
 
+
     public function setMIME($mime)
     {
         //do nothing
     }
 
+
     public function setExtension($extension)
     {
         //do nothing
     }
 
+
     public function encode($data, $human_readable = FALSE)
     {
         return http_build_query($data);
     }
 
+
     public function decode($data)
     {
-        parse_str($data,$r);
+        parse_str($data, $r);
         return $r;
     }
 
+
     public function __toString()
     {
         return $this->getExtension();
     }
+
 }
 
 /**
@@ -1094,50 +1137,58 @@ public function __toString()
  */
 class JsonFormat implements iFormat
 {
-    const MIME      = 'application/json,application/javascript';
-    static $mime    = 'application/json';
+
+    const MIME = 'application/json,application/javascript';
+
+    static $mime = 'application/json';
+
     const EXTENSION = 'json';
 
+
     public function getMIMEMap()
     {
         return array(self::EXTENSION => self::MIME);
     }
 
+
     public function getMIME()
     {
-        return  self::$mime;
+        return self::$mime;
     }
 
+
     public function getExtension()
     {
         return self::EXTENSION;
     }
 
+
     public function setMIME($mime)
     {
         self::$mime = $mime;
     }
 
+
     public function setExtension($extension)
     {
         //do nothing
     }
 
+
     public function encode($data, $human_readable = FALSE)
     {
-        return $human_readable
-            ? $this->json_format(json_encode(object_to_array($data)))
-            : json_encode(object_to_array($data));
+        return $human_readable ? $this->json_format(json_encode(object_to_array($data))) : json_encode(object_to_array($data));
     }
 
+
     public function decode($data)
     {
-        $decoded = json_decode ($data);
-        if (function_exists ('json_last_error')) {
+        $decoded = json_decode($data);
+        if (function_exists('json_last_error')) {
             $message = '';
-            switch (json_last_error ()) {
+            switch (json_last_error()) {
                 case JSON_ERROR_NONE:
-                    return object_to_array ($decoded);
+                    return object_to_array($decoded);
                     break;
                 case JSON_ERROR_DEPTH:
                     $message = 'maximum stack depth exceeded';
@@ -1158,13 +1209,14 @@ public function decode($data)
                     $message = 'unknown error';
                     break;
             }
-            throw new RestException (400, 'Error parsing JSON, ' . $message);
-        } else if (strlen ($data) && $decoded === NULL || $decoded === $data) {
-            throw new RestException (400, 'Error parsing JSON');
+            throw new RestException(400, 'Error parsing JSON, ' . $message);
+        } else if (strlen($data) && $decoded === NULL || $decoded === $data) {
+            throw new RestException(400, 'Error parsing JSON');
         }
-        return object_to_array ($decoded);
+        return object_to_array($decoded);
     }
 
+
     /**
      * Pretty print JSON string
      * @param string $json
@@ -1172,20 +1224,20 @@ public function decode($data)
      */
     private function json_format($json)
     {
-        $tab          = "  ";
-        $new_json     = "";
+        $tab = "  ";
+        $new_json = "";
         $indent_level = 0;
-        $in_string    = FALSE;
-        $len          = strlen($json);
+        $in_string = FALSE;
+        $len = strlen($json);
 
-        for($c = 0; $c < $len; $c++) {
+        for ($c = 0; $c < $len; $c++) {
             $char = $json[$c];
-            switch($char) {
+            switch ($char) {
                 case '{':
                 case '[':
                     if (!$in_string) {
                         $new_json .= $char . "\n" .
-                        str_repeat($tab, $indent_level + 1);
+                            str_repeat($tab, $indent_level + 1);
                         $indent_level++;
                     } else {
                         $new_json .= $char;
@@ -1215,9 +1267,9 @@ private function json_format($json)
                     }
                     break;
                 case '"':
-                    if ($c==0) {
+                    if ($c == 0) {
                         $in_string = TRUE;
-                    } else if ($c > 0 && $json[$c-1] != '\\') {
+                    } else if ($c > 0 && $json[$c - 1] != '\\') {
                         $in_string = !$in_string;
                     }
                 default:
@@ -1229,10 +1281,12 @@ private function json_format($json)
         return $new_json;
     }
 
+
     public function __toString()
     {
         return $this->getExtension();
     }
+
 }
 
 /**
@@ -1248,28 +1302,32 @@ public function __toString()
  */
 class DocParser
 {
+
     private $params = array();
 
-    function parse($doc = '') {
+
+    function parse($doc = '')
+    {
         if ($doc == '') {
             return $this->params;
         }
         //Get the comment
         if (preg_match('#^/\*\*(.*)\*/#s', $doc, $comment) === false) {
-            return  $this->params;
+            return $this->params;
         }
         $comment = trim($comment[1]);
         //Get all the lines and strip the * from the first character
         if (preg_match_all('#^\s*\*(.*)#m', $comment, $lines) === false) {
-            return  $this->params;
+            return $this->params;
         }
         $this->parseLines($lines[1]);
-        return  $this->params;
+        return $this->params;
     }
 
+
     private function parseLines($lines)
     {
-        foreach($lines as $line) {
+        foreach ($lines as $line) {
             $parsedLine = $this->parseLine($line); //Parse the line
 
             if ($parsedLine === false && !isset($this->params['description'])) {
@@ -1288,6 +1346,7 @@ private function parseLines($lines)
         }
     }
 
+
     private function parseLine($line)
     {
         //trim the whitespace from the line
@@ -1307,11 +1366,13 @@ private function parseLine($line)
                 $value = '';
             }
             //Parse the line and return false if the parameter is valid
-            if ($this->setParam($param, $value)) return false;
+            if ($this->setParam($param, $value))
+                return false;
         }
         return $line;
     }
 
+
     private function setParam($param, $value)
     {
         if ($param == 'param' || $param == 'return') {
@@ -1332,12 +1393,13 @@ private function setParam($param, $value)
         return true;
     }
 
+
     private function formatClass($value)
     {
         $r = preg_split("[\(|\)]", $value);
         if (count($r) > 1) {
             $param = $r[0];
-            parse_str($r[1],$value);
+            parse_str($r[1], $value);
             foreach ($value as $key => $val) {
                 $val = explode(',', $val);
                 if (count($val) > 1) {
@@ -1350,12 +1412,14 @@ private function formatClass($value)
         return array($param, $value);
     }
 
+
     private function formatParamOrReturn($string)
     {
-        $pos  = strpos($string, ' ');
+        $pos = strpos($string, ' ');
         $type = substr($string, 0, $pos);
         return '(' . $type . ')' . substr($string, $pos + 1);
     }
+
 }
 
 
@@ -1378,20 +1442,21 @@ function parse_doc($php_doc_comment)
         |(^[\\s]\\*\\/)
         |(^[\\s]*\\*?\\s)
         |(^[\\s]*)
-        |(^[\\t]*)/ixm", "", $php_doc_comment);
+        |(^[\\t]*)/ixm",
+        "", $php_doc_comment);
     $php_doc_comment = str_replace("\r", "", $php_doc_comment);
     $php_doc_comment = preg_replace("/([\\t])+/", "\t", $php_doc_comment);
     return explode("\n", $php_doc_comment);
 
-    $php_doc_comment =  trim(preg_replace('/\r?\n *\* */', ' ',
-                                          $php_doc_comment));
+    $php_doc_comment = trim(preg_replace('/\r?\n *\* */', ' ', $php_doc_comment));
     return $php_doc_comment;
 
-    preg_match_all('/@([a-z]+)\s+(.*?)\s*(?=$|@[a-z]+\s)/s',
-                   $php_doc_comment, $matches);
+    preg_match_all('/@([a-z]+)\s+(.*?)\s*(?=$|@[a-z]+\s)/s', $php_doc_comment,
+        $matches);
     return array_combine($matches[1], $matches[2]);
 }
 
+
 /**
  * Conveniance function that converts the given object
  * in to associative array, leaves object alone if
@@ -1412,7 +1477,7 @@ function object_to_array($object, $utf_encode = FALSE)
         && !($object instanceof JsonSerializable))
     ) {
         $array = array();
-        foreach($object as $key => $value) {
+        foreach ($object as $key => $value) {
             $value = object_to_array($value, $utf_encode);
             if ($utf_encode && is_string($value)) {
                 $value = utf8_encode($value);
@@ -1424,6 +1489,7 @@ function object_to_array($object, $utf_encode = FALSE)
     return $object;
 }
 
+
 /**
  * an autoloader function for loading format classes
  * @param String $class_name class name of a class that implements iFormat
@@ -1432,13 +1498,13 @@ function autoload_formats($class_name)
 {
     $class_name = strtolower($class_name);
     $file = RESTLER_PATH . "/$class_name/$class_name.php";
-    if (file_exists ($file)) {
+    if (file_exists($file)) {
         require_once ($file);
     } else {
         $file = RESTLER_PATH . "/$class_name.php";
-        if (file_exists ($file)) {
+        if (file_exists($file)) {
             require_once ($file);
-        } elseif (file_exists ("$class_name.php")) {
+        } elseif (file_exists("$class_name.php")) {
             require_once ("$class_name.php");
         }
     }
@@ -1456,9 +1522,12 @@ function autoload_formats($class_name)
  * Manage compatibility with PHP 5 < PHP 5.3
  */
 if (!function_exists('isRestlerCompatibilityModeEnabled')) {
+
+
     function isRestlerCompatibilityModeEnabled()
     {
         return FALSE;
     }
+
 }
 define('RESTLER_PATH', dirname(__FILE__));
\ No newline at end of file

From c33c0a3db08dbfd93ec6cc8c574f7555fdddc78b Mon Sep 17 00:00:00 2001
From: Luracast <arul@luracast.com>
Date: Sun, 8 Jul 2012 22:00:04 +0800
Subject: [PATCH 54/61] Improves coding standards, reduces PSR violations from
 58 to 16 :) Undone one change by Joel Simpson thinking that it is not needed.

---
 restler/restler.php          | 180 ++++++++++++++++++++---------------
 restler_minified/restler.php |   4 +-
 2 files changed, 103 insertions(+), 81 deletions(-)

diff --git a/restler/restler.php b/restler/restler.php
index 9d77eb79c..886be9f05 100644
--- a/restler/restler.php
+++ b/restler/restler.php
@@ -2,7 +2,8 @@
 
 /**
  * REST API Server. It is the server part of the Restler framework.
- * Based on the RestServer code from <http://jacwright.com/blog/resources/RestServer.txt>
+ * Based on the RestServer code from 
+ * <http://jacwright.com/blog/resources/RestServer.txt>
  *
  * @category   Framework
  * @package    restler
@@ -11,7 +12,7 @@
  * @copyright  2010 Luracast
  * @license    http://www.opensource.org/licenses/lgpl-license.php LGPL
  * @link       http://luracast.com/products/restler/
- * @version    2.2.0
+ * @version    2.2.1
  */
 class Restler
 {
@@ -21,7 +22,7 @@ class Restler
     //
     // ------------------------------------------------------------------
 
-    const VERSION = '2.2.0';
+    const VERSION = '2.2.1';
 
     /**
      * URL of the currently mapped service
@@ -83,7 +84,7 @@ class Restler
     // ------------------------------------------------------------------
 
     /**
-     * When set to FALSE, it will run in debug mode and parse the
+     * When set to false, it will run in debug mode and parse the
      * class files every time to map it to the URL
      * @var boolean
      */
@@ -188,10 +189,10 @@ class Restler
 
     /**
      * Constructor
-     * @param boolean $production_mode When set to FALSE, it will run in
+     * @param boolean $production_mode When set to false, it will run in
      * debug mode and parse the class files every time to map it to the URL
      */
-    public function __construct($production_mode = FALSE)
+    public function __construct($production_mode = false)
     {
         $this->production_mode = $production_mode;
         $this->cache_dir = getcwd();
@@ -216,7 +217,7 @@ public function __destruct()
     public function refreshCache()
     {
         $this->routes = array();
-        $this->cached = FALSE;
+        $this->cached = false;
     }
 
 
@@ -248,10 +249,11 @@ public function setSupportedFormats()
                     $mime = array($mime);
                 }
                 foreach ($mime as $value) {
-                    if (!isset($this->format_map[$value]))
+                    if (!isset($this->format_map[$value])) {
                         $this->format_map[$value] = $class_name;
+                    }
                 }
-                $extensions[".$extension"] = TRUE;
+                $extensions[".$extension"] = true;
             }
         }
         $this->format_map['default'] = $args[0];
@@ -271,7 +273,7 @@ public function setSupportedFormats()
      * lowercase version of the class name when not specified
      * @throws Exception when supplied with invalid class name
      */
-    public function addAPIClass($class_name, $base_path = NULL)
+    public function addAPIClass($class_name, $base_path = null)
     {
         if (!class_exists($class_name)) {
             throw new Exception("API class $class_name is missing.");
@@ -281,7 +283,7 @@ public function addAPIClass($class_name, $base_path = NULL)
             if (is_null($base_path)) {
                 $base_path = strtolower($class_name);
                 $index = strrpos($class_name, '\\');
-                if ($index !== FALSE) {
+                if ($index !== false) {
                     $base_path = substr($base_path, $index + 1);
                 }
             } else {
@@ -301,7 +303,7 @@ public function addAPIClass($class_name, $base_path = NULL)
      * @param string $class_name of the authentication class
      * @param string $base_path optional url prefix for mapping
      */
-    public function addAuthenticationClass($class_name, $base_path = NULL)
+    public function addAuthenticationClass($class_name, $base_path = null)
     {
         $this->auth_classes[] = $class_name;
         $this->addAPIClass($class_name, $base_path);
@@ -323,16 +325,16 @@ public function addErrorClass($class_name)
      * @param int $statusCode http error code
      * @param string $errorMessage optional custom error message
      */
-    public function handleError($status_code, $error_message = NULL)
+    public function handleError($status_code, $error_message = null)
     {
         $method = "handle$status_code";
-        $handled = FALSE;
+        $handled = false;
         foreach ($this->error_classes as $class_name) {
             if (method_exists($class_name, $method)) {
                 $obj = new $class_name();
                 $obj->restler = $this;
                 $obj->$method();
-                $handled = TRUE;
+                $handled = true;
             }
         }
         if ($handled) {
@@ -348,13 +350,14 @@ public function handleError($status_code, $error_message = NULL)
 
 
     /**
-     * An initialize function to allow use of the restler error generation functions
-     * for pre-processing and pre-routing of requests.
+     * An initialize function to allow use of the restler error generation 
+     * functions for pre-processing and pre-routing of requests.
      */
     public function init()
     {
-        if (empty($this->format_map))
+        if (empty($this->format_map)) {
             $this->setSupportedFormats('JsonFormat');
+        }
         $this->url = $this->getPath();
         $this->request_method = $this->getRequestMethod();
         $this->response_format = $this->getResponseFormat();
@@ -411,13 +414,15 @@ public function handle()
                 $object = $this->service_class_instance = new $o->class_name();
                 $object->restler = $this;
                 if (method_exists($o->class_name, $pre_process)) {
-                    call_user_func_array(array($object, $pre_process), $o->arguments);
+                    call_user_func_array(
+                        array($object, $pre_process), $o->arguments
+                    );
                 }
                 switch ($o->method_flag) {
                     case 3:
                         $reflection_method = new ReflectionMethod($object,
                                 $o->method_name);
-                        $reflection_method->setAccessible(TRUE);
+                        $reflection_method->setAccessible(true);
                         $result = $reflection_method->invokeArgs($object,
                             $o->arguments);
                         break;
@@ -437,7 +442,7 @@ public function handle()
         $responder = new $this->response();
         $responder->restler = $this;
         $this->applyClassMetadata($this->response, $responder, $o);
-        if (isset($result) && $result !== NULL) {
+        if (isset($result) && $result !== null) {
             $result = $responder->__formatResponse($result);
             $this->sendData($result);
         }
@@ -451,7 +456,9 @@ public function handle()
      */
     public function sendData($data)
     {
-        $data = $this->response_format->encode($data, !($this->production_mode));
+        $data = $this->response_format->encode($data, 
+            !($this->production_mode)
+        );
         $post_process = '_' . $this->service_method . '_'
             . $this->response_format->getExtension();
         if (isset($this->service_class_instance)
@@ -463,7 +470,7 @@ public function sendData($data)
         header("Cache-Control: no-cache, must-revalidate");
         header("Expires: 0");
         header('Content-Type: ' . $this->response_format->getMIME());
-        //header('Content-Type: ' . $this->response_format->getMIME().'; charset=utf-8');
+        //.'; charset=utf-8');
         header("X-Powered-By: Luracast Restler v" . Restler::VERSION);
         die($data);
     }
@@ -475,7 +482,8 @@ public function sendData($data)
      */
     public function setStatus($code)
     {
-        header("{$_SERVER['SERVER_PROTOCOL']} $code " . $this->codes[strval($code)]);
+        header("{$_SERVER['SERVER_PROTOCOL']} $code " . 
+            $this->codes[strval($code)]);
     }
 
 
@@ -512,24 +520,24 @@ public function saveCache()
         $file = $this->cache_dir . '/routes.php';
         $s = '$o=array();' . PHP_EOL;
         foreach ($this->routes as $key => $value) {
-            $s .= PHP_EOL . PHP_EOL . PHP_EOL . "############### $key ###############"
-                . PHP_EOL . PHP_EOL;
+            $s .= PHP_EOL . PHP_EOL . PHP_EOL . 
+                "############### $key ###############" . PHP_EOL . PHP_EOL;
             $s .= '$o[\'' . $key . '\']=array();';
             foreach ($value as $ke => $va) {
                 $s .= PHP_EOL . PHP_EOL . "#==== $key $ke" . PHP_EOL . PHP_EOL;
                 $s .= '$o[\'' . $key . '\'][\'' . $ke . '\']=' . str_replace(
-                        PHP_EOL, PHP_EOL . "\t", var_export($va, TRUE)
+                        PHP_EOL, PHP_EOL . "\t", var_export($va, true)
                     ) . ';';
             }
         }
         $s .= PHP_EOL . 'return $o;';
         $r = @file_put_contents($file, "<?php $s");
         @chmod($file, 0777);
-        if ($r === FALSE) {
+        if ($r === false) {
             throw new Exception(
-                "The cache directory located at '$this->cache_dir' needs to have "
-                . "the permissions set to read/write/execute for everyone in order "
-                . "to save cache and improve performance.");
+                "The cache directory located at '$this->cache_dir' needs to "
+                . "have the permissions set to read/write/execute for everyone"
+                . " in order to save cache and improve performance.");
         }
     }
 
@@ -581,7 +589,7 @@ protected function getRequestMethod()
      */
     protected function getRequestFormat()
     {
-        $format = NULL;
+        $format = null;
         //check if client has sent any information on request format
         if (isset($_SERVER['CONTENT_TYPE'])) {
             $mime = explode(';', $_SERVER['CONTENT_TYPE']);
@@ -611,7 +619,7 @@ protected function getResponseFormat()
         /**
          * @var iFormat
          */
-        $format = NULL;
+        $format = null;
         $extensions = explode('.',
             parse_url($_SERVER['REQUEST_URI'], PHP_URL_PATH));
         while ($extensions) {
@@ -636,7 +644,9 @@ protected function getResponseFormat()
             foreach ($accepts as $pos => $accept) {
                 $parts = explode(';q=', trim($accept));
                 $type = array_shift($parts);
-                $quality = count($parts) ? floatval(array_shift($parts)) : (1000 - $pos) / 1000;
+                $quality = count($parts) ? 
+                    floatval(array_shift($parts)) : 
+                    (1000 - $pos) / 1000;
                 $acceptList[$type] = $quality;
             }
             arsort($acceptList);
@@ -646,7 +656,8 @@ protected function getResponseFormat()
                     $format = is_string($format) ? new $format : $format;
                     $format->setMIME($accept);
                     //echo "MIME $accept";
-                    header("Vary: Accept"); // Tell cache content is based on Accept header
+                    // Tell cache content is based on Accept header
+                    header("Vary: Accept"); 
                     return $format;
                 }
             }
@@ -656,24 +667,26 @@ protected function getResponseFormat()
             // client accepts all media types.
             $_SERVER['HTTP_ACCEPT'] = '*/*';
         }
-        if (strpos($_SERVER['HTTP_ACCEPT'], '*') !== FALSE) {
-            if (strpos($_SERVER['HTTP_ACCEPT'], 'application/*') !== FALSE) {
+        if (strpos($_SERVER['HTTP_ACCEPT'], '*') !== false) {
+            if (strpos($_SERVER['HTTP_ACCEPT'], 'application/*') !== false) {
                 $format = new JsonFormat;
-            } else if (strpos($_SERVER['HTTP_ACCEPT'], 'text/*') !== FALSE) {
+            } else if (strpos($_SERVER['HTTP_ACCEPT'], 'text/*') !== false) {
                 $format = new XmlFormat;
-            } else if (strpos($_SERVER['HTTP_ACCEPT'], '*/*') !== FALSE) {
+            } else if (strpos($_SERVER['HTTP_ACCEPT'], '*/*') !== false) {
                 $format = new $this->format_map['default'];
             }
         }
         if (empty($format)) {
-            // RFC 2616: If an Accept header field is present, and if the server
-            // cannot send a response which is acceptable according to the combined
-            // Accept field value, then the server SHOULD send a 406 (not acceptable)
-            // response.
+            // RFC 2616: If an Accept header field is present, and if the 
+            // server cannot send a response which is acceptable according to 
+            // the combined Accept field value, then the server SHOULD send 
+            // a 406 (not acceptable) response.
             header('HTTP/1.1 406 Not Acceptable');
-            die('406 Not Acceptable: The server was unable to negotiate content for this request.');
+            die('406 Not Acceptable: The server was unable to ' . 
+                    'negotiate content for this request.');
         } else {
-            header("Vary: Accept"); // Tell cache content is based ot Accept header
+            // Tell cache content is based ot Accept header
+            header("Vary: Accept"); 
             return $format;
         }
     }
@@ -708,7 +721,7 @@ protected function mapUrlToMethod()
             return array();
         }
 
-        $found = FALSE;
+        $found = false;
         $this->request_data += $_GET;
         $params = array('request_data' => $this->request_data);
         $params += $this->request_data;
@@ -726,15 +739,11 @@ protected function mapUrlToMethod()
                             $params[$arg] = $match;
                         }
                     }
-                    $found = TRUE;
+                    $found = true;
                     break;
                 }
-                // The commented line replaced the following line, but it breaks for
-                // for cases where the api is not at the root uri.
-                // we aren't necessarily looking for an exact match!
-                //} else if ($url == $lc) {
-            } elseif (strpos($lc, $url) !== false) {
-                $found = TRUE;
+            } else if ($url == $lc) {
+                $found = true;
                 break;
             }
         }
@@ -766,9 +775,11 @@ protected function applyClassMetadata($class_name, $instance, $method_info)
         if (isset($method_info->metadata[$class_name])
             && is_array($method_info->metadata[$class_name])
         ) {
-            foreach ($method_info->metadata[$class_name] as $property => $value) {
+            foreach ($method_info->metadata[$class_name] as
+                    $property => $value) {
                 if (property_exists($class_name, $property)) {
-                    $reflection_property = new ReflectionProperty($class_name, $property);
+                    $reflection_property = 
+                        new ReflectionProperty($class_name, $property);
                     $reflection_property->setValue($instance, $value);
                 }
             }
@@ -778,11 +789,11 @@ protected function applyClassMetadata($class_name, $instance, $method_info)
 
     protected function loadCache()
     {
-        if ($this->cached !== NULL) {
+        if ($this->cached !== null) {
             return;
         }
         $file = $this->cache_dir . '/routes.php';
-        $this->cached = FALSE;
+        $this->cached = false;
 
         if ($this->production_mode) {
             if (file_exists($file)) {
@@ -790,7 +801,7 @@ protected function loadCache()
             }
             if (isset($routes) && is_array($routes)) {
                 $this->routes = $routes;
-                $this->cached = TRUE;
+                $this->cached = true;
             }
         } else {
             //@unlink($this->cache_dir . "/$name.php");
@@ -819,10 +830,13 @@ protected function generateMap($class_name, $base_path = '')
             $position = 0;
             foreach ($params as $param) {
                 $arguments[$param->getName()] = $position;
-                $defaults[$position] = $param->isDefaultValueAvailable() ? $param->getDefaultValue() : NULL;
+                $defaults[$position] = $param->isDefaultValueAvailable() ? 
+                    $param->getDefaultValue() : null;
                 $position++;
             }
-            $method_flag = $method->isProtected() ? (isRestlerCompatibilityModeEnabled() ? 2 : 3) : (isset($metadata['protected']) ? 1 : 0);
+            $method_flag = $method->isProtected() ? 
+                (isRestlerCompatibilityModeEnabled() ? 2 : 3) : 
+                (isset($metadata['protected']) ? 1 : 0);
 
             //take note of the order
             $call = array(
@@ -835,7 +849,7 @@ protected function generateMap($class_name, $base_path = '')
             );
             $method_url = strtolower($method->getName());
             if (preg_match_all(
-                    '/@url\s+(GET|POST|PUT|DELETE|HEAD|OPTIONS)[ \t]*\/?(\S*)/s',
+                '/@url\s+(GET|POST|PUT|DELETE|HEAD|OPTIONS)[ \t]*\/?(\S*)/s',
                     $doc, $matches, PREG_SET_ORDER)
             ) {
                 foreach ($matches as $match) {
@@ -843,7 +857,8 @@ protected function generateMap($class_name, $base_path = '')
                     $url = rtrim($base_path . $match[2], '/');
                     $this->routes[$http_method][$url] = $call;
                 }
-            } else if ($method_url[0] != '_') { //not prefixed with underscore
+            } elseif ($method_url[0] != '_') { 
+                //not prefixed with underscore
                 // no configuration found so use convention
                 if (preg_match_all('/^(GET|POST|PUT|DELETE|HEAD|OPTIONS)/i',
                         $method_url, $matches)
@@ -854,7 +869,8 @@ protected function generateMap($class_name, $base_path = '')
                     $http_method = 'GET';
                 }
                 $url = $base_path
-                    . ($method_url == 'index' || $method_url == 'default' ? '' : $method_url);
+                    . ($method_url == 'index' || $method_url == 'default' ? '' :
+                        $method_url);
                 $url = rtrim($url, '/');
                 $this->routes[$http_method][$url] = $call;
                 foreach ($params as $param) {
@@ -896,7 +912,7 @@ class RestException extends Exception
 {
 
 
-    public function __construct($http_status_code, $error_message = NULL)
+    public function __construct($http_status_code, $error_message = null)
     {
         parent::__construct($error_message, $http_status_code);
     }
@@ -982,7 +998,7 @@ interface iAuthenticate
 
     /**
      * Auth function that is called when a protected method is requested
-     * @return boolean TRUE or FALSE
+     * @return boolean true or false
      */
     public function __isAuthenticated();
 }
@@ -1041,12 +1057,12 @@ public function getExtension();
      * Encode the given data in the format
      * @param array $data resulting data that needs to
      * be encoded in the given format
-     * @param boolean $human_readable set to TRUE when restler
+     * @param boolean $human_readable set to true when restler
      * is not running in production mode. Formatter has to
      * make the encoded output more human readable
      * @return string encoded string
      */
-    public function encode($data, $human_readable = FALSE);
+    public function encode($data, $human_readable = false);
 
 
     /**
@@ -1105,7 +1121,7 @@ public function setExtension($extension)
     }
 
 
-    public function encode($data, $human_readable = FALSE)
+    public function encode($data, $human_readable = false)
     {
         return http_build_query($data);
     }
@@ -1175,9 +1191,11 @@ public function setExtension($extension)
     }
 
 
-    public function encode($data, $human_readable = FALSE)
+    public function encode($data, $human_readable = false)
     {
-        return $human_readable ? $this->json_format(json_encode(object_to_array($data))) : json_encode(object_to_array($data));
+        return $human_readable ? 
+            $this->json_format(json_encode(object_to_array($data))) : 
+            json_encode(object_to_array($data));
     }
 
 
@@ -1203,14 +1221,15 @@ public function decode($data)
                     $message = 'malformed JSON';
                     break;
                 case JSON_ERROR_UTF8:
-                    $message = 'malformed UTF-8 characters, possibly incorrectly encoded';
+                    $message = 'malformed UTF-8 characters, '.
+                        'possibly incorrectly encoded';
                     break;
                 default:
                     $message = 'unknown error';
                     break;
             }
             throw new RestException(400, 'Error parsing JSON, ' . $message);
-        } else if (strlen($data) && $decoded === NULL || $decoded === $data) {
+        } else if (strlen($data) && $decoded === null || $decoded === $data) {
             throw new RestException(400, 'Error parsing JSON');
         }
         return object_to_array($decoded);
@@ -1227,7 +1246,7 @@ private function json_format($json)
         $tab = "  ";
         $new_json = "";
         $indent_level = 0;
-        $in_string = FALSE;
+        $in_string = false;
         $len = strlen($json);
 
         for ($c = 0; $c < $len; $c++) {
@@ -1247,7 +1266,8 @@ private function json_format($json)
                 case ']':
                     if (!$in_string) {
                         $indent_level--;
-                        $new_json .= "\n" . str_repeat($tab, $indent_level) . $char;
+                        $new_json .= "\n" . str_repeat($tab, $indent_level) 
+                            . $char;
                     } else {
                         $new_json .= $char;
                     }
@@ -1268,7 +1288,7 @@ private function json_format($json)
                     break;
                 case '"':
                     if ($c == 0) {
-                        $in_string = TRUE;
+                        $in_string = true;
                     } else if ($c > 0 && $json[$c - 1] != '\\') {
                         $in_string = !$in_string;
                     }
@@ -1366,8 +1386,9 @@ private function parseLine($line)
                 $value = '';
             }
             //Parse the line and return false if the parameter is valid
-            if ($this->setParam($param, $value))
+            if ($this->setParam($param, $value)) {
                 return false;
+            }
         }
         return $line;
     }
@@ -1448,7 +1469,8 @@ function parse_doc($php_doc_comment)
     $php_doc_comment = preg_replace("/([\\t])+/", "\t", $php_doc_comment);
     return explode("\n", $php_doc_comment);
 
-    $php_doc_comment = trim(preg_replace('/\r?\n *\* */', ' ', $php_doc_comment));
+    $php_doc_comment = trim(preg_replace('/\r?\n *\* */', ' ', 
+            $php_doc_comment));
     return $php_doc_comment;
 
     preg_match_all('/@([a-z]+)\s+(.*?)\s*(?=$|@[a-z]+\s)/s', $php_doc_comment,
@@ -1470,7 +1492,7 @@ function parse_doc($php_doc_comment)
  * @license    http://www.opensource.org/licenses/lgpl-license.php LGPL
  * @link       http://luracast.com/products/restler/
  */
-function object_to_array($object, $utf_encode = FALSE)
+function object_to_array($object, $utf_encode = false)
 {
     if (is_array($object)
         || (is_object($object)
@@ -1526,7 +1548,7 @@ function autoload_formats($class_name)
 
     function isRestlerCompatibilityModeEnabled()
     {
-        return FALSE;
+        return false;
     }
 
 }
diff --git a/restler_minified/restler.php b/restler_minified/restler.php
index ab2139ec1..837159d5f 100644
--- a/restler_minified/restler.php
+++ b/restler_minified/restler.php
@@ -1,6 +1,6 @@
 <?php
- class Restler { const VERSION = '2.2.0'; public $url; public $request_method; public $request_format; public $request_data = array(); public $cache_dir; public $base_dir; public $response = 'DefaultResponse'; public $response_format; protected $production_mode; protected $routes = array(); protected $format_map = array(); protected $service_class_instance; protected $service_method; protected $auth_classes = array(); protected $error_classes = array(); private $codes = array( 100 => 'Continue', 101 => 'Switching Protocols', 200 => 'OK', 201 => 'Created', 202 => 'Accepted', 203 => 'Non-Authoritative Information', 204 => 'No Content', 205 => 'Reset Content', 206 => 'Partial Content', 300 => 'Multiple Choices', 301 => 'Moved Permanently', 302 => 'Found', 303 => 'See Other', 304 => 'Not Modified', 305 => 'Use Proxy', 306 => '(Unused)', 307 => 'Temporary Redirect', 400 => 'Bad Request', 401 => 'Unauthorized', 402 => 'Payment Required', 403 => 'Forbidden', 404 => 'Not Found', 405 => 'Method Not Allowed', 406 => 'Not Acceptable', 407 => 'Proxy Authentication Required', 408 => 'Request Timeout', 409 => 'Conflict', 410 => 'Gone', 411 => 'Length Required', 412 => 'Precondition Failed', 413 => 'Request Entity Too Large', 414 => 'Request-URI Too Long', 415 => 'Unsupported Media Type', 416 => 'Requested Range Not Satisfiable', 417 => 'Expectation Failed', 500 => 'Internal Server Error', 501 => 'Not Implemented', 502 => 'Bad Gateway', 503 => 'Service Unavailable', 504 => 'Gateway Timeout', 505 => 'HTTP Version Not Supported' ); protected $cached; public function __construct($production_mode = FALSE) { $this->production_mode = $production_mode; $this->cache_dir = getcwd(); $this->base_dir = RESTLER_PATH; } public function __destruct() { if ($this->production_mode && !($this->cached)) { $this->saveCache(); } } public function refreshCache() { $this->routes = array(); $this->cached = FALSE; } public function setSupportedFormats() { $args = func_get_args(); $extensions = array(); foreach ($args as $class_name) { if (!is_string($class_name) || !class_exists($class_name)) { throw new Exception("$class_name is not a vaild Format Class."); } $obj = new $class_name; if (!($obj instanceof iFormat)) { throw new Exception('Invalid format class; must implement ' . 'iFormat interface'); } foreach ($obj->getMIMEMap() as $extension => $mime) { if (!isset($this->format_map[$extension])) { $this->format_map[$extension] = $class_name; } $mime = explode(',', $mime); if (!is_array($mime)) { $mime = array($mime); } foreach ($mime as $value) { if (!isset($this->format_map[$value])) $this->format_map[$value] = $class_name; } $extensions[".$extension"] = TRUE; } } $this->format_map['default'] = $args[0]; $this->format_map['extensions'] = array_keys($extensions); } public function addAPIClass($class_name, $base_path = NULL) { if (!class_exists($class_name)) { throw new Exception("API class $class_name is missing."); } $this->loadCache(); if (!$this->cached) { if (is_null($base_path)) { $base_path = strtolower($class_name); $index = strrpos($class_name, '\\'); if ($index !== FALSE) { $base_path = substr($base_path, $index + 1); } } else { $base_path = trim($base_path,'/'); } if (strlen($base_path) > 0) { $base_path .= '/'; } $this->generateMap($class_name, $base_path); } } public function addAuthenticationClass($class_name, $base_path = NULL) { $this->auth_classes[] = $class_name; $this->addAPIClass($class_name, $base_path); } public function addErrorClass($class_name) { $this->error_classes[] = $class_name; } public function handleError($status_code, $error_message = NULL) { $method = "handle$status_code"; $handled = FALSE; foreach ($this->error_classes as $class_name) { if (method_exists($class_name, $method)) { $obj = new $class_name(); $obj->restler = $this; $obj->$method(); $handled = TRUE; } } if ($handled) { return; } $message = $this->codes[$status_code] . (!$error_message ? '' : ': ' . $error_message); $this->setStatus($status_code); $responder = new $this->response(); $responder->restler = $this; $this->sendData($responder->__formatError($status_code, $message)); } public function handle() { if (empty($this->format_map)) { $this->setSupportedFormats('JsonFormat'); } $this->url = $this->getPath(); $this->request_method = $this->getRequestMethod(); $this->response_format = $this->getResponseFormat(); $this->request_format = $this->getRequestFormat(); if (is_null($this->request_format)) { $this->request_format = $this->response_format; } if ($this->request_method == 'PUT' || $this->request_method == 'POST') { $this->request_data = $this->getRequestData(); } $o = $this->mapUrlToMethod(); if (!isset($o->class_name)) { $this->handleError(404); } else { try { if ($o->method_flag) { $auth_method = '__isAuthenticated'; if (!count($this->auth_classes)) { throw new RestException(401); } foreach ($this->auth_classes as $auth_class) { $auth_obj = new $auth_class(); $auth_obj->restler = $this; $this->applyClassMetadata($auth_class, $auth_obj, $o); if (!method_exists($auth_obj, $auth_method)) { throw new RestException(401, 'Authentication Class ' . 'should implement iAuthenticate'); } else if (!$auth_obj->$auth_method()) { throw new RestException(401); } } } $this->applyClassMetadata(get_class($this->request_format), $this->request_format, $o); $pre_process = '_' . $this->request_format->getExtension() . '_' . $o->method_name; $this->service_method = $o->method_name; if ($o->method_flag == 2) { $o = unprotect($o); } $object = $this->service_class_instance = new $o->class_name(); $object->restler = $this; if (method_exists($o->class_name, $pre_process)) { call_user_func_array(array($object, $pre_process), $o->arguments); } switch ($o->method_flag) { case 3: $reflection_method = new ReflectionMethod($object, $o->method_name); $reflection_method->setAccessible(TRUE); $result = $reflection_method->invokeArgs($object, $o->arguments); break; case 2: case 1: default: $result = call_user_func_array(array( $object, $o->method_name), $o->arguments ); break; } } catch (RestException $e) { $this->handleError($e->getCode(), $e->getMessage()); } } $responder = new $this->response(); $responder->restler = $this; $this->applyClassMetadata($this->response, $responder, $o); if (isset($result) && $result !== NULL) { $result = $responder->__formatResponse($result); $this->sendData($result); } } public function sendData($data) { $data = $this->response_format->encode($data, !($this->production_mode)); $post_process = '_' . $this->service_method . '_' . $this->response_format->getExtension(); if (isset($this->service_class_instance) && method_exists($this->service_class_instance,$post_process) ) { $data = call_user_func(array($this->service_class_instance, $post_process), $data); } header("Cache-Control: no-cache, must-revalidate"); header("Expires: 0"); header('Content-Type: ' . $this->response_format->getMIME()); header("X-Powered-By: Luracast Restler v" . Restler::VERSION); die($data); } public function setStatus($code) { header("{$_SERVER['SERVER_PROTOCOL']} $code " . $this->codes[strval($code)]); } public function removeCommonPath($first, $second, $char = '/') { $first = explode($char, $first); $second = explode($char, $second); while (count($second)) { if ($first[0] == $second[0]) { array_shift($first); } else { break; } array_shift($second); } return implode($char, $first); } public function saveCache() { $file = $this->cache_dir . '/routes.php'; $s = '$o=array();' . PHP_EOL; foreach ($this->routes as $key => $value) { $s .= PHP_EOL . PHP_EOL . PHP_EOL . "############### $key ###############" . PHP_EOL . PHP_EOL; $s .= '$o[\'' . $key . '\']=array();'; foreach ($value as $ke => $va) { $s .= PHP_EOL . PHP_EOL . "#==== $key $ke" . PHP_EOL . PHP_EOL; $s .= '$o[\'' . $key . '\'][\'' . $ke . '\']=' . str_replace( PHP_EOL, PHP_EOL . "\t", var_export($va, TRUE) ) . ';'; } } $s .= PHP_EOL . 'return $o;'; $r = @file_put_contents($file, "<?php $s"); @chmod($file, 0777); if ($r === FALSE) { throw new Exception( "The cache directory located at '$this->cache_dir' needs to have " . "the permissions set to read/write/execute for everyone in order " . "to save cache and improve performance."); } } protected function getPath() { $path = urldecode($this->removeCommonPath($_SERVER['REQUEST_URI'], $_SERVER['SCRIPT_NAME'])); $path = preg_replace('/(\/*\?.*$)|(\/$)/', '', $path); $path = str_replace($this->format_map['extensions'], '', $path); return $path; } protected function getRequestMethod() { $method = $_SERVER['REQUEST_METHOD']; if (isset($_SERVER['HTTP_X_HTTP_METHOD_OVERRIDE'])) { $method = $_SERVER['HTTP_X_HTTP_METHOD_OVERRIDE']; } if ($method == 'HEAD') { $method = 'GET'; } return $method; } protected function getRequestFormat() { $format = NULL; if (isset($_SERVER['CONTENT_TYPE'])) { $mime = explode(';', $_SERVER['CONTENT_TYPE']); $mime = $mime[0]; if ($mime == UrlEncodedFormat::MIME) { $format = new UrlEncodedFormat(); } else { if (isset($this->format_map[$mime])) { $format = $this->format_map[$mime]; $format = is_string($format) ? new $format : $format; $format->setMIME($mime); } } } return $format; } protected function getResponseFormat() { $format = NULL; $extensions = explode('.', parse_url($_SERVER['REQUEST_URI'], PHP_URL_PATH)); while($extensions) { $extension = array_pop($extensions); $extension = explode('/', $extension); $extension = array_shift($extension); if ($extension && isset($this->format_map[$extension])) { $format = $this->format_map[$extension]; $format = is_string($format) ? new $format : $format; $format->setExtension($extension); return $format; } } if (isset($_SERVER['HTTP_ACCEPT'])) { $acceptList = array(); $accepts = explode(',', strtolower($_SERVER['HTTP_ACCEPT'])); if (!is_array($accepts)) { $accepts = array($accepts); } foreach ($accepts as $pos => $accept) { $parts = explode(';q=', trim($accept)); $type = array_shift($parts); $quality = count($parts) ? floatval(array_shift($parts)) : (1000 - $pos) / 1000; $acceptList[$type] = $quality; } arsort($acceptList); foreach ($acceptList as $accept => $quality) { if (isset($this->format_map[$accept])) { $format = $this->format_map[$accept]; $format = is_string($format) ? new $format : $format; $format->setMIME($accept); header("Vary: Accept"); return $format; } } } else { $_SERVER['HTTP_ACCEPT'] = '*/*'; } if (strpos($_SERVER['HTTP_ACCEPT'], '*') !== FALSE) { if (strpos($_SERVER['HTTP_ACCEPT'], 'application/*') !== FALSE) { $format = new JsonFormat; } else if (strpos($_SERVER['HTTP_ACCEPT'], 'text/*') !== FALSE) { $format = new XmlFormat; } else if (strpos($_SERVER['HTTP_ACCEPT'], '*/*') !== FALSE) { $format = new $this->format_map['default']; } } if (empty($format)) { header('HTTP/1.1 406 Not Acceptable'); die('406 Not Acceptable: The server was unable to negotiate content for this request.'); } else { header("Vary: Accept"); return $format; } } protected function getRequestData() { try{ $r = file_get_contents('php://input'); if (is_null($r)) { return $_GET; } $r = $this->request_format->decode($r); return is_null($r) ? array() : $r; } catch (RestException $e) { $this->handleError($e->getCode(), $e->getMessage()); } } protected function mapUrlToMethod() { if (!isset($this->routes[$this->request_method])) { return array(); } $urls = $this->routes[$this->request_method]; if (!$urls) { return array(); } $found = FALSE; $this->request_data += $_GET; $params = array('request_data' => $this->request_data); $params += $this->request_data; $lc = strtolower($this->url); foreach ($urls as $url => $call) { $call = (object) $call; if (strstr($url, ':')) { $regex = preg_replace('/\\\:([^\/]+)/', '(?P<$1>[^/]+)', preg_quote($url)); if (preg_match(":^$regex$:i", $this->url, $matches)) { foreach ($matches as $arg => $match) { if (isset($call->arguments[$arg])) { $params[$arg] = $match; } } $found = TRUE; break; } } else if ($url == $lc) { $found = TRUE; break; } } if ($found) { $p = $call->defaults; foreach ($call->arguments as $key => $value) { if (isset($params[$key])) { $p[$value] = $params[$key]; } } $call->arguments = $p; return $call; } } protected function applyClassMetadata($class_name, $instance, $method_info) { if (isset($method_info->metadata[$class_name]) && is_array($method_info->metadata[$class_name]) ) { foreach ($method_info->metadata[$class_name] as $property => $value ) { if (property_exists($class_name, $property)) { $reflection_property = new ReflectionProperty($class_name, $property); $reflection_property->setValue($instance, $value); } } } } protected function loadCache() { if ($this->cached !== NULL) { return; } $file = $this->cache_dir . '/routes.php'; $this->cached = FALSE; if ($this->production_mode) { if (file_exists($file)) { $routes = include($file); } if (isset($routes) && is_array($routes)) { $this->routes = $routes; $this->cached = TRUE; } } else { } } protected function generateMap ($class_name, $base_path = '') { $reflection = new ReflectionClass($class_name); $class_metadata = parse_doc($reflection->getDocComment()); $methods = $reflection->getMethods( ReflectionMethod::IS_PUBLIC + ReflectionMethod::IS_PROTECTED ); foreach ($methods as $method) { $doc = $method->getDocComment(); $arguments = array(); $defaults = array(); $metadata = $class_metadata + parse_doc($doc); $params = $method->getParameters(); $position = 0; foreach ($params as $param) { $arguments[$param->getName()] = $position; $defaults[$position] = $param->isDefaultValueAvailable() ? $param->getDefaultValue() : NULL; $position++; } $method_flag = $method->isProtected() ? (isRestlerCompatibilityModeEnabled() ? 2 : 3) : (isset($metadata['protected']) ? 1 : 0); $call = array( 'class_name' => $class_name, 'method_name' => $method->getName(), 'arguments' => $arguments, 'defaults' => $defaults, 'metadata' => $metadata, 'method_flag' => $method_flag ); $method_url = strtolower($method->getName()); if (preg_match_all( '/@url\s+(GET|POST|PUT|DELETE|HEAD|OPTIONS)[ \t]*\/?(\S*)/s', $doc, $matches, PREG_SET_ORDER) ) { foreach ($matches as $match) { $http_method = $match[1]; $url = rtrim($base_path . $match[2],'/'); $this->routes[$http_method][$url] = $call; } } else if ($method_url[0] != '_') { if (preg_match_all('/^(GET|POST|PUT|DELETE|HEAD|OPTIONS)/i', $method_url, $matches) ) { $http_method = strtoupper($matches[0][0]); $method_url = substr($method_url, strlen($http_method)); } else { $http_method = 'GET'; } $url = $base_path . ($method_url == 'index' || $method_url == 'default' ? '' : $method_url); $url = rtrim($url,'/'); $this->routes[$http_method][$url] = $call; foreach ($params as $param) { if ($param->getName() == 'request_data') { break; } $url .= $url == '' ? ':' : '/:'; $url .= $param->getName(); $this->routes[$http_method][$url] = $call; } } } } } if (version_compare(PHP_VERSION, '5.3.0') < 0) { require_once 'compat.php'; } class RestException extends Exception { public function __construct($http_status_code, $error_message = NULL) { parent::__construct($error_message, $http_status_code); } } interface iRespond { public function __formatResponse($result); public function __formatError($status_code, $message); } class DefaultResponse implements iRespond { function __formatResponse($result) { return $result; } function __formatError($statusCode, $message) { return array( 'error' => array( 'code' => $statusCode, 'message' => $message ) ); } } interface iAuthenticate { public function __isAuthenticated(); } interface iFormat { public function getMIMEMap(); public function setMIME($mime); public function getMIME(); public function setExtension($extension); public function getExtension(); public function encode($data, $human_readable = FALSE); public function decode($data); } class UrlEncodedFormat implements iFormat { const MIME = 'application/x-www-form-urlencoded'; const EXTENSION = 'post'; public function getMIMEMap() { return array(self::EXTENSION => self::MIME); } public function getMIME() { return self::MIME; } public function getExtension() { return self::EXTENSION; } public function setMIME($mime) { } public function setExtension($extension) { } public function encode($data, $human_readable = FALSE) { return http_build_query($data); } public function decode($data) { parse_str($data,$r); return $r; } public function __toString() { return $this->getExtension(); } } class JsonFormat implements iFormat { const MIME = 'application/json,application/javascript'; static $mime = 'application/json'; const EXTENSION = 'json'; public function getMIMEMap() { return array(self::EXTENSION => self::MIME); } public function getMIME() { return self::$mime; } public function getExtension() { return self::EXTENSION; } public function setMIME($mime) { self::$mime = $mime; } public function setExtension($extension) { } public function encode($data, $human_readable = FALSE) { return $human_readable ? $this->json_format(json_encode(object_to_array($data))) : json_encode(object_to_array($data)); } public function decode($data) { $decoded = json_decode ($data); if (function_exists ('json_last_error')) { $message = ''; switch (json_last_error ()) { case JSON_ERROR_NONE: return object_to_array ($decoded); break; case JSON_ERROR_DEPTH: $message = 'maximum stack depth exceeded'; break; case JSON_ERROR_STATE_MISMATCH: $message = 'underflow or the modes mismatch'; break; case JSON_ERROR_CTRL_CHAR: $message = 'unexpected control character found'; break; case JSON_ERROR_SYNTAX: $message = 'malformed JSON'; break; case JSON_ERROR_UTF8: $message = 'malformed UTF-8 characters, possibly incorrectly encoded'; break; default: $message = 'unknown error'; break; } throw new RestException (400, 'Error parsing JSON, ' . $message); } else if (strlen ($data) && $decoded === NULL || $decoded === $data) { throw new RestException (400, 'Error parsing JSON'); } return object_to_array ($decoded); } private function json_format($json) { $tab = "  "; $new_json = ""; $indent_level = 0; $in_string = FALSE; $len = strlen($json); for($c = 0; $c < $len; $c++) { $char = $json[$c]; switch($char) { case '{': case '[': if (!$in_string) { $new_json .= $char . "\n" . str_repeat($tab, $indent_level + 1); $indent_level++; } else { $new_json .= $char; } break; case '}': case ']': if (!$in_string) { $indent_level--; $new_json .= "\n" . str_repeat($tab, $indent_level) . $char; } else { $new_json .= $char; } break; case ',': if (!$in_string) { $new_json .= ",\n" . str_repeat($tab, $indent_level); } else { $new_json .= $char; } break; case ':': if (!$in_string) { $new_json .= ": "; } else { $new_json .= $char; } break; case '"': if ($c==0) { $in_string = TRUE; } else if ($c > 0 && $json[$c-1] != '\\') { $in_string = !$in_string; } default: $new_json .= $char; break; } } return $new_json; } public function __toString() { return $this->getExtension(); } } class DocParser { private $params = array(); function parse($doc = '') { if ($doc == '') { return $this->params; } if (preg_match('#^/\*\*(.*)\*/#s', $doc, $comment) === false) { return $this->params; } $comment = trim($comment[1]); if (preg_match_all('#^\s*\*(.*)#m', $comment, $lines) === false) { return $this->params; } $this->parseLines($lines[1]); return $this->params; } private function parseLines($lines) { foreach($lines as $line) { $parsedLine = $this->parseLine($line); if ($parsedLine === false && !isset($this->params['description'])) { if (isset($desc)) { $this->params['description'] = implode(PHP_EOL, $desc); } $desc = array(); } else if ($parsedLine !== false) { $desc[] = $parsedLine; } } $desc = implode(' ', $desc); if (!empty($desc)) { $this->params['long_description'] = $desc; } } private function parseLine($line) { $line = trim($line); if (empty($line)) { return false; } if (strpos($line, '@') === 0) { if (strpos($line, ' ') > 0) { $param = substr($line, 1, strpos($line, ' ') - 1); $value = substr($line, strlen($param) + 2); } else { $param = substr($line, 1); $value = ''; } if ($this->setParam($param, $value)) return false; } return $line; } private function setParam($param, $value) { if ($param == 'param' || $param == 'return') { $value = $this->formatParamOrReturn($value); } if ($param == 'class') { list($param, $value) = $this->formatClass($value); } if (empty($this->params[$param])) { $this->params[$param] = $value; } else if ($param == 'param') { $arr = array($this->params[$param], $value); $this->params[$param] = $arr; } else { $this->params[$param] = $value + $this->params[$param]; } return true; } private function formatClass($value) { $r = preg_split("[\(|\)]", $value); if (count($r) > 1) { $param = $r[0]; parse_str($r[1],$value); foreach ($value as $key => $val) { $val = explode(',', $val); if (count($val) > 1) { $value[$key] = $val; } } } else { $param = 'Unknown'; } return array($param, $value); } private function formatParamOrReturn($string) { $pos = strpos($string, ' '); $type = substr($string, 0, $pos); return '(' . $type . ')' . substr($string, $pos + 1); } } function parse_doc($php_doc_comment) { $p = new DocParser(); return $p->parse($php_doc_comment); $p = new Parser($php_doc_comment); return $p; $php_doc_comment = preg_replace( "/(^[\\s]*\\/\\*\\*)
+ class Restler { const VERSION = '2.2.1'; public $url; public $request_method; public $request_format; public $request_data = array(); public $cache_dir; public $base_dir; public $response = 'DefaultResponse'; public $response_format; protected $production_mode; protected $routes = array(); protected $format_map = array(); protected $service_class_instance; protected $service_method; protected $auth_classes = array(); protected $error_classes = array(); private $codes = array( 100 => 'Continue', 101 => 'Switching Protocols', 200 => 'OK', 201 => 'Created', 202 => 'Accepted', 203 => 'Non-Authoritative Information', 204 => 'No Content', 205 => 'Reset Content', 206 => 'Partial Content', 300 => 'Multiple Choices', 301 => 'Moved Permanently', 302 => 'Found', 303 => 'See Other', 304 => 'Not Modified', 305 => 'Use Proxy', 306 => '(Unused)', 307 => 'Temporary Redirect', 400 => 'Bad Request', 401 => 'Unauthorized', 402 => 'Payment Required', 403 => 'Forbidden', 404 => 'Not Found', 405 => 'Method Not Allowed', 406 => 'Not Acceptable', 407 => 'Proxy Authentication Required', 408 => 'Request Timeout', 409 => 'Conflict', 410 => 'Gone', 411 => 'Length Required', 412 => 'Precondition Failed', 413 => 'Request Entity Too Large', 414 => 'Request-URI Too Long', 415 => 'Unsupported Media Type', 416 => 'Requested Range Not Satisfiable', 417 => 'Expectation Failed', 500 => 'Internal Server Error', 501 => 'Not Implemented', 502 => 'Bad Gateway', 503 => 'Service Unavailable', 504 => 'Gateway Timeout', 505 => 'HTTP Version Not Supported' ); protected $cached; public function __construct($production_mode = false) { $this->production_mode = $production_mode; $this->cache_dir = getcwd(); $this->base_dir = RESTLER_PATH; } public function __destruct() { if ($this->production_mode && !($this->cached)) { $this->saveCache(); } } public function refreshCache() { $this->routes = array(); $this->cached = false; } public function setSupportedFormats() { $args = func_get_args(); $extensions = array(); foreach ($args as $class_name) { if (!is_string($class_name) || !class_exists($class_name)) { throw new Exception("$class_name is not a vaild Format Class."); } $obj = new $class_name; if (!($obj instanceof iFormat)) { throw new Exception('Invalid format class; must implement ' . 'iFormat interface'); } foreach ($obj->getMIMEMap() as $extension => $mime) { if (!isset($this->format_map[$extension])) { $this->format_map[$extension] = $class_name; } $mime = explode(',', $mime); if (!is_array($mime)) { $mime = array($mime); } foreach ($mime as $value) { if (!isset($this->format_map[$value])) { $this->format_map[$value] = $class_name; } } $extensions[".$extension"] = true; } } $this->format_map['default'] = $args[0]; $this->format_map['extensions'] = array_keys($extensions); } public function addAPIClass($class_name, $base_path = null) { if (!class_exists($class_name)) { throw new Exception("API class $class_name is missing."); } $this->loadCache(); if (!$this->cached) { if (is_null($base_path)) { $base_path = strtolower($class_name); $index = strrpos($class_name, '\\'); if ($index !== false) { $base_path = substr($base_path, $index + 1); } } else { $base_path = trim($base_path, '/'); } if (strlen($base_path) > 0) { $base_path .= '/'; } $this->generateMap($class_name, $base_path); } } public function addAuthenticationClass($class_name, $base_path = null) { $this->auth_classes[] = $class_name; $this->addAPIClass($class_name, $base_path); } public function addErrorClass($class_name) { $this->error_classes[] = $class_name; } public function handleError($status_code, $error_message = null) { $method = "handle$status_code"; $handled = false; foreach ($this->error_classes as $class_name) { if (method_exists($class_name, $method)) { $obj = new $class_name(); $obj->restler = $this; $obj->$method(); $handled = true; } } if ($handled) { return; } $message = $this->codes[$status_code] . (!$error_message ? '' : ': ' . $error_message); $this->setStatus($status_code); $responder = new $this->response(); $responder->restler = $this; $this->sendData($responder->__formatError($status_code, $message)); } public function init() { if (empty($this->format_map)) { $this->setSupportedFormats('JsonFormat'); } $this->url = $this->getPath(); $this->request_method = $this->getRequestMethod(); $this->response_format = $this->getResponseFormat(); $this->request_format = $this->getRequestFormat(); if (is_null($this->request_format)) { $this->request_format = $this->response_format; } if ($this->request_method == 'PUT' || $this->request_method == 'POST') { $this->request_data = $this->getRequestData(); } } public function handle() { $this->init(); $o = $this->mapUrlToMethod(); if (!isset($o->class_name)) { $this->handleError(404); } else { try { if ($o->method_flag) { $auth_method = '__isAuthenticated'; if (!count($this->auth_classes)) { throw new RestException(401); } foreach ($this->auth_classes as $auth_class) { $auth_obj = new $auth_class(); $auth_obj->restler = $this; $this->applyClassMetadata($auth_class, $auth_obj, $o); if (!method_exists($auth_obj, $auth_method)) { throw new RestException(401, 'Authentication Class ' . 'should implement iAuthenticate'); } else if (!$auth_obj->$auth_method()) { throw new RestException(401); } } } $this->applyClassMetadata(get_class($this->request_format), $this->request_format, $o); $pre_process = '_' . $this->request_format->getExtension() . '_' . $o->method_name; $this->service_method = $o->method_name; if ($o->method_flag == 2) { $o = unprotect($o); } $object = $this->service_class_instance = new $o->class_name(); $object->restler = $this; if (method_exists($o->class_name, $pre_process)) { call_user_func_array( array($object, $pre_process), $o->arguments ); } switch ($o->method_flag) { case 3: $reflection_method = new ReflectionMethod($object, $o->method_name); $reflection_method->setAccessible(true); $result = $reflection_method->invokeArgs($object, $o->arguments); break; case 2: case 1: default: $result = call_user_func_array(array( $object, $o->method_name), $o->arguments ); break; } } catch (RestException $e) { $this->handleError($e->getCode(), $e->getMessage()); } } $responder = new $this->response(); $responder->restler = $this; $this->applyClassMetadata($this->response, $responder, $o); if (isset($result) && $result !== null) { $result = $responder->__formatResponse($result); $this->sendData($result); } } public function sendData($data) { $data = $this->response_format->encode($data, !($this->production_mode) ); $post_process = '_' . $this->service_method . '_' . $this->response_format->getExtension(); if (isset($this->service_class_instance) && method_exists($this->service_class_instance, $post_process) ) { $data = call_user_func(array($this->service_class_instance, $post_process), $data); } header("Cache-Control: no-cache, must-revalidate"); header("Expires: 0"); header('Content-Type: ' . $this->response_format->getMIME()); header("X-Powered-By: Luracast Restler v" . Restler::VERSION); die($data); } public function setStatus($code) { header("{$_SERVER['SERVER_PROTOCOL']} $code " . $this->codes[strval($code)]); } public function removeCommonPath($first, $second, $char = '/') { $first = explode($char, $first); $second = explode($char, $second); while (count($second)) { if ($first[0] == $second[0]) { array_shift($first); } else { break; } array_shift($second); } return implode($char, $first); } public function saveCache() { $file = $this->cache_dir . '/routes.php'; $s = '$o=array();' . PHP_EOL; foreach ($this->routes as $key => $value) { $s .= PHP_EOL . PHP_EOL . PHP_EOL . "############### $key ###############" . PHP_EOL . PHP_EOL; $s .= '$o[\'' . $key . '\']=array();'; foreach ($value as $ke => $va) { $s .= PHP_EOL . PHP_EOL . "#==== $key $ke" . PHP_EOL . PHP_EOL; $s .= '$o[\'' . $key . '\'][\'' . $ke . '\']=' . str_replace( PHP_EOL, PHP_EOL . "\t", var_export($va, true) ) . ';'; } } $s .= PHP_EOL . 'return $o;'; $r = @file_put_contents($file, "<?php $s"); @chmod($file, 0777); if ($r === false) { throw new Exception( "The cache directory located at '$this->cache_dir' needs to " . "have the permissions set to read/write/execute for everyone" . " in order to save cache and improve performance."); } } protected function getPath() { $path = urldecode($this->removeCommonPath($_SERVER['REQUEST_URI'], $_SERVER['SCRIPT_NAME'])); $path = preg_replace('/(\/*\?.*$)|(\/$)/', '', $path); $path = str_replace($this->format_map['extensions'], '', $path); return $path; } protected function getRequestMethod() { $method = $_SERVER['REQUEST_METHOD']; if (isset($_SERVER['HTTP_X_HTTP_METHOD_OVERRIDE'])) { $method = $_SERVER['HTTP_X_HTTP_METHOD_OVERRIDE']; } if ($method == 'HEAD') { $method = 'GET'; } return $method; } protected function getRequestFormat() { $format = null; if (isset($_SERVER['CONTENT_TYPE'])) { $mime = explode(';', $_SERVER['CONTENT_TYPE']); $mime = $mime[0]; if ($mime == UrlEncodedFormat::MIME) { $format = new UrlEncodedFormat(); } else { if (isset($this->format_map[$mime])) { $format = $this->format_map[$mime]; $format = is_string($format) ? new $format : $format; $format->setMIME($mime); } } } return $format; } protected function getResponseFormat() { $format = null; $extensions = explode('.', parse_url($_SERVER['REQUEST_URI'], PHP_URL_PATH)); while ($extensions) { $extension = array_pop($extensions); $extension = explode('/', $extension); $extension = array_shift($extension); if ($extension && isset($this->format_map[$extension])) { $format = $this->format_map[$extension]; $format = is_string($format) ? new $format : $format; $format->setExtension($extension); return $format; } } if (isset($_SERVER['HTTP_ACCEPT'])) { $acceptList = array(); $accepts = explode(',', strtolower($_SERVER['HTTP_ACCEPT'])); if (!is_array($accepts)) { $accepts = array($accepts); } foreach ($accepts as $pos => $accept) { $parts = explode(';q=', trim($accept)); $type = array_shift($parts); $quality = count($parts) ? floatval(array_shift($parts)) : (1000 - $pos) / 1000; $acceptList[$type] = $quality; } arsort($acceptList); foreach ($acceptList as $accept => $quality) { if (isset($this->format_map[$accept])) { $format = $this->format_map[$accept]; $format = is_string($format) ? new $format : $format; $format->setMIME($accept); header("Vary: Accept"); return $format; } } } else { $_SERVER['HTTP_ACCEPT'] = '*/*'; } if (strpos($_SERVER['HTTP_ACCEPT'], '*') !== false) { if (strpos($_SERVER['HTTP_ACCEPT'], 'application/*') !== false) { $format = new JsonFormat; } else if (strpos($_SERVER['HTTP_ACCEPT'], 'text/*') !== false) { $format = new XmlFormat; } else if (strpos($_SERVER['HTTP_ACCEPT'], '*/*') !== false) { $format = new $this->format_map['default']; } } if (empty($format)) { header('HTTP/1.1 406 Not Acceptable'); die('406 Not Acceptable: The server was unable to ' . 'negotiate content for this request.'); } else { header("Vary: Accept"); return $format; } } protected function getRequestData() { try { $r = file_get_contents('php://input'); if (is_null($r)) { return $_GET; } $r = $this->request_format->decode($r); return is_null($r) ? array() : $r; } catch (RestException $e) { $this->handleError($e->getCode(), $e->getMessage()); } } protected function mapUrlToMethod() { if (!isset($this->routes[$this->request_method])) { return array(); } $urls = $this->routes[$this->request_method]; if (!$urls) { return array(); } $found = false; $this->request_data += $_GET; $params = array('request_data' => $this->request_data); $params += $this->request_data; $lc = strtolower($this->url); foreach ($urls as $url => $call) { $call = (object) $call; if (strstr($url, ':')) { $regex = preg_replace('/\\\:([^\/]+)/', '(?P<$1>[^/]+)', preg_quote($url)); if (preg_match(":^$regex$:i", $this->url, $matches)) { foreach ($matches as $arg => $match) { if (isset($call->arguments[$arg])) { $params[$arg] = $match; } } $found = true; break; } } else if ($url == $lc) { $found = true; break; } } if ($found) { $p = $call->defaults; foreach ($call->arguments as $key => $value) { if (isset($params[$key])) { $p[$value] = $params[$key]; } } $call->arguments = $p; return $call; } } protected function applyClassMetadata($class_name, $instance, $method_info) { if (isset($method_info->metadata[$class_name]) && is_array($method_info->metadata[$class_name]) ) { foreach ($method_info->metadata[$class_name] as $property => $value) { if (property_exists($class_name, $property)) { $reflection_property = new ReflectionProperty($class_name, $property); $reflection_property->setValue($instance, $value); } } } } protected function loadCache() { if ($this->cached !== null) { return; } $file = $this->cache_dir . '/routes.php'; $this->cached = false; if ($this->production_mode) { if (file_exists($file)) { $routes = include($file); } if (isset($routes) && is_array($routes)) { $this->routes = $routes; $this->cached = true; } } else { } } protected function generateMap($class_name, $base_path = '') { $reflection = new ReflectionClass($class_name); $class_metadata = parse_doc($reflection->getDocComment()); $methods = $reflection->getMethods( ReflectionMethod::IS_PUBLIC + ReflectionMethod::IS_PROTECTED ); foreach ($methods as $method) { $doc = $method->getDocComment(); $arguments = array(); $defaults = array(); $metadata = $class_metadata + parse_doc($doc); $params = $method->getParameters(); $position = 0; foreach ($params as $param) { $arguments[$param->getName()] = $position; $defaults[$position] = $param->isDefaultValueAvailable() ? $param->getDefaultValue() : null; $position++; } $method_flag = $method->isProtected() ? (isRestlerCompatibilityModeEnabled() ? 2 : 3) : (isset($metadata['protected']) ? 1 : 0); $call = array( 'class_name' => $class_name, 'method_name' => $method->getName(), 'arguments' => $arguments, 'defaults' => $defaults, 'metadata' => $metadata, 'method_flag' => $method_flag ); $method_url = strtolower($method->getName()); if (preg_match_all( '/@url\s+(GET|POST|PUT|DELETE|HEAD|OPTIONS)[ \t]*\/?(\S*)/s', $doc, $matches, PREG_SET_ORDER) ) { foreach ($matches as $match) { $http_method = $match[1]; $url = rtrim($base_path . $match[2], '/'); $this->routes[$http_method][$url] = $call; } } elseif ($method_url[0] != '_') { if (preg_match_all('/^(GET|POST|PUT|DELETE|HEAD|OPTIONS)/i', $method_url, $matches) ) { $http_method = strtoupper($matches[0][0]); $method_url = substr($method_url, strlen($http_method)); } else { $http_method = 'GET'; } $url = $base_path . ($method_url == 'index' || $method_url == 'default' ? '' : $method_url); $url = rtrim($url, '/'); $this->routes[$http_method][$url] = $call; foreach ($params as $param) { if ($param->getName() == 'request_data') { break; } $url .= $url == '' ? ':' : '/:'; $url .= $param->getName(); $this->routes[$http_method][$url] = $call; } } } } } if (version_compare(PHP_VERSION, '5.3.0') < 0) { require_once 'compat.php'; } class RestException extends Exception { public function __construct($http_status_code, $error_message = null) { parent::__construct($error_message, $http_status_code); } } interface iRespond { public function __formatResponse($result); public function __formatError($status_code, $message); } class DefaultResponse implements iRespond { function __formatResponse($result) { return $result; } function __formatError($statusCode, $message) { return array( 'error' => array( 'code' => $statusCode, 'message' => $message ) ); } } interface iAuthenticate { public function __isAuthenticated(); } interface iFormat { public function getMIMEMap(); public function setMIME($mime); public function getMIME(); public function setExtension($extension); public function getExtension(); public function encode($data, $human_readable = false); public function decode($data); } class UrlEncodedFormat implements iFormat { const MIME = 'application/x-www-form-urlencoded'; const EXTENSION = 'post'; public function getMIMEMap() { return array(self::EXTENSION => self::MIME); } public function getMIME() { return self::MIME; } public function getExtension() { return self::EXTENSION; } public function setMIME($mime) { } public function setExtension($extension) { } public function encode($data, $human_readable = false) { return http_build_query($data); } public function decode($data) { parse_str($data, $r); return $r; } public function __toString() { return $this->getExtension(); } } class JsonFormat implements iFormat { const MIME = 'application/json,application/javascript'; static $mime = 'application/json'; const EXTENSION = 'json'; public function getMIMEMap() { return array(self::EXTENSION => self::MIME); } public function getMIME() { return self::$mime; } public function getExtension() { return self::EXTENSION; } public function setMIME($mime) { self::$mime = $mime; } public function setExtension($extension) { } public function encode($data, $human_readable = false) { return $human_readable ? $this->json_format(json_encode(object_to_array($data))) : json_encode(object_to_array($data)); } public function decode($data) { $decoded = json_decode($data); if (function_exists('json_last_error')) { $message = ''; switch (json_last_error()) { case JSON_ERROR_NONE: return object_to_array($decoded); break; case JSON_ERROR_DEPTH: $message = 'maximum stack depth exceeded'; break; case JSON_ERROR_STATE_MISMATCH: $message = 'underflow or the modes mismatch'; break; case JSON_ERROR_CTRL_CHAR: $message = 'unexpected control character found'; break; case JSON_ERROR_SYNTAX: $message = 'malformed JSON'; break; case JSON_ERROR_UTF8: $message = 'malformed UTF-8 characters, '. 'possibly incorrectly encoded'; break; default: $message = 'unknown error'; break; } throw new RestException(400, 'Error parsing JSON, ' . $message); } else if (strlen($data) && $decoded === null || $decoded === $data) { throw new RestException(400, 'Error parsing JSON'); } return object_to_array($decoded); } private function json_format($json) { $tab = "  "; $new_json = ""; $indent_level = 0; $in_string = false; $len = strlen($json); for ($c = 0; $c < $len; $c++) { $char = $json[$c]; switch ($char) { case '{': case '[': if (!$in_string) { $new_json .= $char . "\n" . str_repeat($tab, $indent_level + 1); $indent_level++; } else { $new_json .= $char; } break; case '}': case ']': if (!$in_string) { $indent_level--; $new_json .= "\n" . str_repeat($tab, $indent_level) . $char; } else { $new_json .= $char; } break; case ',': if (!$in_string) { $new_json .= ",\n" . str_repeat($tab, $indent_level); } else { $new_json .= $char; } break; case ':': if (!$in_string) { $new_json .= ": "; } else { $new_json .= $char; } break; case '"': if ($c == 0) { $in_string = true; } else if ($c > 0 && $json[$c - 1] != '\\') { $in_string = !$in_string; } default: $new_json .= $char; break; } } return $new_json; } public function __toString() { return $this->getExtension(); } } class DocParser { private $params = array(); function parse($doc = '') { if ($doc == '') { return $this->params; } if (preg_match('#^/\*\*(.*)\*/#s', $doc, $comment) === false) { return $this->params; } $comment = trim($comment[1]); if (preg_match_all('#^\s*\*(.*)#m', $comment, $lines) === false) { return $this->params; } $this->parseLines($lines[1]); return $this->params; } private function parseLines($lines) { foreach ($lines as $line) { $parsedLine = $this->parseLine($line); if ($parsedLine === false && !isset($this->params['description'])) { if (isset($desc)) { $this->params['description'] = implode(PHP_EOL, $desc); } $desc = array(); } else if ($parsedLine !== false) { $desc[] = $parsedLine; } } $desc = implode(' ', $desc); if (!empty($desc)) { $this->params['long_description'] = $desc; } } private function parseLine($line) { $line = trim($line); if (empty($line)) { return false; } if (strpos($line, '@') === 0) { if (strpos($line, ' ') > 0) { $param = substr($line, 1, strpos($line, ' ') - 1); $value = substr($line, strlen($param) + 2); } else { $param = substr($line, 1); $value = ''; } if ($this->setParam($param, $value)) { return false; } } return $line; } private function setParam($param, $value) { if ($param == 'param' || $param == 'return') { $value = $this->formatParamOrReturn($value); } if ($param == 'class') { list($param, $value) = $this->formatClass($value); } if (empty($this->params[$param])) { $this->params[$param] = $value; } else if ($param == 'param') { $arr = array($this->params[$param], $value); $this->params[$param] = $arr; } else { $this->params[$param] = $value + $this->params[$param]; } return true; } private function formatClass($value) { $r = preg_split("[\(|\)]", $value); if (count($r) > 1) { $param = $r[0]; parse_str($r[1], $value); foreach ($value as $key => $val) { $val = explode(',', $val); if (count($val) > 1) { $value[$key] = $val; } } } else { $param = 'Unknown'; } return array($param, $value); } private function formatParamOrReturn($string) { $pos = strpos($string, ' '); $type = substr($string, 0, $pos); return '(' . $type . ')' . substr($string, $pos + 1); } } function parse_doc($php_doc_comment) { $p = new DocParser(); return $p->parse($php_doc_comment); $p = new Parser($php_doc_comment); return $p; $php_doc_comment = preg_replace( "/(^[\\s]*\\/\\*\\*)
         |(^[\\s]\\*\\/)
         |(^[\\s]*\\*?\\s)
         |(^[\\s]*)
-        |(^[\\t]*)/ixm", "", $php_doc_comment); $php_doc_comment = str_replace("\r", "", $php_doc_comment); $php_doc_comment = preg_replace("/([\\t])+/", "\t", $php_doc_comment); return explode("\n", $php_doc_comment); $php_doc_comment = trim(preg_replace('/\r?\n *\* */', ' ', $php_doc_comment)); return $php_doc_comment; preg_match_all('/@([a-z]+)\s+(.*?)\s*(?=$|@[a-z]+\s)/s', $php_doc_comment, $matches); return array_combine($matches[1], $matches[2]); } function object_to_array($object, $utf_encode = FALSE) { if (is_array($object) || (is_object($object) && !($object instanceof JsonSerializable)) ) { $array = array(); foreach($object as $key => $value) { $value = object_to_array($value, $utf_encode); if ($utf_encode && is_string($value)) { $value = utf8_encode($value); } $array[$key] = $value; } return $array; } return $object; } function autoload_formats($class_name) { $class_name = strtolower($class_name); $file = RESTLER_PATH . "/$class_name/$class_name.php"; if (file_exists ($file)) { require_once ($file); } else { $file = RESTLER_PATH . "/$class_name.php"; if (file_exists ($file)) { require_once ($file); } elseif (file_exists ("$class_name.php")) { require_once ("$class_name.php"); } } } spl_autoload_register('autoload_formats'); if (!function_exists('isRestlerCompatibilityModeEnabled')) { function isRestlerCompatibilityModeEnabled() { return FALSE; } } define('RESTLER_PATH', dirname(__FILE__));
\ No newline at end of file
+        |(^[\\t]*)/ixm", "", $php_doc_comment); $php_doc_comment = str_replace("\r", "", $php_doc_comment); $php_doc_comment = preg_replace("/([\\t])+/", "\t", $php_doc_comment); return explode("\n", $php_doc_comment); $php_doc_comment = trim(preg_replace('/\r?\n *\* */', ' ', $php_doc_comment)); return $php_doc_comment; preg_match_all('/@([a-z]+)\s+(.*?)\s*(?=$|@[a-z]+\s)/s', $php_doc_comment, $matches); return array_combine($matches[1], $matches[2]); } function object_to_array($object, $utf_encode = false) { if (is_array($object) || (is_object($object) && !($object instanceof JsonSerializable)) ) { $array = array(); foreach ($object as $key => $value) { $value = object_to_array($value, $utf_encode); if ($utf_encode && is_string($value)) { $value = utf8_encode($value); } $array[$key] = $value; } return $array; } return $object; } function autoload_formats($class_name) { $class_name = strtolower($class_name); $file = RESTLER_PATH . "/$class_name/$class_name.php"; if (file_exists($file)) { require_once ($file); } else { $file = RESTLER_PATH . "/$class_name.php"; if (file_exists($file)) { require_once ($file); } elseif (file_exists("$class_name.php")) { require_once ("$class_name.php"); } } } spl_autoload_register('autoload_formats'); if (!function_exists('isRestlerCompatibilityModeEnabled')) { function isRestlerCompatibilityModeEnabled() { return false; } } define('RESTLER_PATH', dirname(__FILE__));
\ No newline at end of file

From cd3702b3ae1a925a3c922437f55f1259826233c3 Mon Sep 17 00:00:00 2001
From: Arul <arul@luracast.com>
Date: Thu, 6 Sep 2012 12:13:37 +0800
Subject: [PATCH 55/61] fixed the presentation link

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 3963f7c10..d48a69636 100644
--- a/README.md
+++ b/README.md
@@ -6,7 +6,7 @@ Just deal with your business logic in php, restler will take care of the REST!
 
 * [Developer Home](http://luracast.com/products/restler/)
 * [Live Examples](http://bit.ly/RestlerLiveExamples)
-* [Taking Care of the REST - Presentation](http://bit.ly/TakingCareOfTheREST)
+* [Taking Care of the REST - Presentation](http://bit.ly/TakeCareOfREST)
 * [Open Sourced Real World Example - SingMood](http://bit.ly/SingMood)
 * [Updates on Twitter](http://twitter.com/Luracast)
 

From 3da1a205f51700cb5ccc6fd534319597bc44e9f2 Mon Sep 17 00:00:00 2001
From: Arul <arul@luracast.com>
Date: Thu, 6 Sep 2012 12:15:01 +0800
Subject: [PATCH 56/61] fixed the presentation link in README.html

---
 README.html | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/README.html b/README.html
index 9cb4eb882..e7a992f86 100644
--- a/README.html
+++ b/README.html
@@ -1,4 +1,3 @@
-
 <!DOCTYPE html>
 <html>
 <head>
@@ -16,7 +15,7 @@ <h1>Luracast Restler 2.0</h1>
 <ul>
 <li><a href="http://luracast.com/products/restler/" target="_blank">Developer Home</a></li>
 <li><a href="http://bit.ly/RestlerLiveExamples" target="_blank">Live Examples</a></li>
-<li><a href="http://bit.ly/TakingCareOfTheREST" target="_blank">Taking Care of the REST - Presentation</a></li>
+<li><a href="http://bit.ly/TakeCareOfREST" target="_blank">Taking Care of the REST - Presentation</a></li>
 <li><a href="http://bit.ly/SingMood" target="_blank">Open Sourced Real World Example - SingMood</a></li>
 <li><a href="http://twitter.com/Luracast" target="_blank">Updates on Twitter</a></li>
 </ul>

From 88d0494b75320f581b621f2b0853d29b129280b7 Mon Sep 17 00:00:00 2001
From: Arul <arul@luracast.com>
Date: Sun, 23 Sep 2012 22:50:54 +0800
Subject: [PATCH 57/61] Added information about new release

---
 README.md | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/README.md b/README.md
index d48a69636..1ed08d9dc 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,13 @@
 Luracast Restler 2.0
 ====================
 
+***
+
+> **Update:-** *Restler 3 SP1* (PHP 5.3+) is available with more features, 
+[check it out](https://github.com/Luracast/Restler/tree/v3)!
+
+***
+
 Restler is a simple and effective multi-protocol REST API Server written in PHP. 
 Just deal with your business logic in php, restler will take care of the REST!
 

From 7309703c5247591a5aa6654307c4a9be19ce4887 Mon Sep 17 00:00:00 2001
From: Arul <arul@luracast.com>
Date: Mon, 24 Sep 2012 12:22:37 +0800
Subject: [PATCH 58/61] Update README.md

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 1ed08d9dc..ddb1fb227 100644
--- a/README.md
+++ b/README.md
@@ -3,7 +3,7 @@ Luracast Restler 2.0
 
 ***
 
-> **Update:-** *Restler 3 SP1* (PHP 5.3+) is available with more features, 
+> **Update:-** *Restler 3 RC1* (PHP 5.3+) is available with more features, 
 [check it out](https://github.com/Luracast/Restler/tree/v3)!
 
 ***

From 92c060fe7a7bcef5176d7ab7915b90b7d41f2aff Mon Sep 17 00:00:00 2001
From: Arul <arul@luracast.com>
Date: Wed, 3 Oct 2012 20:26:26 +0800
Subject: [PATCH 59/61] Updated for Restler 3 RC2 update

---
 README.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index ddb1fb227..1bc32c9d5 100644
--- a/README.md
+++ b/README.md
@@ -3,8 +3,8 @@ Luracast Restler 2.0
 
 ***
 
-> **Update:-** *Restler 3 RC1* (PHP 5.3+) is available with more features, 
-[check it out](https://github.com/Luracast/Restler/tree/v3)!
+> **Update:-** *Restler 3 RC2* (PHP 5.3+) is available with more features, take a look at the
+[Repository](https://github.com/Luracast/Restler/tree/v3) and try the [Live Examples](http://bit.ly/r3-examples)
 
 ***
 

From 4e0e1a52fec59c7843db28fc5b12f44ce2943da4 Mon Sep 17 00:00:00 2001
From: Arul <arul@luracast.com>
Date: Thu, 11 Oct 2012 01:27:50 +0800
Subject: [PATCH 60/61] Updated for Restler 3 RC

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 1bc32c9d5..7ae15845f 100644
--- a/README.md
+++ b/README.md
@@ -3,7 +3,7 @@ Luracast Restler 2.0
 
 ***
 
-> **Update:-** *Restler 3 RC2* (PHP 5.3+) is available with more features, take a look at the
+> **Update:-** *Restler 3 RC* (PHP 5.3+) is available with more features, take a look at the
 [Repository](https://github.com/Luracast/Restler/tree/v3) and try the [Live Examples](http://bit.ly/r3-examples)
 
 ***

From ebf48b160bed2964cccdc01b9c9770eed9f8b60b Mon Sep 17 00:00:00 2001
From: Django Eijgensteijn <djangoboy@gmail.com>
Date: Thu, 3 Jan 2013 16:24:00 +0100
Subject: [PATCH 61/61] [Autoloader] Removed spl_autoload_unregister

---
 vendor/Luracast/Restler/AutoLoader.php | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/vendor/Luracast/Restler/AutoLoader.php b/vendor/Luracast/Restler/AutoLoader.php
index e872f199b..788802829 100644
--- a/vendor/Luracast/Restler/AutoLoader.php
+++ b/vendor/Luracast/Restler/AutoLoader.php
@@ -68,7 +68,8 @@ public static function addPath($path) {
     public static function thereCanBeOnlyOne() {
         if (static::$perfectLoaders === spl_autoload_functions())
             return static::$instance;
-
+	
+	/*
         if (false !== $loaders = spl_autoload_functions())
             if (0 < $count = count($loaders))
                 for ($i = 0, static::$rogueLoaders += $loaders;
@@ -76,7 +77,7 @@ public static function thereCanBeOnlyOne() {
                      $i++)
                     if ($loader !== static::$perfectLoaders[0])
                         spl_autoload_unregister($loader);
-
+	*/
         return static::$instance;
     }