Dolibarr / dolibarr

htdocs/admin/multicurrency.php

Braces +16 added lines, -6 removed lines

@@ -90,9 +90,14 @@ 
 	{
 		if ($currency->create($user) > 0)
 		{
-			if ($currency->addRate($rate)) setEventMessages($langs->trans('RecordSaved'), array());
-			else setEventMessages($langs->trans('ErrorAddRateFail'), array(), 'errors');
-		} else setEventMessages($langs->trans('ErrorAddCurrencyFail'), $currency->errors, 'errors');
+			if ($currency->addRate($rate)) {
+				setEventMessages($langs->trans('RecordSaved'), array());
+			} else {
+				setEventMessages($langs->trans('ErrorAddRateFail'), array(), 'errors');
+			}
+		} else {
+			setEventMessages($langs->trans('ErrorAddCurrencyFail'), $currency->errors, 'errors');
+		}
 	}
 } elseif ($action == 'update_currency')
 {
@@ -126,8 +131,11 @@ 
 
 		if ($currency->fetch($fk_multicurrency) > 0)
 		{
-			if ($currency->delete() > 0) setEventMessages($langs->trans('RecordDeleted'), array());
-			else setEventMessages($langs->trans('ErrorDeleteCurrencyFail'), array(), 'errors');
+			if ($currency->delete() > 0) {
+				setEventMessages($langs->trans('RecordDeleted'), array());
+			} else {
+				setEventMessages($langs->trans('ErrorDeleteCurrencyFail'), array(), 'errors');
+			}
 		}
 	}
 } elseif ($action == 'setapilayer')
@@ -330,7 +338,9 @@ 
 
 foreach ($TCurrency as &$currency)
 {
-	if ($currency->code == $conf->currency) continue;
+	if ($currency->code == $conf->currency) {
+		continue;
+	}
 
 	print '<tr class="oddeven">';
 	print '<td>'.$currency->code.' - '.$currency->name.'</td>';

htdocs/admin/ldap_contacts.php

Braces +57 added lines, -20 removed lines

@@ -35,8 +35,9 @@ 
 // Load translation files required by the page
 $langs->loadLangs(array("admin", "errors"));
 
-if (!$user->admin)
+if (!$user->admin) {
   accessforbidden();
+}
 
 $action = GETPOST('action', 'aZ09');
 
@@ -50,29 +51,65 @@ 
 
 	$db->begin();
 
-	if (!dolibarr_set_const($db, 'LDAP_CONTACT_DN', GETPOST("contactdn"), 'chaine', 0, '', $conf->entity)) $error++;
-	if (!dolibarr_set_const($db, 'LDAP_CONTACT_OBJECT_CLASS', GETPOST("objectclass"), 'chaine', 0, '', $conf->entity)) $error++;
-
-	if (!dolibarr_set_const($db, 'LDAP_CONTACT_FIELD_FULLNAME', GETPOST("fieldfullname"), 'chaine', 0, '', $conf->entity)) $error++;
-	if (!dolibarr_set_const($db, 'LDAP_CONTACT_FIELD_NAME', GETPOST("fieldname"), 'chaine', 0, '', $conf->entity)) $error++;
-	if (!dolibarr_set_const($db, 'LDAP_CONTACT_FIELD_FIRSTNAME', GETPOST("fieldfirstname"), 'chaine', 0, '', $conf->entity)) $error++;
-	if (!dolibarr_set_const($db, 'LDAP_CONTACT_FIELD_COMPANY', GETPOST("fieldcompany"), 'chaine', 0, '', $conf->entity)) $error++;
-	if (!dolibarr_set_const($db, 'LDAP_CONTACT_FIELD_MAIL', GETPOST("fieldmail"), 'chaine', 0, '', $conf->entity)) $error++;
-	if (!dolibarr_set_const($db, 'LDAP_CONTACT_FIELD_PHONE', GETPOST("fieldphone"), 'chaine', 0, '', $conf->entity)) $error++;
-	if (!dolibarr_set_const($db, 'LDAP_CONTACT_FIELD_HOMEPHONE', GETPOST("fieldhomephone"), 'chaine', 0, '', $conf->entity)) $error++;
-	if (!dolibarr_set_const($db, 'LDAP_CONTACT_FIELD_MOBILE', GETPOST("fieldmobile"), 'chaine', 0, '', $conf->entity)) $error++;
-	if (!dolibarr_set_const($db, 'LDAP_CONTACT_FIELD_SKYPE', GETPOST("fieldskype"), 'chaine', 0, '', $conf->entity)) $error++;
-	if (!dolibarr_set_const($db, 'LDAP_CONTACT_FIELD_FAX', GETPOST("fieldfax"), 'chaine', 0, '', $conf->entity)) $error++;
-	if (!dolibarr_set_const($db, 'LDAP_CONTACT_FIELD_ADDRESS', GETPOST("fieldaddress"), 'chaine', 0, '', $conf->entity)) $error++;
-	if (!dolibarr_set_const($db, 'LDAP_CONTACT_FIELD_ZIP', GETPOST("fieldzip"), 'chaine', 0, '', $conf->entity)) $error++;
-	if (!dolibarr_set_const($db, 'LDAP_CONTACT_FIELD_TOWN', GETPOST("fieldtown"), 'chaine', 0, '', $conf->entity)) $error++;
-	if (!dolibarr_set_const($db, 'LDAP_CONTACT_FIELD_COUNTRY', GETPOST("fieldcountry"), 'chaine', 0, '', $conf->entity)) $error++;
+	if (!dolibarr_set_const($db, 'LDAP_CONTACT_DN', GETPOST("contactdn"), 'chaine', 0, '', $conf->entity)) {
+		$error++;
+	}
+	if (!dolibarr_set_const($db, 'LDAP_CONTACT_OBJECT_CLASS', GETPOST("objectclass"), 'chaine', 0, '', $conf->entity)) {
+		$error++;
+	}
+
+	if (!dolibarr_set_const($db, 'LDAP_CONTACT_FIELD_FULLNAME', GETPOST("fieldfullname"), 'chaine', 0, '', $conf->entity)) {
+		$error++;
+	}
+	if (!dolibarr_set_const($db, 'LDAP_CONTACT_FIELD_NAME', GETPOST("fieldname"), 'chaine', 0, '', $conf->entity)) {
+		$error++;
+	}
+	if (!dolibarr_set_const($db, 'LDAP_CONTACT_FIELD_FIRSTNAME', GETPOST("fieldfirstname"), 'chaine', 0, '', $conf->entity)) {
+		$error++;
+	}
+	if (!dolibarr_set_const($db, 'LDAP_CONTACT_FIELD_COMPANY', GETPOST("fieldcompany"), 'chaine', 0, '', $conf->entity)) {
+		$error++;
+	}
+	if (!dolibarr_set_const($db, 'LDAP_CONTACT_FIELD_MAIL', GETPOST("fieldmail"), 'chaine', 0, '', $conf->entity)) {
+		$error++;
+	}
+	if (!dolibarr_set_const($db, 'LDAP_CONTACT_FIELD_PHONE', GETPOST("fieldphone"), 'chaine', 0, '', $conf->entity)) {
+		$error++;
+	}
+	if (!dolibarr_set_const($db, 'LDAP_CONTACT_FIELD_HOMEPHONE', GETPOST("fieldhomephone"), 'chaine', 0, '', $conf->entity)) {
+		$error++;
+	}
+	if (!dolibarr_set_const($db, 'LDAP_CONTACT_FIELD_MOBILE', GETPOST("fieldmobile"), 'chaine', 0, '', $conf->entity)) {
+		$error++;
+	}
+	if (!dolibarr_set_const($db, 'LDAP_CONTACT_FIELD_SKYPE', GETPOST("fieldskype"), 'chaine', 0, '', $conf->entity)) {
+		$error++;
+	}
+	if (!dolibarr_set_const($db, 'LDAP_CONTACT_FIELD_FAX', GETPOST("fieldfax"), 'chaine', 0, '', $conf->entity)) {
+		$error++;
+	}
+	if (!dolibarr_set_const($db, 'LDAP_CONTACT_FIELD_ADDRESS', GETPOST("fieldaddress"), 'chaine', 0, '', $conf->entity)) {
+		$error++;
+	}
+	if (!dolibarr_set_const($db, 'LDAP_CONTACT_FIELD_ZIP', GETPOST("fieldzip"), 'chaine', 0, '', $conf->entity)) {
+		$error++;
+	}
+	if (!dolibarr_set_const($db, 'LDAP_CONTACT_FIELD_TOWN', GETPOST("fieldtown"), 'chaine', 0, '', $conf->entity)) {
+		$error++;
+	}
+	if (!dolibarr_set_const($db, 'LDAP_CONTACT_FIELD_COUNTRY', GETPOST("fieldcountry"), 'chaine', 0, '', $conf->entity)) {
+		$error++;
+	}
 
 	// This one must be after the others
 	$valkey = '';
 	$key = GETPOST("key");
-	if ($key) $valkey = $conf->global->$key;
-	if (!dolibarr_set_const($db, 'LDAP_KEY_CONTACTS', $valkey, 'chaine', 0, '', $conf->entity)) $error++;
+	if ($key) {
+		$valkey = $conf->global->$key;
+	}
+	if (!dolibarr_set_const($db, 'LDAP_KEY_CONTACTS', $valkey, 'chaine', 0, '', $conf->entity)) {
+		$error++;
+	}
 
 	if (!$error)
 	{

htdocs/reception/stats/index.php

Braces +14 added lines, -5 removed lines

@@ -194,7 +194,9 @@ 
 		$arrayyears[$val['year']] = $val['year'];
 	}
 }
-if (!count($arrayyears)) $arrayyears[$nowyear] = $nowyear;
+if (!count($arrayyears)) {
+	$arrayyears[$nowyear] = $nowyear;
+}
 
 $h = 0;
 $head = array();
@@ -231,8 +233,12 @@ 
 	print '</td></tr>';
 	// Year
 	print '<tr><td class="left">'.$langs->trans("Year").'</td><td class="left">';
-	if (!in_array($year, $arrayyears)) $arrayyears[$year] = $year;
-	if (!in_array($nowyear, $arrayyears)) $arrayyears[$nowyear] = $nowyear;
+	if (!in_array($year, $arrayyears)) {
+		$arrayyears[$year] = $year;
+	}
+	if (!in_array($nowyear, $arrayyears)) {
+		$arrayyears[$nowyear] = $nowyear;
+	}
 	arsort($arrayyears);
 	print $form->selectarray('year', $arrayyears, $year, 0);
 	print '</td></tr>';
@@ -270,8 +276,11 @@ 
 
 	print '<tr class="oddeven" height="24">';
 	print '<td class="center">';
-	if ($year) print '<a href="'.$_SERVER["PHP_SELF"].'?year='.$year.'">'.$year.'</a>';
-	else print $langs->trans("ValidationDateNotDefinedEvenIfReceptionValidated");
+	if ($year) {
+		print '<a href="'.$_SERVER["PHP_SELF"].'?year='.$year.'">'.$year.'</a>';
+	} else {
+		print $langs->trans("ValidationDateNotDefinedEvenIfReceptionValidated");
+	}
 	print '</td>';
 	print '<td class="right">'.$val['nb'].'</td>';
 	/*print '<td class="right">'.price(price2num($val['total'],'MT'),1).'</td>';

htdocs/projet/comment.php

Braces +17 added lines, -6 removed lines

@@ -50,7 +50,9 @@ 
 // Security check
 $socid = 0;
 //if ($user->socid > 0) $socid = $user->socid;    // For external user, no check is done on company because readability is managed by public status of project and assignement.
-if (!$user->rights->projet->lire) accessforbidden();
+if (!$user->rights->projet->lire) {
+	accessforbidden();
+}
 
 // Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context
 $hookmanager->initHooks(array('projectcard', 'globalcard'));
@@ -67,7 +69,9 @@ 
 	$ret = $object->fetch($id, $ref); // If we create project, ref may be defined into POST but record does not yet exists into database
 	if ($ret > 0) {
 		$object->fetch_thirdparty();
-		if (!empty($conf->global->PROJECT_ALLOW_COMMENT_ON_PROJECT) && method_exists($object, 'fetchComments') && empty($object->comments)) $object->fetchComments();
+		if (!empty($conf->global->PROJECT_ALLOW_COMMENT_ON_PROJECT) && method_exists($object, 'fetchComments') && empty($object->comments)) {
+			$object->fetchComments();
+		}
 		$id = $object->id;
 	}
 }
@@ -122,20 +126,27 @@ 
 
 // Visibility
 print '<tr><td class="titlefield">'.$langs->trans("Visibility").'</td><td>';
-if ($object->public) print $langs->trans('SharedProject');
-else print $langs->trans('PrivateProject');
+if ($object->public) {
+	print $langs->trans('SharedProject');
+} else {
+	print $langs->trans('PrivateProject');
+}
 print '</td></tr>';
 
 // Date start - end
 print '<tr><td>'.$langs->trans("DateStart").' - '.$langs->trans("DateEnd").'</td><td>';
 print dol_print_date($object->date_start, 'day');
 $end = dol_print_date($object->date_end, 'day');
-if ($end) print ' - '.$end;
+if ($end) {
+	print ' - '.$end;
+}
 print '</td></tr>';
 
 // Budget
 print '<tr><td>'.$langs->trans("Budget").'</td><td>';
-if (strcmp($object->budget_amount, '')) print price($object->budget_amount, '', $langs, 1, 0, 0, $conf->currency);
+if (strcmp($object->budget_amount, '')) {
+	print price($object->budget_amount, '', $langs, 1, 0, 0, $conf->currency);
+}
 print '</td></tr>';
 
 // Other attributes

htdocs/projet/tasks/stats/index.php

Braces +23 added lines, -8 removed lines

@@ -28,8 +28,9 @@ 
 require_once DOL_DOCUMENT_ROOT.'/projet/class/taskstats.class.php';
 
 // Security check
-if (!$user->rights->projet->lire)
+if (!$user->rights->projet->lire) {
 	accessforbidden();
+}
 
 
 $WIDTH = DolGraph::getDefaultGraphSizeForStats('width');
@@ -73,9 +74,15 @@ 
 
 
 $stats_tasks = new TaskStats($db);
-if (!empty($userid) && $userid != -1) $stats_tasks->userid = $userid;
-if (!empty($socid) && $socid != -1) $stats_tasks->socid = $socid;
-if (!empty($year)) $stats_tasks->year = $year;
+if (!empty($userid) && $userid != -1) {
+	$stats_tasks->userid = $userid;
+}
+if (!empty($socid) && $socid != -1) {
+	$stats_tasks->socid = $socid;
+}
+if (!empty($year)) {
+	$stats_tasks->year = $year;
+}
 
 
 
@@ -116,12 +123,16 @@ 
 $stats_tasks->year = 0;
 $data_all_year = $stats_tasks->getAllByYear();
 
-if (!empty($year)) $stats_tasks->year = $year;
+if (!empty($year)) {
+	$stats_tasks->year = $year;
+}
 $arrayyears = array();
 foreach ($data_all_year as $val) {
 	$arrayyears[$val['year']] = $val['year'];
 }
-if (!count($arrayyears)) $arrayyears[$nowyear] = $nowyear;
+if (!count($arrayyears)) {
+	$arrayyears[$nowyear] = $nowyear;
+}
 
 
 $h = 0;
@@ -154,8 +165,12 @@ 
 print '</td></tr>';*/
 // Year
 print '<tr><td>'.$langs->trans("Year").'</td><td>';
-if (!in_array($year, $arrayyears)) $arrayyears[$year] = $year;
-if (!in_array($nowyear, $arrayyears)) $arrayyears[$nowyear] = $nowyear;
+if (!in_array($year, $arrayyears)) {
+	$arrayyears[$year] = $year;
+}
+if (!in_array($nowyear, $arrayyears)) {
+	$arrayyears[$nowyear] = $nowyear;
+}
 arsort($arrayyears);
 print $form->selectarray('year', $arrayyears, $year, 0);
 print '</td></tr>';

htdocs/projet/ganttchart.inc.php

Braces +3 added lines, -1 removed lines

@@ -175,7 +175,9 @@
 
 	$start_date = $task["task_start_date"];
 	$end_date = $task["task_end_date"];
-	if (!$end_date) $end_date = $start_date;
+	if (!$end_date) {
+		$end_date = $start_date;
+	}
 	$start_date = dol_print_date($start_date, $dateformatinput2);
 	$end_date = dol_print_date($end_date, $dateformatinput2);
 	// Resources

htdocs/projet/class/taskstats.class.php

Braces +31 added lines, -19 removed lines

@@ -59,8 +59,9 @@ 
 		$sql = "SELECT";
 		$sql .= " COUNT(t.rowid), t.priority";
 		$sql .= " FROM ".MAIN_DB_PREFIX."projet_task as t INNER JOIN ".MAIN_DB_PREFIX."projet as p ON p.rowid = t.fk_projet";
-		if (!$user->rights->societe->client->voir && !$user->soc_id)
-			$sql .= " INNER JOIN ".MAIN_DB_PREFIX."societe_commerciaux as sc ON sc.fk_soc=t.fk_soc AND sc.fk_user=".$user->id;
+		if (!$user->rights->societe->client->voir && !$user->soc_id) {
+					$sql .= " INNER JOIN ".MAIN_DB_PREFIX."societe_commerciaux as sc ON sc.fk_soc=t.fk_soc AND sc.fk_user=".$user->id;
+		}
 		$sql .= $this->buildWhere();
 		//$sql .= " AND t.fk_statut <> 0";     // We want historic also, so all task not draft
 		$sql .= " GROUP BY t.priority";
@@ -82,14 +83,17 @@ 
 						$row[1],
 						$row[0]
 					);
-				} else $other += $row[1];
+				} else {
+					$other += $row[1];
+				}
 				$i++;
 			}
-			if ($num > $limit)
-				$result[$i] = array(
+			if ($num > $limit) {
+							$result[$i] = array(
 						$langs->transnoentitiesnoconv("Other"),
 						$other
 				);
+			}
 			$this->db->free($resql);
 		} else {
 			$this->error = "Error ".$this->db->lasterror();
@@ -115,8 +119,9 @@ 
 
 		$sql = "SELECT date_format(t.datec,'%Y') as year, COUNT(t.rowid) as nb";
 		$sql .= " FROM ".MAIN_DB_PREFIX."projet_task as t INNER JOIN ".MAIN_DB_PREFIX."projet as p ON p.rowid = t.fk_projet";
-		if (!$user->rights->societe->client->voir && !$user->soc_id)
-			$sql .= " INNER JOIN ".MAIN_DB_PREFIX."societe_commerciaux as sc ON sc.fk_soc=t.fk_soc AND sc.fk_user=".$user->id;
+		if (!$user->rights->societe->client->voir && !$user->soc_id) {
+					$sql .= " INNER JOIN ".MAIN_DB_PREFIX."societe_commerciaux as sc ON sc.fk_soc=t.fk_soc AND sc.fk_user=".$user->id;
+		}
 		$sql .= $this->buildWhere();
 		$sql .= " GROUP BY year";
 		$sql .= $this->db->order('year', 'DESC');
@@ -137,18 +142,24 @@ 
 
 		$sqlwhere[] = ' t.entity IN ('.getEntity('project').')';
 
-		if (!empty($this->userid))
-			$sqlwhere[] = ' t.fk_user_resp='.$this->userid;
+		if (!empty($this->userid)) {
+					$sqlwhere[] = ' t.fk_user_resp='.$this->userid;
+		}
 		// Forced filter on socid is similar to forced filter on project. TODO Use project assignement to allow to not use filter on project
-		if (!empty($this->socid))
-			$sqlwhere[] = ' p.fk_soc='.$this->socid; // Link on thirdparty is on project, not on task
-		if (!empty($this->year) && empty($this->yearmonth))
-			$sqlwhere[] = " date_format(t.datec,'%Y')='".$this->db->escape($this->year)."'";
-		if (!empty($this->yearmonth))
-			$sqlwhere[] = " t.datec BETWEEN '".$this->db->idate(dol_get_first_day($this->yearmonth))."' AND '".$this->db->idate(dol_get_last_day($this->yearmonth))."'";
+		if (!empty($this->socid)) {
+					$sqlwhere[] = ' p.fk_soc='.$this->socid;
+		}
+		// Link on thirdparty is on project, not on task
+		if (!empty($this->year) && empty($this->yearmonth)) {
+					$sqlwhere[] = " date_format(t.datec,'%Y')='".$this->db->escape($this->year)."'";
+		}
+		if (!empty($this->yearmonth)) {
+					$sqlwhere[] = " t.datec BETWEEN '".$this->db->idate(dol_get_first_day($this->yearmonth))."' AND '".$this->db->idate(dol_get_last_day($this->yearmonth))."'";
+		}
 
-		if (!empty($this->status))
-			$sqlwhere[] = " t.priority IN (".$this->priority.")";
+		if (!empty($this->status)) {
+					$sqlwhere[] = " t.priority IN (".$this->priority.")";
+		}
 
 		if (count($sqlwhere) > 0) {
 			$sqlwhere_str = ' WHERE '.implode(' AND ', $sqlwhere);
@@ -172,8 +183,9 @@ 
 
 		$sql = "SELECT date_format(t.datec,'%m') as dm, COUNT(t.rowid) as nb";
 		$sql .= " FROM ".MAIN_DB_PREFIX."projet_task as t INNER JOIN ".MAIN_DB_PREFIX."projet as p ON p.rowid = t.fk_projet";
-		if (!$user->rights->societe->client->voir && !$user->soc_id)
-			$sql .= " INNER JOIN ".MAIN_DB_PREFIX."societe_commerciaux as sc ON sc.fk_soc=t.fk_soc AND sc.fk_user=".$user->id;
+		if (!$user->rights->societe->client->voir && !$user->soc_id) {
+					$sql .= " INNER JOIN ".MAIN_DB_PREFIX."societe_commerciaux as sc ON sc.fk_soc=t.fk_soc AND sc.fk_user=".$user->id;
+		}
 		$sql .= $this->buildWhere();
 		$sql .= " GROUP BY dm";
 		$sql .= $this->db->order('dm', 'DESC');

htdocs/projet/class/projectstats.class.php

Braces +55 added lines, -26 removed lines

@@ -92,14 +92,17 @@ 
 					$label.' ('.price(price2num($row[0], 'MT'), 1, $langs, 1, -1, -1, $conf->currency).')',
 					$row[0]
 					);
-				} else $other += $row[1];
+				} else {
+					$other += $row[1];
+				}
 					$i++;
 			}
-			if ($num > $limit)
-				$result[$i] = array(
+			if ($num > $limit) {
+							$result[$i] = array(
 				$langs->transnoentitiesnoconv("Other"),
 				$other
 				);
+			}
 				$this->db->free($resql);
 		} else {
 			$this->error = "Error ".$this->db->lasterror();
@@ -156,25 +159,35 @@ 
 		// Get list of project id allowed to user (in a string list separated by coma)
 		$object = new Project($this->db);
 		$projectsListId = '';
-		if (!$user->rights->projet->all->lire) $projectsListId = $object->getProjectsAuthorizedForUser($user, 0, 1, $user->socid);
+		if (!$user->rights->projet->all->lire) {
+			$projectsListId = $object->getProjectsAuthorizedForUser($user, 0, 1, $user->socid);
+		}
 
 		$sqlwhere[] = ' t.entity IN ('.getEntity('project').')';
 
-		if (!empty($this->userid))
-			$sqlwhere[] = ' t.fk_user_resp='.$this->userid;
+		if (!empty($this->userid)) {
+					$sqlwhere[] = ' t.fk_user_resp='.$this->userid;
+		}
 
 		// Forced filter on socid is similar to forced filter on project. TODO Use project assignement to allow to not use filter on project
-		if (!empty($this->socid))
-			$sqlwhere[] = ' t.fk_soc='.$this->socid;
-		if (!empty($this->year) && empty($this->yearmonth))
-			$sqlwhere[] = " date_format(t.datec,'%Y')='".$this->db->escape($this->year)."'";
-		if (!empty($this->yearmonth))
-			$sqlwhere[] = " t.datec BETWEEN '".$this->db->idate(dol_get_first_day($this->yearmonth))."' AND '".$this->db->idate(dol_get_last_day($this->yearmonth))."'";
+		if (!empty($this->socid)) {
+					$sqlwhere[] = ' t.fk_soc='.$this->socid;
+		}
+		if (!empty($this->year) && empty($this->yearmonth)) {
+					$sqlwhere[] = " date_format(t.datec,'%Y')='".$this->db->escape($this->year)."'";
+		}
+		if (!empty($this->yearmonth)) {
+					$sqlwhere[] = " t.datec BETWEEN '".$this->db->idate(dol_get_first_day($this->yearmonth))."' AND '".$this->db->idate(dol_get_last_day($this->yearmonth))."'";
+		}
 
-		if (!empty($this->status))
-			$sqlwhere[] = " t.fk_opp_status IN (".$this->status.")";
+		if (!empty($this->status)) {
+					$sqlwhere[] = " t.fk_opp_status IN (".$this->status.")";
+		}
 
-		if (!$user->rights->projet->all->lire) $sqlwhere[] = " t.rowid IN (".$projectsListId.")"; // public and assigned to, or restricted to company for external users
+		if (!$user->rights->projet->all->lire) {
+			$sqlwhere[] = " t.rowid IN (".$projectsListId.")";
+		}
+		// public and assigned to, or restricted to company for external users
 
 		if (count($sqlwhere) > 0) {
 			$sqlwhere_str = ' WHERE '.implode(' AND ', $sqlwhere);
@@ -254,7 +267,9 @@ 
 	{
 		global $conf, $user, $langs;
 
-		if ($startyear > $endyear) return -1;
+		if ($startyear > $endyear) {
+			return -1;
+		}
 
 		$datay = array();
 
@@ -285,9 +300,11 @@ 
 		}
 
 		// Load file into $data
-		if ($foundintocache)    // Cache file found and is not too old
+		if ($foundintocache) {
+			// Cache file found and is not too old
 		{
 			dol_syslog(get_class($this).'::'.__FUNCTION__." read data from cache file ".$newpathofdestfile." ".$filedate.".");
+		}
 			$data = json_decode(file_get_contents($newpathofdestfile), true);
 		} else {
 			$year = $startyear;
@@ -315,15 +332,21 @@ 
 		if (empty($foundintocache) && ($cachedelay > 0 || $cachedelay == -1))
 		{
 			dol_syslog(get_class($this).'::'.__FUNCTION__." save cache file ".$newpathofdestfile." onto disk.");
-			if (!dol_is_dir($conf->user->dir_temp)) dol_mkdir($conf->user->dir_temp);
+			if (!dol_is_dir($conf->user->dir_temp)) {
+				dol_mkdir($conf->user->dir_temp);
+			}
 			$fp = fopen($newpathofdestfile, 'w');
 			if ($fp)
 			{
 				fwrite($fp, json_encode($data));
 				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));
-			} else dol_syslog("Failed to write cache file", LOG_ERR);
+			} else {
+				dol_syslog("Failed to write cache file", LOG_ERR);
+			}
 			$this->lastfetchdate[get_class($this).'_'.__FUNCTION__] = $nowgmt;
 		}
 
@@ -371,7 +394,9 @@ 
 	{
 		global $conf, $user, $langs;
 
-		if ($startyear > $endyear) return -1;
+		if ($startyear > $endyear) {
+			return -1;
+		}
 
 		$datay = array();
 
@@ -400,9 +425,11 @@ 
 		}
 
 		// Load file into $data
-		if ($foundintocache) // Cache file found and is not too old
+		if ($foundintocache) {
+			// Cache file found and is not too old
 		{
 			dol_syslog(get_class($this).'::'.__FUNCTION__." read data from cache file ".$newpathofdestfile." ".$filedate.".");
+		}
 			$data = json_decode(file_get_contents($newpathofdestfile), true);
 		} else {
 			$year = $startyear;
@@ -426,13 +453,15 @@ 
 		// Save cache file
 		if (empty($foundintocache) && ($cachedelay > 0 || $cachedelay == - 1)) {
 			dol_syslog(get_class($this).'::'.__FUNCTION__." save cache file ".$newpathofdestfile." onto disk.");
-			if (!dol_is_dir($conf->user->dir_temp))
-				dol_mkdir($conf->user->dir_temp);
+			if (!dol_is_dir($conf->user->dir_temp)) {
+							dol_mkdir($conf->user->dir_temp);
+			}
 			$fp = fopen($newpathofdestfile, 'w');
 			fwrite($fp, json_encode($data));
 			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[get_class($this).'_'.__FUNCTION__] = $nowgmt;

htdocs/projet/stats/index.php

Braces +23 added lines, -8 removed lines

@@ -28,8 +28,9 @@ 
 require_once DOL_DOCUMENT_ROOT.'/projet/class/projectstats.class.php';
 
 // Security check
-if (!$user->rights->projet->lire)
+if (!$user->rights->projet->lire) {
 	accessforbidden();
+}
 
 
 $WIDTH = DolGraph::getDefaultGraphSizeForStats('width');
@@ -73,9 +74,15 @@ 
 
 
 $stats_project = new ProjectStats($db);
-if (!empty($userid) && $userid != -1) $stats_project->userid = $userid;
-if (!empty($socid) && $socid != -1) $stats_project->socid = $socid;
-if (!empty($year)) $stats_project->year = $year;
+if (!empty($userid) && $userid != -1) {
+	$stats_project->userid = $userid;
+}
+if (!empty($socid) && $socid != -1) {
+	$stats_project->socid = $socid;
+}
+if (!empty($year)) {
+	$stats_project->year = $year;
+}
 
 /*
 if (!empty($conf->global->PROJECT_USE_OPPORTUNITIES))
@@ -251,12 +258,16 @@ 
 $stats_project->year = 0;
 $data_all_year = $stats_project->getAllByYear();
 
-if (!empty($year)) $stats_project->year = $year;
+if (!empty($year)) {
+	$stats_project->year = $year;
+}
 $arrayyears = array();
 foreach ($data_all_year as $val) {
 	$arrayyears[$val['year']] = $val['year'];
 }
-if (!count($arrayyears)) $arrayyears[$nowyear] = $nowyear;
+if (!count($arrayyears)) {
+	$arrayyears[$nowyear] = $nowyear;
+}
 
 
 $h = 0;
@@ -288,8 +299,12 @@ 
 print '</td></tr>';*/
 // Year
 print '<tr><td>'.$langs->trans("Year").'</td><td>';
-if (!in_array($year, $arrayyears)) $arrayyears[$year] = $year;
-if (!in_array($nowyear, $arrayyears)) $arrayyears[$nowyear] = $nowyear;
+if (!in_array($year, $arrayyears)) {
+	$arrayyears[$year] = $year;
+}
+if (!in_array($nowyear, $arrayyears)) {
+	$arrayyears[$nowyear] = $nowyear;
+}
 arsort($arrayyears);
 print $form->selectarray('year', $arrayyears, $year, 0);
 print '</td></tr>';