From ff9ff1b8feb34f9bf20508e24469a50ae219ae02 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pavel=20B=C5=99ou=C5=A1ek?= <brousek@ics.muni.cz> Date: Fri, 24 Jun 2022 15:59:29 +0200 Subject: [PATCH] fix: fix module name to campusmultiauth --- README.md | 4 +- lib/Auth/Source/Campusidp.php | 8 +-- locales/cs/LC_MESSAGES/campusMultiauth.po | 59 ------------------- locales/cs/LC_MESSAGES/campusmultiauth.po | 59 +++++++++++++++++++ locales/en/LC_MESSAGES/campusMultiauth.po | 59 ------------------- locales/en/LC_MESSAGES/campusmultiauth.po | 59 +++++++++++++++++++ templates/selectsource.twig | 8 +-- themes/campusThemes/default/_header.twig | 6 +- themes/campusThemes/default/base.twig | 20 +++---- .../default/individual-identities.twig | 10 ++-- themes/campusThemes/default/local-login.twig | 20 +++---- themes/campusThemes/default/searchbox.twig | 18 +++--- www/idpSearch.php | 2 +- www/resources/MuniWeb/js/nv.d3.js | 2 +- www/resources/selectize_conf.js | 2 +- www/selectsource.php | 6 +- 16 files changed, 171 insertions(+), 171 deletions(-) delete mode 100644 locales/cs/LC_MESSAGES/campusMultiauth.po create mode 100644 locales/cs/LC_MESSAGES/campusmultiauth.po delete mode 100644 locales/en/LC_MESSAGES/campusMultiauth.po create mode 100644 locales/en/LC_MESSAGES/campusmultiauth.po diff --git a/README.md b/README.md index 73ce2f8..e2d4df3 100644 --- a/README.md +++ b/README.md @@ -7,7 +7,7 @@ Thanks to this module, you can use a saml:SP authentication source together with To achieve this, you need to define and configure an authentication source in your authsources.php file. An example configuration is shown below: 'campus-idp' => [ - 'campusMultiauth:Campusidp', + 'campusmultiauth:Campusidp', 'userPassSource' => [ 'name' => 'campus-userpass', @@ -22,7 +22,7 @@ To achieve this, you need to define and configure an authentication source in yo Let's look at the configuration options: -`campusMultiauth:campusidp` defines which module and authentication source to use. This is the only mandatory option. +`campusmultiauth:campusidp` defines which module and authentication source to use. This is the only mandatory option. `userPassSource` is an authentication source to use to authentication with a username and password. For easy integration with any identity provider supporting [ECP](http://docs.oasis-open.org/security/saml/Post2.0/saml-ecp/v2.0/saml-ecp-v2.0.html), see [simplesamlphp-module-campususerpass](https://github.com/melanger/simplesamlphp-module-campususerpass). If the name is not set, `campus-userpass` is used as a default option. diff --git a/lib/Auth/Source/Campusidp.php b/lib/Auth/Source/Campusidp.php index 405e9f3..d1a3698 100644 --- a/lib/Auth/Source/Campusidp.php +++ b/lib/Auth/Source/Campusidp.php @@ -2,7 +2,7 @@ declare(strict_types=1); -namespace SimpleSAML\Module\campusMultiauth\Auth\Source; +namespace SimpleSAML\Module\campusmultiauth\Auth\Source; use Exception; use SimpleSAML\Auth; @@ -21,7 +21,7 @@ class Campusidp extends Source public const AUTHID = '\SimpleSAML\Module\campusidp\Auth\Source\Campusidp.AuthId'; public const STAGEID_USERPASS = '\SimpleSAML\Module\core\Auth\UserPassBase.state'; public const SOURCESID = '\SimpleSAML\Module\campusidp\Auth\Source\Campusidp.SourceId'; - public const SESSION_SOURCE = 'campusMultiauth:selectedSource'; + public const SESSION_SOURCE = 'campusmultiauth:selectedSource'; public const USER_PASS_SOURCE_NAME = 'userPassSourceName'; public const SP_SOURCE_NAME = 'spSourceName'; public const COOKIE_PREFIX = 'campusidp_'; @@ -99,7 +99,7 @@ class Campusidp extends Source /* Redirect to the select source page. We include the identifier of the * saved state array as a parameter to the login form */ - $url = Module::getModuleURL('campusMultiauth/selectsource.php'); + $url = Module::getModuleURL('campusmultiauth/selectsource.php'); $params = ['AuthState' => $id]; Utils\HTTP::redirectTrustedURL($url, $params); @@ -143,7 +143,7 @@ class Campusidp extends Source } catch (\SimpleSAML\Error\Error $e) { if ($e->getMessage() === 'WRONGUSERPASS') { $id = State::saveState($state, self::STAGEID_USERPASS); - $url = Module::getModuleURL('campusMultiauth/selectsource.php'); + $url = Module::getModuleURL('campusmultiauth/selectsource.php'); $params = [ 'AuthState' => $id, 'wrongUserPass' => true diff --git a/locales/cs/LC_MESSAGES/campusMultiauth.po b/locales/cs/LC_MESSAGES/campusMultiauth.po deleted file mode 100644 index b5cc4da..0000000 --- a/locales/cs/LC_MESSAGES/campusMultiauth.po +++ /dev/null @@ -1,59 +0,0 @@ -msgid "{campusMultiauth:wrong_user_pass}" -msgstr "Chybné uživatelské jméno nebo heslo!" - -msgid "{campusMultiauth:password}" -msgstr "Heslo" - -msgid "{campusMultiauth:login_title}" -msgstr "Přihlášení" - -msgid "{campusMultiauth:remember}" -msgstr "Zapamatovat si mě" - -msgid "{campusMultiauth:login}" -msgstr "Přihlásit" - -msgid "{campusMultiauth:sign_in_with}" -msgstr "Přihlásit přes" - -msgid "{campusMultiauth:sign_in_another_identity}" -msgstr "Přihlášení přes cizí identitu" - -msgid "{campusMultiauth:or}" -msgstr "nebo" - -msgid "{campusMultiauth:lang_selection}" -msgstr "Výběr jazyka" - -msgid "{campusMultiauth:mobile_lang_selection}" -msgstr "Výběr jazyka mobil" - -msgid "{campusMultiauth:username_label}" -msgstr "Uživatelské jméno" - -msgid "{campusMultiauth:username_placeholder}" -msgstr "Uživatelské jméno" - -msgid "{campusMultiauth:password_label}" -msgstr "Heslo" - -msgid "{campusMultiauth:password_placeholder}" -msgstr "Heslo" - -msgid "{campusMultiauth:searchbox_title}" -msgstr "Přihlášení přes jinou instituci" - -msgid "{campusMultiauth:searchbox_placeholder}" -msgstr "Začněte psát název instituce" - -msgid "{campusMultiauth:individualIdentities_title}" -msgstr "Přihlášení přes instituci nebo sociální síť" - -msgid "{campusMultiauth:more_options}" -msgstr "Více možností" - -msgid "{campusMultiauth:wrong_username_or_password}" -msgstr "Špatné uživatelské jméno nebo heslo." - -msgid "{campusMultiauth:search_button}" -msgstr "Vyhledat" diff --git a/locales/cs/LC_MESSAGES/campusmultiauth.po b/locales/cs/LC_MESSAGES/campusmultiauth.po new file mode 100644 index 0000000..a984549 --- /dev/null +++ b/locales/cs/LC_MESSAGES/campusmultiauth.po @@ -0,0 +1,59 @@ +msgid "{campusmultiauth:wrong_user_pass}" +msgstr "Chybné uživatelské jméno nebo heslo!" + +msgid "{campusmultiauth:password}" +msgstr "Heslo" + +msgid "{campusmultiauth:login_title}" +msgstr "Přihlášení" + +msgid "{campusmultiauth:remember}" +msgstr "Zapamatovat si mě" + +msgid "{campusmultiauth:login}" +msgstr "Přihlásit" + +msgid "{campusmultiauth:sign_in_with}" +msgstr "Přihlásit přes" + +msgid "{campusmultiauth:sign_in_another_identity}" +msgstr "Přihlášení přes cizí identitu" + +msgid "{campusmultiauth:or}" +msgstr "nebo" + +msgid "{campusmultiauth:lang_selection}" +msgstr "Výběr jazyka" + +msgid "{campusmultiauth:mobile_lang_selection}" +msgstr "Výběr jazyka mobil" + +msgid "{campusmultiauth:username_label}" +msgstr "Uživatelské jméno" + +msgid "{campusmultiauth:username_placeholder}" +msgstr "Uživatelské jméno" + +msgid "{campusmultiauth:password_label}" +msgstr "Heslo" + +msgid "{campusmultiauth:password_placeholder}" +msgstr "Heslo" + +msgid "{campusmultiauth:searchbox_title}" +msgstr "Přihlášení přes jinou instituci" + +msgid "{campusmultiauth:searchbox_placeholder}" +msgstr "Začněte psát název instituce" + +msgid "{campusmultiauth:individualIdentities_title}" +msgstr "Přihlášení přes instituci nebo sociální síť" + +msgid "{campusmultiauth:more_options}" +msgstr "Více možností" + +msgid "{campusmultiauth:wrong_username_or_password}" +msgstr "Špatné uživatelské jméno nebo heslo." + +msgid "{campusmultiauth:search_button}" +msgstr "Vyhledat" diff --git a/locales/en/LC_MESSAGES/campusMultiauth.po b/locales/en/LC_MESSAGES/campusMultiauth.po deleted file mode 100644 index ec4783f..0000000 --- a/locales/en/LC_MESSAGES/campusMultiauth.po +++ /dev/null @@ -1,59 +0,0 @@ -msgid "{campusMultiauth:wrong_user_pass}" -msgstr "Wrong username or password!" - -msgid "{campusMultiauth:password}" -msgstr "Password" - -msgid "{campusMultiauth:login_title}" -msgstr "Login" - -msgid "{campusMultiauth:remember}" -msgstr "Remember me" - -msgid "{campusMultiauth:login}" -msgstr "Log in" - -msgid "{campusMultiauth:sign_in_with}" -msgstr "Log in with" - -msgid "{campusMultiauth:sign_in_another_identity}" -msgstr "Login via institution or social network" - -msgid "{campusMultiauth:or}" -msgstr "or" - -msgid "{campusMultiauth:lang_selection}" -msgstr "Language selection" - -msgid "{campusMultiauth:mobile_lang_selection}" -msgstr "Mobile language selection" - -msgid "{campusMultiauth:username_label}" -msgstr "Username" - -msgid "{campusMultiauth:username_placeholder}" -msgstr "Username" - -msgid "{campusMultiauth:password_label}" -msgstr "Password" - -msgid "{campusMultiauth:password_placeholder}" -msgstr "Password" - -msgid "{campusMultiauth:searchbox_title}" -msgstr "Log in via another institution" - -msgid "{campusMultiauth:searchbox_placeholder}" -msgstr "Type the name of institution" - -msgid "{campusMultiauth:individualIdentities_title}" -msgstr "Log in via institution or social network" - -msgid "{campusMultiauth:more_options}" -msgstr "More options" - -msgid "{campusMultiauth:wrong_username_or_password}" -msgstr "Wrong username or password." - -msgid "{campusMultiauth:search_button}" -msgstr "Search" diff --git a/locales/en/LC_MESSAGES/campusmultiauth.po b/locales/en/LC_MESSAGES/campusmultiauth.po new file mode 100644 index 0000000..cbd92a2 --- /dev/null +++ b/locales/en/LC_MESSAGES/campusmultiauth.po @@ -0,0 +1,59 @@ +msgid "{campusmultiauth:wrong_user_pass}" +msgstr "Wrong username or password!" + +msgid "{campusmultiauth:password}" +msgstr "Password" + +msgid "{campusmultiauth:login_title}" +msgstr "Login" + +msgid "{campusmultiauth:remember}" +msgstr "Remember me" + +msgid "{campusmultiauth:login}" +msgstr "Log in" + +msgid "{campusmultiauth:sign_in_with}" +msgstr "Log in with" + +msgid "{campusmultiauth:sign_in_another_identity}" +msgstr "Login via institution or social network" + +msgid "{campusmultiauth:or}" +msgstr "or" + +msgid "{campusmultiauth:lang_selection}" +msgstr "Language selection" + +msgid "{campusmultiauth:mobile_lang_selection}" +msgstr "Mobile language selection" + +msgid "{campusmultiauth:username_label}" +msgstr "Username" + +msgid "{campusmultiauth:username_placeholder}" +msgstr "Username" + +msgid "{campusmultiauth:password_label}" +msgstr "Password" + +msgid "{campusmultiauth:password_placeholder}" +msgstr "Password" + +msgid "{campusmultiauth:searchbox_title}" +msgstr "Log in via another institution" + +msgid "{campusmultiauth:searchbox_placeholder}" +msgstr "Type the name of institution" + +msgid "{campusmultiauth:individualIdentities_title}" +msgstr "Log in via institution or social network" + +msgid "{campusmultiauth:more_options}" +msgstr "More options" + +msgid "{campusmultiauth:wrong_username_or_password}" +msgstr "Wrong username or password." + +msgid "{campusmultiauth:search_button}" +msgstr "Search" diff --git a/templates/selectsource.twig b/templates/selectsource.twig index 6d74c73..10d5329 100644 --- a/templates/selectsource.twig +++ b/templates/selectsource.twig @@ -1,4 +1,4 @@ -{#{% extends "../modules/campusMultiauth/templates/base.twig" %}#} +{#{% extends "../modules/campusmultiauth/templates/base.twig" %}#} {% extends "base.twig" %} {% block content %} @@ -31,11 +31,11 @@ {% if not loop.last and (component_configuration.end_col is not defined or component_configuration.end_col != true) %} <div class="hrline color-secondary"> - <span>{{ '{campusMultiauth:or}'|trans }}</span> + <span>{{ '{campusmultiauth:or}'|trans }}</span> </div> {% elseif not loop.last and (component_configuration.end_col is defined and component_configuration.end_col == true) %} <div class="hrline last-col-component color-secondary"> - <span>{{ '{campusMultiauth:or}'|trans }}</span> + <span>{{ '{campusmultiauth:or}'|trans }}</span> </div> {% endif %} {% endfor %} @@ -43,6 +43,6 @@ </div> </div> - <script type="text/javascript" src="/{{baseurlpath}}module.php/campusMultiauth/resources/selectize_conf.js"></script> + <script type="text/javascript" src="/{{baseurlpath}}module.php/campusmultiauth/resources/selectize_conf.js"></script> {% endblock %} diff --git a/themes/campusThemes/default/_header.twig b/themes/campusThemes/default/_header.twig index 980f408..107d94b 100644 --- a/themes/campusThemes/default/_header.twig +++ b/themes/campusThemes/default/_header.twig @@ -8,7 +8,7 @@ <div class="language-bar-margin"> <div class="header__side"> {% if wayf_config.languages | length > 2 %} - <nav class="menu-lang menu-lang--select menu-lang--select-dark" aria-label="{{ '{campusMultiauth:lang_selection}'|trans }}"> + <nav class="menu-lang menu-lang--select menu-lang--select-dark" aria-label="{{ '{campusmultiauth:lang_selection}'|trans }}"> <p class="menu-lang__selected"> {% if attribute(wayf_config.languages, currentLanguage) is defined %} <a href="#" class="menu-lang__selected__link"> @@ -28,7 +28,7 @@ </p> </nav> {% else %} - <nav class="menu-lang" aria-label="{{ '{campusMultiauth:lang_selection}'|trans }}"> + <nav class="menu-lang" aria-label="{{ '{campusmultiauth:lang_selection}'|trans }}"> <p class="menu-lang__selected"> {% for langKey, langName in wayf_config.languages %} {% if langKey != currentLanguage and currentUrl ~ "&language=" ~ langKey %} @@ -41,7 +41,7 @@ </p> </nav> {% endif %} - <nav class="menu-mobile" aria-label="{{ '{campusMultiauth:mobile_lang_selection}'|trans }}"> + <nav class="menu-mobile" aria-label="{{ '{campusmultiauth:mobile_lang_selection}'|trans }}"> <div class="menu-mobile__wrap"> <div class="row-main"> <ul class="menu-mobile__list"> diff --git a/themes/campusThemes/default/base.twig b/themes/campusThemes/default/base.twig index c9393e8..0ccfdba 100644 --- a/themes/campusThemes/default/base.twig +++ b/themes/campusThemes/default/base.twig @@ -9,24 +9,24 @@ <title>{{ pagetitle }}</title> <script src="https://code.jquery.com/jquery-3.6.0.min.js"></script> - <script type="text/javascript" src="/{{baseurlpath}}module.php/campusMultiauth/resources/selectize/js/standalone/selectize.min.js"></script> + <script type="text/javascript" src="/{{baseurlpath}}module.php/campusmultiauth/resources/selectize/js/standalone/selectize.min.js"></script> - <link rel="stylesheet" type="text/css" href="/{{baseurlpath}}module.php/campusMultiauth/resources/font_awesome/css/all.css" /> + <link rel="stylesheet" type="text/css" href="/{{baseurlpath}}module.php/campusmultiauth/resources/font_awesome/css/all.css" /> {% if wayf_config.css_framework is defined and wayf_config.css_framework == 'muni_jvs' %} - <link rel="stylesheet" type="text/css" href="/{{baseurlpath}}module.php/campusMultiauth/resources/selectize/css/selectize.css" /> - <link rel="stylesheet" type="text/css" href="/{{baseurlpath}}module.php/campusMultiauth/resources/MuniWeb/css/style{% if wayf_config.muni_faculty is defined%}-{{ wayf_config.muni_faculty }}{% endif %}.css" /> - <script src="/{{baseurlpath}}module.php/campusMultiauth/resources/MuniWeb/js/app.js"></script> + <link rel="stylesheet" type="text/css" href="/{{baseurlpath}}module.php/campusmultiauth/resources/selectize/css/selectize.css" /> + <link rel="stylesheet" type="text/css" href="/{{baseurlpath}}module.php/campusmultiauth/resources/MuniWeb/css/style{% if wayf_config.muni_faculty is defined%}-{{ wayf_config.muni_faculty }}{% endif %}.css" /> + <script src="/{{baseurlpath}}module.php/campusmultiauth/resources/MuniWeb/js/app.js"></script> <script> App.run({}) </script> {% else %} - <link rel="stylesheet" type="text/css" href="/{{baseurlpath}}module.php/campusMultiauth/resources/selectize/css/selectize.bootstrap5.css" /> - <link href="/{{baseurlpath}}module.php/campusMultiauth/resources/bootstrap/css/bootstrap.min.css" rel="stylesheet"> - <script src="/{{baseurlpath}}module.php/campusMultiauth/resources/bootstrap/js/bootstrap.bundle.min.js"></script> + <link rel="stylesheet" type="text/css" href="/{{baseurlpath}}module.php/campusmultiauth/resources/selectize/css/selectize.bootstrap5.css" /> + <link href="/{{baseurlpath}}module.php/campusmultiauth/resources/bootstrap/css/bootstrap.min.css" rel="stylesheet"> + <script src="/{{baseurlpath}}module.php/campusmultiauth/resources/bootstrap/js/bootstrap.bundle.min.js"></script> {% endif %} - <link rel="stylesheet" type="text/css" href="/{{baseurlpath}}module.php/campusMultiauth/resources/campus_idp.css" /> + <link rel="stylesheet" type="text/css" href="/{{baseurlpath}}module.php/campusmultiauth/resources/campus_idp.css" /> <meta name="robots" content="noindex, nofollow"> {% block preload %}{% endblock %} </head> @@ -39,7 +39,7 @@ <div class="window"> {% endif %} <h3 class="margin-bottom-12 {% if wayf_config.css_framework is defined and wayf_config.css_framework == 'muni_jvs' %}header-text-jvs{% else %}header-text{% endif%}"> - <b>{{ '{campusMultiauth:login_title}'|trans }}</b> + <b>{{ '{campusmultiauth:login_title}'|trans }}</b> </h3> {% if wayf_config.css_framework is defined and wayf_config.css_framework == 'muni_jvs' %} <div id="content-jvs"> diff --git a/themes/campusThemes/default/individual-identities.twig b/themes/campusThemes/default/individual-identities.twig index edae33f..2b28e1a 100644 --- a/themes/campusThemes/default/individual-identities.twig +++ b/themes/campusThemes/default/individual-identities.twig @@ -19,7 +19,7 @@ {% endif %}>{% if attribute(configuration.title, currentLanguage) is defined %}{{ attribute(configuration.title, currentLanguage) }} {% elseif configuration.title is defined and configuration.title is iterable and configuration.title is not empty %}{{ configuration.title | first }} {% elseif configuration.title is defined and configuration.title is not iterable %}{{ configuration.title }} - {% else %}{{ '{campusMultiauth:individualIdentities_title}'|trans }} + {% else %}{{ '{campusmultiauth:individualIdentities_title}'|trans }} {% endif %}</div> {% for idp in configuration.identities %} @@ -28,7 +28,7 @@ <button class="btn btn-primary btn-border btn-individual-identity-jvs color-{{ configuration.priority }} hover-none-{{ configuration.priority }}" type="submit" name="idpentityid" value="{{ idp.upstream_idp }}"> <span class="no-uppercase color-{{ configuration.priority }} individual-identity-span-wrap"> <img class="individual-identity-logo" {% if idp.background_color is defined %}style="background-color: {{ idp.background_color }}{% endif %}" src="{{ idp.logo }}" alt=""/> - <span class="idp-text">{{ '{campusMultiauth:sign_in_with}'|trans }}{{ " " }}{% if attribute(idp.name, currentLanguage) is defined %}{{ attribute(idp.name, currentLanguage) }} + <span class="idp-text">{{ '{campusmultiauth:sign_in_with}'|trans }}{{ " " }}{% if attribute(idp.name, currentLanguage) is defined %}{{ attribute(idp.name, currentLanguage) }} {% elseif idp.name is defined and idp.name is iterable and idp.name is not empty %}{{ idp.name | first }} {% else %}{{ idp.name }} {% endif %}</span> @@ -38,7 +38,7 @@ {% else %} <button class="btn btn-{{ configuration.priority }} btn-lg btn-individual-identity {% if loop.index0 >= configuration.number_shown %}idp-hidden d-none{% endif %}" type="submit" name="idpentityid" value="{{ idp.upstream_idp }}"> <img class="individual-identity-logo" {% if idp.background_color is defined %}style="background-color: {{ idp.background_color }}{% endif %}" src="{{ idp.logo }}" alt=""/> - <span class="idp-text">{{ '{campusMultiauth:sign_in_with}'|trans }}{{ " " }}{% if attribute(idp.name, currentLanguage) is defined %}{{ attribute(idp.name, currentLanguage) }} + <span class="idp-text">{{ '{campusmultiauth:sign_in_with}'|trans }}{{ " " }}{% if attribute(idp.name, currentLanguage) is defined %}{{ attribute(idp.name, currentLanguage) }} {% elseif idp.name is defined and idp.name is iterable and idp.name is not empty %}{{ idp.name | first }} {% else %}{{ idp.name }} {% endif %}</span> @@ -54,11 +54,11 @@ <div class="text-center"> {% if wayf_config.css_framework is defined and wayf_config.css_framework == 'muni_jvs' %} <button id="more-options" class="btn btn-primary btn-s btn-white hover-none-primary" onclick="show()"> - <span class="no-uppercase padding-zero">{{ '{campusMultiauth:more_options}'|trans }}<span class="btn-icon icon icon-angle-down"></span></span> + <span class="no-uppercase padding-zero">{{ '{campusmultiauth:more_options}'|trans }}<span class="btn-icon icon icon-angle-down"></span></span> </button> {% else %} <button id="more-options" class="btn btn-outline-{{ configuration.priority }} btn-lg btn-individual-identity btn-more-options text-center border-0 text-decoration-underline" type="button" onclick="show()"> - <span class="no-uppercase padding-zero">{{ '{campusMultiauth:more_options}'|trans }} <i class="fas fa-arrow-down"></i></span> + <span class="no-uppercase padding-zero">{{ '{campusmultiauth:more_options}'|trans }} <i class="fas fa-arrow-down"></i></span> </button> {% endif %} </div> diff --git a/themes/campusThemes/default/local-login.twig b/themes/campusThemes/default/local-login.twig index 051de0c..6c11aac 100644 --- a/themes/campusThemes/default/local-login.twig +++ b/themes/campusThemes/default/local-login.twig @@ -8,12 +8,12 @@ {% if wayf_config.css_framework is defined and wayf_config.css_framework == 'muni_jvs' %} <div class="message message--common message--common-error" role="alert"> <p class="message__desc"> - {{ '{campusMultiauth:wrong_username_or_password}'|trans }} + {{ '{campusmultiauth:wrong_username_or_password}'|trans }} </p> </div> {% else %} <div id="wrong_user_pass" class="alert alert-danger" role="alert"> - {{ '{campusMultiauth:wrong_username_or_password}'|trans }} + {{ '{campusmultiauth:wrong_username_or_password}'|trans }} </div> {% endif %} {% endif %} @@ -31,7 +31,7 @@ {% endif %}>{% if attribute(configuration.username_label, currentLanguage) is defined %}{{ attribute(configuration.username_label, currentLanguage) }} {% elseif configuration.username_label is defined and configuration.username_label is iterable and configuration.username_label is not empty %}{{ configuration.username_label | first }} {% elseif configuration.username_label is defined and configuration.username_label is not iterable %}{{ configuration.username_label }} - {% else %}{{ '{campusMultiauth:username_label}'|trans }} + {% else %}{{ '{campusmultiauth:username_label}'|trans }} {% endif %}</label> <br> {% if wayf_config.css_framework is defined and wayf_config.css_framework == 'muni_jvs' %} @@ -50,7 +50,7 @@ type="text" name="username"{% if cookie_username is not null %} value="{{ cookie_username }}"{% endif %} placeholder="{% if attribute(configuration.username_placeholder, currentLanguage) is defined %}{{ attribute(configuration.username_placeholder, currentLanguage) }} {% elseif configuration.username_placeholder is defined and configuration.username_placeholder is iterable and configuration.username_placeholder is not empty %}{{ configuration.username_placeholder | first }} {% elseif configuration.username_placeholder is defined and configuration.username_placeholder is not iterable %}{{ configuration.username_placeholder }} - {% else %}{{ '{campusMultiauth:username_placeholder}'|trans }} + {% else %}{{ '{campusmultiauth:username_placeholder}'|trans }} {% endif %}"> {% if wayf_config.css_framework is defined and wayf_config.css_framework == 'muni_jvs' %} </span> @@ -69,7 +69,7 @@ {% endif %}>{% if attribute(configuration.password_label, currentLanguage) is defined %}{{ attribute(configuration.password_label, currentLanguage) }} {% elseif configuration.password_label is defined and configuration.password_label is iterable and configuration.password_label is not empty %}{{ configuration.password_label | first }} {% elseif configuration.password_label is defined and configuration.password_label is not iterable %}{{ configuration.password_label }} - {% else %}{{ '{campusMultiauth:password_label}'|trans }} + {% else %}{{ '{campusmultiauth:password_label}'|trans }} {% endif %}</label> <br> {% if wayf_config.css_framework is defined and wayf_config.css_framework == 'muni_jvs' %} @@ -90,7 +90,7 @@ type="password" name="password" autocomplete="current-password"{% if cookie_password is not null %} value="{{ cookie_password }}"{% endif %} placeholder="{% if attribute(configuration.password_placeholder, currentLanguage) is defined %}{{ attribute(configuration.password_placeholder, currentLanguage) }} {% elseif configuration.password_placeholder is defined and configuration.password_placeholder is iterable and configuration.password_placeholder is not empty %}{{ configuration.password_placeholder | first }} {% elseif configuration.password_placeholder is defined and configuration.password_placeholder is not iterable %}{{ configuration.password_placeholder }} - {% else %}{{ '{campusMultiauth:password_placeholder}'|trans }} + {% else %}{{ '{campusmultiauth:password_placeholder}'|trans }} {% endif %}"> {% if wayf_config.css_framework is defined and wayf_config.css_framework == 'muni_jvs' %} <button id="toggle-password-jvs" class="btn-icon icon icon-eye color-{{ configuration.priority }}" type="button"></button> @@ -113,11 +113,11 @@ {% if wayf_config.css_framework is defined and wayf_config.css_framework == 'muni_jvs' %} <label class="inp-item inp-item--checkbox{" for="remember_me"> <input id="remember_me" type="checkbox" name="remember_me" value="Yes"> - <span>{{ '{campusMultiauth:remember}'|trans }}</span> + <span>{{ '{campusmultiauth:remember}'|trans }}</span> </label> {% else %} <input type="checkbox" class="form-check-input border{% if configuration.priority == 'primary' %} border-dark{% else %} border-muted{% endif %}" id="remember_me" name="remember_me" value="Yes"> - <label class="form-check-label margin-left-12{% if configuration.priority == 'primary' %} text-dark{% else %} text-muted{% endif %}" for="remember_me">{{ '{campusMultiauth:remember}'|trans }}</label> + <label class="form-check-label margin-left-12{% if configuration.priority == 'primary' %} text-dark{% else %} text-muted{% endif %}" for="remember_me">{{ '{campusmultiauth:remember}'|trans }}</label> {% endif %} </div> @@ -125,12 +125,12 @@ {% if wayf_config.css_framework is defined and wayf_config.css_framework == 'muni_jvs' %} <button id="submit_button" class="btn {% if wayf_config.muni_faculty is defined %}btn-{{ wayf_config.muni_faculty }}{% else %}btn-primary {% endif %}{% if configuration.priority == 'secondary' %}btn-border{% endif %} btn-lg" type="submit"> <span> - <span class="font-muni">{{ '{campusMultiauth:login}'|trans }}</span> + <span class="font-muni">{{ '{campusmultiauth:login}'|trans }}</span> </span> </button> {% else %} <button id="submit_button" class="btn btn-{{ configuration.priority }} btn-lg" type="submit"> - {{ '{campusMultiauth:login}'|trans }} + {{ '{campusmultiauth:login}'|trans }} </button> {% endif %} </div> diff --git a/themes/campusThemes/default/searchbox.twig b/themes/campusThemes/default/searchbox.twig index 57bd581..ce0adcf 100644 --- a/themes/campusThemes/default/searchbox.twig +++ b/themes/campusThemes/default/searchbox.twig @@ -16,7 +16,7 @@ {% endif %}>{% if attribute(configuration.title, currentLanguage) is defined %}{{ attribute(configuration.title, currentLanguage) }} {% elseif configuration.title is defined and configuration.title is iterable and configuration.title is not empty %}{{ configuration.title | first }} {% elseif configuration.title is defined and configuration.title is not iterable %}{{ configuration.title }} - {% else %}{{ '{campusMultiauth:searchbox_title}'|trans }} + {% else %}{{ '{campusmultiauth:searchbox_title}'|trans }} {% endif %}</label> <input type="text" name="searchbox" id="searchbox-{{ component_index }}" value="" {% if wayf_config.css_framework is defined and wayf_config.css_framework == 'muni_jvs' %} @@ -67,17 +67,17 @@ <label for="idps-form-nojs" class="color-{{ configuration.priority }}">{% if attribute(configuration.title, currentLanguage) is defined %}{{ attribute(configuration.title, currentLanguage) }} {% elseif configuration.title is defined and configuration.title is iterable and configuration.title is not empty %}{{ configuration.title | first }} {% elseif configuration.title is defined and configuration.title is not iterable %}{{ configuration.title }} - {% else %}{{ '{campusMultiauth:searchbox_title}'|trans }} + {% else %}{{ '{campusmultiauth:searchbox_title}'|trans }} {% endif %}</label> <form id="idps-form-nojs" class="form-inline" action="{{ currentUrl }}" method="post"> <p class="size--m--4-4 size--l--10-12"> <span class="inp-fix"> - <input id="q" class="inp-text" type="text" name="q" placeholder="{% if attribute(configuration.placeholder, currentLanguage) is defined %}{{ attribute(configuration.placeholder, currentLanguage) }}{% elseif configuration.placeholder is defined and configuration.placeholder is iterable and configuration.placeholder is not empty %}{{ configuration.placeholder | first }}{% elseif configuration.placeholder is defined and configuration.placeholder is not iterable %}{{ configuration.placeholder }}{% else %}{{ '{campusMultiauth:searchbox_placeholder}'|trans }}{% endif %}"> + <input id="q" class="inp-text" type="text" name="q" placeholder="{% if attribute(configuration.placeholder, currentLanguage) is defined %}{{ attribute(configuration.placeholder, currentLanguage) }}{% elseif configuration.placeholder is defined and configuration.placeholder is iterable and configuration.placeholder is not empty %}{{ configuration.placeholder | first }}{% elseif configuration.placeholder is defined and configuration.placeholder is not iterable %}{{ configuration.placeholder }}{% else %}{{ '{campusmultiauth:searchbox_placeholder}'|trans }}{% endif %}"> </span> </p> <p> <button class="btn btn-primary btn-s nowrap full-width" type="submit"> - <span>{{ '{campusMultiauth:search_button}'|trans }}</span> + <span>{{ '{campusmultiauth:search_button}'|trans }}</span> </button> </p> {% else %} @@ -90,16 +90,16 @@ {% endif %}>{% if attribute(configuration.title, currentLanguage) is defined %}{{ attribute(configuration.title, currentLanguage) }} {% elseif configuration.title is defined and configuration.title is iterable and configuration.title is not empty %}{{ configuration.title | first }} {% elseif configuration.title is defined and configuration.title is not iterable %}{{ configuration.title }} - {% else %}{{ '{campusMultiauth:searchbox_title}'|trans }} + {% else %}{{ '{campusmultiauth:searchbox_title}'|trans }} {% endif %}</label> <div class="input-group"> - <input id="q" name="q" type="text" placeholder="{% if attribute(configuration.placeholder, currentLanguage) is defined %}{{ attribute(configuration.placeholder, currentLanguage) }}{% elseif configuration.placeholder is defined and configuration.placeholder is iterable and configuration.placeholder is not empty %}{{ configuration.placeholder | first }}{% elseif configuration.placeholder is defined and configuration.placeholder is not iterable %}{{ configuration.placeholder }}{% else %}{{ '{campusMultiauth:searchbox_placeholder}'|trans }}{% endif %}" + <input id="q" name="q" type="text" placeholder="{% if attribute(configuration.placeholder, currentLanguage) is defined %}{{ attribute(configuration.placeholder, currentLanguage) }}{% elseif configuration.placeholder is defined and configuration.placeholder is iterable and configuration.placeholder is not empty %}{{ configuration.placeholder | first }}{% elseif configuration.placeholder is defined and configuration.placeholder is not iterable %}{{ configuration.placeholder }}{% else %}{{ '{campusmultiauth:searchbox_placeholder}'|trans }}{% endif %}" {% if configuration.priority == 'primary' %} class="form-control border border-2 border-dark input-height" aria-describedby="submit-search"> <button id="submit-search" class="btn btn-primary" type="submit">Button</button> {% else %} class="form-control border border-2 border-muted input-height" aria-describedby="submit-search"> - <button id="submit-search" class="btn btn-secondary" type="submit">{{ '{campusMultiauth:search_button}'|trans }}</button> + <button id="submit-search" class="btn btn-secondary" type="submit">{{ '{campusmultiauth:search_button}'|trans }}</button> {% endif %} </div> {% endif %} @@ -144,7 +144,7 @@ </div> {% endif %} -<script type="text/javascript" src="/{{baseurlpath}}module.php/campusMultiauth/resources/searchbox.js"></script> +<script type="text/javascript" src="/{{baseurlpath}}module.php/campusmultiauth/resources/searchbox.js"></script> <script> if (typeof indexes === 'undefined') { @@ -160,7 +160,7 @@ {% elseif configuration.placeholder is defined and configuration.placeholder is not iterable %} '{{ configuration.placeholder }}' {% else %} - '{{ '{campusMultiauth:searchbox_placeholder}'|trans }}' + '{{ '{campusmultiauth:searchbox_placeholder}'|trans }}' {% endif %}; if (typeof placeholderTexts === 'undefined') { diff --git a/www/idpSearch.php b/www/idpSearch.php index a775f4b..3de6b70 100644 --- a/www/idpSearch.php +++ b/www/idpSearch.php @@ -3,7 +3,7 @@ use SimpleSAML\Configuration; use SimpleSAML\Logger; use SimpleSAML\Metadata\MetaDataStorageHandler; -use SimpleSAML\Module\campusMultiauth\Auth\Source\Campusidp; +use SimpleSAML\Module\campusmultiauth\Auth\Source\Campusidp; header('Content-type: application/json'); diff --git a/www/resources/MuniWeb/js/nv.d3.js b/www/resources/MuniWeb/js/nv.d3.js index ae87622..02f2328 100644 --- a/www/resources/MuniWeb/js/nv.d3.js +++ b/www/resources/MuniWeb/js/nv.d3.js @@ -15,7 +15,7 @@ nv.dom = {}; //DOM manipulation functions // Node/CommonJS - require D3 if (typeof(module) !== 'undefined' && typeof(exports) !== 'undefined' && typeof(d3) == 'undefined') { - d3 = require('modules/campusMultiauth/www/resources/muni_css/MuniWeb/js/d3'); + d3 = require('modules/campusmultiauth/www/resources/muni_css/MuniWeb/js/d3'); } nv.dispatch = d3.dispatch('render_start', 'render_end'); diff --git a/www/resources/selectize_conf.js b/www/resources/selectize_conf.js index 723ddec..de4458c 100644 --- a/www/resources/selectize_conf.js +++ b/www/resources/selectize_conf.js @@ -62,7 +62,7 @@ $(function () { this.refreshOptions(true); $.ajax({ - url: baseUrl + "module.php/campusMultiauth/idpSearch.php", + url: baseUrl + "module.php/campusmultiauth/idpSearch.php", type: "GET", dataType: "json", data: { diff --git a/www/selectsource.php b/www/selectsource.php index 04385e4..87e5098 100644 --- a/www/selectsource.php +++ b/www/selectsource.php @@ -6,7 +6,7 @@ use SimpleSAML\Error\BadRequest; use SimpleSAML\Logger; use SimpleSAML\Metadata\MetaDataStorageHandler; use SimpleSAML\Module; -use SimpleSAML\Module\campusMultiauth\Auth\Source\Campusidp; +use SimpleSAML\Module\campusmultiauth\Auth\Source\Campusidp; use SimpleSAML\XHTML\Template; use League\CommonMark\CommonMarkConverter; @@ -88,7 +88,7 @@ $idps = null; if (!empty($_POST['q'])) { $ch = curl_init(); - curl_setopt($ch, CURLOPT_URL, Module::getModuleURL('campusMultiauth/idpSearch.php?q=' . $_POST['q'] . '&index=' . $_POST['componentIndex'] . '&language=' . $_POST['currentLanguage'])); + curl_setopt($ch, CURLOPT_URL, Module::getModuleURL('campusmultiauth/idpSearch.php?q=' . $_POST['q'] . '&index=' . $_POST['componentIndex'] . '&language=' . $_POST['currentLanguage'])); curl_setopt($ch, CURLOPT_RETURNTRANSFER, true); $idps = json_decode(curl_exec($ch)); @@ -96,7 +96,7 @@ if (!empty($_POST['q'])) { } $globalConfig = Configuration::getInstance(); -$t = new Template($globalConfig, 'campusMultiauth:selectsource.php'); +$t = new Template($globalConfig, 'campusmultiauth:selectsource.php'); array_key_exists('wrongUserPass', $_REQUEST) ? $t->data['wrongUserPass'] = true : $t->data['wrongUserPass'] = false; $t->data['authstate'] = $authStateId; -- GitLab