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

2011-11-25 Juan Manuel Ramon <juanmanuel.ramon@artica.es> 

* include/functions_agents.php: Fixed sql error in agents_get_agents
        function.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@5171 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
This commit is contained in:
juanmanuelr 2011-11-25 11:11:36 +00:00
parent d23c35e623
commit 765f78ee12
2 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
pandora_console/ChangeLog
View File

@ -1,3 +1,8 @@
2011-11-25 Juan Manuel Ramon <juanmanuel.ramon@artica.es>
* include/functions_agents.php: Fixed sql error in agents_get_agents
function.
2011-11-25 Juan Manuel Ramon <juanmanuel.ramon@artica.es> 2011-11-25 Juan Manuel Ramon <juanmanuel.ramon@artica.es>
* godmode/agentes/module_manager.php: Fixed an sql error. * godmode/agentes/module_manager.php: Fixed an sql error.

3
pandora_console/include/functions_agents.php
View File

@ -315,7 +315,7 @@ function agents_get_agents ($filter = false, $fields = false, $access = 'AR', $o
if (! is_array ($filter)) { if (! is_array ($filter)) {
$filter = array (); $filter = array ();
} }
//Get user groups //Get user groups
$groups = array_keys (users_get_groups ($config["id_user"], $access, false)); $groups = array_keys (users_get_groups ($config["id_user"], $access, false));
@ -377,6 +377,7 @@ function agents_get_agents ($filter = false, $fields = false, $access = 'AR', $o
$sql_extra = enterprise_hook('policies_get_agents_sql_condition'); $sql_extra = enterprise_hook('policies_get_agents_sql_condition');
if($sql_extra != ENTERPRISE_NOT_HOOK) { if($sql_extra != ENTERPRISE_NOT_HOOK) {
if (!empty($sql_extra))
$where = sprintf('%s OR %s', $where, $sql_extra); $where = sprintf('%s OR %s', $where, $sql_extra);
} }