Merge branch '1.9.x' of ssh://github.com/chamilo/chamilo-lms into chamilo19

main/admin/course_intro_pdf_import.php

@@ -41,7 +41,6 @@ if ($_POST['formSent']) {
         } else {
             $errors = import_pdfs($courses, $subDir);
             if (count($errors) == 0) {
-            //    save_data($courses);
                 error_log('Course intros imported successfully in '.__FILE__.', line '.__LINE__); 
             }
         }
@@ -153,7 +152,6 @@ function import_pdfs($file, $subDir = '/') {
             error_log($parts[0].' is not a course, apparently');
             $errors[] = array('Line' => 0, 'Code' => $parts[0], 'Title' => $parts[0].' - '.get_lang('CodeDoesNotExists'));
         }
-        error_log($parts[0]);
         $i++; //found at least one entry that is not a dir or a .
     }
     if ($i == 0) {

main/auth/set_temp_password.php

@@ -0,0 +1,59 @@
+<?php
+/* For license terms, see /license.txt */
+/**
+ * This page aims at requesting a password from a user to access a course
+ * protected by password. If the password matches the course password, we 
+ * store the fact that user can access it during its session
+ */
+/**
+ * Initializing context
+ */
+use \ChamiloSession as Session;
+
+// Language files that need to be included
+$language_file = array('courses');
+
+$cidReset = true;
+require_once '../inc/global.inc.php';
+$this_section = SECTION_COURSES;
+$course_id = isset($_GET['course_id'])  ? intval($_GET['course_id']) : null;
+$session_id = isset($_GET['session_id']) ? intval($_GET['session_id']) : null;
+$user_id = api_get_user_id();
+
+/**
+ * Security check
+ */
+if (empty($course_id)) {
+    api_not_allowed();
+}
+/**
+ * Code
+ */
+$course_info = CourseManager::get_course_information_by_id($course_id);
+
+$tpl = new Template(null);
+
+// Build the form
+$form = new FormValidator('set_temp_password', 'POST', api_get_self().'?course_id='.$course_id.'&session_id='.$session_id);
+$form->addElement('header', get_lang('CourseRequiresPassword'));
+$form->addElement('hidden', 'course_id', $course_id);
+$form->addElement('hidden', 'session_id', $session_id);
+$form->addElement('password', 'course_password', null, get_lang('Password'));
+$form->addElement('style_submit_button', null, get_lang('Accept'), 'class="save"');
+
+if ($form->validate()) {
+    $form_values = $form->exportValues();
+    if ($form_values['course_password'] === $course_info['registration_code']) {
+        Session::write('course_password_'.$course_info['real_id'], true);
+        header('Location: '.api_get_course_url($course_info['code'], $session_id));
+        exit;
+    } else {
+        $tpl->assign('error_message', Display::display_error_message(get_lang('CourseRegistrationCodeIncorrect'), true, true));
+    }
+}
+
+$tpl->assign('form', $form->toHtml());
+$content = $tpl->get_template('auth/set_temp_password.tpl');
+$tpl->assign('content', $tpl->fetch($content));
+$tpl->display_one_col_template();
+

main/inc/local.inc.php

@@ -1136,7 +1136,19 @@ if ((isset($uidReset) && $uidReset) || (isset($cidReset) && $cidReset))
     }
 
     if (!$is_platformAdmin) {
-        if (!$is_courseMember && isset($_course['registration_code']) && !empty($_course['registration_code'])) {
+        if (!$is_courseMember && 
+            isset($_course['registration_code']) && 
+            !empty($_course['registration_code']) && 
+            !Session::read('course_password_'.$_course['real_id'], false)
+        ) {
+            // if we are here we try to access to a course requiring password
+            if ($is_allowed_in_course) {
+                // the course visibility allows to access the course 
+                // with a password
+                $url = api_get_path(WEB_CODE_PATH).'auth/set_temp_password.php?course_id='.$_course['real_id'].'&session_id='.$session_id;
+                header('Location: '.$url);
+                exit;
+            } else {
                 $is_courseMember = false;
                 $is_courseAdmin = false;
                 $is_courseTutor = false;
@@ -1145,9 +1157,8 @@ if ((isset($uidReset) && $uidReset) || (isset($cidReset) && $cidReset))
                 $is_allowed_in_course = false;
             }
         }
+    } // check the session visibility
 
-
-    // check the session visibility
     if ($is_allowed_in_course == true) {
 
         //if I'm in a session

main/template/default/auth/set_temp_password.tpl

@@ -0,0 +1,4 @@
+{% if error_message %}
+{{ error_message }}
+{% endif %}
+{{form}}