alxarafe / alixar

dolibarr/htdocs/core/class/dolgraph.class.php

Braces +143 added lines, -59 removed lines

@@ -103,7 +103,9 @@ 
 			$isgdinstalled=0;
 			foreach ($modules_list as $module)
 			{
-				if ($module == 'gd') $isgdinstalled=1;
+				if ($module == 'gd') {
+				    $isgdinstalled=1;
+				}
 			}
 			if (! $isgdinstalled)
 			{
@@ -120,9 +122,15 @@ 
 		if (is_readable($color_file))
 		{
 			include_once $color_file;
-			if (isset($theme_bordercolor)) $this->bordercolor = $theme_bordercolor;
-			if (isset($theme_datacolor))   $this->datacolor   = $theme_datacolor;
-			if (isset($theme_bgcolor))     $this->bgcolor     = $theme_bgcolor;
+			if (isset($theme_bordercolor)) {
+			    $this->bordercolor = $theme_bordercolor;
+			}
+			if (isset($theme_datacolor)) {
+			    $this->datacolor   = $theme_datacolor;
+			}
+			if (isset($theme_bgcolor)) {
+			    $this->bgcolor     = $theme_bgcolor;
+			}
 		}
 		//print 'bgcolor: '.join(',',$this->bgcolor).'<br>';
 	}
@@ -493,13 +501,11 @@ 
 			{
 				//print 'ee'.join(',',$theme_bgcoloronglet);
 				$this->bgcolor = $theme_bgcoloronglet;
-			}
-			else
+			} else
 			{
 				$this->bgcolor = $theme_bgcolor;
 			}
-		}
-		else
+		} else
 		{
 			$this->bgcolor = $bg_color;
 		}
@@ -523,13 +529,11 @@ 
 			{
 				//print 'ee'.join(',',$theme_bgcoloronglet);
 				$this->bgcolorgrid = $theme_bgcoloronglet;
-			}
-			else
+			} else
 			{
 				$this->bgcolorgrid = $theme_bgcolor;
 			}
-		}
-		else
+		} else
 		{
 			$this->bgcolorgrid = $bg_colorgrid;
 		}
@@ -611,7 +615,9 @@ 
 	{
         // phpcs:enable
 		$max = $this->GetMaxValueInData();
-		if ($max != 0) $max++;
+		if ($max != 0) {
+		    $max++;
+		}
 		$size=dol_strlen(abs(ceil($max)));
 		$factor=1;
 		for ($i=0; $i < ($size-1); $i++)
@@ -620,7 +626,9 @@ 
 		}
 
 		$res=0;
-		if (is_numeric($max)) $res=ceil($max/$factor)*$factor;
+		if (is_numeric($max)) {
+		    $res=ceil($max/$factor)*$factor;
+		}
 
 		//print "max=".$max." res=".$res;
 		return $res;
@@ -636,8 +644,12 @@ 
 	{
         // phpcs:enable
 		$min = $this->GetMinValueInData();
-		if ($min == '') $min=0;
-		if ($min != 0) $min--;
+		if ($min == '') {
+		    $min=0;
+		}
+		if ($min != 0) {
+		    $min--;
+		}
 		$size=dol_strlen(abs(floor($min)));
 		$factor=1;
 		for ($i=0; $i < ($size-1); $i++)
@@ -697,15 +709,27 @@ 
 
 		dol_syslog(get_class($this)."::draw_artichow this->type=".join(',',$this->type));
 
-		if (! defined('SHADOW_RIGHT_TOP'))  define('SHADOW_RIGHT_TOP',3);
-		if (! defined('LEGEND_BACKGROUND')) define('LEGEND_BACKGROUND',2);
-		if (! defined('LEGEND_LINE'))       define('LEGEND_LINE',1);
+		if (! defined('SHADOW_RIGHT_TOP')) {
+		    define('SHADOW_RIGHT_TOP',3);
+		}
+		if (! defined('LEGEND_BACKGROUND')) {
+		    define('LEGEND_BACKGROUND',2);
+		}
+		if (! defined('LEGEND_LINE')) {
+		    define('LEGEND_LINE',1);
+		}
 
 		// Create graph
 		$classname='';
-		if (! isset($this->type[0]) || $this->type[0] == 'bars')  $classname='BarPlot';    // Only one type (first one) is supported by artichow
-		else if ($this->type[0] == 'lines' || $this->type[0] == 'linesnopoint') $classname='LinePlot';
-		else $classname='TypeUnknown';
+		if (! isset($this->type[0]) || $this->type[0] == 'bars') {
+		    $classname='BarPlot';
+		}
+		// Only one type (first one) is supported by artichow
+		else if ($this->type[0] == 'lines' || $this->type[0] == 'linesnopoint') {
+		    $classname='LinePlot';
+		} else {
+		    $classname='TypeUnknown';
+		}
 		include_once ARTICHOW_PATH.$classname.'.class.php';
 
 		// Definition de couleurs
@@ -727,8 +751,11 @@ 
 			$graph->title->setFont(new $artichow_defaultfont(10));
 		}
 
-		if (is_array($this->bgcolor)) $graph->setBackgroundColor($bgcolor);
-		else $graph->setBackgroundGradient($colorgradient);
+		if (is_array($this->bgcolor)) {
+		    $graph->setBackgroundColor($bgcolor);
+		} else {
+		    $graph->setBackgroundGradient($colorgradient);
+		}
 
 		$group = new PlotGroup;
 		//$group->setSpace(5, 5, 0, 0);
@@ -736,18 +763,27 @@ 
 		$paddleft=50;
 		$paddright=10;
 		$strl=dol_strlen(max(abs($this->MaxValue),abs($this->MinValue)));
-		if ($strl > 6) $paddleft += ($strl * 4);
+		if ($strl > 6) {
+		    $paddleft += ($strl * 4);
+		}
 		$group->setPadding($paddleft, $paddright);		// Width on left and right for Y axis values
 		$group->legend->setSpace(0);
 		$group->legend->setPadding(2,2,2,2);
 		$group->legend->setPosition(null, 0.1);
 		$group->legend->setBackgroundColor($colorsemitrans);
 
-		if (is_array($this->bgcolorgrid)) $group->grid->setBackgroundColor($bgcolorgrid);
-		else $group->grid->setBackgroundColor($colortrans);
+		if (is_array($this->bgcolorgrid)) {
+		    $group->grid->setBackgroundColor($bgcolorgrid);
+		} else {
+		    $group->grid->setBackgroundColor($colortrans);
+		}
 
-		if ($this->hideXGrid)	$group->grid->hideVertical(true);
-		if ($this->hideYGrid)	$group->grid->hideHorizontal(true);
+		if ($this->hideXGrid) {
+		    $group->grid->hideVertical(true);
+		}
+		if ($this->hideYGrid) {
+		    $group->grid->hideHorizontal(true);
+		}
 
 		// On boucle sur chaque lot de donnees
 		$legends=array();
@@ -785,17 +821,29 @@ 
 				$colorgrey=new Color(100,100,100);
 				$colorborder=new Color($this->datacolor[$i][0],$this->datacolor[$i][1],$this->datacolor[$i][2]);
 
-				if ($this->mode == 'side')  $plot = new BarPlot($newvalues, $i+1, $nblot);
-				if ($this->mode == 'depth') $plot = new BarPlot($newvalues, 1, 1, ($nblot-$i-1)*5);
+				if ($this->mode == 'side') {
+				    $plot = new BarPlot($newvalues, $i+1, $nblot);
+				}
+				if ($this->mode == 'depth') {
+				    $plot = new BarPlot($newvalues, 1, 1, ($nblot-$i-1)*5);
+				}
 
 				$plot->barBorder->setColor($colorgrey);
 				//$plot->setBarColor($color);
 				$plot->setBarGradient(new LinearGradient($colorbis, $color, 90));
 
-				if ($this->mode == 'side')  $plot->setBarPadding(0.1, 0.1);
-				if ($this->mode == 'depth') $plot->setBarPadding(0.1, 0.4);
-				if ($this->mode == 'side')  $plot->setBarSpace(5);
-				if ($this->mode == 'depth') $plot->setBarSpace(2);
+				if ($this->mode == 'side') {
+				    $plot->setBarPadding(0.1, 0.1);
+				}
+				if ($this->mode == 'depth') {
+				    $plot->setBarPadding(0.1, 0.4);
+				}
+				if ($this->mode == 'side') {
+				    $plot->setBarSpace(5);
+				}
+				if ($this->mode == 'depth') {
+				    $plot->setBarSpace(2);
+				}
 
 				$plot->barShadow->setSize($this->SetShading);
 				$plot->barShadow->setPosition(SHADOW_RIGHT_TOP);
@@ -840,8 +888,12 @@ 
 			// solve a bug in Artichow with UTF8
 			if (count($this->Legend))
 			{
-				if ($this->type[0] == 'bars')  										$group->legend->add($plot, $this->Legend[$i], LEGEND_BACKGROUND);
-				if ($this->type[0] == 'lines' || $this->type[0] == 'linesnopoint')	$group->legend->add($plot, $this->Legend[$i], LEGEND_LINE);
+				if ($this->type[0] == 'bars') {
+				    $group->legend->add($plot, $this->Legend[$i], LEGEND_BACKGROUND);
+				}
+				if ($this->type[0] == 'lines' || $this->type[0] == 'linesnopoint') {
+				    $group->legend->add($plot, $this->Legend[$i], LEGEND_LINE);
+				}
 			}
 			$group->add($plot);
 
@@ -852,7 +904,9 @@ 
 		$group->axis->bottom->label->setFont(new $artichow_defaultfont(7));
 
 		//print $group->axis->bottom->getLabelNumber();
-		if ($this->labelInterval > 0) $group->axis->bottom->setLabelInterval($this->labelInterval);
+		if ($this->labelInterval > 0) {
+		    $group->axis->bottom->setLabelInterval($this->labelInterval);
+		}
 
 		$graph->add($group);
 
@@ -895,23 +949,30 @@ 
 
 		$legends=array();
 		$nblot=count($this->data[0])-1;    // -1 to remove legend
-		if ($nblot < 0) dol_syslog('Bad value for property ->data. Must be set by mydolgraph->SetData before calling mydolgrapgh->draw', LOG_WARNING);
+		if ($nblot < 0) {
+		    dol_syslog('Bad value for property ->data. Must be set by mydolgraph->SetData before calling mydolgrapgh->draw', LOG_WARNING);
+		}
 		$firstlot=0;
 		// Works with line but not with bars
 		//if ($nblot > 2) $firstlot = ($nblot - 2);        // We limit nblot to 2 because jflot can't manage more than 2 bars on same x
 
 		$i=$firstlot;
 		$serie=array();
-		while ($i < $nblot)	// Loop on each serie
+		while ($i < $nblot) {
+		    // Loop on each serie
 		{
-			$values=array();	// Array with horizontal y values (specific values of a serie) for each abscisse x
+			$values=array();
+		}
+		// Array with horizontal y values (specific values of a serie) for each abscisse x
 			$serie[$i]="var d".$i." = [];\n";
 
 			// Fill array $values
 			$x=0;
-			foreach($this->data as $valarray)	// Loop on each x
+			foreach($this->data as $valarray) {
+			    // Loop on each x
 			{
 				$legends[$x] = $valarray[0];
+			}
 				$values[$x]  = (is_numeric($valarray[$i+1]) ? $valarray[$i+1] : null);
 				$x++;
 			}
@@ -920,13 +981,16 @@ 
 			if (isset($this->type[$firstlot]) && $this->type[$firstlot] == 'pie')
 			{
 				foreach($values as $x => $y) {
-					if (isset($y)) $serie[$i].='d'.$i.'.push({"label":"'.dol_escape_js($legends[$x]).'", "data":'.$y.'});'."\n";
+					if (isset($y)) {
+					    $serie[$i].='d'.$i.'.push({"label":"'.dol_escape_js($legends[$x]).'", "data":'.$y.'});'."\n";
+					}
 				}
-			}
-			else
+			} else
 			{
 				foreach($values as $x => $y) {
-					if (isset($y)) $serie[$i].='d'.$i.'.push(['.$x.', '.$y.']);'."\n";
+					if (isset($y)) {
+					    $serie[$i].='d'.$i.'.push(['.$x.', '.$y.']);'."\n";
+					}
 				}
 			}
 
@@ -936,7 +1000,9 @@ 
 		$tag=dol_escape_htmltag(dol_string_unaccent(dol_string_nospecial(basename($file),'_',array('-','.'))));
 
 		$this->stringtoshow ='<!-- Build using '.$this->_library.' -->'."\n";
-		if (! empty($this->title)) $this->stringtoshow.='<div align="center" class="dolgraphtitle'.(empty($this->cssprefix)?'':' dolgraphtitle'.$this->cssprefix).'">'.$this->title.'</div>';
+		if (! empty($this->title)) {
+		    $this->stringtoshow.='<div align="center" class="dolgraphtitle'.(empty($this->cssprefix)?'':' dolgraphtitle'.$this->cssprefix).'">'.$this->title.'</div>';
+		}
 		if (! empty($this->shownographyet))
 		{
 		  $this->stringtoshow.='<div style="width:'.$this->width.'px;height:'.$this->height.'px;" class="nographyet"></div>';
@@ -951,8 +1017,7 @@ 
 		if ($nblot < 0)
 		{
 			$this->stringtoshow.='<!-- No series of data -->';
-		}
-		else
+		} else
 		{
 			while ($i < $nblot)
 			{
@@ -966,7 +1031,9 @@ 
 		if (isset($this->type[$firstlot]) && $this->type[$firstlot] == 'pie')
 		{
 			$datacolor=array();
-			foreach($this->datacolor as $val) $datacolor[]="#".sprintf("%02x%02x%02x",$val[0],$val[1],$val[2]);
+			foreach($this->datacolor as $val) {
+			    $datacolor[]="#".sprintf("%02x%02x%02x",$val[0],$val[1],$val[2]);
+			}
 
 			$urltemp='';	// TODO Add support for url link into labels
 			$showlegend=$this->showlegend;
@@ -993,13 +1060,17 @@ 
 								var number=series.data[0][1];
 								return \'';
 								$this->stringtoshow.='<span style="font-size:8pt;text-align:center;padding:2px;color:black;">';
-								if ($urltemp) $this->stringtoshow.='<a style="color: #FFFFFF;" border="0" href="'.$urltemp.'">';
+								if ($urltemp) {
+								    $this->stringtoshow.='<a style="color: #FFFFFF;" border="0" href="'.$urltemp.'">';
+								}
 								$this->stringtoshow.='\'+';
 								$this->stringtoshow.=($showlegend?'':'label+\' \'+');	// Hide label if already shown in legend
 								$this->stringtoshow.=($showpointvalue?'number+':'');
 								$this->stringtoshow.=($showpercent?'\'<br/>\'+percent+\'%\'+':'');
 								$this->stringtoshow.='\'';
-								if ($urltemp) $this->stringtoshow.='</a>';
+								if ($urltemp) {
+								    $this->stringtoshow.='</a>';
+								}
 								$this->stringtoshow.='</span>\';
 							},
 							background: {
@@ -1060,9 +1131,11 @@ 
 						var y = item.datapoint[1].toFixed(2);
 						var z = item.series.xaxis.ticks[item.dataIndex].label;
 						';
-						if ($this->showpointvalue > 0) $this->stringtoshow.='
+						if ($this->showpointvalue > 0) {
+						    $this->stringtoshow.='
 							showTooltip_'.$tag.'(item.pageX, item.pageY, item.series.label + "<br>" + z + " => " + y);
 						';
+						}
 						$this->stringtoshow.='
 					}
 				}
@@ -1080,11 +1153,17 @@ 
 			$i=$firstlot;
 			while ($i < $nblot)
 			{
-				if ($i > $firstlot) $this->stringtoshow.=', '."\n";
+				if ($i > $firstlot) {
+				    $this->stringtoshow.=', '."\n";
+				}
 				$color=sprintf("%02x%02x%02x",$this->datacolor[$i][0],$this->datacolor[$i][1],$this->datacolor[$i][2]);
 				$this->stringtoshow.='{ ';
-				if (! isset($this->type[$i]) || $this->type[$i] == 'bars') $this->stringtoshow.='bars: { lineWidth: 1, show: true, align: "'.($i==$firstlot?'center':'left').'", barWidth: 0.5 }, ';
-				if (isset($this->type[$i]) && ($this->type[$i] == 'lines' || $this->type[$i] == 'linesnopoint')) $this->stringtoshow.='lines: { show: true, fill: false }, points: { show: '.($this->type[$i] == 'linesnopoint' ? 'false' : 'true').' }, ';
+				if (! isset($this->type[$i]) || $this->type[$i] == 'bars') {
+				    $this->stringtoshow.='bars: { lineWidth: 1, show: true, align: "'.($i==$firstlot?'center':'left').'", barWidth: 0.5 }, ';
+				}
+				if (isset($this->type[$i]) && ($this->type[$i] == 'lines' || $this->type[$i] == 'linesnopoint')) {
+				    $this->stringtoshow.='lines: { show: true, fill: false }, points: { show: '.($this->type[$i] == 'linesnopoint' ? 'false' : 'true').' }, ';
+				}
 				$this->stringtoshow.='color: "#'.$color.'", label: "'.(isset($this->Legend[$i]) ? dol_escape_js($this->Legend[$i]) : '').'", data: d'.$i.' }';
 				$i++;
 			}
@@ -1096,7 +1175,9 @@ 
 			$x=0;
 			foreach($this->data as $key => $valarray)
 			{
-				if ($x > 0) $this->stringtoshow.=', '."\n";
+				if ($x > 0) {
+				    $this->stringtoshow.=', '."\n";
+				}
 				$this->stringtoshow.= ' ['.$x.', "'.$valarray[0].'"]';
 				$x++;
 			}
@@ -1155,8 +1236,11 @@ 
 
 		if ($direction == 'width')
 		{
-			if (empty($conf->dol_optimize_smallscreen)) return ($defaultsize ? $defaultsize : '500');
-			else return (empty($_SESSION['dol_screen_width']) ? '280' : ($_SESSION['dol_screen_width']-40));
+			if (empty($conf->dol_optimize_smallscreen)) {
+			    return ($defaultsize ? $defaultsize : '500');
+			} else {
+			    return (empty($_SESSION['dol_screen_width']) ? '280' : ($_SESSION['dol_screen_width']-40));
+			}
 		}
 		if ($direction == 'height')
 		{

dolibarr/htdocs/core/class/extrafields.class.php

Braces +287 added lines, -258 removed lines

@@ -173,11 +173,19 @@ 
 	 */
 	function addExtraField($attrname, $label, $type, $pos, $size, $elementtype, $unique=0, $required=0, $default_value='', $param='', $alwayseditable=0, $perms='', $list='-1', $help='', $computed='', $entity='', $langfile='', $enabled='1')
 	{
-		if (empty($attrname)) return -1;
-		if (empty($label)) return -1;
+		if (empty($attrname)) {
+		    return -1;
+		}
+		if (empty($label)) {
+		    return -1;
+		}
 
-		if ($elementtype == 'thirdparty') $elementtype='societe';
-		if ($elementtype == 'contact') $elementtype='socpeople';
+		if ($elementtype == 'thirdparty') {
+		    $elementtype='societe';
+		}
+		if ($elementtype == 'contact') {
+		    $elementtype='socpeople';
+		}
 
 		// Create field into database except for separator type which is not stored in database
 		if ($type != 'separate')
@@ -195,10 +203,10 @@ 
 				$this->error='';
 				$this->errno=0;
 				return 1;
+			} else {
+			    return -2;
 			}
-			else return -2;
-		}
-		else
+		} else
 		{
 			return -1;
 		}
@@ -223,11 +231,17 @@ 
 	 */
 	private function create($attrname, $type='varchar', $length=255, $elementtype='member', $unique=0, $required=0, $default_value='',$param='', $perms='', $list='0', $computed='')
 	{
-		if ($elementtype == 'thirdparty') $elementtype='societe';
-		if ($elementtype == 'contact') $elementtype='socpeople';
+		if ($elementtype == 'thirdparty') {
+		    $elementtype='societe';
+		}
+		if ($elementtype == 'contact') {
+		    $elementtype='socpeople';
+		}
 
 		$table=$elementtype.'_extrafields';
-		if ($elementtype == 'categorie') $table='categories_extrafields';
+		if ($elementtype == 'categorie') {
+		    $table='categories_extrafields';
+		}
 
 		if (! empty($attrname) && preg_match("/^\w[a-zA-Z0-9_]*$/",$attrname) && ! is_numeric($attrname))
 		{
@@ -261,7 +275,9 @@ 
 			} else {
 				$typedb=$type;
 				$lengthdb=$length;
-				if ($type == 'varchar' && empty($lengthdb)) $lengthdb='255';
+				if ($type == 'varchar' && empty($lengthdb)) {
+				    $lengthdb='255';
+				}
 			}
 			$field_desc = array(
 				'type'=>$typedb,
@@ -279,15 +295,13 @@ 
 					$resql=$this->db->query($sql,1,'dml');
 				}
 				return 1;
-			}
-			else
+			} else
 			{
 				$this->error=$this->db->lasterror();
 				$this->errno=$this->db->lasterrno();
 				return -1;
 			}
-		}
-		else
+		} else
 		{
 			return 0;
 		}
@@ -322,27 +336,39 @@ 
         // phpcs:enable
 		global $conf,$user;
 
-		if ($elementtype == 'thirdparty') $elementtype='societe';
-		if ($elementtype == 'contact') $elementtype='socpeople';
+		if ($elementtype == 'thirdparty') {
+		    $elementtype='societe';
+		}
+		if ($elementtype == 'contact') {
+		    $elementtype='socpeople';
+		}
 
 		// Clean parameters
-		if (empty($pos)) $pos=0;
-		if (empty($list)) $list='0';
-		if (empty($required)) $required=0;
-		if (empty($unique)) $unique=0;
-		if (empty($alwayseditable)) $alwayseditable=0;
+		if (empty($pos)) {
+		    $pos=0;
+		}
+		if (empty($list)) {
+		    $list='0';
+		}
+		if (empty($required)) {
+		    $required=0;
+		}
+		if (empty($unique)) {
+		    $unique=0;
+		}
+		if (empty($alwayseditable)) {
+		    $alwayseditable=0;
+		}
 
 		if (! empty($attrname) && preg_match("/^\w[a-zA-Z0-9-_]*$/",$attrname) && ! is_numeric($attrname))
 		{
 			if (is_array($param) && count($param) > 0)
 			{
 				$params = serialize($param);
-			}
-			elseif (strlen($param) > 0)
+			} elseif (strlen($param) > 0)
 			{
 				$params = trim($param);
-			}
-			else
+			} else
 			{
 				$params='';
 			}
@@ -397,8 +423,7 @@ 
 			if ($this->db->query($sql))
 			{
 				return 1;
-			}
-			else
+			} else
 			{
 				$this->error=$this->db->lasterror();
 				$this->errno=$this->db->lasterrno();
@@ -416,11 +441,17 @@ 
 	 */
 	function delete($attrname, $elementtype='member')
 	{
-		if ($elementtype == 'thirdparty') $elementtype='societe';
-		if ($elementtype == 'contact') $elementtype='socpeople';
+		if ($elementtype == 'thirdparty') {
+		    $elementtype='societe';
+		}
+		if ($elementtype == 'contact') {
+		    $elementtype='socpeople';
+		}
 
 		$table=$elementtype.'_extrafields';
-		if ($elementtype == 'categorie') $table='categories_extrafields';
+		if ($elementtype == 'categorie') {
+		    $table='categories_extrafields';
+		}
 
 		$error=0;
 
@@ -457,8 +488,7 @@ 
 			}
 
 			return $result;
-		}
-		else
+		} else
 		{
 			return 0;
 		}
@@ -477,8 +507,12 @@ 
         // phpcs:enable
 		global $conf;
 
-		if ($elementtype == 'thirdparty') $elementtype='societe';
-		if ($elementtype == 'contact') $elementtype='socpeople';
+		if ($elementtype == 'thirdparty') {
+		    $elementtype='societe';
+		}
+		if ($elementtype == 'contact') {
+		    $elementtype='socpeople';
+		}
 
 		if (isset($attrname) && $attrname != '' && preg_match("/^\w[a-zA-Z0-9-_]*$/",$attrname))
 		{
@@ -492,14 +526,12 @@ 
 			if ($resql)
 			{
 				return 1;
-			}
-			else
+			} else
 			{
 				print dol_print_error($this->db);
 				return -1;
 			}
-		}
-		else
+		} else
 		{
 			return 0;
 		}
@@ -531,11 +563,17 @@ 
 	 */
 	function update($attrname, $label, $type, $length, $elementtype, $unique=0, $required=0, $pos=0, $param='', $alwayseditable=0, $perms='', $list='', $help='', $default='', $computed='', $entity='', $langfile='', $enabled='1', $totalizable=0)
 	{
-		if ($elementtype == 'thirdparty') $elementtype='societe';
-		if ($elementtype == 'contact') $elementtype='socpeople';
+		if ($elementtype == 'thirdparty') {
+		    $elementtype='societe';
+		}
+		if ($elementtype == 'contact') {
+		    $elementtype='socpeople';
+		}
 
         $table=$elementtype.'_extrafields';
-		if ($elementtype == 'categorie') $table='categories_extrafields';
+		if ($elementtype == 'categorie') {
+		    $table='categories_extrafields';
+		}
 
 		if (isset($attrname) && $attrname != '' && preg_match("/^\w[a-zA-Z0-9-_]*$/",$attrname))
 		{
@@ -571,10 +609,12 @@ 
 			}
 			$field_desc = array('type'=>$typedb, 'value'=>$lengthdb, 'null'=>($required?'NOT NULL':'NULL'), 'default'=>$default);
 
-			if ($type != 'separate') // No table update when separate type
+			if ($type != 'separate') {
+			    // No table update when separate type
 			{
 				$result=$this->db->DDLUpdateField(MAIN_DB_PREFIX.$table, $attrname, $field_desc);
 			}
+			}
 			if ($result > 0 || $type == 'separate')
 			{
 				if ($label)
@@ -587,28 +627,24 @@ 
 					if ($unique)
 					{
 						$sql="ALTER TABLE ".MAIN_DB_PREFIX.$table." ADD UNIQUE INDEX uk_".$table."_".$attrname." (".$attrname.")";
-					}
-					else
+					} else
 					{
 						$sql="ALTER TABLE ".MAIN_DB_PREFIX.$table." DROP INDEX uk_".$table."_".$attrname;
 					}
 					dol_syslog(get_class($this).'::update', LOG_DEBUG);
 					$resql=$this->db->query($sql,1,'dml');
 					return 1;
-				}
-				else
+				} else
 				{
 					$this->error=$this->db->lasterror();
 					return -1;
 				}
-			}
-			else
+			} else
 			{
 				$this->error=$this->db->lasterror();
 				return -1;
 			}
-		}
-		else
+		} else
 		{
 			return 0;
 		}
@@ -646,17 +682,31 @@ 
 		dol_syslog(get_class($this)."::update_label ".$attrname.", ".$label.", ".$type.", ".$size.", ".$elementtype.", ".$unique.", ".$required.", ".$pos.", ".$alwayseditable.", ".$perms.", ".$list.", ".$default.", ".$computed.", ".$entity.", ".$langfile.", ".$enabled.", ".$totalizable);
 
 		// Clean parameters
-		if ($elementtype == 'thirdparty') $elementtype='societe';
-		if ($elementtype == 'contact') $elementtype='socpeople';
+		if ($elementtype == 'thirdparty') {
+		    $elementtype='societe';
+		}
+		if ($elementtype == 'contact') {
+		    $elementtype='socpeople';
+		}
 
-		if (empty($pos)) $pos=0;
-		if (empty($list)) $list='0';
+		if (empty($pos)) {
+		    $pos=0;
+		}
+		if (empty($list)) {
+		    $list='0';
+		}
         if (empty($totalizable)) {
             $totalizable = 0;
         }
-		if (empty($required)) $required=0;
-		if (empty($unique)) $unique=0;
-		if (empty($alwayseditable)) $alwayseditable=0;
+		if (empty($required)) {
+		    $required=0;
+		}
+		if (empty($unique)) {
+		    $unique=0;
+		}
+		if (empty($alwayseditable)) {
+		    $alwayseditable=0;
+		}
 
 		if (isset($attrname) && $attrname != '' && preg_match("/^\w[a-zA-Z0-9-_]*$/",$attrname))
 		{
@@ -665,12 +715,10 @@ 
 			if (is_array($param) && count($param) > 0)
 			{
 				$params = serialize($param);
-			}
-			elseif (strlen($param) > 0)
+			} elseif (strlen($param) > 0)
 			{
 				$params = trim($param);
-			}
-			else
+			} else
 			{
 				$params='';
 			}
@@ -682,8 +730,7 @@ 
 				$sql_del.= " WHERE name = '".$attrname."'";
 				$sql_del.= " AND entity IN (0, ".($entity===''?$conf->entity:$entity).")";
 				$sql_del.= " AND elementtype = '".$elementtype."'";
-			}
-			else
+			} else
 			{
 				// We want on all entities ($entities = '0'), we delete on all only (we keep setup specific to each entity)
 				$sql_del = "DELETE FROM ".MAIN_DB_PREFIX."extrafields";
@@ -747,15 +794,13 @@ 
 			{
 				$this->db->commit();
 				return 1;
-			}
-			else
+			} else
 			{
 				$this->db->rollback();
 				print dol_print_error($this->db);
 				return -1;
 			}
-		}
-		else
+		} else
 		{
 			return 0;
 		}
@@ -775,16 +820,26 @@ 
         // phpcs:enable
 		global $conf;
 
-		if (empty($elementtype)) return array();
+		if (empty($elementtype)) {
+		    return array();
+		}
 
-		if ($elementtype == 'thirdparty') $elementtype='societe';
-		if ($elementtype == 'contact') $elementtype='socpeople';
-		if ($elementtype == 'order_supplier') $elementtype='commande_fournisseur';
+		if ($elementtype == 'thirdparty') {
+		    $elementtype='societe';
+		}
+		if ($elementtype == 'contact') {
+		    $elementtype='socpeople';
+		}
+		if ($elementtype == 'order_supplier') {
+		    $elementtype='commande_fournisseur';
+		}
 
 		$array_name_label=array();
 
 		// To avoid conflicts with external modules. TODO Remove this.
-		if (!$forceload && !empty($conf->global->MAIN_EXTRAFIELDS_DISABLED)) return $array_name_label;
+		if (!$forceload && !empty($conf->global->MAIN_EXTRAFIELDS_DISABLED)) {
+		    return $array_name_label;
+		}
 
 		// Set array of label of entity
 		// TODO Remove completely loading of label. This should be done by presentation.
@@ -808,7 +863,10 @@ 
 		$sql = "SELECT rowid,name,label,type,size,elementtype,fieldunique,fieldrequired,param,pos,alwayseditable,perms,langs,list,totalizable,fielddefault,fieldcomputed,entity,enabled,help";
 		$sql.= " FROM ".MAIN_DB_PREFIX."extrafields";
 		$sql.= " WHERE entity IN (0,".$conf->entity.")";
-		if ($elementtype) $sql.= " AND elementtype = '".$elementtype."'";	// Filed with object->table_element
+		if ($elementtype) {
+		    $sql.= " AND elementtype = '".$elementtype."'";
+		}
+		// Filed with object->table_element
 		$sql.= " ORDER BY pos";
 
 		$resql=$this->db->query($sql);
@@ -867,9 +925,11 @@ 
 					$this->attributes[$tab->elementtype]['loaded']=1;
 				}
 			}
-			if ($elementtype) $this->attributes[$elementtype]['loaded']=1;	// If nothing found, we also save tag 'loaded'
-		}
-		else
+			if ($elementtype) {
+			    $this->attributes[$elementtype]['loaded']=1;
+			}
+			// If nothing found, we also save tag 'loaded'
+		} else
 		{
 			$this->error=$this->db->lasterror();
 			dol_syslog(get_class($this)."::fetch_name_optionals_label ".$this->error, LOG_ERR);
@@ -923,8 +983,7 @@ 
 			$totalizable=$this->attributes[$extrafieldsobjectkey]['totalizable'][$key];
 			$help=$this->attributes[$extrafieldsobjectkey]['help'][$key];
 			$hidden=(empty($list) ? 1 : 0);		// If empty, we are sure it is hidden, otherwise we show. If it depends on mode (view/create/edit form or list, this must be filtered by caller)
-		}
-		else	// Old usage
+		} else	// Old usage
 		{
 			$label=$this->attribute_label[$key];
 			$type =$this->attribute_type[$key];
@@ -943,8 +1002,11 @@ 
 
 		if ($computed)
 		{
-			if (! preg_match('/^search_/', $keyprefix)) return '<span class="opacitymedium">'.$langs->trans("AutomaticallyCalculated").'</span>';
-			else return '';
+			if (! preg_match('/^search_/', $keyprefix)) {
+			    return '<span class="opacitymedium">'.$langs->trans("AutomaticallyCalculated").'</span>';
+			} else {
+			    return '';
+			}
 		}
 
 		if (empty($morecss))
@@ -952,38 +1014,30 @@ 
 			if ($type == 'date')
 			{
 				$morecss = 'minwidth100imp';
-			}
-			elseif ($type == 'datetime')
+			} elseif ($type == 'datetime')
 			{
 				$morecss = 'minwidth200imp';
-			}
-			elseif (in_array($type,array('int','integer','double','price')))
+			} elseif (in_array($type,array('int','integer','double','price')))
 			{
 				$morecss = 'maxwidth75';
-			}
-			elseif ($type == 'password')
+			} elseif ($type == 'password')
 			{
 				$morecss='maxwidth100';
-			}
-			elseif ($type == 'url')
+			} elseif ($type == 'url')
 			{
 				$morecss='minwidth400';
-			}
-			elseif ($type == 'boolean')
+			} elseif ($type == 'boolean')
 			{
 				$morecss='';
-			}
-			else
+			} else
 			{
 				if (round($size) < 12)
 				{
 					$morecss = 'minwidth100';
-				}
-				else if (round($size) <= 48)
+				} else if (round($size) <= 48)
 				{
 					$morecss = 'minwidth200';
-				}
-				else
+				} else
 				{
 					$morecss = 'minwidth400';
 				}
@@ -998,52 +1052,50 @@ 
 			$showtime = in_array($type,array('datetime')) ? 1 : 0;
 
 			// Do not show current date when field not required (see selectDate() method)
-			if (!$required && $value == '') $value = '-1';
+			if (!$required && $value == '') {
+			    $value = '-1';
+			}
 
 			// TODO Must also support $moreparam
 			$out = $form->selectDate($value, $keyprefix.$key.$keysuffix, $showtime, $showtime, $required, '', 1, (($keyprefix != 'search_' && $keyprefix != 'search_options_') ? 1 : 0), 0, 1);
-		}
-		elseif (in_array($type,array('int','integer')))
+		} elseif (in_array($type,array('int','integer')))
 		{
 			$tmp=explode(',',$size);
 			$newsize=$tmp[0];
 			$out='<input type="text" class="flat '.$morecss.' maxwidthonsmartphone" name="'.$keyprefix.$key.$keysuffix.'" id="'.$keyprefix.$key.$keysuffix.'" maxlength="'.$newsize.'" value="'.dol_escape_htmltag($value).'"'.($moreparam?$moreparam:'').'>';
-		}
-		elseif (preg_match('/varchar/', $type))
+		} elseif (preg_match('/varchar/', $type))
 		{
 			$out='<input type="text" class="flat '.$morecss.' maxwidthonsmartphone" name="'.$keyprefix.$key.$keysuffix.'" id="'.$keyprefix.$key.$keysuffix.'" maxlength="'.$size.'" value="'.dol_escape_htmltag($value).'"'.($moreparam?$moreparam:'').'>';
-		}
-		elseif (in_array($type, array('mail', 'phone', 'url')))
+		} elseif (in_array($type, array('mail', 'phone', 'url')))
 		{
 			$out='<input type="text" class="flat '.$morecss.' maxwidthonsmartphone" name="'.$keyprefix.$key.$keysuffix.'" id="'.$keyprefix.$key.$keysuffix.'" value="'.dol_escape_htmltag($value).'" '.($moreparam?$moreparam:'').'>';
-		}
-		elseif ($type == 'text')
+		} elseif ($type == 'text')
 		{
-			if (! preg_match('/search_/', $keyprefix))		// If keyprefix is search_ or search_options_, we must just use a simple text field
+			if (! preg_match('/search_/', $keyprefix)) {
+			    // If keyprefix is search_ or search_options_, we must just use a simple text field
 			{
 				require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
+			}
 				$doleditor=new DolEditor($keyprefix.$key.$keysuffix,$value,'',200,'dolibarr_notes','In',false,false,false,ROWS_5,'90%');
 				$out=$doleditor->Create(1);
-			}
-			else
+			} else
 			{
 				$out='<input type="text" class="flat '.$morecss.' maxwidthonsmartphone" name="'.$keyprefix.$key.$keysuffix.'" id="'.$keyprefix.$key.$keysuffix.'" value="'.dol_escape_htmltag($value).'" '.($moreparam?$moreparam:'').'>';
 			}
-		}
-		elseif ($type == 'html')
+		} elseif ($type == 'html')
 		{
-			if (! preg_match('/search_/', $keyprefix))		// If keyprefix is search_ or search_options_, we must just use a simple text field
+			if (! preg_match('/search_/', $keyprefix)) {
+			    // If keyprefix is search_ or search_options_, we must just use a simple text field
 			{
 				require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
+			}
 				$doleditor=new DolEditor($keyprefix.$key.$keysuffix,$value,'',200,'dolibarr_notes','In',false,false,! empty($conf->fckeditor->enabled) && $conf->global->FCKEDITOR_ENABLE_SOCIETE,ROWS_5,'90%');
 				$out=$doleditor->Create(1);
-			}
-			else
+			} else
 			{
 				$out='<input type="text" class="flat '.$morecss.' maxwidthonsmartphone" name="'.$keyprefix.$key.$keysuffix.'" id="'.$keyprefix.$key.$keysuffix.'" value="'.dol_escape_htmltag($value).'" '.($moreparam?$moreparam:'').'>';
 			}
-		}
-		elseif ($type == 'boolean')
+		} elseif ($type == 'boolean')
 		{
 			$checked='';
 			if (!empty($value)) {
@@ -1052,22 +1104,19 @@ 
 				$checked=' value="1" ';
 			}
 			$out='<input type="checkbox" class="flat '.$morecss.' maxwidthonsmartphone" name="'.$keyprefix.$key.$keysuffix.'" id="'.$keyprefix.$key.$keysuffix.'" '.$checked.' '.($moreparam?$moreparam:'').'>';
-		}
-		elseif ($type == 'price')
+		} elseif ($type == 'price')
 		{
 			if (!empty($value)) {		// $value in memory is a php numeric, we format it into user number format.
 				$value=price($value);
 			}
 			$out='<input type="text" class="flat '.$morecss.' maxwidthonsmartphone" name="'.$keyprefix.$key.$keysuffix.'" id="'.$keyprefix.$key.$keysuffix.'" value="'.$value.'" '.($moreparam?$moreparam:'').'> '.$langs->getCurrencySymbol($conf->currency);
-		}
-		elseif ($type == 'double')
+		} elseif ($type == 'double')
 		{
 			if (!empty($value)) {		// $value in memory is a php numeric, we format it into user number format.
 				$value=price($value);
 			}
 			$out='<input type="text" class="flat '.$morecss.' maxwidthonsmartphone" name="'.$keyprefix.$key.$keysuffix.'" id="'.$keyprefix.$key.$keysuffix.'" value="'.$value.'" '.($moreparam?$moreparam:'').'> ';
-		}
-		elseif ($type == 'select')
+		} elseif ($type == 'select')
 		{
 			$out = '';
 			if (! empty($conf->use_javascript_ajax) && ! empty($conf->global->MAIN_EXTRAFIELDS_USE_SELECT2))
@@ -1080,19 +1129,23 @@ 
 			$out.='<option value="0">&nbsp;</option>';
 			foreach ($param['options'] as $key => $val)
 			{
-				if ((string) $key == '') continue;
+				if ((string) $key == '') {
+				    continue;
+				}
 				list($val, $parent) = explode('|', $val);
 				$out.='<option value="'.$key.'"';
 				$out.= (((string) $value == (string) $key)?' selected':'');
 				$out.= (!empty($parent)?' parent="'.$parent.'"':'');
 				$out.='>';
-				if ($langfile && $val) $out.=$langs->trans($val);
-				else $out.=$val;
+				if ($langfile && $val) {
+				    $out.=$langs->trans($val);
+				} else {
+				    $out.=$val;
+				}
 				$out.='</option>';
 			}
 			$out.='</select>';
-		}
-		elseif ($type == 'sellist')
+		} elseif ($type == 'sellist')
 		{
 			$out = '';
 			if (! empty($conf->use_javascript_ajax) && ! empty($conf->global->MAIN_EXTRAFIELDS_USE_SELECT2))
@@ -1163,13 +1216,11 @@ 
 					{
 						$sql.= ' as main, '.MAIN_DB_PREFIX .$InfoFieldList[0].'_extrafields as extra';
 						$sqlwhere.= ' WHERE extra.fk_object=main.'.$InfoFieldList[2]. ' AND '.$InfoFieldList[4];
-					}
-					else
+					} else
 					{
 						$sqlwhere.= ' WHERE '.$InfoFieldList[4];
 					}
-				}
-				else
+				} else
 				{
 					$sqlwhere.= ' WHERE 1=1';
 				}
@@ -1205,8 +1256,7 @@ 
 							{
 								$labeltoshow.= $obj->$field_toshow.' ';
 							}
-						}
-						else
+						} else
 						{
 							$labeltoshow=$obj->{$InfoFieldList[1]};
 						}
@@ -1219,25 +1269,25 @@ 
 								$translabel=$langs->trans($obj->$field_toshow);
 								if ($translabel!=$obj->$field_toshow) {
 									$labeltoshow=dol_trunc($translabel,18).' ';
-								}else {
+								} else {
 									$labeltoshow=dol_trunc($obj->$field_toshow,18).' ';
 								}
 							}
 							$out.='<option value="'.$obj->rowid.'" selected>'.$labeltoshow.'</option>';
-						}
-						else
+						} else
 						{
 							if (! $notrans)
 							{
 								$translabel=$langs->trans($obj->{$InfoFieldList[1]});
 								if ($translabel!=$obj->{$InfoFieldList[1]}) {
 									$labeltoshow=dol_trunc($translabel,18);
-								}
-								else {
+								} else {
 									$labeltoshow=dol_trunc($obj->{$InfoFieldList[1]},18);
 								}
 							}
-							if (empty($labeltoshow)) $labeltoshow='(not defined)';
+							if (empty($labeltoshow)) {
+							    $labeltoshow='(not defined)';
+							}
 							if ($value==$obj->rowid)
 							{
 								$out.='<option value="'.$obj->rowid.'" selected>'.$labeltoshow.'</option>';
@@ -1257,19 +1307,16 @@ 
 						$i++;
 					}
 					$this->db->free($resql);
-				}
-				else {
+				} else {
 					print 'Error in request '.$sql.' '.$this->db->lasterror().'. Check setup of extra parameters.<br>';
 				}
 			}
 			$out.='</select>';
-		}
-		elseif ($type == 'checkbox')
+		} elseif ($type == 'checkbox')
 		{
 			$value_arr=explode(',',$value);
 			$out=$form->multiselectarray($keyprefix.$key.$keysuffix, (empty($param['options'])?null:$param['options']), $value_arr, '', 0, '', 0, '100%');
-		}
-		elseif ($type == 'radio')
+		} elseif ($type == 'radio')
 		{
 			$out='';
 			foreach ($param['options'] as $keyopt => $val)
@@ -1280,13 +1327,11 @@ 
 				$out.= ($value==$keyopt?'checked':'');
 				$out.='/><label for="'.$keyprefix.$key.$keysuffix.'_'.$keyopt.'">'.$val.'</label><br>';
 			}
-		}
-		elseif ($type == 'chkbxlst')
+		} elseif ($type == 'chkbxlst')
 		{
 			if (is_array($value)) {
 				$value_arr = $value;
-			}
-			else {
+			} else {
 				$value_arr = explode(',', $value);
 			}
 
@@ -1365,17 +1410,14 @@ 
 							if (! empty($matchCondition[1]) && ! empty($matchCondition[3]) && $matchCondition[1] != $matchCondition[3] ) {
 								// Nobody sain would do that without parentheses
 								$InfoFieldList[4]=str_replace('$ID$','0',$InfoFieldList[4]);
-							}
-							else {
+							} else {
 								if (! empty($matchCondition[1])) {
 									$boolCond =(( $matchCondition[1] == "AND" )?' AND 1 ':' OR 0 ');
 									$InfoFieldList[4]=str_replace($matchCondition[0],$boolCond.$matchCondition[3],$InfoFieldList[4]);
-								}
-								else if (! empty($matchCondition[3])) {
+								} else if (! empty($matchCondition[3])) {
 									$boolCond =(( $matchCondition[3] == "AND" )?' 1 AND ':' 0 OR');
 									$InfoFieldList[4]=str_replace($matchCondition[0],$boolCond,$InfoFieldList[4]);
-								}
-								else {
+								} else {
 									$InfoFieldList[4] = 1;
 								}
 							}
@@ -1383,8 +1425,7 @@ 
 							// Si l'on a un AND ou un OR, avant ou après
 							preg_match('#(AND|OR|) *('.$word.') *(AND|OR|)#',$InfoFieldList[4],$matchCondition);
 						}
-					}
-					else {
+					} else {
 						$InfoFieldList[4]=str_replace('$ID$','0',$InfoFieldList[4]);
 					}
 
@@ -1452,8 +1493,9 @@ 
 									$labeltoshow = dol_trunc($obj->{$InfoFieldList[1]}, 18);
 								}
 							}
-							if (empty($labeltoshow))
-								$labeltoshow = '(not defined)';
+							if (empty($labeltoshow)) {
+															$labeltoshow = '(not defined)';
+							}
 
 								if (is_array($value_arr) && in_array($obj->rowid, $value_arr)) {
 									$data[$obj->rowid]=$labeltoshow;
@@ -1475,14 +1517,12 @@ 
 					print 'Error in request ' . $sql . ' ' . $this->db->lasterror() . '. Check setup of extra parameters.<br>';
 				}
 			}
-		}
-		elseif ($type == 'link')
+		} elseif ($type == 'link')
 		{
 			$param_list=array_keys($param['options']);				// $param_list='ObjectName:classPath'
 			$showempty=(($required && $default != '')?0:1);
 			$out=$form->selectForForms($param_list[0], $keyprefix.$key.$keysuffix, $value, $showempty);
-		}
-		elseif ($type == 'password')
+		} elseif ($type == 'password')
 		{
 			// If prefix is 'search_', field is used as a filter, we use a common text field.
 			$out='<input style="display:none" type="text" name="fakeusernameremembered">';	// Hidden field to reduce impact of evil Google Chrome autopopulate bug.
@@ -1527,8 +1567,7 @@ 
 			$list=dol_eval($this->attributes[$extrafieldsobjectkey]['list'][$key], 1);
 			$help=$this->attributes[$extrafieldsobjectkey]['help'][$key];
 			$hidden=(empty($list) ? 1 : 0);		// If $list empty, we are sure it is hidden, otherwise we show. If it depends on mode (view/create/edit form or list, this must be filtered by caller)
-		}
-		else	// Old usage
+		} else	// Old usage
 		{
 			$label=$this->attribute_label[$key];
 			$type=$this->attribute_type[$key];
@@ -1545,7 +1584,10 @@ 
 			$hidden=(empty($list) ? 1 : 0);		// If $list empty, we are sure it is hidden, otherwise we show. If it depends on mode (view/create/edit form or list, this must be filtered by caller)
 		}
 
-		if ($hidden) return '';		// This is a protection. If field is hidden, we should just not call this method.
+		if ($hidden) {
+		    return '';
+		}
+		// This is a protection. If field is hidden, we should just not call this method.
 
 		// If field is a computed field, value must become result of compute
 		if ($computed)
@@ -1560,52 +1602,45 @@ 
 		{
 			$showsize=10;
 			$value=dol_print_date($value, 'day');
-		}
-		elseif ($type == 'datetime')
+		} elseif ($type == 'datetime')
 		{
 			$showsize=19;
 			$value=dol_print_date($value, 'dayhour');
-		}
-		elseif ($type == 'int')
+		} elseif ($type == 'int')
 		{
 			$showsize=10;
-		}
-		elseif ($type == 'double')
+		} elseif ($type == 'double')
 		{
 			if (!empty($value)) {
 				$value=price($value);
 			}
-		}
-		elseif ($type == 'boolean')
+		} elseif ($type == 'boolean')
 		{
 			$checked='';
 			if (!empty($value)) {
 				$checked=' checked ';
 			}
 			$value='<input type="checkbox" '.$checked.' '.($moreparam?$moreparam:'').' readonly disabled>';
-		}
-		elseif ($type == 'mail')
+		} elseif ($type == 'mail')
 		{
 			$value=dol_print_email($value, 0, 0, 0, 64, 1, 1);
-		}
-		elseif ($type == 'url')
+		} elseif ($type == 'url')
 		{
 			$value=dol_print_url($value,'_blank',32,1);
-		}
-		elseif ($type == 'phone')
+		} elseif ($type == 'phone')
 		{
 			$value=dol_print_phone($value, '', 0, 0, '', '&nbsp;', 1);
-		}
-		elseif ($type == 'price')
+		} elseif ($type == 'price')
 		{
 			$value=price($value, 0, $langs, 0, 0, -1, $conf->currency);
-		}
-		elseif ($type == 'select')
+		} elseif ($type == 'select')
 		{
-			if ($langfile && $param['options'][$value]) $value=$langs->trans($param['options'][$value]);
-			else $value=$param['options'][$value];
-		}
-		elseif ($type == 'sellist')
+			if ($langfile && $param['options'][$value]) {
+			    $value=$langs->trans($param['options'][$value]);
+			} else {
+			    $value=$param['options'][$value];
+			}
+		} elseif ($type == 'sellist')
 		{
 			$param_list=array_keys($param['options']);
 			$InfoFieldList = explode(":", $param_list[0]);
@@ -1635,7 +1670,7 @@ 
 				$sql.= " WHERE ".$selectkey."=0";
 			} elseif ($selectkey=='rowid') {
 				$sql.= " WHERE ".$selectkey."=".$this->db->escape($value);
-			}else {
+			} else {
 				$sql.= " WHERE ".$selectkey."='".$this->db->escape($value)."'";
 			}
 
@@ -1662,12 +1697,11 @@ 
 						}
 						if ($translabel!=$field_toshow) {
 							$value.=dol_trunc($translabel,18).' ';
-						}else {
+						} else {
 							$value.=$obj->$field_toshow.' ';
 						}
 					}
-				}
-				else
+				} else
 				{
 					$translabel='';
 					if (!empty($obj->{$InfoFieldList[1]})) {
@@ -1675,18 +1709,17 @@ 
 					}
 					if ($translabel!=$obj->{$InfoFieldList[1]}) {
 						$value=dol_trunc($translabel,18);
-					}else {
+					} else {
 						$value=$obj->{$InfoFieldList[1]};
 					}
 				}
+			} else {
+			    dol_syslog(get_class($this).'::showOutputField error '.$this->db->lasterror(), LOG_WARNING);
 			}
-			else dol_syslog(get_class($this).'::showOutputField error '.$this->db->lasterror(), LOG_WARNING);
-		}
-		elseif ($type == 'radio')
+		} elseif ($type == 'radio')
 		{
 			$value=$param['options'][$value];
-		}
-		elseif ($type == 'checkbox')
+		} elseif ($type == 'checkbox')
 		{
 			$value_arr=explode(',',$value);
 			$value='';
@@ -1698,8 +1731,7 @@ 
 				}
 			}
 			$value='<div class="select2-container-multi-dolibarr" style="width: 90%;"><ul class="select2-choices-dolibarr">'.implode(' ', $toprint).'</ul></div>';
-		}
-		elseif ($type == 'chkbxlst')
+		} elseif ($type == 'chkbxlst')
 		{
 			$value_arr = explode(',', $value);
 
@@ -1767,15 +1799,17 @@ 
 			} else {
 				dol_syslog(get_class($this) . '::showOutputField error ' . $this->db->lasterror(), LOG_WARNING);
 			}
-		}
-		elseif ($type == 'link')
+		} elseif ($type == 'link')
 		{
 			$out='';
 
 			// Only if something to display (perf)
-			if ($value)		// If we have -1 here, pb is into sert, not into ouptu
+			if ($value) {
+			    // If we have -1 here, pb is into sert, not into ouptu
 			{
-				$param_list=array_keys($param['options']);				// $param_list='ObjectName:classPath'
+				$param_list=array_keys($param['options']);
+			}
+			// $param_list='ObjectName:classPath'
 
 				$InfoFieldList = explode(":", $param_list[0]);
 				$classname=$InfoFieldList[0];
@@ -1789,30 +1823,27 @@ 
 						$object->fetch($value);
 						$value=$object->getNomUrl(3);
 					}
-				}
-				else
+				} else
 				{
 					dol_syslog('Error bad setup of extrafield', LOG_WARNING);
 					return 'Error bad setup of extrafield';
 				}
 			}
-		}
-		elseif ($type == 'text')
+		} elseif ($type == 'text')
 		{
 			$value=dol_htmlentitiesbr($value);
-		}
-		elseif ($type == 'html')
+		} elseif ($type == 'html')
 		{
 			$value=dol_htmlentitiesbr($value);
-		}
-		elseif ($type == 'password')
+		} elseif ($type == 'password')
 		{
 			$value=dol_trunc(preg_replace('/./i','*',$value), 8, 'right', 'UTF-8', 1);
-		}
-		else
+		} else
 		{
 			$showsize=round($size);
-			if ($showsize > 48) $showsize=48;
+			if ($showsize > 48) {
+			    $showsize=48;
+			}
 		}
 
 		//print $type.'-'.$size;
@@ -1832,40 +1863,36 @@ 
 	{
 		global $conf,$langs;
 
-		if (! empty($extrafieldsobjectkey)) $type=$this->attributes[$extrafieldsobjectkey]['type'][$key];
-		else $type=$this->attribute_type[$key];
+		if (! empty($extrafieldsobjectkey)) {
+		    $type=$this->attributes[$extrafieldsobjectkey]['type'][$key];
+		} else {
+		    $type=$this->attribute_type[$key];
+		}
 
 		$align='';
 
         if ($type == 'date')
 		{
 			$align="center";
-		}
-		elseif ($type == 'datetime')
+		} elseif ($type == 'datetime')
 		{
 			$align="center";
-		}
-		elseif ($type == 'int')
+		} elseif ($type == 'int')
 		{
 			$align="right";
-		}
-		elseif ($type == 'double')
+		} elseif ($type == 'double')
 		{
 			$align="right";
-		}
-		elseif ($type == 'boolean')
+		} elseif ($type == 'boolean')
 		{
 			$align="center";
-		}
-		elseif ($type == 'radio')
+		} elseif ($type == 'radio')
 		{
 			$align="center";
-		}
-		elseif ($type == 'checkbox')
+		} elseif ($type == 'checkbox')
 		{
 			$align="center";
-		}
-		elseif ($type == 'price')
+		} elseif ($type == 'price')
 		{
 			$align="right";
 		}
@@ -1904,17 +1931,23 @@ 
 		$nofillrequired='';// For error when required field left blank
 		$error_field_required = array();
 
-		if (is_array($this->attributes[$object->table_element]['label'])) $extralabels=$this->attributes[$object->table_element]['label'];
+		if (is_array($this->attributes[$object->table_element]['label'])) {
+		    $extralabels=$this->attributes[$object->table_element]['label'];
+		}
 
 		if (is_array($extralabels))
 		{
 			// Get extra fields
 			foreach ($extralabels as $key => $value)
 			{
-				if (! empty($onlykey) && $key != $onlykey) continue;
+				if (! empty($onlykey) && $key != $onlykey) {
+				    continue;
+				}
 
 				$key_type = $this->attributes[$object->table_element]['type'][$key];
-				if ($key_type == 'separate') continue;
+				if ($key_type == 'separate') {
+				    continue;
+				}
 
 				$enabled = 1;
 				if (isset($this->attributes[$object->table_element]['list'][$key]))
@@ -1926,10 +1959,15 @@ 
 				{
 					$perms = dol_eval($this->attributes[$object->table_element]['perms'][$key], 1);
 				}
-				if (empty($enabled)) continue;
-				if (empty($perms)) continue;
+				if (empty($enabled)) {
+				    continue;
+				}
+				if (empty($perms)) {
+				    continue;
+				}
 
-				if ($this->attributes[$object->table_element]['required'][$key])	// Value is required
+				if ($this->attributes[$object->table_element]['required'][$key]) {
+				    // Value is required
 				{
 					// Check if empty without using GETPOST, value can be alpha, int, array, etc...
 					if ((! is_array($_POST["options_".$key]) && empty($_POST["options_".$key]) && $_POST["options_".$key] != '0')
@@ -1937,6 +1975,7 @@ 
 					{
 						//print 'ccc'.$value.'-'.$this->attributes[$object->table_element]['required'][$key];
 						$nofillrequired++;
+				}
 						$error_field_required[] = $langs->transnoentitiesnoconv($value);
 					}
 				}
@@ -1946,28 +1985,24 @@ 
 					// Clean parameters
 					// TODO GMT date in memory must be GMT so we should add gm=true in parameters
 					$value_key=dol_mktime(0, 0, 0, $_POST["options_".$key."month"], $_POST["options_".$key."day"], $_POST["options_".$key."year"]);
-				}
-				elseif (in_array($key_type,array('datetime')))
+				} elseif (in_array($key_type,array('datetime')))
 				{
 					// Clean parameters
 					// TODO GMT date in memory must be GMT so we should add gm=true in parameters
 					$value_key=dol_mktime($_POST["options_".$key."hour"], $_POST["options_".$key."min"], 0, $_POST["options_".$key."month"], $_POST["options_".$key."day"], $_POST["options_".$key."year"]);
-				}
-				else if (in_array($key_type,array('checkbox','chkbxlst')))
+				} else if (in_array($key_type,array('checkbox','chkbxlst')))
 				{
 					$value_arr=GETPOST("options_".$key, 'array'); // check if an array
 					if (!empty($value_arr)) {
 						$value_key=implode($value_arr,',');
-					}else {
+					} else {
 						$value_key='';
 					}
-				}
-				else if (in_array($key_type,array('price','double')))
+				} else if (in_array($key_type,array('price','double')))
 				{
 					$value_arr=GETPOST("options_".$key, 'alpha');
 					$value_key=price2num($value_arr);
-				}
-				else
+				} else
 				{
 					$value_key=GETPOST("options_".$key);
 				}
@@ -1979,12 +2014,10 @@ 
 				$langs->load('errors');
 				setEventMessages($langs->trans('ErrorFieldsRequired').' : '.implode(', ',$error_field_required), null, 'errors');
 				return -1;
-			}
-			else {
+			} else {
 				return 1;
 			}
-		}
-		else {
+		} else {
 			return 0;
 		}
 	}
@@ -2004,8 +2037,7 @@ 
 		if (is_string($extrafieldsobjectkey) && is_array($this->attributes[$extrafieldsobjectkey]['label']))
 		{
 			$extralabels = $this->attributes[$extrafieldsobjectkey]['label'];
-		}
-		else
+		} else
 		{
 			$extralabels = $extrafieldsobjectkey;
 		}
@@ -2027,20 +2059,17 @@ 
 				{
 					// Clean parameters
 					$value_key=dol_mktime($_POST[$keysuffix."options_".$key.$keyprefix."hour"], $_POST[$keysuffix."options_".$key.$keyprefix."min"], 0, $_POST[$keysuffix."options_".$key.$keyprefix."month"], $_POST[$keysuffix."options_".$key.$keyprefix."day"], $_POST[$keysuffix."options_".$key.$keyprefix."year"]);
-				}
-				else if (in_array($key_type,array('checkbox', 'chkbxlst')))
+				} else if (in_array($key_type,array('checkbox', 'chkbxlst')))
 				{
 					$value_arr=GETPOST($keysuffix."options_".$key.$keyprefix);
 					// Make sure we get an array even if there's only one checkbox
 					$value_arr=(array) $value_arr;
 					$value_key=implode(',', $value_arr);
-				}
-				else if (in_array($key_type,array('price','double')))
+				} else if (in_array($key_type,array('price','double')))
 				{
 					$value_arr=GETPOST($keysuffix."options_".$key.$keyprefix);
 					$value_key=price2num($value_arr);
-				}
-				else
+				} else
 				{
 					$value_key=GETPOST($keysuffix."options_".$key.$keyprefix);
 				}

dolibarr/htdocs/core/class/events.class.php

Braces +5 added lines, -5 removed lines

@@ -137,7 +137,9 @@ 
 
 		// Clean parameters
 		$this->description=trim($this->description);
-		if (empty($this->user_agent) && !empty($_SERVER['HTTP_USER_AGENT'])) $this->user_agent=$_SERVER['HTTP_USER_AGENT'];
+		if (empty($this->user_agent) && !empty($_SERVER['HTTP_USER_AGENT'])) {
+		    $this->user_agent=$_SERVER['HTTP_USER_AGENT'];
+		}
 
 		// Check parameters
 		if (empty($this->description)) { $this->error='ErrorBadValueForParameterCreateEventDesc'; return -1; }
@@ -167,8 +169,7 @@ 
 		{
 			$this->id = $this->db->last_insert_id(MAIN_DB_PREFIX."events");
 			return $this->id;
-		}
-		else
+		} else
 		{
 			$this->error="Error ".$this->db->lasterror();
 			return -1;
@@ -256,8 +257,7 @@ 
 			$this->db->free($resql);
 
 			return 1;
-		}
-		else
+		} else
 		{
 			$this->error="Error ".$this->db->lasterror();
 			return -1;

dolibarr/htdocs/core/class/ctyperesource.class.php

Braces +7 added lines, -3 removed lines

@@ -172,9 +172,13 @@
 
 
 		$sql .= ' FROM ' . MAIN_DB_PREFIX . $this->table_element . ' as t';
-		if ($id)   $sql.= " WHERE t.id = ".$id;
-		elseif ($code) $sql.= " WHERE t.code = '".$this->db->escape($code)."'";
-		elseif ($label) $sql.= " WHERE t.label = '".$this->db->escape($label)."'";
+		if ($id) {
+		    $sql.= " WHERE t.id = ".$id;
+		} elseif ($code) {
+		    $sql.= " WHERE t.code = '".$this->db->escape($code)."'";
+		} elseif ($label) {
+		    $sql.= " WHERE t.label = '".$this->db->escape($label)."'";
+		}
 
 
 		$resql = $this->db->query($sql);

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

Braces +31 added lines, -28 removed lines

@@ -105,7 +105,9 @@ 
      // phpcs:enable
         global $conf, $langs, $user, $form;
 
-        if (! is_object($form)) $form=new Form($this->db);
+        if (! is_object($form)) {
+            $form=new Form($this->db);
+        }
 
         // Load translation files required by the page
         $langs->loadLangs(array('other', 'mails', 'sms'));
@@ -131,7 +133,9 @@ 
 }
 </script>';
 
-        if ($showform) print "<form method=\"POST\" name=\"smsform\" enctype=\"multipart/form-data\" action=\"".$this->param["returnurl"]."\">\n";
+        if ($showform) {
+            print "<form method=\"POST\" name=\"smsform\" enctype=\"multipart/form-data\" action=\"".$this->param["returnurl"]."\">\n";
+        }
 
         print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
         foreach ($this->param as $key=>$value)
@@ -141,9 +145,11 @@ 
         print "<table class=\"border centpercent\">\n";
 
         // Substitution array
-        if (! empty($this->withsubstit))		// Unset or set ->withsubstit=0 to disable this.
+        if (! empty($this->withsubstit)) {
+            // Unset or set ->withsubstit=0 to disable this.
         {
             print "<tr><td colspan=\"2\">";
+        }
             $help="";
             foreach($this->substit as $key => $val)
             {
@@ -172,8 +178,7 @@ 
                 if ($this->fromsms)
                 {
                     print $this->fromsms;
-                }
-                else
+                } else
                 {
                     if ($this->fromtype)
                     {
@@ -183,34 +188,34 @@ 
                 }
                 print "</td></tr>\n";
                 print "</td></tr>\n";
-            }
-            else
+            } else
             {
                 print '<tr><td class="'.$morecss.'">'.$langs->trans("SmsFrom")."</td><td>";
                 //print '<input type="text" name="fromname" size="30" value="'.$this->fromsms.'">';
-                if ($conf->global->MAIN_SMS_SENDMODE == 'ovh')        // For backward compatibility        @deprecated
+                if ($conf->global->MAIN_SMS_SENDMODE == 'ovh') {
+                    // For backward compatibility        @deprecated
                 {
                     dol_include_once('/ovh/class/ovhsms.class.php');
+                }
                     try
                     {
                         $sms = new OvhSms($this->db);
                         if (empty($conf->global->OVHSMS_ACCOUNT))
                         {
                             $resultsender = 'ErrorOVHSMS_ACCOUNT not defined';
-                        }
-                        else
+                        } else
                         {
                             $resultsender = $sms->SmsSenderList();
                         }
-                    }
-                    catch(Exception $e)
+                    } catch(Exception $e)
                     {
                         dol_print_error('','Error to get list of senders: '.$e->getMessage());
                     }
-                }
-                else if (!empty($conf->global->MAIN_SMS_SENDMODE))    // $conf->global->MAIN_SMS_SENDMODE looks like a value 'class@module'
+                } else if (!empty($conf->global->MAIN_SMS_SENDMODE)) {
+                    // $conf->global->MAIN_SMS_SENDMODE looks like a value 'class@module'
                 {
                     $tmp=explode('@',$conf->global->MAIN_SMS_SENDMODE);
+                }
                     $classfile=$tmp[0]; $module=(empty($tmp[1])?$tmp[0]:$tmp[1]);
                     dol_include_once('/'.$module.'/class/'.$classfile.'.class.php');
                     try
@@ -220,20 +225,17 @@ 
                         {
                         	$sms = new $classname($this->db);
                         	$resultsender = $sms->SmsSenderList();
-                        }
-                        else
+                        } else
                         {
                         	$sms = new stdClass();
                         	$sms->error='The SMS manager "'.$classfile.'" defined into SMS setup MAIN_SMS_SENDMODE is not found';
                         }
-                    }
-                    catch(Exception $e)
+                    } catch(Exception $e)
                     {
                         dol_print_error('','Error to get list of senders: '.$e->getMessage());
                         exit;
                     }
-                }
-                else
+                } else
                 {
                     dol_syslog("Warning: The SMS sending method has not been defined into MAIN_SMS_SENDMODE", LOG_WARNING);
 	                $resultsender=array();
@@ -248,11 +250,12 @@ 
                         print '<option value="'.$obj->number.'">'.$obj->number.'</option>';
                     }
                     print '</select>';
-                }
-                else
+                } else
                 {
                     print '<span class="error">'.$langs->trans("SmsNoPossibleSenderFound");
-                    if (is_object($sms) && ! empty($sms->error)) print ' '.$sms->error;
+                    if (is_object($sms) && ! empty($sms->error)) {
+                        print ' '.$sms->error;
+                    }
                     print '</span>';
                 }
                 print '</td>';
@@ -271,8 +274,7 @@ 
             if ($this->withtoreadonly)
             {
                 print (! is_array($this->withto) && ! is_numeric($this->withto))?$this->withto:"";
-            }
-            else
+            } else
             {
                 print "<input size=\"16\" id=\"sendto\" name=\"sendto\" value=\"".dol_escape_htmltag(! is_array($this->withto) && $this->withto != '1'? (isset($_REQUEST["sendto"])?GETPOST("sendto"):$this->withto):"+")."\">";
                 if (! empty($this->withtosocid) && $this->withtosocid > 0)
@@ -300,7 +302,9 @@ 
                 $defaultmessage=$this->withbody;
             }
             $defaultmessage=make_substitutions($defaultmessage,$this->substit);
-            if (isset($_POST["message"])) $defaultmessage=$_POST["message"];
+            if (isset($_POST["message"])) {
+                $defaultmessage=$_POST["message"];
+            }
             $defaultmessage=str_replace('\n',"\n",$defaultmessage);
 
             print "<tr>";
@@ -310,8 +314,7 @@ 
             {
                 print nl2br($defaultmessage);
                 print '<input type="hidden" name="message" value="'.dol_escape_htmltag($defaultmessage).'">';
-            }
-            else
+            } else
             {
                 print '<textarea class="quatrevingtpercent" name="message" id="message" rows="'.ROWS_4.'" onkeyup="limitChars(this, 160, \'charlimitinfospan\')">'.$defaultmessage.'</textarea>';
                 print '<div id="charlimitinfo">'.$langs->trans("SmsInfoCharRemain").': <span id="charlimitinfospan">'.(160-dol_strlen($defaultmessage)).'</span></div></td>';

dolibarr/htdocs/core/class/rssparser.class.php

Braces +148 added lines, -107 removed lines

@@ -218,19 +218,19 @@ 
                 $foundintocache=1;
 
                 $this->_lastfetchdate=$filedate;
-            }
-            else
+            } else
             {
                 dol_syslog(get_class($this)."::parser cache file ".$newpathofdestfile." is not found or older than now - cachedelay (".$nowgmt." - ".$cachedelay.") so we can't use it.");
             }
         }
 
         // Load file into $str
-        if ($foundintocache)    // Cache file found and is not too old
+        if ($foundintocache) {
+            // Cache file found and is not too old
         {
             $str = file_get_contents($newpathofdestfile);
         }
-        else
+        } else
         {
             try {
                 ini_set("user_agent","Dolibarr ERP-CRM RSS reader");
@@ -238,14 +238,17 @@ 
                 ini_set("default_socket_timeout", $conf->global->MAIN_USE_RESPONSE_TIMEOUT);
 
                 $opts = array('http'=>array('method'=>"GET"));
-                if (! empty($conf->global->MAIN_USE_CONNECT_TIMEOUT)) $opts['http']['timeout']=$conf->global->MAIN_USE_CONNECT_TIMEOUT;
-                if (! empty($conf->global->MAIN_PROXY_USE))           $opts['http']['proxy']='tcp://'.$conf->global->MAIN_PROXY_HOST.':'.$conf->global->MAIN_PROXY_PORT;
+                if (! empty($conf->global->MAIN_USE_CONNECT_TIMEOUT)) {
+                    $opts['http']['timeout']=$conf->global->MAIN_USE_CONNECT_TIMEOUT;
+                }
+                if (! empty($conf->global->MAIN_PROXY_USE)) {
+                    $opts['http']['proxy']='tcp://'.$conf->global->MAIN_PROXY_HOST.':'.$conf->global->MAIN_PROXY_PORT;
+                }
                 //var_dump($opts);exit;
                 $context = stream_context_create($opts);
 
                 $str = file_get_contents($this->_urlRSS, false, $context);
-            }
-            catch (Exception $e) {
+            } catch (Exception $e) {
                 print 'Error retrieving URL '.$this->urlRSS.' - '.$e->getMessage();
             }
         }
@@ -258,8 +261,7 @@ 
 	            //print 'xx'.LIBXML_NOCDATA;
 	            libxml_use_internal_errors(false);
 	            $rss = simplexml_load_string($str, "SimpleXMLElement", LIBXML_NOCDATA);
-	        }
-	        else
+	        } else
 	        {
 	            $xmlparser=xml_parser_create('');
 	            if (!is_resource($xmlparser)) {
@@ -283,18 +285,21 @@ 
             if (empty($foundintocache) && $cachedir)
             {
                 dol_syslog(get_class($this)."::parser cache file ".$newpathofdestfile." is saved onto disk.");
-                if (! dol_is_dir($cachedir)) dol_mkdir($cachedir);
+                if (! dol_is_dir($cachedir)) {
+                    dol_mkdir($cachedir);
+                }
                 $fp = fopen($newpathofdestfile, 'w');
                 if ($fp)
                 {
                 	fwrite($fp, $str);
                 	fclose($fp);
-                	if (! empty($conf->global->MAIN_UMASK)) $newmask=$conf->global->MAIN_UMASK;
+                	if (! empty($conf->global->MAIN_UMASK)) {
+                	    $newmask=$conf->global->MAIN_UMASK;
+                	}
                 	@chmod($newpathofdestfile, octdec($newmask));
 
 	                $this->_lastfetchdate=$nowgmt;
-                }
-                else
+                } else
                 {
                 	print 'Error, failed to open file '.$newpathofdestfile.' for write';
                 }
@@ -302,10 +307,14 @@ 
 
             unset($str);    // Free memory
 
-            if (empty($rss->_format))    // If format not detected automatically
+            if (empty($rss->_format)) {
+                // If format not detected automatically
             {
                 $rss->_format='rss';
-                if (empty($rss->channel)) $rss->_format='atom';
+            }
+                if (empty($rss->channel)) {
+                    $rss->_format='atom';
+                }
             }
 
             $items=array();
@@ -316,58 +325,114 @@ 
                 //var_dump($rss);
                 if (! empty($conf->global->EXTERNALRSS_USE_SIMPLEXML))
                 {
-                    if (!empty($rss->channel->language))      $this->_language = (string) $rss->channel->language;
-                    if (!empty($rss->channel->generator))     $this->_generator = (string) $rss->channel->generator;
-                    if (!empty($rss->channel->copyright))     $this->_copyright = (string) $rss->channel->copyright;
-                    if (!empty($rss->channel->lastbuilddate)) $this->_lastbuilddate = (string) $rss->channel->lastbuilddate;
-                    if (!empty($rss->channel->image->url[0])) $this->_imageurl = (string) $rss->channel->image->url[0];
-                    if (!empty($rss->channel->link))		  $this->_link = (string) $rss->channel->link;
-                    if (!empty($rss->channel->title))         $this->_title = (string) $rss->channel->title;
-                    if (!empty($rss->channel->description))	  $this->_description = (string) $rss->channel->description;
-                }
-                else
+                    if (!empty($rss->channel->language)) {
+                        $this->_language = (string) $rss->channel->language;
+                    }
+                    if (!empty($rss->channel->generator)) {
+                        $this->_generator = (string) $rss->channel->generator;
+                    }
+                    if (!empty($rss->channel->copyright)) {
+                        $this->_copyright = (string) $rss->channel->copyright;
+                    }
+                    if (!empty($rss->channel->lastbuilddate)) {
+                        $this->_lastbuilddate = (string) $rss->channel->lastbuilddate;
+                    }
+                    if (!empty($rss->channel->image->url[0])) {
+                        $this->_imageurl = (string) $rss->channel->image->url[0];
+                    }
+                    if (!empty($rss->channel->link)) {
+                        $this->_link = (string) $rss->channel->link;
+                    }
+                    if (!empty($rss->channel->title)) {
+                        $this->_title = (string) $rss->channel->title;
+                    }
+                    if (!empty($rss->channel->description)) {
+                        $this->_description = (string) $rss->channel->description;
+                    }
+                } else
                 {
                     //var_dump($rss->channel);
-                    if (!empty($rss->channel['language']))      $this->_language = (string) $rss->channel['language'];
-                    if (!empty($rss->channel['generator']))     $this->_generator = (string) $rss->channel['generator'];
-                    if (!empty($rss->channel['copyright']))     $this->_copyright = (string) $rss->channel['copyright'];
-                    if (!empty($rss->channel['lastbuilddate'])) $this->_lastbuilddate = (string) $rss->channel['lastbuilddate'];
-                    if (!empty($rss->image['url']))             $this->_imageurl = (string) $rss->image['url'];
-                    if (!empty($rss->channel['link']))		    $this->_link = (string) $rss->channel['link'];
-                    if (!empty($rss->channel['title']))         $this->_title = (string) $rss->channel['title'];
-                    if (!empty($rss->channel['description']))   $this->_description = (string) $rss->channel['description'];
+                    if (!empty($rss->channel['language'])) {
+                        $this->_language = (string) $rss->channel['language'];
+                    }
+                    if (!empty($rss->channel['generator'])) {
+                        $this->_generator = (string) $rss->channel['generator'];
+                    }
+                    if (!empty($rss->channel['copyright'])) {
+                        $this->_copyright = (string) $rss->channel['copyright'];
+                    }
+                    if (!empty($rss->channel['lastbuilddate'])) {
+                        $this->_lastbuilddate = (string) $rss->channel['lastbuilddate'];
+                    }
+                    if (!empty($rss->image['url'])) {
+                        $this->_imageurl = (string) $rss->image['url'];
+                    }
+                    if (!empty($rss->channel['link'])) {
+                        $this->_link = (string) $rss->channel['link'];
+                    }
+                    if (!empty($rss->channel['title'])) {
+                        $this->_title = (string) $rss->channel['title'];
+                    }
+                    if (!empty($rss->channel['description'])) {
+                        $this->_description = (string) $rss->channel['description'];
+                    }
                 }
 
-                if (! empty($conf->global->EXTERNALRSS_USE_SIMPLEXML)) $items=$rss->channel->item;    // With simplexml
-                else $items=$rss->items;                                                              // With xmlparse
+                if (! empty($conf->global->EXTERNALRSS_USE_SIMPLEXML)) {
+                    $items=$rss->channel->item;
+                }
+                // With simplexml
+                else {
+                    $items=$rss->items;
+                }
+                // With xmlparse
                 //var_dump($items);exit;
-            }
-            else if ($rss->_format == 'atom')
+            } else if ($rss->_format == 'atom')
             {
                 //var_dump($rss);
                 if (! empty($conf->global->EXTERNALRSS_USE_SIMPLEXML))
                 {
-                    if (!empty($rss->generator))     $this->_generator = (string) $rss->generator;
-                    if (!empty($rss->lastbuilddate)) $this->_lastbuilddate = (string) $rss->modified;
-                    if (!empty($rss->link->href))    $this->_link = (string) $rss->link->href;
-                    if (!empty($rss->title))         $this->_title = (string) $rss->title;
-                    if (!empty($rss->description))	 $this->_description = (string) $rss->description;
-                }
-                else
+                    if (!empty($rss->generator)) {
+                        $this->_generator = (string) $rss->generator;
+                    }
+                    if (!empty($rss->lastbuilddate)) {
+                        $this->_lastbuilddate = (string) $rss->modified;
+                    }
+                    if (!empty($rss->link->href)) {
+                        $this->_link = (string) $rss->link->href;
+                    }
+                    if (!empty($rss->title)) {
+                        $this->_title = (string) $rss->title;
+                    }
+                    if (!empty($rss->description)) {
+                        $this->_description = (string) $rss->description;
+                    }
+                } else
                 {
                     //if (!empty($rss->channel['rss_language']))      $this->_language = (string) $rss->channel['rss_language'];
-                    if (!empty($rss->channel['generator']))     $this->_generator = (string) $rss->channel['generator'];
+                    if (!empty($rss->channel['generator'])) {
+                        $this->_generator = (string) $rss->channel['generator'];
+                    }
                     //if (!empty($rss->channel['rss_copyright']))     $this->_copyright = (string) $rss->channel['rss_copyright'];
-                    if (!empty($rss->channel['modified'])) $this->_lastbuilddate = (string) $rss->channel['modified'];
+                    if (!empty($rss->channel['modified'])) {
+                        $this->_lastbuilddate = (string) $rss->channel['modified'];
+                    }
                     //if (!empty($rss->image['rss_url']))             $this->_imageurl = (string) $rss->image['rss_url'];
-                    if (!empty($rss->channel['link']))		    $this->_link = (string) $rss->channel['link'];
-                    if (!empty($rss->channel['title']))         $this->_title = (string) $rss->channel['title'];
+                    if (!empty($rss->channel['link'])) {
+                        $this->_link = (string) $rss->channel['link'];
+                    }
+                    if (!empty($rss->channel['title'])) {
+                        $this->_title = (string) $rss->channel['title'];
+                    }
                     //if (!empty($rss->channel['rss_description']))   $this->_description = (string) $rss->channel['rss_description'];
                 }
                 if (! empty($conf->global->EXTERNALRSS_USE_SIMPLEXML))  {
                     $tmprss=xml2php($rss); $items=$tmprss['entry'];
                 } // With simplexml
-                else $items=$rss->items;                                                              // With xmlparse
+                else {
+                    $items=$rss->items;
+                }
+                // With xmlparse
                 //var_dump($items);exit;
             }
 
@@ -389,8 +454,7 @@ 
                             $itemPubDate = (string) $item->pubDate;
                             $itemId = '';
                             $itemAuthor = '';
-                        }
-                        else
+                        } else
                         {
                             $itemLink = (string) $item['link'];
                             $itemTitle = (string) $item['title'];
@@ -409,8 +473,7 @@ 
                                 $itemCategory[] = (string) $cat;
                             }
                         }
-                    }
-                    else if ($rss->_format == 'atom')
+                    } else if ($rss->_format == 'atom')
                     {
                         if (! empty($conf->global->EXTERNALRSS_USE_SIMPLEXML))
                         {
@@ -420,8 +483,7 @@ 
                             $itemPubDate = (string) $item['created'];
                             $itemId = (string) $item['id'];
                             $itemAuthor = (string) ($item['author']?$item['author']:$item['author_name']);
-                        }
-                        else
+                        } else
                         {
                             $itemLink = (isset($item['link']['href']) ? (string) $item['link']['href'] : '');
                             $itemTitle = (string) $item['title'];
@@ -430,8 +492,9 @@ 
                             $itemId = (string) $item['id'];
                             $itemAuthor = (string) ($item['author']?$item['author']:$item['author_name']);
                         }
+                    } else {
+                        print 'ErrorBadFeedFormat';
                     }
-                    else print 'ErrorBadFeedFormat';
 
                     // Add record to result array
                     $this->_rssarray[$i] = array(
@@ -446,13 +509,15 @@ 
 
                     $i++;
 
-                    if ($i > $maxNb)    break;    // We get all records we want
+                    if ($i > $maxNb) {
+                        break;
+                    }
+                    // We get all records we want
                 }
             }
 
             return 1;
-        }
-        else
+        } else
         {
             $this->error='ErrorFailedToLoadRSSFile';
             return -1;
@@ -493,12 +558,10 @@ 
             if ( $el == 'rdf' ) {
                 $this->_format = 'rss';
                 $this->feed_version = '1.0';
-            }
-            elseif ( $el == 'rss' ) {
+            } elseif ( $el == 'rss' ) {
                 $this->_format = 'rss';
                 $this->feed_version = $attrs['version'];
-            }
-            elseif ( $el == 'feed' ) {
+            } elseif ( $el == 'feed' ) {
                 $this->_format = 'atom';
                 $this->feed_version = $attrs['version'];
                 $this->inchannel = true;
@@ -509,8 +572,7 @@ 
         if ( $el == 'channel' )
         {
             $this->inchannel = true;
-        }
-        elseif ($el == 'item' or $el == 'entry' )
+        } elseif ($el == 'item' or $el == 'entry' )
         {
             $this->initem = true;
             if ( isset($attrs['rdf:about']) ) {
@@ -526,9 +588,7 @@ 
         $el == 'textinput' )
         {
             $this->intextinput = true;
-        }
-
-        elseif (
+        } elseif (
         $this->_format == 'rss' and
         $this->current_namespace == '' and
         $el == 'image' )
@@ -567,8 +627,7 @@ 
             if ( isset($attrs['rel']) && $attrs['rel'] == 'alternate' )
             {
                 $link_el = 'link';
-            }
-            else {
+            } else {
                 $link_el = 'link_' . $attrs['rel'];
             }
 
@@ -595,8 +654,7 @@ 
         if ($this->_format == 'atom' and $this->incontent)
         {
             $this->append_content($text);
-        }
-        else
+        } else
         {
             $current_el = join('_', array_reverse($this->stack));
             $this->append($current_el, $text);
@@ -621,37 +679,30 @@ 
             $this->items[] = $this->current_item;
             $this->current_item = array();
             $this->initem = false;
-        }
-        elseif ($this->_format == 'rss' and $this->current_namespace == '' and $el == 'textinput' )
+        } elseif ($this->_format == 'rss' and $this->current_namespace == '' and $el == 'textinput' )
         {
             $this->intextinput = false;
-        }
-        elseif ($this->_format == 'rss' and $this->current_namespace == '' and $el == 'image' )
+        } elseif ($this->_format == 'rss' and $this->current_namespace == '' and $el == 'image' )
         {
             $this->inimage = false;
-        }
-        elseif ($this->_format == 'atom' and in_array($el, $this->_CONTENT_CONSTRUCTS) )
+        } elseif ($this->_format == 'atom' and in_array($el, $this->_CONTENT_CONSTRUCTS) )
         {
             $this->incontent = false;
-        }
-        elseif ($el == 'channel' or $el == 'feed' )
+        } elseif ($el == 'channel' or $el == 'feed' )
         {
             $this->inchannel = false;
-        }
-        elseif ($this->_format == 'atom' and $this->incontent  ) {
+        } elseif ($this->_format == 'atom' and $this->incontent  ) {
             // balance tags properly
             // note:  i don't think this is actually neccessary
             if ( $this->stack[0] == $el )
             {
                 $this->append_content("</$el>");
-            }
-            else {
+            } else {
                 $this->append_content("<$el />");
             }
 
             array_shift($this->stack);
-        }
-        else {
+        } else {
             array_shift($this->stack);
         }
 
@@ -686,8 +737,7 @@ 
         // phpcs:enable
         if ( $this->initem ) {
             $this->concat($this->current_item[ $this->incontent ], $text);
-        }
-        elseif ( $this->inchannel ) {
+        } elseif ( $this->inchannel ) {
             $this->concat($this->channel[ $this->incontent ], $text);
         }
     }
@@ -708,28 +758,21 @@ 
         {
             if ( $this->initem ) {
                 $this->concat($this->current_item[ $this->current_namespace ][ $el ], $text);
-            }
-            elseif ($this->inchannel) {
+            } elseif ($this->inchannel) {
                 $this->concat($this->channel[ $this->current_namespace][ $el ], $text);
-            }
-            elseif ($this->intextinput) {
+            } elseif ($this->intextinput) {
                 $this->concat($this->textinput[ $this->current_namespace][ $el ], $text);
-            }
-            elseif ($this->inimage) {
+            } elseif ($this->inimage) {
                 $this->concat($this->image[ $this->current_namespace ][ $el ], $text);
             }
-        }
-        else {
+        } else {
             if ( $this->initem ) {
                 $this->concat($this->current_item[ $el ], $text);
-            }
-            elseif ($this->intextinput) {
+            } elseif ($this->intextinput) {
                 $this->concat($this->textinput[ $el ], $text);
-            }
-            elseif ($this->inimage) {
+            } elseif ($this->inimage) {
                 $this->concat($this->image[ $el ], $text);
-            }
-            elseif ($this->inchannel) {
+            } elseif ($this->inchannel) {
                 $this->concat($this->channel[ $el ], $text);
             }
         }
@@ -767,13 +810,11 @@ 
             $array[$key][] = $tmp;
             $array[$key][] = $child;
             $tab = true;
-        }
-        elseif($tab === true)
+        } elseif($tab === true)
         {
             //Add an element in an existing array
             $array[$key][] = $child;
-        }
-        else
+        } else
         {
             //Add a simple element
             $array[$key] = $child;

dolibarr/htdocs/core/class/menu.class.php

Braces +3 added lines, -1 removed lines

@@ -120,7 +120,9 @@
         $nb=0;
         foreach($this->liste as $val)
         {
-            if (! empty($val['enabled'])) $nb++;
+            if (! empty($val['enabled'])) {
+                $nb++;
+            }
         }
         return $nb;
     }

dolibarr/htdocs/core/class/CMailFile.class.php

Braces +221 added lines, -113 removed lines

@@ -125,7 +125,9 @@ 
 
 		$this->sendcontext = $sendcontext;
 
-		if (empty($replyto)) $replyto=$from;
+		if (empty($replyto)) {
+		    $replyto=$from;
+		}
 
 		// Define this->sendmode
 		$this->sendmode = '';
@@ -133,8 +135,12 @@ 
 		{
 			$this->sendmode = $conf->global->MAIN_MAIL_SENDMODE_EMAILING;
 		}
-		if (empty($this->sendmode)) $this->sendmode=$conf->global->MAIN_MAIL_SENDMODE;
-		if (empty($this->sendmode)) $this->sendmode='mail';
+		if (empty($this->sendmode)) {
+		    $this->sendmode=$conf->global->MAIN_MAIL_SENDMODE;
+		}
+		if (empty($this->sendmode)) {
+		    $this->sendmode='mail';
+		}
 
 		// We define end of line (RFC 821).
 		$this->eol="\r\n";
@@ -175,9 +181,10 @@ 
 		if ($msgishtml == -1)
 		{
 			$this->msgishtml = 0;
-			if (dol_textishtml($msg)) $this->msgishtml = 1;
-		}
-		else
+			if (dol_textishtml($msg)) {
+			    $this->msgishtml = 1;
+			}
+		} else
 		{
 			$this->msgishtml = $msgishtml;
 		}
@@ -192,7 +199,10 @@ 
 		// Replace relative /viewimage to absolute path
 		$msg = preg_replace('/src="'.preg_quote(DOL_URL_ROOT,'/').'\/viewimage\.php/ims', 'src="'.$urlwithroot.'/viewimage.php', $msg, -1, $nbrep);
 
-		if (! empty($conf->global->MAIN_MAIL_FORCE_CONTENT_TYPE_TO_HTML)) $this->msgishtml=1; // To force to send everything with content type html.
+		if (! empty($conf->global->MAIN_MAIL_FORCE_CONTENT_TYPE_TO_HTML)) {
+		    $this->msgishtml=1;
+		}
+		// To force to send everything with content type html.
 
 		// Detect images
 		if ($this->msgishtml)
@@ -232,7 +242,9 @@ 
 		}
 
 		// Add autocopy to (Note: Adding bcc for specific modules are also done from pages)
-		if (! empty($conf->global->MAIN_MAIL_AUTOCOPY_TO)) $addr_bcc.=($addr_bcc?', ':'').$conf->global->MAIN_MAIL_AUTOCOPY_TO;
+		if (! empty($conf->global->MAIN_MAIL_AUTOCOPY_TO)) {
+		    $addr_bcc.=($addr_bcc?', ':'').$conf->global->MAIN_MAIL_AUTOCOPY_TO;
+		}
 
 		// Action according to choosed sending method
 		if ($this->sendmode == 'mail')
@@ -257,7 +269,10 @@ 
 			$this->trackid = $trackid;
 
 			$smtp_headers = $this->write_smtpheaders();
-			if (! empty($moreinheader)) $smtp_headers.=$moreinheader;   // $moreinheader contains the \r\n
+			if (! empty($moreinheader)) {
+			    $smtp_headers.=$moreinheader;
+			}
+			// $moreinheader contains the \r\n
 
 			// Define mime_headers
 			$mime_headers = $this->write_mimeheaders($filename_list, $mimefilename_list);
@@ -293,8 +308,7 @@ 
 			$this->message = 'This is a message with multiple parts in MIME format.'.$this->eol;
 			$this->message.= $text_body . $files_encoded;
 			$this->message.= "--" . $this->mixed_boundary . "--" . $this->eol;
-		}
-		else if ($this->sendmode == 'smtps')
+		} else if ($this->sendmode == 'smtps')
 		{
 			// Use SMTPS library
 			// ------------------------------------------
@@ -309,7 +323,9 @@ 
 			$smtps->setTrackId($trackid);
 			$smtps->setReplyTo($this->getValidAddress($replyto,0,1));
 
-			if (! empty($moreinheader)) $smtps->setMoreInHeader($moreinheader);
+			if (! empty($moreinheader)) {
+			    $smtps->setMoreInHeader($moreinheader);
+			}
 
 			if (! empty($this->html))
 			{
@@ -322,8 +338,11 @@ 
 				$msg = $this->checkIfHTML($msg);
 			}
 
-			if ($this->msgishtml) $smtps->setBodyContent($msg,'html');
-			else $smtps->setBodyContent($msg,'plain');
+			if ($this->msgishtml) {
+			    $smtps->setBodyContent($msg,'html');
+			} else {
+			    $smtps->setBodyContent($msg,'plain');
+			}
 
 			if ($this->atleastoneimage)
 			{
@@ -348,8 +367,7 @@ 
 			$smtps->setDeliveryReceipt($deliveryreceipt);
 
 			$this->smtps=$smtps;
-		}
-		else if ($this->sendmode == 'swiftmailer')
+		} else if ($this->sendmode == 'swiftmailer')
 		{
 			// Use Swift Mailer library
 			// ------------------------------------------
@@ -474,12 +492,17 @@ 
 				}
 			}
 
-			if (! empty($addr_cc)) $this->message->setCc($this->getArrayAddress($addr_cc));
-			if (! empty($addr_bcc)) $this->message->setBcc($this->getArrayAddress($addr_bcc));
+			if (! empty($addr_cc)) {
+			    $this->message->setCc($this->getArrayAddress($addr_cc));
+			}
+			if (! empty($addr_bcc)) {
+			    $this->message->setBcc($this->getArrayAddress($addr_bcc));
+			}
 			//if (! empty($errors_to)) $this->message->setErrorsTo($this->getArrayAddress($errors_to);
-			if (isset($deliveryreceipt) && $deliveryreceipt == 1) $this->message->setReadReceiptTo($this->getArrayAddress($from));
-		}
-		else
+			if (isset($deliveryreceipt) && $deliveryreceipt == 1) {
+			    $this->message->setReadReceiptTo($this->getArrayAddress($from));
+			}
+		} else
 		{
 			// Send mail method not correctly defined
 			// --------------------------------------
@@ -517,13 +540,17 @@ 
 
 				return $reshook;
 			}
-			if ($reshook == 1)	// Hook replace standard code
+			if ($reshook == 1) {
+			    // Hook replace standard code
 			{
 				return true;
 			}
+			}
 
 			// Check number of recipient is lower or equal than MAIL_MAX_NB_OF_RECIPIENTS_IN_SAME_EMAIL
-			if (empty($conf->global->MAIL_MAX_NB_OF_RECIPIENTS_TO_IN_SAME_EMAIL)) $conf->global->MAIL_MAX_NB_OF_RECIPIENTS_TO_IN_SAME_EMAIL=10;
+			if (empty($conf->global->MAIL_MAX_NB_OF_RECIPIENTS_TO_IN_SAME_EMAIL)) {
+			    $conf->global->MAIL_MAX_NB_OF_RECIPIENTS_TO_IN_SAME_EMAIL=10;
+			}
 			$tmparray1 = explode(',', $this->addr_to);
 			if (count($tmparray1) > $conf->global->MAIL_MAX_NB_OF_RECIPIENTS_TO_IN_SAME_EMAIL)
 			{
@@ -531,7 +558,9 @@ 
 				dol_syslog("CMailFile::sendfile: mail end error=" . $this->error, LOG_WARNING);
 				return false;
 			}
-			if (empty($conf->global->MAIL_MAX_NB_OF_RECIPIENTS_CC_IN_SAME_EMAIL)) $conf->global->MAIL_MAX_NB_OF_RECIPIENTS_CC_IN_SAME_EMAIL=10;
+			if (empty($conf->global->MAIL_MAX_NB_OF_RECIPIENTS_CC_IN_SAME_EMAIL)) {
+			    $conf->global->MAIL_MAX_NB_OF_RECIPIENTS_CC_IN_SAME_EMAIL=10;
+			}
 			$tmparray2 = explode(',', $this->addr_cc);
 			if (count($tmparray2) > $conf->global->MAIL_MAX_NB_OF_RECIPIENTS_CC_IN_SAME_EMAIL)
 			{
@@ -539,7 +568,9 @@ 
 				dol_syslog("CMailFile::sendfile: mail end error=" . $this->error, LOG_WARNING);
 				return false;
 			}
-			if (empty($conf->global->MAIL_MAX_NB_OF_RECIPIENTS_BCC_IN_SAME_EMAIL)) $conf->global->MAIL_MAX_NB_OF_RECIPIENTS_BCC_IN_SAME_EMAIL=10;
+			if (empty($conf->global->MAIL_MAX_NB_OF_RECIPIENTS_BCC_IN_SAME_EMAIL)) {
+			    $conf->global->MAIL_MAX_NB_OF_RECIPIENTS_BCC_IN_SAME_EMAIL=10;
+			}
 			$tmparray3 = explode(',', $this->addr_bcc);
 			if (count($tmparray3) > $conf->global->MAIL_MAX_NB_OF_RECIPIENTS_BCC_IN_SAME_EMAIL)
 			{
@@ -547,7 +578,9 @@ 
 				dol_syslog("CMailFile::sendfile: mail end error=" . $this->error, LOG_WARNING);
 				return false;
 			}
-			if (empty($conf->global->MAIL_MAX_NB_OF_RECIPIENTS_IN_SAME_EMAIL)) $conf->global->MAIL_MAX_NB_OF_RECIPIENTS_IN_SAME_EMAIL=10;
+			if (empty($conf->global->MAIL_MAX_NB_OF_RECIPIENTS_IN_SAME_EMAIL)) {
+			    $conf->global->MAIL_MAX_NB_OF_RECIPIENTS_IN_SAME_EMAIL=10;
+			}
 			if ((count($tmparray1)+count($tmparray2)+count($tmparray3)) > $conf->global->MAIL_MAX_NB_OF_RECIPIENTS_IN_SAME_EMAIL)
 			{
 				$this->error = 'Too much recipients in to:, cc:, bcc:';
@@ -590,13 +623,19 @@ 
 				// If Windows, sendmail_from must be defined
 				if (isset($_SERVER["WINDIR"]))
 				{
-					if (empty($this->addr_from)) $this->addr_from = 'robot@example.com';
+					if (empty($this->addr_from)) {
+					    $this->addr_from = 'robot@example.com';
+					}
 					@ini_set('sendmail_from',$this->getValidAddress($this->addr_from,2));
 				}
 
 				// Force parameters
-				if (! empty($conf->global->$keyforsmtpserver)) ini_set('SMTP',$conf->global->$keyforsmtpserver);
-				if (! empty($conf->global->$keyforsmtpport))   ini_set('smtp_port',$conf->global->$keyforsmtpport);
+				if (! empty($conf->global->$keyforsmtpserver)) {
+				    ini_set('SMTP',$conf->global->$keyforsmtpserver);
+				}
+				if (! empty($conf->global->$keyforsmtpport)) {
+				    ini_set('smtp_port',$conf->global->$keyforsmtpport);
+				}
 
 				$res=true;
 				if ($res && ! $this->subject)
@@ -624,29 +663,43 @@ 
 						// Having this variable not defined may create problems with some other sendmail (option -f required)
 						$additionnalparam .= ($additionnalparam?' ':'').(! empty($conf->global->MAIN_MAIL_ERRORS_TO) ? '-f' . $this->getValidAddress($conf->global->MAIN_MAIL_ERRORS_TO,2) : ($this->addr_from != '' ? '-f' . $this->getValidAddress($this->addr_from,2) : '') );
 					}
-					if (! empty($conf->global->MAIN_MAIL_SENDMAIL_FORCE_BA))    // To force usage of -ba option. This option tells sendmail to read From: or Sender: to setup sender
+					if (! empty($conf->global->MAIN_MAIL_SENDMAIL_FORCE_BA)) {
+					    // To force usage of -ba option. This option tells sendmail to read From: or Sender: to setup sender
 					{
 						$additionnalparam .= ($additionnalparam?' ':'').'-ba';
 					}
+					}
 
-					if (! empty($conf->global->MAIN_MAIL_SENDMAIL_FORCE_ADDPARAM)) $additionnalparam .= ($additionnalparam?' ':'').'-U '.$additionnalparam; // Use -U to add additionnal params
+					if (! empty($conf->global->MAIN_MAIL_SENDMAIL_FORCE_ADDPARAM)) {
+					    $additionnalparam .= ($additionnalparam?' ':'').'-U '.$additionnalparam;
+					}
+					// Use -U to add additionnal params
 
 					dol_syslog("CMailFile::sendfile: mail start HOST=".ini_get('SMTP').", PORT=".ini_get('smtp_port').", additionnal_parameters=".$additionnalparam, LOG_DEBUG);
 
 					$this->message=stripslashes($this->message);
 
-					if (! empty($conf->global->MAIN_MAIL_DEBUG)) $this->dump_mail();
+					if (! empty($conf->global->MAIN_MAIL_DEBUG)) {
+					    $this->dump_mail();
+					}
 
-					if (! empty($additionnalparam)) $res = mail($dest, $this->encodetorfc2822($this->subject), $this->message, $this->headers, $additionnalparam);
-					else $res = mail($dest, $this->encodetorfc2822($this->subject), $this->message, $this->headers);
+					if (! empty($additionnalparam)) {
+					    $res = mail($dest, $this->encodetorfc2822($this->subject), $this->message, $this->headers, $additionnalparam);
+					} else {
+					    $res = mail($dest, $this->encodetorfc2822($this->subject), $this->message, $this->headers);
+					}
 
 					if (! $res)
 					{
 						$langs->load("errors");
 						$this->error="Failed to send mail with php mail";
 						$linuxlike=1;
-						if (preg_match('/^win/i',PHP_OS)) $linuxlike=0;
-						if (preg_match('/^mac/i',PHP_OS)) $linuxlike=0;
+						if (preg_match('/^win/i',PHP_OS)) {
+						    $linuxlike=0;
+						}
+						if (preg_match('/^mac/i',PHP_OS)) {
+						    $linuxlike=0;
+						}
 						if (! $linuxlike)
 						{
 							$this->error.=" to HOST=".ini_get('SMTP').", PORT=".ini_get('smtp_port');	// This values are value used only for non linuxlike systems
@@ -654,8 +707,7 @@ 
 						$this->error.=".<br>";
 						$this->error.=$langs->trans("ErrorPhpMailDelivery");
 						dol_syslog("CMailFile::sendfile: mail end error=".$this->error, LOG_ERR);
-					}
-					else
+					} else
 					{
 						dol_syslog("CMailFile::sendfile: mail end success", LOG_DEBUG);
 					}
@@ -667,10 +719,13 @@ 
 				}
 
 				// Restore parameters
-				if (! empty($conf->global->$keyforsmtpserver))	ini_restore('SMTP');
-				if (! empty($conf->global->$keyforsmtpport)) 	ini_restore('smtp_port');
-			}
-			else if ($this->sendmode == 'smtps')
+				if (! empty($conf->global->$keyforsmtpserver)) {
+				    ini_restore('SMTP');
+				}
+				if (! empty($conf->global->$keyforsmtpport)) {
+				    ini_restore('smtp_port');
+				}
+			} else if ($this->sendmode == 'smtps')
 			{
 				if (! is_object($this->smtps))
 				{
@@ -684,14 +739,22 @@ 
 				$this->smtps->setTransportType(0);	// Only this method is coded in SMTPs library
 
 				// Clean parameters
-				if (empty($conf->global->$keyforsmtpserver)) $conf->global->$keyforsmtpserver=ini_get('SMTP');
-				if (empty($conf->global->$keyforsmtpport))   $conf->global->$keyforsmtpport=ini_get('smtp_port');
+				if (empty($conf->global->$keyforsmtpserver)) {
+				    $conf->global->$keyforsmtpserver=ini_get('SMTP');
+				}
+				if (empty($conf->global->$keyforsmtpport)) {
+				    $conf->global->$keyforsmtpport=ini_get('smtp_port');
+				}
 
 				// If we use SSL/TLS
 				$server=$conf->global->$keyforsmtpserver;
 				$secure='';
-				if (! empty($conf->global->$keyfortls) && function_exists('openssl_open')) $secure='ssl';
-				if (! empty($conf->global->$keyforstarttls) && function_exists('openssl_open')) $secure='tls';
+				if (! empty($conf->global->$keyfortls) && function_exists('openssl_open')) {
+				    $secure='ssl';
+				}
+				if (! empty($conf->global->$keyforstarttls) && function_exists('openssl_open')) {
+				    $secure='tls';
+				}
 				$server=($secure?$secure.'://':'').$server;
 
 				$port=$conf->global->$keyforsmtpport;
@@ -729,47 +792,63 @@ 
 
 				if ($res)
 				{
-					if (! empty($conf->global->MAIN_MAIL_DEBUG)) $this->smtps->setDebug(true);
+					if (! empty($conf->global->MAIN_MAIL_DEBUG)) {
+					    $this->smtps->setDebug(true);
+					}
 
 					$result=$this->smtps->sendMsg();
 					//print $result;
 
-					if (! empty($conf->global->MAIN_MAIL_DEBUG)) $this->dump_mail();
+					if (! empty($conf->global->MAIN_MAIL_DEBUG)) {
+					    $this->dump_mail();
+					}
 
 					$result=$this->smtps->getErrors();
 					if (empty($this->error) && empty($result))
 					{
 						dol_syslog("CMailFile::sendfile: mail end success", LOG_DEBUG);
 						$res=true;
-					}
-					else
+					} else
 					{
-						if (empty($this->error)) $this->error=$result;
+						if (empty($this->error)) {
+						    $this->error=$result;
+						}
 						dol_syslog("CMailFile::sendfile: mail end error=".$this->error, LOG_ERR);
 						$res=false;
 					}
 				}
-			}
-			else if ($this->sendmode == 'swiftmailer')
+			} else if ($this->sendmode == 'swiftmailer')
 			{
 				// Use Swift Mailer library
 				// ------------------------------------------
 				require_once DOL_DOCUMENT_ROOT.'/includes/swiftmailer/lib/swift_required.php';
 
 				// Clean parameters
-				if (empty($conf->global->$keyforsmtpserver)) $conf->global->$keyforsmtpserver=ini_get('SMTP');
-				if (empty($conf->global->$keyforsmtpport))   $conf->global->$keyforsmtpport=ini_get('smtp_port');
+				if (empty($conf->global->$keyforsmtpserver)) {
+				    $conf->global->$keyforsmtpserver=ini_get('SMTP');
+				}
+				if (empty($conf->global->$keyforsmtpport)) {
+				    $conf->global->$keyforsmtpport=ini_get('smtp_port');
+				}
 
 				// If we use SSL/TLS
 				$server = $conf->global->$keyforsmtpserver;
 				$secure = '';
-				if (! empty($conf->global->$keyfortls) && function_exists('openssl_open')) $secure='ssl';
-				if (! empty($conf->global->$keyforstarttls) && function_exists('openssl_open')) $secure='tls';
+				if (! empty($conf->global->$keyfortls) && function_exists('openssl_open')) {
+				    $secure='ssl';
+				}
+				if (! empty($conf->global->$keyforstarttls) && function_exists('openssl_open')) {
+				    $secure='tls';
+				}
 
 				$this->transport = new Swift_SmtpTransport($server, $conf->global->$keyforsmtpport, $secure);
 
-				if (! empty($conf->global->$keyforsmtpid)) $this->transport->setUsername($conf->global->$keyforsmtpid);
-				if (! empty($conf->global->$keyforsmtppw)) $this->transport->setPassword($conf->global->$keyforsmtppw);
+				if (! empty($conf->global->$keyforsmtpid)) {
+				    $this->transport->setUsername($conf->global->$keyforsmtpid);
+				}
+				if (! empty($conf->global->$keyforsmtppw)) {
+				    $this->transport->setPassword($conf->global->$keyforsmtppw);
+				}
 				//$smtps->_msgReplyTo  = 'reply@web.com';
 
 				// Create the Mailer using your created Transport
@@ -797,19 +876,19 @@ 
 				} catch (Exception $e) {
 					$this->error =  $e->getMessage();
 				}
-				if (! empty($conf->global->MAIN_MAIL_DEBUG)) $this->dump_mail();
+				if (! empty($conf->global->MAIN_MAIL_DEBUG)) {
+				    $this->dump_mail();
+				}
 
 				$res = true;
 				if (! empty($this->error) || ! $result) {
 					dol_syslog("CMailFile::sendfile: mail end error=".$this->error, LOG_ERR);
 					$res=false;
-				}
-				else
+				} else
 				{
 					dol_syslog("CMailFile::sendfile: mail end success", LOG_DEBUG);
 				}
-			}
-			else
+			} else
 			{
 				// Send mail method not correctly defined
 				// --------------------------------------
@@ -826,8 +905,7 @@ 
 
 				return $reshook;
 			}
-		}
-		else
+		} else
 		{
 			$this->error='No mail sent. Feature is disabled by option MAIN_DISABLE_ALL_MAILS';
 			dol_syslog("CMailFile::sendfile: ".$this->error, LOG_WARNING);
@@ -867,8 +945,7 @@ 
 			$contents = file_get_contents($newsourcefile);	// Need PHP 4.3
 			$encoded = chunk_split(base64_encode($contents), 76, $this->eol);    // 76 max is defined into http://tools.ietf.org/html/rfc2047
 			return $encoded;
-		}
-		else
+		} else
 		{
 			$this->error="Error: Can't read file '".$sourcefile."' into _encode_file";
 			dol_syslog("CMailFile::encode_file: ".$this->error, LOG_ERR);
@@ -890,9 +967,11 @@ 
         // phpcs:enable
 		global $conf,$dolibarr_main_data_root;
 
-		if (@is_writeable($dolibarr_main_data_root))	// Avoid fatal error on fopen with open_basedir
+		if (@is_writeable($dolibarr_main_data_root)) {
+		    // Avoid fatal error on fopen with open_basedir
 		{
 			$outputfile=$dolibarr_main_data_root."/dolibarr_mail.log";
+		}
 			$fp = fopen($outputfile,"w");
 
 			if ($this->sendmode == 'mail')
@@ -900,19 +979,18 @@ 
 				fputs($fp, $this->headers);
 				fputs($fp, $this->eol);			// This eol is added by the mail function, so we add it in log
 				fputs($fp, $this->message);
-			}
-			elseif ($this->sendmode == 'smtps')
+			} elseif ($this->sendmode == 'smtps')
 			{
 				fputs($fp, $this->smtps->log);	// this->smtps->log is filled only if MAIN_MAIL_DEBUG was set to on
-			}
-			elseif ($this->sendmode == 'swiftmailer')
+			} elseif ($this->sendmode == 'swiftmailer')
 			{
 				fputs($fp, $this->logger->dump());	// this->logger is filled only if MAIN_MAIL_DEBUG was set to on
 			}
 
 			fclose($fp);
-			if (! empty($conf->global->MAIN_UMASK))
-				@chmod($outputfile, octdec($conf->global->MAIN_UMASK));
+			if (! empty($conf->global->MAIN_UMASK)) {
+							@chmod($outputfile, octdec($conf->global->MAIN_UMASK));
+			}
 		}
 	}
 
@@ -928,14 +1006,17 @@ 
 		if (!preg_match('/^[\s\t]*<html/i',$msg))
 		{
 			$out = "<html><head><title></title>";
-			if (!empty($this->styleCSS)) $out.= $this->styleCSS;
+			if (!empty($this->styleCSS)) {
+			    $out.= $this->styleCSS;
+			}
 			$out.= "</head><body";
-			if (!empty($this->bodyCSS)) $out.= $this->bodyCSS;
+			if (!empty($this->bodyCSS)) {
+			    $out.= $this->bodyCSS;
+			}
 			$out.= ">";
 			$out.= $msg;
 			$out.= "</body></html>";
-		}
-		else
+		} else
 		{
 			$out = $msg;
 		}
@@ -995,15 +1076,26 @@ 
 		}
 		// Return-Path is important because it is used by SPF. Some MTA does not read Return-Path from header but from command line. See option MAIN_MAIL_ALLOW_SENDMAIL_F for that.
 		$out.= "Return-Path: ".$this->getValidAddress($this->addr_from,0,1).$this->eol2;
-		if (isset($this->reply_to)  && $this->reply_to)  $out.= "Reply-To: ".$this->getValidAddress($this->reply_to,2).$this->eol2;
-		if (isset($this->errors_to) && $this->errors_to) $out.= "Errors-To: ".$this->getValidAddress($this->errors_to,2).$this->eol2;
+		if (isset($this->reply_to)  && $this->reply_to) {
+		    $out.= "Reply-To: ".$this->getValidAddress($this->reply_to,2).$this->eol2;
+		}
+		if (isset($this->errors_to) && $this->errors_to) {
+		    $out.= "Errors-To: ".$this->getValidAddress($this->errors_to,2).$this->eol2;
+		}
 
 		// Receiver
-		if (isset($this->addr_cc)   && $this->addr_cc)   $out.= "Cc: ".$this->getValidAddress($this->addr_cc,2).$this->eol2;
-		if (isset($this->addr_bcc)  && $this->addr_bcc)  $out.= "Bcc: ".$this->getValidAddress($this->addr_bcc,2).$this->eol2;    // TODO Question: bcc must not be into header, only into SMTP command "RCPT TO". Does php mail support this ?
+		if (isset($this->addr_cc)   && $this->addr_cc) {
+		    $out.= "Cc: ".$this->getValidAddress($this->addr_cc,2).$this->eol2;
+		}
+		if (isset($this->addr_bcc)  && $this->addr_bcc) {
+		    $out.= "Bcc: ".$this->getValidAddress($this->addr_bcc,2).$this->eol2;
+		}
+		// TODO Question: bcc must not be into header, only into SMTP command "RCPT TO". Does php mail support this ?
 
 		// Delivery receipt
-		if (isset($this->deliveryreceipt) && $this->deliveryreceipt == 1) $out.= "Disposition-Notification-To: ".$this->getValidAddress($this->addr_from,2).$this->eol2;
+		if (isset($this->deliveryreceipt) && $this->deliveryreceipt == 1) {
+		    $out.= "Disposition-Notification-To: ".$this->getValidAddress($this->addr_from,2).$this->eol2;
+		}
 
 		//$out.= "X-Priority: 3".$this->eol2;
 
@@ -1016,13 +1108,14 @@ 
 			$out.= 'Message-ID: <' . time() . '.phpmail-dolibarr-'. $trackid . '@' . $host . ">" . $this->eol2;	// Uppercase seems replaced by phpmail
 			$out.= 'References: <' . time() . '.phpmail-dolibarr-'. $trackid . '@' . $host . ">" . $this->eol2;
 			$out.= 'X-Dolibarr-TRACKID: ' . $trackid . '@' . $host. $this->eol2;
-		}
-		else
+		} else
 		{
 			$out.= 'Message-ID: <' . time() . '.phpmail@' . $host . ">" . $this->eol2;
 		}
 
-		if (! empty($_SERVER['REMOTE_ADDR'])) $out.= "X-RemoteAddr: " . $_SERVER['REMOTE_ADDR']. $this->eol2;
+		if (! empty($_SERVER['REMOTE_ADDR'])) {
+		    $out.= "X-RemoteAddr: " . $_SERVER['REMOTE_ADDR']. $this->eol2;
+		}
 		$out.= "X-Mailer: Dolibarr version " . DOL_VERSION ." (using php mail)".$this->eol2;
 		$out.= "Mime-Version: 1.0".$this->eol2;
 
@@ -1057,7 +1150,9 @@ 
 			{
 				if ($filename_list[$i])
 				{
-					if ($mimefilename_list[$i]) $filename_list[$i] = $mimefilename_list[$i];
+					if ($mimefilename_list[$i]) {
+					    $filename_list[$i] = $mimefilename_list[$i];
+					}
 					$out.= "X-attachments: $filename_list[$i]".$this->eol2;
 				}
 			}
@@ -1127,9 +1222,11 @@ 
 				$out.= "--" . $this->related_boundary . $this->eol;
 			}
 
-			if (! $this->atleastoneimage && $strContentAltText && ! empty($conf->global->MAIN_MAIL_USE_MULTI_PART))    // Add plain text message part before html part
+			if (! $this->atleastoneimage && $strContentAltText && ! empty($conf->global->MAIN_MAIL_USE_MULTI_PART)) {
+			    // Add plain text message part before html part
 			{
 				$out.= "Content-Type: multipart/alternative;".$this->eol." boundary=\"".$this->alternative_boundary."\"".$this->eol;
+			}
 				$out.= $this->eol;
 				$out.= "--" . $this->alternative_boundary . $this->eol;
 				$out.= "Content-Type: text/plain; charset=".$conf->file->character_set_client.$this->eol;
@@ -1142,12 +1239,13 @@ 
 			//$out.= "Content-Transfer-Encoding: 7bit".$this->eol;	// TODO Use base64
 			$out.= $this->eol.$strContent.$this->eol;
 
-			if (! $this->atleastoneimage && $strContentAltText && ! empty($conf->global->MAIN_MAIL_USE_MULTI_PART))    // Add plain text message part after html part
+			if (! $this->atleastoneimage && $strContentAltText && ! empty($conf->global->MAIN_MAIL_USE_MULTI_PART)) {
+			    // Add plain text message part after html part
 			{
 				$out.= "--" . $this->alternative_boundary . "--". $this->eol;
 			}
-		}
-		else
+			}
+		} else
 		{
 			$out.= "Content-Type: text/plain; charset=".$conf->file->character_set_client.$this->eol;
 			//$out.= "Content-Transfer-Encoding: 7bit".$this->eol;
@@ -1192,7 +1290,9 @@ 
 				$encoded = $this->_encode_file($filename_list[$i]);
 				if ($encoded >= 0)
 				{
-					if ($mimefilename_list[$i]) $filename_list[$i] = $mimefilename_list[$i];
+					if ($mimefilename_list[$i]) {
+					    $filename_list[$i] = $mimefilename_list[$i];
+					}
 					if (! $mimetype_list[$i]) {
 						$mimetype_list[$i] = "application/octet-stream";
 					}
@@ -1206,8 +1306,7 @@ 
 					$out.= $encoded;
 					$out.= $this->eol;
 					//$out.= $this->eol;
-				}
-				else
+				} else
 				{
 					return $encoded;
 				}
@@ -1286,7 +1385,9 @@ 
 			}
 
 			// If we use SSL/TLS
-			if (! empty($conf->global->$keyfortls) && function_exists('openssl_open')) $host='ssl://'.$host;
+			if (! empty($conf->global->$keyfortls) && function_exists('openssl_open')) {
+			    $host='ssl://'.$host;
+			}
 			// tls smtp start with no encryption
 			//if (! empty($conf->global->MAIN_MAIL_EMAIL_STARTTLS) && function_exists('openssl_open')) $host='tls://'.$host;
 
@@ -1298,17 +1399,20 @@ 
 					$errno,      // actual system level error
 					$errstr,     // and any text that goes with the error
 					$timeout
-			))  // timeout for reading/writing data over the socket
+			)) {
+			    // timeout for reading/writing data over the socket
 			{
 				// Windows still does not have support for this timeout function
 				if (function_exists('stream_set_timeout')) stream_set_timeout($socket, $timeout, 0);
+			}
 
 				dol_syslog("Now we wait for answer 220");
 
 				// Check response from Server
-				if ( $_retVal = $this->server_parse($socket, "220") ) $_retVal = $socket;
-			}
-			else
+				if ( $_retVal = $this->server_parse($socket, "220") ) {
+				    $_retVal = $socket;
+				}
+			} else
 			{
 				$this->error = utf8_check('Error '.$errno.' - '.$errstr)?'Error '.$errno.' - '.$errstr:utf8_encode('Error '.$errno.' - '.$errstr);
 			}
@@ -1369,9 +1473,11 @@ 
 			foreach ($matches[1] as $full)
 			{
 
-				if (preg_match('/file=([A-Za-z0-9_\-\/]+[\.]?[A-Za-z0-9]+)?$/i',$full,$regs))   // If xxx is 'file=aaa'
+				if (preg_match('/file=([A-Za-z0-9_\-\/]+[\.]?[A-Za-z0-9]+)?$/i',$full,$regs)) {
+				    // If xxx is 'file=aaa'
 				{
 					$img = $regs[1];
+				}
 
 					if (file_exists($images_dir.'/'.$img))
 					{
@@ -1430,15 +1536,13 @@ 
 					}
 					$i++;
 				}
-			}
-			else
+			} else
 			{
 				return -1;
 			}
 
 			return 1;
-		}
-		else
+		} else
 		{
 			return 0;
 		}
@@ -1473,8 +1577,7 @@ 
 			{
 				$name  = trim($regs[1]);
 				$email = trim($regs[2]);
-			}
-			else
+			} else
 			{
 				$name  = '';
 				$email = trim($val);
@@ -1499,9 +1602,13 @@ 
 				}
 				if ($format == 0 || $format == 3)
 				{
-					if (! empty($conf->global->MAIN_MAIL_NO_FULL_EMAIL)) $newemail='<'.$email.'>';
-					elseif (! $name) $newemail='<'.$email.'>';
-					else $newemail=($format==3?'"':'').($encode?self::encodetorfc2822($name):$name).($format==3?'"':'').' <'.$email.'>';
+					if (! empty($conf->global->MAIN_MAIL_NO_FULL_EMAIL)) {
+					    $newemail='<'.$email.'>';
+					} elseif (! $name) {
+					    $newemail='<'.$email.'>';
+					} else {
+					    $newemail=($format==3?'"':'').($encode?self::encodetorfc2822($name):$name).($format==3?'"':'').' <'.$email.'>';
+					}
 				}
 
 				$ret=($ret ? $ret.',' : '').$newemail;
@@ -1509,7 +1616,9 @@ 
 				// Stop if we have too much records
 				if ($maxnumberofemail && $i >= $maxnumberofemail)
 				{
-					if (count($arrayaddress) > $maxnumberofemail) $ret.='...';
+					if (count($arrayaddress) > $maxnumberofemail) {
+					    $ret.='...';
+					}
 					break;
 				}
 			}
@@ -1539,8 +1648,7 @@ 
 			{
 				$name  = trim($regs[1]);
 				$email = trim($regs[2]);
-			}
-			else
+			} else
 			{
 				$name  = null;
 				$email = trim($val);

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

Braces +1 added lines, -2 removed lines

@@ -176,8 +176,7 @@
             }
             $out .= "</select>";
             $out .= ajax_combobox("select_".$htmlname);
-        }
-        else {
+        } else {
             dol_print_error($this->db);
         }
         return $out;