use lmtp by default if detected

Author: jnorell

install/dist/lib/debian60.lib.php

@@ -33,11 +33,16 @@ class installer extends installer_base {
 	public function configure_dovecot()
 	{
 		global $conf;
-		
+	
 		$virtual_transport = 'dovecot';
 
 		$configure_lmtp = false;
-		
+
+		// use lmtp if installed
+		if($configure_lmtp = is_file('/usr/lib/dovecot/lmtp')) {
+			$virtual_transport = 'lmtp:unix:private/dovecot-lmtp';
+		}
+
 		// check if virtual_transport must be changed
 		if ($this->is_update) {
 			$tmp = $this->db->queryOneRecord("SELECT * FROM ?? WHERE server_id = ?", $conf["mysql"]["database"] . ".server", $conf['server_id']);
@@ -155,20 +160,20 @@ public function configure_dovecot()
 			}
 		}
 
-		//* dovecot-managesieved
-		if($configure_managesieve = is_file('/usr/lib/dovecot/managesieve')) {
-			//remove #mangesieve+ comment
-			$content = file_get_contents($config_dir.'/'.$configfile);
-			$content = str_replace('#mangesieve+ ','',$content);
-			file_put_contents($config_dir.'/'.$configfile,$content);
-			unset($content);
-		}
+		$dovecot_protocols = 'imap pop3';
 
 		//* dovecot-lmtpd
 		if($configure_lmtp) {
-			replaceLine($config_dir.'/'.$configfile, 'protocols = imap pop3', 'protocols = imap pop3 lmtp', 1, 0);
+			$dovecot_protocols .= ' lmtp'
+		}
+
+		//* dovecot-managesieved
+		if(is_file('/usr/lib/dovecot/managesieve')) {
+			$dovecot_protocols .= ' sieve'
 		}
 
+		replaceLine($config_dir.'/'.$configfile, 'protocols = imap pop3', "protocols = $dovecot_protocols", 1, 0);
+
 		//* dovecot-sql.conf
 		$configfile = 'dovecot-sql.conf';
 		if(is_file($config_dir.'/'.$configfile)){

install/lib/installer_base.lib.php

@@ -1233,11 +1233,16 @@ public function configure_courier() {
 
 	public function configure_dovecot() {
 		global $conf;
-		
+	
 		$virtual_transport = 'dovecot';
 
 		$configure_lmtp = false;
-		
+
+		// use lmtp if installed
+		if($configure_lmtp = is_file('/usr/lib/dovecot/lmtp')) {
+			$virtual_transport = 'lmtp:unix:private/dovecot-lmtp';
+		}
+
 		// check if virtual_transport must be changed
 		if ($this->is_update) {
 			$tmp = $this->db->queryOneRecord("SELECT * FROM ?? WHERE server_id = ?", $conf["mysql"]["database"] . ".server", $conf['server_id']);
@@ -1358,20 +1363,20 @@ public function configure_dovecot() {
 			}
 		}
 
-		//* dovecot-managesieved
-		if($configure_managesieve = is_file('/usr/lib/dovecot/managesieve')) {
-			//remove #mangesieve+ comment
-			$content = file_get_contents($config_dir.'/'.$configfile);
-			$content = str_replace('#mangesieve+ ','',$content);
-			file_put_contents($config_dir.'/'.$configfile,$content);
-			unset($content);
-		}
+		$dovecot_protocols = 'imap pop3';
 
 		//* dovecot-lmtpd
 		if($configure_lmtp) {
-			replaceLine($config_dir.'/'.$configfile, 'protocols = imap pop3', 'protocols = imap pop3 lmtp', 1, 0);
+			$dovecot_protocols .= ' lmtp'
+		}
+
+		//* dovecot-managesieved
+		if(is_file('/usr/lib/dovecot/managesieve')) {
+			$dovecot_protocols .= ' sieve'
 		}
 
+		replaceLine($config_dir.'/'.$configfile, 'protocols = imap pop3', "protocols = $dovecot_protocols", 1, 0);
+
 		//* dovecot-sql.conf
 		$configfile = 'dovecot-sql.conf';
 		if(is_file($config_dir.'/'.$configfile)) {

install/tpl/debian6_dovecot2.conf.master

@@ -120,4 +120,3 @@ namespace inbox {
   }
 }
 
-#managesieve+ protocols = $protocols sieve

install/tpl/debian_dovecot2.conf.master

@@ -97,4 +97,3 @@ plugin {
   quota_status_overquota = "552 5.2.2 Mailbox is full"
 }
 
-#managesieve+ protocols = $protocols sieve

install/tpl/fedora_dovecot2.conf.master

@@ -115,4 +115,3 @@ namespace inbox {
   }
 }
 
-#managesieve+ protocols = $protocols sieve

install/tpl/opensuse_dovecot2.conf.master

@@ -114,4 +114,3 @@ namespace inbox {
   }
 }
 
-#managesieve+ protocols = $protocols sieve