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

2013-09-03 Miguel de Dios <miguel.dedios@artica.es> 

* 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
This commit is contained in:
mdtrooper 2013-09-03 07:54:24 +00:00
parent b2f6506f8b
commit 44550e9acc
4 changed files with 15 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
pandora_console/ChangeLog
View File

@ -1,3 +1,11 @@
2013-09-03 Miguel de Dios <miguel.dedios@artica.es>
* 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 <miguel.dedios@artica.es>
* godmode/massive/massive_edit_modules.php: added field "ip_target"

2
pandora_console/include/functions_treeview.php
View File

@ -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,

6
pandora_console/operation/search_agents.getdata.php
View File

@ -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;

4
pandora_console/operation/tree.php
View File

@ -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();
}