tyler.durden
/
pandorafms
mirror of https://github.com/pandorafms/pandorafms.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

2012-04-26 Vanessa Gil <vanessa.gil@artica.es> 

* include/functions_filemanager.php: Changed all messages.


git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@6185 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
This commit is contained in:
vgilc 2012-04-26 11:34:34 +00:00
parent 63cc161751
commit a02c6895a0
2 changed files with 18 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pandora_console/ChangeLog
View File

@ -1,3 +1,7 @@
2012-04-26 Vanessa Gil <vanessa.gil@artica.es>
* include/functions_filemanager.php: Changed all messages.
2012-04-26 Miguel de Dios <miguel.dedios@artica.es> 2012-04-26 Miguel de Dios <miguel.dedios@artica.es>
* include/functions_db.php, operation/agentes/exportdata.php: * include/functions_db.php, operation/agentes/exportdata.php:

28
pandora_console/include/functions_filemanager.php
View File

@ -154,7 +154,7 @@ if ($upload_file) {
$testHash = md5($real_directory . $directory . $config['dbpass']); $testHash = md5($real_directory . $directory . $config['dbpass']);
if ($hash != $testHash) { if ($hash != $testHash) {
$config['filemanager']['message'] = "<h4 class=error>".__('Security error.')."</h4>"; $config['filemanager']['message'] = ui_print_error_message(__('Security error'), '', true);
} }
else { else {
// Copy file to directory and change name // Copy file to directory and change name
@ -166,11 +166,11 @@ if ($upload_file) {
} }
if (! @copy ($_FILES['file']['tmp_name'], $nombre_archivo )) { if (! @copy ($_FILES['file']['tmp_name'], $nombre_archivo )) {
$config['filemanager']['message'] = "<h4 class=error>".__('Upload error')."</h4>"; $config['filemanager']['message'] = ui_print_error_message(__('Upload error'), '', true);
} }
else { else {
$config['filemanager']['correct_upload_file'] = 1; $config['filemanager']['correct_upload_file'] = 1;
$config['filemanager']['message'] = '<h4 class=suc>'.__('Upload correct').'</h4>'; $config['filemanager']['message'] = ui_print_success_message(__('Upload correct'), '', true);
// Delete temporal file // Delete temporal file
unlink ($_FILES['file']['tmp_name']); unlink ($_FILES['file']['tmp_name']);
@ -210,7 +210,7 @@ if ($create_text_file) {
$testHash = md5($real_directory . $directory . $config['dbpass']); $testHash = md5($real_directory . $directory . $config['dbpass']);
if ($hash != $testHash) { if ($hash != $testHash) {
echo "<h4 class=error>".__('Security error.')."</h4>"; ui_print_error_message(__('Security error'), '', true);
} }
else { else {
if ($directory == '') { if ($directory == '') {
@ -220,16 +220,16 @@ if ($create_text_file) {
$nombre_archivo = $config['homedir'].'/'.$directory.'/'.$filename; $nombre_archivo = $config['homedir'].'/'.$directory.'/'.$filename;
} }
if (! @touch($nombre_archivo)) { if (! @touch($nombre_archivo)) {
$config['filemanager']['message'] = "<h4 class=error>".__('Error create file.')."</h4>"; $config['filemanager']['message'] = ui_print_error_message(__('Error creating file'), '', true);
} }
else { else {
$config['filemanager']['message'] = '<h4 class=suc>'.__('Upload correct').'</h4>'; $config['filemanager']['message'] = ui_print_success_message(__('Upload correct'), '', true);
$config['filemanager']['correct_upload_file'] = 1; $config['filemanager']['correct_upload_file'] = 1;
} }
} }
} }
else { else {
$config['filemanager']['message'] = "<h4 class=error>".__('Error create file with empty name.')."</h4>"; $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']); $testHash = md5($real_directory . $directory . $config['dbpass']);
if ($hash != $testHash) { if ($hash != $testHash) {
$config['filemanager']['message'] = "<h4 class=error>".__('Security error.')."</h4>"; $config['filemanager']['message'] = ui_print_error_message(__('Security error'), '', true);
} }
else { else {
// Copy file to directory and change name // Copy file to directory and change name
@ -271,7 +271,7 @@ if ($upload_zip) {
$nombre_archivo = $config['homedir'].'/'.$directory.'/'.$filename; $nombre_archivo = $config['homedir'].'/'.$directory.'/'.$filename;
} }
if (! @copy ($_FILES['file']['tmp_name'], $nombre_archivo )) { if (! @copy ($_FILES['file']['tmp_name'], $nombre_archivo )) {
$config['filemanager']['message'] = "<h4 class=error>".__('attach_error')."</h4>"; $config['filemanager']['message'] = ui_print_error_message(__('Attach error'), '', true);
} }
else { else {
// Delete temporal file // Delete temporal file
@ -285,7 +285,7 @@ if ($upload_zip) {
$zip->extractTo($pathname); $zip->extractTo($pathname);
unlink($nombre_archivo); unlink($nombre_archivo);
} }
$config['filemanager']['message'] = '<h4 class=suc>'.__('Upload correct').'</h4>'; $config['filemanager']['message'] = ui_print_success_message(__('Upload correct'), '', true);
$config['filemanager']['correct_upload_file'] = 1; $config['filemanager']['correct_upload_file'] = 1;
} }
} }
@ -314,12 +314,12 @@ if ($create_dir) {
$dirname = io_safe_output($dirname); $dirname = io_safe_output($dirname);
if ($dirname != '') { if ($dirname != '') {
@mkdir ($directory.'/'.$dirname); @mkdir ($directory.'/'.$dirname);
$config['filemanager']['message'] = '<h4 class="suc">'.__('Created directory').'</h4>'; $config['filemanager']['message'] = ui_print_success_message(__('Directory created'), '', true);
$config['filemanager']['correct_create_dir'] = 1; $config['filemanager']['correct_create_dir'] = 1;
} }
else { else {
$config['filemanager']['message'] = "<h4 class=error>".__('Error create file with empty name.')."</h4>"; $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']); $testHash = md5($filename . $config['dbpass']);
if ($hash != $testHash) { if ($hash != $testHash) {
$config['filemanager']['message'] = "<h4 class=error>".__('Security error.')."</h4>"; $config['filemanager']['message'] = ui_print_error_message(__('Security error'), '', true);
} }
else { else {
$config['filemanager']['message'] = "<h4 class=suc>".__('Deleting')."</h4>"; $config['filemanager']['message'] = ui_print_success_message(__('Deleting'), '', true);
if (is_dir ($filename)) { if (is_dir ($filename)) {
rmdir ($filename); rmdir ($filename);
$config['filemanager']['delete'] = 1; $config['filemanager']['delete'] = 1;