From e4c88b9013b6d3667fa736eec229d37949f558a1 Mon Sep 17 00:00:00 2001 From: mdtrooper Date: Wed, 4 Aug 2010 18:54:48 +0000 Subject: [PATCH] 2010-08-04 Miguel de Dios * include/functions_filemanager.php: move the action messages to $config intermediate var. * godmode/setup/file_manager.php: added the message of action with the filemanager. git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@3104 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f --- pandora_console/ChangeLog | 7 +++ .../godmode/setup/file_manager.php | 7 ++- .../include/functions_filemanager.php | 43 ++++++++++++------- 3 files changed, 41 insertions(+), 16 deletions(-) diff --git a/pandora_console/ChangeLog b/pandora_console/ChangeLog index cf2db4fd5b..95cbfd0748 100644 --- a/pandora_console/ChangeLog +++ b/pandora_console/ChangeLog @@ -1,3 +1,10 @@ +2010-08-04 Miguel de Dios + * include/functions_filemanager.php: move the action messages to $config + intermediate var. + + * godmode/setup/file_manager.php: added the message of action with the + filemanager. + 2010-08-04 Sergio Martin * include/functions_reporting.php: Fixed the get_agent_module_info function diff --git a/pandora_console/godmode/setup/file_manager.php b/pandora_console/godmode/setup/file_manager.php index e9d20a8288..bb1642269a 100644 --- a/pandora_console/godmode/setup/file_manager.php +++ b/pandora_console/godmode/setup/file_manager.php @@ -33,6 +33,11 @@ require_once ("include/functions_filemanager.php"); // Header print_page_header (__('File manager'), "", false, "", true); +if (isset($config['filemanager']['message'])) { + echo $config['filemanager']['message']; + $config['filemanager']['message'] = null; +} + //// Upload file //if ($upload_file) { // if (isset ($_FILES['file']) && $_FILES['file']['name'] != "") { @@ -100,7 +105,7 @@ $available_directories[$directory] = $directory; $real_directory = realpath ($config['homedir'].'/'.$directory); -box_upload_file_explorer($real_directory, $directory); +//box_upload_file_explorer($real_directory, $directory); echo '

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

'; diff --git a/pandora_console/include/functions_filemanager.php b/pandora_console/include/functions_filemanager.php index 53974c31e8..2e6aa289b2 100644 --- a/pandora_console/include/functions_filemanager.php +++ b/pandora_console/include/functions_filemanager.php @@ -130,6 +130,7 @@ if ($upload_file) { $config['filemanager'] = array(); $config['filemanager']['correct_upload_file'] = 0; + $config['filemanager']['message'] = null; check_login (); @@ -149,7 +150,7 @@ if ($upload_file) { $testHash = md5($real_directory . $directory . $config['dbpass']); if ($hash != $testHash) { - echo "

".__('Security error.')."

"; + $config['filemanager']['message'] = "

".__('Security error.')."

"; } else { // Copy file to directory and change name @@ -159,10 +160,13 @@ if ($upload_file) { else { $nombre_archivo = $config['homedir'].'/'.$directory.'/'.$filename; } + if (! @copy ($_FILES['file']['tmp_name'], $nombre_archivo )) { - echo "

".__('attach_error')."

"; - } else { + $config['filemanager']['message'] = "

".__('Upload error')."

"; + } + else { $config['filemanager']['correct_upload_file'] = 1; + $config['filemanager']['message'] = '

'.__('Upload correct').'

'; // Delete temporal file unlink ($_FILES['file']['tmp_name']); @@ -179,6 +183,7 @@ if ($create_text_file) { $config['filemanager'] = array(); $config['filemanager']['correct_upload_file'] = 0; + $config['filemanager']['message'] = null; check_login (); @@ -199,7 +204,7 @@ if ($create_text_file) { $testHash = md5($real_directory . $directory . $config['dbpass']); if ($hash != $testHash) { - echo "

".__('Security error.')."

"; + echo "

".__('Security error.')."

"; } else { if ($directory == '') { @@ -209,15 +214,16 @@ if ($create_text_file) { $nombre_archivo = $config['homedir'].'/'.$directory.'/'.$filename; } if (! @touch($nombre_archivo)) { - echo "

".__('Error create file.')."

"; + $config['filemanager']['message'] = "

".__('Error create file.')."

"; } else { + $config['filemanager']['message'] = '

'.__('Upload correct').'

'; $config['filemanager']['correct_upload_file'] = 1; } } } else { - echo "

".__('Error create file with empty name.')."

"; + $config['filemanager']['message'] = "

".__('Error create file with empty name.')."

"; } } @@ -228,6 +234,7 @@ if ($upload_zip) { $config['filemanager'] = array(); $config['filemanager']['correct_upload_file'] = 0; + $config['filemanager']['message'] = null; check_login (); @@ -247,7 +254,7 @@ if ($upload_zip) { $testHash = md5($real_directory . $directory . $config['dbpass']); if ($hash != $testHash) { - echo "

".__('Security error.')."

"; + $config['filemanager']['message'] = "

".__('Security error.')."

"; } else { // Copy file to directory and change name @@ -258,7 +265,7 @@ if ($upload_zip) { $nombre_archivo = $config['homedir'].'/'.$directory.'/'.$filename; } if (! @copy ($_FILES['file']['tmp_name'], $nombre_archivo )) { - echo "

".__('attach_error')."

"; + $config['filemanager']['message'] = "

".__('attach_error').""; } else { // Delete temporal file @@ -272,7 +279,7 @@ if ($upload_zip) { $zip->extractTo($pathname); unlink($nombre_archivo); } - + $config['filemanager']['message'] = '

'.__('Upload correct').'

'; $config['filemanager']['correct_upload_file'] = 1; } } @@ -286,6 +293,7 @@ if ($create_dir) { $config['filemanager'] = array(); $config['filemanager']['correct_create_dir'] = 0; + $config['filemanager']['message'] = null; $directory = (string) get_parameter ('directory', "/"); @@ -293,18 +301,18 @@ if ($create_dir) { $testHash = md5($directory . $config['dbpass']); if ($hash != $testHash) { - echo "

".__('Security error.')."

"; + echo "

".__('Security error.')."

"; } else { $dirname = (string) get_parameter ('dirname'); if ($dirname != '') { @mkdir ($directory.'/'.$dirname); - echo '

'.__('Created directory %s', $dirname).'

'; + $config['filemanager']['message'] = '

'.__('Created directory').'

'; $config['filemanager']['correct_create_dir'] = 1; } else { - echo "

".__('Error create file with empty name.')."

"; + $config['filemanager']['message'] = "

".__('Error create file with empty name.')."

"; } } } @@ -313,9 +321,10 @@ if ($create_dir) { $delete_file = (bool) get_parameter ('delete_file'); if ($delete_file) { global $config; - + $config['filemanager'] = array(); $config['filemanager']['delete'] = 0; + $config['filemanager']['message'] = null; $filename = (string) get_parameter ('filename'); @@ -323,10 +332,10 @@ if ($delete_file) { $testHash = md5($filename . $config['dbpass']); if ($hash != $testHash) { - echo "

".__('Security error.')."

"; + $config['filemanager']['message'] = "

".__('Security error.')."

"; } else { - echo "

".__('Deleting')." ".$filename."

"; + $config['filemanager']['message'] = "

".__('Deleting')."

"; if (is_dir ($filename)) { rmdir ($filename); $config['filemanager']['delete'] = 1; @@ -427,11 +436,15 @@ function file_explorer($real_directory, $relative_directory, $url, $father = '', } function show_upload_file() { + $("#table1-1").css('display', ''); + $("#main_buttons").css("display", "none"); $("#upload_file").css("display", ""); } function show_create_text_file() { + $("#table1-1").css('display', ''); + $("#main_buttons").css("display", "none"); $("#create_text_file").css("display", ""); }