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

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

Browse Source 
* include/functions_agents.php: Fixed bad sql sintax in 
	agents_get_agents function.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@5216 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
This commit is contained in:
juanmanuelr 2011-11-30 15:04:43 +00:00
parent 12f0c69912
commit 9dfee9b358
2 changed files with 8 additions and 2 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-30 Juan Manuel Ramon <juanmanuel.ramon@artica.es>
* include/functions_agents.php: Fixed bad sql sintax in
agents_get_agents function.
2011-11-30 Juan Manuel Ramon <juanmanuel.ramon@artica.es> 2011-11-30 Juan Manuel Ramon <juanmanuel.ramon@artica.es>
* include/functions_agents.php: Fixed bad sql sintax in * include/functions_agents.php: Fixed bad sql sintax in

5
pandora_console/include/functions_agents.php
View File

@ -376,7 +376,7 @@ function agents_get_agents ($filter = false, $fields = false, $access = 'AR', $o
} }
$where = db_format_array_where_clause_sql ($filter, 'AND', ''); $where = db_format_array_where_clause_sql ($filter, 'AND', '');
$where_nogroup = db_format_array_where_clause_sql ($filter_nogroup, 'AND', ''); $where_nogroup = db_format_array_where_clause_sql ($filter_nogroup, 'AND', '');
$sql_extra = enterprise_hook('policies_get_agents_sql_condition'); $sql_extra = enterprise_hook('policies_get_agents_sql_condition');
@ -395,7 +395,8 @@ function agents_get_agents ($filter = false, $fields = false, $access = 'AR', $o
$where = sprintf('%s AND (%s OR %s)', $where, $where_nogroup, $sql_extra); $where = sprintf('%s AND (%s OR %s)', $where, $where_nogroup, $sql_extra);
} }
else { else {
$where = sprintf('%s AND %s', $where, $where_nogroup); if (!empty($where_nogroup))
$where = sprintf('%s AND %s', $where, $where_nogroup);
} }
$sql = sprintf('SELECT %s FROM tagente WHERE %s %s', implode(',',$fields), $where, $order); $sql = sprintf('SELECT %s FROM tagente WHERE %s %s', implode(',',$fields), $where, $order);