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

more checkstyle fixes

Browse Source 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
This commit is contained in:
Michael Kaufmann
2018-12-24 12:02:26 +01:00
parent c3d44b4558
commit 585d42f1b8
25 changed files with 263 additions and 261 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
lib/Froxlor/Cron/Http/ConfigIO.php
View File

@@ -40,28 +40,28 @@ class ConfigIO
{
// old error logs
$this->_cleanErrLogs();
$this->cleanErrLogs();
// awstats files
$this->_cleanAwstatsFiles();
$this->cleanAwstatsFiles();
// fcgid files
$this->_cleanFcgidFiles();
$this->cleanFcgidFiles();
// php-fpm files
$this->_cleanFpmFiles();
$this->cleanFpmFiles();
// clean webserver-configs
$this->_cleanWebserverConfigs();
$this->cleanWebserverConfigs();
// old htpasswd files
$this->_cleanHtpasswdFiles();
$this->cleanHtpasswdFiles();
// customer-specified ssl-certificates
$this->_cleanCustomerSslCerts();
$this->cleanCustomerSslCerts();
}
private function _cleanErrLogs()
private function cleanErrLogs()
{
$err_dir = \Froxlor\FileDir::makeCorrectDir(\Froxlor\Froxlor::getInstallDir() . "/logs/");
if (@is_dir($err_dir)) {
@@ -78,7 +78,7 @@ class ConfigIO
*
* @return null
*/
private function _cleanCustomerSslCerts()
private function cleanCustomerSslCerts()
{
/*
@@ -86,7 +86,7 @@ class ConfigIO
*/
if (Settings::Get('system.use_ssl') == '1') {
// get correct directory
$configdir = $this->_getFile('system', 'customer_ssl_path');
$configdir = $this->getFile('system', 'customer_ssl_path');
if ($configdir !== false) {
$configdir = \Froxlor\FileDir::makeCorrectDir($configdir);
@@ -106,16 +106,16 @@ class ConfigIO
*
* @return null
*/
private function _cleanWebserverConfigs()
private function cleanWebserverConfigs()
{
// get directories
$configdirs = array();
$dir = $this->_getFile('system', 'apacheconf_vhost');
$dir = $this->getFile('system', 'apacheconf_vhost');
if ($dir !== false)
$configdirs[] = \Froxlor\FileDir::makeCorrectDir($dir);
$dir = $this->_getFile('system', 'apacheconf_diroptions');
$dir = $this->getFile('system', 'apacheconf_diroptions');
if ($dir !== false)
$configdirs[] = \Froxlor\FileDir::makeCorrectDir($dir);
@@ -149,11 +149,11 @@ class ConfigIO
*
* @return null
*/
private function _cleanHtpasswdFiles()
private function cleanHtpasswdFiles()
{
// get correct directory
$configdir = $this->_getFile('system', 'apacheconf_htpasswddir');
$configdir = $this->getFile('system', 'apacheconf_htpasswddir');
if ($configdir !== false) {
$configdir = \Froxlor\FileDir::makeCorrectDir($configdir);
@@ -172,7 +172,7 @@ class ConfigIO
*
* @return null
*/
private function _cleanAwstatsFiles()
private function cleanAwstatsFiles()
{
if (Settings::Get('system.awstats_enabled') == '0') {
return;
@@ -182,7 +182,7 @@ class ConfigIO
$awstatsclean = array();
$awstatsclean['header'] = "## GENERATED BY FROXLOR\n";
$awstatsclean['headerold'] = "## GENERATED BY SYSCP\n";
$awstatsclean['path'] = $this->_getFile('system', 'awstats_conf');
$awstatsclean['path'] = $this->getFile('system', 'awstats_conf');
/**
* don't do anything if the directory does not exist
@@ -218,14 +218,14 @@ class ConfigIO
*
* @return null
*/
private function _cleanFcgidFiles()
private function cleanFcgidFiles()
{
if (Settings::Get('system.mod_fcgid') == '0') {
return;
}
// get correct directory
$configdir = $this->_getFile('system', 'mod_fcgid_configdir');
$configdir = $this->getFile('system', 'mod_fcgid_configdir');
if ($configdir !== false) {
$configdir = \Froxlor\FileDir::makeCorrectDir($configdir);
@@ -258,7 +258,7 @@ class ConfigIO
*
* @return null
*/
private function _cleanFpmFiles()
private function cleanFpmFiles()
{
if (Settings::Get('phpfpm.enabled') == '0') {
return;
@@ -282,7 +282,7 @@ class ConfigIO
}
// also remove aliasconfigdir #1273
$aliasconfigdir = $this->_getFile('phpfpm', 'aliasconfigdir');
$aliasconfigdir = $this->getFile('phpfpm', 'aliasconfigdir');
if ($aliasconfigdir !== false) {
$aliasconfigdir = \Froxlor\FileDir::makeCorrectDir($aliasconfigdir);
if (@is_dir($aliasconfigdir)) {
@@ -304,7 +304,7 @@ class ConfigIO
*
* @return string|boolean complete path including filename if any or false on error
*/
private function _getFile($group, $varname, $check_exists = true)
private function getFile($group, $varname, $check_exists = true)
{
// read from settings