james/fembooru
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

restore strtotime, for +4 months etc

Browse Source
This commit is contained in:
Shish 2019-11-05 00:16:26 +00:00
parent c7d90c2df7
commit 15e61c5bf4
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
ext/ipban/main.php
View File

@ -14,13 +14,13 @@ class AddIPBanEvent extends Event
{ {
public $ip; public $ip;
public $reason; public $reason;
public $end; public $expires;
public function __construct(string $ip, string $reason, string $end) public function __construct(string $ip, string $reason, ?string $expires)
{ {
$this->ip = trim($ip); $this->ip = trim($ip);
$this->reason = trim($reason); $this->reason = trim($reason);
$this->end = trim($end); $this->expires = $expires;
} }
} }
@ -54,7 +54,7 @@ class IPBan extends Extension
if (empty($_POST['end'])) { if (empty($_POST['end'])) {
$end = null; $end = null;
} else { } else {
$end = $_POST['end']; $end = date("Y-m-d H:M:S", strtotime(trim($_POST['end'])));
} }
send_event(new AddIPBanEvent($_POST['ip'], $_POST['reason'], $end)); send_event(new AddIPBanEvent($_POST['ip'], $_POST['reason'], $end));
@ -109,9 +109,9 @@ class IPBan extends Extension
{ {
global $cache, $user, $database; global $cache, $user, $database;
$sql = "INSERT INTO bans (ip, reason, expires, banner_id) VALUES (:ip, :reason, :expires, :admin_id)"; $sql = "INSERT INTO bans (ip, reason, expires, banner_id) VALUES (:ip, :reason, :expires, :admin_id)";
$database->Execute($sql, ["ip"=>$event->ip, "reason"=>$event->reason, "expires"=>$event->end, "admin_id"=>$user->id]); $database->Execute($sql, ["ip"=>$event->ip, "reason"=>$event->reason, "expires"=>$event->expires, "admin_id"=>$user->id]);
$cache->delete("ip_bans_sorted"); $cache->delete("ip_bans_sorted");
log_info("ipban", "Banned {$event->ip} because '{$event->reason}' until {$event->end}"); log_info("ipban", "Banned {$event->ip} because '{$event->reason}' until {$event->expires}");
} }
public function onRemoveIPBan(RemoveIPBanEvent $event) public function onRemoveIPBan(RemoveIPBanEvent $event)