diff --git a/admin_admins.php b/admin_admins.php index c18bb3fc..b404cf8c 100644 --- a/admin_admins.php +++ b/admin_admins.php @@ -107,7 +107,7 @@ if ($page == 'admins' && $userinfo['change_serversettings'] == '1') { $count ++; } - $admincount = $paging->getEntries(); + $admincount = $result['count'] . " / " . $paging->getEntries(); eval("echo \"" . \Froxlor\UI\Template::getTemplate("admins/admins") . "\";"); } elseif ($action == 'su') { diff --git a/admin_customers.php b/admin_customers.php index f641684a..af08c8d1 100644 --- a/admin_customers.php +++ b/admin_customers.php @@ -150,7 +150,7 @@ if ($page == 'customers' && $userinfo['customers'] != '0') { $count ++; } - $customercount = $paging->getEntries(); + $customercount = $result['count'] . " / " . $paging->getEntries(); eval("echo \"" . \Froxlor\UI\Template::getTemplate("customers/customers") . "\";"); } elseif ($action == 'su' && $id != 0) { try { diff --git a/admin_domains.php b/admin_domains.php index b4f62e61..d232f131 100644 --- a/admin_domains.php +++ b/admin_domains.php @@ -80,7 +80,7 @@ if ($page == 'domains' || $page == 'overview') { $count++; } - $domainscount = $paging->getEntries(); + $domainscount = $result['count'] . " / " . $paging->getEntries(); // Display the list eval("echo \"" . \Froxlor\UI\Template::getTemplate("domains/domains") . "\";"); diff --git a/customer_email.php b/customer_email.php index 8a9902de..f65c0bf0 100644 --- a/customer_email.php +++ b/customer_email.php @@ -133,10 +133,10 @@ if ($page == 'overview') { FROM `" . TABLE_PANEL_DOMAINS . "` WHERE `customerid`= :cid AND `isemaildomain` = '1' "); - $result = Database::pexecute_first($result_stmt, array( + $result2 = Database::pexecute_first($result_stmt, array( "cid" => $userinfo['customerid'] )); - $emaildomains_count = $result['emaildomains']; + $emaildomains_count = $result2['emaildomains']; eval("echo \"" . \Froxlor\UI\Template::getTemplate("email/emails") . "\";"); } elseif ($action == 'delete' && $id != 0) { diff --git a/customer_mysql.php b/customer_mysql.php index 08eca699..40e84575 100644 --- a/customer_mysql.php +++ b/customer_mysql.php @@ -85,10 +85,12 @@ if ($page == 'overview') { $mbdata_stmt = Database::prepare("SELECT SUM(data_length + index_length) as MB FROM information_schema.TABLES WHERE table_schema = :table_schema GROUP BY table_schema"); - Database::pexecute($mbdata_stmt, array( + $mbdata = Database::pexecute_first($mbdata_stmt, array( "table_schema" => $row['databasename'] )); - $mbdata = $mbdata_stmt->fetch(PDO::FETCH_ASSOC); + if (!$mbdata) { + $mbdata = array('MB' => 0); + } $row['size'] = \Froxlor\PhpHelper::sizeReadable($mbdata['MB'], 'GiB', 'bi', '%01.' . (int) Settings::Get('panel.decimal_places') . 'f %s'); eval("\$mysqls.=\"" . \Froxlor\UI\Template::getTemplate('mysql/mysqls_database') . "\";"); $count ++; diff --git a/templates/Sparkle/customer/domains/domainlist.tpl b/templates/Sparkle/customer/domains/domainlist.tpl index ecce85a3..890f2104 100644 --- a/templates/Sparkle/customer/domains/domainlist.tpl +++ b/templates/Sparkle/customer/domains/domainlist.tpl @@ -3,7 +3,7 @@

  - {$lng['domains']['domainsettings']} ({$domains_count}) + {$lng['domains']['domainsettings']} ({$result['count']} / {$domains_count})

diff --git a/templates/Sparkle/customer/email/emails.tpl b/templates/Sparkle/customer/email/emails.tpl index 3ee17e54..da719798 100644 --- a/templates/Sparkle/customer/email/emails.tpl +++ b/templates/Sparkle/customer/email/emails.tpl @@ -3,7 +3,7 @@

  - {$lng['menue']['email']['emails']} ({$emailscount}) + {$lng['menue']['email']['emails']} ({$result['count']} / {$emailscount})

diff --git a/templates/Sparkle/customer/ftp/accounts.tpl b/templates/Sparkle/customer/ftp/accounts.tpl index ce431599..cf1f8b1a 100644 --- a/templates/Sparkle/customer/ftp/accounts.tpl +++ b/templates/Sparkle/customer/ftp/accounts.tpl @@ -3,7 +3,7 @@

  - {$lng['menue']['ftp']['accounts']} ({$ftps_count}) + {$lng['menue']['ftp']['accounts']} ({$result['count']} / {$ftps_count})

diff --git a/templates/Sparkle/customer/mysql/mysqls.tpl b/templates/Sparkle/customer/mysql/mysqls.tpl index f1085ca1..eed4c04f 100644 --- a/templates/Sparkle/customer/mysql/mysqls.tpl +++ b/templates/Sparkle/customer/mysql/mysqls.tpl @@ -3,7 +3,7 @@

  - {$lng['menue']['mysql']['databases']} ({$mysqls_count}) + {$lng['menue']['mysql']['databases']} ({$result['count']} / {$mysqls_count})