merge

main/admin/questions.php

@@ -3,8 +3,8 @@
 /* For licensing terms, see /license.txt */
 
 use Chamilo\CourseBundle\Entity\CQuizQuestion;
-use Knp\Component\Pager\Paginator;
 use Doctrine\Common\Collections\Criteria;
+use Knp\Component\Pager\Paginator;
 
 /**
  *  @package chamilo.admin

main/exercise/admin.php

@@ -355,7 +355,7 @@ if ($inATest) {
     $maxScoreAllQuestions = 0;
     if ($showPagination === false) {
         $questionList = $objExercise->selectQuestionList(true, true);
-         if (!empty($questionList)) {
+        if (!empty($questionList)) {
             foreach ($questionList as $questionItemId) {
                 $question = Question::read($questionItemId);
                 if ($question) {

main/exercise/question_pool.php

@@ -467,7 +467,7 @@ function getQuestions(
     $exerciseLevel = (int) $exerciseLevel;
     $answerType = (int) $answerType;
     $questionId = (int) $questionId;
-    $description  = Database::escape_string($description);
+    $description = Database::escape_string($description);
 
     $TBL_EXERCISE_QUESTION = Database::get_course_table(TABLE_QUIZ_TEST_QUESTION);
     $TBL_EXERCISES = Database::get_course_table(TABLE_QUIZ_TEST);

main/forum/reply.php

@@ -26,6 +26,7 @@ api_protect_course_script(true);
 
 $nameTools = get_lang('ForumCategories');
 $origin = api_get_origin();
+$_user = api_get_user_info();
 
 /* Including necessary files */
 require_once 'forumconfig.inc.php';

main/forum/viewforumcategory.php

@@ -129,7 +129,7 @@ $logInfo = [
     'tool_id' => 0,
     'tool_id_detail' => 0,
     'action' => $action,
-    'info' => $_GET['content'],
+    'info' => isset($_GET['content']) ? $_GET['content'] : '',
 ];
 Event::registerLog($logInfo);
 

main/forum/viewthread.php

@@ -22,6 +22,7 @@ $forumUrl = api_get_path(WEB_CODE_PATH).'forum/';
 
 // Are we in a lp ?
 $origin = api_get_origin();
+$_user = api_get_user_info();
 $my_search = null;
 
 /* MAIN DISPLAY SECTION */

main/inc/ajax/user_manager.ajax.php

@@ -60,7 +60,13 @@ switch ($action) {
 
         $userData = '<h3>'.$user_info['complete_name'].'</h3>'.$user_info['mail'].$user_info['official_code'];
         if ($isAnonymous) {
-            echo $userData;
+            // Only allow anonymous users to see user popup if the popup user
+            // is a teacher (which might be necessary to illustrate a course)
+            if ($user_info['status'] === COURSEMANAGER) {
+                echo $userData;
+            } else {
+                echo '<h3>-</h3>';
+            }
         } else {
             echo Display::url(
                 $userData,

main/lp/lp_upload.php

@@ -11,10 +11,8 @@ use Chamilo\CourseBundle\Component\CourseCopy\CourseRestorer;
  *
  * @author Yannick Warnier <ywarnier@beeznest.org>
  */
-
-// Flag to allow for anonymous user - needs to be set before global.inc.php.
-$use_anonymous = true;
 require_once __DIR__.'/../inc/global.inc.php';
+api_protect_course_script();
 $course_dir = api_get_course_path().'/scorm';
 $course_sys_dir = api_get_path(SYS_COURSE_PATH).$course_dir;
 if (empty($_POST['current_dir'])) {

plugin/test2pdf/src/download-pdf.php

@@ -36,7 +36,7 @@ if (!empty($infoQuiz['description'])) {
 }
 
 // Select all questions of the supported types from the given course
-$questionsList = getQuestions($courseId, $quizId, $sessionId);
+$questionsList = getQuestionsFromCourse($courseId, $quizId, $sessionId);
 
 // Go through all questions and get the answers
 if ($_GET['type'] == 'question' || $_GET['type'] == 'all') {

plugin/test2pdf/src/test2pdf.lib.php

@@ -93,7 +93,7 @@ function getInfoQuiz($courseId, $id)
  *
  * @return array Results (list question ID)
  */
-function getQuestions($courseId, $quizId, $sessionId = 0)
+function getQuestionsFromCourse($courseId, $quizId, $sessionId = 0)
 {
     $courseId = (int) $courseId;
     $quizId = (int) $quizId;