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

return the subdomain-names in PhpSettings::listing() instead of only the amount

Browse Source 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
This commit is contained in:
Michael Kaufmann
2018-12-11 11:45:39 +01:00
parent 8d966aebee
commit ab819129dd
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
admin_phpsettings.php
View File

@@ -46,7 +46,7 @@ if ($page == 'overview') {
$row['description'] = "<b>" . $row['description'] . "</b>"; $row['description'] = "<b>" . $row['description'] . "</b>";
} }
$domains = ""; $domains = "";
$subdomains_count = $row['subdomains_count']; $subdomains_count = count($row['subdomains']);
foreach ($row['domains'] as $configdomain) { foreach ($row['domains'] as $configdomain) {
$domains .= $configdomain . "<br>"; $domains .= $configdomain . "<br>";
} }

6
lib/classes/api/commands/class.PhpSettings.php
View File

@@ -74,14 +74,14 @@ class PhpSettings extends ApiCommand implements ResourceEntity
} }
$domains = array(); $domains = array();
$subdomains_count = 0; $subdomains = array();
$domainresult_stmt = Database::prepare($query); $domainresult_stmt = Database::prepare($query);
Database::pexecute($domainresult_stmt, $query_params, true, true); Database::pexecute($domainresult_stmt, $query_params, true, true);
if (Database::num_rows() > 0) { if (Database::num_rows() > 0) {
while ($row2 = $domainresult_stmt->fetch(PDO::FETCH_ASSOC)) { while ($row2 = $domainresult_stmt->fetch(PDO::FETCH_ASSOC)) {
if ($row2['parentdomainid'] != 0) { if ($row2['parentdomainid'] != 0) {
$subdomains_count++; $subdomains[] = $row2['domain'];
} else { } else {
$domains[] = $row2['domain']; $domains[] = $row2['domain'];
} }
@@ -99,7 +99,7 @@ class PhpSettings extends ApiCommand implements ResourceEntity
} }
$row['domains'] = $domains; $row['domains'] = $domains;
$row['subdomains_count'] = $subdomains_count; $row['subdomains'] = $subdomains;
$phpconfigs[] = $row; $phpconfigs[] = $row;
} }