diff options
Diffstat (limited to 'plugins')
46 files changed, 329 insertions, 220 deletions
diff --git a/plugins/acl/config.inc.php.dist b/plugins/acl/config.inc.php.dist index d0e1a0932..3f0b1efb6 100644 --- a/plugins/acl/config.inc.php.dist +++ b/plugins/acl/config.inc.php.dist @@ -3,23 +3,23 @@ // Default look of access rights table // In advanced mode all access rights are displayed separately // In simple mode access rights are grouped into four groups: read, write, delete, full -$rcmail_config['acl_advanced_mode'] = false; +$config['acl_advanced_mode'] = false; // LDAP addressbook that would be searched for user names autocomplete. -// That should be an array refering to the $rcmail_config['ldap_public'] array key +// That should be an array refering to the $config['ldap_public'] array key // or complete addressbook configuration array. -$rcmail_config['acl_users_source'] = ''; +$config['acl_users_source'] = ''; // The LDAP attribute which will be used as ACL user identifier -$rcmail_config['acl_users_field'] = 'mail'; +$config['acl_users_field'] = 'mail'; // The LDAP search filter will be &'d with search queries -$rcmail_config['acl_users_filter'] = ''; +$config['acl_users_filter'] = ''; // Include the following 'special' access control subjects in the ACL dialog; // Defaults to array('anyone', 'anonymous') (not when set to an empty array) // Example: array('anyone') to exclude 'anonymous'. // Set to an empty array to exclude all special aci subjects. -$rcmail_config['acl_specials'] = array('anyone', 'anonymous'); +$config['acl_specials'] = array('anyone', 'anonymous'); ?> diff --git a/plugins/acl/localization/az_AZ.inc b/plugins/acl/localization/az_AZ.inc index d5543ddaa..5d875a2b7 100644 --- a/plugins/acl/localization/az_AZ.inc +++ b/plugins/acl/localization/az_AZ.inc @@ -89,7 +89,7 @@ $messages['saving'] = 'Giriş hüququnun saxlanılması...'; $messages['updatesuccess'] = 'Giriş hüququ dəyişdirildi'; $messages['deletesuccess'] = 'Giriş hüququ silindi'; $messages['createsuccess'] = 'Giriş hüququ əlavə edildi'; -$messages['updateerror'] = 'Giriş hüququnu yeniləmək mümkün deyil'; +$messages['updateerror'] = 'Hüquqları yeniləmək alınmadı'; $messages['deleteerror'] = 'Giriş hüququnu silmək mümkün deyil'; $messages['createerror'] = 'Giriş hüququnu əlavə etmək mümkün deyil'; $messages['deleteconfirm'] = 'Seçilmiş istifadəçilərin giriş hüququnu silməkdə əminsiniz?'; diff --git a/plugins/acl/localization/fa_IR.inc b/plugins/acl/localization/fa_IR.inc index 48fb8a225..2face4fba 100644 --- a/plugins/acl/localization/fa_IR.inc +++ b/plugins/acl/localization/fa_IR.inc @@ -22,51 +22,51 @@ $labels['username'] = 'کاربر:'; $labels['advanced'] = 'حالت پیشرفته'; $labels['newuser'] = 'افزودن مدخل'; $labels['actions'] = 'فعالیت‌های مجوز دسترسی...'; -$labels['anyone'] = 'همه کاربران (هر کسی)'; -$labels['anonymous'] = 'مهمان‌ها (ناشناس‌ها)'; +$labels['anyone'] = 'همه‌ی کاربران (هر کسی)'; +$labels['anonymous'] = 'مهمان‌ها (ناشناس)'; $labels['identifier'] = 'شناساگر'; $labels['acll'] = 'یافتن'; -$labels['aclr'] = 'پیام های خوانده شده'; +$labels['aclr'] = 'پیغام‌های خوانده شده'; $labels['acls'] = 'نگه داشتن حالت بازدید'; $labels['aclw'] = 'پرچم‌های نوشتن'; $labels['acli'] = 'وارد کردن (کپی کردن در)'; -$labels['aclp'] = 'نوشته'; +$labels['aclp'] = 'ارسال'; $labels['aclc'] = 'ایجاد زیرپوشه‌ها'; $labels['aclk'] = 'ایجاد زیرپوشه‌ها'; $labels['acld'] = 'پاک کردن پیغام‌ها'; $labels['aclt'] = 'پاک کردن پیغام‌ها'; $labels['acle'] = 'پاک کردن'; $labels['aclx'] = 'حذف پوشه'; -$labels['acla'] = 'مدیر'; +$labels['acla'] = 'مدیریت کردن'; $labels['aclfull'] = 'کنترل کامل'; $labels['aclother'] = 'دیگر'; -$labels['aclread'] = 'خوانده شده'; +$labels['aclread'] = 'خواندن'; $labels['aclwrite'] = 'نوشتن'; $labels['acldelete'] = 'حذف'; $labels['shortacll'] = 'یافتن'; -$labels['shortaclr'] = 'خوانده شده'; +$labels['shortaclr'] = 'خواندن'; $labels['shortacls'] = 'نگه داشتن'; $labels['shortaclw'] = 'نوشتن'; -$labels['shortacli'] = 'جاگذارى'; -$labels['shortaclp'] = 'نوشته'; +$labels['shortacli'] = 'اضافه کردن'; +$labels['shortaclp'] = 'ارسال'; $labels['shortaclc'] = 'ایجاد'; $labels['shortaclk'] = 'ایجاد'; $labels['shortacld'] = 'حذف'; $labels['shortaclt'] = 'حذف'; $labels['shortacle'] = 'پاک کردن'; $labels['shortaclx'] = 'حذف کردن پوشه'; -$labels['shortacla'] = 'مدیر'; +$labels['shortacla'] = 'مدیریت کردن'; $labels['shortaclother'] = 'دیگر'; -$labels['shortaclread'] = 'خوانده شده'; +$labels['shortaclread'] = 'خواندن'; $labels['shortaclwrite'] = 'نوشتن'; $labels['shortacldelete'] = 'حذف'; -$labels['longacll'] = 'پوشه در فهرست‌ها قابل مشاهده است و می‌تواند مشترک به'; -$labels['longaclr'] = 'پوشه می‌تواند برای خواندن باز شود'; +$labels['longacll'] = 'پوشه را می‌توان در فهرست‌ها دید و در آن مشترک شد'; +$labels['longaclr'] = 'پوشه می‌تواند برای خوانده شدن باز شود'; $labels['longacls'] = 'پرچم بازدید پیغام‌ها می‌تواند تغییر داده شود'; $labels['longaclw'] = 'پرچم و کلیدواژه پیغام‌ها می‌تواند تغییر داده شود، به غیر از بازدید و حذف'; $labels['longacli'] = 'پیغام‌ها می‌توانند کپی یا نوشته شوند به پوشه'; @@ -89,7 +89,7 @@ $messages['saving'] = 'ذخیره قوانین دسترسی...'; $messages['updatesuccess'] = 'قوانین دسترسی با موفقیت تغییر کردند'; $messages['deletesuccess'] = 'قوانین دسترسی با موفقیت حذف شدند'; $messages['createsuccess'] = 'قوانین دسترسی با موفقیت اضافه شدند'; -$messages['updateerror'] = 'ناتوانی در بروزرسانی قوانین دسترسی'; +$messages['updateerror'] = 'ناتوانی در به روز کردن قوانین دسترسی'; $messages['deleteerror'] = 'ناتوانی در حذف قوانین دسترسی'; $messages['createerror'] = 'ناتوانی در اضافه کردن قوانین دسترسی'; $messages['deleteconfirm'] = 'آیا شما مطمئن هستید که می‌خواهید قوانین دسترسی را برای کاربر(ان) انتخاب شده حذف نمایید؟'; diff --git a/plugins/acl/localization/lt_LT.inc b/plugins/acl/localization/lt_LT.inc index 59393012f..39a4d1be2 100644 --- a/plugins/acl/localization/lt_LT.inc +++ b/plugins/acl/localization/lt_LT.inc @@ -89,7 +89,7 @@ $messages['saving'] = 'Išsaugomos prieigos teisės'; $messages['updatesuccess'] = 'Prieigos teisės sėkmingai pakeistos'; $messages['deletesuccess'] = 'Prieigos teisės sėkmingai panaikintos'; $messages['createsuccess'] = 'Prieigos teisės sėkmingai pridėtos'; -$messages['updateerror'] = 'Neįmanoma atnaujinti prieigos teises'; +$messages['updateerror'] = 'Nepavyko pakeisti prieigos teisių'; $messages['deleteerror'] = 'Neįmanoma panaikinti prieigos teises'; $messages['createerror'] = 'Neišeina pridėti prieigos teises'; $messages['deleteconfirm'] = 'Ar jūs esate įsitikinę, jog norite panaikinti prieigos teises pažymėtiems vartotojams(-ui)?'; diff --git a/plugins/additional_message_headers/additional_message_headers.php b/plugins/additional_message_headers/additional_message_headers.php index a43018176..0d16e605e 100644 --- a/plugins/additional_message_headers/additional_message_headers.php +++ b/plugins/additional_message_headers/additional_message_headers.php @@ -7,7 +7,7 @@ * to or remove them from outgoing messages. * * Enable the plugin in config.inc.php and add your desired headers: - * $rcmail_config['additional_message_headers'] = array('User-Agent'); + * $config['additional_message_headers'] = array('User-Agent' => 'My-Very-Own-Webmail'); * * @version @package_version@ * @author Ziba Scott @@ -15,27 +15,32 @@ */ class additional_message_headers extends rcube_plugin { - public $task = 'mail'; - function init() { - $this->add_hook('message_outgoing_headers', array($this, 'message_headers')); + $this->add_hook('message_before_send', array($this, 'message_headers')); } function message_headers($args) { - $this->load_config(); + $this->load_config(); + + $headers = $args['message']->headers(); + $rcube = rcube::get_instance(); // additional email headers - $additional_headers = rcmail::get_instance()->config->get('additional_message_headers',array()); - foreach($additional_headers as $header=>$value){ + $additional_headers = $rcube->config->get('additional_message_headers', array()); + foreach ((array)$additional_headers as $header => $value) { if (null === $value) { - unset($args['headers'][$header]); - } else { - $args['headers'][$header] = $value; + unset($headers[$header]); + } + else { + $headers[$header] = $value; } } + $args['message']->_headers = array(); + $args['message']->headers($headers); + return $args; } } diff --git a/plugins/additional_message_headers/config.inc.php.dist b/plugins/additional_message_headers/config.inc.php.dist index 83ccd869c..72a4f1cee 100644 --- a/plugins/additional_message_headers/config.inc.php.dist +++ b/plugins/additional_message_headers/config.inc.php.dist @@ -1,14 +1,14 @@ <?php -// $rcmail_config['additional_message_headers']['X-Remote-Browser'] = $_SERVER['HTTP_USER_AGENT']; -// $rcmail_config['additional_message_headers']['X-Originating-IP'] = $_SERVER['REMOTE_ADDR']; -// $rcmail_config['additional_message_headers']['X-RoundCube-Server'] = $_SERVER['SERVER_ADDR']; +// $config['additional_message_headers']['X-Remote-Browser'] = $_SERVER['HTTP_USER_AGENT']; +// $config['additional_message_headers']['X-Originating-IP'] = $_SERVER['REMOTE_ADDR']; +// $config['additional_message_headers']['X-RoundCube-Server'] = $_SERVER['SERVER_ADDR']; // if( isset( $_SERVER['MACHINE_NAME'] )) { -// $rcmail_config['additional_message_headers']['X-RoundCube-Server'] .= ' (' . $_SERVER['MACHINE_NAME'] . ')'; +// $config['additional_message_headers']['X-RoundCube-Server'] .= ' (' . $_SERVER['MACHINE_NAME'] . ')'; // } // To remove (e.g. X-Sender) message header use null value -// $rcmail_config['additional_message_headers']['X-Sender'] = null; +// $config['additional_message_headers']['X-Sender'] = null; ?> diff --git a/plugins/additional_message_headers/package.xml b/plugins/additional_message_headers/package.xml index 73c24fba7..c15d9f8b3 100644 --- a/plugins/additional_message_headers/package.xml +++ b/plugins/additional_message_headers/package.xml @@ -13,11 +13,10 @@ <email>email@example.org</email> <active>yes</active> </lead> - <date>2010-01-16</date> - <time>18:19:33</time> + <date>2013-08-25</date> <version> - <release>1.1.0</release> - <api>1.1.0</api> + <release>1.2.0</release> + <api>1.2.0</api> </version> <stability> <release>stable</release> diff --git a/plugins/archive/localization/fa_IR.inc b/plugins/archive/localization/fa_IR.inc index 9df31ed31..03bf6d8bd 100644 --- a/plugins/archive/localization/fa_IR.inc +++ b/plugins/archive/localization/fa_IR.inc @@ -20,11 +20,11 @@ $labels = array(); $labels['buttontext'] = 'بایگانی'; $labels['buttontitle'] = 'بایگانی این پیغام'; $labels['archived'] = 'با موفقیت بایگانی شد'; -$labels['archivedreload'] = 'با موفقیت بایگانی شد، بارگذاری مجدد صفحه برای دیدن پوشه‌های بایگانی جدید.'; -$labels['archiveerror'] = 'برخی پیغام‌ها بایگانی نخواهند شد'; +$labels['archivedreload'] = 'با موفقیت بایگانی شد. برای دیدن پوشه‌های بایگانی جدید صفحه را مجددا بارگذاری نمایید.'; +$labels['archiveerror'] = 'برخی از پیغام‌ها بایگانی نشدند.'; $labels['archivefolder'] = 'بایگانی'; $labels['settingstitle'] = 'بایگانی'; -$labels['archivetype'] = 'جدا کردن بایگانی با'; +$labels['archivetype'] = 'تقسیم بایگانی با'; $labels['archivetypeyear'] = 'سال (به عنوان مثال بایگانی/۲۰۱۲)'; $labels['archivetypemonth'] = 'ماه (به عنوان مثال بایگانی/۲۰۱۲/۰۶)'; $labels['archivetypefolder'] = 'پوشه اصلی'; diff --git a/plugins/database_attachments/config.inc.php.dist b/plugins/database_attachments/config.inc.php.dist index b23a9a1be..c371cbbb7 100644 --- a/plugins/database_attachments/config.inc.php.dist +++ b/plugins/database_attachments/config.inc.php.dist @@ -3,10 +3,10 @@ // By default this plugin stores attachments in filesystem // and copies them into sql database. // You can change it to use 'memcache' or 'apc'. -$rcmail_config['database_attachments_cache'] = 'db'; +$config['database_attachments_cache'] = 'db'; // Attachment data expires after specied TTL time in seconds (max.2592000). // Default is 12 hours. -$rcmail_config['database_attachments_cache_ttl'] = 12 * 60 * 60; +$config['database_attachments_cache_ttl'] = 12 * 60 * 60; ?> diff --git a/plugins/debug_logger/debug_logger.php b/plugins/debug_logger/debug_logger.php index deb6deb91..88237d767 100644 --- a/plugins/debug_logger/debug_logger.php +++ b/plugins/debug_logger/debug_logger.php @@ -23,11 +23,11 @@ * * config.inc.php: * - * // $rcmail_config['debug_logger'][type of logging] = name of file in log_dir + * // $config['debug_logger'][type of logging] = name of file in log_dir * // The 'master' log includes timing information - * $rcmail_config['debug_logger']['master'] = 'master'; + * $config['debug_logger']['master'] = 'master'; * // If you want sql messages to also go into a separate file - * $rcmail_config['debug_logger']['sql'] = 'sql'; + * $config['debug_logger']['sql'] = 'sql'; * * index.php (just after $RCMAIL->plugins->init()): * diff --git a/plugins/enigma/config.inc.php.dist b/plugins/enigma/config.inc.php.dist index ca841d0ac..2adb4d9f6 100644 --- a/plugins/enigma/config.inc.php.dist +++ b/plugins/enigma/config.inc.php.dist @@ -4,11 +4,11 @@ // -------------------- // A driver to use for PGP. Default: "gnupg". -$rcmail_config['enigma_pgp_driver'] = 'gnupg'; +$config['enigma_pgp_driver'] = 'gnupg'; // A driver to use for S/MIME. Default: "phpssl". -$rcmail_config['enigma_smime_driver'] = 'phpssl'; +$config['enigma_smime_driver'] = 'phpssl'; // Keys directory for all users. Default 'enigma/home'. // Must be writeable by PHP process -$rcmail_config['enigma_pgp_homedir'] = null; +$config['enigma_pgp_homedir'] = null; diff --git a/plugins/help/config.inc.php.dist b/plugins/help/config.inc.php.dist index 1dbc21753..7cc8d5f00 100644 --- a/plugins/help/config.inc.php.dist +++ b/plugins/help/config.inc.php.dist @@ -2,12 +2,12 @@ // Help content iframe source // %l will be replaced by the language code resolved using the 'help_language_map' option -$rcmail_config['help_source'] = 'http://roundcube.net/doc/help/0.9/%l/'; +$config['help_source'] = 'http://roundcube.net/doc/help/0.9/%l/'; // Map task/action combinations to deep-links // Use '<task>/<action>' or only '<task>' strings as keys // The values will be appended to the 'help_source' URL -$rcmail_config['help_index_map'] = array( +$config['help_index_map'] = array( 'login' => 'login.html', 'mail' => 'mail/index.html', 'mail/compose' => 'mail/compose.html', @@ -20,16 +20,16 @@ $rcmail_config['help_index_map'] = array( // Map to translate Roundcube language codes into help document languages // The '*' entry will be used as default -$rcmail_config['help_language_map'] = array('*' => 'en_US'); +$config['help_language_map'] = array('*' => 'en_US'); // Enter an absolute URL to a page displaying information about this webmail // Alternatively, create a HTML file under <this-plugin-dir>/content/about.html -$rcmail_config['help_about_url'] = null; +$config['help_about_url'] = null; // Enter an absolute URL to a page displaying information about this webmail // Alternatively, put your license text to <this-plugin-dir>/content/license.html -$rcmail_config['help_license_url'] = null; +$config['help_license_url'] = null; // Determine whether to open the help in a new window -$rcmail_config['help_open_extwin'] = false; +$config['help_open_extwin'] = false; diff --git a/plugins/hide_blockquote/hide_blockquote.php b/plugins/hide_blockquote/hide_blockquote.php index 1168656fd..2ad5dd8ac 100644 --- a/plugins/hide_blockquote/hide_blockquote.php +++ b/plugins/hide_blockquote/hide_blockquote.php @@ -8,7 +8,7 @@ * Configuration: * // Minimum number of citation lines. Longer citation blocks will be hidden. * // 0 - no limit (no hidding). - * $rcmail_config['hide_blockquote_limit'] = 0; + * $config['hide_blockquote_limit'] = 0; * * @version @package_version@ * @license GNU GPLv3+ diff --git a/plugins/http_authentication/config.inc.php.dist b/plugins/http_authentication/config.inc.php.dist index 0d798a586..0940dee1f 100644 --- a/plugins/http_authentication/config.inc.php.dist +++ b/plugins/http_authentication/config.inc.php.dist @@ -5,5 +5,5 @@ // Default mail host to log-in using user/password from HTTP Authentication. // This is useful if the users are free to choose arbitrary mail hosts (or // from a list), but have one host they usually want to log into. -// Unlike $rcmail_config['default_host'] this must be a string! -$rcmail_config['http_authentication_host'] = ''; +// Unlike $config['default_host'] this must be a string! +$config['http_authentication_host'] = ''; diff --git a/plugins/http_authentication/http_authentication.php b/plugins/http_authentication/http_authentication.php index 2631537a0..d86e1791c 100644 --- a/plugins/http_authentication/http_authentication.php +++ b/plugins/http_authentication/http_authentication.php @@ -7,7 +7,7 @@ * * Configuration: * // redirect the client to this URL after logout. This page is then responsible to clear HTTP auth - * $rcmail_config['logout_url'] = 'http://server.tld/logout.html'; + * $config['logout_url'] = 'http://server.tld/logout.html'; * * See logout.html (in this directory) for an example how HTTP auth can be cleared. * diff --git a/plugins/identity_select/identity_select.php b/plugins/identity_select/identity_select.php index 203776725..7973b5dad 100644 --- a/plugins/identity_select/identity_select.php +++ b/plugins/identity_select/identity_select.php @@ -10,7 +10,7 @@ * identity selection more accurate. * * Enable the plugin in config.inc.php and add your desired headers: - * $rcmail_config['identity_select_headers'] = array('Delivered-To'); + * $config['identity_select_headers'] = array('Delivered-To'); * * @version @package_version@ * @author Aleksander Machniak <alec@alec.pl> @@ -46,7 +46,7 @@ class identity_select extends rcube_plugin */ function select($p) { - if ($p['selected'] !== null) { + if ($p['selected'] !== null || !is_object($p['message']->headers)) { return $p; } diff --git a/plugins/jqueryui/config.inc.php.dist b/plugins/jqueryui/config.inc.php.dist index a3c3f75a0..8e111e0e1 100644 --- a/plugins/jqueryui/config.inc.php.dist +++ b/plugins/jqueryui/config.inc.php.dist @@ -1,10 +1,10 @@ <?php // if you want to load localization strings for specific sub-libraries of jquery-ui, configure them here -$rcmail_config['jquery_ui_i18n'] = array('datepicker'); +$config['jquery_ui_i18n'] = array('datepicker'); // map Roundcube skins with jquery-ui themes here -$rcmail_config['jquery_ui_skin_map'] = array( +$config['jquery_ui_skin_map'] = array( 'larry' => 'larry', 'default' => 'larry', 'groupvice4' => 'redmond', diff --git a/plugins/managesieve/config.inc.php.dist b/plugins/managesieve/config.inc.php.dist index 65dbcfc4e..cb56a0efd 100644 --- a/plugins/managesieve/config.inc.php.dist +++ b/plugins/managesieve/config.inc.php.dist @@ -2,7 +2,7 @@ // managesieve server port. When empty the port will be determined automatically // using getservbyname() function, with 4190 as a fallback. -$rcmail_config['managesieve_port'] = null; +$config['managesieve_port'] = null; // managesieve server address, default is localhost. // Replacement variables supported in host name: @@ -10,58 +10,58 @@ $rcmail_config['managesieve_port'] = null; // %n - http hostname ($_SERVER['SERVER_NAME']) // %d - domain (http hostname without the first part) // For example %n = mail.domain.tld, %d = domain.tld -$rcmail_config['managesieve_host'] = 'localhost'; +$config['managesieve_host'] = 'localhost'; // authentication method. Can be CRAM-MD5, DIGEST-MD5, PLAIN, LOGIN, EXTERNAL // or none. Optional, defaults to best method supported by server. -$rcmail_config['managesieve_auth_type'] = null; +$config['managesieve_auth_type'] = null; // Optional managesieve authentication identifier to be used as authorization proxy. // Authenticate as a different user but act on behalf of the logged in user. // Works with PLAIN and DIGEST-MD5 auth. -$rcmail_config['managesieve_auth_cid'] = null; +$config['managesieve_auth_cid'] = null; // Optional managesieve authentication password to be used for imap_auth_cid -$rcmail_config['managesieve_auth_pw'] = null; +$config['managesieve_auth_pw'] = null; // use or not TLS for managesieve server connection // Note: tls:// prefix in managesieve_host is also supported -$rcmail_config['managesieve_usetls'] = false; +$config['managesieve_usetls'] = false; // default contents of filters script (eg. default spam filter) -$rcmail_config['managesieve_default'] = '/etc/dovecot/sieve/global'; +$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'; +$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. // Defaults to UTF7-IMAP -$rcmail_config['managesieve_mbox_encoding'] = 'UTF-8'; +$config['managesieve_mbox_encoding'] = 'UTF-8'; // I need this because my dovecot (with listescape plugin) uses // ':' delimiter, but creates folders with dot delimiter -$rcmail_config['managesieve_replace_delimiter'] = ''; +$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(); +$config['managesieve_disabled_extensions'] = array(); // Enables debugging of conversation with sieve server. Logs it into <log_dir>/sieve -$rcmail_config['managesieve_debug'] = false; +$config['managesieve_debug'] = false; // Enables features described in http://wiki.kolab.org/KEP:14 -$rcmail_config['managesieve_kolab_master'] = false; +$config['managesieve_kolab_master'] = false; // Script name extension used for scripts including. Dovecot uses '.sieve', // Cyrus uses '.siv'. Doesn't matter if you have managesieve_kolab_master disabled. -$rcmail_config['managesieve_filename_extension'] = '.sieve'; +$config['managesieve_filename_extension'] = '.sieve'; // List of reserved script names (without extension). // Scripts listed here will be not presented to the user. -$rcmail_config['managesieve_filename_exceptions'] = array(); +$config['managesieve_filename_exceptions'] = array(); ?> diff --git a/plugins/managesieve/localization/cs_CZ.inc b/plugins/managesieve/localization/cs_CZ.inc index c14873bb7..758316b3f 100644 --- a/plugins/managesieve/localization/cs_CZ.inc +++ b/plugins/managesieve/localization/cs_CZ.inc @@ -49,13 +49,14 @@ $labels['messagesendcopy'] = 'Odeslat kopii zprávy na'; $labels['messagereply'] = 'Odpovědět se zprávou'; $labels['messagedelete'] = 'Smazat zprávu'; $labels['messagediscard'] = 'Smazat se zprávou'; +$labels['messagekeep'] = 'Ponechat zprávu v doručené poště'; $labels['messagesrules'] = 'Pravidla pro příchozí zprávu:'; $labels['messagesactions'] = '...vykonej následující akce:'; $labels['add'] = 'Přidej'; $labels['del'] = 'Smaž'; $labels['sender'] = 'Odesílatel'; $labels['recipient'] = 'Příjemce'; -$labels['vacationaddr'] = 'Moje další e-mailové adresy (aliasy) spojené s tímto účtem:'; +$labels['vacationaddr'] = 'Moje další e-mailová adresa(y):'; $labels['vacationdays'] = 'Počet dnů mezi automatickými odpověďmi:'; $labels['vacationinterval'] = 'Prodleva mezi automatickými odpověďmi:'; $labels['days'] = 'dnů'; @@ -121,6 +122,22 @@ $labels['filtercreate'] = 'Vytvořit filtr'; $labels['usedata'] = 'Použít následující údaje ve filtru:'; $labels['nextstep'] = 'Další krok'; $labels['...'] = '...'; +$labels['currdate'] = 'Aktuální datum'; +$labels['datetest'] = 'Datum'; +$labels['dateheader'] = 'hlavička:'; +$labels['year'] = 'rok'; +$labels['month'] = 'měsíc'; +$labels['day'] = 'den'; +$labels['date'] = 'datum (rrrr-mm-dd)'; +$labels['julian'] = 'datum (juliánské)'; +$labels['hour'] = 'hodina'; +$labels['minute'] = 'minuta'; +$labels['second'] = 'sekunda'; +$labels['time'] = 'čas (hh:mm:ss)'; +$labels['iso8601'] = 'datum (ISO8601)'; +$labels['std11'] = 'datum (RFC2822)'; +$labels['zone'] = 'časová zóna'; +$labels['weekday'] = 'všední den (0-6)'; $labels['advancedopts'] = 'Pokročilá nastavení'; $labels['body'] = 'Tělo'; $labels['address'] = 'adresa'; @@ -140,6 +157,8 @@ $labels['default'] = 'výchozí'; $labels['octet'] = 'striktní (oktet)'; $labels['asciicasemap'] = 'necitlivé na velikost písmen (ascii-casemap)'; $labels['asciinumeric'] = 'číslené (ascii-numeric)'; +$labels['index'] = 'index:'; +$labels['indexlast'] = 'pozpátku'; $messages = array(); $messages['filterunknownerror'] = 'Neznámá chyba serveru'; @@ -173,5 +192,6 @@ $messages['nametoolong'] = 'Příliš dlouhý název.'; $messages['namereserved'] = 'Vyhrazený název.'; $messages['setexist'] = 'Sada již existuje.'; $messages['nodata'] = 'Musí být vybrána minimálně jedna pozice!'; +$messages['invaliddateformat'] = 'Neplatné datum nebo část data'; ?> diff --git a/plugins/managesieve/localization/fi_FI.inc b/plugins/managesieve/localization/fi_FI.inc index f006f6d23..67c819106 100644 --- a/plugins/managesieve/localization/fi_FI.inc +++ b/plugins/managesieve/localization/fi_FI.inc @@ -49,6 +49,7 @@ $labels['messagesendcopy'] = 'Send message copy to'; $labels['messagereply'] = 'Reply with message'; $labels['messagedelete'] = 'Delete message'; $labels['messagediscard'] = 'Discard with message'; +$labels['messagekeep'] = 'Keep message in Inbox'; $labels['messagesrules'] = 'For incoming mail:'; $labels['messagesactions'] = '...execute the following actions:'; $labels['add'] = 'Lisää'; @@ -83,13 +84,13 @@ $labels['countisgreaterthanequal'] = 'count is greater than or equal to'; $labels['countislessthan'] = 'count is less than'; $labels['countislessthanequal'] = 'count is less than or equal to'; $labels['countequals'] = 'count is equal to'; -$labels['countnotequals'] = 'count does not equal'; +$labels['countnotequals'] = 'count is not equal to'; $labels['valueisgreaterthan'] = 'value is greater than'; $labels['valueisgreaterthanequal'] = 'value is greater than or equal to'; $labels['valueislessthan'] = 'value is less than'; $labels['valueislessthanequal'] = 'value is less than or equal to'; $labels['valueequals'] = 'value is equal to'; -$labels['valuenotequals'] = 'value does not equal'; +$labels['valuenotequals'] = 'value is not equal to'; $labels['setflags'] = 'Aseta liput viestiin'; $labels['addflags'] = 'Lisää liput viestiin'; $labels['removeflags'] = 'Poista liput viestistä'; @@ -121,6 +122,22 @@ $labels['filtercreate'] = 'Luo suodatin'; $labels['usedata'] = 'Use following data in the filter:'; $labels['nextstep'] = 'Next Step'; $labels['...'] = '...'; +$labels['currdate'] = 'Current date'; +$labels['datetest'] = 'Date'; +$labels['dateheader'] = 'header:'; +$labels['year'] = 'year'; +$labels['month'] = 'month'; +$labels['day'] = 'day'; +$labels['date'] = 'date (yyyy-mm-dd)'; +$labels['julian'] = 'date (julian)'; +$labels['hour'] = 'hour'; +$labels['minute'] = 'minute'; +$labels['second'] = 'second'; +$labels['time'] = 'time (hh:mm:ss)'; +$labels['iso8601'] = 'date (ISO8601)'; +$labels['std11'] = 'date (RFC2822)'; +$labels['zone'] = 'time-zone'; +$labels['weekday'] = 'weekday (0-6)'; $labels['advancedopts'] = 'Lisävalinnat'; $labels['body'] = 'Body'; $labels['address'] = 'address'; @@ -140,6 +157,8 @@ $labels['default'] = 'oletus'; $labels['octet'] = 'strict (octet)'; $labels['asciicasemap'] = 'case insensitive (ascii-casemap)'; $labels['asciinumeric'] = 'numeric (ascii-numeric)'; +$labels['index'] = 'index:'; +$labels['indexlast'] = 'backwards'; $messages = array(); $messages['filterunknownerror'] = 'Tuntematon palvelinvirhe.'; @@ -173,5 +192,6 @@ $messages['nametoolong'] = 'Nimi on liian pitkä.'; $messages['namereserved'] = 'Reserved name.'; $messages['setexist'] = 'Set already exists.'; $messages['nodata'] = 'At least one position must be selected!'; +$messages['invaliddateformat'] = 'Invalid date or date part format'; ?> diff --git a/plugins/managesieve/localization/fr_FR.inc b/plugins/managesieve/localization/fr_FR.inc index 821f9caab..3defe9f12 100644 --- a/plugins/managesieve/localization/fr_FR.inc +++ b/plugins/managesieve/localization/fr_FR.inc @@ -49,6 +49,7 @@ $labels['messagesendcopy'] = 'Envoyer une copie du message à'; $labels['messagereply'] = 'Répondre avec le message'; $labels['messagedelete'] = 'Supprimer le message'; $labels['messagediscard'] = 'Rejeter avec le message'; +$labels['messagekeep'] = 'Conserver le message dans la boîte de réception'; $labels['messagesrules'] = 'Pour les courriels entrants :'; $labels['messagesactions'] = '...exécuter les actions suivantes:'; $labels['add'] = 'Ajouter'; diff --git a/plugins/managesieve/localization/hr_HR.inc b/plugins/managesieve/localization/hr_HR.inc index 64b9bef62..77b664b5f 100644 --- a/plugins/managesieve/localization/hr_HR.inc +++ b/plugins/managesieve/localization/hr_HR.inc @@ -49,13 +49,14 @@ $labels['messagesendcopy'] = 'Pošalji kopiju poruke na'; $labels['messagereply'] = 'Odgovori sa porukom'; $labels['messagedelete'] = 'Obriši poruku'; $labels['messagediscard'] = 'Otkaži sa porukom'; +$labels['messagekeep'] = 'Keep message in Inbox'; $labels['messagesrules'] = 'Za pristigle poruke:'; $labels['messagesactions'] = '...primijeni sljedeće akcije:'; $labels['add'] = 'Dodaj'; $labels['del'] = 'Obriši'; $labels['sender'] = 'Pošiljatelj'; $labels['recipient'] = 'Primatelj'; -$labels['vacationaddresses'] = 'Dodatna lista primatelja (odvojenih zarezom):'; +$labels['vacationaddr'] = 'My additional e-mail addresse(s):'; $labels['vacationdays'] = 'Koliko često slati poruku (u danima):'; $labels['vacationinterval'] = 'How often send messages:'; $labels['days'] = 'days'; @@ -83,13 +84,13 @@ $labels['countisgreaterthanequal'] = 'brojač je veći ili jednak od'; $labels['countislessthan'] = 'brojač je manji od'; $labels['countislessthanequal'] = 'brojač je manji ili jednak od'; $labels['countequals'] = 'brojač je jednak'; -$labels['countnotequals'] = 'brojač nije jednak'; +$labels['countnotequals'] = 'count is not equal to'; $labels['valueisgreaterthan'] = 'vrijednost je veća od'; $labels['valueisgreaterthanequal'] = 'vrijednost je veća ili jednaka od'; $labels['valueislessthan'] = 'vrijednost je manja od'; $labels['valueislessthanequal'] = 'vrijednost je manja ili jednaka od'; $labels['valueequals'] = 'vrijednost je jednaka'; -$labels['valuenotequals'] = 'vrijednost nije jednaka'; +$labels['valuenotequals'] = 'value is not equal to'; $labels['setflags'] = 'Postavi oznake na poruku'; $labels['addflags'] = 'Dodaj oznake na poruku'; $labels['removeflags'] = 'Ukloni oznake sa poruke'; @@ -121,6 +122,22 @@ $labels['filtercreate'] = 'Stvori filter'; $labels['usedata'] = 'Koristi podatke za filter:'; $labels['nextstep'] = 'Idući korak'; $labels['...'] = '…'; +$labels['currdate'] = 'Current date'; +$labels['datetest'] = 'Date'; +$labels['dateheader'] = 'header:'; +$labels['year'] = 'year'; +$labels['month'] = 'month'; +$labels['day'] = 'day'; +$labels['date'] = 'date (yyyy-mm-dd)'; +$labels['julian'] = 'date (julian)'; +$labels['hour'] = 'hour'; +$labels['minute'] = 'minute'; +$labels['second'] = 'second'; +$labels['time'] = 'time (hh:mm:ss)'; +$labels['iso8601'] = 'date (ISO8601)'; +$labels['std11'] = 'date (RFC2822)'; +$labels['zone'] = 'time-zone'; +$labels['weekday'] = 'weekday (0-6)'; $labels['advancedopts'] = 'Napredne postavke'; $labels['body'] = 'Tijelo poruke'; $labels['address'] = 'adresa'; @@ -140,6 +157,8 @@ $labels['default'] = 'preddefinirano'; $labels['octet'] = 'strogo (oktet)'; $labels['asciicasemap'] = 'neosjetljivo na veličinu slova (ascii-casemap)'; $labels['asciinumeric'] = 'numerički (ascii-numeric)'; +$labels['index'] = 'index:'; +$labels['indexlast'] = 'backwards'; $messages = array(); $messages['filterunknownerror'] = 'Nepoznata greška na poslužitelju'; @@ -173,5 +192,6 @@ $messages['nametoolong'] = 'Nemoguće napraviti grupu filtera. Naziv je preduga $messages['namereserved'] = 'Rezervirano ime.'; $messages['setexist'] = 'Skup već postoji.'; $messages['nodata'] = 'Barem jedan pozicija mora biti odabrana!'; +$messages['invaliddateformat'] = 'Invalid date or date part format'; ?> diff --git a/plugins/managesieve/localization/it_IT.inc b/plugins/managesieve/localization/it_IT.inc index b54c46d9a..9fc7dc570 100644 --- a/plugins/managesieve/localization/it_IT.inc +++ b/plugins/managesieve/localization/it_IT.inc @@ -49,17 +49,18 @@ $labels['messagesendcopy'] = 'Invia copia a'; $labels['messagereply'] = 'Rispondi con il messaggio'; $labels['messagedelete'] = 'Elimina il messaggio'; $labels['messagediscard'] = 'Rifiuta con messaggio'; +$labels['messagekeep'] = 'Mantieni il messaggio in Posta ricevuta'; $labels['messagesrules'] = 'Per la posta in arrivo'; $labels['messagesactions'] = '...esegui le seguenti azioni:'; $labels['add'] = 'Aggiungi'; $labels['del'] = 'Elimina'; $labels['sender'] = 'Mittente'; $labels['recipient'] = 'Destinatario'; -$labels['vacationaddr'] = 'Lista di indirizzi e-mail di destinatari addizionali:'; +$labels['vacationaddr'] = 'Account email aggiuntivo(i):'; $labels['vacationdays'] = 'Ogni quanti giorni ribadire il messaggio allo stesso mittente'; -$labels['vacationinterval'] = 'How often send messages:'; -$labels['days'] = 'days'; -$labels['seconds'] = 'seconds'; +$labels['vacationinterval'] = 'Ogni quanto tempo inviare i messaggi:'; +$labels['days'] = 'giorni'; +$labels['seconds'] = 'secondi'; $labels['vacationreason'] = 'Corpo del messaggio (dettagli relativi all\'assenza):'; $labels['vacationsubject'] = 'Oggetto del messaggio'; $labels['rulestop'] = 'Non valutare le regole successive'; @@ -83,13 +84,13 @@ $labels['countisgreaterthanequal'] = 'somma maggiore uguale a'; $labels['countislessthan'] = 'somma minore di'; $labels['countislessthanequal'] = 'somma minore o uguale a'; $labels['countequals'] = 'somma uguale a'; -$labels['countnotequals'] = 'somma diversa da'; +$labels['countnotequals'] = 'il conteggio non è uguale a'; $labels['valueisgreaterthan'] = 'valore maggiore di'; $labels['valueisgreaterthanequal'] = 'valore maggiore uguale a'; $labels['valueislessthan'] = 'valore minore di'; $labels['valueislessthanequal'] = 'valore minore uguale di'; $labels['valueequals'] = 'valore uguale a'; -$labels['valuenotequals'] = 'valore diverso da'; +$labels['valuenotequals'] = 'il valore non è uguale a'; $labels['setflags'] = 'Contrassegna il messaggio'; $labels['addflags'] = 'aggiungi flag al messaggio'; $labels['removeflags'] = 'togli flag dal messaggio'; @@ -121,6 +122,22 @@ $labels['filtercreate'] = 'Crea filtro'; $labels['usedata'] = 'utilizza i seguenti dati nel filtro'; $labels['nextstep'] = 'passo successivo'; $labels['...'] = '...'; +$labels['currdate'] = 'Data attuale'; +$labels['datetest'] = 'Data'; +$labels['dateheader'] = 'intestazione:'; +$labels['year'] = 'anno'; +$labels['month'] = 'mese'; +$labels['day'] = 'giorno'; +$labels['date'] = 'data (aaaa-mm-gg)'; +$labels['julian'] = 'data (Giuliana)'; +$labels['hour'] = 'ora'; +$labels['minute'] = 'minuto'; +$labels['second'] = 'secondo'; +$labels['time'] = 'tempo (hh:mm:ss)'; +$labels['iso8601'] = 'data (ISO8601)'; +$labels['std11'] = 'data (RFC2822)'; +$labels['zone'] = 'fuso orario'; +$labels['weekday'] = 'giorno della settimana (0-6)'; $labels['advancedopts'] = 'Opzioni avanzate'; $labels['body'] = 'Corpo'; $labels['address'] = 'indirizzo'; @@ -140,6 +157,8 @@ $labels['default'] = 'predefinito'; $labels['octet'] = 'strict (octet)'; $labels['asciicasemap'] = 'non differenziare maiuscole/minuscole (ascii-casemap)'; $labels['asciinumeric'] = 'numerico'; +$labels['index'] = 'indice:'; +$labels['indexlast'] = 'indietro'; $messages = array(); $messages['filterunknownerror'] = 'Errore sconosciuto del server'; @@ -173,5 +192,6 @@ $messages['nametoolong'] = 'Impossibile creare il gruppo: Nome troppo lungo'; $messages['namereserved'] = 'nome riservato'; $messages['setexist'] = 'Il gruppo esiste già'; $messages['nodata'] = 'selezionare almeno una posizione'; +$messages['invaliddateformat'] = 'Formato della data non valido'; ?> diff --git a/plugins/managesieve/managesieve.js b/plugins/managesieve/managesieve.js index 5201284fa..156bce6f0 100644 --- a/plugins/managesieve/managesieve.js +++ b/plugins/managesieve/managesieve.js @@ -660,7 +660,6 @@ function rule_adv_switch(id, elem) function action_type_select(id) { -console.log(id); var obj = document.getElementById('action_type' + id), v = obj.value, enabled = {}, elems = { diff --git a/plugins/markasjunk/localization/ru_RU.inc b/plugins/markasjunk/localization/ru_RU.inc index cbf99d253..d2b6abd40 100644 --- a/plugins/markasjunk/localization/ru_RU.inc +++ b/plugins/markasjunk/localization/ru_RU.inc @@ -18,7 +18,7 @@ $labels = array(); $labels['buttontext'] = 'СПАМ'; -$labels['buttontitle'] = 'Переместить в "СПАМ'; -$labels['reportedasjunk'] = 'Перемещено в "СПАМ'; +$labels['buttontitle'] = 'Переместить в СПАМ'; +$labels['reportedasjunk'] = 'Перемещено в СПАМ'; ?>
\ No newline at end of file diff --git a/plugins/markasjunk/markasjunk.php b/plugins/markasjunk/markasjunk.php index 76b14c140..4448b506c 100644 --- a/plugins/markasjunk/markasjunk.php +++ b/plugins/markasjunk/markasjunk.php @@ -19,6 +19,7 @@ class markasjunk extends rcube_plugin $rcmail = rcmail::get_instance(); $this->register_action('plugin.markasjunk', array($this, 'request_action')); + $this->add_hook('storage_init', array($this, 'storage_init')); if ($rcmail->action == '' || $rcmail->action == 'show') { $skin_path = $this->local_skin_path(); @@ -38,24 +39,36 @@ class markasjunk extends rcube_plugin } } + function storage_init($args) + { + $flags = array( + 'JUNK' => 'Junk', + 'NONJUNK' => 'NonJunk', + ); + + // register message flags + $args['message_flags'] = array_merge((array)$args['message_flags'], $flags); + + return $args; + } + function request_action() { $this->add_texts('localization'); - $GLOBALS['IMAP_FLAGS']['JUNK'] = 'Junk'; - $GLOBALS['IMAP_FLAGS']['NONJUNK'] = 'NonJunk'; - $uids = rcube_utils::get_input_value('_uid', rcube_utils::INPUT_POST); $mbox = rcube_utils::get_input_value('_mbox', rcube_utils::INPUT_POST); - - $rcmail = rcmail::get_instance(); - $rcmail->storage->unset_flag($uids, 'NONJUNK'); - $rcmail->storage->set_flag($uids, 'JUNK'); - + + $rcmail = rcmail::get_instance(); + $storage = $rcmail->get_storage(); + + $storage->unset_flag($uids, 'NONJUNK'); + $storage->set_flag($uids, 'JUNK'); + if (($junk_mbox = $rcmail->config->get('junk_mbox')) && $mbox != $junk_mbox) { $rcmail->output->command('move_messages', $junk_mbox); } - + $rcmail->output->command('display_message', $this->gettext('reportedasjunk'), 'confirmation'); $rcmail->output->send(); } diff --git a/plugins/markasjunk/package.xml b/plugins/markasjunk/package.xml index a5b4bf92c..95597481a 100644 --- a/plugins/markasjunk/package.xml +++ b/plugins/markasjunk/package.xml @@ -13,11 +13,10 @@ <email>roundcube@gmail.com</email> <active>yes</active> </lead> - <date>2010-03-29</date> - <time>13:20:00</time> + <date>2013-08-29</date> <version> - <release>1.1</release> - <api>1.1</api> + <release>1.2</release> + <api>1.2</api> </version> <stability> <release>stable</release> diff --git a/plugins/new_user_identity/new_user_identity.php b/plugins/new_user_identity/new_user_identity.php index bb0821a53..3943134b2 100644 --- a/plugins/new_user_identity/new_user_identity.php +++ b/plugins/new_user_identity/new_user_identity.php @@ -14,12 +14,12 @@ * * // The id of the address book to use to automatically set a new * // user's full name in their new identity. (This should be an - * // string, which refers to the $rcmail_config['ldap_public'] array.) - * $rcmail_config['new_user_identity_addressbook'] = 'People'; + * // string, which refers to the $config['ldap_public'] array.) + * $config['new_user_identity_addressbook'] = 'People'; * * // When automatically setting a new users's full name in their * // new identity, match the user's login name against this field. - * $rcmail_config['new_user_identity_match'] = 'uid'; + * $config['new_user_identity_match'] = 'uid'; */ class new_user_identity extends rcube_plugin { diff --git a/plugins/newmail_notifier/config.inc.php.dist b/plugins/newmail_notifier/config.inc.php.dist index 067fe19f1..cdb563c40 100644 --- a/plugins/newmail_notifier/config.inc.php.dist +++ b/plugins/newmail_notifier/config.inc.php.dist @@ -1,12 +1,12 @@ <?php // Enables basic notification -$rcmail_config['newmail_notifier_basic'] = false; +$config['newmail_notifier_basic'] = false; // Enables sound notification -$rcmail_config['newmail_notifier_sound'] = false; +$config['newmail_notifier_sound'] = false; // Enables desktop notification -$rcmail_config['newmail_notifier_desktop'] = false; +$config['newmail_notifier_desktop'] = false; ?> diff --git a/plugins/newmail_notifier/newmail_notifier.js b/plugins/newmail_notifier/newmail_notifier.js index c398424b6..b00f33d10 100644 --- a/plugins/newmail_notifier/newmail_notifier.js +++ b/plugins/newmail_notifier/newmail_notifier.js @@ -30,9 +30,9 @@ function newmail_notifier_run(prop) function newmail_notifier_stop(prop) { // revert original favicon - if (rcmail.env.favicon_href && (!prop || prop.action != 'check-recent')) { + if (rcmail.env.favicon_href && rcmail.env.favicon_changed && (!prop || prop.action != 'check-recent')) { $('<link rel="shortcut icon" href="'+rcmail.env.favicon_href+'"/>').replaceAll('link[rel="shortcut icon"]'); - rcmail.env.favicon_href = null; + rcmail.env.favicon_changed = 0; } // Remove IE icon overlay if we're pinned to Taskbar @@ -54,7 +54,10 @@ function newmail_notifier_basic() var link = $('<link rel="shortcut icon" href="plugins/newmail_notifier/favicon.ico"/>'), oldlink = $('link[rel="shortcut icon"]', w.document); - rcmail.env.favicon_href = oldlink.attr('href'); + if (!rcmail.env.favicon_href) + rcmail.env.favicon_href = oldlink.attr('href'); + + rcmail.env.favicon_changed = 1; link.replaceAll(oldlink); // Add IE icon overlay if we're pinned to Taskbar diff --git a/plugins/password/README b/plugins/password/README index af70156a6..262ebfd86 100644 --- a/plugins/password/README +++ b/plugins/password/README @@ -42,6 +42,7 @@ 2.16. DBMail (dbmail) 2.17. Expect (expect) 2.18. Samba (smb) + 2.19. Vpopmail daemon (vpopmaild) 3. Driver API @@ -246,7 +247,7 @@ This driver is fully compatible with the ldap driver, but does not require (or uses) the - $rcmail_config['password_ldap_force_replace'] variable. + $config['password_ldap_force_replace'] variable. Other advantages: * Connects only once with the LDAP server when using the search user. * Does not read the DN, but only replaces the password within (that is @@ -299,6 +300,16 @@ Driver to change Samba user password via the 'smbpasswd' command. See config.inc.php.dist file for configuration description. + 2.19. Vpopmail daemon (vpopmaild) + ----------------------------------- + + Driver for the daemon of vpopmail. Vpopmail is used with qmail to + enable virtual users that are saved in a database and not in /etc/passwd. + + Set $config['password_vpopmaild_host'] to the host where vpopmaild runs. + + Set $config['password_vpopmaild_port'] to the port of vpopmaild. + 3. Driver API ------------- diff --git a/plugins/password/config.inc.php.dist b/plugins/password/config.inc.php.dist index 9256829aa..82f6617e5 100644 --- a/plugins/password/config.inc.php.dist +++ b/plugins/password/config.inc.php.dist @@ -4,43 +4,43 @@ // ----------------------- // A driver to use for password change. Default: "sql". // See README file for list of supported driver names. -$rcmail_config['password_driver'] = 'sql'; +$config['password_driver'] = 'sql'; // Determine whether current password is required to change password. // Default: false. -$rcmail_config['password_confirm_current'] = true; +$config['password_confirm_current'] = true; // Require the new password to be a certain length. // set to blank to allow passwords of any length -$rcmail_config['password_minimum_length'] = 0; +$config['password_minimum_length'] = 0; // Require the new password to contain a letter and punctuation character // Change to false to remove this check. -$rcmail_config['password_require_nonalpha'] = false; +$config['password_require_nonalpha'] = false; // Enables logging of password changes into logs/password -$rcmail_config['password_log'] = false; +$config['password_log'] = false; // Comma-separated list of login exceptions for which password change // will be not available (no Password tab in Settings) -$rcmail_config['password_login_exceptions'] = null; +$config['password_login_exceptions'] = null; // Array of hosts that support password changing. Default is NULL. // Listed hosts will feature a Password option in Settings; others will not. // Example: -//$rcmail_config['password_hosts'] = array('mail.example.com', 'mail2.example.org'); -$rcmail_config['password_hosts'] = null; +//$config['password_hosts'] = array('mail.example.com', 'mail2.example.org'); +$config['password_hosts'] = null; // Enables saving the new password even if it matches the old password. Useful // for upgrading the stored passwords after the encryption scheme has changed. -$rcmail_config['password_force_save'] = false; +$config['password_force_save'] = false; // SQL Driver options // ------------------ // PEAR database DSN for performing the query. By default // Roundcube DB settings are used. -$rcmail_config['password_db_dsn'] = ''; +$config['password_db_dsn'] = ''; // The SQL query used to change the password. // The query can contain the following macros that will be expanded as follows: @@ -60,52 +60,52 @@ $rcmail_config['password_db_dsn'] = ''; // (in case the username is an email address) // Escaping of macros is handled by this module. // Default: "SELECT update_passwd(%c, %u)" -$rcmail_config['password_query'] = 'SELECT update_passwd(%c, %u)'; +$config['password_query'] = 'SELECT update_passwd(%c, %u)'; // By default the crypt() function which is used to create the '%c' // parameter uses the md5 algorithm. To use different algorithms // you can choose between: des, md5, blowfish, sha256, sha512. // Before using other hash functions than des or md5 please make sure // your operating system supports the other hash functions. -$rcmail_config['password_crypt_hash'] = 'md5'; +$config['password_crypt_hash'] = 'md5'; // By default domains in variables are using unicode. // Enable this option to use punycoded names -$rcmail_config['password_idn_ascii'] = false; +$config['password_idn_ascii'] = false; // Path for dovecotpw (if not in $PATH) -// $rcmail_config['password_dovecotpw'] = '/usr/local/sbin/dovecotpw'; +// $config['password_dovecotpw'] = '/usr/local/sbin/dovecotpw'; // Dovecot method (dovecotpw -s 'method') -$rcmail_config['password_dovecotpw_method'] = 'CRAM-MD5'; +$config['password_dovecotpw_method'] = 'CRAM-MD5'; // Enables use of password with crypt method prefix in %D, e.g. {MD5}$1$LUiMYWqx$fEkg/ggr/L6Mb2X7be4i1/ -$rcmail_config['password_dovecotpw_with_method'] = false; +$config['password_dovecotpw_with_method'] = false; // Using a password hash for %n and %q variables. // Determine which hashing algorithm should be used to generate // the hashed new and current password for using them within the // SQL query. Requires PHP's 'hash' extension. -$rcmail_config['password_hash_algorithm'] = 'sha1'; +$config['password_hash_algorithm'] = 'sha1'; // You can also decide whether the hash should be provided // as hex string or in base64 encoded format. -$rcmail_config['password_hash_base64'] = false; +$config['password_hash_base64'] = false; // Poppassd Driver options // ----------------------- // The host which changes the password -$rcmail_config['password_pop_host'] = 'localhost'; +$config['password_pop_host'] = 'localhost'; // TCP port used for poppassd connections -$rcmail_config['password_pop_port'] = 106; +$config['password_pop_port'] = 106; // SASL Driver options // ------------------- // Additional arguments for the saslpasswd2 call -$rcmail_config['password_saslpasswd_args'] = ''; +$config['password_saslpasswd_args'] = ''; // LDAP and LDAP_SIMPLE Driver options @@ -114,41 +114,41 @@ $rcmail_config['password_saslpasswd_args'] = ''; // You can provide one or several hosts in an array in which case the hosts are tried from left to right. // Exemple: array('ldap1.exemple.com', 'ldap2.exemple.com'); // Default: 'localhost' -$rcmail_config['password_ldap_host'] = 'localhost'; +$config['password_ldap_host'] = 'localhost'; // LDAP server port to connect to // Default: '389' -$rcmail_config['password_ldap_port'] = '389'; +$config['password_ldap_port'] = '389'; // TLS is started after connecting // Using TLS for password modification is recommanded. // Default: false -$rcmail_config['password_ldap_starttls'] = false; +$config['password_ldap_starttls'] = false; // LDAP version // Default: '3' -$rcmail_config['password_ldap_version'] = '3'; +$config['password_ldap_version'] = '3'; // LDAP base name (root directory) // Exemple: 'dc=exemple,dc=com' -$rcmail_config['password_ldap_basedn'] = 'dc=exemple,dc=com'; +$config['password_ldap_basedn'] = 'dc=exemple,dc=com'; // LDAP connection method // There is two connection method for changing a user's LDAP password. // 'user': use user credential (recommanded, require password_confirm_current=true) // 'admin': use admin credential (this mode require password_ldap_adminDN and password_ldap_adminPW) // Default: 'user' -$rcmail_config['password_ldap_method'] = 'user'; +$config['password_ldap_method'] = 'user'; // LDAP Admin DN // Used only in admin connection mode // Default: null -$rcmail_config['password_ldap_adminDN'] = null; +$config['password_ldap_adminDN'] = null; // LDAP Admin Password // Used only in admin connection mode // Default: null -$rcmail_config['password_ldap_adminPW'] = null; +$config['password_ldap_adminPW'] = null; // LDAP user DN mask // The user's DN is mandatory and as we only have his login, @@ -158,7 +158,7 @@ $rcmail_config['password_ldap_adminPW'] = null; // '%domain' will be replaced by the current roundcube user's domain part // '%dc' will be replaced by domain name hierarchal string e.g. "dc=test,dc=domain,dc=com" // Exemple: 'uid=%login,ou=people,dc=exemple,dc=com' -$rcmail_config['password_ldap_userDN_mask'] = 'uid=%login,ou=people,dc=exemple,dc=com'; +$config['password_ldap_userDN_mask'] = 'uid=%login,ou=people,dc=exemple,dc=com'; // LDAP search DN // The DN roundcube should bind with to find out user's DN @@ -169,7 +169,7 @@ $rcmail_config['password_ldap_userDN_mask'] = 'uid=%login,ou=people,dc=exemple,d // users login to find his DN instead. A common reason might be that // your users are placed under different ou's like engineering or // sales which cannot be derived from their login only. -$rcmail_config['password_ldap_searchDN'] = 'cn=roundcube,ou=services,dc=example,dc=com'; +$config['password_ldap_searchDN'] = 'cn=roundcube,ou=services,dc=example,dc=com'; // LDAP search password // If password_ldap_searchDN is set, the password to use for @@ -179,13 +179,13 @@ $rcmail_config['password_ldap_searchDN'] = 'cn=roundcube,ou=services,dc=example, // is only accesible to roundcube and don't forget to restrict roundcube's access to // your directory as much as possible using ACLs. Should this password be compromised // you want to minimize the damage. -$rcmail_config['password_ldap_searchPW'] = 'secret'; +$config['password_ldap_searchPW'] = 'secret'; // LDAP search base // If password_ldap_searchDN is set, the base to search in using the filter below. // Note that you should comment out the default password_ldap_userDN_mask setting // for this to take effect. -$rcmail_config['password_ldap_search_base'] = 'ou=people,dc=example,dc=com'; +$config['password_ldap_search_base'] = 'ou=people,dc=example,dc=com'; // LDAP search filter // If password_ldap_searchDN is set, the filter to use when @@ -197,7 +197,7 @@ $rcmail_config['password_ldap_search_base'] = 'ou=people,dc=example,dc=com'; // '%dc' will be replaced by domain name hierarchal string e.g. "dc=test,dc=domain,dc=com" // Example: '(uid=%login)' // Example: '(&(objectClass=posixAccount)(uid=%login))' -$rcmail_config['password_ldap_search_filter'] = '(uid=%login)'; +$config['password_ldap_search_filter'] = '(uid=%login)'; // LDAP password hash type // Standard LDAP encryption type which must be one of: crypt, @@ -205,34 +205,34 @@ $rcmail_config['password_ldap_search_filter'] = '(uid=%login)'; // Please note that most encodage types require external libraries // to be included in your PHP installation, see function hashPassword in drivers/ldap.php for more info. // Default: 'crypt' -$rcmail_config['password_ldap_encodage'] = 'crypt'; +$config['password_ldap_encodage'] = 'crypt'; // LDAP password attribute // Name of the ldap's attribute used for storing user password // Default: 'userPassword' -$rcmail_config['password_ldap_pwattr'] = 'userPassword'; +$config['password_ldap_pwattr'] = 'userPassword'; // LDAP password force replace // Force LDAP replace in cases where ACL allows only replace not read // See http://pear.php.net/package/Net_LDAP2/docs/latest/Net_LDAP2/Net_LDAP2_Entry.html#methodreplace // Default: true -$rcmail_config['password_ldap_force_replace'] = true; +$config['password_ldap_force_replace'] = true; // LDAP Password Last Change Date // Some places use an attribute to store the date of the last password change // The date is meassured in "days since epoch" (an integer value) // Whenever the password is changed, the attribute will be updated if set (e.g. shadowLastChange) -$rcmail_config['password_ldap_lchattr'] = ''; +$config['password_ldap_lchattr'] = ''; // LDAP Samba password attribute, e.g. sambaNTPassword // Name of the LDAP's Samba attribute used for storing user password -$rcmail_config['password_ldap_samba_pwattr'] = ''; +$config['password_ldap_samba_pwattr'] = ''; // LDAP Samba Password Last Change Date attribute, e.g. sambaPwdLastSet // Some places use an attribute to store the date of the last password change // The date is meassured in "seconds since epoch" (an integer value) // Whenever the password is changed, the attribute will be updated if set -$rcmail_config['password_ldap_samba_lchattr'] = ''; +$config['password_ldap_samba_lchattr'] = ''; // DirectAdmin Driver options @@ -242,57 +242,57 @@ $rcmail_config['password_ldap_samba_lchattr'] = ''; // The host can contain the following macros that will be expanded as follows: // %h is replaced with the imap host (from the session info) // %d is replaced with the domain part of the username (if the username is an email) -$rcmail_config['password_directadmin_host'] = 'tcp://localhost'; +$config['password_directadmin_host'] = 'tcp://localhost'; // TCP port used for DirectAdmin connections -$rcmail_config['password_directadmin_port'] = 2222; +$config['password_directadmin_port'] = 2222; // vpopmaild Driver options // ----------------------- // The host which changes the password -$rcmail_config['password_vpopmaild_host'] = 'localhost'; +$config['password_vpopmaild_host'] = 'localhost'; // TCP port used for vpopmaild connections -$rcmail_config['password_vpopmaild_port'] = 89; +$config['password_vpopmaild_port'] = 89; // cPanel Driver options // -------------------------- // The cPanel Host name -$rcmail_config['password_cpanel_host'] = 'host.domain.com'; +$config['password_cpanel_host'] = 'host.domain.com'; // The cPanel admin username -$rcmail_config['password_cpanel_username'] = 'username'; +$config['password_cpanel_username'] = 'username'; // The cPanel admin password -$rcmail_config['password_cpanel_password'] = 'password'; +$config['password_cpanel_password'] = 'password'; // The cPanel port to use -$rcmail_config['password_cpanel_port'] = 2087; +$config['password_cpanel_port'] = 2087; // XIMSS (Communigate server) Driver options // ----------------------------------------- // Host name of the Communigate server -$rcmail_config['password_ximss_host'] = 'mail.example.com'; +$config['password_ximss_host'] = 'mail.example.com'; // XIMSS port on Communigate server -$rcmail_config['password_ximss_port'] = 11024; +$config['password_ximss_port'] = 11024; // chpasswd Driver options // --------------------- // Command to use -$rcmail_config['password_chpasswd_cmd'] = 'sudo /usr/sbin/chpasswd 2> /dev/null'; +$config['password_chpasswd_cmd'] = 'sudo /usr/sbin/chpasswd 2> /dev/null'; // XMail Driver options // --------------------- -$rcmail_config['xmail_host'] = 'localhost'; -$rcmail_config['xmail_user'] = 'YourXmailControlUser'; -$rcmail_config['xmail_pass'] = 'YourXmailControlPass'; -$rcmail_config['xmail_port'] = 6017; +$config['xmail_host'] = 'localhost'; +$config['xmail_user'] = 'YourXmailControlUser'; +$config['xmail_pass'] = 'YourXmailControlPass'; +$config['xmail_port'] = 6017; // hMail Driver options @@ -300,9 +300,9 @@ $rcmail_config['xmail_port'] = 6017; // Remote hMailServer configuration // true: HMailserver is on a remote box (php.ini: com.allow_dcom = true) // false: Hmailserver is on same box as PHP -$rcmail_config['hmailserver_remote_dcom'] = false; +$config['hmailserver_remote_dcom'] = false; // Windows credentials -$rcmail_config['hmailserver_server'] = array( +$config['hmailserver_server'] = array( 'Server' => 'localhost', // hostname or ip address 'Username' => 'administrator', // windows username 'Password' => 'password' // windows user password @@ -321,7 +321,7 @@ $rcmail_config['hmailserver_server'] = array( // 6: username_domain // 7: domain_username // 8: username@domain; mbox.username -$rcmail_config['password_virtualmin_format'] = 8; +$config['password_virtualmin_format'] = 8; // pw_usermod Driver options @@ -329,27 +329,27 @@ $rcmail_config['password_virtualmin_format'] = 8; // Use comma delimited exlist to disable password change for users // Add the following line to visudo to tighten security: // www ALL=NOPASSWORD: /usr/sbin/pw -$rcmail_config['password_pw_usermod_cmd'] = 'sudo /usr/sbin/pw usermod -h 0 -n'; +$config['password_pw_usermod_cmd'] = 'sudo /usr/sbin/pw usermod -h 0 -n'; // DBMail Driver options // ------------------- // Additional arguments for the dbmail-users call -$rcmail_config['password_dbmail_args'] = '-p sha512'; +$config['password_dbmail_args'] = '-p sha512'; // Expect Driver options // --------------------- // Location of expect binary -$rcmail_config['password_expect_bin'] = '/usr/bin/expect'; +$config['password_expect_bin'] = '/usr/bin/expect'; // Location of expect script (see helpers/passwd-expect) -$rcmail_config['password_expect_script'] = ''; +$config['password_expect_script'] = ''; // Arguments for the expect script. See the helpers/passwd-expect file for details. // This is probably a good starting default: // -telent -host localhost -output /tmp/passwd.log -log /tmp/passwd.log -$rcmail_config['password_expect_params'] = ''; +$config['password_expect_params'] = ''; // smb Driver options @@ -359,6 +359,6 @@ $rcmail_config['password_expect_params'] = ''; // %n - hostname ($_SERVER['SERVER_NAME']) // %t - hostname without the first part // %d - domain (http hostname $_SERVER['HTTP_HOST'] without the first part) -$rcmail_config['password_smb_host'] = 'localhost'; +$config['password_smb_host'] = 'localhost'; // Location of smbpasswd binary -$rcmail_config['password_smb_cmd'] = '/usr/bin/smbpasswd'; +$config['password_smb_cmd'] = '/usr/bin/smbpasswd'; diff --git a/plugins/password/drivers/hmail.php b/plugins/password/drivers/hmail.php index a8f07a23b..650434617 100644 --- a/plugins/password/drivers/hmail.php +++ b/plugins/password/drivers/hmail.php @@ -5,7 +5,6 @@ * * @version 2.0 * @author Roland 'rosali' Liebl <myroundcube@mail4us.net> - * */ class rcube_hmail_password @@ -39,8 +38,7 @@ class rcube_hmail_password else { $domain = $rcmail->config->get('username_domain',false); if (!$domain) { - rcube::write_log('errors','Plugin password (hmail driver): $rcmail_config[\'username_domain\'] is not defined.'); - rcube::write_log('errors','Plugin password (hmail driver): Hint: Use hmail_login plugin (http://myroundcube.googlecode.com'); + rcube::write_log('errors','Plugin password (hmail driver): $config[\'username_domain\'] is not defined.'); return PASSWORD_ERROR; } $username = $username . "@" . $domain; diff --git a/plugins/password/drivers/xmail.php b/plugins/password/drivers/xmail.php index 59e467c5b..47beb2178 100644 --- a/plugins/password/drivers/xmail.php +++ b/plugins/password/drivers/xmail.php @@ -10,10 +10,10 @@ * Setup xmail_host, xmail_user, xmail_pass and xmail_port into * config.inc.php of password plugin as follows: * - * $rcmail_config['xmail_host'] = 'localhost'; - * $rcmail_config['xmail_user'] = 'YourXmailControlUser'; - * $rcmail_config['xmail_pass'] = 'YourXmailControlPass'; - * $rcmail_config['xmail_port'] = 6017; + * $config['xmail_host'] = 'localhost'; + * $config['xmail_user'] = 'YourXmailControlUser'; + * $config['xmail_pass'] = 'YourXmailControlPass'; + * $config['xmail_port'] = 6017; * */ diff --git a/plugins/password/localization/ru_RU.inc b/plugins/password/localization/ru_RU.inc index 79fbfedf6..2517f922b 100644 --- a/plugins/password/localization/ru_RU.inc +++ b/plugins/password/localization/ru_RU.inc @@ -26,11 +26,11 @@ $messages = array(); $messages['nopassword'] = 'Пожалуйста, введите новый пароль.'; $messages['nocurpassword'] = 'Пожалуйста, введите текущий пароль.'; $messages['passwordincorrect'] = 'Текущий пароль неверен.'; -$messages['passwordinconsistency'] = 'Пароли не совпадают, попробуйте, пожалуйста, ещё.'; +$messages['passwordinconsistency'] = 'Пароли не совпадают, попробуйте ещё раз, пожалуйста.'; $messages['crypterror'] = 'Не могу сохранить новый пароль. Отсутствует криптографическая функция.'; $messages['connecterror'] = 'Не могу сохранить новый пароль. Ошибка соединения.'; $messages['internalerror'] = 'Не могу сохранить новый пароль.'; -$messages['passwordshort'] = 'Пароль должен быть длиной как минимум $length символов.'; +$messages['passwordshort'] = 'Длина пароля должна быть как минимум $length символов.'; $messages['passwordweak'] = 'Пароль должен включать в себя как минимум одну цифру и один знак пунктуации.'; $messages['passwordforbidden'] = 'Пароль содержит недопустимые символы.'; diff --git a/plugins/redundant_attachments/config.inc.php.dist b/plugins/redundant_attachments/config.inc.php.dist index a0be3755e..a6d1ad4dc 100644 --- a/plugins/redundant_attachments/config.inc.php.dist +++ b/plugins/redundant_attachments/config.inc.php.dist @@ -4,10 +4,10 @@ // and copies them into sql database. // In environments with replicated database it is possible // to use memcache as a fallback when write-master is unavailable. -$rcmail_config['redundant_attachments_memcache'] = false; +$config['redundant_attachments_memcache'] = false; // Attachment data expires after specied TTL time in seconds (max.2592000). // Default is 12 hours. -$rcmail_config['redundant_attachments_cache_ttl'] = 12 * 60 * 60; +$config['redundant_attachments_cache_ttl'] = 12 * 60 * 60; ?> diff --git a/plugins/redundant_attachments/redundant_attachments.php b/plugins/redundant_attachments/redundant_attachments.php index c0affad3c..91a027586 100644 --- a/plugins/redundant_attachments/redundant_attachments.php +++ b/plugins/redundant_attachments/redundant_attachments.php @@ -126,11 +126,12 @@ class redundant_attachments extends filesystem_attachments $this->_load_drivers(); - if ($args['path']) - $args['data'] = file_get_contents($args['path']); + $data = $args['path'] ? file_get_contents($args['path']) : $args['data']; + + unset($args['data']); $key = $this->_key($args); - $data = base64_encode($args['data']); + $data = base64_encode($data); $status = $this->cache->write($key, $data); diff --git a/plugins/show_additional_headers/show_additional_headers.php b/plugins/show_additional_headers/show_additional_headers.php index c2b0ca1d3..b7f01104c 100644 --- a/plugins/show_additional_headers/show_additional_headers.php +++ b/plugins/show_additional_headers/show_additional_headers.php @@ -7,7 +7,7 @@ * and display them in the message view. * * Enable the plugin in config.inc.php and add your desired headers: - * $rcmail_config['show_additional_headers'] = array('User-Agent'); + * $config['show_additional_headers'] = array('User-Agent'); * * @version @package_version@ * @author Thomas Bruederli diff --git a/plugins/squirrelmail_usercopy/config.inc.php.dist b/plugins/squirrelmail_usercopy/config.inc.php.dist index cb62b1b86..03ec1cb86 100644 --- a/plugins/squirrelmail_usercopy/config.inc.php.dist +++ b/plugins/squirrelmail_usercopy/config.inc.php.dist @@ -1,25 +1,25 @@ <?php // Driver - 'file' or 'sql' -$rcmail_config['squirrelmail_driver'] = 'sql'; +$config['squirrelmail_driver'] = 'sql'; // full path to the squirrelmail data directory -$rcmail_config['squirrelmail_data_dir'] = ''; -$rcmail_config['squirrelmail_data_dir_hash_level'] = 0; +$config['squirrelmail_data_dir'] = ''; +$config['squirrelmail_data_dir_hash_level'] = 0; // 'mysql://dbuser:dbpass@localhost/database' -$rcmail_config['squirrelmail_dsn'] = 'mysql://user:password@localhost/webmail'; -$rcmail_config['squirrelmail_db_charset'] = 'iso-8859-1'; +$config['squirrelmail_dsn'] = 'mysql://user:password@localhost/webmail'; +$config['squirrelmail_db_charset'] = 'iso-8859-1'; -$rcmail_config['squirrelmail_address_table'] = 'address'; -$rcmail_config['squirrelmail_userprefs_table'] = 'userprefs'; +$config['squirrelmail_address_table'] = 'address'; +$config['squirrelmail_userprefs_table'] = 'userprefs'; // identities_level option value for squirrelmail plugin // With this you can bypass/change identities_level checks // for operations inside this plugin. See #1486773 -$rcmail_config['squirrelmail_identities_level'] = null; +$config['squirrelmail_identities_level'] = null; // Set to false if you don't want the email address of the default identity // (squirrelmail preference "email_address") to be saved as alias. // Recommended: set to false if your squirrelmail config setting $edit_identity has been true. -$rcmail_config['squirrelmail_set_alias'] = true;
\ No newline at end of file +$config['squirrelmail_set_alias'] = true;
\ No newline at end of file diff --git a/plugins/subscriptions_option/localization/ru_RU.inc b/plugins/subscriptions_option/localization/ru_RU.inc index 2b25783f3..b332e24ba 100644 --- a/plugins/subscriptions_option/localization/ru_RU.inc +++ b/plugins/subscriptions_option/localization/ru_RU.inc @@ -17,6 +17,6 @@ */ $labels = array(); -$labels['useimapsubscriptions'] = 'Использовать IMAP подписку'; +$labels['useimapsubscriptions'] = 'Использовать IMAP подписки'; ?> diff --git a/plugins/subscriptions_option/subscriptions_option.php b/plugins/subscriptions_option/subscriptions_option.php index 284c048df..130f16a8b 100644 --- a/plugins/subscriptions_option/subscriptions_option.php +++ b/plugins/subscriptions_option/subscriptions_option.php @@ -10,9 +10,9 @@ * Add it to the plugins list in config.inc.php to enable the user option * The user option can be hidden and set globally by adding 'use_subscriptions' * to the 'dont_override' configure line: - * $rcmail_config['dont_override'] = array('use_subscriptions'); + * $config['dont_override'] = array('use_subscriptions'); * and then set the global preference - * $rcmail_config['use_subscriptions'] = true; // or false + * $config['use_subscriptions'] = true; // or false * * Roundcube caches folder lists. When a user changes this option or visits * their folder list, this cache is refreshed. If the option is on the diff --git a/plugins/virtuser_file/virtuser_file.php b/plugins/virtuser_file/virtuser_file.php index ed0eba189..f2b357aaf 100644 --- a/plugins/virtuser_file/virtuser_file.php +++ b/plugins/virtuser_file/virtuser_file.php @@ -6,7 +6,7 @@ * Add it to the plugins list in config.inc.php and set * path to a virtuser table file to resolve user names and e-mail * addresses - * $rcmail_config['virtuser_file'] = ''; + * $rcmail['virtuser_file'] = ''; * * @version @package_version@ * @license GNU GPLv3+ diff --git a/plugins/virtuser_query/virtuser_query.php b/plugins/virtuser_query/virtuser_query.php index 3181cda94..a0b748288 100644 --- a/plugins/virtuser_query/virtuser_query.php +++ b/plugins/virtuser_query/virtuser_query.php @@ -12,13 +12,13 @@ * The email query could optionally select identity data columns in specified order: * name, organization, reply-to, bcc, signature, html_signature * - * $rcmail_config['virtuser_query'] = array('email' => '', 'user' => '', 'host' => '', 'alias' => ''); + * $config['virtuser_query'] = array('email' => '', 'user' => '', 'host' => '', 'alias' => ''); * * The email query can return more than one record to create more identities. * This requires identities_level option to be set to value less than 2. * * By default Roundcube database is used. To use different database (or host) - * you can specify DSN string in $rcmail_config['virtuser_query_dsn'] option. + * you can specify DSN string in $config['virtuser_query_dsn'] option. * * @version @package_version@ * @author Aleksander Machniak <alec@alec.pl> diff --git a/plugins/zipdownload/README b/plugins/zipdownload/README index 4fa3c17b6..f253d63ee 100644 --- a/plugins/zipdownload/README +++ b/plugins/zipdownload/README @@ -23,7 +23,7 @@ folder for details on the skin license. Install ======= * Place this plugin folder into plugins directory of Roundcube -* Add zipdownload to $rcmail_config['plugins'] in your Roundcube config +* Add zipdownload to $config['plugins'] in your Roundcube config NB: When downloading the plugin from GitHub you will need to create a directory called zipdownload and place the files in there, ignoring the diff --git a/plugins/zipdownload/config.inc.php.dist b/plugins/zipdownload/config.inc.php.dist index 5c7489a15..0b2d14b60 100644 --- a/plugins/zipdownload/config.inc.php.dist +++ b/plugins/zipdownload/config.inc.php.dist @@ -7,15 +7,15 @@ // Zip attachments // Only show the link when there are more than this many attachments // -1 to prevent downloading of attachments as zip -$rcmail_config['zipdownload_attachments'] = 1; +$config['zipdownload_attachments'] = 1; // Zip entire folders -$rcmail_config['zipdownload_folder'] = false; +$config['zipdownload_folder'] = false; // Zip selection of messages -$rcmail_config['zipdownload_selection'] = false; +$config['zipdownload_selection'] = false; // Charset to use for filenames inside the zip -$rcmail_config['zipdownload_charset'] = 'ISO-8859-1'; +$config['zipdownload_charset'] = 'ISO-8859-1'; ?>
\ No newline at end of file diff --git a/plugins/zipdownload/localization/ru_RU.inc b/plugins/zipdownload/localization/ru_RU.inc index 014b2001e..0b58fa7fa 100644 --- a/plugins/zipdownload/localization/ru_RU.inc +++ b/plugins/zipdownload/localization/ru_RU.inc @@ -18,6 +18,6 @@ $labels = array(); $labels['downloadall'] = 'Загрузить все вложения'; -$labels['downloadfolder'] = 'Загрузить каталог'; +$labels['downloadfolder'] = 'Загрузить папку'; ?>
\ No newline at end of file |