Dolibarr / dolibarr

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

Braces +12 added lines, -8 removed lines

@@ -106,8 +106,9 @@ 
 
         static::$haveHeaders ? $keys = $row : $decoded[] = $row;
 
-        while (($row = static::getRow(array_shift($lines), $keys)) !== FALSE)
-            $decoded [] = $row;
+        while (($row = static::getRow(array_shift($lines), $keys)) !== FALSE) {
+                    $decoded [] = $row;
+        }
 
         $char = Obj::$separatorChar;
         Obj::$separatorChar = false;
@@ -130,11 +131,13 @@ 
 
         $row = array();
         foreach ($line as $key => $value) {
-            if (is_numeric($value))
-                $value = floatval($value);
+            if (is_numeric($value)) {
+                            $value = floatval($value);
+            }
             if ($keys) {
-                if (isset($keys [$key]))
-                    $row [$keys [$key]] = $value;
+                if (isset($keys [$key])) {
+                                    $row [$keys [$key]] = $value;
+                }
             } else {
                 $row [$key] = $value;
             }
@@ -169,8 +172,9 @@ 
 
         static::$haveHeaders ? $keys = $row : $decoded[] = $row;
 
-        while (($row = static::getRow(stream_get_line($stream, 0, PHP_EOL), $keys)) !== FALSE)
-            $decoded [] = $row;
+        while (($row = static::getRow(stream_get_line($stream, 0, PHP_EOL), $keys)) !== FALSE) {
+                    $decoded [] = $row;
+        }
 
         $char = Obj::$separatorChar;
         Obj::$separatorChar = false;

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

Braces +6 added lines, -4 removed lines

@@ -118,8 +118,9 @@ 
                     foreach ($file as $property => $value) {
                         $innerFile[$property] = $value[$i];
                     }
-                    if ($innerFile['name'])
-                        static::checkFile($innerFile, $doMimeCheck, $doSizeCheck);
+                    if ($innerFile['name']) {
+                                            static::checkFile($innerFile, $doMimeCheck, $doSizeCheck);
+                    }
 
                     if (isset($innerFile['exception'])) {
                         $file['error'][$i] = $innerFile['error'];
@@ -128,8 +129,9 @@ 
                     }
                 }
             } else {
-                if ($file['name'])
-                    static::checkFile($file, $doMimeCheck, $doSizeCheck);
+                if ($file['name']) {
+                                    static::checkFile($file, $doMimeCheck, $doSizeCheck);
+                }
                 if (isset($innerFile['exception'])) {
                     break;
                 }

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

Braces +92 added lines, -63 removed lines

@@ -51,10 +51,11 @@ 
      *              or the resolved absolute path.
      */
     public static function addPath($path) {
-        if (false === $path = stream_resolve_include_path($path))
-            return false;
-        else
-            set_include_path($path.PATH_SEPARATOR.get_include_path());
+        if (false === $path = stream_resolve_include_path($path)) {
+                    return false;
+        } else {
+                    set_include_path($path.PATH_SEPARATOR.get_include_path());
+        }
         return $path;
     }
 
@@ -66,16 +67,19 @@ 
      * @return callable the one true auto loader.
      */
     public static function thereCanBeOnlyOne() {
-        if (static::$perfectLoaders === spl_autoload_functions())
-            return static::$instance;
+        if (static::$perfectLoaders === spl_autoload_functions()) {
+                    return static::$instance;
+        }
 
-        if (false !== $loaders = spl_autoload_functions())
-            if (0 < $count = count($loaders))
+        if (false !== $loaders = spl_autoload_functions()) {
+                    if (0 < $count = count($loaders))
                 for ($i = 0, static::$rogueLoaders += $loaders;
+        }
                      $i < $count && false != ($loader = $loaders[$i]);
-                     $i++)
-                    if ($loader !== static::$perfectLoaders[0])
+                     $i++) {
+                                    if ($loader !== static::$perfectLoaders[0])
                         spl_autoload_unregister($loader);
+                }
 
         return static::$instance;
     }
@@ -104,12 +108,14 @@ 
             return false;
         }
 
-        if (empty(static::$classMap[$key]))
-            static::$classMap[$key] = $value;
+        if (empty(static::$classMap[$key])) {
+                    static::$classMap[$key] = $value;
+        }
 
-        if (is_string($alias = static::$classMap[$key]))
-            if (isset(static::$classMap[$alias]))
+        if (is_string($alias = static::$classMap[$key])) {
+                    if (isset(static::$classMap[$alias]))
                 return static::$classMap[$alias];
+        }
 
         return static::$classMap[$key];
     }
@@ -139,8 +145,8 @@ 
                     array($dir, 'vendor', 'composer'),
                     array($dir, '..', '..', '..', 'php'),
                     array($dir, 'vendor', 'php'))
-                as $includePath)
-                if (false !== $path = stream_resolve_include_path(
+                as $includePath) {
+                            if (false !== $path = stream_resolve_include_path(
                         implode($slash, $includePath)
                     ))
                     if ('composer' == end($includePath) &&
@@ -151,19 +157,22 @@ 
                         static::seen(static::loadFile(
                             $classmapPath
                         ));
+            }
                         $paths = array_merge(
                             $paths,
                             array_values(static::loadFile(
                                 "$path{$slash}autoload_namespaces.php"
                             ))
                         );
-                    } else
-                        $paths[] = $path;
+                    } else {
+                                            $paths[] = $path;
+                    }
 
             $paths = array_filter(array_map(
                 function ($path) {
-                    if (false == $realPath = @realpath($path))
-                        return null;
+                    if (false == $realPath = @realpath($path)) {
+                                            return null;
+                    }
                     return $realPath . DIRECTORY_SEPARATOR;
                 },
                 $paths
@@ -202,10 +211,11 @@ 
     private function loadPrefixes($className)
     {
         $currentClass = $className;
-        if (false !== $pos = strrpos($className, '\\'))
-            $className = substr($className, $pos);
-        else
-            $className = "\\$className";
+        if (false !== $pos = strrpos($className, '\\')) {
+                    $className = substr($className, $pos);
+        } else {
+                    $className = "\\$className";
+        }
 
         for (
             $i = 0,
@@ -234,12 +244,13 @@ 
     private function loadAliases($className)
     {
         $file = false;
-        if (preg_match('/(.+)(\\\\\w+$)/U', $className, $parts))
-            for (
+        if (preg_match('/(.+)(\\\\\w+$)/U', $className, $parts)) {
+                    for (
                 $i = 0,
                 $aliases = isset(static::$aliases[$parts[1]])
                     ? static::$aliases[$parts[1]] : array(),
                 $count = count($aliases);
+        }
                 $i < $count && false === $file;
                 $file = $this->discover(
                     "{$aliases[$i++]}$parts[2]",
@@ -265,13 +276,15 @@ 
     private function loadLastResort($className, $loader = null) {
         $loaders = array_unique(static::$rogueLoaders, SORT_REGULAR);
         if (isset($loader)) {
-            if (false === array_search($loader, $loaders))
-                static::$rogueLoaders[] = $loader;
+            if (false === array_search($loader, $loaders)) {
+                            static::$rogueLoaders[] = $loader;
+            }
             return $this->loadThisLoader($className, $loader);
         }
-        foreach ($loaders as $loader)
-            if (false !== $file = $this->loadThisLoader($className, $loader))
+        foreach ($loaders as $loader) {
+                    if (false !== $file = $this->loadThisLoader($className, $loader))
                 return $file;
+        }
 
         return false;
     }
@@ -310,13 +323,18 @@ 
      */
     private function alias($className, $currentClass)
     {
-        if ($className == 'Luracast\Restler\string') return;
-        if ($className == 'Luracast\Restler\mixed') return;
+        if ($className == 'Luracast\Restler\string') {
+        	return;
+        }
+        if ($className == 'Luracast\Restler\mixed') {
+        	return;
+        }
         if ($className != $currentClass
-            && false !== strpos($className, $currentClass))
-                if (!class_exists($currentClass, false)
+            && false !== strpos($className, $currentClass)) {
+                        if (!class_exists($currentClass, false)
                     && class_alias($className, $currentClass))
                         static::seen($currentClass, $className);
+        }
     }
 
     /**
@@ -334,11 +352,12 @@ 
 
         /** The short version we've done this before and found it in cache */
         if (false !== $file = static::seen($className)) {
-            if (!$this->exists($className))
-                if (is_callable($file))
+            if (!$this->exists($className)) {
+                            if (is_callable($file))
                     $file = $this->loadLastResort($className, $file);
-                elseif($file = stream_resolve_include_path($file))
-                    $file = static::loadFile($file);
+            } elseif($file = stream_resolve_include_path($file)) {
+                                    $file = static::loadFile($file);
+                }
 
             $this->alias($className, $currentClass);
             return $file;
@@ -348,15 +367,17 @@ 
 
         /** replace \ with / and _ in CLASS NAME with / = PSR-0 in 3 lines */
         $file = preg_replace("/\\\|_(?=\w+$)/", DIRECTORY_SEPARATOR, $className);
-        if (false === $file = stream_resolve_include_path("$file.php"))
-            return false;
+        if (false === $file = stream_resolve_include_path("$file.php")) {
+                    return false;
+        }
 
         /** have we loaded this file before could this be an alias */
         if (in_array($file, get_included_files())) {
-            if (false !== $sameFile = array_search($file, static::$classMap))
-                if (!$this->exists($className, $file))
+            if (false !== $sameFile = array_search($file, static::$classMap)) {
+                            if (!$this->exists($className, $file))
                     if (false !== strpos($sameFile, $className))
                         $this->alias($sameFile, $className);
+            }
 
             return $file;
         }
@@ -365,17 +386,19 @@ 
 
         if (false !== $result = static::loadFile($file)) {
 
-            if ($this->exists($className, $file))
-                $this->alias($className, $currentClass);
-            elseif (false != $diff = array_diff(
-                array_merge(get_declared_classes(), get_declared_interfaces()), $state))
-                foreach ($diff as $autoLoaded)
+            if ($this->exists($className, $file)) {
+                            $this->alias($className, $currentClass);
+            } elseif (false != $diff = array_diff(
+                array_merge(get_declared_classes(), get_declared_interfaces()), $state)) {
+                            foreach ($diff as $autoLoaded)
                     if ($this->exists($autoLoaded, $file))
                         if (false !== strpos($autoLoaded, $className))
                             $this->alias($autoLoaded, $className);
+            }
 
-            if (!$this->exists($currentClass))
-                $result = false;
+            if (!$this->exists($currentClass)) {
+                            $result = false;
+            }
         }
 
         return $result;
@@ -393,11 +416,12 @@ 
     private function exists($className, $mapping = null)
     {
         if (class_exists($className, false)
-            || interface_exists($className, false))
-            if (isset($mapping))
+            || interface_exists($className, false)) {
+                    if (isset($mapping))
                 return static::seen($className, $mapping);
-            else
-                return true;
+        } else {
+                            return true;
+            }
         return false;
     }
 
@@ -410,22 +434,27 @@ 
      */
     public function __invoke($className)
     {
-        if (empty($className))
-            return false;
+        if (empty($className)) {
+                    return false;
+        }
 
-        if (false !== $includeReference = $this->discover($className))
-            return $includeReference;
+        if (false !== $includeReference = $this->discover($className)) {
+                    return $includeReference;
+        }
 
         static::thereCanBeOnlyOne();
 
-        if (false !== $includeReference = $this->loadAliases($className))
-            return $includeReference;
+        if (false !== $includeReference = $this->loadAliases($className)) {
+                    return $includeReference;
+        }
 
-        if (false !== $includeReference = $this->loadPrefixes($className))
-            return $includeReference;
+        if (false !== $includeReference = $this->loadPrefixes($className)) {
+                    return $includeReference;
+        }
 
-        if (false !== $includeReference = $this->loadLastResort($className))
-            return $includeReference;
+        if (false !== $includeReference = $this->loadLastResort($className)) {
+                    return $includeReference;
+        }
 
         static::seen($className, true);
         return null;

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

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 =====//

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

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/printipp/CupsPrintIPP.php

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

htdocs/includes/printipp/http_class.php

Braces +3 added lines, -2 removed lines

@@ -478,8 +478,9 @@
 		}
 		$nc = sprintf('%x', $this->nc);
 		$prepend = "";
-		while ((strlen($nc) + strlen($prepend)) < 8)
-			$prependi .= "0";
+		while ((strlen($nc) + strlen($prepend)) < 8) {
+					$prependi .= "0";
+		}
 		$nc = $prepend.$nc;
 		$cnonce = "printipp";
 		$username = $this->user;

htdocs/includes/printipp/PrintIPP.php

Braces +35 added lines, -70 removed lines

@@ -78,8 +78,7 @@ 
             {
                 $post_values = array_merge($post_values,array("Filetype"=>"TEXT"));
             }
-        }
-        else
+        } else
         {
             self::_putDebug( _("Printing DATA\n"),3); 
 
@@ -99,8 +98,7 @@ 
                 $this->_getJobId();
                 $this->_getJobUri();
                 $this->_parseJobAttributes();
-            }
-            else
+            } else
             {
                 $this->jobs = array_merge($this->jobs,array(''));
                 $this->jobs_uri = array_merge($this->jobs_uri,array(''));
@@ -114,8 +112,7 @@ 
             if ($this->serveroutput->status == "successfull-ok")
             {
               self::_errorLog(sprintf("printing job %s: ",$this->last_job) .$this->serveroutput->status,3);
-            }
-            else
+            } else
             {
                 $this->jobs = array_merge($this->jobs,array(""));
                 $this->jobs_uri = array_merge($this->jobs_uri,array(""));
@@ -168,8 +165,7 @@ 
             if ($this->serveroutput->status == "successfull-ok")
             {
                 self::_errorLog("cancelling job $job_uri: ".$this->serveroutput->status,3);
-            }
-            else
+            } else
             {
                 self::_errorLog("cancelling job $job_uri: ".$this->serveroutput->status,1);
             }
@@ -212,8 +208,7 @@ 
             if (array_key_exists(0,$this->available_printers))
             {
                self::setPrinterURI($this->available_printers[0]);
-            }
-            else
+            } else
             {
                 trigger_error(_("_stringJob: Printer URI is not set: die"),E_USER_WARNING);
                 self::_putDebug( _("_stringJob: Printer URI is not set: die\n"),3);
@@ -252,8 +247,7 @@ 
             if (is_readable($this->data))
             {
                 self::setJobName(basename($this->data),true);
-            }
-            else
+            } else
             {
                 self::setJobName();
             }
@@ -334,8 +328,7 @@ 
             if ($this->serveroutput->status == "successfull-ok")
             {
                 self::_errorLog("validate job: ".$this->serveroutput->status,3);
-            }
-            else
+            } else
             {
                 self::_errorLog("validate job: ".$this->serveroutput->status,1);
             }
@@ -370,8 +363,7 @@ 
             if (array_key_exists(0,$this->available_printers))
             {
                self::setPrinterURI($this->available_printers[0]);
-            }
-            else
+            } else
             {
                 trigger_error(_("_stringJob: Printer URI is not set: die"),E_USER_WARNING);
                 self::_putDebug( _("_stringJob: Printer URI is not set: die\n"),3);
@@ -433,8 +425,7 @@ 
             {
                 self::_errorLog(sprintf(_("getting printer attributes of %s: %s"),$this->printer_uri,
                                                                         $this->serveroutput->status),3);
-            }
-            else 
+            } else 
             {
                 self::_errorLog(sprintf(_("getting printer attributes of %s: %s"),$this->printer_uri,
                                                                         $this->serveroutput->status),1);
@@ -471,8 +462,7 @@ 
             if (array_key_exists(0,$this->available_printers))
             {
                self::setPrinterURI($this->available_printers[0]);
-            }
-            else
+            } else
             {
                 trigger_error(_("getJobs: Printer URI is not set: die"),E_USER_WARNING);
                 self::_putDebug( _("_stringJob: Printer URI is not set: die\n"),3);
@@ -504,8 +494,7 @@ 
                                . 'limit'
                                . self::_giveMeStringLength($limit)
                                . $limit;
-        }
-        else
+        } else
         {
             $this->meta->limit = '';
         }
@@ -517,8 +506,7 @@ 
                                         . 'which-jobs'
                                         . self::_giveMeStringLength($which_jobs)
                                         . $which_jobs;
-        }
-        else
+        } else
         {
             $this->meta->which_jobs = "";
         }
@@ -530,8 +518,7 @@ 
                                  . 'my-jobs'
                                  . self::_giveMeStringLength(chr(0x01))
                                  . chr(0x01);
-        }
-        else
+        } else
         {
             $this->meta->my_jobs = '';
         }
@@ -570,8 +557,7 @@ 
                          . ''
                          . self::_giveMeStringLength('job-state-reason')
                          . 'job-state-reason';
-        }
-        else
+        } else
         { # cups 1.4.4 doesn't return much of anything without this
             $this->stringjob .=
                           chr(0x44) // keyword
@@ -609,8 +595,7 @@ 
             {
                 self::_errorLog(sprintf(_("getting jobs of printer %s: "),$this->printer_uri)
                             .$this->serveroutput->status,3);
-            }
-            else
+            } else
             {
                  self::_errorLog(sprintf(_("getting jobs of printer %s: "),$this->printer_uri)
                                              .$this->serveroutput->status,1);
@@ -654,8 +639,7 @@ 
             if (array_key_exists(0,$this->available_printers))
             {
                self::setPrinterURI($this->available_printers[0]);
-            }
-            else
+            } else
             {
                 trigger_error(_("getJobs: Printer URI is not set: die"),E_USER_WARNING);
                 self::_putDebug( _("_stringJob: Printer URI is not set: die\n"),3);
@@ -716,8 +700,7 @@ 
                          . ''
                          . self::_giveMeStringLength('job-state-reason')
                          . 'job-state-reason';
-        }
-        elseif($attributes_group)
+        } elseif($attributes_group)
         {
             switch($attributes_group)
             {
@@ -768,8 +751,7 @@ 
             {
                 self::_errorLog(sprintf(_("getting job attributes for %s: "),$job_uri)
                             .$this->serveroutput->status,3);
-            }
-            else
+            } else
             {
                  self::_errorLog(sprintf(_("getting job attributes for %s: "),$job_uri)
                                              .$this->serveroutput->status,1);
@@ -871,8 +853,7 @@ 
                     $this->parsed[$k]['name'] = $this->serveroutput->response[$i][$j]['name'];
                     $this->parsed[$k]['type'] = $this->serveroutput->response[$i][$j]['type'];
                     $this->parsed[$k][$l] = $this->serveroutput->response[$i][$j]['value'];
-                }
-                else
+                } else
                 {
                     $l ++;
                     $this->parsed[$k][$l] = $this->serveroutput->response[$i][$j]['value'];
@@ -926,8 +907,7 @@ 
                     $this->parsed[$job][$k]['name'] = $this->serveroutput->response[$i][$j]['name'];
                     $this->parsed[$job][$k]['type'] = $this->serveroutput->response[$i][$j]['type'];
                     $this->parsed[$job][$k][$l] = $this->serveroutput->response[$i][$j]['value'];
-                }
-                else
+                } else
                 {
                     $l ++;
                     $this->parsed[$job][$k][$l] = $this->serveroutput->response[$i][$j]['value'];
@@ -991,8 +971,7 @@ 
                     $this->collection_depth ++;
                     $this->index --;
                     $this->collection_nbr[$this->collection_depth] ++;
-                }
-                else
+                } else
                 {
                     $this->collection_depth ++;
                     if ($this->collection_depth == 0)
@@ -1002,8 +981,7 @@ 
                     if (array_key_exists($this->collection_depth,$this->collection_nbr))
                     {
                         $this->collection_nbr[$this->collection_depth] ++;
-                    }
-                    else
+                    } else
                     {
                         $this->collection_nbr[$this->collection_depth] = 0;
                     }
@@ -1037,8 +1015,7 @@ 
                 if (!$attribute_name)
                 {
                     $attribute_name = $this->attribute_name;
-                }
-                else
+                } else
                 {
                     $this->attribute_name = $attribute_name;
                 }
@@ -1151,24 +1128,19 @@ 
                 if ($tag >= 0x14 && $tag < 0x15 && $tag > 0x17 && $tag <= 0x1f) 
                 {
                     $tag = "out-of-band";
-                }
-                elseif (0x24 <= $tag && $tag <= 0x2f) 
+                } elseif (0x24 <= $tag && $tag <= 0x2f) 
                 {
                     $tag = "new integer type";
-                }
-                elseif (0x38 <= $tag && $tag <= 0x3F) 
+                } elseif (0x38 <= $tag && $tag <= 0x3F) 
                 {
                     $tag = "new octet-stream type";
-                }
-                elseif (0x4B <= $tag && $tag <= 0x5F) 
+                } elseif (0x4B <= $tag && $tag <= 0x5F) 
                 {
                     $tag = "new character string type";
-                }
-                elseif ((0x60 <= $tag && $tag < 0x7f) || $tag >= 0x80 )
+                } elseif ((0x60 <= $tag && $tag < 0x7f) || $tag >= 0x80 )
                 {
                     $tag = "IETF reserved for future";
-                }
-                else
+                } else
                 {
                     $tag = sprintf("UNKNOWN: 0x%x (%u)",$tag,$tag);
                 }
@@ -1222,8 +1194,7 @@ 
         {
             $attribute_name = $this->last_attribute_name;
             $this->collection_key[$this->collection_depth] ++;
-        }
-        else
+        } else
         {
             $this->collection_key[$this->collection_depth] = 0;
         }
@@ -1382,8 +1353,7 @@ 
                     $this->parsed[$k]['name'] = $this->serveroutput->response[$i][$j]['name'];
                     $this->parsed[$k]['type'] = $this->serveroutput->response[$i][$j]['type'];
                     $this->parsed[$k][$l] = $this->serveroutput->response[$i][$j]['value'];
-                }
-                else
+                } else
                 {
                     $l ++;
                     $this->parsed[$k][$l] = $this->serveroutput->response[$i][$j]['value'];
@@ -1430,8 +1400,7 @@ 
                     $this->parsed[$k]['name'] = $this->serveroutput->response[$i][$j]['name'];
                     $this->parsed[$k]['type'] = $this->serveroutput->response[$i][$j]['type'];
                     $this->parsed[$k][$l] = $this->serveroutput->response[$i][$j]['value'];
-                }
-                else
+                } else
                 {
                     $l ++;
                     $this->parsed[$k][$l] = $this->serveroutput->response[$i][$j]['value'];
@@ -1477,8 +1446,7 @@ 
                 if ($value == 0x00)
                 {
                     $value = 'false';
-                }
-                else
+                } else
                 {
                     $value = 'true';
                 }
@@ -1749,19 +1717,16 @@ 
                 if ($value_parsed > 0x002B && $value_parsed <= 0x3FFF)
                 {
                     $value = sprintf('Unknown(IETF standards track operations reserved): 0x%x',$value_parsed);
-                }
-                elseif ($value_parsed >= 0x4000 && $value_parsed <= 0x8FFF)
+                } elseif ($value_parsed >= 0x4000 && $value_parsed <= 0x8FFF)
                 {
                     if (method_exists($this,'_getEnumVendorExtensions'))
                     {
                         $value = $this->_getEnumVendorExtensions($value_parsed);
-                    }
-                    else
+                    } else
                     {
                         $value = sprintf('Unknown(Vendor extension for operations): 0x%x',$value_parsed);
                     }
-                }
-                elseif ($value_parsed > 0x8FFF)
+                } elseif ($value_parsed > 0x8FFF)
                 {
                     $value = sprintf('Unknown operation (should not exists): 0x%x',$value_parsed);
                 }

htdocs/includes/printipp/BasicIPP.php

Braces +44 added lines, -63 removed lines

@@ -183,7 +183,9 @@ 
     {
         $length = strlen($uri);
         $length = chr($length);
-        while (strlen($length) < 2) $length = chr(0x00) . $length;
+        while (strlen($length) < 2) {
+        	$length = chr(0x00) . $length;
+        }
         $this->meta->printer_uri = chr(0x45) // uri type | value-tag
             . chr(0x00) . chr(0x0B) // name-length
             . "printer-uri" // printer-uri | name
@@ -209,9 +211,10 @@ 
         {
             //It's a filename.  Open and stream.
             $data = fopen($this->data, "rb");
-            while (!feof($data)) $output = fread($data, 8192);
-        }
-        else
+            while (!feof($data)) {
+            	$output = fread($data, 8192);
+            }
+        } else
         {
             $output = $this->data;
         }
@@ -278,7 +281,9 @@ 
     {
         self::setBinary();
         $length = chr(strlen($mime_media_type));
-        while (strlen($length) < 2) $length = chr(0x00) . $length;
+        while (strlen($length) < 2) {
+        	$length = chr(0x00) . $length;
+        }
         self::_putDebug(sprintf(_("mime type: %s") , $mime_media_type) , 2);
         $this->meta->mime_media_type = chr(0x49) // document-format tag
             . self::_giveMeStringLength('document-format') . 'document-format' //
@@ -320,7 +325,9 @@ 
         $document_name = substr($document_name, 0, 1023);
         $length = strlen($document_name);
         $length = chr($length);
-        while (strlen($length) < 2) $length = chr(0x00) . $length;
+        while (strlen($length) < 2) {
+        	$length = chr(0x00) . $length;
+        }
         self::_putDebug(sprintf(_("document name: %s") , $document_name) , 2);
         $this->meta->document_name = chr(0x41) // textWithoutLanguage tag
             . chr(0x00) . chr(0x0d) // name-length
@@ -493,8 +500,7 @@ 
                     . 'page-ranges'
                     . self::_giveMeStringLength($value)
                     . $value;
-            }
-            else
+            } else
             {
                 $this->meta->page_ranges .=
                 $this->tags_types['rangeOfInteger']['tag']
@@ -517,44 +523,38 @@ 
             if (!is_array($values))
             {
                 self::_setOperationAttribute($attribute, $values);
-            }
-            else
+            } else
             {
                 foreach($values as $value)
                 {
                     self::_setOperationAttribute($attribute, $value);
                 }
             }
-        }
-        elseif (in_array($attribute, $job_attributes_tags))
+        } elseif (in_array($attribute, $job_attributes_tags))
         {
             if (!is_array($values))
             {
                 self::_setJobAttribute($attribute, $values);
-            }
-            else
+            } else
             {
                 foreach($values as $value)
                 {
                     self::_setJobAttribute($attribute, $value);
                 }
             }
-        }
-        elseif (in_array($attribute, $printer_attributes_tags))
+        } elseif (in_array($attribute, $printer_attributes_tags))
         {
             if (!is_array($values))
             {
                 self::_setPrinterAttribute($attribute, $values);
-            }
-            else
+            } else
             {
                 foreach($values as $value)
                 {
                     self::_setPrinterAttribute($attribute, $value);
                 }
             }
-        }
-        else
+        } else
         {
             trigger_error(
                 sprintf(_('SetAttribute: Tag "%s" is not a printer or a job attribute'),
@@ -580,22 +580,19 @@ 
                 $this->operation_tags[$attribute]['value'],
                 $this->operation_tags[$attribute]['systag']
             );
-        }
-        elseif (in_array($attribute, $job_attributes_tags))
+        } elseif (in_array($attribute, $job_attributes_tags))
         {
             unset(
                 $this->job_tags[$attribute]['value'],
                 $this->job_tags[$attribute]['systag']
             );
-        }
-        elseif (in_array($attribute, $printer_attributes_tags))
+        } elseif (in_array($attribute, $printer_attributes_tags))
         {
             unset(
                 $this->printer_tags[$attribute]['value'],
                 $this->printer_tags[$attribute]['systag']
             );
-        }
-        else
+        } else
         {
             trigger_error(
                 sprintf(_('unsetAttribute: Tag "%s" is not a printer or a job attribute'),
@@ -714,8 +711,7 @@ 
                     )
                 );
             }
-        }
-        else
+        } else
         {
             self::_putDebug(_("Printing DATA"));
             $this->output =
@@ -743,8 +739,7 @@ 
                     sprintf("printing job %s: ", $this->last_job)
                         . $this->serveroutput->status,
                     3);
-            }
-            else
+            } else
             {
                 self::_errorLog(
                     sprintf("printing job: ", $this->last_job)
@@ -781,10 +776,11 @@ 
         $http = new http_class;
         if (!$this->unix) {
         	// DOL_LDR_CHANGE
-        	if (empty($this->host)) $this->host='127.0.0.1';
+        	if (empty($this->host)) {
+        		$this->host='127.0.0.1';
+        	}
             $http->host = $this->host;
-        }
-        else {
+        } else {
             $http->host = "localhost";
         }
         $http->with_exceptions = $this->with_exceptions;
@@ -792,8 +788,7 @@ 
         {
             $http->debug = 1;
             $http->html_debug = 0;
-        }
-        else
+        } else
         {
             $http->debug = 0;
             $http->html_debug = 0;
@@ -838,15 +833,13 @@ 
             try
             {
                 $success = $http->Open($arguments);
-            }
-            catch(httpException $e)
+            } catch(httpException $e)
             {
                 throw new ippException(
                     sprintf("http error: %s", $e->getMessage()),
                         $e->getErrno());
             }
-        }
-        else
+        } else
         {
         	$success = $http->Open($arguments);
         }
@@ -866,8 +859,7 @@ 
                         {
                             self::_putDebug($header_name . ": " . $http->request_headers[$header_name][$header_value]);
                         }
-                    }
-                    else
+                    } else
                     {
                         self::_putDebug($header_name . ": " . $http->request_headers[$header_name]);
                     }
@@ -896,8 +888,7 @@ 
                                     . $headers[$header_name][$header_value];
                             $i++;
                         }
-                    }
-                    else
+                    } else
                     {
                         self::_putDebug($header_name . ": " . $headers[$header_name]);
                         $this->serveroutput->headers[$i] =
@@ -1245,20 +1236,16 @@ 
         if ($status_code < 0x00FF)
         {
             $this->serveroutput->status = "successfull";
-        }
-        elseif ($status_code < 0x01FF)
+        } elseif ($status_code < 0x01FF)
         {
             $this->serveroutput->status = "informational";
-        }
-        elseif ($status_code < 0x02FF)
+        } elseif ($status_code < 0x02FF)
         {
             $this->serveroutput->status = "redirection";
-        }
-        elseif ($status_code < 0x04FF)
+        } elseif ($status_code < 0x04FF)
         {
             $this->serveroutput->status = "client-error";
-        }
-        elseif ($status_code < 0x05FF)
+        } elseif ($status_code < 0x05FF)
         {
             $this->serveroutput->status = "server-error";
         }
@@ -1464,8 +1451,7 @@ 
             if (array_key_exists(0, $this->available_printers))
             {
                 self::setPrinterURI($this->available_printers[0]);
-            }
-            else
+            } else
             {
                 trigger_error(
                     _("_stringJob: Printer URI is not set: die"),
@@ -1560,8 +1546,7 @@ 
                                 . $key
                                 . self::_giveMeStringLength($item_value)
                                 . $item_value;
-                    }
-                    else
+                    } else
                     {
                         $operationattributes .=
                             $values['systag']
@@ -1589,8 +1574,7 @@ 
                                 . $key
                                 . self::_giveMeStringLength($item_value)
                                 . $item_value;
-                    }
-                    else
+                    } else
                     {
                         $jobattributes .=
                             $values['systag']
@@ -1618,8 +1602,7 @@ 
                                 . $key
                                 . self::_giveMeStringLength($item_value)
                                 . $item_value;
-                    }
-                    else
+                    } else
                     {
                         $printerattributes .=
                             $values['systag']
@@ -1649,8 +1632,7 @@ 
             if ($this->with_exceptions)
             {
                 throw new ippException($errmsg);
-            }
-            else
+            } else
             {
                 trigger_error ($errmsg, E_USER_ERROR);
             }
@@ -1814,8 +1796,7 @@ 
         $int4 = $value & 0xFF; //64bits
         if ($initial_value < 0) {
             $int4 = chr($int4) | chr(0x80);
-        }
-        else {
+        } else {
             $int4 = chr($int4);
         }
         $value = $int4 . chr($int3) . chr($int2) . chr($int1);