diff options
| -rw-r--r-- | plugins/password/config.inc.php | 4 | ||||
| -rw-r--r-- | plugins/password/drivers/sasl.php | 20 | ||||
| -rw-r--r-- | plugins/password/localization/de_CH.inc | 19 | ||||
| -rw-r--r-- | plugins/password/localization/de_DE.inc | 19 | ||||
| -rw-r--r-- | plugins/password/password.js | 38 | ||||
| -rw-r--r-- | plugins/password/password.php | 109 |
6 files changed, 127 insertions, 82 deletions
diff --git a/plugins/password/config.inc.php b/plugins/password/config.inc.php index e70ea7aae..8bce0cc69 100644 --- a/plugins/password/config.inc.php +++ b/plugins/password/config.inc.php @@ -18,9 +18,9 @@ $rcmail_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: -// %p is replaced with the plaintext new password +// %p is replaced with the plaintext new password // %c is replaced with the crypt version of the new password, MD5 if available -// otherwise DES. +// otherwise DES. // %u is replaced with the username (from the session info) // %o is replaced with the password before the change // %h is replaced with the imap host (from the session info) diff --git a/plugins/password/drivers/sasl.php b/plugins/password/drivers/sasl.php index 361333403..0f762e50d 100644 --- a/plugins/password/drivers/sasl.php +++ b/plugins/password/drivers/sasl.php @@ -22,18 +22,20 @@ function password_save($currpass, $newpass) $username = escapeshellcmd($_SESSION['username']); if ($fh = popen("$curdir/chgsaslpasswd -p $username", 'w')) { - fwrite($fh, $newpass."\n"); + fwrite($fh, $newpass."\n"); $code = pclose($fh); - if($code == 0) - return PASSWORD_SUCCESS; - } else - raise_error(array( + if ($code == 0) + return PASSWORD_SUCCESS; + } + else { + raise_error(array( 'code' => 600, - 'type' => 'php', - 'file' = __FILE__, - 'message' => "Password plugin: Unable to execute $curdir/chgsaslpasswd" - ), true, false); + 'type' => 'php', + 'file' => __FILE__, + 'message' => "Password plugin: Unable to execute $curdir/chgsaslpasswd" + ), true, false); + } return PASSWORD_ERROR; } diff --git a/plugins/password/localization/de_CH.inc b/plugins/password/localization/de_CH.inc new file mode 100644 index 000000000..a28990d67 --- /dev/null +++ b/plugins/password/localization/de_CH.inc @@ -0,0 +1,19 @@ +<?php + +$labels = array(); +$labels['changepasswd'] = 'Passwort ändern'; +$labels['curpasswd'] = 'Aktuelles Passwort'; +$labels['newpasswd'] = 'Neues Passwort'; +$labels['confpasswd'] = 'Passwort Wiederholung'; + +$messages = array(); +$messages['nopassword'] = "Bitte geben Sie ein neues Passwort ein"; +$messages['nocurpassword'] = "Bitte geben Sie Ihr aktuelles Passwort an"; +$messages['passwordincorrect'] = "Das aktuelle Passwort ist nicht korrekt"; +$messages['passwordinconsistency'] = "Das neue Passwort und dessen Wiederholung stimmen nicht überein"; +$messages['crypterror'] = "Neues Passwort nicht gespeichert: Verschlüsselungsfunktion fehlt"; +$messages['connecterror'] = "Neues Passwort nicht gespeichert: Verbindungsfehler"; +$messages['internalerror'] = "Neues Passwort nicht gespeichert"; + + +?>
\ No newline at end of file diff --git a/plugins/password/localization/de_DE.inc b/plugins/password/localization/de_DE.inc new file mode 100644 index 000000000..a28990d67 --- /dev/null +++ b/plugins/password/localization/de_DE.inc @@ -0,0 +1,19 @@ +<?php + +$labels = array(); +$labels['changepasswd'] = 'Passwort ändern'; +$labels['curpasswd'] = 'Aktuelles Passwort'; +$labels['newpasswd'] = 'Neues Passwort'; +$labels['confpasswd'] = 'Passwort Wiederholung'; + +$messages = array(); +$messages['nopassword'] = "Bitte geben Sie ein neues Passwort ein"; +$messages['nocurpassword'] = "Bitte geben Sie Ihr aktuelles Passwort an"; +$messages['passwordincorrect'] = "Das aktuelle Passwort ist nicht korrekt"; +$messages['passwordinconsistency'] = "Das neue Passwort und dessen Wiederholung stimmen nicht überein"; +$messages['crypterror'] = "Neues Passwort nicht gespeichert: Verschlüsselungsfunktion fehlt"; +$messages['connecterror'] = "Neues Passwort nicht gespeichert: Verbindungsfehler"; +$messages['internalerror'] = "Neues Passwort nicht gespeichert"; + + +?>
\ No newline at end of file diff --git a/plugins/password/password.js b/plugins/password/password.js index e6fa0b547..c3252f031 100644 --- a/plugins/password/password.js +++ b/plugins/password/password.js @@ -12,25 +12,25 @@ if (window.rcmail) { rcmail.add_element(tab, 'tabs'); rcmail.register_command('plugin.password', function() { rcmail.goto_url('plugin.password') }, true); rcmail.register_command('plugin.password-save', function() { - var input_curpasswd = rcube_find_object('_curpasswd'); - var input_newpasswd = rcube_find_object('_newpasswd'); - var input_confpasswd = rcube_find_object('_confpasswd'); - - if (input_curpasswd && input_curpasswd.value=='') { - alert(rcmail.gettext('nocurpassword', 'password')); - input_curpasswd.focus(); - } else if (input_newpasswd && input_newpasswd.value=='') { - alert(rcmail.gettext('nopassword', 'password')); - input_newpasswd.focus(); - } else if (input_confpasswd && input_confpasswd.value=='') { - alert(rcmail.gettext('nopassword', 'password')); - input_confpasswd.focus(); - } else if ((input_newpasswd && input_confpasswd) && (input_newpasswd.value != input_confpasswd.value)) { - alert(rcmail.gettext('passwordinconsistency', 'password')); - input_newpasswd.focus(); - } else { - rcmail.gui_objects.passform.submit(); - } + var input_curpasswd = rcube_find_object('_curpasswd'); + var input_newpasswd = rcube_find_object('_newpasswd'); + var input_confpasswd = rcube_find_object('_confpasswd'); + + if (input_curpasswd && input_curpasswd.value=='') { + alert(rcmail.gettext('nocurpassword', 'password')); + input_curpasswd.focus(); + } else if (input_newpasswd && input_newpasswd.value=='') { + alert(rcmail.gettext('nopassword', 'password')); + input_newpasswd.focus(); + } else if (input_confpasswd && input_confpasswd.value=='') { + alert(rcmail.gettext('nopassword', 'password')); + input_confpasswd.focus(); + } else if ((input_newpasswd && input_confpasswd) && (input_newpasswd.value != input_confpasswd.value)) { + alert(rcmail.gettext('passwordinconsistency', 'password')); + input_newpasswd.focus(); + } else { + rcmail.gui_objects.passform.submit(); + } }, true); }) } diff --git a/plugins/password/password.php b/plugins/password/password.php index e97fa7d5d..83af68bc6 100644 --- a/plugins/password/password.php +++ b/plugins/password/password.php @@ -3,9 +3,9 @@ /* +-------------------------------------------------------------------------+ | Password Plugin for Roundcube | - | Version 1.3 | + | Version 1.3.1 | | | - | Copyright (C) 2009, RoundCube Dev. - Switzerland | + | Copyright (C) 2009, RoundCube Dev. | | | | This program is free software; you can redistribute it and/or modify | | it under the terms of the GNU General Public License version 2 | @@ -33,6 +33,18 @@ define('PASSWORD_ERROR', 2); define('PASSWORD_CONNECT_ERROR', 3); define('PASSWORD_SUCCESS', 0); +/** + * Change password plugin + * + * Plugin that adds functionality to change a users password. + * It provides common functionality and user interface and supports + * several backends to finally update the password. + * + * For installation and configuration instructions please read the README file. + * + * @version 1.3.1 + * @author Aleksander Machniak + */ class password extends rcube_plugin { public $task = 'settings'; @@ -68,8 +80,9 @@ class password extends rcube_plugin $confirm = $rcmail->config->get('password_confirm_current'); - if (($confirm && !isset($_POST['_curpasswd'])) || !isset($_POST['_newpasswd'])) + if (($confirm && !isset($_POST['_curpasswd'])) || !isset($_POST['_newpasswd'])) { $rcmail->output->command('display_message', $this->gettext('nopassword'), 'error'); + } else { $curpwd = get_input_value('_curpasswd', RCUBE_INPUT_POST); $newpwd = get_input_value('_newpasswd', RCUBE_INPUT_POST); @@ -94,70 +107,62 @@ class password extends rcube_plugin // add some labels to client $rcmail->output->add_label( - 'password.nopassword', - 'password.nocurpassword', - 'password.passwordinconsistency' + 'password.nopassword', + 'password.nocurpassword', + 'password.passwordinconsistency' ); $rcmail->output->set_env('product_name', $rcmail->config->get('product_name')); - // allow the following attributes to be added to the <table> tag - $attrib_str = create_attrib_string($attrib, array('style', 'class', 'id', 'cellpadding', 'cellspacing', 'border', 'summary')); - - // return the complete edit form as table - $out = '<table' . $attrib_str . ">\n\n"; + $table = new html_table(array('cols' => 2)); if ($rcmail->config->get('password_confirm_current')) { // show current password selection $field_id = 'curpasswd'; - $input_newpasswd = new html_passwordfield(array('name' => '_curpasswd', 'id' => $field_id, - 'size' => 20, 'autocomplete' => 'off')); + $input_curpasswd = new html_passwordfield(array('name' => '_curpasswd', 'id' => $field_id, + 'size' => 20, 'autocomplete' => 'off')); - $out .= sprintf("<tr><td class=\"title\"><label for=\"%s\">%s</label></td><td>%s</td></tr>\n", - $field_id, - rep_specialchars_output($this->gettext('curpasswd')), - $input_newpasswd->show($rcmail->config->get('curpasswd'))); + $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')); + 'size' => 20, 'autocomplete' => 'off')); - $out .= sprintf("<tr><td class=\"title\"><label for=\"%s\">%s</label></td><td>%s</td></tr>\n", - $field_id, - rep_specialchars_output($this->gettext('newpasswd')), - $input_newpasswd->show($rcmail->config->get('newpasswd'))); + $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')); - - $out .= sprintf("<tr><td class=\"title\"><label for=\"%s\">%s</label></td><td>%s</td></tr>\n", - $field_id, - rep_specialchars_output($this->gettext('confpasswd')), - $input_confpasswd->show($rcmail->config->get('confpasswd'))); - - $out .= "\n</table>"; - - $out .= '<br />'; - - $out .= $rcmail->output->button(array( - 'command' => 'plugin.password-save', - 'type' => 'input', - 'class' => 'button mainaction', - 'label' => 'save' - )); + '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' => "userprefs-title"), $this->gettext('changepasswd')) . + html::div(array('style' => "padding:15px"), $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); + 'id' => 'password-form', + 'name' => 'password-form', + 'method' => 'post', + 'action' => './?_task=settings&_action=plugin.password-save', + ), $out); } private function _save($curpass, $passwd) @@ -168,10 +173,10 @@ class password extends rcube_plugin if (!is_readable($driver)) { raise_error(array( 'code' => 600, - 'type' => 'php', - 'file' => __FILE__, - 'message' => "Password plugin: Unable to open driver file $driver" - ), true, false); + 'type' => 'php', + 'file' => __FILE__, + 'message' => "Password plugin: Unable to open driver file $driver" + ), true, false); return $this->gettext('internalerror'); } @@ -180,10 +185,10 @@ class password extends rcube_plugin if (!function_exists('password_save')) { raise_error(array( 'code' => 600, - 'type' => 'php', - 'file' => __FILE__, - 'message' => "Password plugin: Broken driver: $driver" - ), true, false); + 'type' => 'php', + 'file' => __FILE__, + 'message' => "Password plugin: Broken driver: $driver" + ), true, false); return $this->gettext('internalerror'); } |