com web/master: s/SVN/VCS/ and modify the approval subject to match the request: entry/svn-account.php manage/users.php

Commit: e989df7d0608db78e148b1a9d5c4b0a01bd91ba8 Author: Hannes Magnusson <bjori@10gen.com> Thu, 5 Jul 2012 19:39:26 +0100 Parents: c063b4270b891cf7dc2aab4cfe190d4fe3a32c65 Branches: master Link: http://git.php.net/?p=web/master.git;a=commitdiff;h=e989df7d0608db78e148b1a9d5c4b0a01bd91ba8 Log: s/SVN/VCS/ and modify the approval subject to match the request Changed paths: M entry/svn-account.php M manage/users.php Diff: diff --git a/entry/svn-account.php b/entry/svn-account.php index b178c8a..d19550a 100644 --- a/entry/svn-account.php +++ b/entry/svn-account.php @@ -93,7 +93,7 @@ if (@mysql_query($query)) { // The PEAR guys don't want these requests to their -dev@ list, only -group@ if ($group != "pear") { - mail($mailto,"SVN Account Request: $username",$msg,"From: $from\r\nMessage-ID: <cvs-account-$new_id@php.net>", "-fnoreply@php.net"); + mail($mailto,"VCS Account Request: $username",$msg,"From: $from\r\nMessage-ID: <cvs-account-$new_id@php.net>", "-fnoreply@php.net"); } $msg .= "\n-- \n"; @@ -101,14 +101,14 @@ if (@mysql_query($query)) { $msg .= "reject: https://master.php.net/manage/users.php?action=remove&id=$new_id\n"; $msg .= "view: https://master.php.net/manage/users.php?id=$new_id\n"; - mail($failto,"SVN Account Request: $username",$msg,"From: $from\r\nMessage-ID: <cvs-account-$new_id-admin@php.net>", "-fnoreply@php.net"); + mail($failto,"VCS Account Request: $username",$msg,"From: $from\r\nMessage-ID: <cvs-account-$new_id-admin@php.net>", "-fnoreply@php.net"); } else { - mail($failto,"SVN Account Request: $username", + mail($failto,"VCS Account Request: $username", "Failed to insert into database: ".mysql_error()."\n\n". "Full name: $name\n". "Email: $email\n". "ID: $username\n". "Password: $cvspasswd\n". "Purpose: $note", - "From: \"SVN Account Request\" <$email>"); + "From: \"VCS Account Request\" <$email>"); } diff --git a/manage/users.php b/manage/users.php index 943e9ea..4dda49a 100644 --- a/manage/users.php +++ b/manage/users.php @@ -76,7 +76,7 @@ Welcome to the PHP development team! If you encounter any problems with your VCS account, feel free to send us a note at group@php.net."; mail($userinfo['email'],"VCS Account Request: $userinfo[username]",$message,"From: PHP Group <group@php.net>", "-fnoreply@php.net"); - mail($mailto . ($cc ? ",$cc" : ""),"VCS Account Request: $userinfo[username] approved by $user","Approved $userinfo[username]","From: PHP Group <group@php.net>\nIn-Reply-To: <cvs-account-$id-admin@php.net>", "-fnoreply@php.net"); + mail($mailto . ($cc ? ",$cc" : ""),"VCS Account Request: $userinfo[username]","$user approved $userinfo[username]","From: PHP Group <group@php.net>\nIn-Reply-To: <cvs-account-$id-admin@php.net>", "-fnoreply@php.net"); if (!$noclose) { echo '<script language="javascript">window.close();</script>'; exit;