Dolibarr / dolibarr

htdocs/public/fichinter/agendaexport.php

Braces +12 added lines, -8 removed lines

@@ -585,19 +585,23 @@
 				$duration = $obj->duree;
 				$event['location'] = ($obj->socname ? $obj->socname : "");
 				$event['summary'] = $obj->ref." - ". $obj->description;
-				if ($obj->ref_client)
-				$event['summary'].= " (".$obj->ref_client.")";
+				if ($obj->ref_client) {
+								$event['summary'].= " (".$obj->ref_client.")";
+				}
 
 				$event['desc'] = $obj->description;
 
-				if ($obj->ref_project)
-					$event['desc'] .= " - ".$obj->ref_project;
+				if ($obj->ref_project) {
+									$event['desc'] .= " - ".$obj->ref_project;
+				}
 
-				if ($obj->ref_contract)
-					$event['desc'] .= " - ".$obj->ref_contract;
+				if ($obj->ref_contract) {
+									$event['desc'] .= " - ".$obj->ref_contract;
+				}
 
-				if ($obj->note_public)
-					$event['desc'].= " - ".$obj->note_public;
+				if ($obj->note_public) {
+									$event['desc'].= " - ".$obj->note_public;
+				}
 
 				$event['startdate'] = $datestart;
 				$event['enddate'] = ''; // $dateend; // Not required with type 'journal'

htdocs/includes/parsedown/Parsedown.php

Braces +18 added lines, -36 removed lines

@@ -213,8 +213,7 @@ 
 					$CurrentBlock = $Block;
 
 					continue;
-				}
-				else
+				} else
 				{
 					if ($this->isBlockCompletable($CurrentBlock['type']))
 					{
@@ -282,8 +281,7 @@ 
 			if (isset($Block))
 			{
 				$CurrentBlock = $Block;
-			}
-			else
+			} else
 			{
 				if (isset($CurrentBlock))
 				{
@@ -323,8 +321,7 @@ 
 			if (isset($Component['markup']))
 			{
 				$Component['element'] = array('rawHtml' => $Component['markup']);
-			}
-			elseif (isset($Component['hidden']))
+			} elseif (isset($Component['hidden']))
 			{
 				$Component['element'] = array();
 			}
@@ -584,8 +581,7 @@ 
 				$contentIndent -= 1;
 				$matches[1] = substr($matches[1], 0, -$contentIndent);
 				$matches[3] = str_repeat(' ', $contentIndent) . $matches[3];
-			}
-			elseif ($contentIndent === 0)
+			} elseif ($contentIndent === 0)
 			{
 				$matches[1] .= ' ';
 			}
@@ -687,8 +683,7 @@ 
 				$Block['element']['elements'] []= & $Block['li'];
 
 				return $Block;
-			}
-			elseif ($Line['indent'] < $requiredIndent and $this->blockList($Line))
+			} elseif ($Line['indent'] < $requiredIndent and $this->blockList($Line))
 			{
 				return null;
 			}
@@ -1316,12 +1311,10 @@ 
 		if ($Excerpt['text'][1] === $marker and preg_match($this->StrongRegex[$marker], $Excerpt['text'], $matches))
 		{
 			$emphasis = 'strong';
-		}
-		elseif (preg_match($this->EmRegex[$marker], $Excerpt['text'], $matches))
+		} elseif (preg_match($this->EmRegex[$marker], $Excerpt['text'], $matches))
 		{
 			$emphasis = 'em';
-		}
-		else
+		} else
 		{
 			return;
 		}
@@ -1412,8 +1405,7 @@ 
 			$extent += strlen($matches[0]);
 
 			$remainder = substr($remainder, $extent);
-		}
-		else
+		} else
 		{
 			return;
 		}
@@ -1428,8 +1420,7 @@ 
 			}
 
 			$extent += strlen($matches[0]);
-		}
-		else
+		} else
 		{
 			if (preg_match('/^\s*\[(.*?)\]/', $remainder, $matches))
 			{
@@ -1437,8 +1428,7 @@ 
 				$definition = strtolower($definition);
 
 				$extent += strlen($matches[0]);
-			}
-			else
+			} else
 			{
 				$definition = strtolower($Element['handler']['argument']);
 			}
@@ -1603,8 +1593,7 @@ 
 				$argument = $Element['text'];
 				unset($Element['text']);
 				$destination = 'rawHtml';
-			}
-			else
+			} else
 			{
 				$function = $Element['handler']['function'];
 				$argument = $Element['handler']['argument'];
@@ -1641,8 +1630,7 @@ 
 		if (isset($Element['elements']))
 		{
 			$Element['elements'] = $this->elementsApplyRecursive($closure, $Element['elements']);
-		}
-		elseif (isset($Element['element']))
+		} elseif (isset($Element['element']))
 		{
 			$Element['element'] = $this->elementApplyRecursive($closure, $Element['element']);
 		}
@@ -1655,8 +1643,7 @@ 
 		if (isset($Element['elements']))
 		{
 			$Element['elements'] = $this->elementsApplyRecursiveDepthFirst($closure, $Element['elements']);
-		}
-		elseif (isset($Element['element']))
+		} elseif (isset($Element['element']))
 		{
 			$Element['element'] = $this->elementsApplyRecursiveDepthFirst($closure, $Element['element']);
 		}
@@ -1743,26 +1730,22 @@ 
 			if (isset($Element['elements']))
 			{
 				$markup .= $this->elements($Element['elements']);
-			}
-			elseif (isset($Element['element']))
+			} elseif (isset($Element['element']))
 			{
 				$markup .= $this->element($Element['element']);
-			}
-			else
+			} else
 			{
 				if (!$permitRawHtml)
 				{
 					$markup .= self::escape($text, true);
-				}
-				else
+				} else
 				{
 					$markup .= $text;
 				}
 			}
 
 			$markup .= $hasName ? '</' . $Element['name'] . '>' : '';
-		}
-		elseif ($hasName)
+		} elseif ($hasName)
 		{
 			$markup .= ' />';
 		}
@@ -1928,8 +1911,7 @@ 
 		if ($len > strlen($string))
 		{
 			return false;
-		}
-		else
+		} else
 		{
 			return strtolower(substr($string, 0, $len)) === strtolower($needle);
 		}

htdocs/includes/odtphp/Segment.php

Braces +12 added lines, -4 removed lines

@@ -88,10 +88,16 @@ 
 	{
 		// To provide debug information on line number processed
 		global $count;
-		if (empty($count)) $count=1;
-		else $count++;
+		if (empty($count)) {
+			$count=1;
+		} else {
+			$count++;
+		}
 
-		if (empty($this->savxml)) $this->savxml = $this->xml;       // Sav content of line at first line merged, so we will reuse original for next steps
+		if (empty($this->savxml)) {
+			$this->savxml = $this->xml;
+		}
+		// Sav content of line at first line merged, so we will reuse original for next steps
 		$this->xml = $this->savxml;
 		$tmpvars = $this->vars;                                     // Store into $tmpvars so we won't modify this->vars when completing data with empty values
 
@@ -123,7 +129,9 @@ 
 				$reg = '@\[!--\sIF\s' . preg_quote($key, '@') . '\s--\](.*)(\[!--\sELSE\s' . preg_quote($key, '@') . '\s--\](.*))?\[!--\sENDIF\s' . preg_quote($key, '@') . '\s--\]@smU'; // U modifier = all quantifiers are non-greedy
 				preg_match_all($reg, $this->xml, $matches, PREG_SET_ORDER);
 				foreach ($matches as $match) { // For each match, if there is an ELSE clause, we replace the whole block by the value in the ELSE clause
-					if (!empty($match[3])) $this->xml = str_replace($match[0], $match[3], $this->xml);
+					if (!empty($match[3])) {
+						$this->xml = str_replace($match[0], $match[3], $this->xml);
+					}
 				}
 				// Cleanup the other conditional blocks (all the others where there were no ELSE clause, we can just remove them altogether)
 				$this->xml = preg_replace($reg, '', $this->xml);

test/phpunit/AccountancySystemTest.php

Braces +3 added lines, -2 removed lines

@@ -61,8 +61,9 @@
 		$mysoc = $soc;
 
 		/* Errors are caught in later tests. */
-		if ($socid <= 0)
-			return;
+		if ($socid <= 0) {
+					return;
+		}
 	}
 
 	/**

htdocs/includes/odtphp/zip/PclZipProxy.php

Braces +4 added lines, -1 removed lines

@@ -34,7 +34,10 @@
 			throw new PclZipProxyException('PclZip class not loaded - PclZip library
 			 is required for using PclZipProxy'); ;
 		}
-		if ($forcedir) $this->tmpdir=preg_replace('|[//\/]$|','',$forcedir);	// $this->tmpdir must not contains / at the end
+		if ($forcedir) {
+			$this->tmpdir=preg_replace('|[//\/]$|','',$forcedir);
+		}
+		// $this->tmpdir must not contains / at the end
 	}
 
 	/**

htdocs/core/lib/propal.lib.php

Braces +3 added lines, -1 removed lines

@@ -222,7 +222,9 @@
 	$listofstatus = array(Propal::STATUS_DRAFT, Propal::STATUS_VALIDATED, Propal::STATUS_SIGNED, Propal::STATUS_NOTSIGNED, Propal::STATUS_BILLED);
 
 	$propalstatic = new Propal($db);
-	if ($user->socid > 0) $socid = $user->socid;
+	if ($user->socid > 0) {
+		$socid = $user->socid;
+	}
 	$sql = "SELECT count(p.rowid) as nb, p.fk_statut as status";
 	$sql .= " FROM ".MAIN_DB_PREFIX."societe as s";
 	$sql .= ", ".MAIN_DB_PREFIX."propal as p";

htdocs/core/lib/order.lib.php

Braces +3 added lines, -1 removed lines

@@ -240,7 +240,9 @@
 	/*
 	 * Statistics
 	 */
-	if ($user->socid > 0) $socid = $user->socid;
+	if ($user->socid > 0) {
+		$socid = $user->socid;
+	}
 	$sql = "SELECT count(c.rowid) as nb, c.fk_statut as status";
 	$sql .= " FROM ".MAIN_DB_PREFIX."societe as s";
 	$sql .= ", ".MAIN_DB_PREFIX."commande as c";

htdocs/includes/tcpdi/tcpdi_parser.php

Braces +52 added lines, -29 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;
     }
 
@@ -1205,16 +1222,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;
             }
         }
@@ -1251,8 +1270,9 @@ 
             }
         }
 
-        if ($annots[0] == PDF_TYPE_OBJREF)
-            return $this->getObjectVal($annots);
+        if ($annots[0] == PDF_TYPE_OBJREF) {
+                    return $this->getObjectVal($annots);
+        }
         return $annots;
     }
 
@@ -1350,8 +1370,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);
@@ -1419,16 +1440,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/tcpdi.php

Braces +42 added lines, -26 removed lines

@@ -102,8 +102,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()));
 
@@ -120,8 +121,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()));
 
@@ -172,14 +174,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);
 
@@ -190,13 +194,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;
 
@@ -228,8 +235,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;
         }
@@ -282,10 +290,12 @@ 
         $annots = $parser->getPageAnnotations();
 
         if (is_array($annots) && $annots[0] == PDF_TYPE_ARRAY // It's an array
-                && is_array($annots[1]) && count($annots[1]) > 1) // It's not empty - there are annotations for this page
+                && is_array($annots[1]) && count($annots[1]) > 1) {
+        	// It's not empty - there are annotations for this page
         {
         	if (!isset($this->_obj_stack[$fn])) {
                 $this->_obj_stack[$fn] = array();
+        }
             }
 
             $this->_importedAnnots[$this->page] = array();
@@ -296,10 +306,12 @@ 
 
         if (is_array($annots) && $annots[0] == PDF_TYPE_OBJECT // We got an object
                 && is_array($annots[1]) && $annots[1][0] == PDF_TYPE_ARRAY // It's an array
-                && is_array($annots[1][1]) && count($annots[1][1]) > 1) // It's not empty - there are annotations for this page
+                && is_array($annots[1][1]) && count($annots[1][1]) > 1) {
+        	// It's not empty - there are annotations for this page
         {
         	if (!isset($this->_obj_stack[$fn])) {
                 $this->_obj_stack[$fn] = array();
+        }
             }
 
             $this->_importedAnnots[$this->page] = array();
@@ -512,8 +524,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']) ||
@@ -521,12 +534,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('>>');
             	}
@@ -804,8 +819,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;