From 630343bdbe3daa17b59211724ef0a49119467caa Mon Sep 17 00:00:00 2001 From: Christophe Maudoux Date: Mon, 3 May 2021 23:13:56 +0200 Subject: [PATCH] Remove unused demoMode option (#2517) --- .../lib/Lemonldap/NG/Manager/Conf.pm | 61 +++++++++---------- .../site/htdocs/static/languages/ar.json | 1 - .../site/htdocs/static/languages/de.json | 1 - .../site/htdocs/static/languages/en.json | 1 - .../site/htdocs/static/languages/es.json | 1 - .../site/htdocs/static/languages/fr.json | 1 - .../site/htdocs/static/languages/it.json | 1 - .../site/htdocs/static/languages/pl.json | 1 - .../site/htdocs/static/languages/tr.json | 1 - .../site/htdocs/static/languages/vi.json | 1 - .../site/htdocs/static/languages/zh.json | 1 - .../site/htdocs/static/languages/zh_TW.json | 1 - 12 files changed, 28 insertions(+), 44 deletions(-) diff --git a/lemonldap-ng-manager/lib/Lemonldap/NG/Manager/Conf.pm b/lemonldap-ng-manager/lib/Lemonldap/NG/Manager/Conf.pm index ff32a38c0..c9c97734c 100644 --- a/lemonldap-ng-manager/lib/Lemonldap/NG/Manager/Conf.pm +++ b/lemonldap-ng-manager/lib/Lemonldap/NG/Manager/Conf.pm @@ -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; } } } diff --git a/lemonldap-ng-manager/site/htdocs/static/languages/ar.json b/lemonldap-ng-manager/site/htdocs/static/languages/ar.json index 76f66e4c7..9093ee4fb 100644 --- a/lemonldap-ng-manager/site/htdocs/static/languages/ar.json +++ b/lemonldap-ng-manager/site/htdocs/static/languages/ar.json @@ -312,7 +312,6 @@ "deleteTOTPKey":"Delete TOTP key", "deleteU2FKey":"Delete U2F key", "demoExportedVars":"المتغيرات المصدرة", -"demoModeOn":"هذا المدير يعمل في طريقة العرض", "demoParams":"إثبات المعايير", "description":"التفاصيل", "dest":"Recipient", diff --git a/lemonldap-ng-manager/site/htdocs/static/languages/de.json b/lemonldap-ng-manager/site/htdocs/static/languages/de.json index 5e717a7ca..41747b790 100644 --- a/lemonldap-ng-manager/site/htdocs/static/languages/de.json +++ b/lemonldap-ng-manager/site/htdocs/static/languages/de.json @@ -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", diff --git a/lemonldap-ng-manager/site/htdocs/static/languages/en.json b/lemonldap-ng-manager/site/htdocs/static/languages/en.json index 0477c7a76..8c86f1dc9 100644 --- a/lemonldap-ng-manager/site/htdocs/static/languages/en.json +++ b/lemonldap-ng-manager/site/htdocs/static/languages/en.json @@ -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", diff --git a/lemonldap-ng-manager/site/htdocs/static/languages/es.json b/lemonldap-ng-manager/site/htdocs/static/languages/es.json index 0e1f47c3e..0ed650b8a 100644 --- a/lemonldap-ng-manager/site/htdocs/static/languages/es.json +++ b/lemonldap-ng-manager/site/htdocs/static/languages/es.json @@ -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", diff --git a/lemonldap-ng-manager/site/htdocs/static/languages/fr.json b/lemonldap-ng-manager/site/htdocs/static/languages/fr.json index 7a8f2ec6e..17617510f 100644 --- a/lemonldap-ng-manager/site/htdocs/static/languages/fr.json +++ b/lemonldap-ng-manager/site/htdocs/static/languages/fr.json @@ -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", diff --git a/lemonldap-ng-manager/site/htdocs/static/languages/it.json b/lemonldap-ng-manager/site/htdocs/static/languages/it.json index dd636cd8c..df53ffbce 100644 --- a/lemonldap-ng-manager/site/htdocs/static/languages/it.json +++ b/lemonldap-ng-manager/site/htdocs/static/languages/it.json @@ -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", diff --git a/lemonldap-ng-manager/site/htdocs/static/languages/pl.json b/lemonldap-ng-manager/site/htdocs/static/languages/pl.json index 0b7a95bb7..c32ef0d1e 100644 --- a/lemonldap-ng-manager/site/htdocs/static/languages/pl.json +++ b/lemonldap-ng-manager/site/htdocs/static/languages/pl.json @@ -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", diff --git a/lemonldap-ng-manager/site/htdocs/static/languages/tr.json b/lemonldap-ng-manager/site/htdocs/static/languages/tr.json index be9a78661..43d47b73a 100644 --- a/lemonldap-ng-manager/site/htdocs/static/languages/tr.json +++ b/lemonldap-ng-manager/site/htdocs/static/languages/tr.json @@ -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ı", diff --git a/lemonldap-ng-manager/site/htdocs/static/languages/vi.json b/lemonldap-ng-manager/site/htdocs/static/languages/vi.json index b5258ec56..2d2005152 100644 --- a/lemonldap-ng-manager/site/htdocs/static/languages/vi.json +++ b/lemonldap-ng-manager/site/htdocs/static/languages/vi.json @@ -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", diff --git a/lemonldap-ng-manager/site/htdocs/static/languages/zh.json b/lemonldap-ng-manager/site/htdocs/static/languages/zh.json index 080d6b06a..e47dcf955 100644 --- a/lemonldap-ng-manager/site/htdocs/static/languages/zh.json +++ b/lemonldap-ng-manager/site/htdocs/static/languages/zh.json @@ -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", diff --git a/lemonldap-ng-manager/site/htdocs/static/languages/zh_TW.json b/lemonldap-ng-manager/site/htdocs/static/languages/zh_TW.json index e3b1fdd28..3f911956a 100644 --- a/lemonldap-ng-manager/site/htdocs/static/languages/zh_TW.json +++ b/lemonldap-ng-manager/site/htdocs/static/languages/zh_TW.json @@ -312,7 +312,6 @@ "deleteTOTPKey":"刪除 TOTP 金鑰", "deleteU2FKey":"刪除 U2F 金鑰", "demoExportedVars":"已匯出的變數", -"demoModeOn":"此管理程式以示範模式運作", "demoParams":"示範參數", "description":"描述", "dest":"接收者",