diff --git a/app/Http/Controllers/MetaGerSearch.php b/app/Http/Controllers/MetaGerSearch.php index 6e376b75b7f4c0e83bbfa0b3db08790ac50d757c..b5cc2cea34030dbbb0eaeb8acb88a1a868c44415 100644 --- a/app/Http/Controllers/MetaGerSearch.php +++ b/app/Http/Controllers/MetaGerSearch.php @@ -124,18 +124,26 @@ class MetaGerSearch extends Controller # Wikipedia Quicktip if (App::isLocale('en')) { - $url = "https://en.wikipedia.org/w/api.php?action=opensearch&search=" . urlencode($q) . "&limit=2&namespace=0&format=json&redirects=resolve"; + $url = "https://en.wikipedia.org/w/api.php?action=opensearch&search=" . urlencode($q) . "&limit=10&namespace=0&format=json&redirects=resolve"; } else { - $url = "https://de.wikipedia.org/w/api.php?action=opensearch&search=" . urlencode($q) . "&limit=2&namespace=0&format=json&redirects=resolve"; + $url = "https://de.wikipedia.org/w/api.php?action=opensearch&search=" . urlencode($q) . "&limit=10&namespace=0&format=json&redirects=resolve"; } $decodedResponse = json_decode($this->get($url), true); if (isset($decodedResponse[1][0]) && isset($decodedResponse[2][0]) && isset($decodedResponse[3][0])) { $quicktip = []; $firstSummary = $decodedResponse[2][0]; - if ((strpos($firstSummary, 'steht für:') || strpos($firstSummary, 'may refer to:')) && isset($decodedResponse[1][1]) && isset($decodedResponse[2][1]) && isset($decodedResponse[3][1])) { - $quicktip["title"] = $decodedResponse[1][1]; - $quicktip["URL"] = $decodedResponse[3][1]; - $quicktip["summary"] = $decodedResponse[2][1]; + // Wenn es mehr als 1 Ergebnis gibt + if (isset($decodedResponse[1][1])) { + // Solange noch zusätzliche Seiten vorhanden sind, füge sie der Tabelle hinzu + $details = '<table class=table table-condensed>'; + for ($i = 1;isset($decodedResponse[1][$i]) && isset($decodedResponse[2][$i]) && isset($decodedResponse[3][$i]); $i++) { + $details .= '<tr><td><a href="' . $decodedResponse[3][$i] . '" target="_blank" rel="noopener">' . $decodedResponse[1][$i] . '</a></td></tr>'; + } + $details .= '</table>'; + $quicktip["title"] = $decodedResponse[1][0]; + $quicktip["URL"] = $decodedResponse[3][0]; + $quicktip["summary"] = $decodedResponse[2][0]; + $quicktip["details"] = $details; $quicktip['gefVon'] = trans('metaGerSearch.quicktips.wikipedia.adress'); } else { $quicktip["title"] = $decodedResponse[1][0]; @@ -153,7 +161,7 @@ class MetaGerSearch extends Controller $tips = file($file); $tip = $tips[array_rand($tips)]; - $mquicktips[] = ['title' => 'Wussten Sie schon?', 'summary' => $tip, 'URL' => '/tips']; + $mquicktips[] = ['title' => trans('metaGerSearch.quicktips.tips.title'), 'summary' => $tip, 'URL' => '/tips']; } # Und die Werbelinks: diff --git a/resources/assets/less/metager/quicktips.less b/resources/assets/less/metager/quicktips.less index 31d4bf66ac914b6cbd03e59adda35b91a95323dc..cbdc75b940cf58cb0b8aaaa711f471709d9aaaa1 100644 --- a/resources/assets/less/metager/quicktips.less +++ b/resources/assets/less/metager/quicktips.less @@ -19,7 +19,7 @@ summary { } .qt-icon { - height: 60px; + height: 40px; } summary::-webkit-details-marker { display:none; } diff --git a/resources/lang/de/metaGerSearch.php b/resources/lang/de/metaGerSearch.php index 2e5221a593cb8364e743bb25f250749a69be3909..27b8b3b9ec2bcc76379d97ad454025744d83efe1 100644 --- a/resources/lang/de/metaGerSearch.php +++ b/resources/lang/de/metaGerSearch.php @@ -2,4 +2,5 @@ return [ 'quicktips.wikipedia.adress' => 'aus <a href="https://de.wikipedia.org" target="_blank" rel="noopener">Wikipedia, der freien Enzyklopädie</a>', + 'quicktips.tips.title' => 'Wussten Sie schon?', ];