diff --git a/pandora_console/ChangeLog b/pandora_console/ChangeLog index 956dce3820..25f7fe704f 100644 --- a/pandora_console/ChangeLog +++ b/pandora_console/ChangeLog @@ -1,3 +1,7 @@ +2012-04-26 Vanessa Gil + + * include/functions_filemanager.php: Changed all messages. + 2012-04-26 Miguel de Dios * include/functions_db.php, operation/agentes/exportdata.php: diff --git a/pandora_console/include/functions_filemanager.php b/pandora_console/include/functions_filemanager.php index 9408cb76d1..9410117820 100644 --- a/pandora_console/include/functions_filemanager.php +++ b/pandora_console/include/functions_filemanager.php @@ -154,7 +154,7 @@ if ($upload_file) { $testHash = md5($real_directory . $directory . $config['dbpass']); if ($hash != $testHash) { - $config['filemanager']['message'] = "

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

"; + $config['filemanager']['message'] = ui_print_error_message(__('Security error'), '', true); } else { // Copy file to directory and change name @@ -166,11 +166,11 @@ if ($upload_file) { } if (! @copy ($_FILES['file']['tmp_name'], $nombre_archivo )) { - $config['filemanager']['message'] = "

".__('Upload error')."

"; + $config['filemanager']['message'] = ui_print_error_message(__('Upload error'), '', true); } else { $config['filemanager']['correct_upload_file'] = 1; - $config['filemanager']['message'] = '

'.__('Upload correct').'

'; + $config['filemanager']['message'] = ui_print_success_message(__('Upload correct'), '', true); // Delete temporal file unlink ($_FILES['file']['tmp_name']); @@ -210,7 +210,7 @@ if ($create_text_file) { $testHash = md5($real_directory . $directory . $config['dbpass']); if ($hash != $testHash) { - echo "

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

"; + ui_print_error_message(__('Security error'), '', true); } else { if ($directory == '') { @@ -220,16 +220,16 @@ if ($create_text_file) { $nombre_archivo = $config['homedir'].'/'.$directory.'/'.$filename; } if (! @touch($nombre_archivo)) { - $config['filemanager']['message'] = "

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

"; + $config['filemanager']['message'] = ui_print_error_message(__('Error creating file'), '', true); } else { - $config['filemanager']['message'] = '

'.__('Upload correct').'

'; + $config['filemanager']['message'] = ui_print_success_message(__('Upload correct'), '', true); $config['filemanager']['correct_upload_file'] = 1; } } } else { - $config['filemanager']['message'] = "

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

"; + $config['filemanager']['message'] = ui_print_error_message(__('Error creating file with empty name'), '', true); } } @@ -260,7 +260,7 @@ if ($upload_zip) { $testHash = md5($real_directory . $directory . $config['dbpass']); if ($hash != $testHash) { - $config['filemanager']['message'] = "

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

"; + $config['filemanager']['message'] = ui_print_error_message(__('Security error'), '', true); } else { // Copy file to directory and change name @@ -271,7 +271,7 @@ if ($upload_zip) { $nombre_archivo = $config['homedir'].'/'.$directory.'/'.$filename; } if (! @copy ($_FILES['file']['tmp_name'], $nombre_archivo )) { - $config['filemanager']['message'] = "

".__('attach_error')."

"; + $config['filemanager']['message'] = ui_print_error_message(__('Attach error'), '', true); } else { // Delete temporal file @@ -285,7 +285,7 @@ if ($upload_zip) { $zip->extractTo($pathname); unlink($nombre_archivo); } - $config['filemanager']['message'] = '

'.__('Upload correct').'

'; + $config['filemanager']['message'] = ui_print_success_message(__('Upload correct'), '', true); $config['filemanager']['correct_upload_file'] = 1; } } @@ -314,12 +314,12 @@ if ($create_dir) { $dirname = io_safe_output($dirname); if ($dirname != '') { @mkdir ($directory.'/'.$dirname); - $config['filemanager']['message'] = '

'.__('Created directory').'

'; + $config['filemanager']['message'] = ui_print_success_message(__('Directory created'), '', true); $config['filemanager']['correct_create_dir'] = 1; } else { - $config['filemanager']['message'] = "

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

"; + $config['filemanager']['message'] = ui_print_error_message(__('Error creating file with empty name'), '', true); } } } @@ -339,10 +339,10 @@ if ($delete_file) { $testHash = md5($filename . $config['dbpass']); if ($hash != $testHash) { - $config['filemanager']['message'] = "

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

"; + $config['filemanager']['message'] = ui_print_error_message(__('Security error'), '', true); } else { - $config['filemanager']['message'] = "

".__('Deleting')."

"; + $config['filemanager']['message'] = ui_print_success_message(__('Deleting'), '', true); if (is_dir ($filename)) { rmdir ($filename); $config['filemanager']['delete'] = 1;