do not show ads if no results are available

metager/app/MetaGer.php

@@ -97,7 +97,7 @@ class MetaGer
             $this->domainsBlacklisted = explode("\n", $tmp);
             $tmp = file_get_contents(config_path() . "/blacklistUrl.txt");
             $lines = explode("\n", $tmp);
-            $filtered_lines = array_filter($lines, function($line) {
+            $filtered_lines = array_filter($lines, function ($line) {
                 return strpos(trim($line), '#') !== 0;
             });
             # Re-index the array (array_filter preserves keys by default)
@@ -1315,7 +1315,7 @@ class MetaGer
 
     public function popAd()
     {
-        if (count($this->ads) > 0) {
+        if (count($this->results) > 0 && count($this->ads) > 0) {
             return array_shift($this->ads);
         } else {
             return null;

metager/resources/views/layouts/ad.blade.php

-@if(isset($ad)  && !app(\App\Models\Authorization\Authorization::class)->canDoAuthenticatedSearch())
-	<div class="result" 
-		role="listitem"
-	@if(array_key_exists('ad_data', $ad->additionalInformation))
-	data-yiid="{{ $ad->additionalInformation['ad_data']['yiid'] }}" 
-	@if($ad->additionalInformation['ad_data']['appns'] !== null && $ad->additionalInformation['ad_data']['k'] !== null) 
-	data-appns="{{ $ad->additionalInformation['ad_data']['appns'] }}" 
-	data-k="{{ $ad->additionalInformation['ad_data']['k'] }}" 
-	@endif
-	@endif>
+@if(!empty($ad) && !app(\App\Models\Authorization\Authorization::class)->canDoAuthenticatedSearch())
+	<div class="result" role="listitem" @if(array_key_exists('ad_data', $ad->additionalInformation))
+		data-yiid="{{ $ad->additionalInformation['ad_data']['yiid'] }}" @if($ad->additionalInformation['ad_data']['appns'] !== null && $ad->additionalInformation['ad_data']['k'] !== null)
+			data-appns="{{ $ad->additionalInformation['ad_data']['appns'] }}"
+		data-k="{{ $ad->additionalInformation['ad_data']['k'] }}" @endif @endif>
 		<div class="result-header">
 			<div class="result-headline">
 				<h2 class="result-title">
@@ -15,15 +10,16 @@
 						{{ $ad->titel }}
 					</a>
 				</h2>
-				<a class="result-hoster" href="{{ $ad->gefVonLink[0] }}" target="{{ $metager->getNewtab() }}" rel="noopener" referrerpolicy="no-referrer-when-downgrade">{{ trans('result.gefVon') . " " . $ad->gefVon[0] }} </a>
+				<a class="result-hoster" href="{{ $ad->gefVonLink[0] }}" target="{{ $metager->getNewtab() }}" rel="noopener"
+					referrerpolicy="no-referrer-when-downgrade">{{ trans('result.gefVon') . " " . $ad->gefVon[0] }} </a>
 			</div>
 			<div class="result-subheadline">
 				<a class="result-link" href="{{ $ad->link }}" target="_blank" referrerpolicy="no-referrer-when-downgrade">
 					<span>{{ $ad->anzeigeLink }}</span>
 					@if(\App\Localization::getLanguage() === "de")
-					<img src="/img/100-de.svg" alt="Mark">
+						<img src="/img/100-de.svg" alt="Mark">
 					@else
-					<img src="/img/100-en.svg" alt="Mark">
+						<img src="/img/100-en.svg" alt="Mark">
 					@endif
 				</a>
 			</div>
@@ -34,12 +30,14 @@
 			</div>
 		</div>
 		<div class="result-footer">
-		<a class="result-open-newtab" href="{{ $ad->link }}" target="_blank" rel="noopener" referrerpolicy="no-referrer-when-downgrade" aria-hidden="true" tabindex="-1">
-			{!! trans('result.options.6') !!}
-		</a>
-		<a class="result-open-key" title="@lang('result.metagerkeytext')" href="{{ app(\App\Models\Authorization\Authorization::class)->getAdfreeLink() }}" target="_blank">
-			@lang('result.options.8')
-		</a>
-	</div>
+			<a class="result-open-newtab" href="{{ $ad->link }}" target="_blank" rel="noopener"
+				referrerpolicy="no-referrer-when-downgrade" aria-hidden="true" tabindex="-1">
+				{!! trans('result.options.6') !!}
+			</a>
+			<a class="result-open-key" title="@lang('result.metagerkeytext')"
+				href="{{ app(\App\Models\Authorization\Authorization::class)->getAdfreeLink() }}" target="_blank">
+				@lang('result.options.8')
+			</a>
+		</div>
 	</div>
 @endif