alxarafe / alixar

dolibarr/htdocs/core/class/html.formaccounting.class.php

Braces +17 added lines, -14 removed lines

@@ -82,8 +82,7 @@ 
 		{
 		    $options = $this->options_cache[$usecache];
 		    $selected=$selectid;
-		}
-		else
+		} else
 		{
 			$sql = "SELECT rowid, code, label, nature, entity, active";
 			$sql.= " FROM " . MAIN_DB_PREFIX . "accounting_journal";
@@ -168,17 +167,20 @@ 
             $sql.= " FROM ".MAIN_DB_PREFIX."c_accounting_category as c";
             $sql.= " WHERE c.active = 1";
 			$sql.= " AND c.category_type = 0";
-            if (empty($allcountries)) $sql.= " AND c.fk_country = ".$mysoc->country_id;
+            if (empty($allcountries)) {
+                $sql.= " AND c.fk_country = ".$mysoc->country_id;
+            }
             $sql.= " ORDER BY c.label ASC";
-        }
-        else
+        } else
         {
             $sql = "SELECT c.rowid, c.label as type, c.range_account";
             $sql.= " FROM ".MAIN_DB_PREFIX."c_accounting_category as c, ".MAIN_DB_PREFIX."c_country as co";
             $sql.= " WHERE c.active = 1";
 			$sql.= " AND c.category_type = 0";
 			$sql.= " AND c.fk_country = co.rowid";
-            if (empty($allcountries)) $sql.= " AND co.code = '".$mysoc->country_code."'";
+            if (empty($allcountries)) {
+                $sql.= " AND co.code = '".$mysoc->country_code."'";
+            }
             $sql.= " ORDER BY c.label ASC";
         }
 
@@ -192,25 +194,27 @@ 
                 $out = '<select class="flat minwidth200" id="'.$htmlname.'" name="'.$htmlname.'">';
                 $i = 0;
 
-                if ($useempty) $out.= '<option value="0">&nbsp;</option>';
+                if ($useempty) {
+                    $out.= '<option value="0">&nbsp;</option>';
+                }
                 while ($i < $num)
                 {
                     $obj = $db->fetch_object($resql);
                     $out .= '<option value="'.$obj->rowid.'"';
-                    if ($obj->rowid == $selected) $out .= ' selected';
+                    if ($obj->rowid == $selected) {
+                        $out .= ' selected';
+                    }
                     $out .= '>'.($maxlen ? dol_trunc($obj->type,$maxlen) : $obj->type);
 					$out .= ' ('.$obj->range_account.')';
                     $i++;
                 }
                 $out .=  '</select>';
                 //if ($user->admin && $help) $out .= info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"),1);
-            }
-            else
+            } else
             {
                 $out .= $langs->trans("ErrorNoAccountingCategoryForThisCountry",$mysoc->country_code);
             }
-        }
-        else
+        } else
         {
             dol_print_error($db,$db->lasterror());
         }
@@ -281,8 +285,7 @@ 
 		{
 		    $options = $this->options_cache[$usecache];
 		    $selected=$selectid;
-		}
-		else
+		} else
 		{
     		$trunclength = empty($conf->global->ACCOUNTING_LENGTH_DESCRIPTION_ACCOUNT) ? 50 : $conf->global->ACCOUNTING_LENGTH_DESCRIPTION_ACCOUNT;
 

dolibarr/htdocs/core/class/vcard.class.php

Braces +36 added lines, -12 removed lines

@@ -73,7 +73,9 @@ 
             $newline .= $c;
         } // end of for
         $output .= $newline;
-        if ($j<count($lines)-1) $output .= $linebreak;
+        if ($j<count($lines)-1) {
+            $output .= $linebreak;
+        }
     }
     return trim($output);
 }
@@ -102,7 +104,9 @@ 
     {
         // type may be PREF | WORK | HOME | VOICE | FAX | MSG | CELL | PAGER | BBS | CAR | MODEM | ISDN | VIDEO or any senseful combination, e.g. "PREF;WORK;VOICE"
         $key = "TEL";
-        if ($type!="") $key .= ";".$type;
+        if ($type!="") {
+            $key .= ";".$type;
+        }
         $key.= ";CHARSET=".$this->encoding;
         $this->properties[$key] = encode($number);
     }
@@ -146,7 +150,9 @@ 
     {
         $this->properties["N;CHARSET=".$this->encoding] = encode($family).";".encode($first).";".encode($additional).";".encode($prefix).";".encode($suffix);
         $this->filename = "$first%20$family.vcf";
-        if (empty($this->properties["FN"])) $this->setFormattedName(trim("$prefix $first $additional $family $suffix"));
+        if (empty($this->properties["FN"])) {
+            $this->setFormattedName(trim("$prefix $first $additional $family $suffix"));
+        }
     }
 
     /**
@@ -178,7 +184,9 @@ 
     {
         // $type may be DOM | INTL | POSTAL | PARCEL | HOME | WORK or any combination of these: e.g. "WORK;PARCEL;POSTAL"
         $key = "ADR";
-        if ($type!="") $key.= ";$type";
+        if ($type!="") {
+            $key.= ";$type";
+        }
         $key.= ";CHARSET=".$this->encoding;
         $this->properties[$key] = ";".encode($extended).";".encode($street).";".encode($city).";".encode($region).";".encode($zip).";".encode($country);
 
@@ -204,13 +212,27 @@ 
     function setLabel($postoffice="", $extended="", $street="", $city="", $region="", $zip="", $country="", $type="HOME;POSTAL")
     {
         $label = "";
-        if ($postoffice!="") $label.= "$postoffice\r\n";
-        if ($extended!="") $label.= "$extended\r\n";
-        if ($street!="") $label.= "$street\r\n";
-        if ($zip!="") $label.= "$zip ";
-        if ($city!="") $label.= "$city\r\n";
-        if ($region!="") $label.= "$region\r\n";
-        if ($country!="") $country.= "$country\r\n";
+        if ($postoffice!="") {
+            $label.= "$postoffice\r\n";
+        }
+        if ($extended!="") {
+            $label.= "$extended\r\n";
+        }
+        if ($street!="") {
+            $label.= "$street\r\n";
+        }
+        if ($zip!="") {
+            $label.= "$zip ";
+        }
+        if ($city!="") {
+            $label.= "$city\r\n";
+        }
+        if ($region!="") {
+            $label.= "$region\r\n";
+        }
+        if ($country!="") {
+            $country.= "$country\r\n";
+        }
 
         $this->properties["LABEL;$type;CHARSET=".$this->encoding] = encode($label);
     }
@@ -297,7 +319,9 @@ 
     {
         // $type may be WORK | HOME
         $key = "URL";
-        if ($type!="") $key.= ";$type";
+        if ($type!="") {
+            $key.= ";$type";
+        }
         $this->properties[$key] = $url;
     }
 

dolibarr/htdocs/core/class/commonstickergenerator.class.php

Braces +1 added lines, -2 removed lines

@@ -160,8 +160,7 @@
 		$hauteur=abs($y1-$y2);
 		if($length>$hauteur) {
 			$Pointilles=($length/$nbPointilles)/2; // taille des pointilles
-		}
-		else {
+		} else {
 			$Pointilles=($hauteur/$nbPointilles)/2;
 		}
 		for($i=$x1;$i<=$x2;$i+=$Pointilles+$Pointilles) {

dolibarr/htdocs/core/class/html.formsocialcontrib.class.php

Braces +15 added lines, -10 removed lines

@@ -79,8 +79,7 @@ 
             $sql.= " WHERE c.active = 1";
             $sql.= " AND c.fk_pays = ".$mysoc->country_id;
             $sql.= " ORDER BY c.libelle ASC";
-        }
-        else
+        } else
         {
             $sql = "SELECT c.id, c.libelle as type";
             $sql.= " FROM ".MAIN_DB_PREFIX."c_chargesociales as c, ".MAIN_DB_PREFIX."c_country as co";
@@ -99,25 +98,31 @@ 
             	print '<select class="'.($morecss?$morecss:'').'" id="'.$htmlname.'" name="'.$htmlname.'">';
                 $i = 0;
 
-                if ($useempty) print '<option value="0">&nbsp;</option>';
+                if ($useempty) {
+                    print '<option value="0">&nbsp;</option>';
+                }
                 while ($i < $num)
                 {
                     $obj = $db->fetch_object($resql);
                     print '<option value="'.$obj->id.'"';
-                    if ($obj->id == $selected) print ' selected';
+                    if ($obj->id == $selected) {
+                        print ' selected';
+                    }
                     print '>'.dol_trunc($obj->type,$maxlen);
                     $i++;
                 }
                 print '</select>';
-                if ($user->admin && $help) print info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"),1);
-                if (! empty($conf->use_javascript_ajax)) print ajax_combobox($htmlname);
-            }
-            else
+                if ($user->admin && $help) {
+                    print info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"),1);
+                }
+                if (! empty($conf->use_javascript_ajax)) {
+                    print ajax_combobox($htmlname);
+                }
+            } else
             {
                 print $langs->trans("ErrorNoSocialContributionForSellerCountry",$mysoc->country_code);
             }
-        }
-        else
+        } else
         {
             dol_print_error($db,$db->lasterror());
         }

dolibarr/htdocs/core/class/ccountry.class.php

Braces +34 added lines, -20 removed lines

@@ -92,10 +92,18 @@ 
 		$error=0;
 
 		// Clean parameters
-		if (isset($this->code)) $this->code=trim($this->code);
-		if (isset($this->code_iso)) $this->code_iso=trim($this->code_iso);
-		if (isset($this->label)) $this->label=trim($this->label);
-		if (isset($this->active)) $this->active=trim($this->active);
+		if (isset($this->code)) {
+		    $this->code=trim($this->code);
+		}
+		if (isset($this->code_iso)) {
+		    $this->code_iso=trim($this->code_iso);
+		}
+		if (isset($this->label)) {
+		    $this->label=trim($this->label);
+		}
+		if (isset($this->active)) {
+		    $this->active=trim($this->active);
+		}
 
 		// Check parameters
 		// Put here code to add control on parameters values
@@ -149,8 +157,7 @@ 
 			}
 			$this->db->rollback();
 			return -1*$error;
-		}
-		else
+		} else
 		{
 			$this->db->commit();
             return $this->id;
@@ -175,8 +182,11 @@ 
 		$sql.= " t.label,";
 		$sql.= " t.active";
         $sql.= " FROM ".MAIN_DB_PREFIX."c_country as t";
-        if ($id)   $sql.= " WHERE t.rowid = ".$id;
-        elseif ($code) $sql.= " WHERE t.code = '".$this->db->escape($code)."'";
+        if ($id) {
+            $sql.= " WHERE t.rowid = ".$id;
+        } elseif ($code) {
+            $sql.= " WHERE t.code = '".$this->db->escape($code)."'";
+        }
 
     	dol_syslog(get_class($this)."::fetch", LOG_DEBUG);
         $resql=$this->db->query($sql);
@@ -194,12 +204,10 @@ 
 
                 $this->db->free($resql);
                 return 1;
-            }
-            else {
+            } else {
                 return 0;
             }
-        }
-        else
+        } else
         {
       	    $this->error="Error ".$this->db->lasterror();
             return -1;
@@ -220,10 +228,18 @@ 
 		$error=0;
 
 		// Clean parameters
-		if (isset($this->code)) $this->code=trim($this->code);
-		if (isset($this->code_iso)) $this->code_iso=trim($this->code_iso);
-		if (isset($this->label)) $this->label=trim($this->label);
-		if (isset($this->active)) $this->active=trim($this->active);
+		if (isset($this->code)) {
+		    $this->code=trim($this->code);
+		}
+		if (isset($this->code_iso)) {
+		    $this->code_iso=trim($this->code_iso);
+		}
+		if (isset($this->label)) {
+		    $this->label=trim($this->label);
+		}
+		if (isset($this->active)) {
+		    $this->active=trim($this->active);
+		}
 
 
 		// Check parameters
@@ -269,8 +285,7 @@ 
 			}
 			$this->db->rollback();
 			return -1*$error;
-		}
-		else
+		} else
 		{
 			$this->db->commit();
 			return 1;
@@ -325,8 +340,7 @@ 
 			}
 			$this->db->rollback();
 			return -1*$error;
-		}
-		else
+		} else
 		{
 			$this->db->commit();
 			return 1;

dolibarr/htdocs/core/class/commondocgenerator.class.php

Braces +48 added lines, -34 removed lines

@@ -229,8 +229,7 @@ 
         		if($extrafields->attribute_type[$key] == 'price')
         		{
         			$object->array_options['options_'.$key] = price($object->array_options['options_'.$key],0,$outputlangs,0,0,-1,$conf->currency);
-        		}
-        		else if($extrafields->attribute_type[$key] == 'select' || $extrafields->attribute_type[$key] == 'checkbox')
+        		} else if($extrafields->attribute_type[$key] == 'select' || $extrafields->attribute_type[$key] == 'checkbox')
         		{
         			$object->array_options['options_'.$key] = $extrafields->attribute_param[$key]['options'][$object->array_options['options_'.$key]];
         		}
@@ -303,8 +302,7 @@ 
 			if ($extrafields->attribute_type[$key] == 'price')
 			{
 				$object->array_options['options_' . $key] = price($object->array_options ['options_' . $key], 0, $outputlangs, 0, 0, - 1, $conf->currency);
-			}
-			elseif($extrafields->attribute_type[$key] == 'select' || $extrafields->attribute_type[$key] == 'checkbox')
+			} elseif($extrafields->attribute_type[$key] == 'select' || $extrafields->attribute_type[$key] == 'checkbox')
 			{
 				$object->array_options['options_' . $key] = $extrafields->attribute_param[$key]['options'][$object->array_options['options_' . $key]];
 			}
@@ -343,8 +341,11 @@ 
 
     	foreach($conf->global as $key => $val)
     	{
-    		if (preg_match('/(_pass|password|secret|_key|key$)/i', $key)) $newval = '*****forbidden*****';
-    		else $newval = $val;
+    		if (preg_match('/(_pass|password|secret|_key|key$)/i', $key)) {
+    		    $newval = '*****forbidden*****';
+    		} else {
+    		    $newval = $val;
+    		}
     		$array_other['__['.$key.']__'] = $newval;
     	}
 
@@ -475,12 +476,16 @@ 
 			foreach ($object->lines as $line)
 			{
 			    // $line->tva_tx format depends on database field accuraty, no reliable. This is kept for backward comaptibility
-				if (empty($resarray[$array_key.'_total_vat_'.$line->tva_tx])) $resarray[$array_key.'_total_vat_'.$line->tva_tx]=0;
+				if (empty($resarray[$array_key.'_total_vat_'.$line->tva_tx])) {
+				    $resarray[$array_key.'_total_vat_'.$line->tva_tx]=0;
+				}
 				$resarray[$array_key.'_total_vat_'.$line->tva_tx]+=$line->total_tva;
 				$resarray[$array_key.'_total_vat_locale_'.$line->tva_tx]=price($resarray[$array_key.'_total_vat_'.$line->tva_tx]);
 			    // $vatformated is vat without not expected chars (so 20, or 8.5 or 5.99 for example)
 				$vatformated=vatrate($line->tva_tx);
-				if (empty($resarray[$array_key.'_total_vat_'.$vatformated])) $resarray[$array_key.'_total_vat_'.$vatformated]=0;
+				if (empty($resarray[$array_key.'_total_vat_'.$vatformated])) {
+				    $resarray[$array_key.'_total_vat_'.$vatformated]=0;
+				}
 				$resarray[$array_key.'_total_vat_'.$vatformated]+=$line->total_tva;
 				$resarray[$array_key.'_total_vat_locale_'.$vatformated]=price($resarray[$array_key.'_total_vat_'.$vatformated]);
 			}
@@ -572,8 +577,9 @@ 
 		{
 			$tmpproduct = new Product($this->db);
 			$result = $tmpproduct->fetch($line->fk_product);
-			foreach($tmpproduct->array_options as $key=>$label)
-				$resarray["line_product_".$key] = $label;
+			foreach($tmpproduct->array_options as $key=>$label) {
+							$resarray["line_product_".$key] = $label;
+			}
 		}
 
 		return $resarray;
@@ -623,7 +629,9 @@ 
     	// Add vat by rates
     	foreach ($object->lines as $line)
     	{
-    		if (empty($array_shipment[$array_key.'_total_vat_'.$line->tva_tx])) $array_shipment[$array_key.'_total_vat_'.$line->tva_tx]=0;
+    		if (empty($array_shipment[$array_key.'_total_vat_'.$line->tva_tx])) {
+    		    $array_shipment[$array_key.'_total_vat_'.$line->tva_tx]=0;
+    		}
     		$array_shipment[$array_key.'_total_vat_'.$line->tva_tx]+=$line->total_tva;
     	}
 
@@ -742,12 +750,10 @@ 
 				$object->array_options['options_'.$key.'_currency'] = price($object->array_options['options_'.$key],0,$outputlangs,0,0,-1,$conf->currency);
 				//Add value to store price with currency
 				$array_to_fill=array_merge($array_to_fill,array($array_key.'_options_'.$key.'_currency' => $object->array_options['options_'.$key.'_currency']));
-			}
-			else if($extrafields->attribute_type[$key] == 'select' || $extrafields->attribute_type[$key] == 'checkbox')
+			} else if($extrafields->attribute_type[$key] == 'select' || $extrafields->attribute_type[$key] == 'checkbox')
 			{
 				$object->array_options['options_'.$key] = $extrafields->attribute_param[$key]['options'][$object->array_options['options_'.$key]];
-			}
-			else if($extrafields->attribute_type[$key] == 'date')
+			} else if($extrafields->attribute_type[$key] == 'date')
 			{
 				if (strlen($object->array_options['options_'.$key])>0)
 				{
@@ -755,8 +761,7 @@ 
 					$object->array_options['options_'.$key] = dol_print_date($date,'day');                                       // using company output language
 					$object->array_options['options_'.$key.'_locale'] = dol_print_date($date,'day','tzserver',$outputlangs);     // using output language format
 					$object->array_options['options_'.$key.'_rfc'] = dol_print_date($date,'dayrfc');                             // international format
-				}
-				else
+				} else
 				{
 					$object->array_options['options_'.$key] = '';
 					$object->array_options['options_'.$key.'_locale'] = '';
@@ -764,8 +769,7 @@ 
 				}
 				$array_to_fill=array_merge($array_to_fill,array($array_key.'_options_'.$key.'_locale' => $object->array_options['options_'.$key.'_locale']));
 				$array_to_fill=array_merge($array_to_fill,array($array_key.'_options_'.$key.'_rfc' => $object->array_options['options_'.$key.'_rfc']));
-			}
-			else if($extrafields->attribute_type[$key] == 'datetime')
+			} else if($extrafields->attribute_type[$key] == 'datetime')
 			{
 				$datetime = $object->array_options['options_'.$key];
 				$object->array_options['options_'.$key] = ($datetime!="0000-00-00 00:00:00"?dol_print_date($object->array_options['options_'.$key],'dayhour'):'');                            // using company output language
@@ -773,8 +777,7 @@ 
 				$object->array_options['options_'.$key.'_rfc'] = ($datetime!="0000-00-00 00:00:00"?dol_print_date($object->array_options['options_'.$key],'dayhourrfc'):'');                             // international format
 				$array_to_fill=array_merge($array_to_fill,array($array_key.'_options_'.$key.'_locale' => $object->array_options['options_'.$key.'_locale']));
 				$array_to_fill=array_merge($array_to_fill,array($array_key.'_options_'.$key.'_rfc' => $object->array_options['options_'.$key.'_rfc']));
-			}
-			else if($extrafields->attribute_type[$key] == 'link')
+			} else if($extrafields->attribute_type[$key] == 'link')
 			{
 				$id = $object->array_options['options_'.$key];
 				if ($id != "")
@@ -819,9 +822,13 @@ 
 	 */
     function printRect($pdf, $x, $y, $l, $h, $hidetop=0, $hidebottom=0)
     {
-        if (empty($hidetop) || $hidetop==-1) $pdf->line($x, $y, $x+$l, $y);
+        if (empty($hidetop) || $hidetop==-1) {
+            $pdf->line($x, $y, $x+$l, $y);
+        }
         $pdf->line($x+$l, $y, $x+$l, $y+$h);
-        if (empty($hidebottom)) $pdf->line($x+$l, $y+$h, $x, $y+$h);
+        if (empty($hidebottom)) {
+            $pdf->line($x+$l, $y+$h, $x, $y+$h);
+        }
         $pdf->line($x, $y+$h, $x, $y);
     }
 
@@ -874,7 +881,10 @@ 
         $countFlexCol = 0;
         foreach ($this->cols as $colKey =>& $colDef)
         {
-            if(!$this->getColumnStatus($colKey)) continue; // continue if desable
+            if(!$this->getColumnStatus($colKey)) {
+                continue;
+            }
+            // continue if desable
 
             if(!empty($colDef['scale'])){
                 // In case of column widht is defined by percentage
@@ -883,8 +893,7 @@ 
 
             if(empty($colDef['width'])){
                 $countFlexCol++;
-            }
-            else{
+            } else{
                 $totalDefinedColWidth += $colDef['width'];
             }
         }
@@ -894,16 +903,14 @@ 
             // setting empty conf with default
             if(!empty($colDef['title'])){
                 $colDef['title'] = array_replace($this->defaultTitlesFieldsStyle, $colDef['title']);
-            }
-            else{
+            } else{
                 $colDef['title'] = $this->defaultTitlesFieldsStyle;
             }
 
             // setting empty conf with default
             if(!empty($colDef['content'])){
                 $colDef['content'] = array_replace($this->defaultContentsFieldsStyle, $colDef['content']);
-            }
-            else{
+            } else{
                 $colDef['content'] = $this->defaultContentsFieldsStyle;
             }
 
@@ -956,7 +963,9 @@ 
      */
     function getColumnRank($colKey)
     {
-        if(!isset($this->cols[$colKey]['rank'])) return -1;
+        if(!isset($this->cols[$colKey]['rank'])) {
+            return -1;
+        }
         return  $this->cols[$colKey]['rank'];
     }
 
@@ -1022,10 +1031,14 @@ 
             'colKey' => $colKey
         );
         $reshook=$hookmanager->executeHooks('printStdColumnContent',$parameters,$this);    // Note that $action and $object may have been modified by hook
-        if ($reshook < 0) setEventMessages($hookmanager->error,$hookmanager->errors,'errors');
+        if ($reshook < 0) {
+            setEventMessages($hookmanager->error,$hookmanager->errors,'errors');
+        }
         if (!$reshook)
         {
-            if(empty($columnText)) return;
+            if(empty($columnText)) {
+                return;
+            }
             $pdf->SetXY($this->getColumnContentXStart($colKey),$curY); // Set curent position
             $colDef = $this->cols[$colKey];
             $pdf->writeHTMLCell( $this->getColumnContentWidth($colKey),2,$this->getColumnContentXStart($colKey),$curY, $columnText,0,0,0,true,$colDef['content']['align']);
@@ -1043,7 +1056,8 @@ 
     {
         if( !empty($this->cols[$colKey]['status'])){
             return true;
+        } else {
+            return  false;
         }
-        else  return  false;
     }
 }

dolibarr/htdocs/core/class/canvas.class.php

Braces +20 added lines, -7 removed lines

@@ -76,9 +76,15 @@ 
 	private function _cleanaction($action)
 	{
 	    $newaction = $action;
-	    if ($newaction == 'add')    $newaction='create';
-	    if ($newaction == 'update') $newaction='edit';
-	    if (empty($newaction) || $newaction == 'delete' || $newaction == 'create_user' || $newaction == 'presend' || $newaction == 'send') $newaction='view';
+	    if ($newaction == 'add') {
+	        $newaction='create';
+	    }
+	    if ($newaction == 'update') {
+	        $newaction='edit';
+	    }
+	    if (empty($newaction) || $newaction == 'delete' || $newaction == 'create_user' || $newaction == 'presend' || $newaction == 'send') {
+	        $newaction='view';
+	    }
 	    return $newaction;
 	}
 
@@ -145,7 +151,9 @@ 
 	function assign_values(&$action='view', $id=0, $ref='')
 	{
         // phpcs:enable
-		if (method_exists($this->control,'assign_values')) $this->control->assign_values($action, $id, $ref);
+		if (method_exists($this->control,'assign_values')) {
+		    $this->control->assign_values($action, $id, $ref);
+		}
 	}
 
     /**
@@ -156,10 +164,15 @@ 
      */
     function displayCanvasExists($action)
     {
-        if (empty($this->template_dir)) return 0;
+        if (empty($this->template_dir)) {
+            return 0;
+        }
 
-        if (file_exists($this->template_dir.(!empty($this->card)?$this->card.'_':'').$this->_cleanaction($action).'.tpl.php')) return 1;
-        else return 0;
+        if (file_exists($this->template_dir.(!empty($this->card)?$this->card.'_':'').$this->_cleanaction($action).'.tpl.php')) {
+            return 1;
+        } else {
+            return 0;
+        }
     }
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps

dolibarr/htdocs/core/class/coreobject.class.php

Braces +62 added lines, -45 removed lines

@@ -59,19 +59,24 @@ 
 		{
 			foreach ($this->fields as $field=>$info)
 			{
-		        if ($this->isDate($info)) $this->{$field} = time();
-		        elseif ($this->isArray($info)) $this->{$field} = array();
-		        elseif ($this->isInt($info)) $this->{$field} = (int) 0;
-		        elseif ($this->isFloat($info)) $this->{$field} = (double) 0;
-				else $this->{$field} = '';
+		        if ($this->isDate($info)) {
+		            $this->{$field} = time();
+		        } elseif ($this->isArray($info)) {
+		            $this->{$field} = array();
+		        } elseif ($this->isInt($info)) {
+		            $this->{$field} = (int) 0;
+		        } elseif ($this->isFloat($info)) {
+		            $this->{$field} = (double) 0;
+		        } else {
+				    $this->{$field} = '';
+				}
 		    }
 
             $this->to_delete=false;
             $this->is_clone=false;
 
 			return true;
-		}
-		else
+		} else
         {
 			return false;
 		}
@@ -89,8 +94,7 @@ 
 		if (isset($this->fields[$field]) && method_exists($this, 'is_'.$type))
 		{
 			return $this->{'is_'.$type}($this->fields[$field]);
-		}
-		else
+		} else
         {
             return false;
         }
@@ -107,7 +111,9 @@ 
     {
     	$res = $this->fetchCommon($id);
     	if($res>0) {
-    		if ($loadChild) $this->fetchChild();
+    		if ($loadChild) {
+    		    $this->fetchChild();
+    		}
     	}
 
     	return $res;
@@ -129,7 +135,9 @@ 
 		{
 			foreach($this->{$tabName} as $k=>&$object)
 			{
-				if($object->{$key} === $id) return $k;
+				if($object->{$key} === $id) {
+				    return $k;
+				}
 			}
 		}
 
@@ -195,8 +203,7 @@ 
 
                         $this->{$className}[] = $o;
                     }
-                }
-                else
+                } else
                 {
                     $this->errors[] = $this->db->lasterror();
                 }
@@ -224,7 +231,9 @@ 
 						$object->{$this->fk_element} = $this->id;
 
 						$object->update($user);
-						if($this->unsetChildDeleted && isset($object->to_delete) && $object->to_delete==true) unset($this->{$className}[$i]);
+						if($this->unsetChildDeleted && isset($object->to_delete) && $object->to_delete==true) {
+						    unset($this->{$className}[$i]);
+						}
 					}
 				}
 			}
@@ -240,8 +249,13 @@ 
      */
     public function update(User &$user)
     {
-		if (empty($this->id)) return $this->create($user); // To test, with that, no need to test on high level object, the core decide it, update just needed
-        elseif (isset($this->to_delete) && $this->to_delete==true) return $this->delete($user);
+		if (empty($this->id)) {
+		    return $this->create($user);
+		}
+		// To test, with that, no need to test on high level object, the core decide it, update just needed
+        elseif (isset($this->to_delete) && $this->to_delete==true) {
+            return $this->delete($user);
+        }
 
         $error = 0;
         $this->db->begin();
@@ -250,10 +264,12 @@ 
         if ($res)
         {
             $result = $this->call_trigger(strtoupper($this->element). '_UPDATE', $user);
-            if ($result < 0) $error++;
-            else $this->saveChild($user);
-        }
-        else
+            if ($result < 0) {
+                $error++;
+            } else {
+                $this->saveChild($user);
+            }
+        } else
         {
             $error++;
             $this->error = $this->db->lasterror();
@@ -264,8 +280,7 @@ 
         {
             $this->db->commit();
             return $this->id;
-        }
-        else
+        } else
         {
             $this->db->rollback();
             return -1;
@@ -280,7 +295,9 @@ 
      */
     public function create(User &$user)
     {
-		if($this->id > 0) return $this->update($user);
+		if($this->id > 0) {
+		    return $this->update($user);
+		}
 
         $error = 0;
         $this->db->begin();
@@ -291,10 +308,12 @@ 
 			$this->id = $this->db->last_insert_id($this->table_element);
 
 			$result = $this->call_trigger(strtoupper($this->element). '_CREATE', $user);
-            if ($result < 0) $error++;
-            else $this->saveChild($user);
-		}
-		else
+            if ($result < 0) {
+                $error++;
+            } else {
+                $this->saveChild($user);
+            }
+		} else
         {
             $error++;
             $this->error = $this->db->lasterror();
@@ -305,8 +324,7 @@ 
         {
             $this->db->commit();
             return $this->id;
-        }
-        else
+        } else
         {
             $this->db->rollback();
             return -1;
@@ -321,13 +339,17 @@ 
      */
 	public function delete(User &$user)
     {
-		if ($this->id <= 0) return 0;
+		if ($this->id <= 0) {
+		    return 0;
+		}
 
         $error = 0;
         $this->db->begin();
 
         $result = $this->call_trigger(strtoupper($this->element). '_DELETE', $user);
-        if ($result < 0) $error++;
+        if ($result < 0) {
+            $error++;
+        }
 
         if (!$error)
         {
@@ -352,8 +374,7 @@ 
         {
             $this->db->commit();
             return 1;
-        }
-        else
+        } else
         {
             $this->error = $this->db->lasterror();
             $this->errors[] = $this->error;
@@ -372,8 +393,9 @@ 
      */
     public function getDate($field, $format='')
     {
-		if(empty($this->{$field})) return '';
-		else
+		if(empty($this->{$field})) {
+		    return '';
+		} else
         {
 			return dol_print_date($this->{$field}, $format);
 		}
@@ -391,8 +413,7 @@ 
 	  	if (empty($date))
 	  	{
 	  		$this->{$field} = 0;
-	  	}
-		else
+	  	} else
         {
 			require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
 			$this->{$field} = dol_stringtotime($date);
@@ -415,19 +436,15 @@ 
 			if($this->checkFieldType($key, 'date'))
 			{
 				$this->setDate($key, $value);
-			}
-			else if( $this->checkFieldType($key, 'array'))
+			} else if( $this->checkFieldType($key, 'array'))
 			{
 				$this->{$key} = $value;
-			}
-			else if( $this->checkFieldType($key, 'float') )
+			} else if( $this->checkFieldType($key, 'float') )
 			{
 				$this->{$key} = (double) price2num($value);
-			}
-			else if( $this->checkFieldType($key, 'int') ) {
+			} else if( $this->checkFieldType($key, 'int') ) {
 				$this->{$key} = (int) price2num($value);
-			}
-			else
+			} else
             {
 				$this->{$key} = $value;
 			}

dolibarr/htdocs/core/class/cstate.class.php

Braces +27 added lines, -16 removed lines

@@ -98,9 +98,15 @@ 
 		$error=0;
 
 		// Clean parameters
-		if (isset($this->code_departement)) $this->code_departement=trim($this->code_departement);
-		if (isset($this->nom)) $this->nom=trim($this->nom);
-		if (isset($this->active)) $this->active=trim($this->active);
+		if (isset($this->code_departement)) {
+		    $this->code_departement=trim($this->code_departement);
+		}
+		if (isset($this->nom)) {
+		    $this->nom=trim($this->nom);
+		}
+		if (isset($this->active)) {
+		    $this->active=trim($this->active);
+		}
 
 		// Check parameters
 		// Put here code to add control on parameters values
@@ -152,8 +158,7 @@ 
 			}
 			$this->db->rollback();
 			return -1*$error;
-		}
-		else
+		} else
 		{
 			$this->db->commit();
             return $this->id;
@@ -177,8 +182,11 @@ 
 		$sql.= " t.nom,";
 		$sql.= " t.active";
         $sql.= " FROM ".MAIN_DB_PREFIX."c_departements as t";
-        if ($id)   $sql.= " WHERE t.rowid = ".$id;
-        elseif ($code) $sql.= " WHERE t.code_departement = '".$this->db->escape($code)."'";
+        if ($id) {
+            $sql.= " WHERE t.rowid = ".$id;
+        } elseif ($code) {
+            $sql.= " WHERE t.code_departement = '".$this->db->escape($code)."'";
+        }
 
     	dol_syslog(get_class($this)."::fetch", LOG_DEBUG);
         $resql=$this->db->query($sql);
@@ -196,8 +204,7 @@ 
             $this->db->free($resql);
 
             return 1;
-        }
-        else
+        } else
         {
       	    $this->error="Error ".$this->db->lasterror();
             return -1;
@@ -218,9 +225,15 @@ 
 		$error=0;
 
 		// Clean parameters
-		if (isset($this->code_departement)) $this->code_departement=trim($this->code_departement);
-		if (isset($this->nom)) $this->nom=trim($this->nom);
-		if (isset($this->active)) $this->active=trim($this->active);
+		if (isset($this->code_departement)) {
+		    $this->code_departement=trim($this->code_departement);
+		}
+		if (isset($this->nom)) {
+		    $this->nom=trim($this->nom);
+		}
+		if (isset($this->active)) {
+		    $this->active=trim($this->active);
+		}
 
 
 		// Check parameters
@@ -265,8 +278,7 @@ 
 			}
 			$this->db->rollback();
 			return -1*$error;
-		}
-		else
+		} else
 		{
 			$this->db->commit();
 			return 1;
@@ -321,8 +333,7 @@ 
 			}
 			$this->db->rollback();
 			return -1*$error;
-		}
-		else
+		} else
 		{
 			$this->db->commit();
 			return 1;