dani/lemonldap-ng
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Ping interval in Manager (#658)

Browse Source
This commit is contained in:
Clément Oudot 2014-02-07 10:36:42 +00:00
parent c4b207b73a
commit 16008f35bb
2 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
lemonldap-ng-manager/lib/Lemonldap/NG/Manager/_Struct.pm
View File

@ -9,7 +9,7 @@ use strict;
use Lemonldap::NG::Common::Conf::SAML::Metadata; use Lemonldap::NG::Common::Conf::SAML::Metadata;
use Lemonldap::NG::Common::Regexp; use Lemonldap::NG::Common::Regexp;
our $VERSION = '1.3.2'; our $VERSION = '1.4.0';
## @method protected hashref cstruct(hashref h,string k) ## @method protected hashref cstruct(hashref h,string k)
# Merge $h with the structure produced with $k and return it. # Merge $h with the structure produced with $k and return it.
@ -296,7 +296,7 @@ sub struct {
portalCustomization => { portalCustomization => {
_nodes => [ _nodes => [
qw(portalSkin cn:portalSkinRules portalAutocomplete portalCheckLogins portalUserAttr portalOpenLinkInNewWindow portalAntiFrame passwordManagement) qw(portalSkin cn:portalSkinRules portalAutocomplete portalCheckLogins portalUserAttr portalOpenLinkInNewWindow portalAntiFrame portalPingInterval passwordManagement)
], ],
_help => 'portalcustom', _help => 'portalcustom',
@ -311,7 +311,8 @@ sub struct {
portalUserAttr => 'text:/portalUserAttr', portalUserAttr => 'text:/portalUserAttr',
portalOpenLinkInNewWindow => portalOpenLinkInNewWindow =>
'bool:/portalOpenLinkInNewWindow', 'bool:/portalOpenLinkInNewWindow',
portalAntiFrame => 'bool:/portalAntiFrame', portalAntiFrame => 'bool:/portalAntiFrame',
portalPingInterval => 'int:/portalPingInterval',
passwordManagement => { passwordManagement => {
_nodes => [ _nodes => [
@ -1623,6 +1624,7 @@ m{^(?:ldapi://[^/]*/?|\w[\w\-\.]*(?::\d{1,5})?|ldap(?:s|\+tls)?://\w[\w\-\.]*(?:
portalOpenLinkInNewWindow => $boolean, portalOpenLinkInNewWindow => $boolean,
portalAntiFrame => $boolean, portalAntiFrame => $boolean,
portalParams => $testNotDefined, portalParams => $testNotDefined,
portalPingInterval => $integer,
portalRequireOldPassword => $boolean, portalRequireOldPassword => $boolean,
hideOldPassword => $boolean, hideOldPassword => $boolean,
portalSkin => { portalSkin => {
@ -2059,6 +2061,7 @@ sub defaultConf {
portalDisplayLogout => '1', portalDisplayLogout => '1',
portalDisplayResetPassword => '1', portalDisplayResetPassword => '1',
portalAntiFrame => '1', portalAntiFrame => '1',
portalPingInterval => '60000',
protection => 'none', protection => 'none',
radiusAuthnLevel => '3', radiusAuthnLevel => '3',
remoteGlobalStorage => 'Lemonldap::NG::Common::Apache::Session::SOAP', remoteGlobalStorage => 'Lemonldap::NG::Common::Apache::Session::SOAP',

4
lemonldap-ng-manager/lib/Lemonldap/NG/Manager/_i18n.pm
View File

@ -9,7 +9,7 @@ package Lemonldap::NG::Manager::_i18n;
use strict; use strict;
use AutoLoader qw(AUTOLOAD); use AutoLoader qw(AUTOLOAD);
our $VERSION = '1.3.0'; our $VERSION = '1.4.0';
## @method string translate(string text,string lang) ## @method string translate(string text,string lang)
# Returns $text translated in $lang. # Returns $text translated in $lang.
@ -291,6 +291,7 @@ sub en {
portalModules => 'Modules activation', portalModules => 'Modules activation',
portalOpenLinkInNewWindow => 'New window', portalOpenLinkInNewWindow => 'New window',
portalParams => 'Portal', portalParams => 'Portal',
portalPingInterval => 'Ping Interval',
portalRedirection => 'Portal redirections', portalRedirection => 'Portal redirections',
portalRequireOldPassword => 'Require old password', portalRequireOldPassword => 'Require old password',
portalSkin => 'Default Skin', portalSkin => 'Default Skin',
@ -772,6 +773,7 @@ sub fr {
portalModules => 'Modules', portalModules => 'Modules',
portalOpenLinkInNewWindow => 'Nouvelle fenêtre', portalOpenLinkInNewWindow => 'Nouvelle fenêtre',
portalParams => 'Portail', portalParams => 'Portail',
portalPingInterval => 'Interval du ping',
portalRedirection => 'Redirections du portail', portalRedirection => 'Redirections du portail',
portalRequireOldPassword => 'Ancien mot de passe requis', portalRequireOldPassword => 'Ancien mot de passe requis',
portalSkin => 'Thème visuel par défaut', portalSkin => 'Thème visuel par défaut',