chamilo
/
chamilo-lms
mirror of https://github.com/chamilo/chamilo-lms/tree/1.11.x
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Adding UTC in the api_strtotime function in order to get the correct date see BT#3601 #4263

Browse Source
skala
Julio Montoya 13 years ago
parent 56d372d93e
commit efa519970b
12 changed files with 28 additions and 49 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 2
      main/attendance/attendance_calendar.php
  2. 10
      main/attendance/attendance_controller.php
  3. 2
      main/exercice/exercise.lib.php
  4. 4
      main/gradebook/lib/gradebook_data_generator.class.php
  5. 15
      main/inc/ajax/course_home.ajax.php
  6. 28
      main/inc/lib/attendance.lib.php
  7. 4
      main/inc/lib/chat.lib.php
  8. 4
      main/inc/lib/main_api.lib.php
  9. 2
      main/inc/lib/sessionmanager.lib.php
  10. 2
      main/inc/lib/tracking.lib.php
  11. 2
      main/inc/lib/userportal.lib.php
  12. 2
      main/session/index.php

2
main/attendance/attendance_calendar.php
Unescape View File

@ -52,7 +52,7 @@ if (isset($action) && $action == 'calendar_add') {
echo '<h4>'.get_lang('AddADateTime').'</h4>';
$form = new FormValidator('attendance_calendar_add','POST','index.php?action=calendar_add&attendance_id='.$attendance_id.$param_gradebook.'&'.api_get_cidreq(),'');
$form->addElement('datepicker', 'date_time', '', array('form_name'=>'attendance_calendar_add'), 5);
$defaults['date_time'] = date('Y-m-d H:i',api_strtotime(api_get_local_time()));
$defaults['date_time'] = date('Y-m-d H:i', api_strtotime(api_get_local_time()));
$form->addElement('html','<br /><br />');

10
main/attendance/attendance_controller.php
Unescape View File

@ -299,18 +299,16 @@
if (strtoupper($_SERVER['REQUEST_METHOD']) == "POST") {
if (!isset($_POST['cancel'])) {
if (isset($_POST['repeat'])) {
error_log($attendance->build_datetime_from_array($_POST['date_time']));
//$start_datetime = api_strtotime($attendance->build_datetime_from_array($_POST['date_time']));
//@todo check this error_logs
$start_datetime = api_strtotime(api_get_utc_datetime($attendance->build_datetime_from_array($_POST['date_time'])),'UTC');
error_log('$start_datetime '.$start_datetime);
//error_log('$start_datetime '.$start_datetime);
$_POST['end_date_time']['H'] = $_POST['date_time']['H'];
$_POST['end_date_time']['i'] = $_POST['date_time']['i'];
error_log($attendance->build_datetime_from_array($_POST['end_date_time']));
//error_log($attendance->build_datetime_from_array($_POST['end_date_time']));
$end_datetime = api_strtotime(api_get_utc_datetime($attendance->build_datetime_from_array($_POST['end_date_time'])),'UTC');
error_log('$end_datetime '.$end_datetime);
//error_log('$end_datetime '.$end_datetime);
$checkdate = checkdate($_POST['end_date_time']['F'], $_POST['end_date_time']['d'], $_POST['end_date_time']['Y']);
$repeat_type = $_POST['repeat_type'];

2
main/exercice/exercise.lib.php
Unescape View File

@ -1541,7 +1541,7 @@ function get_exercises_to_be_taken($course_code, $session_id) {
$result = array();
$now = time() + 15*24*60*60;
foreach($exercises as $exercise_item) {
if (isset($exercise_item['end_time']) && !empty($exercise_item['end_time']) && $exercise_item['end_time'] != '0000-00-00 00:00:00' && api_strtotime($exercise_item['end_time']) < $now) {
if (isset($exercise_item['end_time']) && !empty($exercise_item['end_time']) && $exercise_item['end_time'] != '0000-00-00 00:00:00' && api_strtotime($exercise_item['end_time'], 'UTC') < $now) {
$result[] = $exercise_item;
}
}

4
main/gradebook/lib/gradebook_data_generator.class.php
Unescape View File

@ -164,7 +164,7 @@ class GradebookDataGenerator
} else {
$date = $item1->get_date();
if (!empty($date)) {
$timestamp1 = api_strtotime($date);
$timestamp1 = api_strtotime($date, 'UTC');
} else {
$timestamp1 = null;
}
@ -173,7 +173,7 @@ class GradebookDataGenerator
if(is_int($item2->get_date())) {
$timestamp2 = $item2->get_date();
} else {
$timestamp2 = api_strtotime($item2->get_date());
$timestamp2 = api_strtotime($item2->get_date(), 'UTC');
}
if ($timestamp1 == $timestamp2) {

15
main/inc/ajax/course_home.ajax.php
Unescape View File

@ -7,7 +7,6 @@
$action = $_GET['a'];
$now = time();
switch ($action) {
case 'set_visibility':
require_once '../global.inc.php';
@ -174,13 +173,13 @@ switch ($action) {
//Checking LP publicated and expired_on dates
if (!empty($lp_item['publicated_on']) && $lp_item['publicated_on'] != '0000-00-00 00:00:00') {
if ($now < api_strtotime($lp_item['publicated_on'])) {
if ($now < api_strtotime($lp_item['publicated_on'], 'UTC')) {
continue;
}
}
if (!empty($lp_item['expired_on']) && $lp_item['expired_on'] != '0000-00-00 00:00:00') {
if ($now > api_strtotime($lp_item['expired_on'])) {
if ($now > api_strtotime($lp_item['expired_on'], 'UTC')) {
continue;
}
}
@ -297,8 +296,8 @@ switch ($action) {
//Checking LP publicated and expired_on dates
if (!empty($lp_item['publicated_on']) && $lp_item['publicated_on'] != '0000-00-00 00:00:00') {
$week_data = date('Y', api_strtotime($lp_item['publicated_on'])).' - '.get_week_from_day($lp_item['publicated_on']);
if ($now < api_strtotime($lp_item['publicated_on'])) {
$week_data = date('Y', api_strtotime($lp_item['publicated_on'], 'UTC')).' - '.get_week_from_day($lp_item['publicated_on']);
if ($now < api_strtotime($lp_item['publicated_on'], 'UTC')) {
continue;
}
} else {
@ -306,7 +305,7 @@ switch ($action) {
}
if (!empty($lp_item['expired_on']) && $lp_item['expired_on'] != '0000-00-00 00:00:00') {
if ($now > api_strtotime($lp_item['expired_on'])) {
if ($now > api_strtotime($lp_item['expired_on'], 'UTC')) {
continue;
}
}
@ -420,12 +419,12 @@ switch ($action) {
//Checking LP publicated and expired_on dates
if (!empty($lp_item['publicated_on']) && $lp_item['publicated_on'] != '0000-00-00 00:00:00') {
if ($now < api_strtotime($lp_item['publicated_on'])) {
if ($now < api_strtotime($lp_item['publicated_on'], 'UTC')) {
continue;
}
}
if (!empty($lp_item['expired_on']) && $lp_item['expired_on'] != '0000-00-00 00:00:00') {
if ($now > api_strtotime($lp_item['expired_on'])) {
if ($now > api_strtotime($lp_item['expired_on'], 'UTC')) {
continue;
}
}

28
main/inc/lib/attendance.lib.php
Unescape View File

@ -941,8 +941,7 @@ class Attendance
$tbl_attendance_calendar = Database::get_course_table(TABLE_ATTENDANCE_CALENDAR);
$attendance_id = intval($attendance_id);
$course_id = api_get_course_int_id();
$sql = "SELECT * FROM $tbl_attendance_calendar WHERE c_id = $course_id AND attendance_id = '$attendance_id' ";
$filter_where = '';
$sql = "SELECT * FROM $tbl_attendance_calendar WHERE c_id = $course_id AND attendance_id = '$attendance_id' ";
if (!in_array($type, array('today', 'all', 'all_done', 'all_not_done','calendar_id'))) {
$type = 'all';
}
@ -976,10 +975,10 @@ class Attendance
$row['date_time'] = api_get_local_time($row['date_time']);
$row['date'] = api_format_date($row['date_time'], DATE_FORMAT_SHORT);
$row['time'] = api_format_date($row['date_time'], TIME_NO_SEC_FORMAT);
if ($type == 'today') {
if (date('d-m-Y', api_strtotime($row['date_time'])) == date('d-m-Y', api_strtotime(api_get_local_time()))) {
if ($type == 'today') {
if (date('d-m-Y', api_strtotime($row['date_time'], 'UTC')) == date('d-m-Y', time())) {
$data[] = $row;
}
}
} else {
$data[] = $row;
}
@ -1147,24 +1146,7 @@ class Attendance
$this->set_date_time($datetimezone);
$res = $this->attendance_calendar_add($attendance_id);
$j++;
}
//$next_start = $this->add_month($start_date);
/*
$next_start = api_strtotime(api_get_utc_date_add(api_get_utc_datetime($start_date), 0 , 1),'UTC');
error_log('22-->$start_date '.$start_date);
error_log('$next_start '.$next_start);
error_log('$end_date '.$end_date);
while($next_start <= $end_date) {
//$datetime = date('Y-m-d H:i:s', $next_start);
$datetimezone = api_get_utc_datetime($next_start);
error_log('$datetimezone n loop '.$datetimezone);
$this->set_date_time($datetimezone);
$res = $this->attendance_calendar_add($attendance_id);
//$next_start = $this->add_month($next_start);
$next_start = api_strtotime(api_get_utc_date_add(api_get_utc_datetime($next_start), 0 , 1),'UTC');
error_log('$next_start in loop '.$next_start);
}*/
}
break;
}
}

4
main/inc/lib/chat.lib.php
Unescape View File

@ -93,7 +93,7 @@ class Chat extends Model {
'id' => $chat['id']
);
$items[$from_user_id][] = $item;
$_SESSION['openChatBoxes'][$from_user_id] = api_strtotime($chat['sent']);
$_SESSION['openChatBoxes'][$from_user_id] = api_strtotime($chat['sent'],'UTC');
}
$_SESSION['chatHistory'][$from_user_id][] = $item;
@ -106,7 +106,7 @@ class Chat extends Model {
$time = api_convert_and_format_date($time, DATE_TIME_FORMAT_SHORT_TIME_FIRST);
$message = sprintf(get_lang('SentAtX'), $time);
if ($now > 180) {
if ($now > 180) {
$item = array('s' => '2', 'f' => $user_id, 'm' => $message);
if (isset($_SESSION['chatHistory'][$user_id])) {

4
main/inc/lib/main_api.lib.php
Unescape View File

@ -1735,7 +1735,7 @@ function api_get_session_visibility($session_id) {
//If datestart is set
if (!empty($row['date_start']) && $row['date_start'] != '0000-00-00') {
$row['date_start'] = $row['date_start'].' 00:00:00';
if ($time > api_strtotime($row['date_start'])) {
if ($time > api_strtotime($row['date_start'], 'UTC')) {
$visibility = SESSION_AVAILABLE;
} else {
$visibility = SESSION_INVISIBLE;
@ -1749,7 +1749,7 @@ function api_get_session_visibility($session_id) {
if ($visibility == SESSION_AVAILABLE) {
$visibility = $row['visibility'];
/*
if ($time < api_strtotime($row['date_end'])) {
if ($time < api_strtotime($row['date_end'], 'UTC')) {
$visibility = $row['visibility'];
} else {
$visibility = $row['visibility'];

2
main/inc/lib/sessionmanager.lib.php
Unescape View File

@ -220,7 +220,7 @@ class SessionManager {
}
$today = api_get_utc_datetime();
$today = api_strtotime($today);
$today = api_strtotime($today, 'UTC');
$today = date('Y-m-d', $today);
$select = "SELECT * FROM (SELECT

2
main/inc/lib/tracking.lib.php
Unescape View File

@ -2287,7 +2287,7 @@ class Tracking {
}
//$user_results[] = 100;
$user_results[] = $score;
$time = api_strtotime($exercise_data['start_time']) ? api_strtotime($exercise_data['start_time']) : 0;
$time = api_strtotime($exercise_data['start_time']) ? api_strtotime($exercise_data['start_time'], 'UTC') : 0;
$all_exercise_start_time[] = $time ;
$all_user_results[] = $score;
if (count($exercise_list)<=10) {

2
main/inc/lib/userportal.lib.php
Unescape View File

@ -80,7 +80,7 @@ class IndexManager {
foreach($exercises as $exercise_item) {
$exercise_item['course_code'] = $course_code;
$exercise_item['session_id'] = $session_id;
$exercise_item['tms'] = api_strtotime($exercise_item['end_time']);
$exercise_item['tms'] = api_strtotime($exercise_item['end_time'], 'UTC');
$exercise_list[] = $exercise_item;
}

2
main/session/index.php
Unescape View File

@ -185,7 +185,7 @@ foreach($final_array as $session_data) {
} else {
//We check the date validation of the exercise if the user can make it
if ($exercise_info->start_time != '0000-00-00 00:00:00') {
$allowed_time = api_strtotime($exercise_info->start_time);
$allowed_time = api_strtotime($exercise_info->start_time, 'UTC');
if ($now < $allowed_time) {
continue;
}

Write Preview
Loading…
Cancel
Save