Dolibarr / dolibarr

htdocs/comm/action/peruser.php

Spacing +14 added lines, -14 removed lines

@@ -50,7 +50,7 @@ 
  */
 
 $MAXAGENDA = getDolGlobalString('AGENDA_EXT_NB', 5);
-$DELAYFORCACHE = 300;	// 300 seconds
+$DELAYFORCACHE = 300; // 300 seconds
 
 $disabledefaultvalues = GETPOSTINT('disabledefaultvalues');
 
@@ -553,7 +553,7 @@ 
 	$sql .= " ON bc.rowid = ba.fk_bookcal_calendar";
 	$sql .= " WHERE bc.status = 1";
 	$sql .= " AND ba.status = 1";
-	$sql .= " AND bc.entity IN (".getEntity('agenda').")";	// bookcal is a "virtual view" of agenda
+	$sql .= " AND bc.entity IN (".getEntity('agenda').")"; // bookcal is a "virtual view" of agenda
 	if (!empty($filtert) && $filtert != '-1') {
 		$sql .= " AND bc.visibility IN (".$db->sanitize($filtert, 0, 0, 0, 0).")";
 	}
@@ -594,9 +594,9 @@ 
 	// Holiday calendar
 	if ($user->hasRight("holiday", "read")) {
 		$s .= '
-            <div class="nowrap inline-block minheight30"><input type="checkbox" id="check_holiday" name="check_holiday" value="1" class="check_holiday"' . ($check_holiday ? ' checked' : '') . '>
+            <div class="nowrap inline-block minheight30"><input type="checkbox" id="check_holiday" name="check_holiday" value="1" class="check_holiday"' . ($check_holiday ? ' checked' : '').'>
                 <label for="check_holiday" class="labelcalendar">
-                    <span class="check_holiday_text">' . $langs->trans("Holidays") . '</span>
+                    <span class="check_holiday_text">' . $langs->trans("Holidays").'</span>
                 </label> &nbsp;
             </div>';
 	}
@@ -604,7 +604,7 @@ 
 	// External calendars
 	if (is_array($showextcals) && count($showextcals) > 0) {
 		foreach ($showextcals as $val) {
-			$htmlname = md5($val['name']);	// not used for security purpose, only to get a string with no special char
+			$htmlname = md5($val['name']); // not used for security purpose, only to get a string with no special char
 
 			$s .= '<script type="text/javascript">'."\n";
 			$s .= 'jQuery(document).ready(function () {'."\n";
@@ -705,7 +705,7 @@ 
 }
 
 $sql .= " WHERE a.fk_action = ca.id";
-$sql .= " AND a.entity IN (".getEntity('agenda').")";	// bookcal is a "virtual view" of agenda
+$sql .= " AND a.entity IN (".getEntity('agenda').")"; // bookcal is a "virtual view" of agenda
 // Condition on actioncode
 if (!empty($actioncode)) {
 	if (!getDolGlobalString('AGENDA_USE_EVENT_TYPE')) {
@@ -860,7 +860,7 @@ 
 		// event->datep and event->datef must be GMT date.
 		if ($event->fulldayevent) {
 			$tzforfullday = getDolGlobalString('MAIN_STORE_FULL_EVENT_IN_GMT');
-			$event->datep = $db->jdate($obj->datep, $tzforfullday ? 'tzuser' : 'tzserver');	// If saved in $tzforfullday = gmt, we must invert date to be in user tz
+			$event->datep = $db->jdate($obj->datep, $tzforfullday ? 'tzuser' : 'tzserver'); // If saved in $tzforfullday = gmt, we must invert date to be in user tz
 			$event->datef = $db->jdate($obj->datep2, $tzforfullday ? 'tzuser' : 'tzserver');
 		} else {
 			// Example: $obj->datep = '1970-01-01 01:00:00', jdate will return 0 if TZ of PHP server is Europe/Berlin (+1)
@@ -936,8 +936,8 @@ 
 			// Loop on each day covered by action to prepare an index to show on calendar
 			$loop = true;
 			$j = 0;
-			$daykey = dol_mktime(0, 0, 0, $mois, $jour, $annee, 'gmt');	// $mois, $jour, $annee has been set for user tz
-			$daykeyend = dol_mktime(0, 0, 0, $moisend, $jourend, $anneeend, 'gmt');	// $moisend, $jourend, $anneeend has been set for user tz
+			$daykey = dol_mktime(0, 0, 0, $mois, $jour, $annee, 'gmt'); // $mois, $jour, $annee has been set for user tz
+			$daykeyend = dol_mktime(0, 0, 0, $moisend, $jourend, $anneeend, 'gmt'); // $moisend, $jourend, $anneeend has been set for user tz
 			/*
 			 print 'GMT '.$event->date_start_in_calendar.' '.dol_print_date($event->date_start_in_calendar, 'dayhour', 'gmt').'<br>';
 			 print 'TZSERVER '.$event->date_start_in_calendar.' '.dol_print_date($event->date_start_in_calendar, 'dayhour', 'tzserver').'<br>';
@@ -1067,7 +1067,7 @@ 
 	$sql .= " AND x.date_debut < '".$db->idate(dol_get_last_day($year, $month))."'";
 	$sql .= " AND x.date_fin >= '".$db->idate(dol_get_first_day($year, $month))."'";
 	if (!$user->hasRight('holiday', 'readall')) {
-		$sql.= " AND x.fk_user IN(".$db->sanitize(implode(", ", $user->getAllChildIds(1))).") ";
+		$sql .= " AND x.fk_user IN(".$db->sanitize(implode(", ", $user->getAllChildIds(1))).") ";
 	}
 
 	$resql = $db->query($sql);
@@ -1139,9 +1139,9 @@ 
 					} elseif (in_array($obj->halfday, array(-1, 2)) && $firstdayofholiday) {
 						$newevent->label .= ' ('.$langs->trans("Afternoon").')';
 					}
-					$eventarray[$daykey][] = $newevent;	// We need to use ->gtTypePicto, getXXXon object, so clone must be PHP clone.
+					$eventarray[$daykey][] = $newevent; // We need to use ->gtTypePicto, getXXXon object, so clone must be PHP clone.
 				} else {
-					$eventarray[$daykey][] = $event;	// We can use the event unchanged
+					$eventarray[$daykey][] = $event; // We can use the event unchanged
 				}
 
 				$daykey += 60 * 60 * 24;
@@ -1870,8 +1870,8 @@ 
 	// We are in a particular day for $username, now we scan all events
 	foreach ($eventarray as $daykey => $notused) {
 		$annee = (int) dol_print_date($daykey, '%Y', 'tzuserrel');
-		$mois =  (int) dol_print_date($daykey, '%m', 'tzuserrel');
-		$jour =  (int) dol_print_date($daykey, '%d', 'tzuserrel');
+		$mois = (int) dol_print_date($daykey, '%m', 'tzuserrel');
+		$jour = (int) dol_print_date($daykey, '%d', 'tzuserrel');
 		//var_dump("daykey=$daykey day=$day jour=$jour, month=$month mois=$mois, year=$year annee=$annee ".dol_print_date($daykey, 'dayhour', 'gmt'));
 		//var_dump($notused);
 

htdocs/comm/action/index.php

Spacing +24 added lines, -24 removed lines

@@ -50,7 +50,7 @@ 
  */
 
 $MAXAGENDA = getDolGlobalString('AGENDA_EXT_NB', 5);
-$DELAYFORCACHE = 300;	// 300 seconds
+$DELAYFORCACHE = 300; // 300 seconds
 
 $disabledefaultvalues = GETPOSTINT('disabledefaultvalues');
 
@@ -107,7 +107,7 @@ 
 
 $mode = GETPOST('mode', 'aZ09');
 if (empty($mode) && preg_match('/show_/', $action)) {
-	$mode = $action;	// For backward compatibility
+	$mode = $action; // For backward compatibility
 }
 $resourceid = GETPOST("search_resourceid", 'int');
 $year = GETPOSTINT("year") ? GETPOSTINT("year") : date("Y");
@@ -144,8 +144,8 @@ 
 	$status = ((!getDolGlobalString('AGENDA_DEFAULT_FILTER_STATUS') || $disabledefaultvalues) ? '' : getDolGlobalString('AGENDA_DEFAULT_FILTER_STATUS'));
 }
 
-$defaultview = getDolGlobalString('AGENDA_DEFAULT_VIEW', 'show_month');	// default for app
-$defaultview = getDolUserString('AGENDA_DEFAULT_VIEW', $defaultview);	// default for user
+$defaultview = getDolGlobalString('AGENDA_DEFAULT_VIEW', 'show_month'); // default for app
+$defaultview = getDolUserString('AGENDA_DEFAULT_VIEW', $defaultview); // default for user
 if (empty($mode) && !GETPOSTISSET('mode')) {
 	$mode = $defaultview;
 }
@@ -559,7 +559,7 @@ 
 
 $viewmode .= '</div>';
 
-$viewmode .= '<span class="marginrightonly"></span>';	// To add a space before the navigation tools
+$viewmode .= '<span class="marginrightonly"></span>'; // To add a space before the navigation tools
 
 
 $newparam = '';
@@ -595,7 +595,7 @@ 
 	$sql .= " ON bc.rowid = ba.fk_bookcal_calendar";
 	$sql .= " WHERE bc.status = 1";
 	$sql .= " AND ba.status = 1";
-	$sql .= " AND bc.entity IN (".getEntity('agenda').")";	// bookcal is a "virtual view" of agenda
+	$sql .= " AND bc.entity IN (".getEntity('agenda').")"; // bookcal is a "virtual view" of agenda
 	if (!empty($filtert) && $filtert != '-1') {
 		$sql .= " AND bc.visibility IN (".$db->sanitize($filtert, 0, 0, 0, 0).")";
 	}
@@ -651,9 +651,9 @@ 
 	if ($user->hasRight("holiday", "read")) {
 		$s .= '
             <div class="nowrap inline-block minheight30"><input type="checkbox" id="check_holiday" name="check_holiday" value="1" class="check_holiday"' . ($check_holiday
-					? ' checked' : '') . '>
+					? ' checked' : '').'>
                 <label for="check_holiday" class="labelcalendar">
-                    <span class="check_holiday_text">' . $langs->trans("Holidays") . '</span>
+                    <span class="check_holiday_text">' . $langs->trans("Holidays").'</span>
                 </label> &nbsp;
             </div>';
 	}
@@ -679,7 +679,7 @@ 
 		$s .= '</script>'."\n";
 
 		foreach ($showextcals as $val) {
-			$htmlname = md5($val['name']);	// not used for security purpose, only to get a string with no special char
+			$htmlname = md5($val['name']); // not used for security purpose, only to get a string with no special char
 
 			if (!empty($val['default']) || GETPOSTINT('check_ext'.$htmlname)) {
 				$default = "checked";
@@ -777,7 +777,7 @@ 
 	}
 }
 $sql .= ' WHERE a.fk_action = ca.id';
-$sql .= ' AND a.entity IN ('.getEntity('agenda').')';	// bookcal is a "virtual view" of agenda
+$sql .= ' AND a.entity IN ('.getEntity('agenda').')'; // bookcal is a "virtual view" of agenda
 // Condition on actioncode
 if (!empty($actioncode)) {
 	if (!getDolGlobalString('AGENDA_USE_EVENT_TYPE')) {
@@ -928,7 +928,7 @@ 
 		// event->datep and event->datef must be GMT date.
 		if ($event->fulldayevent) {
 			$tzforfullday = getDolGlobalString('MAIN_STORE_FULL_EVENT_IN_GMT');
-			$event->datep = $db->jdate($obj->datep, $tzforfullday ? 'tzuser' : 'tzserver');	// If saved in $tzforfullday = gmt, we must invert date to be in user tz
+			$event->datep = $db->jdate($obj->datep, $tzforfullday ? 'tzuser' : 'tzserver'); // If saved in $tzforfullday = gmt, we must invert date to be in user tz
 			$event->datef = $db->jdate($obj->datep2, $tzforfullday ? 'tzuser' : 'tzserver');
 		} else {
 			// Example: $obj->datep = '1970-01-01 01:00:00', jdate will return 0 if TZ of PHP server is Europe/Berlin (+1)
@@ -1006,8 +1006,8 @@ 
 			// Loop on each day covered by action to prepare an index to show on calendar
 			$loop = true;
 			$j = 0;
-			$daykey = dol_mktime(0, 0, 0, $mois, $jour, $annee, 'gmt');	// $mois, $jour, $annee has been set for user tz
-			$daykeyend = dol_mktime(0, 0, 0, $moisend, $jourend, $anneeend, 'gmt');	// $moisend, $jourend, $anneeend has been set for user tz
+			$daykey = dol_mktime(0, 0, 0, $mois, $jour, $annee, 'gmt'); // $mois, $jour, $annee has been set for user tz
+			$daykeyend = dol_mktime(0, 0, 0, $moisend, $jourend, $anneeend, 'gmt'); // $moisend, $jourend, $anneeend has been set for user tz
 			/*
 			 print 'GMT '.$event->date_start_in_calendar.' '.dol_print_date($event->date_start_in_calendar, 'dayhour', 'gmt').'<br>';
 			 print 'TZSERVER '.$event->date_start_in_calendar.' '.dol_print_date($event->date_start_in_calendar, 'dayhour', 'tzserver').'<br>';
@@ -1134,7 +1134,7 @@ 
 	$sql .= " AND (x.statut = '2' OR x.statut = '3')"; // Show only public leaves (2 = leave wait for approval, 3 = leave approved)
 	if ($mode == 'show_day') {
 		// Request only leaves for the current selected day
-		$sql .= " AND '".$db->escape($year)."-".$db->escape($month)."-".$db->escape($day)."' BETWEEN x.date_debut AND x.date_fin";	// date_debut and date_fin are date without time
+		$sql .= " AND '".$db->escape($year)."-".$db->escape($month)."-".$db->escape($day)."' BETWEEN x.date_debut AND x.date_fin"; // date_debut and date_fin are date without time
 	} elseif ($mode == 'show_week') {
 		// Restrict on current month (we get more, but we will filter later)
 		$sql .= " AND x.date_debut < '".$db->idate(dol_get_last_day($year, $month))."'";
@@ -1145,7 +1145,7 @@ 
 		$sql .= " AND x.date_fin >= '".$db->idate(dol_get_first_day($year, $month))."'";
 	}
 	if (!$user->hasRight('holiday', 'readall')) {
-		$sql.= " AND x.fk_user IN(".$db->sanitize(implode(", ", $user->getAllChildIds(1))).") ";
+		$sql .= " AND x.fk_user IN(".$db->sanitize(implode(", ", $user->getAllChildIds(1))).") ";
 	}
 
 	$resql = $db->query($sql);
@@ -1218,9 +1218,9 @@ 
 					} elseif (in_array($obj->halfday, array(-1, 2)) && $firstdayofholiday) {
 						$newevent->label .= ' ('.$langs->trans("Afternoon").')';
 					}
-					$eventarray[$daykey][] = $newevent;	// We need to use ->gtTypePicto, getXXXon object, so clone must be PHP clone.
+					$eventarray[$daykey][] = $newevent; // We need to use ->gtTypePicto, getXXXon object, so clone must be PHP clone.
 				} else {
-					$eventarray[$daykey][] = $event;	// We can use the event unchanged
+					$eventarray[$daykey][] = $event; // We can use the event unchanged
 				}
 
 				$daykey += 60 * 60 * 24;
@@ -1709,7 +1709,7 @@ 
 
 	for ($iter_day = 0; $iter_day < 7; $iter_day++) {
 		// Show days of the current week
-		$curtime = dol_time_plus_duree($firstdaytoshow, $iter_day, 'd');		// $firstdaytoshow is in timezone of server
+		$curtime = dol_time_plus_duree($firstdaytoshow, $iter_day, 'd'); // $firstdaytoshow is in timezone of server
 		$tmpday = (int) dol_print_date($curtime, '%d', 'tzuserrel');
 		$tmpmonth = (int) dol_print_date($curtime, '%m', 'tzuserrel');
 		$tmpyear = (int) dol_print_date($curtime, '%Y', 'tzuserrel');
@@ -1944,9 +1944,9 @@ 
 	$tmpholiday = new Holiday($db);
 
 	foreach ($eventarray as $daykey => $notused) {		// daykey is the 'YYYYMMDD' to show according to user
-		$annee = (int) dol_print_date($daykey, '%Y', 'gmt');	// We use gmt because we want the value represented by string 'YYYYMMDD'
-		$mois =  (int) dol_print_date($daykey, '%m', 'gmt');	// We use gmt because we want the value represented by string 'YYYYMMDD'
-		$jour =  (int) dol_print_date($daykey, '%d', 'gmt');	// We use gmt because we want the value represented by string 'YYYYMMDD'
+		$annee = (int) dol_print_date($daykey, '%Y', 'gmt'); // We use gmt because we want the value represented by string 'YYYYMMDD'
+		$mois = (int) dol_print_date($daykey, '%m', 'gmt'); // We use gmt because we want the value represented by string 'YYYYMMDD'
+		$jour = (int) dol_print_date($daykey, '%d', 'gmt'); // We use gmt because we want the value represented by string 'YYYYMMDD'
 
 		//print 'event daykey='.$daykey.' dol_print_date(daykey)='.dol_print_date($daykey, 'dayhour', 'gmt').' jour='.$jour.' mois='.$mois.' annee='.$annee."<br>\n";
 		//print 'event daykey='.$daykey.' dol_print_date(daykey)='.dol_print_date($daykey, 'dayhour', 'gmt').' day='.$day.' month='.$month.' year='.$year."<br>\n";
@@ -2216,7 +2216,7 @@ 
 								$event->label = $titletoshow;
 								// Note: List of users are inside $event->userassigned. Link may be clickable depending on permissions of user.
 								$titletoshow = (($event->type_picto || $event->type_code) ? $event->getTypePicto() : '');
-								$titletoshow .= $event->getNomUrl(0, $maxnbofchar, 'cal_event cal_event_title valignmiddle', '', 0, 0);	// do not add 'inline-block' in css here: it makes the title transformed completely into '...'
+								$titletoshow .= $event->getNomUrl(0, $maxnbofchar, 'cal_event cal_event_title valignmiddle', '', 0, 0); // do not add 'inline-block' in css here: it makes the title transformed completely into '...'
 								$event->label = $savlabel;
 							}
 
@@ -2260,7 +2260,7 @@ 
 									$thirdparty = $cachethirdparties[$thirdparty_id];
 								}
 								if (!empty($thirdparty->id)) {
-									$linerelatedto .= $thirdparty->getNomUrl(1, '', 0, 0, -1, 0, '', 'valignmiddle inline');	// using inline-block make the content completely replace with ... when too large
+									$linerelatedto .= $thirdparty->getNomUrl(1, '', 0, 0, -1, 0, '', 'valignmiddle inline'); // using inline-block make the content completely replace with ... when too large
 								}
 							}
 							if (!empty($contact_id) && $contact_id > 0) {
@@ -2275,7 +2275,7 @@ 
 									$linerelatedto .= '&nbsp;';
 								}
 								if (!empty($contact->id)) {
-									$linerelatedto .= $contact->getNomUrl(1, '', 0, '', -1, 0, 'valignmiddle inline');	// using inline-block make the content completely replace with ... when too large
+									$linerelatedto .= $contact->getNomUrl(1, '', 0, '', -1, 0, 'valignmiddle inline'); // using inline-block make the content completely replace with ... when too large
 								}
 							}
 							if (!empty($event->fk_element) && $event->fk_element > 0 && !empty($event->elementtype) && getDolGlobalString('AGENDA_SHOW_LINKED_OBJECT')) {