Dolibarr / dolibarr

htdocs/core/lib/report.lib.php

Braces +21 added lines, -7 removed lines

@@ -44,7 +44,9 @@ 
 
 	print "\n\n<!-- start banner of report -->\n";
 
-	if (!empty($varlink)) $varlink = '?'.$varlink;
+	if (!empty($varlink)) {
+		$varlink = '?'.$varlink;
+	}
 
 	$head = array();
 
@@ -73,7 +75,9 @@ 
 	print '<td>';
 	print $reportname;
 	print '</td>';
-	if ($variante) print '<td></td>';
+	if ($variante) {
+		print '<td></td>';
+	}
 	print '</tr>'."\n";
 
 	// Calculation mode
@@ -83,7 +87,9 @@ 
 		print '<td width="150">'.$langs->trans("CalculationMode").'</td>';
 		print '<td>';
 		print $calcmode;
-		if ($variante) print '<td></td>';
+		if ($variante) {
+			print '<td></td>';
+		}
 		print '</td>';
 		print '</tr>'."\n";
 	}
@@ -92,8 +98,12 @@ 
 	print '<tr>';
 	print '<td>'.$langs->trans("ReportPeriod").'</td>';
 	print '<td>';
-	if ($period) print $period;
-	if ($variante) print '<td class="nowraponall">'.$periodlink.'</td>';
+	if ($period) {
+		print $period;
+	}
+	if ($variante) {
+		print '<td class="nowraponall">'.$periodlink.'</td>';
+	}
 	print '</td>';
 	print '</tr>'."\n";
 
@@ -101,7 +111,9 @@ 
 	print '<tr>';
 	print '<td>'.$langs->trans("ReportDescription").'</td>';
 	print '<td>'.$description.'</td>';
-	if ($variante) print '<td></td>';
+	if ($variante) {
+		print '<td></td>';
+	}
 	print '</tr>'."\n";
 
 	// Ligne d'export
@@ -110,7 +122,9 @@ 
 	print '<td>';
 	print dol_print_date($builddate, 'dayhour');
 	print '</td>';
-	if ($variante) print '<td>'.($exportlink ? $langs->trans("Export").': '.$exportlink : '').'</td>';
+	if ($variante) {
+		print '<td>'.($exportlink ? $langs->trans("Export").': '.$exportlink : '').'</td>';
+	}
 	print '</tr>'."\n";
 
 	print '</table>'."\n";

htdocs/theme/md/btn.inc.php

Braces +4 added lines, -1 removed lines

@@ -1,5 +1,8 @@
 <?php
-if (!defined('ISLOADEDBYSTEELSHEET')) die('Must be call by steelsheet'); ?>
+if (!defined('ISLOADEDBYSTEELSHEET')) {
+	die('Must be call by steelsheet');
+}
+?>
 /* <style type="text/css" > */
 
 :root {

htdocs/theme/md/badges.inc.php

Braces +10 added lines, -3 removed lines

@@ -1,5 +1,8 @@ 
 <?php
-if (!defined('ISLOADEDBYSTEELSHEET')) die('Must be call by steelsheet'); ?>
+if (!defined('ISLOADEDBYSTEELSHEET')) {
+	die('Must be call by steelsheet');
+}
+?>
 /* <style type="text/css" > */
 /*
  Badge style is based on boostrap framework
@@ -231,8 +234,12 @@ 
 			$thisBadgeBackgroundColor = "#fff";
 		}
 
-		if (in_array((string) $statusName, array('0', '5', '9'))) $thisBadgeTextColor = '#999999';
-		if (in_array((string) $statusName, array('6'))) $thisBadgeTextColor = '#777777';
+		if (in_array((string) $statusName, array('0', '5', '9'))) {
+			$thisBadgeTextColor = '#999999';
+		}
+		if (in_array((string) $statusName, array('6'))) {
+			$thisBadgeTextColor = '#777777';
+		}
 		
 		print $cssPrefix.".badge-status".$statusName." {\n";
 		print "        color: ".$thisBadgeTextColor." !important;\n";

htdocs/core/modules/stock/doc/doc_generic_stock_odt.modules.php

Braces +30 added lines, -12 removed lines

@@ -95,7 +95,10 @@ 
 
 		// Recupere emetteur
 		$this->emetteur = $mysoc;
-		if (!$this->emetteur->country_code) $this->emetteur->country_code = substr($langs->defaultlang, -2); // By default if not defined
+		if (!$this->emetteur->country_code) {
+			$this->emetteur->country_code = substr($langs->defaultlang, -2);
+		}
+		// By default if not defined
 	}
 
 
@@ -133,10 +136,13 @@ 
 			if (!$tmpdir) {
 				unset($listofdir[$key]); continue;
 			}
-			if (!is_dir($tmpdir)) $texttitle .= img_warning($langs->trans("ErrorDirNotFound", $tmpdir), 0);
-			else {
+			if (!is_dir($tmpdir)) {
+				$texttitle .= img_warning($langs->trans("ErrorDirNotFound", $tmpdir), 0);
+			} else {
 				$tmpfiles = dol_dir_list($tmpdir, 'files', 0, '\.(ods|odt)');
-				if (count($tmpfiles)) $listoffiles = array_merge($listoffiles, $tmpfiles);
+				if (count($tmpfiles)) {
+					$listoffiles = array_merge($listoffiles, $tmpfiles);
+				}
 			}
 		}
 		$texthelp = $langs->trans("ListOfDirectoriesForModelGenODT");
@@ -224,7 +230,9 @@ 
 		$hookmanager->initHooks(array('odtgeneration'));
 		global $action;
 
-		if (!is_object($outputlangs)) $outputlangs = $langs;
+		if (!is_object($outputlangs)) {
+			$outputlangs = $langs;
+		}
 		$sav_charset_output = $outputlangs->charset_output;
 		$outputlangs->charset_output = 'UTF-8';
 
@@ -252,7 +260,9 @@ 
 
 			$dir = $conf->product->dir_output;
 			$objectref = dol_sanitizeFileName($object->ref);
-			if (!preg_match('/specimen/i', $objectref)) $dir .= "/".$objectref;
+			if (!preg_match('/specimen/i', $objectref)) {
+				$dir .= "/".$objectref;
+			}
 			$file = $dir."/".$objectref.".odt";
 
 			if (!file_exists($dir))
@@ -279,7 +289,9 @@ 
 				if (!empty($conf->global->MAIN_DOC_USE_TIMING))
 				{
 					$format = $conf->global->MAIN_DOC_USE_TIMING;
-					if ($format == '1') $format = '%Y%m%d%H%M%S';
+					if ($format == '1') {
+						$format = '%Y%m%d%H%M%S';
+					}
 					$filename = $newfiletmp.'-'.dol_print_date(dol_now(), $format).'.'.$newfileformat;
 				} else {
 					$filename = $newfiletmp.'.'.$newfileformat;
@@ -382,7 +394,9 @@ 
 				$array_other = $this->get_substitutionarray_other($outputlangs);
 				// retrieve contact information for use in stock as contact_xxx tags
 				$array_thirdparty_contact = array();
-				if ($usecontact && is_object($contactobject)) $array_thirdparty_contact = $this->get_substitutionarray_contact($contactobject, $outputlangs, 'contact');
+				if ($usecontact && is_object($contactobject)) {
+					$array_thirdparty_contact = $this->get_substitutionarray_contact($contactobject, $outputlangs, 'contact');
+				}
 
 				$tmparray = array_merge($substitutionarray, $array_object_from_properties, $array_user, $array_soc, $array_thirdparty, $array_other, $array_thirdparty_contact);
 				complete_substitutions_array($tmparray, $outputlangs, $object);
@@ -394,10 +408,13 @@ 
 				foreach ($tmparray as $key=>$value)
 				{
 					try {
-						if (preg_match('/logo$/', $key)) // Image
+						if (preg_match('/logo$/', $key)) {
+							// Image
 						{
 							if (file_exists($value)) $odfHandler->setImage($key, $value);
-							else $odfHandler->setVars($key, 'ErrorFileNotFound', true, 'UTF-8');
+						} else {
+								$odfHandler->setVars($key, 'ErrorFileNotFound', true, 'UTF-8');
+							}
 						} else // Text
 						{
 							$odfHandler->setVars($key, $value, true, 'UTF-8');
@@ -478,8 +495,9 @@ 
 
 				$reshook = $hookmanager->executeHooks('afterODTCreation', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks
 
-				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));
+				}
 
 				$odfHandler = null; // Destroy object
 

htdocs/core/modules/reception/doc/pdf_squille.modules.php

Braces +125 added lines, -45 removed lines

@@ -62,7 +62,10 @@ 
 
 		// Get source company
 		$this->emetteur = $mysoc;
-		if (!$this->emetteur->country_code) $this->emetteur->country_code = substr($langs->defaultlang, -2); // By default if not defined
+		if (!$this->emetteur->country_code) {
+			$this->emetteur->country_code = substr($langs->defaultlang, -2);
+		}
+		// By default if not defined
 
 		// Define position of columns
 		$this->posxdesc = $this->marge_gauche + 1;
@@ -81,9 +84,11 @@ 
 
 		$this->posxpicture = $this->posxweightvol - (empty($conf->global->MAIN_DOCUMENTS_WITH_PICTURE_WIDTH) ? 20 : $conf->global->MAIN_DOCUMENTS_WITH_PICTURE_WIDTH); // width of images
 
-		if ($this->page_largeur < 210) // To work with US executive format
+		if ($this->page_largeur < 210) {
+			// To work with US executive format
 		{
 			$this->posxweightvol -= 20;
+		}
 			$this->posxpicture -= 20;
 			$this->posxqtyordered -= 20;
 			$this->posxqtytoship -= 20;
@@ -116,9 +121,13 @@ 
 
 		$object->fetch_thirdparty();
 
-		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';
+		}
 
 		$outputlangs->loadLangs(array("main", "dict", "companies", "bills", "products", "propal", "deliveries", "receptions", "productbatch", "sendings"));
 
@@ -132,7 +141,9 @@ 
 
 			for ($i = 0; $i < $nblines; $i++)
 			{
-				if (empty($object->lines[$i]->fk_product)) continue;
+				if (empty($object->lines[$i]->fk_product)) {
+					continue;
+				}
 
 				$objphoto = new Product($this->db);
 				$objphoto->fetch($object->lines[$i]->fk_product);
@@ -159,11 +170,15 @@ 
 					break;
 				}
 
-				if ($realpath) $realpatharray[$i] = $realpath;
+				if ($realpath) {
+					$realpatharray[$i] = $realpath;
+				}
 			}
 		}
 
-		if (count($realpatharray) == 0) $this->posxpicture = $this->posxweightvol;
+		if (count($realpatharray) == 0) {
+			$this->posxpicture = $this->posxweightvol;
+		}
 
 		if ($conf->reception->dir_output)
 		{
@@ -227,20 +242,26 @@ 
 				$pagenb = 0;
 				$pdf->SetDrawColor(128, 128, 128);
 
-				if (method_exists($pdf, 'AliasNbPages')) $pdf->AliasNbPages();
+				if (method_exists($pdf, 'AliasNbPages')) {
+					$pdf->AliasNbPages();
+				}
 
 				$pdf->SetTitle($outputlangs->convToOutputCharset($object->ref));
 				$pdf->SetSubject($outputlangs->transnoentities("Reception"));
 				$pdf->SetCreator("Dolibarr ".DOL_VERSION);
 				$pdf->SetAuthor($outputlangs->convToOutputCharset($user->getFullName($outputlangs)));
 				$pdf->SetKeyWords($outputlangs->convToOutputCharset($object->ref)." ".$outputlangs->transnoentities("Reception"));
-				if (!empty($conf->global->MAIN_DISABLE_PDF_COMPRESSION)) $pdf->SetCompression(false);
+				if (!empty($conf->global->MAIN_DISABLE_PDF_COMPRESSION)) {
+					$pdf->SetCompression(false);
+				}
 
 				$pdf->SetMargins($this->marge_gauche, $this->marge_haute, $this->marge_droite); // Left, Top, Right
 
 				// New page
 				$pdf->AddPage();
-				if (!empty($tplidx)) $pdf->useTemplate($tplidx);
+				if (!empty($tplidx)) {
+					$pdf->useTemplate($tplidx);
+				}
 				$pagenb++;
 				$this->_pagehead($pdf, $object, 1, $outputlangs);
 				$pdf->SetFont('', '', $default_font_size - 1);
@@ -297,7 +318,9 @@ 
 								// Get code using getLabelFromKey
 								$code = $outputlangs->getLabelFromKey($this->db, $object->shipment_method_id, 'c_shipment_mode', 'rowid', 'code');
 								$label = '';
-								if ($object->tracking_url != $object->tracking_number) $label .= $outputlangs->trans("LinkToTrackYourPackage")."<br>";
+								if ($object->tracking_url != $object->tracking_number) {
+									$label .= $outputlangs->trans("LinkToTrackYourPackage")."<br>";
+								}
 								$label .= $outputlangs->trans("ReceptionMethod").": ".$outputlangs->trans("ReceptionMethod".strtoupper($code));
 								//var_dump($object->tracking_url != $object->tracking_number);exit;
 								if ($object->tracking_url != $object->tracking_number)
@@ -347,7 +370,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.
@@ -358,19 +383,27 @@ 
 					$posYAfterDescription = 0;
 
 					// 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($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);
+						}
 						$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 (isset($imglinesize['width']) && isset($imglinesize['height']))
@@ -388,9 +421,11 @@ 
 					pdf_writelinedesc($pdf, $object, $i, $outputlangs, $this->posxpicture - $curX, 3, $curX, $curY, $hideref, $hidedesc);
 
 					$pageposafter = $pdf->getPage();
-					if ($pageposafter > $pageposbefore)	// There is a pagebreak
+					if ($pageposafter > $pageposbefore) {
+						// There is a pagebreak
 					{
 						$pdf->rollbackTransaction(true);
+					}
 						$pageposafter = $pageposbefore;
 						//print $pageposafter.'-'.$pageposbefore;exit;
 						$pdf->setPageOrientation('', 1, $heightforfooter); // The only function to edit the bottom margin of current page to set it.
@@ -400,22 +435,30 @@ 
 						$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($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);
+								}
 								$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
 					{
@@ -479,7 +522,9 @@ 
 					}
 
 					$nexY += 3;
-					if ($weighttxt && $voltxt) $nexY += 2;
+					if ($weighttxt && $voltxt) {
+						$nexY += 2;
+					}
 
 					// Add line
 					if (!empty($conf->global->MAIN_PDF_DASH_BETWEEN_LINES) && $i < ($nblines - 1))
@@ -517,7 +562,9 @@ 
 						$this->_pagefoot($pdf, $object, $outputlangs, 1);
 						// New page
 						$pdf->AddPage();
-						if (!empty($tplidx)) $pdf->useTemplate($tplidx);
+						if (!empty($tplidx)) {
+							$pdf->useTemplate($tplidx);
+						}
 						$pagenb++;
 					}
 				}
@@ -537,7 +584,9 @@ 
 
 				// Pied de page
 				$this->_pagefoot($pdf, $object, $outputlangs);
-				if (method_exists($pdf, 'AliasNbPages')) $pdf->AliasNbPages();
+				if (method_exists($pdf, 'AliasNbPages')) {
+					$pdf->AliasNbPages();
+				}
 
 				$pdf->Close();
 
@@ -554,8 +603,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));
+				}
 
 				return 1; // No error
 			} else {
@@ -600,8 +650,11 @@ 
 		{
 			$col2x-=20;
 		}*/
-		if (empty($conf->global->RECEPTION_PDF_HIDE_ORDERED)) $largcol2 = ($this->posxqtyordered - $this->posxweightvol);
-		else $largcol2 = ($this->posxqtytoship - $this->posxweightvol);
+		if (empty($conf->global->RECEPTION_PDF_HIDE_ORDERED)) {
+			$largcol2 = ($this->posxqtyordered - $this->posxweightvol);
+		} else {
+			$largcol2 = ($this->posxqtytoship - $this->posxweightvol);
+		}
 
 		$useborder = 0;
 		$index = 0;
@@ -623,10 +676,18 @@ 
 			$object->volume_units = $object->size_units * 3;
 		}
 
-		if ($totalWeight != '') $totalWeighttoshow = showDimensionInBestUnit($totalWeight, 0, "weight", $outputlangs);
-		if ($totalVolume != '') $totalVolumetoshow = showDimensionInBestUnit($totalVolume, 0, "volume", $outputlangs);
-		if ($object->trueWeight) $totalWeighttoshow = showDimensionInBestUnit($object->trueWeight, $object->weight_units, "weight", $outputlangs);
-		if ($object->trueVolume) $totalVolumetoshow = showDimensionInBestUnit($object->trueVolume, $object->volume_units, "volume", $outputlangs);
+		if ($totalWeight != '') {
+			$totalWeighttoshow = showDimensionInBestUnit($totalWeight, 0, "weight", $outputlangs);
+		}
+		if ($totalVolume != '') {
+			$totalVolumetoshow = showDimensionInBestUnit($totalVolume, 0, "volume", $outputlangs);
+		}
+		if ($object->trueWeight) {
+			$totalWeighttoshow = showDimensionInBestUnit($object->trueWeight, $object->weight_units, "weight", $outputlangs);
+		}
+		if ($object->trueVolume) {
+			$totalVolumetoshow = showDimensionInBestUnit($object->trueVolume, $object->volume_units, "volume", $outputlangs);
+		}
 
 		$pdf->SetFillColor(255, 255, 255);
 		$pdf->SetXY($col1x, $tab2_top + $tab2_hl * $index);
@@ -664,7 +725,9 @@ 
 
 			$index++;
 		}
-		if (!$totalWeighttoshow && !$totalVolumetoshow) $index++;
+		if (!$totalWeighttoshow && !$totalVolumetoshow) {
+			$index++;
+		}
 
 		$pdf->SetTextColor(0, 0, 0);
 
@@ -690,7 +753,9 @@ 
 
 		// Force to disable hidetop and hidebottom
 		$hidebottom = 0;
-		if ($hidetop) $hidetop = -1;
+		if ($hidetop) {
+			$hidetop = -1;
+		}
 
 		$default_font_size = pdf_getPDFFontSize($outputlangs);
 
@@ -876,9 +941,11 @@ 
 		$origin_id = $object->origin_id;
 
 		// TODO move to external function
-		if (!empty($conf->fournisseur->enabled))     // commonly $origin='commande'
+		if (!empty($conf->fournisseur->enabled)) {
+			// commonly $origin='commande'
 		{
 			$outputlangs->load('orders');
+		}
 
 			$classname = 'CommandeFournisseur';
 			$linkedobject = new $classname($this->db);
@@ -889,7 +956,9 @@ 
 
 				$pdf->SetFont('', '', $default_font_size - 2);
 				$text = $linkedobject->ref;
-				if ($linkedobject->ref_client) $text .= ' ('.$linkedobject->ref_client.')';
+				if ($linkedobject->ref_client) {
+					$text .= ' ('.$linkedobject->ref_client.')';
+				}
 				$Yoff = $Yoff + 8;
 				$pdf->SetXY($this->page_largeur - $this->marge_droite - $w, $Yoff);
 				$pdf->MultiCell($w, 2, $outputlangs->transnoentities("RefOrder")." : ".$outputlangs->transnoentities($text), 0, 'R');
@@ -905,8 +974,12 @@ 
 			$carac_emetteur = '';
 		 	// Add internal contact of origin element if defined
 			$arrayidcontact = array();
-			if (!empty($origin) && is_object($object->$origin)) $arrayidcontact = $object->$origin->getIdContact('internal', 'SALESREPFOLL');
-			if (empty($arrayidcontact)) $arrayidcontact = $object->$origin->getIdContact('internal', 'SHIPPING');
+			if (!empty($origin) && is_object($object->$origin)) {
+				$arrayidcontact = $object->$origin->getIdContact('internal', 'SALESREPFOLL');
+			}
+			if (empty($arrayidcontact)) {
+				$arrayidcontact = $object->$origin->getIdContact('internal', 'SHIPPING');
+			}
 		 	if (count($arrayidcontact) > 0)
 		 	{
 		 		$object->fetch_user(reset($arrayidcontact));
@@ -918,7 +991,9 @@ 
 			// Show sender
 			$posy = !empty($conf->global->MAIN_PDF_USE_ISO_LOCATION) ? 40 : 42;
 			$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;
@@ -970,10 +1045,15 @@ 
 
 			// Show recipient
 			$widthrecbox = !empty($conf->global->MAIN_PDF_USE_ISO_LOCATION) ? 92 : 100;
-			if ($this->page_largeur < 210) $widthrecbox = 84; // To work with US executive format
+			if ($this->page_largeur < 210) {
+				$widthrecbox = 84;
+			}
+			// To work with US executive format
 			$posy = !empty($conf->global->MAIN_PDF_USE_ISO_LOCATION) ? 40 : 42;
 			$posx = $this->page_largeur - $this->marge_droite - $widthrecbox;
-			if (!empty($conf->global->MAIN_INVERT_SENDER_RECIPIENT)) $posx = $this->marge_gauche;
+			if (!empty($conf->global->MAIN_INVERT_SENDER_RECIPIENT)) {
+				$posx = $this->marge_gauche;
+			}
 
 			// Show recipient frame
 			$pdf->SetTextColor(0, 0, 0);

htdocs/core/modules/modRecruitment.class.php

Braces +7 added lines, -2 removed lines

@@ -403,7 +403,10 @@ 
 		global $conf, $langs;
 
 		$result = $this->_load_tables('/recruitment/sql/');
-		if ($result < 0) return -1; // Do not activate module if error 'not allowed' returned when loading module SQL queries (the _load_table run sql with run_sql with the error allowed parameter set to 'default')
+		if ($result < 0) {
+			return -1;
+		}
+		// Do not activate module if error 'not allowed' returned when loading module SQL queries (the _load_table run sql with run_sql with the error allowed parameter set to 'default')
 
 		// Create extrafields during init
 		//include_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php';
@@ -425,7 +428,9 @@ 
 		$myTmpObjects['RecruitmentJobPosition'] = array('includerefgeneration'=>1, 'includedocgeneration'=>1);
 
 		foreach ($myTmpObjects as $myTmpObjectKey => $myTmpObjectArray) {
-			if ($myTmpObjectKey == 'MyObject') continue;
+			if ($myTmpObjectKey == 'MyObject') {
+				continue;
+			}
 			if ($myTmpObjectArray['includerefgeneration']) {
 				$src = DOL_DOCUMENT_ROOT.'/install/doctemplates/mymodule/template_myobjects.odt';
 				$dirodt = DOL_DATA_ROOT.'/doctemplates/mymodule';

htdocs/core/ajax/ajaxdirpreview.php

Braces +135 added lines, -52 removed lines

@@ -27,14 +27,25 @@ 
  * 				ajaxdirpreview.php?mode=nojs&action=preview&module=ecm&section=0&file=xxx
  */
 
-if (!defined('NOTOKENRENEWAL')) define('NOTOKENRENEWAL', 1); // Disables token renewal
-if (!defined('NOREQUIREMENU')) define('NOREQUIREMENU', '1');
-if (!defined('NOREQUIREHTML')) define('NOREQUIREHTML', '1');
-if (!defined('NOREQUIREAJAX')) define('NOREQUIREAJAX', '1');
+if (!defined('NOTOKENRENEWAL')) {
+	define('NOTOKENRENEWAL', 1);
+}
+// Disables token renewal
+if (!defined('NOREQUIREMENU')) {
+	define('NOREQUIREMENU', '1');
+}
+if (!defined('NOREQUIREHTML')) {
+	define('NOREQUIREHTML', '1');
+}
+if (!defined('NOREQUIREAJAX')) {
+	define('NOREQUIREAJAX', '1');
+}
 
-if (!isset($mode) || $mode != 'noajax')    // For ajax call
+if (!isset($mode) || $mode != 'noajax') {
+	// For ajax call
 {
 	require_once '../../main.inc.php';
+}
 	require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
 	require_once DOL_DOCUMENT_ROOT.'/core/class/html.formfile.class.php';
 	require_once DOL_DOCUMENT_ROOT.'/ecm/class/ecmdirectory.class.php';
@@ -54,8 +65,12 @@ 
 	$offset = $limit * $page;
 	$pageprev = $page - 1;
 	$pagenext = $page + 1;
-	if (!$sortorder) $sortorder = "ASC";
-	if (!$sortfield) $sortfield = "name";
+	if (!$sortorder) {
+		$sortorder = "ASC";
+	}
+	if (!$sortfield) {
+		$sortfield = "name";
+	}
 
 	$rootdirfordoc = $conf->ecm->dir_output;
 
@@ -97,15 +112,20 @@ 
 
 if (empty($url))
 {
-	if (GETPOSTISSET('website')) $url = DOL_URL_ROOT.'/website/index.php';
-	else $url = DOL_URL_ROOT.'/ecm/index.php';
-}
+	if (GETPOSTISSET('website')) {
+		$url = DOL_URL_ROOT.'/website/index.php';
+	} else {
+		$url = DOL_URL_ROOT.'/ecm/index.php';
+	}
+	}
 
 // Load translation files required by the page
 $langs->loadLangs(array("ecm", "companies", "other"));
 
 // Security check
-if ($user->socid > 0) $socid = $user->socid;
+if ($user->socid > 0) {
+	$socid = $user->socid;
+}
 
 //print 'xxx'.$upload_dir;
 
@@ -122,8 +142,10 @@ 
 // Check permissions
 if ($modulepart == 'ecm')
 {
-	if (!$user->rights->ecm->read) accessforbidden();
-}
+	if (!$user->rights->ecm->read) {
+		accessforbidden();
+	}
+	}
 if ($modulepart == 'medias')
 {
 	// Always allowed
@@ -166,8 +188,12 @@ 
 //print '<!-- Page called with mode='.dol_escape_htmltag(isset($mode)?$mode:'').' type='.dol_escape_htmltag($type).' module='.dol_escape_htmltag($module).' url='.dol_escape_htmltag($url).' '.dol_escape_htmltag($_SERVER["PHP_SELF"]).'?'.dol_escape_htmltag($_SERVER["QUERY_STRING"]).' -->'."\n";
 
 $param = ($sortfield ? '&sortfield='.urlencode($sortfield) : '').($sortorder ? '&sortorder='.urlencode($sortorder) : '');
-if (!empty($websitekey)) $param .= '&website='.urlencode($websitekey);
-if (!empty($pageid))     $param .= '&pageid='.urlencode($pageid);
+if (!empty($websitekey)) {
+	$param .= '&website='.urlencode($websitekey);
+}
+if (!empty($pageid)) {
+	$param .= '&pageid='.urlencode($pageid);
+}
 
 
 // Dir scan
@@ -202,34 +228,58 @@ 
 	);
 
 	// TODO change for multicompany sharing
-	if ($module == 'company') $upload_dir = $conf->societe->dir_output;
-	elseif ($module == 'invoice') $upload_dir = $conf->facture->dir_output;
-	elseif ($module == 'invoice_supplier') $upload_dir = $conf->fournisseur->facture->dir_output;
-	elseif ($module == 'propal') $upload_dir = $conf->propal->dir_output;
-	elseif ($module == 'supplier_proposal') $upload_dir = $conf->supplier_proposal->dir_output;
-	elseif ($module == 'order') $upload_dir = $conf->commande->dir_output;
-	elseif ($module == 'order_supplier') $upload_dir = $conf->fournisseur->commande->dir_output;
-	elseif ($module == 'contract') $upload_dir = $conf->contrat->dir_output;
-	elseif ($module == 'product') $upload_dir = $conf->product->dir_output;
-	elseif ($module == 'tax') $upload_dir = $conf->tax->dir_output;
-	elseif ($module == 'project') $upload_dir = $conf->projet->dir_output;
-	elseif ($module == 'fichinter') $upload_dir = $conf->ficheinter->dir_output;
-	elseif ($module == 'user') $upload_dir = $conf->user->dir_output;
-	elseif ($module == 'expensereport') $upload_dir = $conf->expensereport->dir_output;
-	elseif ($module == 'holiday') $upload_dir = $conf->holiday->dir_output;
-	elseif ($module == 'recruitment-recruitmentcandidature') $upload_dir = $conf->recruitment->dir_output.'/recruitmentcandidature';
-	elseif ($module == 'banque') $upload_dir = $conf->bank->dir_output;
-	elseif ($module == 'mrp-mo') $upload_dir = $conf->mrp->dir_output.'/mo';
+	if ($module == 'company') {
+		$upload_dir = $conf->societe->dir_output;
+	} elseif ($module == 'invoice') {
+		$upload_dir = $conf->facture->dir_output;
+	} elseif ($module == 'invoice_supplier') {
+		$upload_dir = $conf->fournisseur->facture->dir_output;
+	} elseif ($module == 'propal') {
+		$upload_dir = $conf->propal->dir_output;
+	} elseif ($module == 'supplier_proposal') {
+		$upload_dir = $conf->supplier_proposal->dir_output;
+	} elseif ($module == 'order') {
+		$upload_dir = $conf->commande->dir_output;
+	} elseif ($module == 'order_supplier') {
+		$upload_dir = $conf->fournisseur->commande->dir_output;
+	} elseif ($module == 'contract') {
+		$upload_dir = $conf->contrat->dir_output;
+	} elseif ($module == 'product') {
+		$upload_dir = $conf->product->dir_output;
+	} elseif ($module == 'tax') {
+		$upload_dir = $conf->tax->dir_output;
+	} elseif ($module == 'project') {
+		$upload_dir = $conf->projet->dir_output;
+	} elseif ($module == 'fichinter') {
+		$upload_dir = $conf->ficheinter->dir_output;
+	} elseif ($module == 'user') {
+		$upload_dir = $conf->user->dir_output;
+	} elseif ($module == 'expensereport') {
+		$upload_dir = $conf->expensereport->dir_output;
+	} elseif ($module == 'holiday') {
+		$upload_dir = $conf->holiday->dir_output;
+	} elseif ($module == 'recruitment-recruitmentcandidature') {
+		$upload_dir = $conf->recruitment->dir_output.'/recruitmentcandidature';
+	} elseif ($module == 'banque') {
+		$upload_dir = $conf->bank->dir_output;
+	} elseif ($module == 'mrp-mo') {
+		$upload_dir = $conf->mrp->dir_output.'/mo';
+	}
 
 	// Automatic list
 	if (in_array($module, $automodules))
 	{
 		$param .= '&module='.$module;
-		if (isset($search_doc_ref) && $search_doc_ref != '') $param .= '&search_doc_ref='.urlencode($search_doc_ref);
+		if (isset($search_doc_ref) && $search_doc_ref != '') {
+			$param .= '&search_doc_ref='.urlencode($search_doc_ref);
+		}
 
 		$textifempty = ($section ? $langs->trans("NoFileFound") : ($showonrightsize == 'featurenotyetavailable' ? $langs->trans("FeatureNotYetAvailable") : $langs->trans("NoFileFound")));
 
-		if ($module == 'company') $excludefiles[] = '^contact$'; // The subdir 'contact' contains files of contacts with no id of thirdparty.
+		if ($module == 'company') {
+			$excludefiles[] = '^contact$';
+		}
+		// The subdir 'contact' contains files of contacts with no id of thirdparty.
 
 		$filter = preg_quote($search_doc_ref, '/');
 		$filearray = dol_dir_list($upload_dir, "files", 1, $filter, $excludefiles, $sortfield, $sorting, 1);
@@ -254,13 +304,19 @@ 
 			  'sendit' => string 'Envoyer fichier' (length=15)
     		 */
 			$relativepath = GETPOST('file', 'alpha') ?GETPOST('file', 'alpha') : GETPOST('section_dir', 'alpha');
-			if ($relativepath && $relativepath != '/') $relativepath .= '/';
+			if ($relativepath && $relativepath != '/') {
+				$relativepath .= '/';
+			}
 			$upload_dir = $dolibarr_main_data_root.'/'.$module.'/'.$relativepath;
 			if (GETPOSTISSET('website') || GETPOSTISSET('file_manager'))
 			{
 				$param .= '&file_manager=1';
-				if (!preg_match('/website=/', $param)) $param .= '&website='.urlencode(GETPOST('website', 'alpha'));
-				if (!preg_match('/pageid=/', $param)) $param .= '&pageid='.urlencode(GETPOST('pageid', 'int'));
+				if (!preg_match('/website=/', $param)) {
+					$param .= '&website='.urlencode(GETPOST('website', 'alpha'));
+				}
+				if (!preg_match('/pageid=/', $param)) {
+					$param .= '&pageid='.urlencode(GETPOST('pageid', 'int'));
+				}
 				//if (!preg_match('/backtopage=/',$param)) $param.='&backtopage='.urlencode($_SERVER["PHP_SELF"].'?file_manager=1&website='.$websitekey.'&pageid='.$pageid);
 			}
 		} else {
@@ -279,14 +335,21 @@ 
 		if ($section)
 		{
 			$param .= '&section='.$section;
-			if (isset($search_doc_ref) && $search_doc_ref != '') $param .= '&search_doc_ref='.$search_doc_ref;
+			if (isset($search_doc_ref) && $search_doc_ref != '') {
+				$param .= '&search_doc_ref='.$search_doc_ref;
+			}
 
 			$textifempty = $langs->trans('NoFileFound');
 		} elseif ($section === '0')
 		{
-			if ($module == 'ecm') $textifempty = '<br><div class="center"><font class="warning">'.$langs->trans("DirNotSynchronizedSyncFirst").'</font></div><br>';
-			else $textifempty = $langs->trans('NoFileFound');
-		} else $textifempty = ($showonrightsize == 'featurenotyetavailable' ? $langs->trans("FeatureNotYetAvailable") : $langs->trans("ECMSelectASection"));
+			if ($module == 'ecm') {
+				$textifempty = '<br><div class="center"><font class="warning">'.$langs->trans("DirNotSynchronizedSyncFirst").'</font></div><br>';
+			} else {
+				$textifempty = $langs->trans('NoFileFound');
+			}
+		} else {
+			$textifempty = ($showonrightsize == 'featurenotyetavailable' ? $langs->trans("FeatureNotYetAvailable") : $langs->trans("ECMSelectASection"));
+		}
 
 		if ($module == 'medias')
 		{
@@ -294,12 +357,14 @@ 
 			$modulepart = 'medias';
 			$perm = ($user->rights->website->write || $user->rights->emailing->creer);
 			$title = 'none';
-		} elseif ($module == 'ecm') // DMS/ECM -> manual structure
+		} elseif ($module == 'ecm') {
+			// DMS/ECM -> manual structure
 		{
 			if ($user->rights->ecm->read)
 			{
 				// Buttons: Preview
 				$useinecm = 2;
+		}
 			}
 
 			if ($user->rights->ecm->upload)
@@ -335,18 +400,28 @@ 
 
 // Bottom of page
 $useajax = 1;
-if (!empty($conf->dol_use_jmobile)) $useajax = 0;
-if (empty($conf->use_javascript_ajax)) $useajax = 0;
-if (!empty($conf->global->MAIN_ECM_DISABLE_JS)) $useajax = 0;
+if (!empty($conf->dol_use_jmobile)) {
+	$useajax = 0;
+}
+if (empty($conf->use_javascript_ajax)) {
+	$useajax = 0;
+}
+if (!empty($conf->global->MAIN_ECM_DISABLE_JS)) {
+	$useajax = 0;
+}
 
 //$param.=($param?'?':'').(preg_replace('/^&/','',$param));
 
 if ($useajax || $action == 'delete')
 {
 	$urlfile = '';
-	if ($action == 'delete') $urlfile = GETPOST('urlfile', 'alpha');
+	if ($action == 'delete') {
+		$urlfile = GETPOST('urlfile', 'alpha');
+	}
 
-	if (empty($section_dir)) $section_dir = GETPOST("file", "alpha");
+	if (empty($section_dir)) {
+		$section_dir = GETPOST("file", "alpha");
+	}
 	$section_id = $section;
 
 	require_once DOL_DOCUMENT_ROOT.'/core/class/html.form.class.php';
@@ -358,9 +433,15 @@ 
 	$formquestion['section_dir'] = array('type'=>'hidden', 'value'=>$section_dir, 'name'=>'section_dir'); // We must always put field, even if empty because it is filled by javascript later
 	$formquestion['sortfield'] = array('type'=>'hidden', 'value'=>$sortfield, 'name'=>'sortfield'); // We must always put field, even if empty because it is filled by javascript later
 	$formquestion['sortorder'] = array('type'=>'hidden', 'value'=>$sortorder, 'name'=>'sortorder'); // We must always put field, even if empty because it is filled by javascript later
-	if (!empty($action) && $action == 'file_manager')	$formquestion['file_manager'] = array('type'=>'hidden', 'value'=>1, 'name'=>'file_manager');
-	if (!empty($websitekey))							$formquestion['website'] = array('type'=>'hidden', 'value'=>$websitekey, 'name'=>'website');
-	if (!empty($pageid) && $pageid > 0)				$formquestion['pageid'] = array('type'=>'hidden', 'value'=>$pageid, 'name'=>'pageid');
+	if (!empty($action) && $action == 'file_manager') {
+		$formquestion['file_manager'] = array('type'=>'hidden', 'value'=>1, 'name'=>'file_manager');
+	}
+	if (!empty($websitekey)) {
+		$formquestion['website'] = array('type'=>'hidden', 'value'=>$websitekey, 'name'=>'website');
+	}
+	if (!empty($pageid) && $pageid > 0) {
+		$formquestion['pageid'] = array('type'=>'hidden', 'value'=>$pageid, 'name'=>'pageid');
+	}
 
 	print $form->formconfirm($url, $langs->trans("DeleteFile"), $langs->trans("ConfirmDeleteFile"), 'confirm_deletefile', $formquestion, "no", ($useajax ? 'deletefile' : 0));
 }
@@ -400,4 +481,6 @@ 
 }
 
 // Close db if mode is not noajax
-if ((!isset($mode) || $mode != 'noajax') && is_object($db)) $db->close();
+if ((!isset($mode) || $mode != 'noajax') && is_object($db)) {
+	$db->close();
+}

htdocs/core/actions_sendmails.inc.php

Braces +73 added lines, -25 removed lines

@@ -77,9 +77,15 @@ 
 	$listofnames = array();
 	$listofmimes = array();
 	$keytoavoidconflict = empty($trackid) ? '' : '-'.$trackid;
-	if (!empty($_SESSION["listofpaths".$keytoavoidconflict])) $listofpaths = explode(';', $_SESSION["listofpaths".$keytoavoidconflict]);
-	if (!empty($_SESSION["listofnames".$keytoavoidconflict])) $listofnames = explode(';', $_SESSION["listofnames".$keytoavoidconflict]);
-	if (!empty($_SESSION["listofmimes".$keytoavoidconflict])) $listofmimes = explode(';', $_SESSION["listofmimes".$keytoavoidconflict]);
+	if (!empty($_SESSION["listofpaths".$keytoavoidconflict])) {
+		$listofpaths = explode(';', $_SESSION["listofpaths".$keytoavoidconflict]);
+	}
+	if (!empty($_SESSION["listofnames".$keytoavoidconflict])) {
+		$listofnames = explode(';', $_SESSION["listofnames".$keytoavoidconflict]);
+	}
+	if (!empty($_SESSION["listofmimes".$keytoavoidconflict])) {
+		$listofmimes = explode(';', $_SESSION["listofmimes".$keytoavoidconflict]);
+	}
 
 	include_once DOL_DOCUMENT_ROOT.'/core/class/html.formmail.class.php';
 	$formmail = new FormMail($db);
@@ -103,7 +109,9 @@ 
  */
 if (($action == 'send' || $action == 'relance') && !$_POST['addfile'] && !$_POST['removAll'] && !$_POST['removedfile'] && !$_POST['cancel'] && !$_POST['modelselected'])
 {
-	if (empty($trackid)) $trackid = GETPOST('trackid', 'aZ09');
+	if (empty($trackid)) {
+		$trackid = GETPOST('trackid', 'aZ09');
+	}
 
 	$subject = ''; $actionmsg = ''; $actionmsg2 = '';
 
@@ -118,30 +126,42 @@ 
 		{
 			$resultthirdparty = $object->fetch_thirdparty();
 			$thirdparty = $object->thirdparty;
-			if (is_object($thirdparty)) $sendtosocid = $thirdparty->id;
+			if (is_object($thirdparty)) {
+				$sendtosocid = $thirdparty->id;
+			}
 		} elseif ($object->element == 'member' || $object->element == 'user')
 		{
 			$thirdparty = $object;
-			if ($object->socid > 0) $sendtosocid = $object->socid;
+			if ($object->socid > 0) {
+				$sendtosocid = $object->socid;
+			}
 		} elseif ($object->element == 'expensereport')
 		{
 			$tmpuser = new User($db);
 			$tmpuser->fetch($object->fk_user_author);
 			$thirdparty = $tmpuser;
-			if ($object->socid > 0) $sendtosocid = $object->socid;
+			if ($object->socid > 0) {
+				$sendtosocid = $object->socid;
+			}
 		} elseif ($object->element == 'societe')
 		{
 			$thirdparty = $object;
-			if (is_object($thirdparty) && $thirdparty->id > 0) $sendtosocid = $thirdparty->id;
+			if (is_object($thirdparty) && $thirdparty->id > 0) {
+				$sendtosocid = $thirdparty->id;
+			}
 		} elseif ($object->element == 'contact')
 		{
 			$contact = $object;
 			if ($contact->id > 0) {
 				$contact->fetch_thirdparty();
 				$thirdparty = $contact->thirdparty;
-				if (is_object($thirdparty) && $thirdparty->id > 0) $sendtosocid = $thirdparty->id;
+				if (is_object($thirdparty) && $thirdparty->id > 0) {
+					$sendtosocid = $thirdparty->id;
+				}
 			}
-		} else dol_print_error('', "Use actions_sendmails.in.php for an element/object '".$object->element."' that is not supported");
+		} else {
+			dol_print_error('', "Use actions_sendmails.in.php for an element/object '".$object->element."' that is not supported");
+		}
 
 		if (is_object($hookmanager))
 		{
@@ -165,8 +185,11 @@ 
 		$receiver = $_POST['receiver'];
 		if (!is_array($receiver))
 		{
-			if ($receiver == '-1') $receiver = array();
-			else $receiver = array($receiver);
+			if ($receiver == '-1') {
+				$receiver = array();
+			} else {
+				$receiver = array($receiver);
+			}
 		}
 
 		$tmparray = array();
@@ -181,17 +204,22 @@ 
 			// Recipient was provided from combo list
 			foreach ($receiver as $key=>$val)
 			{
-				if ($val == 'thirdparty') // Key selected means current third party ('thirdparty' may be used for current member or current user too)
+				if ($val == 'thirdparty') {
+					// Key selected means current third party ('thirdparty' may be used for current member or current user too)
 				{
 					$tmparray[] = dol_string_nospecial($thirdparty->getFullName($langs), ' ', array(",")).' <'.$thirdparty->email.'>';
 				}
-				elseif ($val == 'contact') // Key selected means current contact
+				} elseif ($val == 'contact') {
+					// Key selected means current contact
 				{
 					$tmparray[] = dol_string_nospecial($contact->getFullName($langs), ' ', array(",")).' <'.$contact->email.'>';
+				}
 					$sendtoid[] = $contact->id;
-				} elseif ($val)	// $val is the Id of a contact
+				} elseif ($val) {
+					// $val is the Id of a contact
 				{
 					$tmparray[] = $thirdparty->contact_get_property((int) $val, 'email');
+				}
 					$sendtoid[] = ((int) $val);
 				}
 			}
@@ -217,8 +245,11 @@ 
 		$receivercc = $_POST['receivercc'];
 		if (!is_array($receivercc))
 		{
-			if ($receivercc == '-1') $receivercc = array();
-			else $receivercc = array($receivercc);
+			if ($receivercc == '-1') {
+				$receivercc = array();
+			} else {
+				$receivercc = array($receivercc);
+			}
 		}
 		$tmparray = array();
 		if (trim($_POST['sendtocc']))
@@ -230,18 +261,24 @@ 
 			foreach ($receivercc as $key=>$val)
 			{
 				// Recipient was provided from combo list
-				if ($val == 'thirdparty')	// Key selected means currentthird party (may be usd for current member or current user too)
+				if ($val == 'thirdparty') {
+					// Key selected means currentthird party (may be usd for current member or current user too)
 				{
 					$tmparray[] = dol_string_nospecial($thirdparty->name, ' ', array(",")).' <'.$thirdparty->email.'>';
 				}
+				}
 				// Recipient was provided from combo list
-				elseif ($val == 'contact')	// Key selected means current contact
+				elseif ($val == 'contact') {
+					// Key selected means current contact
 				{
 					$tmparray[] = dol_string_nospecial($contact->name, ' ', array(",")).' <'.$contact->email.'>';
+				}
 					//$sendtoid[] = $contact->id;  TODO Add also id of contact in CC ?
-				} elseif ($val)				// $val is the Id of a contact
+				} elseif ($val) {
+					// $val is the Id of a contact
 				{
 					$tmparray[] = $thirdparty->contact_get_property((int) $val, 'email');
+				}
 					//$sendtoid[] = ((int) $val);  TODO Add also id of contact in CC ?
 				}
 			}
@@ -326,7 +363,9 @@ 
 				{
 					$actionmsg = $langs->transnoentities('MailFrom').': '.dol_escape_htmltag($from);
 					$actionmsg = dol_concatdesc($actionmsg, $langs->transnoentities('MailTo').': '.dol_escape_htmltag($sendto));
-					if ($sendtocc) $actionmsg = dol_concatdesc($actionmsg, $langs->transnoentities('Bcc').": ".dol_escape_htmltag($sendtocc));
+					if ($sendtocc) {
+						$actionmsg = dol_concatdesc($actionmsg, $langs->transnoentities('Bcc').": ".dol_escape_htmltag($sendtocc));
+					}
 					$actionmsg = dol_concatdesc($actionmsg, $langs->transnoentities('MailTopic').": ".$subject);
 					$actionmsg = dol_concatdesc($actionmsg, $langs->transnoentities('TextUsedInTheMessageBody').":");
 					$actionmsg = dol_concatdesc($actionmsg, $message);
@@ -405,7 +444,9 @@ 
 			}
 
 			// Send mail (substitutionarray must be done just before this)
-			if (empty($sendcontext)) $sendcontext = 'standard';
+			if (empty($sendcontext)) {
+				$sendcontext = 'standard';
+			}
 			$mailfile = new CMailFile($subject, $sendto, $from, $message, $filepath, $mimetype, $filename, $sendtocc, $sendtobcc, $deliveryreceipt, -1, '', '', $trackid, '', $sendcontext);
 
 			if ($mailfile->error)
@@ -419,7 +460,10 @@ 
 					// Initialisation of datas of object to call trigger
 					if (is_object($object))
 					{
-						if (empty($actiontypecode)) $actiontypecode = 'AC_OTH_AUTO'; // Event insert into agenda automatically
+						if (empty($actiontypecode)) {
+							$actiontypecode = 'AC_OTH_AUTO';
+						}
+						// Event insert into agenda automatically
 
 						$object->socid = $sendtosocid; // To link to a company
 						$object->sendtoid = $sendtoid; // To link to contact-addresses. This is an array.
@@ -451,7 +495,9 @@ 
 						{
 							// Call trigger
 							$result = $object->call_trigger(empty($triggersendname) ? $trigger_name : $triggersendname, $user);
-							if ($result < 0) $error++;
+							if ($result < 0) {
+								$error++;
+							}
 							// End call triggers
 
 							if ($error) {
@@ -467,7 +513,9 @@ 
 					setEventMessages($mesg, null, 'mesgs');
 
   					$moreparam = '';
-	  				if (isset($paramname2) || isset($paramval2)) $moreparam .= '&'.($paramname2 ? $paramname2 : 'mid').'='.$paramval2;
+	  				if (isset($paramname2) || isset($paramval2)) {
+	  					$moreparam .= '&'.($paramname2 ? $paramname2 : 'mid').'='.$paramval2;
+	  				}
 		  			header('Location: '.$_SERVER["PHP_SELF"].'?'.($paramname ? $paramname : 'id').'='.(is_object($object) ? $object->id : '').$moreparam);
 			  		exit;
 				} else {

htdocs/core/lib/member.lib.php

Braces +18 added lines, -6 removed lines

@@ -59,7 +59,9 @@ 
 		$head[$h][0] = DOL_URL_ROOT.'/adherents/subscription.php?rowid='.$object->id;
 		$head[$h][1] = $langs->trans("Subscriptions");
 		$head[$h][2] = 'subscription';
-		if ($nbSubscription > 0) $head[$h][1] .= '<span class="badge marginleftonlyshort">'.$nbSubscription.'</span>';
+		if ($nbSubscription > 0) {
+			$head[$h][1] .= '<span class="badge marginleftonlyshort">'.$nbSubscription.'</span>';
+		}
 		$h++;
 	}
 
@@ -70,13 +72,21 @@ 
 	complete_head_from_modules($conf, $langs, $object, $head, $h, 'member');
 
 	$nbNote = 0;
-	if (!empty($object->note)) $nbNote++;
-	if (!empty($object->note_private)) $nbNote++;
-	if (!empty($object->note_public)) $nbNote++;
+	if (!empty($object->note)) {
+		$nbNote++;
+	}
+	if (!empty($object->note_private)) {
+		$nbNote++;
+	}
+	if (!empty($object->note_public)) {
+		$nbNote++;
+	}
 	$head[$h][0] = DOL_URL_ROOT.'/adherents/note.php?id='.$object->id;
 	$head[$h][1] = $langs->trans("Note");
 	$head[$h][2] = 'note';
-	if ($nbNote > 0) $head[$h][1] .= '<span class="badge marginleftonlyshort">'.$nbNote.'</span>';
+	if ($nbNote > 0) {
+		$head[$h][1] .= '<span class="badge marginleftonlyshort">'.$nbNote.'</span>';
+	}
 	$h++;
 
 	// Attachments
@@ -87,7 +97,9 @@ 
 	$nbLinks = Link::count($db, $object->element, $object->id);
 	$head[$h][0] = DOL_URL_ROOT.'/adherents/document.php?id='.$object->id;
 	$head[$h][1] = $langs->trans('Documents');
-	if (($nbFiles + $nbLinks) > 0) $head[$h][1] .= '<span class="badge marginleftonlyshort">'.($nbFiles + $nbLinks).'</span>';
+	if (($nbFiles + $nbLinks) > 0) {
+		$head[$h][1] .= '<span class="badge marginleftonlyshort">'.($nbFiles + $nbLinks).'</span>';
+	}
 	$head[$h][2] = 'document';
 	$h++;