From 2dc342c7ef5fc408ddf89f7c4d2722c43945d96c Mon Sep 17 00:00:00 2001
From: Dominik Hebeler <dominik@suma-ev.de>
Date: Tue, 11 Jun 2019 13:52:48 +0200
Subject: [PATCH] missing files
---
.gitlab-ci.yml | 4 ++++
app/Http/Controllers/MetaGerSearch.php | 3 +++
build.sh | 1 +
3 files changed, 8 insertions(+)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 37fa5b388..4f55449b1 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -24,6 +24,7 @@ update(144.76.113.134):
- scp -P 63824 metager@metager3.de:~/blacklistDomains.txt config/
- scp -P 63824 metager@metager3.de:~/adBlacklistUrl.txt config/
- scp -P 63824 metager@metager3.de:~/adBlacklistDomains.txt config/
+ - scp -P 63824 metager@metager3.de:~/spam.txt config/
- scp -P 63824 metager@metager3.de:~/UsersSeeder.php database/seeds/
- touch storage/logs/laravel.log
- touch storage/logs/worker.log
@@ -67,6 +68,9 @@ update(metager2):
- scp -P 63824 metager@metager3.de:~/sumasEn.json config/
- scp -P 63824 metager@metager3.de:~/blacklistUrl.txt config/
- scp -P 63824 metager@metager3.de:~/blacklistDomains.txt config/
+ - scp -P 63824 metager@metager3.de:~/adBlacklistUrl.txt config/
+ - scp -P 63824 metager@metager3.de:~/adBlacklistDomains.txt config/
+ - scp -P 63824 metager@metager3.de:~/spam.txt config/
- scp -P 63824 metager@metager3.de:~/UsersSeeder.php database/seeds/
- touch storage/logs/laravel.log
- touch storage/logs/worker.log
diff --git a/app/Http/Controllers/MetaGerSearch.php b/app/Http/Controllers/MetaGerSearch.php
index be31c4736..2776e8757 100644
--- a/app/Http/Controllers/MetaGerSearch.php
+++ b/app/Http/Controllers/MetaGerSearch.php
@@ -78,6 +78,9 @@ class MetaGerSearch extends Controller
$resultpage = $metager->createView($quicktipResults);
foreach ($spamEntries as $index => $entry) {
$entry = trim($entry);
+ if (empty($entry)) {
+ continue;
+ }
if (preg_match("/" . $entry . "/si", $metager->getEingabe())) {
Cache::put('spam.' . $metager->getFokus() . "." . md5($metager->getQ()), $resultpage->render(), 1440);
}
diff --git a/build.sh b/build.sh
index 2f3ec74aa..8e002c858 100644
--- a/build.sh
+++ b/build.sh
@@ -15,6 +15,7 @@ scp -P 63824 metager@metager3.de:~/blacklistUrl.txt config/
scp -P 63824 metager@metager3.de:~/blacklistDomains.txt config/
scp -P 63824 metager@metager3.de:~/adBlacklistUrl.txt config/
scp -P 63824 metager@metager3.de:~/adBlacklistDomains.txt config/
+scp -P 63824 metager@metager3.de:~/spam.txt config/
scp -P 63824 metager@metager3.de:~/UsersSeeder.php database/seeds/
touch storage/logs/laravel.log
touch storage/logs/worker.log
--
GitLab