Changeset 5187 in subversion

Timestamp:

Sep 7, 2011 3:25:54 AM (21 months ago)

Author:

alec

Message:

• Add managesieve_script_name option for default name of the script (#1487956)

Location:

trunk/plugins/managesieve

Files:

• Changelog (modified) (1 diff)
• config.inc.php.dist (modified) (1 diff)
• managesieve.php (modified) (1 diff)

trunk/plugins/managesieve/Changelog

@@ -1 +1 @@
 - Added possibility to create a filter based on selected message "in-place"
 - Fixed import from Horde-INGO (#1488064)
+- Add managesieve_script_name option for default name of the script (#1487956)
 
 * version 4.3 [2011-07-28]

trunk/plugins/managesieve/config.inc.php.dist

@@ -32 +32 @@
 $rcmail_config['managesieve_default'] = '/etc/dovecot/sieve/global';
 
+// The name of the script which will be used when there's no user script
+$rcmail_config['managesieve_script_name'] = 'managesieve';
+
 // Sieve RFC says that we should use UTF-8 endcoding for mailbox names,
 // but some implementations does not covert UTF-8 to modified UTF-7.

trunk/plugins/managesieve/managesieve.php

@@ -206 +206 @@
                     // if script not exists build default script contents
                     $script_file = $this->rc->config->get('managesieve_default');
-                    $script_name = 'roundcube';
+                    $script_name = $this->rc->config->get('managesieve_script_name');
+
+                    if (empty($script_name))
+                        $script_name = 'roundcube';
+
                     if ($script_file && is_readable($script_file))
                         $content = file_get_contents($script_file);
 
-                // add script and set it active
-                if ($this->sieve->save_script($script_name, $content))
-                    if ($this->sieve->activate($script_name))
-                        $_SESSION['managesieve_active'] = $script_name;
+                    // add script and set it active
+                    if ($this->sieve->save_script($script_name, $content))
+                        if ($this->sieve->activate($script_name))
+                            $_SESSION['managesieve_active'] = $script_name;
                 }
             }