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

app/Resources/public/css/base.css

@@ -5484,11 +5484,11 @@ div#chat-remote-video video {
     box-shadow: none;
 }
 
-#registration #status .radio{
+#registration #status-group .radio{
     display: inline-block;
     position: relative;
 }
-#registration #status .radio label p{
+#registration #status-group .radio label p{
     text-align: center;
     padding-top: 5px;
     padding-bottom: 5px;

main/admin/user_add.php

@@ -19,29 +19,6 @@ $is_platform_admin = api_is_platform_admin() ? 1 : 0;
 
 $message = null;
 $htmlHeadXtra[] = api_get_password_checker_js('#username', '#password');
-
-$checkPass = api_get_setting('allow_strength_pass_checker');
-if ($checkPass == 'true') {
-    $htmlHeadXtra[] = '
-    <script>
-    $(document).ready(function() {
-        $("#password").keypress(function() {
-            $("#password").each(function(index, value) {
-                var value = $(this).attr("value");
-                if (value == 0) {
-                    $("#password_progress").show();
-                    $(".password-verdict").show();
-                    $(".error-list").show();
-                } else {
-                    $("#password_progress").hide();
-                    $(".password-verdict").hide();
-                    $(".error-list").hide();
-                }
-            });
-        });
-    });
-    </script>';
-}
 $htmlHeadXtra[] = api_get_css_asset('cropper/dist/cropper.min.css');
 $htmlHeadXtra[] = api_get_asset('cropper/dist/cropper.min.js');
 $htmlHeadXtra[] = '
@@ -247,15 +224,6 @@ $form->addGroup($group, 'password', get_lang('Password'));
 $form->addPasswordRule('password', 'password');
 $form->addGroupRule('password', get_lang('EnterPassword'), 'required', null, 1);
 
-if ($checkPass) {
-    $strengthLabels = '
-        <div id="password-verdict"></div>
-        <div id="password-errors"></div>
-        <div id="password_progress" style="display:none"></div>
-    ';
-    $form->addElement('label', null, $strengthLabels);
-}
-
 // Status
 $status = [];
 $status[COURSEMANAGER] = get_lang('Teacher');

main/exercise/exercise_report.php

@@ -587,7 +587,14 @@ if ($is_allowedToEdit || $is_tutor) {
     $column_model = [
         ['name' => 'firstname', 'index' => 'firstname', 'width' => '50', 'align' => 'left', 'search' => 'true'],
         ['name' => 'lastname', 'index' => 'lastname', 'width' => '50', 'align' => 'left', 'formatter' => 'action_formatter', 'search' => 'true'],
-        ['name' => 'login', 'index' => 'username', 'width' => '40', 'align' => 'left', 'search' => 'true', 'hidden' => 'true'],
+        [
+            'name' => 'login',
+            'index' => 'username',
+            'width' => '40',
+            'align' => 'left',
+            'search' => 'true',
+            'hidden' => api_get_configuration_value('exercise_attempts_report_show_username') ? 'false' : 'true',
+        ],
         ['name' => 'group_name', 'index' => 'group_id', 'width' => '40', 'align' => 'left', 'search' => 'true', 'stype' => 'select',
             //for the bottom bar
             'searchoptions' => [

main/inc/lib/pear/HTML/QuickForm/group.php

@@ -568,7 +568,7 @@ class HTML_QuickForm_group extends HTML_QuickForm_element
                 break;
             case FormValidator::LAYOUT_HORIZONTAL:
                 return '
-                <div class="form-group {error_class}" id="'.$this->getName().'">
+                <div class="form-group {error_class}" id="'.$this->getName().'-group">
                     <label {label-for}  class="col-sm-'.$size[0].' control-label  {extra_label_class}" >
                         <!-- BEGIN required --><span class="form_required">*</span><!-- END required -->
                         {label}

main/install/configuration.dist.php

@@ -529,6 +529,8 @@ $_configuration['send_all_emails_to'] = [
 //$_configuration['hide_free_question_score'] = false;
 // Hide user information in the quiz result's page
 //$_configuration['hide_user_info_in_quiz_result'] = false;
+// Show the username field in exercise results report
+//$_configuration['exercise_attempts_report_show_username'] = false;
 
 // Score model
 // Allow to convert a score into a text/color label

main/session/about.php

@@ -198,7 +198,7 @@ $template->assign(
 
 $plugin = BuyCoursesPlugin::create();
 $checker = $plugin->isEnabled();
-
+$sessionIsPremium = null;
 if ($checker) {
     $sessionIsPremium = $plugin->getItemByProduct(
         $sessionId,