From bcedf05d19ba1b2f63bdbfe42ff2c726fc50b6b6 Mon Sep 17 00:00:00 2001
From: Aleksander Machniak
Date: Tue, 20 Aug 2013 19:23:59 +0200
Subject: s/$rcmail_config/$config/ also for plugins configuration
---
installer/index.php | 4 +-
plugins/acl/config.inc.php.dist | 12 +-
.../additional_message_headers/config.inc.php.dist | 10 +-
plugins/database_attachments/config.inc.php.dist | 4 +-
plugins/debug_logger/debug_logger.php | 6 +-
plugins/enigma/config.inc.php.dist | 6 +-
plugins/help/config.inc.php.dist | 12 +-
plugins/hide_blockquote/hide_blockquote.php | 2 +-
plugins/http_authentication/config.inc.php.dist | 4 +-
.../http_authentication/http_authentication.php | 2 +-
plugins/identity_select/identity_select.php | 2 +-
plugins/jqueryui/config.inc.php.dist | 4 +-
plugins/managesieve/config.inc.php.dist | 30 ++---
plugins/new_user_identity/new_user_identity.php | 6 +-
plugins/newmail_notifier/config.inc.php.dist | 6 +-
plugins/password/README | 6 +-
plugins/password/config.inc.php.dist | 130 ++++++++++-----------
plugins/password/drivers/hmail.php | 4 +-
plugins/password/drivers/xmail.php | 8 +-
plugins/redundant_attachments/config.inc.php.dist | 4 +-
.../show_additional_headers.php | 2 +-
plugins/squirrelmail_usercopy/config.inc.php.dist | 18 +--
.../subscriptions_option/subscriptions_option.php | 4 +-
plugins/virtuser_file/virtuser_file.php | 2 +-
plugins/virtuser_query/virtuser_query.php | 4 +-
plugins/zipdownload/README | 2 +-
plugins/zipdownload/config.inc.php.dist | 8 +-
27 files changed, 150 insertions(+), 152 deletions(-)
diff --git a/installer/index.php b/installer/index.php
index d084c8aa5..d90c4f981 100644
--- a/installer/index.php
+++ b/installer/index.php
@@ -125,12 +125,12 @@ if ($RCI->configured && empty($_REQUEST['_step'])) {
if ($RCI->configured && $RCI->legacy_config) {
echo 'Your configuration needs to be migrated!
';
echo 'We changed the configuration files structure and your installation needs to be updated accordingly.
';
- echo 'Please run the bin/update.sh script from the command line or set
$rcmail_config[\'enable_installer\'] = true;
';
+ echo 'Please run the bin/update.sh script from the command line or set
$rcube_config[\'enable_installer\'] = true;
';
echo ' in your RCUBE_CONFIG_DIR/main.inc.php to let the installer help you migrating it.
';
}
else {
echo 'The installer is disabled!
';
- echo 'To enable it again, set $rcmail_config[\'enable_installer\'] = true; in RCUBE_CONFIG_DIR/config.inc.php
';
+ echo 'To enable it again, set $config[\'enable_installer\'] = true; in RCUBE_CONFIG_DIR/config.inc.php
';
}
echo '