From ab819129ddfcda6d4005c798d73e1498510c513e Mon Sep 17 00:00:00 2001 From: Michael Kaufmann Date: Tue, 11 Dec 2018 11:45:39 +0100 Subject: [PATCH] return the subdomain-names in PhpSettings::listing() instead of only the amount Signed-off-by: Michael Kaufmann --- admin_phpsettings.php | 2 +- lib/classes/api/commands/class.PhpSettings.php | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/admin_phpsettings.php b/admin_phpsettings.php index 77e79395..01ac2d7d 100644 --- a/admin_phpsettings.php +++ b/admin_phpsettings.php @@ -46,7 +46,7 @@ if ($page == 'overview') { $row['description'] = "" . $row['description'] . ""; } $domains = ""; - $subdomains_count = $row['subdomains_count']; + $subdomains_count = count($row['subdomains']); foreach ($row['domains'] as $configdomain) { $domains .= $configdomain . "
"; } diff --git a/lib/classes/api/commands/class.PhpSettings.php b/lib/classes/api/commands/class.PhpSettings.php index 8d06ca90..701c2dab 100644 --- a/lib/classes/api/commands/class.PhpSettings.php +++ b/lib/classes/api/commands/class.PhpSettings.php @@ -74,14 +74,14 @@ class PhpSettings extends ApiCommand implements ResourceEntity } $domains = array(); - $subdomains_count = 0; + $subdomains = array(); $domainresult_stmt = Database::prepare($query); Database::pexecute($domainresult_stmt, $query_params, true, true); if (Database::num_rows() > 0) { while ($row2 = $domainresult_stmt->fetch(PDO::FETCH_ASSOC)) { if ($row2['parentdomainid'] != 0) { - $subdomains_count++; + $subdomains[] = $row2['domain']; } else { $domains[] = $row2['domain']; } @@ -99,7 +99,7 @@ class PhpSettings extends ApiCommand implements ResourceEntity } $row['domains'] = $domains; - $row['subdomains_count'] = $subdomains_count; + $row['subdomains'] = $subdomains; $phpconfigs[] = $row; }