diff --git a/app/Http/Controllers/ImageController.php b/app/Http/Controllers/ImageController.php new file mode 100644 index 0000000000000000000000000000000000000000..2a8100158671dfa24fad700a8f63bd7a4e25699f --- /dev/null +++ b/app/Http/Controllers/ImageController.php @@ -0,0 +1,35 @@ +<?php + +namespace App\Http\Controllers; + +use Illuminate\Http\Request; +use File; +use Response; +use App\Http\Requests; +use PiwikTracker; + +class ImageController extends Controller +{ + public function generateImage(Request $request) + { + #Piwik Code + PiwikTracker::$URL = 'http://piwik.metager3.de'; + $piwikTracker = new PiwikTracker( $idSite = 1 ); + + // Cookies ausschalten + $piwikTracker->disableCookieSupport(); + $piwikTracker->deleteCookies(); + + $site = $request->input('site', '/'); + + // Sendet Tracker request per http + $piwikTracker->doTrackPageView($site); + + + $path = public_path() . '/img/1px.png'; + $fileType = File::type($path); + $response = Response::make( File::get($path), 200); + $response->header('Content-Type', $fileType); + return $response; + } +} diff --git a/app/Http/routes.php b/app/Http/routes.php index b0067734230a29d188145809abf7f9b79efc55eb..5f4820a68d006e0ea0e1b0eebe0ac1d4b86b662b 100644 --- a/app/Http/routes.php +++ b/app/Http/routes.php @@ -22,6 +22,8 @@ Route::get('/', 'StartpageController@loadStartPage'); + Route::get('img/piwik.png', 'ImageController@generateImage'); + Route::get('impressum', function() { return view('impressum') diff --git a/composer.json b/composer.json index 3bfc901bbc97ffc33faff853468a4d6cf8fa4119..cb57630e9d1c44f3f3f89130913f53618657eecc 100644 --- a/composer.json +++ b/composer.json @@ -10,7 +10,8 @@ "mcamara/laravel-localization": "^1.1", "guzzlehttp/guzzle": "^6.2", "jenssegers/agent": "^2.3", - "fideloper/proxy": "^3.1" + "fideloper/proxy": "^3.1", + "piwik/piwik-php-tracker": "^1.0" }, "require-dev": { "fzaninotto/faker": "~1.4", diff --git a/composer.lock b/composer.lock index 48ec57eff7b9eabbd38611cf92589dc2e9cea448..d43a603334ec84eef4d0ba64ba6fe71cd29e1b96 100644 --- a/composer.lock +++ b/composer.lock @@ -4,8 +4,8 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file", "This file is @generated automatically" ], - "hash": "6c69571109b6dd87f8d052141f0f526c", - "content-hash": "36e343030681180e2b652dc511a00c9b", + "hash": "4ef0f871df372735c70d3045d6d8e1e5", + "content-hash": "b7c1e8fa7a337e7f92bf6e4d2df47992", "packages": [ { "name": "classpreloader/classpreloader", @@ -1167,6 +1167,46 @@ ], "time": "2016-03-18 20:34:03" }, + { + "name": "piwik/piwik-php-tracker", + "version": "1.0.2", + "source": { + "type": "git", + "url": "https://github.com/piwik/piwik-php-tracker.git", + "reference": "f026613f8137c014030c96a22491ede5f5f1676b" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/piwik/piwik-php-tracker/zipball/f026613f8137c014030c96a22491ede5f5f1676b", + "reference": "f026613f8137c014030c96a22491ede5f5f1676b", + "shasum": "" + }, + "type": "library", + "autoload": { + "classmap": [ + "." + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-2-Clause" + ], + "authors": [ + { + "name": "The Piwik Team", + "email": "hello@piwik.org", + "homepage": "http://piwik.org/the-piwik-team/" + } + ], + "description": "PHP Client for Piwik Analytics Tracking API", + "homepage": "http://piwik.org", + "keywords": [ + "analytics", + "piwik", + "tracker" + ], + "time": "2016-01-12 21:44:22" + }, { "name": "psr/http-message", "version": "1.0", diff --git a/public/img/1px.png b/public/img/1px.png new file mode 100644 index 0000000000000000000000000000000000000000..6518870e3b2876897e22a5308173cb650a402d0a Binary files /dev/null and b/public/img/1px.png differ diff --git a/resources/lang/de/index.php b/resources/lang/de/index.php index 675b3789869aa1625733ad8336cfd8f305e904d6..8996e9c6e25f09b00caf4dc5dc4fb1d1da1236b2 100644 --- a/resources/lang/de/index.php +++ b/resources/lang/de/index.php @@ -9,8 +9,10 @@ return [ 'foki.angepasst' => 'angepasst', 'conveyor' => 'Einkaufen bei MetaGer-Fördershops', + 'partnertitle' => 'MetaGer unterstützen, ohne Mehrkosten für Sie', 'plugin' => 'MetaGer-Plugin hinzufügen', + 'plugintitle' => 'MetaGer zu Ihrem Browser hinzufügen', 'sponsors.head.1' => 'Weitere Informationen', 'sponsors.head.2' => 'Sponsoren', @@ -71,4 +73,4 @@ return [ 'plugin.edge.3' => 'Scrollen Sie nach unten und klicken auf "Erweiterte Einstellungen anzeigen"', 'plugin.edge.4' => 'Scrollen Sie erneut nach unten bis zum Punkt "In Adressleiste suchen mit" und klicken Sie auf "Ändern"', 'plugin.edge.5' => 'Wählen Sie "MetaGer: Sicher suchen & finden..." und klicken Sie auf "Als Standard"', -]; \ No newline at end of file +]; diff --git a/resources/views/index.blade.php b/resources/views/index.blade.php index 8afbf2bb8316b2a66799dccc33a69abd7958227e..113fa0bcb2be2fd34bb1a560836d8eaa275831a8 100644 --- a/resources/views/index.blade.php +++ b/resources/views/index.blade.php @@ -183,14 +183,14 @@ </fieldset> <ul class="list-inline"> <li> - <a href="https://www.boost-project.com/de/shops?charity_id=1129&tag=bl" target="_blank" id="foerdershops">{{ trans('index.conveyor') }} + <a href="https://www.boost-project.com/de/shops?charity_id=1129&tag=bl" target="_blank" id="foerdershops" class="btn btn-default" title="{{ trans('index.partnertitle') }}">{{ trans('index.conveyor') }} </a> </li> <li class="hidden-xs seperator">| </li> <li id="plug" @unless ($browser === 'Firefox' || $browser === 'Mozilla' || $browser === 'Chrome' || $browser === 'Opera' || $browser === 'IE' || $browser === 'Edge') class="hidden" @endunless > - <a href="#" id="plugin" data-toggle="modal" data-target="#plugin-modal">{{ trans('index.plugin') }}</a> + <a href="#" id="plugin" data-toggle="modal" data-target="#plugin-modal" class="btn btn-default" title="{{ trans('index.plugintitle') }}">{{ trans('index.plugin') }}</a> </li> </ul> </figure> @@ -229,4 +229,4 @@ </div> </div> </section> -@endsection \ No newline at end of file +@endsection diff --git a/resources/views/layouts/resultPage.blade.php b/resources/views/layouts/resultPage.blade.php index b93e7613441c5ddf8bde02baaea66cb05e090f83..581c107c390b3d8c049bd542cdc09d2037e3d948 100644 --- a/resources/views/layouts/resultPage.blade.php +++ b/resources/views/layouts/resultPage.blade.php @@ -34,6 +34,7 @@ </div> </div> </footer> + <img src="{{ action('ImageController@generateImage')}}?site={{ urlencode(url()->current()) }}" class="hidden" /> <script src="/js/jquery.js" type="text/javascript"></script> <script src="/js/bootstrap.js" type="text/javascript"></script> <script src="/js/masonry.js" type="text/javascript"></script> diff --git a/resources/views/layouts/staticPages.blade.php b/resources/views/layouts/staticPages.blade.php index 7252d5e8af2b06d3f15a22a95f5847db7e834e1e..3a1bc06de3b1a5c56ea63c6e671e0f6bb8bf1ff2 100644 --- a/resources/views/layouts/staticPages.blade.php +++ b/resources/views/layouts/staticPages.blade.php @@ -108,7 +108,7 @@ <img src="/img/luh_metager.png" alt="LUH Logo"></a></li> </ul> </footer> - + <img src="{{ action('ImageController@generateImage')}}?site={{ urlencode(url()->current()) }}" class="hidden" /> <script type="text/javascript" src="/js/jquery.js"></script> <script type="text/javascript" src="/js/bootstrap.js"></script> <script type="text/javascript" src="/js/scriptStartPage.js"></script> @@ -125,5 +125,6 @@ </button> In der Zeit vom 07.07.2016 bis 15.07.2016 führen wir Wartungsarbeiten durch, die das Setzen eines nicht identifizierenden Cookies für diesen Zeitraum unvermeidbar machen. Weitere Informationen finden Sie auf unserer <a href="{{ LaravelLocalization::getLocalizedURL(LaravelLocalization::getCurrentLocale(), "/datenschutz#cookie") }}">Datenschutz-Seite</a>. </div> + </body> </html>