@ -8,16 +8,16 @@ date_default_timezone_set ('UTC');
@@ -8,16 +8,16 @@ date_default_timezone_set ('UTC');
$pdo = (new App\DB($options))->pdo;
$util = new App\Utils;
$STH = $pdo->query ("SELECT `host`, `base64`, `base32`, `add_date`, `last_seen`, `approved`, `initial` FROM hosts");
$STH = $pdo->query ("SELECT `host`, `base64`, `base32`, `add_date`, `last_seen`, `approved`, `initial`, `disabled` FROM hosts");
$hosts = $STH->fetchAll(PDO::FETCH_ASSOC);
// for automatic approving
$approffs = date ("Y-m-d H:i:s", strtotime ("-" . $options["approvedelay"] . " hour")); // approval offset
$apprseen = date ("Y-m-d H:i:s", strtotime ("-" . $options["approveseen"] . " hour")); // approval maxseen offset
$newregoffs = date ("Y-m-d H:i:s", strtotime ("-" . $options["newdays"] . " day"));
$newseenlim = date ("Y-m-d H:i:s", strtotime ("-" . $options["delnewdays"] . " day"));
$oldseenlim = date ("Y-m-d H:i:s", strtotime ("-" . $options["delolddays"] . " day"));
$newregoffs = date ("Y-m-d H:i:s", strtotime ("-" . $options["newdays"] . " day")); // 7
$newseenlim = date ("Y-m-d H:i:s", strtotime ("-" . $options["delnewdays"] . " day")); // 3
$oldseenlim = date ("Y-m-d H:i:s", strtotime ("-" . $options["delolddays"] . " day")); // 30
$export_full = $export_live = $export_init = [];
$export_addr_full = $export_addr_live = $export_addr_init = [];
@ -31,10 +31,13 @@ foreach ($hosts as $host)
@@ -31,10 +31,13 @@ foreach ($hosts as $host)
array_push($export_addr_full, $domain . "," . $host["base32"]);
if (
($options["approval"] == false || $host["approved"] == 1) & & (
($host["add_date"] > $newregoffs & & $host["last_seen"] > $newseenlim) ||
($host["add_date"] < $newregoffs & & $host["last_seen"] > $oldseenlim)
)
($options["approval"] == false || $host["approved"] == 1) & &
($host["disabled"] == 0 ||
(
($host["add_date"] > $newregoffs & & $host["last_seen"] > $newseenlim) ||
($host["add_date"] < $newregoffs & & $host["last_seen"] > $oldseenlim)
)
)
)
{
array_push($export_live, $domain . "=" . $host["base64"]);
@ -45,6 +48,11 @@ foreach ($hosts as $host)
@@ -45,6 +48,11 @@ foreach ($hosts as $host)
array_push($export_init, $domain . "=" . $host["base64"]);
array_push($export_addr_init, $domain . "," . $host["base32"]);
}
if ($host["disabled"] == 1)
{
$pdo->exec ("UPDATE `hosts` SET `disabled` = 0 WHERE `host` = '" . $host["host"] . "'");
}
}
else if (
$host["approved"] == 0 & & (
@ -56,6 +64,16 @@ foreach ($hosts as $host)
@@ -56,6 +64,16 @@ foreach ($hosts as $host)
array_push($export_live, $domain . "=" . $host["base64"]);
array_push($export_addr_live, $domain . "," . $host["base32"]);
}
if (
$host["disabled"] == 0 & &
($host["add_date"] > $newregoffs & & $host["last_seen"] < $newseenlim) ||
($host["add_date"] < $newregoffs & & $host["last_seen"] < $oldseenlim)
)
{
$pdo->exec ("UPDATE `hosts` SET `disabled` = 1 WHERE `host` = '" . $host["host"] . "'");
}
}
$STH = null;