Ver Fonte

Adding $daysCoachAccessBeforeBeginning and $daysCoachAccessAfterBeginning + fixing session coach errors.

Julio Montoya há 11 anos atrás
pai
commit
0e6e4b5e49
2 ficheiros alterados com 14 adições e 12 exclusões
  1. 11 7
      main/cron/import_csv.php
  2. 3 5
      main/inc/lib/sessionmanager.lib.php

+ 11 - 7
main/cron/import_csv.php

@@ -107,7 +107,7 @@ class ImportCsv
             }
 
             $sections = array('students', 'teachers', 'courses', 'sessions');
-            //$sections = array('students', 'teachers', 'sessions');
+            $sections = array('sessions');
 
             $this->prepareImport();
 
@@ -232,9 +232,14 @@ class ImportCsv
                 $row = $this->cleanUserRow($row);
 
                 $user_id = UserManager::get_user_id_from_original_id($row['extra_'.$this->extraFieldIdNameList['user']], $this->extraFieldIdNameList['user']);
-                $userInfo = api_get_user_info($user_id);
-                //$userInfo = api_get_user_info_from_username($row['username']);
-                $userInfoByOfficialCode = api_get_user_info_from_official_code($row['official_code']);
+                $userInfo  = array();
+                $userInfoByOfficialCode  = null;
+
+                if (!empty($user_id)) {
+                    $userInfo = api_get_user_info($user_id);
+                    //$userInfo = api_get_user_info_from_username($row['username']);
+                    $userInfoByOfficialCode = api_get_user_info_from_official_code($row['official_code']);
+                }
 
                 $expirationDate = api_get_utc_datetime(strtotime("+".intval($this->expirationDateInUserCreation)."years"));
 
@@ -324,7 +329,6 @@ class ImportCsv
     private function importStudents($file)
     {
         $data = Import::csv_to_array($file);
-
         /*
          * Another users import.
         Unique identifier: official code and username . ok
@@ -343,12 +347,12 @@ class ImportCsv
                 $user_id = UserManager::get_user_id_from_original_id($row['extra_'.$this->extraFieldIdNameList['user']], $this->extraFieldIdNameList['user']);
 
                 $userInfo = array();
+                $userInfoByOfficialCode = null;
                 if (!empty($user_id)) {
                     $userInfo = api_get_user_info($user_id);
+                    $userInfoByOfficialCode = api_get_user_info_from_official_code($row['official_code']);
                 }
 
-                $userInfoByOfficialCode = api_get_user_info_from_official_code($row['official_code']);
-
                 $expirationDate = api_get_utc_datetime(strtotime("+".intval($this->expirationDateInUserCreation)."years"));
 
                 if (empty($userInfo) && empty($userInfoByOfficialCode)) {

+ 3 - 5
main/inc/lib/sessionmanager.lib.php

@@ -2019,7 +2019,8 @@ class SessionManager
                     $sessionId = null;
 
                     if (isset($extraFields) && !empty($extraFields)) {
-                        $sessionId = self::get_session_id_from_original_id($enreg['extra_'.$extraFieldId], 'extra_'.$extraFieldId);
+                        $sessionId = self::get_session_id_from_original_id($enreg['extra_'.$extraFieldId], $extraFieldId);
+
                         if (empty($sessionId)) {
                             $my_session_result = false;
                         } else {
@@ -2108,7 +2109,7 @@ class SessionManager
                         if ($user_id !== false) {
                             // Insert new users.
                             $sql = "INSERT IGNORE INTO $tbl_session_user SET
-                                    id_user='$user_id',
+                                    id_user = '$user_id',
                                     id_session = '$session_id'";
                             Database::query($sql);
                             if ($debug) {
@@ -2126,9 +2127,6 @@ class SessionManager
 
                     if (CourseManager::course_exists($course_code)) {
 
-                        // If the course exists we continue.
-                        $course_info = CourseManager::get_course_information($course_code);
-
                         $coach = api_strstr($course, '[');
                         $coach = api_substr($coach, 1, api_strpos($coach,']') - 1);