Dolibarr / dolibarr

htdocs/includes/tcpdi/tcpdi_parser.php

Braces +49 added lines, -27 removed lines

@@ -48,35 +48,51 @@ 
  */
 
 // include class for decoding filters
-if (defined('TCPDF_PATH')) require_once(constant('TCPDF_PATH').'/include/tcpdf_filters.php');
-else require_once(dirname(__FILE__).'/../tecnickcom/tcpdf/include/tcpdf_filters.php');
+if (defined('TCPDF_PATH')) {
+	require_once(constant('TCPDF_PATH').'/include/tcpdf_filters.php');
+} else {
+	require_once(dirname(__FILE__).'/../tecnickcom/tcpdf/include/tcpdf_filters.php');
+}
 
-if (!defined ('PDF_TYPE_NULL'))
+if (!defined ('PDF_TYPE_NULL')) {
     define ('PDF_TYPE_NULL', 0);
-if (!defined ('PDF_TYPE_NUMERIC'))
+}
+if (!defined ('PDF_TYPE_NUMERIC')) {
     define ('PDF_TYPE_NUMERIC', 1);
-if (!defined ('PDF_TYPE_TOKEN'))
+}
+if (!defined ('PDF_TYPE_TOKEN')) {
     define ('PDF_TYPE_TOKEN', 2);
-if (!defined ('PDF_TYPE_HEX'))
+}
+if (!defined ('PDF_TYPE_HEX')) {
     define ('PDF_TYPE_HEX', 3);
-if (!defined ('PDF_TYPE_STRING'))
+}
+if (!defined ('PDF_TYPE_STRING')) {
     define ('PDF_TYPE_STRING', 4);
-if (!defined ('PDF_TYPE_DICTIONARY'))
+}
+if (!defined ('PDF_TYPE_DICTIONARY')) {
     define ('PDF_TYPE_DICTIONARY', 5);
-if (!defined ('PDF_TYPE_ARRAY'))
+}
+if (!defined ('PDF_TYPE_ARRAY')) {
     define ('PDF_TYPE_ARRAY', 6);
-if (!defined ('PDF_TYPE_OBJDEC'))
+}
+if (!defined ('PDF_TYPE_OBJDEC')) {
     define ('PDF_TYPE_OBJDEC', 7);
-if (!defined ('PDF_TYPE_OBJREF'))
+}
+if (!defined ('PDF_TYPE_OBJREF')) {
     define ('PDF_TYPE_OBJREF', 8);
-if (!defined ('PDF_TYPE_OBJECT'))
+}
+if (!defined ('PDF_TYPE_OBJECT')) {
     define ('PDF_TYPE_OBJECT', 9);
-if (!defined ('PDF_TYPE_STREAM'))
+}
+if (!defined ('PDF_TYPE_STREAM')) {
     define ('PDF_TYPE_STREAM', 10);
-if (!defined ('PDF_TYPE_BOOLEAN'))
+}
+if (!defined ('PDF_TYPE_BOOLEAN')) {
     define ('PDF_TYPE_BOOLEAN', 11);
-if (!defined ('PDF_TYPE_REAL'))
+}
+if (!defined ('PDF_TYPE_REAL')) {
     define ('PDF_TYPE_REAL', 12);
+}
 
 /**
  * @class tcpdi_parser
@@ -245,8 +261,9 @@ 
      */
     public function getPDFVersion() {
         preg_match('/\d\.\d/', substr($this->pdfdata, 0, 16), $m);
-        if (isset($m[0]))
-            $this->pdfVersion = $m[0];
+        if (isset($m[0])) {
+                    $this->pdfVersion = $m[0];
+        }
         return $this->pdfVersion;
     }
 
@@ -1186,16 +1203,18 @@ 
     	// parent object.
         if (isset ($obj[1][1]['/Resources'])) {
     		$res = $obj[1][1]['/Resources'];
-    		if ($res[0] == PDF_TYPE_OBJECT)
-                return $res[1];
+    		if ($res[0] == PDF_TYPE_OBJECT) {
+    		                return $res[1];
+    		}
             return $res;
     	} else {
     		if (!isset ($obj[1][1]['/Parent'])) {
     			return false;
     		} else {
                 $res = $this->_getPageResources($obj[1][1]['/Parent']);
-                if ($res[0] == PDF_TYPE_OBJECT)
-                    return $res[1];
+                if ($res[0] == PDF_TYPE_OBJECT) {
+                                    return $res[1];
+                }
                 return $res;
     		}
     	}
@@ -1295,8 +1314,9 @@ 
     public function getPageBox($page, $box_index, $k) {
         $page = $this->getObjectVal($page);
         $box = null;
-        if (isset($page[1][1][$box_index]))
-            $box =& $page[1][1][$box_index];
+        if (isset($page[1][1][$box_index])) {
+                    $box =& $page[1][1][$box_index];
+        }
 
         if (!is_null($box) && $box[0] == PDF_TYPE_OBJREF) {
             $tmp_box = $this->getObjectVal($box);
@@ -1364,16 +1384,18 @@ 
     	$obj = $this->getObjectVal($obj);
     	if (isset ($obj[1][1]['/Rotate'])) {
     		$res = $this->getObjectVal($obj[1][1]['/Rotate']);
-    		if (isset($res[0]) && $res[0] == PDF_TYPE_OBJECT)
-                return $res[1];
+    		if (isset($res[0]) && $res[0] == PDF_TYPE_OBJECT) {
+    		                return $res[1];
+    		}
             return $res;
     	} else {
     		if (!isset ($obj[1][1]['/Parent'])) {
     			return false;
     		} else {
                 $res = $this->_getPageRotation($obj[1][1]['/Parent']);
-                if (isset($res[0]) && $res[0] == PDF_TYPE_OBJECT)
-                    return $res[1];
+                if (isset($res[0]) && $res[0] == PDF_TYPE_OBJECT) {
+                                    return $res[1];
+                }
                 return $res;
     		}
     	}

htdocs/includes/tcpdi/fpdf_tpl.php

Braces +60 added lines, -40 removed lines

@@ -79,17 +79,22 @@ 
             return;
         }
         
-        if ($this->page <= 0)
-            $this->error("You have to add a page to fpdf first!");
+        if ($this->page <= 0) {
+                    $this->error("You have to add a page to fpdf first!");
+        }
 
-        if ($x == null)
-            $x = 0;
-        if ($y == null)
-            $y = 0;
-        if ($w == null)
-            $w = $this->w;
-        if ($h == null)
-            $h = $this->h;
+        if ($x == null) {
+                    $x = 0;
+        }
+        if ($y == null) {
+                    $y = 0;
+        }
+        if ($w == null) {
+                    $w = $this->w;
+        }
+        if ($h == null) {
+                    $h = $this->h;
+        }
 
         // Save settings
         $this->tpl++;
@@ -165,8 +170,9 @@ 
             $this->FontSize = $tpl['o_FontSize'];
             
             $fontkey = $this->FontFamily . $this->FontStyle;
-            if ($fontkey)
-                $this->CurrentFont =& $this->fonts[$fontkey];
+            if ($fontkey) {
+                            $this->CurrentFont =& $this->fonts[$fontkey];
+            }
             
             return $this->tpl;
         } else {
@@ -192,11 +198,13 @@ 
      * @retrun array The height and width of the template
      */
     function useTemplate($tplidx, $_x = null, $_y = null, $_w = 0, $_h = 0) {
-        if ($this->page <= 0)
-            $this->error('You have to add a page first!');
+        if ($this->page <= 0) {
+                    $this->error('You have to add a page first!');
+        }
         
-        if (!isset($this->tpls[$tplidx]))
-            $this->error('Template does not exist!');
+        if (!isset($this->tpls[$tplidx])) {
+                    $this->error('Template does not exist!');
+        }
             
         if ($this->_intpl) {
             $this->_res['tpl'][$this->tpl]['tpls'][$tplidx] =& $this->tpls[$tplidx];
@@ -206,10 +214,12 @@ 
         $w = $tpl['w'];
         $h = $tpl['h'];
         
-        if ($_x == null)
-            $_x = 0;
-        if ($_y == null)
-            $_y = 0;
+        if ($_x == null) {
+                    $_x = 0;
+        }
+        if ($_y == null) {
+                    $_y = 0;
+        }
             
         $_x += $tpl['x'];
         $_y += $tpl['y'];
@@ -249,8 +259,9 @@ 
      * @return array The height and width of the template
      */
     function getTemplateSize($tplidx, $_w = 0, $_h = 0) {
-        if (!isset($this->tpls[$tplidx]))
-            return false;
+        if (!isset($this->tpls[$tplidx])) {
+                    return false;
+        }
 
         $tpl =& $this->tpls[$tplidx];
         $w = $tpl['w'];
@@ -261,10 +272,12 @@ 
             $_h = $h;
         }
 
-        if($_w == 0)
-            $_w = $_h * $w / $h;
-        if($_h == 0)
-            $_h = $_w * $h / $w;
+        if($_w == 0) {
+                    $_w = $_h * $w / $h;
+        }
+        if($_h == 0) {
+                    $_h = $_w * $h / $w;
+        }
             
         return array("w" => $_w, "h" => $_h);
     }
@@ -323,8 +336,9 @@ 
             return call_user_func_array(array($this, 'TCPDF::AddPage'), $args);
         }
         
-        if ($this->_intpl)
-            $this->Error('Adding pages in templates isn\'t possible!');
+        if ($this->_intpl) {
+                    $this->Error('Adding pages in templates isn\'t possible!');
+        }
             
         parent::AddPage($orientation, $format);
     }
@@ -338,8 +352,9 @@ 
             return call_user_func_array(array($this, 'TCPDF::Link'), $args);
         }
         
-        if ($this->_intpl)
-            $this->Error('Using links in templates aren\'t possible!');
+        if ($this->_intpl) {
+                    $this->Error('Using links in templates aren\'t possible!');
+        }
             
         parent::Link($x, $y, $w, $h, $link);
     }
@@ -350,8 +365,9 @@ 
             return call_user_func_array(array($this, 'TCPDF::AddLink'), $args);
         }
         
-        if ($this->_intpl)
-            $this->Error('Adding links in templates aren\'t possible!');
+        if ($this->_intpl) {
+                    $this->Error('Adding links in templates aren\'t possible!');
+        }
         return parent::AddLink();
     }
     
@@ -361,8 +377,9 @@ 
             return call_user_func_array(array($this, 'TCPDF::SetLink'), $args);
         }
         
-        if ($this->_intpl)
-            $this->Error('Setting links in templates aren\'t possible!');
+        if ($this->_intpl) {
+                    $this->Error('Setting links in templates aren\'t possible!');
+        }
         parent::SetLink($link, $y, $page);
     }
     
@@ -402,8 +419,9 @@ 
             $this->_out('<</ProcSet [/PDF /Text /ImageB /ImageC /ImageI]');
             if (isset($this->_res['tpl'][$tplidx]['fonts']) && count($this->_res['tpl'][$tplidx]['fonts'])) {
                 $this->_out('/Font <<');
-                foreach($this->_res['tpl'][$tplidx]['fonts'] as $font)
-                    $this->_out('/F' . $font['i'] . ' ' . $font['n'] . ' 0 R');
+                foreach($this->_res['tpl'][$tplidx]['fonts'] as $font) {
+                                    $this->_out('/F' . $font['i'] . ' ' . $font['n'] . ' 0 R');
+                }
                 $this->_out('>>');
             }
             if(isset($this->_res['tpl'][$tplidx]['images']) && count($this->_res['tpl'][$tplidx]['images']) || 
@@ -411,12 +429,14 @@ 
             {
                 $this->_out('/XObject <<');
                 if (isset($this->_res['tpl'][$tplidx]['images']) && count($this->_res['tpl'][$tplidx]['images'])) {
-                    foreach($this->_res['tpl'][$tplidx]['images'] as $image)
-                          $this->_out('/I' . $image['i'] . ' ' . $image['n'] . ' 0 R');
+                    foreach($this->_res['tpl'][$tplidx]['images'] as $image) {
+                                              $this->_out('/I' . $image['i'] . ' ' . $image['n'] . ' 0 R');
+                    }
                 }
                 if (isset($this->_res['tpl'][$tplidx]['tpls']) && count($this->_res['tpl'][$tplidx]['tpls'])) {
-                    foreach($this->_res['tpl'][$tplidx]['tpls'] as $i => $tpl)
-                        $this->_out($this->tplprefix . $i . ' ' . $tpl['n'] . ' 0 R');
+                    foreach($this->_res['tpl'][$tplidx]['tpls'] as $i => $tpl) {
+                                            $this->_out($this->tplprefix . $i . ' ' . $tpl['n'] . ' 0 R');
+                    }
                 }
                 $this->_out('>>');
             }

htdocs/includes/tcpdi/tcpdi.php

Braces +36 added lines, -24 removed lines

@@ -84,8 +84,9 @@ 
     function setSourceFile($filename) {
         $this->current_filename = $filename;
 
-        if (!isset($this->parsers[$filename]))
-            $this->parsers[$filename] = $this->_getPdfParser($filename);
+        if (!isset($this->parsers[$filename])) {
+                    $this->parsers[$filename] = $this->_getPdfParser($filename);
+        }
         $this->current_parser =& $this->parsers[$filename];
         $this->setPDFVersion(max($this->getPDFVersion(), $this->current_parser->getPDFVersion()));
 
@@ -102,8 +103,9 @@ 
         $filename = uniqid('tcpdi-');
         $this->current_filename = $filename;
 
-        if (!isset($this->parsers[$filename]))
-            $this->parsers[$filename] = new tcpdi_parser($pdfdata, $filename);
+        if (!isset($this->parsers[$filename])) {
+                    $this->parsers[$filename] = new tcpdi_parser($pdfdata, $filename);
+        }
         $this->current_parser =& $this->parsers[$filename];
         $this->setPDFVersion(max($this->getPDFVersion(), $this->current_parser->getPDFVersion()));
 
@@ -154,14 +156,16 @@ 
 
         // check if page already imported
         $pageKey = $fn . '-' . ((int)$pageno) . $boxName;
-        if (isset($this->_importedPages[$pageKey]))
-            return $this->_importedPages[$pageKey];
+        if (isset($this->_importedPages[$pageKey])) {
+                    return $this->_importedPages[$pageKey];
+        }
 
         $parser =& $this->parsers[$fn];
         $parser->setPageno($pageno);
 
-        if (!in_array($boxName, $parser->availableBoxes))
-            return $this->Error(sprintf('Unknown box: %s', $boxName));
+        if (!in_array($boxName, $parser->availableBoxes)) {
+                    return $this->Error(sprintf('Unknown box: %s', $boxName));
+        }
 
         $pageboxes = $parser->getPageBoxes($pageno, $this->k);
 
@@ -172,13 +176,16 @@ 
          * TrimBox: Default -> CropBox
          * ArtBox: Default -> CropBox
          */
-        if (!isset($pageboxes[$boxName]) && ($boxName == '/BleedBox' || $boxName == '/TrimBox' || $boxName == '/ArtBox'))
-            $boxName = '/CropBox';
-        if (!isset($pageboxes[$boxName]) && $boxName == '/CropBox')
-            $boxName = '/MediaBox';
+        if (!isset($pageboxes[$boxName]) && ($boxName == '/BleedBox' || $boxName == '/TrimBox' || $boxName == '/ArtBox')) {
+                    $boxName = '/CropBox';
+        }
+        if (!isset($pageboxes[$boxName]) && $boxName == '/CropBox') {
+                    $boxName = '/MediaBox';
+        }
 
-        if (!isset($pageboxes[$boxName]))
-            return false;
+        if (!isset($pageboxes[$boxName])) {
+                    return false;
+        }
 
         $this->lastUsedPageBox = $boxName;
 
@@ -210,8 +217,9 @@ 
             $tpl['w'] = $steps % 2 == 0 ? $_w : $_h;
             $tpl['h'] = $steps % 2 == 0 ? $_h : $_w;
 
-            if ($angle < 0)
-            	$angle += 360;
+            if ($angle < 0) {
+                        	$angle += 360;
+            }
 
         	$tpl['_rotationAngle'] = $angle * -1;
         }
@@ -356,8 +364,9 @@ 
                 $this->_out('<</ProcSet [/PDF /Text /ImageB /ImageC /ImageI]');
             	if (isset($this->_res['tpl'][$tplidx]['fonts']) && count($this->_res['tpl'][$tplidx]['fonts'])) {
                 	$this->_out('/Font <<');
-                    foreach($this->_res['tpl'][$tplidx]['fonts'] as $font)
-                		$this->_out('/F' . $font['i'] . ' ' . $font['n'] . ' 0 R');
+                    foreach($this->_res['tpl'][$tplidx]['fonts'] as $font) {
+                                    		$this->_out('/F' . $font['i'] . ' ' . $font['n'] . ' 0 R');
+                    }
                 	$this->_out('>>');
                 }
             	if(isset($this->_res['tpl'][$tplidx]['images']) && count($this->_res['tpl'][$tplidx]['images']) ||
@@ -365,12 +374,14 @@ 
             	{
                     $this->_out('/XObject <<');
                     if (isset($this->_res['tpl'][$tplidx]['images']) && count($this->_res['tpl'][$tplidx]['images'])) {
-                        foreach($this->_res['tpl'][$tplidx]['images'] as $image)
-                  			$this->_out('/I' . $image['i'] . ' ' . $image['n'] . ' 0 R');
+                        foreach($this->_res['tpl'][$tplidx]['images'] as $image) {
+                                          			$this->_out('/I' . $image['i'] . ' ' . $image['n'] . ' 0 R');
+                        }
                     }
                     if (isset($this->_res['tpl'][$tplidx]['tpls']) && count($this->_res['tpl'][$tplidx]['tpls'])) {
-                        foreach($this->_res['tpl'][$tplidx]['tpls'] as $i => $tpl)
-                            $this->_out($this->tplprefix . $i . ' ' . $tpl['n'] . ' 0 R');
+                        foreach($this->_res['tpl'][$tplidx]['tpls'] as $i => $tpl) {
+                                                    $this->_out($this->tplprefix . $i . ' ' . $tpl['n'] . ' 0 R');
+                        }
                     }
                     $this->_out('>>');
             	}
@@ -648,8 +659,9 @@ 
                         $out .= chr(0x0A);
                         break;
                     case "\r":
-                        if ($count != $n-1 && $s[$count+1] == "\n")
-                            $count++;
+                        if ($count != $n-1 && $s[$count+1] == "\n") {
+                                                    $count++;
+                        }
                         break;
                     case "\n":
                         break;

htdocs/install/doctemplates/websites/website_template-onepageblackpurple/containers/master.inc.php

Braces +3 added lines, -1 removed lines

@@ -1,6 +1,8 @@
 <?php
 // File generated to link to the master file - DO NOT MODIFY - It is just an include
 if (! defined('USEDOLIBARRSERVER') && ! defined('USEDOLIBARREDITOR')) {
-	if (! defined('USEEXTERNALSERVER')) define('USEEXTERNALSERVER', 1);
+	if (! defined('USEEXTERNALSERVER')) {
+		define('USEEXTERNALSERVER', 1);
+	}
 	require_once '/var/www/html/dolibarr_dev/htdocs/master.inc.php';
 }

htdocs/install/doctemplates/websites/website_template-homesubmenu/containers/master.inc.php

Braces +3 added lines, -1 removed lines

@@ -1,7 +1,9 @@
 <?php
 // File generated to link to the master file - DO NOT MODIFY - It is just an include
 if (! defined('USEDOLIBARRSERVER') && ! defined('USEDOLIBARREDITOR')) {
-    if (! defined('USEEXTERNALSERVER')) define('USEEXTERNALSERVER', 1);
+    if (! defined('USEEXTERNALSERVER')) {
+    	define('USEEXTERNALSERVER', 1);
+    }
     require_once '/home/ldestailleur/git/dolibarr_dev/htdocs/master.inc.php';
 }
 ?>

htdocs/install/doctemplates/websites/website_template-corporate/containers/master.inc.php

Braces +3 added lines, -1 removed lines

@@ -1,7 +1,9 @@
 <?php
 // File generated to link to the master file - DO NOT MODIFY - It is just an include
 if (! defined('USEDOLIBARRSERVER') && ! defined('USEDOLIBARREDITOR')) {
-    if (! defined('USEEXTERNALSERVER')) define('USEEXTERNALSERVER', 1);
+    if (! defined('USEEXTERNALSERVER')) {
+    	define('USEEXTERNALSERVER', 1);
+    }
     require_once '/home/ldestailleur/git/dolibarr_dev/htdocs/master.inc.php';
 }
 ?>

htdocs/includes/nusoap/lib/nusoap.php

Braces +3 added lines, -6 removed lines

@@ -6508,15 +6508,13 @@ 
                                 $xml .= $this->serializeType ($eName,
                                                               isset($attrs['type']) ? $attrs['type'] : $attrs['ref'],
                                                               $v, $use, $encodingStyle, $unqualified);
-                            }
-                            elseif (isset($attrs['type']) || isset($attrs['ref']))
+                            } elseif (isset($attrs['type']) || isset($attrs['ref']))
                             {
                                 // serialize schema-defined type
                                 $xml .= $this->serializeType ($eName,
                                                               isset($attrs['type']) ? $attrs['type'] : $attrs['ref'],
                                                               $v, $use, $encodingStyle, $unqualified);
-                            }
-                            else
+                            } else
                             {
                                 // serialize generic type (can this ever really happen?)
                                 $this->debug ("calling serialize_val() for $v, $eName, false, false, false, false, $use");
@@ -7018,8 +7016,7 @@ 
                     if (isset($this->namespaces[$value_prefix]))
                     {
                         $this->message[$pos]['type_namespace'] = $this->namespaces[$value_prefix];
-                    }
-                    elseif (isset($attrs['xmlns:' . $value_prefix]))
+                    } elseif (isset($attrs['xmlns:' . $value_prefix]))
                     {
                         $this->message[$pos]['type_namespace'] = $attrs['xmlns:' . $value_prefix];
                     }

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

Braces +92 added lines, -59 removed lines

@@ -52,9 +52,11 @@ 
 		 */
 		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;
 		}
 
@@ -67,16 +69,19 @@ 
 		 */
 		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;
 		}
@@ -105,12 +110,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];
 		}
@@ -138,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) &&
@@ -150,18 +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
@@ -200,9 +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,
@@ -231,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]",
@@ -263,13 +277,15 @@ 
 		{
 			$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;
 		}
@@ -313,13 +329,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);
+			}
 		}
 
 		/**
@@ -337,11 +358,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;
@@ -351,15 +373,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;
 			}
@@ -367,17 +391,19 @@ 
 			$state = array_merge(get_declared_classes(), get_declared_interfaces());
 
 			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;
@@ -395,10 +421,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;
 		}
 
@@ -411,22 +439,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/comm/action/class/cactioncomm.class.php

Braces +9 added lines, -3 removed lines

@@ -327,10 +327,16 @@
 				}
 			}
 
-			if (empty($idorcode)) $idorcode = 'all';
+			if (empty($idorcode)) {
+				$idorcode = 'all';
+			}
 			$TType = $TSystem[$idorcode];
-			if (! empty($TSystemAuto[$idorcode])) $TType = array_merge($TSystem[$idorcode], $TSystemAuto[$idorcode]);
-			if (! empty($TModule[$idorcode])) $TType = array_merge($TSystem[$idorcode], $TModule[$idorcode]);
+			if (! empty($TSystemAuto[$idorcode])) {
+				$TType = array_merge($TSystem[$idorcode], $TSystemAuto[$idorcode]);
+			}
+			if (! empty($TModule[$idorcode])) {
+				$TType = array_merge($TSystem[$idorcode], $TModule[$idorcode]);
+			}
 			$this->liste_array = $TType;