From bd844ba4ea8ec6eb0b6ab9f9ce6e798e746a8026 Mon Sep 17 00:00:00 2001
From: DariusIII <dkrisan@gmail.com>
Date: Tue, 18 Sep 2018 15:14:45 +0200
Subject: [PATCH] Use url helper in place of $this->serverurl variable

---
 Blacklight/NZBGet.php                             | 2 +-
 Blacklight/SABnzbd.php                            | 2 +-
 Changelog                                         | 1 +
 app/Http/Controllers/BasePageController.php       | 4 +---
 app/Http/Controllers/FailedReleasesController.php | 2 +-
 app/Http/Controllers/GetNzbController.php         | 6 +++---
 6 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/Blacklight/NZBGet.php b/Blacklight/NZBGet.php
index f270b3819..02ca58513 100755
--- a/Blacklight/NZBGet.php
+++ b/Blacklight/NZBGet.php
@@ -80,7 +80,7 @@ class NZBGet
      */
     public function __construct(&$page)
     {
-        $this->serverurl = $page->serverurl;
+        $this->serverurl = url('/');
         $this->uid = $page->userdata['id'];
         $this->api_token = $page->userdata['api_token'];
 
diff --git a/Blacklight/SABnzbd.php b/Blacklight/SABnzbd.php
index 9ea8fa98b..c43ff8630 100755
--- a/Blacklight/SABnzbd.php
+++ b/Blacklight/SABnzbd.php
@@ -95,7 +95,7 @@ class SABnzbd
     {
         $this->uid = $page->userdata['id'];
         $this->api_token = $page->userdata['api_token'];
-        $this->serverurl = $page->serverurl;
+        $this->serverurl = url('/');
         $this->client = new Client(['verify' => false]);
 
         // Set up properties.
diff --git a/Changelog b/Changelog
index 34455ed16..fa1e7cb8b 100755
--- a/Changelog
+++ b/Changelog
@@ -1,4 +1,5 @@
 2018-09-18 DariusIII
+	* Fix: Use url helper in place of $this->serverurl variable
 	* Fix: Add missing $this->serverurl declaration in BasePageController
 	* Chg: Update mayconbordin/l5-fixtures to latest commit
 	* Chg: Remove debug messages from Binaries class
diff --git a/app/Http/Controllers/BasePageController.php b/app/Http/Controllers/BasePageController.php
index 91dc30b12..3c1ddbda4 100644
--- a/app/Http/Controllers/BasePageController.php
+++ b/app/Http/Controllers/BasePageController.php
@@ -88,8 +88,6 @@ class BasePageController extends Controller
         }
         $this->smarty->error_reporting = E_ALL & ~E_NOTICE;
 
-        $this->serverurl = url('/');
-
         $this->smarty->assign('serverroot', url('/'));
     }
 
@@ -277,7 +275,7 @@ class BasePageController extends Controller
         }
 
         $content = new Contents();
-        $this->smarty->assign('menulist', Menu::getMenu($role, $this->serverurl));
+        $this->smarty->assign('menulist', Menu::getMenu($role, url('/')));
         $this->smarty->assign('usefulcontentlist', $content->getForMenuByTypeAndRole(Contents::TYPEUSEFUL, $role));
         $this->smarty->assign('articlecontentlist', $content->getForMenuByTypeAndRole(Contents::TYPEARTICLE, $role));
         if ($this->userdata !== null) {
diff --git a/app/Http/Controllers/FailedReleasesController.php b/app/Http/Controllers/FailedReleasesController.php
index 7e09a876f..d81390e54 100644
--- a/app/Http/Controllers/FailedReleasesController.php
+++ b/app/Http/Controllers/FailedReleasesController.php
@@ -43,7 +43,7 @@ class FailedReleasesController extends BasePageController
                 return response('No NZB found for alternate match!', 404)->withHeaders(['X-DNZB-RCode' => 404, 'X-DNZB-RText' => 'No NZB found for alternate match.']);
             }
 
-            return response('Success', 200)->withHeaders(['Location' => $this->serverurl.'getnzb?id='.$alt['guid'].'&i='.$uid.'&r='.$rssToken]);
+            return response('Success', 200)->withHeaders(['Location' => url('/').'/getnzb?id='.$alt['guid'].'&i='.$uid.'&r='.$rssToken]);
         }
 
         return response('Bad request, please supply all parameters!', 400)->withHeaders(['X-DNZB-RCode' => 400, 'X-DNZB-RText' => 'Bad request, please supply all parameters!']);
diff --git a/app/Http/Controllers/GetNzbController.php b/app/Http/Controllers/GetNzbController.php
index d15ff4dc9..2f20369db 100644
--- a/app/Http/Controllers/GetNzbController.php
+++ b/app/Http/Controllers/GetNzbController.php
@@ -121,9 +121,9 @@ class GetNzbController extends BasePageController
         $headers = [
             'Content-Type' => 'application/x-nzb',
             'Expires' => date('r', now()->addDays(365)->timestamp),
-            'X-DNZB-Failure' => $this->serverurl.'failed'.'?guid='.$request->input('id').'&userid='.$uid.'&rsstoken='.$rssToken,
+            'X-DNZB-Failure' => url('/').'/failed'.'?guid='.$request->input('id').'&userid='.$uid.'&rsstoken='.$rssToken,
             'X-DNZB-Category' => $relData['category_name'],
-            'X-DNZB-Details' => $this->serverurl.'details/'.$request->input('id'),
+            'X-DNZB-Details' => url('/').'/details/'.$request->input('id'),
         ];
 
         if (! empty($relData['imdbid']) && $relData['imdbid'] > 0) {
@@ -133,7 +133,7 @@ class GetNzbController extends BasePageController
         }
 
         if ((int) $relData['nfostatus'] === 1) {
-            $headers += ['X-DNZB-NFO ' => $this->serverurl.'nfo/'.$request->input('id')];
+            $headers += ['X-DNZB-NFO ' => url('/').'/nfo/'.$request->input('id')];
         }
 
         $headers += ['X-DNZB-RCode' => '200',