com web/master: make the Message-ID consistent between the approve and the reject mails, also make the subject and message consistent:
manage/users.php
| From: | Ferenc Kovacs | Date: | Mon, 28 Jan 2013 14:08:34 +0000 |
| Subject: | com web/master: make the Message-ID consistent between the approve and the reject mails, also make the subject and message consistent: manage/users.php |
||
| Groups: | php.webmaster | ||
| Request: | Send a blank email to php-webmaster+get-15386@lists.php.net to get a copy of this message | ||
Commit: 9dc11fa8d8fca56ea8f29bd65e083b47e7f77734
Author: Ferenc Kovacs <tyra3l@gmail.com> Mon, 28 Jan 2013 15:08:34 +0100
Parents: 24cdb723f439eda5db0f76f1aa9c638cccd56d03
Branches: master
Link: http://git.php.net/?p=web/master.git;a=commitdiff;h=9dc11fa8d8fca56ea8f29bd65e083b47e7f77734
Log:
make the Message-ID consistent between the approve and the reject mails, also make the subject and
message consistent
Changed paths:
M manage/users.php
Diff:
diff --git a/manage/users.php b/manage/users.php
index 62ef6db..a7af8ea 100644
--- a/manage/users.php
+++ b/manage/users.php
@@ -84,7 +84,7 @@ with your VCS account, feel free to send us a note at $mailtext.
";
mail($userinfo['email'],"VCS Account Request:
$userinfo[username]",$message,"From: PHP Group <group@php.net>",
"-fnoreply@php.net");
- mail($mailto . ($cc ? ",$cc" : ""),"Re: VCS Account Request:
$userinfo[username]","$user approved $userinfo[username] account request
\o/","From: PHP Group <group@php.net>\nIn-Reply-To:
<cvs-account-$id@php.net>", "-fnoreply@php..net");
+ mail($mailto . ($cc ? ",$cc" : ""),"VCS Account Approved:
$userinfo[username] approved by $user","Approved $userinfo[username] \o/","From:
PHP Group <group@php.net>\nIn-Reply-To: <cvs-account-$id@php.net>",
"-fnoreply@php.net");
if (!$noclose) {
echo '<script
language="javascript">window.close();</script>';
exit;
@@ -132,7 +132,7 @@ of existing PHP developers through patches, and have demonstrated
the ability to work with others.
";
mail($userinfo['email'],"VCS Account Request:
$userinfo[username]",$message,"From: PHP Group <group@php.net>",
"-fnoreply@php.net");
- mail($mailto . ($cc ? ",$cc" : ""),$userinfo['cvsaccess'] ?
"VCS Account Deleted: $userinfo[username] deleted by $user" : "VCS Account Rejected:
$userinfo[username] rejected by $user","Nuked $userinfo[username]","From: PHP
Group <group@php.net>\nIn-Reply-To: <cvs-account-$id-admin@php.net>",
"-fnoreply@php.net");
+ mail($mailto . ($cc ? ",$cc" : ""),$userinfo['cvsaccess'] ?
"VCS Account Deleted: $userinfo[username] deleted by $user" : "VCS Account Rejected:
$userinfo[username] rejected by $user","Nuked $userinfo[username]","From: PHP
Group <group@php.net>\nIn-Reply-To: <cvs-account-$id@php.net>",
"-fnoreply@php.net");
db_query("DELETE FROM users_note WHERE userid=$id");
db_query("DELETE FROM users_profile WHERE userid=$id");
if (!$noclose) {