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

Merge branch 'main' of github.com:Froxlor/Froxlor

Browse Source
This commit is contained in:
Michael Kaufmann
2023-01-23 09:00:21 +01:00
parent ed50e03957 d090e48544
commit 97c4c9a366
2 changed files with 12 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
lib/Froxlor/PhpHelper.php
View File

@@ -263,8 +263,10 @@ class PhpHelper
try { try {
$answer = $resolver->query($host, 'A')->answer; $answer = $resolver->query($host, 'A')->answer;
foreach ($answer as $rr) { foreach ($answer as $rr) {
if ($rr instanceof Net_DNS2_RR_A) {
$ips[] = inet_ntop(inet_pton($rr->address)); $ips[] = inet_ntop(inet_pton($rr->address));
} }
}
} catch (Net_DNS2_Exception $e) { } catch (Net_DNS2_Exception $e) {
// we can't do anything here, just continue // we can't do anything here, just continue
} }
@@ -274,8 +276,10 @@ class PhpHelper
try { try {
$answer = $resolver->query($host, 'AAAA')->answer; $answer = $resolver->query($host, 'AAAA')->answer;
foreach ($answer as $rr) { foreach ($answer as $rr) {
if ($rr instanceof Net_DNS2_RR_AAAA) {
$ips[] = inet_ntop(inet_pton($rr->address)); $ips[] = inet_ntop(inet_pton($rr->address));
} }
}
} catch (Net_DNS2_Exception $e) { } catch (Net_DNS2_Exception $e) {
// we can't do anything here, just continue // we can't do anything here, just continue
} }

7
lib/tablelisting/admin/tablelisting.customers.php
View File

@@ -110,6 +110,11 @@ return [
'class' => 'text-center', 'class' => 'text-center',
'callback' => [Text::class, 'boolean'], 'callback' => [Text::class, 'boolean'],
], ],
'c.lastlogin_succ' => [
'label' => lng('admin.lastlogin_succ'),
'field' => 'lastlogin_succ',
'callback' => [Text::class, 'timestamp'],
],
'c.phpenabled' => [ 'c.phpenabled' => [
'label' => lng('admin.phpenabled'), 'label' => lng('admin.phpenabled'),
'field' => 'phpenabled', 'field' => 'phpenabled',
@@ -138,7 +143,7 @@ return [
'class' => 'text-center', 'class' => 'text-center',
'callback' => [Text::class, 'boolean'], 'callback' => [Text::class, 'boolean'],
], ],
'api_allowed' => [ 'c.api_allowed' => [
'label' => lng('usersettings.api_allowed.title'), 'label' => lng('usersettings.api_allowed.title'),
'field' => 'api_allowed', 'field' => 'api_allowed',
'class' => 'text-center', 'class' => 'text-center',