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

app/Resources/public/css/themes/academica/default.css

@@ -33,12 +33,19 @@
 html {
   -ms-text-size-adjust: 100%;
   -webkit-text-size-adjust: 100%;
+  position: relative;
 }
 body {
-  margin: 0;
+  margin: 0 0 60px;
   font-family: 'Open Sans', sans-serif;
   line-height: 1.72222;
 }
+body > main footer.footer {
+  bottom: 0;
+  left: 0;
+  position: absolute;
+  right: 0;
+}
 a{
   color: #185B8E;
 }

app/Resources/public/css/themes/baby_orange/default.css

@@ -32,12 +32,19 @@
 html {
   -ms-text-size-adjust: 100%;
   -webkit-text-size-adjust: 100%;
+  position: relative;
 }
 body {
-  margin: 0;
+  margin: 0 0 60px;
   font-family: 'Open Sans', sans-serif;
   line-height: 1.72222;
 }
+body > main footer.footer {
+  bottom: 0;
+  left: 0;
+  position: absolute;
+  right: 0;
+}
 a{
   color: #666666;
 }

app/Resources/public/css/themes/beach/default.css

@@ -29,16 +29,22 @@
   src: local('Open Sans Bold'), local('OpenSans-Bold'), url(fonts/OpenSans-Bold.woff2) format('woff2'), url(fonts/OpenSans-Bold.woff) format('woff');
 }
 
-
 html {
   -ms-text-size-adjust: 100%;
   -webkit-text-size-adjust: 100%;
+  position: relative;
 }
 body {
-  margin: 0;
+  margin: 0 0 60px;
   font-family: 'Open Sans', sans-serif;
   line-height: 1.72222;
 }
+body > main footer.footer {
+  bottom: 0;
+  left: 0;
+  position: absolute;
+  right: 0;
+}
 
 a {
   color: #2E75A3;

app/Resources/public/css/themes/blue_lagoon/default.css

@@ -33,12 +33,19 @@
 html {
   -ms-text-size-adjust: 100%;
   -webkit-text-size-adjust: 100%;
+  position: relative;
 }
 body {
-  margin: 0;
+  margin: 0 0 60px;
   font-family: 'Open Sans', sans-serif;
   line-height: 1.72222;
 }
+body > main footer.footer {
+  bottom: 0;
+  left: 0;
+  position: absolute;
+  right: 0;
+}
 a{
   color: #185B8E;
 }

app/Resources/public/css/themes/chamilo/default.css

@@ -6,8 +6,17 @@
  * Based on Bootstrap v3
 */
 
+html {
+  position: relative;
+}
 body {
-  margin: 0;
+  margin: 0 0 60px;
+}
+body > main footer.footer {
+  bottom: 0;
+  left: 0;
+  position: absolute;
+  right: 0;
 }
 
 a {
@@ -116,4 +125,4 @@ a:focus {
 }
 .bgfooter a{
   color: #ffffff;
-}
+}

app/Resources/public/css/themes/chamilo_electric_blue/default.css

@@ -30,6 +30,18 @@
   font-weight: 700;
   src: local('Open Sans Bold'), local('OpenSans-Bold'), url(../chamilo/fonts/OpenSans-Bold.woff2) format('woff2'), url(../chamilo/fonts/OpenSans-Bold.woff) format('woff');
 }
+html {
+  position: relative;
+}
+body {
+  margin: 0 0 60px;
+}
+body > main footer.footer {
+  bottom: 0;
+  left: 0;
+  position: absolute;
+  right: 0;
+}
 html {
   -ms-text-size-adjust: 100%;
   -webkit-text-size-adjust: 100%;

app/Resources/public/css/themes/chamilo_green/default.css

@@ -32,12 +32,19 @@
 html {
   -ms-text-size-adjust: 100%;
   -webkit-text-size-adjust: 100%;
+  position: relative;
 }
 body {
-  margin: 0;
+  margin: 0 0 60px;
   font-family: 'Open Sans', sans-serif;
   line-height: 1.72222;
 }
+body > main footer.footer {
+  bottom: 0;
+  left: 0;
+  position: absolute;
+  right: 0;
+}
 a{
   color: #004600;
 }

app/Resources/public/css/themes/chamilo_orange/default.css

@@ -32,12 +32,19 @@
 html {
   -ms-text-size-adjust: 100%;
   -webkit-text-size-adjust: 100%;
+  position: relative;
 }
 body {
-  margin: 0;
+  margin: 0 0 60px;
   font-family: 'Open Sans', sans-serif;
   line-height: 1.72222;
 }
+body > main footer.footer {
+  bottom: 0;
+  left: 0;
+  position: absolute;
+  right: 0;
+}
 
 a{
   color: #666666;

app/Resources/public/css/themes/chamilo_red/default.css

@@ -31,14 +31,21 @@
   src: local('Open Sans Bold'), local('OpenSans-Bold'), url(../chamilo/fonts/OpenSans-Bold.woff2) format('woff2'), url(../chamilo/fonts/OpenSans-Bold.woff) format('woff');
 }
 html {
+  position: relative;
   -ms-text-size-adjust: 100%;
   -webkit-text-size-adjust: 100%;
 }
 body {
-  margin: 0;
+  margin: 0 0 60px;
   font-family: 'Open Sans', sans-serif;
   line-height: 1.72222;
 }
+body > main footer.footer {
+  bottom: 0;
+  left: 0;
+  position: absolute;
+  right: 0;
+}
 a{
   color: #666666;
 }

app/Resources/public/css/themes/chamilo_sport_red/default.css

@@ -32,12 +32,19 @@
 html {
   -ms-text-size-adjust: 100%;
   -webkit-text-size-adjust: 100%;
+  position: relative;
 }
 body {
-  margin: 0;
+  margin: 0 0 60px;
   font-family: 'Open Sans', sans-serif;
   line-height: 1.72222;
 }
+body > main footer.footer {
+  bottom: 0;
+  left: 0;
+  position: absolute;
+  right: 0;
+}
 a{
   color: #666666;
 }

app/Resources/public/css/themes/cool_blue/default.css

@@ -30,13 +30,20 @@
   src: local('Open Sans Bold'), local('OpenSans-Bold'), url(../chamilo/fonts/OpenSans-Bold.woff2) format('woff2'), url(../chamilo/fonts/OpenSans-Bold.woff) format('woff');
 }
 html {
-  -ms-text-size-adjust: 100%;
-  -webkit-text-size-adjust: 100%;
+    -ms-text-size-adjust: 100%;
+    -webkit-text-size-adjust: 100%;
+    position: relative;
 }
 body {
-  margin: 0;
-  font-family: 'Open Sans', sans-serif;
-  line-height: 1.72222;
+    margin: 0 0 60px;
+    font-family: 'Open Sans', sans-serif;
+    line-height: 1.72222;
+}
+body > main footer.footer {
+    bottom: 0;
+    left: 0;
+    position: absolute;
+    right: 0;
 }
 a{
   color: #666666;

app/Resources/public/css/themes/corporate/default.css

@@ -30,14 +30,21 @@
   src: local('Open Sans Bold'), local('OpenSans-Bold'), url(../chamilo/fonts/OpenSans-Bold.woff2) format('woff2'), url(../chamilo/fonts/OpenSans-Bold.woff) format('woff');
 }
 html {
+  position: relative;
   -ms-text-size-adjust: 100%;
   -webkit-text-size-adjust: 100%;
 }
 body {
-  margin: 0;
+  margin: 0 0 60px;
   font-family: 'Open Sans', sans-serif;
   line-height: 1.72222;
 }
+body > main footer.footer {
+  bottom: 0;
+  left: 0;
+  position: absolute;
+  right: 0;
+}
 a{
   color: #666666;
 }

app/Resources/public/css/themes/cosmic_campus/default.css

@@ -31,14 +31,21 @@
   src: local('Open Sans Bold'), local('OpenSans-Bold'), url(../chamilo/fonts/OpenSans-Bold.woff2) format('woff2'), url(../chamilo/fonts/OpenSans-Bold.woff) format('woff');
 }
 html {
+  position: relative;
   -ms-text-size-adjust: 100%;
   -webkit-text-size-adjust: 100%;
 }
 body {
-  margin: 0;
+  margin: 0 0 60px;
   font-family: 'Open Sans', sans-serif;
   line-height: 1.72222;
 }
+body > main footer.footer {
+  bottom: 0;
+  left: 0;
+  position: absolute;
+  right: 0;
+}
 a{
   color: #185B8E;
 }

app/Resources/public/css/themes/delicious_bordeaux/default.css

@@ -30,14 +30,21 @@
   src: local('Open Sans Bold'), local('OpenSans-Bold'), url(../chamilo/fonts/OpenSans-Bold.woff2) format('woff2'), url(../chamilo/fonts/OpenSans-Bold.woff) format('woff');
 }
 html {
+  position: relative;
   -ms-text-size-adjust: 100%;
   -webkit-text-size-adjust: 100%;
 }
 body {
-  margin: 0;
+  margin: 0 0 60px;
   font-family: 'Open Sans', sans-serif;
   line-height: 1.72222;
 }
+body > main footer.footer {
+  bottom: 0;
+  left: 0;
+  position: absolute;
+  right: 0;
+}
 a{
   color: #666666;
 }

app/Resources/public/css/themes/empire_green/default.css

@@ -29,12 +29,20 @@
   font-weight: 700;
   src: local('Open Sans Bold'), local('OpenSans-Bold'), url(../chamilo/fonts/OpenSans-Bold.woff2) format('woff2'), url(../chamilo/fonts/OpenSans-Bold.woff) format('woff');
 }
-
+html {
+  position: relative;
+}
 body {
-  margin: 0;
+  margin: 0 0 60px;
   font-family: 'Open Sans', sans-serif;
   line-height: 1.72222;
 }
+body > main footer.footer {
+  bottom: 0;
+  left: 0;
+  position: absolute;
+  right: 0;
+}
 a{
   color: #666666;
 }

app/Resources/public/css/themes/fruity_orange/default.css

@@ -32,12 +32,19 @@
 html {
   -ms-text-size-adjust: 100%;
   -webkit-text-size-adjust: 100%;
+  position: relative;
 }
 body {
-  margin: 0;
+  margin: 0 0 60px;
   font-family: 'Open Sans', sans-serif;
   line-height: 1.72222;
 }
+body > main footer.footer {
+  bottom: 0;
+  left: 0;
+  position: absolute;
+  right: 0;
+}
 a{
   color: #666666;
 }

app/Resources/public/css/themes/holi/default.css

@@ -29,16 +29,22 @@
   src: local('Open Sans Bold'), local('OpenSans-Bold'), url(fonts/OpenSans-Bold.woff2) format('woff2'), url(fonts/OpenSans-Bold.woff) format('woff');
 }
 
-
 html {
   -ms-text-size-adjust: 100%;
   -webkit-text-size-adjust: 100%;
+  position: relative;
 }
 body {
-  margin: 0;
+  margin: 0 0 60px;
   font-family: 'Open Sans', sans-serif;
   line-height: 1.72222;
 }
+body > main footer.footer {
+  bottom: 0;
+  left: 0;
+  position: absolute;
+  right: 0;
+}
 
 a {
   color: #3D91CA;

app/Resources/public/css/themes/journal/default.css

@@ -29,17 +29,22 @@
   font-weight: 700;
   src: local('Arimo Bold Italic'), local('Arimo-BoldItalic'), url(fonts/Arimo-BoldItalic.woff2) format('woff2');
 }
-
-
 html {
   -ms-text-size-adjust: 100%;
   -webkit-text-size-adjust: 100%;
+  position: relative;
 }
 body {
-  margin: 0;
+  margin: 0 0 60px;
   font-family: 'Arimo', sans-serif;
   line-height: 1.72222;
 }
+body > main footer.footer {
+  bottom: 0;
+  left: 0;
+  position: absolute;
+  right: 0;
+}
 a{
   color: #666666;
 }

app/Resources/public/css/themes/kiddy/default.css

@@ -24,15 +24,21 @@
   src: local('Roboto Condensed Bold'), local('RobotoCondensed-Bold'), url(fonts/RobotoCondensed-Bold.woff2) format('woff2');
 }
 
-
 html {
-  -ms-text-size-adjust: 100%;
-  -webkit-text-size-adjust: 100%;
+    -ms-text-size-adjust: 100%;
+    -webkit-text-size-adjust: 100%;
+    position: relative;
 }
 body {
-  margin: 0;
-  font-family: 'Roboto Condensed', sans-serif;
-  line-height: 1.72222;
+    margin: 0 0 60px;
+    font-family: 'Roboto Condensed', sans-serif;
+    line-height: 1.72222;
+}
+body > main footer.footer {
+    bottom: 0;
+    left: 0;
+    position: absolute;
+    right: 0;
 }
 a{
   color: #666666;

app/Resources/public/css/themes/medical/default.css

@@ -36,13 +36,20 @@
 }
 
 html {
-  -ms-text-size-adjust: 100%;
-  -webkit-text-size-adjust: 100%;
+    -ms-text-size-adjust: 100%;
+    -webkit-text-size-adjust: 100%;
+    position: relative;
 }
 body {
-  margin: 0;
-  font-family: 'Lato', sans-serif;
-  line-height: 1.72222;
+    margin: 0 0 60px;
+    font-family: 'Lato', sans-serif;
+    line-height: 1.72222;
+}
+body > main footer.footer {
+    bottom: 0;
+    left: 0;
+    position: absolute;
+    right: 0;
 }
 a{
   color: #2D9DB5;

app/Resources/public/css/themes/readable/default.css

@@ -28,13 +28,20 @@
 html {
   -ms-text-size-adjust: 100%;
   -webkit-text-size-adjust: 100%;
+  position: relative;
 }
 body {
-  margin: 0;
+  margin: 0 0 60px;
   font-family: 'Roboto Slab', serif;
   line-height: 1.72222;
   background-color: #E3E3E3;
 }
+body > main footer.footer {
+  bottom: 0;
+  left: 0;
+  position: absolute;
+  right: 0;
+}
 a{
   color: #666666;
 }

app/Resources/public/css/themes/royal_purple/default.css

@@ -32,12 +32,19 @@
 html {
   -ms-text-size-adjust: 100%;
   -webkit-text-size-adjust: 100%;
+  position: relative;
 }
 body {
-  margin: 0;
+  margin: 0 0 60px;
   font-family: 'Open Sans', sans-serif;
   line-height: 1.72222;
 }
+body > main footer.footer {
+  bottom: 0;
+  left: 0;
+  position: absolute;
+  right: 0;
+}
 a{
   color: #666666;
 }

app/Resources/public/css/themes/silver_line/default.css

@@ -26,12 +26,19 @@
 html {
   -ms-text-size-adjust: 100%;
   -webkit-text-size-adjust: 100%;
+  position: relative;
 }
 body {
-  margin: 0;
+  margin: 0 0 60px;
   font-family: 'Titillium Web', sans-serif;
   line-height: 1.72222;
 }
+body > main footer.footer {
+  bottom: 0;
+  left: 0;
+  position: absolute;
+  right: 0;
+}
 a{
   color: #666666;
 }

app/Resources/public/css/themes/simplex/default.css

@@ -26,12 +26,19 @@
 html {
   -ms-text-size-adjust: 100%;
   -webkit-text-size-adjust: 100%;
+  position: relative;
 }
 body {
-  margin: 0;
+  margin: 0 0 60px;
   font-family: 'Lato', sans-serif;
   line-height: 1.72222;
 }
+body > main footer.footer {
+  bottom: 0;
+  left: 0;
+  position: absolute;
+  right: 0;
+}
 a{
   color: #111111;
 }

app/Resources/public/css/themes/sober_brown/default.css

@@ -32,12 +32,19 @@
 html {
   -ms-text-size-adjust: 100%;
   -webkit-text-size-adjust: 100%;
+  position: relative;
 }
 body {
-  margin: 0;
+  margin: 0 0 60px;
   font-family: 'Open Sans', sans-serif;
   line-height: 1.72222;
 }
+body > main footer.footer {
+  bottom: 0;
+  left: 0;
+  position: absolute;
+  right: 0;
+}
 a{
   color: #666666;
 }

app/Resources/public/css/themes/spacelab/default.css

@@ -33,12 +33,19 @@
 html {
   -ms-text-size-adjust: 100%;
   -webkit-text-size-adjust: 100%;
+  position: relative;
 }
 body {
-  margin: 0;
+  margin: 0 0 60px;
   font-family: 'Open Sans', sans-serif;
   line-height: 1.72222;
 }
+body > main footer.footer {
+  bottom: 0;
+  left: 0;
+  position: absolute;
+  right: 0;
+}
 a{
   color: #185B8E;
 }

app/Resources/public/css/themes/steel_grey/default.css

@@ -32,12 +32,19 @@
 html {
   -ms-text-size-adjust: 100%;
   -webkit-text-size-adjust: 100%;
+  position: relative;
 }
 body {
-  margin: 0;
+  margin: 0 0 60px;
   font-family: 'Open Sans', sans-serif;
   line-height: 1.72222;
 }
+body > main footer.footer {
+  bottom: 0;
+  left: 0;
+  position: absolute;
+  right: 0;
+}
 a{
   color: #666666;
 }

app/Resources/public/css/themes/tasty_olive/default.css

@@ -32,12 +32,19 @@
 html {
   -ms-text-size-adjust: 100%;
   -webkit-text-size-adjust: 100%;
+  position: relative;
 }
 body {
-  margin: 0;
+  margin: 0 0 60px;
   font-family: 'Open Sans', sans-serif;
   line-height: 1.72222;
 }
+body > main footer.footer {
+  bottom: 0;
+  left: 0;
+  position: absolute;
+  right: 0;
+}
 a{
   color: #666666;
 }

plugin/bbb/lib/bbb_plugin.class.php

@@ -360,7 +360,9 @@ class BBBPlugin extends Plugin
             $destinationDir = api_get_path(SYS_CODE_PATH).'img/icons/';
             foreach ($iconsList as $icon) {
                 $dest = $destinationDir.$icon;
-                unlink($dest);
+                if (is_file($dest)) {
+                    @unlink($dest);
+                }
             }
         }
     }

plugin/google_meet/src/google_meet_plugin.class.php

@@ -146,7 +146,9 @@ class GoogleMeetPlugin extends Plugin
         $destinationDir = api_get_path(SYS_CODE_PATH).'img/icons/';
         foreach ($iconsList as $icon) {
             $dest = $destinationDir.$icon;
-            unlink($dest);
+            if (is_file($dest)) {
+                @unlink($dest);
+            }
         }
     }
 

plugin/mindmap/mindmap_plugin.class.php

@@ -100,7 +100,9 @@ class MindmapPlugin extends Plugin
         $destinationDir = api_get_path(SYS_CODE_PATH).'img/icons/';
         foreach ($iconsList as $icon) {
             $dest = $destinationDir.$icon;
-            unlink($dest);
+            if (is_file($dest)) {
+                @unlink($dest);
+            }
         }
 
         // Deleting course settings and course home icons

plugin/xapi/src/Entity/LrsAuth.php

@@ -2,6 +2,8 @@
 
 /* For licensing terms, see /license.txt */
 
+namespace Chamilo\PluginBundle\Entity\XApi;
+
 use Doctrine\ORM\Mapping as ORM;
 
 /**

plugin/xapi/src/Entity/ToolLaunch.php

@@ -21,7 +21,7 @@ class ToolLaunch
     /**
      * @var int
      *
-     * @ORM\Column(type="integer")
+     * @ORM\Column(type="integer", name="id")
      * @ORM\Id()
      * @ORM\GeneratedValue()
      */

plugin/xapi/src/XApiPlugin.php

@@ -2,6 +2,7 @@
 
 /* For licensing terms, see /license.txt */
 
+use Chamilo\PluginBundle\Entity\XApi\LrsAuth;
 use Chamilo\PluginBundle\Entity\XApi\SharedStatement;
 use Chamilo\PluginBundle\Entity\XApi\ToolLaunch;
 use Doctrine\ORM\EntityManager;
@@ -331,18 +332,19 @@ class XApiPlugin extends Plugin implements HookPluginInterface
     {
         $iso = self::findLanguageIso($languageMap->languageTags(), $language);
 
-        if (isset($languageMap[$iso])) {
-            return $languageMap[$iso];
-        }
+        $text = current($languageMap);
 
-        if (isset($languageMap['und'])) {
-            return $languageMap['und'];
+        if (isset($languageMap[$iso])) {
+            $text = trim($languageMap[$iso]);
+        } elseif (isset($languageMap['und'])) {
+            $text = $languageMap['und'];
         }
 
-        return array_pop($languageMap);
+        return $text;
     }
 
     /**
+     * @param array  $haystack
      * @param string $needle
      *
      * @return string
@@ -359,7 +361,7 @@ class XApiPlugin extends Plugin implements HookPluginInterface
             }
         }
 
-        return 'en';
+        return $haystack[0];
     }
 
     public function generateLaunchUrl(

plugin/xapi/tincan/stats.php

@@ -85,10 +85,12 @@ $students = CourseManager::get_student_list_from_course_code(
 $content = '';
 $content .= '<div class="xapi-students">';
 
+$loadingMessage = Display::returnFontAwesomeIcon('spinner', '', true, 'fa-pulse').' '.get_lang('Loading');
+
 foreach ($students as $studentInfo) {
     $content .= Display::panelCollapse(
         api_get_person_name($studentInfo['firstname'], $studentInfo['lastname']),
-        '',
+        $loadingMessage,
         "pnl-student-{$studentInfo['id']}",
         [
             'class' => 'pnl-student',
@@ -133,7 +135,7 @@ $htmlHeadXtra[] = "<script>
 
             var \$self = \$(this)
                 .addClass('disabled')
-                .html('<em class=\"fa fa-spinner fa-pulse\"></em> ".get_lang('Loading')."');
+                .html('".$loadingMessage."');
 
             $.post(
                 'stats_statements.ajax.php?' + _p.web_cid_query,

plugin/xapi/tincan/stats_attempts.ajax.php

@@ -38,7 +38,7 @@ $toolLaunch = $em->find(
 $student = api_get_user_entity($request->request->getInt('student'));
 
 if (!$toolLaunch || !$student) {
-    echo Display::return_message(get_lang('NoResults'), 'error');
+    echo Display::return_message(get_lang('NotAllowed'), 'error');
     exit;
 }
 
@@ -82,7 +82,7 @@ try {
         )
     );
 } catch (NotFoundException $notFoundException) {
-    echo Display::return_message($notFoundException->getMessage(), 'error');
+    echo Display::return_message(get_lang('NoResults'), 'warning');
     exit;
 } catch (XApiException $exception) {
     echo Display::return_message($exception->getMessage(), 'error');

plugin/zoom/lib/ZoomPlugin.php

@@ -222,7 +222,7 @@ class ZoomPlugin extends Plugin
             $dest = $destinationDir.$icon;
             copy($src, $dest);
         }
-        
+
         $this->install_course_fields_in_all_courses(true, 'zoom_meet.png');
     }
 
@@ -255,7 +255,9 @@ class ZoomPlugin extends Plugin
         $destinationDir = api_get_path(SYS_CODE_PATH).'img/icons/';
         foreach ($iconsList as $icon) {
             $dest = $destinationDir.$icon;
-            unlink($dest);
+            if (is_file($dest)) {
+                @unlink($dest);
+            }
         }
 
     }