Changeset 2962

Timestamp:

06/01/10 11:05:49 (21 months ago)

Author:

TheCry

Message:

• [GUI] Fixed #2291: Invalid counters in ../reseller/index.php

Location:

trunk

Files:

• CHANGELOG (modified) (1 diff)
• gui/include/admin-functions.php (modified) (5 diffs)
• gui/include/reseller-functions.php (modified) (2 diffs)

trunk/CHANGELOG

@@ -5 +5 @@
         - GUI:
                 Changed all reseller/*.php files to use the new IspCP_Registry class and the new IspCP_ConfigHandler interface
+                Fixed #2291: Invalid counters in ../reseller/index.php
 
 2010-06-01 Laurent Declercq

trunk/gui/include/admin-functions.php

@@ -1011 +1011 @@
                 AND `mail_type` NOT RLIKE '_catchall'
                 AND `domain_id`";
-                $mail_current = records_count( 'mail_users', $where, $user_id);
+                $mail_current = records_count('mail_users', $where, $user_id);
         }
         $mail_max = $rs->fields['domain_mailacc_limit'];
@@ -1018 +1018 @@
                                                                                         'userid', 'ftp_users', 'userid', '@', '');
 
-        $ftp_current += sub_records_rlike_count('subdomain_name', 'subdomain', 'domain_id', $user_id,
-                                                                                        'userid', 'ftp_users', 'userid', '@', '');
+        //We don't need this query, because we don't have ftpusers for a subdomain! Otherwise the counters count wrong - TheCry
+        /*$ftp_current += sub_records_rlike_count('subdomain_name', 'subdomain', 'domain_id', $user_id,
+                                                                                        'userid', 'ftp_users', 'userid', '@', '');*/
 
         $ftp_current += sub_records_rlike_count('alias_name', 'domain_aliasses', 'domain_id', $user_id,
@@ -1029 +1030 @@
         $sql_db_max = $rs->fields['domain_sqld_limit'];
 
-        $sql_user_current = sub_records_count(  'sqld_id', 'sql_database', 'domain_id', $user_id,
-                                                                                        'sqlu_id', 'sql_user', 'sqld_id', '', '');
+        $sql_user_current = sub_records_count('sqld_id', 'sql_database', 'domain_id', $user_id,
+                                                                                        'sqlu_id', 'sql_user', 'sqld_id', 'sqlu_name', '');
 
         $sql_user_max = $rs->fields['domain_sqlu_limit'];
@@ -1088 +1089 @@
  * @todo implement check for dynamic table/row in SQL query
  */
-function sub_records_count($field, $table, $where, $value, $subfield, $subtable, $subwhere) {
+function sub_records_count($field, $table, $where, $value, $subfield, $subtable, $subwhere, $subgroupname) {
         $sql = Database::getInstance();
 
@@ -1104 +1105 @@
                 return $result;
         }
-        while (!$rs->EOF) {
-                $contents = $rs->fields['field'];
+        if($subgroupname != '') {
+                $sqld_ids = array();
+                while (!$rs->EOF) {
+                        array_push($sqld_ids, $rs->fields['field']);
+                        $rs->MoveNext();
+                }
+                $sqld_ids = implode(",", $sqld_ids);
 
                 if ($subwhere != '') {
-                        $query = "SELECT COUNT(*) AS cnt FROM $subtable WHERE $subwhere = ?";
+                        $query = "SELECT COUNT(DISTINCT $subgroupname) AS cnt FROM $subtable WHERE sqld_id IN ($sqld_ids)";
+                        $subres = exec_query($sql, $query);
+                        $result = $subres->fields['cnt'];
                 } else {
                         return $result;
                 }
-
-                $subres = exec_query($sql, $query, array($contents));
-                $result += $subres->fields['cnt'];
-                $rs->MoveNext();
-        }
-
+        } else {
+                while (!$rs->EOF) {
+                        $contents = $rs->fields['field'];
+                        if ($subwhere != '') {
+                                $query = "SELECT COUNT(*) AS cnt FROM $subtable WHERE $subwhere = ?";
+                        } else {
+                                return $result;
+                        }
+                        $subres = exec_query($sql, $query, array($contents));
+                        $result += $subres->fields['cnt'];
+                        $rs->MoveNext();
+                }
+        }
         return $result;
 }

trunk/gui/include/reseller-functions.php

@@ -591 +591 @@
                 );
 
-        $ftp_current += sub_records_rlike_count('subdomain_name', 'subdomain', 'domain_id', $user_id,
+        //We don't need this query, because we don't have ftpusers for a subdomain! Otherwise the counters count wrong - TheCry
+        /*$ftp_current += sub_records_rlike_count('subdomain_name', 'subdomain', 'domain_id', $user_id,
                 'userid', 'ftp_users', 'userid', '@', ''
-                );
+                );*/
 
         $ftp_current += sub_records_rlike_count('alias_name', 'domain_aliasses', 'domain_id', $user_id,
@@ -1799 +1800 @@
                 SELECT
                         COUNT(`domain_id`) AS crn_domains,
-                        IFNULL(SUM(`domain_subd_limit`), 0) AS current_sub_cnt,
-                        IFNULL(SUM(`domain_alias_limit`), 0) AS current_als_cnt,
-                        IFNULL(SUM(`domain_mailacc_limit`), 0) AS current_mail_cnt,
-                        IFNULL(SUM(`domain_ftpacc_limit`), 0) AS current_ftp_cnt,
-                        IFNULL(SUM(`domain_sqld_limit`), 0) AS current_sql_db_cnt,
-                        IFNULL(SUM(`domain_sqlu_limit`), 0) AS current_sql_user_cnt,
+                        IFNULL(SUM(IF(`domain_subd_limit` >= 0, `domain_subd_limit`, 0)), 0) AS current_sub_cnt,
+                        IFNULL(SUM(IF(`domain_alias_limit` >= 0, `domain_alias_limit`, 0)), 0) AS current_als_cnt,
+                        IFNULL(SUM(IF(`domain_mailacc_limit` >= 0, `domain_mailacc_limit`, 0)), 0) AS current_mail_cnt,
+                        IFNULL(SUM(IF(`domain_ftpacc_limit` >= 0, `domain_ftpacc_limit`, 0)), 0) AS current_ftp_cnt,
+                        IFNULL(SUM(IF(`domain_sqld_limit` >= 0, `domain_sqld_limit`, 0)), 0) AS current_sql_db_cnt,
+                        IFNULL(SUM(IF(`domain_sqlu_limit` >= 0, `domain_sqlu_limit`, 0)), 0) AS current_sql_user_cnt,
                         IFNULL(SUM(`domain_disk_limit`), 0) AS current_disk_amnt,
                         IFNULL(SUM(`domain_traffic_limit`), 0) AS current_traff_amnt