diff options
Diffstat (limited to 'plugins/password')
| -rw-r--r-- | plugins/password/drivers/ldap.php | 5 | ||||
| -rw-r--r-- | plugins/password/drivers/sql.php | 4 | ||||
| -rw-r--r-- | plugins/password/package.xml | 31 | ||||
| -rw-r--r-- | plugins/password/password.php | 34 |
4 files changed, 31 insertions, 43 deletions
diff --git a/plugins/password/drivers/ldap.php b/plugins/password/drivers/ldap.php index a8aba0f74..f86abd7f4 100644 --- a/plugins/password/drivers/ldap.php +++ b/plugins/password/drivers/ldap.php @@ -133,14 +133,15 @@ function search_userdn($rcmail) */ function substitute_vars($str) { + $rcmail = rcmail::get_instance(); $str = str_replace(array( '%login', '%name', '%domain', ), array( $_SESSION['username'], - password::username_local(), - password::username_domain(), + $rcmail->user->get_username('local'), + $rcmail->user->get_username('domain'), ), $str ); diff --git a/plugins/password/drivers/sql.php b/plugins/password/drivers/sql.php index 2ed65d0a3..8677f231c 100644 --- a/plugins/password/drivers/sql.php +++ b/plugins/password/drivers/sql.php @@ -106,8 +106,8 @@ function password_save($curpass, $passwd) } // at least we should always have the local part - $sql = str_replace('%l', $db->quote(password::username_local(), 'text'), $sql); - $sql = str_replace('%d', $db->quote(password::username_domain(), 'text'), $sql); + $sql = str_replace('%l', $db->quote($rcmail->user->get_username('local'), 'text'), $sql); + $sql = str_replace('%d', $db->quote($rcmail->user->get_username('domain'), 'text'), $sql); $sql = str_replace('%u', $db->quote($_SESSION['username'],'text'), $sql); $sql = str_replace('%h', $db->quote($_SESSION['imap_host'],'text'), $sql); $sql = str_replace('%p', $db->quote($passwd,'text'), $sql); diff --git a/plugins/password/package.xml b/plugins/password/package.xml index 2086d3424..a280d3ed3 100644 --- a/plugins/password/package.xml +++ b/plugins/password/package.xml @@ -15,11 +15,11 @@ <email>alec@alec.pl</email> <active>yes</active> </lead> - <date>2010-04-29</date> + <date>2010-06-20</date> <time>12:00:00</time> <version> - <release>1.4</release> - <api>1.4</api> + <release>1.5</release> + <api>1.5</api> </version> <stability> <release>stable</release> @@ -27,9 +27,8 @@ </stability> <license uri="http://www.gnu.org/licenses/gpl-2.0.html">GNU GPLv2</license> <notes> -- Use mail_domain value for domain variables when there is no domain in username: - sql and ldap drivers(#1486694) -- Created package.xml +- Removed user_login/username_local/username_domain methods, + use rcube_user::get_username instead (#1486707) </notes> <contents> <dir baseinstalldir="/" name="/"> @@ -98,4 +97,24 @@ </required> </dependencies> <phprelease/> + <changelog> + <release> + <date>2010-04-29</date> + <time>12:00:00</time> + <version> + <release>1.4</release> + <api>1.4</api> + </version> + <stability> + <release>stable</release> + <api>stable</api> + </stability> + <license uri="http://www.gnu.org/licenses/gpl-2.0.html">GNU GPLv2</license> + <notes> +- Use mail_domain value for domain variables when there is no domain in username: + sql and ldap drivers (#1486694) +- Created package.xml + </notes> + </release> + </changelog> </package> diff --git a/plugins/password/password.php b/plugins/password/password.php index eb9f19bda..eb0a30b0f 100644 --- a/plugins/password/password.php +++ b/plugins/password/password.php @@ -240,39 +240,7 @@ class password extends rcube_plugin default: return $this->gettext('internalerror'); } - } - - static function username_local() - { - return password::user_login('local'); - } - - static function username_domain() - { - return password::user_login('domain'); - } - - static function user_login($part = null) - { - $user_info = explode('@', $_SESSION['username']); - - // at least we should always have the local part - if ($part == 'local') { - return $user_info[0]; - } - else if ($part == 'domain') { - if (!empty($user_info[1])) { - return $user_info[1]; - } - // if no domain was provided use the default if available - if ($domain = rcmail::get_instance()->config->get('mail_domain')) { - return $domain; - } - return ''; - } - - return $_SESSION['username']; - } + } } ?> |