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

check for existing userinfo if settings are being imported via cli

Browse Source 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
This commit is contained in:
Michael Kaufmann
2023-09-02 17:11:06 +02:00
parent 4b75369597
commit 37aa7af4da
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
lib/Froxlor/Domain/IpAddr.php
View File

@@ -55,6 +55,7 @@ class IpAddr
/** /**
* @return array * @return array
* @throws \Exception
*/ */
public static function getSslIpPortCombinations(): array public static function getSslIpPortCombinations(): array
{ {
@@ -75,7 +76,7 @@ class IpAddr
$additional_conditions_params = []; $additional_conditions_params = [];
$additional_conditions_array = []; $additional_conditions_array = [];
if ($userinfo['ip'] != '-1') { if (!empty($userinfo) && $userinfo['ip'] != '-1') {
$admin_ip_stmt = Database::prepare(" $admin_ip_stmt = Database::prepare("
SELECT `id`, `ip`, `port` FROM `" . TABLE_PANEL_IPSANDPORTS . "` WHERE `id` = IN (:ipid) SELECT `id`, `ip`, `port` FROM `" . TABLE_PANEL_IPSANDPORTS . "` WHERE `id` = IN (:ipid)
"); ");