enable managesieve daemon if installed (#3395)

Author: jnorell

install/dist/lib/debian60.lib.php

@@ -138,7 +138,7 @@ public function configure_dovecot()
 				}
 				//remove #2.3+ comment
 				$content = file_get_contents($config_dir.'/'.$configfile);
-				$content = str_replace('#2.3+','',$content);
+				$content = str_replace('#2.3+ ','',$content);
 				file_put_contents($config_dir.'/'.$configfile,$content);
 				unset($content);
 
@@ -155,6 +155,15 @@ 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-lmtpd
 		if($configure_lmtp) {
 			replaceLine($config_dir.'/'.$configfile, 'protocols = imap pop3', 'protocols = imap pop3 lmtp', 1, 0);

install/lib/installer_base.lib.php

@@ -1347,7 +1347,7 @@ public function configure_dovecot() {
 				}
 				//remove #2.3+ comment
 				$content = file_get_contents($config_dir.'/'.$configfile);
-				$content = str_replace('#2.3+','',$content);
+				$content = str_replace('#2.3+ ','',$content);
 				file_put_contents($config_dir.'/'.$configfile,$content);
 				unset($content);
 
@@ -1358,6 +1358,15 @@ 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-lmtpd
 		if($configure_lmtp) {
 			replaceLine($config_dir.'/'.$configfile, 'protocols = imap pop3', 'protocols = imap pop3 lmtp', 1, 0);

install/tpl/debian6_dovecot2.conf.master

@@ -119,3 +119,5 @@ namespace inbox {
     special_use = \Trash
   }
 }
+
+#managesieve+ protocols = $protocols sieve

install/tpl/debian_dovecot2.conf.master

@@ -96,3 +96,5 @@ plugin {
   quota_status_nouser = DUNNO
   quota_status_overquota = "552 5.2.2 Mailbox is full"
 }
+
+#managesieve+ protocols = $protocols sieve

install/tpl/fedora_dovecot2.conf.master

@@ -114,3 +114,5 @@ namespace inbox {
     special_use = \Trash
   }
 }
+
+#managesieve+ protocols = $protocols sieve

install/tpl/opensuse_dovecot2.conf.master

@@ -113,3 +113,5 @@ namespace inbox {
     special_use = \Trash
   }
 }
+
+#managesieve+ protocols = $protocols sieve