diff --git a/resources/css/kt-framing.css b/resources/css/kt-framing.css index d8e626d..d6096bd 100644 --- a/resources/css/kt-framing.css +++ b/resources/css/kt-framing.css @@ -753,7 +753,7 @@ a.main_nav_item { #content h2 { - font-family: "Lucida Grande", "Bitstream Vera Sans", Tahoma, sans-serif; + font-family: "Lucida Grande", Tahoma, sans-serif; /* "Bitstream Vera Sans" */ padding-bottom: 0.25em; border-width: 0 0 0 0; border-style: solid; @@ -2128,6 +2128,6 @@ body #content #add_dashlet .workflow_step2 { - overflow:scroll; + overflow:scroll; } \ No newline at end of file diff --git a/search2/indexing/indexerCore.inc.php b/search2/indexing/indexerCore.inc.php index 0d99ab1..1f1c434 100644 --- a/search2/indexing/indexerCore.inc.php +++ b/search2/indexing/indexerCore.inc.php @@ -539,7 +539,7 @@ abstract class Indexer global $default; $sql = 'DELETE FROM - index_files AS iff USING index_files AS iff, documents + iff USING index_files AS iff, documents WHERE NOT EXISTS( SELECT diff --git a/search2/search/expr.inc.php b/search2/search/expr.inc.php index 0f7efdd..7ced3da 100644 --- a/search2/search/expr.inc.php +++ b/search2/search/expr.inc.php @@ -1161,9 +1161,19 @@ class SQLQueryBuilder implements QueryBuilder $sql .= " LEFT JOIN document_fields df$offset ON df$offset.id=dfl$offset.document_field_id" . "\n"; } + // Add permissions sql for read access + $oPermission =& KTPermission::getByName('ktcore.permissions.read'); + $permId = $oPermission->getID(); + $oUser = User::get($_SESSION['userID']); + $aPermissionDescriptors = KTPermissionUtil::getPermissionDescriptorsForUser($oUser); + $sPermissionDescriptors = (!empty($aPermissionDescriptors)) ? implode(',', $aPermissionDescriptors) : ''; - $sql .= - 'WHERE dmv.status_id=1 AND d.status_id=1 AND ' . "\n "; + $sql .= 'LEFT JOIN folders f ON d.folder_id = f.id '. "\n"; + + $sql .= 'INNER JOIN permission_lookups AS PL ON f.permission_lookup_id = PL.id '. "\n"; + $sql .= 'INNER JOIN permission_lookup_assignments AS PLA ON PL.id = PLA.permission_lookup_id AND PLA.permission_id = '.$permId. " \n"; + + $sql .= "WHERE PLA.permission_descriptor_id IN ($sPermissionDescriptors) AND dmv.status_id=1 AND d.status_id=1 AND \n "; return $sql; }