alxarafe / alixar

dolibarr/htdocs/core/tpl/filemanager.tpl.php

Braces +21 added lines, -11 removed lines

@@ -34,7 +34,9 @@ 
 
 require_once DOL_DOCUMENT_ROOT.'/ecm/class/ecmdirectory.class.php';
 
-if (empty($module)) $module='ecm';
+if (empty($module)) {
+    $module='ecm';
+}
 
 $permtoadd = 0;
 $permtoupload = 0;
@@ -77,8 +79,7 @@ 
 	print '<a href="'.DOL_URL_ROOT.'/ecm/dir_add_card.php?action=create&module='.urlencode($module).($websitekey?'&website='.$websitekey:'').($pageid?'&pageid='.$pageid:'').'&backtopage='.urlencode($_SERVER["PHP_SELF"].'?file_manager=1&website='.$websitekey.'&pageid='.$pageid).'" class="inline-block valignmiddle toolbarbutton" title="'.dol_escape_htmltag($langs->trans('ECMAddSection')).'">';
     print '<img class="toolbarbutton" border="0" src="'.DOL_URL_ROOT.'/theme/common/folder-new.png">';
     print '</a>';
-}
-else
+} else
 {
     print '<a href="#" class="inline-block valignmiddle toolbarbutton" title="'.$langs->trans("NotAllowed").'">';
     print '<img class="toolbarbutton" border="0" src="'.DOL_URL_ROOT.'/theme/common/folder-new.png">';
@@ -116,8 +117,9 @@ 
 	include_once DOL_DOCUMENT_ROOT.'/core/class/html.formfile.class.php';
     $formfile=new FormFile($db);
     $formfile->form_attach_new_file($_SERVER["PHP_SELF"], 'none', 0, ($section?$section:-1), $permtoupload, 48, null, '', 0, '', 0, $nameforformuserfile, '', $sectiondir);
+} else {
+    print '&nbsp;';
 }
-else print '&nbsp;';
 
 print '</div>';
 // End "Add new file" area
@@ -173,11 +175,12 @@ 
     	// Show filemanager tree (will be filled by a call of ajax /ecm/tpl/enablefiletreeajax.tpl.php, later, that executes ajaxdirtree.php)
 	    print '<div id="filetree" class="ecmfiletree"></div>';
 
-	    if ($action == 'deletefile') print $form->formconfirm('eeeee', $langs->trans('DeleteFile'), $langs->trans('ConfirmDeleteFile'), 'confirm_deletefile', '', '', 'deletefile');
+	    if ($action == 'deletefile') {
+	        print $form->formconfirm('eeeee', $langs->trans('DeleteFile'), $langs->trans('ConfirmDeleteFile'), 'confirm_deletefile', '', '', 'deletefile');
+	    }
 
 	    print '</td></tr>';
-    }
-    else	// Show filtree when ajax is disabled (rare)
+    } else	// Show filtree when ajax is disabled (rare)
     {
         print '<tr><td style="padding-left: 20px">';
 
@@ -192,7 +195,9 @@ 
         // $_GET['modulepart'], $_GET['openeddir'], $_GET['sortfield'], $_GET['sortorder']
         // $_POST['dir']
         $mode='noajax';
-        if (empty($url)) $url=DOL_URL_ROOT.'/ecm/index.php';
+        if (empty($url)) {
+            $url=DOL_URL_ROOT.'/ecm/index.php';
+        }
         include DOL_DOCUMENT_ROOT.'/core/ajax/ajaxdirtree.php';
 
     	print '</div>';
@@ -215,7 +220,9 @@ 
 
 
 $mode='noajax';
-if (empty($url)) $url=DOL_URL_ROOT.'/ecm/index.php';
+if (empty($url)) {
+    $url=DOL_URL_ROOT.'/ecm/index.php';
+}
 include DOL_DOCUMENT_ROOT.'/core/ajax/ajaxdirpreview.php';	// Show content of a directory on right side
 
 
@@ -229,14 +236,17 @@ 
 <?php
 
 
-if (! empty($conf->use_javascript_ajax) && empty($conf->global->MAIN_ECM_DISABLE_JS)) // Show filtree when ajax is enabled
+if (! empty($conf->use_javascript_ajax) && empty($conf->global->MAIN_ECM_DISABLE_JS)) {
+    // Show filtree when ajax is enabled
 {
 	//var_dump($modulepart);
 	// Variables that may be defined:
 	// $_GET['modulepart'], $_GET['openeddir'], $_GET['sortfield'], $_GET['sortorder']
 	// $_POST['dir']
 	// $_POST['section_dir'], $_POST['section_id'], $_POST['token'], $_POST['max_file_size'], $_POST['sendit']
-	if (GETPOST('section_dir','alpha')) { $preopened=GETPOST('section_dir','alpha'); }
+	if (GETPOST('section_dir','alpha')) { $preopened=GETPOST('section_dir','alpha');
+}
+}
 
 	include DOL_DOCUMENT_ROOT.'/ecm/tpl/enablefiletreeajax.tpl.php';
 }

dolibarr/htdocs/core/tpl/commonfields_view.tpl.php

Braces +56 added lines, -17 removed lines

@@ -29,7 +29,9 @@ 
 	print "Error, template page can't be called as URL";
 	exit;
 }
-if (! is_object($form)) $form=new Form($db);
+if (! is_object($form)) {
+    $form=new Form($db);
+}
 
 ?>
 <!-- BEGIN PHP TEMPLATE commonfields_view.tpl.php -->
@@ -40,20 +42,35 @@ 
 foreach($object->fields as $key => $val)
 {
 	// Discard if extrafield is a hidden field on form
-	if (abs($val['visible']) != 1) continue;
+	if (abs($val['visible']) != 1) {
+	    continue;
+	}
 
-	if (array_key_exists('enabled', $val) && isset($val['enabled']) && ! verifCond($val['enabled'])) continue;	// We don't want this field
-	if (in_array($key, array('ref','status'))) continue;	// Ref and status are already in dol_banner
+	if (array_key_exists('enabled', $val) && isset($val['enabled']) && ! verifCond($val['enabled'])) {
+	    continue;
+	}
+	// We don't want this field
+	if (in_array($key, array('ref','status'))) {
+	    continue;
+	}
+	// Ref and status are already in dol_banner
 
 	$value=$object->$key;
 
 	print '<tr><td';
 	print ' class="titlefield';
-	if ($val['notnull'] > 0) print ' fieldrequired';
-	if ($val['type'] == 'text' || $val['type'] == 'html') print ' tdtop';
+	if ($val['notnull'] > 0) {
+	    print ' fieldrequired';
+	}
+	if ($val['type'] == 'text' || $val['type'] == 'html') {
+	    print ' tdtop';
+	}
 	print '">';
-	if (! empty($val['help'])) print $form->textwithpicto($langs->trans($val['label']), $val['help']);
-	else print $langs->trans($val['label']);
+	if (! empty($val['help'])) {
+	    print $form->textwithpicto($langs->trans($val['label']), $val['help']);
+	} else {
+	    print $langs->trans($val['label']);
+	}
 	print '</td>';
 	print '<td>';
 	print $object->showOutputField($val, $key, $value, '', '', '', 0);
@@ -61,7 +78,10 @@ 
 	print '</td>';
 	print '</tr>';
 
-	if (! empty($keyforbreak) && $key == $keyforbreak) break;						// key used for break on second column
+	if (! empty($keyforbreak) && $key == $keyforbreak) {
+	    break;
+	}
+	// key used for break on second column
 }
 
 print '</table>';
@@ -76,23 +96,42 @@ 
 {
 	if ($alreadyoutput)
 	{
-		if (! empty($keyforbreak) && $key == $keyforbreak) $alreadyoutput = 0;		// key used for break on second column
+		if (! empty($keyforbreak) && $key == $keyforbreak) {
+		    $alreadyoutput = 0;
+		}
+		// key used for break on second column
 		continue;
 	}
 
-	if (abs($val['visible']) != 1) continue;	// Discard such field from form
-	if (array_key_exists('enabled', $val) && isset($val['enabled']) && ! $val['enabled']) continue;	// We don't want this field
-	if (in_array($key, array('ref','status'))) continue;	// Ref and status are already in dol_banner
+	if (abs($val['visible']) != 1) {
+	    continue;
+	}
+	// Discard such field from form
+	if (array_key_exists('enabled', $val) && isset($val['enabled']) && ! $val['enabled']) {
+	    continue;
+	}
+	// We don't want this field
+	if (in_array($key, array('ref','status'))) {
+	    continue;
+	}
+	// Ref and status are already in dol_banner
 
 	$value=$object->$key;
 
 	print '<tr><td';
 	print ' class="titlefield';
-	if ($val['notnull'] > 0) print ' fieldrequired';
-	if ($val['type'] == 'text' || $val['type'] == 'html') print ' tdtop';
+	if ($val['notnull'] > 0) {
+	    print ' fieldrequired';
+	}
+	if ($val['type'] == 'text' || $val['type'] == 'html') {
+	    print ' tdtop';
+	}
 	print '">';
-	if (! empty($val['help'])) print $form->textwithpicto($langs->trans($val['label']), $val['help']);
-	else print $langs->trans($val['label']);
+	if (! empty($val['help'])) {
+	    print $form->textwithpicto($langs->trans($val['label']), $val['help']);
+	} else {
+	    print $langs->trans($val['label']);
+	}
 	print '</td>';
 	print '<td>';
 	print $object->showOutputField($val, $key, $value, '', '', '', 0);

dolibarr/htdocs/core/tpl/objectline_view.tpl.php

Braces +80 added lines, -40 removed lines

@@ -48,13 +48,25 @@ 
 global $forceall, $senderissupplier, $inputalsopricewithtax, $outputalsopricetotalwithtax;
 
 $usemargins=0;
-if (! empty($conf->margin->enabled) && ! empty($object->element) && in_array($object->element,array('facture','propal','commande'))) $usemargins=1;
+if (! empty($conf->margin->enabled) && ! empty($object->element) && in_array($object->element,array('facture','propal','commande'))) {
+    $usemargins=1;
+}
 
-if (empty($dateSelector)) $dateSelector=0;
-if (empty($forceall)) $forceall=0;
-if (empty($senderissupplier)) $senderissupplier=0;
-if (empty($inputalsopricewithtax)) $inputalsopricewithtax=0;
-if (empty($outputalsopricetotalwithtax)) $outputalsopricetotalwithtax=0;
+if (empty($dateSelector)) {
+    $dateSelector=0;
+}
+if (empty($forceall)) {
+    $forceall=0;
+}
+if (empty($senderissupplier)) {
+    $senderissupplier=0;
+}
+if (empty($inputalsopricewithtax)) {
+    $inputalsopricewithtax=0;
+}
+if (empty($outputalsopricetotalwithtax)) {
+    $outputalsopricetotalwithtax=0;
+}
 
 // add html5 elements
 $domData  = ' data-element="'.$line->element.'"';
@@ -78,9 +90,13 @@ 
 		<?php
 		$txt='';
 		print img_object($langs->trans("ShowReduc"),'reduc').' ';
-		if ($line->description == '(DEPOSIT)') $txt=$langs->trans("Deposit");
-		elseif ($line->description == '(EXCESS RECEIVED)') $txt=$langs->trans("ExcessReceived");
-		elseif ($line->description == '(EXCESS PAID)') $txt=$langs->trans("ExcessPaid");
+		if ($line->description == '(DEPOSIT)') {
+		    $txt=$langs->trans("Deposit");
+		} elseif ($line->description == '(EXCESS RECEIVED)') {
+		    $txt=$langs->trans("ExcessReceived");
+		} elseif ($line->description == '(EXCESS PAID)') {
+		    $txt=$langs->trans("ExcessPaid");
+		}
 		//else $txt=$langs->trans("Discount");
 		print $txt;
 		?>
@@ -93,66 +109,77 @@ 
 				$discount=new DiscountAbsolute($this->db);
 				$discount->fetch($line->fk_remise_except);
 				echo ($txt?' - ':'').$langs->transnoentities("DiscountFromCreditNote",$discount->getNomUrl(0));
-			}
-			elseif ($line->description == '(DEPOSIT)' && $line->fk_remise_except > 0)
+			} elseif ($line->description == '(DEPOSIT)' && $line->fk_remise_except > 0)
 			{
 				$discount=new DiscountAbsolute($this->db);
 				$discount->fetch($line->fk_remise_except);
 				echo ($txt?' - ':'').$langs->transnoentities("DiscountFromDeposit",$discount->getNomUrl(0));
 				// Add date of deposit
-				if (! empty($conf->global->INVOICE_ADD_DEPOSIT_DATE))
-				    echo ' ('.dol_print_date($discount->datec).')';
-			}
-			elseif ($line->description == '(EXCESS RECEIVED)' && $objp->fk_remise_except > 0)
+				if (! empty($conf->global->INVOICE_ADD_DEPOSIT_DATE)) {
+								    echo ' ('.dol_print_date($discount->datec).')';
+				}
+			} elseif ($line->description == '(EXCESS RECEIVED)' && $objp->fk_remise_except > 0)
 			{
 				$discount=new DiscountAbsolute($this->db);
 				$discount->fetch($line->fk_remise_except);
 				echo ($txt?' - ':'').$langs->transnoentities("DiscountFromExcessReceived",$discount->getNomUrl(0));
-			}
-			elseif ($line->description == '(EXCESS PAID)' && $objp->fk_remise_except > 0)
+			} elseif ($line->description == '(EXCESS PAID)' && $objp->fk_remise_except > 0)
 			{
 				$discount=new DiscountAbsolute($this->db);
 				$discount->fetch($line->fk_remise_except);
 				echo ($txt?' - ':'').$langs->transnoentities("DiscountFromExcessPaid",$discount->getNomUrl(0));
-			}
-			else
+			} else
 			{
 				echo ($txt?' - ':'').dol_htmlentitiesbr($line->description);
 			}
 		}
-	}
-	else
+	} else
 	{
 		$format = $conf->global->MAIN_USE_HOURMIN_IN_DATE_RANGE?'dayhour':'day';
 
 	    if ($line->fk_product > 0)
 		{
 			echo $form->textwithtooltip($text,$description,3,'','',$i,0,(!empty($line->fk_parent_line)?img_picto('', 'rightarrow'):''));
-		}
-		else
+		} else
 		{
-			if ($type==1) $text = img_object($langs->trans('Service'),'service');
-			else $text = img_object($langs->trans('Product'),'product');
+			if ($type==1) {
+			    $text = img_object($langs->trans('Service'),'service');
+			} else {
+			    $text = img_object($langs->trans('Product'),'product');
+			}
 
 			if (! empty($line->label)) {
 				$text.= ' <strong>'.$line->label.'</strong>';
 				echo $form->textwithtooltip($text,dol_htmlentitiesbr($line->description),3,'','',$i,0,(!empty($line->fk_parent_line)?img_picto('', 'rightarrow'):''));
 			} else {
-				if (! empty($line->fk_parent_line)) echo img_picto('', 'rightarrow');
+				if (! empty($line->fk_parent_line)) {
+				    echo img_picto('', 'rightarrow');
+				}
 				echo $text.' '.dol_htmlentitiesbr($line->description);
 			}
 		}
 
 		// Show date range
 		if ($line->element == 'facturedetrec') {
-			if ($line->date_start_fill || $line->date_end_fill) echo '<br><div class="clearboth nowraponall">';
-			if ($line->date_start_fill) echo $langs->trans('AutoFillDateFromShort').': '.yn($line->date_start_fill);
-			if ($line->date_start_fill && $line->date_end_fill) echo ' - ';
-			if ($line->date_end_fill) echo $langs->trans('AutoFillDateToShort').': '.yn($line->date_end_fill);
-			if ($line->date_start_fill || $line->date_end_fill) echo '</div>';
-		}
-		else {
-			if ($line->date_start || $line->date_end) echo '<br><div class="clearboth nowraponall">'.get_date_range($line->date_start, $line->date_end, $format).'</div>';
+			if ($line->date_start_fill || $line->date_end_fill) {
+			    echo '<br><div class="clearboth nowraponall">';
+			}
+			if ($line->date_start_fill) {
+			    echo $langs->trans('AutoFillDateFromShort').': '.yn($line->date_start_fill);
+			}
+			if ($line->date_start_fill && $line->date_end_fill) {
+			    echo ' - ';
+			}
+			if ($line->date_end_fill) {
+			    echo $langs->trans('AutoFillDateToShort').': '.yn($line->date_end_fill);
+			}
+			if ($line->date_start_fill || $line->date_end_fill) {
+			    echo '</div>';
+			}
+		} else {
+			if ($line->date_start || $line->date_end) {
+			    echo '<br><div class="clearboth nowraponall">'.get_date_range($line->date_start, $line->date_end, $format).'</div>';
+			}
 			//echo get_date_range($line->date_start, $line->date_end, $format);
 		}
 
@@ -173,11 +200,13 @@ 
 	?>
 	</td>
 	<?php
-	if ($object->element == 'supplier_proposal' || $object->element == 'order_supplier' || $object->element == 'invoice_supplier')	// We must have same test in printObjectLines
+	if ($object->element == 'supplier_proposal' || $object->element == 'order_supplier' || $object->element == 'invoice_supplier') {
+	    // We must have same test in printObjectLines
 	{
 	?>
 		<td class="linecolrefsupplier"><?php
 		echo ($line->ref_fourn?$line->ref_fourn:$line->ref_supplier);
+	}
 		?></td>
 	<?php
 	}
@@ -185,10 +214,18 @@ 
 	?>
 	<td align="right" class="linecolvat nowrap"><?php $coldisplay++; ?><?php
 	$positiverates='';
-	if (price2num($line->tva_tx))          $positiverates.=($positiverates?'/':'').price2num($line->tva_tx);
-	if (price2num($line->total_localtax1)) $positiverates.=($positiverates?'/':'').price2num($line->localtax1_tx);
-	if (price2num($line->total_localtax2)) $positiverates.=($positiverates?'/':'').price2num($line->localtax2_tx);
-	if (empty($positiverates)) $positiverates='0';
+	if (price2num($line->tva_tx)) {
+	    $positiverates.=($positiverates?'/':'').price2num($line->tva_tx);
+	}
+	if (price2num($line->total_localtax1)) {
+	    $positiverates.=($positiverates?'/':'').price2num($line->localtax1_tx);
+	}
+	if (price2num($line->total_localtax2)) {
+	    $positiverates.=($positiverates?'/':'').price2num($line->localtax2_tx);
+	}
+	if (empty($positiverates)) {
+	    $positiverates='0';
+	}
 	echo vatrate($positiverates.($line->vat_src_code?' ('.$line->vat_src_code.')':''), '%', $line->info_bits);
 	//echo vatrate($line->tva_tx.($line->vat_src_code?(' ('.$line->vat_src_code.')'):''), '%', $line->info_bits);
 	?></td>
@@ -210,7 +247,10 @@ 
 			// must also not be output for most entities (proposal, intervention, ...)
 			//if($line->qty > $line->stock) print img_picto($langs->trans("StockTooLow"),"warning", 'style="vertical-align: bottom;"')." ";
 			echo $line->qty;
-		} else echo '&nbsp;';	?>
+		} else {
+		    echo '&nbsp;';
+		}
+		?>
 	</td>
 
 	<?php

dolibarr/htdocs/core/tpl/originproductline.tpl.php

Braces +4 added lines, -2 removed lines

@@ -32,12 +32,14 @@
 print '<td>'.$this->tpl['description'].'</td>';
 print '<td align="right">'.$this->tpl['vat_rate'].'</td>';
 print '<td align="right">'.$this->tpl['price'].'</td>';
-if (!empty($conf->multicurrency->enabled))
+if (!empty($conf->multicurrency->enabled)) {
 	print '<td align="right">'.$this->tpl['multicurrency_price'].'</td>';
+}
 
 print '<td align="right">'.$this->tpl['qty'].'</td>';
-if($conf->global->PRODUCT_USE_UNITS)
+if($conf->global->PRODUCT_USE_UNITS) {
 	print '<td align="left">'.$langs->trans($this->tpl['unit']).'</td>';
+}
 
 print '<td align="right">'.$this->tpl['remise_percent'].'</td>';
 print '</tr>'."\n";

dolibarr/htdocs/core/tpl/extrafields_list_search_input.tpl.php

Braces +17 added lines, -9 removed lines

@@ -7,10 +7,13 @@ 
 	exit;
 }
 
-if (empty($extrafieldsobjectkey) && is_object($object)) $extrafieldsobjectkey=$object->table_element;
+if (empty($extrafieldsobjectkey) && is_object($object)) {
+    $extrafieldsobjectkey=$object->table_element;
+}
 
 // Loop to show all columns of extrafields for the search title line
-if (! empty($extrafieldsobjectkey))	// $extrafieldsobject is the $object->table_element like 'societe', 'socpeople', ...
+if (! empty($extrafieldsobjectkey)) {
+    // $extrafieldsobject is the $object->table_element like 'societe', 'socpeople', ...
 {
 	if (is_array($extrafields->attributes[$extrafieldsobjectkey]['label']) && count($extrafields->attributes[$extrafieldsobjectkey]['label']))
 	{
@@ -18,6 +21,7 @@ 
 		{
 			if (! empty($arrayfields["ef.".$key]['checked'])) {
 				$align=$extrafields->getAlignFlag($key);
+}
 				$typeofextrafield=$extrafields->attributes[$extrafieldsobjectkey]['type'][$key];
 				print '<td class="liste_titre'.($align?' '.$align:'').'">';
 				if (in_array($typeofextrafield, array('varchar', 'int', 'double', 'select')) && empty($extrafields->attributes[$extrafieldsobjectkey]['computed'][$key]))
@@ -25,18 +29,22 @@ 
 					$crit=$val;
 					$tmpkey=preg_replace('/search_options_/','',$key);
 					$searchclass='';
-					if (in_array($typeofextrafield, array('varchar', 'select'))) $searchclass='searchstring';
-					if (in_array($typeofextrafield, array('int', 'double'))) $searchclass='searchnum';
+					if (in_array($typeofextrafield, array('varchar', 'select'))) {
+					    $searchclass='searchstring';
+					}
+					if (in_array($typeofextrafield, array('int', 'double'))) {
+					    $searchclass='searchnum';
+					}
 					print '<input class="flat'.($searchclass?' '.$searchclass:'').'" size="4" type="text" name="search_options_'.$tmpkey.'" value="'.dol_escape_htmltag($search_array_options['search_options_'.$tmpkey]).'">';
-				}
-				elseif (! in_array($typeofextrafield, array('datetime','timestamp')))
+				} elseif (! in_array($typeofextrafield, array('datetime','timestamp')))
 				{
 					// for the type as 'checkbox', 'chkbxlst', 'sellist' we should use code instead of id (example: I declare a 'chkbxlst' to have a link with dictionnairy, I have to extend it with the 'code' instead 'rowid')
 					$morecss='';
-					if ($typeofextrafield == 'sellist') $morecss='maxwidth200';
+					if ($typeofextrafield == 'sellist') {
+					    $morecss='maxwidth200';
+					}
 					echo $extrafields->showInputField($key, $search_array_options['search_options_'.$key], '', '', 'search_', $morecss);
-				}
-				elseif (in_array($typeofextrafield, array('datetime','timestamp')))
+				} elseif (in_array($typeofextrafield, array('datetime','timestamp')))
 				{
 					// TODO
 					// Use showInputField in a particular manner to have input with a comparison operator, not input for a specific value date-hour-minutes

dolibarr/htdocs/core/tpl/admin_extrafields_view.tpl.php

Braces +1 added lines, -2 removed lines

@@ -100,8 +100,7 @@
 		print "&nbsp; <a href=\"".$_SERVER["PHP_SELF"]."?action=delete&attrname=$key\">".img_delete()."</a></td>\n";
 		print "</tr>";
 	}
-}
-else
+} else
 {
 	$colspan=9;
 

dolibarr/htdocs/core/commonfieldsinexport.inc.php

Braces +1 added lines, -2 removed lines

@@ -52,8 +52,7 @@
 			$this->export_entities_array[$r][$fieldname] = $keyforelement;
 		}
 	}
-}
-else
+} else
 {
 	dol_print_error($this->db, 'Failed to find class '.$keyforclass.', even after the include of '.$keyforclassfile);
 }

dolibarr/htdocs/core/triggers/interface_20_all_Logevents.class.php

Braces +22 added lines, -18 removed lines

@@ -59,13 +59,22 @@ 
 	 */
 	public function runTrigger($action, $object, User $user, Translate $langs, Conf $conf)
     {
-    	if (! empty($conf->global->MAIN_LOGEVENTS_DISABLE_ALL)) return 0;	// Log events is disabled (hidden features)
+    	if (! empty($conf->global->MAIN_LOGEVENTS_DISABLE_ALL)) {
+    	    return 0;
+    	}
+    	// Log events is disabled (hidden features)
 
     	$key='MAIN_LOGEVENTS_'.$action;
     	//dol_syslog("xxxxxxxxxxx".$key);
-    	if (empty($conf->global->$key)) return 0;				// Log events not enabled for this action
+    	if (empty($conf->global->$key)) {
+    	    return 0;
+    	}
+    	// Log events not enabled for this action
 
-    	if (empty($conf->entity)) $conf->entity = $entity;  // forcing of the entity if it's not defined (ex: in login form)
+    	if (empty($conf->entity)) {
+    	    $conf->entity = $entity;
+    	}
+    	// forcing of the entity if it's not defined (ex: in login form)
 
         $date = dol_now();
 
@@ -106,8 +115,7 @@ 
             // Initialisation donnees (date,duree,texte,desc)
             $text=$langs->transnoentities("NewUserCreated",$object->login);
             $desc=$langs->transnoentities("NewUserCreated",$object->login);
-		}
-        elseif ($action == 'USER_MODIFY')
+		} elseif ($action == 'USER_MODIFY')
         {
             dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
             $langs->load("users");
@@ -115,8 +123,7 @@ 
             // Initialisation donnees (date,duree,texte,desc)
             $text=$langs->transnoentities("EventUserModified",$object->login);
             $desc=$langs->transnoentities("EventUserModified",$object->login);
-        }
-        elseif ($action == 'USER_NEW_PASSWORD')
+        } elseif ($action == 'USER_NEW_PASSWORD')
         {
             dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
             $langs->load("users");
@@ -124,8 +131,7 @@ 
             // Initialisation donnees (date,duree,texte,desc)
             $text=$langs->transnoentities("NewUserPassword",$object->login);
             $desc=$langs->transnoentities("NewUserPassword",$object->login);
-        }
-        elseif ($action == 'USER_ENABLEDISABLE')
+        } elseif ($action == 'USER_ENABLEDISABLE')
         {
             dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
             $langs->load("users");
@@ -140,8 +146,7 @@ 
 				$text=$langs->transnoentities("UserDisabled",$object->login);
 				$desc=$langs->transnoentities("UserDisabled",$object->login);
 			}
-        }
-        elseif ($action == 'USER_DELETE')
+        } elseif ($action == 'USER_DELETE')
         {
             dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
             $langs->load("users");
@@ -158,16 +163,14 @@ 
             // Initialisation donnees (date,duree,texte,desc)
             $text=$langs->transnoentities("NewGroupCreated",$object->name);
             $desc=$langs->transnoentities("NewGroupCreated",$object->name);
-		}
-        elseif ($action == 'GROUP_MODIFY')
+		} elseif ($action == 'GROUP_MODIFY')
         {
             dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
             $langs->load("users");
             // Initialisation donnees (date,duree,texte,desc)
             $text=$langs->transnoentities("GroupModified",$object->name);
             $desc=$langs->transnoentities("GroupModified",$object->name);
-		}
-        elseif ($action == 'GROUP_DELETE')
+		} elseif ($action == 'GROUP_DELETE')
         {
             dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
             $langs->load("users");
@@ -186,7 +189,9 @@ 
 */
 
 		// Add more information into desc from the context property
-		if (! empty($desc) && ! empty($object->context['audit'])) $desc.=' - '.$object->context['audit'];
+		if (! empty($desc) && ! empty($object->context['audit'])) {
+		    $desc.=' - '.$object->context['audit'];
+		}
 
         // Add entry in event table
 		include_once DOL_DOCUMENT_ROOT.'/core/class/events.class.php';
@@ -202,8 +207,7 @@ 
         if ($result > 0)
         {
             return 1;
-        }
-        else
+        } else
         {
             $error ="Failed to insert security event: ".$event->error;
             $this->error=$error;

dolibarr/htdocs/core/triggers/interface_80_modStripe_Stripe.class.php

Braces +34 added lines, -15 removed lines

@@ -124,7 +124,9 @@ 
 		require_once DOL_DOCUMENT_ROOT.'/stripe/class/stripe.class.php';
 		$stripe = new Stripe($db);
 
-		if (empty($conf->stripe->enabled)) return 0;
+		if (empty($conf->stripe->enabled)) {
+		    return 0;
+		}
 
 		$ok = 1;
 
@@ -155,25 +157,40 @@ 
 						$taxinfo["tax_id"] = $vatcleaned;
 					}
 					// We force data to "null" if not defined as expected by Stripe
-					if (empty($vatcleaned)) $taxinfo=null;
+					if (empty($vatcleaned)) {
+					    $taxinfo=null;
+					}
 
 					// Detect if we change a Stripe info (email, description, vat id)
 					$changerequested = 0;
-					if (! empty($object->email) && $object->email != $customer->email) $changerequested++;
-					if ($namecleaned != $customer->description) $changerequested++;
-					if (! isset($customer->tax_info['tax_id']) && ! is_null($vatcleaned)) $changerequested++;
-					elseif (isset($customer->tax_info['tax_id']) && is_null($vatcleaned)) $changerequested++;
-					elseif (isset($customer->tax_info['tax_id']) && ! is_null($vatcleaned))
+					if (! empty($object->email) && $object->email != $customer->email) {
+					    $changerequested++;
+					}
+					if ($namecleaned != $customer->description) {
+					    $changerequested++;
+					}
+					if (! isset($customer->tax_info['tax_id']) && ! is_null($vatcleaned)) {
+					    $changerequested++;
+					} elseif (isset($customer->tax_info['tax_id']) && is_null($vatcleaned)) {
+					    $changerequested++;
+					} elseif (isset($customer->tax_info['tax_id']) && ! is_null($vatcleaned))
 					{
-						if ($vatcleaned != $customer->tax_info['tax_id']) $changerequested++;
+						if ($vatcleaned != $customer->tax_info['tax_id']) {
+						    $changerequested++;
+						}
 					}
 
 					if ($changerequested)
 					{
-						if (! empty($object->email)) $customer->email = $object->email;
+						if (! empty($object->email)) {
+						    $customer->email = $object->email;
+						}
 						$customer->description = $namecleaned;
-						if (empty($taxinfo)) $customer->tax_info = array('type'=>'vat', 'tax_id'=>null);
-						else $customer->tax_info = $taxinfo;
+						if (empty($taxinfo)) {
+						    $customer->tax_info = array('type'=>'vat', 'tax_id'=>null);
+						} else {
+						    $customer->tax_info = $taxinfo;
+						}
 
 						$customer->save();
 					}
@@ -225,8 +242,7 @@ 
 							$card->metadata=array('dol_id'=>$object->id, 'dol_version'=>DOL_VERSION, 'dol_entity'=>$conf->entity, 'ipaddress'=>(empty($_SERVER['REMOTE_ADDR'])?'':$_SERVER['REMOTE_ADDR']));
 							try {
 								$card->save($dataforcard);
-							}
-							catch(Exception $e)
+							} catch(Exception $e)
 							{
 								$ok = -1;
 								$this->error = $e->getMessages();
@@ -257,8 +273,11 @@ 
 					{
 						$card = $stripe->cardStripe($customer, $object, $stripeacc, $servicestatus);
 						if ($card) {
-							if (method_exists($card, 'detach')) $card->detach();
-							else $card->delete();
+							if (method_exists($card, 'detach')) {
+							    $card->detach();
+							} else {
+							    $card->delete();
+							}
 						}
 					}
 				}