Completed
Branch develop (01c502)
by
unknown
23:58
created
htdocs/comm/action/peruser.php 1 patch
Spacing   +14 added lines, -14 removed lines patch added patch discarded remove patch
@@ -50,7 +50,7 @@  discard block
 block discarded – undo
50 50
  */
51 51
 
52 52
 $MAXAGENDA = getDolGlobalString('AGENDA_EXT_NB', 5);
53
-$DELAYFORCACHE = 300;	// 300 seconds
53
+$DELAYFORCACHE = 300; // 300 seconds
54 54
 
55 55
 $disabledefaultvalues = GETPOSTINT('disabledefaultvalues');
56 56
 
@@ -553,7 +553,7 @@  discard block
 block discarded – undo
553 553
 	$sql .= " ON bc.rowid = ba.fk_bookcal_calendar";
554 554
 	$sql .= " WHERE bc.status = 1";
555 555
 	$sql .= " AND ba.status = 1";
556
-	$sql .= " AND bc.entity IN (".getEntity('agenda').")";	// bookcal is a "virtual view" of agenda
556
+	$sql .= " AND bc.entity IN (".getEntity('agenda').")"; // bookcal is a "virtual view" of agenda
557 557
 	if (!empty($filtert) && $filtert != '-1') {
558 558
 		$sql .= " AND bc.visibility IN (".$db->sanitize($filtert, 0, 0, 0, 0).")";
559 559
 	}
@@ -594,9 +594,9 @@  discard block
 block discarded – undo
594 594
 	// Holiday calendar
595 595
 	if ($user->hasRight("holiday", "read")) {
596 596
 		$s .= '
597
-            <div class="nowrap inline-block minheight30"><input type="checkbox" id="check_holiday" name="check_holiday" value="1" class="check_holiday"' . ($check_holiday ? ' checked' : '') . '>
597
+            <div class="nowrap inline-block minheight30"><input type="checkbox" id="check_holiday" name="check_holiday" value="1" class="check_holiday"' . ($check_holiday ? ' checked' : '').'>
598 598
                 <label for="check_holiday" class="labelcalendar">
599
-                    <span class="check_holiday_text">' . $langs->trans("Holidays") . '</span>
599
+                    <span class="check_holiday_text">' . $langs->trans("Holidays").'</span>
600 600
                 </label> &nbsp;
601 601
             </div>';
602 602
 	}
@@ -604,7 +604,7 @@  discard block
 block discarded – undo
604 604
 	// External calendars
605 605
 	if (is_array($showextcals) && count($showextcals) > 0) {
606 606
 		foreach ($showextcals as $val) {
607
-			$htmlname = md5($val['name']);	// not used for security purpose, only to get a string with no special char
607
+			$htmlname = md5($val['name']); // not used for security purpose, only to get a string with no special char
608 608
 
609 609
 			$s .= '<script type="text/javascript">'."\n";
610 610
 			$s .= 'jQuery(document).ready(function () {'."\n";
@@ -705,7 +705,7 @@  discard block
 block discarded – undo
705 705
 }
706 706
 
707 707
 $sql .= " WHERE a.fk_action = ca.id";
708
-$sql .= " AND a.entity IN (".getEntity('agenda').")";	// bookcal is a "virtual view" of agenda
708
+$sql .= " AND a.entity IN (".getEntity('agenda').")"; // bookcal is a "virtual view" of agenda
709 709
 // Condition on actioncode
710 710
 if (!empty($actioncode)) {
711 711
 	if (!getDolGlobalString('AGENDA_USE_EVENT_TYPE')) {
@@ -860,7 +860,7 @@  discard block
 block discarded – undo
860 860
 		// event->datep and event->datef must be GMT date.
861 861
 		if ($event->fulldayevent) {
862 862
 			$tzforfullday = getDolGlobalString('MAIN_STORE_FULL_EVENT_IN_GMT');
863
-			$event->datep = $db->jdate($obj->datep, $tzforfullday ? 'tzuser' : 'tzserver');	// If saved in $tzforfullday = gmt, we must invert date to be in user tz
863
+			$event->datep = $db->jdate($obj->datep, $tzforfullday ? 'tzuser' : 'tzserver'); // If saved in $tzforfullday = gmt, we must invert date to be in user tz
864 864
 			$event->datef = $db->jdate($obj->datep2, $tzforfullday ? 'tzuser' : 'tzserver');
865 865
 		} else {
866 866
 			// 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 @@  discard block
 block discarded – undo
936 936
 			// Loop on each day covered by action to prepare an index to show on calendar
937 937
 			$loop = true;
938 938
 			$j = 0;
939
-			$daykey = dol_mktime(0, 0, 0, $mois, $jour, $annee, 'gmt');	// $mois, $jour, $annee has been set for user tz
940
-			$daykeyend = dol_mktime(0, 0, 0, $moisend, $jourend, $anneeend, 'gmt');	// $moisend, $jourend, $anneeend has been set for user tz
939
+			$daykey = dol_mktime(0, 0, 0, $mois, $jour, $annee, 'gmt'); // $mois, $jour, $annee has been set for user tz
940
+			$daykeyend = dol_mktime(0, 0, 0, $moisend, $jourend, $anneeend, 'gmt'); // $moisend, $jourend, $anneeend has been set for user tz
941 941
 			/*
942 942
 			 print 'GMT '.$event->date_start_in_calendar.' '.dol_print_date($event->date_start_in_calendar, 'dayhour', 'gmt').'<br>';
943 943
 			 print 'TZSERVER '.$event->date_start_in_calendar.' '.dol_print_date($event->date_start_in_calendar, 'dayhour', 'tzserver').'<br>';
@@ -1067,7 +1067,7 @@  discard block
 block discarded – undo
1067 1067
 	$sql .= " AND x.date_debut < '".$db->idate(dol_get_last_day($year, $month))."'";
1068 1068
 	$sql .= " AND x.date_fin >= '".$db->idate(dol_get_first_day($year, $month))."'";
1069 1069
 	if (!$user->hasRight('holiday', 'readall')) {
1070
-		$sql.= " AND x.fk_user IN(".$db->sanitize(implode(", ", $user->getAllChildIds(1))).") ";
1070
+		$sql .= " AND x.fk_user IN(".$db->sanitize(implode(", ", $user->getAllChildIds(1))).") ";
1071 1071
 	}
1072 1072
 
1073 1073
 	$resql = $db->query($sql);
@@ -1139,9 +1139,9 @@  discard block
 block discarded – undo
1139 1139
 					} elseif (in_array($obj->halfday, array(-1, 2)) && $firstdayofholiday) {
1140 1140
 						$newevent->label .= ' ('.$langs->trans("Afternoon").')';
1141 1141
 					}
1142
-					$eventarray[$daykey][] = $newevent;	// We need to use ->gtTypePicto, getXXXon object, so clone must be PHP clone.
1142
+					$eventarray[$daykey][] = $newevent; // We need to use ->gtTypePicto, getXXXon object, so clone must be PHP clone.
1143 1143
 				} else {
1144
-					$eventarray[$daykey][] = $event;	// We can use the event unchanged
1144
+					$eventarray[$daykey][] = $event; // We can use the event unchanged
1145 1145
 				}
1146 1146
 
1147 1147
 				$daykey += 60 * 60 * 24;
@@ -1870,8 +1870,8 @@  discard block
 block discarded – undo
1870 1870
 	// We are in a particular day for $username, now we scan all events
1871 1871
 	foreach ($eventarray as $daykey => $notused) {
1872 1872
 		$annee = (int) dol_print_date($daykey, '%Y', 'tzuserrel');
1873
-		$mois =  (int) dol_print_date($daykey, '%m', 'tzuserrel');
1874
-		$jour =  (int) dol_print_date($daykey, '%d', 'tzuserrel');
1873
+		$mois = (int) dol_print_date($daykey, '%m', 'tzuserrel');
1874
+		$jour = (int) dol_print_date($daykey, '%d', 'tzuserrel');
1875 1875
 		//var_dump("daykey=$daykey day=$day jour=$jour, month=$month mois=$mois, year=$year annee=$annee ".dol_print_date($daykey, 'dayhour', 'gmt'));
1876 1876
 		//var_dump($notused);
1877 1877
 
Please login to merge, or discard this patch.
htdocs/comm/action/index.php 1 patch
Spacing   +24 added lines, -24 removed lines patch added patch discarded remove patch
@@ -50,7 +50,7 @@  discard block
 block discarded – undo
50 50
  */
51 51
 
52 52
 $MAXAGENDA = getDolGlobalString('AGENDA_EXT_NB', 5);
53
-$DELAYFORCACHE = 300;	// 300 seconds
53
+$DELAYFORCACHE = 300; // 300 seconds
54 54
 
55 55
 $disabledefaultvalues = GETPOSTINT('disabledefaultvalues');
56 56
 
@@ -107,7 +107,7 @@  discard block
 block discarded – undo
107 107
 
108 108
 $mode = GETPOST('mode', 'aZ09');
109 109
 if (empty($mode) && preg_match('/show_/', $action)) {
110
-	$mode = $action;	// For backward compatibility
110
+	$mode = $action; // For backward compatibility
111 111
 }
112 112
 $resourceid = GETPOST("search_resourceid", 'int');
113 113
 $year = GETPOSTINT("year") ? GETPOSTINT("year") : date("Y");
@@ -144,8 +144,8 @@  discard block
 block discarded – undo
144 144
 	$status = ((!getDolGlobalString('AGENDA_DEFAULT_FILTER_STATUS') || $disabledefaultvalues) ? '' : getDolGlobalString('AGENDA_DEFAULT_FILTER_STATUS'));
145 145
 }
146 146
 
147
-$defaultview = getDolGlobalString('AGENDA_DEFAULT_VIEW', 'show_month');	// default for app
148
-$defaultview = getDolUserString('AGENDA_DEFAULT_VIEW', $defaultview);	// default for user
147
+$defaultview = getDolGlobalString('AGENDA_DEFAULT_VIEW', 'show_month'); // default for app
148
+$defaultview = getDolUserString('AGENDA_DEFAULT_VIEW', $defaultview); // default for user
149 149
 if (empty($mode) && !GETPOSTISSET('mode')) {
150 150
 	$mode = $defaultview;
151 151
 }
@@ -559,7 +559,7 @@  discard block
 block discarded – undo
559 559
 
560 560
 $viewmode .= '</div>';
561 561
 
562
-$viewmode .= '<span class="marginrightonly"></span>';	// To add a space before the navigation tools
562
+$viewmode .= '<span class="marginrightonly"></span>'; // To add a space before the navigation tools
563 563
 
564 564
 
565 565
 $newparam = '';
@@ -595,7 +595,7 @@  discard block
 block discarded – undo
595 595
 	$sql .= " ON bc.rowid = ba.fk_bookcal_calendar";
596 596
 	$sql .= " WHERE bc.status = 1";
597 597
 	$sql .= " AND ba.status = 1";
598
-	$sql .= " AND bc.entity IN (".getEntity('agenda').")";	// bookcal is a "virtual view" of agenda
598
+	$sql .= " AND bc.entity IN (".getEntity('agenda').")"; // bookcal is a "virtual view" of agenda
599 599
 	if (!empty($filtert) && $filtert != '-1') {
600 600
 		$sql .= " AND bc.visibility IN (".$db->sanitize($filtert, 0, 0, 0, 0).")";
601 601
 	}
@@ -651,9 +651,9 @@  discard block
 block discarded – undo
651 651
 	if ($user->hasRight("holiday", "read")) {
652 652
 		$s .= '
653 653
             <div class="nowrap inline-block minheight30"><input type="checkbox" id="check_holiday" name="check_holiday" value="1" class="check_holiday"' . ($check_holiday
654
-					? ' checked' : '') . '>
654
+					? ' checked' : '').'>
655 655
                 <label for="check_holiday" class="labelcalendar">
656
-                    <span class="check_holiday_text">' . $langs->trans("Holidays") . '</span>
656
+                    <span class="check_holiday_text">' . $langs->trans("Holidays").'</span>
657 657
                 </label> &nbsp;
658 658
             </div>';
659 659
 	}
@@ -679,7 +679,7 @@  discard block
 block discarded – undo
679 679
 		$s .= '</script>'."\n";
680 680
 
681 681
 		foreach ($showextcals as $val) {
682
-			$htmlname = md5($val['name']);	// not used for security purpose, only to get a string with no special char
682
+			$htmlname = md5($val['name']); // not used for security purpose, only to get a string with no special char
683 683
 
684 684
 			if (!empty($val['default']) || GETPOSTINT('check_ext'.$htmlname)) {
685 685
 				$default = "checked";
@@ -777,7 +777,7 @@  discard block
 block discarded – undo
777 777
 	}
778 778
 }
779 779
 $sql .= ' WHERE a.fk_action = ca.id';
780
-$sql .= ' AND a.entity IN ('.getEntity('agenda').')';	// bookcal is a "virtual view" of agenda
780
+$sql .= ' AND a.entity IN ('.getEntity('agenda').')'; // bookcal is a "virtual view" of agenda
781 781
 // Condition on actioncode
782 782
 if (!empty($actioncode)) {
783 783
 	if (!getDolGlobalString('AGENDA_USE_EVENT_TYPE')) {
@@ -928,7 +928,7 @@  discard block
 block discarded – undo
928 928
 		// event->datep and event->datef must be GMT date.
929 929
 		if ($event->fulldayevent) {
930 930
 			$tzforfullday = getDolGlobalString('MAIN_STORE_FULL_EVENT_IN_GMT');
931
-			$event->datep = $db->jdate($obj->datep, $tzforfullday ? 'tzuser' : 'tzserver');	// If saved in $tzforfullday = gmt, we must invert date to be in user tz
931
+			$event->datep = $db->jdate($obj->datep, $tzforfullday ? 'tzuser' : 'tzserver'); // If saved in $tzforfullday = gmt, we must invert date to be in user tz
932 932
 			$event->datef = $db->jdate($obj->datep2, $tzforfullday ? 'tzuser' : 'tzserver');
933 933
 		} else {
934 934
 			// 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 @@  discard block
 block discarded – undo
1006 1006
 			// Loop on each day covered by action to prepare an index to show on calendar
1007 1007
 			$loop = true;
1008 1008
 			$j = 0;
1009
-			$daykey = dol_mktime(0, 0, 0, $mois, $jour, $annee, 'gmt');	// $mois, $jour, $annee has been set for user tz
1010
-			$daykeyend = dol_mktime(0, 0, 0, $moisend, $jourend, $anneeend, 'gmt');	// $moisend, $jourend, $anneeend has been set for user tz
1009
+			$daykey = dol_mktime(0, 0, 0, $mois, $jour, $annee, 'gmt'); // $mois, $jour, $annee has been set for user tz
1010
+			$daykeyend = dol_mktime(0, 0, 0, $moisend, $jourend, $anneeend, 'gmt'); // $moisend, $jourend, $anneeend has been set for user tz
1011 1011
 			/*
1012 1012
 			 print 'GMT '.$event->date_start_in_calendar.' '.dol_print_date($event->date_start_in_calendar, 'dayhour', 'gmt').'<br>';
1013 1013
 			 print 'TZSERVER '.$event->date_start_in_calendar.' '.dol_print_date($event->date_start_in_calendar, 'dayhour', 'tzserver').'<br>';
@@ -1134,7 +1134,7 @@  discard block
 block discarded – undo
1134 1134
 	$sql .= " AND (x.statut = '2' OR x.statut = '3')"; // Show only public leaves (2 = leave wait for approval, 3 = leave approved)
1135 1135
 	if ($mode == 'show_day') {
1136 1136
 		// Request only leaves for the current selected day
1137
-		$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
1137
+		$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
1138 1138
 	} elseif ($mode == 'show_week') {
1139 1139
 		// Restrict on current month (we get more, but we will filter later)
1140 1140
 		$sql .= " AND x.date_debut < '".$db->idate(dol_get_last_day($year, $month))."'";
@@ -1145,7 +1145,7 @@  discard block
 block discarded – undo
1145 1145
 		$sql .= " AND x.date_fin >= '".$db->idate(dol_get_first_day($year, $month))."'";
1146 1146
 	}
1147 1147
 	if (!$user->hasRight('holiday', 'readall')) {
1148
-		$sql.= " AND x.fk_user IN(".$db->sanitize(implode(", ", $user->getAllChildIds(1))).") ";
1148
+		$sql .= " AND x.fk_user IN(".$db->sanitize(implode(", ", $user->getAllChildIds(1))).") ";
1149 1149
 	}
1150 1150
 
1151 1151
 	$resql = $db->query($sql);
@@ -1218,9 +1218,9 @@  discard block
 block discarded – undo
1218 1218
 					} elseif (in_array($obj->halfday, array(-1, 2)) && $firstdayofholiday) {
1219 1219
 						$newevent->label .= ' ('.$langs->trans("Afternoon").')';
1220 1220
 					}
1221
-					$eventarray[$daykey][] = $newevent;	// We need to use ->gtTypePicto, getXXXon object, so clone must be PHP clone.
1221
+					$eventarray[$daykey][] = $newevent; // We need to use ->gtTypePicto, getXXXon object, so clone must be PHP clone.
1222 1222
 				} else {
1223
-					$eventarray[$daykey][] = $event;	// We can use the event unchanged
1223
+					$eventarray[$daykey][] = $event; // We can use the event unchanged
1224 1224
 				}
1225 1225
 
1226 1226
 				$daykey += 60 * 60 * 24;
@@ -1709,7 +1709,7 @@  discard block
 block discarded – undo
1709 1709
 
1710 1710
 	for ($iter_day = 0; $iter_day < 7; $iter_day++) {
1711 1711
 		// Show days of the current week
1712
-		$curtime = dol_time_plus_duree($firstdaytoshow, $iter_day, 'd');		// $firstdaytoshow is in timezone of server
1712
+		$curtime = dol_time_plus_duree($firstdaytoshow, $iter_day, 'd'); // $firstdaytoshow is in timezone of server
1713 1713
 		$tmpday = (int) dol_print_date($curtime, '%d', 'tzuserrel');
1714 1714
 		$tmpmonth = (int) dol_print_date($curtime, '%m', 'tzuserrel');
1715 1715
 		$tmpyear = (int) dol_print_date($curtime, '%Y', 'tzuserrel');
@@ -1944,9 +1944,9 @@  discard block
 block discarded – undo
1944 1944
 	$tmpholiday = new Holiday($db);
1945 1945
 
1946 1946
 	foreach ($eventarray as $daykey => $notused) {		// daykey is the 'YYYYMMDD' to show according to user
1947
-		$annee = (int) dol_print_date($daykey, '%Y', 'gmt');	// We use gmt because we want the value represented by string 'YYYYMMDD'
1948
-		$mois =  (int) dol_print_date($daykey, '%m', 'gmt');	// We use gmt because we want the value represented by string 'YYYYMMDD'
1949
-		$jour =  (int) dol_print_date($daykey, '%d', 'gmt');	// We use gmt because we want the value represented by string 'YYYYMMDD'
1947
+		$annee = (int) dol_print_date($daykey, '%Y', 'gmt'); // We use gmt because we want the value represented by string 'YYYYMMDD'
1948
+		$mois = (int) dol_print_date($daykey, '%m', 'gmt'); // We use gmt because we want the value represented by string 'YYYYMMDD'
1949
+		$jour = (int) dol_print_date($daykey, '%d', 'gmt'); // We use gmt because we want the value represented by string 'YYYYMMDD'
1950 1950
 
1951 1951
 		//print 'event daykey='.$daykey.' dol_print_date(daykey)='.dol_print_date($daykey, 'dayhour', 'gmt').' jour='.$jour.' mois='.$mois.' annee='.$annee."<br>\n";
1952 1952
 		//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 @@  discard block
 block discarded – undo
2216 2216
 								$event->label = $titletoshow;
2217 2217
 								// Note: List of users are inside $event->userassigned. Link may be clickable depending on permissions of user.
2218 2218
 								$titletoshow = (($event->type_picto || $event->type_code) ? $event->getTypePicto() : '');
2219
-								$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 '...'
2219
+								$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 '...'
2220 2220
 								$event->label = $savlabel;
2221 2221
 							}
2222 2222
 
@@ -2260,7 +2260,7 @@  discard block
 block discarded – undo
2260 2260
 									$thirdparty = $cachethirdparties[$thirdparty_id];
2261 2261
 								}
2262 2262
 								if (!empty($thirdparty->id)) {
2263
-									$linerelatedto .= $thirdparty->getNomUrl(1, '', 0, 0, -1, 0, '', 'valignmiddle inline');	// using inline-block make the content completely replace with ... when too large
2263
+									$linerelatedto .= $thirdparty->getNomUrl(1, '', 0, 0, -1, 0, '', 'valignmiddle inline'); // using inline-block make the content completely replace with ... when too large
2264 2264
 								}
2265 2265
 							}
2266 2266
 							if (!empty($contact_id) && $contact_id > 0) {
@@ -2275,7 +2275,7 @@  discard block
 block discarded – undo
2275 2275
 									$linerelatedto .= '&nbsp;';
2276 2276
 								}
2277 2277
 								if (!empty($contact->id)) {
2278
-									$linerelatedto .= $contact->getNomUrl(1, '', 0, '', -1, 0, 'valignmiddle inline');	// using inline-block make the content completely replace with ... when too large
2278
+									$linerelatedto .= $contact->getNomUrl(1, '', 0, '', -1, 0, 'valignmiddle inline'); // using inline-block make the content completely replace with ... when too large
2279 2279
 								}
2280 2280
 							}
2281 2281
 							if (!empty($event->fk_element) && $event->fk_element > 0 && !empty($event->elementtype) && getDolGlobalString('AGENDA_SHOW_LINKED_OBJECT')) {
Please login to merge, or discard this patch.