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

Author: ywarnier

main/admin/index.php

@@ -535,7 +535,6 @@
     }
 
     if (!api_get_configuration_value('disable_gdpr')) {
-
         // Data protection
         $blocks['data_privacy']['icon'] = Display::return_icon(
             'platform.png',
@@ -549,7 +548,6 @@
         $blocks['data_privacy']['editable'] = false;
 
         $items = [];
-
         $items[] = [
             'url' => api_get_path(WEB_CODE_PATH).'admin/user_list_consent.php',
             'label' => get_lang('UserList'),

main/coursecopy/copy_course_session.php

@@ -294,17 +294,22 @@ function checkSelected(id_select,id_radio,id_title,id_destination) {
         $destination_session = $_POST['destination_session'];
         $origin_session = $_POST['origin_session'];
 
-        $course = CourseSelectForm::get_posted_course(
-            'copy_course',
-            $origin_session,
-            $origin_course
-        );
+        if ($course_code != $origin_course) {
+            $course = CourseSelectForm::get_posted_course(
+                'copy_course',
+                $origin_session,
+                $origin_course
+            );
 
-        $cr = new CourseRestorer($course);
-        //$cr->set_file_option($_POST['same_file_name_option']);
-        $cr->restore($destination_course, $destination_session);
-        echo Display::return_message(get_lang('CopyFinished'), 'confirmation');
-        display_form();
+            $cr = new CourseRestorer($course);
+            //$cr->set_file_option($_POST['same_file_name_option']);
+            $cr->restore($destination_course, $destination_session);
+            echo Display::return_message(get_lang('CopyFinished'), 'confirmation');
+            display_form();
+        } else {
+            echo Display::return_message(get_lang('PleaseSelectACourse'), 'confirm');
+            display_form();
+        }
     } else {
         $arr_course_origin = [];
         $arr_course_destination = [];
@@ -333,14 +338,20 @@ function checkSelected(id_select,id_radio,id_title,id_destination) {
                 $course_code = $arr_course_origin[0];
                 $course_destinatination = $arr_course_destination[0];
 
-                $course_origin = api_get_course_info($course_code);
-                $cb = new CourseBuilder('', $course_origin);
-                $course = $cb->build($origin_session, $course_code, $with_base_content);
-                $cr = new CourseRestorer($course);
-                $cr->restore($course_destinatination, $destination_session);
+                if ($course_code != $course_destinatination) {
+                    $course_origin = api_get_course_info($course_code);
+                    $cb = new CourseBuilder('', $course_origin);
+                    $course = $cb->build($origin_session, $course_code, $with_base_content);
+                    $cr = new CourseRestorer($course);
+                    $cr->restore($course_destinatination, $destination_session);
+
+                    echo Display::return_message(get_lang('CopyFinished'), 'confirm');
+                    display_form();
+                } else {
+                    echo Display::return_message(get_lang('PleaseSelectACourse'), 'confirm');
+                    display_form();
+                }
             }
-            echo Display::return_message(get_lang('CopyFinished'), 'confirm');
-            display_form();
         } else {
             echo Display::return_message(get_lang('YouMustSelectACourseFromOriginalSession'), 'error');
             display_form();

main/document/showinframes.php

@@ -169,7 +169,7 @@
 $browser_display_title = 'Documents - '.Security::remove_XSS($_GET['cidReq']).' - '.$file;
 // Only admins get to see the "no frames" link in pageheader.php, so students get a header that's not so high
 $frameheight = 135;
-if ($is_courseAdmin) {
+if (api_is_course_admin()) {
     $frameheight = 165;
 }
 

main/exercise/admin.php

@@ -110,6 +110,7 @@
     Session::write('objQuestion', $objQuestion);
 }
 $objAnswer = Session::read('objAnswer');
+$_course = api_get_course_info();
 
 // document path
 $documentPath = api_get_path(SYS_COURSE_PATH).$_course['path'].'/document';

main/inc/lib/template.lib.php

@@ -621,6 +621,9 @@ public function setCssFiles()
 
         if (!empty($features) && isset($features['features'])) {
             foreach ($features['features'] as $feature) {
+                if ($feature === 'vrview') {
+                    continue;
+                }
                 $bowerCSSFiles[] = "mediaelement/plugins/$feature/$feature.css";
                 $defaultFeatures[] = $feature;
             }
@@ -771,6 +774,9 @@ public function set_js_files()
         $features = api_get_configuration_value('video_features');
         if (!empty($features) && isset($features['features'])) {
             foreach ($features['features'] as $feature) {
+                if ($feature === 'vrview') {
+                    continue;
+                }
                 $bowerJsFiles[] = "mediaelement/plugins/$feature/$feature.js";
             }
         }

main/lp/lp_edit.php

@@ -241,7 +241,7 @@ function activate_end_date() {
     </script>';
 }
 
-$htmlHeadXtra[] = '<script>'.$learnPath->get_js_dropdown_array()."</sript>";
+$htmlHeadXtra[] = '<script>'.$learnPath->get_js_dropdown_array().'</script>';
 
 $defaults['publicated_on'] = !empty($publicated_on) && $publicated_on !== '0000-00-00 00:00:00'
     ? api_get_local_time($publicated_on)

src/Chamilo/CoreBundle/Component/Editor/CkEditor/CkEditor.php

@@ -55,7 +55,11 @@ public function createHtml()
     public function createHtmlStyle()
     {
         $style = '';
-        if (trim($this->value) == '<html><head><title></title></head><body></body></html>' || $this->value == '') {
+
+        if (trim($this->value) == '<html><head><title></title></head><body></body></html>' ||
+            trim($this->value) == '<!DOCTYPE html><html><head><title></title></head><body></body></html>' ||
+            $this->value == ''
+        ) {
             $style = api_get_css_asset('bootstrap/dist/css/bootstrap.min.css');
             $style .= api_get_css_asset('fontawesome/css/font-awesome.min.css');
             $style .= api_get_css(ChamiloApi::getEditorDocStylePath());

src/Chamilo/UserBundle/Entity/User.php

@@ -2586,4 +2586,14 @@ public function setCommentedUserSkills($commentedUserSkills)
 
         return $this;
     }
+
+    /**
+     * @return string
+     */
+    public function getPictureLegacy()
+    {
+        $id = $this->id;
+
+        return 'users/'.substr((string) $id, 0, 1).'/'.$id.'/'.'small_'.$this->getPictureUri();
+    }
 }