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

2014-06-10 Hirofumi Kosaka <kosaka@rworks.jp> 

* operation/agentes/ver_agente.php,
	godmode/massive/massive_delete_modules.php: Fixed bug that all
	agents' module the user can view could be targets of deletion,
	if the user has an AW privilege for any.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@10151 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
This commit is contained in:
hkosaka 2014-06-10 10:17:15 +00:00
parent 95d574a5c7
commit 13c6786a40
3 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
pandora_console/ChangeLog
View File

@ -1,3 +1,10 @@
2014-06-10 Hirofumi Kosaka <kosaka@rworks.jp>
* operation/agentes/ver_agente.php,
godmode/massive/massive_delete_modules.php: Fixed bug that all
agents' module the user can view could be targets of deletion,
if the user has an AW privilege for any.
2014-06-09 Alejandro Gallardo <alejandro.gallardo@artica.es> 2014-06-09 Alejandro Gallardo <alejandro.gallardo@artica.es>
* include/functions_api.php: Added the parameter * include/functions_api.php: Added the parameter

1
pandora_console/godmode/massive/massive_delete_modules.php
View File

@ -504,6 +504,7 @@ $(document).ready (function () {
"recursion" : $("#checkbox-recursion") "recursion" : $("#checkbox-recursion")
.attr("checked") ? 1 : 0, .attr("checked") ? 1 : 0,
"id_group" : this.value, "id_group" : this.value,
"privilege" : "AW",
status_agents: function () { status_agents: function () {
return $("#status_agents").val(); return $("#status_agents").val();
}, },

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

@ -47,6 +47,7 @@ if (is_ajax ()) {
$id_group = (int) get_parameter('id_group'); $id_group = (int) get_parameter('id_group');
$recursion = (int) get_parameter ('recursion', 0); $recursion = (int) get_parameter ('recursion', 0);
$custom_condition = get_parameter('custom_condition', ''); $custom_condition = get_parameter('custom_condition', '');
$privilege = (string) get_parameter ('privilege', "AR");
// Is is possible add keys prefix to avoid auto sorting in js object conversion // Is is possible add keys prefix to avoid auto sorting in js object conversion
$keys_prefix = (string) get_parameter ('keys_prefix', ''); $keys_prefix = (string) get_parameter ('keys_prefix', '');
@ -60,8 +61,7 @@ if (is_ajax ()) {
} }
} }
else { else {
$groups_orig = users_get_groups(); $groups_orig = users_get_groups(false, $privilege);
$groups = array_keys($groups_orig); $groups = array_keys($groups_orig);
} }