friendica
/
friendica
mirror of https://github.com/friendica/friendica
6
0
Fork 1
Code Issues Packages Projects Releases 1 Wiki Activity

lint

This commit is contained in:
Friendika 2010-11-07 17:29:30 -08:00
parent d825db3649
commit 9e35fb26f7
5 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/items.php
View File

@ -1061,7 +1061,7 @@ function new_follower($importer,$contact,$datarray,$item) {
$res = mail($r[0]['email'], $res = mail($r[0]['email'],
t("You have a new follower at ") . $a->config['sitename'], t("You have a new follower at ") . $a->config['sitename'],
$email, $email,
'From: ' . t('Administrator') . '@' . $_SERVER[SERVER_NAME] ); 'From: ' . t('Administrator') . '@' . $_SERVER['SERVER_NAME'] );
} }
} }

2
mod/dfrn_request.php
View File

@ -441,7 +441,7 @@ function dfrn_request_content(&$a) {
$res = mail($r[0]['email'], $res = mail($r[0]['email'],
t("Introduction received at ") . $a->config['sitename'], t("Introduction received at ") . $a->config['sitename'],
$email, $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. // This is a redundant notification - no point throwing errors if it fails.
} }
if($auto_confirm) { if($auto_confirm) {

5
mod/lostpass.php
View File

@ -35,9 +35,8 @@ function lostpass_post(&$a) {
'$reset_link' => $a->get_baseurl() . '/lostpass?verify=' . $new_password '$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()); goaway($a->get_baseurl());
} }

4
mod/register.php
View File

@ -195,7 +195,7 @@ function register_post(&$a) {
'$uid' => $newuid )); '$uid' => $newuid ));
$res = mail($email, t('Registration details for ') . $a->config['sitename'], $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) { if($res) {
@ -232,7 +232,7 @@ function register_post(&$a) {
)); ));
$res = mail($a->config['admin_email'], t('Registration request at ') . $a->config['sitename'], $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) { if($res) {
notice( t('Your registration is pending approval by the site owner.') . EOL ) ; notice( t('Your registration is pending approval by the site owner.') . EOL ) ;

4
mod/regmod.php
View File

@ -15,7 +15,7 @@ function regmod_content(&$a) {
if($a->argc != 3) if($a->argc != 3)
killme(); killme();
$cmd = $a->argv[1]; $cmd = $a->argv[1];
$hash = $a->argv[2]; $hash = $a->argv[2];
@ -76,7 +76,7 @@ function regmod_content(&$a) {
)); ));
$res = mail($user[0]['email'], t('Registration details for '). $a->config['sitename'], $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) { if($res) {
notice( t('Account approved.') . EOL ); notice( t('Account approved.') . EOL );