From 4ee5f0d9dd40b3baa2e27889a579dc7852cbfd6c Mon Sep 17 00:00:00 2001 From: Antonio Gallo Date: Tue, 31 Jul 2012 10:48:47 +0000 Subject: improved the way e-mails are sent --- h-source/Application/Include/params.php | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/h-source/Application/Include/params.php b/h-source/Application/Include/params.php index fa2aef2..f09d647 100644 --- a/h-source/Application/Include/params.php +++ b/h-source/Application/Include/params.php @@ -24,6 +24,8 @@ class Website { static public $generalMail = ""; + static public $fromEmail = "noreply@h-node.org"; + static public $generalName = "h-node.org"; static public $projectName = "h-node"; @@ -69,7 +71,7 @@ class Account $mess = gtext("Hello,\n\nyou have registered an account at")." $siteName ".gtext("with the following data:\nusername: ").$clean['username']."\n\n".gtext("in order to confirm the registration of the new account please follow the link below")."\nhttp://".DOMAIN_NAME."/users/confirm/".Lang::$current."/".$clean['id_user']."/".$clean['token']."\n\n".gtext("If you don't want to confirm the account registration\nthen wait one hour and your username and e-mail will be deleted from the database")."\n\n".gtext("If you received this e-mail for error, please simply disregard this message"); - $message = Swift_Message::newInstance()->setSubject('['.Website::$projectName.'] '.gtext("account registration"))->setFrom(array($siteMail => $siteName))->setTo(array($e_mail))->setBody($mess); + $message = Swift_Message::newInstance()->setSubject('['.Website::$projectName.'] '.gtext("account registration"))->setFrom(array(Website::$fromEmail => $siteName))->setTo(array($e_mail))->setBody($mess); //Create the Transport $transport = self::getTransport(); @@ -104,7 +106,7 @@ class Account $mess = "Hello,\n\nyou have requested a new password for your account at $siteName.\nYour username is:\n".$clean['username']."\n\nin order to obtain a new password for your account follow the link below\nhttp://".DOMAIN_NAME."/users/change/".Lang::$current."/".$clean['id_user']."/".$clean['token']."\n\nIf you don't want to change the password then disregard this mail\n"; - $message = Swift_Message::newInstance()->setSubject('['.Website::$projectName.'] request a new password')->setFrom(array($siteMail => $siteName))->setTo(array($e_mail))->setBody($mess); + $message = Swift_Message::newInstance()->setSubject('['.Website::$projectName.'] request a new password')->setFrom(array(Website::$fromEmail => $siteName))->setTo(array($e_mail))->setBody($mess); //Create the Transport $transport = self::getTransport(); @@ -138,7 +140,7 @@ class Account $mess = "Hello,\n\nyou have requested a new password for your account to $siteName.\nYour username is:\n".$clean['username']."\n\nYour new password is:\n".$clean['password']."\n"; - $message = Swift_Message::newInstance()->setSubject('['.Website::$projectName.'] get your new password ')->setFrom(array($siteMail => $siteName))->setTo(array($e_mail))->setBody($mess); + $message = Swift_Message::newInstance()->setSubject('['.Website::$projectName.'] get your new password ')->setFrom(array(Website::$fromEmail => $siteName))->setTo(array($e_mail))->setBody($mess); //Create the Transport $transport = self::getTransport(); @@ -174,7 +176,7 @@ class Account $mess = "$who has added a message to the talk page of a device you have contributed to maintain at $siteName\n\nThe whole conversation is here:\n\n".$urls['urlTalk']."\n\nThe device page is here:\n\n".$urls['urlView']."\n\nBest regards\nthe ".Website::$projectName." team\n\nP.S: you can disable the mail notifications in the profile page of your control panel"; - $message = Swift_Message::newInstance()->setSubject("[".Website::$projectName."] $who sent a notice to your attention")->setFrom(array($siteMail => $siteName))->setTo($e_mails)->setBody($mess); + $message = Swift_Message::newInstance()->setSubject("[".Website::$projectName."] $who sent a notice to your attention")->setFrom(array(Website::$fromEmail => $siteName))->setTo($e_mails)->setBody($mess); //Create the Transport $transport = self::getTransport(); @@ -203,7 +205,7 @@ class Account $mess = "$who has added a message to the talk page of a wiki page you have contributed to maintain at $siteName\n\nThe whole conversation is here:\n\n".$talkUrl."\n\nThe wiki page is here:\n\n".$pageUrl."\n\nBest regards\nthe ".Website::$projectName." team\n\nP.S: you can disable the mail notifications in the profile page of your control panel"; - $message = Swift_Message::newInstance()->setSubject("[".Website::$projectName."] $who sent a notice to your attention")->setFrom(array($siteMail => $siteName))->setTo($e_mails)->setBody($mess); + $message = Swift_Message::newInstance()->setSubject("[".Website::$projectName."] $who sent a notice to your attention")->setFrom(array(Website::$fromEmail => $siteName))->setTo($e_mails)->setBody($mess); //Create the Transport $transport = self::getTransport(); -- cgit v1.2.3