Commit 42c7a204 authored by Dominik Hebeler's avatar Dominik Hebeler
Browse files

Merge branch 'development' into 'master'

Development



See merge request !132
parents acca4e82 813ad2e1
<?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;
}
}
......@@ -22,6 +22,8 @@
Route::get('/', 'StartpageController@loadStartPage');
Route::get('img/piwik.png', 'ImageController@generateImage');
Route::get('impressum', function()
{
return view('impressum')
......
......@@ -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",
......
......@@ -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
];
......@@ -183,14 +183,14 @@
</fieldset>
<ul class="list-inline">
<li>
<a href="https://www.boost-project.com/de/shops?charity_id=1129&amp;tag=bl" target="_blank" id="foerdershops">{{ trans('index.conveyor') }}
<a href="https://www.boost-project.com/de/shops?charity_id=1129&amp;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
......@@ -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>
......
......@@ -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>
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment