Changeset 2797 in subversion

Timestamp:

Jul 24, 2009 8:06:05 AM (4 years ago)

Author:

alec

Message:

• support plugin's config file

Location:

trunk/roundcubemail/plugins

Files:

• help/README (deleted)
• help/config.inc.php.dist (added)
• help/help.php (modified) (2 diffs)
• managesieve/Changelog (modified) (1 diff)
• managesieve/config.inc.php.dist (added)
• managesieve/managesieve.php (modified) (2 diffs)

trunk/roundcubemail/plugins/help/help.php

@@ -7 +7 @@
  * @licence GNU GPL
  *
- * Enable the plugin in config/main.inc.php and set Help content iframe source
- *   $rcmail_config['help_source'] = 'http://trac.roundcube.net/wiki';
+ * Configuration (see config.inc.php.dist)
  * 
  **/
- 
+
 class help extends rcube_plugin
 {
@@ -42 +41 @@
     {
       $rcmail = rcmail::get_instance();
+
+      $this->load_config();
 
       // register UI objects

trunk/roundcubemail/plugins/managesieve/Changelog

@@ +1 @@
+* version 1.3 [2009-07-24]
+-----------------------------------------------------------
+- support more languages
+- support config.inc.php file
+
 * version 1.2 [2009-06-28]
 -----------------------------------------------------------

trunk/roundcubemail/plugins/managesieve/managesieve.php

@@ -8 +8 @@
  * with server using managesieve protocol. Adds Filters tab in Settings.
  *
- * @version 1.1
+ * @version 1.3
  * @author Aleksander 'A.L.E.C' Machniak <alec@alec.pl>
  *
- * Configuration (main.inc.php):
- 
-// managesieve server port
-$rcmail_config['managesieve_port'] = 2000;
-
-// managesieve server address
-$rcmail_config['managesieve_host'] = 'localhost';
-
-// use or not TLS for managesieve server connection
-// it's because I've problems with TLS and dovecot's managesieve plugin
-// and it's not needed on localhost
-$rcmail_config['managesieve_usetls'] = false;
-
-// default contents of filters script (eg. default spam filter)
-$rcmail_config['managesieve_default'] = '/etc/dovecot/sieve/global';
-
-// I need this because my dovecot (with listescape plugin) uses
-// ':' delimiter, but creates folders with dot delimiter
-$rcmail_config['managesieve_replace_delimiter'] = '';
-
-// disabled sieve extensions (body, copy, date, editheader, encoded-character,
-// envelope, environment, ereject, fileinto, ihave, imap4flags, index,
-// mailbox, mboxmetadata, regex, reject, relational, servermetadata,
-// spamtest, spamtestplus, subaddress, vacation, variables, virustest, etc.
-// Note: not all extensions are implemented
-$rcmail_config['managesieve_disabled_extensions'] = array();
-
+ * Configuration (see config.inc.php.dist):
  */
 
@@ -73 +47 @@
     $rcmail = rcmail::get_instance();
     $this->rc = &$rcmail;
+
+    $this->load_config();
 
     // register UI objects