Dolibarr / dolibarr

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

Braces +33 added lines, -20 removed lines

@@ -231,8 +231,9 @@ 
                 }
                 $fLen = strlen($fullPath);
                 if ($tSlash) {
-                    if ($fLen != $tLen && !Text::beginsWith($fullPath, $target . '/'))
-                        continue;
+                    if ($fLen != $tLen && !Text::beginsWith($fullPath, $target . '/')) {
+                                            continue;
+                    }
                 } elseif ($fLen > $tLen + 1 && $fullPath[$tLen + 1] != '{' && !Text::beginsWith($fullPath, '{')) {
                     //when mapped to root exclude paths that have static parts
                     //they are listed else where under that static part name
@@ -244,8 +245,9 @@ 
                 }
                 foreach (static::$excludedPaths as $exclude) {
                     if (empty($exclude)) {
-                        if ($fullPath == $exclude)
-                            continue 2;
+                        if ($fullPath == $exclude) {
+                                                    continue 2;
+                        }
                     } elseif (Text::beginsWith($fullPath, $exclude)) {
                         continue 2;
                     }
@@ -283,8 +285,9 @@ 
                 }
                 $nickname = $this->_nickname($route);
                 $index = static::$placeFormatExtensionBeforeDynamicParts && $pos > 0 ? $pos : 0;
-                if (!empty($parts[$index]))
-                    $parts[$index] .= $this->formatString;
+                if (!empty($parts[$index])) {
+                                    $parts[$index] .= $this->formatString;
+                }
 
                 $fullPath = implode('/', $parts);
                 $description = isset(
@@ -388,8 +391,9 @@ 
         if (!$count) {
             throw new RestException(404);
         }
-        if (!is_null($r))
-            $r->models = $this->_models;
+        if (!is_null($r)) {
+                    $r->models = $this->_models;
+        }
         usort(
             $r->apis,
             function ($a, $b) {
@@ -681,8 +685,9 @@ 
             // Create default object that includes parameters to be submitted
             $defaultObject = new \StdClass();
             foreach ($this->_bodyParam['names'] as $name => $values) {
-                if (!$values->required)
-                    continue;
+                if (!$values->required) {
+                                    continue;
+                }
                 if (class_exists($values->dataType)) {
                     $myClassName = $values->dataType;
                     $defaultObject->$name = new $myClassName();
@@ -706,8 +711,9 @@ 
         }
         $properties = array();
         if (!$instance) {
-            if (!class_exists($className))
-                return;
+            if (!class_exists($className)) {
+                            return;
+            }
             $instance = new $className();
         }
         $data = get_object_vars($instance);
@@ -828,8 +834,12 @@ 
             }
             return 'array';
         }
-        if (is_bool($o)) return 'boolean';
-        if (is_numeric($o)) return is_float($o) ? 'float' : 'int';
+        if (is_bool($o)) {
+        	return 'boolean';
+        }
+        if (is_numeric($o)) {
+        	return is_float($o) ? 'float' : 'int';
+        }
         return 'string';
     }
 
@@ -879,8 +889,9 @@ 
      */
     public function index()
     {
-        if (!static::$accessControlFunction && Defaults::$accessControlFunction)
-            static::$accessControlFunction = Defaults::$accessControlFunction;
+        if (!static::$accessControlFunction && Defaults::$accessControlFunction) {
+                    static::$accessControlFunction = Defaults::$accessControlFunction;
+        }
         $version = $this->restler->getRequestedApiVersion();
         $allRoutes = Util::nestedValue(Routes::toArray(), "v$version");
         $r = $this->_resourceListing();
@@ -934,8 +945,9 @@ 
         foreach ($allRoutes as $fullPath => $routes) {
             $path = explode('/', $fullPath);
             $resource = isset($path[0]) ? $path[0] : '';
-            if ($resource == 'resources' || Text::endsWith($resource, 'index'))
-                continue;
+            if ($resource == 'resources' || Text::endsWith($resource, 'index')) {
+                            continue;
+            }
             foreach ($routes as $httpMethod => $route) {
                 if (in_array($httpMethod, static::$excludedHttpMethods)) {
                     continue;
@@ -946,8 +958,9 @@ 
 
                 foreach (static::$excludedPaths as $exclude) {
                     if (empty($exclude)) {
-                        if ($fullPath == $exclude)
-                            continue 2;
+                        if ($fullPath == $exclude) {
+                                                    continue 2;
+                        }
                     } elseif (Text::beginsWith($fullPath, $exclude)) {
                         continue 2;
                     }

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

Braces +66 added lines, -45 removed lines

@@ -284,8 +284,9 @@ 
                     $this->route();
                     throw $e;
                 }
-                if (Defaults::$useVendorMIMEVersioning)
-                    $this->responseFormat = $this->negotiateResponseFormat();
+                if (Defaults::$useVendorMIMEVersioning) {
+                                    $this->responseFormat = $this->negotiateResponseFormat();
+                }
                 $this->route();
             } catch (Exception $e) {
                 $this->negotiate();
@@ -401,9 +402,10 @@ 
 
             $obj = Scope::get($className);
 
-            if (!$obj instanceof iFormat)
-                throw new Exception('Invalid format class; must implement ' .
+            if (!$obj instanceof iFormat) {
+                            throw new Exception('Invalid format class; must implement ' .
                     'iFormat interface');
+            }
             if ($throwException && get_class($obj) == get_class($this->requestFormat)) {
                 $throwException = false;
             }
@@ -413,12 +415,15 @@ 
                     $this->writableMimeTypes[]=$mime;
                     $extensions[".$extension"] = true;
                 }
-                if($obj->isReadable())
-                    $this->readableMimeTypes[]=$mime;
-                if (!isset($this->formatMap[$extension]))
-                    $this->formatMap[$extension] = $className;
-                if (!isset($this->formatMap[$mime]))
-                    $this->formatMap[$mime] = $className;
+                if($obj->isReadable()) {
+                                    $this->readableMimeTypes[]=$mime;
+                }
+                if (!isset($this->formatMap[$extension])) {
+                                    $this->formatMap[$extension] = $className;
+                }
+                if (!isset($this->formatMap[$mime])) {
+                                    $this->formatMap[$mime] = $className;
+                }
             }
         }
         if ($throwException) {
@@ -449,17 +454,21 @@ 
 
             $obj = Scope::get($className);
 
-            if (!$obj instanceof iFormat)
-                throw new Exception('Invalid format class; must implement ' .
+            if (!$obj instanceof iFormat) {
+                            throw new Exception('Invalid format class; must implement ' .
                     'iFormat interface');
+            }
 
             foreach ($obj->getMIMEMap() as $mime => $extension) {
-                if (!isset($this->formatOverridesMap[$extension]))
-                    $this->formatOverridesMap[$extension] = $className;
-                if (!isset($this->formatOverridesMap[$mime]))
-                    $this->formatOverridesMap[$mime] = $className;
-                if($obj->isWritable())
-                    $extensions[".$extension"] = true;
+                if (!isset($this->formatOverridesMap[$extension])) {
+                                    $this->formatOverridesMap[$extension] = $className;
+                }
+                if (!isset($this->formatOverridesMap[$mime])) {
+                                    $this->formatOverridesMap[$mime] = $className;
+                }
+                if($obj->isWritable()) {
+                                    $extensions[".$extension"] = true;
+                }
             }
         }
         $this->formatOverridesMap['extensions'] = array_keys($extensions);
@@ -498,9 +507,10 @@ 
     protected function getPath()
     {
         // fix SCRIPT_NAME for PHP 5.4 built-in web server
-        if (false === strpos($_SERVER['SCRIPT_NAME'], '.php'))
-            $_SERVER['SCRIPT_NAME']
+        if (false === strpos($_SERVER['SCRIPT_NAME'], '.php')) {
+                    $_SERVER['SCRIPT_NAME']
                 = '/' . substr($_SERVER['SCRIPT_FILENAME'], strlen($_SERVER['DOCUMENT_ROOT']) + 1);
+        }
 
         list($base, $path) = Util::splitCommonPath(
             strtok(urldecode($_SERVER['REQUEST_URI']), '?'), //remove query string
@@ -521,8 +531,9 @@ 
                 (isset($_SERVER['HTTP_X_FORWARDED_PROTO']) && $_SERVER['HTTP_X_FORWARDED_PROTO'] == 'https') || // Amazon ELB
                 (isset($_SERVER['HTTPS']) && $_SERVER['HTTPS'] == 'on');
             $baseUrl = ($https ? 'https://' : 'http://') . $_SERVER['SERVER_NAME'];
-            if (!$https && $port != '80' || $https && $port != '443')
-                $baseUrl .= ':' . $port;
+            if (!$https && $port != '80' || $https && $port != '443') {
+                            $baseUrl .= ':' . $port;
+            }
             $this->baseUrl = $baseUrl . $base;
         } elseif (!empty($base) && false === strpos($this->baseUrl, $base)) {
             $this->baseUrl .= $base;
@@ -572,9 +583,9 @@ 
             if (false !== $pos = strpos($mime, ';')) {
                 $mime = substr($mime, 0, $pos);
             }
-            if ($mime == UrlEncodedFormat::MIME)
-                $format = Scope::get('UrlEncodedFormat');
-            elseif (isset($this->formatMap[$mime])) {
+            if ($mime == UrlEncodedFormat::MIME) {
+                            $format = Scope::get('UrlEncodedFormat');
+            } elseif (isset($this->formatMap[$mime])) {
                 $format = Scope::get($this->formatMap[$mime]);
                 $format->setMIME($mime);
             } elseif (!$this->requestFormatDiffered && isset($this->formatOverridesMap[$mime])) {
@@ -630,8 +641,9 @@ 
             }
 
             $stream = $this->getRequestStream();
-            if($stream === FALSE)
-                return array();
+            if($stream === FALSE) {
+                            return array();
+            }
             $r = $this->requestFormat instanceof iDecodeStream
                 ? $this->requestFormat->decodeStream($stream)
                 : $this->requestFormat->decode(stream_get_contents($stream));
@@ -673,8 +685,9 @@ 
                 }
             }
         }
-        if (!isset($o->className))
-            throw new RestException(404);
+        if (!isset($o->className)) {
+                    throw new RestException(404);
+        }
 
         if(isset($this->apiVersionMap[$o->className])){
             Scope::$classAliases[Util::getShortName($o->className)]
@@ -715,13 +728,15 @@ 
             $this->requestMethod == 'OPTIONS'
             && Defaults::$crossOriginResourceSharing
         ) {
-            if (isset($_SERVER['HTTP_ACCESS_CONTROL_REQUEST_METHOD']))
-                header('Access-Control-Allow-Methods: '
+            if (isset($_SERVER['HTTP_ACCESS_CONTROL_REQUEST_METHOD'])) {
+                            header('Access-Control-Allow-Methods: '
                     . Defaults::$accessControlAllowMethods);
+            }
 
-            if (isset($_SERVER['HTTP_ACCESS_CONTROL_REQUEST_HEADERS']))
-                header('Access-Control-Allow-Headers: '
+            if (isset($_SERVER['HTTP_ACCESS_CONTROL_REQUEST_HEADERS'])) {
+                            header('Access-Control-Allow-Headers: '
                     . $_SERVER['HTTP_ACCESS_CONTROL_REQUEST_HEADERS']);
+            }
 
             header('Access-Control-Allow-Origin: ' .
                 ((Defaults::$accessControlAllowOrigin == '*' && isset($_SERVER['HTTP_ORIGIN']))
@@ -755,11 +770,12 @@ 
             $formats = explode(',', (string)$metadata['format']);
             foreach ($formats as $i => $f) {
                 $f = trim($f);
-                if (!in_array($f, $this->formatOverridesMap))
-                    throw new RestException(
+                if (!in_array($f, $this->formatOverridesMap)) {
+                                    throw new RestException(
                         500,
                         "Given @format is not present in overriding formats. Please call `\$r->setOverridingFormats('$f');` first."
                     );
+                }
                 $formats[$i] = $f;
             }
             call_user_func_array(array($this, 'setSupportedFormats'), $formats);
@@ -1032,8 +1048,9 @@ 
                 }
                 $valid = $o->parameters[$index];
                 $o->parameters[$index] = null;
-                if (empty(Validator::$exceptions))
-                    $o->metadata['param'][$index]['autofocus'] = true;
+                if (empty(Validator::$exceptions)) {
+                                    $o->metadata['param'][$index]['autofocus'] = true;
+                }
                 $valid = $validator::validate(
                     $valid, $info
                 );
@@ -1049,8 +1066,9 @@ 
         $o = & $this->apiMethodInfo;
         $accessLevel = max(Defaults::$apiAccessLevel,
             $o->accessLevel);
-        if (function_exists('newrelic_name_transaction'))
-            newrelic_name_transaction("{$o->className}/{$o->methodName}");
+        if (function_exists('newrelic_name_transaction')) {
+                    newrelic_name_transaction("{$o->className}/{$o->methodName}");
+        }
         $object =  Scope::get($o->className);
         switch ($accessLevel) {
             case 3 : //protected method
@@ -1094,8 +1112,9 @@ 
     {
         //only GET method should be cached if allowed by API developer
         $expires = $this->requestMethod == 'GET' ? Defaults::$headerExpires : 0;
-        if(!is_array(Defaults::$headerCacheControl))
-            Defaults::$headerCacheControl = array(Defaults::$headerCacheControl);
+        if(!is_array(Defaults::$headerCacheControl)) {
+                    Defaults::$headerCacheControl = array(Defaults::$headerCacheControl);
+        }
         $cacheControl = Defaults::$headerCacheControl[0];
         if ($expires > 0) {
             $cacheControl = $this->apiMethodInfo->accessLevel
@@ -1137,8 +1156,9 @@ 
         @header('Content-Language: ' . Defaults::$language);
 
         if (isset($this->apiMethodInfo->metadata['header'])) {
-            foreach ($this->apiMethodInfo->metadata['header'] as $header)
-                @header($header, true);
+            foreach ($this->apiMethodInfo->metadata['header'] as $header) {
+                            @header($header, true);
+            }
         }
         $code = 200;
         if (!Defaults::$suppressResponseCode) {
@@ -1202,8 +1222,9 @@ 
         foreach ($this->errorClasses as $className) {
             if (method_exists($className, $method)) {
                 $obj = Scope::get($className);
-                if ($obj->$method($exception))
-                    $handled = true;
+                if ($obj->$method($exception)) {
+                                    $handled = true;
+                }
             }
         }
         if ($handled) {

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

Braces +9 added lines, -6 removed lines

@@ -38,10 +38,12 @@ 
      */
     public static function file($filename, $forceDownload = false, $expires = 0, $isPublic = true)
     {
-        if (!is_file($filename))
-            throw new RestException(404);
-        if (!is_readable($filename))
-            throw new RestException(403);
+        if (!is_file($filename)) {
+                    throw new RestException(404);
+        }
+        if (!is_readable($filename)) {
+                    throw new RestException(403);
+        }
         $extension = strtolower(pathinfo($filename, PATHINFO_EXTENSION));
         if (!$mime = Util::nestedValue(static::$mimeTypes, $extension)) {
             if (!function_exists('finfo_open')) {
@@ -57,8 +59,9 @@ 
             $finfo = finfo_open(FILEINFO_MIME_TYPE);
             $mime = finfo_file($finfo, $filename);
         }
-        if (!is_array(Defaults::$headerCacheControl))
-            Defaults::$headerCacheControl = array(Defaults::$headerCacheControl);
+        if (!is_array(Defaults::$headerCacheControl)) {
+                    Defaults::$headerCacheControl = array(Defaults::$headerCacheControl);
+        }
         $cacheControl = Defaults::$headerCacheControl[0];
         if ($expires > 0) {
             $cacheControl = $isPublic ? 'public' : 'private';

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

Braces +3 added lines, -1 removed lines

@@ -30,7 +30,9 @@
 
     public static function getUniqueIdentifier($includePlatform = false)
     {
-        if (!static::$initialized) static::init();
+        if (!static::$initialized) {
+        	static::init();
+        }
         return static::$id ? : base64_encode('ip:' . ($includePlatform
             ? static::$ip . '-' . static::$platform
             : static::$ip

htdocs/includes/restler/framework/Luracast/Restler/compatibility/restler2.php

Braces +2 added lines, -1 removed lines

@@ -9,7 +9,7 @@ 
 //changes in auto loading
 $classMap = array();
 //find lowercase php files representing a class/interface
-foreach (explode(PATH_SEPARATOR, get_include_path()) as $path)
+foreach (explode(PATH_SEPARATOR, get_include_path()) as $path) {
     foreach (new DirectoryIterator($path) as $fileInfo)
         if ($fileInfo->isFile()
             && 'php' === $fileInfo->getExtension()
@@ -22,6 +22,7 @@ 
             )
         )
             $classMap[$matches[2]] = $fileInfo->getPathname();
+}
 
 AutoLoader::seen($classMap);
 

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

Braces +9 added lines, -6 removed lines

@@ -44,8 +44,9 @@ 
         }
         //$output .= print_r($entry, true) . "\n";
         $output .= "\nFile: " . $entry['file'] . " (Line: " . $entry['line'] . ")\n";
-        if (isset($entry['class']))
-            $output .= $entry['class'] . "::";
+        if (isset($entry['class'])) {
+                    $output .= $entry['class'] . "::";
+        }
         $output .= $entry['function']
             . "( " . json_encode($entry['args']) . " )\n";
     }
@@ -73,8 +74,9 @@ 
 function render($data, $shadow=true)
 {
     $r = '';
-    if (empty($data))
-        return $r;
+    if (empty($data)) {
+            return $r;
+    }
     $r .= $shadow ? "<ul class=\"shadow\">\n": "<ul>\n";
     if (is_array($data)) {
         // field name
@@ -112,8 +114,9 @@ 
 $reqHeadersArr = array();
 $requestHeaders = $_SERVER['REQUEST_METHOD'] . ' ' . $_SERVER['REQUEST_URI'] . ' ' . $_SERVER['SERVER_PROTOCOL'] . PHP_EOL;
 foreach ($reqHeadersArr as $key => $value) {
-    if ($key == 'Host')
-        continue;
+    if ($key == 'Host') {
+            continue;
+    }
     $requestHeaders .= "$key: $value" . PHP_EOL;
 }
 // $requestHeaders = $this->encode(apache_request_headers(), FALSE,

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

Braces +3 added lines, -1 removed lines

@@ -353,7 +353,9 @@
      */
     public static function setProperty($name, $value)
     {
-        if (!property_exists(__CLASS__, $name)) return false;
+        if (!property_exists(__CLASS__, $name)) {
+        	return false;
+        }
         if (@is_array(Defaults::$validation[$name])) {
             $info = new ValidationInfo(Defaults::$validation[$name]);
             $value = Validator::validate($value, $info);

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

Braces +3 added lines, -1 removed lines

@@ -243,7 +243,9 @@
     public static function getShortName($className)
     {
     	// @CHANGE LDR
-    	if (!is_string($className)) return;
+    	if (!is_string($className)) {
+    		return;
+    	}
     	
     	$className = explode('\\', $className);
         return end($className);

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

Braces +27 added lines, -18 removed lines

@@ -55,8 +55,9 @@ 
         }
         $this->markAsChildren($c);
         $this->children = $c;
-        if (static::$initializer)
-            call_user_func_array(static::$initializer, array(& $this));
+        if (static::$initializer) {
+                    call_user_func_array(static::$initializer, array(& $this));
+        }
     }
 
     /**
@@ -98,8 +99,9 @@ 
             $lineBreak = false;
             foreach ($this->children as $key => $child) {
                 $prefix = $this->prefix;
-                if (!is_null($this->tag))
-                    $prefix .= $this->indent;
+                if (!is_null($this->tag)) {
+                                    $prefix .= $this->indent;
+                }
                 if ($child instanceof $this) {
                     $child->prefix = $prefix;
                     $child->indent = $this->indent;
@@ -109,23 +111,27 @@ 
                     $children .= $child;
                 }
             }
-            if ($lineBreak)
-                $children .= PHP_EOL . $this->prefix;
+            if ($lineBreak) {
+                            $children .= PHP_EOL . $this->prefix;
+            }
         } else {
             $children = implode('', $this->children);
         }
-        if (is_null($this->tag))
-            return $children;
+        if (is_null($this->tag)) {
+                    return $children;
+        }
         $attributes = '';
-        foreach ($this->attributes as $attribute => &$value)
-            $attributes .= " $attribute=\"$value\"";
+        foreach ($this->attributes as $attribute => &$value) {
+                    $attributes .= " $attribute=\"$value\"";
+        }
 
-        if (count($this->children))
-            return static::$humanReadable
+        if (count($this->children)) {
+                    return static::$humanReadable
                 ? "$this->prefix<{$this->tag}{$attributes}>"
                 . "$children"
                 . "</{$this->tag}>"
                 : "<{$this->tag}{$attributes}>$children</{$this->tag}>";
+        }
 
         return "$this->prefix<{$this->tag}{$attributes}/>";
     }
@@ -163,10 +169,12 @@ 
 
     public function __get($name)
     {
-        if ('parent' == $name)
-            return $this->_parent;
-        if (isset($this->attributes[$name]))
-            return $this->attributes[$name];
+        if ('parent' == $name) {
+                    return $this->_parent;
+        }
+        if (isset($this->attributes[$name])) {
+                    return $this->attributes[$name];
+        }
         return;
     }
 
@@ -265,8 +273,9 @@ 
     private function markAsChildren(& $children)
     {
         foreach ($children as $i => $child) {
-            if (is_string($child))
-                continue;
+            if (is_string($child)) {
+                            continue;
+            }
             if (!is_object($child)) {
                 unset($children[$i]);
                 continue;