diff --git a/interface/web/sites/templates/web_sites_stats_list.htm b/interface/web/sites/templates/web_sites_stats_list.htm index 475c9d1b9ca058be15d04d579120dbe823061fcc..3e0642489b82e7589457e0a69e610707426a9861 100644 --- a/interface/web/sites/templates/web_sites_stats_list.htm +++ b/interface/web/sites/templates/web_sites_stats_list.htm @@ -29,20 +29,20 @@ - {tmpl_var name="domain"} - {tmpl_var name="this_month"} MB - {tmpl_var name="last_month"} MB - {tmpl_var name="this_year"} MB - {tmpl_var name="last_year"} MB + {tmpl_var name="domain"} + {tmpl_var name="this_month"} MB + {tmpl_var name="last_month"} MB + {tmpl_var name="this_year"} MB + {tmpl_var name="last_year"} MB - {tmpl_var name="sum_txt"} - {tmpl_var name="sum_this_month"} MB - {tmpl_var name="sum_last_month"} MB - {tmpl_var name="sum_this_year"} MB - {tmpl_var name="sum_last_year"} MB + {tmpl_var name="sum_txt"} + {tmpl_var name="sum_this_month"} MB + {tmpl_var name="sum_last_month"} MB + {tmpl_var name="sum_this_year"} MB + {tmpl_var name="sum_last_year"} MB
diff --git a/interface/web/sites/web_sites_stats.php b/interface/web/sites/web_sites_stats.php index 98c4865fde0621db38275c0ee92290afd88feb92..bd7acb6423d5e984fcd0962967676d1f15f667e0 100644 --- a/interface/web/sites/web_sites_stats.php +++ b/interface/web/sites/web_sites_stats.php @@ -82,7 +82,7 @@ class list_action extends listform_actions { } $list = new list_action; -$list->SQLExtWhere = "type = 'vhost'"; +$list->SQLExtWhere = "(type = 'vhost' or type = 'vhostsubdomain')"; $list->SQLOrderBy = 'ORDER BY domain'; $list->onLoad(); diff --git a/server/cron_daily.php b/server/cron_daily.php index cd86c1ca0fce9cbde1563a9d84f19b37c2b7432c..066fa4dc9bb8f766b1ec64fdd3a31a4af243fd9f 100644 --- a/server/cron_daily.php +++ b/server/cron_daily.php @@ -452,7 +452,7 @@ if ($app->dbmaster == $app->db) { $current_month = date('Y-m'); //* Check website traffic quota - $sql = "SELECT sys_groupid,domain_id,domain,traffic_quota,traffic_quota_lock FROM web_domain WHERE (traffic_quota > 0 or traffic_quota_lock = 'y') and type = 'vhost'"; + $sql = "SELECT sys_groupid,domain_id,domain,traffic_quota,traffic_quota_lock FROM web_domain WHERE (traffic_quota > 0 or traffic_quota_lock = 'y') and (type = 'vhost' OR type = 'vhostsubdomain')"; $records = $app->db->queryAllRecords($sql); if(is_array($records)) { foreach($records as $rec) { @@ -592,7 +592,7 @@ if($backup_dir != '') { chmod(escapeshellcmd($backup_dir), $backup_dir_permissions); } - $sql = "SELECT * FROM web_domain WHERE server_id = '".$conf['server_id']."' AND type = 'vhost' AND backup_interval != 'none'"; + $sql = "SELECT * FROM web_domain WHERE server_id = '".$conf['server_id']."' AND (type = 'vhost' OR type = 'vhostsubdomain') AND backup_interval != 'none'"; $records = $app->db->queryAllRecords($sql); if(is_array($records)) { foreach($records as $rec) {