Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP

Loading…

Fix 'task id 9' issue. #23

Merged
merged 1 commit into from

2 participants

avengerx Florian Aders
avengerx

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.

avengerx avengerx Fix 'task id 9' issue.
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.
42b9964
avengerx

This is more like it! :)

Shall I trouble myself about the path stuff? I don't have much idea now on how I would do to make it an option, I probably would have to make a check box on mailserver settings on admin. If you give me some directions I can try and make something reasonable.

Florian Aders
Owner

Hi,

The patch looks good, I'll merge it now.

If there is an option where you set the maildir-path, this would be very helpfull (maybe with some variables which are replaced?

So long,
EleRas

Florian Aders EleRas merged commit a2c49c3 into from
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Commits on Jun 18, 2012
  1. avengerx

    Fix 'task id 9' issue.

    avengerx authored
    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 page is out of date. Refresh to see the latest.
2  admin_settings.php
View
@@ -83,7 +83,6 @@
$log->logAction(ADM_ACTION, LOG_INFO, "rebuild configfiles due to changed setting");
inserttask('1');
inserttask('5');
- inserttask('9');
# Using nameserver, insert a task which rebuilds the server config
if ($settings['system']['bind_enable'])
@@ -129,7 +128,6 @@
$log->logAction(ADM_ACTION, LOG_INFO, "rebuild configfiles");
inserttask('1');
inserttask('5');
- inserttask('9');
inserttask('10');
# Using nameserver, insert a task which rebuilds the server config
5 lib/functions/froxlor/function.CronjobFunctions.php
View
@@ -216,6 +216,11 @@ function getOutstandingTasks()
{
$task_desc = $lng['tasks']['diskspace_set_quota'];
}
+ else
+ {
+ $task_desc = "ERROR: Unknown task type '".$row['type'].
+ "'";
+ }
if($task_desc != '') {
$tasks .= '<li>'.$task_desc.'</li>';
1  lib/functions/froxlor/function.inserttask.php
View
@@ -35,7 +35,6 @@ function inserttask($type, $param1 = '', $param2 = '', $param3 = '', $param4 = '
|| $type == '3'
|| $type == '4'
|| $type == '5'
- || $type == '9'
|| $type == '10')
{
$db->query('DELETE FROM `' . TABLE_PANEL_TASKS . '` WHERE `type`="' . $type . '"');
Something went wrong with that request. Please try again.