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

main/inc/lib/template.lib.php

@@ -149,6 +149,7 @@ class Template
             'api_get_user_info',
             'api_get_configuration_value',
             'api_get_setting',
+            'api_get_plugin_setting',
             [
                 'name' => 'return_message',
                 'callable' => 'Display::return_message_and_translate',

plugin/azure_active_directory/README.md

@@ -13,4 +13,9 @@ Allow authentication (with OAuth2) with Microsoft's Azure Active Directory.
 * _Application ID_: Enter the Application Id assinged to your app by the Azure portal.
 * _Application secret_: Enter the client secret created.
 * _Block name_: (Optional) The name to show above the login button.
-* And assign a region. Preferably `login_bottom`.
+* _Force logout button_: (Optional) Add a button to force logout from Azure.
+* _Management login_: (Optional) Disable the chamilo login and enable an alternative login page for users.   
+   You will need copy the `/plugin/azure_active_directory/layout/login_form.tpl` file to `/main/template/overrides/layout/` directory.
+* _Name for the management login_: A name for the management login. By default is "Management Login".
+
+And assign a region. Preferably `login_bottom`.

plugin/azure_active_directory/index.php

@@ -17,4 +17,18 @@ if ($activeDirectoryPlugin->get(AzureActiveDirectory::SETTING_ENABLE) === 'true'
     if ('true' === $activeDirectoryPlugin->get(AzureActiveDirectory::SETTING_FORCE_LOGOUT_BUTTON)) {
         $_template['signout_url'] = $activeDirectoryPlugin->getUrl(AzureActiveDirectory::URL_TYPE_LOGOUT);
     }
+
+    $managementLoginEnabled = 'true' === $activeDirectoryPlugin->get(AzureActiveDirectory::SETTING_MANAGEMENT_LOGIN_ENABLE);
+
+    $_template['management_login_enabled'] = $managementLoginEnabled;
+
+    if ($managementLoginEnabled) {
+        $managementLoginName = $activeDirectoryPlugin->get(AzureActiveDirectory::SETTING_MANAGEMENT_LOGIN_NAME);
+
+        if (empty($managementLoginName)) {
+            $managementLoginName = $activeDirectoryPlugin->get_lang('ManagementLogin');
+        }
+
+        $_template['management_login_name'] = $managementLoginName;
+    }
 }

plugin/azure_active_directory/lang/english.php

@@ -17,5 +17,11 @@ $strings['app_secret'] = 'Application secret';
 $strings['force_logout'] = 'Force logout button';
 $strings['force_logout_help'] = 'Show a button to force logout session from Azure.';
 $strings['block_name'] = 'Block name';
+$strings['management_login_enable'] = 'Management login';
+$strings['management_login_enable_help'] = 'Disable the chamilo login and enable an alternative login page for users.<br>'
+    .'You will need copy the <code>/plugin/azure_active_directory/layout/login_form.tpl</code> file to <code>/main/template/overrides/layout/</code> directory.';
+$strings['management_login_name'] = 'Name for the management login';
+$strings['management_login_name_help'] = 'By default is "Management Login".';
 $strings['OrganisationEmail'] = 'Organisation e-mail';
 $strings['AzureId'] = 'Azure ID (mailNickname)';
+$strings['ManagementLogin'] = 'Management Login';

plugin/azure_active_directory/layout/login_form.tpl

@@ -0,0 +1,44 @@
+{% if _u.logged  == 0 %}
+    {% if login_form %}
+        <div id="login-block" class="panel panel-default">
+            <div class="panel-body">
+                {{ login_language_form }}
+                {% if plugin_login_top is not null %}
+                    <div id="plugin_login_top">
+                        {{ plugin_login_top }}
+                    </div>
+                {% endif %}
+
+                {{ login_failed }}
+
+                {% set azure_plugin_enabled = 'azure_active_directory'|api_get_plugin_setting('enable') %}
+                {% set azure_plugin_manage_login = 'azure_active_directory'|api_get_plugin_setting('manage_login_enable') %}
+
+                {% if 'false' == azure_plugin_enabled or 'false' == azure_plugin_manage_login %}
+                    {{ login_form }}
+
+                    {% if "allow_lostpassword" | api_get_setting == 'true' or "allow_registration"|api_get_setting == 'true' %}
+                        <ul class="nav nav-pills nav-stacked">
+                            {% if "allow_registration"|api_get_setting != 'false' %}
+                                <li><a href="{{ _p.web_main }}auth/inscription.php"> {{ 'SignUp'|get_lang }} </a></li>
+                            {% endif %}
+
+                            {% if "allow_lostpassword"|api_get_setting == 'true' %}
+                                <li>
+                                    <a href="{{ _p.web_main }}auth/lostPassword.php">{{ 'LostPassword'|get_lang }}</a>
+                                </li>
+                            {% endif %}
+                        </ul>
+                    {% endif %}
+
+                {% endif %}
+
+                {% if plugin_login_bottom is not null %}
+                    <div id="plugin_login_bottom">
+                        {{ plugin_login_bottom }}
+                    </div>
+                {% endif %}
+            </div>
+        </div>
+    {% endif %}
+{% endif %}

plugin/azure_active_directory/login.php

@@ -0,0 +1,35 @@
+<?php
+/* For license terms, see /license.txt */
+
+require __DIR__.'/../../main/inc/global.inc.php';
+
+$plugin = AzureActiveDirectory::create();
+
+$pluginEnabled = $plugin->get(AzureActiveDirectory::SETTING_ENABLE);
+$managementLoginEnabled = $plugin->get(AzureActiveDirectory::SETTING_MANAGEMENT_LOGIN_ENABLE);
+
+if ('true' !== $pluginEnabled || 'true' !== $managementLoginEnabled) {
+    header('Location: '.api_get_path(WEB_PATH));
+
+    exit;
+}
+
+$userId = api_get_user_id();
+
+if (!($userId) || api_is_anonymous($userId)) {
+    $managementLoginName = $plugin->get(AzureActiveDirectory::SETTING_MANAGEMENT_LOGIN_NAME);
+
+    if (empty($managementLoginName)) {
+        $managementLoginName = $plugin->get_lang('ManagementLogin');
+    }
+
+    $template = new Template($managementLoginName);
+    // Only display if the user isn't logged in.
+    $template->assign('login_language_form', api_display_language_form(true, true));
+    $template->assign('login_form', $template->displayLoginForm());
+
+    $content = $template->fetch('azure_active_directory/view/login.tpl');
+
+    $template->assign('content', $content);
+    $template->display_one_col_template();
+}

plugin/azure_active_directory/src/AzureActiveDirectory.php

@@ -17,6 +17,8 @@ class AzureActiveDirectory extends Plugin
     const SETTING_APP_SECRET = 'app_secret';
     const SETTING_BLOCK_NAME = 'block_name';
     const SETTING_FORCE_LOGOUT_BUTTON = 'force_logout';
+    const SETTING_MANAGEMENT_LOGIN_ENABLE = 'management_login_enable';
+    const SETTING_MANAGEMENT_LOGIN_NAME = 'management_login_name';
 
     const URL_TYPE_AUTHORIZE = 'login';
     const URL_TYPE_LOGOUT = 'logout';
@@ -35,9 +37,11 @@ class AzureActiveDirectory extends Plugin
             self::SETTING_APP_SECRET => 'text',
             self::SETTING_BLOCK_NAME => 'text',
             self::SETTING_FORCE_LOGOUT_BUTTON => 'boolean',
+            self::SETTING_MANAGEMENT_LOGIN_ENABLE => 'boolean',
+            self::SETTING_MANAGEMENT_LOGIN_NAME => 'text',
         ];
 
-        parent::__construct('2.0', 'Angel Fernando Quiroz Campos', $settings);
+        parent::__construct('2.1', 'Angel Fernando Quiroz Campos', $settings);
     }
 
     /**

plugin/azure_active_directory/view/block.tpl

@@ -4,10 +4,19 @@
             <h4>{{ azure_active_directory.block_title }}</h4>
         {% endif %}
 
+        {% if not azure_active_directory.signin_url is empty %}
             <a href="{{ azure_active_directory.signin_url }}" class="btn btn-default">{{ 'SignIn'|get_lang }}</a>
+        {% endif %}
 
-        {% if azure_active_directory.signout_url is not empty %}
+        {% if not azure_active_directory.signout_url is empty %}
             <a href="{{ azure_active_directory.signout_url }}" class="btn btn-danger">{{ 'Logout'|get_lang }}</a>
         {% endif %}
+
+        {% if azure_active_directory.management_login_enabled %}
+            <hr>
+            <a href="{{ _p.web_plugin  ~ 'azure_active_directory/login.php' }}">
+                {{ azure_active_directory.management_login_name }}
+            </a>
+        {% endif %}
     </div>
 {% endif %}

plugin/azure_active_directory/view/login.tpl

@@ -0,0 +1,19 @@
+<div class="row">
+    <div class="col-sm-4 col-sm-offset-4">
+        {{ login_language_form }}
+
+        {{ login_form }}
+
+        {% if "allow_lostpassword"|api_get_setting == 'true' or "allow_registration"|api_get_setting == 'true' %}
+            <ul class="nav nav-pills nav-stacked">
+                {% if "allow_registration"|api_get_setting != 'false' %}
+                    <li><a href="{{ _p.web_main }}auth/inscription.php">{{ 'SignUp'|get_lang }}</a></li>
+                {% endif %}
+
+                {% if "allow_lostpassword"|api_get_setting == 'true' %}
+                    <li><a href="{{ _p.web_main }}auth/lostPassword.php">{{ 'LostPassword'|get_lang }}</a></li>
+                {% endif %}
+            </ul>
+        {% endif %}
+    </div>
+</div>