Fixed EZP-19673: search results contain link to hidden nodes

ezsystems · Oct 24, 2012 · 3fc1347 · 3fc1347 · paulborgermans · Oct 26, 2012
1 parent a505cf6
commit 3fc1347
Show file tree

Hide file tree

Showing 2 changed files with 45 additions and 6 deletions.
diff --git a/classes/ezfezpsolrquerybuilder.php b/classes/ezfezpsolrquerybuilder.php
@@ -158,6 +158,7 @@ public function buildSearch( $searchText, $params = array(), $searchTypes = arra
         $visibilityDefaultSetting = self::$SiteINI->variable( 'SiteAccessSettings', 'ShowHiddenNodes' );
         $visibilityDefault = ( $visibilityDefaultSetting === 'true' ) ? true : false;
         $ignoreVisibility = isset( $params['IgnoreVisibility'] )  ?  $params['IgnoreVisibility'] : $visibilityDefault;
+        $this->searchPluginInstance->postSearchProcessingData['ignore_visibility'] = $ignoreVisibility;
         $limitation = isset( $params['Limitation'] )  ?  $params['Limitation'] : null;
         $boostFunctions = isset( $params['BoostFunctions'] )  ?  $params['BoostFunctions'] : null;
         $forceElevation = isset( $params['ForceElevation'] )  ?  $params['ForceElevation'] : false;
@@ -451,7 +452,8 @@ public function buildSearch( $searchText, $params = array(), $searchTypes = arra
                 eZSolr::getMetaFieldName( 'main_url_alias' ) . ' ' . eZSolr::getMetaFieldName( 'installation_url' ) . ' ' .
                 eZSolr::getMetaFieldName( 'id' ) . ' ' . eZSolr::getMetaFieldName( 'main_node_id' ) . ' ' .
                 eZSolr::getMetaFieldName( 'language_code' ) . ' ' . eZSolr::getMetaFieldName( 'name' ) .
-                ' score ' . eZSolr::getMetaFieldName( 'published' ) . ' ' . eZSolr::getMetaFieldName( 'path_string' ) . ' ' . implode( ' ', $extraFieldsToReturn );
+                ' score ' . eZSolr::getMetaFieldName( 'published' ) . ' ' . eZSolr::getMetaFieldName( 'path_string' ) . ' ' .
+                eZSolr::getMetaFieldName( 'is_invisible' ) . ' ' . implode( ' ', $extraFieldsToReturn );
 
         if ( ! $asObjects )
         {

diff --git a/search/plugins/ezsolr/ezsolr.php b/search/plugins/ezsolr/ezsolr.php
@@ -345,16 +345,42 @@ protected function getNodeID( $doc )
             $docPathStrings,
             $subtreeLimitations
         );
+        $ignoreVisibility = eZContentObjectTreeNode::showInvisibleNodes();
+        if ( isset( $this->postSearchProcessingData['ignore_visibility'] ) )
+        {
+            $ignoreVisibility = $this->postSearchProcessingData['ignore_visibility'];
+        }
+
 
         // Intersect between $validSubtreeArray (search location filter) and $validSubtreeLimitations (user policy limitations)
         // indicates valid locations for $doc in current search query
-        // If this intersect is not empty, we take the first element to get the corresponding node ID
-        $validSubtrees = array_intersect( $validSubtreeArray, $validSubtreeLimitations );
+        // If this intersect is not empty, we take the first node id that
+        // matches the visibility requirement
+        $validSubtrees = array_flip(
+            array_intersect( $validSubtreeArray, $validSubtreeLimitations )
+        );
         if ( !empty( $validSubtrees ) )
         {
-            $validSubtree = array_shift( $validSubtrees );
-            $nodeArray = explode( '/', rtrim( $validSubtree, '/' ) );
-            return (int)array_pop( $nodeArray );
+            foreach ( $docPathStrings as $k => $path )
+            {
+                if ( isset( $validSubtrees[$path] ) )
+                {
+                    if (
+                        $ignoreVisibility ||
+                        !$doc[ezfSolrDocumentFieldBase::generateMetaFieldName( 'is_invisible' )][$k]
+                    )
+                    {
+                        $nodeArray = explode( '/', rtrim( $path, '/' ) );
+                        return (int)array_pop( $nodeArray );
+                    }
+                }
+            }
+            eZDebug::writeError(
+                "Could not find a visible location for content " .
+                "#{$doc[ezfSolrDocumentFieldBase::generateMetaFieldName( 'id' )]} " .
+                "that current user has read access on. The Solr index is probably outdated",
+                __METHOD__
+            );
         }
         else
         {
@@ -369,6 +395,17 @@ protected function getNodeID( $doc )
                     __METHOD__
                 );
             }
+            foreach ( $docPathStrings as $k => $path )
+            {
+                if (
+                    $ignoreVisibility ||
+                    !$doc[ezfSolrDocumentFieldBase::generateMetaFieldName( 'is_invisible' )][$k]
+                )
+                {
+                    $nodeArray = explode( '/', rtrim( $path, '/' ) );
+                    return (int)array_pop( $nodeArray );
+                }
+            }
         }
 
         return (int)$doc[ezfSolrDocumentFieldBase::generateMetaFieldName( 'main_node_id' )];