Changeset 2488 in subversion

Timestamp:

May 15, 2009 2:36:04 PM (4 years ago)

Author:

alec

Message:

• typo + rename db_password_dsn to password_db_dsn

Location:

trunk/roundcubemail/plugins/password

Files:

• localization/en_US.inc (modified) (1 diff)
• localization/nl_NL.inc (modified) (1 diff)
• password.php (modified) (3 diffs)

trunk/roundcubemail/plugins/password/localization/en_US.inc

@@ -10 +10 @@
 $messages['nopassword'] = 'Please input new password.';
 $messages['nocurpassword'] = 'Please input current password.';
-$messages['passwordincorrectly'] = 'Current password incorrectly.';
-$messages['passwordinconsistency'] = 'Inconsistency of password, please try again.';
+$messages['passwordincorrect'] = 'Current password incorrect.';
+$messages['passwordinconsistency'] = 'Passwords do not match, please try again.';
 $messages['nocryptfunction'] = 'The server is missing a function to encrypt your password - contact your system adminstrator.';
 $messages['internalerror'] = 'The server is updated more than one row in the database. This could be bad for all users. Contact your system adminstrator.';

trunk/roundcubemail/plugins/password/localization/nl_NL.inc

@@ -10 +10 @@
 $messages['nopassword'] = 'Vul een wachtwoord in.';
 $messages['nocurpassword'] = 'vul het huidige wachtwoord in.';
-$messages['passwordincorrectly'] = 'Huidig wachtwoord is onjuist.';
+$messages['passwordincorrect'] = 'Huidig wachtwoord is onjuist.';
 $messages['passwordinconsistency'] = 'Wachtwoorden komen niet overeen, probeer het opnieuw.';
 $messages['nocryptfunction'] = 'De server mist een functie om uw wachtwoord et beveiligen - neem contact op met uw systeembeheerder.';

trunk/roundcubemail/plugins/password/password.php

@@ -14 +14 @@
  *   password_confirm_current - boolean to determine whether current password
  *     is required to change password. Defaults to FALSE.
- *   db_passwd_dsn - is the PEAR database DSN for performing the query. Defaults
+ *   password_db_dsn - is the PEAR database DSN for performing the query. Defaults
  *     to the default databse setting in config/db.inc.php
  *   password_query - the SQL query used to change the password.
@@ -209 +209 @@
       $sql = "SELECT update_passwd(%c, %u)";
 
-    if ($dsn = $cfg->get('db_passwd_dsn')) {
+    if ($dsn = $cfg->get('password_db_dsn')) {
       $db = new rcube_mdb2($dsn, '', FALSE);
       $db->set_debug((bool)$cfg->get('sql_debug'));
@@ -216 +216 @@
       $db = rcmail::get_instance()->get_dbh();
     }
+
     if ($err = $db->is_error())
       return $err;