From f3b480c1f1c13e8b38d4e3d4c5b3cb86d3cffce9 Mon Sep 17 00:00:00 2001 From: rob Date: Fri, 25 Apr 2003 13:38:49 +0000 Subject: [PATCH] Updated queries to take advantage of new db search tables --- presentation/lookAndFeel/knowledgeTree/search/advancedSearchBL.php | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/presentation/lookAndFeel/knowledgeTree/search/advancedSearchBL.php b/presentation/lookAndFeel/knowledgeTree/search/advancedSearchBL.php index f769804..ab2683a 100644 --- a/presentation/lookAndFeel/knowledgeTree/search/advancedSearchBL.php +++ b/presentation/lookAndFeel/knowledgeTree/search/advancedSearchBL.php @@ -111,16 +111,19 @@ function getApprovedDocumentString($sMetaTagIDs, $sSQLSearchString) { $aApprovedDocumentIDs = array(); $sQuery = "SELECT DISTINCT D.id " . "FROM documents AS D INNER JOIN document_fields_link AS DFL ON DFL.document_id = D.id " . - "INNER JOIN document_fields AS DF ON DF.id = DFL.document_field_id " . + "INNER JOIN document_fields AS DF ON DF.id = DFL.document_field_id " . + "INNER JOIN search_document_user_link AS SDUL ON SDUL.document_id = D.ID " . "WHERE DF.ID IN ($sMetaTagIDs) " . - "AND " . $sSQLSearchString; - + "AND " . $sSQLSearchString . " " . + "AND SDUL.user_id = " . $_SESSION["userID"]; + $sql = $default->db; $sql->query($sQuery); while ($sql->next_record()) { - if (Permission::userHasDocumentReadPermission($sql->f("id"))) { + /*if (Permission::userHasDocumentReadPermission($sql->f("id"))) { $aApprovedDocuments[count($aApprovedDocuments)] = $sql->f("id"); - } + }*/ + $aApprovedDocuments[count($aApprovedDocuments)] = $sql->f("id"); } if (count($aApprovedDocuments) > 1) { return implode(",",$aApprovedDocuments); -- libgit2 0.21.4