From 11b6cc3f68f55e1c5e725b737b39c0a7f79e0ec1 Mon Sep 17 00:00:00 2001 From: Julius Härtl Date: Mon, 5 Mar 2018 16:22:18 +0100 Subject: Replace logout href to avoid new etag on every request MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Julius Härtl --- core/Controller/NavigationController.php | 23 +++++++++++++++++++---- 1 file changed, 19 insertions(+), 4 deletions(-) (limited to 'core/Controller/NavigationController.php') diff --git a/core/Controller/NavigationController.php b/core/Controller/NavigationController.php index b178cb97cd5..2397fb3c7b4 100644 --- a/core/Controller/NavigationController.php +++ b/core/Controller/NavigationController.php @@ -56,12 +56,12 @@ class NavigationController extends OCSController { $navigation = $this->rewriteToAbsoluteUrls($navigation); } - $etag = md5(json_encode($navigation)); + $etag = $this->generateETag($navigation); if ($this->request->getHeader('If-None-Match') === $etag) { return new DataResponse([], Http::STATUS_NOT_MODIFIED); } $response = new DataResponse($navigation); - $response->setEtag($etag); + $response->setETag($etag); return $response; } @@ -77,15 +77,30 @@ class NavigationController extends OCSController { if ($absolute) { $navigation = $this->rewriteToAbsoluteUrls($navigation); } - $etag = md5(json_encode($navigation)); + $etag = $this->generateETag($navigation); if ($this->request->getHeader('If-None-Match') === $etag) { return new DataResponse([], Http::STATUS_NOT_MODIFIED); } $response = new DataResponse($navigation); - $response->setEtag($etag); + $response->setETag($etag); return $response; } + /** + * Generate an ETag for a list of navigation entries + * + * @param array $navigation + * @return string + */ + private function generateETag(array $navigation): string { + foreach ($navigation as &$nav) { + if ($nav['id'] === 'logout') { + $nav['href'] = 'logout'; + } + } + return md5(json_encode($navigation)); + } + /** * Rewrite href attribute of navigation entries to an absolute URL * -- cgit v1.2.3