Merge branch 'v2.0'

lemonldap-ng-common/lib/Lemonldap/NG/Common/PSGI/Router.pm

@@ -10,9 +10,10 @@ extends 'Lemonldap::NG::Common::PSGI';
 
 # Properties
 has 'routes' => (
-    is      => 'rw',
-    isa     => 'HashRef',
-    default => sub { { GET => {}, POST => {}, PUT => {}, PATCH => {}, DELETE => {} } }
+    is  => 'rw',
+    isa => 'HashRef',
+    default =>
+      sub { { GET => {}, POST => {}, PUT => {}, PATCH => {}, DELETE => {} } }
 );
 has 'defaultRoute' => ( is => 'rw', default => 'index.html' );
 
@@ -75,7 +76,7 @@ sub genRoute {
             elsif ( $t eq 'ARRAY' ) {
                 $routes->{$word} ||= {};
                 foreach my $w ( @{$dest} ) {
-                    $self->genRoute( $routes->{$word}, $w, $transform );
+                    $self->genRoute( $routes->{$word}, $w, $w, $transform );
                 }
                 return;
             }

lemonldap-ng-handler/t/test-psgi-lib.pm

@@ -30,7 +30,7 @@ sub init {
     %$prms = (
         configStorage       => { type => 'File', dirName => 't' },
         localSessionStorage => '',
-        logLevel            => 'debug',
+        logLevel            => 'error',
         cookieName          => 'lemonldap',
         securedCookie       => 0,
         https               => 0,

lemonldap-ng-manager/lib/Lemonldap/NG/Manager/Attributes.pm

@@ -2447,6 +2447,9 @@ qr/(?:(?:https?):\/\/(?:(?:(?:(?:(?:(?:[a-zA-Z0-9][-a-zA-Z0-9]*)?[a-zA-Z0-9])[.]
             'default' => 1,
             'type'    => 'bool'
         },
+        'portalCustomCss' => {
+            'type' => 'text'
+        },
         'portalDisplayAppslist' => {
             'default' => 1,
             'type'    => 'boolOrExpr'

lemonldap-ng-manager/lib/Lemonldap/NG/Manager/Build/Attributes.pm

@@ -357,6 +357,10 @@ sub attributes {
             test          => $url,
             msgFail       => '__badUrl__',
         },
+        portalCustomCss => {
+            type    => 'text',
+            documentation => 'Path to custom CSS file',
+        },
         portalStatus => {
             type          => 'bool',
             default       => 0,

lemonldap-ng-manager/lib/Lemonldap/NG/Manager/Build/Tree.pm

@@ -63,6 +63,7 @@ sub tree {
                             nodes => [
                                 'portalMainLogo',
                                 'showLanguages',
+                                'portalCustomCss',
                                 'portalSkin',
                                 'portalSkinBackground',
                                 'portalSkinRules',

lemonldap-ng-manager/site/htdocs/static/languages/ar.json

@@ -687,6 +687,7 @@
 "portalButtons":"أزرار على صفحة تسجيل الدخول",
 "portalCaptcha":"كلمة التحقق أو الكابتشا ",
 "portalCheckLogins":"تحقق من آخر تسجيلات دخول",
+"portalCustomCss":"Custom CSS file",
 "portalCustomization":"التخصيص",
 "portalDisplayAppslist":"قائمة التطبيقات",
 "portalDisplayFavApps":"Activation rule",

lemonldap-ng-manager/site/htdocs/static/languages/de.json

@@ -687,6 +687,7 @@
 "portalButtons":"Buttons on login page",
 "portalCaptcha":"Captcha",
 "portalCheckLogins":"Check last logins",
+"portalCustomCss":"Custom CSS file",
 "portalCustomization":"Customization",
 "portalDisplayAppslist":"Applications list",
 "portalDisplayFavApps":"Activation rule",

lemonldap-ng-manager/site/htdocs/static/languages/en.json

@@ -687,6 +687,7 @@
 "portalButtons":"Buttons on login page",
 "portalCaptcha":"Captcha",
 "portalCheckLogins":"Check last logins",
+"portalCustomCss":"Custom CSS file",
 "portalCustomization":"Customization",
 "portalDisplayAppslist":"Applications list",
 "portalDisplayFavApps":"Activation rule",

lemonldap-ng-manager/site/htdocs/static/languages/fr.json

@@ -687,6 +687,7 @@
 "portalButtons":"Boutons sur la page de connexion",
 "portalCaptcha":"Captcha",
 "portalCheckLogins":"Vérifier l'historique",
+"portalCustomCss":"Fichier CSS personnalisé",
 "portalCustomization":"Personnalisation",
 "portalDisplayAppslist":"Liste des applications",
 "portalDisplayFavApps":"Règle d'utilisation",

lemonldap-ng-manager/site/htdocs/static/languages/it.json

@@ -687,6 +687,7 @@
 "portalButtons":"Pulsanti nella pagina di login",
 "portalCaptcha":"Captcha",
 "portalCheckLogins":"Controllare ultimi accessi",
+"portalCustomCss":"Custom CSS file",
 "portalCustomization":"Personalizzazione",
 "portalDisplayAppslist":"Lista delle applicazioni",
 "portalDisplayFavApps":"Activation rule",

lemonldap-ng-manager/site/htdocs/static/languages/tr.json

@@ -687,6 +687,7 @@
 "portalButtons":"Giriş sayfasındaki butonlar",
 "portalCaptcha":"Captcha",
 "portalCheckLogins":"Son girişleri kontrol et",
+"portalCustomCss":"Custom CSS file",
 "portalCustomization":"Özelleştirme",
 "portalDisplayAppslist":"Uygulamalar listesi",
 "portalDisplayFavApps":"Activation rule",

lemonldap-ng-manager/site/htdocs/static/languages/vi.json

@@ -687,6 +687,7 @@
 "portalButtons":"Nút trên trang đăng nhập",
 "portalCaptcha":"Captcha",
 "portalCheckLogins":"Kiểm tra đăng nhập lần cuối",
+"portalCustomCss":"Custom CSS file",
 "portalCustomization":"Tùy chỉnh",
 "portalDisplayAppslist":"Danh sách ứng dụng",
 "portalDisplayFavApps":"Activation rule",

lemonldap-ng-manager/site/htdocs/static/languages/zh.json

@@ -687,6 +687,7 @@
 "portalButtons":"Buttons on login page",
 "portalCaptcha":"Captcha",
 "portalCheckLogins":"Check last logins",
+"portalCustomCss":"Custom CSS file",
 "portalCustomization":"Customization",
 "portalDisplayAppslist":"Applications list",
 "portalDisplayFavApps":"Activation rule",

lemonldap-ng-manager/t/jsonfiles/12-modified.json

@@ -1211,7 +1211,7 @@
       "id": "cookieExpiration",
       "title": "cookieExpiration",
       "type": "int",
-      "data": "a"
+      "data": 0
     }]
   }, {
     "id": "sessionParams",

lemonldap-ng-portal/lib/Lemonldap/NG/Portal/Main/Run.pm

@@ -758,6 +758,7 @@ sub cookie {
     $h{max_age}  //= $self->conf->{cookieExpiration}
       if ( $self->conf->{cookieExpiration} );
     $h{SameSite} ||= $self->conf->{sameSite};
+
     foreach (qw(domain path expires max_age HttpOnly SameSite)) {
         my $f = $_;
         $f =~ s/_/-/g;
@@ -984,6 +985,7 @@ sub tplParams {
         PORTAL_URL => $self->conf->{portal},
         SKIN_PATH  => $portalPath . "skins",
         SKIN_BG    => $self->conf->{portalSkinBackground},
+        CUSTOM_CSS => $self->conf->{portalCustomCss},
         ( $self->customParameters ? ( %{ $self->customParameters } ) : () ),
         %templateParams
     );

lemonldap-ng-portal/site/htdocs/static/common/js/totpregistration.js

@@ -1,4 +1,4 @@
-// Generated by CoffeeScript 1.12.7
+// Generated by CoffeeScript 1.12.8
 
 /*
 LemonLDAP::NG TOTP registration script

lemonldap-ng-portal/site/templates/bootstrap/header.tpl

@@ -27,6 +27,9 @@
  <link rel="stylesheet" type="text/css" href="<TMPL_VAR NAME="STATIC_PREFIX"><TMPL_VAR NAME="SKIN">/css/styles.css" />
 <!-- //endif -->
  <link rel="stylesheet" type="text/css" href="/portal.css" />
+ <TMPL_IF NAME="CUSTOM_CSS">
+ <link rel="stylesheet" type="text/css" href="<TMPL_VAR NAME="STATIC_PREFIX"><TMPL_VAR NAME="CUSTOM_CSS">" />
+ </TMPL_IF>
  <!-- HTML5 Shim and Respond.js IE8 support of HTML5 elements and media queries -->
  <!-- WARNING: Respond.js doesn't work if you view the page via file:// -->
  <!--[if lt IE 9]>