Dolibarr / dolibarr

htdocs/includes/restler/framework/Luracast/Restler/Format/iDecodeStream.php

Indentation +10 added lines, -10 removed lines

@@ -16,15 +16,15 @@
 interface iDecodeStream
 {
 
-    /**
-     * Decode the given data stream
-     *
-     * @param string $stream A stream resource with data
-     *                       sent from client to the api
-     *                       in the given format.
-     *
-     * @return array associative array of the parsed data
-     */
-    public function decodeStream($stream);
+	/**
+	 * Decode the given data stream
+	 *
+	 * @param string $stream A stream resource with data
+	 *                       sent from client to the api
+	 *                       in the given format.
+	 *
+	 * @return array associative array of the parsed data
+	 */
+	public function decodeStream($stream);
 
 } 
\ No newline at end of file

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

Indentation +47 added lines, -47 removed lines

@@ -16,53 +16,53 @@
  */
 class Redirect
 {
-    /**
-     * Redirect to given url
-     *
-     * @param string $url       relative path or full url
-     * @param array  $params    associative array of query parameters
-     * @param array  $flashData associative array of properties to be set in $_SESSION for one time use
-     * @param int    $status    http status code to send the response with ideally 301 or 302
-     *
-     * @return array
-     */
-    public static function to($url, array $params = array(), array $flashData = array(), $status = 302)
-    {
-        $url = ltrim($url, '/');
-        /** @var $r Restler */
-        $r = Scope::get('Restler');
-        $base = $r->getBaseUrl() . '/';
-        if (0 !== strpos($url, 'http')) {
-            $url = $base . $url;
-        }
-        if (!empty($flashData) || $base . $r->url !== $url || Util::getRequestMethod() != 'GET') {
-            if ($r->responseFormat instanceof JsonFormat) {
-                return array('redirect' => $url);
-            }
-            if (!empty($params)) {
-                $url .= '?' . http_build_query($params);
-            }
-            Flash::set($flashData);
-            header(
-                "{$_SERVER['SERVER_PROTOCOL']} $status " .
-                (isset(RestException::$codes[$status]) ? RestException::$codes[$status] : '')
-            );
-            header("Location: $url");
-            die('');
-        }
+	/**
+	 * Redirect to given url
+	 *
+	 * @param string $url       relative path or full url
+	 * @param array  $params    associative array of query parameters
+	 * @param array  $flashData associative array of properties to be set in $_SESSION for one time use
+	 * @param int    $status    http status code to send the response with ideally 301 or 302
+	 *
+	 * @return array
+	 */
+	public static function to($url, array $params = array(), array $flashData = array(), $status = 302)
+	{
+		$url = ltrim($url, '/');
+		/** @var $r Restler */
+		$r = Scope::get('Restler');
+		$base = $r->getBaseUrl() . '/';
+		if (0 !== strpos($url, 'http')) {
+			$url = $base . $url;
+		}
+		if (!empty($flashData) || $base . $r->url !== $url || Util::getRequestMethod() != 'GET') {
+			if ($r->responseFormat instanceof JsonFormat) {
+				return array('redirect' => $url);
+			}
+			if (!empty($params)) {
+				$url .= '?' . http_build_query($params);
+			}
+			Flash::set($flashData);
+			header(
+				"{$_SERVER['SERVER_PROTOCOL']} $status " .
+				(isset(RestException::$codes[$status]) ? RestException::$codes[$status] : '')
+			);
+			header("Location: $url");
+			die('');
+		}
 
-        return array();
-    }
+		return array();
+	}
 
-    /**
-     * Redirect back to the previous page
-     *
-     * Makes use of http referrer for redirection
-     *
-     * @return array
-     */
-    public static function back()
-    {
-        return static::to($_SERVER['HTTP_REFERER']);
-    }
+	/**
+	 * Redirect back to the previous page
+	 *
+	 * Makes use of http referrer for redirection
+	 *
+	 * @return array
+	 */
+	public static function back()
+	{
+		return static::to($_SERVER['HTTP_REFERER']);
+	}
 }
\ No newline at end of file

Spacing +5 added lines, -5 removed lines

@@ -31,20 +31,20 @@
         $url = ltrim($url, '/');
         /** @var $r Restler */
         $r = Scope::get('Restler');
-        $base = $r->getBaseUrl() . '/';
+        $base = $r->getBaseUrl().'/';
         if (0 !== strpos($url, 'http')) {
-            $url = $base . $url;
+            $url = $base.$url;
         }
-        if (!empty($flashData) || $base . $r->url !== $url || Util::getRequestMethod() != 'GET') {
+        if (!empty($flashData) || $base.$r->url !== $url || Util::getRequestMethod() != 'GET') {
             if ($r->responseFormat instanceof JsonFormat) {
                 return array('redirect' => $url);
             }
             if (!empty($params)) {
-                $url .= '?' . http_build_query($params);
+                $url .= '?'.http_build_query($params);
             }
             Flash::set($flashData);
             header(
-                "{$_SERVER['SERVER_PROTOCOL']} $status " .
+                "{$_SERVER['SERVER_PROTOCOL']} $status ".
                 (isset(RestException::$codes[$status]) ? RestException::$codes[$status] : '')
             );
             header("Location: $url");

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

Indentation +104 added lines, -104 removed lines

@@ -14,116 +14,116 @@
  */
 class HumanReadableCache implements iCache
 {
-    /**
-     * @var string path of the folder to hold cache files
-     */
-    public static $cacheDir;
+	/**
+	 * @var string path of the folder to hold cache files
+	 */
+	public static $cacheDir;
 
-    public function __construct()
-    {
-        if (is_null(self::$cacheDir)) {
-            self::$cacheDir = Defaults::$cacheDirectory;
-        }
-    }
+	public function __construct()
+	{
+		if (is_null(self::$cacheDir)) {
+			self::$cacheDir = Defaults::$cacheDirectory;
+		}
+	}
 
-    /**
-     * store data in the cache
-     *
-     * @param string $name
-     * @param mixed  $data
-     *
-     * @throws \Exception
-     * @return boolean true if successful
-     */
-    public function set($name, $data)
-    {
-        if (is_array($data)) {
-            $s = '$o = array();' . PHP_EOL . PHP_EOL;
-            $s .= '// ** THIS IS AN AUTO GENERATED FILE.'
-                . ' DO NOT EDIT MANUALLY ** ';
-            foreach ($data as $key => $value) {
-                $s .= PHP_EOL . PHP_EOL .
-                    "//==================== $key ===================="
-                    . PHP_EOL . PHP_EOL;
-                if (is_array($value)) {
-                    $s .= '$o[\'' . $key . '\'] = array();';
-                    foreach ($value as $ke => $va) {
-                        $s .= PHP_EOL . PHP_EOL . "//==== $key $ke ===="
-                            . PHP_EOL . PHP_EOL;
-                        $s .= '$o[\'' . $key . '\'][\'' . $ke . '\'] = ' .
-                            str_replace('  ', '    ',
-                                var_export($va, true)) . ';';
-                    }
-                } else {
-                    $s .= '$o[\'' . $key . '\'] = '
-                        . var_export($value, true) . ';';
-                }
-            }
-            $s .= PHP_EOL . 'return $o;';
-        } else {
-            $s = 'return ' . var_export($data, true) . ';';
-        }
-        $file = $this->_file($name);
-        $r = @file_put_contents($file, "<?php $s");
-        @chmod($file, 0777);
-        if ($r === false) {
-            $this->throwException();
-        }
-        return $r;
-    }
+	/**
+	 * store data in the cache
+	 *
+	 * @param string $name
+	 * @param mixed  $data
+	 *
+	 * @throws \Exception
+	 * @return boolean true if successful
+	 */
+	public function set($name, $data)
+	{
+		if (is_array($data)) {
+			$s = '$o = array();' . PHP_EOL . PHP_EOL;
+			$s .= '// ** THIS IS AN AUTO GENERATED FILE.'
+				. ' DO NOT EDIT MANUALLY ** ';
+			foreach ($data as $key => $value) {
+				$s .= PHP_EOL . PHP_EOL .
+					"//==================== $key ===================="
+					. PHP_EOL . PHP_EOL;
+				if (is_array($value)) {
+					$s .= '$o[\'' . $key . '\'] = array();';
+					foreach ($value as $ke => $va) {
+						$s .= PHP_EOL . PHP_EOL . "//==== $key $ke ===="
+							. PHP_EOL . PHP_EOL;
+						$s .= '$o[\'' . $key . '\'][\'' . $ke . '\'] = ' .
+							str_replace('  ', '    ',
+								var_export($va, true)) . ';';
+					}
+				} else {
+					$s .= '$o[\'' . $key . '\'] = '
+						. var_export($value, true) . ';';
+				}
+			}
+			$s .= PHP_EOL . 'return $o;';
+		} else {
+			$s = 'return ' . var_export($data, true) . ';';
+		}
+		$file = $this->_file($name);
+		$r = @file_put_contents($file, "<?php $s");
+		@chmod($file, 0777);
+		if ($r === false) {
+			$this->throwException();
+		}
+		return $r;
+	}
 
-    /**
-     * retrieve data from the cache
-     *
-     * @param string $name
-     * @param bool   $ignoreErrors
-     *
-     * @return mixed
-     */
-    public function get($name, $ignoreErrors = false)
-    {
-        $file = $this->_file($name);
-        if (file_exists($file)) {
-            return include($file);
-        }
-    }
+	/**
+	 * retrieve data from the cache
+	 *
+	 * @param string $name
+	 * @param bool   $ignoreErrors
+	 *
+	 * @return mixed
+	 */
+	public function get($name, $ignoreErrors = false)
+	{
+		$file = $this->_file($name);
+		if (file_exists($file)) {
+			return include($file);
+		}
+	}
 
-    /**
-     * delete data from the cache
-     *
-     * @param string $name
-     * @param bool   $ignoreErrors
-     *
-     * @return boolean true if successful
-     */
-    public function clear($name, $ignoreErrors = false)
-    {
-        return @unlink($this->_file($name));
-    }
+	/**
+	 * delete data from the cache
+	 *
+	 * @param string $name
+	 * @param bool   $ignoreErrors
+	 *
+	 * @return boolean true if successful
+	 */
+	public function clear($name, $ignoreErrors = false)
+	{
+		return @unlink($this->_file($name));
+	}
 
-    /**
-     * check if the given name is cached
-     *
-     * @param string $name
-     *
-     * @return boolean true if cached
-     */
-    public function isCached($name)
-    {
-        return file_exists($this->_file($name));
-    }
+	/**
+	 * check if the given name is cached
+	 *
+	 * @param string $name
+	 *
+	 * @return boolean true if cached
+	 */
+	public function isCached($name)
+	{
+		return file_exists($this->_file($name));
+	}
 
-    private function _file($name)
-    {
-        return self::$cacheDir . '/' . $name . '.php';
-    }
+	private function _file($name)
+	{
+		return self::$cacheDir . '/' . $name . '.php';
+	}
 
-    private function throwException()
-    {
-        throw new \Exception(
-            'The cache directory `'
-            . self::$cacheDir . '` should exist with write permission.'
-        );
-    }
+	private function throwException()
+	{
+		throw new \Exception(
+			'The cache directory `'
+			. self::$cacheDir . '` should exist with write permission.'
+		);
+	}
 }
 

Spacing +14 added lines, -14 removed lines

@@ -38,30 +38,30 @@ 
     public function set($name, $data)
     {
         if (is_array($data)) {
-            $s = '$o = array();' . PHP_EOL . PHP_EOL;
+            $s = '$o = array();'.PHP_EOL.PHP_EOL;
             $s .= '// ** THIS IS AN AUTO GENERATED FILE.'
                 . ' DO NOT EDIT MANUALLY ** ';
             foreach ($data as $key => $value) {
-                $s .= PHP_EOL . PHP_EOL .
+                $s .= PHP_EOL.PHP_EOL.
                     "//==================== $key ===================="
-                    . PHP_EOL . PHP_EOL;
+                    . PHP_EOL.PHP_EOL;
                 if (is_array($value)) {
-                    $s .= '$o[\'' . $key . '\'] = array();';
+                    $s .= '$o[\''.$key.'\'] = array();';
                     foreach ($value as $ke => $va) {
-                        $s .= PHP_EOL . PHP_EOL . "//==== $key $ke ===="
-                            . PHP_EOL . PHP_EOL;
-                        $s .= '$o[\'' . $key . '\'][\'' . $ke . '\'] = ' .
+                        $s .= PHP_EOL.PHP_EOL."//==== $key $ke ===="
+                            . PHP_EOL.PHP_EOL;
+                        $s .= '$o[\''.$key.'\'][\''.$ke.'\'] = '.
                             str_replace('  ', '    ',
-                                var_export($va, true)) . ';';
+                                var_export($va, true)).';';
                     }
                 } else {
-                    $s .= '$o[\'' . $key . '\'] = '
-                        . var_export($value, true) . ';';
+                    $s .= '$o[\''.$key.'\'] = '
+                        . var_export($value, true).';';
                 }
             }
-            $s .= PHP_EOL . 'return $o;';
+            $s .= PHP_EOL.'return $o;';
         } else {
-            $s = 'return ' . var_export($data, true) . ';';
+            $s = 'return '.var_export($data, true).';';
         }
         $file = $this->_file($name);
         $r = @file_put_contents($file, "<?php $s");
@@ -115,14 +115,14 @@ 
 
     private function _file($name)
     {
-        return self::$cacheDir . '/' . $name . '.php';
+        return self::$cacheDir.'/'.$name.'.php';
     }
 
     private function throwException()
     {
         throw new \Exception(
             'The cache directory `'
-            . self::$cacheDir . '` should exist with write permission.'
+            . self::$cacheDir.'` should exist with write permission.'
         );
     }
 }

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

Indentation +755 added lines, -755 removed lines

@@ -21,45 +21,45 @@ 
  */
 class Routes
 {
-    public static $prefixingParameterNames = array(
-        'id'
-    );
+	public static $prefixingParameterNames = array(
+		'id'
+	);
 
-    public static $fieldTypesByName = array(
-        'email'       => 'email',
-        'password'    => 'password',
-        'phone'       => 'tel',
-        'mobile'      => 'tel',
-        'tel'         => 'tel',
-        'search'      => 'search',
-        'date'        => 'date',
-        'created_at'  => 'datetime',
-        'modified_at' => 'datetime',
-        'url'         => 'url',
-        'link'        => 'url',
-        'href'        => 'url',
-        'website'     => 'url',
-        'color'       => 'color',
-        'colour'      => 'color',
-    );
+	public static $fieldTypesByName = array(
+		'email'       => 'email',
+		'password'    => 'password',
+		'phone'       => 'tel',
+		'mobile'      => 'tel',
+		'tel'         => 'tel',
+		'search'      => 'search',
+		'date'        => 'date',
+		'created_at'  => 'datetime',
+		'modified_at' => 'datetime',
+		'url'         => 'url',
+		'link'        => 'url',
+		'href'        => 'url',
+		'website'     => 'url',
+		'color'       => 'color',
+		'colour'      => 'color',
+	);
 
-    protected static $routes = array();
+	protected static $routes = array();
 
-    protected static $models = array();
+	protected static $models = array();
 
-    /**
-     * Route the public and protected methods of an Api class
-     *
-     * @param string $className
-     * @param string $resourcePath
-     * @param int    $version
-     *
-     * @throws RestException
-     */
-    public static function addAPIClass($className, $resourcePath = '', $version = 1)
-    {
+	/**
+	 * Route the public and protected methods of an Api class
+	 *
+	 * @param string $className
+	 * @param string $resourcePath
+	 * @param int    $version
+	 *
+	 * @throws RestException
+	 */
+	public static function addAPIClass($className, $resourcePath = '', $version = 1)
+	{
 
-        /*
+		/*
          * Mapping Rules
          * =============
          *
@@ -74,749 +74,749 @@ 
          * - If a required parameter is not primitive type
          *      - Do not include it in URL
          */
-        $class = new ReflectionClass($className);
-        $dataName = CommentParser::$embeddedDataName;
-        try {
-            $classMetadata = CommentParser::parse($class->getDocComment());
-        } catch (Exception $e) {
-            throw new RestException(500, "Error while parsing comments of `$className` class. " . $e->getMessage());
-        }
-        $classMetadata['scope'] = $scope = static::scope($class);
-        $methods = $class->getMethods(ReflectionMethod::IS_PUBLIC +
-            ReflectionMethod::IS_PROTECTED);
-        foreach ($methods as $method) {
-            $methodUrl = strtolower($method->getName());
-            //method name should not begin with _
-            if ($methodUrl[0] == '_') {
-                continue;
-            }
-            $doc = $method->getDocComment();
+		$class = new ReflectionClass($className);
+		$dataName = CommentParser::$embeddedDataName;
+		try {
+			$classMetadata = CommentParser::parse($class->getDocComment());
+		} catch (Exception $e) {
+			throw new RestException(500, "Error while parsing comments of `$className` class. " . $e->getMessage());
+		}
+		$classMetadata['scope'] = $scope = static::scope($class);
+		$methods = $class->getMethods(ReflectionMethod::IS_PUBLIC +
+			ReflectionMethod::IS_PROTECTED);
+		foreach ($methods as $method) {
+			$methodUrl = strtolower($method->getName());
+			//method name should not begin with _
+			if ($methodUrl[0] == '_') {
+				continue;
+			}
+			$doc = $method->getDocComment();
 
-            try {
-                $metadata = CommentParser::parse($doc) + $classMetadata;
-            } catch (Exception $e) {
-                throw new RestException(500, "Error while parsing comments of `{$className}::{$method->getName()}` method. " . $e->getMessage());
-            }
-            //@access should not be private
-            if (isset($metadata['access'])
-                && $metadata['access'] == 'private'
-            ) {
-                continue;
-            }
-            $arguments = array();
-            $defaults = array();
-            $params = $method->getParameters();
-            $position = 0;
-            $pathParams = array();
-            $allowAmbiguity
-                = (isset($metadata['smart-auto-routing'])
-                    && $metadata['smart-auto-routing'] != 'true')
-                || !Defaults::$smartAutoRouting;
-            $metadata['resourcePath'] = trim($resourcePath, '/');
-            if (isset($classMetadata['description'])) {
-                $metadata['classDescription'] = $classMetadata['description'];
-            }
-            if (isset($classMetadata['classLongDescription'])) {
-                $metadata['classLongDescription']
-                    = $classMetadata['longDescription'];
-            }
-            if (!isset($metadata['param'])) {
-                $metadata['param'] = array();
-            }
-            if (isset($metadata['return']['type'])) {
-                if ($qualified = Scope::resolve($metadata['return']['type'], $scope))
-                    list($metadata['return']['type'], $metadata['return']['children']) =
-                        static::getTypeAndModel(new ReflectionClass($qualified), $scope);
-            } else {
-                //assume return type is array
-                $metadata['return']['type'] = 'array';
-            }
-            foreach ($params as $param) {
-                $children = array();
-                $type =
-                    $param->isArray() ? 'array' : $param->getClass();
-                $arguments[$param->getName()] = $position;
-                $defaults[$position] = $param->isDefaultValueAvailable() ?
-                    $param->getDefaultValue() : null;
-                if (!isset($metadata['param'][$position])) {
-                    $metadata['param'][$position] = array();
-                }
-                $m = & $metadata ['param'] [$position];
-                $m ['name'] = $param->getName();
-                if (!isset($m[$dataName])) {
-                    $m[$dataName] = array();
-                }
-                $p = &$m[$dataName];
-                if (empty($m['label']))
-                    $m['label'] = Text::title($m['name']);
-                if (is_null($type) && isset($m['type'])) {
-                    $type = $m['type'];
-                }
-                if (isset(static::$fieldTypesByName[$m['name']]) && empty($p['type']) && $type == 'string') {
-                    $p['type'] = static::$fieldTypesByName[$m['name']];
-                }
-                $m ['default'] = $defaults [$position];
-                $m ['required'] = !$param->isOptional();
-                $contentType = Util::nestedValue($p,'type');
-                if ($type == 'array' && $contentType && $qualified = Scope::resolve($contentType, $scope)) {
-                    list($p['type'], $children, $modelName) = static::getTypeAndModel(
-                        new ReflectionClass($qualified), $scope,
-                        $className . Text::title($methodUrl), $p
-                    );
-                }
-                if ($type instanceof ReflectionClass) {
-                    list($type, $children, $modelName) = static::getTypeAndModel($type, $scope,
-                        $className . Text::title($methodUrl), $p);
-                } elseif ($type && is_string($type) && $qualified = Scope::resolve($type, $scope)) {
-                    list($type, $children, $modelName)
-                        = static::getTypeAndModel(new ReflectionClass($qualified), $scope,
-                        $className . Text::title($methodUrl), $p);
-                }
-                if (isset($type)) {
-                    $m['type'] = $type;
-                }
+			try {
+				$metadata = CommentParser::parse($doc) + $classMetadata;
+			} catch (Exception $e) {
+				throw new RestException(500, "Error while parsing comments of `{$className}::{$method->getName()}` method. " . $e->getMessage());
+			}
+			//@access should not be private
+			if (isset($metadata['access'])
+				&& $metadata['access'] == 'private'
+			) {
+				continue;
+			}
+			$arguments = array();
+			$defaults = array();
+			$params = $method->getParameters();
+			$position = 0;
+			$pathParams = array();
+			$allowAmbiguity
+				= (isset($metadata['smart-auto-routing'])
+					&& $metadata['smart-auto-routing'] != 'true')
+				|| !Defaults::$smartAutoRouting;
+			$metadata['resourcePath'] = trim($resourcePath, '/');
+			if (isset($classMetadata['description'])) {
+				$metadata['classDescription'] = $classMetadata['description'];
+			}
+			if (isset($classMetadata['classLongDescription'])) {
+				$metadata['classLongDescription']
+					= $classMetadata['longDescription'];
+			}
+			if (!isset($metadata['param'])) {
+				$metadata['param'] = array();
+			}
+			if (isset($metadata['return']['type'])) {
+				if ($qualified = Scope::resolve($metadata['return']['type'], $scope))
+					list($metadata['return']['type'], $metadata['return']['children']) =
+						static::getTypeAndModel(new ReflectionClass($qualified), $scope);
+			} else {
+				//assume return type is array
+				$metadata['return']['type'] = 'array';
+			}
+			foreach ($params as $param) {
+				$children = array();
+				$type =
+					$param->isArray() ? 'array' : $param->getClass();
+				$arguments[$param->getName()] = $position;
+				$defaults[$position] = $param->isDefaultValueAvailable() ?
+					$param->getDefaultValue() : null;
+				if (!isset($metadata['param'][$position])) {
+					$metadata['param'][$position] = array();
+				}
+				$m = & $metadata ['param'] [$position];
+				$m ['name'] = $param->getName();
+				if (!isset($m[$dataName])) {
+					$m[$dataName] = array();
+				}
+				$p = &$m[$dataName];
+				if (empty($m['label']))
+					$m['label'] = Text::title($m['name']);
+				if (is_null($type) && isset($m['type'])) {
+					$type = $m['type'];
+				}
+				if (isset(static::$fieldTypesByName[$m['name']]) && empty($p['type']) && $type == 'string') {
+					$p['type'] = static::$fieldTypesByName[$m['name']];
+				}
+				$m ['default'] = $defaults [$position];
+				$m ['required'] = !$param->isOptional();
+				$contentType = Util::nestedValue($p,'type');
+				if ($type == 'array' && $contentType && $qualified = Scope::resolve($contentType, $scope)) {
+					list($p['type'], $children, $modelName) = static::getTypeAndModel(
+						new ReflectionClass($qualified), $scope,
+						$className . Text::title($methodUrl), $p
+					);
+				}
+				if ($type instanceof ReflectionClass) {
+					list($type, $children, $modelName) = static::getTypeAndModel($type, $scope,
+						$className . Text::title($methodUrl), $p);
+				} elseif ($type && is_string($type) && $qualified = Scope::resolve($type, $scope)) {
+					list($type, $children, $modelName)
+						= static::getTypeAndModel(new ReflectionClass($qualified), $scope,
+						$className . Text::title($methodUrl), $p);
+				}
+				if (isset($type)) {
+					$m['type'] = $type;
+				}
 
-                $m['children'] = $children;
-                if (isset($modelName)) {
-                    $m['model'] = $modelName;
-                }
-                if ($m['name'] == Defaults::$fullRequestDataName) {
-                    $from = 'body';
-                    if (!isset($m['type'])) {
-                        $type = $m['type'] = 'array';
-                    }
+				$m['children'] = $children;
+				if (isset($modelName)) {
+					$m['model'] = $modelName;
+				}
+				if ($m['name'] == Defaults::$fullRequestDataName) {
+					$from = 'body';
+					if (!isset($m['type'])) {
+						$type = $m['type'] = 'array';
+					}
 
-                } elseif (isset($p['from'])) {
-                    $from = $p['from'];
-                } else {
-                    if ((isset($type) && Util::isObjectOrArray($type))
-                    ) {
-                        $from = 'body';
-                        if (!isset($type)) {
-                            $type = $m['type'] = 'array';
-                        }
-                    } elseif ($m['required'] && in_array($m['name'], static::$prefixingParameterNames)) {
-                        $from = 'path';
-                    } else {
-                        $from = 'body';
-                    }
-                }
-                $p['from'] = $from;
-                if (!isset($m['type'])) {
-                    $type = $m['type'] = static::type($defaults[$position]);
-                }
+				} elseif (isset($p['from'])) {
+					$from = $p['from'];
+				} else {
+					if ((isset($type) && Util::isObjectOrArray($type))
+					) {
+						$from = 'body';
+						if (!isset($type)) {
+							$type = $m['type'] = 'array';
+						}
+					} elseif ($m['required'] && in_array($m['name'], static::$prefixingParameterNames)) {
+						$from = 'path';
+					} else {
+						$from = 'body';
+					}
+				}
+				$p['from'] = $from;
+				if (!isset($m['type'])) {
+					$type = $m['type'] = static::type($defaults[$position]);
+				}
 
-                if ($allowAmbiguity || $from == 'path') {
-                    $pathParams [] = $position;
-                }
-                $position++;
-            }
-            $accessLevel = 0;
-            if ($method->isProtected()) {
-                $accessLevel = 3;
-            } elseif (isset($metadata['access'])) {
-                if ($metadata['access'] == 'protected') {
-                    $accessLevel = 2;
-                } elseif ($metadata['access'] == 'hybrid') {
-                    $accessLevel = 1;
-                }
-            } elseif (isset($metadata['protected'])) {
-                $accessLevel = 2;
-            }
-            /*
+				if ($allowAmbiguity || $from == 'path') {
+					$pathParams [] = $position;
+				}
+				$position++;
+			}
+			$accessLevel = 0;
+			if ($method->isProtected()) {
+				$accessLevel = 3;
+			} elseif (isset($metadata['access'])) {
+				if ($metadata['access'] == 'protected') {
+					$accessLevel = 2;
+				} elseif ($metadata['access'] == 'hybrid') {
+					$accessLevel = 1;
+				}
+			} elseif (isset($metadata['protected'])) {
+				$accessLevel = 2;
+			}
+			/*
             echo " access level $accessLevel for $className::"
             .$method->getName().$method->isProtected().PHP_EOL;
             */
 
-            // take note of the order
-            $call = array(
-                'url' => null,
-                'className' => $className,
-                'path' => rtrim($resourcePath, '/'),
-                'methodName' => $method->getName(),
-                'arguments' => $arguments,
-                'defaults' => $defaults,
-                'metadata' => $metadata,
-                'accessLevel' => $accessLevel,
-            );
-            // if manual route
-            if (preg_match_all(
-                '/@url\s+(GET|POST|PUT|PATCH|DELETE|HEAD|OPTIONS)'
-                . '[ \t]*\/?(\S*)/s',
-                $doc, $matches, PREG_SET_ORDER
-            )
-            ) {
-                foreach ($matches as $match) {
-                    $httpMethod = $match[1];
-                    $url = rtrim($resourcePath . $match[2], '/');
-                    //deep copy the call, as it may change for each @url
-                    $copy = unserialize(serialize($call));
-                    foreach ($copy['metadata']['param'] as $i => $p) {
-                        $inPath =
-                            strpos($url, '{' . $p['name'] . '}') ||
-                            strpos($url, ':' . $p['name']);
-                        if ($inPath) {
-                            $copy['metadata']['param'][$i][$dataName]['from'] = 'path';
-                        } elseif ($httpMethod == 'GET' || $httpMethod == 'DELETE') {
-                            $copy['metadata']['param'][$i][$dataName]['from'] = 'query';
-                        } elseif (empty($p[$dataName]['from']) || $p[$dataName]['from'] == 'path') {
-                            $copy['metadata']['param'][$i][$dataName]['from'] = 'body';
-                        }
-                    }
-                    $url = preg_replace_callback('/{[^}]+}|:[^\/]+/',
-                        function ($matches) use ($copy) {
-                            $match = trim($matches[0], '{}:');
-                            $index = $copy['arguments'][$match];
-                            return '{' .
-                            Routes::typeChar(isset(
-                                $copy['metadata']['param'][$index]['type'])
-                                ? $copy['metadata']['param'][$index]['type']
-                                : null)
-                            . $index . '}';
-                        }, $url);
-                    static::addPath($url, $copy, $httpMethod, $version);
-                }
-                //if auto route enabled, do so
-            } elseif (Defaults::$autoRoutingEnabled) {
-                // no configuration found so use convention
-                if (preg_match_all(
-                    '/^(GET|POST|PUT|PATCH|DELETE|HEAD|OPTIONS)/i',
-                    $methodUrl, $matches)
-                ) {
-                    $httpMethod = strtoupper($matches[0][0]);
-                    $methodUrl = substr($methodUrl, strlen($httpMethod));
-                } else {
-                    $httpMethod = 'GET';
-                }
-                if ($methodUrl == 'index') {
-                    $methodUrl = '';
-                }
-                $url = empty($methodUrl) ? rtrim($resourcePath, '/')
-                    : $resourcePath . $methodUrl;
-                for ($position = 0; $position < count($params); $position++) {
-                    $from = $metadata['param'][$position][$dataName]['from'];
-                    if ($from == 'body' && ($httpMethod == 'GET' ||
-                            $httpMethod == 'DELETE')
-                    ) {
-                        $call['metadata']['param'][$position][$dataName]['from']
-                            = 'query';
-                    }
-                }
-                if (empty($pathParams) || $allowAmbiguity) {
-                    static::addPath($url, $call, $httpMethod, $version);
-                }
-                $lastPathParam = end($pathParams);
-                foreach ($pathParams as $position) {
-                    if (!empty($url))
-                        $url .= '/';
-                    $url .= '{' .
-                        static::typeChar(isset($call['metadata']['param'][$position]['type'])
-                            ? $call['metadata']['param'][$position]['type']
-                            : null)
-                        . $position . '}';
-                    if ($allowAmbiguity || $position == $lastPathParam) {
-                        static::addPath($url, $call, $httpMethod, $version);
-                    }
-                }
-            }
-        }
-    }
+			// take note of the order
+			$call = array(
+				'url' => null,
+				'className' => $className,
+				'path' => rtrim($resourcePath, '/'),
+				'methodName' => $method->getName(),
+				'arguments' => $arguments,
+				'defaults' => $defaults,
+				'metadata' => $metadata,
+				'accessLevel' => $accessLevel,
+			);
+			// if manual route
+			if (preg_match_all(
+				'/@url\s+(GET|POST|PUT|PATCH|DELETE|HEAD|OPTIONS)'
+				. '[ \t]*\/?(\S*)/s',
+				$doc, $matches, PREG_SET_ORDER
+			)
+			) {
+				foreach ($matches as $match) {
+					$httpMethod = $match[1];
+					$url = rtrim($resourcePath . $match[2], '/');
+					//deep copy the call, as it may change for each @url
+					$copy = unserialize(serialize($call));
+					foreach ($copy['metadata']['param'] as $i => $p) {
+						$inPath =
+							strpos($url, '{' . $p['name'] . '}') ||
+							strpos($url, ':' . $p['name']);
+						if ($inPath) {
+							$copy['metadata']['param'][$i][$dataName]['from'] = 'path';
+						} elseif ($httpMethod == 'GET' || $httpMethod == 'DELETE') {
+							$copy['metadata']['param'][$i][$dataName]['from'] = 'query';
+						} elseif (empty($p[$dataName]['from']) || $p[$dataName]['from'] == 'path') {
+							$copy['metadata']['param'][$i][$dataName]['from'] = 'body';
+						}
+					}
+					$url = preg_replace_callback('/{[^}]+}|:[^\/]+/',
+						function ($matches) use ($copy) {
+							$match = trim($matches[0], '{}:');
+							$index = $copy['arguments'][$match];
+							return '{' .
+							Routes::typeChar(isset(
+								$copy['metadata']['param'][$index]['type'])
+								? $copy['metadata']['param'][$index]['type']
+								: null)
+							. $index . '}';
+						}, $url);
+					static::addPath($url, $copy, $httpMethod, $version);
+				}
+				//if auto route enabled, do so
+			} elseif (Defaults::$autoRoutingEnabled) {
+				// no configuration found so use convention
+				if (preg_match_all(
+					'/^(GET|POST|PUT|PATCH|DELETE|HEAD|OPTIONS)/i',
+					$methodUrl, $matches)
+				) {
+					$httpMethod = strtoupper($matches[0][0]);
+					$methodUrl = substr($methodUrl, strlen($httpMethod));
+				} else {
+					$httpMethod = 'GET';
+				}
+				if ($methodUrl == 'index') {
+					$methodUrl = '';
+				}
+				$url = empty($methodUrl) ? rtrim($resourcePath, '/')
+					: $resourcePath . $methodUrl;
+				for ($position = 0; $position < count($params); $position++) {
+					$from = $metadata['param'][$position][$dataName]['from'];
+					if ($from == 'body' && ($httpMethod == 'GET' ||
+							$httpMethod == 'DELETE')
+					) {
+						$call['metadata']['param'][$position][$dataName]['from']
+							= 'query';
+					}
+				}
+				if (empty($pathParams) || $allowAmbiguity) {
+					static::addPath($url, $call, $httpMethod, $version);
+				}
+				$lastPathParam = end($pathParams);
+				foreach ($pathParams as $position) {
+					if (!empty($url))
+						$url .= '/';
+					$url .= '{' .
+						static::typeChar(isset($call['metadata']['param'][$position]['type'])
+							? $call['metadata']['param'][$position]['type']
+							: null)
+						. $position . '}';
+					if ($allowAmbiguity || $position == $lastPathParam) {
+						static::addPath($url, $call, $httpMethod, $version);
+					}
+				}
+			}
+		}
+	}
 
-    /**
-     * @access private
-     */
-    public static function typeChar($type = null)
-    {
-        if (!$type) {
-            return 's';
-        }
-        switch ($type[0]) {
-            case 'i':
-            case 'f':
-                return 'n';
-        }
-        return 's';
-    }
+	/**
+	 * @access private
+	 */
+	public static function typeChar($type = null)
+	{
+		if (!$type) {
+			return 's';
+		}
+		switch ($type[0]) {
+			case 'i':
+			case 'f':
+				return 'n';
+		}
+		return 's';
+	}
 
-    protected static function addPath($path, array $call,
-        $httpMethod = 'GET', $version = 1)
-    {
-        $call['url'] = preg_replace_callback(
-            "/\{\S(\d+)\}/",
-            function ($matches) use ($call) {
-                return '{' .
-                $call['metadata']['param'][$matches[1]]['name'] . '}';
-            },
-            $path
-        );
-        //check for wildcard routes
-        if (substr($path, -1, 1) == '*') {
-            $path = rtrim($path, '/*');
-            static::$routes["v$version"]['*'][$path][$httpMethod] = $call;
-        } else {
-            static::$routes["v$version"][$path][$httpMethod] = $call;
-            //create an alias with index if the method name is index
-            if ($call['methodName'] == 'index')
-                static::$routes["v$version"][ltrim("$path/index", '/')][$httpMethod] = $call;
-        }
-    }
+	protected static function addPath($path, array $call,
+		$httpMethod = 'GET', $version = 1)
+	{
+		$call['url'] = preg_replace_callback(
+			"/\{\S(\d+)\}/",
+			function ($matches) use ($call) {
+				return '{' .
+				$call['metadata']['param'][$matches[1]]['name'] . '}';
+			},
+			$path
+		);
+		//check for wildcard routes
+		if (substr($path, -1, 1) == '*') {
+			$path = rtrim($path, '/*');
+			static::$routes["v$version"]['*'][$path][$httpMethod] = $call;
+		} else {
+			static::$routes["v$version"][$path][$httpMethod] = $call;
+			//create an alias with index if the method name is index
+			if ($call['methodName'] == 'index')
+				static::$routes["v$version"][ltrim("$path/index", '/')][$httpMethod] = $call;
+		}
+	}
 
-    /**
-     * Find the api method for the given url and http method
-     *
-     * @param string $path       Requested url path
-     * @param string $httpMethod GET|POST|PUT|PATCH|DELETE etc
-     * @param int    $version    Api Version number
-     * @param array  $data       Data collected from the request
-     *
-     * @throws RestException
-     * @return ApiMethodInfo
-     */
-    public static function find($path, $httpMethod,
-        $version = 1, array $data = array())
-    {
-        $p = Util::nestedValue(static::$routes, "v$version");
-        if (!$p) {
-            throw new RestException(
-                404,
-                $version == 1 ? '' : "Version $version is not supported"
-            );
-        }
-        $status = 404;
-        $message = null;
-        $methods = array();
-        if (isset($p[$path][$httpMethod])) {
-            //================== static routes ==========================
-            return static::populate($p[$path][$httpMethod], $data);
-        } elseif (isset($p['*'])) {
-            //================== wildcard routes ========================
-            uksort($p['*'], function ($a, $b) {
-                return strlen($b) - strlen($a);
-            });
-            foreach ($p['*'] as $key => $value) {
-                if (strpos($path, $key) === 0 && isset($value[$httpMethod])) {
-                    //path found, convert rest of the path to parameters
-                    $path = substr($path, strlen($key) + 1);
-                    $call = ApiMethodInfo::__set_state($value[$httpMethod]);
-                    $call->parameters = empty($path)
-                        ? array()
-                        : explode('/', $path);
-                    return $call;
-                }
-            }
-        }
-        //================== dynamic routes =============================
-        //add newline char if trailing slash is found
-        if (substr($path, -1) == '/')
-            $path .= PHP_EOL;
-        //if double slash is found fill in newline char;
-        $path = str_replace('//', '/' . PHP_EOL . '/', $path);
-        ksort($p);
-        foreach ($p as $key => $value) {
-            if (!isset($value[$httpMethod])) {
-                continue;
-            }
-            $regex = str_replace(array('{', '}'),
-                array('(?P<', '>[^/]+)'), $key);
-            if (preg_match_all(":^$regex$:i", $path, $matches, PREG_SET_ORDER)) {
-                $matches = $matches[0];
-                $found = true;
-                foreach ($matches as $k => $v) {
-                    if (is_numeric($k)) {
-                        unset($matches[$k]);
-                        continue;
-                    }
-                    $index = intval(substr($k, 1));
-                    $details = $value[$httpMethod]['metadata']['param'][$index];
-                    if ($k[0] == 's' || strpos($k, static::pathVarTypeOf($v)) === 0) {
-                        //remove the newlines
-                        $data[$details['name']] = trim($v, PHP_EOL);
-                    } else {
-                        $status = 400;
-                        $message = 'invalid value specified for `'
-                            . $details['name'] . '`';
-                        $found = false;
-                        break;
-                    }
-                }
-                if ($found) {
-                    return static::populate($value[$httpMethod], $data);
-                }
-            }
-        }
-        if ($status == 404) {
-            //check if other methods are allowed
-            if (isset($p[$path])) {
-                $status = 405;
-                $methods = array_keys($p[$path]);
-            }
-        }
-        if ($status == 405) {
-            header('Allow: ' . implode(', ', $methods));
-        }
-        throw new RestException($status, $message);
-    }
+	/**
+	 * Find the api method for the given url and http method
+	 *
+	 * @param string $path       Requested url path
+	 * @param string $httpMethod GET|POST|PUT|PATCH|DELETE etc
+	 * @param int    $version    Api Version number
+	 * @param array  $data       Data collected from the request
+	 *
+	 * @throws RestException
+	 * @return ApiMethodInfo
+	 */
+	public static function find($path, $httpMethod,
+		$version = 1, array $data = array())
+	{
+		$p = Util::nestedValue(static::$routes, "v$version");
+		if (!$p) {
+			throw new RestException(
+				404,
+				$version == 1 ? '' : "Version $version is not supported"
+			);
+		}
+		$status = 404;
+		$message = null;
+		$methods = array();
+		if (isset($p[$path][$httpMethod])) {
+			//================== static routes ==========================
+			return static::populate($p[$path][$httpMethod], $data);
+		} elseif (isset($p['*'])) {
+			//================== wildcard routes ========================
+			uksort($p['*'], function ($a, $b) {
+				return strlen($b) - strlen($a);
+			});
+			foreach ($p['*'] as $key => $value) {
+				if (strpos($path, $key) === 0 && isset($value[$httpMethod])) {
+					//path found, convert rest of the path to parameters
+					$path = substr($path, strlen($key) + 1);
+					$call = ApiMethodInfo::__set_state($value[$httpMethod]);
+					$call->parameters = empty($path)
+						? array()
+						: explode('/', $path);
+					return $call;
+				}
+			}
+		}
+		//================== dynamic routes =============================
+		//add newline char if trailing slash is found
+		if (substr($path, -1) == '/')
+			$path .= PHP_EOL;
+		//if double slash is found fill in newline char;
+		$path = str_replace('//', '/' . PHP_EOL . '/', $path);
+		ksort($p);
+		foreach ($p as $key => $value) {
+			if (!isset($value[$httpMethod])) {
+				continue;
+			}
+			$regex = str_replace(array('{', '}'),
+				array('(?P<', '>[^/]+)'), $key);
+			if (preg_match_all(":^$regex$:i", $path, $matches, PREG_SET_ORDER)) {
+				$matches = $matches[0];
+				$found = true;
+				foreach ($matches as $k => $v) {
+					if (is_numeric($k)) {
+						unset($matches[$k]);
+						continue;
+					}
+					$index = intval(substr($k, 1));
+					$details = $value[$httpMethod]['metadata']['param'][$index];
+					if ($k[0] == 's' || strpos($k, static::pathVarTypeOf($v)) === 0) {
+						//remove the newlines
+						$data[$details['name']] = trim($v, PHP_EOL);
+					} else {
+						$status = 400;
+						$message = 'invalid value specified for `'
+							. $details['name'] . '`';
+						$found = false;
+						break;
+					}
+				}
+				if ($found) {
+					return static::populate($value[$httpMethod], $data);
+				}
+			}
+		}
+		if ($status == 404) {
+			//check if other methods are allowed
+			if (isset($p[$path])) {
+				$status = 405;
+				$methods = array_keys($p[$path]);
+			}
+		}
+		if ($status == 405) {
+			header('Allow: ' . implode(', ', $methods));
+		}
+		throw new RestException($status, $message);
+	}
 
-    public static function findAll(array $excludedPaths = array(), array $excludedHttpMethods = array(), $version = 1)
-    {
-        $map = array();
-        $all = Util::nestedValue(self::$routes, "v$version");
-        $filter = array();
-        if (isset($all['*'])) {
-            $all = $all['*'] + $all;
-            unset($all['*']);
-        }
-        if(is_array($all)){
-            foreach ($all as $fullPath => $routes) {
-                foreach ($routes as $httpMethod => $route) {
-                    if (in_array($httpMethod, $excludedHttpMethods)) {
-                        continue;
-                    }
-                    foreach ($excludedPaths as $exclude) {
-                        if (empty($exclude)) {
-                            if ($fullPath == $exclude || $fullPath == 'index')
-                                continue 2;
-                        } elseif (Text::beginsWith($fullPath, $exclude)) {
-                            continue 2;
-                        }
-                    }
-                    $hash = "$httpMethod " . $route['url'];
-                    if (!isset($filter[$hash])) {
-                        $route['httpMethod'] = $httpMethod;
-                        $map[$route['metadata']['resourcePath']][]
-                            = array('access' => static::verifyAccess($route), 'route' => $route, 'hash' => $hash);
-                        $filter[$hash] = true;
-                    }
-                }
-            }
-        }
-        return $map;
-    }
+	public static function findAll(array $excludedPaths = array(), array $excludedHttpMethods = array(), $version = 1)
+	{
+		$map = array();
+		$all = Util::nestedValue(self::$routes, "v$version");
+		$filter = array();
+		if (isset($all['*'])) {
+			$all = $all['*'] + $all;
+			unset($all['*']);
+		}
+		if(is_array($all)){
+			foreach ($all as $fullPath => $routes) {
+				foreach ($routes as $httpMethod => $route) {
+					if (in_array($httpMethod, $excludedHttpMethods)) {
+						continue;
+					}
+					foreach ($excludedPaths as $exclude) {
+						if (empty($exclude)) {
+							if ($fullPath == $exclude || $fullPath == 'index')
+								continue 2;
+						} elseif (Text::beginsWith($fullPath, $exclude)) {
+							continue 2;
+						}
+					}
+					$hash = "$httpMethod " . $route['url'];
+					if (!isset($filter[$hash])) {
+						$route['httpMethod'] = $httpMethod;
+						$map[$route['metadata']['resourcePath']][]
+							= array('access' => static::verifyAccess($route), 'route' => $route, 'hash' => $hash);
+						$filter[$hash] = true;
+					}
+				}
+			}
+		}
+		return $map;
+	}
 
-    public static function verifyAccess($route)
-    {
-        if ($route['accessLevel'] < 2)
-            return true;
-        /** @var Restler $r */
-        $r = Scope::get('Restler');
-        $authenticated = $r->_authenticated;
-        if (!$authenticated && $route['accessLevel'] > 1)
-            return false;
-        if (
-            $authenticated &&
-            Defaults::$accessControlFunction &&
-            (!call_user_func(Defaults::$accessControlFunction, $route['metadata']))
-        ) {
-            return false;
-        }
-        return true;
-    }
+	public static function verifyAccess($route)
+	{
+		if ($route['accessLevel'] < 2)
+			return true;
+		/** @var Restler $r */
+		$r = Scope::get('Restler');
+		$authenticated = $r->_authenticated;
+		if (!$authenticated && $route['accessLevel'] > 1)
+			return false;
+		if (
+			$authenticated &&
+			Defaults::$accessControlFunction &&
+			(!call_user_func(Defaults::$accessControlFunction, $route['metadata']))
+		) {
+			return false;
+		}
+		return true;
+	}
 
 
-    /**
-     * Populates the parameter values
-     *
-     * @param array $call
-     * @param       $data
-     *
-     * @return ApiMethodInfo
-     *
-     * @access private
-     */
-    protected static function populate(array $call, $data)
-    {
-        $call['parameters'] = $call['defaults'];
-        $p = & $call['parameters'];
-        $dataName = CommentParser::$embeddedDataName;
-        foreach ($data as $key => $value) {
-            if (isset($call['arguments'][$key])) {
-                $p[$call['arguments'][$key]] = $value;
-            }
-        }
-        if (Defaults::$smartParameterParsing) {
-            if (
-                ($m = Util::nestedValue($call, 'metadata', 'param', 0)) &&
-                !array_key_exists($m['name'], $data) &&
-                array_key_exists(Defaults::$fullRequestDataName, $data) &&
-                !is_null($d = $data[Defaults::$fullRequestDataName]) &&
-                isset($m['type']) &&
-                static::typeMatch($m['type'], $d)
-            ) {
-                $p[0] = $d;
-            } else {
-                $bodyParamCount = 0;
-                $lastBodyParamIndex = -1;
-                $lastM = null;
-                foreach ($call['metadata']['param'] as $k => $m) {
-                    if ($m[$dataName]['from'] == 'body') {
-                        $bodyParamCount++;
-                        $lastBodyParamIndex = $k;
-                        $lastM = $m;
-                    }
-                }
-                if (
-                    $bodyParamCount == 1 &&
-                    !array_key_exists($lastM['name'], $data) &&
-                    array_key_exists(Defaults::$fullRequestDataName, $data) &&
-                    !is_null($d = $data[Defaults::$fullRequestDataName])
-                ) {
-                    $p[$lastBodyParamIndex] = $d;
-                }
-            }
-        }
-        $r = ApiMethodInfo::__set_state($call);
-        $modifier = "_modify_{$r->methodName}_api";
-        if (method_exists($r->className, $modifier)) {
-            $stage = end(Scope::get('Restler')->getEvents());
-            if (empty($stage))
-                $stage = 'setup';
-            $r = Scope::get($r->className)->$modifier($r, $stage) ? : $r;
-        }
-        return $r;
-    }
+	/**
+	 * Populates the parameter values
+	 *
+	 * @param array $call
+	 * @param       $data
+	 *
+	 * @return ApiMethodInfo
+	 *
+	 * @access private
+	 */
+	protected static function populate(array $call, $data)
+	{
+		$call['parameters'] = $call['defaults'];
+		$p = & $call['parameters'];
+		$dataName = CommentParser::$embeddedDataName;
+		foreach ($data as $key => $value) {
+			if (isset($call['arguments'][$key])) {
+				$p[$call['arguments'][$key]] = $value;
+			}
+		}
+		if (Defaults::$smartParameterParsing) {
+			if (
+				($m = Util::nestedValue($call, 'metadata', 'param', 0)) &&
+				!array_key_exists($m['name'], $data) &&
+				array_key_exists(Defaults::$fullRequestDataName, $data) &&
+				!is_null($d = $data[Defaults::$fullRequestDataName]) &&
+				isset($m['type']) &&
+				static::typeMatch($m['type'], $d)
+			) {
+				$p[0] = $d;
+			} else {
+				$bodyParamCount = 0;
+				$lastBodyParamIndex = -1;
+				$lastM = null;
+				foreach ($call['metadata']['param'] as $k => $m) {
+					if ($m[$dataName]['from'] == 'body') {
+						$bodyParamCount++;
+						$lastBodyParamIndex = $k;
+						$lastM = $m;
+					}
+				}
+				if (
+					$bodyParamCount == 1 &&
+					!array_key_exists($lastM['name'], $data) &&
+					array_key_exists(Defaults::$fullRequestDataName, $data) &&
+					!is_null($d = $data[Defaults::$fullRequestDataName])
+				) {
+					$p[$lastBodyParamIndex] = $d;
+				}
+			}
+		}
+		$r = ApiMethodInfo::__set_state($call);
+		$modifier = "_modify_{$r->methodName}_api";
+		if (method_exists($r->className, $modifier)) {
+			$stage = end(Scope::get('Restler')->getEvents());
+			if (empty($stage))
+				$stage = 'setup';
+			$r = Scope::get($r->className)->$modifier($r, $stage) ? : $r;
+		}
+		return $r;
+	}
 
-    /**
-     * @access private
-     */
-    protected static function pathVarTypeOf($var)
-    {
-        if (is_numeric($var)) {
-            return 'n';
-        }
-        if ($var === 'true' || $var === 'false') {
-            return 'b';
-        }
-        return 's';
-    }
+	/**
+	 * @access private
+	 */
+	protected static function pathVarTypeOf($var)
+	{
+		if (is_numeric($var)) {
+			return 'n';
+		}
+		if ($var === 'true' || $var === 'false') {
+			return 'b';
+		}
+		return 's';
+	}
 
-    protected static function typeMatch($type, $var)
-    {
-        switch ($type) {
-            case 'boolean':
-            case 'bool':
-                return is_bool($var);
-            case 'array':
-            case 'object':
-                return is_array($var);
-            case 'string':
-            case 'int':
-            case 'integer':
-            case 'float':
-            case 'number':
-                return is_scalar($var);
-        }
-        return true;
-    }
+	protected static function typeMatch($type, $var)
+	{
+		switch ($type) {
+			case 'boolean':
+			case 'bool':
+				return is_bool($var);
+			case 'array':
+			case 'object':
+				return is_array($var);
+			case 'string':
+			case 'int':
+			case 'integer':
+			case 'float':
+			case 'number':
+				return is_scalar($var);
+		}
+		return true;
+	}
 
-    protected static function parseMagic(ReflectionClass $class, $forResponse = true)
-    {
-        if (!$c = CommentParser::parse($class->getDocComment())) {
-            return false;
-        }
-        $p = 'property';
-        $r = empty($c[$p]) ? array() : $c[$p];
-        $p .= '-' . ($forResponse ? 'read' : 'write');
-        if (!empty($c[$p])) {
-            $r = array_merge($r, $c[$p]);
-        }
+	protected static function parseMagic(ReflectionClass $class, $forResponse = true)
+	{
+		if (!$c = CommentParser::parse($class->getDocComment())) {
+			return false;
+		}
+		$p = 'property';
+		$r = empty($c[$p]) ? array() : $c[$p];
+		$p .= '-' . ($forResponse ? 'read' : 'write');
+		if (!empty($c[$p])) {
+			$r = array_merge($r, $c[$p]);
+		}
 
-        return $r;
-    }
+		return $r;
+	}
 
-    /**
-     * Get the type and associated model
-     *
-     * @param ReflectionClass $class
-     * @param array           $scope
-     *
-     * @throws RestException
-     * @throws \Exception
-     * @return array
-     *
-     * @access protected
-     */
-    protected static function getTypeAndModel(ReflectionClass $class, array $scope, $prefix='', array $rules=array())
-    {
-        $className = $class->getName();
-        $dataName = CommentParser::$embeddedDataName;
-        if (isset(static::$models[$prefix.$className])) {
-            return static::$models[$prefix.$className];
-        }
-        $children = array();
-        try {
-            if ($magic_properties = static::parseMagic($class, empty($prefix))) {
-                foreach ($magic_properties as $prop) {
-                    if (!isset($prop['name'])) {
-                        throw new Exception('@property comment is not properly defined in ' . $className . ' class');
-                    }
-                    if (!isset($prop[$dataName]['label'])) {
-                        $prop[$dataName]['label'] = Text::title($prop['name']);
-                    }
-                    if (isset(static::$fieldTypesByName[$prop['name']]) && $prop['type'] == 'string' && !isset($prop[$dataName]['type'])) {
-                        $prop[$dataName]['type'] = static::$fieldTypesByName[$prop['name']];
-                    }
-                    $children[$prop['name']] = $prop;
-                }
-            } else {
-                $props = $class->getProperties(ReflectionProperty::IS_PUBLIC);
-                foreach ($props as $prop) {
-                    $name = $prop->getName();
-                    $child = array('name' => $name);
-                    if ($c = $prop->getDocComment()) {
-                        $child += Util::nestedValue(CommentParser::parse($c), 'var') ?: array();
-                    } else {
-                        $o = $class->newInstance();
-                        $p = $prop->getValue($o);
-                        if (is_object($p)) {
-                            $child['type'] = get_class($p);
-                        } elseif (is_array($p)) {
-                            $child['type'] = 'array';
-                            if (count($p)) {
-                                $pc = reset($p);
-                                if (is_object($pc)) {
-                                    $child['contentType'] = get_class($pc);
-                                }
-                            }
-                        }
-                    }
-                    $child += array(
-                        'type'  => isset(static::$fieldTypesByName[$child['name']])
-                            ? static::$fieldTypesByName[$child['name']]
-                            : 'string',
-                        'label' => Text::title($child['name'])
-                    );
-                    isset($child[$dataName])
-                        ? $child[$dataName] += array('required' => true)
-                        : $child[$dataName]['required'] = true;
-                    if ($prop->class != $className && $qualified = Scope::resolve($child['type'], $scope)) {
-                        list($child['type'], $child['children'])
-                            = static::getTypeAndModel(new ReflectionClass($qualified), $scope);
-                    } elseif (
-                        ($contentType = Util::nestedValue($child, $dataName, 'type')) &&
-                        ($qualified = Scope::resolve($contentType, $scope))
-                    ) {
-                        list($child['contentType'], $child['children'])
-                            = static::getTypeAndModel(new ReflectionClass($qualified), $scope);
-                    }
-                    $children[$name] = $child;
-                }
-            }
-        } catch (Exception $e) {
-            if (Text::endsWith($e->getFile(), 'CommentParser.php')) {
-                throw new RestException(500, "Error while parsing comments of `$className` class. " . $e->getMessage());
-            }
-            throw $e;
-        }
-        if ($properties = Util::nestedValue($rules, 'properties')) {
-            if (is_string($properties)) {
-                $properties = array($properties);
-            }
-            $c = array();
-            foreach ($properties as $property) {
-                if (isset($children[$property])) {
-                    $c[$property] = $children[$property];
-                }
-            }
-            $children = $c;
-        }
-        if ($required = Util::nestedValue($rules, 'required')) {
-            //override required on children
-            if (is_bool($required)) {
-                // true means all are required false means none are required
-                $required = $required ? array_keys($children) : array();
-            } elseif (is_string($required)) {
-                $required = array($required);
-            }
-            $required = array_fill_keys($required, true);
-            foreach ($children as $name => $child) {
-                $children[$name][$dataName]['required'] = isset($required[$name]);
-            }
-        }
-        static::$models[$prefix.$className] = array($className, $children, $prefix.$className);
-        return static::$models[$prefix.$className];
-    }
+	/**
+	 * Get the type and associated model
+	 *
+	 * @param ReflectionClass $class
+	 * @param array           $scope
+	 *
+	 * @throws RestException
+	 * @throws \Exception
+	 * @return array
+	 *
+	 * @access protected
+	 */
+	protected static function getTypeAndModel(ReflectionClass $class, array $scope, $prefix='', array $rules=array())
+	{
+		$className = $class->getName();
+		$dataName = CommentParser::$embeddedDataName;
+		if (isset(static::$models[$prefix.$className])) {
+			return static::$models[$prefix.$className];
+		}
+		$children = array();
+		try {
+			if ($magic_properties = static::parseMagic($class, empty($prefix))) {
+				foreach ($magic_properties as $prop) {
+					if (!isset($prop['name'])) {
+						throw new Exception('@property comment is not properly defined in ' . $className . ' class');
+					}
+					if (!isset($prop[$dataName]['label'])) {
+						$prop[$dataName]['label'] = Text::title($prop['name']);
+					}
+					if (isset(static::$fieldTypesByName[$prop['name']]) && $prop['type'] == 'string' && !isset($prop[$dataName]['type'])) {
+						$prop[$dataName]['type'] = static::$fieldTypesByName[$prop['name']];
+					}
+					$children[$prop['name']] = $prop;
+				}
+			} else {
+				$props = $class->getProperties(ReflectionProperty::IS_PUBLIC);
+				foreach ($props as $prop) {
+					$name = $prop->getName();
+					$child = array('name' => $name);
+					if ($c = $prop->getDocComment()) {
+						$child += Util::nestedValue(CommentParser::parse($c), 'var') ?: array();
+					} else {
+						$o = $class->newInstance();
+						$p = $prop->getValue($o);
+						if (is_object($p)) {
+							$child['type'] = get_class($p);
+						} elseif (is_array($p)) {
+							$child['type'] = 'array';
+							if (count($p)) {
+								$pc = reset($p);
+								if (is_object($pc)) {
+									$child['contentType'] = get_class($pc);
+								}
+							}
+						}
+					}
+					$child += array(
+						'type'  => isset(static::$fieldTypesByName[$child['name']])
+							? static::$fieldTypesByName[$child['name']]
+							: 'string',
+						'label' => Text::title($child['name'])
+					);
+					isset($child[$dataName])
+						? $child[$dataName] += array('required' => true)
+						: $child[$dataName]['required'] = true;
+					if ($prop->class != $className && $qualified = Scope::resolve($child['type'], $scope)) {
+						list($child['type'], $child['children'])
+							= static::getTypeAndModel(new ReflectionClass($qualified), $scope);
+					} elseif (
+						($contentType = Util::nestedValue($child, $dataName, 'type')) &&
+						($qualified = Scope::resolve($contentType, $scope))
+					) {
+						list($child['contentType'], $child['children'])
+							= static::getTypeAndModel(new ReflectionClass($qualified), $scope);
+					}
+					$children[$name] = $child;
+				}
+			}
+		} catch (Exception $e) {
+			if (Text::endsWith($e->getFile(), 'CommentParser.php')) {
+				throw new RestException(500, "Error while parsing comments of `$className` class. " . $e->getMessage());
+			}
+			throw $e;
+		}
+		if ($properties = Util::nestedValue($rules, 'properties')) {
+			if (is_string($properties)) {
+				$properties = array($properties);
+			}
+			$c = array();
+			foreach ($properties as $property) {
+				if (isset($children[$property])) {
+					$c[$property] = $children[$property];
+				}
+			}
+			$children = $c;
+		}
+		if ($required = Util::nestedValue($rules, 'required')) {
+			//override required on children
+			if (is_bool($required)) {
+				// true means all are required false means none are required
+				$required = $required ? array_keys($children) : array();
+			} elseif (is_string($required)) {
+				$required = array($required);
+			}
+			$required = array_fill_keys($required, true);
+			foreach ($children as $name => $child) {
+				$children[$name][$dataName]['required'] = isset($required[$name]);
+			}
+		}
+		static::$models[$prefix.$className] = array($className, $children, $prefix.$className);
+		return static::$models[$prefix.$className];
+	}
 
-    /**
-     * Import previously created routes from cache
-     *
-     * @param array $routes
-     */
-    public static function fromArray(array $routes)
-    {
-        static::$routes = $routes;
-    }
+	/**
+	 * Import previously created routes from cache
+	 *
+	 * @param array $routes
+	 */
+	public static function fromArray(array $routes)
+	{
+		static::$routes = $routes;
+	}
 
-    /**
-     * Export current routes for cache
-     *
-     * @return array
-     */
-    public static function toArray()
-    {
-        return static::$routes;
-    }
+	/**
+	 * Export current routes for cache
+	 *
+	 * @return array
+	 */
+	public static function toArray()
+	{
+		return static::$routes;
+	}
 
-    public static function type($var)
-    {
-        if (is_object($var)) return get_class($var);
-        if (is_array($var)) return 'array';
-        if (is_bool($var)) return 'boolean';
-        if (is_numeric($var)) return is_float($var) ? 'float' : 'int';
-        return 'string';
-    }
+	public static function type($var)
+	{
+		if (is_object($var)) return get_class($var);
+		if (is_array($var)) return 'array';
+		if (is_bool($var)) return 'boolean';
+		if (is_numeric($var)) return is_float($var) ? 'float' : 'int';
+		return 'string';
+	}
 
-    public static function scope(ReflectionClass $class)
-    {
-        $namespace = $class->getNamespaceName();
-        $imports = array(
-            '*' => empty($namespace) ? '' : $namespace . '\\'
-        );
-        $file = file_get_contents($class->getFileName());
-        $tokens = token_get_all($file);
-        $namespace = '';
-        $alias = '';
-        $reading = false;
-        $last = 0;
-        foreach ($tokens as $token) {
-            if (is_string($token)) {
-                if ($reading && ',' == $token) {
-                    //===== STOP =====//
-                    $reading = false;
-                    if (!empty($namespace))
-                        $imports[$alias] = trim($namespace, '\\');
-                    //===== START =====//
-                    $reading = true;
-                    $namespace = '';
-                    $alias = '';
-                } else {
-                    //===== STOP =====//
-                    $reading = false;
-                    if (!empty($namespace))
-                        $imports[$alias] = trim($namespace, '\\');
-                }
-            } elseif (T_USE == $token[0]) {
-                //===== START =====//
-                $reading = true;
-                $namespace = '';
-                $alias = '';
-            } elseif ($reading) {
-                //echo token_name($token[0]) . ' ' . $token[1] . PHP_EOL;
-                switch ($token[0]) {
-                    case T_WHITESPACE:
-                        continue 2;
-                    case T_STRING:
-                        $alias = $token[1];
-                        if (T_AS == $last) {
-                            break;
-                        }
-                    //don't break;
-                    case T_NS_SEPARATOR:
-                        $namespace .= $token[1];
-                        break;
-                }
-                $last = $token[0];
-            }
-        }
-        return $imports;
-    }
+	public static function scope(ReflectionClass $class)
+	{
+		$namespace = $class->getNamespaceName();
+		$imports = array(
+			'*' => empty($namespace) ? '' : $namespace . '\\'
+		);
+		$file = file_get_contents($class->getFileName());
+		$tokens = token_get_all($file);
+		$namespace = '';
+		$alias = '';
+		$reading = false;
+		$last = 0;
+		foreach ($tokens as $token) {
+			if (is_string($token)) {
+				if ($reading && ',' == $token) {
+					//===== STOP =====//
+					$reading = false;
+					if (!empty($namespace))
+						$imports[$alias] = trim($namespace, '\\');
+					//===== START =====//
+					$reading = true;
+					$namespace = '';
+					$alias = '';
+				} else {
+					//===== STOP =====//
+					$reading = false;
+					if (!empty($namespace))
+						$imports[$alias] = trim($namespace, '\\');
+				}
+			} elseif (T_USE == $token[0]) {
+				//===== START =====//
+				$reading = true;
+				$namespace = '';
+				$alias = '';
+			} elseif ($reading) {
+				//echo token_name($token[0]) . ' ' . $token[1] . PHP_EOL;
+				switch ($token[0]) {
+					case T_WHITESPACE:
+						continue 2;
+					case T_STRING:
+						$alias = $token[1];
+						if (T_AS == $last) {
+							break;
+						}
+					//don't break;
+					case T_NS_SEPARATOR:
+						$namespace .= $token[1];
+						break;
+				}
+				$last = $token[0];
+			}
+		}
+		return $imports;
+	}
 }

Spacing +30 added lines, -30 removed lines

@@ -79,7 +79,7 @@ 
         try {
             $classMetadata = CommentParser::parse($class->getDocComment());
         } catch (Exception $e) {
-            throw new RestException(500, "Error while parsing comments of `$className` class. " . $e->getMessage());
+            throw new RestException(500, "Error while parsing comments of `$className` class. ".$e->getMessage());
         }
         $classMetadata['scope'] = $scope = static::scope($class);
         $methods = $class->getMethods(ReflectionMethod::IS_PUBLIC +
@@ -95,7 +95,7 @@ 
             try {
                 $metadata = CommentParser::parse($doc) + $classMetadata;
             } catch (Exception $e) {
-                throw new RestException(500, "Error while parsing comments of `{$className}::{$method->getName()}` method. " . $e->getMessage());
+                throw new RestException(500, "Error while parsing comments of `{$className}::{$method->getName()}` method. ".$e->getMessage());
             }
             //@access should not be private
             if (isset($metadata['access'])
@@ -157,20 +157,20 @@ 
                 }
                 $m ['default'] = $defaults [$position];
                 $m ['required'] = !$param->isOptional();
-                $contentType = Util::nestedValue($p,'type');
+                $contentType = Util::nestedValue($p, 'type');
                 if ($type == 'array' && $contentType && $qualified = Scope::resolve($contentType, $scope)) {
                     list($p['type'], $children, $modelName) = static::getTypeAndModel(
                         new ReflectionClass($qualified), $scope,
-                        $className . Text::title($methodUrl), $p
+                        $className.Text::title($methodUrl), $p
                     );
                 }
                 if ($type instanceof ReflectionClass) {
                     list($type, $children, $modelName) = static::getTypeAndModel($type, $scope,
-                        $className . Text::title($methodUrl), $p);
+                        $className.Text::title($methodUrl), $p);
                 } elseif ($type && is_string($type) && $qualified = Scope::resolve($type, $scope)) {
                     list($type, $children, $modelName)
                         = static::getTypeAndModel(new ReflectionClass($qualified), $scope,
-                        $className . Text::title($methodUrl), $p);
+                        $className.Text::title($methodUrl), $p);
                 }
                 if (isset($type)) {
                     $m['type'] = $type;
@@ -248,13 +248,13 @@ 
             ) {
                 foreach ($matches as $match) {
                     $httpMethod = $match[1];
-                    $url = rtrim($resourcePath . $match[2], '/');
+                    $url = rtrim($resourcePath.$match[2], '/');
                     //deep copy the call, as it may change for each @url
                     $copy = unserialize(serialize($call));
                     foreach ($copy['metadata']['param'] as $i => $p) {
                         $inPath =
-                            strpos($url, '{' . $p['name'] . '}') ||
-                            strpos($url, ':' . $p['name']);
+                            strpos($url, '{'.$p['name'].'}') ||
+                            strpos($url, ':'.$p['name']);
                         if ($inPath) {
                             $copy['metadata']['param'][$i][$dataName]['from'] = 'path';
                         } elseif ($httpMethod == 'GET' || $httpMethod == 'DELETE') {
@@ -264,15 +264,15 @@ 
                         }
                     }
                     $url = preg_replace_callback('/{[^}]+}|:[^\/]+/',
-                        function ($matches) use ($copy) {
+                        function($matches) use ($copy) {
                             $match = trim($matches[0], '{}:');
                             $index = $copy['arguments'][$match];
-                            return '{' .
+                            return '{'.
                             Routes::typeChar(isset(
                                 $copy['metadata']['param'][$index]['type'])
                                 ? $copy['metadata']['param'][$index]['type']
                                 : null)
-                            . $index . '}';
+                            . $index.'}';
                         }, $url);
                     static::addPath($url, $copy, $httpMethod, $version);
                 }
@@ -292,7 +292,7 @@ 
                     $methodUrl = '';
                 }
                 $url = empty($methodUrl) ? rtrim($resourcePath, '/')
-                    : $resourcePath . $methodUrl;
+                    : $resourcePath.$methodUrl;
                 for ($position = 0; $position < count($params); $position++) {
                     $from = $metadata['param'][$position][$dataName]['from'];
                     if ($from == 'body' && ($httpMethod == 'GET' ||
@@ -309,11 +309,11 @@ 
                 foreach ($pathParams as $position) {
                     if (!empty($url))
                         $url .= '/';
-                    $url .= '{' .
+                    $url .= '{'.
                         static::typeChar(isset($call['metadata']['param'][$position]['type'])
                             ? $call['metadata']['param'][$position]['type']
                             : null)
-                        . $position . '}';
+                        . $position.'}';
                     if ($allowAmbiguity || $position == $lastPathParam) {
                         static::addPath($url, $call, $httpMethod, $version);
                     }
@@ -343,9 +343,9 @@ 
     {
         $call['url'] = preg_replace_callback(
             "/\{\S(\d+)\}/",
-            function ($matches) use ($call) {
-                return '{' .
-                $call['metadata']['param'][$matches[1]]['name'] . '}';
+            function($matches) use ($call) {
+                return '{'.
+                $call['metadata']['param'][$matches[1]]['name'].'}';
             },
             $path
         );
@@ -390,7 +390,7 @@ 
             return static::populate($p[$path][$httpMethod], $data);
         } elseif (isset($p['*'])) {
             //================== wildcard routes ========================
-            uksort($p['*'], function ($a, $b) {
+            uksort($p['*'], function($a, $b) {
                 return strlen($b) - strlen($a);
             });
             foreach ($p['*'] as $key => $value) {
@@ -410,7 +410,7 @@ 
         if (substr($path, -1) == '/')
             $path .= PHP_EOL;
         //if double slash is found fill in newline char;
-        $path = str_replace('//', '/' . PHP_EOL . '/', $path);
+        $path = str_replace('//', '/'.PHP_EOL.'/', $path);
         ksort($p);
         foreach ($p as $key => $value) {
             if (!isset($value[$httpMethod])) {
@@ -434,7 +434,7 @@ 
                     } else {
                         $status = 400;
                         $message = 'invalid value specified for `'
-                            . $details['name'] . '`';
+                            . $details['name'].'`';
                         $found = false;
                         break;
                     }
@@ -452,7 +452,7 @@ 
             }
         }
         if ($status == 405) {
-            header('Allow: ' . implode(', ', $methods));
+            header('Allow: '.implode(', ', $methods));
         }
         throw new RestException($status, $message);
     }
@@ -466,7 +466,7 @@ 
             $all = $all['*'] + $all;
             unset($all['*']);
         }
-        if(is_array($all)){
+        if (is_array($all)) {
             foreach ($all as $fullPath => $routes) {
                 foreach ($routes as $httpMethod => $route) {
                     if (in_array($httpMethod, $excludedHttpMethods)) {
@@ -480,7 +480,7 @@ 
                             continue 2;
                         }
                     }
-                    $hash = "$httpMethod " . $route['url'];
+                    $hash = "$httpMethod ".$route['url'];
                     if (!isset($filter[$hash])) {
                         $route['httpMethod'] = $httpMethod;
                         $map[$route['metadata']['resourcePath']][]
@@ -570,7 +570,7 @@ 
             $stage = end(Scope::get('Restler')->getEvents());
             if (empty($stage))
                 $stage = 'setup';
-            $r = Scope::get($r->className)->$modifier($r, $stage) ? : $r;
+            $r = Scope::get($r->className)->$modifier($r, $stage) ?: $r;
         }
         return $r;
     }
@@ -615,7 +615,7 @@ 
         }
         $p = 'property';
         $r = empty($c[$p]) ? array() : $c[$p];
-        $p .= '-' . ($forResponse ? 'read' : 'write');
+        $p .= '-'.($forResponse ? 'read' : 'write');
         if (!empty($c[$p])) {
             $r = array_merge($r, $c[$p]);
         }
@@ -635,7 +635,7 @@ 
      *
      * @access protected
      */
-    protected static function getTypeAndModel(ReflectionClass $class, array $scope, $prefix='', array $rules=array())
+    protected static function getTypeAndModel(ReflectionClass $class, array $scope, $prefix = '', array $rules = array())
     {
         $className = $class->getName();
         $dataName = CommentParser::$embeddedDataName;
@@ -647,7 +647,7 @@ 
             if ($magic_properties = static::parseMagic($class, empty($prefix))) {
                 foreach ($magic_properties as $prop) {
                     if (!isset($prop['name'])) {
-                        throw new Exception('@property comment is not properly defined in ' . $className . ' class');
+                        throw new Exception('@property comment is not properly defined in '.$className.' class');
                     }
                     if (!isset($prop[$dataName]['label'])) {
                         $prop[$dataName]['label'] = Text::title($prop['name']);
@@ -703,7 +703,7 @@ 
             }
         } catch (Exception $e) {
             if (Text::endsWith($e->getFile(), 'CommentParser.php')) {
-                throw new RestException(500, "Error while parsing comments of `$className` class. " . $e->getMessage());
+                throw new RestException(500, "Error while parsing comments of `$className` class. ".$e->getMessage());
             }
             throw $e;
         }
@@ -769,7 +769,7 @@ 
     {
         $namespace = $class->getNamespaceName();
         $imports = array(
-            '*' => empty($namespace) ? '' : $namespace . '\\'
+            '*' => empty($namespace) ? '' : $namespace.'\\'
         );
         $file = file_get_contents($class->getFileName());
         $tokens = token_get_all($file);

Braces +45 added lines, -26 removed lines

@@ -124,9 +124,10 @@ 
                 $metadata['param'] = array();
             }
             if (isset($metadata['return']['type'])) {
-                if ($qualified = Scope::resolve($metadata['return']['type'], $scope))
-                    list($metadata['return']['type'], $metadata['return']['children']) =
+                if ($qualified = Scope::resolve($metadata['return']['type'], $scope)) {
+                                    list($metadata['return']['type'], $metadata['return']['children']) =
                         static::getTypeAndModel(new ReflectionClass($qualified), $scope);
+                }
             } else {
                 //assume return type is array
                 $metadata['return']['type'] = 'array';
@@ -147,8 +148,9 @@ 
                     $m[$dataName] = array();
                 }
                 $p = &$m[$dataName];
-                if (empty($m['label']))
-                    $m['label'] = Text::title($m['name']);
+                if (empty($m['label'])) {
+                                    $m['label'] = Text::title($m['name']);
+                }
                 if (is_null($type) && isset($m['type'])) {
                     $type = $m['type'];
                 }
@@ -307,8 +309,9 @@ 
                 }
                 $lastPathParam = end($pathParams);
                 foreach ($pathParams as $position) {
-                    if (!empty($url))
-                        $url .= '/';
+                    if (!empty($url)) {
+                                            $url .= '/';
+                    }
                     $url .= '{' .
                         static::typeChar(isset($call['metadata']['param'][$position]['type'])
                             ? $call['metadata']['param'][$position]['type']
@@ -356,8 +359,9 @@ 
         } else {
             static::$routes["v$version"][$path][$httpMethod] = $call;
             //create an alias with index if the method name is index
-            if ($call['methodName'] == 'index')
-                static::$routes["v$version"][ltrim("$path/index", '/')][$httpMethod] = $call;
+            if ($call['methodName'] == 'index') {
+                            static::$routes["v$version"][ltrim("$path/index", '/')][$httpMethod] = $call;
+            }
         }
     }
 
@@ -407,8 +411,9 @@ 
         }
         //================== dynamic routes =============================
         //add newline char if trailing slash is found
-        if (substr($path, -1) == '/')
-            $path .= PHP_EOL;
+        if (substr($path, -1) == '/') {
+                    $path .= PHP_EOL;
+        }
         //if double slash is found fill in newline char;
         $path = str_replace('//', '/' . PHP_EOL . '/', $path);
         ksort($p);
@@ -474,8 +479,9 @@ 
                     }
                     foreach ($excludedPaths as $exclude) {
                         if (empty($exclude)) {
-                            if ($fullPath == $exclude || $fullPath == 'index')
-                                continue 2;
+                            if ($fullPath == $exclude || $fullPath == 'index') {
+                                                            continue 2;
+                            }
                         } elseif (Text::beginsWith($fullPath, $exclude)) {
                             continue 2;
                         }
@@ -495,13 +501,15 @@ 
 
     public static function verifyAccess($route)
     {
-        if ($route['accessLevel'] < 2)
-            return true;
+        if ($route['accessLevel'] < 2) {
+                    return true;
+        }
         /** @var Restler $r */
         $r = Scope::get('Restler');
         $authenticated = $r->_authenticated;
-        if (!$authenticated && $route['accessLevel'] > 1)
-            return false;
+        if (!$authenticated && $route['accessLevel'] > 1) {
+                    return false;
+        }
         if (
             $authenticated &&
             Defaults::$accessControlFunction &&
@@ -568,8 +576,9 @@ 
         $modifier = "_modify_{$r->methodName}_api";
         if (method_exists($r->className, $modifier)) {
             $stage = end(Scope::get('Restler')->getEvents());
-            if (empty($stage))
-                $stage = 'setup';
+            if (empty($stage)) {
+                            $stage = 'setup';
+            }
             $r = Scope::get($r->className)->$modifier($r, $stage) ? : $r;
         }
         return $r;
@@ -758,10 +767,18 @@ 
 
     public static function type($var)
     {
-        if (is_object($var)) return get_class($var);
-        if (is_array($var)) return 'array';
-        if (is_bool($var)) return 'boolean';
-        if (is_numeric($var)) return is_float($var) ? 'float' : 'int';
+        if (is_object($var)) {
+        	return get_class($var);
+        }
+        if (is_array($var)) {
+        	return 'array';
+        }
+        if (is_bool($var)) {
+        	return 'boolean';
+        }
+        if (is_numeric($var)) {
+        	return is_float($var) ? 'float' : 'int';
+        }
         return 'string';
     }
 
@@ -782,8 +799,9 @@ 
                 if ($reading && ',' == $token) {
                     //===== STOP =====//
                     $reading = false;
-                    if (!empty($namespace))
-                        $imports[$alias] = trim($namespace, '\\');
+                    if (!empty($namespace)) {
+                                            $imports[$alias] = trim($namespace, '\\');
+                    }
                     //===== START =====//
                     $reading = true;
                     $namespace = '';
@@ -791,8 +809,9 @@ 
                 } else {
                     //===== STOP =====//
                     $reading = false;
-                    if (!empty($namespace))
-                        $imports[$alias] = trim($namespace, '\\');
+                    if (!empty($namespace)) {
+                                            $imports[$alias] = trim($namespace, '\\');
+                    }
                 }
             } elseif (T_USE == $token[0]) {
                 //===== START =====//

Upper-Lower-Casing +1 added lines, -1 removed lines

@@ -379,7 +379,7 @@
         if (!$p) {
             throw new RestException(
                 404,
-                $version == 1 ? '' : "Version $version is not supported"
+                $version == 1 ? '' : "version $version is not supported"
             );
         }
         $status = 404;

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

Indentation +5 added lines, -5 removed lines

@@ -9,9 +9,9 @@
  */
 interface iProvideMultiVersionApi
 {
-    /**
-     * Maximum api version supported by the api class
-     * @return int
-     */
-    public static function __getMaximumSupportedVersion();
+	/**
+	 * Maximum api version supported by the api class
+	 * @return int
+	 */
+	public static function __getMaximumSupportedVersion();
 }
\ No newline at end of file

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

Indentation +16 added lines, -16 removed lines

@@ -16,21 +16,21 @@
  *
  */
 interface iCompose {
-    /**
-     * Result of an api call is passed to this method
-     * to create a standard structure for the data
-     *
-     * @param mixed $result can be a primitive or array or object
-     */
-    public function response($result);
+	/**
+	 * Result of an api call is passed to this method
+	 * to create a standard structure for the data
+	 *
+	 * @param mixed $result can be a primitive or array or object
+	 */
+	public function response($result);
 
-    /**
-     * When the api call results in RestException this method
-     * will be called to return the error message
-     *
-     * @param RestException $exception exception that has reasons for failure
-     *
-     * @return
-     */
-    public function message(RestException $exception);
+	/**
+	 * When the api call results in RestException this method
+	 * will be called to return the error message
+	 *
+	 * @param RestException $exception exception that has reasons for failure
+	 *
+	 * @return
+	 */
+	public function message(RestException $exception);
 }
\ No newline at end of file

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

Indentation +71 added lines, -71 removed lines

@@ -15,84 +15,84 @@
 
 class EventDispatcher
 {
-    private $listeners = array();
-    protected static $_waitList = array();
+	private $listeners = array();
+	protected static $_waitList = array();
 
-    public static $self;
-    protected $events = array();
+	public static $self;
+	protected $events = array();
 
-    public function __construct() {
-        static::$self = $this;
-        if (!empty(static::$_waitList)) {
-            foreach (static::$_waitList as $param) {
-                call_user_func_array(array($this,$param[0]), $param[1]);
-            }
-        }
-    }
+	public function __construct() {
+		static::$self = $this;
+		if (!empty(static::$_waitList)) {
+			foreach (static::$_waitList as $param) {
+				call_user_func_array(array($this,$param[0]), $param[1]);
+			}
+		}
+	}
 
-    public static function __callStatic($eventName, $params)
-    {
-        if (0 === strpos($eventName, 'on')) {
-            if(static::$self){
-                return call_user_func_array(array(static::$self, $eventName), $params);
-            }
-            static::$_waitList[] = func_get_args();
-            return false;
-        }
-    }
+	public static function __callStatic($eventName, $params)
+	{
+		if (0 === strpos($eventName, 'on')) {
+			if(static::$self){
+				return call_user_func_array(array(static::$self, $eventName), $params);
+			}
+			static::$_waitList[] = func_get_args();
+			return false;
+		}
+	}
 
-    public function __call($eventName, $params)
-    {
-        if (0 === strpos($eventName, 'on')) {
-            if (!isset($this->listeners[$eventName]) || !is_array($this->listeners[$eventName]))
-                $this->listeners[$eventName] = array();
-            $this->listeners[$eventName][] = $params[0];
-        }
-        return $this;
-    }
+	public function __call($eventName, $params)
+	{
+		if (0 === strpos($eventName, 'on')) {
+			if (!isset($this->listeners[$eventName]) || !is_array($this->listeners[$eventName]))
+				$this->listeners[$eventName] = array();
+			$this->listeners[$eventName][] = $params[0];
+		}
+		return $this;
+	}
 
-    public static function addListener($eventName, Closure $callback)
-    {
-        return static::$eventName($callback);
-    }
+	public static function addListener($eventName, Closure $callback)
+	{
+		return static::$eventName($callback);
+	}
 
-    public function on(array $eventHandlers)
-    {
-        for (
-            $count = count($eventHandlers),
-                $events = array_map(
-                    'ucfirst',
-                    $keys = array_keys(
-                        $eventHandlers = array_change_key_case(
-                            $eventHandlers,
-                            CASE_LOWER
-                        )
-                    )
-                ),
-                $i = 0;
-            $i < $count;
-            call_user_func(
-                array($this, "on{$events[$i]}"),
-                $eventHandlers[$keys[$i++]]
-            )
-        );
-    }
+	public function on(array $eventHandlers)
+	{
+		for (
+			$count = count($eventHandlers),
+				$events = array_map(
+					'ucfirst',
+					$keys = array_keys(
+						$eventHandlers = array_change_key_case(
+							$eventHandlers,
+							CASE_LOWER
+						)
+					)
+				),
+				$i = 0;
+			$i < $count;
+			call_user_func(
+				array($this, "on{$events[$i]}"),
+				$eventHandlers[$keys[$i++]]
+			)
+		);
+	}
 
-    /**
-     * Fire an event to notify all listeners
-     *
-     * @param string $eventName name of the event
-     * @param array  $params    event related data
-     */
-    protected function dispatch($eventName, array $params = array())
-    {
-        $this->events[] = $eventName;
-        $params = func_get_args();
-        $eventName = 'on'.ucfirst(array_shift($params));
-        if (isset($this->listeners[$eventName]))
-            foreach ($this->listeners[$eventName] as $callback)
-                call_user_func_array($callback, $params);
-    }
+	/**
+	 * Fire an event to notify all listeners
+	 *
+	 * @param string $eventName name of the event
+	 * @param array  $params    event related data
+	 */
+	protected function dispatch($eventName, array $params = array())
+	{
+		$this->events[] = $eventName;
+		$params = func_get_args();
+		$eventName = 'on'.ucfirst(array_shift($params));
+		if (isset($this->listeners[$eventName]))
+			foreach ($this->listeners[$eventName] as $callback)
+				call_user_func_array($callback, $params);
+	}
 
 }
 

Spacing +2 added lines, -2 removed lines

@@ -25,7 +25,7 @@ 
         static::$self = $this;
         if (!empty(static::$_waitList)) {
             foreach (static::$_waitList as $param) {
-                call_user_func_array(array($this,$param[0]), $param[1]);
+                call_user_func_array(array($this, $param[0]), $param[1]);
             }
         }
     }
@@ -33,7 +33,7 @@ 
     public static function __callStatic($eventName, $params)
     {
         if (0 === strpos($eventName, 'on')) {
-            if(static::$self){
+            if (static::$self) {
                 return call_user_func_array(array(static::$self, $eventName), $params);
             }
             static::$_waitList[] = func_get_args();

Braces +6 added lines, -4 removed lines

@@ -44,8 +44,9 @@ 
     public function __call($eventName, $params)
     {
         if (0 === strpos($eventName, 'on')) {
-            if (!isset($this->listeners[$eventName]) || !is_array($this->listeners[$eventName]))
-                $this->listeners[$eventName] = array();
+            if (!isset($this->listeners[$eventName]) || !is_array($this->listeners[$eventName])) {
+                            $this->listeners[$eventName] = array();
+            }
             $this->listeners[$eventName][] = $params[0];
         }
         return $this;
@@ -89,9 +90,10 @@ 
         $this->events[] = $eventName;
         $params = func_get_args();
         $eventName = 'on'.ucfirst(array_shift($params));
-        if (isset($this->listeners[$eventName]))
-            foreach ($this->listeners[$eventName] as $callback)
+        if (isset($this->listeners[$eventName])) {
+                    foreach ($this->listeners[$eventName] as $callback)
                 call_user_func_array($callback, $params);
+        }
     }
 
 }

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

Indentation +12 added lines, -12 removed lines

@@ -8,16 +8,16 @@
  */
 class ExplorerInfo
 {
-    public static $title = 'Restler API Explorer';
-    public static $description = 'Live API Documentation';
-    public static $termsOfService = null;
-    public static $contact = array(
-        'name'  => 'Restler Support',
-        'url'   => 'luracast.com/products/restler',
-        'email' => 'arul@luracast.com',
-    );
-    public static $license = array(
-        'name' => 'LGPL-2.1',
-        'url'  => 'https://www.gnu.org/licenses/old-licenses/lgpl-2.1.html',
-    );
+	public static $title = 'Restler API Explorer';
+	public static $description = 'Live API Documentation';
+	public static $termsOfService = null;
+	public static $contact = array(
+		'name'  => 'Restler Support',
+		'url'   => 'luracast.com/products/restler',
+		'email' => 'arul@luracast.com',
+	);
+	public static $license = array(
+		'name' => 'LGPL-2.1',
+		'url'  => 'https://www.gnu.org/licenses/old-licenses/lgpl-2.1.html',
+	);
 }
\ No newline at end of file

htdocs/includes/printipp/CupsPrintIPP.php

Indentation +721 added lines, -721 removed lines

@@ -40,735 +40,735 @@
 
 class CupsPrintIPP extends ExtendedPrintIPP
 {
-    public $printers_attributes;
-    public $defaults_attributes;
+	public $printers_attributes;
+	public $defaults_attributes;
 
-    protected $parsed;
-    protected $output;
+	protected $parsed;
+	protected $output;
 
-    public function __construct()
-    {
-        parent::__construct();
-        self::_initTags();
-    }
+	public function __construct()
+	{
+		parent::__construct();
+		self::_initTags();
+	}
 
 //
 // OPERATIONS
 //
-    public function cupsGetDefaults($attributes=array("all"))
-    {
-        //The CUPS-Get-Default operation returns the default printer URI and attributes
-
-        $this->jobs = array_merge($this->jobs,array(""));
-        $this->jobs_uri = array_merge($this->jobs_uri,array(""));
-        $this->parsed = array();
-        unset($this->printer_attributes);
-
-        if (!isset($this->setup->charset))
-        {
-            self::setCharset();
-        }
-
-        if (!isset($this->setup->language))
-        {
-            self::setLanguage('en');
-        }
-
-        self::_setOperationId();
-
-        for($i = 0 ; $i < count($attributes) ; $i++)
-        {
-            if ($i == 0)
-            {
-                $this->meta->attributes = chr(0x44) // Keyword
-                                        . self::_giveMeStringLength('requested-attributes')
-                                        . 'requested-attributes'
-                                        . self::_giveMeStringLength($attributes[0])
-                                        . $attributes[0];
-            }
-            else
-            {
-                $this->meta->attributes .= chr(0x44) // Keyword
-                                        .  chr(0x0).chr(0x0) // zero-length name
-                                        .  self::_giveMeStringLength($attributes[$i])
-                                        .  $attributes[$i];
-            }
-        }
-
-        $this->stringjob = chr(0x01) . chr(0x01) // IPP version 1.1
-                         . chr(0x40). chr(0x01) // operation:  cups vendor extension: get defaults
-                         . $this->meta->operation_id // request-id
-                         . chr(0x01) // start operation-attributes | operation-attributes-tag
-                         . $this->meta->charset
-                         . $this->meta->language
-                         . $this->meta->attributes
-                         . chr(0x03); // end operations attribute
-
-        $this->output = $this->stringjob;
-
-        self::_putDebug("Request: ".$this->output);
-
-        $post_values = array( "Content-Type" => "application/ipp",
-                              "Data" => $this->output);
-
-        if (self::_sendHttp ($post_values,'/'))
-        {
-
-            if(self::_parseServerOutput())
-            {
-                self::_parsePrinterAttributes();
-            }
-        }
-
-       $this->attributes = &$this->printer_attributes;
-
-       if (isset($this->printer_attributes->printer_type))
-       {
-                    $printer_type = $this->printer_attributes->printer_type->_value0;
-                    $table = self::_interpretPrinterType($printer_type);
-
-                    for($i = 0 ; $i < count($table) ; $i++ )
-                    {
-                        $index = '_value'.$i;
-                        $this->printer_attributes->printer_type->$index = $table[$i];
-                        }
-                    }
-
-        if (isset($this->serveroutput) && isset($this->serveroutput->status))
-        {
-
-            $this->status = array_merge($this->status,array($this->serveroutput->status));
-            if ($this->serveroutput->status == "successfull-ok")
-            {
-                self::_errorLog("getting defaults: ".$this->serveroutput->status,3);
-            }
-            else
-            {
-                self::_errorLog("getting defaults: ".$this->serveroutput->status,1);
-            }
-
-            return $this->serveroutput->status;
-        }
-        else
-        {
-            $this->status = array_merge($this->status,array("OPERATION FAILED"));
-            self::_errorLog("getting defaults : OPERATION FAILED",1);
-            }
-    return false;
-    }
-
-
-    public function cupsAcceptJobs($printer_uri)
-    {
-    //The CUPS-Get-Default operation returns the default printer URI and attributes
-
-        $this->jobs = array_merge($this->jobs,array(""));
-        $this->jobs_uri = array_merge($this->jobs_uri,array(""));
-        $this->parsed = array();
-        unset($this->printer_attributes);
-
-        if (!isset($this->setup->charset))
-        {
-            self::setCharset();
-        }
-
-        if (!isset($this->setup->language))
-        {
-            self::setLanguage('en');
-        }
-
-        self::_setOperationId();
-
-        $this->stringjob = chr(0x01) . chr(0x01) // IPP version 1.1
-                         . chr(0x40). chr(0x08) // operation:  cups vendor extension: Accept-Jobs
-                         . $this->meta->operation_id // request-id
-                         . chr(0x01) // start operation-attributes | operation-attributes-tag
-                         . $this->meta->charset
-                         . $this->meta->language
-                         . chr(0x45) // uri
-                         . self::_giveMeStringLength('printer-uri')
-                         . 'printer-uri'
-                         . self::_giveMeStringLength($printer_uri)
-                         . $printer_uri
-                         . chr(0x03); // end operations attribute
-
-        $this->output = $this->stringjob;
-
-        self::_putDebug("Request: ".$this->output);
-
-        $post_values = array( "Content-Type" => "application/ipp",
-                              "Data" => $this->output);
-
-        if (self::_sendHttp ($post_values,'/admin/'))
-        {
-
-            if(self::_parseServerOutput())
-            {
-                self::_parseAttributes();
-            }
-        }
-
-        if (isset($this->serveroutput) && isset($this->serveroutput->status))
-        {
-
-            $this->status = array_merge($this->status,array($this->serveroutput->status));
-            if ($this->serveroutput->status == "successfull-ok")
-            {
-                self::_errorLog("getting defaults: ".$this->serveroutput->status,3);
-            }
-            else
-            {
-                self::_errorLog("getting defaults: ".$this->serveroutput->status,1);
-            }
-
-            return $this->serveroutput->status;
-        }
-        else
-        {
-            $this->status = array_merge($this->status,array("OPERATION FAILED"));
-            self::_errorLog("getting defaults : OPERATION FAILED",1);
-            }
-    return false;
-    }
-
-
-    public function cupsRejectJobs($printer_uri,$printer_state_message)
-    {
-    //The CUPS-Get-Default operation returns the default printer URI and attributes
-
-        $this->jobs = array_merge($this->jobs,array(""));
-        $this->jobs_uri = array_merge($this->jobs_uri,array(""));
-        $this->parsed = array();
-        unset($this->attributes);
-
-        if (!isset($this->setup->charset))
-        {
-            self::setCharset();
-        }
-
-        if (!isset($this->setup->language))
-        {
-            self::setLanguage('en');
-        }
-
-        self::_setOperationId();
-
-        $message = "";
-        if ($printer_state_message)
-        {
-            $message = chr(0x04) // start printer-attributes
-                     . chr(0x41) // textWithoutLanguage
-                     . self::_giveMeStringLength("printer-state-message")
-                     . "printer-state-message"
-                     . self::_giveMeStringLength($printer_state_message)
-                     . $printer_state_message;
-        }
-
-       $this->stringjob = chr(0x01) . chr(0x01) // IPP version 1.1
-                         . chr(0x40). chr(0x09) // operation:  cups vendor extension: Reject-Jobs
-                         . $this->meta->operation_id // request-id
-                         . chr(0x01) // start operation-attributes | operation-attributes-tag
-                         . $this->meta->charset
-                         . $this->meta->language
-                         . chr(0x45) // uri
-                         . self::_giveMeStringLength('printer-uri')
-                         . 'printer-uri'
-                         . self::_giveMeStringLength($printer_uri)
-                         . $printer_uri
-                         . $message
-                         . chr(0x03); // end operations attribute
-
-        $this->output = $this->stringjob;
-
-        self::_putDebug("Request: ".$this->output);
-
-        $post_values = array( "Content-Type" => "application/ipp",
-                              "Data" => $this->output);
-
-        if (self::_sendHttp ($post_values,'/admin/'))
-        {
-
-            if(self::_parseServerOutput())
-            {
-                self::_parseAttributes();
-            }
-        }
-
-        if (isset($this->serveroutput) && isset($this->serveroutput->status))
-        {
-
-            $this->status = array_merge($this->status,array($this->serveroutput->status));
-            if ($this->serveroutput->status == "successfull-ok")
-            {
-                self::_errorLog("getting defaults: ".$this->serveroutput->status,3);
-            }
-            else
-            {
-                self::_errorLog("getting defaults: ".$this->serveroutput->status,1);
-            }
-
-            return $this->serveroutput->status;
-        }
-        else
-        {
-            $this->status = array_merge($this->status,array("OPERATION FAILED"));
-            self::_errorLog("getting defaults : OPERATION FAILED",1);
-        }
-        return false;
-    }
-
-
-    public function getPrinters($printer_location=false,$printer_info=false,$attributes=array())
-    {
-        if (count($attributes) == 0)
-        {
-            true;
-        }
-        $attributes=array('printer-uri-supported', 'printer-location', 'printer-info', 'printer-type', 'color-supported', 'printer-name');
-        $this->jobs = array_merge($this->jobs,array(""));
-        $this->jobs_uri = array_merge($this->jobs_uri,array(""));
-
-        unset ($this->printers_attributes);
-
-        if (!isset($this->setup->charset))
-        {
-            self::setCharset();
-        }
-
-        if (!isset($this->setup->language))
-        {
-            self::setLanguage('en-us');
-        }
-
-        self::_setOperationId();
-
-        $this->meta->attributes='';
-
-        if ($printer_location)
-        {
-            $this->meta->attributes .= chr(0x41) // textWithoutLanguage
-                                    . self::_giveMeStringLength('printer-location')
-                                    . 'printer-location'
-                                    . self::_giveMeStringLength($printer_location)
-                                    . $printer_location;
-        }
-
-        if ($printer_info)
-        {
-            $this->meta->attributes .= chr(0x41) // textWithoutLanguage
-                                    . self::_giveMeStringLength('printer-info')
-                                    . 'printer-info'
-                                    . self::_giveMeStringLength($printer_info)
-                                    . $printer_info;
-        }
-
-        for($i = 0 ; $i < count($attributes) ; $i++)
-        {
-            if ($i == 0)
-            {
-                $this->meta->attributes .= chr(0x44) // Keyword
-                                        . self::_giveMeStringLength('requested-attributes')
-                                        . 'requested-attributes'
-                                        . self::_giveMeStringLength($attributes[0])
-                                        . $attributes[0];
-            }
-            else
-            {
-                $this->meta->attributes .= chr(0x44) // Keyword
-                                        .  chr(0x0).chr(0x0) // zero-length name
-                                        .  self::_giveMeStringLength($attributes[$i])
-                                        .  $attributes[$i];
-            }
-        }
-
-        $this->stringjob = chr(0x01) . chr(0x01) // IPP version 1.1
-                         . chr(0x40). chr(0x02) // operation:  cups vendor extension: get printers
-                         . $this->meta->operation_id //           request-id
-                         . chr(0x01) // start operation-attributes | operation-attributes-tag
-                         . $this->meta->charset
-                         . $this->meta->language
-                         . $this->meta->attributes
-                         . chr(0x03); // end operations attribute
-
-        $this->output = $this->stringjob;
-
-        $post_values = array( "Content-Type" => "application/ipp",
-                              "Data" => $this->output);
-
-        if (self::_sendHttp ($post_values,'/'))
-        {
-
-            if(self::_parseServerOutput())
-            {
-                $this->_getAvailablePrinters();
-            }
-        }
-
-        if (isset($this->serveroutput) && isset($this->serveroutput->status))
-        {
-
-            $this->status = array_merge($this->status,array($this->serveroutput->status));
-            if ($this->serveroutput->status == "successfull-ok")
-            {
-                self::_errorLog("getting printers: ".$this->serveroutput->status,3);
-            }
-            else
-            {
-                self::_errorLog("getting printers: ".$this->serveroutput->status,1);
-            }
-            return $this->serveroutput->status;
-        }
-        else
-        {
-            $this->status = array_merge($this->status,array("OPERATION FAILED"));
-            self::_errorLog("getting printers : OPERATION FAILED",1);
-        }
-        return false;
-    }
-
-
-    public function cupsGetPrinters ()
-    {
-        // alias for getPrinters();
-        self::getPrinters();
-    }
-
-
-    public function getPrinterAttributes()
-    {
-        // complete informations from parent with Cups-specific stuff
-
-        if(!$result = parent::getPrinterAttributes())
-        {
-            return FALSE;
-        }
-        if(!isset($this->printer_attributes))
-        {
-            return FALSE;
-        }
-
-        if (isset ($this->printer_attributes->printer_type))
-        {
-            $printer_type = $this->printer_attributes->printer_type->_value0;
-            $table = self::_interpretPrinterType($printer_type);
-
-            for($i = 0 ; $i < count($table) ; $i++ )
-            {
-                $index = '_value'.$i;
-                $this->printer_attributes->printer_type->$index = $table[$i];
-            }
-        }
-
-        return $result;
-    }
+	public function cupsGetDefaults($attributes=array("all"))
+	{
+		//The CUPS-Get-Default operation returns the default printer URI and attributes
+
+		$this->jobs = array_merge($this->jobs,array(""));
+		$this->jobs_uri = array_merge($this->jobs_uri,array(""));
+		$this->parsed = array();
+		unset($this->printer_attributes);
+
+		if (!isset($this->setup->charset))
+		{
+			self::setCharset();
+		}
+
+		if (!isset($this->setup->language))
+		{
+			self::setLanguage('en');
+		}
+
+		self::_setOperationId();
+
+		for($i = 0 ; $i < count($attributes) ; $i++)
+		{
+			if ($i == 0)
+			{
+				$this->meta->attributes = chr(0x44) // Keyword
+										. self::_giveMeStringLength('requested-attributes')
+										. 'requested-attributes'
+										. self::_giveMeStringLength($attributes[0])
+										. $attributes[0];
+			}
+			else
+			{
+				$this->meta->attributes .= chr(0x44) // Keyword
+										.  chr(0x0).chr(0x0) // zero-length name
+										.  self::_giveMeStringLength($attributes[$i])
+										.  $attributes[$i];
+			}
+		}
+
+		$this->stringjob = chr(0x01) . chr(0x01) // IPP version 1.1
+						 . chr(0x40). chr(0x01) // operation:  cups vendor extension: get defaults
+						 . $this->meta->operation_id // request-id
+						 . chr(0x01) // start operation-attributes | operation-attributes-tag
+						 . $this->meta->charset
+						 . $this->meta->language
+						 . $this->meta->attributes
+						 . chr(0x03); // end operations attribute
+
+		$this->output = $this->stringjob;
+
+		self::_putDebug("Request: ".$this->output);
+
+		$post_values = array( "Content-Type" => "application/ipp",
+							  "Data" => $this->output);
+
+		if (self::_sendHttp ($post_values,'/'))
+		{
+
+			if(self::_parseServerOutput())
+			{
+				self::_parsePrinterAttributes();
+			}
+		}
+
+	   $this->attributes = &$this->printer_attributes;
+
+	   if (isset($this->printer_attributes->printer_type))
+	   {
+					$printer_type = $this->printer_attributes->printer_type->_value0;
+					$table = self::_interpretPrinterType($printer_type);
+
+					for($i = 0 ; $i < count($table) ; $i++ )
+					{
+						$index = '_value'.$i;
+						$this->printer_attributes->printer_type->$index = $table[$i];
+						}
+					}
+
+		if (isset($this->serveroutput) && isset($this->serveroutput->status))
+		{
+
+			$this->status = array_merge($this->status,array($this->serveroutput->status));
+			if ($this->serveroutput->status == "successfull-ok")
+			{
+				self::_errorLog("getting defaults: ".$this->serveroutput->status,3);
+			}
+			else
+			{
+				self::_errorLog("getting defaults: ".$this->serveroutput->status,1);
+			}
+
+			return $this->serveroutput->status;
+		}
+		else
+		{
+			$this->status = array_merge($this->status,array("OPERATION FAILED"));
+			self::_errorLog("getting defaults : OPERATION FAILED",1);
+			}
+	return false;
+	}
+
+
+	public function cupsAcceptJobs($printer_uri)
+	{
+	//The CUPS-Get-Default operation returns the default printer URI and attributes
+
+		$this->jobs = array_merge($this->jobs,array(""));
+		$this->jobs_uri = array_merge($this->jobs_uri,array(""));
+		$this->parsed = array();
+		unset($this->printer_attributes);
+
+		if (!isset($this->setup->charset))
+		{
+			self::setCharset();
+		}
+
+		if (!isset($this->setup->language))
+		{
+			self::setLanguage('en');
+		}
+
+		self::_setOperationId();
+
+		$this->stringjob = chr(0x01) . chr(0x01) // IPP version 1.1
+						 . chr(0x40). chr(0x08) // operation:  cups vendor extension: Accept-Jobs
+						 . $this->meta->operation_id // request-id
+						 . chr(0x01) // start operation-attributes | operation-attributes-tag
+						 . $this->meta->charset
+						 . $this->meta->language
+						 . chr(0x45) // uri
+						 . self::_giveMeStringLength('printer-uri')
+						 . 'printer-uri'
+						 . self::_giveMeStringLength($printer_uri)
+						 . $printer_uri
+						 . chr(0x03); // end operations attribute
+
+		$this->output = $this->stringjob;
+
+		self::_putDebug("Request: ".$this->output);
+
+		$post_values = array( "Content-Type" => "application/ipp",
+							  "Data" => $this->output);
+
+		if (self::_sendHttp ($post_values,'/admin/'))
+		{
+
+			if(self::_parseServerOutput())
+			{
+				self::_parseAttributes();
+			}
+		}
+
+		if (isset($this->serveroutput) && isset($this->serveroutput->status))
+		{
+
+			$this->status = array_merge($this->status,array($this->serveroutput->status));
+			if ($this->serveroutput->status == "successfull-ok")
+			{
+				self::_errorLog("getting defaults: ".$this->serveroutput->status,3);
+			}
+			else
+			{
+				self::_errorLog("getting defaults: ".$this->serveroutput->status,1);
+			}
+
+			return $this->serveroutput->status;
+		}
+		else
+		{
+			$this->status = array_merge($this->status,array("OPERATION FAILED"));
+			self::_errorLog("getting defaults : OPERATION FAILED",1);
+			}
+	return false;
+	}
+
+
+	public function cupsRejectJobs($printer_uri,$printer_state_message)
+	{
+	//The CUPS-Get-Default operation returns the default printer URI and attributes
+
+		$this->jobs = array_merge($this->jobs,array(""));
+		$this->jobs_uri = array_merge($this->jobs_uri,array(""));
+		$this->parsed = array();
+		unset($this->attributes);
+
+		if (!isset($this->setup->charset))
+		{
+			self::setCharset();
+		}
+
+		if (!isset($this->setup->language))
+		{
+			self::setLanguage('en');
+		}
+
+		self::_setOperationId();
+
+		$message = "";
+		if ($printer_state_message)
+		{
+			$message = chr(0x04) // start printer-attributes
+					 . chr(0x41) // textWithoutLanguage
+					 . self::_giveMeStringLength("printer-state-message")
+					 . "printer-state-message"
+					 . self::_giveMeStringLength($printer_state_message)
+					 . $printer_state_message;
+		}
+
+	   $this->stringjob = chr(0x01) . chr(0x01) // IPP version 1.1
+						 . chr(0x40). chr(0x09) // operation:  cups vendor extension: Reject-Jobs
+						 . $this->meta->operation_id // request-id
+						 . chr(0x01) // start operation-attributes | operation-attributes-tag
+						 . $this->meta->charset
+						 . $this->meta->language
+						 . chr(0x45) // uri
+						 . self::_giveMeStringLength('printer-uri')
+						 . 'printer-uri'
+						 . self::_giveMeStringLength($printer_uri)
+						 . $printer_uri
+						 . $message
+						 . chr(0x03); // end operations attribute
+
+		$this->output = $this->stringjob;
+
+		self::_putDebug("Request: ".$this->output);
+
+		$post_values = array( "Content-Type" => "application/ipp",
+							  "Data" => $this->output);
+
+		if (self::_sendHttp ($post_values,'/admin/'))
+		{
+
+			if(self::_parseServerOutput())
+			{
+				self::_parseAttributes();
+			}
+		}
+
+		if (isset($this->serveroutput) && isset($this->serveroutput->status))
+		{
+
+			$this->status = array_merge($this->status,array($this->serveroutput->status));
+			if ($this->serveroutput->status == "successfull-ok")
+			{
+				self::_errorLog("getting defaults: ".$this->serveroutput->status,3);
+			}
+			else
+			{
+				self::_errorLog("getting defaults: ".$this->serveroutput->status,1);
+			}
+
+			return $this->serveroutput->status;
+		}
+		else
+		{
+			$this->status = array_merge($this->status,array("OPERATION FAILED"));
+			self::_errorLog("getting defaults : OPERATION FAILED",1);
+		}
+		return false;
+	}
+
+
+	public function getPrinters($printer_location=false,$printer_info=false,$attributes=array())
+	{
+		if (count($attributes) == 0)
+		{
+			true;
+		}
+		$attributes=array('printer-uri-supported', 'printer-location', 'printer-info', 'printer-type', 'color-supported', 'printer-name');
+		$this->jobs = array_merge($this->jobs,array(""));
+		$this->jobs_uri = array_merge($this->jobs_uri,array(""));
+
+		unset ($this->printers_attributes);
+
+		if (!isset($this->setup->charset))
+		{
+			self::setCharset();
+		}
+
+		if (!isset($this->setup->language))
+		{
+			self::setLanguage('en-us');
+		}
+
+		self::_setOperationId();
+
+		$this->meta->attributes='';
+
+		if ($printer_location)
+		{
+			$this->meta->attributes .= chr(0x41) // textWithoutLanguage
+									. self::_giveMeStringLength('printer-location')
+									. 'printer-location'
+									. self::_giveMeStringLength($printer_location)
+									. $printer_location;
+		}
+
+		if ($printer_info)
+		{
+			$this->meta->attributes .= chr(0x41) // textWithoutLanguage
+									. self::_giveMeStringLength('printer-info')
+									. 'printer-info'
+									. self::_giveMeStringLength($printer_info)
+									. $printer_info;
+		}
+
+		for($i = 0 ; $i < count($attributes) ; $i++)
+		{
+			if ($i == 0)
+			{
+				$this->meta->attributes .= chr(0x44) // Keyword
+										. self::_giveMeStringLength('requested-attributes')
+										. 'requested-attributes'
+										. self::_giveMeStringLength($attributes[0])
+										. $attributes[0];
+			}
+			else
+			{
+				$this->meta->attributes .= chr(0x44) // Keyword
+										.  chr(0x0).chr(0x0) // zero-length name
+										.  self::_giveMeStringLength($attributes[$i])
+										.  $attributes[$i];
+			}
+		}
+
+		$this->stringjob = chr(0x01) . chr(0x01) // IPP version 1.1
+						 . chr(0x40). chr(0x02) // operation:  cups vendor extension: get printers
+						 . $this->meta->operation_id //           request-id
+						 . chr(0x01) // start operation-attributes | operation-attributes-tag
+						 . $this->meta->charset
+						 . $this->meta->language
+						 . $this->meta->attributes
+						 . chr(0x03); // end operations attribute
+
+		$this->output = $this->stringjob;
+
+		$post_values = array( "Content-Type" => "application/ipp",
+							  "Data" => $this->output);
+
+		if (self::_sendHttp ($post_values,'/'))
+		{
+
+			if(self::_parseServerOutput())
+			{
+				$this->_getAvailablePrinters();
+			}
+		}
+
+		if (isset($this->serveroutput) && isset($this->serveroutput->status))
+		{
+
+			$this->status = array_merge($this->status,array($this->serveroutput->status));
+			if ($this->serveroutput->status == "successfull-ok")
+			{
+				self::_errorLog("getting printers: ".$this->serveroutput->status,3);
+			}
+			else
+			{
+				self::_errorLog("getting printers: ".$this->serveroutput->status,1);
+			}
+			return $this->serveroutput->status;
+		}
+		else
+		{
+			$this->status = array_merge($this->status,array("OPERATION FAILED"));
+			self::_errorLog("getting printers : OPERATION FAILED",1);
+		}
+		return false;
+	}
+
+
+	public function cupsGetPrinters ()
+	{
+		// alias for getPrinters();
+		self::getPrinters();
+	}
+
+
+	public function getPrinterAttributes()
+	{
+		// complete informations from parent with Cups-specific stuff
+
+		if(!$result = parent::getPrinterAttributes())
+		{
+			return FALSE;
+		}
+		if(!isset($this->printer_attributes))
+		{
+			return FALSE;
+		}
+
+		if (isset ($this->printer_attributes->printer_type))
+		{
+			$printer_type = $this->printer_attributes->printer_type->_value0;
+			$table = self::_interpretPrinterType($printer_type);
+
+			for($i = 0 ; $i < count($table) ; $i++ )
+			{
+				$index = '_value'.$i;
+				$this->printer_attributes->printer_type->$index = $table[$i];
+			}
+		}
+
+		return $result;
+	}
 
 //
 // SETUP
 //
-    protected function _initTags ()
-    {
-        // override parent with specific cups attributes
-
-        $operation_tags = array ();
-        $this->operation_tags = array_merge ($this->operation_tags, $operation_tags);
-
-        $job_tags = array ( "job-billing" => array("tag" => "textWithoutLanguage"),
-                            "blackplot" => array("tag" => "boolean"),
-                            "brightness" => array("tag" => "integer"),
-                            "columns" => array("tag" => "integer"),
-                            "cpi" => array("tag" => "enum"),
-                            "fitplot" => array("tag" => "boolean"),
-                            "gamma" => array("tag" => "integer"),
-                            "hue" => array("tag" => "integer"),
-                            "lpi" => array("tag" => "enum"),
-                            "mirror" => array("tag","boolean"),
-                            "natural-scaling" => array("tag" => "integer"),
-                            "number-up-layout" => array("tag" => "keyword"),
-                            "page-border" => array("tag" => "keyword"),
-                            "page-bottom" => array("tag" => "integer"),
-                            "page-label" => array("tag" => "textWithoutLanguage"),
-                            "page-left" => array("tag" => "integer"),
-                            "page-right" => array("tag" => "integer"),
-                            "page-set" => array("tag" => "keyword"),
-                            "page-top" => array("tag" => "integer"),
-                            "penwidth" => array("tag" => "integer"),
-                            "position" => array("tag" => "keyword"),
-                            "ppi" => array("tag" => "integer"),
-                            "prettyprint" => array("tag","boolean"),
-                            "saturation" => array("tag" => "integer"),
-                            "scaling" => array("tag" => "integer"),
-                            "wrap" => array("tag","boolean"),
-
-                            );
-        $this->job_tags = array_merge ($this->job_tags, $job_tags);
-    }
-
-    //
-    // REQUEST BUILDING
-    //
-    protected function _enumBuild ($tag,$value)
-    {
-        $value_built = parent::_enumBuild($tag,$value);
-
-        switch ($tag)
-        {
-           case "cpi":
-                switch ($value)
-                {
-                    case '10':
-                        $value_built = chr(10);
-                        break;
-                    case '12':
-                        $value_built = chr(12);
-                        break;
-                    case '17':
-                        $value_built = chr(17);
-                        break;
-                    default:
-                        $value_built = chr(10);
-                }
-            break;
-            case "lpi":
-                switch ($value)
-                {
-                    case '6':
-                        $value_built = chr(6);
-                        break;
-                    case '8':
-                        $value_built = chr(8);
-                        break;
-                    default:
-                        $value_built = chr(6);
-                }
-            break;
-            }
-
-        $prepend = '';
-        while ((strlen($value_built) + strlen($prepend)) < 4)
-            $prepend .= chr(0);
-        return $prepend.$value_built;
-    }
-
-    //
-    // RESPONSE PARSING
-    //
-    private function _getAvailablePrinters ()
-    {
-        $this->available_printers = array();
-        $this->printer_map = array();
-        $k = 0;
-        $this->printers_attributes = new \stdClass();
-
-        for ($i = 0 ; (array_key_exists($i,$this->serveroutput->response)) ; $i ++)
-        {
-            if (($this->serveroutput->response[$i]['attributes']) == "printer-attributes")
-            {
-                $phpname = "_printer".$k;
-                $this->printers_attributes->$phpname = new \stdClass();
-                for ($j = 0 ; array_key_exists($j,$this->serveroutput->response[$i]) ; $j++)
-                {
-
-                    $value = $this->serveroutput->response[$i][$j]['value'];
-                    $name = str_replace("-","_",$this->serveroutput->response[$i][$j]['name']);
-
-                    switch ($name)
-                    {
-                        case "printer_uri_supported":
-                            $this->available_printers = array_merge($this->available_printers,array($value));
-                            break;
-                        case "printer_type":
-                            $table = self::_interpretPrinterType($value);
-                            $this->printers_attributes->$phpname->$name = new \stdClass();
-
-                            for($l = 0 ; $l < count($table) ; $l++ )
-                            {
-                                $index = '_value'.$l;
-                                $this->printers_attributes->$phpname->$name->$index = $table[$l];
-                            }
-
-                            break;
-                        case '':
-                            break;
-                        case 'printer_name':
-                            $this->printer_map[$value] = $k;
-                            break;
-                        default:
-                            $this->printers_attributes->$phpname->$name = $value;
-                            break;
-                    }
-                }
-                $k ++;
-            }
-        }
-    }
-
-    protected function _getEnumVendorExtensions ($value_parsed)
-    {
-        switch ($value_parsed)
-        {
-            case 0x4002:
-                $value = 'Get-Availables-Printers';
-                break;
-            default:
-                $value = sprintf('Unknown(Cups extension for operations): 0x%x',$value_parsed);
-                break;
-        }
-
-        if (isset($value))
-        {
-            return ($value);
-        }
-
-        return sprintf('Unknown: 0x%x',$value_parsed);
-    }
-
-
-    private function _interpretPrinterType($value)
-    {
-        $value_parsed = 0;
-        for ($i = strlen($value) ; $i > 0 ; $i --)
-        {
-            $value_parsed += pow(256,($i - 1)) * ord($value[strlen($value) - $i]);
-        }
-
-        $type[0] = $type[1] = $type[2] = $type[3] = $type[4] = $type[5] = '';
-        $type[6] = $type[7] = $type[8] = $type[9] = $type[10] = '';
-        $type[11] = $type[12] = $type[13] = $type[14] = $type[15] = '';
-        $type[16] = $type[17] = $type[18] = $type[19] = '';
-
-        if ($value_parsed %2 == 1)
-        {
-            $type[0] = 'printer-class';
-            $value_parsed -= 1;
-        }
-
-        if ($value_parsed %4 == 2 )
-        {
-            $type[1] = 'remote-destination';
-            $value_parsed -= 2;
-        }
-
-        if ($value_parsed %8 == 4 )
-        {
-            $type[2] = 'print-black';
-            $value_parsed -= 4;
-        }
-
-        if ($value_parsed %16 == 8 )
-        {
-            $type[3] = 'print-color';
-            $value_parsed -= 8;
-        }
-
-        if ($value_parsed %32 == 16)
-        {
-            $type[4] = 'hardware-print-on-both-sides';
-            $value_parsed -= 16;
-        }
-
-        if ($value_parsed %64 == 32)
-        {
-            $type[5] = 'hardware-staple-output';
-            $value_parsed -= 32;
-        }
-
-        if ($value_parsed %128 == 64)
-        {
-            $type[6] = 'hardware-fast-copies';
-            $value_parsed -= 64;
-        }
-
-        if ($value_parsed %256 == 128)
-        {
-            $type[7] = 'hardware-fast-copy-collation';
-            $value_parsed -= 128;
-        }
-
-        if ($value_parsed %512 == 256)
-        {
-            $type[8] = 'punch-output';
-            $value_parsed -= 256;
-        }
-
-        if ($value_parsed %1024 == 512)
-        {
-            $type[9] = 'cover-output';
-            $value_parsed -= 512;
-        }
-
-        if ($value_parsed %2048 == 1024)
-        {
-            $type[10] = 'bind-output';
-            $value_parsed -= 1024;
-        }
-
-        if ($value_parsed %4096 == 2048)
-        {
-            $type[11] = 'sort-output';
-            $value_parsed -= 2048;
-        }
-
-        if ($value_parsed %8192 == 4096)
-        {
-            $type[12] = 'handle-media-up-to-US-Legal-A4';
-            $value_parsed -= 4096;
-        }
-
-        if ($value_parsed %16384 == 8192)
-        {
-            $type[13] = 'handle-media-between-US-Legal-A4-and-ISO_C-A2';
-            $value_parsed -= 8192;
-        }
-
-        if ($value_parsed %32768 == 16384)
-        {
-            $type[14] = 'handle-media-larger-than-ISO_C-A2';
-            $value_parsed -= 16384;
-        }
-
-        if ($value_parsed %65536 == 32768)
-        {
-            $type[15] = 'handle-user-defined-media-sizes';
-            $value_parsed -= 32768;
-        }
-
-        if ($value_parsed %131072 == 65536)
-        {
-            $type[16] = 'implicit-server-generated-class';
-            $value_parsed -= 65536;
-        }
-
-        if ($value_parsed %262144 == 131072)
-        {
-            $type[17] = 'network-default-printer';
-            $value_parsed -= 131072;
-        }
-
-        if ($value_parsed %524288 == 262144)
-        {
-            $type[18] = 'fax-device';
-            $value_parsed -= 262144;
-        }
-
-        return $type;
-    }
-
-
-    protected function _interpretEnum($attribute_name,$value)
-    {
-        $value_parsed = self::_interpretInteger($value);
-
-        switch ($attribute_name)
-        {
-            case 'cpi':
-            case 'lpi':
-                $value = $value_parsed;
-                break;
-            default:
-                $value = parent::_interpretEnum($attribute_name,$value);
-                break;
-        }
-
-        return $value;
-    }
+	protected function _initTags ()
+	{
+		// override parent with specific cups attributes
+
+		$operation_tags = array ();
+		$this->operation_tags = array_merge ($this->operation_tags, $operation_tags);
+
+		$job_tags = array ( "job-billing" => array("tag" => "textWithoutLanguage"),
+							"blackplot" => array("tag" => "boolean"),
+							"brightness" => array("tag" => "integer"),
+							"columns" => array("tag" => "integer"),
+							"cpi" => array("tag" => "enum"),
+							"fitplot" => array("tag" => "boolean"),
+							"gamma" => array("tag" => "integer"),
+							"hue" => array("tag" => "integer"),
+							"lpi" => array("tag" => "enum"),
+							"mirror" => array("tag","boolean"),
+							"natural-scaling" => array("tag" => "integer"),
+							"number-up-layout" => array("tag" => "keyword"),
+							"page-border" => array("tag" => "keyword"),
+							"page-bottom" => array("tag" => "integer"),
+							"page-label" => array("tag" => "textWithoutLanguage"),
+							"page-left" => array("tag" => "integer"),
+							"page-right" => array("tag" => "integer"),
+							"page-set" => array("tag" => "keyword"),
+							"page-top" => array("tag" => "integer"),
+							"penwidth" => array("tag" => "integer"),
+							"position" => array("tag" => "keyword"),
+							"ppi" => array("tag" => "integer"),
+							"prettyprint" => array("tag","boolean"),
+							"saturation" => array("tag" => "integer"),
+							"scaling" => array("tag" => "integer"),
+							"wrap" => array("tag","boolean"),
+
+							);
+		$this->job_tags = array_merge ($this->job_tags, $job_tags);
+	}
+
+	//
+	// REQUEST BUILDING
+	//
+	protected function _enumBuild ($tag,$value)
+	{
+		$value_built = parent::_enumBuild($tag,$value);
+
+		switch ($tag)
+		{
+		   case "cpi":
+				switch ($value)
+				{
+					case '10':
+						$value_built = chr(10);
+						break;
+					case '12':
+						$value_built = chr(12);
+						break;
+					case '17':
+						$value_built = chr(17);
+						break;
+					default:
+						$value_built = chr(10);
+				}
+			break;
+			case "lpi":
+				switch ($value)
+				{
+					case '6':
+						$value_built = chr(6);
+						break;
+					case '8':
+						$value_built = chr(8);
+						break;
+					default:
+						$value_built = chr(6);
+				}
+			break;
+			}
+
+		$prepend = '';
+		while ((strlen($value_built) + strlen($prepend)) < 4)
+			$prepend .= chr(0);
+		return $prepend.$value_built;
+	}
+
+	//
+	// RESPONSE PARSING
+	//
+	private function _getAvailablePrinters ()
+	{
+		$this->available_printers = array();
+		$this->printer_map = array();
+		$k = 0;
+		$this->printers_attributes = new \stdClass();
+
+		for ($i = 0 ; (array_key_exists($i,$this->serveroutput->response)) ; $i ++)
+		{
+			if (($this->serveroutput->response[$i]['attributes']) == "printer-attributes")
+			{
+				$phpname = "_printer".$k;
+				$this->printers_attributes->$phpname = new \stdClass();
+				for ($j = 0 ; array_key_exists($j,$this->serveroutput->response[$i]) ; $j++)
+				{
+
+					$value = $this->serveroutput->response[$i][$j]['value'];
+					$name = str_replace("-","_",$this->serveroutput->response[$i][$j]['name']);
+
+					switch ($name)
+					{
+						case "printer_uri_supported":
+							$this->available_printers = array_merge($this->available_printers,array($value));
+							break;
+						case "printer_type":
+							$table = self::_interpretPrinterType($value);
+							$this->printers_attributes->$phpname->$name = new \stdClass();
+
+							for($l = 0 ; $l < count($table) ; $l++ )
+							{
+								$index = '_value'.$l;
+								$this->printers_attributes->$phpname->$name->$index = $table[$l];
+							}
+
+							break;
+						case '':
+							break;
+						case 'printer_name':
+							$this->printer_map[$value] = $k;
+							break;
+						default:
+							$this->printers_attributes->$phpname->$name = $value;
+							break;
+					}
+				}
+				$k ++;
+			}
+		}
+	}
+
+	protected function _getEnumVendorExtensions ($value_parsed)
+	{
+		switch ($value_parsed)
+		{
+			case 0x4002:
+				$value = 'Get-Availables-Printers';
+				break;
+			default:
+				$value = sprintf('Unknown(Cups extension for operations): 0x%x',$value_parsed);
+				break;
+		}
+
+		if (isset($value))
+		{
+			return ($value);
+		}
+
+		return sprintf('Unknown: 0x%x',$value_parsed);
+	}
+
+
+	private function _interpretPrinterType($value)
+	{
+		$value_parsed = 0;
+		for ($i = strlen($value) ; $i > 0 ; $i --)
+		{
+			$value_parsed += pow(256,($i - 1)) * ord($value[strlen($value) - $i]);
+		}
+
+		$type[0] = $type[1] = $type[2] = $type[3] = $type[4] = $type[5] = '';
+		$type[6] = $type[7] = $type[8] = $type[9] = $type[10] = '';
+		$type[11] = $type[12] = $type[13] = $type[14] = $type[15] = '';
+		$type[16] = $type[17] = $type[18] = $type[19] = '';
+
+		if ($value_parsed %2 == 1)
+		{
+			$type[0] = 'printer-class';
+			$value_parsed -= 1;
+		}
+
+		if ($value_parsed %4 == 2 )
+		{
+			$type[1] = 'remote-destination';
+			$value_parsed -= 2;
+		}
+
+		if ($value_parsed %8 == 4 )
+		{
+			$type[2] = 'print-black';
+			$value_parsed -= 4;
+		}
+
+		if ($value_parsed %16 == 8 )
+		{
+			$type[3] = 'print-color';
+			$value_parsed -= 8;
+		}
+
+		if ($value_parsed %32 == 16)
+		{
+			$type[4] = 'hardware-print-on-both-sides';
+			$value_parsed -= 16;
+		}
+
+		if ($value_parsed %64 == 32)
+		{
+			$type[5] = 'hardware-staple-output';
+			$value_parsed -= 32;
+		}
+
+		if ($value_parsed %128 == 64)
+		{
+			$type[6] = 'hardware-fast-copies';
+			$value_parsed -= 64;
+		}
+
+		if ($value_parsed %256 == 128)
+		{
+			$type[7] = 'hardware-fast-copy-collation';
+			$value_parsed -= 128;
+		}
+
+		if ($value_parsed %512 == 256)
+		{
+			$type[8] = 'punch-output';
+			$value_parsed -= 256;
+		}
+
+		if ($value_parsed %1024 == 512)
+		{
+			$type[9] = 'cover-output';
+			$value_parsed -= 512;
+		}
+
+		if ($value_parsed %2048 == 1024)
+		{
+			$type[10] = 'bind-output';
+			$value_parsed -= 1024;
+		}
+
+		if ($value_parsed %4096 == 2048)
+		{
+			$type[11] = 'sort-output';
+			$value_parsed -= 2048;
+		}
+
+		if ($value_parsed %8192 == 4096)
+		{
+			$type[12] = 'handle-media-up-to-US-Legal-A4';
+			$value_parsed -= 4096;
+		}
+
+		if ($value_parsed %16384 == 8192)
+		{
+			$type[13] = 'handle-media-between-US-Legal-A4-and-ISO_C-A2';
+			$value_parsed -= 8192;
+		}
+
+		if ($value_parsed %32768 == 16384)
+		{
+			$type[14] = 'handle-media-larger-than-ISO_C-A2';
+			$value_parsed -= 16384;
+		}
+
+		if ($value_parsed %65536 == 32768)
+		{
+			$type[15] = 'handle-user-defined-media-sizes';
+			$value_parsed -= 32768;
+		}
+
+		if ($value_parsed %131072 == 65536)
+		{
+			$type[16] = 'implicit-server-generated-class';
+			$value_parsed -= 65536;
+		}
+
+		if ($value_parsed %262144 == 131072)
+		{
+			$type[17] = 'network-default-printer';
+			$value_parsed -= 131072;
+		}
+
+		if ($value_parsed %524288 == 262144)
+		{
+			$type[18] = 'fax-device';
+			$value_parsed -= 262144;
+		}
+
+		return $type;
+	}
+
+
+	protected function _interpretEnum($attribute_name,$value)
+	{
+		$value_parsed = self::_interpretInteger($value);
+
+		switch ($attribute_name)
+		{
+			case 'cpi':
+			case 'lpi':
+				$value = $value_parsed;
+				break;
+			default:
+				$value = parent::_interpretEnum($attribute_name,$value);
+				break;
+		}
+
+		return $value;
+	}
 }
\ No newline at end of file

Spacing +103 added lines, -103 removed lines

@@ -55,12 +55,12 @@ 
 //
 // OPERATIONS
 //
-    public function cupsGetDefaults($attributes=array("all"))
+    public function cupsGetDefaults($attributes = array("all"))
     {
         //The CUPS-Get-Default operation returns the default printer URI and attributes
 
-        $this->jobs = array_merge($this->jobs,array(""));
-        $this->jobs_uri = array_merge($this->jobs_uri,array(""));
+        $this->jobs = array_merge($this->jobs, array(""));
+        $this->jobs_uri = array_merge($this->jobs_uri, array(""));
         $this->parsed = array();
         unset($this->printer_attributes);
 
@@ -76,7 +76,7 @@ 
 
         self::_setOperationId();
 
-        for($i = 0 ; $i < count($attributes) ; $i++)
+        for ($i = 0; $i < count($attributes); $i++)
         {
             if ($i == 0)
             {
@@ -95,8 +95,8 @@ 
             }
         }
 
-        $this->stringjob = chr(0x01) . chr(0x01) // IPP version 1.1
-                         . chr(0x40). chr(0x01) // operation:  cups vendor extension: get defaults
+        $this->stringjob = chr(0x01).chr(0x01) // IPP version 1.1
+                         . chr(0x40).chr(0x01) // operation:  cups vendor extension: get defaults
                          . $this->meta->operation_id // request-id
                          . chr(0x01) // start operation-attributes | operation-attributes-tag
                          . $this->meta->charset
@@ -108,13 +108,13 @@ 
 
         self::_putDebug("Request: ".$this->output);
 
-        $post_values = array( "Content-Type" => "application/ipp",
+        $post_values = array("Content-Type" => "application/ipp",
                               "Data" => $this->output);
 
-        if (self::_sendHttp ($post_values,'/'))
+        if (self::_sendHttp($post_values, '/'))
         {
 
-            if(self::_parseServerOutput())
+            if (self::_parseServerOutput())
             {
                 self::_parsePrinterAttributes();
             }
@@ -127,7 +127,7 @@ 
                     $printer_type = $this->printer_attributes->printer_type->_value0;
                     $table = self::_interpretPrinterType($printer_type);
 
-                    for($i = 0 ; $i < count($table) ; $i++ )
+                    for ($i = 0; $i < count($table); $i++)
                     {
                         $index = '_value'.$i;
                         $this->printer_attributes->printer_type->$index = $table[$i];
@@ -137,22 +137,22 @@ 
         if (isset($this->serveroutput) && isset($this->serveroutput->status))
         {
 
-            $this->status = array_merge($this->status,array($this->serveroutput->status));
+            $this->status = array_merge($this->status, array($this->serveroutput->status));
             if ($this->serveroutput->status == "successfull-ok")
             {
-                self::_errorLog("getting defaults: ".$this->serveroutput->status,3);
+                self::_errorLog("getting defaults: ".$this->serveroutput->status, 3);
             }
             else
             {
-                self::_errorLog("getting defaults: ".$this->serveroutput->status,1);
+                self::_errorLog("getting defaults: ".$this->serveroutput->status, 1);
             }
 
             return $this->serveroutput->status;
         }
         else
         {
-            $this->status = array_merge($this->status,array("OPERATION FAILED"));
-            self::_errorLog("getting defaults : OPERATION FAILED",1);
+            $this->status = array_merge($this->status, array("OPERATION FAILED"));
+            self::_errorLog("getting defaults : OPERATION FAILED", 1);
             }
     return false;
     }
@@ -162,8 +162,8 @@ 
     {
     //The CUPS-Get-Default operation returns the default printer URI and attributes
 
-        $this->jobs = array_merge($this->jobs,array(""));
-        $this->jobs_uri = array_merge($this->jobs_uri,array(""));
+        $this->jobs = array_merge($this->jobs, array(""));
+        $this->jobs_uri = array_merge($this->jobs_uri, array(""));
         $this->parsed = array();
         unset($this->printer_attributes);
 
@@ -179,8 +179,8 @@ 
 
         self::_setOperationId();
 
-        $this->stringjob = chr(0x01) . chr(0x01) // IPP version 1.1
-                         . chr(0x40). chr(0x08) // operation:  cups vendor extension: Accept-Jobs
+        $this->stringjob = chr(0x01).chr(0x01) // IPP version 1.1
+                         . chr(0x40).chr(0x08) // operation:  cups vendor extension: Accept-Jobs
                          . $this->meta->operation_id // request-id
                          . chr(0x01) // start operation-attributes | operation-attributes-tag
                          . $this->meta->charset
@@ -196,13 +196,13 @@ 
 
         self::_putDebug("Request: ".$this->output);
 
-        $post_values = array( "Content-Type" => "application/ipp",
+        $post_values = array("Content-Type" => "application/ipp",
                               "Data" => $this->output);
 
-        if (self::_sendHttp ($post_values,'/admin/'))
+        if (self::_sendHttp($post_values, '/admin/'))
         {
 
-            if(self::_parseServerOutput())
+            if (self::_parseServerOutput())
             {
                 self::_parseAttributes();
             }
@@ -211,33 +211,33 @@ 
         if (isset($this->serveroutput) && isset($this->serveroutput->status))
         {
 
-            $this->status = array_merge($this->status,array($this->serveroutput->status));
+            $this->status = array_merge($this->status, array($this->serveroutput->status));
             if ($this->serveroutput->status == "successfull-ok")
             {
-                self::_errorLog("getting defaults: ".$this->serveroutput->status,3);
+                self::_errorLog("getting defaults: ".$this->serveroutput->status, 3);
             }
             else
             {
-                self::_errorLog("getting defaults: ".$this->serveroutput->status,1);
+                self::_errorLog("getting defaults: ".$this->serveroutput->status, 1);
             }
 
             return $this->serveroutput->status;
         }
         else
         {
-            $this->status = array_merge($this->status,array("OPERATION FAILED"));
-            self::_errorLog("getting defaults : OPERATION FAILED",1);
+            $this->status = array_merge($this->status, array("OPERATION FAILED"));
+            self::_errorLog("getting defaults : OPERATION FAILED", 1);
             }
     return false;
     }
 
 
-    public function cupsRejectJobs($printer_uri,$printer_state_message)
+    public function cupsRejectJobs($printer_uri, $printer_state_message)
     {
     //The CUPS-Get-Default operation returns the default printer URI and attributes
 
-        $this->jobs = array_merge($this->jobs,array(""));
-        $this->jobs_uri = array_merge($this->jobs_uri,array(""));
+        $this->jobs = array_merge($this->jobs, array(""));
+        $this->jobs_uri = array_merge($this->jobs_uri, array(""));
         $this->parsed = array();
         unset($this->attributes);
 
@@ -264,8 +264,8 @@ 
                      . $printer_state_message;
         }
 
-       $this->stringjob = chr(0x01) . chr(0x01) // IPP version 1.1
-                         . chr(0x40). chr(0x09) // operation:  cups vendor extension: Reject-Jobs
+       $this->stringjob = chr(0x01).chr(0x01) // IPP version 1.1
+                         . chr(0x40).chr(0x09) // operation:  cups vendor extension: Reject-Jobs
                          . $this->meta->operation_id // request-id
                          . chr(0x01) // start operation-attributes | operation-attributes-tag
                          . $this->meta->charset
@@ -282,13 +282,13 @@ 
 
         self::_putDebug("Request: ".$this->output);
 
-        $post_values = array( "Content-Type" => "application/ipp",
+        $post_values = array("Content-Type" => "application/ipp",
                               "Data" => $this->output);
 
-        if (self::_sendHttp ($post_values,'/admin/'))
+        if (self::_sendHttp($post_values, '/admin/'))
         {
 
-            if(self::_parseServerOutput())
+            if (self::_parseServerOutput())
             {
                 self::_parseAttributes();
             }
@@ -297,36 +297,36 @@ 
         if (isset($this->serveroutput) && isset($this->serveroutput->status))
         {
 
-            $this->status = array_merge($this->status,array($this->serveroutput->status));
+            $this->status = array_merge($this->status, array($this->serveroutput->status));
             if ($this->serveroutput->status == "successfull-ok")
             {
-                self::_errorLog("getting defaults: ".$this->serveroutput->status,3);
+                self::_errorLog("getting defaults: ".$this->serveroutput->status, 3);
             }
             else
             {
-                self::_errorLog("getting defaults: ".$this->serveroutput->status,1);
+                self::_errorLog("getting defaults: ".$this->serveroutput->status, 1);
             }
 
             return $this->serveroutput->status;
         }
         else
         {
-            $this->status = array_merge($this->status,array("OPERATION FAILED"));
-            self::_errorLog("getting defaults : OPERATION FAILED",1);
+            $this->status = array_merge($this->status, array("OPERATION FAILED"));
+            self::_errorLog("getting defaults : OPERATION FAILED", 1);
         }
         return false;
     }
 
 
-    public function getPrinters($printer_location=false,$printer_info=false,$attributes=array())
+    public function getPrinters($printer_location = false, $printer_info = false, $attributes = array())
     {
         if (count($attributes) == 0)
         {
             true;
         }
-        $attributes=array('printer-uri-supported', 'printer-location', 'printer-info', 'printer-type', 'color-supported', 'printer-name');
-        $this->jobs = array_merge($this->jobs,array(""));
-        $this->jobs_uri = array_merge($this->jobs_uri,array(""));
+        $attributes = array('printer-uri-supported', 'printer-location', 'printer-info', 'printer-type', 'color-supported', 'printer-name');
+        $this->jobs = array_merge($this->jobs, array(""));
+        $this->jobs_uri = array_merge($this->jobs_uri, array(""));
 
         unset ($this->printers_attributes);
 
@@ -342,7 +342,7 @@ 
 
         self::_setOperationId();
 
-        $this->meta->attributes='';
+        $this->meta->attributes = '';
 
         if ($printer_location)
         {
@@ -362,7 +362,7 @@ 
                                     . $printer_info;
         }
 
-        for($i = 0 ; $i < count($attributes) ; $i++)
+        for ($i = 0; $i < count($attributes); $i++)
         {
             if ($i == 0)
             {
@@ -381,8 +381,8 @@ 
             }
         }
 
-        $this->stringjob = chr(0x01) . chr(0x01) // IPP version 1.1
-                         . chr(0x40). chr(0x02) // operation:  cups vendor extension: get printers
+        $this->stringjob = chr(0x01).chr(0x01) // IPP version 1.1
+                         . chr(0x40).chr(0x02) // operation:  cups vendor extension: get printers
                          . $this->meta->operation_id //           request-id
                          . chr(0x01) // start operation-attributes | operation-attributes-tag
                          . $this->meta->charset
@@ -392,13 +392,13 @@ 
 
         $this->output = $this->stringjob;
 
-        $post_values = array( "Content-Type" => "application/ipp",
+        $post_values = array("Content-Type" => "application/ipp",
                               "Data" => $this->output);
 
-        if (self::_sendHttp ($post_values,'/'))
+        if (self::_sendHttp($post_values, '/'))
         {
 
-            if(self::_parseServerOutput())
+            if (self::_parseServerOutput())
             {
                 $this->_getAvailablePrinters();
             }
@@ -407,27 +407,27 @@ 
         if (isset($this->serveroutput) && isset($this->serveroutput->status))
         {
 
-            $this->status = array_merge($this->status,array($this->serveroutput->status));
+            $this->status = array_merge($this->status, array($this->serveroutput->status));
             if ($this->serveroutput->status == "successfull-ok")
             {
-                self::_errorLog("getting printers: ".$this->serveroutput->status,3);
+                self::_errorLog("getting printers: ".$this->serveroutput->status, 3);
             }
             else
             {
-                self::_errorLog("getting printers: ".$this->serveroutput->status,1);
+                self::_errorLog("getting printers: ".$this->serveroutput->status, 1);
             }
             return $this->serveroutput->status;
         }
         else
         {
-            $this->status = array_merge($this->status,array("OPERATION FAILED"));
-            self::_errorLog("getting printers : OPERATION FAILED",1);
+            $this->status = array_merge($this->status, array("OPERATION FAILED"));
+            self::_errorLog("getting printers : OPERATION FAILED", 1);
         }
         return false;
     }
 
 
-    public function cupsGetPrinters ()
+    public function cupsGetPrinters()
     {
         // alias for getPrinters();
         self::getPrinters();
@@ -438,11 +438,11 @@ 
     {
         // complete informations from parent with Cups-specific stuff
 
-        if(!$result = parent::getPrinterAttributes())
+        if (!$result = parent::getPrinterAttributes())
         {
             return FALSE;
         }
-        if(!isset($this->printer_attributes))
+        if (!isset($this->printer_attributes))
         {
             return FALSE;
         }
@@ -452,7 +452,7 @@ 
             $printer_type = $this->printer_attributes->printer_type->_value0;
             $table = self::_interpretPrinterType($printer_type);
 
-            for($i = 0 ; $i < count($table) ; $i++ )
+            for ($i = 0; $i < count($table); $i++)
             {
                 $index = '_value'.$i;
                 $this->printer_attributes->printer_type->$index = $table[$i];
@@ -465,14 +465,14 @@ 
 //
 // SETUP
 //
-    protected function _initTags ()
+    protected function _initTags()
     {
         // override parent with specific cups attributes
 
-        $operation_tags = array ();
-        $this->operation_tags = array_merge ($this->operation_tags, $operation_tags);
+        $operation_tags = array();
+        $this->operation_tags = array_merge($this->operation_tags, $operation_tags);
 
-        $job_tags = array ( "job-billing" => array("tag" => "textWithoutLanguage"),
+        $job_tags = array("job-billing" => array("tag" => "textWithoutLanguage"),
                             "blackplot" => array("tag" => "boolean"),
                             "brightness" => array("tag" => "integer"),
                             "columns" => array("tag" => "integer"),
@@ -481,7 +481,7 @@ 
                             "gamma" => array("tag" => "integer"),
                             "hue" => array("tag" => "integer"),
                             "lpi" => array("tag" => "enum"),
-                            "mirror" => array("tag","boolean"),
+                            "mirror" => array("tag", "boolean"),
                             "natural-scaling" => array("tag" => "integer"),
                             "number-up-layout" => array("tag" => "keyword"),
                             "page-border" => array("tag" => "keyword"),
@@ -494,21 +494,21 @@ 
                             "penwidth" => array("tag" => "integer"),
                             "position" => array("tag" => "keyword"),
                             "ppi" => array("tag" => "integer"),
-                            "prettyprint" => array("tag","boolean"),
+                            "prettyprint" => array("tag", "boolean"),
                             "saturation" => array("tag" => "integer"),
                             "scaling" => array("tag" => "integer"),
-                            "wrap" => array("tag","boolean"),
+                            "wrap" => array("tag", "boolean"),
 
                             );
-        $this->job_tags = array_merge ($this->job_tags, $job_tags);
+        $this->job_tags = array_merge($this->job_tags, $job_tags);
     }
 
     //
     // REQUEST BUILDING
     //
-    protected function _enumBuild ($tag,$value)
+    protected function _enumBuild($tag, $value)
     {
-        $value_built = parent::_enumBuild($tag,$value);
+        $value_built = parent::_enumBuild($tag, $value);
 
         switch ($tag)
         {
@@ -552,35 +552,35 @@ 
     //
     // RESPONSE PARSING
     //
-    private function _getAvailablePrinters ()
+    private function _getAvailablePrinters()
     {
         $this->available_printers = array();
         $this->printer_map = array();
         $k = 0;
         $this->printers_attributes = new \stdClass();
 
-        for ($i = 0 ; (array_key_exists($i,$this->serveroutput->response)) ; $i ++)
+        for ($i = 0; (array_key_exists($i, $this->serveroutput->response)); $i++)
         {
             if (($this->serveroutput->response[$i]['attributes']) == "printer-attributes")
             {
                 $phpname = "_printer".$k;
                 $this->printers_attributes->$phpname = new \stdClass();
-                for ($j = 0 ; array_key_exists($j,$this->serveroutput->response[$i]) ; $j++)
+                for ($j = 0; array_key_exists($j, $this->serveroutput->response[$i]); $j++)
                 {
 
                     $value = $this->serveroutput->response[$i][$j]['value'];
-                    $name = str_replace("-","_",$this->serveroutput->response[$i][$j]['name']);
+                    $name = str_replace("-", "_", $this->serveroutput->response[$i][$j]['name']);
 
                     switch ($name)
                     {
                         case "printer_uri_supported":
-                            $this->available_printers = array_merge($this->available_printers,array($value));
+                            $this->available_printers = array_merge($this->available_printers, array($value));
                             break;
                         case "printer_type":
                             $table = self::_interpretPrinterType($value);
                             $this->printers_attributes->$phpname->$name = new \stdClass();
 
-                            for($l = 0 ; $l < count($table) ; $l++ )
+                            for ($l = 0; $l < count($table); $l++)
                             {
                                 $index = '_value'.$l;
                                 $this->printers_attributes->$phpname->$name->$index = $table[$l];
@@ -597,12 +597,12 @@ 
                             break;
                     }
                 }
-                $k ++;
+                $k++;
             }
         }
     }
 
-    protected function _getEnumVendorExtensions ($value_parsed)
+    protected function _getEnumVendorExtensions($value_parsed)
     {
         switch ($value_parsed)
         {
@@ -610,7 +610,7 @@ 
                 $value = 'Get-Availables-Printers';
                 break;
             default:
-                $value = sprintf('Unknown(Cups extension for operations): 0x%x',$value_parsed);
+                $value = sprintf('Unknown(Cups extension for operations): 0x%x', $value_parsed);
                 break;
         }
 
@@ -619,16 +619,16 @@ 
             return ($value);
         }
 
-        return sprintf('Unknown: 0x%x',$value_parsed);
+        return sprintf('Unknown: 0x%x', $value_parsed);
     }
 
 
     private function _interpretPrinterType($value)
     {
         $value_parsed = 0;
-        for ($i = strlen($value) ; $i > 0 ; $i --)
+        for ($i = strlen($value); $i > 0; $i--)
         {
-            $value_parsed += pow(256,($i - 1)) * ord($value[strlen($value) - $i]);
+            $value_parsed += pow(256, ($i - 1)) * ord($value[strlen($value) - $i]);
         }
 
         $type[0] = $type[1] = $type[2] = $type[3] = $type[4] = $type[5] = '';
@@ -636,115 +636,115 @@ 
         $type[11] = $type[12] = $type[13] = $type[14] = $type[15] = '';
         $type[16] = $type[17] = $type[18] = $type[19] = '';
 
-        if ($value_parsed %2 == 1)
+        if ($value_parsed % 2 == 1)
         {
             $type[0] = 'printer-class';
             $value_parsed -= 1;
         }
 
-        if ($value_parsed %4 == 2 )
+        if ($value_parsed % 4 == 2)
         {
             $type[1] = 'remote-destination';
             $value_parsed -= 2;
         }
 
-        if ($value_parsed %8 == 4 )
+        if ($value_parsed % 8 == 4)
         {
             $type[2] = 'print-black';
             $value_parsed -= 4;
         }
 
-        if ($value_parsed %16 == 8 )
+        if ($value_parsed % 16 == 8)
         {
             $type[3] = 'print-color';
             $value_parsed -= 8;
         }
 
-        if ($value_parsed %32 == 16)
+        if ($value_parsed % 32 == 16)
         {
             $type[4] = 'hardware-print-on-both-sides';
             $value_parsed -= 16;
         }
 
-        if ($value_parsed %64 == 32)
+        if ($value_parsed % 64 == 32)
         {
             $type[5] = 'hardware-staple-output';
             $value_parsed -= 32;
         }
 
-        if ($value_parsed %128 == 64)
+        if ($value_parsed % 128 == 64)
         {
             $type[6] = 'hardware-fast-copies';
             $value_parsed -= 64;
         }
 
-        if ($value_parsed %256 == 128)
+        if ($value_parsed % 256 == 128)
         {
             $type[7] = 'hardware-fast-copy-collation';
             $value_parsed -= 128;
         }
 
-        if ($value_parsed %512 == 256)
+        if ($value_parsed % 512 == 256)
         {
             $type[8] = 'punch-output';
             $value_parsed -= 256;
         }
 
-        if ($value_parsed %1024 == 512)
+        if ($value_parsed % 1024 == 512)
         {
             $type[9] = 'cover-output';
             $value_parsed -= 512;
         }
 
-        if ($value_parsed %2048 == 1024)
+        if ($value_parsed % 2048 == 1024)
         {
             $type[10] = 'bind-output';
             $value_parsed -= 1024;
         }
 
-        if ($value_parsed %4096 == 2048)
+        if ($value_parsed % 4096 == 2048)
         {
             $type[11] = 'sort-output';
             $value_parsed -= 2048;
         }
 
-        if ($value_parsed %8192 == 4096)
+        if ($value_parsed % 8192 == 4096)
         {
             $type[12] = 'handle-media-up-to-US-Legal-A4';
             $value_parsed -= 4096;
         }
 
-        if ($value_parsed %16384 == 8192)
+        if ($value_parsed % 16384 == 8192)
         {
             $type[13] = 'handle-media-between-US-Legal-A4-and-ISO_C-A2';
             $value_parsed -= 8192;
         }
 
-        if ($value_parsed %32768 == 16384)
+        if ($value_parsed % 32768 == 16384)
         {
             $type[14] = 'handle-media-larger-than-ISO_C-A2';
             $value_parsed -= 16384;
         }
 
-        if ($value_parsed %65536 == 32768)
+        if ($value_parsed % 65536 == 32768)
         {
             $type[15] = 'handle-user-defined-media-sizes';
             $value_parsed -= 32768;
         }
 
-        if ($value_parsed %131072 == 65536)
+        if ($value_parsed % 131072 == 65536)
         {
             $type[16] = 'implicit-server-generated-class';
             $value_parsed -= 65536;
         }
 
-        if ($value_parsed %262144 == 131072)
+        if ($value_parsed % 262144 == 131072)
         {
             $type[17] = 'network-default-printer';
             $value_parsed -= 131072;
         }
 
-        if ($value_parsed %524288 == 262144)
+        if ($value_parsed % 524288 == 262144)
         {
             $type[18] = 'fax-device';
             $value_parsed -= 262144;
@@ -754,7 +754,7 @@ 
     }
 
 
-    protected function _interpretEnum($attribute_name,$value)
+    protected function _interpretEnum($attribute_name, $value)
     {
         $value_parsed = self::_interpretInteger($value);
 
@@ -765,7 +765,7 @@ 
                 $value = $value_parsed;
                 break;
             default:
-                $value = parent::_interpretEnum($attribute_name,$value);
+                $value = parent::_interpretEnum($attribute_name, $value);
                 break;
         }
 

Braces +13 added lines, -22 removed lines

@@ -85,8 +85,7 @@ 
                                         . 'requested-attributes'
                                         . self::_giveMeStringLength($attributes[0])
                                         . $attributes[0];
-            }
-            else
+            } else
             {
                 $this->meta->attributes .= chr(0x44) // Keyword
                                         .  chr(0x0).chr(0x0) // zero-length name
@@ -141,15 +140,13 @@ 
             if ($this->serveroutput->status == "successfull-ok")
             {
                 self::_errorLog("getting defaults: ".$this->serveroutput->status,3);
-            }
-            else
+            } else
             {
                 self::_errorLog("getting defaults: ".$this->serveroutput->status,1);
             }
 
             return $this->serveroutput->status;
-        }
-        else
+        } else
         {
             $this->status = array_merge($this->status,array("OPERATION FAILED"));
             self::_errorLog("getting defaults : OPERATION FAILED",1);
@@ -215,15 +212,13 @@ 
             if ($this->serveroutput->status == "successfull-ok")
             {
                 self::_errorLog("getting defaults: ".$this->serveroutput->status,3);
-            }
-            else
+            } else
             {
                 self::_errorLog("getting defaults: ".$this->serveroutput->status,1);
             }
 
             return $this->serveroutput->status;
-        }
-        else
+        } else
         {
             $this->status = array_merge($this->status,array("OPERATION FAILED"));
             self::_errorLog("getting defaults : OPERATION FAILED",1);
@@ -301,15 +296,13 @@ 
             if ($this->serveroutput->status == "successfull-ok")
             {
                 self::_errorLog("getting defaults: ".$this->serveroutput->status,3);
-            }
-            else
+            } else
             {
                 self::_errorLog("getting defaults: ".$this->serveroutput->status,1);
             }
 
             return $this->serveroutput->status;
-        }
-        else
+        } else
         {
             $this->status = array_merge($this->status,array("OPERATION FAILED"));
             self::_errorLog("getting defaults : OPERATION FAILED",1);
@@ -371,8 +364,7 @@ 
                                         . 'requested-attributes'
                                         . self::_giveMeStringLength($attributes[0])
                                         . $attributes[0];
-            }
-            else
+            } else
             {
                 $this->meta->attributes .= chr(0x44) // Keyword
                                         .  chr(0x0).chr(0x0) // zero-length name
@@ -411,14 +403,12 @@ 
             if ($this->serveroutput->status == "successfull-ok")
             {
                 self::_errorLog("getting printers: ".$this->serveroutput->status,3);
-            }
-            else
+            } else
             {
                 self::_errorLog("getting printers: ".$this->serveroutput->status,1);
             }
             return $this->serveroutput->status;
-        }
-        else
+        } else
         {
             $this->status = array_merge($this->status,array("OPERATION FAILED"));
             self::_errorLog("getting printers : OPERATION FAILED",1);
@@ -544,8 +534,9 @@ 
             }
 
         $prepend = '';
-        while ((strlen($value_built) + strlen($prepend)) < 4)
-            $prepend .= chr(0);
+        while ((strlen($value_built) + strlen($prepend)) < 4) {
+                    $prepend .= chr(0);
+        }
         return $prepend.$value_built;
     }