Merge branch 'master' of github.com:roundcube/roundcubemail

installer/rcube_install.php

@@ -193,16 +193,16 @@ class rcube_install
         $value = '%p';
       }
       else if ($prop == 'default_folders') {
-	    $value = array();
-	    foreach ($this->config['default_folders'] as $_folder) {
-	      switch ($_folder) {
-	      case 'Drafts': $_folder = $this->config['drafts_mbox']; break;
-	      case 'Sent':   $_folder = $this->config['sent_mbox']; break;
-	      case 'Junk':   $_folder = $this->config['junk_mbox']; break;
-	      case 'Trash':  $_folder = $this->config['trash_mbox']; break;
+        $value = array();
+        foreach ($this->config['default_folders'] as $_folder) {
+          switch ($_folder) {
+          case 'Drafts': $_folder = $this->config['drafts_mbox']; break;
+          case 'Sent':   $_folder = $this->config['sent_mbox']; break;
+          case 'Junk':   $_folder = $this->config['junk_mbox']; break;
+          case 'Trash':  $_folder = $this->config['trash_mbox']; break;
           }
-	    if (!in_array($_folder, $value))
-	      $value[] = $_folder;
+        if (!in_array($_folder, $value))
+          $value[] = $_folder;
         }
       }
       else if (is_bool($default)) {
@@ -453,8 +453,8 @@ class rcube_install
         '0.4-beta', '0.4.2',
         '0.5-beta', '0.5', '0.5.1',
         '0.6-beta', '0.6',
-        '0.7-beta', '0.7', '0.7.1', '0.7.2',
-        '0.8-beta', '0.8-rc', '0.8.0',
+        '0.7-beta', '0.7', '0.7.1', '0.7.2', '0.7.3',
+        '0.8-beta', '0.8-rc', '0.8.0', '0.8.1',
     ));
     return $select;
   }

plugins/managesieve/Changelog

@@ -1,7 +1,10 @@
+* version 6.0 [2012-10-03]
+-----------------------------------------------------------
 - Fixed issue with DBMail bug [http://pear.php.net/bugs/bug.php?id=19077] (#1488594)
 - Added support for enotify/notify (RFC5435, RFC5436, draft-ietf-sieve-notify-00)
 - Change default port to 4190 (IANA-allocated), add port auto-detection (#1488713)
 - Added request size limits detection and script corruption prevention (#1488648)
+- Fix so scripts listed in managesieve_filename_exceptions aren't displayed on the list (#1488724)
 
 * version 5.2 [2012-07-24]
 -----------------------------------------------------------

plugins/managesieve/managesieve.php

@@ -62,7 +62,7 @@ class managesieve extends rcube_plugin
         "x-beenthere",
     );
 
-    const VERSION  = '5.2';
+    const VERSION  = '6.0';
     const PROGNAME = 'Roundcube (Managesieve)';
     const PORT     = 4190;
 
@@ -1839,6 +1839,12 @@ class managesieve extends rcube_plugin
             if ($active = $this->sieve->get_active()) {
                 $this->active = array($active);
             }
+
+            // Hide scripts from config
+            $exceptions = $this->rc->config->get('managesieve_filename_exceptions');
+            if (!empty($exceptions)) {
+                $this->list = array_diff($this->list, (array)$exceptions);
+            }
         }
 
         return $this->list;

plugins/managesieve/package.xml

@@ -17,10 +17,10 @@
 		<email>alec@alec.pl</email>
 		<active>yes</active>
 	</lead>
-	<date>2012-07-24</date>
+	<date>2012-10-03</date>
 	<version>
-		<release>5.2</release>
-		<api>5.0</api>
+		<release>6.0</release>
+		<api>6.0</api>
 	</version>
 	<stability>
 		<release>stable</release>
@@ -95,6 +95,15 @@
 			<file name="skins/classic/images/down_small.gif" role="data"></file>
 			<file name="skins/classic/images/filter.png" role="data"></file>
 			<file name="skins/classic/images/up_small.gif" role="data"></file>
+			<file name="skins/larry/managesieve.css" role="data"></file>
+			<file name="skins/larry/managesieve_mail.css" role="data"></file>
+			<file name="skins/larry/templates/filteredit.html" role="data"></file>
+			<file name="skins/larry/templates/managesieve.html" role="data"></file>
+			<file name="skins/larry/templates/setedit.html" role="data"></file>
+			<file name="skins/larry/images/add.png" role="data"></file>
+			<file name="skins/larry/images/del.png" role="data"></file>
+			<file name="skins/larry/images/down_small.gif" role="data"></file>
+			<file name="skins/larry/images/up_small.gif" role="data"></file>
 			<file name="managesieve.php" role="php"></file>
 			<file name="lib/rcube_sieve.php" role="php"></file>
 			<file name="lib/rcube_sieve_script.php" role="php"></file>