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

2011-09-01 Miguel de Dios <miguel.dedios@artica.es> 

* operation/incidents/incident_detail.php: fixed the entities in the name
	of file in the action to upload and delete.
	
	Fixes: #3397447



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@4885 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
This commit is contained in:
mdtrooper 2011-09-01 16:55:12 +00:00
parent 2bcd893a00
commit 4822a1f1de
2 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
pandora_console/ChangeLog
View File

@ -1,3 +1,10 @@
2011-09-01 Miguel de Dios <miguel.dedios@artica.es>
* operation/incidents/incident_detail.php: fixed the entities in the name
of file in the action to upload and delete.
Fixes: #3397447
2011-09-01 Miguel de Dios <miguel.dedios@artica.es> 2011-09-01 Miguel de Dios <miguel.dedios@artica.es>
* include/functions_agents.php: added the other part of logical expression * include/functions_agents.php: added the other part of logical expression

4
pandora_console/operation/incidents/incident_detail.php
View File

@ -93,7 +93,7 @@ if (isset ($_GET["id"])) {
$result = db_process_sql ($sql); $result = db_process_sql ($sql);
if (!empty ($result)) { if (!empty ($result)) {
unlink ($config["attachment_store"]."/pand".$file_id."_".$filename); unlink ($config["attachment_store"]."/pand".$file_id."_".io_safe_output($filename));
incidents_process_touch ($id_inc); incidents_process_touch ($id_inc);
} }
@ -129,7 +129,7 @@ if (isset ($_GET["id"])) {
// Copy file to directory and change name // Copy file to directory and change name
if ($id_attachment !== false) { if ($id_attachment !== false) {
$nombre_archivo = $config["attachment_store"]."/pand".$id_attachment."_".$filename; $nombre_archivo = $config["attachment_store"]."/pand".$id_attachment."_".$_FILES['userfile']['name'];
$result = copy ($_FILES['userfile']['tmp_name'], $nombre_archivo); $result = copy ($_FILES['userfile']['tmp_name'], $nombre_archivo);
} else { } else {
echo '<h3 class="error">'.__('File could not be saved due to database error').'</h3>'; echo '<h3 class="error">'.__('File could not be saved due to database error').'</h3>';