diff --git a/pandora_console/ChangeLog b/pandora_console/ChangeLog index 6b29d28b90..18ffe2b41d 100644 --- a/pandora_console/ChangeLog +++ b/pandora_console/ChangeLog @@ -1,3 +1,15 @@ +2012-12-17 Miguel de Dios + + * godmode/setup/file_manager.php, include/functions_filemanager.php: + some fixes and added support for the metaconsole. + + * include/get_file.php: fixed lost check "is_user". + + * operation/netflow/nf_live_view.php: cleaned source code style. + + * include/functions_config.php: added check the flag of "is_admin" + when try to change some config from setup. + 2012-12-14 Sergio Martin * operation/events/events.php: Disable the events view diff --git a/pandora_console/godmode/setup/file_manager.php b/pandora_console/godmode/setup/file_manager.php index 92069f1590..9529aad2f7 100644 --- a/pandora_console/godmode/setup/file_manager.php +++ b/pandora_console/godmode/setup/file_manager.php @@ -60,7 +60,7 @@ if (isset ($banned_directories[$directory])) // Current directory $available_directories[$directory] = $directory; -$real_directory = realpath ($config['homedir'].'/'.$directory); +$real_directory = realpath ($config['homedir'] . '/' . $directory); echo '

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

'; diff --git a/pandora_console/include/functions_config.php b/pandora_console/include/functions_config.php index 2616fa5746..2d404abe13 100644 --- a/pandora_console/include/functions_config.php +++ b/pandora_console/include/functions_config.php @@ -316,6 +316,14 @@ function config_update_config () { function config_process_config () { global $config; + //Check if the user have the admin flag. + $is_admin = (bool)db_get_value('is_admin', + 'tusuario', 'id_user', $_SESSION['id_usuario']); + if (!$is_admin) { + return false; + exit; + } + $configs = db_get_all_rows_in_table ('tconfig'); if (empty ($configs)) { diff --git a/pandora_console/include/functions_filemanager.php b/pandora_console/include/functions_filemanager.php index 8e18389959..5afb8a9924 100644 --- a/pandora_console/include/functions_filemanager.php +++ b/pandora_console/include/functions_filemanager.php @@ -164,7 +164,8 @@ if ($upload_file) { $nombre_archivo = $real_directory .'/'. $filename; } else { - $nombre_archivo = $config['homedir'].'/'.$directory.'/'.$filename; + $nombre_archivo = $config['homedir'] . '/' . + $directory . '/' . $filename; } if (! @copy ($_FILES['file']['tmp_name'], $nombre_archivo )) { @@ -177,7 +178,7 @@ if ($upload_file) { // Delete temporal file unlink ($_FILES['file']['tmp_name']); } - } + } } } @@ -202,7 +203,7 @@ if ($create_text_file) { $filename = io_safe_output(get_parameter('name_file')); if ($filename != "") { - + $real_directory = (string) get_parameter('real_directory'); $real_directory = io_safe_output($real_directory); $directory = (string) get_parameter ('directory'); @@ -216,11 +217,13 @@ if ($create_text_file) { } else { if ($directory == '') { - $nombre_archivo = $real_directory .'/'. $filename; + $nombre_archivo = $real_directory . '/' . $filename; } else { - $nombre_archivo = $config['homedir'].'/'.$directory.'/'.$filename; + $nombre_archivo = $config['homedir'] . '/' . + $directory . '/' . $filename; } + if (! @touch($nombre_archivo)) { $config['filemanager']['message'] = ui_print_error_message(__('Error creating file'), '', true); } @@ -314,8 +317,10 @@ if ($create_dir) { else { $dirname = (string) get_parameter ('dirname'); $dirname = io_safe_output($dirname); + if ($dirname != '') { - @mkdir ($directory.'/'.$dirname); + @mkdir ($config['homedir'] . '/' . + $directory . '/' . $dirname); $config['filemanager']['message'] = ui_print_success_message(__('Directory created'), '', true); $config['filemanager']['correct_create_dir'] = 1; @@ -345,6 +350,7 @@ if ($delete_file) { } else { $config['filemanager']['message'] = ui_print_success_message(__('Deleted'), '', true); + if (is_dir ($filename)) { rmdir ($filename); $config['filemanager']['delete'] = 1; @@ -430,6 +436,10 @@ function filemanager_read_recursive_dir($dir, $relative_path = '') { function filemanager_file_explorer($real_directory, $relative_directory, $url, $father = '', $editor = false, $readOnly = false) { global $config; + $hack_metaconsole = ''; + if (defined('METACONSOLE')) + $hack_metaconsole = '../../'; + ?>