Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
open-source
MetaGer
Commits
485f804b
Commit
485f804b
authored
Feb 12, 2020
by
Dominik Hebeler
Browse files
deleting works again
parent
1a94a3e8
Changes
2
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
.env.example
View file @
485f804b
...
...
@@ -4,6 +4,8 @@ APP_LOG_LEVEL=debug
APP_KEY=
APP_URL=http://localhost
BOT_PROTECTION=true
DB_CONNECTION=mysql
DB_HOST=mgdb
DB_PORT=3306
...
...
app/Http/Controllers/HumanVerification.php
View file @
485f804b
...
...
@@ -92,9 +92,9 @@ class HumanVerification extends Controller
public
static
function
removeGet
(
Request
$request
,
$mm
,
$password
,
$url
)
{
$url
=
base64_decode
(
str_replace
(
"<<SLASH>>"
,
"/"
,
$url
));
# If the user is correct and the password is we will delete any entry in the database
$requiredPass
=
md5
(
$mm
.
Carbon
::
NOW
()
->
day
.
$url
.
env
(
"PROXY_PASSWORD"
));
if
(
HumanVerification
::
checkId
(
$request
,
$mm
)
&&
$requiredPass
===
$password
)
{
HumanVerification
::
removeUser
(
$request
,
$mm
);
}
...
...
@@ -126,8 +126,13 @@ class HumanVerification extends Controller
$changed
=
true
;
}
}
if
(
$changed
)
{
Cache
::
put
(
HumanVerification
::
PREFIX
.
"."
.
$user
[
"id"
],
$userList
,
now
()
->
addWeeks
(
2
));
if
(
sizeof
(
$newUserList
)
>
0
)
{
Cache
::
put
(
HumanVerification
::
PREFIX
.
"."
.
$user
[
"id"
],
$newUserList
,
now
()
->
addWeeks
(
2
));
}
else
{
Cache
::
forget
(
HumanVerification
::
PREFIX
.
"."
.
$user
[
"id"
],
$newUserList
);
}
}
}
...
...
@@ -152,11 +157,10 @@ class HumanVerification extends Controller
$sum
=
0
;
foreach
(
$userlist
as
$uidTmp
=>
$userTmp
)
{
if
(
!
empty
(
$userTmp
)
&&
!
empty
(
$userTmp
[
"whitelist"
])
&&
!
$userTmp
[
"whitelist"
])
{
if
(
!
empty
(
$userTmp
)
&&
gettype
(
$userTmp
[
"whitelist"
])
===
"boolean"
&&
!
$userTmp
[
"whitelist"
])
{
$sum
+=
intval
(
$userTmp
[
"unusedResultPages"
]);
}
}
# Check if we have to whitelist the user or if we can simply delete the data
if
(
$user
[
"unusedResultPages"
]
<
$sum
&&
!
$user
[
"whitelist"
])
{
# Whitelist
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment