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

2010-05-14 Sergio Martin <sergio.martin@artica.es> 

* include/functions_db.php
	operation/agentes/ver_agente.php
	godmode/agentes/massive_edit_modules.php: Fixed the
	ACL check into groups combo for bug 3001500 and 
	All agents display for bug 2999431



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@2727 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
This commit is contained in:
zarzuelo 2010-05-14 09:25:39 +00:00
parent c06b11a83d
commit d8d2d23ba1
4 changed files with 29 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 @@
2010-05-14 Sergio Martin <sergio.martin@artica.es>
* include/functions_db.php
operation/agentes/ver_agente.php
godmode/agentes/massive_edit_modules.php: Fixed the
ACL check into groups combo for bug 3001500 and
All agents display for bug 2999431
2010-05-14 Miguel de Dios <miguel.dedios@artica.es>
* include/gettext.php: Sorry I forget part of changes in "fixed the bug of

1
pandora_console/godmode/agentes/massive_edit_modules.php
View File

@ -160,7 +160,6 @@ $names = get_agent_modules (array_keys ($agents),
foreach ($names as $name) {
$modules[$name['nombre']] = $name['nombre'];
}
$agents = null;
$table->data[0][2] = __('Module name');
$table->data[0][3] = print_select ($modules, 'module_name',

10
pandora_console/include/functions_db.php
View File

@ -1334,14 +1334,20 @@ function give_agentmodule_flag ($id_agent_module) {
function get_all_groups($groupWithAgents = false) {
$sql = 'SELECT id_grupo, nombre FROM tgrupo';
global $config;
if ($groupWithAgents)
$sql .= ' WHERE id_grupo IN (SELECT id_grupo FROM tagente GROUP BY id_grupo)';
$sql .= ' ORDER BY nombre DESC';
$rows = get_db_all_rows_sql ($sql);
$return = array();
foreach ($rows as $row)
$return[$row['id_grupo']] = $row['nombre'];
foreach ($rows as $row) {
if (give_acl ($config['id_user'], $row["id_grupo"], "AR"))
$return[$row['id_grupo']] = $row['nombre'];
}
return $return;
}

13
pandora_console/operation/agentes/ver_agente.php
View File

@ -36,7 +36,18 @@ if (is_ajax ()) {
if ($get_agents_group_json) {
$id_group = get_parameter('id_group');
$agents = get_db_all_rows_sql("SELECT id_agente, nombre FROM tagente WHERE id_grupo = ". $id_group);
if($id_group > 0)
$filter = " WHERE id_grupo = ". $id_group;
else {
$groups_orig = get_user_groups();
$a = 0;
$groups = array_keys($groups_orig);
$filter = " WHERE id_grupo IN (". implode(',', $groups) .")";
}
$agents = get_db_all_rows_sql("SELECT id_agente, nombre FROM tagente". $filter);
echo json_encode($agents);
return;