EZP-29033: [Legacy] Do not remove links user has no access to (ezsyst…

…ems#104)
peterkeung · Jul 1, 2018 · 50bfaf9 · 50bfaf9
1 parent 3298b53
commit 50bfaf9
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 13 deletions.
diff --git a/kernel/classes/datatypes/ezxmltext/handlers/output/ezxhtmlxmloutput.php b/kernel/classes/datatypes/ezxmltext/handlers/output/ezxhtmlxmloutput.php
@@ -187,6 +187,7 @@ function initHandlerHeader( $element, &$attributes, &$siblingParams, &$parentPar
     function initHandlerLink( $element, &$attributes, &$siblingParams, &$parentParams )
     {
         $ret = array();
+        $ezxmlIni = eZINI::instance('ezxml.ini');
 
         // Set link parameters for rendering children of link tag
         $href='';
@@ -203,16 +204,16 @@ function initHandlerLink( $element, &$attributes, &$siblingParams, &$parentParam
 
             if ( $node != null )
             {
-                if ( !$node->object()->canRead() )
+                $view = $element->getAttribute( 'view' );
+                if ( $view )
+                    $href = 'content/view/' . $view . '/' . $nodeID;
+                else if ( !$node->object()->canRead() &&
+                          $ezxmlIni->variable( 'ezxhtml', 'ShowURLAliasForProtectedLinks' ) !== 'enabled' )
                 {
                     eZDebug::writeWarning( "Current user does not have read access to the object of node #$nodeID",
                         'XML output handler: link' );
-                    return $ret;
+                    $href = 'content/view/full/' . $nodeID;
                 }
-
-                $view = $element->getAttribute( 'view' );
-                if ( $view )
-                    $href = 'content/view/' . $view . '/' . $nodeID;
                 else
                     $href = $node->attribute( 'url_alias' );
             }
@@ -227,13 +228,6 @@ function initHandlerLink( $element, &$attributes, &$siblingParams, &$parentParam
             if ( isset( $this->ObjectArray["$objectID"] ) )
             {
                 $object = $this->ObjectArray["$objectID"];
-                if ( !$object->canRead() )
-                {
-                    eZDebug::writeWarning( "Current user does not have read access to the object #$objectID",
-                        'XML output handler: link' );
-                    return $ret;
-                }
-
                 $node = $object->attribute( 'main_node' );
                 if ( $node )
                 {
@@ -242,6 +236,13 @@ function initHandlerLink( $element, &$attributes, &$siblingParams, &$parentParam
                     $view = $element->getAttribute( 'view' );
                     if ( $view )
                         $href = 'content/view/' . $view . '/' . $nodeID;
+                    else if ( !$object->canRead() &&
+                              $ezxmlIni->variable( 'ezxhtml', 'ShowURLAliasForProtectedLinks' ) !== 'enabled' )
+                    {
+                        eZDebug::writeWarning( "Current user does not have read access to the object #$objectID",
+                            'XML output handler: link' );
+                        $href = 'content/view/full/' . $nodeID;
+                    }
                     else
                         $href = $node->attribute( 'url_alias' );
                 }

diff --git a/settings/ezxml.ini b/settings/ezxml.ini
@@ -54,3 +54,6 @@ TagPresets[]
 # Determines to insert <p> tag inside a table cell in the output or not
 # if there is only one <paragraph> tag inside a cell.
 RenderParagraphInTableCells=enabled
+# Show URL alias for links the current user does not have read access to.
+# If disabled (recommended) the link will be /content/view/full/[nodeID] instead.
+ShowURLAliasForProtectedLinks=disabled