maketank/Froxlor
2
0
Fork 0
Code Pull Requests Releases Activity

add missing panel-text for task #8 and #99

Browse Source 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
This commit is contained in:
Michael Kaufmann (d00p)
2014-01-14 07:35:14 +01:00
parent 4e095aaeb4
commit f4e2449822
3 changed files with 13 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
lib/functions/froxlor/function.CronjobFunctions.php
View File

@@ -96,14 +96,22 @@ function getOutstandingTasks() {
$task_desc = $lng['tasks']['deleting_customerfiles']; $task_desc = $lng['tasks']['deleting_customerfiles'];
$task_desc = str_replace('%loginname%', $loginname, $task_desc); $task_desc = str_replace('%loginname%', $loginname, $task_desc);
} }
// deleteing email-account // deleting email-account
elseif ($row['type'] == '7') { elseif ($row['type'] == '7') {
$task_desc = $lng['tasks']['remove_emailacc_files']; $task_desc = $lng['tasks']['remove_emailacc_files'];
} }
// deleting ftp-account
elseif ($row['type'] == '8') {
$task_desc = $lng['tasks']['remove_ftpacc_files'];
}
// Set FS - quota // Set FS - quota
elseif ($row['type'] == '10') { elseif ($row['type'] == '10') {
$task_desc = $lng['tasks']['diskspace_set_quota']; $task_desc = $lng['tasks']['diskspace_set_quota'];
} }
// re-generating of cron.d-file
elseif ($row['type'] == '99') {
$task_desc = $lng['tasks']['regenerating_crond'];
}
// unknown // unknown
else { else {
$task_desc = "ERROR: Unknown task type '".$row['type']."'"; $task_desc = "ERROR: Unknown task type '".$row['type']."'";

2
lng/english.lng.php
View File

@@ -1800,3 +1800,5 @@ $lng['panel']['ftpdesc'] = 'FTP description';
$lng['admin']['cronsettings'] = 'Cronjob settings'; $lng['admin']['cronsettings'] = 'Cronjob settings';
$lng['serversettings']['system_cronconfig']['title'] = 'Cron configuration file'; $lng['serversettings']['system_cronconfig']['title'] = 'Cron configuration file';
$lng['serversettings']['system_cronconfig']['description'] = 'Path to the cron-service configuration-file. This file will be updated regularly and automatically by froxlor.<br />Note: Do <b>not</b> use the same filename as for the main froxlor cronjob (/etc/cron.d/froxlor)!'; $lng['serversettings']['system_cronconfig']['description'] = 'Path to the cron-service configuration-file. This file will be updated regularly and automatically by froxlor.<br />Note: Do <b>not</b> use the same filename as for the main froxlor cronjob (/etc/cron.d/froxlor)!';
$lng['tasks']['remove_ftpacc_files'] = 'Delete customer ftp-account data.';
$lng['tasks']['regenerating_crond'] = 'Rebuilding the cron.d-file';

2
lng/german.lng.php
View File

@@ -1526,3 +1526,5 @@ $lng['panel']['ftpdesc'] = 'FTP Beschreibung';
$lng['admin']['cronsettings'] = 'Cronjob Einstellungen'; $lng['admin']['cronsettings'] = 'Cronjob Einstellungen';
$lng['serversettings']['system_cronconfig']['title'] = 'Cron-Konfigurationsdatei'; $lng['serversettings']['system_cronconfig']['title'] = 'Cron-Konfigurationsdatei';
$lng['serversettings']['system_cronconfig']['description'] = 'Pfad zur Konfigurationsdatei des Cron-Dienstes. Diese Datei wird von froxlor automatisch aktualisiert.<br />Hinweis: bitte <b>nicht</b> die gleiche Datei wie für den Froxlor-Hautp-Cronjob angeben (/etc/cron.d/froxlor)!'; $lng['serversettings']['system_cronconfig']['description'] = 'Pfad zur Konfigurationsdatei des Cron-Dienstes. Diese Datei wird von froxlor automatisch aktualisiert.<br />Hinweis: bitte <b>nicht</b> die gleiche Datei wie für den Froxlor-Hautp-Cronjob angeben (/etc/cron.d/froxlor)!';
$lng['tasks']['remove_ftpacc_files'] = 'Kunden FTP-Konto Dateien löschen';
$lng['tasks']['regenerating_crond'] = 'Neuerstellung der cron.d-Datei';