svn: /web/php-bugs/trunk/include/ functions.php trusted-devs.php
| From: | Felipe Pena | Date: | Sat, 02 Apr 2011 17:55:18 +0000 |
| Subject: | svn: /web/php-bugs/trunk/include/ functions.php trusted-devs.php | ||
| Groups: | php.webmaster | ||
| Request: | Send a blank email to php-webmaster+get-10797@lists.php.net to get a copy of this message | ||
felipe Sat, 02 Apr 2011 17:55:18 +0000
Revision: http://svn.php.net/viewvc?view=revision&revision=309899
Log:
- Let try to send the sec related mails via Bcc
Changed paths:
U web/php-bugs/trunk/include/functions.php
U web/php-bugs/trunk/include/trusted-devs.php
Modified: web/php-bugs/trunk/include/functions.php
===================================================================
--- web/php-bugs/trunk/include/functions.php 2011-04-02 17:38:08 UTC (rev 309898)
+++ web/php-bugs/trunk/include/functions.php 2011-04-02 17:55:18 UTC (rev 309899)
@@ -1015,34 +1015,22 @@
$tmp[$field] = strtok($tmp[$field], "\r\n");
}
- if ($mailto == 'security@php.net') {
- // Send the mail to security@php.net
- bugs_mail(
- $mailto,
- "{$subj}: {$sdesc}",
- $dev_text,
- "From: {$from}\n" .
- "X-PHP-Bug: {$bug['id']}\n" .
- "In-Reply-To: <bug-{$bug['id']}@{$site_url}>"
- );
- } else {
- // but we go ahead and let the default sender get used for the list
- bugs_mail(
- $mailto,
- "{$subj}: {$sdesc}",
- $dev_text,
- "From: {$from}\n".
- "X-PHP-Bug: {$bug['id']}\n" .
- "X-PHP-Site: {$siteBig}\n" .
- "X-PHP-Type: {$tmp['bug_type']}\n" .
- "X-PHP-Version: {$tmp['php_version']}\n" .
- "X-PHP-Category: {$tmp['package_name']}\n" .
- "X-PHP-OS: {$tmp['php_os']}\n" .
- "X-PHP-Status: {$tmp['new_status']}\n" .
- "X-PHP-Old-Status: {$tmp['old_status']}\n" .
- "In-Reply-To: <bug-{$bug['id']}@{$site_url}>"
- );
- }
+ // but we go ahead and let the default sender get used for the list
+ bugs_mail(
+ $mailto,
+ "{$subj}: {$sdesc}",
+ $dev_text,
+ "From: {$from}\n".
+ "X-PHP-Bug: {$bug['id']}\n" .
+ "X-PHP-Site: {$siteBig}\n" .
+ "X-PHP-Type: {$tmp['bug_type']}\n" .
+ "X-PHP-Version: {$tmp['php_version']}\n" .
+ "X-PHP-Category: {$tmp['package_name']}\n" .
+ "X-PHP-OS: {$tmp['php_os']}\n" .
+ "X-PHP-Status: {$tmp['new_status']}\n" .
+ "X-PHP-Old-Status: {$tmp['old_status']}\n" .
+ "In-Reply-To: <bug-{$bug['id']}@{$site_url}>"
+ );
}
/* if a developer assigns someone else, let that other person know about it */
@@ -1273,7 +1261,7 @@
*/
function get_package_mail($package_name, $bug_id = false, $bug_type = 'Bug')
{
- global $dbh, $bugEmail, $docBugEmail, $secBugEmail, $security_distro_people;
+ global $dbh, $bugEmail, $docBugEmail, $secBugEmail, $security_developers;
$to = array();
@@ -1320,7 +1308,7 @@
// Add the security distro people
if ($bug_type == 'Security') {
- $bcc = array_merge($bcc, $security_distro_people);
+ $bcc = array_merge($bcc, array_map(create_function('$x', 'return
$x."@php.net";'), $security_developers));
}
$bcc = array_diff($bcc, $to);
$bcc = array_unique($bcc);
Modified: web/php-bugs/trunk/include/trusted-devs.php
===================================================================
--- web/php-bugs/trunk/include/trusted-devs.php 2011-04-02 17:38:08 UTC (rev 309898)
+++ web/php-bugs/trunk/include/trusted-devs.php 2011-04-02 17:55:18 UTC (rev 309899)
@@ -17,10 +17,10 @@
// Distro people (security related)
$security_distro_people = array(
- 'jorton' => 'jorton@php.net',
- 'geissert' => 'geissert@php.net',
- 'oden' => 'oden@php.net',
- 'vdanen' => 'vdanen@php.net',
+ 'jorton',
+ 'geissert',
+ 'oden',
+ 'vdanen',
);
$security_developers = array(