From 8cab1f5b56ecc4380e2087b5725beb4de8f64db4 Mon Sep 17 00:00:00 2001
From: Dominik Pfennig <dominik@suma-ev.de>
Date: Wed, 2 May 2018 14:15:55 +0200
Subject: [PATCH] =?UTF-8?q?Bugs=20behoben.=20Zeitliche=20L=C3=B6schung=20a?=
=?UTF-8?q?ber=20noch=20nicht=20eingebaut.=20Das=20kommt=20bald.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
app/Http/Middleware/HumanVerification.php | 2 +-
..._114745_create_humanverification_table.php | 4 ++--
resources/assets/js/scriptResultPage.js | 20 ++++++++++++++++++-
3 files changed, 22 insertions(+), 4 deletions(-)
diff --git a/app/Http/Middleware/HumanVerification.php b/app/Http/Middleware/HumanVerification.php
index d1ea16392..a04d55376 100644
--- a/app/Http/Middleware/HumanVerification.php
+++ b/app/Http/Middleware/HumanVerification.php
@@ -38,7 +38,7 @@ class HumanVerification
DB::table('humanverification')->insert(
['id' => $id, 'unusedResultPages' => 1, 'locked' => false, 'updated_at' => now()]
);
- $user = DB::table('humanverification')->where($id, $id)->first();
+ $user = DB::table('humanverification')->where('id', $id)->first();
}else if($user->locked !== "1"){
$unusedResultPages = intval($user->unusedResultPages);
$unusedResultPages++;
diff --git a/database/migrations/2018_04_26_114745_create_humanverification_table.php b/database/migrations/2018_04_26_114745_create_humanverification_table.php
index 877cbf33b..95c94233c 100644
--- a/database/migrations/2018_04_26_114745_create_humanverification_table.php
+++ b/database/migrations/2018_04_26_114745_create_humanverification_table.php
@@ -14,10 +14,10 @@ class CreateHumanverificationTable extends Migration
public function up()
{
Schema::create('humanverification', function (Blueprint $table) {
- $table->string('id');
+ $table->string('id')->unique();
$table->integer('unusedResultPages');
$table->boolean('locked');
- $table->date('updated_at');
+ $table->timestamp('updated_at');
});
}
diff --git a/resources/assets/js/scriptResultPage.js b/resources/assets/js/scriptResultPage.js
index b4cf3893f..c5d67e2c4 100644
--- a/resources/assets/js/scriptResultPage.js
+++ b/resources/assets/js/scriptResultPage.js
@@ -134,7 +134,25 @@ function clickLog () {
function botProtection () {
$(".result").find("a").click(function(){
- $.post('/img/cat.jpg', { mm: $("meta[name=mm]").attr("content")});
+ var link = $(this).attr("href");
+ var newtab = false;
+ if($(this).attr("target") == "_blank"){
+ newtab = true;
+ }
+ $.ajax({
+ url: '/img/cat.jpg',
+ type: "post",
+ data: { mm: $("meta[name=mm]").attr("content")},
+ timeout: 2000
+ })
+ .always(function(){
+ if(!newtab)
+ document.location.href = link;
+ });
+ if(!newtab)
+ return false;
+ else
+ return true;
});
}
--
GitLab