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

Fixed general module search, now searches all the modules if the user haven't tags. Tickets #2847 and #2835

This commit is contained in:
Arturo Gonzalez Diaz 2015-10-02 14:24:00 +02:00
parent 82b5d07a2f
commit 1951cce831
2 changed files with 92 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

92
pandora_console/include/functions_tags.php
View File

@ -1056,8 +1056,96 @@ function tags_get_user_tags($id_user = false, $access = 'AR') {
}
$user_tags[$id] = $all_tags[$id];
}
return $user_tags;
}
function tags_get_tags_for_module_search($id_user = false, $access = 'AR') {
global $config;
//users_is_strict_acl
if ($id_user === false) {
$id_user = $config['id_user'];
}
// Get all tags to have the name of all of them
$all_tags = tags_get_all_tags();
// If at least one of the profiles of this access flag hasent
// tags restrictions, the user can see all tags
$acl_column = get_acl_column($access);
if (empty($acl_column)) {
return array();
}
switch ($config["dbtype"]) {
case "mysql":
case "postgresql":
$query = sprintf("
SELECT count(*)
FROM tusuario_perfil, tperfil
WHERE tperfil.id_perfil = tusuario_perfil.id_perfil
AND tusuario_perfil.id_usuario = '%s'
AND tperfil.%s = 1
AND tags <> ''",
$id_user, $acl_column);
break;
case "oracle":
$query = sprintf("
SELECT count(*)
FROM tusuario_perfil, tperfil
WHERE tperfil.id_perfil = tusuario_perfil.id_perfil
AND tusuario_perfil.id_usuario = '%s'
AND tperfil.%s = 1
AND dbms_lob.getlength(tags) > 0",
$id_user, $acl_column);
break;
}
$profiles_without_tags = db_get_value_sql($query);
if ($profiles_without_tags == 0) {
//--------------------------------------------------------------
// FIXED FOR TICKET #1921
//
// If the user is setted with strict ACL, the pandora does not
// show any tags. Thanks Mr. C from T.
//
//--------------------------------------------------------------
return false;
}
// Get the tags of the required access flag for each group
$tags = tags_get_acl_tags($id_user, 0, $access, 'data');
// If there are wrong parameters or fail ACL check, return false
if ($tags_user === ERR_WRONG_PARAMETERS || $tags_user === ERR_ACL) {
return array();
}
// Merge the tags to get an array with all of them
$user_tags_id = array();
foreach ($tags as $t) {
if (empty($user_tags_id)) {
$user_tags_id = $t;
}
else {
$user_tags_id = array_unique(array_merge($t,$user_tags_id));
}
}
// Set the format id=>name to tags
$user_tags = array();
foreach ($user_tags_id as $id) {
if (!isset($all_tags[$id])) {
continue;
}
$user_tags[$id] = $all_tags[$id];
}
return $user_tags;
}

4
pandora_console/operation/search_modules.getdata.php
View File

@ -64,8 +64,8 @@ $modules = false;
if ($searchModules) {
$userGroups = users_get_groups($config['id_user'], 'AR', false);
$id_userGroups = array_keys($userGroups);
$tags = tags_get_user_tags();
$tags = tags_get_tags_for_module_search();
$sql_tags = "'no_check_tags' = 'no_check_tags'";
if (!empty($tags)) {