Dolibarr / dolibarr

htdocs/core/class/dolgraph.class.php

Braces +190 added lines, -62 removed lines

@@ -106,9 +106,15 @@ 
 		$color_file = DOL_DOCUMENT_ROOT . '/theme/' . $conf->theme . '/theme_vars.inc.php';
 		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>';
 
@@ -522,7 +528,9 @@ 
 	public function GetMaxValueInData()
 	{
 		// phpcs:enable
-		if (!is_array($this->data)) return 0;
+		if (!is_array($this->data)) {
+			return 0;
+		}
 
 		$k = 0;
 		$vals = array();
@@ -549,7 +557,9 @@ 
 	public function GetMinValueInData()
 	{
 		// phpcs:enable
-		if (!is_array($this->data)) return 0;
+		if (!is_array($this->data)) {
+			return 0;
+		}
 
 		$k = 0;
 		$vals = array();
@@ -577,7 +587,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++) {
@@ -585,7 +597,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;
@@ -601,8 +615,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++) {
@@ -676,34 +694,45 @@ 
 		if (is_array($this->data) && is_array($this->data[0])) {
 			$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++;
 			}
 
 			if (isset($this->type[$firstlot]) && in_array($this->type[$firstlot], array('pie', 'piesemicircle', 'polar'))) {
 				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 {
 				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";
+					}
 				}
 			}
 
@@ -713,7 +742,9 @@ 
 		$tag = dol_escape_htmltag(dol_string_unaccent(dol_string_nospecial(basename($file), '_', array('-', '.'))));
 
 		$this->stringtoshow = '<!-- Build using jflot -->' . "\n";
-		if (!empty($this->title)) $this->stringtoshow .= '<div class="center dolgraphtitle' . (empty($this->cssprefix) ? '' : ' dolgraphtitle' . $this->cssprefix) . '">' . $this->title . '</div>';
+		if (!empty($this->title)) {
+			$this->stringtoshow .= '<div class="center 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>';
 			$this->stringtoshow .= '<div class="nographyettext margintoponly">' . $langs->trans("NotEnoughDataYet") . '...</div>';
@@ -722,7 +753,9 @@ 
 
 		// Start the div that will contains all the graph
 		$dolxaxisvertical = '';
-		if (count($this->data) > 20) $dolxaxisvertical = 'dol-xaxis-vertical';
+		if (count($this->data) > 20) {
+			$dolxaxisvertical = 'dol-xaxis-vertical';
+		}
 		$this->stringtoshow .= '<div id="placeholder_' . $tag . '" style="width:' . $this->width . 'px;height:' . $this->height . 'px;" class="dolgraph' . (empty($dolxaxisvertical) ? '' : ' ' . $dolxaxisvertical) . (empty($this->cssprefix) ? '' : ' dolgraph' . $this->cssprefix) . ' center"></div>' . "\n";
 
 		$this->stringtoshow .= '<script id="' . $tag . '">' . "\n";
@@ -743,8 +776,14 @@ 
 		if (isset($this->type[$firstlot]) && in_array($this->type[$firstlot], array('pie', 'piesemicircle', 'polar'))) {
 			$datacolor = array();
 			foreach ($this->datacolor as $val) {
-				if (is_array($val)) $datacolor[] = "#" . sprintf("%02x%02x%02x", $val[0], $val[1], $val[2]); // If datacolor is array(R, G, B)
-				else $datacolor[] = "#" . str_replace(array('#', '-'), '', $val); // If $val is '124' or '#124'
+				if (is_array($val)) {
+					$datacolor[] = "#" . sprintf("%02x%02x%02x", $val[0], $val[1], $val[2]);
+				}
+				// If datacolor is array(R, G, B)
+				else {
+					$datacolor[] = "#" . str_replace(array('#', '-'), '', $val);
+				}
+				// If $val is '124' or '#124'
 			}
 
 			$urltemp = ''; // TODO Add support for url link into labels
@@ -772,13 +811,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: {
@@ -837,9 +880,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 .= '
 					}
 				}
@@ -856,18 +901,28 @@ 
 			$this->stringtoshow .= '$.plot($("#placeholder_' . $tag . '"), [ ' . "\n";
 			$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') {
 					if ($nblot == 3) {
-						if ($i == $firstlot) $align = 'right';
-						elseif ($i == $firstlot + 1) $align = 'center';
-						else $align = 'left';
+						if ($i == $firstlot) {
+							$align = 'right';
+						} elseif ($i == $firstlot + 1) {
+							$align = 'center';
+						} else {
+							$align = 'left';
+						}
 						$this->stringtoshow .= 'bars: { lineWidth: 1, show: true, align: "' . $align . '", barWidth: 0.45 }, ';
-					} else $this->stringtoshow .= 'bars: { lineWidth: 1, show: true, align: "' . ($i == $firstlot ? 'center' : 'left') . '", barWidth: 0.5 }, ';
+					} else {
+						$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] == '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++;
 			}
@@ -878,7 +933,9 @@ 
 			$this->stringtoshow .= ', xaxis: { ticks: [' . "\n";
 			$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++;
 			}
@@ -936,13 +993,18 @@ 
 		$legends = array();
 		$nblot = 0;
 		if (is_array($this->data)) {
-			foreach ($this->data as $valarray)      // Loop on each x
+			foreach ($this->data as $valarray) {
+				// Loop on each x
 			{
-				$nblot = max($nblot, count($valarray) - 1); // -1 to remove legend
+				$nblot = max($nblot, count($valarray) - 1);
+			}
+			// -1 to remove legend
 			}
 		}
 		//var_dump($nblot);
-		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
@@ -952,16 +1014,21 @@ 
 		//var_dump($this->data);
 
 		$i = $firstlot;
-		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 (with x=0,1,2,...)
+			$values = array();
+		}
+		// Array with horizontal y values (specific values of a serie) for each abscisse x (with x=0,1,2,...)
 			$serie[$i] = "";
 
 			// 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] = (array_key_exists('label', $valarray) ? $valarray['label'] : $valarray[0]);
+			}
 				$array_of_ykeys = array_keys($valarray);
 				$alabelexists = 1;
 				$tmpykey = explode('_', ($array_of_ykeys[$i + ($alabelexists ? 1 : 0)]), 3);
@@ -1000,7 +1067,9 @@ 
 		$tag = dol_escape_htmltag(dol_string_unaccent(dol_string_nospecial(basename($file), '_', array('-', '.'))));
 
 		$this->stringtoshow = '<!-- Build using chart -->' . "\n";
-		if (!empty($this->title)) $this->stringtoshow .= '<div class="center dolgraphtitle' . (empty($this->cssprefix) ? '' : ' dolgraphtitle' . $this->cssprefix) . '">' . $this->title . '</div>';
+		if (!empty($this->title)) {
+			$this->stringtoshow .= '<div class="center dolgraphtitle' . (empty($this->cssprefix) ? '' : ' dolgraphtitle' . $this->cssprefix) . '">' . $this->title . '</div>';
+		}
 		if (!empty($this->shownographyet)) {
 			$this->stringtoshow .= '<div style="width:' . $this->width . (strpos($this->width, '%') > 0 ? '' : 'px') . '; height:' . $this->height . 'px;" class="nographyet"></div>';
 			$this->stringtoshow .= '<div class="nographyettext margintoponly">' . $langs->trans("NotEnoughDataYet") . '...</div>';
@@ -1009,10 +1078,14 @@ 
 
 		// Start the div that will contains all the graph
 		$dolxaxisvertical = '';
-		if (count($this->data) > 20) $dolxaxisvertical = 'dol-xaxis-vertical';
+		if (count($this->data) > 20) {
+			$dolxaxisvertical = 'dol-xaxis-vertical';
+		}
 		// No height for the pie grah
 		$cssfordiv = 'dolgraphchart';
-		if (isset($this->type[$firstlot])) $cssfordiv .= ' dolgraphchar' . $this->type[$firstlot];
+		if (isset($this->type[$firstlot])) {
+			$cssfordiv .= ' dolgraphchar' . $this->type[$firstlot];
+		}
 		$this->stringtoshow .= '<div id="placeholder_' . $tag . '" style="min-height: ' . $this->height . (strpos($this->height, '%') > 0 ? '' : 'px') . '; width:' . $this->width . (strpos($this->width, '%') > 0 ? '' : 'px') . ';" class="' . $cssfordiv . ' dolgraph' . (empty($dolxaxisvertical) ? '' : ' ' . $dolxaxisvertical) . (empty($this->cssprefix) ? '' : ' dolgraph' . $this->cssprefix) . ' center"><canvas id="canvas_' . $tag . '"></canvas></div>' . "\n";
 
 		$this->stringtoshow .= '<script id="' . $tag . '">' . "\n";
@@ -1052,16 +1125,24 @@ 
 			$this->stringtoshow .= 'backgroundColor: [';
 			$i = 0;
 			$foundnegativecolor = 0;
-			foreach ($legends as $val)	// Loop on each serie
+			foreach ($legends as $val) {
+				// Loop on each serie
 			{
 				if ($i > 0) $this->stringtoshow .= ', ' . "\n";
-				if (is_array($this->datacolor[$i])) $color = 'rgb(' . $this->datacolor[$i][0] . ', ' . $this->datacolor[$i][1] . ', ' . $this->datacolor[$i][2] . ')'; // If datacolor is array(R, G, B)
+			}
+				if (is_array($this->datacolor[$i])) {
+					$color = 'rgb(' . $this->datacolor[$i][0] . ', ' . $this->datacolor[$i][1] . ', ' . $this->datacolor[$i][2] . ')';
+				}
+				// If datacolor is array(R, G, B)
 				else {
 					$tmp = str_replace('#', '', $this->datacolor[$i]);
 					if (strpos($tmp, '-') !== false) {
 						$foundnegativecolor++;
 						$color = '#FFFFFF'; // If $val is '-123'
-					} else $color = "#" . $tmp; // If $val is '123' or '#123'
+					} else {
+						$color = "#" . $tmp;
+					}
+					// If $val is '123' or '#123'
 				}
 				$this->stringtoshow .= "'" . $color . "'";
 				$i++;
@@ -1071,14 +1152,25 @@ 
 			if ($foundnegativecolor) {
 				$this->stringtoshow .= 'borderColor: [';
 				$i = 0;
-				foreach ($legends as $val)	// Loop on each serie
+				foreach ($legends as $val) {
+					// Loop on each serie
 				{
 					if ($i > 0) $this->stringtoshow .= ', ' . "\n";
-					if (is_array($this->datacolor[$i])) $color = 'null'; // If datacolor is array(R, G, B)
+				}
+					if (is_array($this->datacolor[$i])) {
+						$color = 'null';
+					}
+					// If datacolor is array(R, G, B)
 					else {
 						$tmp = str_replace('#', '', $this->datacolor[$i]);
-						if (strpos($tmp, '-') !== false) $color = '#' . str_replace('-', '', $tmp); // If $val is '-123'
-						else $color = 'null'; // If $val is '123' or '#123'
+						if (strpos($tmp, '-') !== false) {
+							$color = '#' . str_replace('-', '', $tmp);
+						}
+						// If $val is '-123'
+						else {
+							$color = 'null';
+						}
+						// If $val is '123' or '#123'
 					}
 					$this->stringtoshow .= ($color == 'null' ? "'rgba(0,0,0,0.2)'" : "'" . $color . "'");
 					$i++;
@@ -1098,9 +1190,11 @@ 
 					labels: [';
 
 			$i = 0;
-			foreach ($legends as $val)	// Loop on each serie
+			foreach ($legends as $val) {
+				// Loop on each serie
 			{
 				if ($i > 0) $this->stringtoshow .= ', ';
+			}
 				$this->stringtoshow .= "'" . dol_escape_js(dol_trunc($val, 32)) . "'";
 				$i++;
 			}
@@ -1109,12 +1203,16 @@ 
 					datasets: [';
 			$i = 0;
 			$i = 0;
-			while ($i < $nblot)	// Loop on each serie
+			while ($i < $nblot) {
+				// Loop on each serie
 			{
 				$color = 'rgb(' . $this->datacolor[$i][0] . ', ' . $this->datacolor[$i][1] . ', ' . $this->datacolor[$i][2] . ')';
+			}
 				//$color = (!empty($data['seriescolor']) ? json_encode($data['seriescolor']) : json_encode($datacolor));
 
-				if ($i > 0) $this->stringtoshow .= ', ' . "\n";
+				if ($i > 0) {
+					$this->stringtoshow .= ', ' . "\n";
+				}
 				$this->stringtoshow .= '{' . "\n";
 				//$this->stringtoshow .= 'borderColor: \''.$color.'\', ';
 				//$this->stringtoshow .= 'backgroundColor: \''.$color.'\', ';
@@ -1131,11 +1229,19 @@ 
 			$type = 'bar';
 
 			$isfunnel = false;
-			if ($file == 'idgraphleadfunnel') $isfunnel = true;
+			if ($file == 'idgraphleadfunnel') {
+				$isfunnel = true;
+			}
 
-			if (!isset($this->type[$firstlot]) || $this->type[$firstlot] == 'bars') $type = 'bar';
-			if (isset($this->type[$firstlot]) && $this->type[$firstlot] == 'horizontalbars') $type = 'horizontalBar';
-			if (isset($this->type[$firstlot]) && ($this->type[$firstlot] == 'lines' || $this->type[$firstlot] == 'linesnopoint')) $type = 'line';
+			if (!isset($this->type[$firstlot]) || $this->type[$firstlot] == 'bars') {
+				$type = 'bar';
+			}
+			if (isset($this->type[$firstlot]) && $this->type[$firstlot] == 'horizontalbars') {
+				$type = 'horizontalBar';
+			}
+			if (isset($this->type[$firstlot]) && ($this->type[$firstlot] == 'lines' || $this->type[$firstlot] == 'linesnopoint')) {
+				$type = 'line';
+			}
 
 			$this->stringtoshow .= 'var options = { maintainAspectRatio: false, aspectRatio: 2.5, ';
 			if (empty($showlegend)) {
@@ -1181,9 +1287,11 @@ 
 
 			$i = 0;
 			if (!$isfunnel) {
-				foreach ($legends as $val)	// Loop on each serie
+				foreach ($legends as $val) {
+					// Loop on each serie
 					{
 					if ($i > 0) $this->stringtoshow .= ', ';
+				}
 					$this->stringtoshow .= "'".dol_escape_js(dol_trunc($val, 32))."'";
 					$i++;
 				}
@@ -1198,9 +1306,11 @@ 
 			//var_dump($arrayofgroupslegend);
 			$i = 0; $iinstack = 0;
 			$oldstacknum = -1;
-			while ($i < $nblot)	// Loop on each serie
+			while ($i < $nblot) {
+				// Loop on each serie
 			{
 				$foundnegativecolor = 0;
+			}
 				$usecolorvariantforgroupby = 0;
 				// We used a 'group by' and we have too many colors so we generated color variants per
 				if (is_array($arrayofgroupslegend[$i]) && count($arrayofgroupslegend[$i]) > 0) {	// If we used a group by.
@@ -1255,11 +1365,20 @@ 
 								$bordercolor = $color;
 							}
 							if ($foundnegativecolor) {
-								if (is_array($this->datacolor[$i])) $color = 'null'; // If datacolor is array(R, G, B)
+								if (is_array($this->datacolor[$i])) {
+									$color = 'null';
+								}
+								// If datacolor is array(R, G, B)
 								else {
 									$tmp = str_replace('#', '', $this->datacolor[$i]);
-									if (strpos($tmp, '-') !== false) $bordercolor = '#' . str_replace('-', '', $tmp); // If $val is '-123'
-									else $bordercolor = 'null'; // If $val is '123' or '#123'
+									if (strpos($tmp, '-') !== false) {
+										$bordercolor = '#' . str_replace('-', '', $tmp);
+									}
+									// If $val is '-123'
+									else {
+										$bordercolor = 'null';
+									}
+									// If $val is '123' or '#123'
 								}
 								$bordercolor == 'null' ? "'rgba(0,0,0,0.2)'" : "'" . $bordercolor . "'";
 							}
@@ -1271,7 +1390,9 @@ 
 					}
 				}
 
-				if ($i > 0) $this->stringtoshow .= ', ';
+				if ($i > 0) {
+					$this->stringtoshow .= ', ';
+				}
 				$this->stringtoshow .= "\n";
 				$this->stringtoshow .= '{';
 				$this->stringtoshow .= 'dolibarrinfo: \'y_' . $i . '\', ';
@@ -1285,7 +1406,9 @@ 
 				}
 				$this->stringtoshow .= 'borderColor: \'' . $bordercolor . '\', ';
 				$this->stringtoshow .= 'backgroundColor: \'' . $color . '\', ';
-				if ($arrayofgroupslegend[$i]) $this->stringtoshow .= 'stack: \'' . $arrayofgroupslegend[$i]['stacknum'] . '\', ';
+				if ($arrayofgroupslegend[$i]) {
+					$this->stringtoshow .= 'stack: \'' . $arrayofgroupslegend[$i]['stacknum'] . '\', ';
+				}
 				$this->stringtoshow .='data: [';
 				if ($isfunnel) {
 					$this->stringtoshow .= '['.-$serie[$i].','.$serie[$i].']';
@@ -1315,10 +1438,12 @@ 
 	public function total()
 	{
 		$value = 0;
-		foreach ($this->data as $valarray)	// Loop on each x
+		foreach ($this->data as $valarray) {
+			// Loop on each x
 			{
 			$value += $valarray[1];
 		}
+		}
 		return $value;
 	}
 
@@ -1361,8 +1486,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')
 		{

htdocs/admin/emailcollector_list.php

Braces +160 added lines, -59 removed lines

@@ -70,16 +70,23 @@ 
 $search_array_options = $extrafields->getOptionalsFromPost($object->table_element, '', 'search_');
 
 // Default sort order (if not yet defined by previous GETPOST)
-if (!$sortfield) $sortfield = "t.".key($object->fields); // Set here default search field. By default 1st field in definition.
-if (!$sortorder) $sortorder = "ASC";
+if (!$sortfield) {
+	$sortfield = "t.".key($object->fields);
+}
+// Set here default search field. By default 1st field in definition.
+if (!$sortorder) {
+	$sortorder = "ASC";
+}
 
 // Security check
 $socid = 0;
-if ($user->socid > 0)	// Protection if external user
+if ($user->socid > 0) {
+	// Protection if external user
 {
 	//$socid = $user->socid;
 	accessforbidden();
 }
+}
 //$result = restrictedArea($user, 'emailcollector', $id, '');
 
 // Initialize array of search criterias
@@ -87,15 +94,19 @@ 
 $search = array();
 foreach ($object->fields as $key => $val)
 {
-	if (GETPOST('search_'.$key, 'alpha') !== '') $search[$key] = GETPOST('search_'.$key, 'alpha');
-}
+	if (GETPOST('search_'.$key, 'alpha') !== '') {
+		$search[$key] = GETPOST('search_'.$key, 'alpha');
+	}
+	}
 
 // List of fields to search into when doing a "search in all"
 $fieldstosearchall = array();
 foreach ($object->fields as $key => $val)
 {
-	if ($val['searchall']) $fieldstosearchall['t.'.$key] = $val['label'];
-}
+	if ($val['searchall']) {
+		$fieldstosearchall['t.'.$key] = $val['label'];
+	}
+	}
 
 // Definition of array of fields for columns
 $arrayfields = array();
@@ -138,8 +149,12 @@ 
 $permissiontoadd = $user->admin;
 $permissiontodelete = $user->admin;
 
-if (!$user->admin) accessforbidden();
-if (empty($conf->emailcollector->enabled)) accessforbidden('Module not enabled');
+if (!$user->admin) {
+	accessforbidden();
+}
+if (empty($conf->emailcollector->enabled)) {
+	accessforbidden('Module not enabled');
+}
 
 
 
@@ -152,7 +167,9 @@ 
 
 $parameters = array();
 $reshook = $hookmanager->executeHooks('doActions', $parameters, $object, $action); // Note that $action and $object may have been modified by some hooks
-if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
+if ($reshook < 0) {
+	setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
+}
 
 if (empty($reshook))
 {
@@ -160,11 +177,13 @@ 
 	include DOL_DOCUMENT_ROOT.'/core/actions_changeselectedfields.inc.php';
 
 	// Purge search criteria
-	if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter.x', 'alpha') || GETPOST('button_removefilter', 'alpha')) // All tests are required to be compatible with all browsers
+	if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter.x', 'alpha') || GETPOST('button_removefilter', 'alpha')) {
+		// All tests are required to be compatible with all browsers
 	{
 		foreach ($object->fields as $key => $val)
 		{
 			$search[$key] = '';
+	}
 		}
 		$toselect = '';
 		$search_array_options = array();
@@ -203,28 +222,43 @@ 
 }
 // Add fields from extrafields
 if (!empty($extrafields->attributes[$object->table_element]['label'])) {
-	foreach ($extrafields->attributes[$object->table_element]['label'] as $key => $val) $sql .= ($extrafields->attributes[$object->table_element]['type'][$key] != 'separate' ? "ef.".$key.' as options_'.$key.', ' : '');
-}
+	foreach ($extrafields->attributes[$object->table_element]['label'] as $key => $val) {
+		$sql .= ($extrafields->attributes[$object->table_element]['type'][$key] != 'separate' ? "ef.".$key.' as options_'.$key.', ' : '');
+	}
+	}
 // Add fields from hooks
 $parameters = array();
 $reshook = $hookmanager->executeHooks('printFieldListSelect', $parameters, $object); // Note that $action and $object may have been modified by hook
 $sql .= preg_replace('/^,/', '', $hookmanager->resPrint);
 $sql = preg_replace('/,\s*$/', '', $sql);
 $sql .= " FROM ".MAIN_DB_PREFIX.$object->table_element." as t";
-if (is_array($extrafields->attributes[$object->table_element]['label']) && count($extrafields->attributes[$object->table_element]['label'])) $sql .= " LEFT JOIN ".MAIN_DB_PREFIX.$object->table_element."_extrafields as ef on (t.rowid = ef.fk_object)";
-if ($object->ismultientitymanaged == 1) $sql .= " WHERE t.entity IN (".getEntity($object->element).")";
-else $sql .= " WHERE 1 = 1";
+if (is_array($extrafields->attributes[$object->table_element]['label']) && count($extrafields->attributes[$object->table_element]['label'])) {
+	$sql .= " LEFT JOIN ".MAIN_DB_PREFIX.$object->table_element."_extrafields as ef on (t.rowid = ef.fk_object)";
+}
+if ($object->ismultientitymanaged == 1) {
+	$sql .= " WHERE t.entity IN (".getEntity($object->element).")";
+} else {
+	$sql .= " WHERE 1 = 1";
+}
 foreach ($search as $key => $val)
 {
-	if ($key == 'status' && $search[$key] == -1) continue;
+	if ($key == 'status' && $search[$key] == -1) {
+		continue;
+	}
 	$mode_search = (($object->isInt($object->fields[$key]) || $object->isFloat($object->fields[$key])) ? 1 : 0);
 	if (strpos($object->fields[$key]['type'], 'integer:') === 0) {
-		if ($search[$key] == '-1') $search[$key] = '';
+		if ($search[$key] == '-1') {
+			$search[$key] = '';
+		}
 		$mode_search = 2;
 	}
-	if ($search[$key] != '') $sql .= natural_search($key, $search[$key], (($key == 'status') ? 2 : $mode_search));
+	if ($search[$key] != '') {
+		$sql .= natural_search($key, $search[$key], (($key == 'status') ? 2 : $mode_search));
+	}
+	}
+if ($search_all) {
+	$sql .= natural_search(array_keys($fieldstosearchall), $search_all);
 }
-if ($search_all) $sql .= natural_search(array_keys($fieldstosearchall), $search_all);
 // Add where from extra fields
 include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_sql.tpl.php';
 // Add where from hooks
@@ -257,9 +291,11 @@ 
 {
 	$resql = $db->query($sql);
 	$nbtotalofrecords = $db->num_rows($resql);
-	if (($page * $limit) > $nbtotalofrecords)	// if total of record found is smaller than page * limit, goto and load page 0
+	if (($page * $limit) > $nbtotalofrecords) {
+		// if total of record found is smaller than page * limit, goto and load page 0
 	{
 		$page = 0;
+	}
 		$offset = 0;
 	}
 }
@@ -268,7 +304,9 @@ 
 {
 	$num = $nbtotalofrecords;
 } else {
-	if ($limit) $sql .= $db->plimit($limit + 1, $offset);
+	if ($limit) {
+		$sql .= $db->plimit($limit + 1, $offset);
+	}
 
 	$resql = $db->query($sql);
 	if (!$resql)
@@ -313,14 +351,23 @@ 
 $arrayofselected = is_array($toselect) ? $toselect : array();
 
 $param = '';
-if (!empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) $param .= '&contextpage='.urlencode($contextpage);
-if ($limit > 0 && $limit != $conf->liste_limit) $param .= '&limit='.urlencode($limit);
+if (!empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) {
+	$param .= '&contextpage='.urlencode($contextpage);
+}
+if ($limit > 0 && $limit != $conf->liste_limit) {
+	$param .= '&limit='.urlencode($limit);
+}
 foreach ($search as $key => $val)
 {
-	if (is_array($search[$key]) && count($search[$key])) foreach ($search[$key] as $skey) $param .= '&search_'.$key.'[]='.urlencode($skey);
-	else $param .= '&search_'.$key.'='.urlencode($search[$key]);
+	if (is_array($search[$key]) && count($search[$key])) {
+		foreach ($search[$key] as $skey) $param .= '&search_'.$key.'[]='.urlencode($skey);
+	} else {
+		$param .= '&search_'.$key.'='.urlencode($search[$key]);
+	}
+	}
+if ($optioncss != '') {
+	$param .= '&optioncss='.urlencode($optioncss);
 }
-if ($optioncss != '')     $param .= '&optioncss='.urlencode($optioncss);
 // Add $param from extra fields
 include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_param.tpl.php';
 
@@ -329,12 +376,18 @@ 
 	//'presend'=>$langs->trans("SendByMail"),
 	//'builddoc'=>$langs->trans("PDFMerge"),
 );
-if ($permissiontodelete) $arrayofmassactions['predelete'] = '<span class="fa fa-trash paddingrightonly"></span>'.$langs->trans("Delete");
-if (GETPOST('nomassaction', 'int') || in_array($massaction, array('presend', 'predelete'))) $arrayofmassactions = array();
+if ($permissiontodelete) {
+	$arrayofmassactions['predelete'] = '<span class="fa fa-trash paddingrightonly"></span>'.$langs->trans("Delete");
+}
+if (GETPOST('nomassaction', 'int') || in_array($massaction, array('presend', 'predelete'))) {
+	$arrayofmassactions = array();
+}
 $massactionbutton = $form->selectMassAction('', $arrayofmassactions);
 
 print '<form method="POST" id="searchFormList" action="'.$_SERVER["PHP_SELF"].'">';
-if ($optioncss != '') print '<input type="hidden" name="optioncss" value="'.$optioncss.'">';
+if ($optioncss != '') {
+	print '<input type="hidden" name="optioncss" value="'.$optioncss.'">';
+}
 print '<input type="hidden" name="token" value="'.newToken().'">';
 print '<input type="hidden" name="formfilteraction" id="formfilteraction" value="list">';
 print '<input type="hidden" name="action" value="list">';
@@ -363,8 +416,11 @@ 
 
 $parameters = array();
 $reshook = $hookmanager->executeHooks('printFieldPreListTitle', $parameters, $object); // Note that $action and $object may have been modified by hook
-if (empty($reshook)) $moreforfilter .= $hookmanager->resPrint;
-else $moreforfilter = $hookmanager->resPrint;
+if (empty($reshook)) {
+	$moreforfilter .= $hookmanager->resPrint;
+} else {
+	$moreforfilter = $hookmanager->resPrint;
+}
 
 if (!empty($moreforfilter))
 {
@@ -387,17 +443,25 @@ 
 foreach ($object->fields as $key => $val)
 {
 	$cssforfield = (empty($val['css']) ? '' : $val['css']);
-	if ($key == 'status') $cssforfield .= ($cssforfield ? ' ' : '').'center';
-	elseif (in_array($val['type'], array('date', 'datetime', 'timestamp'))) $cssforfield .= ($cssforfield ? ' ' : '').'center';
-	elseif (in_array($val['type'], array('timestamp'))) $cssforfield .= ($cssforfield ? ' ' : '').'nowrap';
-	elseif (in_array($val['type'], array('double(24,8)', 'double(6,3)', 'integer', 'real', 'price')) && $val['label'] != 'TechnicalID') $cssforfield .= ($cssforfield ? ' ' : '').'right';
+	if ($key == 'status') {
+		$cssforfield .= ($cssforfield ? ' ' : '').'center';
+	} elseif (in_array($val['type'], array('date', 'datetime', 'timestamp'))) {
+		$cssforfield .= ($cssforfield ? ' ' : '').'center';
+	} elseif (in_array($val['type'], array('timestamp'))) {
+		$cssforfield .= ($cssforfield ? ' ' : '').'nowrap';
+	} elseif (in_array($val['type'], array('double(24,8)', 'double(6,3)', 'integer', 'real', 'price')) && $val['label'] != 'TechnicalID') {
+		$cssforfield .= ($cssforfield ? ' ' : '').'right';
+	}
 	if (!empty($arrayfields['t.'.$key]['checked']))
 	{
 		print '<td class="liste_titre'.($cssforfield ? ' '.$cssforfield : '').'">';
-		if (!empty($val['arrayofkeyval']) && is_array($val['arrayofkeyval'])) print $form->selectarray('search_'.$key, $val['arrayofkeyval'], $search[$key], $val['notnull'], 0, 0, '', 1, 0, 0, '', 'maxwidth100', 1);
-		elseif (strpos($val['type'], 'integer:') === 0) {
+		if (!empty($val['arrayofkeyval']) && is_array($val['arrayofkeyval'])) {
+			print $form->selectarray('search_'.$key, $val['arrayofkeyval'], $search[$key], $val['notnull'], 0, 0, '', 1, 0, 0, '', 'maxwidth100', 1);
+		} elseif (strpos($val['type'], 'integer:') === 0) {
 			print $object->showInputField($val, $key, $search[$key], '', '', 'search_', 'maxwidth150', 1);
-		} elseif (!preg_match('/^(date|timestamp)/', $val['type'])) print '<input type="text" class="flat maxwidth75" name="search_'.$key.'" value="'.dol_escape_htmltag($search[$key]).'">';
+		} elseif (!preg_match('/^(date|timestamp)/', $val['type'])) {
+			print '<input type="text" class="flat maxwidth75" name="search_'.$key.'" value="'.dol_escape_htmltag($search[$key]).'">';
+		}
 		print '</td>';
 	}
 }
@@ -422,10 +486,15 @@ 
 foreach ($object->fields as $key => $val)
 {
 	$cssforfield = (empty($val['css']) ? '' : $val['css']);
-	if ($key == 'status') $cssforfield .= ($cssforfield ? ' ' : '').'center';
-	elseif (in_array($val['type'], array('date', 'datetime', 'timestamp'))) $cssforfield .= ($cssforfield ? ' ' : '').'center';
-	elseif (in_array($val['type'], array('timestamp'))) $cssforfield .= ($cssforfield ? ' ' : '').'nowrap';
-	elseif (in_array($val['type'], array('double(24,8)', 'double(6,3)', 'integer', 'real', 'price')) && $val['label'] != 'TechnicalID') $cssforfield .= ($cssforfield ? ' ' : '').'right';
+	if ($key == 'status') {
+		$cssforfield .= ($cssforfield ? ' ' : '').'center';
+	} elseif (in_array($val['type'], array('date', 'datetime', 'timestamp'))) {
+		$cssforfield .= ($cssforfield ? ' ' : '').'center';
+	} elseif (in_array($val['type'], array('timestamp'))) {
+		$cssforfield .= ($cssforfield ? ' ' : '').'nowrap';
+	} elseif (in_array($val['type'], array('double(24,8)', 'double(6,3)', 'integer', 'real', 'price')) && $val['label'] != 'TechnicalID') {
+		$cssforfield .= ($cssforfield ? ' ' : '').'right';
+	}
 	if (!empty($arrayfields['t.'.$key]['checked']))
 	{
 		print getTitleFieldOfList($arrayfields['t.'.$key]['label'], 0, $_SERVER['PHP_SELF'], 't.'.$key, '', $param, ($cssforfield ? 'class="'.$cssforfield.'"' : ''), $sortfield, $sortorder, ($cssforfield ? $cssforfield.' ' : ''))."\n";
@@ -448,7 +517,10 @@ 
 {
 	foreach ($extrafields->attributes[$object->table_element]['computed'] as $key => $val)
 	{
-		if (preg_match('/\$object/', $val)) $needToFetchEachLine++; // There is at least one compute field that use $object
+		if (preg_match('/\$object/', $val)) {
+			$needToFetchEachLine++;
+		}
+		// There is at least one compute field that use $object
 	}
 }
 
@@ -460,7 +532,10 @@ 
 while ($i < ($limit ? min($num, $limit) : $num))
 {
 	$obj = $db->fetch_object($resql);
-	if (empty($obj)) break; // Should not happen
+	if (empty($obj)) {
+		break;
+	}
+	// Should not happen
 
 	// Store properties in $object
 	$object->setVarsFromFetchObj($obj);
@@ -470,25 +545,40 @@ 
 	foreach ($object->fields as $key => $val)
 	{
 		$cssforfield = (empty($val['css']) ? '' : $val['css']);
-		if (in_array($val['type'], array('date', 'datetime', 'timestamp'))) $cssforfield .= ($cssforfield ? ' ' : '').'center';
-		elseif ($key == 'status') $cssforfield .= ($cssforfield ? ' ' : '').'center';
+		if (in_array($val['type'], array('date', 'datetime', 'timestamp'))) {
+			$cssforfield .= ($cssforfield ? ' ' : '').'center';
+		} elseif ($key == 'status') {
+			$cssforfield .= ($cssforfield ? ' ' : '').'center';
+		}
 
-		if (in_array($val['type'], array('timestamp'))) $cssforfield .= ($cssforfield ? ' ' : '').'nowrap';
-		elseif ($key == 'ref') $cssforfield .= ($cssforfield ? ' ' : '').'nowrap';
+		if (in_array($val['type'], array('timestamp'))) {
+			$cssforfield .= ($cssforfield ? ' ' : '').'nowrap';
+		} elseif ($key == 'ref') {
+			$cssforfield .= ($cssforfield ? ' ' : '').'nowrap';
+		}
 
-		if (in_array($val['type'], array('double(24,8)', 'double(6,3)', 'integer', 'real', 'price')) && !in_array($key, array('rowid', 'status'))) $cssforfield .= ($cssforfield ? ' ' : '').'right';
+		if (in_array($val['type'], array('double(24,8)', 'double(6,3)', 'integer', 'real', 'price')) && !in_array($key, array('rowid', 'status'))) {
+			$cssforfield .= ($cssforfield ? ' ' : '').'right';
+		}
 		//if (in_array($key, array('fk_soc', 'fk_user', 'fk_warehouse'))) $cssforfield = 'tdoverflowmax100';
 
 		if (!empty($arrayfields['t.'.$key]['checked']))
 		{
 			print '<td'.($cssforfield ? ' class="'.$cssforfield.'"' : '').'>';
-			if ($key == 'status') print $object->getLibStatut(5);
-			else print $object->showOutputField($val, $key, $object->$key, '');
+			if ($key == 'status') {
+				print $object->getLibStatut(5);
+			} else {
+				print $object->showOutputField($val, $key, $object->$key, '');
+			}
 			print '</td>';
-			if (!$i) $totalarray['nbfield']++;
+			if (!$i) {
+				$totalarray['nbfield']++;
+			}
 			if (!empty($val['isameasure']))
 			{
-				if (!$i) $totalarray['pos'][$totalarray['nbfield']] = 't.'.$key;
+				if (!$i) {
+					$totalarray['pos'][$totalarray['nbfield']] = 't.'.$key;
+				}
 				$totalarray['val']['t.'.$key] += $object->$key;
 			}
 		}
@@ -501,14 +591,20 @@ 
 	print $hookmanager->resPrint;
 	// Action column
 	print '<td class="nowrap center">';
-	if ($massactionbutton || $massaction)   // If we are in select mode (massactionbutton defined) or if we have already selected and sent an action ($massaction) defined
+	if ($massactionbutton || $massaction) {
+		// If we are in select mode (massactionbutton defined) or if we have already selected and sent an action ($massaction) defined
 	{
 		$selected = 0;
-		if (in_array($object->id, $arrayofselected)) $selected = 1;
+	}
+		if (in_array($object->id, $arrayofselected)) {
+			$selected = 1;
+		}
 		print '<input id="cb'.$object->id.'" class="flat checkforselect" type="checkbox" name="toselect[]" value="'.$object->id.'"'.($selected ? ' checked="checked"' : '').'>';
 	}
 	print '</td>';
-	if (!$i) $totalarray['nbfield']++;
+	if (!$i) {
+		$totalarray['nbfield']++;
+	}
 
 	print '</tr>'."\n";
 
@@ -523,7 +619,10 @@ 
 if ($num == 0)
 {
 	$colspan = 1;
-	foreach ($arrayfields as $key => $val) { if (!empty($val['checked'])) $colspan++; }
+	foreach ($arrayfields as $key => $val) { if (!empty($val['checked'])) {
+		$colspan++;
+	}
+	}
 	print '<tr><td colspan="'.$colspan.'" class="opacitymedium">'.$langs->trans("NoRecordFound").'</td></tr>';
 }
 
@@ -542,7 +641,9 @@ 
 if (in_array('builddoc', $arrayofmassactions) && ($nbtotalofrecords === '' || $nbtotalofrecords))
 {
 	$hidegeneratedfilelistifempty = 1;
-	if ($massaction == 'builddoc' || $action == 'remove_file' || $show_files) $hidegeneratedfilelistifempty = 0;
+	if ($massaction == 'builddoc' || $action == 'remove_file' || $show_files) {
+		$hidegeneratedfilelistifempty = 0;
+	}
 
 	require_once DOL_DOCUMENT_ROOT.'/core/class/html.formfile.class.php';
 	$formfile = new FormFile($db);