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/odtphp/odf.php

Braces +31 added lines, -10 removed lines

@@ -78,7 +78,10 @@ 
 		}
 
 		$md5uniqid = md5(uniqid());
-		if ($this->config['PATH_TO_TMP']) $this->tmpdir = preg_replace('|[\/]$|', '', $this->config['PATH_TO_TMP']);	// Remove last \ or /
+		if ($this->config['PATH_TO_TMP']) {
+			$this->tmpdir = preg_replace('|[\/]$|', '', $this->config['PATH_TO_TMP']);
+		}
+		// Remove last \ or /
 		$this->tmpdir .= ($this->tmpdir?'/':'').$md5uniqid;
 		$this->tmpfile = $this->tmpdir.'/'.$md5uniqid.'.odt';	// We keep .odt extension to allow OpenOffice usage during debug.
 
@@ -94,7 +97,9 @@ 
 
 		// Load zip proxy
 		$zipHandler = $this->config['ZIP_PROXY'];
-		if (!defined('PCLZIP_TEMPORARY_DIR')) define('PCLZIP_TEMPORARY_DIR', $this->tmpdir);
+		if (!defined('PCLZIP_TEMPORARY_DIR')) {
+			define('PCLZIP_TEMPORARY_DIR', $this->tmpdir);
+		}
 		include_once 'zip/'.$zipHandler.'.php';
 		if (! class_exists($this->config['ZIP_PROXY'])) {
 			throw new OdfException($this->config['ZIP_PROXY'] . ' class not found - check your php settings');
@@ -236,8 +241,12 @@ 
 	 */
 	private function _replaceHtmlWithOdtTag($tags, &$customStyles, &$fontDeclarations, $encode = false, $charset = '')
 	{
-		if ($customStyles == null) $customStyles = array();
-		if ($fontDeclarations == null) $fontDeclarations = array();
+		if ($customStyles == null) {
+			$customStyles = array();
+		}
+		if ($fontDeclarations == null) {
+			$fontDeclarations = array();
+		}
 
 		$odtResult = '';
 
@@ -595,7 +604,9 @@ 
 				$reg = '@\[!--\sIF\s' . $key . '\s--\](.*)(\[!--\sELSE\s' . $key . '\s--\](.*))?\[!--\sENDIF\s' . $key . '\s--\]@smU'; // U modifier = all quantifiers are non-greedy
 				preg_match_all($reg, $this->contentXml, $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->contentXml = str_replace($match[0], $match[3], $this->contentXml);
+					if (!empty($match[3])) {
+						$this->contentXml = str_replace($match[0], $match[3], $this->contentXml);
+					}
 				}
 				// Cleanup the other conditional blocks (all the others where there were no ELSE clause, we can just remove them altogether)
 				$this->contentXml = preg_replace($reg, '', $this->contentXml);
@@ -608,9 +619,15 @@ 
 		}
 
 		// Static substitution
-		if ($type == 'content')	$this->contentXml = str_replace(array_keys($this->vars), array_values($this->vars), $this->contentXml);
-		if ($type == 'styles')	$this->stylesXml = str_replace(array_keys($this->vars), array_values($this->vars), $this->stylesXml);
-		if ($type == 'meta')	$this->metaXml = str_replace(array_keys($this->vars), array_values($this->vars), $this->metaXml);
+		if ($type == 'content') {
+			$this->contentXml = str_replace(array_keys($this->vars), array_values($this->vars), $this->contentXml);
+		}
+		if ($type == 'styles') {
+			$this->stylesXml = str_replace(array_keys($this->vars), array_values($this->vars), $this->stylesXml);
+		}
+		if ($type == 'meta') {
+			$this->metaXml = str_replace(array_keys($this->vars), array_values($this->vars), $this->metaXml);
+		}
 	}
 
 	/**
@@ -751,7 +768,9 @@ 
 	 */
 	public function setMetaData()
 	{
-		if (empty($this->creator)) $this->creator='';
+		if (empty($this->creator)) {
+			$this->creator='';
+		}
 
 		$this->metaXml = preg_replace('/<dc:date>.*<\/dc:date>/', '<dc:date>'.gmdate("Y-m-d\TH:i:s").'</dc:date>', $this->metaXml);
 		$this->metaXml = preg_replace('/<dc:creator>.*<\/dc:creator>/', '<dc:creator>'.htmlspecialchars($this->creator).'</dc:creator>', $this->metaXml);
@@ -819,7 +838,9 @@ 
 	{
 		global $conf;
 
-		if ( $name == "" ) $name = "temp".md5(uniqid());
+		if ( $name == "" ) {
+			$name = "temp".md5(uniqid());
+		}
 
 		dol_syslog(get_class($this).'::exportAsAttachedPDF $name='.$name, LOG_DEBUG);
 		$this->saveToDisk($name);

htdocs/index.php

Braces +9 added lines, -3 removed lines

@@ -43,9 +43,15 @@
  */
 
 $nbmodulesnotautoenabled = count($conf->modules);
-if (in_array('fckeditor', $conf->modules)) $nbmodulesnotautoenabled--;
-if (in_array('export', $conf->modules)) $nbmodulesnotautoenabled--;
-if (in_array('import', $conf->modules)) $nbmodulesnotautoenabled--;
+if (in_array('fckeditor', $conf->modules)) {
+	$nbmodulesnotautoenabled--;
+}
+if (in_array('export', $conf->modules)) {
+	$nbmodulesnotautoenabled--;
+}
+if (in_array('import', $conf->modules)) {
+	$nbmodulesnotautoenabled--;
+}
 
 // Check if company name is defined (first install)
 if (!isset($conf->global->MAIN_INFO_SOCIETE_NOM) || !getDolGlobalString('MAIN_INFO_SOCIETE_NOM')) {

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