From 2fb091939fde650452edf213ecb35995de274df1 Mon Sep 17 00:00:00 2001 From: Daniel Reichelt Date: Tue, 16 Feb 2016 18:24:48 +0100 Subject: [PATCH] remove unused setting system_send_cron_errors --- actions/admin/settings/125.cronjob.php | 8 -------- install/froxlor.sql | 2 +- install/updates/froxlor/0.9/update_0.9.inc.php | 10 ++++++++++ lib/version.inc.php | 2 +- lng/english.lng.php | 2 -- lng/german.lng.php | 2 -- lng/italian.lng.php | 2 -- 7 files changed, 12 insertions(+), 16 deletions(-) diff --git a/actions/admin/settings/125.cronjob.php b/actions/admin/settings/125.cronjob.php index 077be68a..e23a2379 100644 --- a/actions/admin/settings/125.cronjob.php +++ b/actions/admin/settings/125.cronjob.php @@ -29,14 +29,6 @@ return array( 'default' => '/etc/cron.d/froxlor', 'save_method' => 'storeSettingField', ), - 'system_send_cron_errors' => array( - 'label' => $lng['serversettings']['system_send_cron_errors'], - 'settinggroup' => 'system', - 'varname' => 'send_cron_errors', - 'type' => 'bool', - 'default' => false, - 'save_method' => 'storeSettingField', - ), 'system_croncmdline' => array( 'label' => $lng['serversettings']['system_croncmdline'], 'settinggroup' => 'system', diff --git a/install/froxlor.sql b/install/froxlor.sql index 58ff325a..febce3ab 100644 --- a/install/froxlor.sql +++ b/install/froxlor.sql @@ -548,7 +548,7 @@ INSERT INTO `panel_settings` (`settinggroup`, `varname`, `value`) VALUES ('panel', 'password_numeric', '0'), ('panel', 'password_special_char_required', '0'), ('panel', 'password_special_char', '!?<>§$%+#=@'), - ('panel', 'version', '0.9.35-dev3'); + ('panel', 'version', '0.9.35-dev4'); DROP TABLE IF EXISTS `panel_tasks`; diff --git a/install/updates/froxlor/0.9/update_0.9.inc.php b/install/updates/froxlor/0.9/update_0.9.inc.php index 5f5e209a..9dfc6a01 100644 --- a/install/updates/froxlor/0.9/update_0.9.inc.php +++ b/install/updates/froxlor/0.9/update_0.9.inc.php @@ -3069,3 +3069,13 @@ if (isFroxlorVersion('0.9.35-dev2')) { updateToVersion('0.9.35-dev3'); } + +if (isFroxlorVersion('0.9.35-dev3')) { + + // remove unused settingjj + showUpdateStep("Removing unused setting "Send cron-errors to froxlor-admin via e-mail""); + Database::query("DELETE FROM `" . TABLE_PANEL_SETTINGS . "` WHERE `settinggroup` = 'system' AND `varname` = 'send_cron_errors';"); + lastStepStatus(0); + + updateToVersion('0.9.35-dev4'); +} diff --git a/lib/version.inc.php b/lib/version.inc.php index 73bb3194..01c668c6 100644 --- a/lib/version.inc.php +++ b/lib/version.inc.php @@ -16,7 +16,7 @@ */ // Main version variable -$version = '0.9.35-dev3'; +$version = '0.9.35-dev4'; // Database version (unused, old stuff from SysCP) $dbversion = '2'; diff --git a/lng/english.lng.php b/lng/english.lng.php index 2b0b152b..b217a0f6 100644 --- a/lng/english.lng.php +++ b/lng/english.lng.php @@ -1836,8 +1836,6 @@ $lng['domains']['import_description'] = 'Detailed information about the structur $lng['usersettings']['custom_notes']['title'] = 'Custom notes'; $lng['usersettings']['custom_notes']['description'] = 'Feel free to put any notes you want/need in here. They will show up in the admin/customer overview for the corresponding user.'; $lng['usersettings']['custom_notes']['show'] = 'Show your notes on the dashboard of the user'; -$lng['serversettings']['system_send_cron_errors']['title'] = 'Send cron-errors to froxlor-admin via e-mail'; -$lng['serversettings']['system_send_cron_errors']['description'] = 'Choose whether you want to receive an e-mail on cronjob errors. Keep in mind that this can lead to an e-mail being sent every 5 minutes depending on the error and your cronjob settings.'; $lng['error']['fcgidandphpfpmnogoodtogether'] = 'FCGID and PHP-FPM cannot be activated at the same time'; // Added in Froxlor 0.9.34 diff --git a/lng/german.lng.php b/lng/german.lng.php index 588b3ca9..0498a667 100644 --- a/lng/german.lng.php +++ b/lng/german.lng.php @@ -1563,8 +1563,6 @@ $lng['domains']['import_description'] = 'Detaillierte Informationen über den Au $lng['usersettings']['custom_notes']['title'] = 'Eigene Notizen'; $lng['usersettings']['custom_notes']['description'] = 'Hier können Notizen je nach Lust und Laune eingetragen werden. Diese werden in der Administrator/Kunden-Übersicht bei dem jeweiligen Benutzer angezeigt.'; $lng['usersettings']['custom_notes']['show'] = 'Zeige die Notizen auf dem Dashboard des Benutzers'; -$lng['serversettings']['system_send_cron_errors']['title'] = 'Sende Cron-Fehler via E-Mail an den Froxlor-Admin'; -$lng['serversettings']['system_send_cron_errors']['description'] = 'Gib an, ob bei einem Cron-Fehler eine E-Mail versendet werden soll. Beachte das es je nach Fehler und Cronjob-Einstellungen dazu kommen kann, dass diese E-Mail alle 5 Minuten gesendet wird.'; $lng['error']['fcgidandphpfpmnogoodtogether'] = 'FCGID und PHP-FPM können nicht gleichzeitig aktiviert werden.'; // Added in Froxlor 0.9.34 diff --git a/lng/italian.lng.php b/lng/italian.lng.php index a0bb177b..bc2bcbe4 100644 --- a/lng/italian.lng.php +++ b/lng/italian.lng.php @@ -1802,5 +1802,3 @@ $lng['domains']['import_description'] = 'Per ottenere informazioni dettagliate s $lng['usersettings']['custom_notes']['title'] = 'Note personali'; $lng['usersettings']['custom_notes']['description'] = 'Sentiti libero di inserire qualsi nota vuoi o necessiti qui. Apparirano nel riepilogo dell\'amministratore/cliente perl \'utente corrispondente.'; $lng['usersettings']['custom_notes']['show'] = 'Mostra le tue note nel cruscotto dell\'utente'; -$lng['serversettings']['system_send_cron_errors']['title'] = 'Inviaa gli errori cron all \'amministratore di froxlor via e-mail'; -$lng['serversettings']['system_send_cron_errors']['description'] = 'Scegli se ricevere una email sugli errori di cronjob. Ricorda che questo potrebbe causare l\'invio di una mail ogni 5 minuti in dipendenza all \'errore e alle tue impostazioni di cronjob.';