diff --git a/actions/admin/settings/170.logger.php b/actions/admin/settings/170.logger.php
index 92b1ab6b..2b0e730d 100644
--- a/actions/admin/settings/170.logger.php
+++ b/actions/admin/settings/170.logger.php
@@ -65,8 +65,14 @@ return array(
'label' => $lng['serversettings']['logger']['logcron'],
'settinggroup' => 'logger',
'varname' => 'log_cron',
- 'type' => 'bool',
- 'default' => false,
+ 'type' => 'option',
+ 'default' => 0,
+ 'option_mode' => 'one',
+ 'option_options' => array(
+ 0 => $lng['serversettings']['logger']['logcronoption']['never'],
+ 1 => $lng['serversettings']['logger']['logcronoption']['once'],
+ 2 => $lng['serversettings']['logger']['logcronoption']['always']
+ ),
'save_method' => 'storeSettingField',
),
),
@@ -74,4 +80,4 @@ return array(
)
);
-?>
\ No newline at end of file
+?>
diff --git a/lib/classes/logger/class.FroxlorLogger.php b/lib/classes/logger/class.FroxlorLogger.php
index 036b3daa..fda489ad 100644
--- a/lib/classes/logger/class.FroxlorLogger.php
+++ b/lib/classes/logger/class.FroxlorLogger.php
@@ -191,13 +191,11 @@ class FroxlorLogger {
$_cronlog = (int)$_cronlog;
- if ($_cronlog != 0
- && $_cronlog != 1
- ) {
+ if ($_cronlog < 0 || $_cronlog > 2) {
$_cronlog = 0;
}
Settings::Set('logger.log_cron', $_cronlog);
- return true;
+ return $_cronlog;
}
/**
diff --git a/lng/dutch.lng.php b/lng/dutch.lng.php
index a78c2b14..93e27080 100644
--- a/lng/dutch.lng.php
+++ b/lng/dutch.lng.php
@@ -689,7 +689,10 @@ $lng['serversettings']['logger']['types']['title'] = 'Log-type(s)';
$lng['serversettings']['logger']['types']['description'] = 'Om meerdere types te selecteren, houd u CTRL ingedrukt terwijl u selecteert.
Beschikbare types zijn: syslog, bestand, mysql';
$lng['serversettings']['logger']['logfile'] = 'Pad naar logfile, inclusief bestandsnaam';
$lng['error']['logerror'] = 'Log-Fout: %s';
-$lng['serversettings']['logger']['logcron'] = 'Cronjobs loggen (eenmalig)';
+$lng['serversettings']['logger']['logcron'] = 'Cronjobs loggen';
+$lng['serversettings']['logger']['logcronoption']['never'] = 'Nooit';
+$lng['serversettings']['logger']['logcronoption']['once'] = 'Eeenmalig';
+$lng['serversettings']['logger']['logcronoption']['always'] = 'Altijd';
$lng['question']['logger_reallytruncate'] = 'Weet u zeker dat u de tabel "%s" wilt legen?';
$lng['admin']['loggersystem'] = 'Systeemlog';
$lng['menue']['logger']['logger'] = 'Systeemlog';
diff --git a/lng/english.lng.php b/lng/english.lng.php
index 0277b0fd..2b0b152b 100644
--- a/lng/english.lng.php
+++ b/lng/english.lng.php
@@ -738,7 +738,10 @@ $lng['serversettings']['logger']['types']['title'] = 'Log-type(s)';
$lng['serversettings']['logger']['types']['description'] = 'Specify logtypes. To select multiple types, hold down CTRL while selecting.
Available logtypes are: syslog, file, mysql';
$lng['serversettings']['logger']['logfile'] = 'Logfile path including filename';
$lng['error']['logerror'] = 'Log-Error: %s';
-$lng['serversettings']['logger']['logcron'] = 'Log cronjobs (one run)';
+$lng['serversettings']['logger']['logcron'] = 'Log cronjobs';
+$lng['serversettings']['logger']['logcronoption']['never'] = 'Never';
+$lng['serversettings']['logger']['logcronoption']['once'] = 'Once';
+$lng['serversettings']['logger']['logcronoption']['always'] = 'Always';
$lng['question']['logger_reallytruncate'] = 'Do you really want to truncate the table "%s"?';
$lng['admin']['loggersystem'] = 'System-logging';
$lng['menue']['logger']['logger'] = 'System-logging';
@@ -1959,4 +1962,4 @@ $lng['admin']['server_php'] = 'PHP';
// Added for Termination-date
$lng['domains']['termination_date'] = 'Date of termination';
-$lng['domains']['termination_date_overview'] = 'canceled until ';
\ No newline at end of file
+$lng['domains']['termination_date_overview'] = 'canceled until ';
diff --git a/lng/french.lng.php b/lng/french.lng.php
index 92fe9a7b..ebfad396 100644
--- a/lng/french.lng.php
+++ b/lng/french.lng.php
@@ -728,7 +728,10 @@ $lng['serversettings']['logger']['types']['title'] = 'Type(s) de log';
$lng['serversettings']['logger']['types']['description'] = 'Spécifiez les types de log séparés par des virgules.
Les types de log disponible sont : syslog, file, mysql';
$lng['serversettings']['logger']['logfile'] = 'Nom du fichier de log, dossier + nom du fichier';
$lng['error']['logerror'] = 'Erreur log : %s';
-$lng['serversettings']['logger']['logcron'] = 'Loguer les travaux de cron (lancer une fois)';
+$lng['serversettings']['logger']['logcron'] = 'Loguer les travaux de cron';
+$lng['serversettings']['logger']['logcronoption']['never'] = 'Jamais';
+$lng['serversettings']['logger']['logcronoption']['once'] = 'Une fois';
+$lng['serversettings']['logger']['logcronoption']['always'] = 'Toujours';
$lng['question']['logger_reallytruncate'] = 'Etes-vous sûr de vouloir vider la table "%s" ?';
$lng['admin']['loggersystem'] = 'Log système';
$lng['menue']['logger']['logger'] = 'Log système';
diff --git a/lng/german.lng.php b/lng/german.lng.php
index 673106f2..588b3ca9 100644
--- a/lng/german.lng.php
+++ b/lng/german.lng.php
@@ -735,7 +735,10 @@ $lng['serversettings']['logger']['types']['title'] = 'Log-Art(en)';
$lng['serversettings']['logger']['types']['description'] = 'Wählen Sie hier die gewünschten Logtypen. Für Mehrfachauswahl, halten Sie während der Auswahl STRG gedrückt
Mögliche Logtypen sind: syslog, file, mysql';
$lng['serversettings']['logger']['logfile'] = 'Log-Datei Pfad inklusive Dateinamen';
$lng['error']['logerror'] = 'Log-Fehler: "%s"';
-$lng['serversettings']['logger']['logcron'] = 'Logge Cronjobs (einen Durchgang)';
+$lng['serversettings']['logger']['logcron'] = 'Logge Cronjobs';
+$lng['serversettings']['logger']['logcronoption']['never'] = 'Nie';
+$lng['serversettings']['logger']['logcronoption']['once'] = 'Einmalig';
+$lng['serversettings']['logger']['logcronoption']['always'] = 'Immer';
$lng['question']['logger_reallytruncate'] = 'Wollen Sie die Tabelle "%s" wirklich leeren?';
$lng['admin']['loggersystem'] = 'System-Logging';
$lng['menue']['logger']['logger'] = 'System-Logging';
diff --git a/lng/portugues.lng.php b/lng/portugues.lng.php
index 75f2a84d..82a42330 100644
--- a/lng/portugues.lng.php
+++ b/lng/portugues.lng.php
@@ -642,6 +642,9 @@ $lng['serversettings']['logger']['types']['description'] = 'Especificar tipos de
$lng['serversettings']['logger']['logfile'] = 'Caminho do Arquivo de Log incluindo nome de arquivo';
$lng['error']['logerror'] = 'Log-Erro: %s';
$lng['serversettings']['logger']['logcron'] = 'Logar tarefas do cron';
+$lng['serversettings']['logger']['logcronoption']['never'] = 'Nunca';
+$lng['serversettings']['logger']['logcronoption']['once'] = 'Uma vez';
+$lng['serversettings']['logger']['logcronoption']['always'] = 'Sempre';
$lng['question']['logger_reallytruncate'] = 'Você realmente deseja dividir a tabela "%s"?';
$lng['admin']['loggersystem'] = 'Systema-Logging';
$lng['menue']['logger']['logger'] = 'Systema-Logging';