From e6f91471ecb740a032d03e8a362991a6687c0ec8 Mon Sep 17 00:00:00 2001 From: alec Date: Thu, 29 Apr 2010 07:13:26 +0000 Subject: - Use mail_domain value for domain variables when there is no domain in username: sql and ldap drivers (#1486694) - Created package.xml git-svn-id: https://svn.roundcube.net/trunk@3575 208e9e7b-5314-0410-a742-e7e81cd9613c --- plugins/password/password.php | 390 +++++++++++++++++++++++------------------- 1 file changed, 210 insertions(+), 180 deletions(-) (limited to 'plugins/password/password.php') diff --git a/plugins/password/password.php b/plugins/password/password.php index 3121eb6fe..eb9f19bda 100644 --- a/plugins/password/password.php +++ b/plugins/password/password.php @@ -3,7 +3,7 @@ /* +-------------------------------------------------------------------------+ | Password Plugin for Roundcube | - | Version 1.3.2 | + | @version @package_version@ | | | | Copyright (C) 2009, RoundCube Dev. | | | @@ -46,203 +46,233 @@ define('PASSWORD_SUCCESS', 0); */ class password extends rcube_plugin { - public $task = 'settings'; - - function init() - { - $rcmail = rcmail::get_instance(); - // add Tab label - $rcmail->output->add_label('password'); - $this->register_action('plugin.password', array($this, 'password_init')); - $this->register_action('plugin.password-save', array($this, 'password_save')); - $this->include_script('password.js'); - } - - function password_init() - { - $this->add_texts('localization/'); - $this->register_handler('plugin.body', array($this, 'password_form')); - - $rcmail = rcmail::get_instance(); - $rcmail->output->set_pagetitle($this->gettext('changepasswd')); - $rcmail->output->send('plugin'); - } - - function password_save() - { - $rcmail = rcmail::get_instance(); - $this->load_config(); - - $this->add_texts('localization/'); - $this->register_handler('plugin.body', array($this, 'password_form')); - $rcmail->output->set_pagetitle($this->gettext('changepasswd')); + public $task = 'settings'; + + function init() + { + $rcmail = rcmail::get_instance(); + // add Tab label + $rcmail->output->add_label('password'); + $this->register_action('plugin.password', array($this, 'password_init')); + $this->register_action('plugin.password-save', array($this, 'password_save')); + $this->include_script('password.js'); + } - $confirm = $rcmail->config->get('password_confirm_current'); - $required_length = intval($rcmail->config->get('password_minimum_length')); - $check_strength = $rcmail->config->get('password_require_nonalpha'); + function password_init() + { + $this->add_texts('localization/'); + $this->register_handler('plugin.body', array($this, 'password_form')); - if (($confirm && !isset($_POST['_curpasswd'])) || !isset($_POST['_newpasswd'])) { - $rcmail->output->command('display_message', $this->gettext('nopassword'), 'error'); - } - else { - - $charset = strtoupper($rcmail->config->get('password_charset', 'ISO-8859-1')); - $rc_charset = strtoupper($rcmail->output->get_charset()); - - $curpwd = get_input_value('_curpasswd', RCUBE_INPUT_POST, true, $charset); - $newpwd = get_input_value('_newpasswd', RCUBE_INPUT_POST, true); - $conpwd = get_input_value('_confpasswd', RCUBE_INPUT_POST, true); - - // check allowed characters according to the configured 'password_charset' option - // by converting the password entered by the user to this charset and back to UTF-8 - $orig_pwd = $newpwd; - $chk_pwd = rcube_charset_convert($orig_pwd, $rc_charset, $charset); - $chk_pwd = rcube_charset_convert($chk_pwd, $charset, $rc_charset); - - // WARNING: Default password_charset is ISO-8859-1, so conversion will - // change national characters. This may disable possibility of using - // the same password in other MUA's. - // We're doing this for consistence with Roundcube core - $newpwd = rcube_charset_convert($newpwd, $rc_charset, $charset); - $conpwd = rcube_charset_convert($conpwd, $rc_charset, $charset); - - if ($chk_pwd != $orig_pwd) { - $rcmail->output->command('display_message', $this->gettext('passwordforbidden'), 'error'); - } - // other passwords validity checks - else if ($conpwd != $newpwd) { - $rcmail->output->command('display_message', $this->gettext('passwordinconsistency'), 'error'); - } - else if ($confirm && $rcmail->decrypt($_SESSION['password']) != $curpwd) { - $rcmail->output->command('display_message', $this->gettext('passwordincorrect'), 'error'); - } - else if ($required_length && strlen($newpwd) < $required_length) { - $rcmail->output->command('display_message', $this->gettext( - array('name' => 'passwordshort', 'vars' => array('length' => $required_length))), 'error'); - } - else if ($check_strength && (!preg_match("/[0-9]/", $newpwd) || !preg_match("/[^A-Za-z0-9]/", $newpwd))) { - $rcmail->output->command('display_message', $this->gettext('passwordweak'), 'error'); - } - // try to save the password - else if (!($res = $this->_save($curpwd,$newpwd))) { - $rcmail->output->command('display_message', $this->gettext('successfullysaved'), 'confirmation'); - $_SESSION['password'] = $rcmail->encrypt($newpwd); - } - else - $rcmail->output->command('display_message', $res, 'error'); + $rcmail = rcmail::get_instance(); + $rcmail->output->set_pagetitle($this->gettext('changepasswd')); + $rcmail->output->send('plugin'); } - rcmail_overwrite_action('plugin.password'); - $rcmail->output->send('plugin'); - } + function password_save() + { + $rcmail = rcmail::get_instance(); + $this->load_config(); + + $this->add_texts('localization/'); + $this->register_handler('plugin.body', array($this, 'password_form')); + $rcmail->output->set_pagetitle($this->gettext('changepasswd')); + + $confirm = $rcmail->config->get('password_confirm_current'); + $required_length = intval($rcmail->config->get('password_minimum_length')); + $check_strength = $rcmail->config->get('password_require_nonalpha'); + + if (($confirm && !isset($_POST['_curpasswd'])) || !isset($_POST['_newpasswd'])) { + $rcmail->output->command('display_message', $this->gettext('nopassword'), 'error'); + } + else { + + $charset = strtoupper($rcmail->config->get('password_charset', 'ISO-8859-1')); + $rc_charset = strtoupper($rcmail->output->get_charset()); + + $curpwd = get_input_value('_curpasswd', RCUBE_INPUT_POST, true, $charset); + $newpwd = get_input_value('_newpasswd', RCUBE_INPUT_POST, true); + $conpwd = get_input_value('_confpasswd', RCUBE_INPUT_POST, true); + + // check allowed characters according to the configured 'password_charset' option + // by converting the password entered by the user to this charset and back to UTF-8 + $orig_pwd = $newpwd; + $chk_pwd = rcube_charset_convert($orig_pwd, $rc_charset, $charset); + $chk_pwd = rcube_charset_convert($chk_pwd, $charset, $rc_charset); + + // WARNING: Default password_charset is ISO-8859-1, so conversion will + // change national characters. This may disable possibility of using + // the same password in other MUA's. + // We're doing this for consistence with Roundcube core + $newpwd = rcube_charset_convert($newpwd, $rc_charset, $charset); + $conpwd = rcube_charset_convert($conpwd, $rc_charset, $charset); + + if ($chk_pwd != $orig_pwd) { + $rcmail->output->command('display_message', $this->gettext('passwordforbidden'), 'error'); + } + // other passwords validity checks + else if ($conpwd != $newpwd) { + $rcmail->output->command('display_message', $this->gettext('passwordinconsistency'), 'error'); + } + else if ($confirm && $rcmail->decrypt($_SESSION['password']) != $curpwd) { + $rcmail->output->command('display_message', $this->gettext('passwordincorrect'), 'error'); + } + else if ($required_length && strlen($newpwd) < $required_length) { + $rcmail->output->command('display_message', $this->gettext( + array('name' => 'passwordshort', 'vars' => array('length' => $required_length))), 'error'); + } + else if ($check_strength && (!preg_match("/[0-9]/", $newpwd) || !preg_match("/[^A-Za-z0-9]/", $newpwd))) { + $rcmail->output->command('display_message', $this->gettext('passwordweak'), 'error'); + } + // try to save the password + else if (!($res = $this->_save($curpwd,$newpwd))) { + $rcmail->output->command('display_message', $this->gettext('successfullysaved'), 'confirmation'); + $_SESSION['password'] = $rcmail->encrypt($newpwd); + } + else { + $rcmail->output->command('display_message', $res, 'error'); + } + } + + rcmail_overwrite_action('plugin.password'); + $rcmail->output->send('plugin'); + } - function password_form() - { - $rcmail = rcmail::get_instance(); - $this->load_config(); + function password_form() + { + $rcmail = rcmail::get_instance(); + $this->load_config(); - // add some labels to client - $rcmail->output->add_label( - 'password.nopassword', - 'password.nocurpassword', - 'password.passwordinconsistency' - ); + // add some labels to client + $rcmail->output->add_label( + 'password.nopassword', + 'password.nocurpassword', + 'password.passwordinconsistency' + ); - $rcmail->output->set_env('product_name', $rcmail->config->get('product_name')); + $rcmail->output->set_env('product_name', $rcmail->config->get('product_name')); - $table = new html_table(array('cols' => 2)); + $table = new html_table(array('cols' => 2)); - if ($rcmail->config->get('password_confirm_current')) { - // show current password selection - $field_id = 'curpasswd'; - $input_curpasswd = new html_passwordfield(array('name' => '_curpasswd', 'id' => $field_id, - 'size' => 20, 'autocomplete' => 'off')); + if ($rcmail->config->get('password_confirm_current')) { + // show current password selection + $field_id = 'curpasswd'; + $input_curpasswd = new html_passwordfield(array('name' => '_curpasswd', 'id' => $field_id, + 'size' => 20, 'autocomplete' => 'off')); - $table->add('title', html::label($field_id, Q($this->gettext('curpasswd')))); - $table->add(null, $input_curpasswd->show()); + $table->add('title', html::label($field_id, Q($this->gettext('curpasswd')))); + $table->add(null, $input_curpasswd->show()); + } + + // show new password selection + $field_id = 'newpasswd'; + $input_newpasswd = new html_passwordfield(array('name' => '_newpasswd', 'id' => $field_id, + 'size' => 20, 'autocomplete' => 'off')); + + $table->add('title', html::label($field_id, Q($this->gettext('newpasswd')))); + $table->add(null, $input_newpasswd->show()); + + // show confirm password selection + $field_id = 'confpasswd'; + $input_confpasswd = new html_passwordfield(array('name' => '_confpasswd', 'id' => $field_id, + 'size' => 20, 'autocomplete' => 'off')); + + $table->add('title', html::label($field_id, Q($this->gettext('confpasswd')))); + $table->add(null, $input_confpasswd->show()); + + $out = html::div(array('class' => 'settingsbox', 'style' => 'margin:0'), + html::div(array('id' => 'prefs-title', 'class' => 'boxtitle'), $this->gettext('changepasswd')) . + html::div(array('class' => 'boxcontent'), $table->show() . + html::p(null, + $rcmail->output->button(array( + 'command' => 'plugin.password-save', + 'type' => 'input', + 'class' => 'button mainaction', + 'label' => 'save' + ))))); + + $rcmail->output->add_gui_object('passform', 'password-form'); + + return $rcmail->output->form_tag(array( + 'id' => 'password-form', + 'name' => 'password-form', + 'method' => 'post', + 'action' => './?_task=settings&_action=plugin.password-save', + ), $out); } - // show new password selection - $field_id = 'newpasswd'; - $input_newpasswd = new html_passwordfield(array('name' => '_newpasswd', 'id' => $field_id, - 'size' => 20, 'autocomplete' => 'off')); - - $table->add('title', html::label($field_id, Q($this->gettext('newpasswd')))); - $table->add(null, $input_newpasswd->show()); - - // show confirm password selection - $field_id = 'confpasswd'; - $input_confpasswd = new html_passwordfield(array('name' => '_confpasswd', 'id' => $field_id, - 'size' => 20, 'autocomplete' => 'off')); - - $table->add('title', html::label($field_id, Q($this->gettext('confpasswd')))); - $table->add(null, $input_confpasswd->show()); - - $out = html::div(array('class' => 'settingsbox', 'style' => 'margin:0'), - html::div(array('id' => 'prefs-title', 'class' => 'boxtitle'), $this->gettext('changepasswd')) . - html::div(array('class' => 'boxcontent'), $table->show() . - html::p(null, - $rcmail->output->button(array( - 'command' => 'plugin.password-save', - 'type' => 'input', - 'class' => 'button mainaction', - 'label' => 'save' - ))) - ) - ); - - $rcmail->output->add_gui_object('passform', 'password-form'); - - return $rcmail->output->form_tag(array( - 'id' => 'password-form', - 'name' => 'password-form', - 'method' => 'post', - 'action' => './?_task=settings&_action=plugin.password-save', - ), $out); - } - - private function _save($curpass, $passwd) - { - $config = rcmail::get_instance()->config; - $driver = $this->home.'/drivers/'.$config->get('password_driver', 'sql').'.php'; + private function _save($curpass, $passwd) + { + $config = rcmail::get_instance()->config; + $driver = $this->home.'/drivers/'.$config->get('password_driver', 'sql').'.php'; - if (!is_readable($driver)) { - raise_error(array( - 'code' => 600, - 'type' => 'php', - 'file' => __FILE__, - 'message' => "Password plugin: Unable to open driver file $driver" - ), true, false); - return $this->gettext('internalerror'); - } + if (!is_readable($driver)) { + raise_error(array( + 'code' => 600, + 'type' => 'php', + 'file' => __FILE__, 'line' => __LINE__, + 'message' => "Password plugin: Unable to open driver file $driver" + ), true, false); + return $this->gettext('internalerror'); + } - include($driver); - - if (!function_exists('password_save')) { - raise_error(array( - 'code' => 600, - 'type' => 'php', - 'file' => __FILE__, - 'message' => "Password plugin: Broken driver: $driver" - ), true, false); - return $this->gettext('internalerror'); + include($driver); + + if (!function_exists('password_save')) { + raise_error(array( + 'code' => 600, + 'type' => 'php', + 'file' => __FILE__, 'line' => __LINE__, + 'message' => "Password plugin: Broken driver: $driver" + ), true, false); + return $this->gettext('internalerror'); + } + + $result = password_save($curpass, $passwd); + + switch ($result) { + case PASSWORD_SUCCESS: + return; + case PASSWORD_CRYPT_ERROR; + return $this->gettext('crypterror'); + case PASSWORD_CONNECT_ERROR; + return $this->gettext('connecterror'); + case PASSWORD_ERROR: + default: + return $this->gettext('internalerror'); + } } - $result = password_save($curpass, $passwd); - - switch ($result) { - case PASSWORD_SUCCESS: - return; - case PASSWORD_CRYPT_ERROR; - return $this->gettext('crypterror'); - case PASSWORD_CONNECT_ERROR; - return $this->gettext('connecterror'); - case PASSWORD_ERROR: - 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']; + } } ?> -- cgit v1.2.3