tyler.durden/pandorafms
1
0
Fork 0
mirror of https://github.com/pandorafms/pandorafms.git synced 2025-07-30 01:05:39 +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> 2013-02-15 Miguel de Dios <miguel.dedios@artica.es>
* godmode/modules/manage_network_components.php, * godmode/modules/manage_network_components.php,

33
pandora_console/include/functions_treeview.php
View File

@ -99,7 +99,7 @@ function treeview_printModuleTable($id_module, $server_data = false) {
echo '<table cellspacing="4" cellpadding="4" border="0" class="databox" style="width:100%; text-align: center;">'; echo '<table cellspacing="4" cellpadding="4" border="0" class="databox" style="width:100%; text-align: center;">';
echo '<tr>'; echo '<tr>';
echo '<td><form id="module_detail" method="post" action="' . $console_url . 'index.php?sec=estado&sec2=operation/agentes/ver_agente&id_agente=' . $module['id_agente'] . '&tab=data' . $url_hash . '">'; echo '<td><form id="module_detail" method="post" action="' . $console_url . 'index.php?sec=estado&sec2=operation/agentes/ver_agente&id_agente=' . $module['id_agente'] . '&tab=data' . $url_hash . '">';
html_print_submit_button (__('Go to modules detail'), 'upd_button', false, 'class="sub search"'); html_print_submit_button (__('Go to modules detail'), 'upd_button', false, 'class="sub search"');
echo '</form></td></tr>'; echo '</form></td></tr>';
echo '</table>'; echo '</table>';
@ -165,7 +165,7 @@ function treeview_printAlertsTable($id_module, $server_data = array()) {
echo '<table cellspacing="4" cellpadding="4" border="0" class="databox" style="width:100%; text-align: center;">'; echo '<table cellspacing="4" cellpadding="4" border="0" class="databox" style="width:100%; text-align: center;">';
echo '<tr>'; echo '<tr>';
echo '<td><form id="agent_detail" method="post" action="' . $console_url . 'index.php?sec=estado&sec2=operation/agentes/ver_agente&id_agente=' . $agent_id . $url_hash . '&tab=alert" target="_blank">'; echo '<td><form id="agent_detail" method="post" action="' . $console_url . 'index.php?sec=estado&sec2=operation/agentes/ver_agente&id_agente=' . $agent_id . $url_hash . '&tab=alert" target="_blank">';
html_print_submit_button (__('Go to alerts detail'), 'upd_button', false, 'class="sub search"'); html_print_submit_button (__('Go to alerts detail'), 'upd_button', false, 'class="sub search"');
echo '</form></td></tr>'; echo '</form></td></tr>';
echo '</table>'; echo '</table>';
} }
@ -1090,10 +1090,10 @@ function treeview_getFirstBranchSQL ($type, $id, $avariableGroupsIds, $statusSel
} }
$sql = "SELECT tagente.* $sql = "SELECT tagente.*
FROM tagente, tagente_modulo, ttag_module FROM tagente, tagente_modulo, ttag_module
WHERE tagente.id_agente = tagente_modulo.id_agente WHERE tagente.id_agente = tagente_modulo.id_agente
AND tagente_modulo.id_agente_modulo = ttag_module.id_agente_modulo AND tagente_modulo.id_agente_modulo = ttag_module.id_agente_modulo
AND ttag_module.id_tag = " . $id . $groups_condition; AND ttag_module.id_tag = " . $id . $groups_condition;
$sql .= tags_get_acl_tags($config['id_user'], 0, 'AR', 'module_condition', 'AND', 'tagente_modulo'); $sql .= tags_get_acl_tags($config['id_user'], 0, 'AR', 'module_condition', 'AND', 'tagente_modulo');
$sql .= ' AND tagente.disabled = 0'. $search_sql; $sql .= ' AND tagente.disabled = 0'. $search_sql;
@ -1163,8 +1163,10 @@ function treeview_getSecondBranchSQL ($fatherType, $id, $id_father) {
case "oracle": case "oracle":
$sql = 'SELECT * $sql = 'SELECT *
FROM tagente_modulo AS t1 FROM tagente_modulo AS t1
INNER JOIN tagente_estado AS t2 ON t1.id_agente_modulo = t2.id_agente_modulo INNER JOIN tagente_estado AS t2
WHERE t1.id_agente = ' . $id . ' AND nombre = \'' . io_safe_input($name) . '\''; ON t1.id_agente_modulo = t2.id_agente_modulo
WHERE t1.id_agente = ' . $id . '
AND nombre = \'' . io_safe_input($name) . '\'';
break; break;
} }
break; break;
@ -1179,16 +1181,17 @@ function treeview_getSecondBranchSQL ($fatherType, $id, $id_father) {
if ($id_father === false) { if ($id_father === false) {
return false; return false;
} }
$sql = 'SELECT * FROM tagente_modulo, tagente_estado, ttag_module $sql = 'SELECT *
WHERE tagente_modulo.id_agente_modulo = ttag_module.id_agente_modulo 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_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; break;
} }
// This line checks for initializated modules or (non-initialized) asyncronous modules // This line checks for initializated modules or (non-initialized) asyncronous modules
$sql .= ' AND disabled = 0 AND (utimestamp > 0 OR id_tipo_modulo IN (21,22,23))'; $sql .= ' AND disabled = 0 AND (utimestamp > 0 OR id_tipo_modulo IN (21,22,23))';
return $sql; return $sql;
} }
?> ?>

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

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