Dolibarr / dolibarr

htdocs/product/class/productcustomerprice.class.php

Braces +9 added lines, -3 removed lines

@@ -187,9 +187,15 @@
 		$sql .= "  OR t.date_begin = '" . $this->db->idate($this->date_end) . "' OR t.date_end = '" . $this->db->idate($this->date_end) . "'";
 		$sql .= "  OR (t.date_begin <= '" . $this->db->idate($this->date_begin) . "' AND '" . $this->db->idate($this->date_begin) . "' <= t.date_end)";
 		$sql .= "  OR (t.date_begin <= '" . $this->db->idate($this->date_end) . "' AND '" . $this->db->idate($this->date_end) . "' <= t.date_end))";
-		if ($this->fk_product > 0) $sql .= " AND t.fk_product = " . ((int) $this->fk_product);
-		if ($this->fk_soc > 0) $sql .= " AND t.fk_soc = " . ((int) $this->fk_soc);
-		if ($this->id > 0) $sql .= " AND t.rowid != " . ((int) $this->id);
+		if ($this->fk_product > 0) {
+			$sql .= " AND t.fk_product = " . ((int) $this->fk_product);
+		}
+		if ($this->fk_soc > 0) {
+			$sql .= " AND t.fk_soc = " . ((int) $this->fk_soc);
+		}
+		if ($this->id > 0) {
+			$sql .= " AND t.rowid != " . ((int) $this->id);
+		}
 
 		dol_syslog(get_class($this) . "::fetch", LOG_DEBUG);
 		$resql = $this->db->query($sql);

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;

htdocs/product/class/product.class.php

Braces +6 added lines, -2 removed lines

@@ -1138,7 +1138,9 @@ 
 					$sql .= ", fk_unit";
 					$sql .= ", mandatory_period";
 					$sql .= ", stockable_product";
-					if (!empty($this->default_vat_code)) $sql.=", default_vat_code";
+					if (!empty($this->default_vat_code)) {
+						$sql.=", default_vat_code";
+					}
 					$sql .= ") VALUES (";
 					$sql .= "'".$this->db->idate($this->date_creation)."'";
 					$sql .= ", ".(!empty($this->entity) ? (int) $this->entity : (int) $conf->entity);
@@ -1171,7 +1173,9 @@ 
 					$sql .= ", ".($this->fk_unit > 0 ? ((int) $this->fk_unit) : 'NULL');
 					$sql .= ", '".$this->db->escape((string) $this->mandatory_period)."'";
 					$sql .= ", ".((int) $this->stockable_product);
-					if (!empty($this->default_vat_code)) $sql.=", '".$this->db->escape($this->default_vat_code)."'";
+					if (!empty($this->default_vat_code)) {
+						$sql.=", '".$this->db->escape($this->default_vat_code)."'";
+					}
 					$sql .= ")";
 					dol_syslog(get_class($this)."::Create", LOG_DEBUG);
 

htdocs/compta/facture/card.php

Braces +3 added lines, -1 removed lines

@@ -2638,8 +2638,10 @@
 		$outlangs = $langs;
 		$margin_rate = GETPOSTISSET('marginforalllines') ? GETPOST('marginforalllines', 'int') : '';
 		$mark_rate = GETPOSTISSET('markforalllines') ? GETPOST('markforalllines', 'int') : '';
-		foreach ($object->lines as &$line) if ($line->subprice > 0) {
+		foreach ($object->lines as &$line) {
+			if ($line->subprice > 0) {
 			$subprice_multicurrency = $line->subprice;
+		}
 			if (is_numeric($margin_rate) && $margin_rate > 0) {
 				$line->subprice = floatval(price2num(floatval($line->pa_ht) * (1 + floatval($margin_rate) / 100), 'MU'));
 			} elseif (is_numeric($mark_rate) && $mark_rate > 0) {

htdocs/comm/propal/card.php

Braces +3 added lines, -1 removed lines

@@ -1552,8 +1552,10 @@
 		// Define margin
 		$margin_rate = GETPOSTISSET('marginforalllines') ? GETPOST('marginforalllines', 'int') : '';
 		$mark_rate = GETPOSTISSET('markforalllines') ? GETPOST('markforalllines', 'int') : '';
-		foreach ($object->lines as &$line) if ($line->subprice > 0) {
+		foreach ($object->lines as &$line) {
+			if ($line->subprice > 0) {
 			$subprice_multicurrency = $line->subprice;
+		}
 			if (is_numeric($margin_rate) && $margin_rate > 0) {
 				$line->subprice = floatval(price2num(floatval($line->pa_ht) * (1 + floatval($margin_rate) / 100), 'MU'));
 			} elseif (is_numeric($mark_rate) && $mark_rate > 0) {

htdocs/commande/card.php

Braces +3 added lines, -1 removed lines

@@ -1552,8 +1552,10 @@
 		// Define margin
 		$margin_rate = GETPOSTISSET('marginforalllines') ? GETPOST('marginforalllines', 'int') : '';
 		$mark_rate = GETPOSTISSET('markforalllines') ? GETPOST('markforalllines', 'int') : '';
-		foreach ($object->lines as &$line) if ($line->subprice > 0) {
+		foreach ($object->lines as &$line) {
+			if ($line->subprice > 0) {
 			$subprice_multicurrency = $line->subprice;
+		}
 			if (is_numeric($margin_rate) && $margin_rate > 0) {
 				$line->subprice = floatval(price2num(floatval($line->pa_ht) * (1 + floatval($margin_rate) / 100), 'MU'));
 			} elseif (is_numeric($mark_rate) && $mark_rate > 0) {