check switching to lmtp in update-case too

Dominik Müller

2014-10-13 59baa48eb7ed4219251acf41c9560da00b77c62e

check switching to lmtp in update-case too

 install/lib/installer_base.lib.php

@@ -930,6 +930,19 @@

    public function configure_dovecot() {
        global $conf;
		
        $virtual_transport = 'dovecot';
		
        // check if virtual_transport must be changed
        if ($this->is_update) {
            $tmp = $inst->db->queryOneRecord("SELECT * FROM ".$conf["mysql"]["database"].".server WHERE server_id = ".$conf['server_id']);
            $ini_array = ini_to_array(stripslashes($tmp['config']));
            // ini_array needs not to be checked, because already done in update.php -> updateDbAndIni()
			
            if(isset($ini_array['mail']['mailbox_virtual_uidgid_maps']) && $ini_array['mail']['mailbox_virtual_uidgid_maps'] == 'y') {
                $virtual_transport = 'lmtp:unix:private/dovecot-lmtp';
            }
        }

        $config_dir = $conf['dovecot']['config_dir'];

@@ -954,7 +967,7 @@
        // Adding the amavisd commands to the postfix configuration
        $postconf_commands = array (
            'dovecot_destination_recipient_limit = 1',
            'virtual_transport = dovecot',
            'virtual_transport = '.$virtual_transport,
            'smtpd_sasl_type = dovecot',
            'smtpd_sasl_path = private/auth'
        );