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

remove now superfluous $debugHandler fields

Browse Source
This commit is contained in:
Daniel Reichelt
2016-02-16 15:42:33 +01:00
parent f86a115c6a
commit e306425428
5 changed files with 6 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
scripts/jobs/cron_tasks.inc.dns.10.bind.php
View File

@@ -19,7 +19,6 @@
class bind { class bind {
public $logger = false; public $logger = false;
public $debugHandler = false;
public $nameservers = array(); public $nameservers = array();
public $mxservers = array(); public $mxservers = array();
public $axfrservers = array(); public $axfrservers = array();
@@ -27,10 +26,9 @@ class bind {
private $_known_filenames = array(); private $_known_filenames = array();
private $_bindconf_file = ''; private $_bindconf_file = '';
public function __construct($logger, $debugHandler) { public function __construct($logger) {
$this->logger = $logger; $this->logger = $logger;
$this->debugHandler = $debugHandler;
if (Settings::Get('system.nameservers') != '') { if (Settings::Get('system.nameservers') != '') {
$nameservers = explode(',', Settings::Get('system.nameservers')); $nameservers = explode(',', Settings::Get('system.nameservers'));

4
scripts/jobs/cron_tasks.inc.http.10.apache.php
View File

@@ -21,7 +21,6 @@ require_once(dirname(__FILE__).'/../classes/class.HttpConfigBase.php');
class apache extends HttpConfigBase { class apache extends HttpConfigBase {
private $logger = false; private $logger = false;
private $debugHandler = false;
private $idnaConvert = false; private $idnaConvert = false;
// protected // protected
@@ -40,9 +39,8 @@ class apache extends HttpConfigBase {
*/ */
private $_deactivated = false; private $_deactivated = false;
public function __construct($logger, $debugHandler, $idnaConvert) { public function __construct($logger, $idnaConvert) {
$this->logger = $logger; $this->logger = $logger;
$this->debugHandler = $debugHandler;
$this->idnaConvert = $idnaConvert; $this->idnaConvert = $idnaConvert;
} }

4
scripts/jobs/cron_tasks.inc.http.20.lighttpd.php
View File

@@ -22,7 +22,6 @@ require_once(dirname(__FILE__).'/../classes/class.HttpConfigBase.php');
class lighttpd extends HttpConfigBase { class lighttpd extends HttpConfigBase {
private $logger = false; private $logger = false;
private $debugHandler = false;
private $idnaConvert = false; private $idnaConvert = false;
// protected // protected
@@ -40,9 +39,8 @@ class lighttpd extends HttpConfigBase {
*/ */
private $_deactivated = false; private $_deactivated = false;
public function __construct($logger, $debugHandler, $idnaConvert) { public function __construct($logger, $idnaConvert) {
$this->logger = $logger; $this->logger = $logger;
$this->debugHandler = $debugHandler;
$this->idnaConvert = $idnaConvert; $this->idnaConvert = $idnaConvert;
} }

4
scripts/jobs/cron_tasks.inc.http.30.nginx.php
View File

@@ -19,7 +19,6 @@ require_once(dirname(__FILE__).'/../classes/class.HttpConfigBase.php');
class nginx extends HttpConfigBase { class nginx extends HttpConfigBase {
private $logger = false; private $logger = false;
private $debugHandler = false;
private $idnaConvert = false; private $idnaConvert = false;
private $nginx_server = array(); private $nginx_server = array();
@@ -40,9 +39,8 @@ class nginx extends HttpConfigBase {
*/ */
private $_deactivated = false; private $_deactivated = false;
public function __construct($logger, $debugHandler, $idnaConvert, $nginx_server=array()) { public function __construct($logger, $idnaConvert, $nginx_server=array()) {
$this->logger = $logger; $this->logger = $logger;
$this->debugHandler = $debugHandler;
$this->idnaConvert = $idnaConvert; $this->idnaConvert = $idnaConvert;
$this->nginx_server = $nginx_server; $this->nginx_server = $nginx_server;
} }

4
scripts/jobs/cron_tasks.php
View File

@@ -72,7 +72,7 @@ while ($row = $result_tasks_stmt->fetch(PDO::FETCH_ASSOC)) {
} }
} }
$webserver = new $websrv($cronlog, $debugHandler, $idna_convert); $webserver = new $websrv($cronlog, $idna_convert);
} }
if (isset($webserver)) { if (isset($webserver)) {
@@ -170,7 +170,7 @@ while ($row = $result_tasks_stmt->fetch(PDO::FETCH_ASSOC)) {
*/ */
elseif ($row['type'] == '4' && (int)Settings::Get('system.bind_enable') != 0) { elseif ($row['type'] == '4' && (int)Settings::Get('system.bind_enable') != 0) {
if (!isset($nameserver)) { if (!isset($nameserver)) {
$nameserver = new bind($cronlog, $debugHandler); $nameserver = new bind($cronlog);
} }
if (Settings::Get('dkim.use_dkim') == '1') { if (Settings::Get('dkim.use_dkim') == '1') {