Changeset 3530 for trunk

Timestamp:

03/12/09 06:15:46 (9 months ago)

Author:

fumiakiy

Message:

Merged MT4.24 branch to trunk. "svn merge -r3461:3462 http://code.sixapart.com/svn/movabletype/branches/mt4.24 ."

Also merged MT.pm, and MT/Upgrade/v4.pm.

Location:

trunk

Files:

• default_templates/recover-password.mtml (modified) (1 diff)
• lib/MT.pm (modified) (1 diff)
• lib/MT/App/CMS.pm (modified) (1 diff)
• lib/MT/App/Comments.pm (modified) (2 diffs)
• lib/MT/Author.pm (modified) (1 diff)
• lib/MT/CMS/Tools.pm (modified) (4 diffs)
• lib/MT/L10N/de.pm (modified) (1 diff)
• lib/MT/L10N/en_us.pm (modified) (1 diff)
• lib/MT/L10N/es.pm (modified) (1 diff)
• lib/MT/L10N/fr.pm (modified) (1 diff)
• lib/MT/L10N/ja.pm (modified) (8 diffs)
• lib/MT/L10N/nl.pm (modified) (1 diff)
• lib/MT/Upgrade/v4.pm (modified) (2 diffs)
• tmpl/cms/dialog/new_password.tmpl (copied) (copied from branches/mt4.24/tmpl/cms/dialog/new_password.tmpl)
• tmpl/cms/dialog/recover.tmpl (modified) (3 diffs)
• tmpl/comment/login.tmpl (modified) (1 diff)

trunk/default_templates/recover-password.mtml

@@ -1 @@
-<__trans phrase="_USAGE_FORGOT_PASSWORD_1">
+<__trans phrase="A request has been made to change your password in Movable Type. To complete this process click on the link below to select a new password.">
 
-    <$mt:Var name="user_password"$>
+<mt:var name="link_to_login">
 
-<__trans phrase="_USAGE_FORGOT_PASSWORD_2">
+<__trans phrase="If you did not request this change, you can safely ignore this email.">
 
-    <$mt:Var name="link_to_login"$>
-
-<$mt:Include module="<__trans phrase="Mail Footer">"$>
-
+<mt:include module="<__trans phrase="Mail Footer">">

trunk/lib/MT.pm

@@ -2036 +2036 @@
     }
     undef;
+}
+
+sub load_global_tmpl {
+    my $app = shift;
+    my ( $arg, $blog_id ) = @_;
+    $blog_id ||= '0';
+
+    my $terms = {};
+    if ( 'HASH' eq ref($arg) ) {
+        $terms = { %$arg, blog_id => $blog_id };
+    }
+    else {
+        $terms = {
+            type => $arg,
+            blog_id => $blog_id,
+        }
+    }
+    require MT::Template;
+    my $tmpl = MT::Template->load( $terms );
+    $app->set_default_tmpl_params($tmpl) if $tmpl;
+    $tmpl;
 }
 

trunk/lib/MT/App/CMS.pm

@@ -141 +141 @@
         'recover' => {
             code           => "${pkg}Tools::recover_password",
+            requires_login => 0,
+        },
+        'new_pw' => {
+            code => "${pkg}Tools::new_password",
             requires_login => 0,
         },

trunk/lib/MT/App/Comments.pm

@@ -40 +40 @@
         red              => \&do_red,
         generate_captcha => \&generate_captcha,
+
+        start_recover    => \&start_recover,
+        recover          => \&recover,
+        new_pw           => \&new_pw,
 
         # deprecated
@@ -1889 +1893 @@
 }
 
+sub start_recover {
+    require MT::CMS::Tools;
+    MT::CMS::Tools::start_recover(@_);
+}
+
+sub recover {
+    require MT::CMS::Tools;
+    MT::CMS::Tools::recover_password(@_);
+}
+
+sub new_pw {
+    require MT::CMS::Tools;
+    MT::CMS::Tools::new_password(@_);
+}
+
 1;
 __END__

trunk/lib/MT/Author.pm

@@ -42 +42 @@
         'widgets' => 'hash meta',
         'favorite_blogs' => 'array meta',
+        'password_reset' => 'string meta',
+        'password_reset_expires' => 'string meta',
+        'password_reset_return_to' => 'string meta',
     },
     defaults => {

trunk/lib/MT/CMS/Tools.pm

@@ -107 +107 @@
 sub start_recover {
     my $app = shift;
+    my ($param) = @_;
+    $param ||= {};
+    $param->{'email'} = $app->param('email');
+    $param->{'return_to'} = $app->param('return_to');
     $app->add_breadcrumb( $app->translate('Password Recovery') );
-    $app->load_tmpl('dialog/recover.tmpl');
+
+    my $blog_id = $app->param('blog_id');
+    my $tmpl = $app->load_global_tmpl( { identifier => 'new_password_reset_form',
+            $blog_id ? ( blog_id => $app->param('blog_id') ) : () } );
+    if (!$tmpl) {
+        $tmpl = $app->load_tmpl( 'cms/dialog/recover.tmpl' );
+    }
+    $tmpl->param($param);
+    return $tmpl;
 }
 
 sub recover_password {
-    my $app   = shift;
-    my $q     = $app->param;
-    my $name  = $q->param('name');
-    my $class = ref $app eq 'MT::App::Upgrader' ? 'MT::BasicAuthor' : $app->model('author');
+    my $app      = shift;
+    my $email    = $app->param('email');
+    my $username = $app->param('name');
+
+    if ( !$email ) {
+        return $app->start_recover(
+            { error => $app->translate('Email Address is required for password recovery.'), } );
+    }
+
+    # Searching user by email (and username)
+    my $class
+        = ref $app eq 'MT::App::Upgrader'
+        ? 'MT::BasicAuthor'
+        : $app->model('author');
     eval "use $class;";
-    my @author = $class->load( { name => $name } );
-    my $author;
-    foreach (@author) {
+
+    my @all_authors = $class->load(
+        { email => $email, ( $username ? ( name => $username ) : () ) } );
+    my @authors;
+    my $user;
+    foreach (@all_authors) {
         next unless $_->password && ( $_->password ne '(none)' );
-        $author = $_;
-    }
-
-    my ( $rc, $res ) =
-      reset_password( $app, $author, $q->param('hint'), $name );
-
-    if ($rc) {
-        $app->add_breadcrumb( $app->translate('Password Recovery') );
-        $app->load_tmpl(
-            'dialog/recover.tmpl',
-            {
-                recovered => 1,
-                email     => $author->email
+        push( @authors, $_ );
+    }
+    if ( !@authors ) {
+        return $app->start_recover(
+            {   error => $app->translate('User not found'),
+                ( $username ? ( not_unique_email => 1 ) : () ),
             }
         );
     }
-    else {
-        $app->error($res);
-    }
+    elsif ( @authors > 1 ) {
+        return $app->start_recover( { not_unique_email => 1, } );
+    }
+    $user = pop @authors;
+
+    # Generate Token
+    require MT::Util::Captcha;
+    my $salt    = MT::Util::Captcha->_generate_code(8);
+    my $expires = time + ( 60 * 60 );
+    my $token = MT::Util::perl_sha1_digest_hex(
+        $salt . $expires . $app->config->SecretToken );
+
+    $user->password_reset($salt);
+    $user->password_reset_expires($expires);
+    $user->password_reset_return_to($app->param('return_to'))
+        if $app->param('return_to');
+    $user->save;
+
+    # Send mail to user
+    my %head = (
+        id      => 'recover_password',
+        To      => $email,
+        From    => $app->config('EmailAddressMain') || $email,
+        Subject => $app->translate("Password Recovery")
+    );
+    my $charset = $app->charset;
+    my $mail_enc = uc( $app->config('MailEncoding') || $charset );
+    $head{'Content-Type'} = qq(text/plain; charset="$mail_enc");
+
+    my $body = $app->build_email(
+        'recover-password',
+        {         link_to_login => $app->base
+                . $app->uri
+                . "?__mode=new_pw&token=$token&email="
+                . encode_url($email),
+        }
+    );
+
+    require MT::Mail;
+    MT::Mail->send( \%head, $body )
+        or return $app->error(
+        $app->translate(
+            "Error sending mail ([_1]); please fix the problem, then "
+                . "try again to recover your password.",
+            MT::Mail->errstr
+        )
+        );
+
+    return $app->start_recover( { recovered => 1, } );
+}
+
+sub new_password {
+    my $app = shift;
+    my ($param) = @_;
+    $param ||= {};
+
+    my $token = $app->param('token');
+    if ( !$token ) {
+        return $app->start_recover(
+            { error => $app->translate('Password reset token not found'), } );
+    }
+
+    my $email = $app->param('email');
+    if ( !$token ) {
+        return $app->start_recover(
+            { error => $app->translate('Email address not found'), } );
+    }
+
+    my $class = $app->model('author');
+    my @users = $class->load( { email => $email } );
+    if ( !@users ) {
+        return $app->start_recover(
+            { error => $app->translate('User not found'), } );
+    }
+
+    # comparing token
+    require MT::Util::Captcha;
+    my $user;
+    for my $u (@users) {
+        my $salt    = $u->password_reset;
+        my $expires = $u->password_reset_expires;
+        my $compare = MT::Util::perl_sha1_digest_hex(
+            $salt . $expires . $app->config->SecretToken );
+        if ( $compare eq $token ) {
+            if ( time > $u->password_reset_expires ) {
+                return $app->start_recover(
+                    {   error => $app->translate(
+                            'Your request to change your password has expired.'
+                        ),
+                    }
+                );
+            }
+            $user  = $u;
+            last;
+        }
+    }
+
+    if ( !$user ) {
+        return $app->start_recover(
+            { error => $app->translate('Invalid password reset request'), } );
+    }
+
+    # Password reset
+    my $new_password = $app->param('password');
+    if ($new_password) {
+        my $again = $app->param('password_again');
+        if ( !$again ) {
+            $param->{'error'}
+                = $app->translate('Please confirm your new password');
+        }
+        elsif ( $new_password ne $again ) {
+            $param->{'error'} = $app->translate('Passwords do not match');
+        }
+        else {
+            my $redirect = $user->password_reset_return_to || '';
+            $user->set_password($new_password);
+            $user->password_reset(undef);
+            $user->password_reset_expires(undef);
+            $user->password_reset_return_to(undef);
+            $user->save;
+            $app->param( 'username', $user->name )
+                if $user->type == MT::Author::AUTHOR();
+            $app->login;
+            if ($redirect) {
+                return $app->redirect($redirect);
+            } else{
+                return $app->return_to_dashboard( redirect => 1 );
+            }
+        }
+    }
+
+    $param->{'email'}          = $email;
+    $param->{'token'}          = $token;
+    $param->{'password'}       = $app->param('password');
+    $param->{'password_again'} = $app->param('password_again');
+    $app->add_breadcrumb( $app->translate('Password Recovery') );
+
+    my $blog_id = $app->param('blog_id');
+    my $tmpl = $app->load_global_tmpl( { identifier => 'new_password',
+            $blog_id ? ( blog_id => $app->param('blog_id') ) : () } );
+    if (!$tmpl) {
+        $tmpl = $app->load_tmpl( 'cms/dialog/new_password.tmpl' );
+    }
+    $tmpl->param($param);
+    return $tmpl;
 }
 
@@ -1531 +1691 @@
       unless $author->email;
 
-    my @pool = ( 'a' .. 'z', 0 .. 9 );
-    my $pass = '';
-    for ( 1 .. 8 ) { $pass .= $pool[ rand @pool ] }
-    $author->set_password($pass);
+    # Generate Token
+    require MT::Util::Captcha;
+    my $salt    = MT::Util::Captcha->_generate_code(8);
+    my $expires = time + ( 60 * 60 );
+    my $token = MT::Util::perl_sha1_digest_hex(
+        $salt . $expires . $app->config->SecretToken );
+
+    $author->password_reset($salt);
+    $author->password_reset_expires($expires);
+    $author->password_reset_return_to(undef);
     $author->save;
+
     my $message =
       $app->translate(
-"Password was reset for user '[_1]' (user #[_2]). Password was sent to the following address: [_3]",
+"A password reset link has been sent to [_3] for user  '[_1]' (user #[_2]).",
         $author->name, $author->id, $author->email );
     $app->log(
@@ -1549 +1716 @@
     );
 
-    my $address =
-      defined $author->nickname
-      ? $author->nickname . ' <' . $author->email . '>'
-      : $author->email;
+    # Send mail to user
+    my $email = $author->email;
     my %head = (
         id      => 'recover_password',
-        To      => $address,
-        From    => $app->config('EmailAddressMain') || $address,
+        To      => $email,
+        From    => $app->config('EmailAddressMain') || $email,
         Subject => $app->translate("Password Recovery")
     );
@@ -1563 +1728 @@
     $head{'Content-Type'} = qq(text/plain; charset="$mail_enc");
 
-    my $body = $app->build_email( 'recover-password.tmpl',
-        { user_password => $pass, link_to_login => $app->base . $app->mt_uri } 
+    my $body = $app->build_email(
+        'recover-password',
+        {         link_to_login => $app->base
+                . $app->uri
+                . "?__mode=new_pw&token=$token&email="
+                . encode_url($email),
+        }
     );
-    $body = wrap_text( $body, 72 );
+
     require MT::Mail;
     MT::Mail->send( \%head, $body )
-      or return (
-        0,
+        or return $app->error(
         $app->translate(
             "Error sending mail ([_1]); please fix the problem, then "
-              . "try again to recover your password.",
+                . "try again to recover your password.",
             MT::Mail->errstr
         )
-      );
+        );
+
     ( 1, $message );
 }

trunk/lib/MT/L10N/de.pm

@@ -5230 +5230 @@
         'Upgrade to Feeds.App' => 'Upgrade auf Feeds.App',
         'Create a Feed Widget' => 'Feed-Widget anlegen',
-
+        
+       '%f-thumb-%wx%h-%i%x' => '%f-thumb-%wx%h-%i%x', # Translate - New
+       '[_1] contains an invalid character: [_2]' => '[_1] beinhaltet ein ungÃŒltiges Schriftzeichen: [_2]', # Translate - New
+       'Email address is required.' => 'Bitte geben Sie Ihre E-Mail-Adresse ein.', # Translate - New
+       'User not found' => 'Dieser Benutzer wurde nicht gefunden', # Translate - New
+       'Password reset token not found' => 'Der Passwort Reset Token wurde nicht gefunden', # Translate - New
+       'Email address not found' => 'Diese E-Mail-Adresse wurde nicht gefunden', # Translate - New
+       'Your request to change your password has expired.' => 'Ihre Anfrage auf Änderung Ihres Passwortes ist ausgelaufen.', # Translate - New
+       'Invalid password reset request' => 'UngÃŒltige Passwort Reset Anfrage', # Translate - New
+       'Please confirm your new password' => 'Bitte bestÀtigen Sie Ihr neues Passwort', # Translate - New
+       'Password do not match' => 'Die Passwörter stimmen nicht Ìberein', # Translate - New
+       'Invalid [_1] parameter.' => 'UngÃŒltiger [_1] Parameter.', # Translate - New
+       'Blog, BlogID or Template param must be specified.' => 'Blog, BlogID oder Template Parameter mÃŒssen spezifiziert werden.', # Translate - New
+       'Error saving [_1] record # [_3]: [_2]...' => 'Error saving [_1] record # [_3]: [_2]...', # Translate - New
+       'The email address provided is not unique.  Please enter your username.' => 'Diese E-Mail-Adresse wird bereits verwendet. Bitte geben Sie Ihren Benutzernamen ein.', # Translate - New
+       'An email with a link to reset your password has been sent to your email address ([_1]).' => 'Es wurde eine E-Mail mit einem Link zur ZurÃŒcksetzung Ihres Passwortes an Ihre Adresse gesendet([_1]).', # Translate - New
+       'Choose New Password' => 'WÀhlen Sie Ihr neues Passwort', # Translate - New
+       'You must set Local Archive Path.' => 'Bitte definieren Sie Ihren Local Archive Path.', # Translate - New
+       'You must set a valid Archive URL.' => 'Bitte definieren Sie eine gÃŒltige Archive URL.', # Translate - New
+       'You must set a valid Local Archive Path.' => 'Bitte definieren Sie einen gÃŒltigen Local Archive Path.', # Translate - New 
+       'A request has been made to change your password in Movable Type. To complete this process click on the link below to select a new password.' => 'Es wurde eine Anfrage zur Änderung Ihres Passwortes in Movable Type gestellt. Bitte klicken Sie auf untenstehenden Link und wÀhlen Sie ein neues Passwort aus um diesen Prozess abzuschließen.',
+       'If you did not request this change, you can safely ignore this email.' => 'Wenn Sie diese Änderung nicht wÃŒnschen können Sie diese E-Mail bedenkenlos ignorieren.',
+       'Passwords do not match' => 'Passwörter stimmen nicht Ìberein.',
+       'Password reset for user \'[_1]\' (user #[_2]) was successful. Recovery link sent to the following address: [_3]' => 'Das ZurÃŒcksetzen des Passwortes fÃŒr Benutzer \'[_1]\' (Benutzer #[_2]) war erfolgreich. Ein Wiederherstellungs-Link wurde an folgende Adresse gesendet',
+       'Updating password recover email template...' => 'Aktualisierung des Passwort-Wiederherstellungs-Templates...',
+       'The email address provided is not unique.  Please enter your username.' => 'Die angegebene E-Mail-Adresse wird bereits genutzt. Bitte geben Sie Ihren Benutzernamen ein.',
+       '_WARNING_PASSWORD_RESET_MULTI' => 'Sie sind dabei Email(s) an ausgewÀhlte Nutzer zu senden um deren Password zurÌck zu setzen. Möchten Sie fortfahren?',
+       "A password reset link has been sent to [_3] for user '[_1]' (user #[_2])." => 'Ein Passwort-Wiederherstellungs-Link fÃŒr den Benutzer \'[_1]\' wurde an [_3] gesendet. (Benutzer #[_2])' 
 );
 

trunk/lib/MT/L10N/en_us.pm

@@ -59 +59 @@
     '_USAGE_PASSWORD_RESET' => 'You can initiate password recovery on behalf of this user. If you choose to do so, an email will be sent to directly to <strong>[_1]</strong> with a randomly generated new password.',
     '_WARNING_PASSWORD_RESET_SINGLE' => 'You are about to reset the password for "[_1]". A new password will be randomly generated and sent directly to their email address ([_2]).  Do you wish to continue?',
-    '_WARNING_PASSWORD_RESET_MULTI' => 'You are about to reset the password for the selected users. New passwords will be randomly generated and sent directly to their email address(es). Do you wish to continue?',
+    '_WARNING_PASSWORD_RESET_MULTI' => 'You are about to send email(s) to allow the selected user(s) to reset their passwords.  Do you wish to continue?',
     '_USAGE_NEW_AUTHOR' => 'From this screen you can create a new user in the system.',
     '_USAGE_NEW_GROUP' => 'From this screen you can create a new group in the system.',

trunk/lib/MT/L10N/es.pm

@@ -5229 +5229 @@
         'Create a Feed Widget' => 'Crear un widget de fuente',
 
+        'A request has been made to change your password in Movable Type. To complete this process click on the link below to select a new password.' => 'Se ha recibido una petición para cambiar su contraseña de Movable Type. Para completar el proceso y seleccionar una nueva contraseña, haga clic en el enlace.', # Translate - New
+        'If you did not request this change, you can safely ignore this email.' => 'Si no solicitó este cambio, ignore este mensaje.', # Translate - New
+        '%f-thumb-%wx%h-%i%x' => '%f-miniatura-%wx%h-%i%x', # Translate - New
+        '[_1] contains an invalid character: [_2]' => '[_1] contiene un caracter no válido: [_2]', # Translate - New
+        'Email address is required.' => 'El correo electrónico es obligatorio.', # Translate - New
+        'User not found' => 'Usuario no encontrado', # Translate - New
+        'Password reset token not found' => 'Token para el reinicio de la contraseña no encontrado', # Translate - New
+        'Email address not found' => 'Dirección de correo no encontrada', # Translate - New
+        'Your request to change your password has expired.' => 'Expiró su solicitud de cambio de contraseña.', # Translate - New
+        'Invalid password reset request' => 'Solicitud de reinicio de contraseña no válida', # Translate - New
+        'Please confirm your new password' => 'Por favor, confirme su nueva contraseña', # Translate - New
+        'Password do not match' => 'La contraseña no coincide', # Translate - New
+        'Invalid [_1] parameter.' => 'Parámetro [_1] no válido', # Translate - New
+        'Blog, BlogID or Template param must be specified.' => 'Debe especificarse el parámetro Blog, BlogID o Template.', # Translate - New
+        'Error saving [_1] record # [_3]: [_2]...' => 'Error guardando registro [_1] # [_3]: [_2]...', # Translate - New
+        'The email address provided is not unique.  Please enter your username.' => 'El correo no es único. Por favor, introduzca el usuario.', # Translate - New
+        'An email with a link to reset your password has been sent to your email address ([_1]).' => 'Se ha enviado a su dirección de correo ([_1]) un correo con el enlace para reiniciar la contraseña', # Translate - New
+        'Choose New Password' => 'Seleccione la nueva contraseña', # Translate - New
+        'You must set Local Archive Path.' => 'Debe indicar la ruta local de archivos.', # Translate - New
+        'You must set a valid Archive URL.' => 'Debe indicar una URL de archivos válida.', # Translate - New
+        'You must set a valid Local Archive Path.' => 'Debe indicar una ruta local de archivos válida.', # Translate - New
+
 );
 

trunk/lib/MT/L10N/fr.pm

@@ -5230 +5230 @@
         'Create a Feed Widget' => 'Créer un widget à partir d\'un flux',
 
+        'A request has been made to change your password in Movable Type. To complete this process click on the link below to select a new password.' => 'Une requête a été faite pour changer votre mot de passe dans Movable Type. Pour terminer cliquez sur le lien ci-dessous pour choisir un nouveau mot de passe.', # Translate - New
+      'If you did not request this change, you can safely ignore this email.' => 'Si vous n\'avez pas demandé ce changement, vous pouvez ignorer cet email.', # Translate - New
+      '%f-thumb-%wx%h-%i%x' => '%f-thumb-%wx%h-%i%x', # Translate - New
+      '[_1] contains an invalid character: [_2]' => '[_1] contient un caractÚre invalide : [_2]', # Translate - New
+      'Email address is required.' => 'Adresse email obligatoire', # Translate - New
+      'User not found' => 'Utilisateur introuvable', # Translate - New
+      'Password reset token not found' => 'Token de remise à zéro du mot de passe introuvable', # Translate - New
+      'Email address not found' => 'Adresse email introuvable', # Translate - New
+      'Your request to change your password has expired.' => 'Votre demande de modification de mot de passe a expirée.', # Translate - New
+      'Invalid password reset request' => 'Requête de modification de mot de passe invalide', # Translate - New
+      'Please confirm your new password' => 'Merci de confirmer votre nouveau mot de passe', # Translate - New
+      'Password do not match' => 'Le mot de passe ne correspond pas', # Translate - New
+      'Invalid [_1] parameter.' => 'ParamÚtre [_1] invalide', # Translate - New
+      'Blog, BlogID or Template param must be specified.' => 'Les paramÚtres Blog, BlogID ou Template doivent être spécifiés.', # Translate - New
+      'Error saving [_1] record # [_3]: [_2]...' => 'Erreur en enregistrant l\'enregistrement [_1] # [_3]: [_2]...', # Translate - New
+      'The email address provided is not unique.  Please enter your username.' => 'Une adresse  email n\'est pas unique. Merci de saisir votre nom de membre.', # Translate - New
+      'An email with a link to reset your password has been sent to your email address ([_1]).' => 'Un email contenant un lien pour réinitialiser votre mot de passe a été envoyé à votre adresse email ([_1]).', # Translate - New
+      'Choose New Password' => 'Choisissez un nouveau mot de passe', # Translate - New
+      'You must set Local Archive Path.' => 'Vous devez renseigner Local Archive Path.', # Translate - New
+      'You must set a valid Archive URL.' => 'Vous devez renseigner une Archive URL valide.', # Translate - New
+      'You must set a valid Local Archive Path.' => 'Vous devez renseigner un Local Archive Path valide.', # Translate - New 
+      'Passwords do not match' => 'Les mots de passe ne correspondent pas', # Translate - New
+      'Password reset for user \'[_1]\' (user #[_2]) was successful. Recovery link sent to the following address: [_3]' => 'Réinitialisation du mot de passe pour l\'utilisateur \'[_1]\' (utilisateur #[_2]) a réussi. Lien envoyé à l\'adresse suivante : [_3]', # Translate - New
+      'Updating password recover email template...' => 'Template de réinitialisation du mot de passe en cours de mise à jour...', # Translate - New
+      'The email address provided is not unique.  Please enter your username.' => 'L\'adresse email fournie n\'est pas unique. Merci de saisir votre nom d\'utilisateur.', # Translate - New
+      '_WARNING_PASSWORD_RESET_MULTI' => 'Vous êtes sur le point d\'envoyer des emails pour permettre aux utilisateurs sélectionnés de réinitialiser leurs mots de passe. Voulez-vous continuer ?',
+      "A password reset link has been sent to [_3] for user '[_1]' (user #[_2])." => 'Un lien de réinitialisation de mot de passe envoyé à [_3] pour utilisateur \'[_1]\' (utilisateur #[_2]).', 
 );
 

trunk/lib/MT/L10N/ja.pm

@@ -403 +403 @@
         '_USAGE_FORGOT_PASSWORD_2' => '以䞋のURLから、新しいパスワヌドを䜿っおMovable Typeにログむンし、すぐにパスワヌドを倉曎しおください。',
         'Mail Footer' => 'メヌルフッタヌ',
+        'A request has been made to change your password in Movable Type. To complete this process click on the link below to select a new password.' => 'パスワヌドをリセットしようずしおいたす。以䞋のリンクをクリックしお、新しいパスワヌドを蚭定しおください。',
+        'If you did not request this change, you can safely ignore this email.' => 'このメヌルに心圓たりがないずきは、䜕もせずに無芖しおください。',
 
 ## default_templates/main_index.mtml
@@ -1024 +1026 @@
 ## lib/MT/CMS/Tools.pm
         'Password Recovery' => 'パスワヌドの再蚭定',
+        'Email Address is required for password recovery.' => 'メヌルアドレスがå¿
+芁です。',
+        'User not found' => 'ナヌザヌが芋぀かりたせんでした。',
+        'Error sending mail ([_1]); please fix the problem, then try again to recover your password.' => 'メヌルを送信できたせんでした。問題を解決しおから再床パスワヌドの再蚭定を行っおください: [_1]',
+        'Password reset token not found' => 'パスワヌドをリセットするためのトヌクンが芋぀かりたせんでした。',
+        'Email address not found' => 'メヌルアドレスが芋぀かりたせんでした。',
+        'Your request to change your password has expired.' => 'パスワヌドのリセットを始めおから決められた時間を経過しおしたいたした。',
+        'Invalid password reset request' => '䞍正なリク゚ストです。',
+        'Please confirm your new password' => '新しいパスワヌドを確認しおください。',
+        'Passwords do not match' => 'パスワヌドが䞀臎しおいたせん。',
         'That action ([_1]) is apparently not implemented!' => 'アクション([_1])が実è£
 されおいたせん。',
@@ -1074 +1086 @@
         'Invalid attempt to recover password (used hint \'[_1]\')' => 'パスワヌドの再蚭定に倱敗したした(フレヌズ: [_1])。',
         'User does not have email address' => 'ナヌザヌのメヌルアドレスがありたせん。',
-        'Password was reset for user \'[_1]\' (user #[_2]). Password was sent to the following address: [_3]' => 'ナヌザヌ\'[_1]\'(ID:[_2])のパスワヌドがリセットされ、メヌルアドレス([_3])あおに通知されたした。',
+        'A password reset link has been sent to [_3] for user  \'[_1]\' (user #[_2]).' => 'パスワヌド再蚭定甚のリンクがナヌザヌ\'[_1]\'(ID:[_2])のメヌルアドレス([_3])あおに通知されたした。',
         'Error sending mail ([_1]); please fix the problem, then try again to recover your password.' => 'メヌルを送信できたせんでした。問題を解決しおから再床パスワヌドの再蚭定を行っおください: [_1]',
         'Some objects were not restored because their parent objects were not restored.  Detailed information is in the <a href="javascript:void(0);" onclick="closeDialog(\'[_1]\');">activity log</a>.' => '芪ずなるオブゞェクトがないため埩å
@@ -1935 +1947 @@
 の暩限を埩å
 ƒã—おいたす...',
+        'Updating password recover email template...' => 'パスワヌドの再蚭定メヌル テンプレヌトを曎新しおいたす...',
 
 ## lib/MT/PluginData.pm
@@ -2059 +2072 @@
 
 ## lib/MT/App/CMS.pm
-        '_WARNING_PASSWORD_RESET_MULTI' => '遞択されたナヌザヌのパスワヌドを再蚭定しようずしおいたす。パスワヌドはランダムに生成され、盎接それぞれのメヌルアドレスに送られたす。
+        '_WARNING_PASSWORD_RESET_MULTI' => '遞択されたナヌザヌのパスワヌドを再蚭定しようずしおいたす。パスワヌド再蚭定甚のリンクが盎接それぞれのメヌルアドレスに送られたす。
 
 実行したすか?',
@@ -2235 +2248 @@
 
 ## lib/MT/App/Search.pm
+        'Invalid [_1] parameter.' => '[_1]パラメヌタが䞍正です。',
         'Invalid type: [_1]' => '䞍正なtypeです: [_1]',
         'Search: failed storing results in cache.  [_1] is not available: [_2]' => '結果をキャッシュできたせんでした。[_1]を利甚できたせん: [_2]',
@@ -4615 +4629 @@
         'Are you sure you wish to continue?' => '続けおもよろしいですか?',
 
+## tmpl/cms/dialog/new_password.tmpl
+        'Choose New Password' => '新しいパスワヌドを遞択',
+
 ## tmpl/cms/dialog/refresh_templates.tmpl
         'Refresh Template Set' => 'テンプレヌトセットの初期化',
@@ -4654 +4671 @@
 
 ## tmpl/cms/dialog/recover.tmpl
+        'The email address provided is not unique.  Please enter your username.' => '同じメヌルアドレスを持っおいるナヌザヌがいたす。ナヌザヌ名をå
+¥åŠ›ã—おください。',
+        'An email with a link to reset your password has been sent to your email address ([_1]).' => '「[_1]」にパスワヌドをリセットするためのリンクを含むメヌルを送信したした。',
         'Your password has been changed, and the new password has been sent to your email address ([_1]).' => 'パスワヌドを倉曎したした。新しいパスワヌドはメヌルアドレス([_1])に送信されたす。',
         'Recover (s)' => '再蚭定 (s)',
         'Recover' => '再蚭定',
         'Go Back (x)' => '戻る (x)',
+        'Go Back' => '戻る',
 
 ## tmpl/cms/dialog/create_association.tmpl

trunk/lib/MT/L10N/nl.pm

@@ -5228 +5228 @@
         'Upgrade to Feeds.App' => 'Upgraden naar Feeds.App',
         'Create a Feed Widget' => 'Feedwidget aanmaken',
-
+        'A request has been made to change your password in Movable Type. To complete this process click on the link below to select a new password.' => 'Er is een verzoek ingediend om uw wachtwoord aan te passen in Movable Type.  Gelieve dit te bevestigen door op onderstaande link te klikken om een nieuw wachtwoord te kiezen.', # Translate - New
+        'If you did not request this change, you can safely ignore this email.' => 'Als u deze wijziging niet heeft aangevraagd, kunt u deze e-mail gerust negeren.', # Translate - New
+        '%f-thumb-%wx%h-%i%x' => '%f-thumb-%wx%h-%i%x', # Translate - New
+        '[_1] contains an invalid character: [_2]' => '[_1] bevat een ongeldig karakter: [_2]', # Translate - New
+        'Email address is required.' => 'E-mail adres is vereist', # Translate - New
+        'User not found' => 'Gebruiker niet gevonden', # Translate - New
+        'Password reset token not found' => 'Wachtwoord reset token niet gevonden', # Translate - New
+        'Email address not found' => 'E-mail adres niet gevonden', # Translate - New
+        'Your request to change your password has expired.' => 'Uw verzoek om uw wachtwoord aan te passen is verlopen', # Translate - New
+        'Invalid password reset request' => 'Ongeldig verzoek om wachtwoord te veranderen', # Translate - New
+        'Please confirm your new password' => 'Gelieve uw nieuwe wachtwoord te bevestigen', # Translate - New
+        'Password do not match' => 'Wachtwoorden komen niet overeen', # Translate - New
+        'Invalid [_1] parameter.' => 'Ongeldige [_1] parameter', # Translate - New
+        'Blog, BlogID or Template param must be specified.' => 'Blog, BlogID of Template parameter moet opgegeven zijn.', # Translate - New
+        'Error saving [_1] record # [_3]: [_2]...' => 'Fout bij opslaan [_1] record # [_3]: [_2]...', # Translate - New
+        'The email address provided is not unique.  Please enter your username.' => 'Een e-mail is niet uniek.  Gelieve uw gebruikersnaam op te geven.', # Translate - New
+        'An email with a link to reset your password has been sent to your email address ([_1]).' => 'Er is een e-mail met een link om uw wachtwoord aan te passen doorgestuurd naar uw e-mail adres ([_1]).', # Translate - New
+        'Choose New Password' => 'Nieuw wachtwoord kiezen', # Translate - New
+        'You must set Local Archive Path.' => 'U moet een lokaal archiefpad instellen.', # Translate - New
+        'You must set a valid Archive URL.' => 'U moet een geldige archief URL instellen.', # Translate - New
+        'You must set a valid Local Archive Path.' => 'U moet een geldig lokaal archiefpad instellen.', # Translate - New
+        'Passwords do not match' => 'Wachtwoorden komen niet overeen', # Translate - New
+        'Password reset for user \'[_1]\' (user #[_2]) was successful. Recovery link sent to the following address: [_3]' => 'Wachtwoord reset voor gebruiker \'[_1]\' (gebruiker #[_2]) geslaagd. Reset link verstuurd naar volgend adres: [_3]', # Translate - New
+        'Updating password recover email template...' => 'Sjabloon wachtwoordrecuperatie e-mail wordt bijgewerkt...', # Translate - New
+        'The email address provided is not unique.  Please enter your username.' => 'Het opgegeven e-mail adres is niet uniek.  Gelieve uw gebruikersnaam op te geven.', # Translate - New
+        '_WARNING_PASSWORD_RESET_MULTI' => 'U staat op het punt e-mails te versturen waarmee de geselecteerde gebruikers hun wachtwoord kunnen aanpassen. Bent u zeker?',
+        "A password reset link has been sent to [_3] for user '[_1]' (user #[_2])." => 'Een link om het wachtwoord opnieuw in te stellen is verzonden naar [_3] voor gebruiker \'[_1]\' (gebruiker #[_2]).', 
 );
 

trunk/lib/MT/Upgrade/v4.pm

@@ -463 +463 @@
             },
         },
+        'core_update_password_recover_template' => {
+            version_limit => 4.0068,
+            code => \&core_update_password_recover_template,
+        },
     };
 }
@@ -1217 +1221 @@
 }
 
+sub core_update_password_recover_template {
+    my $self = shift;
+    $self->progress($self->translate_escape("Updating password recover email template..."));
+    require MT::DefaultTemplates;
+    my $recover_tmpl = MT::DefaultTemplates->load ({ identifier => 'recover-password' });
+    my $recover_text = MT->instance->translate_templatized($recover_tmpl->{text});
+    require MT::Template;
+    my @tmpls = MT::Template->load ({ type => 'email', identifier => 'recover-password' });
+    for my $tmpl (@tmpls) {
+        my $backup = $tmpl->clone;
+        delete $backup->{column_values}
+          ->{id};    # make sure we don't overwrite original
+        delete $backup->{changed_cols}->{id};
+        $backup->name(
+            $backup->name . ' (Backup during upgrade to version 4.24)' );
+        $backup->type('backup');
+        $backup->identifier(undef);
+        $backup->save;
+
+        $tmpl->text ($recover_text);
+        $tmpl->save;
+    }
+}
+
 1;

trunk/tmpl/cms/dialog/recover.tmpl

@@ -1 +1 @@
 <mt:setvarblock name="page_title"><__trans phrase="Password Recovery"></mt:setvarblock>
 <mt:setvar name="complete" value="1">
-<mt:include name="include/chromeless_header.tmpl">
+<mt:include name="cms/include/chromeless_header.tmpl">
 
+<mt:if name="error">
+        <mtapp:statusmsg
+            id="error"
+            class="error">
+            <mt:var name="error">
+        </mtapp:statusmsg>
+</mt:if>
+
+<mt:If name="not_unique_email">
+        <mtapp:statusmsg
+            id="not-unique-email"
+            class="alert">
+            <__trans phrase="The email address provided is not unique.  Please enter your username.">
+        </mtapp:statusmsg>
+</mt:if>
 
 <mt:if name="recovered">
-<p><__trans phrase="Your password has been changed, and the new password has been sent to your email address ([_1])." params="<mt:var name="email" escape="html">"></p>
+<p><__trans phrase="An email with a link to reset your password has been sent to your email address ([_1]).", params="<mt:var name="email" escape="html">"></p>
 
 <div class="actions-bar">
     <div class="actions-bar-inner pkg actions">
+        <mt:If name="return_to">
         <a
-            href="<$mt:var name="mt_url"$>"
+            href="<$mt:var name="return_to" escape="html" $>"
+            accesskey="x"
+            title="<__trans phrase="Go Back (x)">"
+            class="primary-button"
+            ><__trans phrase="Go Back"></a>
+        <mt:Else>
+        <a
+            href="<$mt:var name="script_url"$>"
             accesskey="s"
             title="<__trans phrase="Sign in to Movable Type (s)">"
             class="primary-button"
             ><__trans phrase="Sign in to Movable Type"></a>
+        </a>
+        </mt:If>
     </div>
 </div>
@@ -22 +47 @@
     <form method="post" action="<mt:var name="script_url">">
     <input type="hidden" name="__mode" value="recover" />
+    <input type="hidden" name="return_to" value="<mt:Var name="return_to" escape="html">" />
 <fieldset>
 
+<mtapp:setting
+    id="email"
+    label="<__trans phrase="Email Address">"
+    label_class="top-label">
+    <input type="text" name="email" id="email" class="ti" value="<mt:var name="email">" />
+</mtapp:setting>
+
+<mt:If name="not_unique_email">
 <mtapp:setting
     id="name"
     label="<__trans phrase="Username">"
     label_class="top-label">
-    <input type="text" name="name" id="name" class="ti" />
+    <input type="text" name="name" id="name" class="ti" value="<mt:var name="name">" />
 </mtapp:setting>
-
-<mtapp:setting
-    id="hint"
-    label="<__trans phrase="Password recovery word/phrase">"
-    label_class="top-label">
-    <input type="text" name="hint" id="hint" class="ti" autocomplete="0" />
-</mtapp:setting>
+</mt:If>
 
 <div class="actions-bar">
@@ -59 +87 @@
 </mt:if>
 
-
-<mt:include name="include/chromeless_footer.tmpl">
+<mt:include name="cms/include/chromeless_footer.tmpl">

trunk/tmpl/comment/login.tmpl

@@ -83 +83 @@
     </mtapp:setting>
     <mt:if name="can_recover_password">
-    <div class="right"><a href="<mt:var name="mt_url">?__mode=start_recover"><__trans phrase="Forgot your password?"></a></div>
+    <div class="right"><a href="<mt:var name="script_url">?__mode=start_recover<mt:if name="return_url">&return_to=<mt:var name="return_url" escape="url"></mt:if>"><__trans phrase="Forgot your password?"></a></div>
     </mt:if>
     <p><label><__trans phrase="Remember me?"></label> <input type="checkbox" name="remember" value="1" accesskey="r" class="cb" /></p>