From 9240c6a7d9053af43fe16629f0a38440c6369fdc Mon Sep 17 00:00:00 2001 From: alecpl Date: Fri, 24 Jul 2009 12:06:05 +0000 Subject: - support plugin's config file --- plugins/help/README | 1 - plugins/help/config.inc.php.dist | 8 ++++++++ plugins/help/help.php | 7 ++++--- plugins/managesieve/Changelog | 5 +++++ plugins/managesieve/config.inc.php.dist | 28 ++++++++++++++++++++++++++++ plugins/managesieve/managesieve.php | 32 ++++---------------------------- 6 files changed, 49 insertions(+), 32 deletions(-) delete mode 100644 plugins/help/README create mode 100644 plugins/help/config.inc.php.dist create mode 100644 plugins/managesieve/config.inc.php.dist (limited to 'plugins') diff --git a/plugins/help/README b/plugins/help/README deleted file mode 100644 index f1298763a..000000000 --- a/plugins/help/README +++ /dev/null @@ -1 +0,0 @@ -Please refer to main plugin script ... \ No newline at end of file diff --git a/plugins/help/config.inc.php.dist b/plugins/help/config.inc.php.dist new file mode 100644 index 000000000..6b27227b0 --- /dev/null +++ b/plugins/help/config.inc.php.dist @@ -0,0 +1,8 @@ + + \ No newline at end of file diff --git a/plugins/help/help.php b/plugins/help/help.php index 336321c88..c02b7e991 100644 --- a/plugins/help/help.php +++ b/plugins/help/help.php @@ -6,11 +6,10 @@ * @author Aleksander 'A.L.E.C' Machniak * @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 { function init() @@ -42,6 +41,8 @@ class help extends rcube_plugin { $rcmail = rcmail::get_instance(); + $this->load_config(); + // register UI objects $rcmail->output->add_handlers(array( 'helpcontent' => array($this, 'content'), diff --git a/plugins/managesieve/Changelog b/plugins/managesieve/Changelog index 58d4e882d..53f12be7e 100644 --- a/plugins/managesieve/Changelog +++ b/plugins/managesieve/Changelog @@ -1,3 +1,8 @@ +* version 1.3 [2009-07-24] +----------------------------------------------------------- +- support more languages +- support config.inc.php file + * version 1.2 [2009-06-28] ----------------------------------------------------------- - Support IMAP namespaces in fileinto (#1485943) diff --git a/plugins/managesieve/config.inc.php.dist b/plugins/managesieve/config.inc.php.dist new file mode 100644 index 000000000..d8e949a1f --- /dev/null +++ b/plugins/managesieve/config.inc.php.dist @@ -0,0 +1,28 @@ + diff --git a/plugins/managesieve/managesieve.php b/plugins/managesieve/managesieve.php index 606f6898e..21d974da6 100644 --- a/plugins/managesieve/managesieve.php +++ b/plugins/managesieve/managesieve.php @@ -7,36 +7,10 @@ * It's clickable interface which operates on text scripts and communicates * with server using managesieve protocol. Adds Filters tab in Settings. * - * @version 1.1 + * @version 1.3 * @author Aleksander 'A.L.E.C' Machniak * - * 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): */ class managesieve extends rcube_plugin @@ -73,6 +47,8 @@ class managesieve extends rcube_plugin $rcmail = rcmail::get_instance(); $this->rc = &$rcmail; + $this->load_config(); + // register UI objects $this->rc->output->add_handlers(array( 'filterslist' => array($this, 'filters_list'), -- cgit v1.2.3