From 5f068d4f9200846f373ba54c5f35415b3fa1831c Mon Sep 17 00:00:00 2001
From: Xavier Guimard <x.guimard@free.fr>
Date: Fri, 9 Mar 2018 18:45:05 +0100
Subject: [PATCH] Update prm list

---
 .../lib/Lemonldap/NG/Manager/Attributes.pm            |  3 +--
 .../lib/Lemonldap/NG/Manager/Build/Attributes.pm      |  6 ------
 lemonldap-ng-manager/t/80-attributes.t                | 11 +++++++++++
 scripts/parameters-for-wiki.pl                        |  3 ++-
 4 files changed, 14 insertions(+), 9 deletions(-)

diff --git a/lemonldap-ng-manager/lib/Lemonldap/NG/Manager/Attributes.pm b/lemonldap-ng-manager/lib/Lemonldap/NG/Manager/Attributes.pm
index 622e9ff44..99462d0f5 100644
--- a/lemonldap-ng-manager/lib/Lemonldap/NG/Manager/Attributes.pm
+++ b/lemonldap-ng-manager/lib/Lemonldap/NG/Manager/Attributes.pm
@@ -3020,8 +3020,7 @@ qr/(?:(?:https?):\/\/(?:(?:(?:(?:(?:(?:[a-zA-Z0-9][-a-zA-Z0-9]*)?[a-zA-Z0-9])[.]
             'type' => 'select'
         },
         'secureTokenAllowOnError' => {
-            'default' => '',
-            'type'    => 'text'
+            'type' => 'text'
         },
         'secureTokenAttribute' => {
             'default' => 'uid',
diff --git a/lemonldap-ng-manager/lib/Lemonldap/NG/Manager/Build/Attributes.pm b/lemonldap-ng-manager/lib/Lemonldap/NG/Manager/Build/Attributes.pm
index 5c1a29a5e..1778d391b 100644
--- a/lemonldap-ng-manager/lib/Lemonldap/NG/Manager/Build/Attributes.pm
+++ b/lemonldap-ng-manager/lib/Lemonldap/NG/Manager/Build/Attributes.pm
@@ -1382,12 +1382,6 @@ sub attributes {
             flags         => 'h',
             default       => '.*',
         },
-        secureTokenAllowOnError => {
-            type          => 'text',
-            documentation => '',
-            flags         => 'h',
-            default       => '',
-        },
 
         # Zimbra handler parameters
         zimbraAccountKey => {
diff --git a/lemonldap-ng-manager/t/80-attributes.t b/lemonldap-ng-manager/t/80-attributes.t
index c96acf507..03a9ea503 100644
--- a/lemonldap-ng-manager/t/80-attributes.t
+++ b/lemonldap-ng-manager/t/80-attributes.t
@@ -31,6 +31,17 @@ my @notManagedAttributes = (
 
     # PSGI/CGI protection (must be set in lemonldap-ng.ini)
     'protection',
+
+    # SecureToken handler
+    'secureTokenAllowOnError', 'secureTokenAttribute', 'secureTokenExpiration',
+    'secureTokenHeader', 'secureTokenMemcachedServers', 'secureTokenUrls',
+
+    # Zimbra handler
+    'zimbraAccountKey', 'zimbraBy', 'zimbraPreAuthKey',
+    'zimbraSsoUrl',     'zimbraUrl',
+
+    # Other ini-only prms
+    'configStorage', 'status', 'localStorageOptions', 'localStorage',
 );
 
 # Words used either as attribute name and node title
diff --git a/scripts/parameters-for-wiki.pl b/scripts/parameters-for-wiki.pl
index c0ad58d9f..9b2937eba 100755
--- a/scripts/parameters-for-wiki.pl
+++ b/scripts/parameters-for-wiki.pl
@@ -30,7 +30,7 @@ The attribute key name can be used directly in ''lemonldap-ng.ini'' or in Perl s
 
 ===== Main parameters =====
 
-<sortable 2>
+<sortable 1>
 ^  Key name  ^  Documentation  ^  Portal  ^  Handler  ^  Manager  ^  ini file only  ^
 EOF
 
@@ -54,6 +54,7 @@ foreach my $k ( sort keys %$prm ) {
 }
 
 print <<EOF;
+</sortable>
 
 ===== Configuration backend parameters =====