Peter M. Groen / knowledgetree

Commit c1a14a55975d3a82927160ec372edb629830b38f

Authored by kevin_fourie
1 parent 9d22b661

Merged in from DEV trunk... 

KTS-3211
"Search not adhering to read permissions"
Fixed. Added permissions to the sql.

Committed by: Megan Watson
Reviewed by: Kevin Fourie

KTC-443
"No dashlets are displayed on Ie7 after upgrading from 3.5.2 to 3.5.2a"
Fixed. The font-family "Bitstream Vera Sans" was causing an issue in IE7 so it has been removed.

Committed by: Megan Watson
Reviewed by: Kevin Fourie

KTC-444
"SQL Error in the Indexer"
Fixed.

Committed By: Kevin Fourie
Reviewed By: Isaac Lundall


git-svn-id: https://kt-dms.svn.sourceforge.net/svnroot/kt-dms/STABLE/trunk@8324 c91229c3-7414-0410-bfa2-8a42b809f60b
Inline Side-by-side
Showing 3 changed files with 15 additions and 5 deletions
resources/css/kt-framing.css
  View file @c1a14a5
... ... @@ -753,7 +753,7 @@ a.main_nav_item {
753 753  
754 754 #content h2
755 755 {
756   - font-family: "Lucida Grande", "Bitstream Vera Sans", Tahoma, sans-serif;
  756 + font-family: "Lucida Grande", Tahoma, sans-serif; /* "Bitstream Vera Sans" */
757 757 padding-bottom: 0.25em;
758 758 border-width: 0 0 0 0;
759 759 border-style: solid;
... ... @@ -2128,6 +2128,6 @@ body #content #add_dashlet
2128 2128  
2129 2129 .workflow_step2
2130 2130 {
2131   - overflow:scroll;
  2131 + overflow:scroll;
2132 2132  
2133 2133 }
2134 2134 \ No newline at end of file
... ...
search2/indexing/indexerCore.inc.php
  View file @c1a14a5
... ... @@ -539,7 +539,7 @@ abstract class Indexer
539 539 global $default;
540 540  
541 541 $sql = 'DELETE FROM
542   - index_files AS iff USING index_files AS iff, documents
  542 + iff USING index_files AS iff, documents
543 543 WHERE
544 544 NOT EXISTS(
545 545 SELECT
... ...
search2/search/expr.inc.php
  View file @c1a14a5
... ... @@ -1161,9 +1161,19 @@ class SQLQueryBuilder implements QueryBuilder
1161 1161 $sql .= " LEFT JOIN document_fields df$offset ON df$offset.id=dfl$offset.document_field_id" . "\n";
1162 1162 }
1163 1163  
  1164 + // Add permissions sql for read access
  1165 + $oPermission =& KTPermission::getByName('ktcore.permissions.read');
  1166 + $permId = $oPermission->getID();
  1167 + $oUser = User::get($_SESSION['userID']);
  1168 + $aPermissionDescriptors = KTPermissionUtil::getPermissionDescriptorsForUser($oUser);
  1169 + $sPermissionDescriptors = (!empty($aPermissionDescriptors)) ? implode(',', $aPermissionDescriptors) : '';
1164 1170  
1165   - $sql .=
1166   - 'WHERE dmv.status_id=1 AND d.status_id=1 AND ' . "\n ";
  1171 + $sql .= 'LEFT JOIN folders f ON d.folder_id = f.id '. "\n";
  1172 +
  1173 + $sql .= 'INNER JOIN permission_lookups AS PL ON f.permission_lookup_id = PL.id '. "\n";
  1174 + $sql .= 'INNER JOIN permission_lookup_assignments AS PLA ON PL.id = PLA.permission_lookup_id AND PLA.permission_id = '.$permId. " \n";
  1175 +
  1176 + $sql .= "WHERE PLA.permission_descriptor_id IN ($sPermissionDescriptors) AND dmv.status_id=1 AND d.status_id=1 AND \n ";
1167 1177  
1168 1178 return $sql;
1169 1179 }
... ...