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

use correct makeCorrect(Dir/File) everywhere

Browse Source 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
This commit is contained in:
Michael Kaufmann
2018-12-19 17:13:41 +01:00
parent 8e84a4ff44
commit c4024c8107
53 changed files with 328 additions and 345 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
lib/Froxlor/Dns/PowerDNS.php
View File

@@ -26,7 +26,7 @@ class PowerDNS
{
// get froxlor pdns config
$cf = Settings::Get('system.bindconf_directory') . '/froxlor/pdns_froxlor.conf';
$config = makeCorrectFile($cf);
$config = \Froxlor\FileDir::makeCorrectFile($cf);
if (! file_exists($config)) {
die('PowerDNS configuration file (' . $config . ') not found. Did you go through the configuration templates?' . PHP_EOL);
@@ -58,7 +58,7 @@ class PowerDNS
);
if (isset($mysql_data['gmysql-socket']) && ! empty($mysql_data['gmysql-socket'])) {
$dbconf["dsn"]['unix_socket'] = makeCorrectFile($mysql_data['gmysql-socket']);
$dbconf["dsn"]['unix_socket'] = \Froxlor\FileDir::makeCorrectFile($mysql_data['gmysql-socket']);
} else {
$dbconf["dsn"]['host'] = $mysql_data['gmysql-host'];
$dbconf["dsn"]['port'] = $mysql_data['gmysql-port'];