Dolibarr / dolibarr

htdocs/comm/action/card.php

Spacing +2 added lines, -2 removed lines

@@ -730,7 +730,7 @@ 
 {
 	$error = 0;
 
-	$shour = dol_print_date($object->datep, "%H", 'tzuserrel');		// We take the date visible by user $newdate is also date visible by user.
+	$shour = dol_print_date($object->datep, "%H", 'tzuserrel'); // We take the date visible by user $newdate is also date visible by user.
 	$smin = dol_print_date($object->datep, "%M", 'tzuserrel');
 
 	$newdate = GETPOST('newdate', 'alpha');
@@ -1776,7 +1776,7 @@ 
                    })';
 			print '</script>'."\n";
 
-			print '</div>';		// End of div for reminderparameters
+			print '</div>'; // End of div for reminderparameters
 		}
 
 		print dol_get_fiche_end();

htdocs/comm/action/list.php

Braces +320 added lines, -112 removed lines

@@ -27,7 +27,9 @@ 
  *		\brief      Page to list actions
  */
 
-if (!defined("NOREDIRECTBYMAINTOLOGIN"))  define('NOREDIRECTBYMAINTOLOGIN', 1);
+if (!defined("NOREDIRECTBYMAINTOLOGIN")) {
+	define('NOREDIRECTBYMAINTOLOGIN', 1);
+}
 
 require '../../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/contact/class/contact.class.php';
@@ -58,11 +60,15 @@ 
 if (GETPOST('search_actioncode', 'array'))
 {
 	$actioncode = GETPOST('search_actioncode', 'array', 3);
-	if (!count($actioncode)) $actioncode = '0';
-} else {
+	if (!count($actioncode)) {
+		$actioncode = '0';
+	}
+	} else {
 	$actioncode = GETPOST("search_actioncode", "alpha", 3) ?GETPOST("search_actioncode", "alpha", 3) : (GETPOST("search_actioncode") == '0' ? '0' : (empty($conf->global->AGENDA_DEFAULT_FILTER_TYPE) ? '' : $conf->global->AGENDA_DEFAULT_FILTER_TYPE));
 }
-if ($actioncode == '' && empty($actioncodearray)) $actioncode = (empty($conf->global->AGENDA_DEFAULT_FILTER_TYPE) ? '' : $conf->global->AGENDA_DEFAULT_FILTER_TYPE);
+if ($actioncode == '' && empty($actioncodearray)) {
+	$actioncode = (empty($conf->global->AGENDA_DEFAULT_FILTER_TYPE) ? '' : $conf->global->AGENDA_DEFAULT_FILTER_TYPE);
+}
 $search_id = GETPOST('search_id', 'alpha');
 $search_title = GETPOST('search_title', 'alpha');
 $search_note = GETPOST('search_note', 'alpha');
@@ -70,8 +76,12 @@ 
 $dateselect = dol_mktime(0, 0, 0, GETPOST('dateselectmonth', 'int'), GETPOST('dateselectday', 'int'), GETPOST('dateselectyear', 'int'), 'tzuserrel');
 $datestart = dol_mktime(0, 0, 0, GETPOST('datestartmonth', 'int'), GETPOST('datestartday', 'int'), GETPOST('datestartyear', 'int'), 'tzuserrel');
 $dateend = dol_mktime(0, 0, 0, GETPOST('dateendmonth', 'int'), GETPOST('dateendday', 'int'), GETPOST('dateendyear', 'int'), 'tzuserrel');
-if ($search_status == '' && !GETPOSTISSET('search_status')) $search_status = (empty($conf->global->AGENDA_DEFAULT_FILTER_STATUS) ? '' : $conf->global->AGENDA_DEFAULT_FILTER_STATUS);
-if (empty($action) && !GETPOSTISSET('action')) $action = (empty($conf->global->AGENDA_DEFAULT_VIEW) ? 'show_month' : $conf->global->AGENDA_DEFAULT_VIEW);
+if ($search_status == '' && !GETPOSTISSET('search_status')) {
+	$search_status = (empty($conf->global->AGENDA_DEFAULT_FILTER_STATUS) ? '' : $conf->global->AGENDA_DEFAULT_FILTER_STATUS);
+}
+if (empty($action) && !GETPOSTISSET('action')) {
+	$action = (empty($conf->global->AGENDA_DEFAULT_VIEW) ? 'show_month' : $conf->global->AGENDA_DEFAULT_VIEW);
+}
 
 $filter = GETPOST("search_filter", 'alpha', 3) ?GETPOST("search_filter", 'alpha', 3) : GETPOST("filter", 'alpha', 3);
 $filtert = GETPOST("search_filtert", "int", 3) ?GETPOST("search_filtert", "int", 3) : GETPOST("filtert", "int", 3);
@@ -103,27 +113,41 @@ 
 if (!$sortorder)
 {
 	$sortorder = "DESC,DESC";
-	if ($search_status == 'todo') $sortorder = "DESC,DESC";
-}
+	if ($search_status == 'todo') {
+		$sortorder = "DESC,DESC";
+	}
+	}
 if (!$sortfield)
 {
 	$sortfield = "a.datep,a.id";
-	if ($search_status == 'todo') $sortfield = "a.datep,a.id";
-}
+	if ($search_status == 'todo') {
+		$sortfield = "a.datep,a.id";
+	}
+	}
 
 // Security check
 $socid = GETPOST("search_socid", 'int') ?GETPOST("search_socid", 'int') : GETPOST("socid", 'int');
-if ($user->socid) $socid = $user->socid;
+if ($user->socid) {
+	$socid = $user->socid;
+}
 $result = restrictedArea($user, 'agenda', 0, '', 'myactions');
-if ($socid < 0) $socid = '';
+if ($socid < 0) {
+	$socid = '';
+}
 
 $canedit = 1;
-if (!$user->rights->agenda->myactions->read) accessforbidden();
-if (!$user->rights->agenda->allactions->read) $canedit = 0;
-if (!$user->rights->agenda->allactions->read || $filter == 'mine')	// If no permission to see all, we show only affected to me
+if (!$user->rights->agenda->myactions->read) {
+	accessforbidden();
+}
+if (!$user->rights->agenda->allactions->read) {
+	$canedit = 0;
+}
+if (!$user->rights->agenda->allactions->read || $filter == 'mine') {
+	// If no permission to see all, we show only affected to me
 {
 	$filtert = $user->id;
 }
+}
 
 $arrayfields = array(
 	'a.id'=>array('label'=>"Ref", 'checked'=>1),
@@ -174,15 +198,19 @@ 
 
 $parameters = array('id'=>$socid);
 $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');
+}
 
 // Selection of new fields
 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
 {
 	//$actioncode='';
 	$search_id = '';
+}
 	$search_title = '';
 	$search_note = '';
 	$datestart = '';
@@ -258,32 +286,78 @@ 
 $listofextcals = 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);
+}
 if ($actioncode != '') {
 	if (is_array($actioncode)) {
-		foreach ($actioncode as $str_action) $param .= "&search_actioncode[]=".urlencode($str_action);
-	} else $param .= "&search_actioncode=".urlencode($actioncode);
-}
-if ($resourceid > 0) $param .= "&search_resourceid=".urlencode($resourceid);
-if ($search_status != '' && $search_status > -1) $param .= "&search_status=".urlencode($search_status);
-if ($filter) $param .= "&search_filter=".urlencode($filter);
-if ($filtert) $param .= "&search_filtert=".urlencode($filtert);
-if ($usergroup > 0) $param .= "&search_usergroup=".urlencode($usergroup);
-if ($socid > 0) $param .= "&search_socid=".urlencode($socid);
-if ($showbirthday) $param .= "&search_showbirthday=1";
-if ($pid) $param .= "&search_projectid=".urlencode($pid);
-if ($type) $param .= "&search_type=".urlencode($type);
-if ($search_id != '') $param .= '&search_title='.urlencode($search_id);
-if ($search_title != '') $param .= '&search_title='.urlencode($search_title);
-if ($search_note != '') $param .= '&search_note='.$search_note;
-if (GETPOST('datestartday', 'int')) $param .= '&datestartday='.GETPOST('datestartday', 'int');
-if (GETPOST('datestartmonth', 'int')) $param .= '&datestartmonth='.GETPOST('datestartmonth', 'int');
-if (GETPOST('datestartyear', 'int')) $param .= '&datestartyear='.GETPOST('datestartyear', 'int');
-if (GETPOST('dateendday', 'int')) $param .= '&dateendday='.GETPOST('dateendday', 'int');
-if (GETPOST('dateendmonth', 'int')) $param .= '&dateendmonth='.GETPOST('dateendmonth', 'int');
-if (GETPOST('dateendyear', 'int')) $param .= '&dateendyear='.GETPOST('dateendyear', 'int');
-if ($optioncss != '') $param .= '&optioncss='.urlencode($optioncss);
+		foreach ($actioncode as $str_action) {
+			$param .= "&search_actioncode[]=".urlencode($str_action);
+		}
+	} else {
+		$param .= "&search_actioncode=".urlencode($actioncode);
+	}
+	}
+if ($resourceid > 0) {
+	$param .= "&search_resourceid=".urlencode($resourceid);
+}
+if ($search_status != '' && $search_status > -1) {
+	$param .= "&search_status=".urlencode($search_status);
+}
+if ($filter) {
+	$param .= "&search_filter=".urlencode($filter);
+}
+if ($filtert) {
+	$param .= "&search_filtert=".urlencode($filtert);
+}
+if ($usergroup > 0) {
+	$param .= "&search_usergroup=".urlencode($usergroup);
+}
+if ($socid > 0) {
+	$param .= "&search_socid=".urlencode($socid);
+}
+if ($showbirthday) {
+	$param .= "&search_showbirthday=1";
+}
+if ($pid) {
+	$param .= "&search_projectid=".urlencode($pid);
+}
+if ($type) {
+	$param .= "&search_type=".urlencode($type);
+}
+if ($search_id != '') {
+	$param .= '&search_title='.urlencode($search_id);
+}
+if ($search_title != '') {
+	$param .= '&search_title='.urlencode($search_title);
+}
+if ($search_note != '') {
+	$param .= '&search_note='.$search_note;
+}
+if (GETPOST('datestartday', 'int')) {
+	$param .= '&datestartday='.GETPOST('datestartday', 'int');
+}
+if (GETPOST('datestartmonth', 'int')) {
+	$param .= '&datestartmonth='.GETPOST('datestartmonth', 'int');
+}
+if (GETPOST('datestartyear', 'int')) {
+	$param .= '&datestartyear='.GETPOST('datestartyear', 'int');
+}
+if (GETPOST('dateendday', 'int')) {
+	$param .= '&dateendday='.GETPOST('dateendday', 'int');
+}
+if (GETPOST('dateendmonth', 'int')) {
+	$param .= '&dateendmonth='.GETPOST('dateendmonth', 'int');
+}
+if (GETPOST('dateendyear', 'int')) {
+	$param .= '&dateendyear='.GETPOST('dateendyear', 'int');
+}
+if ($optioncss != '') {
+	$param .= '&optioncss='.urlencode($optioncss);
+}
 // Add $param from extra fields
 include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_param.tpl.php';
 
@@ -299,12 +373,18 @@ 
 {
 	$arrayofmassactions['predelete'] = '<span class="fa fa-trash paddingrightonly"></span>'.$langs->trans("Delete");
 }
-if ($user->rights->agenda->myactions->create) $arrayofmassactions['preaffecttag'] = '<span class="fa fa-tag paddingrightonly"></span>'.$langs->trans("AffectTag");
-if (GETPOST('nomassaction', 'int') || in_array($massaction, array('presend', 'predelete','preaffecttag'))) $arrayofmassactions = array();
+if ($user->rights->agenda->myactions->create) {
+	$arrayofmassactions['preaffecttag'] = '<span class="fa fa-tag paddingrightonly"></span>'.$langs->trans("AffectTag");
+}
+if (GETPOST('nomassaction', 'int') || in_array($massaction, array('presend', 'predelete','preaffecttag'))) {
+	$arrayofmassactions = array();
+}
 $massactionbutton = $form->selectMassAction('', $arrayofmassactions);
 
 $sql = "SELECT";
-if ($usergroup > 0) $sql .= " DISTINCT";
+if ($usergroup > 0) {
+	$sql .= " DISTINCT";
+}
 $sql .= " s.nom as societe, s.rowid as socid, s.client, s.email as socemail,";
 $sql .= " a.id, a.code, a.label, a.note, a.datep as dp, a.datep2 as dp2, a.fulldayevent, a.location,";
 $sql .= ' a.fk_user_author,a.fk_user_action,';
@@ -315,8 +395,10 @@ 
 
 // 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();
@@ -325,15 +407,23 @@ 
 
 $sql .= " FROM ".MAIN_DB_PREFIX."actioncomm as a";
 $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."actioncomm_extrafields as ef ON (a.id = ef.fk_object) ";
-if (!$user->rights->societe->client->voir && !$socid) $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."societe_commerciaux as sc ON a.fk_soc = sc.fk_soc";
+if (!$user->rights->societe->client->voir && !$socid) {
+	$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."societe_commerciaux as sc ON a.fk_soc = sc.fk_soc";
+}
 $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."societe as s ON a.fk_soc = s.rowid";
 $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."socpeople as sp ON a.fk_contact = sp.rowid";
 $sql .= " ,".MAIN_DB_PREFIX."c_actioncomm as c";
 // We must filter on resource table
-if ($resourceid > 0) $sql .= ", ".MAIN_DB_PREFIX."element_resources as r";
+if ($resourceid > 0) {
+	$sql .= ", ".MAIN_DB_PREFIX."element_resources as r";
+}
 // We must filter on assignement table
-if ($filtert > 0 || $usergroup > 0) $sql .= ", ".MAIN_DB_PREFIX."actioncomm_resources as ar";
-if ($usergroup > 0) $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."usergroup_user as ugu ON ugu.fk_user = ar.fk_element";
+if ($filtert > 0 || $usergroup > 0) {
+	$sql .= ", ".MAIN_DB_PREFIX."actioncomm_resources as ar";
+}
+if ($usergroup > 0) {
+	$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."usergroup_user as ugu ON ugu.fk_user = ar.fk_element";
+}
 $sql .= " WHERE c.id = a.fk_action";
 $sql .= ' AND a.entity IN ('.getEntity('agenda').')';
 // Condition on actioncode
@@ -341,16 +431,24 @@ 
 {
 	if (empty($conf->global->AGENDA_USE_EVENT_TYPE))
 	{
-		if ($actioncode == 'AC_NON_AUTO') $sql .= " AND c.type != 'systemauto'";
-		elseif ($actioncode == 'AC_ALL_AUTO') $sql .= " AND c.type = 'systemauto'";
-		else {
-			if ($actioncode == 'AC_OTH') $sql .= " AND c.type != 'systemauto'";
-			if ($actioncode == 'AC_OTH_AUTO') $sql .= " AND c.type = 'systemauto'";
+		if ($actioncode == 'AC_NON_AUTO') {
+			$sql .= " AND c.type != 'systemauto'";
+		} elseif ($actioncode == 'AC_ALL_AUTO') {
+			$sql .= " AND c.type = 'systemauto'";
+		} else {
+			if ($actioncode == 'AC_OTH') {
+				$sql .= " AND c.type != 'systemauto'";
+			}
+			if ($actioncode == 'AC_OTH_AUTO') {
+				$sql .= " AND c.type = 'systemauto'";
+			}
 		}
 	} else {
-		if ($actioncode == 'AC_NON_AUTO') $sql .= " AND c.type != 'systemauto'";
-		elseif ($actioncode == 'AC_ALL_AUTO') $sql .= " AND c.type = 'systemauto'";
-		else {
+		if ($actioncode == 'AC_NON_AUTO') {
+			$sql .= " AND c.type != 'systemauto'";
+		} elseif ($actioncode == 'AC_ALL_AUTO') {
+			$sql .= " AND c.type = 'systemauto'";
+		} else {
 			if (is_array($actioncode))
 			{
 				$sql .= " AND c.code IN ('".implode("','", $actioncode)."')";
@@ -360,35 +458,64 @@ 
 		}
 	}
 }
-if ($resourceid > 0) $sql .= " AND r.element_type = 'action' AND r.element_id = a.id AND r.resource_id = ".$db->escape($resourceid);
-if ($pid) $sql .= " AND a.fk_project=".$db->escape($pid);
-if (!$user->rights->societe->client->voir && !$socid) $sql .= " AND (a.fk_soc IS NULL OR sc.fk_user = ".$user->id.")";
-if ($socid > 0) $sql .= " AND s.rowid = ".$socid;
+if ($resourceid > 0) {
+	$sql .= " AND r.element_type = 'action' AND r.element_id = a.id AND r.resource_id = ".$db->escape($resourceid);
+}
+if ($pid) {
+	$sql .= " AND a.fk_project=".$db->escape($pid);
+}
+if (!$user->rights->societe->client->voir && !$socid) {
+	$sql .= " AND (a.fk_soc IS NULL OR sc.fk_user = ".$user->id.")";
+}
+if ($socid > 0) {
+	$sql .= " AND s.rowid = ".$socid;
+}
 // We must filter on assignement table
-if ($filtert > 0 || $usergroup > 0) $sql .= " AND ar.fk_actioncomm = a.id AND ar.element_type='user'";
-if ($type) $sql .= " AND c.id = ".(int) $type;
+if ($filtert > 0 || $usergroup > 0) {
+	$sql .= " AND ar.fk_actioncomm = a.id AND ar.element_type='user'";
+}
+if ($type) {
+	$sql .= " AND c.id = ".(int) $type;
+}
 if ($search_status == '0') { $sql .= " AND a.percent = 0"; }
 if ($search_status == 'na') { $sql .= " AND a.percent = -1"; }	// Not applicable
 if ($search_status == '50') { $sql .= " AND (a.percent > 0 AND a.percent < 100)"; }	// Running already started
 if ($search_status == '100') { $sql .= " AND a.percent = 100"; }
 if ($search_status == 'done') { $sql .= " AND (a.percent = 100)"; }
 if ($search_status == 'todo') { $sql .= " AND (a.percent >= 0 AND a.percent < 100)"; }
-if ($search_id) $sql .= natural_search("a.id", $search_id, 1);
-if ($search_title) $sql .= natural_search("a.label", $search_title);
-if ($search_note) $sql .= natural_search('a.note', $search_note);
+if ($search_id) {
+	$sql .= natural_search("a.id", $search_id, 1);
+}
+if ($search_title) {
+	$sql .= natural_search("a.label", $search_title);
+}
+if ($search_note) {
+	$sql .= natural_search('a.note', $search_note);
+}
 // We must filter on assignement table
 if ($filtert > 0 || $usergroup > 0)
 {
 	$sql .= " AND (";
-	if ($filtert > 0) $sql .= "(ar.fk_element = ".$filtert." OR (ar.fk_element IS NULL AND a.fk_user_action=".$filtert."))"; // The OR is for backward compatibility
-	if ($usergroup > 0) $sql .= ($filtert > 0 ? " OR " : "")." ugu.fk_usergroup = ".$usergroup;
+	if ($filtert > 0) {
+		$sql .= "(ar.fk_element = ".$filtert." OR (ar.fk_element IS NULL AND a.fk_user_action=".$filtert."))";
+	}
+	// The OR is for backward compatibility
+	if ($usergroup > 0) {
+		$sql .= ($filtert > 0 ? " OR " : "")." ugu.fk_usergroup = ".$usergroup;
+	}
 	$sql .= ")";
 }
 
 // The second or of next test is to take event with no end date (we suppose duration is 1 hour in such case)
-if ($dateselect > 0) $sql .= " AND ((a.datep2 >= '".$db->idate($dateselect)."' AND a.datep <= '".$db->idate($dateselect + 3600 * 24 - 1)."') OR (a.datep2 IS NULL AND a.datep > '".$db->idate($dateselect - 3600)."' AND a.datep <= '".$db->idate($dateselect + 3600 * 24 - 1)."'))";
-if ($datestart > 0) $sql .= " AND a.datep BETWEEN '".$db->idate($datestart)."' AND '".$db->idate($datestart + 3600 * 24 - 1)."'";
-if ($dateend > 0) $sql .= " AND a.datep2 BETWEEN '".$db->idate($dateend)."' AND '".$db->idate($dateend + 3600 * 24 - 1)."'";
+if ($dateselect > 0) {
+	$sql .= " AND ((a.datep2 >= '".$db->idate($dateselect)."' AND a.datep <= '".$db->idate($dateselect + 3600 * 24 - 1)."') OR (a.datep2 IS NULL AND a.datep > '".$db->idate($dateselect - 3600)."' AND a.datep <= '".$db->idate($dateselect + 3600 * 24 - 1)."'))";
+}
+if ($datestart > 0) {
+	$sql .= " AND a.datep BETWEEN '".$db->idate($datestart)."' AND '".$db->idate($datestart + 3600 * 24 - 1)."'";
+}
+if ($dateend > 0) {
+	$sql .= " AND a.datep2 BETWEEN '".$db->idate($dateend)."' AND '".$db->idate($dateend + 3600 * 24 - 1)."'";
+}
 
 // Add where from extra fields
 include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_sql.tpl.php';
@@ -405,9 +532,11 @@ 
 {
 	$result = $db->query($sql);
 	$nbtotalofrecords = $db->num_rows($result);
-	if (($page * $limit) > $nbtotalofrecords)	// if total resultset is smaller then paging size (filtering), goto and load page 0
+	if (($page * $limit) > $nbtotalofrecords) {
+		// if total resultset is smaller then paging size (filtering), goto and load page 0
 	{
 		$page = 0;
+	}
 		$offset = 0;
 	}
 }
@@ -438,7 +567,9 @@ 
 
 	print '<form method="POST" id="searchFormList" class="listactionsfilter" action="'.$_SERVER["PHP_SELF"].'">'."\n";
 
-	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="sortfield" value="'.$sortfield.'">';
@@ -446,8 +577,12 @@ 
 	print '<input type="hidden" name="type" value="'.$type.'">';
 	$nav = '';
 
-	if ($filter)          $nav .= '<input type="hidden" name="search_filter" value="'.$filter.'">';
-	if ($showbirthday)    $nav .= '<input type="hidden" name="search_showbirthday" value="1">';
+	if ($filter) {
+		$nav .= '<input type="hidden" name="search_filter" value="'.$filter.'">';
+	}
+	if ($showbirthday) {
+		$nav .= '<input type="hidden" name="search_showbirthday" value="1">';
+	}
 	print $nav;
 
 	//print dol_get_fiche_head($head, $tabactive, $langs->trans('Agenda'), 0, 'action');
@@ -550,7 +685,9 @@ 
 
 	$varpage = empty($contextpage) ? $_SERVER["PHP_SELF"] : $contextpage;
 	$selectedfields = $form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage); // This also change content of $arrayfields
-	if ($massactionbutton) $selectedfields .= $form->showCheckAddButtons('checkforselect', 1);
+	if ($massactionbutton) {
+		$selectedfields .= $form->showCheckAddButtons('checkforselect', 1);
+	}
 	$i = 0;
 
 	print '<div class="liste_titre liste_titre_bydiv centpercent">';
@@ -561,11 +698,21 @@ 
 	print '<table class="tagtable liste'.($moreforfilter ? " listwithfilterbefore" : "").'">'."\n";
 
 	print '<tr class="liste_titre_filter">';
-	if (!empty($arrayfields['a.id']['checked']))		print '<td class="liste_titre"><input type="text" class="maxwidth50" name="search_id" value="'.$search_id.'"></td>';
-	if (!empty($arrayfields['owner']['checked']))		print '<td class="liste_titre"></td>';
-	if (!empty($arrayfields['c.libelle']['checked']))	print '<td class="liste_titre"></td>';
-	if (!empty($arrayfields['a.label']['checked']))	print '<td class="liste_titre"><input type="text" class="maxwidth75" name="search_title" value="'.$search_title.'"></td>';
-	if (!empty($arrayfields['a.note']['checked']))	print '<td class="liste_titre"><input type="text" class="maxwidth75" name="search_note" value="'.$search_note.'"></td>';
+	if (!empty($arrayfields['a.id']['checked'])) {
+		print '<td class="liste_titre"><input type="text" class="maxwidth50" name="search_id" value="'.$search_id.'"></td>';
+	}
+	if (!empty($arrayfields['owner']['checked'])) {
+		print '<td class="liste_titre"></td>';
+	}
+	if (!empty($arrayfields['c.libelle']['checked'])) {
+		print '<td class="liste_titre"></td>';
+	}
+	if (!empty($arrayfields['a.label']['checked'])) {
+		print '<td class="liste_titre"><input type="text" class="maxwidth75" name="search_title" value="'.$search_title.'"></td>';
+	}
+	if (!empty($arrayfields['a.note']['checked'])) {
+		print '<td class="liste_titre"><input type="text" class="maxwidth75" name="search_note" value="'.$search_note.'"></td>';
+	}
 	if (!empty($arrayfields['a.datep']['checked'])) {
 		print '<td class="liste_titre nowraponall" align="center">';
 		print $form->selectDate($datestart, 'datestart', 0, 0, 1, '', 1, 0, 0, '', '', '', '', 1, '', '', 'tzuserrel');
@@ -579,8 +726,12 @@ 
 	if (!empty($arrayfields['s.nom']['checked'])) {
 		print '<td class="liste_titre"></td>';
 	}
-	if (!empty($arrayfields['a.fk_contact']['checked']))	print '<td class="liste_titre"></td>';
-	if (!empty($arrayfields['a.fk_element']['checked']))	print '<td class="liste_titre"></td>';
+	if (!empty($arrayfields['a.fk_contact']['checked'])) {
+		print '<td class="liste_titre"></td>';
+	}
+	if (!empty($arrayfields['a.fk_element']['checked'])) {
+		print '<td class="liste_titre"></td>';
+	}
 
 	// Extra fields
 	include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_input.tpl.php';
@@ -590,8 +741,12 @@ 
 	$reshook = $hookmanager->executeHooks('printFieldListOption', $parameters); // Note that $action and $object may have been modified by hook
 	print $hookmanager->resPrint;
 
-	if (!empty($arrayfields['a.datec']['checked']))	print '<td class="liste_titre"></td>';
-	if (!empty($arrayfields['a.tms']['checked']))		print '<td class="liste_titre"></td>';
+	if (!empty($arrayfields['a.datec']['checked'])) {
+		print '<td class="liste_titre"></td>';
+	}
+	if (!empty($arrayfields['a.tms']['checked'])) {
+		print '<td class="liste_titre"></td>';
+	}
 	if (!empty($arrayfields['a.percent']['checked'])) {
 		print '<td class="liste_titre center">';
 		$formactions->form_select_status_action('formaction', $search_status, 1, 'search_status', 1, 2, 'minwidth100imp maxwidth125');
@@ -606,17 +761,37 @@ 
 	print "</tr>\n";
 
 	print '<tr class="liste_titre">';
-	if (!empty($arrayfields['a.id']['checked']))	      print_liste_field_titre($arrayfields['a.id']['label'], $_SERVER["PHP_SELF"], "a.id", $param, "", "", $sortfield, $sortorder);
-	if (!empty($arrayfields['owner']['checked']))        print_liste_field_titre($arrayfields['owner']['label'], $_SERVER["PHP_SELF"], "", $param, "", "", $sortfield, $sortorder);
-	if (!empty($arrayfields['c.libelle']['checked']))	  print_liste_field_titre($arrayfields['c.libelle']['label'], $_SERVER["PHP_SELF"], "c.libelle", $param, "", "", $sortfield, $sortorder);
-	if (!empty($arrayfields['a.label']['checked']))	  print_liste_field_titre($arrayfields['a.label']['label'], $_SERVER["PHP_SELF"], "a.label", $param, "", "", $sortfield, $sortorder);
-	if (!empty($arrayfields['a.note']['checked']))		  print_liste_field_titre($arrayfields['a.note']['label'], $_SERVER["PHP_SELF"], "a.note", $param, "", "", $sortfield, $sortorder);
+	if (!empty($arrayfields['a.id']['checked'])) {
+		print_liste_field_titre($arrayfields['a.id']['label'], $_SERVER["PHP_SELF"], "a.id", $param, "", "", $sortfield, $sortorder);
+	}
+	if (!empty($arrayfields['owner']['checked'])) {
+		print_liste_field_titre($arrayfields['owner']['label'], $_SERVER["PHP_SELF"], "", $param, "", "", $sortfield, $sortorder);
+	}
+	if (!empty($arrayfields['c.libelle']['checked'])) {
+		print_liste_field_titre($arrayfields['c.libelle']['label'], $_SERVER["PHP_SELF"], "c.libelle", $param, "", "", $sortfield, $sortorder);
+	}
+	if (!empty($arrayfields['a.label']['checked'])) {
+		print_liste_field_titre($arrayfields['a.label']['label'], $_SERVER["PHP_SELF"], "a.label", $param, "", "", $sortfield, $sortorder);
+	}
+	if (!empty($arrayfields['a.note']['checked'])) {
+		print_liste_field_titre($arrayfields['a.note']['label'], $_SERVER["PHP_SELF"], "a.note", $param, "", "", $sortfield, $sortorder);
+	}
 	//if (! empty($conf->global->AGENDA_USE_EVENT_TYPE))
-	if (!empty($arrayfields['a.datep']['checked']))	  print_liste_field_titre($arrayfields['a.datep']['label'], $_SERVER["PHP_SELF"], "a.datep,a.id", $param, '', 'align="center"', $sortfield, $sortorder);
-	if (!empty($arrayfields['a.datep2']['checked']))	  print_liste_field_titre($arrayfields['a.datep2']['label'], $_SERVER["PHP_SELF"], "a.datep2", $param, '', 'align="center"', $sortfield, $sortorder);
-	if (!empty($arrayfields['s.nom']['checked']))	      print_liste_field_titre($arrayfields['s.nom']['label'], $_SERVER["PHP_SELF"], "s.nom", $param, "", "", $sortfield, $sortorder);
-	if (!empty($arrayfields['a.fk_contact']['checked'])) print_liste_field_titre($arrayfields['a.fk_contact']['label'], $_SERVER["PHP_SELF"], "", $param, "", "", $sortfield, $sortorder);
-	if (!empty($arrayfields['a.fk_element']['checked'])) print_liste_field_titre($arrayfields['a.fk_element']['label'], $_SERVER["PHP_SELF"], "", $param, "", "", $sortfield, $sortorder);
+	if (!empty($arrayfields['a.datep']['checked'])) {
+		print_liste_field_titre($arrayfields['a.datep']['label'], $_SERVER["PHP_SELF"], "a.datep,a.id", $param, '', 'align="center"', $sortfield, $sortorder);
+	}
+	if (!empty($arrayfields['a.datep2']['checked'])) {
+		print_liste_field_titre($arrayfields['a.datep2']['label'], $_SERVER["PHP_SELF"], "a.datep2", $param, '', 'align="center"', $sortfield, $sortorder);
+	}
+	if (!empty($arrayfields['s.nom']['checked'])) {
+		print_liste_field_titre($arrayfields['s.nom']['label'], $_SERVER["PHP_SELF"], "s.nom", $param, "", "", $sortfield, $sortorder);
+	}
+	if (!empty($arrayfields['a.fk_contact']['checked'])) {
+		print_liste_field_titre($arrayfields['a.fk_contact']['label'], $_SERVER["PHP_SELF"], "", $param, "", "", $sortfield, $sortorder);
+	}
+	if (!empty($arrayfields['a.fk_element']['checked'])) {
+		print_liste_field_titre($arrayfields['a.fk_element']['label'], $_SERVER["PHP_SELF"], "", $param, "", "", $sortfield, $sortorder);
+	}
 
 	// Extra fields
 	include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_title.tpl.php';
@@ -626,10 +801,16 @@ 
 	$reshook = $hookmanager->executeHooks('printFieldListTitle', $parameters); // Note that $action and $object may have been modified by hook
 	print $hookmanager->resPrint;
 
-	if (!empty($arrayfields['a.datec']['checked'])) print_liste_field_titre($arrayfields['a.datec']['label'], $_SERVER["PHP_SELF"], "a.datec,a.id", $param, "", 'align="center"', $sortfield, $sortorder);
-	if (!empty($arrayfields['a.tms']['checked'])) print_liste_field_titre($arrayfields['a.tms']['label'], $_SERVER["PHP_SELF"], "a.tms,a.id", $param, "", 'align="center"', $sortfield, $sortorder);
+	if (!empty($arrayfields['a.datec']['checked'])) {
+		print_liste_field_titre($arrayfields['a.datec']['label'], $_SERVER["PHP_SELF"], "a.datec,a.id", $param, "", 'align="center"', $sortfield, $sortorder);
+	}
+	if (!empty($arrayfields['a.tms']['checked'])) {
+		print_liste_field_titre($arrayfields['a.tms']['label'], $_SERVER["PHP_SELF"], "a.tms,a.id", $param, "", 'align="center"', $sortfield, $sortorder);
+	}
 
-	if (!empty($arrayfields['a.percent']['checked']))print_liste_field_titre("Status", $_SERVER["PHP_SELF"], "a.percent", $param, "", 'align="center"', $sortfield, $sortorder);
+	if (!empty($arrayfields['a.percent']['checked'])) {
+		print_liste_field_titre("Status", $_SERVER["PHP_SELF"], "a.percent", $param, "", 'align="center"', $sortfield, $sortorder);
+	}
 	print_liste_field_titre($selectedfields, $_SERVER["PHP_SELF"], "", '', '', 'align="center"', $sortfield, $sortorder, 'maxwidthsearch ');
 	print "</tr>\n";
 
@@ -683,7 +864,9 @@ 
 			{
 				$userstatic->fetch($obj->fk_user_action);
 				print $userstatic->getNomUrl(-1);
-			} else print '&nbsp;';
+			} else {
+				print '&nbsp;';
+			}
 			print '</td>';
 		}
 
@@ -693,12 +876,19 @@ 
 			print '<td class="nowraponall">';
 			print $actionstatic->getTypePicto();
 			$labeltype = $obj->type_code;
-			if (empty($conf->global->AGENDA_USE_EVENT_TYPE) && empty($arraylist[$labeltype])) $labeltype = 'AC_OTH';
+			if (empty($conf->global->AGENDA_USE_EVENT_TYPE) && empty($arraylist[$labeltype])) {
+				$labeltype = 'AC_OTH';
+			}
 			if ($actionstatic->type_code == 'AC_OTH' && $actionstatic->code == 'TICKET_MSG') {
 				$labeltype = $langs->trans("Message");
 			} else {
-				if (!empty($arraylist[$labeltype])) $labeltype = $arraylist[$labeltype];
-				if ($obj->type_code == 'AC_OTH_AUTO' && ($obj->type_code != $obj->code) && $labeltype && !empty($arraylist[$obj->code])) $labeltype .= ' - '.$arraylist[$obj->code]; // Use code in priority on type_code
+				if (!empty($arraylist[$labeltype])) {
+					$labeltype = $arraylist[$labeltype];
+				}
+				if ($obj->type_code == 'AC_OTH_AUTO' && ($obj->type_code != $obj->code) && $labeltype && !empty($arraylist[$obj->code])) {
+					$labeltype .= ' - '.$arraylist[$obj->code];
+				}
+				// Use code in priority on type_code
 			}
 			print dol_trunc($labeltype, 28);
 			print '</td>';
@@ -726,11 +916,21 @@ 
 			print '<td class="center nowraponall">';
 			print dol_print_date($db->jdate($obj->dp), $formatToUse, 'tzuser');
 			$late = 0;
-			if ($obj->percent == 0 && $obj->dp && $db->jdate($obj->dp) < ($now - $delay_warning)) $late = 1;
-			if ($obj->percent == 0 && !$obj->dp && $obj->dp2 && $db->jdate($obj->dp) < ($now - $delay_warning)) $late = 1;
-			if ($obj->percent > 0 && $obj->percent < 100 && $obj->dp2 && $db->jdate($obj->dp2) < ($now - $delay_warning)) $late = 1;
-			if ($obj->percent > 0 && $obj->percent < 100 && !$obj->dp2 && $obj->dp && $db->jdate($obj->dp) < ($now - $delay_warning)) $late = 1;
-			if ($late) print img_warning($langs->trans("Late")).' ';
+			if ($obj->percent == 0 && $obj->dp && $db->jdate($obj->dp) < ($now - $delay_warning)) {
+				$late = 1;
+			}
+			if ($obj->percent == 0 && !$obj->dp && $obj->dp2 && $db->jdate($obj->dp) < ($now - $delay_warning)) {
+				$late = 1;
+			}
+			if ($obj->percent > 0 && $obj->percent < 100 && $obj->dp2 && $db->jdate($obj->dp2) < ($now - $delay_warning)) {
+				$late = 1;
+			}
+			if ($obj->percent > 0 && $obj->percent < 100 && !$obj->dp2 && $obj->dp && $db->jdate($obj->dp) < ($now - $delay_warning)) {
+				$late = 1;
+			}
+			if ($late) {
+				print img_warning($langs->trans("Late")).' ';
+			}
 			print '</td>';
 		}
 
@@ -752,7 +952,9 @@ 
 				$societestatic->email = $obj->socemail;
 
 				print $societestatic->getNomUrl(1, '', 28);
-			} else print '&nbsp;';
+			} else {
+				print '&nbsp;';
+			}
 			print '</td>';
 		}
 
@@ -782,9 +984,11 @@ 
 				if (!empty($contactList)) {
 					print implode(', ', $contactList);
 				}
-			} elseif ($obj->fk_contact > 0) //keep for retrocompatibility with faraway event
+			} elseif ($obj->fk_contact > 0) {
+				//keep for retrocompatibility with faraway event
 			{
 				$contactstatic->id = $obj->fk_contact;
+			}
 				$contactstatic->email = $obj->email;
 				$contactstatic->lastname = $obj->lastname;
 				$contactstatic->firstname = $obj->firstname;
@@ -835,10 +1039,14 @@ 
 		}
 		// 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($obj->id, $arrayofselected)) $selected = 1;
+		}
+			if (in_array($obj->id, $arrayofselected)) {
+				$selected = 1;
+			}
 			print '<input id="cb'.$obj->id.'" class="flat checkforselect" type="checkbox" name="toselect[]" value="'.$obj->id.'"'.($selected ? ' checked="checked"' : '').'>';
 		}
 		print '</td>';

htdocs/comm/action/pertype.php

Braces +282 added lines, -99 removed lines

@@ -39,7 +39,9 @@ 
 require_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php';
 
 
-if (!isset($conf->global->AGENDA_MAX_EVENTS_DAY_VIEW)) $conf->global->AGENDA_MAX_EVENTS_DAY_VIEW = 3;
+if (!isset($conf->global->AGENDA_MAX_EVENTS_DAY_VIEW)) {
+	$conf->global->AGENDA_MAX_EVENTS_DAY_VIEW = 3;
+}
 
 $filter = GETPOST("search_filter", 'alpha', 3) ? GETPOST("search_filter", 'alpha', 3) : GETPOST("filter", 'alpha', 3);
 $filtert = GETPOST("search_filtert", "int", 3) ? GETPOST("search_filtert", "int", 3) : GETPOST("filtert", "int", 3);
@@ -60,22 +62,36 @@ 
 if (empty($page) || $page == -1) { $page = 0; }     // If $page is not defined, or '' or -1
 $limit = GETPOST('limit', 'int') ?GETPOST('limit', 'int') : $conf->liste_limit;
 $offset = $limit * $page;
-if (!$sortorder) $sortorder = "ASC";
-if (!$sortfield) $sortfield = "a.datec";
+if (!$sortorder) {
+	$sortorder = "ASC";
+}
+if (!$sortfield) {
+	$sortfield = "a.datec";
+}
 
 // Security check
 $socid = GETPOST("search_socid", "int") ?GETPOST("search_socid", "int") : GETPOST("socid", "int");
-if ($user->socid) $socid = $user->socid;
+if ($user->socid) {
+	$socid = $user->socid;
+}
 $result = restrictedArea($user, 'agenda', 0, '', 'myactions');
-if ($socid < 0) $socid = '';
+if ($socid < 0) {
+	$socid = '';
+}
 
 $canedit = 1;
-if (!$user->rights->agenda->myactions->read) accessforbidden();
-if (!$user->rights->agenda->allactions->read) $canedit = 0;
-if (!$user->rights->agenda->allactions->read || $filter == 'mine')  // If no permission to see all, we show only affected to me
+if (!$user->rights->agenda->myactions->read) {
+	accessforbidden();
+}
+if (!$user->rights->agenda->allactions->read) {
+	$canedit = 0;
+}
+if (!$user->rights->agenda->allactions->read || $filter == 'mine') {
+	// If no permission to see all, we show only affected to me
 {
 	$filtert = $user->id;
 }
+}
 
 //$action=GETPOST('action','alpha');
 $action = 'show_pertype';
@@ -93,11 +109,15 @@ 
 if (GETPOST('search_actioncode', 'array'))
 {
 	$actioncode = GETPOST('search_actioncode', 'array', 3);
-	if (!count($actioncode)) $actioncode = '0';
-} else {
+	if (!count($actioncode)) {
+		$actioncode = '0';
+	}
+	} else {
 	$actioncode = GETPOST("search_actioncode", "alpha", 3) ?GETPOST("search_actioncode", "alpha", 3) : (GETPOST("search_actioncode", "alpha") == '0' ? '0' : (empty($conf->global->AGENDA_DEFAULT_FILTER_TYPE) ? '' : $conf->global->AGENDA_DEFAULT_FILTER_TYPE));
 }
-if ($actioncode == '' && empty($actioncodearray)) $actioncode = (empty($conf->global->AGENDA_DEFAULT_FILTER_TYPE) ? '' : $conf->global->AGENDA_DEFAULT_FILTER_TYPE);
+if ($actioncode == '' && empty($actioncodearray)) {
+	$actioncode = (empty($conf->global->AGENDA_DEFAULT_FILTER_TYPE) ? '' : $conf->global->AGENDA_DEFAULT_FILTER_TYPE);
+}
 
 $dateselect = dol_mktime(0, 0, 0, GETPOST('dateselectmonth', 'int'), GETPOST('dateselectday', 'int'), GETPOST('dateselectyear', 'int'));
 if ($dateselect > 0)
@@ -112,9 +132,15 @@ 
 $tmparray = explode('-', $tmp);
 $begin_h = GETPOST('begin_h', 'int') != '' ?GETPOST('begin_h', 'int') : ($tmparray[0] != '' ? $tmparray[0] : 9);
 $end_h   = GETPOST('end_h', 'int') ?GETPOST('end_h', 'int') : ($tmparray[1] != '' ? $tmparray[1] : 18);
-if ($begin_h < 0 || $begin_h > 23) $begin_h = 9;
-if ($end_h < 1 || $end_h > 24) $end_h = 18;
-if ($end_h <= $begin_h) $end_h = $begin_h + 1;
+if ($begin_h < 0 || $begin_h > 23) {
+	$begin_h = 9;
+}
+if ($end_h < 1 || $end_h > 24) {
+	$end_h = 18;
+}
+if ($end_h <= $begin_h) {
+	$end_h = $begin_h + 1;
+}
 
 $tmp = empty($conf->global->MAIN_DEFAULT_WORKING_DAYS) ? '1-5' : $conf->global->MAIN_DEFAULT_WORKING_DAYS;
 $tmp = str_replace(' ', '', $tmp); // FIX 7533
@@ -122,8 +148,12 @@ 
 $begin_d = 1;
 $end_d = 53;
 
-if ($status == '' && !GETPOSTISSET('status')) $status = (empty($conf->global->AGENDA_DEFAULT_FILTER_STATUS) ? '' : $conf->global->AGENDA_DEFAULT_FILTER_STATUS);
-if (empty($action) && !GETPOSTISSET('action')) $action = (empty($conf->global->AGENDA_DEFAULT_VIEW) ? 'show_month' : $conf->global->AGENDA_DEFAULT_VIEW);
+if ($status == '' && !GETPOSTISSET('status')) {
+	$status = (empty($conf->global->AGENDA_DEFAULT_FILTER_STATUS) ? '' : $conf->global->AGENDA_DEFAULT_FILTER_STATUS);
+}
+if (empty($action) && !GETPOSTISSET('action')) {
+	$action = (empty($conf->global->AGENDA_DEFAULT_VIEW) ? 'show_month' : $conf->global->AGENDA_DEFAULT_VIEW);
+}
 
 if (GETPOST('viewcal', 'alpha') && $action != 'show_day' && $action != 'show_week' && $action != 'show_peruser') {
 	$action = 'show_month'; $day = '';
@@ -185,7 +215,9 @@ 
 	'usergroup' => $usergroup,
 );
 $reshook = $hookmanager->executeHooks('beforeAgendaPerType', $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');
+}
 
 $form = new Form($db);
 $companystatic = new Societe($db);
@@ -223,29 +255,65 @@ 
 //print 'xx'.$next_year.'-'.$next_month.'-'.$next_day;
 
 $title = $langs->trans("DoneAndToDoActions");
-if ($status == 'done') $title = $langs->trans("DoneActions");
-if ($status == 'todo') $title = $langs->trans("ToDoActions");
+if ($status == 'done') {
+	$title = $langs->trans("DoneActions");
+}
+if ($status == 'todo') {
+	$title = $langs->trans("ToDoActions");
+}
 
 $param = '';
 if ($actioncode || GETPOSTISSET('search_actioncode')) {
 	if (is_array($actioncode)) {
-		foreach ($actioncode as $str_action) $param .= "&search_actioncode[]=".urlencode($str_action);
-	} else $param .= "&search_actioncode=".urlencode($actioncode);
+		foreach ($actioncode as $str_action) {
+			$param .= "&search_actioncode[]=".urlencode($str_action);
+		}
+	} else {
+		$param .= "&search_actioncode=".urlencode($actioncode);
+	}
+	}
+if ($resourceid > 0) {
+	$param .= "&search_resourceid=".urlencode($resourceid);
+}
+if ($status || GETPOSTISSET('status')) {
+	$param .= "&search_status=".urlencode($status);
+}
+if ($filter) {
+	$param .= "&search_filter=".urlencode($filter);
+}
+if ($filtert) {
+	$param .= "&search_filtert=".urlencode($filtert);
+}
+if ($usergroup > 0) {
+	$param .= "&search_usergroup=".urlencode($usergroup);
+}
+if ($socid > 0) {
+	$param .= "&search_socid=".urlencode($socid);
+}
+if ($showbirthday) {
+	$param .= "&search_showbirthday=1";
+}
+if ($pid) {
+	$param .= "&search_projectid=".urlencode($pid);
+}
+if ($type) {
+	$param .= "&search_type=".urlencode($type);
+}
+if ($action == 'show_day' || $action == 'show_week' || $action == 'show_month' || $action != 'show_peruser') {
+	$param .= '&action='.urlencode($action);
+}
+if ($begin_h != '') {
+	$param .= '&begin_h='.urlencode($begin_h);
+}
+if ($end_h != '') {
+	$param .= '&end_h='.urlencode($end_h);
+}
+if ($begin_d != '') {
+	$param .= '&begin_d='.urlencode($begin_d);
+}
+if ($end_d != '') {
+	$param .= '&end_d='.urlencode($end_d);
 }
-if ($resourceid > 0) $param .= "&search_resourceid=".urlencode($resourceid);
-if ($status || GETPOSTISSET('status')) $param .= "&search_status=".urlencode($status);
-if ($filter)        $param .= "&search_filter=".urlencode($filter);
-if ($filtert)       $param .= "&search_filtert=".urlencode($filtert);
-if ($usergroup > 0) $param .= "&search_usergroup=".urlencode($usergroup);
-if ($socid > 0)     $param .= "&search_socid=".urlencode($socid);
-if ($showbirthday)  $param .= "&search_showbirthday=1";
-if ($pid)           $param .= "&search_projectid=".urlencode($pid);
-if ($type)          $param .= "&search_type=".urlencode($type);
-if ($action == 'show_day' || $action == 'show_week' || $action == 'show_month' || $action != 'show_peruser') $param .= '&action='.urlencode($action);
-if ($begin_h != '') $param .= '&begin_h='.urlencode($begin_h);
-if ($end_h != '')   $param .= '&end_h='.urlencode($end_h);
-if ($begin_d != '') $param .= '&begin_d='.urlencode($begin_d);
-if ($end_d != '')   $param .= '&end_d='.urlencode($end_d);
 $param .= "&maxprint=".urlencode($maxprint);
 
 $paramnoactionodate = $param;
@@ -435,7 +503,9 @@ 
 
 // DEFAULT CALENDAR + AUTOEVENT CALENDAR + CONFERENCEBOOTH CALENDAR
 $sql = 'SELECT';
-if ($usergroup > 0) $sql .= " DISTINCT";
+if ($usergroup > 0) {
+	$sql .= " DISTINCT";
+}
 $sql .= ' a.id, a.label,';
 $sql .= ' a.datep,';
 $sql .= ' a.datep2,';
@@ -445,12 +515,20 @@ 
 $sql .= ' a.fk_soc, a.fk_contact, a.fk_element, a.elementtype, a.fk_project,';
 $sql .= ' ca.code, ca.libelle as type_label, ca.color, ca.type as type_type, ca.picto as type_picto';
 $sql .= ' FROM '.MAIN_DB_PREFIX.'c_actioncomm as ca, '.MAIN_DB_PREFIX."actioncomm as a";
-if (!$user->rights->societe->client->voir && !$socid) $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."societe_commerciaux as sc ON a.fk_soc = sc.fk_soc";
+if (!$user->rights->societe->client->voir && !$socid) {
+	$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."societe_commerciaux as sc ON a.fk_soc = sc.fk_soc";
+}
 // We must filter on resource table
-if ($resourceid > 0) $sql .= ", ".MAIN_DB_PREFIX."element_resources as r";
+if ($resourceid > 0) {
+	$sql .= ", ".MAIN_DB_PREFIX."element_resources as r";
+}
 // We must filter on assignement table
-if ($filtert > 0 || $usergroup > 0) $sql .= ", ".MAIN_DB_PREFIX."actioncomm_resources as ar";
-if ($usergroup > 0) $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."usergroup_user as ugu ON ugu.fk_user = ar.fk_element";
+if ($filtert > 0 || $usergroup > 0) {
+	$sql .= ", ".MAIN_DB_PREFIX."actioncomm_resources as ar";
+}
+if ($usergroup > 0) {
+	$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."usergroup_user as ugu ON ugu.fk_user = ar.fk_element";
+}
 $sql .= ' WHERE a.fk_action = ca.id';
 $sql .= ' AND a.entity IN ('.getEntity('agenda').')';
 // Condition on actioncode
@@ -458,16 +536,24 @@ 
 {
 	if (empty($conf->global->AGENDA_USE_EVENT_TYPE))
 	{
-		if ($actioncode == 'AC_NON_AUTO') $sql .= " AND ca.type != 'systemauto'";
-		elseif ($actioncode == 'AC_ALL_AUTO') $sql .= " AND ca.type = 'systemauto'";
-		else {
-			if ($actioncode == 'AC_OTH') $sql .= " AND ca.type != 'systemauto'";
-			if ($actioncode == 'AC_OTH_AUTO') $sql .= " AND ca.type = 'systemauto'";
+		if ($actioncode == 'AC_NON_AUTO') {
+			$sql .= " AND ca.type != 'systemauto'";
+		} elseif ($actioncode == 'AC_ALL_AUTO') {
+			$sql .= " AND ca.type = 'systemauto'";
+		} else {
+			if ($actioncode == 'AC_OTH') {
+				$sql .= " AND ca.type != 'systemauto'";
+			}
+			if ($actioncode == 'AC_OTH_AUTO') {
+				$sql .= " AND ca.type = 'systemauto'";
+			}
 		}
 	} else {
-		if ($actioncode == 'AC_NON_AUTO') $sql .= " AND ca.type != 'systemauto'";
-		elseif ($actioncode == 'AC_ALL_AUTO') $sql .= " AND ca.type = 'systemauto'";
-		else {
+		if ($actioncode == 'AC_NON_AUTO') {
+			$sql .= " AND ca.type != 'systemauto'";
+		} elseif ($actioncode == 'AC_ALL_AUTO') {
+			$sql .= " AND ca.type = 'systemauto'";
+		} else {
 			if (is_array($actioncode))
 			{
 				$sql .= " AND ca.code IN ('".implode("','", $actioncode)."')";
@@ -477,12 +563,22 @@ 
 		}
 	}
 }
-if ($resourceid > 0) $sql .= " AND r.element_type = 'action' AND r.element_id = a.id AND r.resource_id = ".$db->escape($resourceid);
-if ($pid) $sql .= " AND a.fk_project=".$db->escape($pid);
-if (!$user->rights->societe->client->voir && !$socid) $sql .= " AND (a.fk_soc IS NULL OR sc.fk_user = ".$user->id.")";
-if ($socid > 0) $sql .= ' AND a.fk_soc = '.$socid;
+if ($resourceid > 0) {
+	$sql .= " AND r.element_type = 'action' AND r.element_id = a.id AND r.resource_id = ".$db->escape($resourceid);
+}
+if ($pid) {
+	$sql .= " AND a.fk_project=".$db->escape($pid);
+}
+if (!$user->rights->societe->client->voir && !$socid) {
+	$sql .= " AND (a.fk_soc IS NULL OR sc.fk_user = ".$user->id.")";
+}
+if ($socid > 0) {
+	$sql .= ' AND a.fk_soc = '.$socid;
+}
 // We must filter on assignement table
-if ($filtert > 0 || $usergroup > 0) $sql .= " AND ar.fk_actioncomm = a.id AND ar.element_type='user'";
+if ($filtert > 0 || $usergroup > 0) {
+	$sql .= " AND ar.fk_actioncomm = a.id AND ar.element_type='user'";
+}
 if ($action == 'show_day')
 {
 	$sql .= " AND (";
@@ -508,7 +604,9 @@ 
 	$sql .= " AND a.datep2 > '".$db->idate(dol_mktime(23, 59, 59, 12, 31, $year) + (60 * 60 * 24 * 7))."')";
 	$sql .= ')';
 }
-if ($type) $sql .= " AND ca.id = ".$type;
+if ($type) {
+	$sql .= " AND ca.id = ".$type;
+}
 if ($status == '0') { $sql .= " AND a.percent = 0"; }
 if ($status == '-1') { $sql .= " AND a.percent = -1"; }	// Not applicable
 if ($status == '50') { $sql .= " AND (a.percent > 0 AND a.percent < 100)"; }	// Running already started
@@ -518,8 +616,12 @@ 
 if ($filtert > 0 || $usergroup > 0)
 {
 	$sql .= " AND (";
-	if ($filtert > 0) $sql .= "ar.fk_element = ".$filtert;
-	if ($usergroup > 0) $sql .= ($filtert > 0 ? " OR " : "")." ugu.fk_usergroup = ".$usergroup;
+	if ($filtert > 0) {
+		$sql .= "ar.fk_element = ".$filtert;
+	}
+	if ($usergroup > 0) {
+		$sql .= ($filtert > 0 ? " OR " : "")." ugu.fk_usergroup = ".$usergroup;
+	}
 	$sql .= ")";
 }
 // Sort on date
@@ -575,12 +677,18 @@ 
 		if ($event->percentage <= 0)
 		{
 			$event->date_start_in_calendar = $datep;
-			if ($datep2 != '' && $datep2 >= $datep) $event->date_end_in_calendar = $datep2;
-			else $event->date_end_in_calendar = $datep;
+			if ($datep2 != '' && $datep2 >= $datep) {
+				$event->date_end_in_calendar = $datep2;
+			} else {
+				$event->date_end_in_calendar = $datep;
+			}
 		} else {
 			$event->date_start_in_calendar = $datep;
-			if ($datep2 != '' && $datep2 >= $datep) $event->date_end_in_calendar = $datep2;
-			else $event->date_end_in_calendar = $datep;
+			if ($datep2 != '' && $datep2 >= $datep) {
+				$event->date_end_in_calendar = $datep2;
+			} else {
+				$event->date_end_in_calendar = $datep;
+			}
 		}
 		// Define ponctual property
 		if ($event->date_start_in_calendar == $event->date_end_in_calendar)
@@ -598,8 +706,12 @@ 
 			//print $i.' - '.dol_print_date($this->date_start_in_calendar, 'dayhour').' - '.dol_print_date($this->date_end_in_calendar, 'dayhour').'<br>'."\n";
 			$event->fetch_userassigned(); // This load $event->userassigned
 
-			if ($event->date_start_in_calendar < $firstdaytoshow) $event->date_start_in_calendar = $firstdaytoshow;
-			if ($event->date_end_in_calendar >= $lastdaytoshow) $event->date_end_in_calendar = ($lastdaytoshow - 1);
+			if ($event->date_start_in_calendar < $firstdaytoshow) {
+				$event->date_start_in_calendar = $firstdaytoshow;
+			}
+			if ($event->date_end_in_calendar >= $lastdaytoshow) {
+				$event->date_end_in_calendar = ($lastdaytoshow - 1);
+			}
 
 			// Add an entry in actionarray for each day
 			$daycursor = $event->date_start_in_calendar;
@@ -617,7 +729,9 @@ 
 				$j++;
 
 				$daykey += 60 * 60 * 24;
-				if ($daykey > $event->date_end_in_calendar) $loop = false;
+				if ($daykey > $event->date_end_in_calendar) {
+					$loop = false;
+				}
 			} while ($loop);
 
 			//print 'Event '.$i.' id='.$event->id.' (start='.dol_print_date($event->datep).'-end='.dol_print_date($event->datef);
@@ -641,7 +755,9 @@ 
 {
 	include_once $color_file;
 }
-if (!is_array($theme_datacolor)) $theme_datacolor = array(array(120, 130, 150), array(200, 160, 180), array(190, 190, 220));
+if (!is_array($theme_datacolor)) {
+	$theme_datacolor = array(array(120, 130, 150), array(200, 160, 180), array(190, 190, 220));
+}
 
 
 $newparam = $param; // newparam is for birthday links
@@ -735,10 +851,16 @@ 
 		$tmpyear = $tmparray['year'];
 
 		$style = 'cal_current_month';
-		if ($iter_day == 6) $style .= ' cal_other_month';
+		if ($iter_day == 6) {
+			$style .= ' cal_other_month';
+		}
 		$today = 0;
-		if ($todayarray['mday'] == $tmpday && $todayarray['mon'] == $tmpmonth && $todayarray['year'] == $tmpyear) $today = 1;
-		if ($today) $style = 'cal_today_peruser';
+		if ($todayarray['mday'] == $tmpday && $todayarray['mon'] == $tmpmonth && $todayarray['year'] == $tmpyear) {
+			$today = 1;
+		}
+		if ($today) {
+			$style = 'cal_today_peruser';
+		}
 
 		show_day_events_pertype($typeofevent, $tmpday, $tmpmonth, $tmpyear, 0, $style, $eventarray, 0, $maxnbofchar, $newparam, 1, 300, $showheader, $colorsbytype, $var);
 
@@ -866,7 +988,8 @@ 
 		$mois =  dol_print_date($daykey, '%m');
 		$jour =  dol_print_date($daykey, '%d');
 
-		if ($day == $jour && $month == $mois && $year == $annee)	// Is it the day we are looking for when calling function ?
+		if ($day == $jour && $month == $mois && $year == $annee) {
+			// Is it the day we are looking for when calling function ?
 		{
 			// Scan all event for this date
 			foreach ($eventarray[$daykey] as $index => $event)
@@ -875,12 +998,18 @@ 
 				//var_dump($event);
 
 				$keysofuserassigned = array_keys($event->userassigned);
-				if (!in_array($username->id, $keysofuserassigned)) continue; // We discard record if event is from another user than user we want to show
+		}
+				if (!in_array($username->id, $keysofuserassigned)) {
+					continue;
+				}
+				// We discard record if event is from another user than user we want to show
 				//if ($username->id != $event->userownerid) continue;	// We discard record if event is from another user than user we want to show
 
 				$parameters = array();
 				$reshook = $hookmanager->executeHooks('formatEvent', $parameters, $event, $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');
+				}
 
 				$ponct = ($event->date_start_in_calendar == $event->date_end_in_calendar);
 
@@ -889,7 +1018,9 @@ 
 				if (in_array($user->id, $keysofuserassigned))
 				{
 					$nummytasks++; $cssclass = 'family_mytasks';
-					if (!empty($conf->global->AGENDA_USE_EVENT_TYPE)) $color = $event->type_color;
+					if (!empty($conf->global->AGENDA_USE_EVENT_TYPE)) {
+						$color = $event->type_color;
+					}
 				} elseif ($event->type_code == 'ICALEVENT')
 				{
 					$numical++;
@@ -908,20 +1039,27 @@ 
 					$numbirthday++; $colorindex = 2; $cssclass = 'family_birthday unsortable'; $color = sprintf("%02x%02x%02x", $theme_datacolor[$colorindex][0], $theme_datacolor[$colorindex][1], $theme_datacolor[$colorindex][2]);
 				} else {
 					$numother++; $cssclass = 'family_other';
-					if (!empty($conf->global->AGENDA_USE_EVENT_TYPE)) $color = $event->type_color;
+					if (!empty($conf->global->AGENDA_USE_EVENT_TYPE)) {
+						$color = $event->type_color;
+					}
 				}
 
-				if ($color < 0)	// Color was not set on user card. Set color according to color index.
+				if ($color < 0) {
+					// Color was not set on user card. Set color according to color index.
 				{
 					// Define color index if not yet defined
 					$idusertouse = ($event->userownerid ? $event->userownerid : 0);
+				}
 					if (isset($colorindexused[$idusertouse]))
 					{
 						$colorindex = $colorindexused[$idusertouse]; // Color already assigned to this user
 					} else {
 						$colorindex = $nextindextouse;
 						$colorindexused[$idusertouse] = $colorindex;
-						if (!empty($theme_datacolor[$nextindextouse + 1])) $nextindextouse++; // Prepare to use next color
+						if (!empty($theme_datacolor[$nextindextouse + 1])) {
+							$nextindextouse++;
+						}
+						// Prepare to use next color
 					}
 					// Define color
 					$color = sprintf("%02x%02x%02x", $theme_datacolor[$colorindex][0], $theme_datacolor[$colorindex][1], $theme_datacolor[$colorindex][2]);
@@ -940,7 +1078,9 @@ 
 						$c = dol_mktime((int) $h + 1, 0, 0, $month, $day, $year, 'tzuserrel', 0);
 
 						$dateendtouse = $event->date_end_in_calendar;
-						if ($dateendtouse == $event->date_start_in_calendar) $dateendtouse++;
+						if ($dateendtouse == $event->date_start_in_calendar) {
+							$dateendtouse++;
+						}
 
 						//print dol_print_date($event->date_start_in_calendar,'dayhour').'-'.dol_print_date($a,'dayhour').'-'.dol_print_date($b,'dayhour').'<br>';
 
@@ -953,10 +1093,15 @@ 
 							{
 								$tmpa = dol_getdate($event->date_start_in_calendar, true);
 								$tmpb = dol_getdate($event->date_end_in_calendar, true);
-								if ($tmpa['mday'] == $tmpb['mday'] && $tmpa['mon'] == $tmpb['mon'] && $tmpa['year'] == $tmpb['year']) $cases1[$h][$event->id]['string'] .= '-'.dol_print_date($event->date_end_in_calendar, 'hour', 'tzuserrel');
-								else $cases1[$h][$event->id]['string'] .= '-'.dol_print_date($event->date_end_in_calendar, 'dayhour', 'tzuserrel');
+								if ($tmpa['mday'] == $tmpb['mday'] && $tmpa['mon'] == $tmpb['mon'] && $tmpa['year'] == $tmpb['year']) {
+									$cases1[$h][$event->id]['string'] .= '-'.dol_print_date($event->date_end_in_calendar, 'hour', 'tzuserrel');
+								} else {
+									$cases1[$h][$event->id]['string'] .= '-'.dol_print_date($event->date_end_in_calendar, 'dayhour', 'tzuserrel');
+								}
+							}
+							if ($event->label) {
+								$cases1[$h][$event->id]['string'] .= ' - '.$event->label;
 							}
-							if ($event->label) $cases1[$h][$event->id]['string'] .= ' - '.$event->label;
 							$cases1[$h][$event->id]['typecode'] = $event->type_code;
 							$cases1[$h][$event->id]['color'] = $color;
 							if ($event->fk_project > 0)
@@ -999,10 +1144,15 @@ 
 							{
 								$tmpa = dol_getdate($event->date_start_in_calendar, true);
 								$tmpb = dol_getdate($event->date_end_in_calendar, true);
-								if ($tmpa['mday'] == $tmpb['mday'] && $tmpa['mon'] == $tmpb['mon'] && $tmpa['year'] == $tmpb['year']) $cases2[$h][$event->id]['string'] .= '-'.dol_print_date($event->date_end_in_calendar, 'hour', 'tzuserrel');
-								else $cases2[$h][$event->id]['string'] .= '-'.dol_print_date($event->date_end_in_calendar, 'dayhour', 'tzuserrel');
+								if ($tmpa['mday'] == $tmpb['mday'] && $tmpa['mon'] == $tmpb['mon'] && $tmpa['year'] == $tmpb['year']) {
+									$cases2[$h][$event->id]['string'] .= '-'.dol_print_date($event->date_end_in_calendar, 'hour', 'tzuserrel');
+								} else {
+									$cases2[$h][$event->id]['string'] .= '-'.dol_print_date($event->date_end_in_calendar, 'dayhour', 'tzuserrel');
+								}
+							}
+							if ($event->label) {
+								$cases2[$h][$event->id]['string'] .= ' - '.$event->label;
 							}
-							if ($event->label) $cases2[$h][$event->id]['string'] .= ' - '.$event->label;
 							$cases2[$h][$event->id]['typecode'] = $event->type_code;
 							$cases2[$h][$event->id]['color'] = $color;
 							if ($event->fk_project > 0)
@@ -1065,52 +1215,85 @@ 
 		if (isset($cases1[$h]) && $cases1[$h] != '')
 		{
 			//$title1.=count($cases1[$h]).' '.(count($cases1[$h])==1?$langs->trans("Event"):$langs->trans("Events"));
-			if (count($cases1[$h]) > 1) $title1 .= count($cases1[$h]).' '.(count($cases1[$h]) == 1 ? $langs->trans("Event") : $langs->trans("Events"));
+			if (count($cases1[$h]) > 1) {
+				$title1 .= count($cases1[$h]).' '.(count($cases1[$h]) == 1 ? $langs->trans("Event") : $langs->trans("Events"));
+			}
 			$string1 = '&nbsp;';
-			if (empty($conf->global->AGENDA_NO_TRANSPARENT_ON_NOT_BUSY)) $style1 = 'peruser_notbusy';
-			else $style1 = 'peruser_busy';
+			if (empty($conf->global->AGENDA_NO_TRANSPARENT_ON_NOT_BUSY)) {
+				$style1 = 'peruser_notbusy';
+			} else {
+				$style1 = 'peruser_busy';
+			}
 			foreach ($cases1[$h] as $id => $ev)
 			{
-				if ($ev['busy']) $style1 = 'peruser_busy';
+				if ($ev['busy']) {
+					$style1 = 'peruser_busy';
+				}
 			}
 		}
 		if (isset($cases2[$h]) && $cases2[$h] != '')
 		{
 			//$title2.=count($cases2[$h]).' '.(count($cases2[$h])==1?$langs->trans("Event"):$langs->trans("Events"));
-			if (count($cases2[$h]) > 1) $title2 .= count($cases2[$h]).' '.(count($cases2[$h]) == 1 ? $langs->trans("Event") : $langs->trans("Events"));
+			if (count($cases2[$h]) > 1) {
+				$title2 .= count($cases2[$h]).' '.(count($cases2[$h]) == 1 ? $langs->trans("Event") : $langs->trans("Events"));
+			}
 			$string2 = '&nbsp;';
-			if (empty($conf->global->AGENDA_NO_TRANSPARENT_ON_NOT_BUSY)) $style2 = 'peruser_notbusy';
-			else $style2 = 'peruser_busy';
+			if (empty($conf->global->AGENDA_NO_TRANSPARENT_ON_NOT_BUSY)) {
+				$style2 = 'peruser_notbusy';
+			} else {
+				$style2 = 'peruser_busy';
+			}
 			foreach ($cases2[$h] as $id => $ev)
 			{
-				if ($ev['busy']) $style2 = 'peruser_busy';
+				if ($ev['busy']) {
+					$style2 = 'peruser_busy';
+				}
 			}
 		}
 
 		$ids1 = ''; $ids2 = '';
-		if (count($cases1[$h]) && array_keys($cases1[$h])) $ids1 = join(',', array_keys($cases1[$h]));
-		if (count($cases2[$h]) && array_keys($cases2[$h])) $ids2 = join(',', array_keys($cases2[$h]));
+		if (count($cases1[$h]) && array_keys($cases1[$h])) {
+			$ids1 = join(',', array_keys($cases1[$h]));
+		}
+		if (count($cases2[$h]) && array_keys($cases2[$h])) {
+			$ids2 = join(',', array_keys($cases2[$h]));
+		}
 
-		if ($h == $begin_h) echo '<td class="'.$style.'_peruserleft cal_peruser'.($var ? ' cal_impair '.$style.'_impair' : '').'">';
-		else echo '<td class="'.$style.' cal_peruser'.($var ? ' cal_impair '.$style.'_impair' : '').'">';
-		if (count($cases1[$h]) == 1)	// only 1 event
+		if ($h == $begin_h) {
+			echo '<td class="'.$style.'_peruserleft cal_peruser'.($var ? ' cal_impair '.$style.'_impair' : '').'">';
+		} else {
+			echo '<td class="'.$style.' cal_peruser'.($var ? ' cal_impair '.$style.'_impair' : '').'">';
+		}
+		if (count($cases1[$h]) == 1) {
+			// only 1 event
 		{
 			$output = array_slice($cases1[$h], 0, 1);
+		}
 			$title1 = $langs->trans("Ref").' '.$ids1.($title1 ? ' - '.$title1 : '');
-			if ($output[0]['string']) $title1 .= ($title1 ? ' - ' : '').$output[0]['string'];
-			if ($output[0]['color']) $color1 = $output[0]['color'];
+			if ($output[0]['string']) {
+				$title1 .= ($title1 ? ' - ' : '').$output[0]['string'];
+			}
+			if ($output[0]['color']) {
+				$color1 = $output[0]['color'];
+			}
 		} elseif (count($cases1[$h]) > 1)
 		{
 			$title1 = $langs->trans("Ref").' '.$ids1.($title1 ? ' - '.$title1 : '');
 			$color1 = '222222';
 		}
 
-		if (count($cases2[$h]) == 1)	// only 1 event
+		if (count($cases2[$h]) == 1) {
+			// only 1 event
 		{
 			$output = array_slice($cases2[$h], 0, 1);
+		}
 			$title2 = $langs->trans("Ref").' '.$ids2.($title2 ? ' - '.$title2 : '');
-			if ($output[0]['string']) $title2 .= ($title2 ? ' - ' : '').$output[0]['string'];
-			if ($output[0]['color']) $color2 = $output[0]['color'];
+			if ($output[0]['string']) {
+				$title2 .= ($title2 ? ' - ' : '').$output[0]['string'];
+			}
+			if ($output[0]['color']) {
+				$color2 = $output[0]['color'];
+			}
 		} elseif (count($cases2[$h]) > 1)
 		{
 			$title2 = $langs->trans("Ref").' '.$ids2.($title2 ? ' - '.$title2 : '');

htdocs/comm/action/class/actioncomm.class.php

Braces +361 added lines, -138 removed lines

@@ -390,9 +390,11 @@ 
 		$now = dol_now();
 
 		// Check parameters
-		if (!isset($this->userownerid) || $this->userownerid === '')	// $this->userownerid may be 0 (anonymous event) of > 0
+		if (!isset($this->userownerid) || $this->userownerid === '') {
+			// $this->userownerid may be 0 (anonymous event) of > 0
 		{
 			dol_syslog("You tried to create an event but mandatory property ownerid was not defined", LOG_WARNING);
+		}
 			$this->errors[] = 'ErrorPropertyUserowneridNotDefined';
 			return -1;
 		}
@@ -401,25 +403,50 @@ 
 		$this->label = dol_trunc(trim($this->label), 128);
 		$this->location = dol_trunc(trim($this->location), 128);
 		$this->note_private = dol_htmlcleanlastbr(trim(empty($this->note_private) ? $this->note : $this->note_private));
-		if (empty($this->percentage))   $this->percentage = 0;
-		if (empty($this->priority) || !is_numeric($this->priority)) $this->priority = 0;
-		if (empty($this->fulldayevent)) $this->fulldayevent = 0;
-		if (empty($this->transparency)) $this->transparency = 0;
-		if ($this->percentage > 100) $this->percentage = 100;
+		if (empty($this->percentage)) {
+			$this->percentage = 0;
+		}
+		if (empty($this->priority) || !is_numeric($this->priority)) {
+			$this->priority = 0;
+		}
+		if (empty($this->fulldayevent)) {
+			$this->fulldayevent = 0;
+		}
+		if (empty($this->transparency)) {
+			$this->transparency = 0;
+		}
+		if ($this->percentage > 100) {
+			$this->percentage = 100;
+		}
 		//if ($this->percentage == 100 && ! $this->dateend) $this->dateend = $this->date;
-		if (!empty($this->datep) && !empty($this->datef))   $this->durationp = ($this->datef - $this->datep); // deprecated
+		if (!empty($this->datep) && !empty($this->datef)) {
+			$this->durationp = ($this->datef - $this->datep);
+		}
+		// deprecated
 		//if (! empty($this->date)  && ! empty($this->dateend)) $this->durationa=($this->dateend - $this->date);
-		if (!empty($this->datep) && !empty($this->datef) && $this->datep > $this->datef) $this->datef = $this->datep;
+		if (!empty($this->datep) && !empty($this->datef) && $this->datep > $this->datef) {
+			$this->datef = $this->datep;
+		}
 		//if (! empty($this->date)  && ! empty($this->dateend) && $this->date > $this->dateend) $this->dateend=$this->date;
-		if (!isset($this->fk_project) || $this->fk_project < 0) $this->fk_project = 0;
+		if (!isset($this->fk_project) || $this->fk_project < 0) {
+			$this->fk_project = 0;
+		}
 		// For backward compatibility
-		if ($this->elementtype == 'facture')  $this->elementtype = 'invoice';
-		if ($this->elementtype == 'commande') $this->elementtype = 'order';
-		if ($this->elementtype == 'contrat')  $this->elementtype = 'contract';
+		if ($this->elementtype == 'facture') {
+			$this->elementtype = 'invoice';
+		}
+		if ($this->elementtype == 'commande') {
+			$this->elementtype = 'order';
+		}
+		if ($this->elementtype == 'contrat') {
+			$this->elementtype = 'contract';
+		}
 
-		if (!is_array($this->userassigned) && !empty($this->userassigned))	// For backward compatibility when userassigned was an int instead fo array
+		if (!is_array($this->userassigned) && !empty($this->userassigned)) {
+			// For backward compatibility when userassigned was an int instead fo array
 		{
 			$tmpid = $this->userassigned;
+		}
 			$this->userassigned = array();
 			$this->userassigned[$tmpid] = array('id'=>$tmpid, 'transparency'=>$this->transparency);
 		}
@@ -428,8 +455,9 @@ 
 		$userdoneid = $this->userdoneid;
 
 		// Be sure assigned user is defined as an array of array('id'=>,'mandatory'=>,...).
-		if (empty($this->userassigned) || count($this->userassigned) == 0 || !is_array($this->userassigned))
-			$this->userassigned = array($userownerid=>array('id'=>$userownerid, 'transparency'=>$this->transparency));
+		if (empty($this->userassigned) || count($this->userassigned) == 0 || !is_array($this->userassigned)) {
+					$this->userassigned = array($userownerid=>array('id'=>$userownerid, 'transparency'=>$this->transparency));
+		}
 
 		if (!$this->type_id || !$this->type_code)
 		{
@@ -537,10 +565,12 @@ 
 				//dol_syslog(var_export($this->userassigned, true));
 				foreach ($this->userassigned as $key => $val)
 				{
-					if (!is_array($val))	// For backward compatibility when val=id
+					if (!is_array($val)) {
+						// For backward compatibility when val=id
 					{
 						$val = array('id'=>$val);
 					}
+					}
 
 					if ($val['id'] > 0)
 					{
@@ -643,7 +673,9 @@ 
 		// Create clone
 		$this->context['createfromclone'] = 'createfromclone';
 		$result = $this->create($fuser);
-		if ($result < 0) $error++;
+		if ($result < 0) {
+			$error++;
+		}
 
 		if (!$error)
 		{
@@ -653,7 +685,9 @@ 
 				$parameters = array('objFrom'=>$objFrom);
 				$action = '';
 				$reshook = $hookmanager->executeHooks('createFrom', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks
-				if ($reshook < 0) $error++;
+				if ($reshook < 0) {
+					$error++;
+				}
 			}
 
 			// Call trigger
@@ -714,10 +748,17 @@ 
 		$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."user as u on u.rowid = a.fk_user_author";
 		$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."societe as s on s.rowid = a.fk_soc";
 		$sql .= " WHERE ";
-		if ($ref) $sql .= " a.id = ".((int) $ref); // No field ref, we use id
-		elseif ($ref_ext) $sql .= " a.ref_ext = '".$this->db->escape($ref_ext)."'";
-		elseif ($email_msgid) $sql .= " a.email_msgid = '".$this->db->escape($email_msgid)."'";
-		else $sql .= " a.id = ".((int) $id);
+		if ($ref) {
+			$sql .= " a.id = ".((int) $ref);
+		}
+		// No field ref, we use id
+		elseif ($ref_ext) {
+			$sql .= " a.ref_ext = '".$this->db->escape($ref_ext)."'";
+		} elseif ($email_msgid) {
+			$sql .= " a.email_msgid = '".$this->db->escape($email_msgid)."'";
+		} else {
+			$sql .= " a.id = ".((int) $id);
+		}
 
 		dol_syslog(get_class($this)."::fetch", LOG_DEBUG);
 		$resql = $this->db->query($sql);
@@ -758,11 +799,17 @@ 
 				$this->authorid = $obj->fk_user_author;
 				$this->usermodid = $obj->fk_user_mod;
 
-				if (!is_object($this->author)) $this->author = new stdClass(); // To avoid warning
+				if (!is_object($this->author)) {
+					$this->author = new stdClass();
+				}
+				// To avoid warning
 				$this->author->id = $obj->fk_user_author; // deprecated
 				$this->author->firstname = $obj->firstname; // deprecated
 				$this->author->lastname = $obj->lastname; // deprecated
-				if (!is_object($this->usermod)) $this->usermod = new stdClass(); // To avoid warning
+				if (!is_object($this->usermod)) {
+					$this->usermod = new stdClass();
+				}
+				// To avoid warning
 				$this->usermod->id = $obj->fk_user_mod; // deprecated
 
 				$this->userownerid = $obj->fk_user_action;
@@ -812,7 +859,10 @@ 
 		if ($resql)
 		{
 			// If owner is known, we must but id first into list
-			if ($this->userownerid > 0) $this->userassigned[$this->userownerid] = array('id'=>$this->userownerid); // Set first so will be first into list.
+			if ($this->userownerid > 0) {
+				$this->userassigned[$this->userownerid] = array('id'=>$this->userownerid);
+			}
+			// Set first so will be first into list.
 
 			while ($obj = $this->db->fetch_object($resql))
 			{
@@ -821,7 +871,10 @@ 
 					switch ($obj->element_type) {
 						case 'user':
 							$this->userassigned[$obj->fk_element] = array('id'=>$obj->fk_element, 'mandatory'=>$obj->mandatory, 'answer_status'=>$obj->answer_status, 'transparency'=>$obj->transparency);
-							if (empty($this->userownerid)) $this->userownerid = $obj->fk_element; // If not defined (should not happened, we fix this)
+							if (empty($this->userownerid)) {
+								$this->userownerid = $obj->fk_element;
+							}
+							// If not defined (should not happened, we fix this)
 							break;
 						case 'socpeople':
 							$this->socpeopleassigned[$obj->fk_element] = array('id'=>$obj->fk_element, 'mandatory'=>$obj->mandatory, 'answer_status'=>$obj->answer_status, 'transparency'=>$obj->transparency);
@@ -1006,17 +1059,34 @@ 
 		// Clean parameters
 		$this->label = trim($this->label);
 		$this->note_private = dol_htmlcleanlastbr(trim(!isset($this->note_private) ? $this->note : $this->note_private));
-		if (empty($this->percentage))    $this->percentage = 0;
-		if (empty($this->priority) || !is_numeric($this->priority)) $this->priority = 0;
-		if (empty($this->transparency))  $this->transparency = 0;
-		if (empty($this->fulldayevent))  $this->fulldayevent = 0;
-		if ($this->percentage > 100) $this->percentage = 100;
+		if (empty($this->percentage)) {
+			$this->percentage = 0;
+		}
+		if (empty($this->priority) || !is_numeric($this->priority)) {
+			$this->priority = 0;
+		}
+		if (empty($this->transparency)) {
+			$this->transparency = 0;
+		}
+		if (empty($this->fulldayevent)) {
+			$this->fulldayevent = 0;
+		}
+		if ($this->percentage > 100) {
+			$this->percentage = 100;
+		}
 		//if ($this->percentage == 100 && ! $this->dateend) $this->dateend = $this->date;
-		if ($this->datep && $this->datef)   $this->durationp = ($this->datef - $this->datep); // deprecated
+		if ($this->datep && $this->datef) {
+			$this->durationp = ($this->datef - $this->datep);
+		}
+		// deprecated
 		//if ($this->date  && $this->dateend) $this->durationa=($this->dateend - $this->date);
-		if ($this->datep && $this->datef && $this->datep > $this->datef) $this->datef = $this->datep;
+		if ($this->datep && $this->datef && $this->datep > $this->datef) {
+			$this->datef = $this->datep;
+		}
 		//if ($this->date  && $this->dateend && $this->date > $this->dateend) $this->dateend=$this->date;
-		if ($this->fk_project < 0) $this->fk_project = 0;
+		if ($this->fk_project < 0) {
+			$this->fk_project = 0;
+		}
 
 		// Check parameters
 		if ($this->percentage == 0 && $this->userdoneid > 0)
@@ -1034,7 +1104,9 @@ 
 
 		$sql = "UPDATE ".MAIN_DB_PREFIX."actioncomm ";
 		$sql .= " SET percent = '".$this->db->escape($this->percentage)."'";
-		if ($this->type_id > 0) $sql .= ", fk_action = '".$this->db->escape($this->type_id)."'";
+		if ($this->type_id > 0) {
+			$sql .= ", fk_action = '".$this->db->escape($this->type_id)."'";
+		}
 		$sql .= ", label = ".($this->label ? "'".$this->db->escape($this->label)."'" : "null");
 		$sql .= ", datep = ".(strval($this->datep) != '' ? "'".$this->db->idate($this->datep)."'" : 'null');
 		$sql .= ", datep2 = ".(strval($this->datef) != '' ? "'".$this->db->idate($this->datef)."'" : 'null');
@@ -1050,8 +1122,12 @@ 
 		$sql .= ", fk_user_mod = ".$user->id;
 		$sql .= ", fk_user_action = ".($userownerid > 0 ? "'".$this->db->escape($userownerid)."'" : "null");
 		$sql .= ", fk_user_done = ".($userdoneid > 0 ? "'".$this->db->escape($userdoneid)."'" : "null");
-		if (!empty($this->fk_element)) $sql .= ", fk_element=".($this->fk_element ? $this->db->escape($this->fk_element) : "null");
-		if (!empty($this->elementtype)) $sql .= ", elementtype=".($this->elementtype ? "'".$this->db->escape($this->elementtype)."'" : "null");
+		if (!empty($this->fk_element)) {
+			$sql .= ", fk_element=".($this->fk_element ? $this->db->escape($this->fk_element) : "null");
+		}
+		if (!empty($this->elementtype)) {
+			$sql .= ", elementtype=".($this->elementtype ? "'".$this->db->escape($this->elementtype)."'" : "null");
+		}
 		$sql .= " WHERE id=".$this->id;
 
 		dol_syslog(get_class($this)."::update", LOG_DEBUG);
@@ -1077,10 +1153,12 @@ 
 
 				foreach ($this->userassigned as $key => $val)
 				{
-					if (!is_array($val))	// For backward compatibility when val=id
+					if (!is_array($val)) {
+						// For backward compatibility when val=id
 					{
 						$val = array('id'=>$val);
 					}
+					}
 					$sql = "INSERT INTO ".MAIN_DB_PREFIX."actioncomm_resources(fk_actioncomm, element_type, fk_element, mandatory, transparency, answer_status)";
 					$sql .= " VALUES(".$this->id.", 'user', ".$val['id'].", ".(empty($val['mandatory']) ? '0' : $val['mandatory']).", ".(empty($val['transparency']) ? '0' : $val['transparency']).", ".(empty($val['answer_status']) ? '0' : $val['answer_status']).")";
 
@@ -1165,23 +1243,27 @@ 
 		$sql = "SELECT a.id";
 		$sql .= " FROM ".MAIN_DB_PREFIX."actioncomm as a";
 		$sql .= " WHERE a.entity IN (".getEntity('agenda').")";
-		if (!empty($socid)) $sql .= " AND a.fk_soc = ".$socid;
+		if (!empty($socid)) {
+			$sql .= " AND a.fk_soc = ".$socid;
+		}
 		if (!empty($elementtype))
 		{
 			if ($elementtype == 'project') {
 				$sql .= ' AND a.fk_project = '.$fk_element;
-			}
-			elseif ($elementtype == 'contact') {
+			} elseif ($elementtype == 'contact') {
 				$sql .= ' AND a.id IN';
 				$sql .= " (SELECT fk_actioncomm FROM ".MAIN_DB_PREFIX."actioncomm_resources WHERE";
 				$sql .= " element_type = 'socpeople' AND fk_element = ".$fk_element.')';
-			}
-			else {
+			} else {
 				$sql .= " AND a.fk_element = ".(int) $fk_element." AND a.elementtype = '".$db->escape($elementtype)."'";
 			}
 		}
-		if (!empty($filter)) $sql .= $filter;
-		if ($sortorder && $sortfield) $sql .= $db->order($sortfield, $sortorder);
+		if (!empty($filter)) {
+			$sql .= $filter;
+		}
+		if ($sortorder && $sortfield) {
+			$sql .= $db->order($sortfield, $sortorder);
+		}
 		$sql .= $db->plimit($limit, 0);
 
 		$resql = $db->query($sql);
@@ -1226,16 +1308,24 @@ 
 			$sql = "SELECT count(a.id) as nb";
 		}
 		$sql .= " FROM ".MAIN_DB_PREFIX."actioncomm as a";
-		if (!$user->rights->societe->client->voir && !$user->socid) $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."societe_commerciaux as sc ON a.fk_soc = sc.fk_soc";
+		if (!$user->rights->societe->client->voir && !$user->socid) {
+			$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."societe_commerciaux as sc ON a.fk_soc = sc.fk_soc";
+		}
     	if (!$user->rights->agenda->allactions->read) {
     	    $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."actioncomm_resources AS ar ON a.id = ar.fk_actioncomm AND ar.element_type ='user' AND ar.fk_element = ".$user->id;
     	}
 		$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."societe as s ON a.fk_soc = s.rowid";
 		$sql .= " WHERE 1 = 1";
-		if (empty($load_state_board)) $sql .= " AND a.percent >= 0 AND a.percent < 100";
+		if (empty($load_state_board)) {
+			$sql .= " AND a.percent >= 0 AND a.percent < 100";
+		}
 		$sql .= " AND a.entity IN (".getEntity('agenda').")";
-		if (!$user->rights->societe->client->voir && !$user->socid) $sql .= " AND (a.fk_soc IS NULL OR sc.fk_user = ".$user->id.")";
-		if ($user->socid) $sql .= " AND a.fk_soc = ".$user->socid;
+		if (!$user->rights->societe->client->voir && !$user->socid) {
+			$sql .= " AND (a.fk_soc IS NULL OR sc.fk_user = ".$user->id.")";
+		}
+		if ($user->socid) {
+			$sql .= " AND a.fk_soc = ".$user->socid;
+		}
 		if (!$user->rights->agenda->allactions->read) {
     	    $sql .= " AND (a.fk_user_author = ".$user->id." OR a.fk_user_action = ".$user->id." OR a.fk_user_done = ".$user->id;
     	    $sql .= " OR ar.fk_element = ".$user->id; // Added by PV
@@ -1252,7 +1342,9 @@ 
 				$response->label = $langs->trans("ActionsToDo");
 				$response->labelShort = $langs->trans("ActionsToDoShort");
 				$response->url = DOL_URL_ROOT.'/comm/action/list.php?action=show_list&actioncode=0&status=todo&mainmenu=agenda';
-				if ($user->rights->agenda->allactions->read) $response->url .= '&filtert=-1';
+				if ($user->rights->agenda->allactions->read) {
+					$response->url .= '&filtert=-1';
+				}
 				$response->img = img_object('', "action", 'class="inline-block valigntextmiddle"');
 			}
 			// This assignment in condition is not a bug. It allows walking the results.
@@ -1260,15 +1352,20 @@ 
 				if (empty($load_state_board)) {
 					$response->nbtodo++;
 					$agenda_static->datep = $this->db->jdate($obj->dp);
-					if ($agenda_static->hasDelay()) $response->nbtodolate++;
+					if ($agenda_static->hasDelay()) {
+						$response->nbtodolate++;
+					}
 				} else {
 					$this->nb["actionscomm"] = $obj->nb;
 				}
 			}
 
 			$this->db->free($resql);
-			if (empty($load_state_board)) return $response;
-			else return 1;
+			if (empty($load_state_board)) {
+				return $response;
+			} else {
+				return 1;
+			}
 		} else {
 			dol_print_error($this->db);
 			$this->error = $this->db->error();
@@ -1316,7 +1413,9 @@ 
 				}
 
 				$this->date_creation = $this->db->jdate($obj->datec);
-				if (!empty($obj->fk_user_mod)) $this->date_modification = $this->db->jdate($obj->datem);
+				if (!empty($obj->fk_user_mod)) {
+					$this->date_modification = $this->db->jdate($obj->datem);
+				}
 			}
 			$this->db->free($result);
 		} else {
@@ -1353,22 +1452,40 @@ 
 		global $langs;
 
 		$labelStatus = $langs->trans('StatusNotApplicable');
-	   	if ($percent == -1 && !$hidenastatus) $labelStatus = $langs->trans('StatusNotApplicable');
-	   	elseif ($percent == 0) $labelStatus = $langs->trans('StatusActionToDo').' (0%)';
-	   	elseif ($percent > 0 && $percent < 100) $labelStatus = $langs->trans('StatusActionInProcess').' ('.$percent.'%)';
-	   	elseif ($percent >= 100) $labelStatus = $langs->trans('StatusActionDone').' (100%)';
+	   	if ($percent == -1 && !$hidenastatus) {
+	   		$labelStatus = $langs->trans('StatusNotApplicable');
+	   	} elseif ($percent == 0) {
+	   		$labelStatus = $langs->trans('StatusActionToDo').' (0%)';
+	   	} elseif ($percent > 0 && $percent < 100) {
+	   		$labelStatus = $langs->trans('StatusActionInProcess').' ('.$percent.'%)';
+	   	} elseif ($percent >= 100) {
+	   		$labelStatus = $langs->trans('StatusActionDone').' (100%)';
+	   	}
 
 		$labelStatusShort = $langs->trans('StatusNotApplicable');
-		if ($percent == -1 && !$hidenastatus) $labelStatusShort = $langs->trans('NA');
-		elseif ($percent == 0) $labelStatusShort = '0%';
-		elseif ($percent > 0 && $percent < 100) $labelStatusShort = $percent.'%';
-		elseif ($percent >= 100) $labelStatusShort = '100%';
+		if ($percent == -1 && !$hidenastatus) {
+			$labelStatusShort = $langs->trans('NA');
+		} elseif ($percent == 0) {
+			$labelStatusShort = '0%';
+		} elseif ($percent > 0 && $percent < 100) {
+			$labelStatusShort = $percent.'%';
+		} elseif ($percent >= 100) {
+			$labelStatusShort = '100%';
+		}
 
 		$statusType = 'status9';
-		if ($percent == -1 && !$hidenastatus) $statusType = 'status9';
-		if ($percent == 0) $statusType = 'status1';
-		if ($percent > 0 && $percent < 100) $statusType = 'status3';
-		if ($percent >= 100) $statusType = 'status6';
+		if ($percent == -1 && !$hidenastatus) {
+			$statusType = 'status9';
+		}
+		if ($percent == 0) {
+			$statusType = 'status1';
+		}
+		if ($percent > 0 && $percent < 100) {
+			$statusType = 'status3';
+		}
+		if ($percent >= 100) {
+			$statusType = 'status6';
+		}
 
 		return dolGetStatus($labelStatus, $labelStatusShort, '', $statusType, $mode);
 	}
@@ -1390,19 +1507,34 @@ 
 	{
 		global $conf, $langs, $user, $hookmanager, $action;
 
-		if (!empty($conf->dol_no_mouse_hover)) $notooltip = 1; // Force disable tooltips
+		if (!empty($conf->dol_no_mouse_hover)) {
+			$notooltip = 1;
+		}
+		// Force disable tooltips
 
 		$canread = 0;
-		if ($user->rights->agenda->myactions->read && $this->authorid == $user->id) $canread = 1; // Can read my event
-		if ($user->rights->agenda->myactions->read && array_key_exists($user->id, $this->userassigned)) $canread = 1; // Can read my event i am assigned
-		if ($user->rights->agenda->allactions->read) $canread = 1; // Can read all event of other
+		if ($user->rights->agenda->myactions->read && $this->authorid == $user->id) {
+			$canread = 1;
+		}
+		// Can read my event
+		if ($user->rights->agenda->myactions->read && array_key_exists($user->id, $this->userassigned)) {
+			$canread = 1;
+		}
+		// Can read my event i am assigned
+		if ($user->rights->agenda->allactions->read) {
+			$canread = 1;
+		}
+		// Can read all event of other
 		if (!$canread)
 		{
 			$option = 'nolink';
 		}
 
 		$label = $this->label;
-		if (empty($label)) $label = $this->libelle; // For backward compatibility
+		if (empty($label)) {
+			$label = $this->libelle;
+		}
+		// For backward compatibility
 
 		$result = '';
 
@@ -1414,22 +1546,30 @@ 
 		}
 		if (empty($conf->global->AGENDA_USE_EVENT_TYPE))
 		{
-			if ($this->type_code != 'AC_OTH_AUTO') $labeltype = $langs->trans('ActionAC_MANUAL');
+			if ($this->type_code != 'AC_OTH_AUTO') {
+				$labeltype = $langs->trans('ActionAC_MANUAL');
+			}
 		}
 
 		$tooltip = img_picto('', $this->picto).' <u>'.$langs->trans('Action').'</u>';
-		if (!empty($this->ref))
-			$tooltip .= '<br><b>'.$langs->trans('Ref').':</b> '.$this->ref;
-		if (!empty($label))
-			$tooltip .= '<br><b>'.$langs->trans('Title').':</b> '.$label;
-		if (!empty($labeltype))
-			$tooltip .= '<br><b>'.$langs->trans('Type').':</b> '.$labeltype;
-		if (!empty($this->location))
-			$tooltip .= '<br><b>'.$langs->trans('Location').':</b> '.$this->location;
-		if (isset($this->transparency))
-			$tooltip .= '<br><b>'.$langs->trans('Busy').':</b> '.yn($this->transparency);
-		if (!empty($this->note_private))
-			$tooltip .= '<br><b>'.$langs->trans('Note').':</b> '.(dol_textishtml($this->note_private) ? str_replace(array("\r", "\n"), "", $this->note_private) : str_replace(array("\r", "\n"), '<br>', $this->note_private));
+		if (!empty($this->ref)) {
+					$tooltip .= '<br><b>'.$langs->trans('Ref').':</b> '.$this->ref;
+		}
+		if (!empty($label)) {
+					$tooltip .= '<br><b>'.$langs->trans('Title').':</b> '.$label;
+		}
+		if (!empty($labeltype)) {
+					$tooltip .= '<br><b>'.$langs->trans('Type').':</b> '.$labeltype;
+		}
+		if (!empty($this->location)) {
+					$tooltip .= '<br><b>'.$langs->trans('Location').':</b> '.$this->location;
+		}
+		if (isset($this->transparency)) {
+					$tooltip .= '<br><b>'.$langs->trans('Busy').':</b> '.yn($this->transparency);
+		}
+		if (!empty($this->note_private)) {
+					$tooltip .= '<br><b>'.$langs->trans('Note').':</b> '.(dol_textishtml($this->note_private) ? str_replace(array("\r", "\n"), "", $this->note_private) : str_replace(array("\r", "\n"), '<br>', $this->note_private));
+		}
 		$linkclose = '';
 		//if (!empty($conf->global->AGENDA_USE_EVENT_TYPE) && $this->type_color)
 		//	$linkclose = ' style="background-color:#'.$this->type_color.'"';
@@ -1450,21 +1590,29 @@ 
 		    $reshook=$hookmanager->executeHooks('getnomurltooltip',$parameters,$this,$action);    // Note that $action and $object may have been modified by some hooks
 		    $linkclose = ($hookmanager->resPrint ? $hookmanager->resPrint : $linkclose);
 		    */
-		} else $linkclose .= ' class="'.$classname.'"';
+		} else {
+			$linkclose .= ' class="'.$classname.'"';
+		}
 
 		$url = '';
-		if ($option == 'birthday')
-			$url = DOL_URL_ROOT.'/contact/perso.php?id='.$this->id;
-		elseif ($option == 'holiday')
-			$url = DOL_URL_ROOT.'/holiday/card.php?id='.$this->id;
-		else $url = DOL_URL_ROOT.'/comm/action/card.php?id='.$this->id;
+		if ($option == 'birthday') {
+					$url = DOL_URL_ROOT.'/contact/perso.php?id='.$this->id;
+		} elseif ($option == 'holiday') {
+					$url = DOL_URL_ROOT.'/holiday/card.php?id='.$this->id;
+		} else {
+			$url = DOL_URL_ROOT.'/comm/action/card.php?id='.$this->id;
+		}
 
 		if ($option !== 'nolink')
 		{
 			// Add param to save lastsearch_values or not
 			$add_save_lastsearch_values = ($save_lastsearch_value == 1 ? 1 : 0);
-			if ($save_lastsearch_value == -1 && preg_match('/list\.php/', $_SERVER["PHP_SELF"])) $add_save_lastsearch_values = 1;
-			if ($add_save_lastsearch_values) $url .= '&save_lastsearch_values=1';
+			if ($save_lastsearch_value == -1 && preg_match('/list\.php/', $_SERVER["PHP_SELF"])) {
+				$add_save_lastsearch_values = 1;
+			}
+			if ($add_save_lastsearch_values) {
+				$url .= '&save_lastsearch_values=1';
+			}
 		}
 
 		$linkstart = '<a href="'.$url.'"';
@@ -1479,28 +1627,39 @@ 
 		if ($withpicto == 2)
 		{
 			$libelle = $label;
-			if (!empty($conf->global->AGENDA_USE_EVENT_TYPE)) $libelle = $labeltype;
+			if (!empty($conf->global->AGENDA_USE_EVENT_TYPE)) {
+				$libelle = $labeltype;
+			}
 			$libelleshort = '';
 		} else {
 			$libelle = (empty($this->libelle) ? $label : $this->libelle.(($label && $label != $this->libelle) ? ' '.$label : ''));
-			if (!empty($conf->global->AGENDA_USE_EVENT_TYPE) && empty($libelle)) $libelle = $labeltype;
-			if ($maxlength < 0) $libelleshort = $this->ref;
-			else $libelleshort = dol_trunc($libelle, $maxlength);
+			if (!empty($conf->global->AGENDA_USE_EVENT_TYPE) && empty($libelle)) {
+				$libelle = $labeltype;
+			}
+			if ($maxlength < 0) {
+				$libelleshort = $this->ref;
+			} else {
+				$libelleshort = dol_trunc($libelle, $maxlength);
+			}
 		}
 
 		if ($withpicto)
 		{
-			if (!empty($conf->global->AGENDA_USE_EVENT_TYPE))	// Add code into ()
+			if (!empty($conf->global->AGENDA_USE_EVENT_TYPE)) {
+				// Add code into ()
 			{
 				if ($labeltype)
 				{
 					$libelle .= (preg_match('/'.preg_quote($labeltype, '/').'/', $libelle) ? '' : ' ('.$langs->transnoentities("Action".$this->type_code).')');
+			}
 				}
 			}
 		}
 
 		$result .= $linkstart;
-		if ($withpicto)	$result .= img_object(($notooltip ? '' : $langs->trans("ShowAction").': '.$libelle), ($overwritepicto ? $overwritepicto : 'action'), (($this->type_color && $overwritepicto) ? 'style="color: #'.$this->type_color.' !important;" ' : '').($notooltip ? 'class="'.(($withpicto != 2) ? 'paddingright ' : '').'"' : 'class="'.(($withpicto != 2) ? 'paddingright ' : '').'classfortooltip"'), 0, 0, $notooltip ? 0 : 1);
+		if ($withpicto) {
+			$result .= img_object(($notooltip ? '' : $langs->trans("ShowAction").': '.$libelle), ($overwritepicto ? $overwritepicto : 'action'), (($this->type_color && $overwritepicto) ? 'style="color: #'.$this->type_color.' !important;" ' : '').($notooltip ? 'class="'.(($withpicto != 2) ? 'paddingright ' : '').'"' : 'class="'.(($withpicto != 2) ? 'paddingright ' : '').'classfortooltip"'), 0, 0, $notooltip ? 0 : 1);
+		}
 		$result .= $libelleshort;
 		$result .= $linkend;
 
@@ -1508,8 +1667,11 @@ 
 		$hookmanager->initHooks(array('actiondao'));
 		$parameters = array('id'=>$this->id, 'getnomurl'=>$result);
 		$reshook = $hookmanager->executeHooks('getNomUrl', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks
-		if ($reshook > 0) $result = $hookmanager->resPrint;
-		else $result .= $hookmanager->resPrint;
+		if ($reshook > 0) {
+			$result = $hookmanager->resPrint;
+		} else {
+			$result .= $hookmanager->resPrint;
+		}
 
 		return $result;
 	}
@@ -1533,19 +1695,31 @@ 
 			if ($this->type_picto) {
 				$imgpicto = img_picto('', $this->type_picto, 'class="paddingright"');
 			} else {
-				if ($this->type_code == 'AC_RDV')         $imgpicto = img_picto('', 'meeting', $color, false, 0, 0, '', 'paddingright');
-				elseif ($this->type_code == 'AC_TEL')     $imgpicto = img_picto('', 'object_phoning', $color, false, 0, 0, '', 'paddingright');
-				elseif ($this->type_code == 'AC_FAX')     $imgpicto = img_picto('', 'object_phoning_fax', $color, false, 0, 0, '', 'paddingright');
-				elseif ($this->type_code == 'AC_EMAIL' || $this->type_code == 'AC_EMAIL_IN')   $imgpicto = img_picto('', 'object_email', $color, false, 0, 0, '', 'paddingright');
-				elseif ($this->type_code == 'AC_INT')     $imgpicto = img_picto('', 'object_intervention', $color, false, 0, 0, '', 'paddingright');
-				elseif ($this->type_code == 'AC_OTH' && $this->code == 'TICKET_MSG') $imgpicto = img_picto('', 'object_conversation', $color, false, 0, 0, '', 'paddingright');
-				elseif ($this->type != 'systemauto') $imgpicto = img_picto('', 'user-cog', $color, false, 0, 0, '', 'paddingright');
-				else $imgpicto = img_picto('', 'cog', $color, false, 0, 0, '', 'paddingright');
+				if ($this->type_code == 'AC_RDV') {
+					$imgpicto = img_picto('', 'meeting', $color, false, 0, 0, '', 'paddingright');
+				} elseif ($this->type_code == 'AC_TEL') {
+					$imgpicto = img_picto('', 'object_phoning', $color, false, 0, 0, '', 'paddingright');
+				} elseif ($this->type_code == 'AC_FAX') {
+					$imgpicto = img_picto('', 'object_phoning_fax', $color, false, 0, 0, '', 'paddingright');
+				} elseif ($this->type_code == 'AC_EMAIL' || $this->type_code == 'AC_EMAIL_IN') {
+					$imgpicto = img_picto('', 'object_email', $color, false, 0, 0, '', 'paddingright');
+				} elseif ($this->type_code == 'AC_INT') {
+					$imgpicto = img_picto('', 'object_intervention', $color, false, 0, 0, '', 'paddingright');
+				} elseif ($this->type_code == 'AC_OTH' && $this->code == 'TICKET_MSG') {
+					$imgpicto = img_picto('', 'object_conversation', $color, false, 0, 0, '', 'paddingright');
+				} elseif ($this->type != 'systemauto') {
+					$imgpicto = img_picto('', 'user-cog', $color, false, 0, 0, '', 'paddingright');
+				} else {
+					$imgpicto = img_picto('', 'cog', $color, false, 0, 0, '', 'paddingright');
+				}
 			}
 		} else {
 			// 2 picto: 1 for auto, 1 for manual
-			if ($this->type != 'systemauto') $imgpicto = img_picto('', 'user-cog', '', false, 0, 0, '', 'paddingright');
-			else $imgpicto = img_picto('', 'cog', '', false, 0, 0, '', 'paddingright');
+			if ($this->type != 'systemauto') {
+				$imgpicto = img_picto('', 'user-cog', '', false, 0, 0, '', 'paddingright');
+			} else {
+				$imgpicto = img_picto('', 'cog', '', false, 0, 0, '', 'paddingright');
+			}
 		}
 		return $imgpicto;
 	}
@@ -1622,13 +1796,17 @@ 
 		dol_syslog(get_class($this)."::build_exportfile Build export file format=".$format.", type=".$type.", cachedelay=".$cachedelay.", filename=".$filename.", filters size=".count($filters), LOG_DEBUG);
 
 		// Check parameters
-		if (empty($format)) return -1;
+		if (empty($format)) {
+			return -1;
+		}
 
 		// Clean parameters
 		if (!$filename)
 		{
 			$extension = 'vcs';
-			if ($format == 'ical') $extension = 'ics';
+			if ($format == 'ical') {
+				$extension = 'ics';
+			}
 			$filename = $format.'.'.$extension;
 		}
 
@@ -1683,21 +1861,41 @@ 
 			$sql .= $hookmanager->resPrint;
 
 			// We must filter on assignement table
-			if ($filters['logint']) $sql .= ", ".MAIN_DB_PREFIX."actioncomm_resources as ar";
+			if ($filters['logint']) {
+				$sql .= ", ".MAIN_DB_PREFIX."actioncomm_resources as ar";
+			}
 			$sql .= " WHERE a.fk_action=c.id";
 			$sql .= " AND a.entity IN (".getEntity('agenda').")";
 			foreach ($filters as $key => $value)
 			{
-				if ($key == 'notolderthan' && $value != '') $sql .= " AND a.datep >= '".$this->db->idate($now - ($value * 24 * 60 * 60))."'";
-				if ($key == 'year')         $sql .= " AND a.datep BETWEEN '".$this->db->idate(dol_get_first_day($value, 1))."' AND '".$this->db->idate(dol_get_last_day($value, 12))."'";
-				if ($key == 'id')           $sql .= " AND a.id=".(is_numeric($value) ? $value : 0);
-				if ($key == 'idfrom')       $sql .= " AND a.id >= ".(is_numeric($value) ? $value : 0);
-				if ($key == 'idto')         $sql .= " AND a.id <= ".(is_numeric($value) ? $value : 0);
-				if ($key == 'project')      $sql .= " AND a.fk_project=".(is_numeric($value) ? $value : 0);
-				if ($key == 'actiontype')    $sql .= " AND c.type = '".$this->db->escape($value)."'";
-				if ($key == 'notactiontype') $sql .= " AND c.type <> '".$this->db->escape($value)."'";
+				if ($key == 'notolderthan' && $value != '') {
+					$sql .= " AND a.datep >= '".$this->db->idate($now - ($value * 24 * 60 * 60))."'";
+				}
+				if ($key == 'year') {
+					$sql .= " AND a.datep BETWEEN '".$this->db->idate(dol_get_first_day($value, 1))."' AND '".$this->db->idate(dol_get_last_day($value, 12))."'";
+				}
+				if ($key == 'id') {
+					$sql .= " AND a.id=".(is_numeric($value) ? $value : 0);
+				}
+				if ($key == 'idfrom') {
+					$sql .= " AND a.id >= ".(is_numeric($value) ? $value : 0);
+				}
+				if ($key == 'idto') {
+					$sql .= " AND a.id <= ".(is_numeric($value) ? $value : 0);
+				}
+				if ($key == 'project') {
+					$sql .= " AND a.fk_project=".(is_numeric($value) ? $value : 0);
+				}
+				if ($key == 'actiontype') {
+					$sql .= " AND c.type = '".$this->db->escape($value)."'";
+				}
+				if ($key == 'notactiontype') {
+					$sql .= " AND c.type <> '".$this->db->escape($value)."'";
+				}
 				// We must filter on assignement table
-				if ($key == 'logint')       $sql .= " AND ar.fk_actioncomm = a.id AND ar.element_type='user'";
+				if ($key == 'logint') {
+					$sql .= " AND ar.fk_actioncomm = a.id AND ar.element_type='user'";
+				}
 				if ($key == 'logina')
 				{
 					$logina = $value;
@@ -1709,8 +1907,11 @@ 
 					}
 					$userforfilter = new User($this->db);
 					$result = $userforfilter->fetch('', $logina);
-					if ($result > 0) $sql .= " AND a.fk_user_author ".$condition." ".$userforfilter->id;
-					elseif ($result < 0 || $condition == '=') $sql .= " AND a.fk_user_author = 0";
+					if ($result > 0) {
+						$sql .= " AND a.fk_user_author ".$condition." ".$userforfilter->id;
+					} elseif ($result < 0 || $condition == '=') {
+						$sql .= " AND a.fk_user_author = 0";
+					}
 				}
 				if ($key == 'logint')
 				{
@@ -1723,8 +1924,11 @@ 
 					}
 					$userforfilter = new User($this->db);
 					$result = $userforfilter->fetch('', $logint);
-					if ($result > 0) $sql .= " AND ar.fk_element = ".$userforfilter->id;
-					elseif ($result < 0 || $condition == '=') $sql .= " AND ar.fk_element = 0";
+					if ($result > 0) {
+						$sql .= " AND ar.fk_element = ".$userforfilter->id;
+					} elseif ($result < 0 || $condition == '=') {
+						$sql .= " AND ar.fk_element = 0";
+					}
 				}
 			}
 
@@ -1904,10 +2108,18 @@ 
 
 			// Define title and desc
 			$more = '';
-			if ($login)  $more = $langs->transnoentities("User").' '.$login;
-			if ($logina) $more = $langs->transnoentities("ActionsAskedBy").' '.$logina;
-			if ($logint) $more = $langs->transnoentities("ActionsToDoBy").' '.$logint;
-			if ($logind) $more = $langs->transnoentities("ActionsDoneBy").' '.$logind;
+			if ($login) {
+				$more = $langs->transnoentities("User").' '.$login;
+			}
+			if ($logina) {
+				$more = $langs->transnoentities("ActionsAskedBy").' '.$logina;
+			}
+			if ($logint) {
+				$more = $langs->transnoentities("ActionsToDoBy").' '.$logint;
+			}
+			if ($logind) {
+				$more = $langs->transnoentities("ActionsDoneBy").' '.$logind;
+			}
 			if ($more)
 			{
 				$title = 'Dolibarr actions '.$mysoc->name.' - '.$more;
@@ -1924,14 +2136,19 @@ 
 			@chmod($outputfiletmp, octdec($conf->global->MAIN_UMASK));
 
 			// Write file
-			if ($format == 'vcal') $result = build_calfile($format, $title, $desc, $eventarray, $outputfiletmp);
-			elseif ($format == 'ical') $result = build_calfile($format, $title, $desc, $eventarray, $outputfiletmp);
-			elseif ($format == 'rss')  $result = build_rssfile($format, $title, $desc, $eventarray, $outputfiletmp);
+			if ($format == 'vcal') {
+				$result = build_calfile($format, $title, $desc, $eventarray, $outputfiletmp);
+			} elseif ($format == 'ical') {
+				$result = build_calfile($format, $title, $desc, $eventarray, $outputfiletmp);
+			} elseif ($format == 'rss') {
+				$result = build_rssfile($format, $title, $desc, $eventarray, $outputfiletmp);
+			}
 
 			if ($result >= 0)
 			{
-				if (dol_move($outputfiletmp, $outputfile, 0, 1)) $result = 1;
-				else {
+				if (dol_move($outputfiletmp, $outputfile, 0, 1)) {
+					$result = 1;
+				} else {
 					$this->error = 'Failed to rename '.$outputfiletmp.' into '.$outputfile;
 					dol_syslog(get_class($this)."::build_exportfile ".$this->error, LOG_ERR);
 					dol_delete_file($outputfiletmp, 0, 1);
@@ -2046,8 +2263,12 @@ 
 		if ($fk_user > 0) {
 			$sql .= " AND fk_user = ".((int) $fk_user);
 		}
-		if (empty($conf->global->AGENDA_REMINDER_EMAIL)) $sql .= " AND typeremind != 'email'";
-		if (empty($conf->global->AGENDA_REMINDER_BROWSER)) $sql .= " AND typeremind != 'browser'";
+		if (empty($conf->global->AGENDA_REMINDER_EMAIL)) {
+			$sql .= " AND typeremind != 'email'";
+		}
+		if (empty($conf->global->AGENDA_REMINDER_BROWSER)) {
+			$sql .= " AND typeremind != 'browser'";
+		}
 
 		$sql .= $this->db->order("dateremind", "ASC");
 		$resql = $this->db->query($sql);
@@ -2090,9 +2311,11 @@ 
 		$nbMailSend = 0;
 		$errorsMsg = array();
 
-		if (empty($conf->agenda->enabled))	// Should not happen. If module disabled, cron job should not be visible.
+		if (empty($conf->agenda->enabled)) {
+			// Should not happen. If module disabled, cron job should not be visible.
 		{
 			$langs->load("agenda");
+		}
 			$this->output = $langs->trans('ModuleNotEnabled', $langs->transnoentitiesnoconv("Agenda"));
 			return 0;
 		}

htdocs/comm/action/class/cactioncomm.class.php

Braces +50 added lines, -18 removed lines

@@ -106,8 +106,11 @@ 
 	{
 		$sql = "SELECT id, code, type, libelle as label, color, active, picto";
 		$sql .= " FROM ".MAIN_DB_PREFIX."c_actioncomm";
-		if (is_numeric($id)) $sql .= " WHERE id=".(int) $id;
-		else $sql .= " WHERE code='".$this->db->escape($id)."'";
+		if (is_numeric($id)) {
+			$sql .= " WHERE id=".(int) $id;
+		} else {
+			$sql .= " WHERE code='".$this->db->escape($id)."'";
+		}
 
 		dol_syslog(get_class($this)."::fetch", LOG_DEBUG);
 		$resql = $this->db->query($sql);
@@ -165,8 +168,12 @@ 
 		if ($active != '') {
 			$sql .= " AND active=".(int) $active;
 		}
-		if (!empty($excludetype)) $sql .= " AND type <> '".$this->db->escape($excludetype)."'";
-		if ($morefilter) $sql .= " AND ".$morefilter;
+		if (!empty($excludetype)) {
+			$sql .= " AND type <> '".$this->db->escape($excludetype)."'";
+		}
+		if ($morefilter) {
+			$sql .= " AND ".$morefilter;
+		}
 		$sql .= " ORDER BY type, position, module";
 
 		dol_syslog(get_class($this)."::liste_array", LOG_DEBUG);
@@ -185,16 +192,31 @@ 
 					$qualified = 1;
 
 					// $obj->type can be system, systemauto, module, moduleauto, xxx, xxxauto
-					if ($qualified && $onlyautoornot > 0 && preg_match('/^system/', $obj->type) && !preg_match('/^AC_OTH/', $obj->code)) $qualified = 0; // We discard detailed system events. We keep only the 2 generic lines (AC_OTH and AC_OTH_AUTO)
+					if ($qualified && $onlyautoornot > 0 && preg_match('/^system/', $obj->type) && !preg_match('/^AC_OTH/', $obj->code)) {
+						$qualified = 0;
+					}
+					// We discard detailed system events. We keep only the 2 generic lines (AC_OTH and AC_OTH_AUTO)
 
 					if ($qualified && $obj->module)
 					{
-						if ($obj->module == 'invoice' && !$conf->facture->enabled)	$qualified = 0;
-						if ($obj->module == 'order' && !$conf->commande->enabled) $qualified = 0;
-						if ($obj->module == 'propal' && !$conf->propal->enabled)	  $qualified = 0;
-						if ($obj->module == 'invoice_supplier' && ((!empty($conf->fournisseur->enabled) && empty($conf->global->MAIN_USE_NEW_SUPPLIERMOD)) || !$conf->supplier_invoice->enabled))	$qualified = 0;
-						if ($obj->module == 'order_supplier' && ((!empty($conf->fournisseur->enabled) && empty($conf->global->MAIN_USE_NEW_SUPPLIERMOD)) || !$conf->supplier_order->enabled))	$qualified = 0;
-						if ($obj->module == 'shipping' && !$conf->expedition->enabled)	 $qualified = 0;
+						if ($obj->module == 'invoice' && !$conf->facture->enabled) {
+							$qualified = 0;
+						}
+						if ($obj->module == 'order' && !$conf->commande->enabled) {
+							$qualified = 0;
+						}
+						if ($obj->module == 'propal' && !$conf->propal->enabled) {
+							$qualified = 0;
+						}
+						if ($obj->module == 'invoice_supplier' && ((!empty($conf->fournisseur->enabled) && empty($conf->global->MAIN_USE_NEW_SUPPLIERMOD)) || !$conf->supplier_invoice->enabled)) {
+							$qualified = 0;
+						}
+						if ($obj->module == 'order_supplier' && ((!empty($conf->fournisseur->enabled) && empty($conf->global->MAIN_USE_NEW_SUPPLIERMOD)) || !$conf->supplier_order->enabled)) {
+							$qualified = 0;
+						}
+						if ($obj->module == 'shipping' && !$conf->expedition->enabled) {
+							$qualified = 0;
+						}
 					}
 
 					if ($qualified)
@@ -204,9 +226,13 @@ 
 						$code = $obj->code;
 						$typecalendar = $obj->type;
 
-						if ($onlyautoornot > 0 && $typecalendar == 'system') $code = 'AC_MANUAL';
-						elseif ($onlyautoornot > 0 && $typecalendar == 'systemauto') $code = 'AC_AUTO';
-						elseif ($onlyautoornot > 0) $code = 'AC_'.strtoupper($obj->module);
+						if ($onlyautoornot > 0 && $typecalendar == 'system') {
+							$code = 'AC_MANUAL';
+						} elseif ($onlyautoornot > 0 && $typecalendar == 'systemauto') {
+							$code = 'AC_AUTO';
+						} elseif ($onlyautoornot > 0) {
+							$code = 'AC_'.strtoupper($obj->module);
+						}
 
 						if ($shortlabel)
 						{
@@ -252,9 +278,13 @@ 
 				}
 			}
 
-			if ($idorcode == 'id') $this->liste_array = $repid;
-			elseif ($idorcode == 'code') $this->liste_array = $repcode;
-			else $this->liste_array = $repall;
+			if ($idorcode == 'id') {
+				$this->liste_array = $repid;
+			} elseif ($idorcode == 'code') {
+				$this->liste_array = $repcode;
+			} else {
+				$this->liste_array = $repall;
+			}
 
 			return $this->liste_array;
 		} else {
@@ -276,6 +306,8 @@ 
 
 		// Check if translation available
 		$transcode = $langs->trans("Action".$this->code);
-		if ($transcode != "Action".$this->code) return $transcode;
+		if ($transcode != "Action".$this->code) {
+			return $transcode;
+		}
 	}
 }

htdocs/comm/action/peruser.php

Braces +345 added lines, -123 removed lines

@@ -39,7 +39,9 @@ 
 require_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php';
 
 
-if (!isset($conf->global->AGENDA_MAX_EVENTS_DAY_VIEW)) $conf->global->AGENDA_MAX_EVENTS_DAY_VIEW = 3;
+if (!isset($conf->global->AGENDA_MAX_EVENTS_DAY_VIEW)) {
+	$conf->global->AGENDA_MAX_EVENTS_DAY_VIEW = 3;
+}
 
 $filter = GETPOST("search_filter", 'alpha', 3) ? GETPOST("search_filter", 'alpha', 3) : GETPOST("filter", 'alpha', 3);
 $filtert = GETPOST("search_filtert", "int", 3) ? GETPOST("search_filtert", "int", 3) : GETPOST("filtert", "int", 3);
@@ -60,22 +62,36 @@ 
 if (empty($page) || $page == -1) { $page = 0; }     // If $page is not defined, or '' or -1
 $limit = GETPOST('limit', 'int') ?GETPOST('limit', 'int') : $conf->liste_limit;
 $offset = $limit * $page;
-if (!$sortorder) $sortorder = "ASC";
-if (!$sortfield) $sortfield = "a.datec";
+if (!$sortorder) {
+	$sortorder = "ASC";
+}
+if (!$sortfield) {
+	$sortfield = "a.datec";
+}
 
 // Security check
 $socid = GETPOST("search_socid", "int") ?GETPOST("search_socid", "int") : GETPOST("socid", "int");
-if ($user->socid) $socid = $user->socid;
+if ($user->socid) {
+	$socid = $user->socid;
+}
 $result = restrictedArea($user, 'agenda', 0, '', 'myactions');
-if ($socid < 0) $socid = '';
+if ($socid < 0) {
+	$socid = '';
+}
 
 $canedit = 1;
-if (!$user->rights->agenda->myactions->read) accessforbidden();
-if (!$user->rights->agenda->allactions->read) $canedit = 0;
-if (!$user->rights->agenda->allactions->read || $filter == 'mine')  // If no permission to see all, we show only affected to me
+if (!$user->rights->agenda->myactions->read) {
+	accessforbidden();
+}
+if (!$user->rights->agenda->allactions->read) {
+	$canedit = 0;
+}
+if (!$user->rights->agenda->allactions->read || $filter == 'mine') {
+	// If no permission to see all, we show only affected to me
 {
 	$filtert = $user->id;
 }
+}
 
 //$action=GETPOST('action','alpha');
 $action = 'show_peruser'; //We use 'show_week' mode
@@ -93,11 +109,15 @@ 
 if (GETPOST('search_actioncode', 'array'))
 {
 	$actioncode = GETPOST('search_actioncode', 'array', 3);
-	if (!count($actioncode)) $actioncode = '0';
-} else {
+	if (!count($actioncode)) {
+		$actioncode = '0';
+	}
+	} else {
 	$actioncode = GETPOST("search_actioncode", "alpha", 3) ?GETPOST("search_actioncode", "alpha", 3) : (GETPOST("search_actioncode", "alpha") == '0' ? '0' : (empty($conf->global->AGENDA_DEFAULT_FILTER_TYPE) ? '' : $conf->global->AGENDA_DEFAULT_FILTER_TYPE));
 }
-if ($actioncode == '' && empty($actioncodearray)) $actioncode = (empty($conf->global->AGENDA_DEFAULT_FILTER_TYPE) ? '' : $conf->global->AGENDA_DEFAULT_FILTER_TYPE);
+if ($actioncode == '' && empty($actioncodearray)) {
+	$actioncode = (empty($conf->global->AGENDA_DEFAULT_FILTER_TYPE) ? '' : $conf->global->AGENDA_DEFAULT_FILTER_TYPE);
+}
 
 $dateselect = dol_mktime(0, 0, 0, GETPOST('dateselectmonth', 'int'), GETPOST('dateselectday', 'int'), GETPOST('dateselectyear', 'int'));
 if ($dateselect > 0)
@@ -112,21 +132,37 @@ 
 $tmparray = explode('-', $tmp);
 $begin_h = GETPOST('begin_h', 'int') != '' ? GETPOST('begin_h', 'int') : ($tmparray[0] != '' ? $tmparray[0] : 9);
 $end_h   = GETPOST('end_h', 'int') ? GETPOST('end_h', 'int') : ($tmparray[1] != '' ? $tmparray[1] : 18);
-if ($begin_h < 0 || $begin_h > 23) $begin_h = 9;
-if ($end_h < 1 || $end_h > 24) $end_h = 18;
-if ($end_h <= $begin_h) $end_h = $begin_h + 1;
+if ($begin_h < 0 || $begin_h > 23) {
+	$begin_h = 9;
+}
+if ($end_h < 1 || $end_h > 24) {
+	$end_h = 18;
+}
+if ($end_h <= $begin_h) {
+	$end_h = $begin_h + 1;
+}
 
 $tmp = empty($conf->global->MAIN_DEFAULT_WORKING_DAYS) ? '1-5' : $conf->global->MAIN_DEFAULT_WORKING_DAYS;
 $tmp = str_replace(' ', '', $tmp); // FIX 7533
 $tmparray = explode('-', $tmp);
 $begin_d = GETPOST('begin_d', 'int') ?GETPOST('begin_d', 'int') : ($tmparray[0] != '' ? $tmparray[0] : 1);
 $end_d   = GETPOST('end_d', 'int') ?GETPOST('end_d', 'int') : ($tmparray[1] != '' ? $tmparray[1] : 5);
-if ($begin_d < 1 || $begin_d > 7) $begin_d = 1;
-if ($end_d < 1 || $end_d > 7) $end_d = 7;
-if ($end_d < $begin_d) $end_d = $begin_d + 1;
+if ($begin_d < 1 || $begin_d > 7) {
+	$begin_d = 1;
+}
+if ($end_d < 1 || $end_d > 7) {
+	$end_d = 7;
+}
+if ($end_d < $begin_d) {
+	$end_d = $begin_d + 1;
+}
 
-if ($status == '' && !GETPOSTISSET('status')) $status = (empty($conf->global->AGENDA_DEFAULT_FILTER_STATUS) ? '' : $conf->global->AGENDA_DEFAULT_FILTER_STATUS);
-if (empty($action) && !GETPOSTISSET('action')) $action = (empty($conf->global->AGENDA_DEFAULT_VIEW) ? 'show_month' : $conf->global->AGENDA_DEFAULT_VIEW);
+if ($status == '' && !GETPOSTISSET('status')) {
+	$status = (empty($conf->global->AGENDA_DEFAULT_FILTER_STATUS) ? '' : $conf->global->AGENDA_DEFAULT_FILTER_STATUS);
+}
+if (empty($action) && !GETPOSTISSET('action')) {
+	$action = (empty($conf->global->AGENDA_DEFAULT_VIEW) ? 'show_month' : $conf->global->AGENDA_DEFAULT_VIEW);
+}
 
 if (GETPOST('viewcal', 'alpha') && $action != 'show_day' && $action != 'show_week' && $action != 'show_peruser') {
 	$action = 'show_month'; $day = '';
@@ -185,7 +221,9 @@ 
 	'usergroup' => $usergroup,
 );
 $reshook = $hookmanager->executeHooks('beforeAgendaPerUser', $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');
+}
 
 $form = new Form($db);
 $companystatic = new Societe($db);
@@ -223,29 +261,65 @@ 
 //print 'xx'.$next_year.'-'.$next_month.'-'.$next_day;
 
 $title = $langs->trans("DoneAndToDoActions");
-if ($status == 'done') $title = $langs->trans("DoneActions");
-if ($status == 'todo') $title = $langs->trans("ToDoActions");
+if ($status == 'done') {
+	$title = $langs->trans("DoneActions");
+}
+if ($status == 'todo') {
+	$title = $langs->trans("ToDoActions");
+}
 
 $param = '';
 if ($actioncode || GETPOSTISSET('search_actioncode')) {
 	if (is_array($actioncode)) {
-		foreach ($actioncode as $str_action) $param .= "&search_actioncode[]=".urlencode($str_action);
-	} else $param .= "&search_actioncode=".urlencode($actioncode);
+		foreach ($actioncode as $str_action) {
+			$param .= "&search_actioncode[]=".urlencode($str_action);
+		}
+	} else {
+		$param .= "&search_actioncode=".urlencode($actioncode);
+	}
+	}
+if ($resourceid > 0) {
+	$param .= "&search_resourceid=".urlencode($resourceid);
+}
+if ($status || GETPOSTISSET('status')) {
+	$param .= "&search_status=".urlencode($status);
+}
+if ($filter) {
+	$param .= "&search_filter=".urlencode($filter);
+}
+if ($filtert) {
+	$param .= "&search_filtert=".urlencode($filtert);
+}
+if ($usergroup > 0) {
+	$param .= "&search_usergroup=".urlencode($usergroup);
+}
+if ($socid > 0) {
+	$param .= "&search_socid=".urlencode($socid);
+}
+if ($showbirthday) {
+	$param .= "&search_showbirthday=1";
+}
+if ($pid) {
+	$param .= "&search_projectid=".urlencode($pid);
+}
+if ($type) {
+	$param .= "&search_type=".urlencode($type);
+}
+if ($action == 'show_day' || $action == 'show_week' || $action == 'show_month' || $action != 'show_peruser') {
+	$param .= '&action='.urlencode($action);
+}
+if ($begin_h != '') {
+	$param .= '&begin_h='.urlencode($begin_h);
+}
+if ($end_h != '') {
+	$param .= '&end_h='.urlencode($end_h);
+}
+if ($begin_d != '') {
+	$param .= '&begin_d='.urlencode($begin_d);
+}
+if ($end_d != '') {
+	$param .= '&end_d='.urlencode($end_d);
 }
-if ($resourceid > 0) $param .= "&search_resourceid=".urlencode($resourceid);
-if ($status || GETPOSTISSET('status')) $param .= "&search_status=".urlencode($status);
-if ($filter)        $param .= "&search_filter=".urlencode($filter);
-if ($filtert)       $param .= "&search_filtert=".urlencode($filtert);
-if ($usergroup > 0) $param .= "&search_usergroup=".urlencode($usergroup);
-if ($socid > 0)     $param .= "&search_socid=".urlencode($socid);
-if ($showbirthday)  $param .= "&search_showbirthday=1";
-if ($pid)           $param .= "&search_projectid=".urlencode($pid);
-if ($type)          $param .= "&search_type=".urlencode($type);
-if ($action == 'show_day' || $action == 'show_week' || $action == 'show_month' || $action != 'show_peruser') $param .= '&action='.urlencode($action);
-if ($begin_h != '') $param .= '&begin_h='.urlencode($begin_h);
-if ($end_h != '')   $param .= '&end_h='.urlencode($end_h);
-if ($begin_d != '') $param .= '&begin_d='.urlencode($begin_d);
-if ($end_d != '')   $param .= '&end_d='.urlencode($end_d);
 $param .= "&maxprint=".urlencode($maxprint);
 
 $paramnoactionodate = $param;
@@ -406,10 +480,18 @@ 
 	$tmpforcreatebutton = dol_getdate(dol_now(), true);
 
 	$newparam .= '&month='.urlencode(str_pad($month, 2, "0", STR_PAD_LEFT)).'&year='.urlencode($tmpforcreatebutton['year']);
-	if ($begin_h !== '') $newparam .= '&begin_h='.urlencode($begin_h);
-	if ($end_h !== '') $newparam .= '&end_h='.urlencode($end_h);
-	if ($begin_d !== '') $newparam .= '&begin_d='.urlencode($begin_d);
-	if ($end_d !== '') $newparam .= '&end_d='.urlencode($end_d);
+	if ($begin_h !== '') {
+		$newparam .= '&begin_h='.urlencode($begin_h);
+	}
+	if ($end_h !== '') {
+		$newparam .= '&end_h='.urlencode($end_h);
+	}
+	if ($begin_d !== '') {
+		$newparam .= '&begin_d='.urlencode($begin_d);
+	}
+	if ($end_d !== '') {
+		$newparam .= '&end_d='.urlencode($end_d);
+	}
 
 	//$param='month='.$monthshown.'&year='.$year;
 	$hourminsec = '100000';
@@ -442,7 +524,9 @@ 
 
 // DEFAULT CALENDAR + AUTOEVENT CALENDAR + CONFERENCEBOOTH CALENDAR
 $sql = 'SELECT';
-if ($usergroup > 0) $sql .= " DISTINCT";
+if ($usergroup > 0) {
+	$sql .= " DISTINCT";
+}
 $sql .= ' a.id, a.label,';
 $sql .= ' a.datep,';
 $sql .= ' a.datep2,';
@@ -452,12 +536,20 @@ 
 $sql .= ' a.fk_soc, a.fk_contact, a.fk_element, a.elementtype, a.fk_project,';
 $sql .= ' ca.code, ca.libelle as type_label, ca.color, ca.type as type_type, ca.picto as type_picto';
 $sql .= ' FROM '.MAIN_DB_PREFIX.'c_actioncomm as ca, '.MAIN_DB_PREFIX."actioncomm as a";
-if (!$user->rights->societe->client->voir && !$socid) $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."societe_commerciaux as sc ON a.fk_soc = sc.fk_soc";
+if (!$user->rights->societe->client->voir && !$socid) {
+	$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."societe_commerciaux as sc ON a.fk_soc = sc.fk_soc";
+}
 // We must filter on resource table
-if ($resourceid > 0) $sql .= ", ".MAIN_DB_PREFIX."element_resources as r";
+if ($resourceid > 0) {
+	$sql .= ", ".MAIN_DB_PREFIX."element_resources as r";
+}
 // We must filter on assignement table
-if ($filtert > 0 || $usergroup > 0) $sql .= ", ".MAIN_DB_PREFIX."actioncomm_resources as ar";
-if ($usergroup > 0) $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."usergroup_user as ugu ON ugu.fk_user = ar.fk_element";
+if ($filtert > 0 || $usergroup > 0) {
+	$sql .= ", ".MAIN_DB_PREFIX."actioncomm_resources as ar";
+}
+if ($usergroup > 0) {
+	$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."usergroup_user as ugu ON ugu.fk_user = ar.fk_element";
+}
 $sql .= ' WHERE a.fk_action = ca.id';
 $sql .= ' AND a.entity IN ('.getEntity('agenda').')';
 // Condition on actioncode
@@ -465,16 +557,24 @@ 
 {
 	if (empty($conf->global->AGENDA_USE_EVENT_TYPE))
 	{
-		if ($actioncode == 'AC_NON_AUTO') $sql .= " AND ca.type != 'systemauto'";
-		elseif ($actioncode == 'AC_ALL_AUTO') $sql .= " AND ca.type = 'systemauto'";
-		else {
-			if ($actioncode == 'AC_OTH') $sql .= " AND ca.type != 'systemauto'";
-			if ($actioncode == 'AC_OTH_AUTO') $sql .= " AND ca.type = 'systemauto'";
+		if ($actioncode == 'AC_NON_AUTO') {
+			$sql .= " AND ca.type != 'systemauto'";
+		} elseif ($actioncode == 'AC_ALL_AUTO') {
+			$sql .= " AND ca.type = 'systemauto'";
+		} else {
+			if ($actioncode == 'AC_OTH') {
+				$sql .= " AND ca.type != 'systemauto'";
+			}
+			if ($actioncode == 'AC_OTH_AUTO') {
+				$sql .= " AND ca.type = 'systemauto'";
+			}
 		}
 	} else {
-		if ($actioncode == 'AC_NON_AUTO') $sql .= " AND ca.type != 'systemauto'";
-		elseif ($actioncode == 'AC_ALL_AUTO') $sql .= " AND ca.type = 'systemauto'";
-		else {
+		if ($actioncode == 'AC_NON_AUTO') {
+			$sql .= " AND ca.type != 'systemauto'";
+		} elseif ($actioncode == 'AC_ALL_AUTO') {
+			$sql .= " AND ca.type = 'systemauto'";
+		} else {
 			if (is_array($actioncode))
 			{
   				$sql .= " AND ca.code IN ('".implode("','", $actioncode)."')";
@@ -484,12 +584,22 @@ 
 		}
 	}
 }
-if ($resourceid > 0) $sql .= " AND r.element_type = 'action' AND r.element_id = a.id AND r.resource_id = ".$db->escape($resourceid);
-if ($pid) $sql .= " AND a.fk_project=".$db->escape($pid);
-if (!$user->rights->societe->client->voir && !$socid) $sql .= " AND (a.fk_soc IS NULL OR sc.fk_user = ".$user->id.")";
-if ($socid > 0) $sql .= ' AND a.fk_soc = '.$socid;
+if ($resourceid > 0) {
+	$sql .= " AND r.element_type = 'action' AND r.element_id = a.id AND r.resource_id = ".$db->escape($resourceid);
+}
+if ($pid) {
+	$sql .= " AND a.fk_project=".$db->escape($pid);
+}
+if (!$user->rights->societe->client->voir && !$socid) {
+	$sql .= " AND (a.fk_soc IS NULL OR sc.fk_user = ".$user->id.")";
+}
+if ($socid > 0) {
+	$sql .= ' AND a.fk_soc = '.$socid;
+}
 // We must filter on assignement table
-if ($filtert > 0 || $usergroup > 0) $sql .= " AND ar.fk_actioncomm = a.id AND ar.element_type='user'";
+if ($filtert > 0 || $usergroup > 0) {
+	$sql .= " AND ar.fk_actioncomm = a.id AND ar.element_type='user'";
+}
 if ($action == 'show_day')
 {
 	$sql .= " AND (";
@@ -515,7 +625,9 @@ 
 	$sql .= " AND a.datep2 > '".$db->idate($lastdaytoshow + (60 * 60 * 24 * 2))."')";
 	$sql .= ')';
 }
-if ($type) $sql .= " AND ca.id = ".$type;
+if ($type) {
+	$sql .= " AND ca.id = ".$type;
+}
 if ($status == '0') { $sql .= " AND a.percent = 0"; }
 if ($status == '-1') { $sql .= " AND a.percent = -1"; }	// Not applicable
 if ($status == '50') { $sql .= " AND (a.percent > 0 AND a.percent < 100)"; }	// Running already started
@@ -525,8 +637,12 @@ 
 if ($filtert > 0 || $usergroup > 0)
 {
 	$sql .= " AND (";
-	if ($filtert > 0) $sql .= "ar.fk_element = ".$filtert;
-	if ($usergroup > 0) $sql .= ($filtert > 0 ? " OR " : "")." ugu.fk_usergroup = ".$usergroup;
+	if ($filtert > 0) {
+		$sql .= "ar.fk_element = ".$filtert;
+	}
+	if ($usergroup > 0) {
+		$sql .= ($filtert > 0 ? " OR " : "")." ugu.fk_usergroup = ".$usergroup;
+	}
 	$sql .= ")";
 }
 // Sort on date
@@ -583,12 +699,18 @@ 
 		if ($event->percentage <= 0)
 		{
 			$event->date_start_in_calendar = $datep;
-			if ($datep2 != '' && $datep2 >= $datep) $event->date_end_in_calendar = $datep2;
-			else $event->date_end_in_calendar = $datep;
+			if ($datep2 != '' && $datep2 >= $datep) {
+				$event->date_end_in_calendar = $datep2;
+			} else {
+				$event->date_end_in_calendar = $datep;
+			}
 		} else {
 			$event->date_start_in_calendar = $datep;
-			if ($datep2 != '' && $datep2 >= $datep) $event->date_end_in_calendar = $datep2;
-			else $event->date_end_in_calendar = $datep;
+			if ($datep2 != '' && $datep2 >= $datep) {
+				$event->date_end_in_calendar = $datep2;
+			} else {
+				$event->date_end_in_calendar = $datep;
+			}
 		}
 		// Define ponctual property
 		if ($event->date_start_in_calendar == $event->date_end_in_calendar)
@@ -606,8 +728,12 @@ 
 			//print $i.' - '.dol_print_date($this->date_start_in_calendar, 'dayhour').' - '.dol_print_date($this->date_end_in_calendar, 'dayhour').'<br>'."\n";
 			$event->fetch_userassigned(); // This load $event->userassigned
 
-			if ($event->date_start_in_calendar < $firstdaytoshow) $event->date_start_in_calendar = $firstdaytoshow;
-			if ($event->date_end_in_calendar >= $lastdaytoshow) $event->date_end_in_calendar = ($lastdaytoshow - 1);
+			if ($event->date_start_in_calendar < $firstdaytoshow) {
+				$event->date_start_in_calendar = $firstdaytoshow;
+			}
+			if ($event->date_end_in_calendar >= $lastdaytoshow) {
+				$event->date_end_in_calendar = ($lastdaytoshow - 1);
+			}
 
 			// Add an entry in actionarray for each day
 			$daycursor = $event->date_start_in_calendar;
@@ -626,7 +752,9 @@ 
 				$j++;
 
 				$daykey += 60 * 60 * 24;
-				if ($daykey > $event->date_end_in_calendar) $loop = false;
+				if ($daykey > $event->date_end_in_calendar) {
+					$loop = false;
+				}
 			} while ($loop);
 
 			//print 'Event '.$i.' id='.$event->id.' (start='.dol_print_date($event->datep).'-end='.dol_print_date($event->datef);
@@ -650,7 +778,9 @@ 
 {
 	include_once $color_file;
 }
-if (!is_array($theme_datacolor)) $theme_datacolor = array(array(120, 130, 150), array(200, 160, 180), array(190, 190, 220));
+if (!is_array($theme_datacolor)) {
+	$theme_datacolor = array(array(120, 130, 150), array(200, 160, 180), array(190, 190, 220));
+}
 
 
 $newparam = $param; // newparam is for birthday links
@@ -689,10 +819,15 @@ 
 		print '<span class="hideonsmartphone" title="'.$langs->trans("VisibleTimeRange").'">'.$langs->trans("Hours").'</span>';
 		print "\n".'<div class="ui-grid-a inline-block"><div class="ui-block-a nowraponall">';
 		print '<input type="number" class="short" name="begin_h" value="'.$begin_h.'" min="0" max="23">';
-		if (empty($conf->dol_use_jmobile)) print ' - ';
-		else print '</div><div class="ui-block-b">';
+		if (empty($conf->dol_use_jmobile)) {
+			print ' - ';
+		} else {
+			print '</div><div class="ui-block-b">';
+		}
 		print '<input type="number" class="short" name="end_h" value="'.$end_h.'" min="1" max="24">';
-		if (empty($conf->dol_use_jmobile)) print ' '.$langs->trans("H");
+		if (empty($conf->dol_use_jmobile)) {
+			print ' '.$langs->trans("H");
+		}
 		print '</div></div>';
 
 		print '<br>';
@@ -702,8 +837,11 @@ 
 		print '<span class="hideonsmartphone" title="'.$langs->trans("VisibleDaysRange").'">'.$langs->trans("DaysOfWeek").'</span>';
 		print "\n".'<div class="ui-grid-a  inline-block"><div class="ui-block-a">';
 		print '<input type="number" class="short" name="begin_d" value="'.$begin_d.'" min="1" max="7">';
-		if (empty($conf->dol_use_jmobile)) print ' - ';
-		else print '</div><div class="ui-block-b">';
+		if (empty($conf->dol_use_jmobile)) {
+			print ' - ';
+		} else {
+			print '</div><div class="ui-block-b">';
+		}
 		print '<input type="number" class="short" name="end_d" value="'.$end_d.'" min="1" max="7">';
 		print '</div></div>';
 	}
@@ -720,8 +858,11 @@ 
 		echo '<td align="center" colspan="'.($end_h - $begin_h).'">';
 		echo '<span class="bold spandayofweek">'.$langs->trans("Day".(($i + (isset($conf->global->MAIN_START_WEEK) ? $conf->global->MAIN_START_WEEK : 1)) % 7)).'</span>';
 		print "<br>";
-		if ($i) print dol_print_date(dol_time_plus_duree($currentdaytoshow, $i, 'd'), 'day');
-		else print dol_print_date($currentdaytoshow, 'day');
+		if ($i) {
+			print dol_print_date(dol_time_plus_duree($currentdaytoshow, $i, 'd'), 'day');
+		} else {
+			print dol_print_date($currentdaytoshow, 'day');
+		}
 		echo "</td>\n";
 		$i++;
 	}
@@ -763,7 +904,9 @@ 
 				$event->fetch_userassigned();
 				$listofuserid = $event->userassigned;
 				foreach ($listofuserid as $userid => $tmp) {
-				   	if (!in_array($userid, $usernamesid)) $usernamesid[$userid] = $userid;
+				   	if (!in_array($userid, $usernamesid)) {
+				   		$usernamesid[$userid] = $userid;
+				   	}
 				}
 			}
 		}
@@ -771,9 +914,13 @@ 
 		/* Use this list to have for all users */
 		$sql = "SELECT u.rowid, u.lastname as lastname, u.firstname, u.statut, u.login, u.admin, u.entity";
 		$sql .= " FROM ".MAIN_DB_PREFIX."user as u";
-		if ($usergroup > 0)	$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."usergroup_user as ug ON u.rowid = ug.fk_user";
+		if ($usergroup > 0) {
+			$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."usergroup_user as ug ON u.rowid = ug.fk_user";
+		}
 		$sql .= " WHERE u.statut = 1 AND u.entity IN (".getEntity('user').")";
-		if ($usergroup > 0)	$sql .= " AND ug.fk_usergroup = ".$usergroup;
+		if ($usergroup > 0) {
+			$sql .= " AND ug.fk_usergroup = ".$usergroup;
+		}
 		//print $sql;
 		$resql = $db->query($sql);
 		if ($resql) {
@@ -788,7 +935,9 @@ 
 					$i++;
 				}
 			}
-		} else dol_print_error($db);
+		} else {
+			dol_print_error($db);
+		}
 	}
 	//var_dump($usernamesid);
 	foreach ($usernamesid as $id)
@@ -862,10 +1011,16 @@ 
 			//var_dump($curtime.' '.$tmpday.' '.$tmpmonth.' '.$tmpyear);
 
 			$style = 'cal_current_month';
-			if ($iter_day == 6) $style .= ' cal_other_month';
+			if ($iter_day == 6) {
+				$style .= ' cal_other_month';
+			}
 			$today = 0;
-			if ($todayarray['mday'] == $tmpday && $todayarray['mon'] == $tmpmonth && $todayarray['year'] == $tmpyear) $today = 1;
-			if ($today) $style = 'cal_today_peruser';
+			if ($todayarray['mday'] == $tmpday && $todayarray['mon'] == $tmpmonth && $todayarray['year'] == $tmpyear) {
+				$today = 1;
+			}
+			if ($today) {
+				$style = 'cal_today_peruser';
+			}
 
 			show_day_events2($username, $tmpday, $tmpmonth, $tmpyear, 0, $style, $eventarray, 0, $maxnbofchar, $newparam, 1, 300, $showheader, $colorsbytype, $var);
 
@@ -999,7 +1154,8 @@ 
 		$mois =  dol_print_date($daykey, '%m');
 		$jour =  dol_print_date($daykey, '%d');
 
-		if ($day == $jour && $month == $mois && $year == $annee)	// Is it the day we are looking for when calling function ?
+		if ($day == $jour && $month == $mois && $year == $annee) {
+			// Is it the day we are looking for when calling function ?
 		{
 			// Scan all event for this date
 			foreach ($eventarray[$daykey] as $index => $event)
@@ -1008,14 +1164,20 @@ 
 				//var_dump($event);
 
 				$keysofuserassigned = array_keys($event->userassigned);
+		}
 				$ponct = ($event->date_start_in_calendar == $event->date_end_in_calendar);
 
-				if (!in_array($username->id, $keysofuserassigned)) continue; // We discard record if event is from another user than user we want to show
+				if (!in_array($username->id, $keysofuserassigned)) {
+					continue;
+				}
+				// We discard record if event is from another user than user we want to show
 				//if ($username->id != $event->userownerid) continue;	// We discard record if event is from another user than user we want to show
 
 				$parameters = array();
 				$reshook = $hookmanager->executeHooks('formatEvent', $parameters, $event, $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');
+				}
 
 				// Define $color (Hex string like '0088FF') and $cssclass of event
 				$color = -1; $cssclass = ''; $colorindex = -1;
@@ -1032,9 +1194,13 @@ 
 					//var_dump($cacheusers[$event->userownerid]->color);
 
 					// We decide to choose color of owner of event (event->userownerid is user id of owner, event->userassigned contains all users assigned to event)
-					if (!empty($cacheusers[$event->userownerid]->color)) $color = $cacheusers[$event->userownerid]->color;
+					if (!empty($cacheusers[$event->userownerid]->color)) {
+						$color = $cacheusers[$event->userownerid]->color;
+					}
 
-					if (!empty($conf->global->AGENDA_USE_COLOR_PER_EVENT_TYPE)) $color = $event->type_color;
+					if (!empty($conf->global->AGENDA_USE_COLOR_PER_EVENT_TYPE)) {
+						$color = $event->type_color;
+					}
 				} elseif ($event->type_code == 'ICALEVENT')
 				{
 					$numical++;
@@ -1065,22 +1231,31 @@ 
 					//var_dump($cacheusers[$event->userownerid]->color);
 
 					// We decide to choose color of owner of event (event->userownerid is user id of owner, event->userassigned contains all users assigned to event)
-					if (!empty($cacheusers[$event->userownerid]->color)) $color = $cacheusers[$event->userownerid]->color;
+					if (!empty($cacheusers[$event->userownerid]->color)) {
+						$color = $cacheusers[$event->userownerid]->color;
+					}
 
-					if (!empty($conf->global->AGENDA_USE_COLOR_PER_EVENT_TYPE)) $color = $event->type_color;
+					if (!empty($conf->global->AGENDA_USE_COLOR_PER_EVENT_TYPE)) {
+						$color = $event->type_color;
+					}
 				}
 
-				if ($color < 0)	// Color was not set on user card. Set color according to color index.
+				if ($color < 0) {
+					// Color was not set on user card. Set color according to color index.
 				{
 					// Define color index if not yet defined
 					$idusertouse = ($event->userownerid ? $event->userownerid : 0);
+				}
 					if (isset($colorindexused[$idusertouse]))
 					{
 						$colorindex = $colorindexused[$idusertouse]; // Color already assigned to this user
 					} else {
 						$colorindex = $nextindextouse;
 						$colorindexused[$idusertouse] = $colorindex;
-						if (!empty($theme_datacolor[$nextindextouse + 1])) $nextindextouse++; // Prepare to use next color
+						if (!empty($theme_datacolor[$nextindextouse + 1])) {
+							$nextindextouse++;
+						}
+						// Prepare to use next color
 					}
 					// Define color
 					$color = sprintf("%02x%02x%02x", $theme_datacolor[$colorindex][0], $theme_datacolor[$colorindex][1], $theme_datacolor[$colorindex][2]);
@@ -1098,7 +1273,9 @@ 
 						$c = dol_mktime((int) $h + 1, 0, 0, $month, $day, $year, 'tzuserrel', 0);
 
 						$dateendtouse = $event->date_end_in_calendar;
-						if ($dateendtouse == $event->date_start_in_calendar) $dateendtouse++;
+						if ($dateendtouse == $event->date_start_in_calendar) {
+							$dateendtouse++;
+						}
 
 						//print dol_print_date($event->date_start_in_calendar,'dayhour').'-'.dol_print_date($a,'dayhour').'-'.dol_print_date($b,'dayhour').'<br>';
 
@@ -1111,10 +1288,15 @@ 
 							{
 								$tmpa = dol_getdate($event->date_start_in_calendar, true);
 								$tmpb = dol_getdate($event->date_end_in_calendar, true);
-								if ($tmpa['mday'] == $tmpb['mday'] && $tmpa['mon'] == $tmpb['mon'] && $tmpa['year'] == $tmpb['year']) $cases1[$h][$event->id]['string'] .= '-'.dol_print_date($event->date_end_in_calendar, 'hour', 'tzuserrel');
-								else $cases1[$h][$event->id]['string'] .= '-'.dol_print_date($event->date_end_in_calendar, 'dayhour', 'tzuserrel');
+								if ($tmpa['mday'] == $tmpb['mday'] && $tmpa['mon'] == $tmpb['mon'] && $tmpa['year'] == $tmpb['year']) {
+									$cases1[$h][$event->id]['string'] .= '-'.dol_print_date($event->date_end_in_calendar, 'hour', 'tzuserrel');
+								} else {
+									$cases1[$h][$event->id]['string'] .= '-'.dol_print_date($event->date_end_in_calendar, 'dayhour', 'tzuserrel');
+								}
+							}
+							if ($event->label) {
+								$cases1[$h][$event->id]['string'] .= ' - '.$event->label;
 							}
-							if ($event->label) $cases1[$h][$event->id]['string'] .= ' - '.$event->label;
 							$cases1[$h][$event->id]['typecode'] = $event->type_code;
 							$cases1[$h][$event->id]['color'] = $color;
 							if ($event->fk_project > 0)
@@ -1157,10 +1339,15 @@ 
 							{
 								$tmpa = dol_getdate($event->date_start_in_calendar, true);
 								$tmpb = dol_getdate($event->date_end_in_calendar, true);
-								if ($tmpa['mday'] == $tmpb['mday'] && $tmpa['mon'] == $tmpb['mon'] && $tmpa['year'] == $tmpb['year']) $cases2[$h][$event->id]['string'] .= '-'.dol_print_date($event->date_end_in_calendar, 'hour', 'tzuserrel');
-								else $cases2[$h][$event->id]['string'] .= '-'.dol_print_date($event->date_end_in_calendar, 'dayhour', 'tzuserrel');
+								if ($tmpa['mday'] == $tmpb['mday'] && $tmpa['mon'] == $tmpb['mon'] && $tmpa['year'] == $tmpb['year']) {
+									$cases2[$h][$event->id]['string'] .= '-'.dol_print_date($event->date_end_in_calendar, 'hour', 'tzuserrel');
+								} else {
+									$cases2[$h][$event->id]['string'] .= '-'.dol_print_date($event->date_end_in_calendar, 'dayhour', 'tzuserrel');
+								}
+							}
+							if ($event->label) {
+								$cases2[$h][$event->id]['string'] .= ' - '.$event->label;
 							}
-							if ($event->label) $cases2[$h][$event->id]['string'] .= ' - '.$event->label;
 							$cases2[$h][$event->id]['typecode'] = $event->type_code;
 							$cases2[$h][$event->id]['color'] = $color;
 							if ($event->fk_project > 0)
@@ -1223,53 +1410,86 @@ 
 		if (isset($cases1[$h]) && $cases1[$h] != '')
 		{
 			//$title1.=count($cases1[$h]).' '.(count($cases1[$h])==1?$langs->trans("Event"):$langs->trans("Events"));
-			if (count($cases1[$h]) > 1) $title1 .= count($cases1[$h]).' '.(count($cases1[$h]) == 1 ? $langs->trans("Event") : $langs->trans("Events"));
+			if (count($cases1[$h]) > 1) {
+				$title1 .= count($cases1[$h]).' '.(count($cases1[$h]) == 1 ? $langs->trans("Event") : $langs->trans("Events"));
+			}
 			$string1 = '&nbsp;';
-			if (empty($conf->global->AGENDA_NO_TRANSPARENT_ON_NOT_BUSY)) $style1 = 'peruser_notbusy';
-			else $style1 = 'peruser_busy';
+			if (empty($conf->global->AGENDA_NO_TRANSPARENT_ON_NOT_BUSY)) {
+				$style1 = 'peruser_notbusy';
+			} else {
+				$style1 = 'peruser_busy';
+			}
 			foreach ($cases1[$h] as $id => $ev)
 			{
-				if ($ev['busy']) $style1 = 'peruser_busy';
+				if ($ev['busy']) {
+					$style1 = 'peruser_busy';
+				}
 			}
 		}
 		if (isset($cases2[$h]) && $cases2[$h] != '')
 		{
 			//$title2.=count($cases2[$h]).' '.(count($cases2[$h])==1?$langs->trans("Event"):$langs->trans("Events"));
-			if (count($cases2[$h]) > 1) $title2 .= count($cases2[$h]).' '.(count($cases2[$h]) == 1 ? $langs->trans("Event") : $langs->trans("Events"));
+			if (count($cases2[$h]) > 1) {
+				$title2 .= count($cases2[$h]).' '.(count($cases2[$h]) == 1 ? $langs->trans("Event") : $langs->trans("Events"));
+			}
 			$string2 = '&nbsp;';
-			if (empty($conf->global->AGENDA_NO_TRANSPARENT_ON_NOT_BUSY)) $style2 = 'peruser_notbusy';
-			else $style2 = 'peruser_busy';
+			if (empty($conf->global->AGENDA_NO_TRANSPARENT_ON_NOT_BUSY)) {
+				$style2 = 'peruser_notbusy';
+			} else {
+				$style2 = 'peruser_busy';
+			}
 			foreach ($cases2[$h] as $id => $ev)
 			{
-				if ($ev['busy']) $style2 = 'peruser_busy';
+				if ($ev['busy']) {
+					$style2 = 'peruser_busy';
+				}
 			}
 		}
 
 		$ids1 = '';
 		$ids2 = '';
-		if (is_array($cases1[$h]) && count($cases1[$h]) && array_keys($cases1[$h])) $ids1 = join(',', array_keys($cases1[$h]));
-		if (is_array($cases2[$h]) && count($cases2[$h]) && array_keys($cases2[$h])) $ids2 = join(',', array_keys($cases2[$h]));
+		if (is_array($cases1[$h]) && count($cases1[$h]) && array_keys($cases1[$h])) {
+			$ids1 = join(',', array_keys($cases1[$h]));
+		}
+		if (is_array($cases2[$h]) && count($cases2[$h]) && array_keys($cases2[$h])) {
+			$ids2 = join(',', array_keys($cases2[$h]));
+		}
 
-		if ($h == $begin_h) echo '<td class="'.$style.'_peruserleft cal_peruser'.($var ? ' cal_impair '.$style.'_impair' : '').'">';
-		else echo '<td class="'.$style.' cal_peruser'.($var ? ' cal_impair '.$style.'_impair' : '').'">';
-		if (is_array($cases1[$h]) && count($cases1[$h]) == 1)	// only 1 event
+		if ($h == $begin_h) {
+			echo '<td class="'.$style.'_peruserleft cal_peruser'.($var ? ' cal_impair '.$style.'_impair' : '').'">';
+		} else {
+			echo '<td class="'.$style.' cal_peruser'.($var ? ' cal_impair '.$style.'_impair' : '').'">';
+		}
+		if (is_array($cases1[$h]) && count($cases1[$h]) == 1) {
+			// only 1 event
 		{
 			$output = array_slice($cases1[$h], 0, 1);
+		}
 			$title1 = $langs->trans("Ref").' '.$ids1.($title1 ? ' - '.$title1 : '');
-			if ($output[0]['string']) $title1 .= ($title1 ? ' - ' : '').$output[0]['string'];
-			if ($output[0]['color']) $color1 = $output[0]['color'];
+			if ($output[0]['string']) {
+				$title1 .= ($title1 ? ' - ' : '').$output[0]['string'];
+			}
+			if ($output[0]['color']) {
+				$color1 = $output[0]['color'];
+			}
 		} elseif (is_array($cases1[$h]) && count($cases1[$h]) > 1)
 		{
 			$title1 = $langs->trans("Ref").' '.$ids1.($title1 ? ' - '.$title1 : '');
 			$color1 = '222222';
 		}
 
-		if (is_array($cases2[$h]) && count($cases2[$h]) == 1)	// only 1 event
+		if (is_array($cases2[$h]) && count($cases2[$h]) == 1) {
+			// only 1 event
 		{
 			$output = array_slice($cases2[$h], 0, 1);
+		}
 			$title2 = $langs->trans("Ref").' '.$ids2.($title2 ? ' - '.$title2 : '');
-			if ($output[0]['string']) $title2 .= ($title2 ? ' - ' : '').$output[0]['string'];
-			if ($output[0]['color']) $color2 = $output[0]['color'];
+			if ($output[0]['string']) {
+				$title2 .= ($title2 ? ' - ' : '').$output[0]['string'];
+			}
+			if ($output[0]['color']) {
+				$color2 = $output[0]['color'];
+			}
 		} elseif (is_array($cases2[$h]) && count($cases2[$h]) > 1)
 		{
 			$title2 = $langs->trans("Ref").' '.$ids2.($title2 ? ' - '.$title2 : '');
@@ -1277,8 +1497,9 @@ 
 		}
 		print '<table class="nobordernopadding" width="100%">';
 		print '<tr><td ';
-		if ($style1 == 'peruser_notbusy') print 'style="border: 1px solid #'.($color1 ? $color1 : "888").' !important" ';
-		elseif ($color1)
+		if ($style1 == 'peruser_notbusy') {
+			print 'style="border: 1px solid #'.($color1 ? $color1 : "888").' !important" ';
+		} elseif ($color1)
 		{
 			print ($color1 ? 'style="background: #'.$color1.';"' : '');
 		}
@@ -1287,8 +1508,9 @@ 
 		print 'onclickopenref'.($title2 ? ' classfortooltip' : '').($title1 ? ' cursorpointer' : '').'" ref="ref_'.$username->id.'_'.sprintf("%04d", $year).'_'.sprintf("%02d", $month).'_'.sprintf("%02d", $day).'_'.sprintf("%02d", $h).'_00_'.($ids1 ? $ids1 : 'none').'"'.($title1 ? ' title="'.$title1.'"' : '').'>';
 		print $string1;
 		print '</td><td ';
-		if ($style2 == 'peruser_notbusy') print 'style="border: 1px solid #'.($color2 ? $color2 : "888").' !important" ';
-		elseif ($color2)
+		if ($style2 == 'peruser_notbusy') {
+			print 'style="border: 1px solid #'.($color2 ? $color2 : "888").' !important" ';
+		} elseif ($color2)
 		{
 			print ($color2 ? 'style="background: #'.$color2.';"' : '');
 		}

htdocs/core/class/html.formactions.class.php

Braces +69 added lines, -27 removed lines

@@ -128,9 +128,13 @@ 
 		if (!empty($conf->use_javascript_ajax) || $onlyselect)
 		{
 			//var_dump($selected);
-			if ($selected == 'done') $selected = '100';
+			if ($selected == 'done') {
+				$selected = '100';
+			}
 			print '<select '.($canedit ? '' : 'disabled ').'name="'.$htmlname.'" id="select'.$htmlname.'" class="flat'.($morecss ? ' '.$morecss : '').'">';
-			if ($showempty) print '<option value=""'.($selected == '' ? ' selected' : '').'>&nbsp;</option>';
+			if ($showempty) {
+				print '<option value=""'.($selected == '' ? ' selected' : '').'>&nbsp;</option>';
+			}
 			foreach ($listofstatus as $key => $val)
 			{
 				print '<option value="'.$key.'"'.(($selected == $key && strlen($selected) == strlen($key)) || (($selected > 0 && $selected < 100) && $key == '50') ? ' selected' : '').'>'.$val.'</option>';
@@ -140,7 +144,9 @@ 
 				}
 			}
 			print '</select>';
-			if ($selected == 0 || $selected == 100) $canedit = 0;
+			if ($selected == 0 || $selected == 100) {
+				$canedit = 0;
+			}
 
 			print ajax_combobox('select'.$htmlname);
 
@@ -178,28 +184,45 @@ 
 		$sortorder = 'DESC,DESC';
 
 		$listofactions = ActionComm::getActions($this->db, $socid, $object->id, $typeelement, '', $sortfield, $sortorder, ($max ? ($max + 1) : 0));
-		if (!is_array($listofactions)) dol_print_error($this->db, 'FailedToGetActions');
+		if (!is_array($listofactions)) {
+			dol_print_error($this->db, 'FailedToGetActions');
+		}
 
 		$num = count($listofactions);
 		if ($num || $forceshowtitle)
 		{
-			if ($typeelement == 'invoice')               $title = $langs->trans('ActionsOnBill');
-			elseif ($typeelement == 'invoice_supplier' || $typeelement == 'supplier_invoice') $title = $langs->trans('ActionsOnBill');
-			elseif ($typeelement == 'propal')            $title = $langs->trans('ActionsOnPropal');
-			elseif ($typeelement == 'supplier_proposal') $title = $langs->trans('ActionsOnSupplierProposal');
-			elseif ($typeelement == 'order')             $title = $langs->trans('ActionsOnOrder');
-			elseif ($typeelement == 'order_supplier' || $typeelement == 'supplier_order')   $title = $langs->trans('ActionsOnOrder');
-			elseif ($typeelement == 'shipping')          $title = $langs->trans('ActionsOnShipping');
-			elseif ($typeelement == 'fichinter')         $title = $langs->trans('ActionsOnFicheInter');
-			elseif ($typeelement == 'project')           $title = $langs->trans('LatestLinkedEvents', $max ? $max : '');
-			elseif ($typeelement == 'task')              $title = $langs->trans('LatestLinkedEvents', $max ? $max : '');
-			elseif ($typeelement == 'member')            $title = $langs->trans('LatestLinkedEvents', $max ? $max : '');
-			else $title = $langs->trans("LatestLinkedEvents", $max ? $max : '');
+			if ($typeelement == 'invoice') {
+				$title = $langs->trans('ActionsOnBill');
+			} elseif ($typeelement == 'invoice_supplier' || $typeelement == 'supplier_invoice') {
+				$title = $langs->trans('ActionsOnBill');
+			} elseif ($typeelement == 'propal') {
+				$title = $langs->trans('ActionsOnPropal');
+			} elseif ($typeelement == 'supplier_proposal') {
+				$title = $langs->trans('ActionsOnSupplierProposal');
+			} elseif ($typeelement == 'order') {
+				$title = $langs->trans('ActionsOnOrder');
+			} elseif ($typeelement == 'order_supplier' || $typeelement == 'supplier_order') {
+				$title = $langs->trans('ActionsOnOrder');
+			} elseif ($typeelement == 'shipping') {
+				$title = $langs->trans('ActionsOnShipping');
+			} elseif ($typeelement == 'fichinter') {
+				$title = $langs->trans('ActionsOnFicheInter');
+			} elseif ($typeelement == 'project') {
+				$title = $langs->trans('LatestLinkedEvents', $max ? $max : '');
+			} elseif ($typeelement == 'task') {
+				$title = $langs->trans('LatestLinkedEvents', $max ? $max : '');
+			} elseif ($typeelement == 'member') {
+				$title = $langs->trans('LatestLinkedEvents', $max ? $max : '');
+			} else {
+				$title = $langs->trans("LatestLinkedEvents", $max ? $max : '');
+			}
 
 			$urlbacktopage = $_SERVER['PHP_SELF'].'?id='.$object->id.($moreparambacktopage ? '&'.$moreparambacktopage : '');
 
 			$projectid = $object->fk_project;
-			if ($typeelement == 'project') $projectid = $object->id;
+			if ($typeelement == 'project') {
+				$projectid = $object->id;
+			}
 
 			$newcardbutton = '';
 			if (!empty($conf->agenda->enabled) && !empty($user->rights->agenda->myactions->create))
@@ -232,7 +255,9 @@ 
 				$cursorevent = 0;
 				foreach ($listofactions as $actioncomm)
 				{
-					if ($max && $cursorevent >= $max) break;
+					if ($max && $cursorevent >= $max) {
+						break;
+					}
 
 					$ref = $actioncomm->getNomUrl(1, -1);
 					$label = $actioncomm->getNomUrl(0, 36);
@@ -282,8 +307,12 @@ 
 						$tmpb = dol_getdate($actioncomm->datef);
 						if ($tmpa['mday'] == $tmpb['mday'] && $tmpa['mon'] == $tmpb['mon'] && $tmpa['year'] == $tmpb['year'])
 						{
-							if ($tmpa['hours'] != $tmpb['hours'] || $tmpa['minutes'] != $tmpb['minutes'] && $tmpa['seconds'] != $tmpb['seconds']) print '-'.dol_print_date($actioncomm->datef, 'hour', 'tzuserrel');
-						} else print '-'.dol_print_date($actioncomm->datef, 'dayhour', 'tzuserrel');
+							if ($tmpa['hours'] != $tmpb['hours'] || $tmpa['minutes'] != $tmpb['minutes'] && $tmpa['seconds'] != $tmpb['seconds']) {
+								print '-'.dol_print_date($actioncomm->datef, 'hour', 'tzuserrel');
+							}
+						} else {
+							print '-'.dol_print_date($actioncomm->datef, 'dayhour', 'tzuserrel');
+						}
 					}
 					print '</td>';
 					print '<td class="right">';
@@ -329,7 +358,9 @@ 
 		// phpcs:enable
 		global $langs, $user, $form, $conf;
 
-		if (!is_object($form)) $form = new Form($this->db);
+		if (!is_object($form)) {
+			$form = new Form($this->db);
+		}
 
 		require_once DOL_DOCUMENT_ROOT.'/comm/action/class/cactioncomm.class.php';
 		require_once DOL_DOCUMENT_ROOT.'/core/class/html.form.class.php';
@@ -343,16 +374,24 @@ 
 		}
 		//asort($arraylist);
 
-	   	if ($selected == 'manual') $selected = 'AC_OTH';
-	   	if ($selected == 'auto')   $selected = 'AC_OTH_AUTO';
+	   	if ($selected == 'manual') {
+	   		$selected = 'AC_OTH';
+	   	}
+	   	if ($selected == 'auto') {
+	   		$selected = 'AC_OTH_AUTO';
+	   	}
 
-	   	if (!empty($conf->global->AGENDA_ALWAYS_HIDE_AUTO)) unset($arraylist['AC_OTH_AUTO']);
+	   	if (!empty($conf->global->AGENDA_ALWAYS_HIDE_AUTO)) {
+	   		unset($arraylist['AC_OTH_AUTO']);
+	   	}
 
 	   	$out = '';
 
 		if (!empty($multiselect))
 		{
-			if (!is_array($selected) && !empty($selected)) $selected = explode(',', $selected);
+			if (!is_array($selected) && !empty($selected)) {
+				$selected = explode(',', $selected);
+			}
 			$out .= $form->multiselectarray($htmlname, $arraylist, $selected, 0, 0, 'centpercent', 0, 0);
 		} else {
 			$out .= $form->selectarray($htmlname, $arraylist, $selected, 0, 0, 0, '', 0, 0, 0, '', 'minwidth300'.($morecss ? ' '.$morecss : ''), 1);
@@ -363,8 +402,11 @@ 
 			$out .= info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup").($hideinfohelp == -1 ? ". ".$langs->trans("YouCanSetDefaultValueInModuleSetup") : ''), 1);
 		}
 
-		if ($nooutput) return $out;
-		else print $out;
+		if ($nooutput) {
+			return $out;
+		} else {
+			print $out;
+		}
 		return '';
 	}
 }

htdocs/core/class/html.formadmin.class.php

Braces +103 added lines, -35 removed lines

@@ -67,7 +67,9 @@ 
 		// phpcs:enable
 		global $conf, $langs;
 
-		if (!empty($conf->global->MAIN_DEFAULT_LANGUAGE_FILTER)) $filter[$conf->global->MAIN_DEFAULT_LANGUAGE_FILTER] = 1;
+		if (!empty($conf->global->MAIN_DEFAULT_LANGUAGE_FILTER)) {
+			$filter[$conf->global->MAIN_DEFAULT_LANGUAGE_FILTER] = 1;
+		}
 
 		$langs_available = $langs->get_available_languages(DOL_DOCUMENT_ROOT, 12, 0, $mainlangonly);
 
@@ -77,16 +79,23 @@ 
 		if ($showempty && !$multiselect)
 		{
 			$out .= '<option value="0"';
-			if ($selected === '') $out .= ' selected';
+			if ($selected === '') {
+				$out .= ' selected';
+			}
 			$out .= '>';
-			if ($showempty != '1') $out .= $showempty;
-			else $out .= '&nbsp;';
+			if ($showempty != '1') {
+				$out .= $showempty;
+			} else {
+				$out .= '&nbsp;';
+			}
 			$out .= '</option>';
 		}
 		if ($showauto)
 		{
 			$out .= '<option value="auto"';
-			if ($selected === 'auto') $out .= ' selected';
+			if ($selected === 'auto') {
+				$out .= ' selected';
+			}
 			$out .= '>'.$langs->trans("AutoDetectLang").'</option>';
 		}
 
@@ -96,16 +105,24 @@ 
 		{
 			$valuetoshow = $value;
 			if ($showcode == 1) {
-				if ($mainlangonly) $valuetoshow = '<span class="opacitymedium">'.preg_replace('/[_-].*$/', '', $key).'</span> - '.$value;
-				else $valuetoshow = '<span class="opacitymedium">'.$key.'</span> - '.$value;
+				if ($mainlangonly) {
+					$valuetoshow = '<span class="opacitymedium">'.preg_replace('/[_-].*$/', '', $key).'</span> - '.$value;
+				} else {
+					$valuetoshow = '<span class="opacitymedium">'.$key.'</span> - '.$value;
+				}
 			}
 			if ($showcode == 2) {
-				if ($mainlangonly) $valuetoshow = $value.' <span class="opacitymedium">('.preg_replace('/[_-].*$/', '', $key).')</span>';
-				else $valuetoshow = $value.' <span class="opacitymedium">('.$key.')</span>';
+				if ($mainlangonly) {
+					$valuetoshow = $value.' <span class="opacitymedium">('.preg_replace('/[_-].*$/', '', $key).')</span>';
+				} else {
+					$valuetoshow = $value.' <span class="opacitymedium">('.$key.')</span>';
+				}
 			}
 
 			$keytouse = $key;
-			if ($mainlangonly) $keytouse = preg_replace('/[_-].*$/', '', $key);
+			if ($mainlangonly) {
+				$keytouse = preg_replace('/[_-].*$/', '', $key);
+			}
 
 			if ($filter && is_array($filter) && array_key_exists($keytouse, $filter)) {
 				continue;
@@ -152,7 +169,9 @@ 
 
 
 		// Check parameters
-		if (!is_array($dirmenuarray)) return -1;
+		if (!is_array($dirmenuarray)) {
+			return -1;
+		}
 
 		$menuarray = array();
 		foreach ($conf->file->dol_document_root as $dirroot)
@@ -170,17 +189,33 @@ 
 						{
 							if (is_file($dir."/".$file) && substr($file, 0, 1) <> '.' && substr($file, 0, 3) <> 'CVS' && substr($file, 0, 5) != 'index')
 							{
-								if (preg_match('/lib\.php$/i', $file)) continue; // We exclude library files
-								if (preg_match('/eldy_(backoffice|frontoffice)\.php$/i', $file)) continue; // We exclude all menu manager files
-								if (preg_match('/auguria_(backoffice|frontoffice)\.php$/i', $file)) continue; // We exclude all menu manager files
-								if (preg_match('/smartphone_(backoffice|frontoffice)\.php$/i', $file)) continue; // We exclude all menu manager files
+								if (preg_match('/lib\.php$/i', $file)) {
+									continue;
+								}
+								// We exclude library files
+								if (preg_match('/eldy_(backoffice|frontoffice)\.php$/i', $file)) {
+									continue;
+								}
+								// We exclude all menu manager files
+								if (preg_match('/auguria_(backoffice|frontoffice)\.php$/i', $file)) {
+									continue;
+								}
+								// We exclude all menu manager files
+								if (preg_match('/smartphone_(backoffice|frontoffice)\.php$/i', $file)) {
+									continue;
+								}
+								// We exclude all menu manager files
 
 								$filelib = preg_replace('/\.php$/i', '', $file);
 								$prefix = '';
 								// 0=Recommanded, 1=Experimental, 2=Developpement, 3=Other
-								if (preg_match('/^eldy/i', $file)) $prefix = '0';
-								elseif (preg_match('/^smartphone/i', $file)) $prefix = '2';
-								else $prefix = '3';
+								if (preg_match('/^eldy/i', $file)) {
+									$prefix = '0';
+								} elseif (preg_match('/^smartphone/i', $file)) {
+									$prefix = '2';
+								} else {
+									$prefix = '3';
+								}
 
 								if ($file == $selected)
 								{
@@ -204,16 +239,30 @@ 
 		{
 			$tab = explode('_', $key);
 			$newprefix = $tab[0];
-			if ($newprefix == '1' && ($conf->global->MAIN_FEATURES_LEVEL < 1)) continue;
-			if ($newprefix == '2' && ($conf->global->MAIN_FEATURES_LEVEL < 2)) continue;
-			if ($newprefix != $oldprefix)	// Add separators
+			if ($newprefix == '1' && ($conf->global->MAIN_FEATURES_LEVEL < 1)) {
+				continue;
+			}
+			if ($newprefix == '2' && ($conf->global->MAIN_FEATURES_LEVEL < 2)) {
+				continue;
+			}
+			if ($newprefix != $oldprefix) {
+				// Add separators
 			{
 				// Affiche titre
 				print '<option value="-1" disabled>';
-				if ($newprefix == '0') print '-- '.$langs->trans("VersionRecommanded").' --';
-				if ($newprefix == '1') print '-- '.$langs->trans("VersionExperimental").' --';
-				if ($newprefix == '2') print '-- '.$langs->trans("VersionDevelopment").' --';
-				if ($newprefix == '3') print '-- '.$langs->trans("Other").' --';
+			}
+				if ($newprefix == '0') {
+					print '-- '.$langs->trans("VersionRecommanded").' --';
+				}
+				if ($newprefix == '1') {
+					print '-- '.$langs->trans("VersionExperimental").' --';
+				}
+				if ($newprefix == '2') {
+					print '-- '.$langs->trans("VersionDevelopment").' --';
+				}
+				if ($newprefix == '3') {
+					print '-- '.$langs->trans("Other").' --';
+				}
 				print '</option>';
 				$oldprefix = $newprefix;
 			}
@@ -256,11 +305,21 @@ 
 							if (is_file($dir."/".$file) && substr($file, 0, 1) <> '.' && substr($file, 0, 3) <> 'CVS')
 							{
 								$filelib = preg_replace('/(_backoffice|_frontoffice)?\.php$/i', '', $file);
-								if (preg_match('/^index/i', $filelib)) continue;
-								if (preg_match('/^default/i', $filelib)) continue;
-								if (preg_match('/^empty/i', $filelib)) continue;
-								if (preg_match('/\.lib/i', $filelib)) continue;
-								if (empty($conf->global->MAIN_FEATURES_LEVEL) && in_array($file, $expdevmenu)) continue;
+								if (preg_match('/^index/i', $filelib)) {
+									continue;
+								}
+								if (preg_match('/^default/i', $filelib)) {
+									continue;
+								}
+								if (preg_match('/^empty/i', $filelib)) {
+									continue;
+								}
+								if (preg_match('/\.lib/i', $filelib)) {
+									continue;
+								}
+								if (empty($conf->global->MAIN_FEATURES_LEVEL) && in_array($file, $expdevmenu)) {
+									continue;
+								}
 
 								$menuarray[$filelib] = 1;
 							}
@@ -287,8 +346,11 @@ 
 				print '	selected';
 			}
 			print '>';
-			if ($key == 'all') print $langs->trans("AllMenus");
-			else print $key;
+			if ($key == 'all') {
+				print $langs->trans("AllMenus");
+			} else {
+				print $key;
+			}
 			print '</option>'."\n";
 		}
 		print '</select>';
@@ -340,7 +402,9 @@ 
 		);
 		foreach ($arraytz as $lib => $gmt) {
 			print '<option value="'.$lib.'"';
-			if ($selected == $lib || $selected == $gmt) print ' selected';
+			if ($selected == $lib || $selected == $gmt) {
+				print ' selected';
+			}
 			print '>'.$gmt.'</option>'."\n";
 		}
 		print '</select>';
@@ -368,7 +432,9 @@ 
 		$sql = "SELECT code, label, width, height, unit";
 		$sql .= " FROM ".MAIN_DB_PREFIX."c_paper_format";
 		$sql .= " WHERE active=1";
-		if ($filter) $sql .= " AND code LIKE '%".$this->db->escape($filter)."%'";
+		if ($filter) {
+			$sql .= " AND code LIKE '%".$this->db->escape($filter)."%'";
+		}
 
 		$resql = $this->db->query($sql);
 		if ($resql)
@@ -394,7 +460,9 @@ 
 		if ($showempty)
 		{
 			$out .= '<option value=""';
-			if ($selected == '') $out .= ' selected';
+			if ($selected == '') {
+				$out .= ' selected';
+			}
 			$out .= '>&nbsp;</option>';
 		}
 		foreach ($paperformat as $key => $value)

htdocs/product/stock/class/productlot.class.php

Braces +18 added lines, -6 removed lines

@@ -229,7 +229,9 @@ 
 
 				// Call triggers
 				$result = $this->call_trigger('PRODUCTLOT_CREATE', $user);
-				if ($result < 0) $error++;
+				if ($result < 0) {
+					$error++;
+				}
 				// End call triggers
 			}
 		}
@@ -584,8 +586,12 @@ 
 		{
 			// Add param to save lastsearch_values or not
 			$add_save_lastsearch_values = ($save_lastsearch_value == 1 ? 1 : 0);
-			if ($save_lastsearch_value == -1 && preg_match('/list\.php/', $_SERVER["PHP_SELF"])) $add_save_lastsearch_values = 1;
-			if ($add_save_lastsearch_values) $url .= '&save_lastsearch_values=1';
+			if ($save_lastsearch_value == -1 && preg_match('/list\.php/', $_SERVER["PHP_SELF"])) {
+				$add_save_lastsearch_values = 1;
+			}
+			if ($add_save_lastsearch_values) {
+				$url .= '&save_lastsearch_values=1';
+			}
 		}
 
 		$linkclose = '';
@@ -598,7 +604,9 @@ 
 			}
 			$linkclose .= ' title="'.dol_escape_htmltag($label, 1).'"';
 			$linkclose .= ' class="classfortooltip'.($morecss ? ' '.$morecss : '').'"';
-		} else $linkclose = ($morecss ? ' class="'.$morecss.'"' : '');
+		} else {
+			$linkclose = ($morecss ? ' class="'.$morecss.'"' : '');
+		}
 
 		if ($option == 'nolink') {
 			$linkstart = '<span';
@@ -613,8 +621,12 @@ 
 		}
 
 		$result .= $linkstart;
-		if ($withpicto) $result .= img_object(($notooltip ? '' : $label), ($this->picto ? $this->picto : 'generic'), ($notooltip ? (($withpicto != 2) ? 'class="paddingright"' : '') : 'class="'.(($withpicto != 2) ? 'paddingright ' : '').'classfortooltip"'), 0, 0, $notooltip ? 0 : 1);
-		if ($withpicto != 2) $result .= $this->batch;
+		if ($withpicto) {
+			$result .= img_object(($notooltip ? '' : $label), ($this->picto ? $this->picto : 'generic'), ($notooltip ? (($withpicto != 2) ? 'class="paddingright"' : '') : 'class="'.(($withpicto != 2) ? 'paddingright ' : '').'classfortooltip"'), 0, 0, $notooltip ? 0 : 1);
+		}
+		if ($withpicto != 2) {
+			$result .= $this->batch;
+		}
 		$result .= $linkend;
 
 		return $result;