diff --git a/app/Http/Controllers/MetaGerSearch.php b/app/Http/Controllers/MetaGerSearch.php
index 6384ed2f9a33fc057899089c664cdad089197d6e..20a50f8be6d52d14d0ad9fdd765cc4eae0b88457 100644
--- a/app/Http/Controllers/MetaGerSearch.php
+++ b/app/Http/Controllers/MetaGerSearch.php
@@ -19,11 +19,11 @@ class MetaGerSearch extends Controller
$time = microtime();
# Mit gelieferte Formulardaten parsen und abspeichern:
$metager->parseFormData($request);
- if($metager->getFokus() !== "bilder" )
- {
+ #if($metager->getFokus() !== "bilder" )
+ #{
# Nach Spezialsuchen überprüfen:
$metager->checkSpecialSearches($request);
- }
+ #}
# Alle Suchmaschinen erstellen
$metager->createSearchEngines($request);
diff --git a/app/MetaGer.php b/app/MetaGer.php
index 2d8dffb3e83bfe29f5366967ea9fda61aa5fdfe6..0498741cd20295b83ae0d7cef5ac1ea2c836e621 100644
--- a/app/MetaGer.php
+++ b/app/MetaGer.php
@@ -292,25 +292,16 @@ class MetaGer
if($this->fokus === "angepasst")
{
$sumas = $xml->xpath("suma");
- /**$maxSumas = 30;
- $count = 0;
- foreach($sumas as $suma)
- {
- if($maxSumas === $count)
- break;
- $enabledSearchengines[] = $suma;
- $count++;
- }**/
+
foreach($sumas as $suma)
{
if($request->has($suma["service"])
- #|| ( $this->fokus !== "bilder"
- # && ($suma["name"]->__toString() === "qualigo"
- # || $suma["name"]->__toString() === "similar_product_ads"
- # || ( !$overtureEnabled && $suma["name"]->__toString() === "overtureAds" )
- # )
- # )
- #|| 1 === 1 #Todo: entfernen
+ || ( $this->fokus !== "bilder"
+ && ($suma["name"]->__toString() === "qualigo"
+ || $suma["name"]->__toString() === "similar_product_ads"
+ || ( !$overtureEnabled && $suma["name"]->__toString() === "overtureAds" )
+ )
+ )
){
if(!(isset($suma['disabled']) && $suma['disabled']->__toString() === "1"))
@@ -355,17 +346,38 @@ class MetaGer
{
$this->errors[] = "Achtung: Sie haben in ihren Einstellungen keine Suchmaschine ausgewählt.";
}
+ $engines = [];
+ $siteSearchFailed = false;
+ if( strlen($this->site) > 0 )
+ {
+ # Wenn eine Sitesearch durchgeführt werden soll, überprüfen wir ob eine der Suchmaschinen überhaupt eine Sitesearch unterstützt:
+ $enginesWithSite = 0;
+ foreach($enabledSearchengines as $engine)
+ {
+ if( isset($engine['hasSiteSearch']) && $engine['hasSiteSearch']->__toString() === "1" )
+ {
+ $enginesWithSite++;
+ }
+ }
+ if( $enginesWithSite === 0 )
+ {
+ $this->errors[] = "Sie wollten eine Sitesearch auf " . $this->site . " durchführen. Leider unterstützen die eingestellten Suchmaschinen diese nicht. Sie können <a href=\"" . $this->generateSearchLink("web", false) . "\">hier</a> die Sitesearch im Web-FoKus durchführen. Es werden ihnen Ergebnisse ohne Sitesearch angezeigt.";
+ $siteSearchFailed = true;
+ }else
+ {
+ $this->warnings[] = "Sie führen eine Sitesearch durch. Es werden nur Ergebnisse von der Seite: \"" . $this->site . "\" angezeigt.";
+ }
+ }
- $engines = [];
foreach($enabledSearchengines as $engine){
- if(strlen($this->site) > 0 && (!isset($engine["hasSiteSearch"]) || $engine["hasSiteSearch"]->__toString() !== "1"))
+ if( !$siteSearchFailed && strlen($this->site) > 0 && ( !isset($engine['hasSiteSearch']) || $engine['hasSiteSearch']->__toString() === "0") )
{
+
continue;
}
-
# Wenn diese Suchmaschine gar nicht eingeschaltet sein soll
$path = "App\Models\parserSkripte\\" . ucfirst($engine["package"]->__toString());
@@ -405,11 +417,11 @@ class MetaGer
# Abbruchbedingung
if($time < 500)
{
- if($loadedEngines >= $enginesToLoad && $canBreak)
+ if(($enginesToLoad === 0 || $loadedEngines >= $enginesToLoad) && $canBreak)
break;
}elseif( $time >= 500 && $time < $this->time)
{
- if( ($loadedEngines / ($enginesToLoad * 1.0)) >= 0.8 && $canBreak )
+ if( ($enginesToLoad === 0 || ($loadedEngines / ($enginesToLoad * 1.0)) >= 0.8) && $canBreak )
break;
}else
{
@@ -423,7 +435,13 @@ class MetaGer
{
if(!$engine->loaded)
{
- $engine->retrieveResults();
+ try{
+ $engine->retrieveResults();
+ } catch(\ErrorException $e)
+ {
+ Log::error($e);
+
+ }
}
}
@@ -588,12 +606,10 @@ class MetaGer
{
$this->site = $match[2];
$this->q = $match[1] . $match[3];
- $this->warnings[] = "Sie führen eine Sitesearch durch. Es werden nur Ergebnisse von der Seite: \"" . $this->site . "\" angezeigt.";
}
if( $request->has('site') )
{
$this->site = $request->input('site');
- $this->warnings[] = "Sie führen eine Sitesearch durch. Es werden nur Ergebnisse von der Seite: \"" . $this->site . "\" angezeigt.";
}
# Wenn die Suchanfrage um das Schlüsselwort "-host:*" ergänzt ist, sollen bestimmte Hosts nicht eingeblendet werden
# Wir prüfen, ob das hier der Fall ist:
@@ -671,9 +687,6 @@ class MetaGer
public function getQ ()
{
- if(strlen($this->site) > 0)
- return $this->q . " site:" . $this->site;
- else
return $this->q;
}
@@ -777,11 +790,12 @@ class MetaGer
}
}
- public function generateSearchLink($fokus)
+ public function generateSearchLink($fokus, $results = true)
{
$requestData = $this->request->except('page');
$requestData['focus'] = $fokus;
- $requestData['out'] = "results";
+ if($results)
+ $requestData['out'] = "results";
$link = action('MetaGerSearch@search', $requestData);
return $link;
}
diff --git a/app/Models/Searchengine.php b/app/Models/Searchengine.php
index cb508ff46edcb506b6b43c9e91885a039a261e73..8f0deb05772110d47676444ef3c8667f13a53bd3 100644
--- a/app/Models/Searchengine.php
+++ b/app/Models/Searchengine.php
@@ -61,8 +61,18 @@ abstract class Searchengine
$this->gefVon = "<a href=\"" . $this->homepage . "\" target=\"_blank\">" . $this->displayName . "</a>";
$this->startTime = microtime();
- $this->getString = $this->generateGetString($metager->getQ(), $metager->getUrl(), $metager->getLanguage(), $metager->getCategory());
-
+ $q = "";
+ if( isset($this->hasSiteSearch) && $this->hasSiteSearch === "1")
+ {
+ if(strlen($metager->getSite()) === 0)
+ $q = $metager->getQ();
+ else
+ $q = $metager->getQ() . " site:" . $metager->getSite();
+ }else
+ {
+ $q = $metager->getQ();
+ }
+ $this->getString = $this->generateGetString($q, $metager->getUrl(), $metager->getLanguage(), $metager->getCategory());
$this->hash = $metager->getHashCode();
# Die Anfragen an die Suchmaschinen werden nun von der Laravel-Queue bearbeitet:
diff --git a/app/Models/parserSkripte/Ecoshopper.php b/app/Models/parserSkripte/Ecoshopper.php
index 1ab99ce68dd4dd71a2c61e334c45361d7f51a394..c5e74c27b2ced9b435e853ace3103a6696f66cc1 100644
--- a/app/Models/parserSkripte/Ecoshopper.php
+++ b/app/Models/parserSkripte/Ecoshopper.php
@@ -2,6 +2,7 @@
namespace app\Models\parserSkripte;
use App\Models\Searchengine;
+use Log;
class Ecoshopper extends Searchengine
{
@@ -17,7 +18,8 @@ class Ecoshopper extends Searchengine
try {
$content = simplexml_load_string($result);
} catch (\Exception $e) {
- abort(500, "$result is not a valid xml string");
+ Log::error("Ergebnisse von Ecoshopper konnten nicht eingelesen werden");
+ return;
}
if(!$content)
diff --git a/app/Models/parserSkripte/Exalead.php b/app/Models/parserSkripte/Exalead.php
index 66c34fc5a947db5be33cdcc5dbd717c7f588539f..96b930ab529f29ff404d7d4c76ad111e9b5a6d13 100644
--- a/app/Models/parserSkripte/Exalead.php
+++ b/app/Models/parserSkripte/Exalead.php
@@ -2,6 +2,7 @@
namespace app\Models\parserSkripte;
use App\Models\Searchengine;
+use Log;
class Exalead extends Searchengine
{
@@ -14,22 +15,54 @@ class Exalead extends Searchengine
public function loadResults ($result)
{
+ $result = preg_replace("/\r\n/si", "", $result);
+ try {
+ $content = simplexml_load_string($result);
+ } catch (\Exception $e) {
+ abort(500, "$result is not a valid xml string");
+ }
- $title = "";
- $link = "";
- $anzeigeLink = $link;
- $descr = "";
-
- #die($result);
-
- /*$this->counter++;
- $this->results[] = new \App\Models\Result(
- $title,
- $link,
- $anzeigeLink,
- $descr,
- $this->gefVon,
- $this->counter
- ); */
+ if(!$content)
+ {
+ return;
+ }
+ $results = $content;
+ $prefix = ""; $namespace = "";
+ foreach($results->getDocNamespaces() as $strPrefix => $strNamespace) {
+ if(strlen($strPrefix)==0) {
+ $prefix="a"; //Assign an arbitrary namespace prefix.
+ }else {
+ $prefix="a";
+ }
+ $namespace = $strNamespace;
+ }
+ $results->registerXPathNamespace($prefix,$namespace);
+ try{
+ $results = $results->xpath("//a:hits/a:Hit");
+ } catch(\ErrorException $e)
+ {
+ return;
+ }
+ foreach($results as $result)
+ {
+ $result->registerXPathNamespace($prefix,$namespace);
+ $title = $result->xpath("a:metas/a:Meta[@name='title']/a:MetaString[@name='value']")[0]->__toString();
+ $link = $result->xpath("a:metas/a:Meta[@name='url']/a:MetaString[@name='value']")[0]->__toString();
+ $anzeigeLink = $link;
+ if(sizeOf($result->xpath("a:metas/a:Meta[@name='metadesc']/a:MetaString[@name='value']")) === 0)
+ $descr = "";
+ else
+ $descr = $result->xpath("a:metas/a:Meta[@name='metadesc']/a:MetaString[@name='value']")[0]->__toString();
+ $this->counter++;
+ $this->results[] = new \App\Models\Result(
+ $this->engine,
+ $title,
+ $link,
+ $anzeigeLink,
+ $descr,
+ $this->gefVon,
+ $this->counter
+ );
+ }
}
-}
\ No newline at end of file
+}
diff --git a/app/Models/parserSkripte/Mg_produkt2.php b/app/Models/parserSkripte/Mg_produkt2.php
index e6688252b6723b9ba4d748e332d327078145888b..6aba1210bcf821c88c0437f1f928e322a74d3ba3 100644
--- a/app/Models/parserSkripte/Mg_produkt2.php
+++ b/app/Models/parserSkripte/Mg_produkt2.php
@@ -2,7 +2,7 @@
namespace app\Models\parserSkripte;
use App\Models\Searchengine;
-
+use Log;
class Mg_produkt2 extends Searchengine
{
public $results = [];
@@ -18,7 +18,8 @@ class Mg_produkt2 extends Searchengine
try {
$content = simplexml_load_string($result);
} catch (\Exception $e) {
- abort(500, "$result is not a valid xml string");
+ Log::error("MG_Produkt konnte keine Ergebnisse bekommen");
+ return;
}
if(!$content)
diff --git a/app/Models/parserSkripte/Yandex.php b/app/Models/parserSkripte/Yandex.php
index 92b7754f8688d1ee74e9f84e1b069cb82851f05b..2a0366bdc32643472ef274123e37ba161b17a8c7 100644
--- a/app/Models/parserSkripte/Yandex.php
+++ b/app/Models/parserSkripte/Yandex.php
@@ -2,6 +2,7 @@
namespace app\Models\parserSkripte;
use App\Models\Searchengine;
+use Log;
class Yandex extends Searchengine
{
@@ -14,22 +15,40 @@ class Yandex extends Searchengine
public function loadResults ($result)
{
+ $result = preg_replace("/\r\n/si", "", $result);
+ try {
+ $content = simplexml_load_string($result);
+ } catch (\Exception $e) {
+ abort(500, "$result is not a valid xml string");
+ }
- $title = "";
- $link = "";
- $anzeigeLink = $link;
- $descr = "";
-
- #die($result);
-
- /*$this->counter++;
- $this->results[] = new \App\Models\Result(
- $title,
- $link,
- $anzeigeLink,
- $descr,
- $this->gefVon,
- $this->counter
- );*/
+ if(!$content)
+ {
+ return;
+ }
+ $results = $content;
+ try{
+ $results = $results->xpath("//yandexsearch/response/results/grouping/group");
+ } catch(\ErrorException $e)
+ {
+ return;
+ }
+ foreach($results as $result)
+ {
+ $title = strip_tags($result->{"doc"}->{"title"}->asXML());
+ $link = $result->{"doc"}->{"url"}->__toString();
+ $anzeigeLink = $link;
+ $descr = strip_tags($result->{"doc"}->{"headline"}->asXML());
+ $this->counter++;
+ $this->results[] = new \App\Models\Result(
+ $this->engine,
+ $title,
+ $link,
+ $anzeigeLink,
+ $descr,
+ $this->gefVon,
+ $this->counter
+ );
+ }
}
-}
\ No newline at end of file
+}
diff --git a/composer.lock b/composer.lock
index 7e53158a6d83da1206b6970c93e6fa53ade4aae4..e115efec9a5676ceddeff7f8d2f18a53ee366738 100644
--- a/composer.lock
+++ b/composer.lock
@@ -327,16 +327,16 @@
},
{
"name": "guzzlehttp/psr7",
- "version": "1.3.0",
+ "version": "1.3.1",
"source": {
"type": "git",
"url": "https://github.com/guzzle/psr7.git",
- "reference": "31382fef2889136415751badebbd1cb022a4ed72"
+ "reference": "5c6447c9df362e8f8093bda8f5d8873fe5c7f65b"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/guzzle/psr7/zipball/31382fef2889136415751badebbd1cb022a4ed72",
- "reference": "31382fef2889136415751badebbd1cb022a4ed72",
+ "url": "https://api.github.com/repos/guzzle/psr7/zipball/5c6447c9df362e8f8093bda8f5d8873fe5c7f65b",
+ "reference": "5c6447c9df362e8f8093bda8f5d8873fe5c7f65b",
"shasum": ""
},
"require": {
@@ -352,7 +352,7 @@
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "1.0-dev"
+ "dev-master": "1.4-dev"
}
},
"autoload": {
@@ -381,7 +381,7 @@
"stream",
"uri"
],
- "time": "2016-04-13 19:56:01"
+ "time": "2016-06-24 23:00:38"
},
{
"name": "jakub-onderka/php-console-color",
@@ -587,16 +587,16 @@
},
{
"name": "laravel/framework",
- "version": "v5.2.36",
+ "version": "v5.2.39",
"source": {
"type": "git",
"url": "https://github.com/laravel/framework.git",
- "reference": "236d7c0c5b67a2348ac7831391031d93000de3ab"
+ "reference": "c2a77050269b4e03bd9a735a9f24e573a7598b8a"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/laravel/framework/zipball/236d7c0c5b67a2348ac7831391031d93000de3ab",
- "reference": "236d7c0c5b67a2348ac7831391031d93000de3ab",
+ "url": "https://api.github.com/repos/laravel/framework/zipball/c2a77050269b4e03bd9a735a9f24e573a7598b8a",
+ "reference": "c2a77050269b4e03bd9a735a9f24e573a7598b8a",
"shasum": ""
},
"require": {
@@ -712,7 +712,7 @@
"framework",
"laravel"
],
- "time": "2016-06-06 15:18:48"
+ "time": "2016-06-17 19:25:12"
},
{
"name": "league/flysystem",
@@ -799,16 +799,16 @@
},
{
"name": "mcamara/laravel-localization",
- "version": "1.1.2",
+ "version": "1.1.3",
"source": {
"type": "git",
"url": "https://github.com/mcamara/laravel-localization.git",
- "reference": "e305d2d2b32dc07a24e0699dcb05cf4f2064cdf8"
+ "reference": "89b5d9de51b3ba7c02c5fd9b96a22f84eba2d135"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/mcamara/laravel-localization/zipball/e305d2d2b32dc07a24e0699dcb05cf4f2064cdf8",
- "reference": "e305d2d2b32dc07a24e0699dcb05cf4f2064cdf8",
+ "url": "https://api.github.com/repos/mcamara/laravel-localization/zipball/89b5d9de51b3ba7c02c5fd9b96a22f84eba2d135",
+ "reference": "89b5d9de51b3ba7c02c5fd9b96a22f84eba2d135",
"shasum": ""
},
"require": {
@@ -843,7 +843,7 @@
"localization",
"php"
],
- "time": "2016-01-08 07:14:49"
+ "time": "2016-06-23 13:34:39"
},
{
"name": "mobiledetect/mobiledetectlib",
@@ -901,16 +901,16 @@
},
{
"name": "monolog/monolog",
- "version": "1.19.0",
+ "version": "1.20.0",
"source": {
"type": "git",
"url": "https://github.com/Seldaek/monolog.git",
- "reference": "5f56ed5212dc509c8dc8caeba2715732abb32dbf"
+ "reference": "55841909e2bcde01b5318c35f2b74f8ecc86e037"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/Seldaek/monolog/zipball/5f56ed5212dc509c8dc8caeba2715732abb32dbf",
- "reference": "5f56ed5212dc509c8dc8caeba2715732abb32dbf",
+ "url": "https://api.github.com/repos/Seldaek/monolog/zipball/55841909e2bcde01b5318c35f2b74f8ecc86e037",
+ "reference": "55841909e2bcde01b5318c35f2b74f8ecc86e037",
"shasum": ""
},
"require": {
@@ -929,8 +929,8 @@
"php-console/php-console": "^3.1.3",
"phpunit/phpunit": "~4.5",
"phpunit/phpunit-mock-objects": "2.3.0",
- "raven/raven": "^0.13",
"ruflin/elastica": ">=0.90 <3.0",
+ "sentry/sentry": "^0.13",
"swiftmailer/swiftmailer": "~5.3"
},
"suggest": {
@@ -942,9 +942,9 @@
"mongodb/mongodb": "Allow sending log messages to a MongoDB server via PHP Driver",
"php-amqplib/php-amqplib": "Allow sending log messages to an AMQP server using php-amqplib",
"php-console/php-console": "Allow sending log messages to Google Chrome",
- "raven/raven": "Allow sending log messages to a Sentry server",
"rollbar/rollbar": "Allow sending log messages to Rollbar",
- "ruflin/elastica": "Allow sending log messages to an Elastic Search server"
+ "ruflin/elastica": "Allow sending log messages to an Elastic Search server",
+ "sentry/sentry": "Allow sending log messages to a Sentry server"
},
"type": "library",
"extra": {
@@ -975,7 +975,7 @@
"logging",
"psr-3"
],
- "time": "2016-04-12 18:29:35"
+ "time": "2016-07-02 14:02:10"
},
{
"name": "mtdowling/cron-expression",
@@ -1381,16 +1381,16 @@
},
{
"name": "symfony/console",
- "version": "v3.0.7",
+ "version": "v3.0.8",
"source": {
"type": "git",
"url": "https://github.com/symfony/console.git",
- "reference": "382fc9ed852edabd6133e34f8549d7a7d99db115"
+ "reference": "a7abb7153f6d1da47f87ec50274844e246b09d9f"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/console/zipball/382fc9ed852edabd6133e34f8549d7a7d99db115",
- "reference": "382fc9ed852edabd6133e34f8549d7a7d99db115",
+ "url": "https://api.github.com/repos/symfony/console/zipball/a7abb7153f6d1da47f87ec50274844e246b09d9f",
+ "reference": "a7abb7153f6d1da47f87ec50274844e246b09d9f",
"shasum": ""
},
"require": {
@@ -1437,20 +1437,20 @@
],
"description": "Symfony Console Component",
"homepage": "https://symfony.com",
- "time": "2016-06-06 15:08:35"
+ "time": "2016-06-29 07:02:21"
},
{
"name": "symfony/debug",
- "version": "v3.0.7",
+ "version": "v3.0.8",
"source": {
"type": "git",
"url": "https://github.com/symfony/debug.git",
- "reference": "e67e1552dd7313df1cf6535cb606751899e0e727"
+ "reference": "c54bc3539c3b87e86799533801e8ae0e971d78c2"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/debug/zipball/e67e1552dd7313df1cf6535cb606751899e0e727",
- "reference": "e67e1552dd7313df1cf6535cb606751899e0e727",
+ "url": "https://api.github.com/repos/symfony/debug/zipball/c54bc3539c3b87e86799533801e8ae0e971d78c2",
+ "reference": "c54bc3539c3b87e86799533801e8ae0e971d78c2",
"shasum": ""
},
"require": {
@@ -1494,20 +1494,20 @@
],
"description": "Symfony Debug Component",
"homepage": "https://symfony.com",
- "time": "2016-06-06 15:08:35"
+ "time": "2016-06-29 05:40:00"
},
{
"name": "symfony/event-dispatcher",
- "version": "v3.1.0",
+ "version": "v3.1.2",
"source": {
"type": "git",
"url": "https://github.com/symfony/event-dispatcher.git",
- "reference": "0343b2cedd0edb26cdc791212a8eb645c406018b"
+ "reference": "7f9839ede2070f53e7e2f0849b9bd14748c434c5"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/0343b2cedd0edb26cdc791212a8eb645c406018b",
- "reference": "0343b2cedd0edb26cdc791212a8eb645c406018b",
+ "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/7f9839ede2070f53e7e2f0849b9bd14748c434c5",
+ "reference": "7f9839ede2070f53e7e2f0849b9bd14748c434c5",
"shasum": ""
},
"require": {
@@ -1554,20 +1554,20 @@
],
"description": "Symfony EventDispatcher Component",
"homepage": "https://symfony.com",
- "time": "2016-04-12 18:27:47"
+ "time": "2016-06-29 05:41:56"
},
{
"name": "symfony/finder",
- "version": "v3.0.7",
+ "version": "v3.0.8",
"source": {
"type": "git",
"url": "https://github.com/symfony/finder.git",
- "reference": "39e5f3d533d07b5416b9d7aad53a27f939d4f811"
+ "reference": "3eb4e64c6145ef8b92adefb618a74ebdde9e3fe9"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/finder/zipball/39e5f3d533d07b5416b9d7aad53a27f939d4f811",
- "reference": "39e5f3d533d07b5416b9d7aad53a27f939d4f811",
+ "url": "https://api.github.com/repos/symfony/finder/zipball/3eb4e64c6145ef8b92adefb618a74ebdde9e3fe9",
+ "reference": "3eb4e64c6145ef8b92adefb618a74ebdde9e3fe9",
"shasum": ""
},
"require": {
@@ -1603,20 +1603,20 @@
],
"description": "Symfony Finder Component",
"homepage": "https://symfony.com",
- "time": "2016-05-13 18:03:36"
+ "time": "2016-06-29 05:40:00"
},
{
"name": "symfony/http-foundation",
- "version": "v3.0.7",
+ "version": "v3.0.8",
"source": {
"type": "git",
"url": "https://github.com/symfony/http-foundation.git",
- "reference": "d268a643884f85e91d6ba11ca68de96833f3f6e5"
+ "reference": "1341139f906d295baa4f4abd55293d07e25a065a"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/http-foundation/zipball/d268a643884f85e91d6ba11ca68de96833f3f6e5",
- "reference": "d268a643884f85e91d6ba11ca68de96833f3f6e5",
+ "url": "https://api.github.com/repos/symfony/http-foundation/zipball/1341139f906d295baa4f4abd55293d07e25a065a",
+ "reference": "1341139f906d295baa4f4abd55293d07e25a065a",
"shasum": ""
},
"require": {
@@ -1656,20 +1656,20 @@
],
"description": "Symfony HttpFoundation Component",
"homepage": "https://symfony.com",
- "time": "2016-06-06 11:33:26"
+ "time": "2016-06-29 07:02:21"
},
{
"name": "symfony/http-kernel",
- "version": "v3.0.7",
+ "version": "v3.0.8",
"source": {
"type": "git",
"url": "https://github.com/symfony/http-kernel.git",
- "reference": "97cc1c15e3406e7a2adf14ad6b0e41a04d4a6fc4"
+ "reference": "177b63b2d50b63fa6d82ea41359ed9928cc7a1fb"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/http-kernel/zipball/97cc1c15e3406e7a2adf14ad6b0e41a04d4a6fc4",
- "reference": "97cc1c15e3406e7a2adf14ad6b0e41a04d4a6fc4",
+ "url": "https://api.github.com/repos/symfony/http-kernel/zipball/177b63b2d50b63fa6d82ea41359ed9928cc7a1fb",
+ "reference": "177b63b2d50b63fa6d82ea41359ed9928cc7a1fb",
"shasum": ""
},
"require": {
@@ -1677,7 +1677,7 @@
"psr/log": "~1.0",
"symfony/debug": "~2.8|~3.0",
"symfony/event-dispatcher": "~2.8|~3.0",
- "symfony/http-foundation": "~2.8|~3.0"
+ "symfony/http-foundation": "~2.8.8|~3.0.8|~3.1.2|~3.2"
},
"conflict": {
"symfony/config": "<2.8"
@@ -1738,7 +1738,7 @@
],
"description": "Symfony HttpKernel Component",
"homepage": "https://symfony.com",
- "time": "2016-06-06 16:52:35"
+ "time": "2016-06-30 16:30:17"
},
{
"name": "symfony/polyfill-mbstring",
@@ -1909,16 +1909,16 @@
},
{
"name": "symfony/process",
- "version": "v3.0.7",
+ "version": "v3.0.8",
"source": {
"type": "git",
"url": "https://github.com/symfony/process.git",
- "reference": "bf6e2d1fa8b93fdd7cca6b684c0ea213cf0255dd"
+ "reference": "d7cde1f9d94d87060204f863779389b61c382eeb"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/process/zipball/bf6e2d1fa8b93fdd7cca6b684c0ea213cf0255dd",
- "reference": "bf6e2d1fa8b93fdd7cca6b684c0ea213cf0255dd",
+ "url": "https://api.github.com/repos/symfony/process/zipball/d7cde1f9d94d87060204f863779389b61c382eeb",
+ "reference": "d7cde1f9d94d87060204f863779389b61c382eeb",
"shasum": ""
},
"require": {
@@ -1954,20 +1954,20 @@
],
"description": "Symfony Process Component",
"homepage": "https://symfony.com",
- "time": "2016-06-06 11:33:26"
+ "time": "2016-06-29 05:40:00"
},
{
"name": "symfony/routing",
- "version": "v3.0.7",
+ "version": "v3.0.8",
"source": {
"type": "git",
"url": "https://github.com/symfony/routing.git",
- "reference": "c780454838a1131adc756d737a4b4cc1d18f8c64"
+ "reference": "9038984bd9c05ab07280121e9e10f61a7231457b"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/routing/zipball/c780454838a1131adc756d737a4b4cc1d18f8c64",
- "reference": "c780454838a1131adc756d737a4b4cc1d18f8c64",
+ "url": "https://api.github.com/repos/symfony/routing/zipball/9038984bd9c05ab07280121e9e10f61a7231457b",
+ "reference": "9038984bd9c05ab07280121e9e10f61a7231457b",
"shasum": ""
},
"require": {
@@ -2029,20 +2029,20 @@
"uri",
"url"
],
- "time": "2016-05-30 06:58:27"
+ "time": "2016-06-29 05:40:00"
},
{
"name": "symfony/translation",
- "version": "v3.0.7",
+ "version": "v3.0.8",
"source": {
"type": "git",
"url": "https://github.com/symfony/translation.git",
- "reference": "2b0aacaa613c0ec1ad8046f972d8abdcb19c1db7"
+ "reference": "6bf844e1ee3c820c012386c10427a5c67bbefec8"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/translation/zipball/2b0aacaa613c0ec1ad8046f972d8abdcb19c1db7",
- "reference": "2b0aacaa613c0ec1ad8046f972d8abdcb19c1db7",
+ "url": "https://api.github.com/repos/symfony/translation/zipball/6bf844e1ee3c820c012386c10427a5c67bbefec8",
+ "reference": "6bf844e1ee3c820c012386c10427a5c67bbefec8",
"shasum": ""
},
"require": {
@@ -2093,20 +2093,20 @@
],
"description": "Symfony Translation Component",
"homepage": "https://symfony.com",
- "time": "2016-06-06 11:33:26"
+ "time": "2016-06-29 05:40:00"
},
{
"name": "symfony/var-dumper",
- "version": "v3.0.7",
+ "version": "v3.0.8",
"source": {
"type": "git",
"url": "https://github.com/symfony/var-dumper.git",
- "reference": "d8bb851da153d97abe7c2b71a65dee19f324bcf7"
+ "reference": "2f046e9a9d571f22cc8b26783564876713b06579"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/var-dumper/zipball/d8bb851da153d97abe7c2b71a65dee19f324bcf7",
- "reference": "d8bb851da153d97abe7c2b71a65dee19f324bcf7",
+ "url": "https://api.github.com/repos/symfony/var-dumper/zipball/2f046e9a9d571f22cc8b26783564876713b06579",
+ "reference": "2f046e9a9d571f22cc8b26783564876713b06579",
"shasum": ""
},
"require": {
@@ -2156,20 +2156,20 @@
"debug",
"dump"
],
- "time": "2016-05-24 10:03:10"
+ "time": "2016-06-29 05:40:00"
},
{
"name": "vlucas/phpdotenv",
- "version": "v2.2.1",
+ "version": "v2.3.0",
"source": {
"type": "git",
"url": "https://github.com/vlucas/phpdotenv.git",
- "reference": "63f37b9395e8041cd4313129c08ece896d06ca8e"
+ "reference": "9ca5644c536654e9509b9d257f53c58630eb2a6a"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/vlucas/phpdotenv/zipball/63f37b9395e8041cd4313129c08ece896d06ca8e",
- "reference": "63f37b9395e8041cd4313129c08ece896d06ca8e",
+ "url": "https://api.github.com/repos/vlucas/phpdotenv/zipball/9ca5644c536654e9509b9d257f53c58630eb2a6a",
+ "reference": "9ca5644c536654e9509b9d257f53c58630eb2a6a",
"shasum": ""
},
"require": {
@@ -2181,7 +2181,7 @@
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "2.2-dev"
+ "dev-master": "2.3-dev"
}
},
"autoload": {
@@ -2206,7 +2206,7 @@
"env",
"environment"
],
- "time": "2016-04-15 10:48:49"
+ "time": "2016-06-14 14:14:52"
}
],
"packages-dev": [
@@ -2478,22 +2478,22 @@
},
{
"name": "phpdocumentor/reflection-docblock",
- "version": "3.0.2",
+ "version": "3.1.0",
"source": {
"type": "git",
"url": "https://github.com/phpDocumentor/ReflectionDocBlock.git",
- "reference": "45ada3e3fd09789fbfbd6d65b3f0901f0030dc61"
+ "reference": "9270140b940ff02e58ec577c237274e92cd40cdd"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/phpDocumentor/ReflectionDocBlock/zipball/45ada3e3fd09789fbfbd6d65b3f0901f0030dc61",
- "reference": "45ada3e3fd09789fbfbd6d65b3f0901f0030dc61",
+ "url": "https://api.github.com/repos/phpDocumentor/ReflectionDocBlock/zipball/9270140b940ff02e58ec577c237274e92cd40cdd",
+ "reference": "9270140b940ff02e58ec577c237274e92cd40cdd",
"shasum": ""
},
"require": {
"php": ">=5.5",
"phpdocumentor/reflection-common": "^1.0@dev",
- "phpdocumentor/type-resolver": "^0.1.5",
+ "phpdocumentor/type-resolver": "^0.2.0",
"webmozart/assert": "^1.0"
},
"require-dev": {
@@ -2519,20 +2519,20 @@
}
],
"description": "With this component, a library can provide support for annotations via DocBlocks or otherwise retrieve information that is embedded in a DocBlock.",
- "time": "2016-06-06 06:44:13"
+ "time": "2016-06-10 09:48:41"
},
{
"name": "phpdocumentor/type-resolver",
- "version": "0.1.8",
+ "version": "0.2",
"source": {
"type": "git",
"url": "https://github.com/phpDocumentor/TypeResolver.git",
- "reference": "9891754231e55d42f0d16988ffb799af39f31a12"
+ "reference": "b39c7a5b194f9ed7bd0dd345c751007a41862443"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/phpDocumentor/TypeResolver/zipball/9891754231e55d42f0d16988ffb799af39f31a12",
- "reference": "9891754231e55d42f0d16988ffb799af39f31a12",
+ "url": "https://api.github.com/repos/phpDocumentor/TypeResolver/zipball/b39c7a5b194f9ed7bd0dd345c751007a41862443",
+ "reference": "b39c7a5b194f9ed7bd0dd345c751007a41862443",
"shasum": ""
},
"require": {
@@ -2541,7 +2541,7 @@
},
"require-dev": {
"mockery/mockery": "^0.9.4",
- "phpunit/phpunit": "^5.2"
+ "phpunit/phpunit": "^5.2||^4.8.24"
},
"type": "library",
"extra": {
@@ -2566,7 +2566,7 @@
"email": "me@mikevanriel.com"
}
],
- "time": "2016-03-28 10:02:29"
+ "time": "2016-06-10 07:14:17"
},
{
"name": "phpspec/prophecy",
@@ -3007,12 +3007,12 @@
"source": {
"type": "git",
"url": "https://github.com/nrk/predis.git",
- "reference": "0e17edbefb50c6cbd1acc4a6f6ef06399deb1af2"
+ "reference": "6ab10b2b705ea5121f2c1ea87a290f6871c32ebd"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/nrk/predis/zipball/0e17edbefb50c6cbd1acc4a6f6ef06399deb1af2",
- "reference": "0e17edbefb50c6cbd1acc4a6f6ef06399deb1af2",
+ "url": "https://api.github.com/repos/nrk/predis/zipball/6ab10b2b705ea5121f2c1ea87a290f6871c32ebd",
+ "reference": "6ab10b2b705ea5121f2c1ea87a290f6871c32ebd",
"shasum": ""
},
"require": {
@@ -3049,7 +3049,7 @@
"predis",
"redis"
],
- "time": "2016-06-01 22:06:21"
+ "time": "2016-06-18 19:51:10"
},
{
"name": "sebastian/comparator",
@@ -3219,16 +3219,16 @@
},
{
"name": "sebastian/exporter",
- "version": "1.2.1",
+ "version": "1.2.2",
"source": {
"type": "git",
"url": "https://github.com/sebastianbergmann/exporter.git",
- "reference": "7ae5513327cb536431847bcc0c10edba2701064e"
+ "reference": "42c4c2eec485ee3e159ec9884f95b431287edde4"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/sebastianbergmann/exporter/zipball/7ae5513327cb536431847bcc0c10edba2701064e",
- "reference": "7ae5513327cb536431847bcc0c10edba2701064e",
+ "url": "https://api.github.com/repos/sebastianbergmann/exporter/zipball/42c4c2eec485ee3e159ec9884f95b431287edde4",
+ "reference": "42c4c2eec485ee3e159ec9884f95b431287edde4",
"shasum": ""
},
"require": {
@@ -3236,12 +3236,13 @@
"sebastian/recursion-context": "~1.0"
},
"require-dev": {
+ "ext-mbstring": "*",
"phpunit/phpunit": "~4.4"
},
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "1.2.x-dev"
+ "dev-master": "1.3.x-dev"
}
},
"autoload": {
@@ -3281,7 +3282,7 @@
"export",
"exporter"
],
- "time": "2015-06-21 07:55:53"
+ "time": "2016-06-17 09:04:28"
},
{
"name": "sebastian/global-state",
@@ -3424,16 +3425,16 @@
},
{
"name": "symfony/css-selector",
- "version": "v3.0.7",
+ "version": "v3.0.8",
"source": {
"type": "git",
"url": "https://github.com/symfony/css-selector.git",
- "reference": "e8a66c51bf65f188c02f8120c0748b2291d3a2d0"
+ "reference": "b8999c1f33c224b2b66b38253f5e3a838d0d0115"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/css-selector/zipball/e8a66c51bf65f188c02f8120c0748b2291d3a2d0",
- "reference": "e8a66c51bf65f188c02f8120c0748b2291d3a2d0",
+ "url": "https://api.github.com/repos/symfony/css-selector/zipball/b8999c1f33c224b2b66b38253f5e3a838d0d0115",
+ "reference": "b8999c1f33c224b2b66b38253f5e3a838d0d0115",
"shasum": ""
},
"require": {
@@ -3473,20 +3474,20 @@
],
"description": "Symfony CssSelector Component",
"homepage": "https://symfony.com",
- "time": "2016-06-06 11:33:26"
+ "time": "2016-06-29 05:40:00"
},
{
"name": "symfony/dom-crawler",
- "version": "v3.0.7",
+ "version": "v3.0.8",
"source": {
"type": "git",
"url": "https://github.com/symfony/dom-crawler.git",
- "reference": "49b588841225b205700e5122fa01911cabada857"
+ "reference": "62769e3409006b937bb333b29da8df9a8b262975"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/dom-crawler/zipball/49b588841225b205700e5122fa01911cabada857",
- "reference": "49b588841225b205700e5122fa01911cabada857",
+ "url": "https://api.github.com/repos/symfony/dom-crawler/zipball/62769e3409006b937bb333b29da8df9a8b262975",
+ "reference": "62769e3409006b937bb333b29da8df9a8b262975",
"shasum": ""
},
"require": {
@@ -3529,20 +3530,20 @@
],
"description": "Symfony DomCrawler Component",
"homepage": "https://symfony.com",
- "time": "2016-04-12 18:09:53"
+ "time": "2016-06-29 05:40:00"
},
{
"name": "symfony/yaml",
- "version": "v3.1.0",
+ "version": "v3.1.2",
"source": {
"type": "git",
"url": "https://github.com/symfony/yaml.git",
- "reference": "eca51b7b65eb9be6af88ad7cc91685f1556f5c9a"
+ "reference": "2884c26ce4c1d61aebf423a8b912950fe7c764de"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/yaml/zipball/eca51b7b65eb9be6af88ad7cc91685f1556f5c9a",
- "reference": "eca51b7b65eb9be6af88ad7cc91685f1556f5c9a",
+ "url": "https://api.github.com/repos/symfony/yaml/zipball/2884c26ce4c1d61aebf423a8b912950fe7c764de",
+ "reference": "2884c26ce4c1d61aebf423a8b912950fe7c764de",
"shasum": ""
},
"require": {
@@ -3578,7 +3579,7 @@
],
"description": "Symfony Yaml Component",
"homepage": "https://symfony.com",
- "time": "2016-05-26 21:46:24"
+ "time": "2016-06-29 05:41:56"
},
{
"name": "webmozart/assert",
diff --git a/config/database.php b/config/database.php
index 57cc7e5c76b968776b5e2d60571a7ada84e7e565..95646bcf2352226c409d484c1ccc68f6bbfa4a76 100755
--- a/config/database.php
+++ b/config/database.php
@@ -116,7 +116,7 @@ return [
],
'redisLogs' => [
'host' => env('REDIS_LOGS_HOST', 'localhost'),
- 'password' => env('REDIS_LOGS_PASSWORD', null),
+ 'password' => env('REDIS_LOGS_PASSWORD', env('REDIS_PASSWORD', null)),
'port' => env('REDIS_MAIN_PORT', 6379),
'database' => 1,
],
diff --git a/resources/views/errors/500.blade.php b/resources/views/errors/500.blade.php
index 5c78212eb5131a6141da811ca0cccd1743fc91d5..e14254b919a68b5590f073593341736d9294847d 100644
--- a/resources/views/errors/500.blade.php
+++ b/resources/views/errors/500.blade.php
@@ -5,4 +5,7 @@
@section('content')
<h1>{{ trans('500.1') }}</h1>
<p>{{ trans('500.2') }}</p>
+@if( config('app.debug') )
+<pre>{{ $exception }}</pre>
+@endif
@endsection
\ No newline at end of file
diff --git a/resources/views/layouts/researchandtabs.blade.php b/resources/views/layouts/researchandtabs.blade.php
index a02b44dd2e8f63e39cc8b4a0557c66f973eb9e4c..5fd584522a143c0a45cafad28ac4dffdffceb409 100644
--- a/resources/views/layouts/researchandtabs.blade.php
+++ b/resources/views/layouts/researchandtabs.blade.php
@@ -123,24 +123,6 @@
</ul>
<div class="tab-content container-fluid">
- @if( sizeof($errors) > 0 )
- <div class="alert alert-danger">
- <ul>
- @foreach($errors as $error)
- <li>{{ $error }}</li>
- @endforeach
- </ul>
- </div>
- @endif
- @if( sizeof($warnings) > 0)
- <div class="alert alert-warning">
- <ul>
- @foreach($warnings as $warning)
- <li>{{ $warning }}</li>
- @endforeach
- </ul>
- </div>
- @endif
@if( $metager->getFokus() === "web" )
<div role="tabpanel" class="tab-pane active" id="web">
diff --git a/resources/views/layouts/resultPage.blade.php b/resources/views/layouts/resultPage.blade.php
index 55511408d59ae30af0d1909ff60fe9a016eebfb0..b93e7613441c5ddf8bde02baaea66cb05e090f83 100644
--- a/resources/views/layouts/resultPage.blade.php
+++ b/resources/views/layouts/resultPage.blade.php
@@ -21,24 +21,6 @@
@include('layouts.researchandtabs')
@else
<div class="tab-content container-fluid">
- @if( sizeof($errors) > 0 )
- <div class="alert alert-danger">
- <ul>
- @foreach($errors as $error)
- <li>{{ $error }}</li>
- @endforeach
- </ul>
- </div>
- @endif
- @if( sizeof($warnings) > 0)
- <div class="alert alert-warning">
- <ul>
- @foreach($warnings as $warning)
- <li>{{ $warning }}</li>
- @endforeach
- </ul>
- </div>
- @endif
@yield('results')
</div>
@endif
diff --git a/resources/views/layouts/staticPages.blade.php b/resources/views/layouts/staticPages.blade.php
index 8db494fc7da8ce26b0ee41a1c6d7f8e973eeae73..a9c9bf3c042d5702e05767f9beaaa7c67dfacf77 100644
--- a/resources/views/layouts/staticPages.blade.php
+++ b/resources/views/layouts/staticPages.blade.php
@@ -72,7 +72,7 @@
<li><a href="http://forum.suma-ev.de/viewtopic.php?f=3&t=43" target="_blank">{{ trans('staticPages.nav14') }}</a></li>
</ul>
</li>
- <li class="dropdown">
+ <!--<li class="dropdown">
<a class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false" id="navigationSprache">{{ trans('staticPages.nav19') }}
<span class="caret"></span></a>
<ul class="dropdown-menu">
@@ -80,7 +80,7 @@
<li><a rel="alternate" hreflang="{{$localeCode}}" href="{{LaravelLocalization::getLocalizedURL($localeCode) }}">{{{ $properties['native'] }}}</a></li>
@endforeach
</ul>
- </li>
+ </li>-->
</ul>
</div>
</div>
diff --git a/resources/views/metager3.blade.php b/resources/views/metager3.blade.php
index 2c78a240eecf34ed06e9d644c8b03231b15131d6..b169b36fdd325ffb7a80a91543383df2f57d8e96 100644
--- a/resources/views/metager3.blade.php
+++ b/resources/views/metager3.blade.php
@@ -1,6 +1,24 @@
@extends('layouts.resultPage')
@section('results')
+@if( sizeof($errors) > 0 )
+ <div class="alert alert-danger">
+ <ul>
+ @foreach($errors as $error)
+ <li>{!! $error !!}</li>
+ @endforeach
+ </ul>
+ </div>
+ @endif
+ @if( sizeof($warnings) > 0)
+ <div class="alert alert-warning">
+ <ul>
+ @foreach($warnings as $warning)
+ <li>{!! $warning !!}</li>
+ @endforeach
+ </ul>
+ </div>
+ @endif
@if( $metager->showQuicktips() )
<div class="col-xs-12 col-md-8 resultContainer">
@else
diff --git a/resources/views/metager3bilder.blade.php b/resources/views/metager3bilder.blade.php
index 13606769d5199525ecf8680ad3f9c666e16351c4..c0ba4a325ecbc06bafd1632a8ef78a69b468d80b 100644
--- a/resources/views/metager3bilder.blade.php
+++ b/resources/views/metager3bilder.blade.php
@@ -1,6 +1,24 @@
@extends('layouts.resultPage')
@section('results')
+@if( sizeof($errors) > 0 )
+ <div class="alert alert-danger">
+ <ul>
+ @foreach($errors as $error)
+ <li>{!! $error !!}</li>
+ @endforeach
+ </ul>
+ </div>
+ @endif
+ @if( sizeof($warnings) > 0)
+ <div class="alert alert-warning">
+ <ul>
+ @foreach($warnings as $warning)
+ <li>{!! $warning !!}</li>
+ @endforeach
+ </ul>
+ </div>
+ @endif
<div id="container">
@foreach($metager->getResults()->items() as $result)
<div class="item">
diff --git a/resources/views/metager3bilderresults.blade.php b/resources/views/metager3bilderresults.blade.php
index fde7799d86579f8f2a609963f5a3b902f45d0035..73fdf5da00fac1a41c3cde303b45fe65634bfd86 100644
--- a/resources/views/metager3bilderresults.blade.php
+++ b/resources/views/metager3bilderresults.blade.php
@@ -1,3 +1,21 @@
+@if( sizeof($errors) > 0 )
+ <div class="alert alert-danger">
+ <ul>
+ @foreach($errors as $error)
+ <li>{!! $error !!}</li>
+ @endforeach
+ </ul>
+ </div>
+ @endif
+ @if( sizeof($warnings) > 0)
+ <div class="alert alert-warning">
+ <ul>
+ @foreach($warnings as $warning)
+ <li>{!! $warning !!}</li>
+ @endforeach
+ </ul>
+ </div>
+ @endif
<div id="container">
@foreach($metager->getResults()->items() as $result)
<div class="item">
diff --git a/resources/views/metager3results.blade.php b/resources/views/metager3results.blade.php
index 2338ae9d01a1116c1d1bcbf5bd14d6b1428e4218..add3ebca93cdb83dbd8d4f83a1c266ce71102071 100644
--- a/resources/views/metager3results.blade.php
+++ b/resources/views/metager3results.blade.php
@@ -1,3 +1,21 @@
+@if( sizeof($errors) > 0 )
+ <div class="alert alert-danger">
+ <ul>
+ @foreach($errors as $error)
+ <li>{!! $error !!}</li>
+ @endforeach
+ </ul>
+ </div>
+ @endif
+ @if( sizeof($warnings) > 0)
+ <div class="alert alert-warning">
+ <ul>
+ @foreach($warnings as $warning)
+ <li>{!! $warning !!}</li>
+ @endforeach
+ </ul>
+ </div>
+ @endif
<div class="col-xs-12 col-md-8">
{{-- 3-Mal Werbung --}}
@for($i = 0; $i <= 2; $i++)