Dolibarr / dolibarr

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

Spacing +2 added lines, -2 removed lines

@@ -37,8 +37,8 @@
             static::$callbackMethodName
                 = (string) $_GET[static::$callbackOverrideQueryString];
         }
-        return static::$callbackMethodName . '('
-            . parent::encode($r, $human_readable) . ');';
+        return static::$callbackMethodName.'('
+            . parent::encode($r, $human_readable).');';
     }
 
     public function isReadable()

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

Spacing +7 added lines, -7 removed lines

@@ -108,7 +108,7 @@ 
         if (self::$unEscapedUnicode) {
             $result = preg_replace_callback(
                 '/\\\u(\w\w\w\w)/',
-                function ($matches) {
+                function($matches) {
                     if (function_exists('mb_convert_encoding')) {
                         return mb_convert_encoding(pack('H*', $matches[1]), 'UTF-8', 'UTF-16BE');
                     } else {
@@ -181,7 +181,7 @@ 
                 case '{' :
                 case '[' :
                     if (!$inString) {
-                        $newJson .= $char . "\n" .
+                        $newJson .= $char."\n".
                             str_repeat($tab, $indentLevel + 1);
                         $indentLevel++;
                     } else {
@@ -192,15 +192,15 @@ 
                 case ']' :
                     if (!$inString) {
                         $indentLevel--;
-                        $newJson .= "\n" .
-                            str_repeat($tab, $indentLevel) . $char;
+                        $newJson .= "\n".
+                            str_repeat($tab, $indentLevel).$char;
                     } else {
                         $newJson .= $char;
                     }
                     break;
                 case ',' :
                     if (!$inString) {
-                        $newJson .= ",\n" .
+                        $newJson .= ",\n".
                             str_repeat($tab, $indentLevel);
                     } else {
                         $newJson .= $char;
@@ -262,7 +262,7 @@ 
                     $message = 'malformed JSON';
                     break;
                 case JSON_ERROR_UTF8:
-                    $message = 'malformed UTF-8 characters, possibly ' .
+                    $message = 'malformed UTF-8 characters, possibly '.
                         'incorrectly encoded';
                     break;
                 default:
@@ -272,7 +272,7 @@ 
         }
 
         if (isset($message)) {
-            throw new \RuntimeException('Error encoding/decoding JSON: ' . $message);
+            throw new \RuntimeException('Error encoding/decoding JSON: '.$message);
         }
     }
 }

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

Spacing +3 added lines, -3 removed lines

@@ -58,8 +58,8 @@ 
          *
          * @var CFPropertyList
          */
-        $plist = new CFPropertyList ();
-        $td = new CFTypeDetector ();
+        $plist = new CFPropertyList();
+        $td = new CFTypeDetector();
         $guessedStructure = $td->toCFType(
             Obj::toArray($data)
         );
@@ -81,7 +81,7 @@ 
      */
     public function decode($data)
     {
-        $plist = new CFPropertyList ();
+        $plist = new CFPropertyList();
         $plist->parse($data);
 
         return $plist->toArray();

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

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

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

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);

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

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();

htdocs/includes/printipp/CupsPrintIPP.php

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;
         }
 

htdocs/includes/printipp/http_class.php

Spacing +24 added lines, -24 removed lines

@@ -102,16 +102,16 @@ 
 		E_USER_NOTICE => 'E_USER_NOTICE'
 	);
 	if (defined('E_STRICT')) {
-		$level_names[E_STRICT]='E_STRICT';
+		$level_names[E_STRICT] = 'E_STRICT';
 	}
-	$levels=array();
-	if (($value&E_ALL)==E_ALL) {
-		$levels[]='E_ALL';
-		$value&=~E_ALL;
+	$levels = array();
+	if (($value&E_ALL) == E_ALL) {
+		$levels[] = 'E_ALL';
+		$value &= ~E_ALL;
 	}
 	foreach ($level_names as $level=>$name) {
-		if (($value&$level)==$level) {
-			$levels[]=$name;
+		if (($value & $level) == $level) {
+			$levels[] = $name;
 		}
 	}
 	return implode(' | ', $levels);
@@ -127,13 +127,13 @@ 
 	// variables declaration
 	public $debug;
 	public $html_debug;
-	public $timeout = 30;  // time waiting for connection, seconds
+	public $timeout = 30; // time waiting for connection, seconds
 	public $data_timeout = 30; // time waiting for data, milliseconds
 	public $data_chunk_timeout = 1; // time waiting between data chunks, millisecond
 	public $force_multipart_form_post;
 	public $username;
 	public $password;
-	public $request_headers = array ();
+	public $request_headers = array();
 	public $request_body = "Not a useful information";
 	public $status;
 	public $window_size = 1024; // chunk size of data
@@ -142,11 +142,11 @@ 
 	public $host;
 	private $default_port = 631;
 	private $headers;
-	private $reply_headers = array ();
-	private $reply_body = array ();
+	private $reply_headers = array();
+	private $reply_body = array();
 	private $connection;
 	private $arguments;
-	private $bodystream = array ();
+	private $bodystream = array();
 	private $last_limit;
 	private $connected;
 	private $nc = 1;
@@ -166,7 +166,7 @@ 
 
 	public function GetRequestArguments($url, &$arguments)
 	{
-		$this->arguments = array ();
+		$this->arguments = array();
 		$this->arguments["URL"] = $arguments["URL"] = $url;
 		$this->arguments["RequestMethod"] = $arguments["RequestMethod"] = "POST";
 		$this->headers["Content-Length"] = 0;
@@ -230,7 +230,7 @@ 
 			return $this->_HttpError($error, E_USER_WARNING);
 		}
 		$this->connected = true;
-		return array (true, "success");
+		return array(true, "success");
 	}
 
 	public function SendRequest($arguments)
@@ -243,7 +243,7 @@ 
 		}
 		self::_ReadReply();
 		if (!preg_match('#http/1.1 401 unauthorized#', $this->status)) {
-			return array (true, "success");
+			return array(true, "success");
 		}
 		$headers = array_keys($this->reply_headers);
 		$error = _("need authentication but no mechanism provided");
@@ -279,7 +279,7 @@ 
 			return $this->_HttpError($error.": ".$result[1], E_USER_WARNING);
 		}
 		self::_ReadReply();
-		return array (true, "success");
+		return array(true, "success");
 	}
 
 	public function ReadReplyHeaders(&$headers)
@@ -314,13 +314,13 @@ 
 		foreach ($backtrace as $trace) {
 			$trace .= sprintf("in [file: '%s'][function: '%s'][line: %s];\n", $trace['file'], $trace['function'], $trace['line']);
 		}
-		$msg = sprintf( '%s\n%s: [errno: %s]: %s',
+		$msg = sprintf('%s\n%s: [errno: %s]: %s',
 			$trace, error2string($level), $errno, $msg);
 		if ($this->with_exceptions) {
 			throw new httpException($msg, $errno);
 		} else {
 			trigger_error($msg, $level);
-			return array (false, $msg);
+			return array(false, $msg);
 		}
 	}
 
@@ -336,7 +336,7 @@ 
 	private function _StreamRequest($arguments)
 	{
 		$this->status = false;
-		$this->reply_headers = array ();
+		$this->reply_headers = array();
 		$this->reply_body = "";
 		if (!$this->connected) {
 			return $this->_HttpError(_("not connected"), E_USER_WARNING);
@@ -413,17 +413,17 @@ 
 				}
 			}
 		}
-		return array (true, "success");
+		return array(true, "success");
 	}
 
 	private function _ReadReply()
 	{
 		if (!$this->connected) {
-			return array (false, _("not connected"));
+			return array(false, _("not connected"));
 		}
-		$this->reply_headers = array ();
+		$this->reply_headers = array();
 		$this->reply_body = "";
-		$headers = array ();
+		$headers = array();
 		$body = "";
 		while (!feof($this->connection)) {
 			$line = fgets($this->connection, 1024);
@@ -453,7 +453,7 @@ 
 
 	private function _ReadStream()
 	{
-		if (! array_key_exists("content-length", $this->reply_headers)) {
+		if (!array_key_exists("content-length", $this->reply_headers)) {
 			stream_set_blocking($this->connection, 0);
 			$this->reply_body = stream_get_contents($this->connection);
 			return true;