Skip to content

GitLab

Commit 833792d6 authored by Yadd's avatar Yadd
Browse files

New manager: 

 * translation update
 * display errors and warnings in #help_content
parent 567dd1d2
Hide whitespace changes
Inline Side-by-side
modules/lemonldap-ng-manager/example/skins/default/manager.js
View file @ 833792d6
......@@ -151,10 +151,13 @@ function uploadConf(){
data:{data: $('#li_cm9vdA2').html()},
dataType:'json',
success:function(data){
var c='<h3>'+data.result.msg+'</h3><dl>';
if(data.result.cfgNum<=0){
$.each(data.errors,function(key,state){
alert(key+': '+state);
});
if(typeof(data.errors)!='undefined'){
for(m in data.errors){
c+='<dt>'+m+'</dt><dd>'+data.errors[m]+'</dd>';
}
}
}
else{
var tmp=lmtext('li_cm9vdA2');
......@@ -162,9 +165,16 @@ function uploadConf(){
setlmtext('li_cm9vdA2',tmp);
setlmdata('li_cm9vdA2',data.result.cfgNum);
}
if(typeof(data.warnings)!='undefined'){
for(m in data.warnings){
c+='<dt>'+m+'</dt><dd>'+data.warnings[m]+'</dd>';
}
}
c+='</dl>';
$('#help_content').html(c);
},
error:function(xhr, ajaxOptions, thrownError){
alert('Request failed. Error code: '+xhr.status+', '+thrownError);
$('#help_content').html('<h3>Request failed</h3> Error code: '+xhr.status+', '+thrownError);
}
});
}
modules/lemonldap-ng-manager/lib/Lemonldap/NG/Manager/Uploader.pm
View file @ 833792d6
......@@ -14,7 +14,9 @@ use MIME::Base64;
use Data::Dumper;
use Lemonldap::NG::Common::Safelib; #link protected safe Safe object
use Lemonldap::NG::Manager::Downloader; #inherits
use Lemonldap::NG::Manager::_Struct; #inherits
use Lemonldap::NG::Manager::_Struct; #link protected struct _Struct object
use Lemonldap::NG::Manager::_i18n;
use Lemonldap::NG::Common::Conf::Constants; #inherits
our $VERSION = '0.1';
our ( $stylesheet, $parser );
......@@ -128,9 +130,23 @@ sub confUpload {
print STDERR Dumper($errors);
if ( $errors->{errors} ) {
$errors->{result}->{cfgNum} = 0;
$errors->{result}->{msg} = $self->translate('syntaxError');
}
else {
$errors->{result}->{cfgNum} = $self->confObj->saveConf($newConf);
$errors->{result}->{msg} = (
$errors->{result}->{cfgNum} > 0
? $self->translate('confSaved')
: $self->translate(
{
CONFIG_WAS_CHANGED => 'confWasChanged',
UNKNOWN_ERROR => 'unknownError',
DATABASE_LOCKED => 'databaseLocked',
UPLOAD_DENIED => 'uploadDenied',
SYNTAX_ERROR => 'syntaxError',
}->{ $errors->{result}->{cfgNum} }
)
);
}
my $buf = '{';
my $i = 0;
......
modules/lemonldap-ng-manager/lib/Lemonldap/NG/Manager/_i18n.pm
View file @ 833792d6
......@@ -42,73 +42,128 @@ sub translate {
*en_us = *en;
1;
__END__
sub en {
return {
authentication => 'Authentication module',
authParams => 'Authentication parameters',
Configuration => 'Configuration',
cookieName => 'Cookie Name',
cookieParams => 'Cookies Parameters',
domain => 'Domain',
exportedVars => 'Exported Variables',
generalParameters => 'General Parameters',
globalStorage => 'Apache::Session module',
globalStorageOptions => 'Apache::Session module parameters',
groups => 'Groups',
headers => 'HTTP Headers',
ldapBase => 'LDAP Search Base',
ldapParams => 'LDAP parameters',
ldapPort => 'LDAP Server Port',
ldapServer => 'LDAP Server',
macros => 'Macros',
managerDn => 'LDAP Account',
managerPassword => 'LDAP Password',
portal => 'Portal',
rules => 'Rules',
securedCookie => 'Secured Cookie (SSL)',
sessionParams => 'Sessions Parameters',
sessionStorage => 'Sessions Storage',
timeout => 'Sessions timeout',
userDB => 'Users database type',
userControl => 'Username control',
virtualHosts => 'Virtual Hosts',
whatToTrace => "Attribute to use in Apache's logs",
advancedParams => 'Advanced parameters',
authentication => 'Authentication module',
authParams => 'Authentication parameters',
Configuration => 'Configuration',
confSaved => 'Configuration saved',
confWasChanged => 'Configuration has been changed',
cookieExpiration => 'Cookie expiration time',
cookieName => 'Cookie Name',
cookieParams => 'Cookies Parameters',
databaseLocked => 'Database locked by another process',
domain => 'Domain',
exportedAttr => 'SOAP exported attributes',
exportedVars => 'Exported Variables',
generalParameters => 'General Parameters',
globalStorage => 'Apache::Session module',
globalStorageOptions => 'Apache::Session module parameters',
groups => 'Groups',
headers => 'HTTP Headers',
https => 'Default value for https parameter',
ldapBase => 'LDAP Search Base',
ldapParams => 'LDAP parameters',
ldapPort => 'LDAP Server Port',
ldapServer => 'LDAP Server',
macros => 'Macros',
mailBody => 'Message content',
mailFrom => 'Mail sender',
managerDn => 'LDAP Account',
managerPassword => 'LDAP Password',
notification => 'Active notifications',
notificationStorage => 'Notifications storage type',
notificationStorageOptions => 'Storage module parameters',
passwordDB => 'Passaword database type',
passwordManagement => 'Password management',
portal => 'Portal',
randomPasswordRegexp => 'Regexp for password generation',
rules => 'Rules',
securedCookie => 'Secured Cookie (SSL)',
sessionParams => 'Sessions Parameters',
sessionStorage => 'Sessions Storage',
singleIP => 'One IP only by user',
singleSession => 'One session only by user',
singleUserByIP => 'One user by IP address',
SMTPServer => 'SMTP server',
Soap => 'Activate portal SOAP functions',
storePassword => 'Store user password in session datas',
syntaxError => 'Syntax Error',
syslog => 'Syslog facility',
timeout => 'Sessions timeout',
trustedDomains => 'Trusted domains',
unknownError => 'Unknown error',
uploadDenied => 'Upload denied',
userDB => 'Users database type',
userControl => 'Username control',
virtualHosts => 'Virtual Hosts',
whatToTrace => "Attribute to use in Apache's logs",
};
}
sub fr {
return {
authentication => "Module d'authentification",
authParams => "Paramètres d'authentification",
Configuration => 'Configuration',
cookieName => 'Nom du cookie',
cookieParams => 'Paramètres des cookies',
domain => 'Domaine',
exportedVars => 'Attributs LDAP à exporter',
generalParameters => 'Paramètres généraux',
globalStorage => 'Module Apache::Session',
globalStorageOptions => 'Paramètres du module Apache::Session',
groups => 'Groupes',
headers => 'En-têtes HTTP',
ldapBase => 'Base de recherche LDAP',
ldapParams => 'Paramètres LDAP',
ldapPort => 'Port du serveur LDAP',
ldapServer => 'Serveur LDAP',
macros => 'Macros',
managerDn => 'Compte de connexion LDAP',
managerPassword => 'Mot de passe LDAP',
portal => 'Portail',
rules => 'Règles',
securedCookie => 'Cookie sécurisé (SSL)',
sessionParams => 'Paramètres des Sessions Parameters',
sessionStorage => 'Stockage des sessions',
timeout => 'Durée de vie des sessions',
userDB => "Type de base de données d'utilisateurs",
userControl => "Contrôle du nom d'utilisateur",
virtualHosts => 'Hôtes virtuels',
whatToTrace => "Donnée à inscrire dans les journaux d'Apache",
advancedParams => 'Paramètres avancés',
authentication => "Module d'authentification",
authParams => "Paramètres d'authentification",
Configuration => 'Configuration',
confSaved => 'Configuration sauvegardée',
confWasChanged => 'Configuration modifiée entre-temps',
cookieExpiration => 'Durée de vie du cookie',
cookieName => 'Nom du cookie',
cookieParams => 'Paramètres des cookies',
databaseLocked => 'Base de donnée verrouillée par un autre processus',
domain => 'Domaine',
exportedAttr => 'Attribut exportés par le portail (SOAP)',
exportedVars => 'Attributs LDAP à exporter',
generalParameters => 'Paramètres généraux',
globalStorage => 'Module Apache::Session',
globalStorageOptions => 'Paramètres du module Apache::Session',
groups => 'Groupes',
headers => 'En-têtes HTTP',
https => 'Valeur par défaut du paramètre https',
ldapBase => 'Base de recherche LDAP',
ldapParams => 'Paramètres LDAP',
ldapPort => 'Port du serveur LDAP',
ldapServer => 'Serveur LDAP',
macros => 'Macros',
mailBody => 'Contenu du message',
mailFrom => 'Expéditeur du message',
managerDn => 'Compte de connexion LDAP',
managerPassword => 'Mot de passe LDAP',
notification => 'Active les notifications',
notificationStorage => 'Type de stockage des notifications',
notificationStorageOptions => 'Paramètres du module de stockage',
passwordDB => 'Type de base de données des mots-de-passe',
passwordManagement => 'Gestion des mots-de-passe',
portal => 'Portail',
randomPasswordRegexp =>
'Expression regulière pour la génération des mots-de-passe',
rules => 'Règles',
securedCookie => 'Cookie sécurisé (SSL)',
sessionParams => 'Paramètres des Sessions Parameters',
sessionStorage => 'Stockage des sessions',
singleIP => 'Une seule IP par utilisateur',
singleSession => 'Une seule session par utilisateur',
singleUserByIP => 'Une seule adresse IP par utilisateur',
SMTPServer => 'Serveur SMTP',
Soap => 'Active les fonctions SOAP du portail',
storePassword =>
"Stocke le mot-de-passe de l'utilisateur dans les données de session",
syntaxError => 'Erreur de syntaxe',
syslog => 'Facilité syslog',
timeout => 'Durée de vie des sessions',
trustedDomains => 'Domaines appouvés',
unknownError => 'Erreur nconnue',
uploadDenied => 'Téléchargement refusé',
userDB => "Type de base de données d'utilisateurs",
userControl => "Contrôle du nom d'utilisateur",
virtualHosts => 'Hôtes virtuels',
whatToTrace => "Donnée à inscrire dans les journaux d'Apache",
};
}
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment