tyler.durden/pandorafms
1
0
Fork 0
mirror of https://github.com/pandorafms/pandorafms.git synced 2025-07-28 16:24:54 +02:00
Code Issues Packages Projects Releases Wiki Activity

2013-02-15 Miguel de Dios <miguel.dedios@artica.es>

Browse Source 
* include/functions_treeview.php: fixed the cleaned source code.
	
	* operation/agentes/networkmap.php: fixed double messages when
	delete a networkmap.
	
	Fixes: #3553703




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@7662 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
This commit is contained in:
mdtrooper 2013-02-15 12:28:03 +00:00
parent 9bcd52d6ee
commit a208e250ad
3 changed files with 60 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
pandora_console/ChangeLog
View File

@ -1,3 +1,12 @@
2013-02-15 Miguel de Dios <miguel.dedios@artica.es>
* include/functions_treeview.php: fixed the cleaned source code.
* operation/agentes/networkmap.php: fixed double messages when
delete a networkmap.
Fixes: #3553703
2013-02-15 Miguel de Dios <miguel.dedios@artica.es>
* godmode/modules/manage_network_components.php,

13
pandora_console/include/functions_treeview.php
View File

@ -1163,8 +1163,10 @@ function treeview_getSecondBranchSQL ($fatherType, $id, $id_father) {
case "oracle":
$sql = 'SELECT *
FROM tagente_modulo AS t1
INNER JOIN tagente_estado AS t2 ON t1.id_agente_modulo = t2.id_agente_modulo
WHERE t1.id_agente = ' . $id . ' AND nombre = \'' . io_safe_input($name) . '\'';
INNER JOIN tagente_estado AS t2
ON t1.id_agente_modulo = t2.id_agente_modulo
WHERE t1.id_agente = ' . $id . '
AND nombre = \'' . io_safe_input($name) . '\'';
break;
}
break;
@ -1179,10 +1181,12 @@ function treeview_getSecondBranchSQL ($fatherType, $id, $id_father) {
if ($id_father === false) {
return false;
}
$sql = 'SELECT * FROM tagente_modulo, tagente_estado, ttag_module
$sql = 'SELECT *
FROM tagente_modulo, tagente_estado, ttag_module
WHERE tagente_modulo.id_agente_modulo = ttag_module.id_agente_modulo
AND tagente_modulo.id_agente_modulo = tagente_estado.id_agente_modulo
AND tagente_modulo.id_agente=' . $id . ' AND ttag_module.id_tag = ' . $id_father;
AND tagente_modulo.id_agente=' . $id . '
AND ttag_module.id_tag = ' . $id_father;
break;
}
@ -1190,5 +1194,4 @@ function treeview_getSecondBranchSQL ($fatherType, $id, $id_father) {
$sql .= ' AND disabled = 0 AND (utimestamp > 0 OR id_tipo_modulo IN (21,22,23))';
return $sql;
}
?>

2
pandora_console/operation/agentes/networkmap.php
View File

@ -45,8 +45,6 @@ if ($delete_networkmap) {
__('Network map deleted successfully'),
__('Could not delete network map'), '', true);
echo $message;
$id_networkmap = 0;
}