Browse Source

Adding new parameters when creating a session see BT#6449

Julio Montoya 11 years ago
parent
commit
ec82b74b99
2 changed files with 12 additions and 4 deletions
  1. 6 2
      main/cron/import_csv.php
  2. 6 2
      main/inc/lib/sessionmanager.lib.php

+ 6 - 2
main/cron/import_csv.php

@@ -21,6 +21,8 @@ class ImportCsv
         'course' => 'external_course_id',
         'user' => 'external_user_id',
     );
+    public $defaultAdminId = 5;
+    public $defaultSessionVisibility = 1;
 
     /**
      * When creating a user the expiration date is set to registration date + this value
@@ -503,12 +505,13 @@ class ImportCsv
         $result = SessionManager::importCSV(
             $file,
             true,
-            1,
+            $this->defaultAdminId,
             $this->logger,
             array('SessionID' => 'extra_'.$this->extraFieldIdNameList['session']),
             $this->extraFieldIdNameList['session'],
             $this->daysCoachAccessBeforeBeginning,
-            $this->daysCoachAccessAfterBeginning
+            $this->daysCoachAccessAfterBeginning,
+            $this->defaultSessionVisibility
         );
 
         if (!empty($result['error_message'])) {
@@ -616,6 +619,7 @@ $logger->pushHandler(new BufferHandler($stream, 0, $minLevel));
 $logger->pushHandler(new RotatingFileHandler('import_csv', 5, $minLevel));
 
 $import = new ImportCsv($logger);
+// @todo in production disable the dump option
 $dump = false;
 
 if (isset($argv[1]) && $argv[1] = '--dump') {

+ 6 - 2
main/inc/lib/sessionmanager.lib.php

@@ -1880,7 +1880,8 @@ class SessionManager
         $extraFields = array(),
         $extraFieldId = null,
         $daysCoachAccessBeforeBeginning = null,
-        $daysCoachAccessAfterBeginning = null
+        $daysCoachAccessAfterBeginning = null,
+        $sessionVisibility = 1
     )
     {
         $content = file($file);
@@ -1902,7 +1903,6 @@ class SessionManager
             $debug = true;
         }
 
-
         $extraParameters = null;
 
         if (!empty($daysCoachAccessBeforeBeginning) && !empty($daysCoachAccessAfterBeginning)) {
@@ -1910,6 +1910,10 @@ class SessionManager
             $extraParameters .= ' , nb_days_access_after_end = '.intval($daysCoachAccessAfterBeginning);
         }
 
+        if (!empty($sessionVisibility)) {
+            $extraParameters .= ' , visibility = '.intval($sessionVisibility);
+        }
+
         $tbl_session = Database::get_main_table(TABLE_MAIN_SESSION);
         $tbl_session_user           = Database::get_main_table(TABLE_MAIN_SESSION_USER);
         $tbl_session_course         = Database::get_main_table(TABLE_MAIN_SESSION_COURSE);