From d472eb01e01519077a8a4c93d7f8476901b30343 Mon Sep 17 00:00:00 2001 From: cdujeu Date: Wed, 16 Nov 2016 08:55:17 +0100 Subject: [PATCH] Add user if not in indexed URL. --- .../src/ElasticSearchIndexer.php | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/core/src/plugins/index.elasticsearch/src/ElasticSearchIndexer.php b/core/src/plugins/index.elasticsearch/src/ElasticSearchIndexer.php index 3874256887..05d9dceb7f 100644 --- a/core/src/plugins/index.elasticsearch/src/ElasticSearchIndexer.php +++ b/core/src/plugins/index.elasticsearch/src/ElasticSearchIndexer.php @@ -266,8 +266,16 @@ public function applyAction(\Psr\Http\Message\ServerRequestInterface $requestInt if ($source["serialized_metadata"] != null) { $meta = unserialize(base64_decode($source["serialized_metadata"])); $tmpNode = new AJXP_Node($source["node_url"], $meta); + if(!$tmpNode->hasUser()){ + if($source['ajxp_scope'] === "user" && !empty($source['ajxp_user'])) $tmpNode->setUserId($source['ajxp_user']); + else $tmpNode->setUserId($ctx->getUser()->getId()); + } } else { $tmpNode = new AJXP_Node($source["node_url"], []); + if(!$tmpNode->hasUser()){ + if($source['ajxp_scope'] === "user" && !empty($source['ajxp_user'])) $tmpNode->setUserId($source['ajxp_user']); + else $tmpNode->setUserId($ctx->getUser()->getId()); + } $tmpNode->loadNodeInfo(); } @@ -330,8 +338,16 @@ public function applyAction(\Psr\Http\Message\ServerRequestInterface $requestInt if ($hit->serialized_metadata!=null) { $meta = unserialize(base64_decode($hit->serialized_metadata)); $tmpNode = new AJXP_Node($hit->node_url, $meta); + if(!$tmpNode->hasUser()){ + if($hit->ajxp_user) $tmpNode->setUserId($hit->ajxp_user); + else $tmpNode->setUserId($ctx->getUser()->getId()); + } } else { $tmpNode = new AJXP_Node($hit->node_url, []); + if(!$tmpNode->hasUser()){ + if($hit->ajxp_user) $tmpNode->setUserId($hit->ajxp_user); + else $tmpNode->setUserId($ctx->getUser()->getId()); + } $tmpNode->loadNodeInfo(); } if (!file_exists($tmpNode->getUrl())) {