Use html_table class to build password form + add german localizations + codestyle (no tabs, just spaces)

release-0.6
thomascube 16 years ago
parent 3d241d914c
commit 6a765a9355

@ -27,13 +27,15 @@ function password_save($currpass, $newpass)
if ($code == 0)
return PASSWORD_SUCCESS;
} else
}
else {
raise_error(array(
'code' => 600,
'type' => 'php',
'file' = __FILE__,
'file' => __FILE__,
'message' => "Password plugin: Unable to execute $curdir/chgsaslpasswd"
), true, false);
}
return PASSWORD_ERROR;
}

@ -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";
?>

@ -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";
?>

@ -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);
@ -101,22 +114,16 @@ class password extends rcube_plugin
$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,
$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
@ -124,31 +131,29 @@ class password extends rcube_plugin
$input_newpasswd = new html_passwordfield(array('name' => '_newpasswd', '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('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')));
$table->add('title', html::label($field_id, Q($this->gettext('confpasswd'))));
$table->add(null, $input_confpasswd->show());
$out .= "\n</table>";
$out .= '<br />';
$out .= $rcmail->output->button(array(
$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');

Loading…
Cancel
Save