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

forgot to use the new distro-editor variable

Browse Source 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
This commit is contained in:
Michael Kaufmann (d00p)
2015-08-13 15:45:53 +02:00
parent 4da3a87772
commit 3b96efc04d
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
admin_configfiles.php
View File

@@ -142,7 +142,7 @@ if ($userinfo['change_serversettings'] == '1') {
break; break;
case "file": case "file":
if (array_key_exists('content', $action)) { if (array_key_exists('content', $action)) {
$commands_file = getFileContentContainer($action['content'], $replace_arr, $action['name']); $commands_file = getFileContentContainer($action['content'], $replace_arr, $action['name'], $distro_editor);
} elseif (array_key_exists('subcommands', $action)) { } elseif (array_key_exists('subcommands', $action)) {
foreach ($action['subcommands'] as $fileaction) { foreach ($action['subcommands'] as $fileaction) {
if (array_key_exists('execute', $fileaction) && $fileaction['execute'] == "pre") { if (array_key_exists('execute', $fileaction) && $fileaction['execute'] == "pre") {
@@ -150,7 +150,7 @@ if ($userinfo['change_serversettings'] == '1') {
} elseif (array_key_exists('execute', $fileaction) && $fileaction['execute'] == "post") { } elseif (array_key_exists('execute', $fileaction) && $fileaction['execute'] == "post") {
$commands_post .= $fileaction['content'] . "\n"; $commands_post .= $fileaction['content'] . "\n";
} elseif ($fileaction['type'] == 'file') { } elseif ($fileaction['type'] == 'file') {
$commands_file = getFileContentContainer($fileaction['content'], $replace_arr, $action['name']); $commands_file = getFileContentContainer($fileaction['content'], $replace_arr, $action['name'], $distro_editor);
} }
} }
} }
@@ -187,7 +187,7 @@ if ($userinfo['change_serversettings'] == '1') {
} }
// helper functions // helper functions
function getFileContentContainer($file_content, &$replace_arr, $realname) function getFileContentContainer($file_content, &$replace_arr, $realname, $distro_editor)
{ {
$files = ""; $files = "";
$file_content = trim($file_content); $file_content = trim($file_content);