Browse Source

Merge pull request #713 from AngelFQC/fix-session-date

Fix session dates in queries
Angel Fernando Quiroz Campos 9 years ago
parent
commit
a98bc5a62e

+ 2 - 2
main/inc/ajax/model.ajax.php

@@ -888,8 +888,8 @@ switch ($action) {
             'nbr_courses',
             'nbr_users',
             'category_name',
-            'date_start',
-            'date_end',
+            'access_start_date',
+            'access_end_date',
             'coach_name',
             'session_active',
             'visibility'

+ 20 - 20
main/inc/lib/api.lib.php

@@ -2218,8 +2218,8 @@ function api_get_session_visibility(
             $visibility = $original_visibility = $row['visibility'];
 
             // I don't care the session visibility.
-            if ($row['date_start'] == '0000-00-00' &&
-                $row['date_end'] == '0000-00-00'
+            if ($row['access_start_date'] == '0000-00-00' &&
+                $row['access_end_date'] == '0000-00-00'
             ) {
 
                 // Session duration per student.
@@ -2263,10 +2263,10 @@ function api_get_session_visibility(
                 return SESSION_AVAILABLE;
             } else {
                 // If start date was set.
-                if (!empty($row['date_start']) && $row['date_start'] != '0000-00-00') {
+                if (!empty($row['access_start_date']) && $row['access_start_date'] != '0000-00-00') {
                     // The beginning of the day starts at 00:00:00
-                    $row['date_start'] = $row['date_start'].' 00:00:00';
-                    if ($now > api_strtotime($row['date_start'], 'UTC')) {
+                    $row['access_start_date'] = $row['access_start_date'].' 00:00:00';
+                    if ($now > api_strtotime($row['access_start_date'], 'UTC')) {
                         $visibility = SESSION_AVAILABLE;
                     } else {
                         $visibility = SESSION_INVISIBLE;
@@ -2274,13 +2274,13 @@ function api_get_session_visibility(
                 }
 
                 // If the end date was set.
-                if (!empty($row['date_end']) && $row['date_end'] != '0000-00-00') {
+                if (!empty($row['access_end_date']) && $row['access_end_date'] != '0000-00-00') {
                     // End date finish at midnight.
-                    $row['date_end'] = $row['date_end'].' 23:59:59';
+                    $row['access_end_date'] = $row['access_end_date'].' 23:59:59';
 
-                    // Only if date_start said that it was ok
+                    // Only if access_start_date said that it was ok
                     if ($visibility == SESSION_AVAILABLE) {
-                        if ($now < api_strtotime($row['date_end'], 'UTC')) {
+                        if ($now < api_strtotime($row['access_end_date'], 'UTC')) {
                             // Date still available
                             $visibility = SESSION_AVAILABLE;
                         } else {
@@ -2297,12 +2297,12 @@ function api_get_session_visibility(
 
             if ($is_coach) {
                 // Test end date.
-                if (isset($row['date_end']) &&
-                    !empty($row['date_end']) &&
-                    $row['date_end'] != '0000-00-00' &&
+                if (isset($row['access_end_date']) &&
+                    !empty($row['access_end_date']) &&
+                    $row['access_end_date'] != '0000-00-00' &&
                     $row['nb_days_access_after_end'] != '0'
                 ) {
-                    $end_date_for_coach = new DateTime(substr($row['date_end'], 0 ,10).' 23:59:59');
+                    $end_date_for_coach = new DateTime(substr($row['access_end_date'], 0 ,10).' 23:59:59');
                     $number_of_days = "P".intval($row['nb_days_access_after_end']).'D';
                     $end_date_for_coach->add(new DateInterval($number_of_days));
 
@@ -2314,12 +2314,12 @@ function api_get_session_visibility(
                 }
 
                 // Test start date.
-                if (isset($row['date_start']) &&
-                    !empty($row['date_start']) &&
-                    $row['date_start'] != '0000-00-00' &&
+                if (isset($row['access_start_date']) &&
+                    !empty($row['access_start_date']) &&
+                    $row['access_start_date'] != '0000-00-00' &&
                     $row['nb_days_access_before_beginning'] != '0'
                 ) {
-                    $start_date_for_coach = new DateTime(substr($row['date_start'], 0, 10).' 00:00:00');
+                    $start_date_for_coach = new DateTime(substr($row['access_start_date'], 0, 10).' 00:00:00');
                     $number_of_days = "P".intval($row['nb_days_access_before_beginning']).'D';
                     $start_date_for_coach->sub(new DateInterval($number_of_days));
                     if ($start_date_for_coach->getTimestamp() < $now) {
@@ -2793,7 +2793,7 @@ function api_is_coach($session_id = 0, $courseId = null, $check_student_view = t
     $sessionIsCoach = null;
 
     if (!empty($course_code)) {
-        $sql = "SELECT DISTINCT s.id, name, date_start, date_end
+        $sql = "SELECT DISTINCT s.id, name, access_start_date, access_end_date
                 FROM $session_table s
                 INNER JOIN $session_rel_course_rel_user_table session_rc_ru
                 ON session_rc_ru.session_id = s.id AND session_rc_ru.user_id = '".$userId."'
@@ -2806,10 +2806,10 @@ function api_is_coach($session_id = 0, $courseId = null, $check_student_view = t
     }
 
     if (!empty($session_id)) {
-        $sql = "SELECT DISTINCT id, name, date_start, date_end
+        $sql = "SELECT DISTINCT id, name, access_start_date, access_end_date
                 FROM $session_table
                 WHERE session.id_coach =  '".$userId."' AND id = '$session_id'
-                ORDER BY date_start, date_end, name";
+                ORDER BY access_start_date, access_end_date, name";
         $result = Database::query($sql);
         if (!empty($sessionIsCoach)) {
             $sessionIsCoach = array_merge($sessionIsCoach , Database::store_result($result));

+ 51 - 51
main/inc/lib/sessionmanager.lib.php

@@ -178,8 +178,8 @@ class SessionManager
             if ($ready_to_create) {
                 $values = array(
                     'name' => $name,
-                    'date_start' => $date_start,
-                    'date_end' => $date_end,
+                    'access_start_date' => $date_start,
+                    'access_end_date' => $date_end,
                     'id_coach' => $id_coach,
                     'session_admin_id' => api_get_user_id(),
                     'nb_days_access_before_beginning' => $nb_days_acess_before,
@@ -199,8 +199,8 @@ class SessionManager
 
                 if (!empty($duration)) {
                     $sql = "UPDATE $tbl_session SET
-                              date_start = '0000-00-00',
-                              date_end = '0000-00-00',
+                              access_start_date = '0000-00-00',
+                              access_end_date = '0000-00-00',
                               duration = $duration
                             WHERE id = $session_id";
                     Database::query($sql);
@@ -325,12 +325,12 @@ class SessionManager
         $sql = "SELECT COUNT(id) as total_rows FROM (
                 SELECT DISTINCT
                  IF (
-					(s.date_start <= '$today' AND '$today' <= s.date_end) OR
-                    (s.nb_days_access_before_beginning > 0 AND DATEDIFF(s.date_start, '$today') <= s.nb_days_access_before_beginning) OR
-                    (s.nb_days_access_after_end > 0 AND DATEDIFF('$today',s.date_end) <= s.nb_days_access_after_end) OR
-                    (s.date_start  = '0000-00-00' AND s.date_end  = '0000-00-00' ) OR
-					(s.date_start <= '$today' AND '0000-00-00' = s.date_end) OR
-					('$today' <= s.date_end AND '0000-00-00' = s.date_start)
+					(s.access_start_date <= '$today' AND '$today' <= s.access_end_date) OR
+                    (s.nb_days_access_before_beginning > 0 AND DATEDIFF(s.access_start_date, '$today') <= s.nb_days_access_before_beginning) OR
+                    (s.nb_days_access_after_end > 0 AND DATEDIFF('$today',s.access_end_date) <= s.nb_days_access_after_end) OR
+                    (s.access_start_date  = '0000-00-00' AND s.access_end_date  = '0000-00-00' ) OR
+					(s.access_start_date <= '$today' AND '0000-00-00' = s.access_end_date) OR
+					('$today' <= s.access_end_date AND '0000-00-00' = s.access_start_date)
 				, 1, 0) as session_active,
                 s.id
                 FROM $tbl_session s
@@ -349,12 +349,12 @@ class SessionManager
                 $sql = "SELECT count(id) as total_rows FROM (
                 SELECT DISTINCT
                   IF (
-					(s.date_start <= '$today' AND '$today' <= s.date_end) OR
-                    (s.nb_days_access_before_beginning > 0 AND DATEDIFF(s.date_start, '$today') <= s.nb_days_access_before_beginning) OR
-                    (s.nb_days_access_after_end > 0 AND DATEDIFF('$today',s.date_end) <= s.nb_days_access_after_end) OR
-                    (s.date_start  = '0000-00-00' AND s.date_end  = '0000-00-00' ) OR
-					(s.date_start <= '$today' AND '0000-00-00' = s.date_end) OR
-					('$today' <= s.date_end AND '0000-00-00' = s.date_start)
+					(s.access_start_date <= '$today' AND '$today' <= s.access_end_date) OR
+                    (s.nb_days_access_before_beginning > 0 AND DATEDIFF(s.access_start_date, '$today') <= s.nb_days_access_before_beginning) OR
+                    (s.nb_days_access_after_end > 0 AND DATEDIFF('$today',s.access_end_date) <= s.nb_days_access_after_end) OR
+                    (s.access_start_date  = '0000-00-00' AND s.access_end_date  = '0000-00-00' ) OR
+					(s.access_start_date <= '$today' AND '0000-00-00' = s.access_end_date) OR
+					('$today' <= s.access_end_date AND '0000-00-00' = s.access_start_date)
 				, 1, 0)
 				as session_active,
 				s.id
@@ -445,19 +445,19 @@ class SessionManager
 
         $select = "SELECT DISTINCT * FROM (SELECT
                 IF (
-					(s.date_start <= '$today' AND '$today' <= s.date_end) OR
-                    (s.nb_days_access_before_beginning > 0 AND DATEDIFF(s.date_start,'" . $today . "' " . ") <= s.nb_days_access_before_beginning) OR
-                    (s.nb_days_access_after_end > 0 AND DATEDIFF('" . $today . "',s.date_end) <= s.nb_days_access_after_end) OR
-                    (s.date_start  = '0000-00-00' AND s.date_end  = '0000-00-00' ) OR
-					(s.date_start <= '$today' AND '0000-00-00' = s.date_end) OR
-					('$today' <= s.date_end AND '0000-00-00' = s.date_start)
+					(s.access_start_date <= '$today' AND '$today' <= s.access_end_date) OR
+                    (s.nb_days_access_before_beginning > 0 AND DATEDIFF(s.access_start_date,'" . $today . "' " . ") <= s.nb_days_access_before_beginning) OR
+                    (s.nb_days_access_after_end > 0 AND DATEDIFF('" . $today . "',s.access_end_date) <= s.nb_days_access_after_end) OR
+                    (s.access_start_date  = '0000-00-00' AND s.access_end_date  = '0000-00-00' ) OR
+					(s.access_start_date <= '$today' AND '0000-00-00' = s.access_end_date) OR
+					('$today' <= s.access_end_date AND '0000-00-00' = s.access_start_date)
 				, 1, 0)
 				as session_active,
 				s.name,
                 nbr_courses,
                 s.nbr_users,
-                s.date_start,
-                s.date_end,
+                s.access_start_date,
+                s.access_end_date,
                 $coach_name,
                 sc.name as category_name,
                 s.visibility,
@@ -510,7 +510,7 @@ class SessionManager
                 $session['name'] = Display::url($session['name'], "resume_session.php?id_session=" . $session['id']);
                 $session['coach_name'] = Display::url($session['coach_name'], "user_information.php?user_id=" . $session['user_id']);
 
-                if ($session['date_start'] == '0000-00-00' && $session['date_end'] == '0000-00-00') {
+                if ($session['access_start_date'] == '0000-00-00' && $session['access_end_date'] == '0000-00-00') {
                     // $session['session_active'] = 1;
                 }
 
@@ -520,11 +520,11 @@ class SessionManager
                     $session['session_active'] = Display::return_icon('error.png', get_lang('Inactive'), array(), ICON_SIZE_SMALL);
                 }
 
-                if ($session['date_start'] == '0000-00-00') {
-                    $session['date_start'] = '';
+                if ($session['access_start_date'] == '0000-00-00') {
+                    $session['access_start_date'] = '';
                 }
-                if ($session['date_end'] == '0000-00-00') {
-                    $session['date_end'] = '';
+                if ($session['access_end_date'] == '0000-00-00') {
+                    $session['access_end_date'] = '';
                 }
 
                 switch ($session['visibility']) {
@@ -1436,8 +1436,8 @@ class SessionManager
                 $values['duration'] = $duration;
 
                 $values['name'] = $name;
-                $values['date_start'] = $date_start;
-                $values['date_end'] = $date_end;
+                $values['access_start_date'] = $date_start;
+                $values['access_end_date'] = $date_end;
                 $values['id_coach'] = $id_coach;
                 $values['nb_days_access_before_beginning'] = $nb_days_acess_before;
                 $values['nb_days_access_after_end'] = $nb_days_acess_after;
@@ -2434,8 +2434,8 @@ class SessionManager
                     s.id,
                     s.name,
                     s.nbr_courses,
-                    s.date_start,
-                    s.date_end,
+                    s.access_start_date,
+                    s.access_end_date,
                     u.firstname,
                     u.lastname,
                     sc.name as category_name,
@@ -3417,12 +3417,12 @@ class SessionManager
     {
         $id = intval($id);
         $s = self::fetch($id);
-        $s['year_start'] = substr($s['date_start'], 0, 4);
-        $s['month_start'] = substr($s['date_start'], 5, 2);
-        $s['day_start'] = substr($s['date_start'], 8, 2);
-        $s['year_end'] = substr($s['date_end'], 0, 4);
-        $s['month_end'] = substr($s['date_end'], 5, 2);
-        $s['day_end'] = substr($s['date_end'], 8, 2);
+        $s['year_start'] = substr($s['access_start_date'], 0, 4);
+        $s['month_start'] = substr($s['access_start_date'], 5, 2);
+        $s['day_start'] = substr($s['access_start_date'], 8, 2);
+        $s['year_end'] = substr($s['access_end_date'], 0, 4);
+        $s['month_end'] = substr($s['access_end_date'], 5, 2);
+        $s['day_end'] = substr($s['access_end_date'], 8, 2);
         $consider_start = true;
         if ($s['year_start'] . '-' . $s['month_start'] . '-' . $s['day_start'] == '0000-00-00') {
             $consider_start = false;
@@ -3926,8 +3926,8 @@ class SessionManager
                     $sql = "INSERT IGNORE INTO $tbl_session SET
                             name = '" . $session_name . "',
                             id_coach = '$coach_id',
-                            date_start = '$date_start',
-                            date_end = '$date_end',
+                            access_start_date = '$date_start',
+                            access_end_date = '$date_end',
                             visibility = '$visibilityAfterExpirationPerSession',
                             $sessionCondition
                             session_admin_id = " . intval($defaultUserId) . $extraParameters . $extraSessionParameters;
@@ -3967,8 +3967,8 @@ class SessionManager
                         $sql = "INSERT IGNORE INTO $tbl_session SET
                                 name = '$session_name',
                                 id_coach = '$coach_id',
-                                date_start = '$date_start',
-                                date_end = '$date_end',
+                                access_start_date = '$date_start',
+                                access_end_date = '$date_end',
                                 visibility = '$visibilityAfterExpirationPerSession',
                                 session_category_id = '$session_category_id' " . $extraParameters . $extraSessionParameters;
 
@@ -4014,8 +4014,8 @@ class SessionManager
                         // Updating the session.
                         $params = array(
                             'id_coach' => $coach_id,
-                            'date_start' => $date_start,
-                            'date_end' => $date_end,
+                            'access_start_date' => $date_start,
+                            'access_end_date' => $date_end,
                             'visibility' => $visibilityAfterExpirationPerSession,
                             'session_category_id' => $session_category_id
                         );
@@ -5427,19 +5427,19 @@ class SessionManager
      */
     public static function getSessionFormattedDate($sessionInfo)
     {
-        if ($sessionInfo['date_start'] == '0000-00-00' && $sessionInfo['date_end'] == '0000-00-00') {
+        if ($sessionInfo['access_start_date'] == '0000-00-00' && $sessionInfo['access_end_date'] == '0000-00-00') {
             return get_lang('NoTimeLimits');
         } else {
-            if ($sessionInfo['date_start'] != '0000-00-00') {
-                $startDate = get_lang('From') . ' ' . api_format_date($sessionInfo['date_start'], DATE_FORMAT_LONG_NO_DAY);
+            if ($sessionInfo['access_start_date'] != '0000-00-00') {
+                $startDate = get_lang('From') . ' ' . api_format_date($sessionInfo['access_start_date'], DATE_FORMAT_LONG_NO_DAY);
             } else {
                 $startDate = '';
             }
 
-            if ($sessionInfo['date_end'] == '0000-00-00') {
+            if ($sessionInfo['access_end_date'] == '0000-00-00') {
                 $endDate = '';
             } else {
-                $endDate = get_lang('Until') . ' ' . api_format_date($sessionInfo['date_end'], DATE_FORMAT_LONG_NO_DAY);
+                $endDate = get_lang('Until') . ' ' . api_format_date($sessionInfo['access_end_date'], DATE_FORMAT_LONG_NO_DAY);
             }
 
             return "$startDate $endDate";
@@ -5680,7 +5680,7 @@ class SessionManager
             $extraFieldType = \Chamilo\CoreBundle\Entity\ExtraField::SESSION_FIELD_TYPE;
             // Get the session list from session category and target
             $sessionList = Database::select(
-                'id, name, date_start, date_end',
+                'id, name, access_start_date, access_end_date',
                 $sTable,
                 array(
                     'where' => array(

+ 10 - 10
main/inc/lib/usermanager.lib.php

@@ -2272,7 +2272,7 @@ class UserManager
      */
     public static function get_sessions_by_category(
         $user_id,
-        $is_time_over = false,
+        $is_time_over = true,
         $ignore_visibility_for_admins = false
     ) {
         // Database Table Definitions
@@ -2290,8 +2290,8 @@ class UserManager
         $sql = "SELECT DISTINCT
                     session.id,
                     session.name,
-                    session.date_start,
-                    session.date_end,
+                    session.access_start_date,
+                    session.access_end_date,
                     session_category_id,
                     session_category.name as session_category_name,
                     session_category.date_start session_category_date_start,
@@ -2319,13 +2319,13 @@ class UserManager
                 // User portal filters:
                 if ($is_time_over) {
                     // History
-                    if (isset($row['date_end']) && $row['date_end'] != '0000-00-00') {
-                        if ($row['date_end'].' 23:59:59' > $now) {
+                    if (isset($row['access_end_date']) && $row['access_end_date'] != '0000-00-00') {
+                        if ($row['access_end_date'].' 23:59:59' > $now) {
                             continue;
                         }
                     }
 
-                    if ($row['date_end'] == '0000-00-00') {
+                    if ($row['access_end_date'] == '0000-00-00') {
                         continue;
                     }
                 } else {
@@ -2333,8 +2333,8 @@ class UserManager
                     if (api_is_allowed_to_create_course()) {
                         // Teachers can access the session depending in the access_coach date
                     } else {
-                        if (isset($row['date_end']) && $row['date_end'] != '0000-00-00') {
-                            if ($row['date_end'].' 23:59:59' <= $now) {
+                        if (isset($row['access_end_date']) && $row['access_end_date'] != '0000-00-00') {
+                            if ($row['access_end_date'].' 23:59:59' <= $now) {
                                 continue;
                             }
                         }
@@ -2401,8 +2401,8 @@ class UserManager
                 $categories[$row['session_category_id']]['sessions'][$row['id']] = array(
                     'session_name' => $row['name'],
                     'session_id' => $row['id'],
-                    'date_start' => $row['date_start'],
-                    'date_end' => $row['date_end'],
+                    'date_start' => $row['access_start_date'],
+                    'date_end' => $row['access_end_date'],
                     'nb_days_access_before_beginning' => $row['nb_days_access_before_beginning'],
                     'nb_days_access_after_end' => $row['nb_days_access_after_end'],
                     'courses' => $courseList

+ 6 - 6
main/session/index.php

@@ -363,13 +363,13 @@ if (!empty($new_exercises)) {
 
 $start = $end = $start_only = $end_only ='';
 
-if (!empty($session_info['date_start']) && $session_info['date_start'] != '0000-00-00') {
-    $start = api_convert_and_format_date($session_info['date_start'], DATE_FORMAT_SHORT);
-    $start_only = get_lang('From').' '.$session_info['date_start'];
+if (!empty($session_info['access_start_date']) && $session_info['access_start_date'] != '0000-00-00') {
+    $start = api_convert_and_format_date($session_info['access_start_date'], DATE_FORMAT_SHORT);
+    $start_only = get_lang('From').' '.$session_info['access_start_date'];
 }
-if (!empty($session_info['date_start']) && $session_info['date_end'] != '0000-00-00') {
-    $end = api_convert_and_format_date($session_info['date_end'], DATE_FORMAT_SHORT);
-    $end_only = get_lang('Until').' '.$session_info['date_end'];
+if (!empty($session_info['access_start_date']) && $session_info['access_end_date'] != '0000-00-00') {
+    $end = api_convert_and_format_date($session_info['access_end_date'], DATE_FORMAT_SHORT);
+    $end_only = get_lang('Until').' '.$session_info['access_end_date'];
 }
 
 if (!empty($start) && !empty($end)) {

+ 2 - 2
main/session/resume_session.php

@@ -46,8 +46,8 @@ $sql = 'SELECT
             nbr_courses,
             nbr_users,
             nbr_classes,
-            DATE_FORMAT(date_start,"%d-%m-%Y") as date_start,
-            DATE_FORMAT(date_end,"%d-%m-%Y") as date_end,
+            DATE_FORMAT(access_start_date,"%d-%m-%Y") as date_start,
+            DATE_FORMAT(access_end_date,"%d-%m-%Y") as date_end,
             lastname,
             firstname,
             username,

+ 6 - 4
main/session/session_edit.php

@@ -23,6 +23,8 @@ $id = intval($_GET['id']);
 SessionManager::protectSession($id);
 
 $infos = SessionManager::fetch($id);
+$infos['access_start_date'] = api_format_date($infos['access_start_date'], '%Y-%m-%d');
+$infos['access_end_date'] = api_format_date($infos['access_end_date'], '%Y-%m-%d');
 
 $id_coach = $infos['id_coach'];
 $tool_name = get_lang('EditSession');
@@ -31,8 +33,8 @@ $tool_name = get_lang('EditSession');
 $interbreadcrumb[] = array('url' => "session_list.php","name" => get_lang('SessionList'));
 $interbreadcrumb[] = array('url' => "resume_session.php?id_session=".$id,"name" => get_lang('SessionOverview'));
 
-list($year_start, $month_start, $day_start) = explode('-', $infos['date_start']);
-list($year_end, $month_end, $day_end) = explode('-', $infos['date_end']);
+list($year_start, $month_start, $day_start) = explode('-', $infos['access_start_date']);
+list($year_end, $month_end, $day_end) = explode('-', $infos['access_end_date']);
 
 if (isset($_POST['formSent']) && $_POST['formSent']) {
 	$formSent = 1;
@@ -239,8 +241,8 @@ $form->addButtonUpdate(get_lang('ModifyThisSession'));
 $formDefaults = array(
     'id_coach' => $infos['id_coach'],
     'session_category' => $infos['session_category_id'],
-    'date_start' => $infos['date_start'],
-    'date_end' => $infos['date_end'],
+    'date_start' => $infos['access_start_date'],
+    'date_end' => $infos['access_end_date'],
     'session_visibility' => $infos['visibility'],
     'description' => $infos['description']
 );

+ 9 - 9
main/session/session_export.php

@@ -49,8 +49,8 @@ if (isset($_POST['formSent'])) {
 					name,
 					id_coach,
 					username,
-					date_start,
-					date_end,
+					access_start_date,
+					access_end_date,
 					visibility,
 					session_category_id
 				FROM $tbl_session s
@@ -62,7 +62,7 @@ if (isset($_POST['formSent'])) {
 			$tbl_session_rel_access_url= Database::get_main_table(TABLE_MAIN_ACCESS_URL_REL_SESSION);
 			$access_url_id = api_get_current_access_url_id();
 			if ($access_url_id != -1){
-			$sql = "SELECT s.id, name,id_coach,username,date_start,date_end,visibility,session_category_id
+			$sql = "SELECT s.id, name,id_coach,username,access_start_date,access_end_date,visibility,session_category_id
 					FROM $tbl_session s
 					INNER JOIN $tbl_session_rel_access_url as session_rel_url
 					ON (s.id= session_rel_url.session_id)
@@ -74,7 +74,7 @@ if (isset($_POST['formSent'])) {
 
 		$result = Database::query($sql);
 	} else {
-		$sql = "SELECT s.id,name,username,date_start,date_end,visibility,session_category_id
+		$sql = "SELECT s.id,name,username,access_start_date,access_end_date,visibility,session_category_id
 				FROM $tbl_session s
 				INNER JOIN $tbl_user
 					ON $tbl_user.user_id = s.id_coach
@@ -113,18 +113,18 @@ if (isset($_POST['formSent'])) {
 			$add = '';
 			$row['name'] = str_replace(';',',',$row['name']);
 			$row['username'] = str_replace(';',',',$row['username']);
-			$row['date_start'] = str_replace(';',',',$row['date_start']);
-			$row['date_end'] = str_replace(';',',',$row['date_end']);
+			$row['access_start_date'] = str_replace(';',',',$row['access_start_date']);
+			$row['access_end_date'] = str_replace(';',',',$row['access_end_date']);
 			$row['visibility'] = str_replace(';',',',$row['visibility']);
 			$row['session_category'] = str_replace(';',',',$row['session_category_id']);
 			if ($cvs) {
-				$add.= $row['name'].';'.$row['username'].';'.$row['date_start'].';'.$row['date_end'].';'.$row['visibility'].';'.$row['session_category'].';';
+				$add.= $row['name'].';'.$row['username'].';'.$row['access_start_date'].';'.$row['access_end_date'].';'.$row['visibility'].';'.$row['session_category'].';';
 			} else {
 				$add = "\t<Session>\n"
 						 ."\t\t<SessionName>$row[name]</SessionName>\n"
 						 ."\t\t<Coach>$row[username]</Coach>\n"
-						 ."\t\t<DateStart>$row[date_start]</DateStart>\n"
-						 ."\t\t<DateEnd>$row[date_end]</DateEnd>\n"
+						 ."\t\t<DateStart>$row[access_start_date]</DateStart>\n"
+						 ."\t\t<DateEnd>$row[access_end_date]</DateEnd>\n"
 						 ."\t\t<Visibility>$row[visibility]</Visibility>\n"
 						 ."\t\t<SessionCategory>$row[session_category]</SessionCategory>\n";
 			}

+ 6 - 6
main/session/session_import.php

@@ -261,8 +261,8 @@ if (isset($_POST['formSent']) && $_POST['formSent']) {
                             $sql_session = "INSERT IGNORE INTO $tbl_session SET
                                     name = '".Database::escape_string($session_name)."',
                                     id_coach = '$coach_id',
-                                    date_start = '$date_start',
-                                    date_end = '$date_end',
+                                    access_start_date = '$date_start',
+                                    access_end_date = '$date_end',
                                     visibility = '$visibility',
                                     session_category_id = '$session_category_id',
                                     session_admin_id=".intval($_user['user_id']);
@@ -278,8 +278,8 @@ if (isset($_POST['formSent']) && $_POST['formSent']) {
                                 $sql_session = "INSERT IGNORE INTO $tbl_session SET
                                         name = '".Database::escape_string($session_name)."',
                                         id_coach = '$coach_id',
-                                        date_start = '$date_start',
-                                        date_end = '$date_end',
+                                        access_start_date = '$date_start',
+                                        access_end_date = '$date_end',
                                         visibility = '$visibility',
                                         session_category_id = '$session_category_id',
                                         session_admin_id=".intval($_user['user_id']);
@@ -290,8 +290,8 @@ if (isset($_POST['formSent']) && $_POST['formSent']) {
                                 // if the session already exists - update it.
                                 $sql_session = "UPDATE $tbl_session SET
                                         id_coach = '$coach_id',
-                                        date_start = '$date_start',
-                                        date_end = '$date_end',
+                                        access_start_date = '$date_start',
+                                        access_end_date = '$date_end',
                                         visibility = '$visibility',
                                         session_category_id = '$session_category_id'
                                     WHERE name = '$session_name'";