maketank/Froxlor
2
0
Fork 0
Code Pull Requests Releases Activity

add default-ssl-ip setting

Browse Source 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
This commit is contained in:
Michael Kaufmann (d00p)
2018-02-21 11:50:34 +01:00
parent 26b9c030b5
commit 5480fcbf5d
14 changed files with 106 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
lib/classes/integrity/class.IntegrityCheck.php
View File

@@ -126,10 +126,12 @@ class IntegrityCheck {
// Cache all IPs the admins have assigned
$adm_stmt = Database::prepare("SELECT `adminid`, `ip` FROM `" . TABLE_PANEL_ADMINS . "` ORDER BY `adminid` ASC");
Database::pexecute($adm_stmt);
$default_ips = explode(',', Settings::Get('system.defaultip'));
$default_ssl_ips = explode(',', Settings::Get('system.defaultsslip'));
while ($row = $adm_stmt->fetch(PDO::FETCH_ASSOC)) {
if ($row['ip'] < 0 || is_null($row['ip']) || empty($row['ip'])) {
// Admin uses default-IP
$admips[$row['adminid']] = explode(',', Settings::Get('system.defaultip'));
$admips[$row['adminid']] = array_merge($default_ips, $default_ssl_ips);
} else {
$admips[$row['adminid']] = array($row['ip']);
}