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

Remove unused demoMode option (#2517)

Browse Source
This commit is contained in:
Christophe Maudoux 2021-05-03 23:13:56 +02:00
parent 6be4cfe035
commit 630343bdbe
12 changed files with 28 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

61
lemonldap-ng-manager/lib/Lemonldap/NG/Manager/Conf.pm
View File

@ -402,43 +402,38 @@ sub newConf {
}
}
if ( $res->{result} ) {
if ( $self->p->{demoMode} ) {
$res->{message} = '__demoModeOn__';
my %args;
$args{force} = 1 if ( $req->params('force') );
if ( $req->params('cfgDate') ) {
$args{cfgDate} = $req->params('cfgDate');
$args{currentCfgDate} = $currentCfgDate;
}
my $s = CONFIG_WAS_CHANGED;
$s = $self->confAcc->saveConf( $parser->newConf, %args )
unless ( @{ $parser->{needConfirmation} } && !$args{force} );
if ( $s > 0 ) {
$self->userLogger->notice(
'User ' . $self->p->userId($req) . " has stored conf $s" );
$res->{result} = 1;
$res->{cfgNum} = $s;
if ( my $status = $self->applyConf( $parser->newConf ) ) {
push @{ $res->{details}->{__applyResult__} },
{ message => "$_: $status->{$_}" }
foreach ( keys %$status );
}
}
else {
my %args;
$args{force} = 1 if ( $req->params('force') );
if ( $req->params('cfgDate') ) {
$args{cfgDate} = $req->params('cfgDate');
$args{currentCfgDate} = $currentCfgDate;
}
my $s = CONFIG_WAS_CHANGED;
$s = $self->confAcc->saveConf( $parser->newConf, %args )
unless ( @{ $parser->{needConfirmation} } && !$args{force} );
if ( $s > 0 ) {
$self->userLogger->notice(
'User ' . $self->p->userId($req) . " has stored conf $s" );
$res->{result} = 1;
$res->{cfgNum} = $s;
if ( my $status = $self->applyConf( $parser->newConf ) ) {
push @{ $res->{details}->{__applyResult__} },
{ message => "$_: $status->{$_}" }
foreach ( keys %$status );
}
$self->userLogger->notice(
'Saving attempt rejected, asking for confirmation to '
. $self->p->userId($req) );
$res->{result} = 0;
if ( $s == CONFIG_WAS_CHANGED ) {
$res->{needConfirm} = 1;
$res->{message} .= '__needConfirmation__'
unless @{ $parser->{needConfirmation} };
}
else {
$self->userLogger->notice(
'Saving attempt rejected, asking for confirmation to '
. $self->p->userId($req) );
$res->{result} = 0;
if ( $s == CONFIG_WAS_CHANGED ) {
$res->{needConfirm} = 1;
$res->{message} .= '__needConfirmation__'
unless @{ $parser->{needConfirmation} };
}
else {
$res->{message} = $Lemonldap::NG::Common::Conf::msg;
}
$res->{message} = $Lemonldap::NG::Common::Conf::msg;
}
}
}

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

@ -312,7 +312,6 @@
"deleteTOTPKey":"Delete TOTP key",
"deleteU2FKey":"Delete U2F key",
"demoExportedVars":"المتغيرات المصدرة",
"demoModeOn":"هذا المدير يعمل في طريقة العرض",
"demoParams":"إثبات المعايير",
"description":"التفاصيل",
"dest":"Recipient",

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

@ -312,7 +312,6 @@
"deleteTOTPKey":"Delete TOTP key",
"deleteU2FKey":"Delete U2F key",
"demoExportedVars":"Exported variables",
"demoModeOn":"This manager runs in demo mode",
"demoParams":"Demonstration parameters",
"description":"Beschreibung",
"dest":"Recipient",

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

@ -312,7 +312,6 @@
"deleteTOTPKey":"Delete TOTP key",
"deleteU2FKey":"Delete U2F key",
"demoExportedVars":"Exported variables",
"demoModeOn":"This manager runs in demo mode",
"demoParams":"Demonstration parameters",
"description":"Description",
"dest":"Recipient",

1
lemonldap-ng-manager/site/htdocs/static/languages/es.json
View File

@ -312,7 +312,6 @@
"deleteTOTPKey":"Borrar clave TOTP",
"deleteU2FKey":"Borrar clave U2F",
"demoExportedVars":"Variables exportadas",
"demoModeOn":"Este gestor se ejecuta en modo de pruebas",
"demoParams":"Parámetros de prueba",
"description":"Descripción",
"dest":"Recipient",

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

@ -312,7 +312,6 @@
"deleteTOTPKey":"Supprimer la clef TOTP",
"deleteU2FKey":"Supprimer la clef U2F",
"demoExportedVars":"Variables exportées",
"demoModeOn":"Ce manager fonctionne en mode Demo",
"demoParams":"Paramètres démonstration",
"description":"Description",
"dest":"Destinataire",

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

@ -312,7 +312,6 @@
"deleteTOTPKey":"Elimina la chiave TOTP",
"deleteU2FKey":"Elimina la chiave U2F",
"demoExportedVars":"Variabili esportate",
"demoModeOn":"Questo gestore viene eseguito in modalità demo",
"demoParams":"Parametri di dimostrazione",
"description":"Descrizione",
"dest":"Recipient",

1
lemonldap-ng-manager/site/htdocs/static/languages/pl.json
View File

@ -312,7 +312,6 @@
"deleteTOTPKey":"Usuń klucz TOTP",
"deleteU2FKey":"Usuń klucz U2F",
"demoExportedVars":"Wyeksportowane zmienne",
"demoModeOn":"Ten menedżer działa w trybie demonstracyjnym",
"demoParams":"Parametry demonstracyjne",
"description":"Opis",
"dest":"Odbiorca",

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

@ -312,7 +312,6 @@
"deleteTOTPKey":"TOTP anahtarını sil",
"deleteU2FKey":"U2F anahtarını sil",
"demoExportedVars":"Dışa aktarılan değişkenler",
"demoModeOn":"Bu yönetici demo modunda çalışıyor",
"demoParams":"Gösterim parametreleri",
"description":"Açıklama",
"dest":"Alıcı",

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

@ -312,7 +312,6 @@
"deleteTOTPKey":"Delete TOTP key",
"deleteU2FKey":"Delete U2F key",
"demoExportedVars":"Xuất khẩu biến",
"demoModeOn":"Trình quản lý này chạy ở chế độ demo",
"demoParams":"Tham số trình diễn",
"description":"Mô tả",
"dest":"Recipient",

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

@ -312,7 +312,6 @@
"deleteTOTPKey":"Delete TOTP key",
"deleteU2FKey":"Delete U2F key",
"demoExportedVars":"Exported variables",
"demoModeOn":"This manager runs in demo mode",
"demoParams":"Demonstration parameters",
"description":"Description",
"dest":"Recipient",

1
lemonldap-ng-manager/site/htdocs/static/languages/zh_TW.json
View File

@ -312,7 +312,6 @@
"deleteTOTPKey":"刪除 TOTP 金鑰",
"deleteU2FKey":"刪除 U2F 金鑰",
"demoExportedVars":"已匯出的變數",
"demoModeOn":"此管理程式以示範模式運作",
"demoParams":"示範參數",
"description":"描述",
"dest":"接收者",