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 --- plugins/password/drivers/hmail.php | 4 +--- plugins/password/drivers/xmail.php | 8 ++++---- 2 files changed, 5 insertions(+), 7 deletions(-) (limited to 'plugins/password/drivers') 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 - * */ 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; * */ -- cgit v1.2.3