diff options
| -rw-r--r-- | app/Http/Controllers/FeedController.php | 41 | ||||
| -rw-r--r-- | app/Http/Controllers/LinkController.php | 7 | ||||
| -rw-r--r-- | resources/views/offers.blade.php | 2 |
3 files changed, 24 insertions, 26 deletions
diff --git a/app/Http/Controllers/FeedController.php b/app/Http/Controllers/FeedController.php index e5bc9c8..148a9f9 100644 --- a/app/Http/Controllers/FeedController.php +++ b/app/Http/Controllers/FeedController.php @@ -84,33 +84,28 @@ class FeedController extends Controller { */ setlocale(LC_TIME, 'de_DE.utf8'); - /* - if ( "" != env('PIWIK_RSS_ID') ) { - $piwik = new \PiwikTracker( env('PIWIK_RSS_ID'), env('PIWIK_RSS_URL') ); - $piwik->setTokenAuth( env('PIWIK_RSS_AUTH_TOKEN') ); - $piwik->setVisitorId( $piwik->getVisitorId() ); - $piwik->setIp( $request->header('X_REAL_IP') ); - $piwik->setUrl( $request->fullUrl() ); - - $piwik->setUrlReferrer( $request->server('HTTP_REFERER') ); - $piwik->setBrowserLanguage( $request->server('HTTP_ACCEPT_LANGUAGE') ); - $piwik->setUserAgent( $request->server('HTTP_USER_AGENT') ); + if ( "" != env('MATOMO_RSS_ID') ) { - $piwik->doTrackPageView( ucfirst($view_name) . "-Feed" ); + $matomo = new \MatomoTracker( env('MATOMO_RSS_ID'), env('MATOMO_RSS_URL')); + $matomo->setTokenAuth( env('MATOMO_RSS_AUTH_TOKEN') ); + #$matomo->setVisitorId( $matomo->getVisitorId() ); + $matomo->setIp( $request->header('X_REAL_IP') ); + $matomo->setUrl( $request->fullUrl() ); + $matomo->setUrlReferrer( $request->server('HTTP_REFERER') ); + $matomo->setBrowserLanguage( $request->server('HTTP_ACCEPT_LANGUAGE') ); + $matomo->setUserAgent( $request->server('HTTP_USER_AGENT') ); if ( "" != $request->get('filter') ) { - $piwik->doTrackEvent("sort", $request->get('sort') ); + $matomo->doTrackEvent( "sort", $request->get('sort') ); } if ( "" != $request->get('order') ) { - $piwik->doTrackEvent("order", $request->get('order') ); + $matomo->doTrackEvent( "order", $request->get('order') ); } if ( "" != $request->get('q') ) { - $piwik->doTrackEvent("search_phrase", $request->get('q') ); + $matomo->doTrackEvent( "search_phrase", $request->get('q') ); + $matomo->doTrackSiteSearch( $request->get('q') ); } } - */ - - $feed = \App::make("feed"); @@ -130,8 +125,8 @@ class FeedController extends Controller { # Adds campagin $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); + if ( "" != env('MATMOMO_RSS_ID') ) { + $matomo->doTrackContentImpression($offer->spirit_type, $offer->name, $offer->long_url); } $desc = '<p><img src="'.TemplateFunction::Camo($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 .').'; @@ -139,13 +134,15 @@ class FeedController extends Controller { $feed->addItem( [ 'title' => $offer->name, 'author' => $offer->shop, - 'url' => $offer->url, - 'link' => $offer->url, + 'url' => env('LINK_SHORTER_BASE_DOMAIN') . $offer->url, + 'link' => env('LINK_SHORTER_BASE_DOMAIN') . $offer->url, 'pubdate' => strftime('%Y-%m-%d', $offer->created_at), 'description' => $desc, 'content' => $desc ] ); } + $matomo->doTrackPageView( ucfirst($view_name) . "-Feed" ); + return $feed->render('atom'); } diff --git a/app/Http/Controllers/LinkController.php b/app/Http/Controllers/LinkController.php index 4515e04..a9d343f 100644 --- a/app/Http/Controllers/LinkController.php +++ b/app/Http/Controllers/LinkController.php @@ -14,7 +14,7 @@ class LinkController extends Controller { */ public function redirect(Request $request, $shortlink) { - $matomo = new \MatomoTracker( env('MATOMO_LINK_SHORTER_ID'), env('MATOMO_URL')); + $matomo = new \MatomoTracker( env('MATOMO_LINK_SHORTER_ID'), env('MATOMO_BACKEND_URL')); $matomo->setTokenAuth( env('MATOMO_LINK_SHORTER_AUTH_TOKEN') ); #$matomo->setVisitorId( $matomo->getVisitorId() ); $matomo->setIp( $request->header('X_REAL_IP') ); @@ -23,13 +23,14 @@ class LinkController extends Controller { $matomo->setBrowserLanguage( $request->server('HTTP_ACCEPT_LANGUAGE') ); $matomo->setUserAgent( $request->server('HTTP_USER_AGENT') ); - $data = DB::table('all_view')->select('name', 'shop', 'spirit_type', 'long_url')->where('url', "https://l.fuselkoenig.de/" . $shortlink)->limit(1)->get()->first(); + #$data = DB::table('all_view')->select('name', 'shop', 'spirit_type', 'long_url')->where('url', $shortlink)->limit(1)->get()->first(); + $data = DB::table('angebot')->select('name', 'shop', 'spirit_type', 'url as long_url')->where('short_url', $shortlink)->limit(1)->get()->first(); $matomo->doTrackPageView( $data->name . " - " . $data->shop ); $matomo->doTrackEvent("Redirect", "Shop", $data->shop); $matomo->doTrackEvent("Redirect", "Name", $data->name); $matomo->doTrackEvent("Redirect", "Spirit Type", $data->spirit_type); - $matomo->doTrackEvent("Redirect", "Short URL", $shortlink); + $matomo->doTrackEvent("Redirect", "Short URL", env('LINK_SHORTER_BASE_DOMAIN') . $shortlink); $matomo->doTrackEvent("Redirect", "Long URL", $data->long_url); #return response()->json($data); diff --git a/resources/views/offers.blade.php b/resources/views/offers.blade.php index 859fa3c..283ab48 100644 --- a/resources/views/offers.blade.php +++ b/resources/views/offers.blade.php @@ -58,7 +58,7 @@ </div> <div class="card-footer row"> <div class="col-md-6 col-sm-6"> - <a href="{{ str_replace('l.fuselkoenig.de', 'www.kategorischeraperitif.de/s', $offer->url) }}" class="btn btn-primary">Zum Shop</a> + <a href="{{ env('LINK_SHORTER_BASE_DOMAIN') . $offer->url }}" class="btn btn-primary">Zum Shop</a> </div> <div class="col-md-6 col-sm-6 price-from"> <p> |