Merge branch 'master' of git.ispconfig.org:ispconfig/ispconfig3

Marius Cramer

2015-02-03 9b0ee8d9832edd60b772ee11a18f2e1c4f39e8cf

Merge branch 'master' of git.ispconfig.org:ispconfig/ispconfig3

Conflicts:
	install/sql/incremental/upd_dev_collection.sql

 install/dist/lib/fedora.lib.php

@@ -152,6 +152,9 @@
        //* mysql-virtual_relayrecipientmaps.cf
        $this->process_postfix_config('mysql-virtual_relayrecipientmaps.cf');

        //* mysql-virtual_policy_greylist.cf
        $this->process_postfix_config('mysql-virtual_policy_greylist.cf');

        //* postfix-dkim
        $full_file_name=$config_dir.'/tag_as_originating.re';
        if(is_file($full_file_name)) {
@@ -193,13 +196,21 @@
        }
        unset($rbl_hosts);
        unset($server_ini_array);

		
        //* If Postgrey is installed, configure it
        $greylisting = '';
        if($conf['postgrey']['installed'] == true) {
            $greylisting = 'check_recipient_access mysql:/etc/postfix/mysql-virtual_policy_greylist.cf';
        }
		
        //* These postconf commands will be executed on installation and update
        $postconf_placeholders = array('{config_dir}' => $config_dir,
            '{vmail_mailbox_base}' => $cf['vmail_mailbox_base'],
            '{vmail_userid}' => $cf['vmail_userid'],
            '{vmail_groupid}' => $cf['vmail_groupid'],
            '{rbl_list}' => $rbl_list);
            '{rbl_list}' => $rbl_list,
            '{greylisting}' => $greylisting,
        );

        $postconf_tpl = rfsel($conf['ispconfig_install_dir'].'/server/conf-custom/install/fedora_postfix.conf.master', 'tpl/fedora_postfix.conf.master');
        $postconf_tpl = strtr($postconf_tpl, $postconf_placeholders);

 install/dist/lib/opensuse.lib.php

@@ -168,6 +168,9 @@
        //* mysql-virtual_relayrecipientmaps.cf
        $this->process_postfix_config('mysql-virtual_relayrecipientmaps.cf');

        //* mysql-virtual_policy_greylist.cf
        $this->process_postfix_config('mysql-virtual_policy_greylist.cf');

        //* postfix-dkim
        $full_file_name=$config_dir.'/tag_as_originating.re';
        if(is_file($full_file_name)) {
@@ -224,12 +227,20 @@
        unset($rbl_hosts);
        unset($server_ini_array);

        //* If Postgrey is installed, configure it
        $greylisting = '';
        if($conf['postgrey']['installed'] == true) {
            $greylisting = 'check_recipient_access mysql:/etc/postfix/mysql-virtual_policy_greylist.cf';
        }
		
        //* These postconf commands will be executed on installation and update
        $postconf_placeholders = array('{config_dir}' => $config_dir,
            '{vmail_mailbox_base}' => $cf['vmail_mailbox_base'],
            '{vmail_userid}' => $cf['vmail_userid'],
            '{vmail_groupid}' => $cf['vmail_groupid'],
            '{rbl_list}' => $rbl_list);
            '{rbl_list}' => $rbl_list,
            '{greylisting}' => $greylisting,
        );

        $postconf_tpl = rfsel($conf['ispconfig_install_dir'].'/server/conf-custom/install/opensuse_postfix.conf.master', 'tpl/opensuse_postfix.conf.master');
        $postconf_tpl = strtr($postconf_tpl, $postconf_placeholders);

 install/lib/installer_base.lib.php

@@ -135,6 +135,7 @@

        if(is_installed('mysql') || is_installed('mysqld')) $conf['mysql']['installed'] = true;
        if(is_installed('postfix')) $conf['postfix']['installed'] = true;
        if(is_installed('postgrey')) $conf['postgrey']['installed'] = true;
        if(is_installed('mailman')) $conf['mailman']['installed'] = true;
        if(is_installed('apache') || is_installed('apache2') || is_installed('httpd') || is_installed('httpd2')) $conf['apache']['installed'] = true;
        if(is_installed('getmail')) $conf['getmail']['installed'] = true;
@@ -704,6 +705,9 @@
        //* mysql-virtual_outgoing_bcc.cf
        $this->process_postfix_config('mysql-virtual_outgoing_bcc.cf');

                //* mysql-virtual_policy_greylist.cf
                $this->process_postfix_config('mysql-virtual_policy_greylist.cf');

        //* postfix-dkim
        $full_file_name=$config_dir.'/tag_as_originating.re';
        if(is_file($full_file_name)) copy($full_file_name, $full_file_name.'~');
@@ -742,11 +746,19 @@
        unset($rbl_hosts);
        unset($server_ini_array);

        //* If Postgrey is installed, configure it
        $greylisting = '';
        if($conf['postgrey']['installed'] == true) {
            $greylisting = 'check_recipient_access mysql:/etc/postfix/mysql-virtual_policy_greylist.cf';
        }
		
        $postconf_placeholders = array('{config_dir}' => $config_dir,
            '{vmail_mailbox_base}' => $cf['vmail_mailbox_base'],
            '{vmail_userid}' => $cf['vmail_userid'],
            '{vmail_groupid}' => $cf['vmail_groupid'],
            '{rbl_list}' => $rbl_list);
            '{rbl_list}' => $rbl_list,
            '{greylisting}' => $greylisting,
        );

        $postconf_tpl = rfsel($conf['ispconfig_install_dir'].'/server/conf-custom/install/debian_postfix.conf.master', 'tpl/debian_postfix.conf.master');
        $postconf_tpl = strtr($postconf_tpl, $postconf_placeholders);
@@ -841,7 +853,7 @@
        caselog($command." &> /dev/null", __FILE__, __LINE__, "EXECUTED: $command", "Failed to execute the command $command");

    }

	
    public function configure_saslauthd() {
        global $conf;


 install/sql/incremental/upd_dev_collection.sql

@@ -36,3 +36,5 @@
ALTER TABLE `web_backup` CHANGE `filesize` `filesize` VARCHAR(20) NOT NULL DEFAULT '';

ALTER TABLE `sys_datalog` ADD INDEX `dbtable` (`dbtable` (25), `dbidx` (25)), ADD INDEX (`action`);
ALTER TABLE `mail_user` ADD `greylisting` ENUM( 'n', 'y' ) NOT NULL DEFAULT 'n' AFTER `postfix`;
ALTER TABLE `mail_forwarding` ADD `greylisting` ENUM( 'n', 'y' ) NOT NULL DEFAULT 'n' AFTER `active`;

 install/tpl/debian_postfix.conf.master

@@ -12,7 +12,9 @@
smtpd_sasl_auth_enable = yes
broken_sasl_auth_clients = yes
smtpd_sasl_authenticated_header = yes
smtpd_recipient_restrictions = permit_mynetworks, permit_sasl_authenticated, reject_unauth_destination, check_recipient_access mysql:{config_dir}/mysql-virtual_recipient.cf{rbl_list}
smtpd_restriction_classes = greylisting
greylisting = check_policy_service inet:127.0.0.1:10023 
smtpd_recipient_restrictions = permit_mynetworks, permit_sasl_authenticated, reject_unauth_destination, check_recipient_access mysql:{config_dir}/mysql-virtual_recipient.cf{rbl_list}{greylisting}
smtpd_use_tls = yes
smtpd_tls_security_level = may
smtpd_tls_cert_file = {config_dir}/smtpd.cert

 install/tpl/fedora_postfix.conf.master

@@ -9,7 +9,9 @@
smtpd_sasl_auth_enable = yes
broken_sasl_auth_clients = yes
smtpd_sasl_authenticated_header = yes
smtpd_recipient_restrictions = permit_mynetworks, permit_sasl_authenticated, reject_unauth_destination, check_recipient_access mysql:{config_dir}/mysql-virtual_recipient.cf{rbl_list}
smtpd_restriction_classes = greylisting
greylisting = check_policy_service inet:127.0.0.1:10023
smtpd_recipient_restrictions = permit_mynetworks, permit_sasl_authenticated, reject_unauth_destination, check_recipient_access mysql:{config_dir}/mysql-virtual_recipient.cf{rbl_list}{greylisting}
smtpd_use_tls = yes
smtpd_tls_security_level = may
smtpd_tls_cert_file = {config_dir}/smtpd.cert

 install/tpl/gentoo_postfix.conf.master

@@ -8,7 +8,9 @@
smtpd_sasl_auth_enable = yes
broken_sasl_auth_clients = yes
smtpd_sasl_authenticated_header = yes
smtpd_recipient_restrictions = permit_mynetworks, permit_sasl_authenticated, reject_unauth_destination, check_recipient_access mysql:{config_dir}/mysql-virtual_recipient.cf{rbl_list}
smtpd_restriction_classes = greylisting
greylisting = check_policy_service inet:127.0.0.1:10023
smtpd_recipient_restrictions = permit_mynetworks, permit_sasl_authenticated, reject_unauth_destination, check_recipient_access mysql:{config_dir}/mysql-virtual_recipient.cf{rbl_list}{greylisting}
smtpd_use_tls = yes
smtpd_tls_security_level = may
smtpd_tls_cert_file = {config_dir}/smtpd.cert

 install/tpl/mysql-virtual_policy_greylist.cf.master

New file
@@ -0,0 +1,5 @@
user = {mysql_server_ispconfig_user}
password = {mysql_server_ispconfig_password}
dbname = {mysql_server_database}
query = SELECT 'greylisting' FROM (SELECT greylisting, source AS email FROM mail_forwarding WHERE server_id = {server_id} UNION SELECT greylisting, email FROM mail_user WHERE server_id = {server_id}) addresses WHERE addresses.email='%s' AND addresses.greylisting='y'
hosts = {mysql_server_ip}

 install/tpl/opensuse_postfix.conf.master

@@ -11,7 +11,9 @@
smtpd_sasl_auth_enable = yes
broken_sasl_auth_clients = yes
smtpd_sasl_authenticated_header = yes
smtpd_recipient_restrictions = permit_mynetworks, permit_sasl_authenticated, reject_unauth_destination, check_recipient_access mysql:{config_dir}/mysql-virtual_recipient.cf{rbl_list}
smtpd_restriction_classes = greylisting
greylisting = check_policy_service inet:127.0.0.1:10023
smtpd_recipient_restrictions = permit_mynetworks, permit_sasl_authenticated, reject_unauth_destination, check_recipient_access mysql:{config_dir}/mysql-virtual_recipient.cf{rbl_list}{greylisting}
smtpd_use_tls = yes
smtpd_tls_security_level = may
smtpd_tls_cert_file = {config_dir}/smtpd.cert

 interface/lib/classes/quota_lib.inc.php

@@ -95,7 +95,68 @@
        
        return $sites;
    }

	
    public function get_trafficquota_data($clientid = null, $lastdays = 0) {
        global $app;
	
        $traffic_data = array();
	
        // select vhosts (belonging to client)
        if($clientid != null){
            $sql_where = " AND sys_groupid = (SELECT default_group FROM sys_user WHERE client_id=".$clientid.")";
        }
        $sites = $app->db->queryAllRecords("SELECT * FROM web_domain WHERE active = 'y' AND (type = 'vhost' OR type = 'vhostsubdomain' OR type = 'vhostalias')".$sql_where);
	
        $hostnames = array();
        $traffic_data = array();
	
        foreach ($sites as $site) {
            $hostnames[] = $site['domain'];
            $traffic_data[$site['domain']]['domain_id'] = $site['domain_id'];
        }
	
        // fetch all traffic-data of selected vhosts
        if (!empty($hostnames)) {
            $tmp_year = date('Y');
            $tmp_month = date('m');
            // This Month
            $tmp_recs = $app->db->queryAllRecords("SELECT hostname, SUM(traffic_bytes) as t FROM web_traffic WHERE YEAR(traffic_date) = ? AND MONTH(traffic_date) = ? AND hostname IN ('".join("','",$hostnames)."') GROUP BY hostname", $tmp_year, $tmp_month);
            foreach ($tmp_recs as $tmp_rec) {
                $traffic_data[$tmp_rec['hostname']]['this_month'] = $tmp_rec['t'];
            }
            // This Year
            $tmp_recs = $app->db->queryAllRecords("SELECT hostname, SUM(traffic_bytes) as t FROM web_traffic WHERE YEAR(traffic_date) = ? AND hostname IN ('".join("','",$hostnames)."') GROUP BY hostname", $tmp_year);
            foreach ($tmp_recs as $tmp_rec) {
                $traffic_data[$tmp_rec['hostname']]['this_year'] = $tmp_rec['t'];
            }
				
            $tmp_year = date('Y', mktime(0, 0, 0, date("m")-1, date("d"), date("Y")));
            $tmp_month = date('m', mktime(0, 0, 0, date("m")-1, date("d"), date("Y")));
            // Last Month
            $tmp_recs = $app->db->queryAllRecords("SELECT hostname, SUM(traffic_bytes) as t FROM web_traffic WHERE YEAR(traffic_date) = ? AND MONTH(traffic_date) = ? AND hostname IN ('".join("','",$hostnames)."') GROUP BY hostname", $tmp_year, $tmp_month);
            foreach ($tmp_recs as $tmp_rec) {
                $traffic_data[$tmp_rec['hostname']]['last_month'] = $tmp_rec['t'];
            }
				
            $tmp_year = date('Y', mktime(0, 0, 0, date("m"), date("d"), date("Y")-1));
            // Last Year
            $tmp_recs = $app->db->queryAllRecords("SELECT hostname, SUM(traffic_bytes) as t FROM web_traffic WHERE YEAR(traffic_date) = ? AND hostname IN ('".join("','",$hostnames)."') GROUP BY hostname", $tmp_year);
            foreach ($tmp_recs as $tmp_rec) {
                $traffic_data[$tmp_rec['hostname']]['last_year'] = $tmp_rec['t'];
            }
				
            if (is_int($lastdays)  && ($lastdays > 0)) {
                // Last xx Days
                $tmp_recs = $app->db->queryAllRecords("SELECT hostname, SUM(traffic_bytes) as t FROM web_traffic WHERE (traffic_date >= DATE_SUB(NOW(), INTERVAL ".$app->db->quote($lastdays)." DAY)) AND hostname IN ('".join("','",$hostnames)."') GROUP BY hostname");
                foreach ($tmp_recs as $tmp_rec) {
                    $traffic_data[$tmp_rec['hostname']]['lastdays'] = $tmp_rec['t'];
                }
            }
        }
	
        return $traffic_data;
    }
	
    public function get_mailquota_data($clientid = null, $readable = true) {
        global $app;
        

 interface/lib/classes/remote.d/sites.inc.php

@@ -966,6 +966,21 @@
        return $app->quota_lib->get_quota_data($client_id, false);
    }
    
    public function trafficquota_get_by_user($session_id, $client_id, $lastdays = 0)
    {
        global $app;
        $app->uses('quota_lib');
		
        if(!$this->checkPerm($session_id, 'trafficquota_get_by_user')) {
            $this->server->fault('permission_denied', 'You do not have the permissions to access this function.');
            return false;
        }
        if ($client_id != null)
            $client_id = $app->functions->intval($client_id);
		
        return $app->quota_lib->get_trafficquota_data($client_id, $lastdays);
    }
	
    public function databasequota_get_by_user($session_id, $client_id)
    {
        global $app;

 interface/web/client/lib/remote.conf.php

@@ -2,7 +2,7 @@

$function_list['client_get_all,client_get,client_add,client_update,client_delete,client_get_sites_by_user,client_get_by_username,client_change_password,client_get_id,client_delete_everything,client_get_emailcontact'] = 'Client functions';
$function_list['domains_domain_get,domains_domain_add,domains_domain_delete,domains_get_all_by_user'] = 'Domaintool functions';
$function_list['quota_get_by_user,mailquota_get_by_user,databasequota_get_by_user'] = 'Quota functions';
$function_list['quota_get_by_user,trafficquota_get_by_user,mailquota_get_by_user,databasequota_get_by_user'] = 'Quota functions';


?>

 interface/web/mail/form/mail_alias.tform.php

@@ -124,6 +124,12 @@
            'default' => 'y',
            'value'  => array(0 => 'n', 1 => 'y')
        ),
        'greylisting' => array (
            'datatype' => 'VARCHAR',
            'formtype' => 'CHECKBOX',
            'default' => 'n',
            'value'  => array(1 => 'y', 0 => 'n')
        ),
        //#################################
        // ENDE Datatable fields
        //#################################

 interface/web/mail/form/mail_forward.tform.php

@@ -118,6 +118,12 @@
            'default' => 'y',
            'value'  => array(0 => 'n', 1 => 'y')
        ),
        'greylisting' => array (
            'datatype' => 'VARCHAR',
            'formtype' => 'CHECKBOX',
            'default' => 'n',
            'value'  => array(1 => 'y', 0 => 'n')
        ),
        //#################################
        // ENDE Datatable fields
        //#################################

 interface/web/mail/form/mail_user.tform.php

@@ -233,6 +233,12 @@
            'default' => 'y',
            'value'  => array(1 => 'y', 0 => 'n')
        ),
        'greylisting' => array (
            'datatype' => 'VARCHAR',
            'formtype' => 'CHECKBOX',
            'default' => 'n',
            'value'  => array(1 => 'y', 0 => 'n')
        ),
        /*
        'access' => array (
            'datatype'    => 'VARCHAR',

 interface/web/mail/lib/lang/ar_mail_alias.lng

@@ -11,4 +11,5 @@
$wb['domain_txt'] = 'Domain';
$wb['duplicate_email_alias_txt'] = 'This email alias does already exist.';
$wb['source_txt'] = 'Alias';
$wb['greylisting_txt'] = 'Enable greylisting';
?>

 interface/web/mail/lib/lang/ar_mail_forward.lng

@@ -6,4 +6,5 @@
$wb['duplicate_mailbox_txt'] = 'There is already a mailbox with this email address';
$wb['domain_txt'] = 'Domain';
$wb['source_txt'] = 'Source Email';
$wb['greylisting_txt'] = 'Enable greylisting';
?>

 interface/web/mail/lib/lang/ar_mail_user.lng

@@ -20,6 +20,7 @@
$wb['password_txt'] = 'Password';
$wb['maildir_txt'] = 'Maildir';
$wb['postfix_txt'] = 'Enable Receiving';
$wb['greylisting_txt'] = 'Enable greylisting';
$wb['access_txt'] = 'Enable Access';
$wb['policy_txt'] = 'Spamfilter';
$wb['no_policy'] = '- not enabled -';

 interface/web/mail/lib/lang/bg_mail_alias.lng

@@ -11,4 +11,5 @@
$wb['domain_txt'] = 'Domain';
$wb['duplicate_email_alias_txt'] = 'This email alias does already exist.';
$wb['source_txt'] = 'Alias';
$wb['greylisting_txt'] = 'Enable greylisting';
?>

 interface/web/mail/lib/lang/bg_mail_forward.lng

@@ -6,4 +6,5 @@
$wb['duplicate_mailbox_txt'] = 'Вече съществува пощенска кутия с такъв адрес.';
$wb['domain_txt'] = 'Домейн';
$wb['source_txt'] = 'Source Email';
$wb['greylisting_txt'] = 'Enable greylisting';
?>

 interface/web/mail/lib/lang/bg_mail_user.lng

@@ -16,6 +16,7 @@
$wb['password_txt'] = 'парола';
$wb['maildir_txt'] = 'maildir';
$wb['postfix_txt'] = 'Разреши получаване';
$wb['greylisting_txt'] = 'Enable greylisting';
$wb['access_txt'] = 'Разреши достъп';
$wb['policy_txt'] = 'Спам филтър';
$wb['no_policy'] = '- забранен -';

 interface/web/mail/lib/lang/br_mail_alias.lng

@@ -11,4 +11,5 @@
$wb['domain_txt'] = 'Domínio';
$wb['duplicate_email_alias_txt'] = 'This email alias does already exist.';
$wb['source_txt'] = 'Alias';
$wb['greylisting_txt'] = 'Enable greylisting';
?>

 interface/web/mail/lib/lang/br_mail_forward.lng

@@ -6,4 +6,5 @@
$wb['duplicate_mailbox_txt'] = 'Já existe uma caixa de correio com este endereço.';
$wb['domain_txt'] = 'Domínio';
$wb['source_txt'] = 'Source Email';
$wb['greylisting_txt'] = 'Enable greylisting';
?>

 interface/web/mail/lib/lang/br_mail_user.lng

@@ -16,6 +16,7 @@
$wb['password_txt'] = 'Senha';
$wb['maildir_txt'] = 'Maildir';
$wb['postfix_txt'] = 'Habilitar Recebimento';
$wb['greylisting_txt'] = 'Enable greylisting';
$wb['access_txt'] = 'Habilitar Acesso';
$wb['policy_txt'] = 'Spamfilter';
$wb['no_policy'] = '- desativado -';

 interface/web/mail/lib/lang/cz_mail_alias.lng

@@ -11,5 +11,6 @@
$wb['domain_txt'] = 'Doména';
$wb['duplicate_email_alias_txt'] = 'Tento e-mail alias již existuje.';
$wb['source_txt'] = 'Alias';
$wb['greylisting_txt'] = 'Enable greylisting';
?>


 interface/web/mail/lib/lang/cz_mail_forward.lng

@@ -6,5 +6,6 @@
$wb['duplicate_mailbox_txt'] = 'Mailbox s touto adresou již existuje';
$wb['domain_txt'] = 'Doména';
$wb['source_txt'] = 'Zdrojový e-mail';
$wb['greylisting_txt'] = 'Enable greylisting';
?>


 interface/web/mail/lib/lang/cz_mail_user.lng

@@ -20,6 +20,7 @@
$wb['password_txt'] = 'Heslo';
$wb['maildir_txt'] = 'E-mailový adresář';
$wb['postfix_txt'] = 'Povolit příjem';
$wb['greylisting_txt'] = 'Enable greylisting';
$wb['access_txt'] = 'Povolit přístup';
$wb['policy_txt'] = 'Spamový filtr';
$wb['no_policy'] = '- nepovoleno -';

 interface/web/mail/lib/lang/de_mail_alias.lng

@@ -11,4 +11,5 @@
$wb['domain_txt'] = 'Domain';
$wb['duplicate_email_alias_txt'] = 'Dieser E-Mail Alias existiert bereits.';
$wb['source_txt'] = 'Alias';
$wb['greylisting_txt'] = 'Aktiviere Greylisting';
?>

 interface/web/mail/lib/lang/de_mail_forward.lng

@@ -7,4 +7,5 @@
$wb['domain_txt'] = 'Domain';
$wb['source_txt'] = 'Quell E-Mail Adresse';
$wb['email_error_isemail'] = 'Bitte geben Sie eine gültige E-Mail Adresse an.';
$wb['greylisting_txt'] = 'Aktiviere greylisting';
?>

 interface/web/mail/lib/lang/de_mail_user.lng

@@ -17,6 +17,7 @@
$wb['password_txt'] = 'Passwort';
$wb['maildir_txt'] = 'E-Mail Verzeichnis';
$wb['postfix_txt'] = 'Aktiviere Empfang';
$wb['greylisting_txt'] = 'Aktiviere Greylisting';
$wb['access_txt'] = 'Aktiviere Zugriff';
$wb['policy_txt'] = 'Spamfilter';
$wb['no_policy'] = '- nicht aktiviert -';

 interface/web/mail/lib/lang/el_mail_alias.lng

@@ -11,4 +11,5 @@
$wb['domain_txt'] = 'Domain';
$wb['duplicate_email_alias_txt'] = 'This email alias does already exist.';
$wb['source_txt'] = 'Alias';
$wb['greylisting_txt'] = 'Enable greylisting';
?>

 interface/web/mail/lib/lang/el_mail_forward.lng

@@ -6,4 +6,5 @@
$wb['duplicate_mailbox_txt'] = 'Υπάρχει ήδη μια θυρίδα με αυτή τη διεύθυνση email';
$wb['domain_txt'] = 'Domain';
$wb['source_txt'] = 'Source Email';
$wb['greylisting_txt'] = 'Enable greylisting';
?>

 interface/web/mail/lib/lang/el_mail_user.lng

@@ -20,6 +20,7 @@
$wb['password_txt'] = 'Συνθηματικό';
$wb['maildir_txt'] = 'Maildir';
$wb['postfix_txt'] = 'Ενεργοποίηση Λήψης';
$wb['greylisting_txt'] = 'Enable greylisting';
$wb['access_txt'] = 'Ενεργοποίηση Πρόσβασης';
$wb['policy_txt'] = 'Φίλτρο Spam';
$wb['no_policy'] = '- ανενεργή -';

 interface/web/mail/lib/lang/en_mail_alias.lng

@@ -11,4 +11,5 @@
$wb['domain_txt'] = 'Domain';
$wb["duplicate_email_alias_txt"] = 'This email alias does already exist.';
$wb["source_txt"] = 'Alias';
$wb['greylisting_txt'] = 'Enable greylisting';
?>

 interface/web/mail/lib/lang/en_mail_forward.lng

@@ -7,4 +7,5 @@
$wb['domain_txt'] = 'Domain';
$wb["source_txt"] = 'Source Email';
$wb['email_error_isemail'] = 'Please enter a valid email address.';
$wb['greylisting_txt'] = 'Enable greylisting';
?>

 interface/web/mail/lib/lang/en_mail_user.lng

@@ -22,6 +22,7 @@
$wb["password_txt"] = 'Password';
$wb["maildir_txt"] = 'Maildir';
$wb["postfix_txt"] = 'Enable receiving';
$wb['greylisting_txt'] = 'Enable greylisting';
$wb["access_txt"] = 'Enable access';
$wb["policy_txt"] = 'Spamfilter';
$wb["no_policy"] = '- not enabled -';

 interface/web/mail/lib/lang/es_mail_alias.lng

@@ -11,4 +11,5 @@
$wb['domain_txt'] = 'Dominio';
$wb['duplicate_email_alias_txt'] = 'Este alias de correo ya existe.';
$wb['source_txt'] = 'Alias';
$wb['greylisting_txt'] = 'Enable greylisting';
?>

 interface/web/mail/lib/lang/es_mail_forward.lng

@@ -6,4 +6,5 @@
$wb['duplicate_mailbox_txt'] = 'Ya existe un buzón de correo con esta dirección';
$wb['domain_txt'] = 'Dominio';
$wb['source_txt'] = 'Source Email';
$wb['greylisting_txt'] = 'Enable greylisting';
?>

 interface/web/mail/lib/lang/es_mail_user.lng

@@ -19,6 +19,7 @@
$wb['password_txt'] = 'Contraseña';
$wb['maildir_txt'] = 'Directorio del buzón';
$wb['postfix_txt'] = 'Habilitar la recepción';
$wb['greylisting_txt'] = 'Enable greylisting';
$wb['access_txt'] = 'Habilitar el acceso';
$wb['policy_txt'] = 'Filtro de spam';
$wb['no_policy'] = '- no habilitado -';

 interface/web/mail/lib/lang/fi_mail_alias.lng

@@ -11,4 +11,5 @@
$wb['domain_txt'] = 'Domain';
$wb['duplicate_email_alias_txt'] = 'This email alias does already exist.';
$wb['source_txt'] = 'Alias';
$wb['greylisting_txt'] = 'Enable greylisting';
?>

 interface/web/mail/lib/lang/fi_mail_forward.lng

@@ -6,4 +6,5 @@
$wb['duplicate_mailbox_txt'] = 'Edelleenlähetyssääntö osoitteelle on jo olemassa.';
$wb['domain_txt'] = 'Domain';
$wb['source_txt'] = 'Source Email';
$wb['greylisting_txt'] = 'Enable greylisting';
?>

 interface/web/mail/lib/lang/fi_mail_user.lng

@@ -15,6 +15,7 @@
$wb['password_txt'] = 'Salasana';
$wb['maildir_txt'] = 'Postikansio';
$wb['postfix_txt'] = 'Salli vastaanotto';
$wb['greylisting_txt'] = 'Enable greylisting';
$wb['access_txt'] = 'Salli yhteys';
$wb['policy_txt'] = 'Roskapostisuodatin';
$wb['no_policy'] = '- ei käytössä -';

 interface/web/mail/lib/lang/fr_mail_alias.lng

@@ -11,4 +11,5 @@
$wb['domain_txt'] = 'Domaine';
$wb['duplicate_email_alias_txt'] = 'This email alias does already exist.';
$wb['source_txt'] = 'Alias';
$wb['greylisting_txt'] = 'Enable greylisting';
?>

 interface/web/mail/lib/lang/fr_mail_forward.lng

@@ -6,4 +6,5 @@
$wb['duplicate_mailbox_txt'] = 'Il y a déja une boite email avec cette adresse email';
$wb['domain_txt'] = 'Domaine';
$wb['source_txt'] = 'Source Email';
$wb['greylisting_txt'] = 'Enable greylisting';
?>

 interface/web/mail/lib/lang/fr_mail_user.lng

@@ -16,6 +16,7 @@
$wb['password_txt'] = 'Mot de passe';
$wb['maildir_txt'] = 'Maildir';
$wb['postfix_txt'] = 'Activer la réception';
$wb['greylisting_txt'] = 'Enable greylisting';
$wb['access_txt'] = 'Activer l\'accès';
$wb['policy_txt'] = 'Filtre antispam';
$wb['no_policy'] = '- inactif -';

 interface/web/mail/lib/lang/hr_mail_alias.lng

@@ -11,6 +11,7 @@
$wb['domain_txt'] = 'Domena';
$wb['duplicate_email_alias_txt'] = 'This email alias does already exist.';
$wb['source_txt'] = 'Alias';
$wb['greylisting_txt'] = 'Enable greylisting';
?>



 interface/web/mail/lib/lang/hr_mail_forward.lng

@@ -6,6 +6,7 @@
$wb['duplicate_mailbox_txt'] = 'Već postoji mailbox sa tom email adresom';
$wb['domain_txt'] = 'Domena';
$wb['source_txt'] = 'Izvorni email';
$wb['greylisting_txt'] = 'Enable greylisting';
?>



 interface/web/mail/lib/lang/hr_mail_user.lng

@@ -19,6 +19,7 @@
$wb['password_txt'] = 'Šifra';
$wb['maildir_txt'] = 'Maildir';
$wb['postfix_txt'] = 'Enable Receiving';
$wb['greylisting_txt'] = 'Enable greylisting';
$wb['access_txt'] = 'Enable Access';
$wb['policy_txt'] = 'Spamfilter';
$wb['no_policy'] = '- not enabled -';

 interface/web/mail/lib/lang/hu_mail_alias.lng

@@ -11,4 +11,5 @@
$wb['domain_txt'] = 'Domain';
$wb['duplicate_email_alias_txt'] = 'This email alias does already exist.';
$wb['source_txt'] = 'Alias';
$wb['greylisting_txt'] = 'Enable greylisting';
?>

 interface/web/mail/lib/lang/hu_mail_forward.lng

@@ -6,4 +6,5 @@
$wb['duplicate_mailbox_txt'] = 'There is already a mailbox with this email address';
$wb['domain_txt'] = 'Domain';
$wb['source_txt'] = 'Source Email';
$wb['greylisting_txt'] = 'Enable greylisting';
?>

 interface/web/mail/lib/lang/hu_mail_user.lng

@@ -15,6 +15,7 @@
$wb['password_txt'] = 'Jelszó';
$wb['maildir_txt'] = 'levelezőláda';
$wb['postfix_txt'] = 'Bejövő engedélyezés';
$wb['greylisting_txt'] = 'Enable greylisting';
$wb['access_txt'] = 'Hozzáférés engelyezés';
$wb['policy_txt'] = 'Spam szűrő';
$wb['no_policy'] = '- nem engelyézett -';

 interface/web/mail/lib/lang/id_mail_alias.lng

@@ -11,4 +11,5 @@
$wb['domain_txt'] = 'Domain';
$wb['duplicate_email_alias_txt'] = 'This email alias does already exist.';
$wb['source_txt'] = 'Alias';
$wb['greylisting_txt'] = 'Enable greylisting';
?>

 interface/web/mail/lib/lang/id_mail_forward.lng

@@ -6,4 +6,5 @@
$wb['duplicate_mailbox_txt'] = 'Sudah ada mailbox untuk alamat email ini';
$wb['domain_txt'] = 'Domain';
$wb['source_txt'] = 'Source Email';
$wb['greylisting_txt'] = 'Enable greylisting';
?>

 interface/web/mail/lib/lang/id_mail_user.lng

@@ -20,6 +20,7 @@
$wb['password_txt'] = 'Kata Sandi';
$wb['maildir_txt'] = 'Maildir';
$wb['postfix_txt'] = 'Dapat Menerima';
$wb['greylisting_txt'] = 'Enable greylisting';
$wb['access_txt'] = 'Dapat Mengakses';
$wb['policy_txt'] = 'Spamfilter';
$wb['no_policy'] = '- tidak diaktifkan -';

 interface/web/mail/lib/lang/it_mail_alias.lng

@@ -11,4 +11,5 @@
$wb['domain_txt'] = 'Domain';
$wb['duplicate_email_alias_txt'] = 'This email alias does already exist.';
$wb['source_txt'] = 'Alias';
$wb['greylisting_txt'] = 'Enable greylisting';
?>

 interface/web/mail/lib/lang/it_mail_forward.lng

@@ -6,4 +6,5 @@
$wb['duplicate_mailbox_txt'] = 'There is already a mailbox with this email address';
$wb['domain_txt'] = 'Domain';
$wb['source_txt'] = 'Source Email';
$wb['greylisting_txt'] = 'Enable greylisting';
?>

 interface/web/mail/lib/lang/it_mail_user.lng

@@ -16,6 +16,7 @@
$wb['password_txt'] = 'password';
$wb['maildir_txt'] = 'maildir';
$wb['postfix_txt'] = 'Enable Receiving';
$wb['greylisting_txt'] = 'Enable greylisting';
$wb['access_txt'] = 'Enable Access';
$wb['policy_txt'] = 'Spamfilter';
$wb['no_policy'] = '- not enabled -';

 interface/web/mail/lib/lang/ja_mail_alias.lng

@@ -11,4 +11,5 @@
$wb['domain_txt'] = 'Domain';
$wb['duplicate_email_alias_txt'] = 'This email alias does already exist.';
$wb['source_txt'] = 'Alias';
$wb['greylisting_txt'] = 'Enable greylisting';
?>

 interface/web/mail/lib/lang/ja_mail_forward.lng

@@ -6,4 +6,5 @@
$wb['duplicate_mailbox_txt'] = 'このメールアドレス向けのメールボックスが既に存在します。';
$wb['domain_txt'] = 'Domain';
$wb['source_txt'] = 'Source Email';
$wb['greylisting_txt'] = 'Enable greylisting';
?>

 interface/web/mail/lib/lang/ja_mail_user.lng

@@ -16,6 +16,7 @@
$wb['password_txt'] = 'パスワード';
$wb['maildir_txt'] = 'メールディレクトリ';
$wb['postfix_txt'] = 'メールを受信する';
$wb['greylisting_txt'] = 'Enable greylisting';
$wb['access_txt'] = 'アクセスを許可する';
$wb['policy_txt'] = 'スパムフィルター';
$wb['no_policy'] = '- 利用しない -';

 interface/web/mail/lib/lang/nl_mail_alias.lng

@@ -11,4 +11,5 @@
$wb['domain_txt'] = 'Domain';
$wb['duplicate_email_alias_txt'] = 'This email alias does already exist.';
$wb['source_txt'] = 'Alias';
$wb['greylisting_txt'] = 'Enable greylisting';
?>

 interface/web/mail/lib/lang/nl_mail_forward.lng

@@ -6,4 +6,5 @@
$wb['duplicate_mailbox_txt'] = 'Er is al een mailbox met dit e-mailadres';
$wb['domain_txt'] = 'Domain';
$wb['source_txt'] = 'Source Email';
$wb['greylisting_txt'] = 'Enable greylisting';
?>

 interface/web/mail/lib/lang/nl_mail_user.lng

@@ -20,6 +20,7 @@
$wb['password_txt'] = 'Wachtwoord';
$wb['maildir_txt'] = 'Maildir';
$wb['postfix_txt'] = 'Ontvangen inschakelen';
$wb['greylisting_txt'] = 'Enable greylisting';
$wb['access_txt'] = 'Toegang inschakelen';
$wb['policy_txt'] = 'Spamfilter';
$wb['no_policy'] = '- niet ingeschakeld -';

 interface/web/mail/lib/lang/pl_mail_alias.lng

@@ -11,4 +11,5 @@
$wb['domain_txt'] = 'Domena';
$wb['duplicate_email_alias_txt'] = 'Istnieje już taki alias email.';
$wb['source_txt'] = 'Alias';
$wb['greylisting_txt'] = 'Enable greylisting';
?>

 interface/web/mail/lib/lang/pl_mail_forward.lng

@@ -6,4 +6,5 @@
$wb['duplicate_mailbox_txt'] = 'Istnieje już skrzynka pocztowa o podanym adresie e-mail';
$wb['domain_txt'] = 'Domena';
$wb['source_txt'] = 'E-mail źródłowy';
$wb['greylisting_txt'] = 'Enable greylisting';
?>

 interface/web/mail/lib/lang/pl_mail_user.lng

@@ -16,6 +16,7 @@
$wb['password_txt'] = 'Hasło';
$wb['maildir_txt'] = 'Maildir';
$wb['postfix_txt'] = 'Zezwól na odbiór poczty';
$wb['greylisting_txt'] = 'Enable greylisting';
$wb['access_txt'] = 'Możliwy dostęp';
$wb['policy_txt'] = 'Filtr spamu';
$wb['no_policy'] = '- brak polityki -';

 interface/web/mail/lib/lang/pt_mail_alias.lng

@@ -11,4 +11,5 @@
$wb['domain_txt'] = 'Domain';
$wb['duplicate_email_alias_txt'] = 'This email alias does already exist.';
$wb['source_txt'] = 'Alias';
$wb['greylisting_txt'] = 'Enable greylisting';
?>

 interface/web/mail/lib/lang/pt_mail_forward.lng

@@ -6,4 +6,5 @@
$wb['duplicate_mailbox_txt'] = 'Já existe uma caixa de correio com este endereço.';
$wb['domain_txt'] = 'Domain';
$wb['source_txt'] = 'Source Email';
$wb['greylisting_txt'] = 'Enable greylisting';
?>

 interface/web/mail/lib/lang/pt_mail_user.lng

@@ -16,6 +16,7 @@
$wb['password_txt'] = 'Senha';
$wb['maildir_txt'] = 'Maildir';
$wb['postfix_txt'] = 'Permitir Recepção';
$wb['greylisting_txt'] = 'Enable greylisting';
$wb['access_txt'] = 'Permitir Acesso';
$wb['policy_txt'] = 'Spamfilter';
$wb['no_policy'] = '- desactivado -';

 interface/web/mail/lib/lang/ro_mail_alias.lng

@@ -11,4 +11,5 @@
$wb['domain_txt'] = 'Domain';
$wb['duplicate_email_alias_txt'] = 'This email alias does already exist.';
$wb['source_txt'] = 'Alias';
$wb['greylisting_txt'] = 'Enable greylisting';
?>

 interface/web/mail/lib/lang/ro_mail_forward.lng

@@ -6,4 +6,5 @@
$wb['duplicate_mailbox_txt'] = 'There is already a mailbox with this email address';
$wb['domain_txt'] = 'Domain';
$wb['source_txt'] = 'Source Email';
$wb['greylisting_txt'] = 'Enable greylisting';
?>

 interface/web/mail/lib/lang/ro_mail_user.lng

@@ -16,6 +16,7 @@
$wb['password_txt'] = 'Password';
$wb['maildir_txt'] = 'Maildir';
$wb['postfix_txt'] = 'Enable Receiving';
$wb['greylisting_txt'] = 'Enable greylisting';
$wb['access_txt'] = 'Enable Access';
$wb['policy_txt'] = 'Spamfilter';
$wb['no_policy'] = '- not enabled -';

 interface/web/mail/lib/lang/ru_mail_alias.lng

@@ -11,4 +11,5 @@
$wb['domain_txt'] = 'Domain';
$wb['duplicate_email_alias_txt'] = 'This email alias does already exist.';
$wb['source_txt'] = 'Alias';
$wb['greylisting_txt'] = 'Enable greylisting';
?>

 interface/web/mail/lib/lang/ru_mail_forward.lng

@@ -6,4 +6,5 @@
$wb['duplicate_mailbox_txt'] = 'Ящик с таким именем уже существует';
$wb['domain_txt'] = 'Domain';
$wb['source_txt'] = 'Source Email';
$wb['greylisting_txt'] = 'Enable greylisting';
?>

 interface/web/mail/lib/lang/ru_mail_user.lng

@@ -15,6 +15,7 @@
$wb['password_txt'] = 'пароль';
$wb['maildir_txt'] = 'maildir';
$wb['postfix_txt'] = 'Разрешить получение';
$wb['greylisting_txt'] = 'Enable greylisting';
$wb['access_txt'] = 'Включить доступ';
$wb['policy_txt'] = 'Спам-фильтр';
$wb['no_policy'] = '- не включено -';

 interface/web/mail/lib/lang/se_mail_alias.lng

@@ -11,4 +11,5 @@
$wb['domain_txt'] = 'Domän';
$wb['duplicate_email_alias_txt'] = 'Detta epostalias finns redan';
$wb['source_txt'] = 'Alias';
$wb['greylisting_txt'] = 'Enable greylisting';
?>

 interface/web/mail/lib/lang/se_mail_forward.lng

@@ -6,4 +6,5 @@
$wb['duplicate_mailbox_txt'] = 'Det finns redan ett epostkonto med denna adress';
$wb['domain_txt'] = 'Domän';
$wb['source_txt'] = 'Källadress';
$wb['greylisting_txt'] = 'Enable greylisting';
?>

 interface/web/mail/lib/lang/se_mail_user.lng

@@ -16,6 +16,7 @@
$wb['password_txt'] = 'lösenord';
$wb['maildir_txt'] = 'maildir';
$wb['postfix_txt'] = 'Aktivera mottagning';
$wb['greylisting_txt'] = 'Enable greylisting';
$wb['access_txt'] = 'Aktivera åtkomst';
$wb['policy_txt'] = 'Spamfilter';
$wb['no_policy'] = '- ej aktiverat -';

 interface/web/mail/lib/lang/sk_mail_alias.lng

@@ -11,4 +11,5 @@
$wb['domain_txt'] = 'Domain';
$wb['duplicate_email_alias_txt'] = 'This email alias does already exist.';
$wb['source_txt'] = 'Alias';
$wb['greylisting_txt'] = 'Enable greylisting';
?>

 interface/web/mail/lib/lang/sk_mail_forward.lng

@@ -6,4 +6,5 @@
$wb['duplicate_mailbox_txt'] = 'Existuje už schránku s touto e-mailovou adresou';
$wb['domain_txt'] = 'Domain';
$wb['source_txt'] = 'Source Email';
$wb['greylisting_txt'] = 'Enable greylisting';
?>

 interface/web/mail/lib/lang/sk_mail_user.lng

@@ -16,6 +16,7 @@
$wb['password_txt'] = 'Heslo';
$wb['maildir_txt'] = 'Mailová záložka';
$wb['postfix_txt'] = 'Povoliť príjem';
$wb['greylisting_txt'] = 'Enable greylisting';
$wb['access_txt'] = 'Povoliť Prístup';
$wb['policy_txt'] = 'Spamfilter';
$wb['no_policy'] = '- nepovolená -';

 interface/web/mail/lib/lang/tr_mail_alias.lng

@@ -11,4 +11,5 @@
$wb['domain_txt'] = 'Domain';
$wb['duplicate_email_alias_txt'] = 'This email alias does already exist.';
$wb['source_txt'] = 'Alias';
$wb['greylisting_txt'] = 'Enable greylisting';
?>

 interface/web/mail/lib/lang/tr_mail_forward.lng

@@ -6,4 +6,5 @@
$wb['duplicate_mailbox_txt'] = 'Bu email adresiyle bir mail kutusu zaten bulunmakta';
$wb['domain_txt'] = 'Domain';
$wb['source_txt'] = 'Source Email';
$wb['greylisting_txt'] = 'Enable greylisting';
?>

 interface/web/mail/lib/lang/tr_mail_user.lng

@@ -16,6 +16,7 @@
$wb['password_txt'] = 'Şifre';
$wb['maildir_txt'] = 'Mail dizini';
$wb['postfix_txt'] = 'Alış Aktif';
$wb['greylisting_txt'] = 'Enable greylisting';
$wb['access_txt'] = 'Erişim Aktif';
$wb['policy_txt'] = 'Spam filtresi';
$wb['no_policy'] = '- aktif değil -';

 interface/web/mail/templates/mail_alias_edit.htm

@@ -25,7 +25,12 @@
                    {tmpl_var name='active'}
                </div>
            </div>
        
            <div class="form-group">
                <label class="col-sm-3 control-label">{tmpl_var name='greylisting_txt'}</label>
                <div class="col-sm-9">
                    {tmpl_var name='greylisting'}
                </div>
            </div>

        <input type="hidden" name="id" value="{tmpl_var name='id'}">
        <input type="hidden" name="type" value="alias">
@@ -33,4 +38,4 @@
        <div class="clear"><div class="right">
            <button class="btn btn-default formbutton-success" type="button" value="{tmpl_var name='btn_save_txt'}" data-submit-form="pageForm" data-form-action="mail/mail_alias_edit.php">{tmpl_var name='btn_save_txt'}</button>
            <button class="btn btn-default formbutton-default" type="button" value="{tmpl_var name='btn_cancel_txt'}" data-load-content="mail/mail_alias_list.php">{tmpl_var name='btn_cancel_txt'}</button>
        </div></div>
        </div></div>

 interface/web/mail/templates/mail_forward_edit.htm

@@ -23,7 +23,12 @@
                    {tmpl_var name='active'}
                </div>
            </div>
        
            <div class="form-group">
                <label class="col-sm-3 control-label">{tmpl_var name='greylisting_txt'}</label>
                <div class="col-sm-9">
                    {tmpl_var name='greylisting'}
                </div>
            </div>

        <input type="hidden" name="id" value="{tmpl_var name='id'}">
        <input type="hidden" name="type" value="forward">
@@ -31,4 +36,4 @@
        <div class="clear"><div class="right">
            <button class="btn btn-default formbutton-success" type="button" value="{tmpl_var name='btn_save_txt'}" data-submit-form="pageForm" data-form-action="mail/mail_forward_edit.php">{tmpl_var name='btn_save_txt'}</button>
            <button class="btn btn-default formbutton-default" type="button" value="{tmpl_var name='btn_cancel_txt'}" data-load-content="mail/mail_forward_list.php">{tmpl_var name='btn_cancel_txt'}</button>
        </div></div>
        </div></div>

 interface/web/mail/templates/mail_user_mailbox_edit.htm

@@ -66,6 +66,12 @@
                </div>
            </div>
            <div class="form-group">
                <label class="col-sm-3 control-label">{tmpl_var name='greylisting_txt'}</label>
                <div class="col-sm-9">
                    {tmpl_var name='greylisting'}
                </div>
            </div>
            <div class="form-group">
                <label class="col-sm-3 control-label">{tmpl_var name='disableimap_txt'}</label>
                <div class="col-sm-9">
                    {tmpl_var name='disableimap'}
@@ -84,4 +90,4 @@
        <div class="clear"><div class="right">
            <button class="btn btn-default formbutton-success" type="button" value="{tmpl_var name='btn_save_txt'}" data-submit-form="pageForm" data-form-action="mail/mail_user_edit.php">{tmpl_var name='btn_save_txt'}</button>
            <button class="btn btn-default formbutton-default" type="button" value="{tmpl_var name='btn_cancel_txt'}" data-load-content="mail/mail_user_list.php">{tmpl_var name='btn_cancel_txt'}</button>
        </div></div>
        </div></div>