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

2012-02-06 Miguel de Dios <miguel.dedios@artica.es> 

* include/functions_api.php: fixed into function "get_events__with_user"
	when try get list events when empty list of groups for user.
	
	* include/api.php: fixed the auth.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@5499 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
This commit is contained in:
mdtrooper 2012-02-06 17:21:11 +00:00
parent 8ec65ef9ab
commit d7b6cbe8db
3 changed files with 20 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 @@
2012-02-06 Miguel de Dios <miguel.dedios@artica.es>
* include/functions_api.php: fixed into function "get_events__with_user"
when try get list events when empty list of groups for user.
* include/api.php: fixed the auth.
2012-02-06 Ramon Novoa <rnovoa@artica.es> 2012-02-06 Ramon Novoa <rnovoa@artica.es>
* operation/netflow/nf_live_view.php: Added ACL checks for filter * operation/netflow/nf_live_view.php: Added ACL checks for filter

7
pandora_console/include/api.php
View File

@ -52,7 +52,12 @@ if (!empty($apiPassword)) {
} }
} }
else { else {
if (isInACL($ipOrigin)) { $user_in_db = process_user_login($user, $password);
if ($user_in_db !== false) {
$config['id_user'] = $user_in_db;
$correctLogin = true;
}
else if (isInACL($ipOrigin)) {
$correctLogin = true; $correctLogin = true;
} }
} }

6
pandora_console/include/functions_api.php
View File

@ -4348,8 +4348,14 @@ function get_events__with_user($trash1, $trash2, $other, $returnType, $user_in_d
//to a function. //to a function.
$groups = users_get_groups ($user_in_db, "IR"); $groups = users_get_groups ($user_in_db, "IR");
$is_admin = (bool)db_get_value('is_admin', 'tusuario', 'id_user', $user_in_db);
if (!empty($groups)) {
$sql_post = " AND id_grupo IN (".implode (",", array_keys ($groups)).")"; $sql_post = " AND id_grupo IN (".implode (",", array_keys ($groups)).")";
}
else if ($is_admin) {
$sql_post = " AND 1 = 0";
}
// Skip system messages if user is not PM // Skip system messages if user is not PM
if (!check_acl ($user_in_db, 0, "PM")) { if (!check_acl ($user_in_db, 0, "PM")) {