Merge branch '1.10.x' of https://github.com/chamilo/chamilo-lms into 1.10.x

main/admin/user_information.php

@@ -403,21 +403,28 @@ $message = null;
 if (isset($_GET['action'])) {
     switch ($_GET['action']) {
         case 'unsubscribe':
-            if (CourseManager::get_user_in_course_status($_GET['user_id'], $_GET['course_code']) == STUDENT) {
-                CourseManager::unsubscribe_user($_GET['user_id'], $_GET['course_code'], $_GET['id_session']);
+            $userId = empty($_GET['user_id']) ? 0 : intval($_GET['user_id']);
+            $courseCode = empty($_GET['course_code']) ? '' : intval($_GET['course_code']);
+            $sessionId = empty($_GET['id_session']) ? 0 : intval($_GET['id_session']);
+            if (CourseManager::get_user_in_course_status($userId, $courseCode) == STUDENT) {
+                CourseManager::unsubscribe_user($userId, $courseCode, $sessionId);
                 $message = Display::return_message(get_lang('UserUnsubscribed'));
             } else {
                 $message = Display::return_message(
                     get_lang('CannotUnsubscribeUserFromCourse'),
-                    'error'
+                    'error',
+                    false
                 );
             }
             break;
         case 'unsubscribeSessionCourse':
+            $userId = empty($_GET['user_id']) ? 0 : intval($_GET['user_id']);
+            $courseCode = empty($_GET['course_code']) ? '' : intval($_GET['course_code']);
+            $sessionId = empty($_GET['id_session']) ? 0 : intval($_GET['id_session']);
             SessionManager::removeUsersFromCourseSession(
-                array($_GET['user_id']),
-                $_GET['id_session'],
-                api_get_course_info($_GET['course_code'])
+                array($userId),
+                $sessionId,
+                api_get_course_info($courseCode)
             );
             $message = Display::return_message(get_lang('UserUnsubscribed'));
             break;
@@ -453,13 +460,14 @@ $fullUrl = UserManager::getUserPicture(
 );
 
 echo '<div class="row">';
+
+echo $message;
+
 echo '<div class="col-md-2">';
 echo '<a class="expand-image" href="'.$fullUrlBig.'">'
     .'<img src="'.$fullUrl.'" /></a><br />';
 echo '</div>';
 
-echo $message;
-
 echo '<div class="col-md-5">';
 echo $userInformation;
 echo '</div>';

main/inc/lib/course.lib.php

@@ -304,12 +304,15 @@ class CourseManager
      * @param   int $user_id
      * @param   string $course_code
      *
-     * @return int the status of the user in that course
+     * @return int|bool the status of the user in that course (or false if the user is not in that course)
      */
     public static function get_user_in_course_status($user_id, $course_code)
     {
         $courseInfo = api_get_course_info($course_code);
         $courseId = $courseInfo['real_id'];
+        if (empty($courseId)) {
+            return false;
+        }
         $result = Database::fetch_array(
             Database::query(
                 "SELECT status FROM " . Database::get_main_table(TABLE_MAIN_COURSE_USER) . "

main/inc/lib/display.lib.php

@@ -773,7 +773,7 @@ class Display
         // it checks if there is an SVG version. If so, it uses it.
         // When moving this to production, the return_icon() calls should
         // ask for the SVG version directly
-        /*$testServer = api_get_setting('server_type');
+        $testServer = api_get_setting('server_type');
         if ($testServer == 'test' && $return_only_path == false) {
             $svgImage = substr($image, 0, -3) . 'svg';
             if (is_file($code_path . $theme . 'svg/' . $svgImage)) {
@@ -788,7 +788,7 @@ class Display
             if (empty($additional_attributes['width'])) {
                 $additional_attributes['width'] = $size;
             }
-        }*/
+        }
 
         $icon = api_get_cdn_path($icon);
 

main/inc/lib/sessionmanager.lib.php

@@ -1441,6 +1441,8 @@ class SessionManager
 
                 if (!empty($sessionCategoryId)) {
                     $values['session_category_id'] = $sessionCategoryId;
+                } else {
+                    $values['session_category_id'] = null;
                 }
 
                 Database::update($tbl_session, $values, array(

main/lang/english/trad4all.inc.php

@@ -7659,4 +7659,5 @@ $ManageSkillsLevels = "Manage skills levels";
 $AddProfile = "Add profile";
 $AddLevel = "Add level";
 $ChangeAcquiredLevel = "Change acquired level";
+$NoLevelAcquiredYet = "No level acquired yet";
 ?>

main/lang/french/trad4all.inc.php

@@ -7550,7 +7550,7 @@ $IssuedBadgeInformation = "Information du badge délivré";
 $RecipientDetails = "Données du bénéficiaire";
 $SkillAcquiredAt = "Compétence acquise le";
 $BasicSkills = "Compétences simples";
-$TimeXThroughCourseY = "%s par le cours %s";
+$TimeXThroughCourseY = "%s par le cours <b>%s</b>";
 $ExportBadge = "Exporter ce badge";
 $SelectToSearch = "Inclure dans la recherche";
 $PlaceOnTheWheel = "Localiser sur la roue";
@@ -7646,4 +7646,5 @@ $ManageSkillsLevels = "Gérer les niveaux de compétences";
 $AddProfile = "Ajouter profil";
 $AddLevel = "Ajouter niveau";
 $ChangeAcquiredLevel = "Modifier le niveau acquis";
+$NoLevelAcquiredYet = "Aucun niveau acquis à ce jour";
 ?>

main/lang/spanish/trad4all.inc.php

@@ -6743,7 +6743,7 @@ $XQuestionsWithTotalScoreY = "%d preguntas, con un resultado máximo (todas preg
 $ThisIsAutomaticEmailNoReply = "Este es un mensaje automático. Por favor no le de respuesta (será ignorada).";
 $UploadedDocuments = "Documentos enviados";
 $QuestionLowerCase = "Pregunta minúsculas";
-$QuestionsLowerCase = "Preguntas minúsculas";
+$QuestionsLowerCase = "preguntas";
 $BackToTestList = "Regreso a lista de ejercicios";
 $CategoryDescription = "Descripción de categoría";
 $BackToCategoryList = "Regreso a la lista de categorías";
@@ -7582,7 +7582,7 @@ $IssuedBadgeInformation = "Información de la insignia emitida";
 $RecipientDetails = "Datos del beneficiario";
 $SkillAcquiredAt = "Competencia adquirida el";
 $BasicSkills = "Competencias simples";
-$TimeXThroughCourseY = "%s en el curso %s";
+$TimeXThroughCourseY = "%s en el curso <b>%s</b>";
 $ExportBadge = "Exportar la insignia";
 $SelectToSearch = "Seleccionar para buscar";
 $PlaceOnTheWheel = "Ubicar en la rueda";
@@ -7678,4 +7678,5 @@ $ManageSkillsLevels = "Administrar niveles de competencias";
 $AddProfile = "Añadir perfil";
 $AddLevel = "Añadir nivel";
 $ChangeAcquiredLevel = "Cambiar nivel adquirido";
+$NoLevelAcquiredYet = "Ningún nivel adquirido todavía";
 ?>