Dolibarr / dolibarr

htdocs/variants/class/ProductAttribute.class.php

Braces +2 added lines, -1 removed lines

@@ -120,8 +120,9 @@
 
 				$return[] = $tmp;
 			}
+		} else {
+			dol_print_error($this->db);
 		}
-		else dol_print_error($this->db);
 
 		return $return;
 	}

htdocs/compta/prelevement/create.php

Braces +30 added lines, -10 removed lines

@@ -40,7 +40,9 @@ 
 $langs->loadLangs(array('banks', 'categories', 'withdrawals', 'companies', 'bills'));
 
 // Security check
-if ($user->socid) $socid = $user->socid;
+if ($user->socid) {
+	$socid = $user->socid;
+}
 $result = restrictedArea($user, 'prelevement', '', '', 'bons');
 
 $type = GETPOST('type', 'aZ09');
@@ -63,7 +65,9 @@ 
 
 $parameters = array('mode' => $mode, 'format' => $format, 'limit' => $limit, 'page' => $page, 'offset' => $offset);
 $reshook = $hookmanager->executeHooks('doActions', $parameters, $object, $action); // Note that $action and $object may have been modified by some hooks
-if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
+if ($reshook < 0) {
+	setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
+}
 
 if (empty($reshook))
 {
@@ -180,7 +184,9 @@ 
 print '</table>';
 print '</div>';
 
-if ($mesg) print $mesg;
+if ($mesg) {
+	print $mesg;
+}
 
 print '<div class="tabsAction">'."\n";
 
@@ -279,16 +285,20 @@ 
 } else {
 	$sql .= " AND pfd.fk_facture = f.rowid";
 }
-if ($socid > 0) $sql .= " AND f.fk_soc = ".$socid;
+if ($socid > 0) {
+	$sql .= " AND f.fk_soc = ".$socid;
+}
 
 $nbtotalofrecords = '';
 if (empty($conf->global->MAIN_DISABLE_FULL_SCANLIST))
 {
 	$result = $db->query($sql);
 	$nbtotalofrecords = $db->num_rows($result);
-	if (($page * $limit) > $nbtotalofrecords)	// if total resultset is smaller then paging size (filtering), goto and load page 0
+	if (($page * $limit) > $nbtotalofrecords) {
+		// if total resultset is smaller then paging size (filtering), goto and load page 0
 	{
 		$page = 0;
+	}
 		$offset = 0;
 	}
 }
@@ -302,9 +312,15 @@ 
 	$i = 0;
 
 	$param = '';
-	if ($limit > 0 && $limit != $conf->liste_limit) $param .= '&limit='.urlencode($limit);
-	if ($socid) $param .= '&socid='.urlencode($socid);
-	if ($option) $param .= "&option=".urlencode($option);
+	if ($limit > 0 && $limit != $conf->liste_limit) {
+		$param .= '&limit='.urlencode($limit);
+	}
+	if ($socid) {
+		$param .= '&socid='.urlencode($socid);
+	}
+	if ($option) {
+		$param .= "&option=".urlencode($option);
+	}
 
 	print '<form method="POST" id="searchFormList" action="'.$_SERVER["PHP_SELF"].'">';
 	print '<input type="hidden" name="token" value="'.newToken().'">';
@@ -363,7 +379,9 @@ 
 			// RIB
 			print '<td>';
 			print $bac->iban.(($bac->iban && $bac->bic) ? ' / ' : '').$bac->bic;
-			if ($bac->verif() <= 0) print img_warning('Error on default bank number for IBAN : '.$bac->error_message);
+			if ($bac->verif() <= 0) {
+				print img_warning('Error on default bank number for IBAN : '.$bac->error_message);
+			}
 			print '</td>';
 
 			// RUM
@@ -373,7 +391,9 @@ 
 				print $rumtoshow;
 				$format = $thirdpartystatic->display_rib('format');
 				if ($type != 'bank-transfer') {
-					if ($format) print ' ('.$format.')';
+					if ($format) {
+						print ' ('.$format.')';
+					}
 				}
 			} else {
 				print img_warning($langs->trans("NoBankAccount"));

htdocs/compta/prelevement/factures.php

Braces +36 added lines, -13 removed lines

@@ -35,7 +35,9 @@ 
 $langs->loadLangs(array('banks', 'categories', 'bills', 'companies', 'withdrawals'));
 
 // Securite acces client
-if ($user->socid > 0) accessforbidden();
+if ($user->socid > 0) {
+	accessforbidden();
+}
 
 // Get supervariables
 $id = GETPOST('id', 'int');
@@ -52,8 +54,12 @@ 
 $offset = $limit * $page;
 $pageprev = $page - 1;
 $pagenext = $page + 1;
-if (!$sortfield) $sortfield = 'p.ref';
-if (!$sortorder) $sortorder = 'DESC';
+if (!$sortfield) {
+	$sortfield = 'p.ref';
+}
+if (!$sortorder) {
+	$sortorder = 'DESC';
+}
 
 $object = new BonPrelevement($db);
 
@@ -129,22 +135,29 @@ 
 
 		print '<tr><td class="titlefield">';
 		$labelofbankfield = "BankToReceiveWithdraw";
-		if ($object->type == 'bank-transfer') $labelofbankfield = 'BankToPayCreditTransfer';
+		if ($object->type == 'bank-transfer') {
+			$labelofbankfield = 'BankToPayCreditTransfer';
+		}
 		print $langs->trans($labelofbankfield);
 		print '</td>';
 		print '<td>';
-		if ($acc->id > 0)
-			print $acc->getNomUrl(1);
+		if ($acc->id > 0) {
+					print $acc->getNomUrl(1);
+		}
 		print '</td>';
 		print '</tr>';
 
 		print '<tr><td class="titlefield">';
 		$labelfororderfield = 'WithdrawalFile';
-		if ($object->type == 'bank-transfer') $labelfororderfield = 'CreditTransferFile';
+		if ($object->type == 'bank-transfer') {
+			$labelfororderfield = 'CreditTransferFile';
+		}
 		print $langs->trans($labelfororderfield).'</td><td>';
 		$relativepath = 'receipts/'.$object->ref.'.xml';
 		$modulepart = 'prelevement';
-		if ($object->type == 'bank-transfer') $modulepart = 'paymentbybanktransfer';
+		if ($object->type == 'bank-transfer') {
+			$modulepart = 'paymentbybanktransfer';
+		}
 		print '<a data-ajax="false" href="'.DOL_URL_ROOT.'/document.php?type=text/plain&amp;modulepart='.$modulepart.'&amp;file='.urlencode($relativepath).'">'.$relativepath.'</a>';
 		print '</td></tr></table>';
 
@@ -183,8 +196,12 @@ 
 } else {
 	$sql .= " AND f.entity IN (".getEntity('supplier_invoice').")";
 }
-if ($object->id > 0) $sql .= " AND p.rowid=".$object->id;
-if ($socid) $sql .= " AND s.rowid = ".$socid;
+if ($object->id > 0) {
+	$sql .= " AND p.rowid=".$object->id;
+}
+if ($socid) {
+	$sql .= " AND s.rowid = ".$socid;
+}
 $sql .= $db->order($sortfield, $sortorder);
 
 // Count total nb of records
@@ -193,9 +210,11 @@ 
 {
 	$resql = $db->query($sql);
 	$nbtotalofrecords = $db->num_rows($resql);
-	if (($page * $limit) > $nbtotalofrecords)	// if total resultset is smaller then paging size (filtering), goto and load page 0
+	if (($page * $limit) > $nbtotalofrecords) {
+		// if total resultset is smaller then paging size (filtering), goto and load page 0
 	{
 		$page = 0;
+	}
 		$offset = 0;
 	}
 }
@@ -212,7 +231,9 @@ 
 
 	// Lines of title fields
 	print '<form method="POST" id="searchFormList" action="'.$_SERVER["PHP_SELF"].'">';
-	if ($optioncss != '') print '<input type="hidden" name="optioncss" value="'.$optioncss.'">';
+	if ($optioncss != '') {
+		print '<input type="hidden" name="optioncss" value="'.$optioncss.'">';
+	}
 	print '<input type="hidden" name="token" value="'.newToken().'">';
 	print '<input type="hidden" name="formfilteraction" id="formfilteraction" value="list">';
 	print '<input type="hidden" name="action" value="list">';
@@ -307,7 +328,9 @@ 
 	  	print '<td>&nbsp;</td>';
 	  	print '<td class="right">';
 		//if ($totalinvoices != $object->amount) print img_warning("AmountOfFileDiffersFromSumOfInvoices");		// It is normal to have total that differs. For an amount of invoice of 100, request to pay may be 50 only.
-	  	if ($totalamount_requested != $object->amount) print img_warning("AmountOfFileDiffersFromSumOfInvoices");
+	  	if ($totalamount_requested != $object->amount) {
+	  		print img_warning("AmountOfFileDiffersFromSumOfInvoices");
+	  	}
 		print "</td>\n";
 	  	print '<td class="right">';
 		print price($totalamount_requested);

htdocs/recruitment/core/modules/recruitment/doc/pdf_standard_recruitmentjobposition.modules.php

Braces +92 added lines, -34 removed lines

@@ -174,7 +174,10 @@ 
 
 		// Get source company
 		$this->emetteur = $mysoc;
-		if (empty($this->emetteur->country_code)) $this->emetteur->country_code = substr($langs->defaultlang, -2); // By default, if was not defined
+		if (empty($this->emetteur->country_code)) {
+			$this->emetteur->country_code = substr($langs->defaultlang, -2);
+		}
+		// By default, if was not defined
 
 		// Define position of columns
 		$this->posxdesc = $this->marge_gauche + 1; // used for notes ans other stuff
@@ -212,9 +215,13 @@ 
 
 		dol_syslog("write_file outputlangs->defaultlang=".(is_object($outputlangs) ? $outputlangs->defaultlang : 'null'));
 
-		if (!is_object($outputlangs)) $outputlangs = $langs;
+		if (!is_object($outputlangs)) {
+			$outputlangs = $langs;
+		}
 		// For backward compatibility with FPDF, force output charset to ISO, because FPDF expect text to be encoded in ISO
-		if (!empty($conf->global->MAIN_USE_FPDF)) $outputlangs->charset_output = 'ISO-8859-1';
+		if (!empty($conf->global->MAIN_USE_FPDF)) {
+			$outputlangs->charset_output = 'ISO-8859-1';
+		}
 
 		// Load translation files required by the page
 		$outputlangs->loadLangs(array("main", "bills", "products", "dict", "companies"));
@@ -362,7 +369,9 @@ 
 				$pdf->SetCreator("Dolibarr ".DOL_VERSION);
 				$pdf->SetAuthor($outputlangs->convToOutputCharset($user->getFullName($outputlangs)));
 				$pdf->SetKeyWords($outputlangs->convToOutputCharset($object->ref)." ".$object->label." ".$outputlangs->convToOutputCharset($object->thirdparty->name));
-				if (!empty($conf->global->MAIN_DISABLE_PDF_COMPRESSION)) $pdf->SetCompression(false);
+				if (!empty($conf->global->MAIN_DISABLE_PDF_COMPRESSION)) {
+					$pdf->SetCompression(false);
+				}
 
 				// Set certificate
 				$cert = empty($user->conf->CERTIFICATE_CRT) ? '' : $user->conf->CERTIFICATE_CRT;
@@ -385,7 +394,9 @@ 
 
 				// New page
 				$pdf->AddPage();
-				if (!empty($tplidx)) $pdf->useTemplate($tplidx);
+				if (!empty($tplidx)) {
+					$pdf->useTemplate($tplidx);
+				}
 				$pagenb++;
 
 				$top_shift = $this->_pagehead($pdf, $object, 1, $outputlangs, $outputlangsbis);
@@ -397,7 +408,9 @@ 
 				$tab_top_newpage = (empty($conf->global->MAIN_PDF_DONOTREPEAT_HEAD) ? 42 + $top_shift : 10);
 				$tab_height = 130 - $top_shift;
 				$tab_height_newpage = 150;
-				if (empty($conf->global->MAIN_PDF_DONOTREPEAT_HEAD)) $tab_height_newpage -= $top_shift;
+				if (empty($conf->global->MAIN_PDF_DONOTREPEAT_HEAD)) {
+					$tab_height_newpage -= $top_shift;
+				}
 
 				$nexY = $tab_top - 1;
 
@@ -439,8 +452,12 @@ 
 						while ($pagenb < $pageposafternote) {
 							$pdf->AddPage();
 							$pagenb++;
-							if (!empty($tplidx)) $pdf->useTemplate($tplidx);
-							if (empty($conf->global->MAIN_PDF_DONOTREPEAT_HEAD)) $this->_pagehead($pdf, $object, 0, $outputlangs);
+							if (!empty($tplidx)) {
+								$pdf->useTemplate($tplidx);
+							}
+							if (empty($conf->global->MAIN_PDF_DONOTREPEAT_HEAD)) {
+								$this->_pagehead($pdf, $object, 0, $outputlangs);
+							}
 							// $this->_pagefoot($pdf,$object,$outputlangs,1);
 							$pdf->setTopMargin($tab_top_newpage);
 							// The only function to edit the bottom margin of current page to set it.
@@ -456,9 +473,11 @@ 
 
 						$posyafter = $pdf->GetY();
 
-						if ($posyafter > ($this->page_hauteur - ($heightforfooter + $heightforfreetext + 20)))	// There is no space left for total+free text
+						if ($posyafter > ($this->page_hauteur - ($heightforfooter + $heightforfreetext + 20))) {
+							// There is no space left for total+free text
 						{
 							$pdf->AddPage('', '', true);
+						}
 							$pagenb++;
 							$pageposafternote++;
 							$pdf->setPage($pageposafternote);
@@ -494,8 +513,12 @@ 
 
 						// apply note frame to last page
 						$pdf->setPage($pageposafternote);
-						if (!empty($tplidx)) $pdf->useTemplate($tplidx);
-						if (empty($conf->global->MAIN_PDF_DONOTREPEAT_HEAD)) $this->_pagehead($pdf, $object, 0, $outputlangs);
+						if (!empty($tplidx)) {
+							$pdf->useTemplate($tplidx);
+						}
+						if (empty($conf->global->MAIN_PDF_DONOTREPEAT_HEAD)) {
+							$this->_pagehead($pdf, $object, 0, $outputlangs);
+						}
 						$height_note = $posyafter - $tab_top_newpage;
 						$pdf->Rect($this->marge_gauche, $tab_top_newpage - 1, $tab_width, $height_note + 1);
 					} else // No pagebreak
@@ -512,8 +535,12 @@ 
 							$pagenb++;
 							$pageposafternote++;
 							$pdf->setPage($pageposafternote);
-							if (!empty($tplidx)) $pdf->useTemplate($tplidx);
-							if (empty($conf->global->MAIN_PDF_DONOTREPEAT_HEAD)) $this->_pagehead($pdf, $object, 0, $outputlangs);
+							if (!empty($tplidx)) {
+								$pdf->useTemplate($tplidx);
+							}
+							if (empty($conf->global->MAIN_PDF_DONOTREPEAT_HEAD)) {
+								$this->_pagehead($pdf, $object, 0, $outputlangs);
+							}
 
 							$posyafter = $tab_top_newpage;
 						}
@@ -546,7 +573,9 @@ 
 
 					// Define size of image if we need it
 					$imglinesize = array();
-					if (!empty($realpatharray[$i])) $imglinesize = pdf_getSizeForImage($realpatharray[$i]);
+					if (!empty($realpatharray[$i])) {
+						$imglinesize = pdf_getSizeForImage($realpatharray[$i]);
+					}
 
 					$pdf->setTopMargin($tab_top_newpage);
 					$pdf->setPageOrientation('', 1, $heightforfooter + $heightforfreetext + $heightforinfotot); // The only function to edit the bottom margin of current page to set it.
@@ -558,18 +587,24 @@ 
 					if ($this->getColumnStatus('photo'))
 					{
 						// We start with Photo of product line
-						if (isset($imglinesize['width']) && isset($imglinesize['height']) && ($curY + $imglinesize['height']) > ($this->page_hauteur - ($heightforfooter + $heightforfreetext + $heightforinfotot)))	// If photo too high, we moved completely on new page
+						if (isset($imglinesize['width']) && isset($imglinesize['height']) && ($curY + $imglinesize['height']) > ($this->page_hauteur - ($heightforfooter + $heightforfreetext + $heightforinfotot))) {
+							// If photo too high, we moved completely on new page
 						{
 							$pdf->AddPage('', '', true);
-							if (!empty($tplidx)) $pdf->useTemplate($tplidx);
+						}
+							if (!empty($tplidx)) {
+								$pdf->useTemplate($tplidx);
+							}
 							$pdf->setPage($pageposbefore + 1);
 
 							$curY = $tab_top_newpage;
 
 							// Allows data in the first page if description is long enough to break in multiples pages
-							if (!empty($conf->global->MAIN_PDF_DATA_ON_FIRST_PAGE))
-								$showpricebeforepagebreak = 1;
-							else $showpricebeforepagebreak = 0;
+							if (!empty($conf->global->MAIN_PDF_DATA_ON_FIRST_PAGE)) {
+															$showpricebeforepagebreak = 1;
+							} else {
+								$showpricebeforepagebreak = 0;
+							}
 						}
 
 						if (!empty($this->cols['photo']) && isset($imglinesize['width']) && isset($imglinesize['height']))
@@ -588,9 +623,11 @@ 
 						$this->printColDescContent($pdf, $curY, 'desc', $object, $i, $outputlangs, $hideref, $hidedesc);
 						$pageposafter = $pdf->getPage();
 
-						if ($pageposafter > $pageposbefore)	// There is a pagebreak
+						if ($pageposafter > $pageposbefore) {
+							// There is a pagebreak
 						{
 							$pdf->rollbackTransaction(true);
+						}
 							$pdf->setPageOrientation('', 1, $heightforfooter); // The only function to edit the bottom margin of current page to set it.
 
 							$this->printColDescContent($pdf, $curY, 'desc', $object, $i, $outputlangs, $hideref, $hidedesc);
@@ -598,20 +635,26 @@ 
 							$pageposafter = $pdf->getPage();
 							$posyafter = $pdf->GetY();
 							//var_dump($posyafter); var_dump(($this->page_hauteur - ($heightforfooter+$heightforfreetext+$heightforinfotot))); exit;
-							if ($posyafter > ($this->page_hauteur - ($heightforfooter + $heightforfreetext + $heightforinfotot)))	// There is no space left for total+free text
+							if ($posyafter > ($this->page_hauteur - ($heightforfooter + $heightforfreetext + $heightforinfotot))) {
+								// There is no space left for total+free text
 							{
 								if ($i == ($nblines - 1))	// No more lines, and no space left to show total, so we create a new page
 								{
 									$pdf->AddPage('', '', true);
-									if (!empty($tplidx)) $pdf->useTemplate($tplidx);
+							}
+									if (!empty($tplidx)) {
+										$pdf->useTemplate($tplidx);
+									}
 									$pdf->setPage($pageposafter + 1);
 								}
 							} else {
 								// We found a page break
 								// Allows data in the first page if description is long enough to break in multiples pages
-								if (!empty($conf->global->MAIN_PDF_DATA_ON_FIRST_PAGE))
-									$showpricebeforepagebreak = 1;
-								else $showpricebeforepagebreak = 0;
+								if (!empty($conf->global->MAIN_PDF_DATA_ON_FIRST_PAGE)) {
+																	$showpricebeforepagebreak = 1;
+								} else {
+									$showpricebeforepagebreak = 0;
+								}
 							}
 						} else // No pagebreak
 						{
@@ -659,7 +702,9 @@ 
 						$pagenb++;
 						$pdf->setPage($pagenb);
 						$pdf->setPageOrientation('', 1, 0); // The only function to edit the bottom margin of current page to set it.
-						if (empty($conf->global->MAIN_PDF_DONOTREPEAT_HEAD)) $this->_pagehead($pdf, $object, 0, $outputlangs);
+						if (empty($conf->global->MAIN_PDF_DONOTREPEAT_HEAD)) {
+							$this->_pagehead($pdf, $object, 0, $outputlangs);
+						}
 					}
 
 					if (isset($object->lines[$i + 1]->pagebreak) && $object->lines[$i + 1]->pagebreak) {
@@ -671,9 +716,13 @@ 
 						$this->_pagefoot($pdf, $object, $outputlangs, 1);
 						// New page
 						$pdf->AddPage();
-						if (!empty($tplidx)) $pdf->useTemplate($tplidx);
+						if (!empty($tplidx)) {
+							$pdf->useTemplate($tplidx);
+						}
 						$pagenb++;
-						if (empty($conf->global->MAIN_PDF_DONOTREPEAT_HEAD)) $this->_pagehead($pdf, $object, 0, $outputlangs);
+						if (empty($conf->global->MAIN_PDF_DONOTREPEAT_HEAD)) {
+							$this->_pagehead($pdf, $object, 0, $outputlangs);
+						}
 					}
 				}
 
@@ -703,7 +752,9 @@ 
 
 				// Pagefoot
 				$this->_pagefoot($pdf, $object, $outputlangs);
-				if (method_exists($pdf, 'AliasNbPages')) $pdf->AliasNbPages();
+				if (method_exists($pdf, 'AliasNbPages')) {
+					$pdf->AliasNbPages();
+				}
 
 				$pdf->Close();
 
@@ -720,8 +771,9 @@ 
 					$this->errors = $hookmanager->errors;
 				}
 
-				if (!empty($conf->global->MAIN_UMASK))
-					@chmod($file, octdec($conf->global->MAIN_UMASK));
+				if (!empty($conf->global->MAIN_UMASK)) {
+									@chmod($file, octdec($conf->global->MAIN_UMASK));
+				}
 
 					$this->result = array('fullpath'=>$file);
 
@@ -771,7 +823,9 @@ 
 
 		// Force to disable hidetop and hidebottom
 		$hidebottom = 0;
-		if ($hidetop) $hidetop = -1;
+		if ($hidetop) {
+			$hidetop = -1;
+		}
 
 		$currency = !empty($currency) ? $currency : $conf->currency;
 		$default_font_size = pdf_getPDFFontSize($outputlangs);
@@ -846,7 +900,9 @@ 
 			if ($this->emetteur->logo)
 			{
 				$logodir = $conf->mycompany->dir_output;
-				if (!empty($conf->mycompany->multidir_output[$object->entity])) $logodir = $conf->mycompany->multidir_output[$object->entity];
+				if (!empty($conf->mycompany->multidir_output[$object->entity])) {
+					$logodir = $conf->mycompany->multidir_output[$object->entity];
+				}
 				if (empty($conf->global->MAIN_PDF_USE_LARGE_LOGO))
 				{
 					$logo = $logodir.'/logos/thumbs/'.$this->emetteur->logo_small;
@@ -965,7 +1021,9 @@ 
 			$posy = !empty($conf->global->MAIN_PDF_USE_ISO_LOCATION) ? 40 : 42;
 			$posy += $top_shift;
 			$posx = $this->marge_gauche;
-			if (!empty($conf->global->MAIN_INVERT_SENDER_RECIPIENT)) $posx = $this->page_largeur - $this->marge_droite - 80;
+			if (!empty($conf->global->MAIN_INVERT_SENDER_RECIPIENT)) {
+				$posx = $this->page_largeur - $this->marge_droite - 80;
+			}
 
 			$hautcadre = !empty($conf->global->MAIN_PDF_USE_ISO_LOCATION) ? 38 : 40;
 			$widthrecbox = !empty($conf->global->MAIN_PDF_USE_ISO_LOCATION) ? 92 : 82;

htdocs/zapier/class/hook.class.php

Braces +3 added lines, -1 removed lines

@@ -645,7 +645,9 @@
 		}
 
 		$statusType = 'status5';
-		if ($status == self::STATUS_VALIDATED) $statusType = 'status4';
+		if ($status == self::STATUS_VALIDATED) {
+			$statusType = 'status4';
+		}
 
 		return dolGetStatus($this->labelStatus[$status], $this->labelStatusShort[$status], '', $statusType, $mode);
 	}

htdocs/install/repair.php

Braces +141 added lines, -48 removed lines

@@ -24,7 +24,9 @@ 
  */
 
 include_once 'inc.php';
-if (file_exists($conffile)) include_once $conffile;
+if (file_exists($conffile)) {
+	include_once $conffile;
+}
 require_once $dolibarr_main_document_root.'/core/lib/admin.lib.php';
 include_once $dolibarr_main_document_root.'/core/lib/images.lib.php';
 require_once $dolibarr_main_document_root.'/core/class/extrafields.class.php';
@@ -47,13 +49,21 @@ 
 
 $langs->loadLangs(array("admin", "install", "other"));
 
-if ($dolibarr_main_db_type == "mysqli") $choix = 1;
-if ($dolibarr_main_db_type == "pgsql") $choix = 2;
-if ($dolibarr_main_db_type == "mssql") $choix = 3;
+if ($dolibarr_main_db_type == "mysqli") {
+	$choix = 1;
+}
+if ($dolibarr_main_db_type == "pgsql") {
+	$choix = 2;
+}
+if ($dolibarr_main_db_type == "mssql") {
+	$choix = 3;
+}
 
 
 dolibarr_install_syslog("--- repair: entering upgrade.php page");
-if (!is_object($conf)) dolibarr_install_syslog("repair: conf file not initialized", LOG_ERR);
+if (!is_object($conf)) {
+	dolibarr_install_syslog("repair: conf file not initialized", LOG_ERR);
+}
 
 
 /*
@@ -99,8 +109,10 @@ 
 		$dolibarr_main_db_pass = preg_replace('/crypted:/i', '', $dolibarr_main_db_pass);
 		$dolibarr_main_db_pass = dol_decode($dolibarr_main_db_pass);
 		$dolibarr_main_db_encrypted_pass = $dolibarr_main_db_pass; // We need to set this as it is used to know the password was initially crypted
-	} else $dolibarr_main_db_pass = dol_decode($dolibarr_main_db_encrypted_pass);
-}
+	} else {
+		$dolibarr_main_db_pass = dol_decode($dolibarr_main_db_encrypted_pass);
+	}
+	}
 
 // $conf is already instancied inside inc.php
 $conf->db->type = $dolibarr_main_db_type;
@@ -156,7 +168,9 @@ 
 
 $conf->setValues($db);
 // Reset forced setup after the setValues
-if (defined('SYSLOG_FILE')) $conf->global->SYSLOG_FILE = constant('SYSLOG_FILE');
+if (defined('SYSLOG_FILE')) {
+	$conf->global->SYSLOG_FILE = constant('SYSLOG_FILE');
+}
 $conf->global->MAIN_ENABLE_LOG_TO_HTML = 1;
 
 
@@ -191,7 +205,9 @@ 
 	{
 		while (($file = readdir($handle)) !== false)
 		{
-			if (preg_match('/\.sql$/i', $file)) $filesindir[] = $file;
+			if (preg_match('/\.sql$/i', $file)) {
+				$filesindir[] = $file;
+			}
 		}
 	}
 	sort($filesindir);
@@ -256,8 +272,12 @@ 
 					$fieldtype = isset($obj->Type) ? $obj->Type : 'varchar';
 				}
 
-				if (empty($fieldname)) continue;
-				if (in_array($fieldname, array('rowid', 'tms', 'fk_object', 'import_key'))) continue;
+				if (empty($fieldname)) {
+					continue;
+				}
+				if (in_array($fieldname, array('rowid', 'tms', 'fk_object', 'import_key'))) {
+					continue;
+				}
 				$arrayoffieldsfound[$fieldname] = array('type'=>$fieldtype);
 			}
 
@@ -500,7 +520,9 @@ 
 
 			$tmp = explode('.', $obj->logo);
 			$name = $tmp[0];
-			if (isset($tmp[1])) $ext = '.'.$tmp[1];
+			if (isset($tmp[1])) {
+				$ext = '.'.$tmp[1];
+			}
 
 			if (!empty($name))
 			{
@@ -583,7 +605,9 @@ 
 
 			$tmp = explode('.', $obj->photo);
 			$name = $tmp[0];
-			if (isset($tmp[1])) $ext = '.'.$tmp[1];
+			if (isset($tmp[1])) {
+				$ext = '.'.$tmp[1];
+			}
 
 			if (!empty($name))
 			{
@@ -765,16 +789,25 @@ 
 
 				$db->begin();
 
-				if ($modulecond)		// And menu entry for module $modulecond was found in database.
+				if ($modulecond) {
+					// And menu entry for module $modulecond was found in database.
 				{
 					$moduleok = 0;
+				}
 					foreach ($modulecondarray as $tmpname)
 					{
-						if ($tmpname == 'margins') $tmpname = 'margin'; // TODO Remove this when normalized
+						if ($tmpname == 'margins') {
+							$tmpname = 'margin';
+						}
+						// TODO Remove this when normalized
 
 						$result = 0;
-						if (!empty($conf->$tmpname)) $result = $conf->$tmpname->enabled;
-						if ($result) $moduleok++;
+						if (!empty($conf->$tmpname)) {
+							$result = $conf->$tmpname->enabled;
+						}
+						if ($result) {
+							$moduleok++;
+						}
 					}
 
 					if (!$moduleok && $modulecond)
@@ -788,7 +821,9 @@ 
 							{
 								$error++;
 								dol_print_error($db);
-							} else print ' - <span class="warning">Cleaned</span>';
+							} else {
+								print ' - <span class="warning">Cleaned</span>';
+							}
 						} else {
 							print ' - <span class="warning">Canceled (test mode)</span>';
 						}
@@ -797,12 +832,17 @@ 
 					}
 				}
 
-				if (!$error) $db->commit();
-				else $db->rollback();
+				if (!$error) {
+					$db->commit();
+				} else {
+					$db->rollback();
+				}
 
 				print'</td></tr>';
 
-				if ($error) break;
+				if ($error) {
+					break;
+				}
 
 				$i++;
 			}
@@ -824,14 +864,29 @@ 
 	{
 		$filearray = array();
 		$upload_dir = isset($conf->$modulepart->dir_output) ? $conf->$modulepart->dir_output : '';
-		if ($modulepart == 'company') $upload_dir = $conf->societe->dir_output; // TODO change for multicompany sharing
-		if ($modulepart == 'invoice') $upload_dir = $conf->facture->dir_output;
-		if ($modulepart == 'invoice_supplier') $upload_dir = $conf->fournisseur->facture->dir_output;
-		if ($modulepart == 'order') $upload_dir = $conf->commande->dir_output;
-		if ($modulepart == 'order_supplier') $upload_dir = $conf->fournisseur->commande->dir_output;
-		if ($modulepart == 'contract') $upload_dir = $conf->contrat->dir_output;
+		if ($modulepart == 'company') {
+			$upload_dir = $conf->societe->dir_output;
+		}
+		// TODO change for multicompany sharing
+		if ($modulepart == 'invoice') {
+			$upload_dir = $conf->facture->dir_output;
+		}
+		if ($modulepart == 'invoice_supplier') {
+			$upload_dir = $conf->fournisseur->facture->dir_output;
+		}
+		if ($modulepart == 'order') {
+			$upload_dir = $conf->commande->dir_output;
+		}
+		if ($modulepart == 'order_supplier') {
+			$upload_dir = $conf->fournisseur->commande->dir_output;
+		}
+		if ($modulepart == 'contract') {
+			$upload_dir = $conf->contrat->dir_output;
+		}
 
-		if (empty($upload_dir)) continue;
+		if (empty($upload_dir)) {
+			continue;
+		}
 
 		print '<tr><td colspan="2"><br>*** Clean orphelins files into files '.$upload_dir.'</td></tr>';
 
@@ -915,10 +970,12 @@ 
 					//print 'Fetch '.$id.' or '.$ref.'<br>';
 					$result = $object_instance->fetch($id, $ref);
 					//print $result.'<br>';
-					if ($result == 0)    // Not found but no error
+					if ($result == 0) {
+						// Not found but no error
 					{
 						// Clean of orphelins directories are done into repair.php
 						print '<tr><td colspan="2">';
+					}
 						print 'Delete orphelins file '.$file['fullname'].'<br>';
 						if (GETPOST('clean_orphelin_dir', 'alpha') == 'confirmed')
 						{
@@ -926,7 +983,9 @@ 
 							dol_delete_dir(dirname($file['fullname']), 1);
 						}
 						print "</td></tr>";
-					} elseif ($result < 0) print 'Error in '.get_class($object_instance).'.fetch of id'.$id.' ref='.$ref.', result='.$result.'<br>';
+					} elseif ($result < 0) {
+						print 'Error in '.get_class($object_instance).'.fetch of id'.$id.' ref='.$ref.', result='.$result.'<br>';
+					}
 				}
 			}
 		}
@@ -1009,8 +1068,11 @@ 
 								dol_print_error($db);
 							}
 
-							if (!$error) $db->commit();
-							else $db->rollback();
+							if (!$error) {
+								$db->commit();
+							} else {
+								$db->rollback();
+							}
 						}
 					}
 				}
@@ -1096,12 +1158,17 @@ 
 					}
 				}
 
-				if (!$error) $db->commit();
-				else $db->rollback();
+				if (!$error) {
+					$db->commit();
+				} else {
+					$db->rollback();
+				}
 
 				print'</td></tr>';
 
-				if ($error) break;
+				if ($error) {
+					break;
+				}
 
 				$i++;
 			}
@@ -1150,12 +1217,16 @@ 
 					{
 						$name = strtolower($reg[1]);
 
-						if ($name)		// An entry for key $key and module $name was found in database.
+						if ($name) {
+							// An entry for key $key and module $name was found in database.
 						{
 							$reloffile = '';
+						}
 							$result = 'found';
 
-							if ($key == 'hooks') $reloffile = $name.'/class/actions_'.$name.'.class.php';
+							if ($key == 'hooks') {
+								$reloffile = $name.'/class/actions_'.$name.'.class.php';
+							}
 							if ($key == 'js')
 							{
 								$value = $obj->value;
@@ -1167,7 +1238,10 @@ 
 							{
 								$value = $obj->value;
 								$valuearray = json_decode($value);
-								if ($value && count($valuearray) == 0) $valuearray[0] = $value; // If value was not a json array but a string
+								if ($value && count($valuearray) == 0) {
+									$valuearray[0] = $value;
+								}
+								// If value was not a json array but a string
 								$reloffile = preg_replace('/^\//', '', $valuearray[0]);
 							}
 
@@ -1201,7 +1275,9 @@ 
 									{
 										$error++;
 										dol_print_error($db);
-									} else print ' - <span class="warning">Cleaned</span>';
+									} else {
+										print ' - <span class="warning">Cleaned</span>';
+									}
 								} else {
 									print ' - <span class="warning">Canceled (test mode)</span>';
 								}
@@ -1210,13 +1286,18 @@ 
 							}
 						}
 
-						if (!$error) $db->commit();
-						else $db->rollback();
+						if (!$error) {
+							$db->commit();
+						} else {
+							$db->rollback();
+						}
 					}
 
 					print'</td></tr>';
 
-					if ($error) break;
+					if ($error) {
+						break;
+					}
 
 					$i++;
 				}
@@ -1300,7 +1381,9 @@ 
 		foreach ($listoftables as $table)
 		{
 			// do not convert llx_const if mysql encrypt/decrypt is used
-			if ($conf->db->dolibarr_main_db_encryption != 0 && preg_match('/\_const$/', $table)) continue;
+			if ($conf->db->dolibarr_main_db_encryption != 0 && preg_match('/\_const$/', $table)) {
+				continue;
+			}
 
 			print '<tr><td colspan="2">';
 			print $table;
@@ -1310,7 +1393,9 @@ 
 			{
 				$resql = $db->query($sql);
 				print ' - Done ('.($resql ? 'OK' : 'KO').')';
-			} else print ' - Disabled';
+			} else {
+				print ' - Disabled';
+			}
 			print '</td></tr>';
 		}
 
@@ -1385,9 +1470,13 @@ 
 				$n_processed_rows++;
 				continue;
 			}
-			if ($db->num_rows($resql_line) == 0) continue;
+			if ($db->num_rows($resql_line) == 0) {
+				continue;
+			}
 			while ($obj_line = $db->fetch_object($resql_line)) {
-				if (!$remaining_qty) break;
+				if (!$remaining_qty) {
+					break;
+				}
 				if (!$obj_line->rowid) {
 					continue;
 				}
@@ -1486,7 +1575,11 @@ 
 dolibarr_install_syslog("--- repair: end");
 pFooter(1, $setuplang);
 
-if ($db->connected) $db->close();
+if ($db->connected) {
+	$db->close();
+}
 
 // Return code if ran from command line
-if (!$ok && isset($argv[1])) exit(1);
+if (!$ok && isset($argv[1])) {
+	exit(1);
+}

htdocs/accountancy/admin/index.php

Braces +30 added lines, -19 removed lines

@@ -104,8 +104,9 @@ 
 if ($action == 'setlistsorttodo') {
 	$setlistsorttodo = GETPOST('value', 'int');
 	$res = dolibarr_set_const($db, "ACCOUNTING_LIST_SORT_VENTILATION_TODO", $setlistsorttodo, 'yesno', 0, '', $conf->entity);
-	if (!$res > 0)
-		$error++;
+	if (!$res > 0) {
+			$error++;
+	}
 
 	if (!$error) {
 		setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
@@ -117,8 +118,9 @@ 
 if ($action == 'setlistsortdone') {
 	$setlistsortdone = GETPOST('value', 'int');
 	$res = dolibarr_set_const($db, "ACCOUNTING_LIST_SORT_VENTILATION_DONE", $setlistsortdone, 'yesno', 0, '', $conf->entity);
-	if (!$res > 0)
-		$error++;
+	if (!$res > 0) {
+			$error++;
+	}
 	if (!$error) {
 		setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
 	} else {
@@ -129,8 +131,9 @@ 
 if ($action == 'setmanagezero') {
 	$setmanagezero = GETPOST('value', 'int');
 	$res = dolibarr_set_const($db, "ACCOUNTING_MANAGE_ZERO", $setmanagezero, 'yesno', 0, '', $conf->entity);
-	if (!$res > 0)
-		$error++;
+	if (!$res > 0) {
+			$error++;
+	}
 	if (!$error) {
 		setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
 	} else {
@@ -141,8 +144,9 @@ 
 if ($action == 'setdisabledirectinput') {
 	$setdisabledirectinput = GETPOST('value', 'int');
 	$res = dolibarr_set_const($db, "BANK_DISABLE_DIRECT_INPUT", $setdisabledirectinput, 'yesno', 0, '', $conf->entity);
-	if (!$res > 0)
-		$error++;
+	if (!$res > 0) {
+			$error++;
+	}
 	if (!$error) {
 		setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
 	} else {
@@ -153,8 +157,9 @@ 
 if ($action == 'setenabledraftexport') {
 	$setenabledraftexport = GETPOST('value', 'int');
 	$res = dolibarr_set_const($db, "ACCOUNTING_ENABLE_EXPORT_DRAFT_JOURNAL", $setenabledraftexport, 'yesno', 0, '', $conf->entity);
-	if (!$res > 0)
-		$error++;
+	if (!$res > 0) {
+			$error++;
+	}
 	if (!$error) {
 		setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
 	} else {
@@ -165,8 +170,9 @@ 
 if ($action == 'setenablesubsidiarylist') {
 	$setenablesubsidiarylist = GETPOST('value', 'int');
 	$res = dolibarr_set_const($db, "ACCOUNTANCY_COMBO_FOR_AUX", $setenablesubsidiarylist, 'yesno', 0, '', $conf->entity);
-	if (!$res > 0)
-		$error++;
+	if (!$res > 0) {
+			$error++;
+	}
 	if (!$error) {
 		setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
 	} else {
@@ -177,8 +183,9 @@ 
 if ($action == 'setdisablebindingonsales') {
 	$setdisablebindingonsales = GETPOST('value', 'int');
 	$res = dolibarr_set_const($db, "ACCOUNTING_DISABLE_BINDING_ON_SALES", $setdisablebindingonsales, 'yesno', 0, '', $conf->entity);
-	if (!$res > 0)
-		$error++;
+	if (!$res > 0) {
+			$error++;
+	}
 	if (!$error) {
 		setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
 	} else {
@@ -189,8 +196,9 @@ 
 if ($action == 'setdisablebindingonpurchases') {
 	$setdisablebindingonpurchases = GETPOST('value', 'int');
 	$res = dolibarr_set_const($db, "ACCOUNTING_DISABLE_BINDING_ON_PURCHASES", $setdisablebindingonpurchases, 'yesno', 0, '', $conf->entity);
-	if (!$res > 0)
-		$error++;
+	if (!$res > 0) {
+			$error++;
+	}
 	if (!$error) {
 		setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
 	} else {
@@ -201,8 +209,9 @@ 
 if ($action == 'setdisablebindingonexpensereports') {
 	$setdisablebindingonexpensereports = GETPOST('value', 'int');
 	$res = dolibarr_set_const($db, "ACCOUNTING_DISABLE_BINDING_ON_EXPENSEREPORTS", $setdisablebindingonexpensereports, 'yesno', 0, '', $conf->entity);
-	if (!$res > 0)
-		$error++;
+	if (!$res > 0) {
+			$error++;
+	}
 	if (!$error) {
 		setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
 	} else {
@@ -323,7 +332,9 @@ 
 {
 	print '<tr class="oddeven value">';
 
-	if (!empty($conf->global->ACCOUNTING_MANAGE_ZERO) && ($key == 'ACCOUNTING_LENGTH_GACCOUNT' || $key == 'ACCOUNTING_LENGTH_AACCOUNT')) continue;
+	if (!empty($conf->global->ACCOUNTING_MANAGE_ZERO) && ($key == 'ACCOUNTING_LENGTH_GACCOUNT' || $key == 'ACCOUNTING_LENGTH_AACCOUNT')) {
+		continue;
+	}
 
 	// Param
 	$label = $langs->trans($key);

htdocs/fourn/class/fournisseur.commande.dispatch.class.php

Braces +92 added lines, -33 removed lines

@@ -140,16 +140,36 @@ 
 
 		// Clean parameters
 
-		if (isset($this->fk_commande)) $this->fk_commande = trim($this->fk_commande);
-		if (isset($this->fk_product)) $this->fk_product = trim($this->fk_product);
-		if (isset($this->fk_commandefourndet)) $this->fk_commandefourndet = trim($this->fk_commandefourndet);
-		if (isset($this->qty)) $this->qty = trim($this->qty);
-		if (isset($this->fk_entrepot)) $this->fk_entrepot = trim($this->fk_entrepot);
-		if (isset($this->fk_user)) $this->fk_user = trim($this->fk_user);
-		if (isset($this->comment)) $this->comment = trim($this->comment);
-		if (isset($this->status)) $this->status = trim($this->status);
-		if (isset($this->batch)) $this->batch = trim($this->batch);
-		if (empty($this->datec)) $this->datec = dol_now();
+		if (isset($this->fk_commande)) {
+			$this->fk_commande = trim($this->fk_commande);
+		}
+		if (isset($this->fk_product)) {
+			$this->fk_product = trim($this->fk_product);
+		}
+		if (isset($this->fk_commandefourndet)) {
+			$this->fk_commandefourndet = trim($this->fk_commandefourndet);
+		}
+		if (isset($this->qty)) {
+			$this->qty = trim($this->qty);
+		}
+		if (isset($this->fk_entrepot)) {
+			$this->fk_entrepot = trim($this->fk_entrepot);
+		}
+		if (isset($this->fk_user)) {
+			$this->fk_user = trim($this->fk_user);
+		}
+		if (isset($this->comment)) {
+			$this->comment = trim($this->comment);
+		}
+		if (isset($this->status)) {
+			$this->status = trim($this->status);
+		}
+		if (isset($this->batch)) {
+			$this->batch = trim($this->batch);
+		}
+		if (empty($this->datec)) {
+			$this->datec = dol_now();
+		}
 
 
 		// Check parameters
@@ -214,7 +234,9 @@ 
 		if (!$error)
 		{
 			$result = $this->insertExtraFields();
-			if ($result < 0) $error++;
+			if ($result < 0) {
+				$error++;
+			}
 		}
 
 		// Commit or rollback
@@ -264,8 +286,11 @@ 
 
 
 		$sql .= " FROM ".MAIN_DB_PREFIX.$this->table_element." as t";
-		if ($ref) $sql .= " WHERE t.ref = '".$ref."'";
-		else $sql .= " WHERE t.rowid = ".$id;
+		if ($ref) {
+			$sql .= " WHERE t.ref = '".$ref."'";
+		} else {
+			$sql .= " WHERE t.rowid = ".$id;
+		}
 
 		dol_syslog(get_class($this)."::fetch");
 		$resql = $this->db->query($sql);
@@ -318,15 +343,33 @@ 
 
 		// Clean parameters
 
-		if (isset($this->fk_commande)) $this->fk_commande = trim($this->fk_commande);
-		if (isset($this->fk_product)) $this->fk_product = trim($this->fk_product);
-		if (isset($this->fk_commandefourndet)) $this->fk_commandefourndet = trim($this->fk_commandefourndet);
-		if (isset($this->qty)) $this->qty = trim($this->qty);
-		if (isset($this->fk_entrepot)) $this->fk_entrepot = trim($this->fk_entrepot);
-		if (isset($this->fk_user)) $this->fk_user = trim($this->fk_user);
-		if (isset($this->comment)) $this->comment = trim($this->comment);
-		if (isset($this->status)) $this->status = trim($this->status);
-		if (isset($this->batch)) $this->batch = trim($this->batch);
+		if (isset($this->fk_commande)) {
+			$this->fk_commande = trim($this->fk_commande);
+		}
+		if (isset($this->fk_product)) {
+			$this->fk_product = trim($this->fk_product);
+		}
+		if (isset($this->fk_commandefourndet)) {
+			$this->fk_commandefourndet = trim($this->fk_commandefourndet);
+		}
+		if (isset($this->qty)) {
+			$this->qty = trim($this->qty);
+		}
+		if (isset($this->fk_entrepot)) {
+			$this->fk_entrepot = trim($this->fk_entrepot);
+		}
+		if (isset($this->fk_user)) {
+			$this->fk_user = trim($this->fk_user);
+		}
+		if (isset($this->comment)) {
+			$this->comment = trim($this->comment);
+		}
+		if (isset($this->status)) {
+			$this->status = trim($this->status);
+		}
+		if (isset($this->batch)) {
+			$this->batch = trim($this->batch);
+		}
 
 
 
@@ -363,7 +406,9 @@ 
 		{
 			if (!$error)
 			{
-				if (empty($this->id) && !empty($this->rowid))$this->id = $this->rowid;
+				if (empty($this->id) && !empty($this->rowid)) {
+					$this->id = $this->rowid;
+				}
 				$result = $this->insertExtraFields();
 				if ($result < 0)
 				{
@@ -375,7 +420,9 @@ 
 			{
 				// Uncomment this and change MYOBJECT to your own tag if you
 				$result = $this->call_trigger('LINERECEPTION_UPDATE', $user);
-				if ($result < 0) $error++;
+				if ($result < 0) {
+					$error++;
+				}
 				//// End call triggers
 			}
 		}
@@ -552,19 +599,31 @@ 
 			return $langs->trans($this->statuts[$status]);
 		} elseif ($mode == 3)
 		{
-			if ($status == 0) return img_picto($langs->trans($this->statuts[$status]), 'statut0');
-			elseif ($status == 1) return img_picto($langs->trans($this->statuts[$status]), 'statut4');
-			elseif ($status == 2) return img_picto($langs->trans($this->statuts[$status]), 'statut8');
+			if ($status == 0) {
+				return img_picto($langs->trans($this->statuts[$status]), 'statut0');
+			} elseif ($status == 1) {
+				return img_picto($langs->trans($this->statuts[$status]), 'statut4');
+			} elseif ($status == 2) {
+				return img_picto($langs->trans($this->statuts[$status]), 'statut8');
+			}
 		} elseif ($mode == 4)
 		{
-			if ($status == 0) return img_picto($langs->trans($this->statuts[$status]), 'statut0').' '.$langs->trans($this->statuts[$status]);
-			elseif ($status == 1) return img_picto($langs->trans($this->statuts[$status]), 'statut4').' '.$langs->trans($this->statuts[$status]);
-			elseif ($status == 2) return img_picto($langs->trans($this->statuts[$status]), 'statut8').' '.$langs->trans($this->statuts[$status]);
+			if ($status == 0) {
+				return img_picto($langs->trans($this->statuts[$status]), 'statut0').' '.$langs->trans($this->statuts[$status]);
+			} elseif ($status == 1) {
+				return img_picto($langs->trans($this->statuts[$status]), 'statut4').' '.$langs->trans($this->statuts[$status]);
+			} elseif ($status == 2) {
+				return img_picto($langs->trans($this->statuts[$status]), 'statut8').' '.$langs->trans($this->statuts[$status]);
+			}
 		} elseif ($mode == 5)
 		{
-			if ($status == 0) return '<span class="hideonsmartphone">'.$langs->trans($this->statutshort[$status]).' </span>'.img_picto($langs->trans($this->statuts[$status]), 'statut0');
-			elseif ($status == 1) return '<span class="hideonsmartphone">'.$langs->trans($this->statutshort[$status]).' </span>'.img_picto($langs->trans($this->statuts[$status]), 'statut4');
-			elseif ($status == 2) return '<span class="hideonsmartphone">'.$langs->trans($this->statutshort[$status]).' </span>'.img_picto($langs->trans($this->statuts[$status]), 'statut8');
+			if ($status == 0) {
+				return '<span class="hideonsmartphone">'.$langs->trans($this->statutshort[$status]).' </span>'.img_picto($langs->trans($this->statuts[$status]), 'statut0');
+			} elseif ($status == 1) {
+				return '<span class="hideonsmartphone">'.$langs->trans($this->statutshort[$status]).' </span>'.img_picto($langs->trans($this->statuts[$status]), 'statut4');
+			} elseif ($status == 2) {
+				return '<span class="hideonsmartphone">'.$langs->trans($this->statutshort[$status]).' </span>'.img_picto($langs->trans($this->statuts[$status]), 'statut8');
+			}
 		}
 	}
 

htdocs/opensurvey/card.php

Braces +43 added lines, -16 removed lines

@@ -32,7 +32,9 @@ 
 
 
 // Security check
-if (!$user->rights->opensurvey->read) accessforbidden();
+if (!$user->rights->opensurvey->read) {
+	accessforbidden();
+}
 
 // Initialisation des variables
 $action = GETPOST('action', 'aZ09');
@@ -63,17 +65,23 @@ 
 
 $parameters = array('id' => $numsondage);
 $reshook = $hookmanager->executeHooks('doActions', $parameters, $object, $action); // Note that $action and $object may have been modified by some hooks
-if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
+if ($reshook < 0) {
+	setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
+}
 
 if (empty($reshook))
 {
-	if ($cancel) $action = '';
+	if ($cancel) {
+		$action = '';
+	}
 
 	// Delete
 	if ($action == 'delete_confirm')
 	{
 		// Security check
-		if (!$user->rights->opensurvey->write) accessforbidden();
+		if (!$user->rights->opensurvey->write) {
+			accessforbidden();
+		}
 
 		$result = $object->delete($user, '', $numsondage);
 
@@ -99,7 +107,9 @@ 
 	if ($action == 'update')
 	{
 		// Security check
-		if (!$user->rights->opensurvey->write) accessforbidden();
+		if (!$user->rights->opensurvey->write) {
+			accessforbidden();
+		}
 
 		$error = 0;
 
@@ -164,14 +174,18 @@ 
 	if ($idcomment)
 	{
 		// Security check
-		if (!$user->rights->opensurvey->write) accessforbidden();
+		if (!$user->rights->opensurvey->write) {
+			accessforbidden();
+		}
 
 		$resql = $object->deleteComment($idcomment);
 	}
 
 	if ($action == 'edit') {
 		// Security check
-		if (!$user->rights->opensurvey->write) accessforbidden();
+		if (!$user->rights->opensurvey->write) {
+			accessforbidden();
+		}
 	}
 }
 
@@ -240,7 +254,9 @@ 
 if ($action == 'edit')
 {
 	print '<input type="text" name="nouveautitre" style="width: 95%" value="'.dol_escape_htmltag(dol_htmlentities($object->title)).'">';
-} else print dol_htmlentities($object->title);
+} else {
+	print dol_htmlentities($object->title);
+}
 print '</td></tr>';
 
 // Description
@@ -261,7 +277,9 @@ 
 	if ($action == 'edit')
 	{
 		print '<input type="text" name="nouvelleadresse" class="minwith200" value="'.$object->mail_admin.'">';
-	} else print dol_print_email($object->mail_admin, 0, 0, 1);
+	} else {
+		print dol_print_email($object->mail_admin, 0, 0, 1);
+	}
 	print '</td></tr>';
 }
 
@@ -287,7 +305,9 @@ 
 if ($action == 'edit')
 {
 	print '<input type="checkbox" name="cancomment" '.($object->allow_comments ? 'checked="checked"' : '').'">';
-} else print yn($object->allow_comments);
+} else {
+	print yn($object->allow_comments);
+}
 print '</td></tr>';
 
 // Users can see others vote
@@ -295,16 +315,21 @@ 
 if ($action == 'edit')
 {
 	print '<input type="checkbox" name="canseeothersvote" '.($object->allow_spy ? 'checked="checked"' : '').'">';
-} else print yn($object->allow_spy);
+} else {
+	print yn($object->allow_spy);
+}
 print '</td></tr>';
 
 // Expire date
 print '<tr><td>'.$langs->trans('ExpireDate').'</td><td colspan="2">';
-if ($action == 'edit') print $form->selectDate($expiredate ? $expiredate : $object->date_fin, 'expire', 0, 0, 0, '', 1, 0);
-else {
+if ($action == 'edit') {
+	print $form->selectDate($expiredate ? $expiredate : $object->date_fin, 'expire', 0, 0, 0, '', 1, 0);
+} else {
 	print dol_print_date($object->date_fin, 'day');
-	if ($object->date_fin && $object->date_fin < dol_now() && $object->status == Opensurveysondage::STATUS_VALIDATED) print img_warning($langs->trans("Expired"));
-}
+	if ($object->date_fin && $object->date_fin < dol_now() && $object->status == Opensurveysondage::STATUS_VALIDATED) {
+		print img_warning($langs->trans("Expired"));
+	}
+	}
 print '</td></tr>';
 
 // Author
@@ -327,7 +352,9 @@ 
 
 $url = $urlwithroot.'/public/opensurvey/studs.php?sondage='.$object->id_sondage;
 print '<input type="text" style="width: 60%" '.($action == 'edit' ? 'disabled' : '').' id="opensurveyurl" name="opensurveyurl" value="'.$url.'">';
-if ($action != 'edit') print ajax_autoselect("opensurveyurl", $url);
+if ($action != 'edit') {
+	print ajax_autoselect("opensurveyurl", $url);
+}
 
 print '</td></tr>';