fix issues in login when 'login with domain' is activated; improved php8.3 compatibity; updated ubuntu noble config-template for dovecot and proftpd
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
This commit is contained in:
@@ -156,7 +156,7 @@ class GlobalSearch
|
||||
],
|
||||
'result_key' => 'domain_ace',
|
||||
'result_format' => [
|
||||
'title' => ['self', 'getFieldFromResult'],
|
||||
'title' => ['\\Froxlor\\Ajax\\GlobalSearch', 'getFieldFromResult'],
|
||||
'title_args' => 'domain_ace',
|
||||
'href' => 'admin_domains.php?page=domains&searchfield=d.domain_ace&searchtext='
|
||||
]
|
||||
@@ -172,7 +172,7 @@ class GlobalSearch
|
||||
'result_key' => 'ip',
|
||||
'result_groupkey' => 'ip',
|
||||
'result_format' => [
|
||||
'title' => ['self', 'getFieldFromResult'],
|
||||
'title' => ['\\Froxlor\\Ajax\\GlobalSearch', 'getFieldFromResult'],
|
||||
'title_args' => 'ip',
|
||||
'href' => 'admin_ipsandports.php?page=ipsandports&searchfield=ip&searchtext='
|
||||
]
|
||||
@@ -186,7 +186,7 @@ class GlobalSearch
|
||||
],
|
||||
'result_key' => 'id',
|
||||
'result_format' => [
|
||||
'title' => ['self', 'getFieldFromResult'],
|
||||
'title' => ['\\Froxlor\\Ajax\\GlobalSearch', 'getFieldFromResult'],
|
||||
'title_args' => 'name',
|
||||
'href' => 'admin_plans.php?page=overview&searchfield=id&searchtext='
|
||||
]
|
||||
@@ -201,7 +201,7 @@ class GlobalSearch
|
||||
],
|
||||
'result_key' => 'id',
|
||||
'result_format' => [
|
||||
'title' => ['self', 'getFieldFromResult'],
|
||||
'title' => ['\\Froxlor\\Ajax\\GlobalSearch', 'getFieldFromResult'],
|
||||
'title_args' => 'description',
|
||||
'href' => 'admin_phpsettings.php?page=overview&searchfield=id&searchtext='
|
||||
]
|
||||
@@ -215,7 +215,7 @@ class GlobalSearch
|
||||
],
|
||||
'result_key' => 'id',
|
||||
'result_format' => [
|
||||
'title' => ['self', 'getFieldFromResult'],
|
||||
'title' => ['\\Froxlor\\Ajax\\GlobalSearch', 'getFieldFromResult'],
|
||||
'title_args' => 'description',
|
||||
'href' => 'admin_phpsettings.php?page=fpmdaemons&searchfield=id&searchtext='
|
||||
]
|
||||
@@ -234,7 +234,7 @@ class GlobalSearch
|
||||
],
|
||||
'result_key' => 'loginname',
|
||||
'result_format' => [
|
||||
'title' => ['self', 'getFieldFromResult'],
|
||||
'title' => ['\\Froxlor\\Ajax\\GlobalSearch', 'getFieldFromResult'],
|
||||
'title_args' => 'name',
|
||||
'href' => 'admin_admins.php?page=admins&searchfield=loginname&searchtext='
|
||||
]
|
||||
@@ -252,7 +252,7 @@ class GlobalSearch
|
||||
],
|
||||
'result_key' => 'domain_ace',
|
||||
'result_format' => [
|
||||
'title' => ['self', 'getFieldFromResult'],
|
||||
'title' => ['\\Froxlor\\Ajax\\GlobalSearch', 'getFieldFromResult'],
|
||||
'title_args' => 'domain_ace',
|
||||
'href' => 'customer_domains.php?page=domains&searchfield=d.domain_ace&searchtext='
|
||||
]
|
||||
@@ -266,7 +266,7 @@ class GlobalSearch
|
||||
],
|
||||
'result_key' => 'email',
|
||||
'result_format' => [
|
||||
'title' => ['self', 'getFieldFromResult'],
|
||||
'title' => ['\\Froxlor\\Ajax\\GlobalSearch', 'getFieldFromResult'],
|
||||
'title_args' => 'email',
|
||||
'href' => 'customer_email.php?page=email_domain&domainid={domainid}&searchfield=m.email&searchtext='
|
||||
]
|
||||
@@ -279,7 +279,7 @@ class GlobalSearch
|
||||
],
|
||||
'result_key' => 'domain',
|
||||
'result_format' => [
|
||||
'title' => ['self', 'getFieldFromResult'],
|
||||
'title' => ['\\Froxlor\\Ajax\\GlobalSearch', 'getFieldFromResult'],
|
||||
'title_args' => 'domain',
|
||||
'href' => 'customer_email.php?page=emails&searchfield=d.domain&searchtext='
|
||||
]
|
||||
@@ -293,7 +293,7 @@ class GlobalSearch
|
||||
],
|
||||
'result_key' => 'databasename',
|
||||
'result_format' => [
|
||||
'title' => ['self', 'getFieldFromResult'],
|
||||
'title' => ['\\Froxlor\\Ajax\\GlobalSearch', 'getFieldFromResult'],
|
||||
'title_args' => 'databasename',
|
||||
'href' => 'customer_mysql.php?page=mysqls&searchfield=databasename&searchtext='
|
||||
]
|
||||
@@ -307,7 +307,7 @@ class GlobalSearch
|
||||
],
|
||||
'result_key' => 'username',
|
||||
'result_format' => [
|
||||
'title' => ['self', 'getFieldFromResult'],
|
||||
'title' => ['\\Froxlor\\Ajax\\GlobalSearch', 'getFieldFromResult'],
|
||||
'title_args' => 'username',
|
||||
'href' => 'customer_ftp.php?page=accounts&searchfield=username&searchtext='
|
||||
]
|
||||
|
||||
@@ -46,7 +46,7 @@ class CurrentUser
|
||||
*/
|
||||
public static function hasSession(): bool
|
||||
{
|
||||
return !empty($_SESSION) && isset($_SESSION['userinfo']) && !empty($_SESSION['userinfo']);
|
||||
return !empty($_SESSION) && !empty($_SESSION['userinfo']);
|
||||
}
|
||||
|
||||
/**
|
||||
|
||||
@@ -52,7 +52,7 @@ class ErrorBag
|
||||
*/
|
||||
public static function addError(string $data): void
|
||||
{
|
||||
if (!is_array($_SESSION['_errors'])) {
|
||||
if (!isset($_SESSION['_errors']) || !is_array($_SESSION['_errors'])) {
|
||||
$_SESSION['_errors'] = [];
|
||||
}
|
||||
$_SESSION['_errors'][] = $data;
|
||||
|
||||
@@ -374,6 +374,9 @@ class PhpHelper
|
||||
): bool
|
||||
{
|
||||
foreach ($haystack as $key => $value) {
|
||||
if (empty($value)) {
|
||||
continue;
|
||||
}
|
||||
$pathkey = empty($currentKey) ? $key : $currentKey . '.' . $key;
|
||||
if (is_array($value)) {
|
||||
self::recursive_array_search($needle, $value, $keys, $pathkey);
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
Reference in New Issue
Block a user