From ef11ad8da7321c71aa672d0094c6db5accdab2b4 Mon Sep 17 00:00:00 2001 From: Michael Kaufmann Date: Sat, 2 Nov 2019 11:12:49 +0100 Subject: [PATCH] fix broke count sql-queries Signed-off-by: Michael Kaufmann --- lib/Froxlor/Api/Commands/Certificates.php | 2 +- lib/Froxlor/Api/Commands/Cronjobs.php | 2 +- lib/Froxlor/Api/Commands/Domains.php | 2 +- lib/Froxlor/Api/Commands/Emails.php | 2 +- lib/Froxlor/Api/Commands/HostingPlans.php | 4 ++-- lib/Froxlor/Api/Commands/IpsAndPorts.php | 2 +- lib/Froxlor/Api/Commands/PhpSettings.php | 2 +- lib/Froxlor/Api/Commands/SubDomains.php | 2 +- 8 files changed, 9 insertions(+), 9 deletions(-) diff --git a/lib/Froxlor/Api/Commands/Certificates.php b/lib/Froxlor/Api/Commands/Certificates.php index 6d6ee3be..9860400c 100644 --- a/lib/Froxlor/Api/Commands/Certificates.php +++ b/lib/Froxlor/Api/Commands/Certificates.php @@ -238,7 +238,7 @@ class Certificates extends \Froxlor\Api\ApiCommand implements \Froxlor\Api\Resou public function listingCount() { // select all my (accessable) certificates - $certs_stmt_query = "SELECT COUNT(s.*) as num_certs + $certs_stmt_query = "SELECT COUNT(*) as num_certs FROM `" . TABLE_PANEL_DOMAIN_SSL_SETTINGS . "` s LEFT JOIN `" . TABLE_PANEL_DOMAINS . "` d ON `d`.`id` = `s`.`domainid` LEFT JOIN `" . TABLE_PANEL_CUSTOMERS . "` c ON `c`.`customerid` = `d`.`customerid` diff --git a/lib/Froxlor/Api/Commands/Cronjobs.php b/lib/Froxlor/Api/Commands/Cronjobs.php index 66fda2cc..99674501 100644 --- a/lib/Froxlor/Api/Commands/Cronjobs.php +++ b/lib/Froxlor/Api/Commands/Cronjobs.php @@ -171,7 +171,7 @@ class Cronjobs extends \Froxlor\Api\ApiCommand implements \Froxlor\Api\ResourceE { if ($this->isAdmin()) { $result_stmt = Database::prepare(" - SELECT COUNT(`c`.*) as num_crons FROM `" . TABLE_PANEL_CRONRUNS . "` `c` + SELECT COUNT(*) as num_crons FROM `" . TABLE_PANEL_CRONRUNS . "` `c` "); $result = Database::pexecute_first($result_stmt, null, true, true); if ($result) { diff --git a/lib/Froxlor/Api/Commands/Domains.php b/lib/Froxlor/Api/Commands/Domains.php index 7c0b95b6..3e71482f 100644 --- a/lib/Froxlor/Api/Commands/Domains.php +++ b/lib/Froxlor/Api/Commands/Domains.php @@ -82,7 +82,7 @@ class Domains extends \Froxlor\Api\ApiCommand implements \Froxlor\Api\ResourceEn $this->logger()->logAction(\Froxlor\FroxlorLogger::ADM_ACTION, LOG_NOTICE, "[API] list domains"); $result_stmt = Database::prepare(" SELECT - COUNT(`d`.*) as num_domains + COUNT(*) as num_domains FROM `" . TABLE_PANEL_DOMAINS . "` `d` LEFT JOIN `" . TABLE_PANEL_CUSTOMERS . "` `c` USING(`customerid`) LEFT JOIN `" . TABLE_PANEL_DOMAINS . "` `ad` ON `d`.`aliasdomain`=`ad`.`id` diff --git a/lib/Froxlor/Api/Commands/Emails.php b/lib/Froxlor/Api/Commands/Emails.php index f5efc5fb..80270e55 100644 --- a/lib/Froxlor/Api/Commands/Emails.php +++ b/lib/Froxlor/Api/Commands/Emails.php @@ -316,7 +316,7 @@ class Emails extends \Froxlor\Api\ApiCommand implements \Froxlor\Api\ResourceEnt { $customer_ids = $this->getAllowedCustomerIds('email'); $result_stmt = Database::prepare(" - SELECT COUNT(m.*) as num_emails + SELECT COUNT(*) as num_emails FROM `" . TABLE_MAIL_VIRTUAL . "` m LEFT JOIN `" . TABLE_PANEL_DOMAINS . "` d ON (m.`domainid` = d.`id`) LEFT JOIN `" . TABLE_MAIL_USERS . "` u ON (m.`popaccountid` = u.`id`) diff --git a/lib/Froxlor/Api/Commands/HostingPlans.php b/lib/Froxlor/Api/Commands/HostingPlans.php index 0e39b9c6..a8070198 100644 --- a/lib/Froxlor/Api/Commands/HostingPlans.php +++ b/lib/Froxlor/Api/Commands/HostingPlans.php @@ -33,7 +33,7 @@ class HostingPlans extends \Froxlor\Api\ApiCommand implements \Froxlor\Api\Resou * optional specify offset for resultset * @param array $sql_orderby * optional array with index = fieldname and value = ASC|DESC to order the resultset by one or more fields - * + * * @access admin * @throws \Exception * @return string json-encoded array count|list @@ -76,7 +76,7 @@ class HostingPlans extends \Froxlor\Api\ApiCommand implements \Froxlor\Api\Resou { if ($this->isAdmin()) { $result_stmt = Database::prepare(" - SELECT COUNT(p.*) as num_plans + SELECT COUNT(*) as num_plans FROM `" . TABLE_PANEL_PLANS . "` p, `" . TABLE_PANEL_ADMINS . "` a WHERE `p`.`adminid` = `a`.`adminid`" . ($this->getUserDetail('customers_see_all') ? '' : " AND `p`.`adminid` = :adminid ")); $params = array(); diff --git a/lib/Froxlor/Api/Commands/IpsAndPorts.php b/lib/Froxlor/Api/Commands/IpsAndPorts.php index 54d7a4a2..ef458698 100644 --- a/lib/Froxlor/Api/Commands/IpsAndPorts.php +++ b/lib/Froxlor/Api/Commands/IpsAndPorts.php @@ -82,7 +82,7 @@ class IpsAndPorts extends \Froxlor\Api\ApiCommand implements \Froxlor\Api\Resour SELECT COUNT(*) as num_ips FROM `" . TABLE_PANEL_IPSANDPORTS . "` " . $ip_where); $result = Database::pexecute_first($result_stmt, null, true, true); if ($result) { - return $this->response(200, "successfull", $result['num_plans']); + return $this->response(200, "successfull", $result['num_ips']); } } throw new \Exception("Not allowed to execute given command.", 403); diff --git a/lib/Froxlor/Api/Commands/PhpSettings.php b/lib/Froxlor/Api/Commands/PhpSettings.php index bc3f5d3d..c43c25ff 100644 --- a/lib/Froxlor/Api/Commands/PhpSettings.php +++ b/lib/Froxlor/Api/Commands/PhpSettings.php @@ -133,7 +133,7 @@ class PhpSettings extends \Froxlor\Api\ApiCommand implements \Froxlor\Api\Resour { if ($this->isAdmin()) { $result_stmt = Database::prepare(" - SELECT COUNT(c.*) as num_phps + SELECT COUNT(*) as num_phps FROM `" . TABLE_PANEL_PHPCONFIGS . "` c "); $result = Database::pexecute_first($result_stmt, null, true, true); diff --git a/lib/Froxlor/Api/Commands/SubDomains.php b/lib/Froxlor/Api/Commands/SubDomains.php index 85180bc4..1b25e703 100644 --- a/lib/Froxlor/Api/Commands/SubDomains.php +++ b/lib/Froxlor/Api/Commands/SubDomains.php @@ -811,7 +811,7 @@ class SubDomains extends \Froxlor\Api\ApiCommand implements \Froxlor\Api\Resourc } // prepare select statement $domains_stmt = Database::prepare(" - SELECT COUNT(`d`.*) as num_subdom + SELECT COUNT(*) as num_subdom FROM `" . TABLE_PANEL_DOMAINS . "` `d` LEFT JOIN `" . TABLE_PANEL_DOMAINS . "` `ad` ON `d`.`aliasdomain`=`ad`.`id` LEFT JOIN `" . TABLE_PANEL_DOMAINS . "` `da` ON `da`.`aliasdomain`=`d`.`id`