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

Fix 'task id 9' issue.

Browse Source 
Adds a message on Admin's Overview page if a task is of an unknown type.
Removes task '9' adding on function.inserttask and ignores task id 9 on
CronJobFunctions.
This commit is contained in:
Fabrício Zimmerer Murta
2012-06-18 02:05:55 -03:00
parent 12d137aac4
commit 42b9964e9c
3 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
admin_settings.php
View File

@@ -83,7 +83,6 @@ if(($page == 'settings' || $page == 'overview')
$log->logAction(ADM_ACTION, LOG_INFO, "rebuild configfiles due to changed setting"); $log->logAction(ADM_ACTION, LOG_INFO, "rebuild configfiles due to changed setting");
inserttask('1'); inserttask('1');
inserttask('5'); inserttask('5');
inserttask('9');
# Using nameserver, insert a task which rebuilds the server config # Using nameserver, insert a task which rebuilds the server config
if ($settings['system']['bind_enable']) if ($settings['system']['bind_enable'])
@@ -129,7 +128,6 @@ elseif($page == 'rebuildconfigs'
$log->logAction(ADM_ACTION, LOG_INFO, "rebuild configfiles"); $log->logAction(ADM_ACTION, LOG_INFO, "rebuild configfiles");
inserttask('1'); inserttask('1');
inserttask('5'); inserttask('5');
inserttask('9');
inserttask('10'); inserttask('10');
# Using nameserver, insert a task which rebuilds the server config # Using nameserver, insert a task which rebuilds the server config

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

@@ -216,6 +216,11 @@ function getOutstandingTasks()
{ {
$task_desc = $lng['tasks']['diskspace_set_quota']; $task_desc = $lng['tasks']['diskspace_set_quota'];
} }
else
{
$task_desc = "ERROR: Unknown task type '".$row['type'].
"'";
}
if($task_desc != '') { if($task_desc != '') {
$tasks .= '<li>'.$task_desc.'</li>'; $tasks .= '<li>'.$task_desc.'</li>';

1
lib/functions/froxlor/function.inserttask.php
View File

@@ -35,7 +35,6 @@ function inserttask($type, $param1 = '', $param2 = '', $param3 = '', $param4 = '
|| $type == '3' || $type == '3'
|| $type == '4' || $type == '4'
|| $type == '5' || $type == '5'
|| $type == '9'
|| $type == '10') || $type == '10')
{ {
$db->query('DELETE FROM `' . TABLE_PANEL_TASKS . '` WHERE `type`="' . $type . '"'); $db->query('DELETE FROM `' . TABLE_PANEL_TASKS . '` WHERE `type`="' . $type . '"');