Dolibarr / dolibarr

htdocs/includes/restler/framework/Luracast/Restler/iCache.php

Indentation +43 added lines, -43 removed lines

@@ -13,51 +13,51 @@
  */
 interface iCache
 {
-    /**
-     * store data in the cache
-     *
-     * @abstract
-     *
-     * @param string $name
-     * @param mixed  $data
-     *
-     * @return boolean true if successful
-     */
-    public function set($name, $data);
+	/**
+	 * store data in the cache
+	 *
+	 * @abstract
+	 *
+	 * @param string $name
+	 * @param mixed  $data
+	 *
+	 * @return boolean true if successful
+	 */
+	public function set($name, $data);
 
-    /**
-     * retrieve data from the cache
-     *
-     * @abstract
-     *
-     * @param string     $name
-     * @param bool       $ignoreErrors
-     *
-     * @return mixed
-     */
-    public function get($name, $ignoreErrors = false);
+	/**
+	 * retrieve data from the cache
+	 *
+	 * @abstract
+	 *
+	 * @param string     $name
+	 * @param bool       $ignoreErrors
+	 *
+	 * @return mixed
+	 */
+	public function get($name, $ignoreErrors = false);
 
-    /**
-     * delete data from the cache
-     *
-     * @abstract
-     *
-     * @param string     $name
-     * @param bool       $ignoreErrors
-     *
-     * @return boolean true if successful
-     */
-    public function clear($name, $ignoreErrors = false);
+	/**
+	 * delete data from the cache
+	 *
+	 * @abstract
+	 *
+	 * @param string     $name
+	 * @param bool       $ignoreErrors
+	 *
+	 * @return boolean true if successful
+	 */
+	public function clear($name, $ignoreErrors = false);
 
-    /**
-     * check if the given name is cached
-     *
-     * @abstract
-     *
-     * @param string $name
-     *
-     * @return boolean true if cached
-     */
-    public function isCached($name);
+	/**
+	 * check if the given name is cached
+	 *
+	 * @abstract
+	 *
+	 * @param string $name
+	 *
+	 * @return boolean true if cached
+	 */
+	public function isCached($name);
 }
 

htdocs/includes/restler/framework/Luracast/Restler/views/debug.php

Indentation +97 added lines, -97 removed lines

@@ -15,41 +15,41 @@ 
 
 function exceptions()
 {
-    global $call_trace;
-    $r = Util::$restler;
-    $source = $r->_exceptions;
-    if (count($source)) {
-        $source = end($source);
-        $traces = array();
-        do {
-            $traces += $source->getTrace();
-        } while ($source = $source->getPrevious());
-        $traces += debug_backtrace();
-        $call_trace
-            = parse_backtrace($traces, 0);
-    } else {
-        $call_trace
-            = parse_backtrace(debug_backtrace());
-    }
+	global $call_trace;
+	$r = Util::$restler;
+	$source = $r->_exceptions;
+	if (count($source)) {
+		$source = end($source);
+		$traces = array();
+		do {
+			$traces += $source->getTrace();
+		} while ($source = $source->getPrevious());
+		$traces += debug_backtrace();
+		$call_trace
+			= parse_backtrace($traces, 0);
+	} else {
+		$call_trace
+			= parse_backtrace(debug_backtrace());
+	}
 
 }
 exceptions();
 
 function parse_backtrace($raw, $skip = 1)
 {
-    $output = "";
-    foreach ($raw as $entry) {
-        if ($skip-- > 0) {
-            continue;
-        }
-        //$output .= print_r($entry, true) . "\n";
-        $output .= "\nFile: " . $entry['file'] . " (Line: " . $entry['line'] . ")\n";
-        if (isset($entry['class']))
-            $output .= $entry['class'] . "::";
-        $output .= $entry['function']
-            . "( " . json_encode($entry['args']) . " )\n";
-    }
-    return $output;
+	$output = "";
+	foreach ($raw as $entry) {
+		if ($skip-- > 0) {
+			continue;
+		}
+		//$output .= print_r($entry, true) . "\n";
+		$output .= "\nFile: " . $entry['file'] . " (Line: " . $entry['line'] . ")\n";
+		if (isset($entry['class']))
+			$output .= $entry['class'] . "::";
+		$output .= $entry['function']
+			. "( " . json_encode($entry['args']) . " )\n";
+	}
+	return $output;
 }
 
 
@@ -57,64 +57,64 @@ 
 //print_r($response);
 $icon;
 if ($success && isset($api)) {
-    $arguments = implode(', ', $api->parameters);
-    $icon = "<icon class=\"success\"></icon>";
-    $title = "{$api->className}::"
-        . "{$api->methodName}({$arguments})";
+	$arguments = implode(', ', $api->parameters);
+	$icon = "<icon class=\"success\"></icon>";
+	$title = "{$api->className}::"
+		. "{$api->methodName}({$arguments})";
 } else {
-    if (isset($response['error']['message'])) {
-        $icon = '<icon class="denied"></icon>';
-        $title = end(explode(':',$response['error']['message'],2));
-    } else {
-        $icon = '<icon class="warning"></icon>';
-        $title = 'No Matching Resource';
-    }
+	if (isset($response['error']['message'])) {
+		$icon = '<icon class="denied"></icon>';
+		$title = end(explode(':',$response['error']['message'],2));
+	} else {
+		$icon = '<icon class="warning"></icon>';
+		$title = 'No Matching Resource';
+	}
 }
 function render($data, $shadow=true)
 {
-    $r = '';
-    if (empty($data))
-        return $r;
-    $r .= $shadow ? "<ul class=\"shadow\">\n": "<ul>\n";
-    if (is_array($data)) {
-        // field name
-        foreach ($data as $key => $value) {
-            $r .= '<li>';
-            $r .= is_numeric($key)
-                ? "<strong>[$key]</strong> "
-                : "<strong>$key: </strong>";
-            $r .= '<span>';
-            if (is_array($value)) {
-                // recursive
-                $r .= render($value,false);
-            } else {
-                // value, with hyperlinked hyperlinks
-                if (is_bool($value)) {
-                    $value = $value ? 'true' : 'false';
-                }
-                $value = htmlentities($value, ENT_COMPAT, 'UTF-8');
-                if (strpos($value, 'http://') === 0) {
-                    $r .= '<a href="' . $value . '">' . $value . '</a>';
-                } else {
-                    $r .= $value;
-                }
-            }
-            $r .= "</span></li>\n";
-        }
-    } elseif (is_bool($data)) {
-        $r .= '<li>' . ($data ? 'true' : 'false') . '</li>';
-    } else {
-        $r .= "<li><strong>$data</strong></li>";
-    }
-    $r .= "</ul>\n";
-    return $r;
+	$r = '';
+	if (empty($data))
+		return $r;
+	$r .= $shadow ? "<ul class=\"shadow\">\n": "<ul>\n";
+	if (is_array($data)) {
+		// field name
+		foreach ($data as $key => $value) {
+			$r .= '<li>';
+			$r .= is_numeric($key)
+				? "<strong>[$key]</strong> "
+				: "<strong>$key: </strong>";
+			$r .= '<span>';
+			if (is_array($value)) {
+				// recursive
+				$r .= render($value,false);
+			} else {
+				// value, with hyperlinked hyperlinks
+				if (is_bool($value)) {
+					$value = $value ? 'true' : 'false';
+				}
+				$value = htmlentities($value, ENT_COMPAT, 'UTF-8');
+				if (strpos($value, 'http://') === 0) {
+					$r .= '<a href="' . $value . '">' . $value . '</a>';
+				} else {
+					$r .= $value;
+				}
+			}
+			$r .= "</span></li>\n";
+		}
+	} elseif (is_bool($data)) {
+		$r .= '<li>' . ($data ? 'true' : 'false') . '</li>';
+	} else {
+		$r .= "<li><strong>$data</strong></li>";
+	}
+	$r .= "</ul>\n";
+	return $r;
 }
 $reqHeadersArr = array();
 $requestHeaders = $_SERVER['REQUEST_METHOD'] . ' ' . $_SERVER['REQUEST_URI'] . ' ' . $_SERVER['SERVER_PROTOCOL'] . PHP_EOL;
 foreach ($reqHeadersArr as $key => $value) {
-    if ($key == 'Host')
-        continue;
-    $requestHeaders .= "$key: $value" . PHP_EOL;
+	if ($key == 'Host')
+		continue;
+	$requestHeaders .= "$key: $value" . PHP_EOL;
 }
 // $requestHeaders = $this->encode(apache_request_headers(), FALSE,
 // FALSE);
@@ -134,24 +134,24 @@ 
 <body>
 <div id="breadcrumbs-one">
     <?php
-    if(Util::$restler->exception){
-        $stages =  Util::$restler->exception->getStages();
-        $curStage = Util::$restler->exception->getStage();
-        foreach($stages['success'] as $stage){
-            echo "<a href=\"#\">$stage</a>";
-        }
-        foreach($stages['failure'] as $stage){
-            echo '<a href="#" class="failure">'
-                . $stage
-                . ($stage==$curStage ? ' <span class="state"/> ' : '')
-                . '</a>';
-        }
-    } else {
-        foreach(Util::$restler->_events as $stage){
-            echo "<a href=\"#\">$stage</a>";
-        }
-    }
-    ?>
+	if(Util::$restler->exception){
+		$stages =  Util::$restler->exception->getStages();
+		$curStage = Util::$restler->exception->getStage();
+		foreach($stages['success'] as $stage){
+			echo "<a href=\"#\">$stage</a>";
+		}
+		foreach($stages['failure'] as $stage){
+			echo '<a href="#" class="failure">'
+				. $stage
+				. ($stage==$curStage ? ' <span class="state"/> ' : '')
+				. '</a>';
+		}
+	} else {
+		foreach(Util::$restler->_events as $stage){
+			echo "<a href=\"#\">$stage</a>";
+		}
+	}
+	?>
 </div>
 <header>
     <h1><?php echo $title ?></h1>

htdocs/includes/restler/framework/Luracast/Restler/Defaults.php

Indentation +340 added lines, -340 removed lines

@@ -19,348 +19,348 @@
  */
 class Defaults
 {
-    // ==================================================================
-    //
-    // Class Mappings
-    //
-    // ------------------------------------------------------------------
-
-    /**
-     * @var string of name of the class that implements
-     * \Luracast\Restler\iCache the cache class to be used
-     */
-    public static $cacheClass = 'Luracast\\Restler\\HumanReadableCache';
-
-    /**
-     * @var string full path of the directory where all the generated files will
-     * be kept. When set to null (default) it will use the cache folder that is
-     * in the same folder as index.php (gateway)
-     */
-    public static $cacheDirectory;
-
-    /**
-     * @var string of name of the class that implements
-     * \Luracast\Restler\Data\iValidate the validator class to be used
-     */
-    public static $validatorClass = 'Luracast\\Restler\\Data\\Validator';
-
-    /**
-     * @var string name of the class that implements \Luracast\Restler\iCompose
-     * the class to be used to compose the response
-     */
-    public static $composeClass = 'Luracast\\Restler\\Compose';
-
-    // ==================================================================
-    //
-    // Routing
-    //
-    // ------------------------------------------------------------------
-
-    /**
-     * @var bool should auto routing for public and protected api methods
-     * should be enabled by default or not. Set this to false to get
-     * Restler 1.0 style behavior
-     */
-    public static $autoRoutingEnabled = true;
-
-    /**
-     * @var boolean avoids creating multiple routes that can increase the
-     * ambiguity when set to true. when a method parameter is optional it is
-     * not mapped to the url and should only be used in request body or as
-     * query string `/resource?id=value`. When a parameter is required and is
-     * scalar, it will be mapped as part of the url `/resource/{id}`
-     */
-    public static $smartAutoRouting = true;
-
-    /**
-     * @var boolean enables more ways of finding the parameter data in the request.
-     * If you need backward compatibility with Restler 2 or below turn this off
-     */
-    public static $smartParameterParsing = true;
-
-    // ==================================================================
-    //
-    // API Version Management
-    //
-    // ------------------------------------------------------------------
-
-    /**
-     * @var null|string name that is used for vendor specific media type and
-     * api version using the Accept Header for example
-     * application/vnd.{vendor}-v1+json
-     *
-     * Keep this null if you do not want to use vendor MIME for specifying api version
-     */
-    public static $apiVendor = null;
-
-    /**
-     * @var bool set it to true to force vendor specific MIME for versioning.
-     * It will be automatically set to true when Defaults::$vendor is not
-     * null and client is requesting for the custom MIME type
-     */
-    public static $useVendorMIMEVersioning = false;
-
-    /**
-     * @var bool set it to true to use enableUrl based versioning
-     */
-    public static $useUrlBasedVersioning = false;
-
-
-    // ==================================================================
-    //
-    // Request
-    //
-    // ------------------------------------------------------------------
-
-    /**
-     * @var string name to be used for the method parameter to capture the
-     *             entire request data
-     */
-    public static $fullRequestDataName = 'request_data';
-
-    /**
-     * @var string name of the property that can sent through $_GET or $_POST to
-     *             override the http method of the request. Set it to null or
-     *             blank string to disable http method override through request
-     *             parameters.
-     */
-    public static $httpMethodOverrideProperty = 'http_method';
-
-    /**
-     * @var bool should auto validating api parameters should be enabled by
-     *           default or not. Set this to false to avoid validation.
-     */
-    public static $autoValidationEnabled = true;
-
-    /**
-     * @var string name of the class that implements iUser interface to identify
-     *             the user for caching purposes
-     */
-    public static $userIdentifierClass = 'Luracast\\Restler\\User';
-
-    // ==================================================================
-    //
-    // Response
-    //
-    // ------------------------------------------------------------------
-
-    /**
-     * @var bool HTTP status codes are set on all responses by default.
-     * Some clients (like flash, mobile) have trouble dealing with non-200
-     * status codes on error responses.
-     *
-     * You can set it to true to force a HTTP 200 status code on all responses,
-     * even when errors occur. If you suppress status codes, look for an error
-     * response to determine if an error occurred.
-     */
-    public static $suppressResponseCode = false;
-
-    public static $supportedCharsets = array('utf-8', 'iso-8859-1');
-    public static $supportedLanguages = array('en', 'en-US');
-
-    public static $charset = 'utf-8';
-    public static $language = 'en';
-
-    /**
-     * @var bool when set to true, it will exclude the response body
-     */
-    public static $emptyBodyForNullResponse = true;
-
-    /**
-     * @var bool when set to true, the response will not be outputted directly into the buffer.
-     * If set, Restler::handle() will return the response as a string.
-     */
-    public static $returnResponse = false;
-
-    /**
-     * @var bool enables CORS support
-     */
-    public static $crossOriginResourceSharing = false;
-    public static $accessControlAllowOrigin = '*';
-    public static $accessControlAllowMethods =
-        'GET, POST, PUT, PATCH, DELETE, OPTIONS, HEAD';
-
-    // ==================================================================
-    //
-    // Header
-    //
-    // ------------------------------------------------------------------
-
-    /**
-     * @var array default Cache-Control template that used to set the
-     * Cache-Control header and has two values, first one is used when
-     * Defaults::$headerExpires is 0 and second one when it has some time
-     * value specified. When only one value is specified it will be used for
-     * both cases
-     */
-    public static $headerCacheControl = array(
-        'no-cache, must-revalidate',
-
-        /* "public, " or "private, " will be prepended based on api method
+	// ==================================================================
+	//
+	// Class Mappings
+	//
+	// ------------------------------------------------------------------
+
+	/**
+	 * @var string of name of the class that implements
+	 * \Luracast\Restler\iCache the cache class to be used
+	 */
+	public static $cacheClass = 'Luracast\\Restler\\HumanReadableCache';
+
+	/**
+	 * @var string full path of the directory where all the generated files will
+	 * be kept. When set to null (default) it will use the cache folder that is
+	 * in the same folder as index.php (gateway)
+	 */
+	public static $cacheDirectory;
+
+	/**
+	 * @var string of name of the class that implements
+	 * \Luracast\Restler\Data\iValidate the validator class to be used
+	 */
+	public static $validatorClass = 'Luracast\\Restler\\Data\\Validator';
+
+	/**
+	 * @var string name of the class that implements \Luracast\Restler\iCompose
+	 * the class to be used to compose the response
+	 */
+	public static $composeClass = 'Luracast\\Restler\\Compose';
+
+	// ==================================================================
+	//
+	// Routing
+	//
+	// ------------------------------------------------------------------
+
+	/**
+	 * @var bool should auto routing for public and protected api methods
+	 * should be enabled by default or not. Set this to false to get
+	 * Restler 1.0 style behavior
+	 */
+	public static $autoRoutingEnabled = true;
+
+	/**
+	 * @var boolean avoids creating multiple routes that can increase the
+	 * ambiguity when set to true. when a method parameter is optional it is
+	 * not mapped to the url and should only be used in request body or as
+	 * query string `/resource?id=value`. When a parameter is required and is
+	 * scalar, it will be mapped as part of the url `/resource/{id}`
+	 */
+	public static $smartAutoRouting = true;
+
+	/**
+	 * @var boolean enables more ways of finding the parameter data in the request.
+	 * If you need backward compatibility with Restler 2 or below turn this off
+	 */
+	public static $smartParameterParsing = true;
+
+	// ==================================================================
+	//
+	// API Version Management
+	//
+	// ------------------------------------------------------------------
+
+	/**
+	 * @var null|string name that is used for vendor specific media type and
+	 * api version using the Accept Header for example
+	 * application/vnd.{vendor}-v1+json
+	 *
+	 * Keep this null if you do not want to use vendor MIME for specifying api version
+	 */
+	public static $apiVendor = null;
+
+	/**
+	 * @var bool set it to true to force vendor specific MIME for versioning.
+	 * It will be automatically set to true when Defaults::$vendor is not
+	 * null and client is requesting for the custom MIME type
+	 */
+	public static $useVendorMIMEVersioning = false;
+
+	/**
+	 * @var bool set it to true to use enableUrl based versioning
+	 */
+	public static $useUrlBasedVersioning = false;
+
+
+	// ==================================================================
+	//
+	// Request
+	//
+	// ------------------------------------------------------------------
+
+	/**
+	 * @var string name to be used for the method parameter to capture the
+	 *             entire request data
+	 */
+	public static $fullRequestDataName = 'request_data';
+
+	/**
+	 * @var string name of the property that can sent through $_GET or $_POST to
+	 *             override the http method of the request. Set it to null or
+	 *             blank string to disable http method override through request
+	 *             parameters.
+	 */
+	public static $httpMethodOverrideProperty = 'http_method';
+
+	/**
+	 * @var bool should auto validating api parameters should be enabled by
+	 *           default or not. Set this to false to avoid validation.
+	 */
+	public static $autoValidationEnabled = true;
+
+	/**
+	 * @var string name of the class that implements iUser interface to identify
+	 *             the user for caching purposes
+	 */
+	public static $userIdentifierClass = 'Luracast\\Restler\\User';
+
+	// ==================================================================
+	//
+	// Response
+	//
+	// ------------------------------------------------------------------
+
+	/**
+	 * @var bool HTTP status codes are set on all responses by default.
+	 * Some clients (like flash, mobile) have trouble dealing with non-200
+	 * status codes on error responses.
+	 *
+	 * You can set it to true to force a HTTP 200 status code on all responses,
+	 * even when errors occur. If you suppress status codes, look for an error
+	 * response to determine if an error occurred.
+	 */
+	public static $suppressResponseCode = false;
+
+	public static $supportedCharsets = array('utf-8', 'iso-8859-1');
+	public static $supportedLanguages = array('en', 'en-US');
+
+	public static $charset = 'utf-8';
+	public static $language = 'en';
+
+	/**
+	 * @var bool when set to true, it will exclude the response body
+	 */
+	public static $emptyBodyForNullResponse = true;
+
+	/**
+	 * @var bool when set to true, the response will not be outputted directly into the buffer.
+	 * If set, Restler::handle() will return the response as a string.
+	 */
+	public static $returnResponse = false;
+
+	/**
+	 * @var bool enables CORS support
+	 */
+	public static $crossOriginResourceSharing = false;
+	public static $accessControlAllowOrigin = '*';
+	public static $accessControlAllowMethods =
+		'GET, POST, PUT, PATCH, DELETE, OPTIONS, HEAD';
+
+	// ==================================================================
+	//
+	// Header
+	//
+	// ------------------------------------------------------------------
+
+	/**
+	 * @var array default Cache-Control template that used to set the
+	 * Cache-Control header and has two values, first one is used when
+	 * Defaults::$headerExpires is 0 and second one when it has some time
+	 * value specified. When only one value is specified it will be used for
+	 * both cases
+	 */
+	public static $headerCacheControl = array(
+		'no-cache, must-revalidate',
+
+		/* "public, " or "private, " will be prepended based on api method
          * called (public or protected)
          */
-        'max-age={expires}, must-revalidate',
-
-    );
-
-
-    /**
-     * @var int sets the content to expire immediately when set to zero
-     * alternatively you can specify the number of seconds the content will
-     * expire. This setting can be altered at api level using php doc comment
-     * with @expires numOfSeconds
-     */
-    public static $headerExpires = 0;
-
-    // ==================================================================
-    //
-    // Access Control
-    //
-    // ------------------------------------------------------------------
-
-    /**
-     * @var null|callable if the api methods are under access control mechanism
-     * you can attach a function here that returns true or false to determine
-     * visibility of a protected api method. this function will receive method
-     * info as the only parameter.
-     */
-    public static $accessControlFunction = null;
-
-    /**
-     * @var int set the default api access mode
-     *      value of 0 = public api
-     *      value of 1 = hybrid api using `@access hybrid` comment
-     *      value of 2 = protected api using `@access protected` comment
-     *      value of 3 = protected api using `protected function` method
-     */
-    public static $apiAccessLevel = 0;
-
-    /**
-     * @var string authentication method to be called in iAuthenticate
-     * Interface
-     */
-    public static $authenticationMethod = '__isAllowed';
-
-    /**
-     * @var int time in milliseconds for bandwidth throttling,
-     * which is the minimum response time for each api request. You can
-     * change it per api method by setting `@throttle 3000` in php doc
-     * comment either at the method level or class level
-     */
-    public static $throttle = 0;
-
-    // ==================================================================
-    //
-    // Overrides for API User
-    //
-    // ------------------------------------------------------------------
-
-    /**
-     * @var array use 'alternativeName'=> 'actualName' to set alternative
-     * names that can be used to represent the api method parameters and/or
-     * static properties of Defaults
-     */
-    public static $aliases = array(
-        /**
-         * suppress_response_codes=true as an URL parameter to force
-         * a HTTP 200 status code on all responses
-         */
-        'suppress_response_codes' => 'suppressResponseCode',
-    );
-
-    /**
-     * @var array determines the defaults that can be overridden by the api
-     * user by passing them as URL parameters
-     */
-    public static $overridables = array(
-        'suppressResponseCode',
-    );
-
-    /**
-     * @var array contains validation details for defaults to be used when
-     * set through URL parameters
-     */
-    public static $validation = array(
-        'suppressResponseCode' => array('type' => 'bool'),
-        'headerExpires' => array('type' => 'int', 'min' => 0),
-    );
-
-    // ==================================================================
-    //
-    // Overrides API Developer
-    //
-    // ------------------------------------------------------------------
-
-    /**
-     * @var array determines what are the phpdoc comment tags that will
-     * override the Defaults here with their values
-     */
-    public static $fromComments = array(
-
-        /**
-         * use PHPDoc comments such as the following
-         * `
-         *
-         * @cache no-cache, must-revalidate` to set the Cache-Control header
-         *        for a specific api method
-         */
-        'cache' => 'headerCacheControl',
-
-        /**
-         * use PHPDoc comments such as the following
-         * `
-         *
-         * @expires 50` to set the Expires header
-         *          for a specific api method
-         */
-        'expires' => 'headerExpires',
-
-        /**
-         * use PHPDoc comments such as the following
-         * `
-         *
-         * @throttle 300`
-         *           to set the bandwidth throttling for 300 milliseconds
-         *           for a specific api method
-         */
-        'throttle' => 'throttle',
-
-        /**
-         * enable or disable smart auto routing from method comments
-         * this one is hardwired so cant be turned off
-         * it is placed here just for documentation purpose
-         */
-        'smart-auto-routing' => 'smartAutoRouting',
-    );
-
-    // ==================================================================
-    //
-    // Util
-    //
-    // ------------------------------------------------------------------
-
-    /**
-     * Use this method to set value to a static properly of Defaults when
-     * you want to make sure only proper values are taken in with the help of
-     * validation
-     *
-     * @static
-     *
-     * @param string $name  name of the static property
-     * @param mixed  $value value to set the property to
-     *
-     * @return bool
-     */
-    public static function setProperty($name, $value)
-    {
-        if (!property_exists(__CLASS__, $name)) return false;
-        if (@is_array(Defaults::$validation[$name])) {
-            $info = new ValidationInfo(Defaults::$validation[$name]);
-            $value = Validator::validate($value, $info);
-        }
-        Defaults::$$name = $value;
-        return true;
-    }
+		'max-age={expires}, must-revalidate',
+
+	);
+
+
+	/**
+	 * @var int sets the content to expire immediately when set to zero
+	 * alternatively you can specify the number of seconds the content will
+	 * expire. This setting can be altered at api level using php doc comment
+	 * with @expires numOfSeconds
+	 */
+	public static $headerExpires = 0;
+
+	// ==================================================================
+	//
+	// Access Control
+	//
+	// ------------------------------------------------------------------
+
+	/**
+	 * @var null|callable if the api methods are under access control mechanism
+	 * you can attach a function here that returns true or false to determine
+	 * visibility of a protected api method. this function will receive method
+	 * info as the only parameter.
+	 */
+	public static $accessControlFunction = null;
+
+	/**
+	 * @var int set the default api access mode
+	 *      value of 0 = public api
+	 *      value of 1 = hybrid api using `@access hybrid` comment
+	 *      value of 2 = protected api using `@access protected` comment
+	 *      value of 3 = protected api using `protected function` method
+	 */
+	public static $apiAccessLevel = 0;
+
+	/**
+	 * @var string authentication method to be called in iAuthenticate
+	 * Interface
+	 */
+	public static $authenticationMethod = '__isAllowed';
+
+	/**
+	 * @var int time in milliseconds for bandwidth throttling,
+	 * which is the minimum response time for each api request. You can
+	 * change it per api method by setting `@throttle 3000` in php doc
+	 * comment either at the method level or class level
+	 */
+	public static $throttle = 0;
+
+	// ==================================================================
+	//
+	// Overrides for API User
+	//
+	// ------------------------------------------------------------------
+
+	/**
+	 * @var array use 'alternativeName'=> 'actualName' to set alternative
+	 * names that can be used to represent the api method parameters and/or
+	 * static properties of Defaults
+	 */
+	public static $aliases = array(
+		/**
+		 * suppress_response_codes=true as an URL parameter to force
+		 * a HTTP 200 status code on all responses
+		 */
+		'suppress_response_codes' => 'suppressResponseCode',
+	);
+
+	/**
+	 * @var array determines the defaults that can be overridden by the api
+	 * user by passing them as URL parameters
+	 */
+	public static $overridables = array(
+		'suppressResponseCode',
+	);
+
+	/**
+	 * @var array contains validation details for defaults to be used when
+	 * set through URL parameters
+	 */
+	public static $validation = array(
+		'suppressResponseCode' => array('type' => 'bool'),
+		'headerExpires' => array('type' => 'int', 'min' => 0),
+	);
+
+	// ==================================================================
+	//
+	// Overrides API Developer
+	//
+	// ------------------------------------------------------------------
+
+	/**
+	 * @var array determines what are the phpdoc comment tags that will
+	 * override the Defaults here with their values
+	 */
+	public static $fromComments = array(
+
+		/**
+		 * use PHPDoc comments such as the following
+		 * `
+		 *
+		 * @cache no-cache, must-revalidate` to set the Cache-Control header
+		 *        for a specific api method
+		 */
+		'cache' => 'headerCacheControl',
+
+		/**
+		 * use PHPDoc comments such as the following
+		 * `
+		 *
+		 * @expires 50` to set the Expires header
+		 *          for a specific api method
+		 */
+		'expires' => 'headerExpires',
+
+		/**
+		 * use PHPDoc comments such as the following
+		 * `
+		 *
+		 * @throttle 300`
+		 *           to set the bandwidth throttling for 300 milliseconds
+		 *           for a specific api method
+		 */
+		'throttle' => 'throttle',
+
+		/**
+		 * enable or disable smart auto routing from method comments
+		 * this one is hardwired so cant be turned off
+		 * it is placed here just for documentation purpose
+		 */
+		'smart-auto-routing' => 'smartAutoRouting',
+	);
+
+	// ==================================================================
+	//
+	// Util
+	//
+	// ------------------------------------------------------------------
+
+	/**
+	 * Use this method to set value to a static properly of Defaults when
+	 * you want to make sure only proper values are taken in with the help of
+	 * validation
+	 *
+	 * @static
+	 *
+	 * @param string $name  name of the static property
+	 * @param mixed  $value value to set the property to
+	 *
+	 * @return bool
+	 */
+	public static function setProperty($name, $value)
+	{
+		if (!property_exists(__CLASS__, $name)) return false;
+		if (@is_array(Defaults::$validation[$name])) {
+			$info = new ValidationInfo(Defaults::$validation[$name]);
+			$value = Validator::validate($value, $info);
+		}
+		Defaults::$$name = $value;
+		return true;
+	}
 
 }
 

htdocs/includes/restler/framework/Luracast/Restler/ApcCache.php

Indentation +85 added lines, -85 removed lines

@@ -17,98 +17,98 @@
  */
 class ApcCache implements iCache
 {
-    /**
-     * The namespace that all of the cached entries will be stored under.  This allows multiple APIs to run concurrently.
-     *
-     * @var string
-     */
-    static public $namespace = 'restler';
+	/**
+	 * The namespace that all of the cached entries will be stored under.  This allows multiple APIs to run concurrently.
+	 *
+	 * @var string
+	 */
+	static public $namespace = 'restler';
 
-    /**
-     * store data in the cache
-     *
-     *
-     * @param string $name
-     * @param mixed $data
-     *
-     * @return boolean true if successful
-     */
-    public function set($name, $data)
-    {
-        function_exists('apc_store') || $this->apcNotAvailable();
+	/**
+	 * store data in the cache
+	 *
+	 *
+	 * @param string $name
+	 * @param mixed $data
+	 *
+	 * @return boolean true if successful
+	 */
+	public function set($name, $data)
+	{
+		function_exists('apc_store') || $this->apcNotAvailable();
 
-        try {
-            return apc_store(self::$namespace . "-" . $name, $data);
-        } catch
-        (\Exception $exception) {
-            return false;
-        }
-    }
+		try {
+			return apc_store(self::$namespace . "-" . $name, $data);
+		} catch
+		(\Exception $exception) {
+			return false;
+		}
+	}
 
-    private function apcNotAvailable()
-    {
-        throw new \Exception('APC is not available for use as Restler Cache. Please make sure the module is installed. http://php.net/manual/en/apc.installation.php');
-    }
+	private function apcNotAvailable()
+	{
+		throw new \Exception('APC is not available for use as Restler Cache. Please make sure the module is installed. http://php.net/manual/en/apc.installation.php');
+	}
 
-    /**
-     * retrieve data from the cache
-     *
-     *
-     * @param string $name
-     * @param bool $ignoreErrors
-     *
-     * @throws \Exception
-     * @return mixed
-     */
-    public function get($name, $ignoreErrors = false)
-    {
-        function_exists('apc_fetch') || $this->apcNotAvailable();
+	/**
+	 * retrieve data from the cache
+	 *
+	 *
+	 * @param string $name
+	 * @param bool $ignoreErrors
+	 *
+	 * @throws \Exception
+	 * @return mixed
+	 */
+	public function get($name, $ignoreErrors = false)
+	{
+		function_exists('apc_fetch') || $this->apcNotAvailable();
 
-        try {
-            return apc_fetch(self::$namespace . "-" . $name);
-        } catch (\Exception $exception) {
-            if (!$ignoreErrors) {
-                throw $exception;
-            }
-            return null;
-        }
-    }
+		try {
+			return apc_fetch(self::$namespace . "-" . $name);
+		} catch (\Exception $exception) {
+			if (!$ignoreErrors) {
+				throw $exception;
+			}
+			return null;
+		}
+	}
 
-    /**
-     * delete data from the cache
-     *
-     *
-     * @param string $name
-     * @param bool $ignoreErrors
-     *
-     * @throws \Exception
-     * @return boolean true if successful
-     */
-    public function clear($name, $ignoreErrors = false)
-    {
-        function_exists('apc_delete') || $this->apcNotAvailable();
+	/**
+	 * delete data from the cache
+	 *
+	 *
+	 * @param string $name
+	 * @param bool $ignoreErrors
+	 *
+	 * @throws \Exception
+	 * @return boolean true if successful
+	 */
+	public function clear($name, $ignoreErrors = false)
+	{
+		function_exists('apc_delete') || $this->apcNotAvailable();
 
-        try {
-            apc_delete(self::$namespace . "-" . $name);
-        } catch (\Exception $exception) {
-            if (!$ignoreErrors) {
-                throw $exception;
-            }
-        }
-    }
+		try {
+			apc_delete(self::$namespace . "-" . $name);
+		} catch (\Exception $exception) {
+			if (!$ignoreErrors) {
+				throw $exception;
+			}
+		}
+	}
 
-    /**
-     * check if the given name is cached
-     *
-     *
-     * @param string $name
-     *
-     * @return boolean true if cached
-     */
-    public function isCached($name)
-    {
-        function_exists('apc_exists') || $this->apcNotAvailable();
-        return apc_exists(self::$namespace . "-" . $name);
-    }
+	/**
+	 * check if the given name is cached
+	 *
+	 *
+	 * @param string $name
+	 *
+	 * @return boolean true if cached
+	 */
+	public function isCached($name)
+	{
+		function_exists('apc_exists') || $this->apcNotAvailable();
+		return apc_exists(self::$namespace . "-" . $name);
+	}
 
 }
\ No newline at end of file

htdocs/includes/restler/framework/Luracast/Restler/Util.php

Indentation +224 added lines, -224 removed lines

@@ -15,238 +15,238 @@
  */
 class Util
 {
-    /**
-     * @var Restler instance injected at runtime
-     */
-    public static $restler;
+	/**
+	 * @var Restler instance injected at runtime
+	 */
+	public static $restler;
 
-    /**
-     * verify if the given data type string is scalar or not
-     *
-     * @static
-     *
-     * @param string $type data type as string
-     *
-     * @return bool true or false
-     */
-    public static function isObjectOrArray($type)
-    {
-        if (is_array($type)) {
-            foreach ($type as $t) {
-                if (static::isObjectOrArray($t)) {
-                    return true;
-                }
-            }
-            return false;
-        }
-        return !(boolean)strpos('|bool|boolean|int|float|string|', $type);
-    }
+	/**
+	 * verify if the given data type string is scalar or not
+	 *
+	 * @static
+	 *
+	 * @param string $type data type as string
+	 *
+	 * @return bool true or false
+	 */
+	public static function isObjectOrArray($type)
+	{
+		if (is_array($type)) {
+			foreach ($type as $t) {
+				if (static::isObjectOrArray($t)) {
+					return true;
+				}
+			}
+			return false;
+		}
+		return !(boolean)strpos('|bool|boolean|int|float|string|', $type);
+	}
 
-    /**
-     * Get the value deeply nested inside an array / object
-     *
-     * Using isset() to test the presence of nested value can give a false positive
-     *
-     * This method serves that need
-     *
-     * When the deeply nested property is found its value is returned, otherwise
-     * false is returned.
-     *
-     * @param array|object $from    array to extract the value from
-     * @param string|array $key     ... pass more to go deeply inside the array
-     *                              alternatively you can pass a single array
-     *
-     * @return null|mixed null when not found, value otherwise
-     */
-    public static function nestedValue($from, $key/**, $key2 ... $key`n` */)
-    {
-        if (is_array($key)) {
-            $keys = $key;
-        } else {
-            $keys = func_get_args();
-            array_shift($keys);
-        }
-        foreach ($keys as $key) {
-            if (is_array($from) && isset($from[$key])) {
-                $from = $from[$key];
-                continue;
-            } elseif (is_object($from) && isset($from->{$key})) {
-                $from = $from->{$key};
-                continue;
-            }
-            return null;
-        }
-        return $from;
-    }
+	/**
+	 * Get the value deeply nested inside an array / object
+	 *
+	 * Using isset() to test the presence of nested value can give a false positive
+	 *
+	 * This method serves that need
+	 *
+	 * When the deeply nested property is found its value is returned, otherwise
+	 * false is returned.
+	 *
+	 * @param array|object $from    array to extract the value from
+	 * @param string|array $key     ... pass more to go deeply inside the array
+	 *                              alternatively you can pass a single array
+	 *
+	 * @return null|mixed null when not found, value otherwise
+	 */
+	public static function nestedValue($from, $key/**, $key2 ... $key`n` */)
+	{
+		if (is_array($key)) {
+			$keys = $key;
+		} else {
+			$keys = func_get_args();
+			array_shift($keys);
+		}
+		foreach ($keys as $key) {
+			if (is_array($from) && isset($from[$key])) {
+				$from = $from[$key];
+				continue;
+			} elseif (is_object($from) && isset($from->{$key})) {
+				$from = $from->{$key};
+				continue;
+			}
+			return null;
+		}
+		return $from;
+	}
 
-    public static function getResourcePath(
-        $className,
-        $resourcePath = null,
-        $prefix = ''
-    ) {
-        if (is_null($resourcePath)) {
-            if (Defaults::$autoRoutingEnabled) {
-                $resourcePath = strtolower($className);
-                if (false !== ($index = strrpos($className, '\\'))) {
-                    $resourcePath = substr($resourcePath, $index + 1);
-                }
-                if (false !== ($index = strrpos($resourcePath, '_'))) {
-                    $resourcePath = substr($resourcePath, $index + 1);
-                }
-            } else {
-                $resourcePath = '';
-            }
-        } else {
-            $resourcePath = trim($resourcePath, '/');
-        }
-        if (strlen($resourcePath) > 0) {
-            $resourcePath .= '/';
-        }
-        return $prefix . $resourcePath;
-    }
+	public static function getResourcePath(
+		$className,
+		$resourcePath = null,
+		$prefix = ''
+	) {
+		if (is_null($resourcePath)) {
+			if (Defaults::$autoRoutingEnabled) {
+				$resourcePath = strtolower($className);
+				if (false !== ($index = strrpos($className, '\\'))) {
+					$resourcePath = substr($resourcePath, $index + 1);
+				}
+				if (false !== ($index = strrpos($resourcePath, '_'))) {
+					$resourcePath = substr($resourcePath, $index + 1);
+				}
+			} else {
+				$resourcePath = '';
+			}
+		} else {
+			$resourcePath = trim($resourcePath, '/');
+		}
+		if (strlen($resourcePath) > 0) {
+			$resourcePath .= '/';
+		}
+		return $prefix . $resourcePath;
+	}
 
-    /**
-     * Compare two strings and remove the common
-     * sub string from the first string and return it
-     *
-     * @static
-     *
-     * @param string $fromPath
-     * @param string $usingPath
-     * @param string $char
-     *            optional, set it as
-     *            blank string for char by char comparison
-     *
-     * @return string
-     */
-    public static function removeCommonPath($fromPath, $usingPath, $char = '/')
-    {
-        if (empty($fromPath)) {
-            return '';
-        }
-        $fromPath = explode($char, $fromPath);
-        $usingPath = explode($char, $usingPath);
-        while (count($usingPath)) {
-            if (count($fromPath) && $fromPath[0] == $usingPath[0]) {
-                array_shift($fromPath);
-            } else {
-                break;
-            }
-            array_shift($usingPath);
-        }
-        return implode($char, $fromPath);
-    }
+	/**
+	 * Compare two strings and remove the common
+	 * sub string from the first string and return it
+	 *
+	 * @static
+	 *
+	 * @param string $fromPath
+	 * @param string $usingPath
+	 * @param string $char
+	 *            optional, set it as
+	 *            blank string for char by char comparison
+	 *
+	 * @return string
+	 */
+	public static function removeCommonPath($fromPath, $usingPath, $char = '/')
+	{
+		if (empty($fromPath)) {
+			return '';
+		}
+		$fromPath = explode($char, $fromPath);
+		$usingPath = explode($char, $usingPath);
+		while (count($usingPath)) {
+			if (count($fromPath) && $fromPath[0] == $usingPath[0]) {
+				array_shift($fromPath);
+			} else {
+				break;
+			}
+			array_shift($usingPath);
+		}
+		return implode($char, $fromPath);
+	}
 
-    /**
-     * Compare two strings and split the common
-     * sub string from the first string and return it as array
-     *
-     * @static
-     *
-     * @param string $fromPath
-     * @param string $usingPath
-     * @param string $char
-     *            optional, set it as
-     *            blank string for char by char comparison
-     *
-     * @return array with 2 strings first is the common string and second is the remaining in $fromPath
-     */
-    public static function splitCommonPath($fromPath, $usingPath, $char = '/')
-    {
-        if (empty($fromPath)) {
-            return array('', '');
-        }
-        $fromPath = explode($char, $fromPath);
-        $usingPath = explode($char, $usingPath);
-        $commonPath = array();
-        while (count($usingPath)) {
-            if (count($fromPath) && $fromPath[0] == $usingPath[0]) {
-                $commonPath [] = array_shift($fromPath);
-            } else {
-                break;
-            }
-            array_shift($usingPath);
-        }
-        return array(implode($char, $commonPath), implode($char, $fromPath));
-    }
+	/**
+	 * Compare two strings and split the common
+	 * sub string from the first string and return it as array
+	 *
+	 * @static
+	 *
+	 * @param string $fromPath
+	 * @param string $usingPath
+	 * @param string $char
+	 *            optional, set it as
+	 *            blank string for char by char comparison
+	 *
+	 * @return array with 2 strings first is the common string and second is the remaining in $fromPath
+	 */
+	public static function splitCommonPath($fromPath, $usingPath, $char = '/')
+	{
+		if (empty($fromPath)) {
+			return array('', '');
+		}
+		$fromPath = explode($char, $fromPath);
+		$usingPath = explode($char, $usingPath);
+		$commonPath = array();
+		while (count($usingPath)) {
+			if (count($fromPath) && $fromPath[0] == $usingPath[0]) {
+				$commonPath [] = array_shift($fromPath);
+			} else {
+				break;
+			}
+			array_shift($usingPath);
+		}
+		return array(implode($char, $commonPath), implode($char, $fromPath));
+	}
 
-    /**
-     * Parses the request to figure out the http request type
-     *
-     * @static
-     *
-     * @return string which will be one of the following
-     *        [GET, POST, PUT, PATCH, DELETE]
-     * @example GET
-     */
-    public static function getRequestMethod()
-    {
-        $method = $_SERVER['REQUEST_METHOD'];
-        if (isset($_SERVER['HTTP_X_HTTP_METHOD_OVERRIDE'])) {
-            $method = $_SERVER['HTTP_X_HTTP_METHOD_OVERRIDE'];
-        } elseif (
-            !empty(Defaults::$httpMethodOverrideProperty)
-            && isset($_REQUEST[Defaults::$httpMethodOverrideProperty])
-        ) {
-            // support for exceptional clients who can't set the header
-            $m = strtoupper($_REQUEST[Defaults::$httpMethodOverrideProperty]);
-            if ($m == 'PUT' || $m == 'DELETE' ||
-                $m == 'POST' || $m == 'PATCH'
-            ) {
-                $method = $m;
-            }
-        }
-        // support for HEAD request
-        if ($method == 'HEAD') {
-            $method = 'GET';
-        }
-        return $method;
-    }
+	/**
+	 * Parses the request to figure out the http request type
+	 *
+	 * @static
+	 *
+	 * @return string which will be one of the following
+	 *        [GET, POST, PUT, PATCH, DELETE]
+	 * @example GET
+	 */
+	public static function getRequestMethod()
+	{
+		$method = $_SERVER['REQUEST_METHOD'];
+		if (isset($_SERVER['HTTP_X_HTTP_METHOD_OVERRIDE'])) {
+			$method = $_SERVER['HTTP_X_HTTP_METHOD_OVERRIDE'];
+		} elseif (
+			!empty(Defaults::$httpMethodOverrideProperty)
+			&& isset($_REQUEST[Defaults::$httpMethodOverrideProperty])
+		) {
+			// support for exceptional clients who can't set the header
+			$m = strtoupper($_REQUEST[Defaults::$httpMethodOverrideProperty]);
+			if ($m == 'PUT' || $m == 'DELETE' ||
+				$m == 'POST' || $m == 'PATCH'
+			) {
+				$method = $m;
+			}
+		}
+		// support for HEAD request
+		if ($method == 'HEAD') {
+			$method = 'GET';
+		}
+		return $method;
+	}
 
-    /**
-     * Pass any content negotiation header such as Accept,
-     * Accept-Language to break it up and sort the resulting array by
-     * the order of negotiation.
-     *
-     * @static
-     *
-     * @param string $accept header value
-     *
-     * @return array sorted by the priority
-     */
-    public static function sortByPriority($accept)
-    {
-        $acceptList = array();
-        $accepts = explode(',', strtolower($accept));
-        if (!is_array($accepts)) {
-            $accepts = array($accepts);
-        }
-        foreach ($accepts as $pos => $accept) {
-            $parts = explode(';', $accept);
-            $type = trim(array_shift($parts));
-            $parameters = [];
-            foreach ($parts as $part) {
-                $part = explode('=', $part);
-                if (2 !== count($part)) {
-                    continue;
-                }
-                $key = strtolower(trim($part[0]));
-                $parameters[$key] = trim($part[1], ' "');
-            }
-            $quality = isset($parameters['q']) ? (float)$parameters['q'] : (1000 - $pos) / 1000;
-            $acceptList[$type] = $quality;
-        }
-        arsort($acceptList);
-        return $acceptList;
-    }
+	/**
+	 * Pass any content negotiation header such as Accept,
+	 * Accept-Language to break it up and sort the resulting array by
+	 * the order of negotiation.
+	 *
+	 * @static
+	 *
+	 * @param string $accept header value
+	 *
+	 * @return array sorted by the priority
+	 */
+	public static function sortByPriority($accept)
+	{
+		$acceptList = array();
+		$accepts = explode(',', strtolower($accept));
+		if (!is_array($accepts)) {
+			$accepts = array($accepts);
+		}
+		foreach ($accepts as $pos => $accept) {
+			$parts = explode(';', $accept);
+			$type = trim(array_shift($parts));
+			$parameters = [];
+			foreach ($parts as $part) {
+				$part = explode('=', $part);
+				if (2 !== count($part)) {
+					continue;
+				}
+				$key = strtolower(trim($part[0]));
+				$parameters[$key] = trim($part[1], ' "');
+			}
+			$quality = isset($parameters['q']) ? (float)$parameters['q'] : (1000 - $pos) / 1000;
+			$acceptList[$type] = $quality;
+		}
+		arsort($acceptList);
+		return $acceptList;
+	}
 
-    public static function getShortName($className)
-    {
-    	// @CHANGE LDR
-    	if (!is_string($className)) return;
+	public static function getShortName($className)
+	{
+		// @CHANGE LDR
+		if (!is_string($className)) return;
     	
-    	$className = explode('\\', $className);
-        return end($className);
-    }
+		$className = explode('\\', $className);
+		return end($className);
+	}
 }
 

htdocs/includes/restler/framework/Luracast/Restler/UI/Tags.php

Indentation +225 added lines, -225 removed lines

@@ -34,249 +34,249 @@
  */
 class Tags implements ArrayAccess, Countable
 {
-    public static $humanReadable = true;
-    public static $initializer = null;
-    protected static $instances = array();
-    public $prefix = '';
-    public $indent = '    ';
-    public $tag;
-    protected $attributes = array();
-    protected $children = array();
-    protected $_parent;
+	public static $humanReadable = true;
+	public static $initializer = null;
+	protected static $instances = array();
+	public $prefix = '';
+	public $indent = '    ';
+	public $tag;
+	protected $attributes = array();
+	protected $children = array();
+	protected $_parent;
 
-    public function __construct($name = null, array $children = array())
-    {
-        $this->tag = $name;
-        $c = array();
-        foreach ($children as $child) {
-            is_array($child)
-                ? $c = array_merge($c, $child)
-                : $c [] = $child;
-        }
-        $this->markAsChildren($c);
-        $this->children = $c;
-        if (static::$initializer)
-            call_user_func_array(static::$initializer, array(& $this));
-    }
+	public function __construct($name = null, array $children = array())
+	{
+		$this->tag = $name;
+		$c = array();
+		foreach ($children as $child) {
+			is_array($child)
+				? $c = array_merge($c, $child)
+				: $c [] = $child;
+		}
+		$this->markAsChildren($c);
+		$this->children = $c;
+		if (static::$initializer)
+			call_user_func_array(static::$initializer, array(& $this));
+	}
 
-    /**
-     * Get Tag by id
-     *
-     * Retrieve a tag by its id attribute
-     *
-     * @param string $id
-     *
-     * @return Tags|null
-     */
-    public static function byId($id)
-    {
-        return Util::nestedValue(static::$instances, $id);
-    }
+	/**
+	 * Get Tag by id
+	 *
+	 * Retrieve a tag by its id attribute
+	 *
+	 * @param string $id
+	 *
+	 * @return Tags|null
+	 */
+	public static function byId($id)
+	{
+		return Util::nestedValue(static::$instances, $id);
+	}
 
-    /**
-     * @param       $name
-     * @param array $children
-     *
-     * @return Tags
-     */
-    public static function __callStatic($name, array $children)
-    {
-        return new static($name, $children);
-    }
+	/**
+	 * @param       $name
+	 * @param array $children
+	 *
+	 * @return Tags
+	 */
+	public static function __callStatic($name, array $children)
+	{
+		return new static($name, $children);
+	}
 
-    public function toString($prefix = '', $indent = '    ')
-    {
-        $this->prefix = $prefix;
-        $this->indent = $indent;
-        return $this->__toString();
-    }
+	public function toString($prefix = '', $indent = '    ')
+	{
+		$this->prefix = $prefix;
+		$this->indent = $indent;
+		return $this->__toString();
+	}
 
-    public function __toString()
-    {
-        $children = '';
-        if (static::$humanReadable) {
-            $lineBreak = false;
-            foreach ($this->children as $key => $child) {
-                $prefix = $this->prefix;
-                if (!is_null($this->tag))
-                    $prefix .= $this->indent;
-                if ($child instanceof $this) {
-                    $child->prefix = $prefix;
-                    $child->indent = $this->indent;
-                    $children .= PHP_EOL . $child;
-                    $lineBreak = true;
-                } else {
-                    $children .= $child;
-                }
-            }
-            if ($lineBreak)
-                $children .= PHP_EOL . $this->prefix;
-        } else {
-            $children = implode('', $this->children);
-        }
-        if (is_null($this->tag))
-            return $children;
-        $attributes = '';
-        foreach ($this->attributes as $attribute => &$value)
-            $attributes .= " $attribute=\"$value\"";
+	public function __toString()
+	{
+		$children = '';
+		if (static::$humanReadable) {
+			$lineBreak = false;
+			foreach ($this->children as $key => $child) {
+				$prefix = $this->prefix;
+				if (!is_null($this->tag))
+					$prefix .= $this->indent;
+				if ($child instanceof $this) {
+					$child->prefix = $prefix;
+					$child->indent = $this->indent;
+					$children .= PHP_EOL . $child;
+					$lineBreak = true;
+				} else {
+					$children .= $child;
+				}
+			}
+			if ($lineBreak)
+				$children .= PHP_EOL . $this->prefix;
+		} else {
+			$children = implode('', $this->children);
+		}
+		if (is_null($this->tag))
+			return $children;
+		$attributes = '';
+		foreach ($this->attributes as $attribute => &$value)
+			$attributes .= " $attribute=\"$value\"";
 
-        if (count($this->children))
-            return static::$humanReadable
-                ? "$this->prefix<{$this->tag}{$attributes}>"
-                . "$children"
-                . "</{$this->tag}>"
-                : "<{$this->tag}{$attributes}>$children</{$this->tag}>";
+		if (count($this->children))
+			return static::$humanReadable
+				? "$this->prefix<{$this->tag}{$attributes}>"
+				. "$children"
+				. "</{$this->tag}>"
+				: "<{$this->tag}{$attributes}>$children</{$this->tag}>";
 
-        return "$this->prefix<{$this->tag}{$attributes}/>";
-    }
+		return "$this->prefix<{$this->tag}{$attributes}/>";
+	}
 
-    public function toArray()
-    {
-        $r = array();
-        $r['attributes'] = $this->attributes;
-        $r['tag'] = $this->tag;
-        $children = array();
-        foreach ($this->children as $key => $child) {
-            $children[$key] = $child instanceof $this
-                ? $child->toArray()
-                : $child;
-        }
-        $r['children'] = $children;
-        return $r;
-    }
+	public function toArray()
+	{
+		$r = array();
+		$r['attributes'] = $this->attributes;
+		$r['tag'] = $this->tag;
+		$children = array();
+		foreach ($this->children as $key => $child) {
+			$children[$key] = $child instanceof $this
+				? $child->toArray()
+				: $child;
+		}
+		$r['children'] = $children;
+		return $r;
+	}
 
-    /**
-     * Set the id attribute of the current tag
-     *
-     * @param string $value
-     *
-     * @return string
-     */
-    public function id($value)
-    {
-        if (!empty($value) && is_string($value)) {
-            $this->attributes['id'] = $value;
-            static::$instances[$value] = $this;
-        }
-        return $this;
-    }
+	/**
+	 * Set the id attribute of the current tag
+	 *
+	 * @param string $value
+	 *
+	 * @return string
+	 */
+	public function id($value)
+	{
+		if (!empty($value) && is_string($value)) {
+			$this->attributes['id'] = $value;
+			static::$instances[$value] = $this;
+		}
+		return $this;
+	}
 
-    public function __get($name)
-    {
-        if ('parent' == $name)
-            return $this->_parent;
-        if (isset($this->attributes[$name]))
-            return $this->attributes[$name];
-        return;
-    }
+	public function __get($name)
+	{
+		if ('parent' == $name)
+			return $this->_parent;
+		if (isset($this->attributes[$name]))
+			return $this->attributes[$name];
+		return;
+	}
 
-    public function __set($name, $value)
-    {
-        if ('parent' == $name) {
-            if ($this->_parent) {
-                unset($this->_parent[array_search($this, $this->_parent->children)]);
-            }
-            if (!empty($value)) {
-                $value[] = $this;
-            }
-        }
-    }
+	public function __set($name, $value)
+	{
+		if ('parent' == $name) {
+			if ($this->_parent) {
+				unset($this->_parent[array_search($this, $this->_parent->children)]);
+			}
+			if (!empty($value)) {
+				$value[] = $this;
+			}
+		}
+	}
 
-    public function __isset($name)
-    {
-        return isset($this->attributes[$name]);
-    }
+	public function __isset($name)
+	{
+		return isset($this->attributes[$name]);
+	}
 
-    /**
-     * @param $attribute
-     * @param $value
-     *
-     * @return Tags
-     */
-    public function __call($attribute, $value)
-    {
-        if (is_null($value)) {
-            return isset($this->attributes[$attribute])
-                ? $this->attributes[$attribute]
-                : null;
-        }
-        $value = $value[0];
-        if (is_null($value)) {
-            unset($this->attributes[$attribute]);
-            return $this;
-        }
-        $this->attributes[$attribute] = is_bool($value)
-            ? ($value ? 'true' : 'false')
-            : @(string)$value;
-        return $this;
-    }
+	/**
+	 * @param $attribute
+	 * @param $value
+	 *
+	 * @return Tags
+	 */
+	public function __call($attribute, $value)
+	{
+		if (is_null($value)) {
+			return isset($this->attributes[$attribute])
+				? $this->attributes[$attribute]
+				: null;
+		}
+		$value = $value[0];
+		if (is_null($value)) {
+			unset($this->attributes[$attribute]);
+			return $this;
+		}
+		$this->attributes[$attribute] = is_bool($value)
+			? ($value ? 'true' : 'false')
+			: @(string)$value;
+		return $this;
+	}
 
-    public function offsetGet($index)
-    {
-        if ($this->offsetExists($index)) {
-            return $this->children[$index];
-        }
-        return false;
-    }
+	public function offsetGet($index)
+	{
+		if ($this->offsetExists($index)) {
+			return $this->children[$index];
+		}
+		return false;
+	}
 
-    public function offsetExists($index)
-    {
-        return isset($this->children[$index]);
-    }
+	public function offsetExists($index)
+	{
+		return isset($this->children[$index]);
+	}
 
-    public function offsetSet($index, $value)
-    {
-        if ($index) {
-            $this->children[$index] = $value;
-        } elseif (is_array($value)) {
-            $c = array();
-            foreach ($value as $child) {
-                is_array($child)
-                    ? $c = array_merge($c, $child)
-                    : $c [] = $child;
-            }
-            $this->markAsChildren($c);
-            $this->children += $c;
-        } else {
-            $c = array($value);
-            $this->markAsChildren($c);
-            $this->children[] = $value;
-        }
-        return true;
-    }
+	public function offsetSet($index, $value)
+	{
+		if ($index) {
+			$this->children[$index] = $value;
+		} elseif (is_array($value)) {
+			$c = array();
+			foreach ($value as $child) {
+				is_array($child)
+					? $c = array_merge($c, $child)
+					: $c [] = $child;
+			}
+			$this->markAsChildren($c);
+			$this->children += $c;
+		} else {
+			$c = array($value);
+			$this->markAsChildren($c);
+			$this->children[] = $value;
+		}
+		return true;
+	}
 
-    public function offsetUnset($index)
-    {
-        $this->children[$index]->_parent = null;
-        unset($this->children[$index]);
-        return true;
-    }
+	public function offsetUnset($index)
+	{
+		$this->children[$index]->_parent = null;
+		unset($this->children[$index]);
+		return true;
+	}
 
-    public function getContents()
-    {
-        return $this->children;
-    }
+	public function getContents()
+	{
+		return $this->children;
+	}
 
-    public function count()
-    {
-        return count($this->children);
-    }
+	public function count()
+	{
+		return count($this->children);
+	}
 
-    private function markAsChildren(& $children)
-    {
-        foreach ($children as $i => $child) {
-            if (is_string($child))
-                continue;
-            if (!is_object($child)) {
-                unset($children[$i]);
-                continue;
-            }
-            //echo $child;
-            if (isset($child->_parent) && $child->_parent != $this) {
-                //remove from current parent
-                unset($child->_parent[array_search($child, $child->_parent->children)]);
-            }
-            $child->_parent = $this;
-        }
-    }
+	private function markAsChildren(& $children)
+	{
+		foreach ($children as $i => $child) {
+			if (is_string($child))
+				continue;
+			if (!is_object($child)) {
+				unset($children[$i]);
+				continue;
+			}
+			//echo $child;
+			if (isset($child->_parent) && $child->_parent != $this) {
+				//remove from current parent
+				unset($child->_parent[array_search($child, $child->_parent->children)]);
+			}
+			$child->_parent = $this;
+		}
+	}
 }
\ No newline at end of file

htdocs/includes/restler/framework/Luracast/Restler/UI/FormStyles.php

Indentation +42 added lines, -42 removed lines

@@ -14,46 +14,46 @@
  */
 class FormStyles
 {
-    public static $html = array(
-        'form' => 'form[role=form id=$id# name=$name# method=$method# action=$action# enctype=$enctype#]',
-        'input' => '.row>section>label{$label#}^input[id=$id# name=$name# value=$value# type=$type# required=$required# autofocus=$autofocus# placeholder=$default# accept=$accept# disabled=$disabled#]',
-        'textarea' => '.row>label{$label#}^textarea[id=$id# name=$name# required=$required# autofocus=$autofocus# placeholder=$default# rows=3 disabled=$disabled#]{$value#}',
-        'radio' => '.row>section>label{$label#}^span>label*options>input[id=$id# name=$name# value=$value# type=radio checked=$selected# required=$required# disabled=$disabled#]+{ $text#}',
-        'select' => '.row>label{$label#}^select[id=$id# name=$name# required=$required#]>option[value]+option[value=$value# selected=$selected# disabled=$disabled#]{$text#}*options',
-        'submit' => '.row>label{   }^button[id=$id# type=submit disabled=$disabled#]{$label#}',
-        'fieldset' => 'fieldset>legend{$label#}',
-        'checkbox' => '.row>label>input[id=$id# name=$name# value=$value# type=checkbox checked=$selected# required=$required# autofocus=$autofocus# accept=$accept# disabled=$disabled#]+{$label#}',
-        //------------- TYPE BASED STYLES ---------------------//
-        'checkbox-array' => 'fieldset>legend{$label#}+section*options>label>input[name=$name# value=$value# type=checkbox checked=$selected# required=$required# autofocus=$autofocus# accept=$accept#]+{ $text#}',
-        'select-array' => 'label{$label#}+select[name=$name# required=$required# multiple style="height: auto;background-image: none; outline: inherit;"]>option[value=$value# selected=$selected#]{$text#}*options',
-    );
-    public static $bootstrap3 = array(
-        'form' => 'form[role=form id=$id# name=$name# method=$method# action=$action# enctype=$enctype#]',
-        'input' => '.form-group.$error#>label{$label#}+input.form-control[id=$id# name=$name# value=$value# type=$type# required=$required# autofocus=$autofocus# placeholder=$default# accept=$accept# disabled=$disabled#]+small.help-block>{$message#}',
-        'textarea' => '.form-group>label{$label#}+textarea.form-control[id=$id# name=$name# required=$required# autofocus=$autofocus# placeholder=$default# rows=3 disabled=$disabled#]{$value#}+small.help-block>{$message#}',
-        'radio' => 'fieldset>legend{$label#}>.radio*options>label>input.radio[name=$name# value=$value# type=radio checked=$selected# required=$required# disabled=$disabled#]{$text#}+p.help-block>{$message#}',
-        'select' => '.form-group>label{$label#}+select.form-control[id=$id# name=$name# multiple=$multiple# required=$required#]>option[value]+option[value=$value# selected=$selected# disabled=$disabled#]{$text#}*options',
-        'submit' => 'button.btn.btn-primary[id=$id# type=submit]{$label#} disabled=$disabled#',
-        'fieldset' => 'fieldset>legend{$label#}',
-        'checkbox' => '.checkbox>label>input[id=$id# name=$name# value=$value# type=checkbox checked=$selected# required=$required# autofocus=$autofocus# disabled=$disabled#]+{$label#}^p.help-block>{$error#}',
-        //------------- TYPE BASED STYLES ---------------------//
-        'checkbox-array' => 'fieldset>legend{$label#}>.checkbox*options>label>input[name=$name# value=$value# type=checkbox checked=$selected# required=$required#]{$text#}',
-        'select-array' => '.form-group>label{$label#}+select.form-control[name=$name# multiple=$multiple# required=$required#] size=$options#>option[value=$value# selected=$selected#]{$text#}*options',
-        //------------- CUSTOM STYLES ---------------------//
-        'radio-inline' => '.form-group>label{$label# :  }+label.radio-inline*options>input.radio[name=$name# value=$value# type=radio checked=$selected# required=$required#]+{$text#}',
-    );
-    public static $foundation5 = array(
-        'form' => 'form[id=$id# name=$name# method=$method# action=$action# enctype=$enctype#]',
-        'input' => 'label{$label#}+input[id=$id# name=$name# value=$value# type=$type# required=$required# autofocus=$autofocus# placeholder=$default# accept=$accept# disabled=$disabled#]',
-        'textarea' => 'label{$label#}+textarea[id=$id# name=$name# required=$required# autofocus=$autofocus# placeholder=$default# rows=3 disabled=$disabled#]{$value#}',
-        'radio' => 'label{$label# :  }+label.radio-inline*options>input.radio[name=$name# value=$value# type=radio checked=$selected# required=$required# disabled=$disabled#]+{$text#}',
-        'select' => 'label{$label#}+select[id=$id# name=$name# required=$required#]>option[value]+option[value=$value# selected=$selected# disabled=$disabled#]{$text#}*options',
-        'submit' => 'button.button[id=$id# type=submit disabled=$disabled#]{$label#}',
-        'fieldset' => 'fieldset>legend{$label#}',
-        'checkbox' => 'label>input[id=$id# name=$name# value=$value# type=checkbox checked=$selected# required=$required# autofocus=$autofocus# disabled=$disabled#]+{ $label#}',
-        //------------- TYPE BASED STYLES ---------------------//
-        'checkbox-array' => 'fieldset>legend{$label#}+label*options>input[name=$name# value=$value# type=checkbox checked=$selected# required=$required# autofocus=$autofocus#]+{ $text#}',
-        'select-array' => 'label{$label#}+select[name=$name# required=$required# multiple style="height: auto;background-image: none; outline: inherit;"]>option[value=$value# selected=$selected#]{$text#}*options',
-        //------------- CUSTOM STYLES ---------------------//
-    );
+	public static $html = array(
+		'form' => 'form[role=form id=$id# name=$name# method=$method# action=$action# enctype=$enctype#]',
+		'input' => '.row>section>label{$label#}^input[id=$id# name=$name# value=$value# type=$type# required=$required# autofocus=$autofocus# placeholder=$default# accept=$accept# disabled=$disabled#]',
+		'textarea' => '.row>label{$label#}^textarea[id=$id# name=$name# required=$required# autofocus=$autofocus# placeholder=$default# rows=3 disabled=$disabled#]{$value#}',
+		'radio' => '.row>section>label{$label#}^span>label*options>input[id=$id# name=$name# value=$value# type=radio checked=$selected# required=$required# disabled=$disabled#]+{ $text#}',
+		'select' => '.row>label{$label#}^select[id=$id# name=$name# required=$required#]>option[value]+option[value=$value# selected=$selected# disabled=$disabled#]{$text#}*options',
+		'submit' => '.row>label{   }^button[id=$id# type=submit disabled=$disabled#]{$label#}',
+		'fieldset' => 'fieldset>legend{$label#}',
+		'checkbox' => '.row>label>input[id=$id# name=$name# value=$value# type=checkbox checked=$selected# required=$required# autofocus=$autofocus# accept=$accept# disabled=$disabled#]+{$label#}',
+		//------------- TYPE BASED STYLES ---------------------//
+		'checkbox-array' => 'fieldset>legend{$label#}+section*options>label>input[name=$name# value=$value# type=checkbox checked=$selected# required=$required# autofocus=$autofocus# accept=$accept#]+{ $text#}',
+		'select-array' => 'label{$label#}+select[name=$name# required=$required# multiple style="height: auto;background-image: none; outline: inherit;"]>option[value=$value# selected=$selected#]{$text#}*options',
+	);
+	public static $bootstrap3 = array(
+		'form' => 'form[role=form id=$id# name=$name# method=$method# action=$action# enctype=$enctype#]',
+		'input' => '.form-group.$error#>label{$label#}+input.form-control[id=$id# name=$name# value=$value# type=$type# required=$required# autofocus=$autofocus# placeholder=$default# accept=$accept# disabled=$disabled#]+small.help-block>{$message#}',
+		'textarea' => '.form-group>label{$label#}+textarea.form-control[id=$id# name=$name# required=$required# autofocus=$autofocus# placeholder=$default# rows=3 disabled=$disabled#]{$value#}+small.help-block>{$message#}',
+		'radio' => 'fieldset>legend{$label#}>.radio*options>label>input.radio[name=$name# value=$value# type=radio checked=$selected# required=$required# disabled=$disabled#]{$text#}+p.help-block>{$message#}',
+		'select' => '.form-group>label{$label#}+select.form-control[id=$id# name=$name# multiple=$multiple# required=$required#]>option[value]+option[value=$value# selected=$selected# disabled=$disabled#]{$text#}*options',
+		'submit' => 'button.btn.btn-primary[id=$id# type=submit]{$label#} disabled=$disabled#',
+		'fieldset' => 'fieldset>legend{$label#}',
+		'checkbox' => '.checkbox>label>input[id=$id# name=$name# value=$value# type=checkbox checked=$selected# required=$required# autofocus=$autofocus# disabled=$disabled#]+{$label#}^p.help-block>{$error#}',
+		//------------- TYPE BASED STYLES ---------------------//
+		'checkbox-array' => 'fieldset>legend{$label#}>.checkbox*options>label>input[name=$name# value=$value# type=checkbox checked=$selected# required=$required#]{$text#}',
+		'select-array' => '.form-group>label{$label#}+select.form-control[name=$name# multiple=$multiple# required=$required#] size=$options#>option[value=$value# selected=$selected#]{$text#}*options',
+		//------------- CUSTOM STYLES ---------------------//
+		'radio-inline' => '.form-group>label{$label# :  }+label.radio-inline*options>input.radio[name=$name# value=$value# type=radio checked=$selected# required=$required#]+{$text#}',
+	);
+	public static $foundation5 = array(
+		'form' => 'form[id=$id# name=$name# method=$method# action=$action# enctype=$enctype#]',
+		'input' => 'label{$label#}+input[id=$id# name=$name# value=$value# type=$type# required=$required# autofocus=$autofocus# placeholder=$default# accept=$accept# disabled=$disabled#]',
+		'textarea' => 'label{$label#}+textarea[id=$id# name=$name# required=$required# autofocus=$autofocus# placeholder=$default# rows=3 disabled=$disabled#]{$value#}',
+		'radio' => 'label{$label# :  }+label.radio-inline*options>input.radio[name=$name# value=$value# type=radio checked=$selected# required=$required# disabled=$disabled#]+{$text#}',
+		'select' => 'label{$label#}+select[id=$id# name=$name# required=$required#]>option[value]+option[value=$value# selected=$selected# disabled=$disabled#]{$text#}*options',
+		'submit' => 'button.button[id=$id# type=submit disabled=$disabled#]{$label#}',
+		'fieldset' => 'fieldset>legend{$label#}',
+		'checkbox' => 'label>input[id=$id# name=$name# value=$value# type=checkbox checked=$selected# required=$required# autofocus=$autofocus# disabled=$disabled#]+{ $label#}',
+		//------------- TYPE BASED STYLES ---------------------//
+		'checkbox-array' => 'fieldset>legend{$label#}+label*options>input[name=$name# value=$value# type=checkbox checked=$selected# required=$required# autofocus=$autofocus#]+{ $text#}',
+		'select-array' => 'label{$label#}+select[name=$name# required=$required# multiple style="height: auto;background-image: none; outline: inherit;"]>option[value=$value# selected=$selected#]{$text#}*options',
+		//------------- CUSTOM STYLES ---------------------//
+	);
 }
\ No newline at end of file

htdocs/includes/restler/framework/Luracast/Restler/UI/Nav.php

Indentation +185 added lines, -185 removed lines

@@ -23,201 +23,201 @@
  */
 class Nav
 {
-    protected static $tree = array();
-    public static $root = 'home';
+	protected static $tree = array();
+	public static $root = 'home';
 
-    /**
-     * @var array all paths beginning with any of the following will be excluded
-     * from documentation. if an empty string is given it will exclude the root
-     */
-    public static $excludedPaths = array('');
-    /**
-     * @var array prefix additional menu items with one of the following syntax
-     *            [$path => $text]
-     *            [$path]
-     *            [$path => ['text' => $text, 'url' => $url, 'trail'=> $trail]]
-     */
-    public static $prepends = array();
-    /**
-     * @var array suffix additional menu items with one of the following syntax
-     *            [$path => $text]
-     *            [$path]
-     *            [$path => ['text' => $text, 'url' => $url, 'trail'=> $trail]]
-     */
-    public static $appends = array();
+	/**
+	 * @var array all paths beginning with any of the following will be excluded
+	 * from documentation. if an empty string is given it will exclude the root
+	 */
+	public static $excludedPaths = array('');
+	/**
+	 * @var array prefix additional menu items with one of the following syntax
+	 *            [$path => $text]
+	 *            [$path]
+	 *            [$path => ['text' => $text, 'url' => $url, 'trail'=> $trail]]
+	 */
+	public static $prepends = array();
+	/**
+	 * @var array suffix additional menu items with one of the following syntax
+	 *            [$path => $text]
+	 *            [$path]
+	 *            [$path => ['text' => $text, 'url' => $url, 'trail'=> $trail]]
+	 */
+	public static $appends = array();
 
-    public static $addExtension = true;
+	public static $addExtension = true;
 
-    protected static $extension = '';
-    protected static $activeTrail = '';
-    protected static $url;
+	protected static $extension = '';
+	protected static $activeTrail = '';
+	protected static $url;
 
-    public static function get($for = '', $activeTrail = null)
-    {
-        if (empty(static::$tree)) {
-            /** @var Restler $restler */
-            $restler = Scope::get('Restler');
-            if (static::$addExtension)
-                static::$extension = isset($restler->responseFormat)
-                    ? '.' . $restler->responseFormat->getExtension()
-                    : '.html';
-            static::$url = $restler->getBaseUrl();
-            if (empty(static::$url))
-                static::$url = '';
-            static::$activeTrail = $activeTrail = empty($activeTrail)
-                ? (empty($restler->url) || $restler->url == 'index'
-                    ? static::$root
-                    : $restler->url
-                )
-                : $activeTrail;
-            if (static::$addExtension)
-                static::$extension = isset($restler->responseFormat)
-                    ? '.' . $restler->responseFormat->getExtension()
-                    : '.html';
-            static::addUrls(static::$prepends);
-            $map = Routes::findAll(
-                static::$excludedPaths,
-                array('POST', 'DELETE', 'PUT', 'PATCH'),
-                $restler->getRequestedApiVersion()
-            );
-            foreach ($map as $path => $data) {
-                foreach ($data as $item) {
-                    $access = $item['access'];
-                    $route = $item['route'];
-                    $url = $route['url'];
-                    if ($access && !Text::contains($url, '{')) {
-                        $label = Util::nestedValue(
-                            $route,
-                            'metadata',
-                            CommentParser::$embeddedDataName,
-                            'label'
-                        );
-                        if (!empty($url)) {
-                            $url .= static::$extension;
-                        }
-                        static::add($url, $label);
-                    }
-                }
-            }
-            static::addUrls(static::$appends);
-        } elseif (empty($activeTrail)) {
-            $activeTrail = static::$activeTrail;
-        }
-        $tree = static::$tree;
-        $activeTrail = explode('/', $activeTrail);
-        $nested = & static::nested($tree, $activeTrail);
-        if (is_array($nested)) {
-            $nested['active'] = true;
-        }
-        if (!empty($for)) {
-            $for = explode('/', $for);
-            $tree = static::nested($tree, $for)['children'];
-        }
-        return array_filter($tree);
-    }
+	public static function get($for = '', $activeTrail = null)
+	{
+		if (empty(static::$tree)) {
+			/** @var Restler $restler */
+			$restler = Scope::get('Restler');
+			if (static::$addExtension)
+				static::$extension = isset($restler->responseFormat)
+					? '.' . $restler->responseFormat->getExtension()
+					: '.html';
+			static::$url = $restler->getBaseUrl();
+			if (empty(static::$url))
+				static::$url = '';
+			static::$activeTrail = $activeTrail = empty($activeTrail)
+				? (empty($restler->url) || $restler->url == 'index'
+					? static::$root
+					: $restler->url
+				)
+				: $activeTrail;
+			if (static::$addExtension)
+				static::$extension = isset($restler->responseFormat)
+					? '.' . $restler->responseFormat->getExtension()
+					: '.html';
+			static::addUrls(static::$prepends);
+			$map = Routes::findAll(
+				static::$excludedPaths,
+				array('POST', 'DELETE', 'PUT', 'PATCH'),
+				$restler->getRequestedApiVersion()
+			);
+			foreach ($map as $path => $data) {
+				foreach ($data as $item) {
+					$access = $item['access'];
+					$route = $item['route'];
+					$url = $route['url'];
+					if ($access && !Text::contains($url, '{')) {
+						$label = Util::nestedValue(
+							$route,
+							'metadata',
+							CommentParser::$embeddedDataName,
+							'label'
+						);
+						if (!empty($url)) {
+							$url .= static::$extension;
+						}
+						static::add($url, $label);
+					}
+				}
+			}
+			static::addUrls(static::$appends);
+		} elseif (empty($activeTrail)) {
+			$activeTrail = static::$activeTrail;
+		}
+		$tree = static::$tree;
+		$activeTrail = explode('/', $activeTrail);
+		$nested = & static::nested($tree, $activeTrail);
+		if (is_array($nested)) {
+			$nested['active'] = true;
+		}
+		if (!empty($for)) {
+			$for = explode('/', $for);
+			$tree = static::nested($tree, $for)['children'];
+		}
+		return array_filter($tree);
+	}
 
-    protected static function & nested(array & $tree, array $parts)
-    {
-        if (!empty($parts)) {
-            $part = array_shift($parts);
-            if (empty($tree[$part])) {
-                return $tree[$part];
-            } elseif (empty($parts)) {
-                return static::nested($tree[$part], $parts);
-            } elseif (!empty($tree[$part]['children'])) {
-                return static::nested($tree[$part]['children'], $parts);
-            }
-        } else {
-            return $tree;
-        }
-        $value = null;
-        return $value;
-    }
+	protected static function & nested(array & $tree, array $parts)
+	{
+		if (!empty($parts)) {
+			$part = array_shift($parts);
+			if (empty($tree[$part])) {
+				return $tree[$part];
+			} elseif (empty($parts)) {
+				return static::nested($tree[$part], $parts);
+			} elseif (!empty($tree[$part]['children'])) {
+				return static::nested($tree[$part]['children'], $parts);
+			}
+		} else {
+			return $tree;
+		}
+		$value = null;
+		return $value;
+	}
 
-    public static function addUrls(array $urls)
-    {
-        foreach ($urls as $url => $label) {
-            $trail = null;
-            if (is_array($label)) {
-                if (isset($label['trail'])) {
-                    $trail = $label['trail'];
-                }
-                if (isset($label['url'])) {
-                    $url = $label['url'];
-                    $label = isset($label['label']) ? $label['label'] : null;
-                } else {
-                    $url = current(array_keys($label));
-                    $label = current($label);
-                }
+	public static function addUrls(array $urls)
+	{
+		foreach ($urls as $url => $label) {
+			$trail = null;
+			if (is_array($label)) {
+				if (isset($label['trail'])) {
+					$trail = $label['trail'];
+				}
+				if (isset($label['url'])) {
+					$url = $label['url'];
+					$label = isset($label['label']) ? $label['label'] : null;
+				} else {
+					$url = current(array_keys($label));
+					$label = current($label);
+				}
 
-            }
-            if (is_numeric($url)) {
-                $url = $label;
-                $label = null;
-            }
-            static::add($url, $label, $trail);
-        }
-        return static::$tree;
-    }
+			}
+			if (is_numeric($url)) {
+				$url = $label;
+				$label = null;
+			}
+			static::add($url, $label, $trail);
+		}
+		return static::$tree;
+	}
 
-    public static function add($url, $label = null, $trail = null)
-    {
-        $r = parse_url($url);
-        if (is_null($trail)) {
-            $trail = isset($r['path']) ? $r['path'] : static::$root;
-        }
-        //remove / prefix and / suffixes and any extension
-        $trail = strtok(trim($trail, '/'), '.');
-        $parts = explode('/', $trail);
-        if (count($parts) == 1 && empty($parts[0]))
-            $parts = array(static::$root);
-        if (isset($r['fragment'])) {
-            $parts[] = $r['fragment'];
-            if (is_null($label)) {
-                $label = Text::title($r['fragment']);
-            }
-        }
-        if (empty($r['scheme'])) {
-            //relative url found
-            if (empty($url)) {
-                $label = Text::title(static::$root);
-                $url = static::$url;
-            } else {
-                $url = static::$url . '/' . ltrim($url, '/');
-            }
-        }
-        if (is_null($label)) {
-            $label = Text::title(strtok(end($parts), '.'));
-        }
-        $r['url'] = $url;
-        $r['path'] = $trail;
-        $r['parts'] = $parts;
-        $r['label'] = $label;
-        static::build($r);
-        return $r;
-    }
+	public static function add($url, $label = null, $trail = null)
+	{
+		$r = parse_url($url);
+		if (is_null($trail)) {
+			$trail = isset($r['path']) ? $r['path'] : static::$root;
+		}
+		//remove / prefix and / suffixes and any extension
+		$trail = strtok(trim($trail, '/'), '.');
+		$parts = explode('/', $trail);
+		if (count($parts) == 1 && empty($parts[0]))
+			$parts = array(static::$root);
+		if (isset($r['fragment'])) {
+			$parts[] = $r['fragment'];
+			if (is_null($label)) {
+				$label = Text::title($r['fragment']);
+			}
+		}
+		if (empty($r['scheme'])) {
+			//relative url found
+			if (empty($url)) {
+				$label = Text::title(static::$root);
+				$url = static::$url;
+			} else {
+				$url = static::$url . '/' . ltrim($url, '/');
+			}
+		}
+		if (is_null($label)) {
+			$label = Text::title(strtok(end($parts), '.'));
+		}
+		$r['url'] = $url;
+		$r['path'] = $trail;
+		$r['parts'] = $parts;
+		$r['label'] = $label;
+		static::build($r);
+		return $r;
+	}
 
-    public static function build(array $r)
-    {
-        $p = & static::$tree;
-        $parts = $r['parts'];
-        $last = count($parts) - 1;
-        foreach ($parts as $i => $part) {
-            if ($i == $last) {
-                $p[$part]['text'] = $r['label'];
-                $p[$part]['href'] = $r['url'];
-                $p[$part]['class'] = Text::slug($part);
-                /* dynamically do it at run time instead
+	public static function build(array $r)
+	{
+		$p = & static::$tree;
+		$parts = $r['parts'];
+		$last = count($parts) - 1;
+		foreach ($parts as $i => $part) {
+			if ($i == $last) {
+				$p[$part]['text'] = $r['label'];
+				$p[$part]['href'] = $r['url'];
+				$p[$part]['class'] = Text::slug($part);
+				/* dynamically do it at run time instead
                 if ($r['path'] == static::$activeTrail)
                     $p[$part]['active'] = true;
                 */
-            } elseif (!isset($p[$part])) {
-                $p[$part] = array();
-                $p[$part]['text'] = Text::title($part);
-                $p[$part]['href'] = '#';
-                $p[$part]['children'] = array();
-            }
-            $p = & $p[$part]['children'];
-        }
-    }
+			} elseif (!isset($p[$part])) {
+				$p[$part] = array();
+				$p[$part]['text'] = Text::title($part);
+				$p[$part]['href'] = '#';
+				$p[$part]['children'] = array();
+			}
+			$p = & $p[$part]['children'];
+		}
+	}
 }

htdocs/includes/restler/framework/Luracast/Restler/UI/Forms.php

Indentation +428 added lines, -428 removed lines

@@ -34,453 +34,453 @@
  */
 class Forms implements iFilter
 {
-    const FORM_KEY = 'form_key';
-    public static $filterFormRequestsOnly = false;
+	const FORM_KEY = 'form_key';
+	public static $filterFormRequestsOnly = false;
 
-    public static $excludedPaths = array();
+	public static $excludedPaths = array();
 
-    private static $style;
-    /**
-     * @var bool should we fill up the form using given data?
-     */
-    public static $preFill = true;
-    /**
-     * @var ValidationInfo
-     */
-    public static $validationInfo = null;
-    protected static $inputTypes = array(
-        'hidden',
-        'password',
-        'button',
-        'image',
-        'file',
-        'reset',
-        'submit',
-        'search',
-        'checkbox',
-        'radio',
-        'email',
-        'text',
-        'color',
-        'date',
-        'datetime',
-        'datetime-local',
-        'email',
-        'month',
-        'number',
-        'range',
-        'search',
-        'tel',
-        'time',
-        'url',
-        'week',
-    );
-    protected static $fileUpload = false;
-    private static $key = array();
-    /**
-     * @var ApiMethodInfo;
-     */
-    private static $info;
+	private static $style;
+	/**
+	 * @var bool should we fill up the form using given data?
+	 */
+	public static $preFill = true;
+	/**
+	 * @var ValidationInfo
+	 */
+	public static $validationInfo = null;
+	protected static $inputTypes = array(
+		'hidden',
+		'password',
+		'button',
+		'image',
+		'file',
+		'reset',
+		'submit',
+		'search',
+		'checkbox',
+		'radio',
+		'email',
+		'text',
+		'color',
+		'date',
+		'datetime',
+		'datetime-local',
+		'email',
+		'month',
+		'number',
+		'range',
+		'search',
+		'tel',
+		'time',
+		'url',
+		'week',
+	);
+	protected static $fileUpload = false;
+	private static $key = array();
+	/**
+	 * @var ApiMethodInfo;
+	 */
+	private static $info;
 
-    public static function setStyles(HtmlForm $style)
-    {
-        static::$style = get_class($style);
-    }
+	public static function setStyles(HtmlForm $style)
+	{
+		static::$style = get_class($style);
+	}
 
-    /**
-     * Get the form
-     *
-     * @param string $method   http method to submit the form
-     * @param string $action   relative path from the web root. When set to null
-     *                         it uses the current api method's path
-     * @param bool   $dataOnly if you want to render the form yourself use this
-     *                         option
-     * @param string $prefix   used for adjusting the spacing in front of
-     *                         form elements
-     * @param string $indent   used for adjusting indentation
-     *
-     * @return array|T
-     *
-     * @throws RestException
-     */
-    public static function get($method = 'POST', $action = null, $dataOnly = false, $prefix = '', $indent = '    ')
-    {
-        if (!static::$style) {
-            static::$style = 'Luracast\\Restler\\UI\HtmlForm';
-        }
+	/**
+	 * Get the form
+	 *
+	 * @param string $method   http method to submit the form
+	 * @param string $action   relative path from the web root. When set to null
+	 *                         it uses the current api method's path
+	 * @param bool   $dataOnly if you want to render the form yourself use this
+	 *                         option
+	 * @param string $prefix   used for adjusting the spacing in front of
+	 *                         form elements
+	 * @param string $indent   used for adjusting indentation
+	 *
+	 * @return array|T
+	 *
+	 * @throws RestException
+	 */
+	public static function get($method = 'POST', $action = null, $dataOnly = false, $prefix = '', $indent = '    ')
+	{
+		if (!static::$style) {
+			static::$style = 'Luracast\\Restler\\UI\HtmlForm';
+		}
 
-        try {
-            /** @var Restler $restler */
-            $restler = Scope::get('Restler');
-            if (is_null($action)) {
-                $action = $restler->url;
-            }
+		try {
+			/** @var Restler $restler */
+			$restler = Scope::get('Restler');
+			if (is_null($action)) {
+				$action = $restler->url;
+			}
 
-            $info = $restler->url == $action
-            && Util::getRequestMethod() == $method
-                ? $restler->apiMethodInfo
-                : Routes::find(
-                    trim($action, '/'),
-                    $method,
-                    $restler->getRequestedApiVersion(),
-                    static::$preFill ||
-                    ($restler->requestMethod == $method &&
-                        $restler->url == $action)
-                        ? $restler->getRequestData()
-                        : array()
-                );
+			$info = $restler->url == $action
+			&& Util::getRequestMethod() == $method
+				? $restler->apiMethodInfo
+				: Routes::find(
+					trim($action, '/'),
+					$method,
+					$restler->getRequestedApiVersion(),
+					static::$preFill ||
+					($restler->requestMethod == $method &&
+						$restler->url == $action)
+						? $restler->getRequestData()
+						: array()
+				);
 
-        } catch (RestException $e) {
-            //echo $e->getErrorMessage();
-            $info = false;
-        }
-        if (!$info) {
-            throw new RestException(500, 'invalid action path for form `' . $method . ' ' . $action . '`');
-        }
-        static::$info = $info;
-        $m = $info->metadata;
-        $r = static::fields($dataOnly);
-        if ($method != 'GET' && $method != 'POST') {
-            if (empty(Defaults::$httpMethodOverrideProperty)) {
-                throw new RestException(
-                    500,
-                    'Forms require `Defaults::\$httpMethodOverrideProperty`' .
-                    "for supporting HTTP $method"
-                );
-            }
-            if ($dataOnly) {
-                $r[] = array(
-                    'tag'   => 'input',
-                    'name'  => Defaults::$httpMethodOverrideProperty,
-                    'type'  => 'hidden',
-                    'value' => 'method',
-                );
-            } else {
-                $r[] = T::input()
-                    ->name(Defaults::$httpMethodOverrideProperty)
-                    ->value($method)
-                    ->type('hidden');
-            }
+		} catch (RestException $e) {
+			//echo $e->getErrorMessage();
+			$info = false;
+		}
+		if (!$info) {
+			throw new RestException(500, 'invalid action path for form `' . $method . ' ' . $action . '`');
+		}
+		static::$info = $info;
+		$m = $info->metadata;
+		$r = static::fields($dataOnly);
+		if ($method != 'GET' && $method != 'POST') {
+			if (empty(Defaults::$httpMethodOverrideProperty)) {
+				throw new RestException(
+					500,
+					'Forms require `Defaults::\$httpMethodOverrideProperty`' .
+					"for supporting HTTP $method"
+				);
+			}
+			if ($dataOnly) {
+				$r[] = array(
+					'tag'   => 'input',
+					'name'  => Defaults::$httpMethodOverrideProperty,
+					'type'  => 'hidden',
+					'value' => 'method',
+				);
+			} else {
+				$r[] = T::input()
+					->name(Defaults::$httpMethodOverrideProperty)
+					->value($method)
+					->type('hidden');
+			}
 
-            $method = 'POST';
-        }
-        if (session_id() != '') {
-            $form_key = static::key($method, $action);
-            if ($dataOnly) {
-                $r[] = array(
-                    'tag'   => 'input',
-                    'name'  => static::FORM_KEY,
-                    'type'  => 'hidden',
-                    'value' => 'hidden',
-                );
-            } else {
-                $key = T::input()
-                    ->name(static::FORM_KEY)
-                    ->type('hidden')
-                    ->value($form_key);
-                $r[] = $key;
-            }
-        }
+			$method = 'POST';
+		}
+		if (session_id() != '') {
+			$form_key = static::key($method, $action);
+			if ($dataOnly) {
+				$r[] = array(
+					'tag'   => 'input',
+					'name'  => static::FORM_KEY,
+					'type'  => 'hidden',
+					'value' => 'hidden',
+				);
+			} else {
+				$key = T::input()
+					->name(static::FORM_KEY)
+					->type('hidden')
+					->value($form_key);
+				$r[] = $key;
+			}
+		}
 
-        $s = array(
-            'tag'   => 'button',
-            'type'  => 'submit',
-            'label' =>
-                Util::nestedValue($m, 'return', CommentParser::$embeddedDataName, 'label')
-                    ?: 'Submit'
-        );
+		$s = array(
+			'tag'   => 'button',
+			'type'  => 'submit',
+			'label' =>
+				Util::nestedValue($m, 'return', CommentParser::$embeddedDataName, 'label')
+					?: 'Submit'
+		);
 
-        if (!$dataOnly) {
-            $s = Emmet::make(static::style('submit', $m), $s);
-        }
-        $r[] = $s;
-        $t = array(
-            'action' => $restler->getBaseUrl() . '/' . rtrim($action, '/'),
-            'method' => $method,
-        );
-        if (static::$fileUpload) {
-            static::$fileUpload = false;
-            $t['enctype'] = 'multipart/form-data';
-        }
-        if (isset($m[CommentParser::$embeddedDataName])) {
-            $t += $m[CommentParser::$embeddedDataName];
-        }
-        if (!$dataOnly) {
-            $t = Emmet::make(static::style('form', $m), $t);
-            $t->prefix = $prefix;
-            $t->indent = $indent;
-            $t[] = $r;
-        } else {
-            $t['fields'] = $r;
-        }
-        return $t;
-    }
+		if (!$dataOnly) {
+			$s = Emmet::make(static::style('submit', $m), $s);
+		}
+		$r[] = $s;
+		$t = array(
+			'action' => $restler->getBaseUrl() . '/' . rtrim($action, '/'),
+			'method' => $method,
+		);
+		if (static::$fileUpload) {
+			static::$fileUpload = false;
+			$t['enctype'] = 'multipart/form-data';
+		}
+		if (isset($m[CommentParser::$embeddedDataName])) {
+			$t += $m[CommentParser::$embeddedDataName];
+		}
+		if (!$dataOnly) {
+			$t = Emmet::make(static::style('form', $m), $t);
+			$t->prefix = $prefix;
+			$t->indent = $indent;
+			$t[] = $r;
+		} else {
+			$t['fields'] = $r;
+		}
+		return $t;
+	}
 
-    public static function style($name, array $metadata, $type = '')
-    {
-        if (isset($metadata[CommentParser::$embeddedDataName][$name])) {
-            return $metadata[CommentParser::$embeddedDataName][$name];
-        }
-        $style = static::$style . '::' . $name;
-        $typedStyle = $style . '_' . $type;
-        if (defined($typedStyle)) {
-            return constant($typedStyle);
-        }
-        if (defined($style)) {
-            return constant($style);
-        }
-        return null;
-    }
+	public static function style($name, array $metadata, $type = '')
+	{
+		if (isset($metadata[CommentParser::$embeddedDataName][$name])) {
+			return $metadata[CommentParser::$embeddedDataName][$name];
+		}
+		$style = static::$style . '::' . $name;
+		$typedStyle = $style . '_' . $type;
+		if (defined($typedStyle)) {
+			return constant($typedStyle);
+		}
+		if (defined($style)) {
+			return constant($style);
+		}
+		return null;
+	}
 
-    public static function fields($dataOnly = false)
-    {
-        $m = static::$info->metadata;
-        $params = $m['param'];
-        $values = static::$info->parameters;
-        $r = array();
-        foreach ($params as $k => $p) {
-            $value = Util::nestedValue($values, $k);
-            if (
-                is_scalar($value) ||
-                ($p['type'] == 'array' && is_array($value) && $value == array_values($value)) ||
-                is_object($value) && $p['type'] == get_class($value)
-            ) {
-                $p['value'] = $value;
-            }
-            static::$validationInfo = $v = new ValidationInfo($p);
-            if ($v->from == 'path') {
-                continue;
-            }
-            if (!empty($v->children)) {
-                $t = Emmet::make(static::style('fieldset', $m), array('label' => $v->label));
-                foreach ($v->children as $n => $c) {
-                    $value = Util::nestedValue($v->value, $n);
-                    if (
-                        is_scalar($value) ||
-                        ($c['type'] == 'array' && is_array($value) && $value == array_values($value)) ||
-                        is_object($value) && $c['type'] == get_class($value)
-                    ) {
-                        $c['value'] = $value;
-                    }
-                    static::$validationInfo = $vc = new ValidationInfo($c);
-                    if ($vc->from == 'path') {
-                        continue;
-                    }
-                    $vc->name = $v->name . '[' . $vc->name . ']';
-                    $t [] = static::field($vc, $dataOnly);
-                }
-                $r[] = $t;
-                static::$validationInfo = null;
-            } else {
-                $f = static::field($v, $dataOnly);
-                $r [] = $f;
-            }
-            static::$validationInfo = null;
-        }
-        return $r;
-    }
+	public static function fields($dataOnly = false)
+	{
+		$m = static::$info->metadata;
+		$params = $m['param'];
+		$values = static::$info->parameters;
+		$r = array();
+		foreach ($params as $k => $p) {
+			$value = Util::nestedValue($values, $k);
+			if (
+				is_scalar($value) ||
+				($p['type'] == 'array' && is_array($value) && $value == array_values($value)) ||
+				is_object($value) && $p['type'] == get_class($value)
+			) {
+				$p['value'] = $value;
+			}
+			static::$validationInfo = $v = new ValidationInfo($p);
+			if ($v->from == 'path') {
+				continue;
+			}
+			if (!empty($v->children)) {
+				$t = Emmet::make(static::style('fieldset', $m), array('label' => $v->label));
+				foreach ($v->children as $n => $c) {
+					$value = Util::nestedValue($v->value, $n);
+					if (
+						is_scalar($value) ||
+						($c['type'] == 'array' && is_array($value) && $value == array_values($value)) ||
+						is_object($value) && $c['type'] == get_class($value)
+					) {
+						$c['value'] = $value;
+					}
+					static::$validationInfo = $vc = new ValidationInfo($c);
+					if ($vc->from == 'path') {
+						continue;
+					}
+					$vc->name = $v->name . '[' . $vc->name . ']';
+					$t [] = static::field($vc, $dataOnly);
+				}
+				$r[] = $t;
+				static::$validationInfo = null;
+			} else {
+				$f = static::field($v, $dataOnly);
+				$r [] = $f;
+			}
+			static::$validationInfo = null;
+		}
+		return $r;
+	}
 
-    /**
-     * @param ValidationInfo $p
-     *
-     * @param bool           $dataOnly
-     *
-     * @return array|T
-     */
-    public static function field(ValidationInfo $p, $dataOnly = false)
-    {
-        if (is_string($p->value)) {
-            //prevent XSS attacks
-            $p->value = htmlspecialchars($p->value, ENT_QUOTES | ENT_HTML401, 'UTF-8');
-        }
-        $type = $p->field ?: static::guessFieldType($p);
-        $tag = in_array($type, static::$inputTypes)
-            ? 'input' : $type;
-        $options = array();
-        $name = $p->name;
-        $multiple = null;
-        if ($p->type == 'array' && $p->contentType != 'associative') {
-            $name .= '[]';
-            $multiple = true;
-        }
-        if ($p->choice) {
-            foreach ($p->choice as $i => $choice) {
-                $option = array('name' => $name, 'value' => $choice);
-                $option['text'] = isset($p->rules['select'][$i])
-                    ? $p->rules['select'][$i]
-                    : $choice;
-                if ($choice == $p->value) {
-                    $option['selected'] = true;
-                }
-                $options[] = $option;
-            }
-        } elseif ($p->type == 'boolean' || $p->type == 'bool') {
-            if (Text::beginsWith($type, 'radio') || Text::beginsWith($type, 'select')) {
-                $options[] = array(
-                    'name'  => $p->name,
-                    'text'  => ' Yes ',
-                    'value' => 'true'
-                );
-                $options[] = array(
-                    'name'  => $p->name,
-                    'text'  => ' No ',
-                    'value' => 'false'
-                );
-                if ($p->value || $p->default) {
-                    $options[0]['selected'] = true;
-                }
-            } else { //checkbox
-                $r = array(
-                    'tag'     => $tag,
-                    'name'    => $name,
-                    'type'    => $type,
-                    'label'   => $p->label,
-                    'value'   => 'true',
-                    'default' => $p->default,
-                );
-                $r['text'] = 'Yes';
-                if ($p->default) {
-                    $r['selected'] = true;
-                }
-                if (isset($p->rules)) {
-                    $r += $p->rules;
-                }
-            }
-        }
-        if (empty($r)) {
-            $r = array(
-                'tag'      => $tag,
-                'name'     => $name,
-                'type'     => $type,
-                'label'    => $p->label,
-                'value'    => $p->value,
-                'default'  => $p->default,
-                'options'  => & $options,
-                'multiple' => $multiple,
-            );
-            if (isset($p->rules)) {
-                $r += $p->rules;
-            }
-        }
-        if ($type == 'file') {
-            static::$fileUpload = true;
-            if (empty($r['accept'])) {
-                $r['accept'] = implode(', ', UploadFormat::$allowedMimeTypes);
-            }
-        }
-        if (!empty(Validator::$exceptions[$name]) && static::$info->url == Scope::get('Restler')->url) {
-            $r['error'] = 'has-error';
-            $r['message'] = Validator::$exceptions[$p->name]->getMessage();
-        }
+	/**
+	 * @param ValidationInfo $p
+	 *
+	 * @param bool           $dataOnly
+	 *
+	 * @return array|T
+	 */
+	public static function field(ValidationInfo $p, $dataOnly = false)
+	{
+		if (is_string($p->value)) {
+			//prevent XSS attacks
+			$p->value = htmlspecialchars($p->value, ENT_QUOTES | ENT_HTML401, 'UTF-8');
+		}
+		$type = $p->field ?: static::guessFieldType($p);
+		$tag = in_array($type, static::$inputTypes)
+			? 'input' : $type;
+		$options = array();
+		$name = $p->name;
+		$multiple = null;
+		if ($p->type == 'array' && $p->contentType != 'associative') {
+			$name .= '[]';
+			$multiple = true;
+		}
+		if ($p->choice) {
+			foreach ($p->choice as $i => $choice) {
+				$option = array('name' => $name, 'value' => $choice);
+				$option['text'] = isset($p->rules['select'][$i])
+					? $p->rules['select'][$i]
+					: $choice;
+				if ($choice == $p->value) {
+					$option['selected'] = true;
+				}
+				$options[] = $option;
+			}
+		} elseif ($p->type == 'boolean' || $p->type == 'bool') {
+			if (Text::beginsWith($type, 'radio') || Text::beginsWith($type, 'select')) {
+				$options[] = array(
+					'name'  => $p->name,
+					'text'  => ' Yes ',
+					'value' => 'true'
+				);
+				$options[] = array(
+					'name'  => $p->name,
+					'text'  => ' No ',
+					'value' => 'false'
+				);
+				if ($p->value || $p->default) {
+					$options[0]['selected'] = true;
+				}
+			} else { //checkbox
+				$r = array(
+					'tag'     => $tag,
+					'name'    => $name,
+					'type'    => $type,
+					'label'   => $p->label,
+					'value'   => 'true',
+					'default' => $p->default,
+				);
+				$r['text'] = 'Yes';
+				if ($p->default) {
+					$r['selected'] = true;
+				}
+				if (isset($p->rules)) {
+					$r += $p->rules;
+				}
+			}
+		}
+		if (empty($r)) {
+			$r = array(
+				'tag'      => $tag,
+				'name'     => $name,
+				'type'     => $type,
+				'label'    => $p->label,
+				'value'    => $p->value,
+				'default'  => $p->default,
+				'options'  => & $options,
+				'multiple' => $multiple,
+			);
+			if (isset($p->rules)) {
+				$r += $p->rules;
+			}
+		}
+		if ($type == 'file') {
+			static::$fileUpload = true;
+			if (empty($r['accept'])) {
+				$r['accept'] = implode(', ', UploadFormat::$allowedMimeTypes);
+			}
+		}
+		if (!empty(Validator::$exceptions[$name]) && static::$info->url == Scope::get('Restler')->url) {
+			$r['error'] = 'has-error';
+			$r['message'] = Validator::$exceptions[$p->name]->getMessage();
+		}
 
-        if (true === $p->required) {
-            $r['required'] = 'required';
-        }
-        if (isset($p->rules['autofocus'])) {
-            $r['autofocus'] = 'autofocus';
-        }
-        /*
+		if (true === $p->required) {
+			$r['required'] = 'required';
+		}
+		if (isset($p->rules['autofocus'])) {
+			$r['autofocus'] = 'autofocus';
+		}
+		/*
         echo "<pre>";
         print_r($r);
         echo "</pre>";
         */
-        if ($dataOnly) {
-            return $r;
-        }
-        if (isset($p->rules['form'])) {
-            return Emmet::make($p->rules['form'], $r);
-        }
-        $m = static::$info->metadata;
-        $t = Emmet::make(static::style($type, $m, $p->type) ?: static::style($tag, $m, $p->type), $r);
-        return $t;
-    }
+		if ($dataOnly) {
+			return $r;
+		}
+		if (isset($p->rules['form'])) {
+			return Emmet::make($p->rules['form'], $r);
+		}
+		$m = static::$info->metadata;
+		$t = Emmet::make(static::style($type, $m, $p->type) ?: static::style($tag, $m, $p->type), $r);
+		return $t;
+	}
 
-    protected static function guessFieldType(ValidationInfo $p, $type = 'type')
-    {
-        if (in_array($p->$type, static::$inputTypes)) {
-            return $p->$type;
-        }
-        if ($p->choice) {
-            return $p->type == 'array' ? 'checkbox' : 'select';
-        }
-        switch ($p->$type) {
-            case 'boolean':
-                return 'radio';
-            case 'int':
-            case 'number':
-            case 'float':
-                return 'number';
-            case 'array':
-                return static::guessFieldType($p, 'contentType');
-        }
-        if ($p->name == 'password') {
-            return 'password';
-        }
-        return 'text';
-    }
+	protected static function guessFieldType(ValidationInfo $p, $type = 'type')
+	{
+		if (in_array($p->$type, static::$inputTypes)) {
+			return $p->$type;
+		}
+		if ($p->choice) {
+			return $p->type == 'array' ? 'checkbox' : 'select';
+		}
+		switch ($p->$type) {
+			case 'boolean':
+				return 'radio';
+			case 'int':
+			case 'number':
+			case 'float':
+				return 'number';
+			case 'array':
+				return static::guessFieldType($p, 'contentType');
+		}
+		if ($p->name == 'password') {
+			return 'password';
+		}
+		return 'text';
+	}
 
-    /**
-     * Get the form key
-     *
-     * @param string $method   http method for form key
-     * @param string $action   relative path from the web root. When set to null
-     *                         it uses the current api method's path
-     *
-     * @return string generated form key
-     */
-    public static function key($method = 'POST', $action = null)
-    {
-        if (is_null($action)) {
-            $action = Scope::get('Restler')->url;
-        }
-        $target = "$method $action";
-        if (empty(static::$key[$target])) {
-            static::$key[$target] = md5($target . User::getIpAddress() . uniqid(mt_rand()));
-        }
-        $_SESSION[static::FORM_KEY] = static::$key;
-        return static::$key[$target];
-    }
+	/**
+	 * Get the form key
+	 *
+	 * @param string $method   http method for form key
+	 * @param string $action   relative path from the web root. When set to null
+	 *                         it uses the current api method's path
+	 *
+	 * @return string generated form key
+	 */
+	public static function key($method = 'POST', $action = null)
+	{
+		if (is_null($action)) {
+			$action = Scope::get('Restler')->url;
+		}
+		$target = "$method $action";
+		if (empty(static::$key[$target])) {
+			static::$key[$target] = md5($target . User::getIpAddress() . uniqid(mt_rand()));
+		}
+		$_SESSION[static::FORM_KEY] = static::$key;
+		return static::$key[$target];
+	}
 
-    /**
-     * Access verification method.
-     *
-     * API access will be denied when this method returns false
-     *
-     * @return boolean true when api access is allowed false otherwise
-     *
-     * @throws RestException 403 security violation
-     */
-    public function __isAllowed()
-    {
-        if (session_id() == '') {
-            session_start();
-        }
-        /** @var Restler $restler */
-        $restler = $this->restler;
-        $url = $restler->url;
-        foreach (static::$excludedPaths as $exclude) {
-            if (empty($exclude)) {
-                if ($url == $exclude) {
-                    return true;
-                }
-            } elseif (Text::beginsWith($url, $exclude)) {
-                return true;
-            }
-        }
-        $check = static::$filterFormRequestsOnly
-            ? $restler->requestFormat instanceof UrlEncodedFormat || $restler->requestFormat instanceof UploadFormat
-            : true;
-        if (!empty($_POST) && $check) {
-            if (
-                isset($_POST[static::FORM_KEY]) &&
-                ($target = Util::getRequestMethod() . ' ' . $restler->url) &&
-                isset($_SESSION[static::FORM_KEY][$target]) &&
-                $_POST[static::FORM_KEY] == $_SESSION[static::FORM_KEY][$target]
-            ) {
-                return true;
-            }
-            throw new RestException(403, 'Insecure form submission');
-        }
-        return true;
-    }
+	/**
+	 * Access verification method.
+	 *
+	 * API access will be denied when this method returns false
+	 *
+	 * @return boolean true when api access is allowed false otherwise
+	 *
+	 * @throws RestException 403 security violation
+	 */
+	public function __isAllowed()
+	{
+		if (session_id() == '') {
+			session_start();
+		}
+		/** @var Restler $restler */
+		$restler = $this->restler;
+		$url = $restler->url;
+		foreach (static::$excludedPaths as $exclude) {
+			if (empty($exclude)) {
+				if ($url == $exclude) {
+					return true;
+				}
+			} elseif (Text::beginsWith($url, $exclude)) {
+				return true;
+			}
+		}
+		$check = static::$filterFormRequestsOnly
+			? $restler->requestFormat instanceof UrlEncodedFormat || $restler->requestFormat instanceof UploadFormat
+			: true;
+		if (!empty($_POST) && $check) {
+			if (
+				isset($_POST[static::FORM_KEY]) &&
+				($target = Util::getRequestMethod() . ' ' . $restler->url) &&
+				isset($_SESSION[static::FORM_KEY][$target]) &&
+				$_POST[static::FORM_KEY] == $_SESSION[static::FORM_KEY][$target]
+			) {
+				return true;
+			}
+			throw new RestException(403, 'Insecure form submission');
+		}
+		return true;
+	}
 }