Merge branch 'Bugfix' into 'development'

Bugfix



See merge request !117

app/Http/Controllers/MetaGerSearch.php

@@ -44,7 +44,7 @@ class MetaGerSearch extends Controller
 
         # Zunächst den Spruch
         $spruecheFile = storage_path() . "/app/public/sprueche.txt";
-        if( file_exists($spruecheFile) && $_GET['sprueche'])
+        if( file_exists($spruecheFile) && $request->has('sprueche') )
         {
             $sprueche = file($spruecheFile);
             $spruch = $sprueche[array_rand($sprueche)];

app/Models/Result.php

@@ -81,6 +81,8 @@ class Result
 		#die($tmpLi . "<br>" . $link . "<br>" . $tmpEingabe . "<br><br>");
 		foreach(str_split($tmpEingabe) as $char)
 		{
+			if( !$char || !$tmpEingabe || strlen($tmpEingabe) === 0 || strlen($char) === 0 )
+				continue;
 			if(strpos(strtolower($tmpLink), strtolower($char)) >= 0)
 			{
 				$count++;

app/Models/parserSkripte/Minisucher.php

@@ -30,28 +30,33 @@ class Minisucher extends Searchengine
 		$counter = 0;
 		foreach($results as $result)
 		{
-			$counter++;
-			$result = simplexml_load_string($result->saveXML());
-			$title = $result->xpath('//doc/arr[@name="title"]/str')[0]->__toString();
-			$link = $result->xpath('//doc/str[@name="url"]')[0]->__toString();
-			$anzeigeLink = $link;
-			$descr = "";
-			$descriptions = $content->xpath("//response/lst[@name='highlighting']/lst[@name='$link']/arr[@name='content']/str");
-			foreach($descriptions as $description)
+			try{
+				$counter++;
+				$result = simplexml_load_string($result->saveXML());
+				$title = $result->xpath('//doc/arr[@name="title"]/str')[0]->__toString();
+				$link = $result->xpath('//doc/str[@name="url"]')[0]->__toString();
+				$anzeigeLink = $link;
+				$descr = "";
+				$descriptions = $content->xpath("//response/lst[@name='highlighting']/lst[@name='$link']/arr[@name='content']/str");
+				foreach($descriptions as $description)
+				{
+					$descr .= $description->__toString();
+				}
+				$descr = strip_tags($descr);
+				$provider = $result->xpath('//doc/str[@name="subcollection"]')[0]->__toString();
+				$this->results[] = new \App\Models\Result(
+						$this->engine,
+						$title,
+						$link,
+						$link,
+						$descr,
+						$this->gefVon,
+						$counter
+						);
+			}catch(\ErrorException $e)
 			{
-				$descr .= $description->__toString();
+				continue;
 			}
-			$descr = strip_tags($descr);
-			$provider = $result->xpath('//doc/str[@name="subcollection"]')[0]->__toString();
-			$this->results[] = new \App\Models\Result(
-					$this->engine,
-					$title,
-					$link,
-					$link,
-					$descr,
-					$this->gefVon,
-					$counter
-					);
 		}