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

modernize parameters of Cronjob::inserttask()

Browse Source 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
This commit is contained in:
Michael Kaufmann
2022-01-21 10:39:32 +01:00
parent 4a912e3902
commit 06849133a8
1 changed files with 22 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

48
lib/Froxlor/System/Cronjob.php
View File

@@ -95,17 +95,13 @@ class Cronjob
* @param * @param
* int Type of task * int Type of task
* @param * @param
* string Parameter 1 * string Parameter (possible to pass multiple times)
* @param *
* string Parameter 2
* @param
* string Parameter 3
* @author Florian Lippert <flo@syscp.org> * @author Florian Lippert <flo@syscp.org>
* @author Froxlor team <team@froxlor.org> * @author Froxlor team <team@froxlor.org>
*/ */
public static function inserttask($type, $param1 = '', $param2 = '', $param3 = '', $param4 = '') public static function inserttask($type, ...$params)
{ {
// prepare the insert-statement // prepare the insert-statement
$ins_stmt = Database::prepare(" $ins_stmt = Database::prepare("
INSERT INTO `" . TABLE_PANEL_TASKS . "` SET `type` = :type, `data` = :data INSERT INTO `" . TABLE_PANEL_TASKS . "` SET `type` = :type, `data` = :data
@@ -134,62 +130,62 @@ class Cronjob
'type' => $type, 'type' => $type,
'data' => '' 'data' => ''
)); ));
} elseif ($type == TaskId::CREATE_HOME && $param1 != '' && $param2 != '' && $param3 != '' && ($param4 == 0 || $param4 == 1)) { } elseif ($type == TaskId::CREATE_HOME && count($params) == 4 && $params[0] != '' && $params[1] != '' && $params[2] != '' && ($params[3] == 0 || $params[3] == 1)) {
$data = array(); $data = array();
$data['loginname'] = $param1; $data['loginname'] = $params[0];
$data['uid'] = $param2; $data['uid'] = $params[1];
$data['gid'] = $param3; $data['gid'] = $params[2];
$data['store_defaultindex'] = $param4; $data['store_defaultindex'] = $params[3];
$data = json_encode($data); $data = json_encode($data);
Database::pexecute($ins_stmt, array( Database::pexecute($ins_stmt, array(
'type' => TaskId::CREATE_HOME, 'type' => TaskId::CREATE_HOME,
'data' => $data 'data' => $data
)); ));
} elseif ($type == TaskId::DELETE_CUSTOMER_FILES && $param1 != '') { } elseif ($type == TaskId::DELETE_CUSTOMER_FILES && isset($params[0]) && $params[0] != '') {
$data = array(); $data = array();
$data['loginname'] = $param1; $data['loginname'] = $params[0];
$data = json_encode($data); $data = json_encode($data);
Database::pexecute($ins_stmt, array( Database::pexecute($ins_stmt, array(
'type' => TaskId::DELETE_CUSTOMER_FILES, 'type' => TaskId::DELETE_CUSTOMER_FILES,
'data' => $data 'data' => $data
)); ));
} elseif ($type == TaskId::DELETE_EMAIL_DATA && $param1 != '' && $param2 != '') { } elseif ($type == TaskId::DELETE_EMAIL_DATA && count($params) == 2 && $params[0] != '' && $params[1] != '') {
$data = array(); $data = array();
$data['loginname'] = $param1; $data['loginname'] = $params[0];
$data['email'] = $param2; $data['email'] = $params[1];
$data = json_encode($data); $data = json_encode($data);
Database::pexecute($ins_stmt, array( Database::pexecute($ins_stmt, array(
'type' => TaskId::DELETE_EMAIL_DATA, 'type' => TaskId::DELETE_EMAIL_DATA,
'data' => $data 'data' => $data
)); ));
} elseif ($type == TaskId::DELETE_FTP_DATA && $param1 != '' && $param2 != '') { } elseif ($type == TaskId::DELETE_FTP_DATA && count($params) == 2 && $params[0] != '' && $params[1] != '') {
$data = array(); $data = array();
$data['loginname'] = $param1; $data['loginname'] = $params[0];
$data['homedir'] = $param2; $data['homedir'] = $params[1];
$data = json_encode($data); $data = json_encode($data);
Database::pexecute($ins_stmt, array( Database::pexecute($ins_stmt, array(
'type' => TaskId::DELETE_FTP_DATA, 'type' => TaskId::DELETE_FTP_DATA,
'data' => $data 'data' => $data
)); ));
} elseif ($type == TaskId::DELETE_DOMAIN_PDNS && $param1 != '' && Settings::Get('system.bind_enable') == '1' && Settings::Get('system.dns_server') == 'PowerDNS') { } elseif ($type == TaskId::DELETE_DOMAIN_PDNS && isset($params[0]) && $params[0] != '' && Settings::Get('system.bind_enable') == '1' && Settings::Get('system.dns_server') == 'PowerDNS') {
// -> if bind disabled or dns-server not PowerDNS -> no task // -> if bind disabled or dns-server not PowerDNS -> no task
$data = array(); $data = array();
$data['domain'] = $param1; $data['domain'] = $params[0];
$data = json_encode($data); $data = json_encode($data);
Database::pexecute($ins_stmt, array( Database::pexecute($ins_stmt, array(
'type' => TaskId::DELETE_DOMAIN_PDNS, 'type' => TaskId::DELETE_DOMAIN_PDNS,
'data' => $data 'data' => $data
)); ));
} elseif ($type == TaskId::DELETE_DOMAIN_SSL && $param1 != '') { } elseif ($type == TaskId::DELETE_DOMAIN_SSL && isset($params[0]) && $params[0] != '') {
$data = array(); $data = array();
$data['domain'] = $param1; $data['domain'] = $params[0];
$data = json_encode($data); $data = json_encode($data);
Database::pexecute($ins_stmt, array( Database::pexecute($ins_stmt, array(
'type' => TaskId::DELETE_DOMAIN_SSL, 'type' => TaskId::DELETE_DOMAIN_SSL,
'data' => $data 'data' => $data
)); ));
} elseif ($type == TaskId::CREATE_CUSTOMER_BACKUP && is_array($param1)) { } elseif ($type == TaskId::CREATE_CUSTOMER_BACKUP && isset($params[0]) && is_array($params[0])) {
$data = json_encode($param1); $data = json_encode($params[0]);
Database::pexecute($ins_stmt, array( Database::pexecute($ins_stmt, array(
'type' => TaskId::CREATE_CUSTOMER_BACKUP, 'type' => TaskId::CREATE_CUSTOMER_BACKUP,
'data' => $data 'data' => $data