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

Florian Schaal

2014-10-17 22e5abc44844ffb4aa6a6eaf301d6fde633908e9

 install/lib/installer_base.lib.php

@@ -682,6 +682,9 @@

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

      //* postfix-dkim
      $full_file_name=$config_dir.'/tag_as_originating.re';
@@ -930,6 +933,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 +970,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'
      );
@@ -2196,8 +2212,8 @@
      }

      $root_cron_jobs = array(
         "* * * * * ".$install_dir."/server/server.sh 2>&1 > /dev/null | while read line; do echo `/bin/date` \"\$line\" >> ".$conf['ispconfig_log_dir']."/cron.log; done",
         "* * * * * ".$install_dir."/server/cron.sh 2>&1 > /dev/null | while read line; do echo `/bin/date` \"\$line\" >> ".$conf['ispconfig_log_dir']."/cron.log; done"
         "* * * * * ".$install_dir."/server/server.sh 2>&1 | while read line; do echo `/bin/date` \"\$line\" >> ".$conf['ispconfig_log_dir']."/cron.log; done",
         "* * * * * ".$install_dir."/server/cron.sh 2>&1 | while read line; do echo `/bin/date` \"\$line\" >> ".$conf['ispconfig_log_dir']."/cron.log; done"
      );

      if ($conf['nginx']['installed'] == true) {