lint

diff --git a/include/items.php b/include/items.php
index 133d1299b37b9469febf80eab578c8ca8ccee803..483540f46a5c544ddf0353ad3369a88d8637bd59 100644 (file)
--- a/include/items.php
+++ b/include/items.php
@@ -1061,7 +1061,7 @@ function new_follower($importer,$contact,$datarray,$item) {
                                $res = mail($r[0]['email'], 
                                        t("You have a new follower at ") . $a->config['sitename'],
                                        $email,
-                                       'From: ' . t('Administrator') . '@' . $_SERVER[SERVER_NAME] );
+                                       'From: ' . t('Administrator') . '@' . $_SERVER['SERVER_NAME'] );
                        
                        }
                }

diff --git a/mod/dfrn_request.php b/mod/dfrn_request.php
index a7296fec03cf729249a1d9119bb056c29f09c3dd..8c259f231a2627d94642b52c00d8220c73d19600 100644 (file)
--- a/mod/dfrn_request.php
+++ b/mod/dfrn_request.php
@@ -441,7 +441,7 @@ function dfrn_request_content(&$a) {
                                        $res = mail($r[0]['email'], 
                                                t("Introduction received at ") . $a->config['sitename'],
                                                $email,
-                                               'From: ' . t('Administrator') . '@' . $_SERVER[SERVER_NAME] );
+                                               'From: ' . t('Administrator') . '@' . $_SERVER['SERVER_NAME'] );
                                        // This is a redundant notification - no point throwing errors if it fails.
                                }
                                if($auto_confirm) {

diff --git a/mod/lostpass.php b/mod/lostpass.php
index 0b5dc1376bb7ca17dba16ecde71243c2926d1455..30bdc059c3f8925aa8c5c6b607cd4652daa5038d 100644 (file)
--- a/mod/lostpass.php
+++ b/mod/lostpass.php
@@ -35,9 +35,8 @@ function lostpass_post(&$a) {
                        '$reset_link' => $a->get_baseurl() . '/lostpass?verify=' . $new_password
        ));
 
-       $res = mail($email,"Password reset requested at {$a->config['sitename']}",$email_tpl,"From: Administrator@{$_SERVER[SERVER_NAME]}");
-
-       
+       $res = mail($email, t('Password reset requested at ') . $a->config['sitename'],
+                       $email_tpl, 'From: ' . t('Administrator') . '@' . $_SERVER[SERVER_NAME]);
 
        goaway($a->get_baseurl());
 }

diff --git a/mod/register.php b/mod/register.php
index 5fdb629b520938488c62c3addc15cba9e2d77993..99823f45138bab5d94b694f7040be7d53045334a 100644 (file)
--- a/mod/register.php
+++ b/mod/register.php
@@ -195,7 +195,7 @@ function register_post(&$a) {
                                '$uid' => $newuid ));
 
                $res = mail($email, t('Registration details for ') . $a->config['sitename'],
-                       $email_tpl, 'From: ' . t('Administrator@') . $_SERVER['SERVER_NAME']);
+                       $email_tpl, 'From: ' . t('Administrator') . '@' . $_SERVER['SERVER_NAME']);
 
 
                if($res) {
@@ -232,7 +232,7 @@ function register_post(&$a) {
                 ));
 
                $res = mail($a->config['admin_email'], t('Registration request at ') . $a->config['sitename'],
-                       $email_tpl,'From: ' .  t('Administrator@') . $_SERVER[SERVER_NAME]);
+                       $email_tpl,'From: ' .  t('Administrator') . '@' . $_SERVER['SERVER_NAME']);
 
                if($res) {
                        notice( t('Your registration is pending approval by the site owner.') . EOL ) ;

diff --git a/mod/regmod.php b/mod/regmod.php
index 932b109ebca32ea0762b0ddc3477044106e96fb3..772351ac55ab477bf4af2bafb1007be2a6f0512e 100644 (file)
--- a/mod/regmod.php
+++ b/mod/regmod.php
@@ -15,7 +15,7 @@ function regmod_content(&$a) {
        if($a->argc != 3)
                killme();
 
-       $cmd = $a->argv[1];
+       $cmd  = $a->argv[1];
        $hash = $a->argv[2];
 
 
@@ -76,7 +76,7 @@ function regmod_content(&$a) {
                ));
 
                $res = mail($user[0]['email'], t('Registration details for '). $a->config['sitename'],
-                       $email_tpl,'From: ' . t('Administrator@') . $_SERVER[SERVER_NAME] );
+                       $email_tpl,'From: ' . t('Administrator') . '@' . $_SERVER['SERVER_NAME'] );
 
                if($res) {
                        notice( t('Account approved.') . EOL );