Changeset 3358:8c3a4eda8e2b for admin/auth.php

Timestamp:

10/07/16 08:07:27 (9 years ago)

Author:

franck <carnet.franck.paul@…>

Branch:

2.10

Message:

Autant être cohérent :-)

File:

• admin/auth.php (modified) (3 diffs)

admin/auth.php

@@ -88 +88 @@
           $recover_key = $core->auth->setRecoverKey($user_id,$user_email);
 
-          $subject = mail::B64Header('DotClear '.__('Password reset'));
+          $subject = mail::B64Header('Dotclear '.__('Password reset'));
           $message =
           __('Someone has requested to reset the password for the following site and username.')."\n\n".
@@ -113 +113 @@
           $recover_res = $core->auth->recoverUserPassword($akey);
 
-          $subject = mb_encode_mimeheader('DotClear '.__('Your new password'),'UTF-8','B');
+          $subject = mb_encode_mimeheader('Dotclear '.__('Your new password'),'UTF-8','B');
           $message =
           __('Username:').' '.$recover_res['user_id']."\n".
@@ -119 +119 @@
           preg_replace('/\?(.*)$/','',$page_url);
 
-          $headers[] = 'From: dotclear@'.$_SERVER['HTTP_HOST'];
+          $headers[] = 'From: '.(defined('DC_ADMIN_MAILFROM') && DC_ADMIN_MAILFROM ? DC_ADMIN_MAILFROM : 'dotclear@local');
           $headers[] = 'Content-Type: text/plain; charset=UTF-8;';