Marius Cramer
2015-01-13 06339e0c8ac8fdbbf5d2784df8019704da9bd6eb
install/dist/lib/fedora.lib.php
@@ -385,7 +385,7 @@
      
      // 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']);
         $tmp = $this->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()
         
@@ -442,18 +442,19 @@
      //* Get the dovecot version
      exec('dovecot --version', $tmp);
      $parts = explode('.', trim($tmp[0]));
      $dovecot_version = $parts[0];
      $dovecot_version = $tmp[0];
      unset($tmp);
      unset($parts);
      //* Copy dovecot configuration file
      if($dovecot_version == 2) {
      if(version_compare($dovecot_version,2) >= 0) {
         if(is_file($conf['ispconfig_install_dir'].'/server/conf-custom/install/fedora_dovecot2.conf.master')) {
            copy($conf['ispconfig_install_dir'].'/server/conf-custom/install/fedora_dovecot2.conf.master', $config_dir.'/'.$configfile);
         } else {
            copy('tpl/fedora_dovecot2.conf.master', $config_dir.'/'.$configfile);
         }
         if(version_compare($dovecot_version,2.1) < 0) {
            removeLine($config_dir.'/'.$configfile, 'ssl_protocols =');
         }
      } else {
         if(is_file($conf['ispconfig_install_dir'].'/server/conf-custom/install/fedora_dovecot.conf.master')) {
            copy($conf['ispconfig_install_dir'].'/server/conf-custom/install/fedora_dovecot.conf.master', $config_dir.'/'.$configfile);