diff --git a/admin_admins.php b/admin_admins.php index 83c50549..eeb5c8e5 100644 --- a/admin_admins.php +++ b/admin_admins.php @@ -63,6 +63,8 @@ if($page == 'admins' 'email_forwarders_used' => $lng['customer']['forwarders'] . ' (' . $lng['panel']['used'] . ')', 'email_quota' => $lng['customer']['email_quota'], 'email_quota_used' => $lng['customer']['email_quota'] . ' (' . $lng['panel']['used'] . ')', + 'email_autoresponder' => $lng['customer']['autoresponder'], + 'email_autoresponder_used' => $lng['customer']['autoresponder'] . ' (' . $lng['panel']['used'] . ')', 'deactivated' => $lng['admin']['deactivated'] ); $paging = new paging($userinfo, $db, TABLE_PANEL_ADMINS, $fields, $settings['panel']['paging'], $settings['panel']['natsorting']); @@ -84,7 +86,7 @@ if($page == 'admins' $row['traffic'] = round($row['traffic'] / (1024 * 1024), $settings['panel']['decimal_places']); $row['diskspace_used'] = round($row['diskspace_used'] / 1024, $settings['panel']['decimal_places']); $row['diskspace'] = round($row['diskspace'] / 1024, $settings['panel']['decimal_places']); - $row = str_replace_array('-1', 'UL', $row, 'customers domains diskspace traffic mysqls emails email_accounts email_forwarders email_quota ftps subdomains tickets'); + $row = str_replace_array('-1', 'UL', $row, 'customers domains diskspace traffic mysqls emails email_accounts email_forwarders email_quota email_autoresponder ftps subdomains tickets'); $row = htmlentities_array($row); eval("\$admins.=\"" . getTemplate("admins/admins_admin") . "\";"); $count++; @@ -213,6 +215,20 @@ if($page == 'admins' $email_quota = - 1; } + if($settings['autoresponder']['autoresponder_active'] == '1') + { + $email_autoresponder = intval_ressource($_POST['email_autoresponder']); + + if(isset($_POST['email_autoresponder_ul'])) + { + $email_autoresponder = - 1; + } + } + else + { + $email_autoresponder = 0; + } + $ftps = intval_ressource($_POST['ftps']); if(isset($_POST['ftps_ul'])) @@ -224,8 +240,7 @@ if($page == 'admins' { $tickets = intval_ressource($_POST['tickets']); - if(isset($_POST['tickets_ul']) - && $settings['ticket']['enabled'] == '1') + if(isset($_POST['tickets_ul'])) { $tickets = - 1; } @@ -345,8 +360,8 @@ if($page == 'admins' $change_serversettings = '0'; } - $result = $db->query("INSERT INTO `" . TABLE_PANEL_ADMINS . "` (`loginname`, `password`, `name`, `email`, `def_language`, `change_serversettings`, `customers`, `customers_see_all`, `domains`, `domains_see_all`, `caneditphpsettings`, `diskspace`, `traffic`, `subdomains`, `emails`, `email_accounts`, `email_forwarders`, `email_quota`, `ftps`, `tickets`, `mysqls`, `ip`, `can_manage_aps_packages`, `aps_packages`) - VALUES ('" . $db->escape($loginname) . "', '" . md5($password) . "', '" . $db->escape($name) . "', '" . $db->escape($email) . "','" . $db->escape($def_language) . "', '" . $db->escape($change_serversettings) . "', '" . $db->escape($customers) . "', '" . $db->escape($customers_see_all) . "', '" . $db->escape($domains) . "', '" . $db->escape($domains_see_all) . "', '" . (int)$caneditphpsettings . "', '" . $db->escape($diskspace) . "', '" . $db->escape($traffic) . "', '" . $db->escape($subdomains) . "', '" . $db->escape($emails) . "', '" . $db->escape($email_accounts) . "', '" . $db->escape($email_forwarders) . "', '" . $db->escape($email_quota) . "', '" . $db->escape($ftps) . "', '" . $db->escape($tickets) . "', '" . $db->escape($mysqls) . "', '" . (int)$ipaddress . "', " . (int)$can_manage_aps_packages . ", " . (int)$number_of_aps_packages . ")"); + $result = $db->query("INSERT INTO `" . TABLE_PANEL_ADMINS . "` (`loginname`, `password`, `name`, `email`, `def_language`, `change_serversettings`, `customers`, `customers_see_all`, `domains`, `domains_see_all`, `caneditphpsettings`, `diskspace`, `traffic`, `subdomains`, `emails`, `email_accounts`, `email_forwarders`, `email_quota`, `ftps`, `tickets`, `mysqls`, `ip`, `can_manage_aps_packages`, `aps_packages`, `email_autoresponder`) + VALUES ('" . $db->escape($loginname) . "', '" . md5($password) . "', '" . $db->escape($name) . "', '" . $db->escape($email) . "','" . $db->escape($def_language) . "', '" . $db->escape($change_serversettings) . "', '" . $db->escape($customers) . "', '" . $db->escape($customers_see_all) . "', '" . $db->escape($domains) . "', '" . $db->escape($domains_see_all) . "', '" . (int)$caneditphpsettings . "', '" . $db->escape($diskspace) . "', '" . $db->escape($traffic) . "', '" . $db->escape($subdomains) . "', '" . $db->escape($emails) . "', '" . $db->escape($email_accounts) . "', '" . $db->escape($email_forwarders) . "', '" . $db->escape($email_quota) . "', '" . $db->escape($ftps) . "', '" . $db->escape($tickets) . "', '" . $db->escape($mysqls) . "', '" . (int)$ipaddress . "', " . (int)$can_manage_aps_packages . ", " . (int)$number_of_aps_packages . ", " . $db->escape($email_autoresponder) . ")"); $adminid = $db->insert_id(); $log->logAction(ADM_ACTION, LOG_INFO, "added admin '" . $loginname . "'"); redirectTo($filename, Array('page' => $page, 's' => $s)); @@ -388,6 +403,7 @@ if($page == 'admins' $email_accounts_ul = makecheckbox('email_accounts_ul', $lng['customer']['unlimited'], '-1', false, '0', true, true); $email_forwarders_ul = makecheckbox('email_forwarders_ul', $lng['customer']['unlimited'], '-1', false, '0', true, true); $email_quota_ul = makecheckbox('email_quota_ul', $lng['customer']['unlimited'], '-1', false, '0', true, true); + $email_autoresponder_ul = makecheckbox('email_autoresponder_ul', $lng['customer']['unlimited'], '-1', false, '0', true, true); $ftps_ul = makecheckbox('ftps_ul', $lng['customer']['unlimited'], '-1', false, '0', true, true); $tickets_ul = makecheckbox('tickets_ul', $lng['customer']['unlimited'], '-1', false, '0', true, true); $mysqls_ul = makecheckbox('mysqls_ul', $lng['customer']['unlimited'], '-1', false, '0', true, true); @@ -426,6 +442,7 @@ if($page == 'admins' $email_accounts = $result['email_accounts']; $email_forwarders = $result['email_forwarders']; $email_quota = $result['email_quota']; + $email_autoresponder = $result['email_autoresponder']; $ftps = $result['ftps']; $tickets = $result['tickets']; $mysqls = $result['mysqls']; @@ -500,6 +517,20 @@ if($page == 'admins' $email_quota = - 1; } + if($settings['autoresponder']['autoresponder_active'] == '1') + { + $email_autoresponder = intval_ressource($_POST['email_autoresponder']); + + if(isset($_POST['email_autoresponder_ul'])) + { + $email_autoresponder = - 1; + } + } + else + { + $email_autoresponder = 0; + } + $ftps = intval_ressource($_POST['ftps']); if(isset($_POST['ftps_ul'])) @@ -609,7 +640,7 @@ if($page == 'admins' $change_serversettings = '0'; } - $db->query("UPDATE `" . TABLE_PANEL_ADMINS . "` SET `name`='" . $db->escape($name) . "', `email`='" . $db->escape($email) . "', `def_language`='" . $db->escape($def_language) . "', `change_serversettings` = '" . $db->escape($change_serversettings) . "', `customers` = '" . $db->escape($customers) . "', `customers_see_all` = '" . $db->escape($customers_see_all) . "', `domains` = '" . $db->escape($domains) . "', `domains_see_all` = '" . $db->escape($domains_see_all) . "', `caneditphpsettings` = '" . (int)$caneditphpsettings . "', `password` = '" . $password . "', `diskspace`='" . $db->escape($diskspace) . "', `traffic`='" . $db->escape($traffic) . "', `subdomains`='" . $db->escape($subdomains) . "', `emails`='" . $db->escape($emails) . "', `email_accounts` = '" . $db->escape($email_accounts) . "', `email_forwarders`='" . $db->escape($email_forwarders) . "', `email_quota`='" . $db->escape($email_quota) . "', `ftps`='" . $db->escape($ftps) . "', `tickets`='" . $db->escape($tickets) . "', `mysqls`='" . $db->escape($mysqls) . "', `ip`='" . (int)$ipaddress . "', `deactivated`='" . $db->escape($deactivated) . "', `can_manage_aps_packages`=" . (int)$can_manage_aps_packages . ", `aps_packages`=" . (int)$number_of_aps_packages . " WHERE `adminid`='" . $db->escape($id) . "'"); + $db->query("UPDATE `" . TABLE_PANEL_ADMINS . "` SET `name`='" . $db->escape($name) . "', `email`='" . $db->escape($email) . "', `def_language`='" . $db->escape($def_language) . "', `change_serversettings` = '" . $db->escape($change_serversettings) . "', `customers` = '" . $db->escape($customers) . "', `customers_see_all` = '" . $db->escape($customers_see_all) . "', `domains` = '" . $db->escape($domains) . "', `domains_see_all` = '" . $db->escape($domains_see_all) . "', `caneditphpsettings` = '" . (int)$caneditphpsettings . "', `password` = '" . $password . "', `diskspace`='" . $db->escape($diskspace) . "', `traffic`='" . $db->escape($traffic) . "', `subdomains`='" . $db->escape($subdomains) . "', `emails`='" . $db->escape($emails) . "', `email_accounts` = '" . $db->escape($email_accounts) . "', `email_forwarders`='" . $db->escape($email_forwarders) . "', `email_quota`='" . $db->escape($email_quota) . "', `email_autoresponder`='" . $db->escape($email_autoresponder) . "', `ftps`='" . $db->escape($ftps) . "', `tickets`='" . $db->escape($tickets) . "', `mysqls`='" . $db->escape($mysqls) . "', `ip`='" . (int)$ipaddress . "', `deactivated`='" . $db->escape($deactivated) . "', `can_manage_aps_packages`=" . (int)$can_manage_aps_packages . ", `aps_packages`=" . (int)$number_of_aps_packages . " WHERE `adminid`='" . $db->escape($id) . "'"); $log->logAction(ADM_ACTION, LOG_INFO, "edited admin '#" . $id . "'"); $redirect_props = Array( 'page' => $page, @@ -687,6 +718,13 @@ if($page == 'admins' $result['email_quota'] = ''; } + $email_autoresponder_ul = makecheckbox('email_autoresponder_ul', $lng['customer']['unlimited'], '-1', false, $result['email_autoresponder'], true, true); + + if($result['email_autoresponder'] == '-1') + { + $result['email_autoresponder'] = ''; + } + $ftps_ul = makecheckbox('ftps_ul', $lng['customer']['unlimited'], '-1', false, $result['ftps'], true, true); if($result['ftps'] == '-1') diff --git a/admin_customers.php b/admin_customers.php index c966bedf..e74ebbb6 100644 --- a/admin_customers.php +++ b/admin_customers.php @@ -76,6 +76,12 @@ if($page == 'customers' $fields['c.tickets'] = $lng['customer']['tickets']; $fields['c.tickets_used'] = $lng['customer']['tickets'] . ' (' . $lng['panel']['used'] . ')'; } + + if($settings['autoresponder']['autoresponder_active'] == 1) + { + $fields['c.email_autoresponder'] = $lng['customer']['autoresponder']; + $fields['c.email_autoresponder_used'] = $lng['customer']['autoresponder'] . ' (' . $lng['panel']['used'] . ')'; + } $paging = new paging($userinfo, $db, TABLE_PANEL_CUSTOMERS, $fields, $settings['panel']['paging'], $settings['panel']['natsorting']); $customers = ''; @@ -107,7 +113,7 @@ if($page == 'customers' $column_style = ' style="background-color: #f99122;"'; } - $row = str_replace_array('-1', 'UL', $row, 'diskspace traffic mysqls emails email_accounts email_forwarders ftps tickets subdomains'); + $row = str_replace_array('-1', 'UL', $row, 'diskspace traffic mysqls emails email_accounts email_forwarders ftps tickets subdomains email_autoresponder'); $row = htmlentities_array($row); eval("\$customers.=\"" . getTemplate("customers/customers_customer") . "\";"); $count++; @@ -242,6 +248,11 @@ if($page == 'customers' $admin_update_query.= ", `email_quota_used` = `email_quota_used` - 0" . (int)$result['email_quota']; } + if($result['email_autoresponder'] != '-1') + { + $admin_update_query.= ", `email_autoresponder` = `email_autoresponder` - 0" . (int)$result['email_autoresponder']; + } + if($result['subdomains'] != '-1') { $admin_update_query.= ", `subdomains_used` = `subdomains_used` - 0" . (int)$result['subdomains']; @@ -380,6 +391,20 @@ if($page == 'customers' { $email_quota = - 1; } + + if($settings['autoresponder']['autoresponder_active'] == '1') + { + $email_autoresponder = intval_ressource($_POST['email_autoresponder']); + + if(isset($_POST['email_autoresponder_ul'])) + { + $email_autoresponder = - 1; + } + } + else + { + $email_autoresponder = 0; + } $email_imap = intval_ressource($_POST['email_imap']); $email_pop3 = intval_ressource($_POST['email_pop3']); @@ -435,6 +460,7 @@ if($page == 'customers' || ((($userinfo['email_accounts_used'] + $email_accounts) > $userinfo['email_accounts']) && $userinfo['email_accounts'] != '-1') || ((($userinfo['email_forwarders_used'] + $email_forwarders) > $userinfo['email_forwarders']) && $userinfo['email_forwarders'] != '-1') || ((($userinfo['email_quota_used'] + $email_quota) > $userinfo['email_quota']) && $userinfo['email_quota'] != '-1' && $settings['system']['mail_quota_enabled'] == '1') + || ((($userinfo['email_autoresponder_used'] + $email_autoresponder) > $userinfo['email_autoresponder']) && $userinfo['email_autoresponder'] != '-1' && $settings['autoresponder']['autoresponder_active'] == '1') || ((($userinfo['ftps_used'] + $ftps) > $userinfo['ftps']) && $userinfo['ftps'] != '-1') || ((($userinfo['tickets_used'] + $tickets) > $userinfo['tickets']) && $userinfo['tickets'] != '-1') || ((($userinfo['subdomains_used'] + $subdomains) > $userinfo['subdomains']) && $userinfo['subdomains'] != '-1') @@ -445,6 +471,7 @@ if($page == 'customers' || ($email_accounts == '-1' && $userinfo['email_accounts'] != '-1') || ($email_forwarders == '-1' && $userinfo['email_forwarders'] != '-1') || ($email_quota == '-1' && $userinfo['email_quota'] != '-1' && $settings['system']['mail_quota_enabled'] == '1') + || ($email_autoresponder == '-1' && $userinfo['email_autoresponder'] != '-1' && $settings['autoresponder']['autoresponder_active'] == '1') || ($ftps == '-1' && $userinfo['ftps'] != '-1') || ($tickets == '-1' && $userinfo['tickets'] != '-1') || ($subdomains == '-1' && $userinfo['subdomains'] != '-1') @@ -538,7 +565,7 @@ if($page == 'customers' $password = substr(md5(uniqid(microtime(), 1)), 12, 6); } - $result = $db->query("INSERT INTO `" . TABLE_PANEL_CUSTOMERS . "` (`adminid`, `loginname`, `password`, `name`, `firstname`, `company`, `street`, `zipcode`, `city`, `phone`, `fax`, `email`, `customernumber`, `def_language`, `documentroot`, `guid`, `diskspace`, `traffic`, `subdomains`, `emails`, `email_accounts`, `email_forwarders`, `email_quota`, `ftps`, `tickets`, `mysqls`, `standardsubdomain`, `phpenabled`, `imap`, `pop3`, `aps_packages`, `perlenabled`) VALUES ('" . (int)$userinfo['adminid'] . "', '" . $db->escape($loginname) . "', '" . md5($password) . "', '" . $db->escape($name) . "', '" . $db->escape($firstname) . "', '" . $db->escape($company) . "', '" . $db->escape($street) . "', '" . $db->escape($zipcode) . "', '" . $db->escape($city) . "', '" . $db->escape($phone) . "', '" . $db->escape($fax) . "', '" . $db->escape($email) . "', '" . $db->escape($customernumber) . "','" . $db->escape($def_language) . "', '" . $db->escape($documentroot) . "', '" . $db->escape($guid) . "', '" . $db->escape($diskspace) . "', '" . $db->escape($traffic) . "', '" . $db->escape($subdomains) . "', '" . $db->escape($emails) . "', '" . $db->escape($email_accounts) . "', '" . $db->escape($email_forwarders) . "', '" . $db->escape($email_quota) . "', '" . $db->escape($ftps) . "', '" . $db->escape($tickets) . "', '" . $db->escape($mysqls) . "', '0', '" . $db->escape($phpenabled) . "', '" . $db->escape($email_imap) . "', '" . $db->escape($email_pop3) . "', '" . (int)$number_of_aps_packages . "', '" . $db->escape($perlenabled) . "')"); + $result = $db->query("INSERT INTO `" . TABLE_PANEL_CUSTOMERS . "` (`adminid`, `loginname`, `password`, `name`, `firstname`, `company`, `street`, `zipcode`, `city`, `phone`, `fax`, `email`, `customernumber`, `def_language`, `documentroot`, `guid`, `diskspace`, `traffic`, `subdomains`, `emails`, `email_accounts`, `email_forwarders`, `email_quota`, `ftps`, `tickets`, `mysqls`, `standardsubdomain`, `phpenabled`, `imap`, `pop3`, `aps_packages`, `perlenabled`, `email_autoresponder`) VALUES ('" . (int)$userinfo['adminid'] . "', '" . $db->escape($loginname) . "', '" . md5($password) . "', '" . $db->escape($name) . "', '" . $db->escape($firstname) . "', '" . $db->escape($company) . "', '" . $db->escape($street) . "', '" . $db->escape($zipcode) . "', '" . $db->escape($city) . "', '" . $db->escape($phone) . "', '" . $db->escape($fax) . "', '" . $db->escape($email) . "', '" . $db->escape($customernumber) . "','" . $db->escape($def_language) . "', '" . $db->escape($documentroot) . "', '" . $db->escape($guid) . "', '" . $db->escape($diskspace) . "', '" . $db->escape($traffic) . "', '" . $db->escape($subdomains) . "', '" . $db->escape($emails) . "', '" . $db->escape($email_accounts) . "', '" . $db->escape($email_forwarders) . "', '" . $db->escape($email_quota) . "', '" . $db->escape($ftps) . "', '" . $db->escape($tickets) . "', '" . $db->escape($mysqls) . "', '0', '" . $db->escape($phpenabled) . "', '" . $db->escape($email_imap) . "', '" . $db->escape($email_pop3) . "', '" . (int)$number_of_aps_packages . "', '" . $db->escape($perlenabled) . "', '" . $db->escape($email_autoresponder) . "')"); $customerid = $db->insert_id(); $admin_update_query = "UPDATE `" . TABLE_PANEL_ADMINS . "` SET `customers_used` = `customers_used` + 1"; @@ -567,6 +594,12 @@ if($page == 'customers' $admin_update_query.= ", `email_quota_used` = `email_quota_used` + 0" . (int)$email_quota; } + if($email_autoresponder != '-1' + && $settings['autoresponder']['autoresponder_active'] == 1) + { + $admin_update_query.= ", `email_autoresponder_used` = `email_autoresponder_used` + 0" . (int)$email_autoresponder; + } + if($subdomains != '-1') { $admin_update_query.= ", `subdomains_used` = `subdomains_used` + 0" . (int)$subdomains; @@ -728,6 +761,7 @@ if($page == 'customers' $email_accounts_ul = makecheckbox('email_accounts_ul', $lng['customer']['unlimited'], '-1', false, '0', true, true); $email_forwarders_ul = makecheckbox('email_forwarders_ul', $lng['customer']['unlimited'], '-1', false, '0', true, true); $email_quota_ul = makecheckbox('email_quota_ul', $lng['customer']['unlimited'], '-1', false, '0', true, true); + $email_autoresponder_ul = makecheckbox('email_autoresponder_ul', $lng['customer']['unlimited'], '-1', false, '0', true, true); $ftps_ul = makecheckbox('ftps_ul', $lng['customer']['unlimited'], '-1', false, '0', true, true); $tickets_ul = makecheckbox('tickets_ul', $lng['customer']['unlimited'], '-1', false, '0', true, true); $mysqls_ul = makecheckbox('mysqls_ul', $lng['customer']['unlimited'], '-1', false, '0', true, true); @@ -821,6 +855,20 @@ if($page == 'customers' $email_quota = - 1; } + if($settings['autoresponder']['autoresponder_active'] == '1') + { + $email_autoresponder = intval_ressource($_POST['email_autoresponder']); + + if(isset($_POST['email_autoresponder_ul'])) + { + $email_autoresponder = - 1; + } + } + else + { + $email_autoresponder = 0; + } + $email_imap = intval_ressource($_POST['email_imap']); $email_pop3 = intval_ressource($_POST['email_pop3']); $ftps = intval_ressource($_POST['ftps']); @@ -872,6 +920,7 @@ if($page == 'customers' || ((($userinfo['email_accounts_used'] + $email_accounts - $result['email_accounts']) > $userinfo['email_accounts']) && $userinfo['email_accounts'] != '-1') || ((($userinfo['email_forwarders_used'] + $email_forwarders - $result['email_forwarders']) > $userinfo['email_forwarders']) && $userinfo['email_forwarders'] != '-1') || ((($userinfo['email_quota_used'] + $email_quota - $result['email_quota']) > $userinfo['email_quota']) && $userinfo['email_quota'] != '-1' && $settings['system']['mail_quota_enabled'] == '1') + || ((($userinfo['email_autoresponder_used'] + $email_autoresponder - $result['email_autoresponder']) > $userinfo['email_autoresponder']) && $userinfo['email_autoresponder'] != '-1' && $settings['autoresponder']['autoresponder_active'] == '1') || ((($userinfo['ftps_used'] + $ftps - $result['ftps']) > $userinfo['ftps']) && $userinfo['ftps'] != '-1') || ((($userinfo['tickets_used'] + $tickets - $result['tickets']) > $userinfo['tickets']) && $userinfo['tickets'] != '-1') || ((($userinfo['subdomains_used'] + $subdomains - $result['subdomains']) > $userinfo['subdomains']) && $userinfo['subdomains'] != '-1') @@ -882,6 +931,7 @@ if($page == 'customers' || ($email_accounts == '-1' && $userinfo['email_accounts'] != '-1') || ($email_forwarders == '-1' && $userinfo['email_forwarders'] != '-1') || ($email_quota == '-1' && $userinfo['email_quota'] != '-1' && $settings['system']['mail_quota_enabled'] == '1') + || ($email_autoresponder == '-1' && $userinfo['email_autoresponder'] != '-1' && $settings['autoresponder']['autoresponder_active'] == '1') || ($ftps == '-1' && $userinfo['ftps'] != '-1') || ($tickets == '-1' && $userinfo['tickets'] != '-1') || ($subdomains == '-1' && $userinfo['subdomains'] != '-1') @@ -1001,7 +1051,7 @@ if($page == 'customers' $db->query("UPDATE `" . TABLE_MAIL_USERS . "` SET `imap`='" . (int)$email_imap . "' WHERE `customerid`='" . (int)$id . "'"); } - $db->query("UPDATE `" . TABLE_PANEL_CUSTOMERS . "` SET `name`='" . $db->escape($name) . "', `firstname`='" . $db->escape($firstname) . "', `company`='" . $db->escape($company) . "', `street`='" . $db->escape($street) . "', `zipcode`='" . $db->escape($zipcode) . "', `city`='" . $db->escape($city) . "', `phone`='" . $db->escape($phone) . "', `fax`='" . $db->escape($fax) . "', `email`='" . $db->escape($email) . "', `customernumber`='" . $db->escape($customernumber) . "', `def_language`='" . $db->escape($def_language) . "', `password` = '" . $password . "', `diskspace`='" . $db->escape($diskspace) . "', `traffic`='" . $db->escape($traffic) . "', `subdomains`='" . $db->escape($subdomains) . "', `emails`='" . $db->escape($emails) . "', `email_accounts` = '" . $db->escape($email_accounts) . "', `email_forwarders`='" . $db->escape($email_forwarders) . "', `ftps`='" . $db->escape($ftps) . "', `tickets`='" . $db->escape($tickets) . "', `mysqls`='" . $db->escape($mysqls) . "', `deactivated`='" . $db->escape($deactivated) . "', `phpenabled`='" . $db->escape($phpenabled) . "', `email_quota`='" . $db->escape($email_quota) . "', `imap`='" . $db->escape($email_imap) . "', `pop3`='" . $db->escape($email_pop3) . "', `aps_packages`='" . (int)$number_of_aps_packages . "', `perlenabled`='" . $db->escape($perlenabled) . "' WHERE `customerid`='" . (int)$id . "'"); + $db->query("UPDATE `" . TABLE_PANEL_CUSTOMERS . "` SET `name`='" . $db->escape($name) . "', `firstname`='" . $db->escape($firstname) . "', `company`='" . $db->escape($company) . "', `street`='" . $db->escape($street) . "', `zipcode`='" . $db->escape($zipcode) . "', `city`='" . $db->escape($city) . "', `phone`='" . $db->escape($phone) . "', `fax`='" . $db->escape($fax) . "', `email`='" . $db->escape($email) . "', `customernumber`='" . $db->escape($customernumber) . "', `def_language`='" . $db->escape($def_language) . "', `password` = '" . $password . "', `diskspace`='" . $db->escape($diskspace) . "', `traffic`='" . $db->escape($traffic) . "', `subdomains`='" . $db->escape($subdomains) . "', `emails`='" . $db->escape($emails) . "', `email_accounts` = '" . $db->escape($email_accounts) . "', `email_forwarders`='" . $db->escape($email_forwarders) . "', `ftps`='" . $db->escape($ftps) . "', `tickets`='" . $db->escape($tickets) . "', `mysqls`='" . $db->escape($mysqls) . "', `deactivated`='" . $db->escape($deactivated) . "', `phpenabled`='" . $db->escape($phpenabled) . "', `email_quota`='" . $db->escape($email_quota) . "', `imap`='" . $db->escape($email_imap) . "', `pop3`='" . $db->escape($email_pop3) . "', `aps_packages`='" . (int)$number_of_aps_packages . "', `perlenabled`='" . $db->escape($perlenabled) . "', `email_autoresponder`='" . $db->escape($email_autoresponder) . "' WHERE `customerid`='" . (int)$id . "'"); $admin_update_query = "UPDATE `" . TABLE_PANEL_ADMINS . "` SET `customers_used` = `customers_used` "; if($mysqls != '-1' @@ -1084,6 +1134,22 @@ if($page == 'customers' } } + if($email_autoresponder != '-1' + || $result['email_autoresponder'] != '-1') + { + $admin_update_query.= ", `email_autoresponder_used` = `email_autoresponder_used` "; + + if($email_autoresponder != '-1') + { + $admin_update_query.= " + 0" . (int)$email_autoresponder . " "; + } + + if($result['email_autoresponder'] != '-1') + { + $admin_update_query.= " - 0" . (int)$result['email_autoresponder'] . " "; + } + } + if($subdomains != '-1' || $result['subdomains'] != '-1') { @@ -1236,6 +1302,13 @@ if($page == 'customers' $result['email_quota'] = ''; } + $email_autoresponder_ul = makecheckbox('email_autoresponder_ul', $lng['customer']['unlimited'], '-1', false, $result['email_autoresponder'], true, true); + + if($result['email_autoresponder'] == '-1') + { + $result['email_autoresponder'] = ''; + } + $ftps_ul = makecheckbox('ftps_ul', $lng['customer']['unlimited'], '-1', false, $result['ftps'], true, true); if($result['ftps'] == '-1') diff --git a/admin_index.php b/admin_index.php index 573d03ea..a0155df9 100644 --- a/admin_index.php +++ b/admin_index.php @@ -61,6 +61,7 @@ if($page == 'overview') SUM(`email_accounts_used`) AS `email_accounts_used`, SUM(`email_forwarders_used`) AS `email_forwarders_used`, SUM(`email_quota_used`) AS `email_quota_used`, + SUM(`email_autoresponder_used`) AS `email_autoresponder_used`, SUM(`ftps_used`) AS `ftps_used`, SUM(`tickets_used`) AS `tickets_used`, SUM(`subdomains_used`) AS `subdomains_used`, @@ -140,7 +141,7 @@ if($page == 'overview') $userinfo['diskspace_used'] = round($userinfo['diskspace_used'] / 1024, $settings['panel']['decimal_places']); $userinfo['traffic'] = round($userinfo['traffic'] / (1024 * 1024), $settings['panel']['decimal_places']); $userinfo['traffic_used'] = round($userinfo['traffic_used'] / (1024 * 1024), $settings['panel']['decimal_places']); - $userinfo = str_replace_array('-1', $lng['customer']['unlimited'], $userinfo, 'customers domains diskspace traffic mysqls emails email_accounts email_forwarders email_quota ftps tickets subdomains aps_packages'); + $userinfo = str_replace_array('-1', $lng['customer']['unlimited'], $userinfo, 'customers domains diskspace traffic mysqls emails email_accounts email_forwarders email_quota email_autoresponder ftps tickets subdomains aps_packages'); $cron_last_runs = getCronjobsLastRun(); $outstanding_tasks = getOutstandingTasks(); @@ -185,7 +186,7 @@ if($page == 'overview') } // Try to get the uptime - // First: With exec (let's hope it's enabled for the SysCP - vHost) + // First: With exec (let's hope it's enabled for the Froxlor - vHost) $uptime_array = explode(" ", @file_get_contents("/proc/uptime")); diff --git a/customer_autoresponder.php b/customer_autoresponder.php index a20add7d..616b004d 100644 --- a/customer_autoresponder.php +++ b/customer_autoresponder.php @@ -87,6 +87,7 @@ if($action == "add") `subject` = '" . $db->escape($subject) . "', `customerid` = '" . $db->escape((int)$userinfo['customerid']) . "' "); + $db->query("UPDATE `" . TABLE_PANEL_CUSTOMERS . "` SET `email_autoresponder_used` = `email_autoresponder_used` + 1 WHERE `customerid` = '" . $db->escape((int)$userinfo['customerid']). "'"); redirectTo($filename, Array('s' => $s)); } @@ -265,6 +266,7 @@ if($action == "delete") WHERE `email` = '" . $db->escape($account) . "' AND `customerid` = '" . $db->escape((int)$userinfo['customerid']) . "' "); + $db->query("UPDATE `" . TABLE_PANEL_CUSTOMERS . "` SET `email_autoresponder_used` = `email_autoresponder_used` - 1 WHERE `customerid` = '" . $db->escape((int)$userinfo['customerid']). "'"); redirectTo($filename, Array('s' => $s)); } diff --git a/customer_index.php b/customer_index.php index 589f3775..1593442c 100644 --- a/customer_index.php +++ b/customer_index.php @@ -67,7 +67,7 @@ if($page == 'overview') $userinfo['diskspace_used'] = round($userinfo['diskspace_used'] / 1024, $settings['panel']['decimal_places']); $userinfo['traffic'] = round($userinfo['traffic'] / (1024 * 1024), $settings['panel']['decimal_places']); $userinfo['traffic_used'] = round($userinfo['traffic_used'] / (1024 * 1024), $settings['panel']['decimal_places']); - $userinfo = str_replace_array('-1', $lng['customer']['unlimited'], $userinfo, 'diskspace traffic mysqls emails email_accounts email_forwarders email_quota ftps tickets subdomains aps_packages'); + $userinfo = str_replace_array('-1', $lng['customer']['unlimited'], $userinfo, 'diskspace traffic mysqls emails email_accounts email_forwarders email_quota email_autoresponder ftps tickets subdomains aps_packages'); $opentickets = 0; $opentickets = $db->query_first('SELECT COUNT(`id`) as `count` FROM `' . TABLE_PANEL_TICKETS . '` WHERE `customerid` = "' . $userinfo['customerid'] . '" diff --git a/install/froxlor.sql b/install/froxlor.sql index dffb09c1..991eac0b 100644 --- a/install/froxlor.sql +++ b/install/froxlor.sql @@ -164,6 +164,8 @@ CREATE TABLE `panel_admins` ( `can_manage_aps_packages` tinyint(1) NOT NULL default '1', `aps_packages` int(5) NOT NULL default '0', `aps_packages_used` int(5) NOT NULL default '0', + `email_autoresponder` int(5) NOT NULL default '0', + `email_autoresponder_used` int(5) NOT NULL default '0', PRIMARY KEY (`adminid`), UNIQUE KEY `loginname` (`loginname`) ) TYPE=MyISAM ; @@ -228,6 +230,8 @@ CREATE TABLE `panel_customers` ( `aps_packages` int(5) NOT NULL default '0', `aps_packages_used` int(5) NOT NULL default '0', `perlenabled` tinyint(1) NOT NULL default '0', + `email_autoresponder` int(5) NOT NULL default '0', + `email_autoresponder_used` int(5) NOT NULL default '0', PRIMARY KEY (`customerid`), UNIQUE KEY `loginname` (`loginname`) ) TYPE=MyISAM ; @@ -456,7 +460,7 @@ INSERT INTO `panel_settings` (`settingid`, `settinggroup`, `varname`, `value`) V INSERT INTO `panel_settings` (`settingid`, `settinggroup`, `varname`, `value`) VALUES (18, 'system', 'vmail_homedir', '/var/customers/mail/'); INSERT INTO `panel_settings` (`settingid`, `settinggroup`, `varname`, `value`) VALUES (19, 'system', 'bindconf_directory', '/etc/bind/'); INSERT INTO `panel_settings` (`settingid`, `settinggroup`, `varname`, `value`) VALUES (20, 'system', 'bindreload_command', '/etc/init.d/bind9 reload'); -INSERT INTO `panel_settings` (`settingid`, `settinggroup`, `varname`, `value`) VALUES (22, 'panel', 'version', '0.9.12'); +INSERT INTO `panel_settings` (`settingid`, `settinggroup`, `varname`, `value`) VALUES (22, 'panel', 'version', '0.9.13-svn1'); INSERT INTO `panel_settings` (`settingid`, `settinggroup`, `varname`, `value`) VALUES (23, 'system', 'hostname', 'SERVERNAME'); INSERT INTO `panel_settings` (`settingid`, `settinggroup`, `varname`, `value`) VALUES (24, 'login', 'maxloginattempts', '3'); INSERT INTO `panel_settings` (`settingid`, `settinggroup`, `varname`, `value`) VALUES (25, 'login', 'deactivatetime', '900'); diff --git a/install/install.php b/install/install.php index 3d8dc853..cc1a3a9c 100644 --- a/install/install.php +++ b/install/install.php @@ -730,7 +730,10 @@ if(isset($_POST['installstep']) `traffic` = -1048576, `traffic_used` = 0, `deactivated` = 0, - `aps_packages` = -1"); + `aps_packages` = -1, + `aps_packages_used` = 0, + `email_autoresponder` = -1, + `email_autoresponder_used` = 0"); status_message('green', 'OK'); //now we create the userdata.inc.php with the mysql-accounts diff --git a/install/updates/froxlor/0.9/update_0.9.inc.php b/install/updates/froxlor/0.9/update_0.9.inc.php index 57b297aa..6978115d 100644 --- a/install/updates/froxlor/0.9/update_0.9.inc.php +++ b/install/updates/froxlor/0.9/update_0.9.inc.php @@ -1027,3 +1027,40 @@ if(isFroxlorVersion('0.9.12-svn6')) updateToVersion('0.9.12'); } + +if(isFroxlorVersion('0.9.12')) +{ + showUpdateStep("Updating from 0.9.12 to 0.9.13-svn1", false); + + showUpdateStep("Adding new fields to admin-table"); + $db->query("ALTER TABLE `".TABLE_PANEL_ADMINS."` ADD `email_autoresponder` int(5) NOT NULL default '0' AFTER `aps_packages_used`;"); + $db->query("ALTER TABLE `".TABLE_PANEL_ADMINS."` ADD `email_autoresponder_used` int(5) NOT NULL default '0' AFTER `email_autoresponder`;"); + lastStepStatus(0); + + showUpdateStep("Adding new fields to customer-table"); + $db->query("ALTER TABLE `".TABLE_PANEL_CUSTOMERS."` ADD `email_autoresponder` int(5) NOT NULL default '0' AFTER `perlenabled`;"); + $db->query("ALTER TABLE `".TABLE_PANEL_CUSTOMERS."` ADD `email_autoresponder_used` int(5) NOT NULL default '0' AFTER `email_autoresponder`;"); + lastStepStatus(0); + + if((int)$settings['autoresponder']['autoresponder_active'] == 1) + { + $update_autoresponder_default = isset($_POST['update_autoresponder_default']) ? intval_ressource($_POST['update_autoresponder_default']) : 0; + + if(isset($_POST['update_autoresponder_default_ul'])) { + $update_autoresponder_default = -1; + } + } + else + { + $update_autoresponder_default = 0; + } + + showUpdateStep("Setting default amount of autoresponders"); + // admin gets unlimited + $db->query("UPDATE `".TABLE_PANEL_ADMINS."` SET `email_autoresponder`='-1' WHERE `adminid` = '".(int)$userinfo['adminid']."'"); + // customers + $db->query("UPDATE `".TABLE_PANEL_CUSTOMERS."` SET `email_autoresponder`='".(int)$update_autoresponder_default."' WHERE `deactivated` = '0'"); + lastStepStatus(0); + + updateToVersion('0.9.13-svn1'); +} diff --git a/install/updates/preconfig/0.9/preconfig_0.9.inc.php b/install/updates/preconfig/0.9/preconfig_0.9.inc.php index ce563638..96936949 100644 --- a/install/updates/preconfig/0.9/preconfig_0.9.inc.php +++ b/install/updates/preconfig/0.9/preconfig_0.9.inc.php @@ -279,4 +279,16 @@ function parseAndOutputPreconfig(&$has_preconfig, &$return, $current_version) eval("\$return.=\"" . getTemplate("update/preconfigitem") . "\";"); } } + + if(versionInUpdate($current_version, '0.9.13-svn1')) + { + if((int)$settings['autoresponder']['autoresponder_active'] == 1) + { + $has_preconfig = true; + $description = 'Froxlor can now limit the number of autoresponder-entries for each user. Here you can set the value which will be available for each customer (Of course you can change the value for each customer separately after the update).'; + $question = 'How many autoresponders should your customers be able to add?: '; + $question.= ' '.makecheckbox('update_autoresponder_default', $lng['customer']['unlimited'], '-1', false, 0, true, true).'
'; + eval("\$return.=\"" . getTemplate("update/preconfigitem") . "\";"); + } + } } diff --git a/lib/functions/froxlor/function.updateCounters.php b/lib/functions/froxlor/function.updateCounters.php index ae4fb0bf..a87a2b64 100644 --- a/lib/functions/froxlor/function.updateCounters.php +++ b/lib/functions/froxlor/function.updateCounters.php @@ -138,6 +138,16 @@ function updateCounters($returndebuginfo = false) $admin_resources[$customer['adminid']]['email_quota_used']+= intval_ressource($customer['email_quota']); } + if(!isset($admin_resources[$customer['adminid']]['email_autoresponder_used'])) + { + $admin_resources[$customer['adminid']]['email_autoresponder_used'] = 0; + } + + if($customer['email_autoresponder'] != '-1') + { + $admin_resources[$customer['adminid']]['email_autoresponder_used']+= intval_ressource($customer['email_autoresponder']); + } + if(!isset($admin_resources[$customer['adminid']]['subdomains_used'])) { $admin_resources[$customer['adminid']]['subdomains_used'] = 0; @@ -181,7 +191,11 @@ function updateCounters($returndebuginfo = false) $customer['subdomains_used_new'] = (int)$customer_subdomains['number_subdomains']; $customer_email_quota = $db->query_first('SELECT SUM(`quota`) AS `email_quota` FROM `' . TABLE_MAIL_USERS . '` WHERE `customerid` = "' . (int)$customer['customerid'] . '"'); $customer['email_quota_used_new'] = (int)$customer_email_quota['email_quota']; - $db->query('UPDATE `' . TABLE_PANEL_CUSTOMERS . '` SET `mysqls_used` = "' . (int)$customer['mysqls_used_new'] . '", `emails_used` = "' . (int)$customer['emails_used_new'] . '", `email_accounts_used` = "' . (int)$customer['email_accounts_used_new'] . '", `email_forwarders_used` = "' . (int)$customer['email_forwarders_used_new'] . '", `email_quota_used` = "' . (int)$customer['email_quota_used_new'] . '", `ftps_used` = "' . (int)$customer['ftps_used_new'] . '", `tickets_used` = "' . (int)$customer['tickets_used_new'] . '", `subdomains_used` = "' . (int)$customer['subdomains_used_new'] . '" WHERE `customerid` = "' . (int)$customer['customerid'] . '"'); + + $customer_email_autoresponder = $db->query_first('SELECT COUNT(*) AS `number_autoresponder` FROM `' . TABLE_MAIL_AUTORESPONDER . '` WHERE `customerid` = "' . (int)$customer['customerid'] . '"'); + $customer['email_autoresponder_used_new'] = (int)$customer_email_autoresponder['number_autoresponder']; + + $db->query('UPDATE `' . TABLE_PANEL_CUSTOMERS . '` SET `mysqls_used` = "' . (int)$customer['mysqls_used_new'] . '", `emails_used` = "' . (int)$customer['emails_used_new'] . '", `email_accounts_used` = "' . (int)$customer['email_accounts_used_new'] . '", `email_forwarders_used` = "' . (int)$customer['email_forwarders_used_new'] . '", `email_quota_used` = "' . (int)$customer['email_quota_used_new'] . '", `email_autoresponder_used` = "' . (int)$customer['email_autoresponder_used_new'] . '", `ftps_used` = "' . (int)$customer['ftps_used_new'] . '", `tickets_used` = "' . (int)$customer['tickets_used_new'] . '", `subdomains_used` = "' . (int)$customer['subdomains_used_new'] . '" WHERE `customerid` = "' . (int)$customer['customerid'] . '"'); if($returndebuginfo === true) { @@ -268,13 +282,21 @@ function updateCounters($returndebuginfo = false) $admin['email_quota_used_new'] = $admin_resources[$admin['adminid']]['email_quota_used']; + if(!isset($admin_resources[$admin['adminid']]['email_autoresponder_used'])) + { + $admin_resources[$admin['adminid']]['email_autoresponder_used'] = 0; + } + + $admin['email_autoresponder_used_new'] = $admin_resources[$admin['adminid']]['email_autoresponder_used']; + if(!isset($admin_resources[$admin['adminid']]['subdomains_used'])) { $admin_resources[$admin['adminid']]['subdomains_used'] = 0; } + $admin['subdomains_used_new'] = $admin_resources[$admin['adminid']]['subdomains_used']; - $db->query('UPDATE `' . TABLE_PANEL_ADMINS . '` SET `customers_used` = "' . (int)$admin['customers_used_new'] . '", `domains_used` = "' . (int)$admin['domains_used_new'] . '", `diskspace_used` = "' . (int)$admin['diskspace_used_new'] . '", `mysqls_used` = "' . (int)$admin['mysqls_used_new'] . '", `emails_used` = "' . (int)$admin['emails_used_new'] . '", `email_accounts_used` = "' . (int)$admin['email_accounts_used_new'] . '", `email_forwarders_used` = "' . (int)$admin['email_forwarders_used_new'] . '", `email_quota_used` = "' . (int)$admin['email_quota_used_new'] . '", `ftps_used` = "' . (int)$admin['ftps_used_new'] . '", `tickets_used` = "' . (int)$admin['tickets_used_new'] . '", `subdomains_used` = "' . (int)$admin['subdomains_used_new'] . '", `traffic_used` = "' . (int)$admin['traffic_used_new'] . '" WHERE `adminid` = "' . (int)$admin['adminid'] . '"'); + $db->query('UPDATE `' . TABLE_PANEL_ADMINS . '` SET `customers_used` = "' . (int)$admin['customers_used_new'] . '", `domains_used` = "' . (int)$admin['domains_used_new'] . '", `diskspace_used` = "' . (int)$admin['diskspace_used_new'] . '", `mysqls_used` = "' . (int)$admin['mysqls_used_new'] . '", `emails_used` = "' . (int)$admin['emails_used_new'] . '", `email_accounts_used` = "' . (int)$admin['email_accounts_used_new'] . '", `email_forwarders_used` = "' . (int)$admin['email_forwarders_used_new'] . '", `email_quota_used` = "' . (int)$admin['email_quota_used_new'] . '", `email_autoresponder_used` = "' . (int)$admin['email_autoresponder_used_new'] . '", `ftps_used` = "' . (int)$admin['ftps_used_new'] . '", `tickets_used` = "' . (int)$admin['tickets_used_new'] . '", `subdomains_used` = "' . (int)$admin['subdomains_used_new'] . '", `traffic_used` = "' . (int)$admin['traffic_used_new'] . '" WHERE `adminid` = "' . (int)$admin['adminid'] . '"'); if($returndebuginfo === true) { diff --git a/lib/tables.inc.php b/lib/tables.inc.php index 4eaef147..9d02f078 100644 --- a/lib/tables.inc.php +++ b/lib/tables.inc.php @@ -72,7 +72,7 @@ define('PACKAGE_ENABLED', 2); // VERSION INFO -$version = '0.9.12'; +$version = '0.9.13-svn1'; $dbversion = '2'; $branding = ''; diff --git a/lng/english.lng.php b/lng/english.lng.php index 7c0d4acd..0ba0021b 100644 --- a/lng/english.lng.php +++ b/lng/english.lng.php @@ -1500,4 +1500,7 @@ $lng['admin']['templates']['forgotpwd'] = 'Notification-mails for password-reset $lng['admin']['templates']['password_reset'] = 'Customer-notification for passwort-reset'; $lng['admin']['store_defaultindex'] = 'Store default index-file to customers docroot'; +// ADDED IN FROXLOR 0.9.13-svn1 +$lng['customer']['autoresponder'] = 'Autoresponder'; + ?> diff --git a/lng/german.lng.php b/lng/german.lng.php index e8a038a3..e494c817 100644 --- a/lng/german.lng.php +++ b/lng/german.lng.php @@ -1483,4 +1483,7 @@ $lng['admin']['templates']['forgotpwd'] = 'Benachrichtigungs-Mails bei Zurü $lng['admin']['templates']['password_reset'] = 'Kunden-Benachrichtigung nach Zurücksetzen des Passworts'; $lng['admin']['store_defaultindex'] = 'Erstelle standard Index-Datei in Kunden-Ordner'; +// ADDED IN FROXLOR 0.9.13-svn1 +$lng['customer']['autoresponder'] = 'Abwesenheitsnachrichten'; + ?> diff --git a/templates/admin/admins/admins.tpl b/templates/admin/admins/admins.tpl index f4d1fbfa..8da2a445 100644 --- a/templates/admin/admins/admins.tpl +++ b/templates/admin/admins/admins.tpl @@ -5,7 +5,7 @@ $header - + @@ -13,7 +13,17 @@ $header - + + + + + + + + + + + @@ -26,7 +36,7 @@ $header - +
 {$lng['admin']['admins']} ({$admincount}){$searchcode}{$searchcode}
{$lng['login']['username']}
{$arrowcode['loginname']}		{$lng['admin']['customers']}
{$lng['admin']['domains']}		 {$lng['customer']['diskspace']}
{$lng['customer']['traffic']}		 {$lng['customer']['mysqls']}
{$lng['customer']['ftps']}		{$lng['customer']['tickets']}{$lng['customer']['tickets']}{$lng['customer']['autoresponder']}{$lng['customer']['tickets']}
{$lng['customer']['autoresponder']}		 {$lng['customer']['emails']}
{$lng['customer']['subdomains']}		 {$lng['customer']['accounts']}
{$lng['customer']['forwarders']}		 {$lng['admin']['deactivated']}
{$arrowcode['deactivated']}
{$lng['admin']['admin_add']}{$lng['admin']['admin_add']}
diff --git a/templates/admin/admins/admins_add.tpl b/templates/admin/admins/admins_add.tpl index 497956f4..11576a81 100644 --- a/templates/admin/admins/admins_add.tpl +++ b/templates/admin/admins/admins_add.tpl @@ -110,6 +110,12 @@ $header  {$email_quota_ul} + + + {$lng['customer']['autoresponder']}: +  {$email_autoresponder_ul} + + {$lng['customer']['ftps']}: *  {$ftps_ul} diff --git a/templates/admin/admins/admins_admin.tpl b/templates/admin/admins/admins_admin.tpl index ea3b0021..6a693ffa 100644 --- a/templates/admin/admins/admins_admin.tpl +++ b/templates/admin/admins/admins_admin.tpl @@ -4,7 +4,21 @@ {$row['customers_used']}/{$row['customers']}
{$row['domains_used']}/{$row['domains']} {$row['diskspace_used']}/{$row['diskspace']} (MB)
{$row['traffic_used']}/{$row['traffic']} (GB) {$row['mysqls_used']}/{$row['mysqls']}
{$row['ftps_used']}/{$row['ftps']} - {$row['tickets_used']}/{$row['tickets']} + + + {$row['tickets_used']}/{$row['tickets']} + + + {$row['email_autoresponder_used']}/{$row['email_autoresponder']} + + + + {$row['tickets_used']}/{$row['tickets']} +
+ {$row['email_autoresponder_used']}/{$row['email_autoresponder']} + + + {$row['emails_used']}/{$row['emails']}
{$row['subdomains_used']}/{$row['subdomains']} {$row['email_accounts_used']}/{$row['email_accounts']}
{$row['email_forwarders_used']}/{$row['email_forwarders']} {$lng['panel']['yes']}{$lng['panel']['no']} diff --git a/templates/admin/admins/admins_edit.tpl b/templates/admin/admins/admins_edit.tpl index 43508f2e..4e111a8b 100644 --- a/templates/admin/admins/admins_edit.tpl +++ b/templates/admin/admins/admins_edit.tpl @@ -127,6 +127,12 @@ $header  {$email_quota_ul} + + + {$lng['customer']['autoresponder']}: +  {$email_autoresponder_ul} + + {$lng['customer']['ftps']}: *  {$ftps_ul} diff --git a/templates/admin/customers/customers.tpl b/templates/admin/customers/customers.tpl index c9d56a0e..f2bf1c67 100644 --- a/templates/admin/customers/customers.tpl +++ b/templates/admin/customers/customers.tpl @@ -5,7 +5,7 @@ $header - + @@ -17,7 +17,17 @@ $header - + + + + + + + + + + + @@ -33,7 +43,7 @@ $header - +
 {$lng['admin']['customers']} ({$customercount}){$searchcode}{$searchcode}
{$lng['admin']['admin']}
{$arrowcode['a.loginname']}		 {$lng['customer']['name']}  {$arrowcode['c.name']}
{$lng['customer']['firstname']}  {$arrowcode['c.firstname']}		 {$lng['customer']['domains']}{$lng['customer']['tickets']}{$lng['customer']['tickets']}{$lng['customer']['autoresponder']}{$lng['customer']['tickets']}
{$lng['customer']['autoresponder']}		 {$lng['customer']['diskspace']}
{$lng['customer']['traffic']}		 {$lng['customer']['mysqls']}
{$lng['customer']['ftps']}		 {$lng['customer']['emails']}
{$lng['customer']['subdomains']}
{$lng['admin']['customer_add']}{$lng['admin']['customer_add']}
diff --git a/templates/admin/customers/customers_add.tpl b/templates/admin/customers/customers_add.tpl index 0b1979b0..9bad6a09 100644 --- a/templates/admin/customers/customers_add.tpl +++ b/templates/admin/customers/customers_add.tpl @@ -126,6 +126,12 @@ $header  {$email_quota_ul} + + + {$lng['customer']['autoresponder']}: +  {$email_autoresponder_ul} + + {$lng['customer']['email_imap']}: * $email_imap diff --git a/templates/admin/customers/customers_customer.tpl b/templates/admin/customers/customers_customer.tpl index 4b2a2a84..421cc374 100644 --- a/templates/admin/customers/customers_customer.tpl +++ b/templates/admin/customers/customers_customer.tpl @@ -3,7 +3,21 @@ {$row['adminname']} {$row['name']}
{$row['firstname']}{$row['company']} {$row['domains']}{$row['domains']} - style="color:red" style="color:green">{$row['tickets_used']}/{$row['tickets']} + + + style="color:red" style="color:green">{$row['tickets_used']}/{$row['tickets']} + + + style="color:red" style="color:green">{$row['email_autoresponder_used']}/{$row['email_autoresponder']} + + + + style="color:red" style="color:green">{$row['tickets_used']}/{$row['tickets']} +
+ style="color:red" style="color:green">{$row['email_autoresponder_used']}/{$row['email_autoresponder']} + + + style="color:red" style="color:green">{$row['diskspace_used']}/{$row['diskspace']} (MB)
diff --git a/templates/admin/customers/customers_edit.tpl b/templates/admin/customers/customers_edit.tpl index b980262a..92e857ce 100644 --- a/templates/admin/customers/customers_edit.tpl +++ b/templates/admin/customers/customers_edit.tpl @@ -127,6 +127,12 @@ $header  {$email_quota_ul} + + + {$lng['customer']['autoresponder']}: +  {$email_autoresponder_ul} + + {$lng['customer']['email_imap']}: * $email_imap diff --git a/templates/admin/index/index.tpl b/templates/admin/index/index.tpl index 5e993487..caa3ad59 100644 --- a/templates/admin/index/index.tpl +++ b/templates/admin/index/index.tpl @@ -39,10 +39,18 @@ $header {$lng['customer']['forwarders']}: {$overview['email_forwarders_used']} ({$userinfo['email_forwarders_used']}/{$userinfo['email_forwarders']}) + {$lng['customer']['email_quota']}: {$overview['email_quota_used']} ({$userinfo['email_quota_used']}/{$userinfo['email_quota']}) + + + + {$lng['customer']['autoresponder']}: + {$userinfo['email_autoresponder_used']} ({$userinfo['email_autoresponder']}) + + {$lng['aps']['numberofapspackages']}: diff --git a/templates/admin/settings/updatecounters_row_admin.tpl b/templates/admin/settings/updatecounters_row_admin.tpl index 53057ebe..11b5e633 100644 --- a/templates/admin/settings/updatecounters_row_admin.tpl +++ b/templates/admin/settings/updatecounters_row_admin.tpl @@ -46,6 +46,12 @@ style="color:green"style="color:red">{$admin['email_quota_used']} -> {$admin['email_quota_used_new']} + + + {$lng['customer']['autoresponder']}: + style="color:green"style="color:red">{$admin['email_autoresponder_used']} -> {$admin['email_autoresponder_used_new']} + + {$lng['customer']['ftps']}: style="color:green"style="color:red">{$admin['ftps_used']} -> {$admin['ftps_used_new']} diff --git a/templates/admin/settings/updatecounters_row_customer.tpl b/templates/admin/settings/updatecounters_row_customer.tpl index 464719a3..d1def6a8 100644 --- a/templates/admin/settings/updatecounters_row_customer.tpl +++ b/templates/admin/settings/updatecounters_row_customer.tpl @@ -30,6 +30,12 @@ style="color:green"style="color:red">{$customer['email_quota_used']} -> {$customer['email_quota_used_new']} + + + {$lng['customer']['autoresponder']}: + style="color:green"style="color:red">{$customer['email_autoresponder_used']} -> {$customer['email_autoresponder_used_new']} + + {$lng['customer']['ftps']}: style="color:green"style="color:red">{$customer['ftps_used']} -> {$customer['ftps_used_new']} diff --git a/templates/customer/email/autoresponder.tpl b/templates/customer/email/autoresponder.tpl index 8ddde17c..a946acd8 100644 --- a/templates/customer/email/autoresponder.tpl +++ b/templates/customer/email/autoresponder.tpl @@ -11,9 +11,11 @@ $header   $autoresponder + {$lng['autoresponder']['autoresponder_add']} +

diff --git a/templates/customer/index/index.tpl b/templates/customer/index/index.tpl index f26aee63..447ee2e4 100644 --- a/templates/customer/index/index.tpl +++ b/templates/customer/index/index.tpl @@ -68,6 +68,13 @@ $header {$userinfo['email_quota_used']} ({$userinfo['email_quota']}) + + + + {$lng['customer']['autoresponder']}: + {$userinfo['email_autoresponder_used']} ({$userinfo['email_autoresponder']}) + + {$lng['customer']['mysqls']}: {$userinfo['mysqls_used']} ({$userinfo['mysqls']})