From c4f2df074592fbcff7a7b6fc0e54022c04d1bca2 Mon Sep 17 00:00:00 2001
From: Kovah <mail@kovah.de>
Date: Thu, 5 Mar 2020 22:53:36 +0100
Subject: [PATCH] Implement target handling for external links (#97)

---
 app/Helper/functions.php                               | 10 ++++++++++
 .../views/actions/search/partials/table.blade.php      |  2 +-
 .../views/guest/links/partials/single-table.blade.php  |  2 +-
 resources/views/guest/links/partials/single.blade.php  |  2 +-
 .../views/models/links/partials/single-cards.blade.php |  2 +-
 .../views/models/links/partials/single-table.blade.php |  2 +-
 resources/views/models/links/partials/single.blade.php |  2 +-
 resources/views/models/links/show.blade.php            |  4 ++--
 8 files changed, 18 insertions(+), 8 deletions(-)

diff --git a/app/Helper/functions.php b/app/Helper/functions.php
index 41d87386..58afe7c8 100644
--- a/app/Helper/functions.php
+++ b/app/Helper/functions.php
@@ -213,3 +213,13 @@ function alert(?string $message = null, ?string $style = 'info'): Alert
 
     return $alert->flash($message, $style);
 }
+
+/**
+ * Return proper link attributes based on the links_new_tab user setting
+ *
+ * @return string
+ */
+function linkTarget(): string
+{
+    return usersettings('links_new_tab') ? 'target="_blank" rel="noopener noreferrer"' : '';
+}
diff --git a/resources/views/actions/search/partials/table.blade.php b/resources/views/actions/search/partials/table.blade.php
index 81cb8e2e..185b1f98 100644
--- a/resources/views/actions/search/partials/table.blade.php
+++ b/resources/views/actions/search/partials/table.blade.php
@@ -16,7 +16,7 @@
                     </a>
                 </td>
                 <td>
-                    <a href="{{ $link->url }}" target="_blank">
+                    <a href="{{ $link->url }}" {!! linkTarget() !!}>
                         {{ $link->url }}
                     </a>
                 </td>
diff --git a/resources/views/guest/links/partials/single-table.blade.php b/resources/views/guest/links/partials/single-table.blade.php
index 514f213c..fb77e10c 100644
--- a/resources/views/guest/links/partials/single-table.blade.php
+++ b/resources/views/guest/links/partials/single-table.blade.php
@@ -3,7 +3,7 @@
         {{ $link->title }}
     </td>
     <td>
-        <a href="{{ $link->url }}" target="_blank">
+        <a href="{{ $link->url }}" {!! linkTarget() !!}>
             {{ $link->url }}
         </a>
     </td>
diff --git a/resources/views/guest/links/partials/single.blade.php b/resources/views/guest/links/partials/single.blade.php
index ab9ceea8..cfe58164 100644
--- a/resources/views/guest/links/partials/single.blade.php
+++ b/resources/views/guest/links/partials/single.blade.php
@@ -4,7 +4,7 @@
         <div class="d-flex align-items-center">
             <div class="mr-2">
                 {!! $link->getIcon('mr-1') !!}
-                <a href="{{ $link->url }}" target="_blank">{{ $link->title }}</a>
+                <a href="{{ $link->url }}" {!! linkTarget() !!}>{{ $link->title }}</a>
                 <small>({{ $link->url }})</small>
             </div>
             <div class="ml-auto text-right">
diff --git a/resources/views/models/links/partials/single-cards.blade.php b/resources/views/models/links/partials/single-cards.blade.php
index 51048ec1..b6d49283 100644
--- a/resources/views/models/links/partials/single-cards.blade.php
+++ b/resources/views/models/links/partials/single-cards.blade.php
@@ -7,7 +7,7 @@
                         <i class="fas fa-lock text-muted mr-1" title="@lang('link.private')"></i>
                     @endif
                     {!! $link->getIcon('mr-1') !!}
-                    <a href="{{ $link->url }}">{{ $link->title }}</a>
+                    <a href="{{ $link->url }}" {!! linkTarget() !!}>{{ $link->title }}</a>
                     <br>
                     <small class="text-muted">({{ $link->shortUrl() }})</small>
                 </div>
diff --git a/resources/views/models/links/partials/single-table.blade.php b/resources/views/models/links/partials/single-table.blade.php
index a129cca2..f9ca12a6 100644
--- a/resources/views/models/links/partials/single-table.blade.php
+++ b/resources/views/models/links/partials/single-table.blade.php
@@ -8,7 +8,7 @@
         @endif
     </td>
     <td>
-        <a href="{{ $link->url }}" target="_blank">
+        <a href="{{ $link->url }}" {!! linkTarget() !!}>
             {{ $link->shortUrl() }}
         </a>
     </td>
diff --git a/resources/views/models/links/partials/single.blade.php b/resources/views/models/links/partials/single.blade.php
index a5e4507f..71c11cc0 100644
--- a/resources/views/models/links/partials/single.blade.php
+++ b/resources/views/models/links/partials/single.blade.php
@@ -7,7 +7,7 @@
                     <i class="fas fa-lock text-muted mr-1" title="@lang('link.private')"></i>
                 @endif
                 {!! $link->getIcon('mr-1') !!}
-                <a href="{{ $link->url }}">{{ $link->title }}</a>
+                <a href="{{ $link->url }}" {!! linkTarget() !!}>{{ $link->title }}</a>
                 <br>
                 <small class="text-muted">({{ $link->shortUrl() }})</small>
             </div>
diff --git a/resources/views/models/links/show.blade.php b/resources/views/models/links/show.blade.php
index 68b9684d..fcd9a4c0 100644
--- a/resources/views/models/links/show.blade.php
+++ b/resources/views/models/links/show.blade.php
@@ -16,10 +16,10 @@
                 <div class="card-body">
 
                     <h2>
-                        <a href="{{ $link->url }}">{{ $link->title }}</a>
+                        <a href="{{ $link->url }}" {!! linkTarget() !!}>{{ $link->title }}</a>
                     </h2>
                     <div class="text-muted small mt-1 mb-3">
-                        <a href="{{ $link->url }}">{{ $link->url }}</a>
+                        <a href="{{ $link->url }}" {!! linkTarget() !!}>{{ $link->url }}</a>
                     </div>
 
                     <div class="row">