From 744b60cbd1450f59536419ff4b791ae533ba9fe9 Mon Sep 17 00:00:00 2001 From: fermin831 Date: Wed, 16 Mar 2016 18:47:41 +0100 Subject: [PATCH] Solved config token homedir_filetransfer duplication TICKETS #3475 --- pandora_console/godmode/servers/plugin.php | 5 ++++- pandora_console/godmode/setup/file_manager.php | 11 ++++++++++- .../operation/snmpconsole/snmp_mib_uploader.php | 10 +++++++++- 3 files changed, 23 insertions(+), 3 deletions(-) diff --git a/pandora_console/godmode/servers/plugin.php b/pandora_console/godmode/servers/plugin.php index 11445b9c1a..78b9c8d552 100644 --- a/pandora_console/godmode/servers/plugin.php +++ b/pandora_console/godmode/servers/plugin.php @@ -179,6 +179,8 @@ if ($filemanager) { $chunck_url = '&create=1'; } + $homedir_filemanager = isset ($config['homedir_filemanager']) ? $config['homedir_filemanager'] : false; + filemanager_file_explorer($real_directory, $directory, 'index.php?sec=gservers&sec2=godmode/servers/plugin&filemanager=1&id_plugin=' . $id_plugin, @@ -187,7 +189,8 @@ if ($filemanager) { false, 'index.php?sec=gservers&sec2=godmode/servers/plugin' . $chunck_url . '&plugin_command=[FILE_FULLPATH]&id_plugin=' . $id_plugin, true, - 0775); + 0775, + $homedir_filemanager); return; diff --git a/pandora_console/godmode/setup/file_manager.php b/pandora_console/godmode/setup/file_manager.php index bec225e024..3ffcc3768d 100644 --- a/pandora_console/godmode/setup/file_manager.php +++ b/pandora_console/godmode/setup/file_manager.php @@ -62,7 +62,16 @@ $real_directory = realpath ($config['homedir'] . '/' . $directory); echo '

' . __('Index of %s', $directory) . '

'; +$homedir_filemanager = isset ($config['homedir_filemanager']) ? $config['homedir_filemanager'] : false; + filemanager_file_explorer($real_directory, $directory, - 'index.php?sec=gsetup&sec2=godmode/setup/file_manager'); + 'index.php?sec=gsetup&sec2=godmode/setup/file_manager', + '', + false, + false, + '', + false, + '', + $homedir_filemanager); ?> diff --git a/pandora_console/operation/snmpconsole/snmp_mib_uploader.php b/pandora_console/operation/snmpconsole/snmp_mib_uploader.php index f4ab411c68..e3c2d1f50d 100644 --- a/pandora_console/operation/snmpconsole/snmp_mib_uploader.php +++ b/pandora_console/operation/snmpconsole/snmp_mib_uploader.php @@ -67,8 +67,16 @@ ui_print_info_message(__("MIB files will be installed on the system. Please note //echo '

' . __('Index of %s', $directory) . '

'; +$homedir_filemanager = isset ($config['homedir_filemanager']) ? $config['homedir_filemanager'] : false; + filemanager_file_explorer($real_directory, $directory, 'index.php?sec=snmpconsole&sec2=operation/snmpconsole/snmp_mib_uploader', - SNMP_DIR_MIBS); + SNMP_DIR_MIBS, + false, + false, + '', + false, + '', + $homedir_filemanager); ?>