From 8e1615ac5f3074d3864db4f8bfc37a717868432e Mon Sep 17 00:00:00 2001
From: Chris <chris@headred.net>
Date: Tue, 18 Jun 2019 12:25:05 +0100
Subject: [PATCH] fix search tab behaviour and tag link in subfolder

---
 app/Helper.php                 | 12 ++++++++++++
 app/Search.php                 |  4 ++--
 resources/views/item.blade.php |  2 +-
 3 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/app/Helper.php b/app/Helper.php
index b3b994c7..86cf5e8a 100644
--- a/app/Helper.php
+++ b/app/Helper.php
@@ -35,6 +35,18 @@ function title_color($hex)
     }
 }
 
+function getLinkTargetAttribute()
+{
+    $target = \App\Setting::fetch('window_target');
+
+    if($target === 'current') {
+        return '';
+    } else {
+        return ' target="' . $target . '"';
+    }
+}
+
+
 
 function className($name)
 {
diff --git a/app/Search.php b/app/Search.php
index b68e4c38..05da1851 100644
--- a/app/Search.php
+++ b/app/Search.php
@@ -125,7 +125,7 @@ abstract class Search
                 $provider = self::providerDetails($user_search_provider);
 
                 $output .= '<div class="searchform">';
-                $output .= Form::open(['url' => 'search', 'method' => 'get']);
+                $output .= '<form action="'.url('search').'"'.getLinkTargetAttribute().' method="get">';
                 $output .= '<div id="search-container" class="input-container">';
                 $output .= '<select name="provider">';
                 foreach(self::providers() as $key => $searchprovider) {
@@ -136,7 +136,7 @@ abstract class Search
                 $output .= Form::text('q', null, ['class' => 'homesearch', 'autofocus' => 'autofocus', 'placeholder' => __('app.settings.search').'...']);
                 $output .= '<button type="submit">'.ucwords(__('app.settings.search')).'</button>';
                 $output .= '</div>';
-                $output .= Form::close();
+                $output .= '</form>';
                 $output .= '</div>';
             }
         }
diff --git a/resources/views/item.blade.php b/resources/views/item.blade.php
index 738dbe96..0235164a 100644
--- a/resources/views/item.blade.php
+++ b/resources/views/item.blade.php
@@ -11,7 +11,7 @@
                                 <div data-id="{{ $app->id }}" data-dataonly="{{ $app->getconfig()->dataonly ?? '0' }}" class="livestats-container{{ title_color($app->colour) }}"></div>
                                 @endif
                             </div>
-                            <a title="{{ App\Item::getApplicationDescription($app->class) }}" class="link{{ title_color($app->colour) }}"{!! $app->link_target !!} href="{{ $app->link }}"><i class="fas {{ $app->link_icon }}"></i></a>
+                            <a title="{{ App\Item::getApplicationDescription($app->class) }}" class="link{{ title_color($app->colour) }}"{!! $app->link_target !!} href="{{ url($app->link) }}"><i class="fas {{ $app->link_icon }}"></i></a>
                         </div>
                         <a class="item-edit" href="{{ route($app->link_type.'.edit', [ $app->id ]) }}"><i class="fas fa-pencil"></i></a>