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

2011-05-04 Vanessa Gil <vanessa.gil@artica.es> 

*  operation/agentes/estado_agente.php: Fixed error on list of agents


git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@4302 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
This commit is contained in:
vgilc 2011-05-04 11:44:31 +00:00
parent 7ddba9b5c1
commit 22c8363ba4
2 changed files with 26 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pandora_console/ChangeLog
View File

@ -1,3 +1,7 @@
2011-05-04 Vanessa Gil <vanessa.gil@artica.es>
* operation/agentes/estado_agente.php: Fixed error on list of agents
2011-05-03 Junichi Satoh <junichi@rworks.jp>
* include/help/ja/help_reporting_advanced_tab.php: Added a missing

33
pandora_console/operation/agentes/estado_agente.php
View File

@ -229,22 +229,32 @@ if ($group_id > 0) {
}
else {
// Not selected any specific group
$user_group = get_user_groups($config["id_user"], "AR");
$groups = array_keys($user_group);
$agent_names = get_group_agents(array_keys ($user_group), $filter, "upper");
if (check_acl ($config['id_user'], 0, "PM")){
$agent_names = get_group_agents(0, $filter, "upper", true);
}else{
$user_group = get_user_groups($config["id_user"], "AR");
$groups = array_keys($user_group);
$agent_names = get_group_agents(array_keys ($user_group), $filter, "upper");
}
}
$total_agents = 0;
$agents = false;
if (! empty ($agent_names)) {
$total_agents = agents_get_agents (array ('id_agente' => array_keys ($agent_names),
'order' => 'nombre ASC',
'disabled' => 0,
'id_grupo' => $groups),
array ('COUNT(*) as total'));
$total_agents = isset ($total_agents[0]['total']) ? $total_agents[0]['total'] : 0;
$agents = agents_get_agents (array ('id_agente' => array_keys ($agent_names),
if (check_acl ($config['id_user'], 0, "PM")){
$sql = sprintf ('SELECT COUNT(*) FROM tagente WHERE 1=1 %s', $search_sql);
$total_agents = get_db_sql ($sql);
$sql = sprintf ('SELECT * FROM tagente WHERE 1=1 %s ORDER BY %s %s LIMIT %d, %d', $search_sql, $order['field'], $order['order'], $offset, $config["block_size"]);
$agents = get_db_all_rows_sql ($sql);
}else{
$total_agents = get_agents (array ('id_agente' => array_keys ($agent_names),
'order' => 'nombre ASC',
'disabled' => 0,
'id_grupo' => $groups),
array ('COUNT(*) as total'));
$total_agents = isset ($total_agents[0]['total']) ? $total_agents[0]['total'] : 0;
$agents = get_agents (array ('id_agente' => array_keys ($agent_names),
'order' => 'nombre ASC',
'id_grupo' => $groups,
'offset' => (int) get_parameter ('offset'),
@ -256,6 +266,7 @@ if (! empty ($agent_names)) {
'intervalo'),
'AR',
$order);
}
}
if (empty ($agents)) {