Skip to content
Snippets Groups Projects
Commit 395fb23f authored by Dominik Hebeler's avatar Dominik Hebeler
Browse files

fixed botoverview

parent c1c5e67d
No related branches found
No related tags found
1 merge request!1980Resolve "Browserverification"
Hide whitespace changes
Inline Side-by-side
metager/app/Http/Controllers/HumanVerification.php
+ 16
− 33
View file @ 395fb23f
...@@ -183,52 +183,35 @@ class HumanVerification extends Controller ...@@ -183,52 +183,35 @@ class HumanVerification extends Controller
public function botOverview(Request $request) public function botOverview(Request $request)
{ {
$id = ""; $human_verification = \app()->make(ModelsHumanVerification::class);
$uid = "";
$ip = $request->ip();
if (\App\Http\Controllers\HumanVerification::couldBeSpammer($ip)) {
$id = hash("sha1", "999.999.999.999");
$uid = hash("sha1", "999.999.999.999" . $ip . $_SERVER["AGENT"] . "uid");
} else {
$id = hash("sha1", $ip);
$uid = hash("sha1", $ip . $_SERVER["AGENT"] . "uid");
}
$userList = Cache::get(HumanVerification::PREFIX . "." . $id);
$user = $userList[$uid];
return view('humanverification.botOverview') return view('humanverification.botOverview')
->with('title', "Bot Overview") ->with('title', "Bot Overview")
->with('ip', $ip) ->with('ip', $request->ip())
->with('userList', $userList) ->with('userList', $human_verification->getUserList())
->with('user', $user); ->with('user', $human_verification->getUser());
} }
public function botOverviewChange(Request $request) public function botOverviewChange(Request $request)
{ {
$id = ""; $human_verification = \app()->make(ModelsHumanVerification::class);
$uid = "";
$ip = $request->ip();
if (\App\Http\Controllers\HumanVerification::couldBeSpammer($ip)) {
$id = hash("sha1", "999.999.999.999");
$uid = hash("sha1", "999.999.999.999" . $ip . $_SERVER["AGENT"] . "uid");
} else {
$id = hash("sha1", $ip);
$uid = hash("sha1", $ip . $_SERVER["AGENT"] . "uid");
}
$userList = Cache::get(HumanVerification::PREFIX . "." . $id);
$user = $userList[$uid];
if ($request->filled("locked")) { if ($request->filled("locked")) {
$user["locked"] = boolval($request->input('locked')); if (\boolval($request->input("locked"))) {
$human_verification->lockUser();
} else {
$human_verification->unlockUser();
}
} elseif ($request->filled("whitelist")) { } elseif ($request->filled("whitelist")) {
$user["whitelist"] = boolval($request->input('whitelist')); if (\boolval($request->input("whitelist"))) {
$human_verification->verifyUser();
} else {
$human_verification->unverifyUser();
}
} elseif ($request->filled("unusedResultPages")) { } elseif ($request->filled("unusedResultPages")) {
$user["unusedResultPages"] = intval($request->input('unusedResultPages')); $human_verification->setUnusedResultPage(intval($request->input('unusedResultPages')));
} }
HumanVerification::saveUser($user);
return redirect('admin/bot'); return redirect('admin/bot');
} }
......
metager/app/Models/HumanVerification.php
+ 22
− 0
View file @ 395fb23f
...@@ -164,6 +164,18 @@ class HumanVerification ...@@ -164,6 +164,18 @@ class HumanVerification
} }
} }
public function unverifyUser()
{
$this->user["whitelist"] = false;
$this->saveUser();
}
public function setUnusedResultPage($unusedResultPages)
{
$this->user["unusedResultPages"] = $unusedResultPages;
$this->saveUser();
}
public function isWhiteListed() public function isWhiteListed()
{ {
return $this->user["whitelist"]; return $this->user["whitelist"];
...@@ -236,4 +248,14 @@ class HumanVerification ...@@ -236,4 +248,14 @@ class HumanVerification
{ {
return sizeof($this->users); return sizeof($this->users);
} }
public function getUser()
{
return $this->user;
}
public function getUserList()
{
return $this->users;
}
} }
metager/resources/views/humanverification/botOverview.blade.php
+ 67
− 11
View file @ 395fb23f
...@@ -4,27 +4,28 @@ ...@@ -4,27 +4,28 @@
@section('content') @section('content')
<style> <style>
table form { .user {
padding-top: 8px; width: max-content;
padding-bottom: 8px; padding: 1rem;
} border: 1px solid white;
td:nth-child(1) { background-color: #4a4a4a;
padding-right: 8px; border-radius: 5px;
} }
</style> </style>
<div class="user">
<table> <table>
<tbody> <tbody>
<tr> <tr>
<td>IP-Adresse</td> <td>IP-Adresse</td>
<td><pre>{{$ip}}</pre></td> <td>{{$ip}}</td>
</tr> </tr>
<tr> <tr>
<td>ID</td> <td>ID</td>
<td><pre>{{$user["id"]}}</pre></td> <td>{{$user["id"]}}</td>
</tr> </tr>
<tr> <tr>
<td>User-ID</td> <td>User-ID</td>
<td><pre>{{$user["uid"]}}</pre></td> <td>{{$user["uid"]}}</td>
</tr> </tr>
<tr> <tr>
<td>Unused Resultpages</td> <td>Unused Resultpages</td>
...@@ -62,9 +63,64 @@ ...@@ -62,9 +63,64 @@
</tr> </tr>
<tr> <tr>
<td>Expiration</td> <td>Expiration</td>
<td><pre>{{$user["expiration"]}}</pre></td> <td><pre>{{$user["expiration"]->format("d.m.Y H:i:s")}}</pre></td>
</tr>
</tbody>
</table>
</div>
@foreach($userList as $user_current)
@if($user_current["uid"] === $user["uid"])
@continue
@endif
<div class="user">
<h3>{{$user_current["uid"]}}</h3>
<table>
<tbody>
<tr>
<td>ID</td>
<td>{{$user_current["id"]}}</td>
</tr>
<tr>
<td>Unused Resultpages</td>
<td>
<form action="" method="post">
<input type="number" name="unusedResultPages" id="unusedResultPages" readonly value="{{$user_current["unusedResultPages"]}}">
</form>
</td>
</tr>
<tr>
<td>Whitelist</td>
<td>
<form action="" method="post">
<select name="whitelist" id="locked" disabled>
<option value="1" @if($user_current["whitelist"]) selected @endif >True</option>
<option value="0" @if(!$user_current["whitelist"]) selected @endif >False</option>
</select>
</form>
</td>
</tr>
<tr>
<td>Locked</td>
<td>
<form action="" method="post">
<select name="locked" id="locked" disabled>
<option value="1" @if($user_current["locked"]) selected @endif>True</option>
<option value="0" @if(!$user_current["locked"]) selected @endif>False</option>
</select>
</form>
</td>
</tr>
<tr>
<td>Locked Key</td>
<td><pre>{{$user_current["lockedKey"]}}</pre></td>
</tr>
<tr>
<td>Expiration</td>
<td><pre>{{$user_current["expiration"]->format("d.m.Y H:i:s")}}</pre></td>
</tr> </tr>
</tbody> </tbody>
</table> </table>
{{ dd($userList) }} </div>
@endforeach
@endsection @endsection
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment