Upgrade Laravel from 5.6 to 8. Switch to subdomain instead of subfolder.

4 files changed, 37 insertions, 35 deletions

diff --git a/app/Http/Controllers/ListOfferController.php b/app/Http/Controllers/ListOfferController.php
index 23cac17..904ee20 100644
--- a/app/Http/Controllers/ListOfferController.php
+++ b/app/Http/Controllers/ListOfferController.php
@@ -7,7 +7,6 @@ use Illuminate\Support\Facades\DB;
 use App\Http\Controllers\Controller;
 
 use Carbon;
-use Illuminate\Support\Facades\Input;
 
 class ListOfferController extends Controller {
     /**
@@ -20,7 +19,7 @@ class ListOfferController extends Controller {
 	    /*
 	     * Sorting
 	     */
-	    $sort_by = Input::get("filter");
+	    $sort_by = $request->get("filter");
 	    switch ($sort_by) {
 	    case("price"):
 		    $sort_by = "discounted_price";
@@ -58,9 +57,9 @@ class ListOfferController extends Controller {
 	     */
 	    $view_name = \Request::route()->getName();
 
-	    if ( "" != Input::get('type') ) {
-	    	$data = DB::table($view_name . '_view')->where('spirit_type', '=', Input::get('type'))->whereNotNull('url')->orderBy($sort_by, $order_by)->paginate(10);
-	    	$count = DB::table($view_name . '_view')->where('spirit_type', '=', Input::get('type'))->whereNotNull('url')->count();
+	    if ( "" != $request->get('type') ) {
+	    	$data = DB::table($view_name . '_view')->where('spirit_type', '=', $request->get('type'))->whereNotNull('url')->orderBy($sort_by, $order_by)->paginate(10);
+	    	$count = DB::table($view_name . '_view')->where('spirit_type', '=', $request->get('type'))->whereNotNull('url')->count();
 
 	    } else {
 	    	$data = DB::table($view_name . '_view')->where('procent', '>=', '5')->whereNotNull('url')->orderBy($sort_by, $order_by)->paginate(10);
@@ -70,9 +69,9 @@ class ListOfferController extends Controller {
 	    # Only used on misc_view, all_view and search.
 	    $spirit_types = DB::select('SELECT DISTINCT spirit_type FROM ' . $view_name . '_view ' . ' ORDER BY spirit_type' );
 
-	    $rss_feed = "/angebote/" . $view_name . "/feed/";
+	    $rss_feed = $view_name . "/feed/";
 	    $query_string = "";
-	    $query_params = Input::except('page');
+	    $query_params = $request->except('page');
 	    foreach( $query_params as $key => $value) {
 		    $query_string .= "&" . $key . "=" . $value;
 	    }
diff --git a/app/Http/Controllers/LookupController.php b/app/Http/Controllers/LookupController.php
index 3a876a9..45543e6 100644
--- a/app/Http/Controllers/LookupController.php
+++ b/app/Http/Controllers/LookupController.php
@@ -6,8 +6,6 @@ use App\Helpers\CryptoHelper;
 use Illuminate\Support\Facades\DB;
 use App\Http\Controllers\Controller;
 
-use Illuminate\Support\Facades\Input;
-
 class LookupController extends Controller {
     /**
      * Shows the index page.
@@ -19,7 +17,7 @@ class LookupController extends Controller {
 	    // Used by external linkshorter for better reporting in web analytics.
 	    $query = "SELECT name, shop, spirit_type FROM all_view WHERE short_url = ? LIMIT 1)";
 	    
-	    $data = DB::table('all_view')->select('name', 'shop', 'spirit_type')->where('url', "https://l.fuselkoenig.de/" . Input::get('short_url'))->limit(1)->get();
+	    $data = DB::table('all_view')->select('name', 'shop', 'spirit_type')->where('url', "https://l.fuselkoenig.de/" . $request->get('short_url'))->limit(1)->get();
 	    
 	    return response()->json($data);
     }
diff --git a/app/Http/Controllers/RSSController.php b/app/Http/Controllers/RSSController.php
index 11e5a54..7853b32 100644
--- a/app/Http/Controllers/RSSController.php
+++ b/app/Http/Controllers/RSSController.php
@@ -7,7 +7,6 @@ use Illuminate\Support\Facades\DB;
 use App\Http\Controllers\Controller;
 
 use Carbon;
-use Illuminate\Support\Facades\Input;
 use App\Libraries\Utility;
 
 class RSSController extends Controller {
@@ -21,7 +20,7 @@ class RSSController extends Controller {
 	    /*
 	     * Sorting
 	     */
-	    $sort_by = Input::get("filter");
+	    $sort_by = $request->get("filter");
 	    switch ($sort_by) {
 	    case("price"):
 		    $sort_by = "discounted_price";
@@ -61,12 +60,12 @@ class RSSController extends Controller {
 	    $view_name = str_replace("/angebote/", "", $view_name);
 
 	    if ( "search" == $view_name ) {
-		    if ( "" != Input::get("q") ) {
-			$query = Input::get("q");
+		    if ( "" != $request->get("q") ) {
+			$query = $request->get("q");
 			$q = "%" . Utility::escapeLike($query) . "%";
 			$data = DB::table('all_view')->whereNotNull('url')->where('name', 'like', $q)->orWhere('spirit_type', 'like', $q)->orderBy($sort_by, $order_by)->limit(20)->get();
 		    } else {
-			    $data = DB::table('all_view')->where('spirit_type', '=', Input::get('type'))->whereNotNull('url')->orderBy($sort_by, $order_by)->limit(20)->get();
+			    $data = DB::table('all_view')->where('spirit_type', '=', $request->get('type'))->whereNotNull('url')->orderBy($sort_by, $order_by)->limit(20)->get();
 		    }
 	    } else {
 	    	$data = DB::table($view_name . '_view')->orderBy($sort_by, $order_by)->limit(20)->get();
@@ -91,14 +90,14 @@ class RSSController extends Controller {
 
 		    $piwik->doTrackPageView( ucfirst($view_name) . "-Feed" );
 
-		    if ( "" != Input::get('filter') ) {
-			    $piwik->doTrackEvent("sort", Input::get('sort') );
+		    if ( "" != $request->get('filter') ) {
+			    $piwik->doTrackEvent("sort", $request->get('sort') );
 		    }
-		    if ( "" != Input::get('order') ) {
-			    $piwik->doTrackEvent("order", Input::get('order') );
+		    if ( "" != $request->get('order') ) {
+			    $piwik->doTrackEvent("order", $request->get('order') );
 		    }
-		    if ( "" != Input::get('q') ) {
-			    $piwik->doTrackEvent("search_phrase", Input::get('q') );
+		    if ( "" != $request->get('q') ) {
+			    $piwik->doTrackEvent("search_phrase", $request->get('q') );
 		    }
 	    }
 	    */
@@ -123,11 +122,19 @@ class RSSController extends Controller {
 		    $offer->url = $offer->url . "?pk_campaign=feed&pk_kwd=" . urlencode($offer->name) . "&pk_source=" . $view_name . "_feed";
 
 		    if ( "" != env('PIWIK_RSS_ID') ) {
-		//	    $piwik->doTrackContentImpression($offer->spirit_type, $offer->name, $offer->long_url);
+			//$piwik->doTrackContentImpression($offer->spirit_type, $offer->name, $offer->long_url);
 		    } 
 
 		    $desc = '<p><img src="'.$offer->image_url.'"></p><p><strong>'.$offer->spirit_type.'</strong><br>'. $offer->name . ' gesenkt auf <strong>' . \TF::fF($offer->discounted_price) . '€</strong> statt ' . \TF::fF($offer->original_price) . '€ ('.$offer->procent.'% Rabatt auf '. $offer->shop .').';
-		    $feed->add($offer->name, $offer->shop, $offer->url, $offer->created_at, $desc, $desc);
+
+		    $feed->addItem( [
+			    'title' => $offer->name,
+			    'author' => $offer->shop,
+			    'url' => $offer->url,
+			    'link' => $offer->url,
+			    'pubdate' => $offer->created_at,
+			    'description' => $desc,
+			    'content' => $desc ] );
 	    }
 
 	    return $feed->render('atom');
diff --git a/app/Http/Controllers/SearchController.php b/app/Http/Controllers/SearchController.php
index c63a0f5..48a5c2f 100644
--- a/app/Http/Controllers/SearchController.php
+++ b/app/Http/Controllers/SearchController.php
@@ -6,8 +6,6 @@ use App\Helpers\CryptoHelper;
 use Illuminate\Support\Facades\DB;
 use App\Http\Controllers\Controller;
 
-use Illuminate\Support\Facades\Input;
-
 use App\Libraries\Utility;
 
 class SearchController extends Controller {
@@ -21,7 +19,7 @@ class SearchController extends Controller {
 		/*
 		* Sorting
 		*/
-		$sort_by = Input::get("filter");
+		$sort_by = $request->get("filter");
 		switch ($sort_by) {
 		case("price"):
 		    $sort_by = "discounted_price";
@@ -62,16 +60,16 @@ class SearchController extends Controller {
 		$query = "nichts";
 
 		$data = DB::table('all_view');
-	        if ( "" != Input::get('type') ) {
-			$query = Input::get('type');
-			$data = $data->where('spirit_type', '=', Input::get('type'));
-			$title = "Suche nach " . ucwords(Input::get('type'));
+	        if ( "" != $request->get('type') ) {
+			$query = $request->get('type');
+			$data = $data->where('spirit_type', '=', $request->get('type'));
+			$title = "Suche nach " . ucwords($request->get('type'));
 		}
-	        if ( "" != Input::get('q') ) {
-			$query = Input::get("q");
+	        if ( "" != $request->get('q') ) {
+			$query = $request->get("q");
 			$q = "%" . Utility::escapeLike($query) . "%";
 			$data = $data->where('name', 'like', $q)->orWhere('spirit_type', 'like', $q)->orWhere('shop', 'like', $q);
-			$title = "Suche nach " . ucwords(Input::get('q'));
+			$title = "Suche nach " . ucwords($request->get('q'));
 		}
 
 		$data = $data->whereNotNull('url');
@@ -83,7 +81,7 @@ class SearchController extends Controller {
 	        $spirit_types = DB::select('SELECT DISTINCT spirit_type FROM all_view ORDER BY spirit_type' );
 
 		$query_string = "";
-		$query_params = Input::except('page');
+		$query_params = $request->except('page');
 		foreach( $query_params as $key => $value) {
 			$query_string .= "&" . $key . "=" . $value;
 		}
@@ -95,6 +93,6 @@ class SearchController extends Controller {
 		*/
 		#setlocale(LC_TIME, 'de_DE.utf8');
 
-		return view('search', ['data' => $data, 'count' => $count, 'search_phrase' => $query, 'spirit_types' => $spirit_types, 'title' => $title, 'rss_feed' => '/angebote/search/feed/?' . $query_string ]);
+		return view('search', ['data' => $data, 'count' => $count, 'search_phrase' => $query, 'spirit_types' => $spirit_types, 'title' => $title, 'rss_feed' => '/search/feed/?' . $query_string ]);
 	}
 }