From 44550e9accb1f7d7f00abf9eacfa34829bcae0aa Mon Sep 17 00:00:00 2001 From: mdtrooper Date: Tue, 3 Sep 2013 07:54:24 +0000 Subject: [PATCH] 2013-09-03 Miguel de Dios * operation/tree.php, include/functions_treeview.php: improved the source code style. * operation/search_agents.getdata.php: added to search for the main address of agent. git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@8729 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f --- pandora_console/ChangeLog | 8 ++++++++ pandora_console/include/functions_treeview.php | 2 +- pandora_console/operation/search_agents.getdata.php | 6 ++++-- pandora_console/operation/tree.php | 4 ++-- 4 files changed, 15 insertions(+), 5 deletions(-) diff --git a/pandora_console/ChangeLog b/pandora_console/ChangeLog index 8a1a411acd..c6b05e2521 100644 --- a/pandora_console/ChangeLog +++ b/pandora_console/ChangeLog @@ -1,3 +1,11 @@ +2013-09-03 Miguel de Dios + + * operation/tree.php, include/functions_treeview.php: improved the + source code style. + + * operation/search_agents.getdata.php: added to search for the + main address of agent. + 2013-09-02 Miguel de Dios * godmode/massive/massive_edit_modules.php: added field "ip_target" diff --git a/pandora_console/include/functions_treeview.php b/pandora_console/include/functions_treeview.php index 340020a805..7494d1831a 100755 --- a/pandora_console/include/functions_treeview.php +++ b/pandora_console/include/functions_treeview.php @@ -1081,7 +1081,7 @@ function treeview_getFirstBranchSQL ($type, $id, $avariableGroupsIds, $statusSel array('field' => 'nombre COLLATE utf8_general_ci', 'order' => ' ASC'), true); break; - case 'os': + case 'os': $sql = agents_get_agents(array ( 'id_os' => $id, diff --git a/pandora_console/operation/search_agents.getdata.php b/pandora_console/operation/search_agents.getdata.php index 61c51096c6..43b3ff8b3f 100644 --- a/pandora_console/operation/search_agents.getdata.php +++ b/pandora_console/operation/search_agents.getdata.php @@ -141,7 +141,8 @@ if ($searchAgents) { ) AND ( t1.nombre COLLATE utf8_general_ci LIKE '%%" . $stringSearchSQL . "%%' OR - t2.nombre COLLATE utf8_general_ci LIKE '%%" . $stringSearchSQL . "%%' + t2.nombre COLLATE utf8_general_ci LIKE '%%" . $stringSearchSQL . "%%' OR + t1.direccion COLLATE utf8_general_ci LIKE '%%" . $stringSearchSQL . "%%' ) "; break; @@ -171,7 +172,8 @@ if ($searchAgents) { ) AND ( t1.nombre LIKE '%%" . $stringSearchSQL . "%%' OR - t2.nombre LIKE '%%" . $stringSearchSQL . "%%' + t2.nombre LIKE '%%" . $stringSearchSQL . "%%' OR + t1.direction LIKE '%%" . $stringSearchSQL . "%%' ) "; break; diff --git a/pandora_console/operation/tree.php b/pandora_console/operation/tree.php index ef8aff13c0..3f46c87c04 100644 --- a/pandora_console/operation/tree.php +++ b/pandora_console/operation/tree.php @@ -94,7 +94,7 @@ if (is_ajax ()) treeview_printModuleTable($id_module, $server); - + if (defined ('METACONSOLE')) { metaconsole_restore_db(); } @@ -605,7 +605,7 @@ else { enterprise_hook('open_meta_frame'); -if(tags_has_user_acl_tags()) { +if (tags_has_user_acl_tags()) { ui_print_tags_warning(); }