cvs: php-master-web / forgot.php /entry cvs-account.php event.php subscribe.php user-note.php /manage event.php users.php

bjori Sun Jun 17 17:00:48 2007 UTC Modified files: /php-master-web forgot.php /php-master-web/entry event.php subscribe.php user-note.php cvs-account.php /php-master-web/manage event.php users.php Log: Set the envelope sender to noreply@php.net

http://cvs.php.net/viewvc.cgi/php-master-web/forgot.php?r1=1.5&r2=1.6&diff_format=u Index: php-master-web/forgot.php diff -u php-master-web/forgot.php:1.5 php-master-web/forgot.php:1.6 --- php-master-web/forgot.php:1.5 Fri Aug 6 08:54:58 2004 +++ php-master-web/forgot.php Sun Jun 17 17:00:48 2007 @@ -74,7 +74,7 @@ -- group@php.net "; - mail($row['email'],"Password change instructions for $row[username]",$body,'From: PHP Group <group@php.net>'); + mail($row['email'],"Password change instructions for $row[username]",$body,'From: PHP Group <group@php.net>', '-fnoreply@php.net'); echo '<p>Okay, instructions on how to change your password have been sent to your email address. If you don\'t receive them, you\'ll have to contact group@php.net for help.</p>'; foot(); exit; http://cvs.php.net/viewvc.cgi/php-master-web/entry/event.php?r1=1.11&r2=1.12&diff_format=u Index: php-master-web/entry/event.php diff -u php-master-web/entry/event.php:1.11 php-master-web/entry/event.php:1.12 --- php-master-web/entry/event.php:1.11 Sun Jul 30 15:55:09 2006 +++ php-master-web/entry/event.php Sun Jun 17 17:00:48 2007 @@ -103,4 +103,5 @@ . "https://master.php.net/manage/event.php?id=$new_id&action=reject\n" . "https://master.php.net/manage/event.php?id=$new_id\n"; -mail($mailto,"Event #$new_id: ".stripslashes($sdesc),$msg,"From: ".stripslashes($email)."\r\nMessage-ID: <event-$new_id@php.net>\r\nContent-type: text/plain; charset=utf8"); +mail($mailto,"Event #$new_id: ".stripslashes($sdesc),$msg,"From: ".stripslashes($email)."\r\nMessage-ID: <event-$new_id@php.net>\r\nContent-type: text/plain; charset=utf8", "-fnoreply@php.net"); + http://cvs.php.net/viewvc.cgi/php-master-web/entry/subscribe.php?r1=1.1&r2=1.2&diff_format=u Index: php-master-web/entry/subscribe.php diff -u php-master-web/entry/subscribe.php:1.1 php-master-web/entry/subscribe.php:1.2 --- php-master-web/entry/subscribe.php:1.1 Sun Aug 10 11:14:08 2003 +++ php-master-web/entry/subscribe.php Sun Jun 17 17:00:48 2007 @@ -32,10 +32,11 @@ "{$_POST['maillist']}-{$_POST['request']}-$sub@lists.php.net", "PHP Mailing List Website Subscription", "This was a request generated from the form at {$_POST['referer']} by {$_POST['remoteip']}.", - "From: {$_POST['email']}\r\n" + "From: {$_POST['email']}\r\n", + "-fnoreply@php.net" ); // Check if we sent mail if (!$mail_sent) { die("Unable to send mail"); -} \ No newline at end of file +} http://cvs.php.net/viewvc.cgi/php-master-web/entry/user-note.php?r1=1.67&r2=1.68&diff_format=u Index: php-master-web/entry/user-note.php diff -u php-master-web/entry/user-note.php:1.67 php-master-web/entry/user-note.php:1.68 --- php-master-web/entry/user-note.php:1.67 Sun May 20 21:16:35 2007 +++ php-master-web/entry/user-note.php Sun Jun 17 17:00:48 2007 @@ -76,7 +76,9 @@ mail ($failto, 'failed manual note query', "Query Failed: $query\nError: ".mysql_error(), - 'From: webmaster@php.net'); + 'From: webmaster@php.net', + '-fnoreply@php.net' + ); die("failed to query note db"); } @@ -92,8 +94,9 @@ "User : $user\n" . "Section: $sect\n" . "Note : $note", - 'From: webmaster@php.net' - ); + 'From: webmaster@php.net', + '-fnoreply@php.net' + ); die ('[TOO MANY NOTES]'); } @@ -151,13 +154,14 @@ // see who requested an alert // ** alerts ** //$mailto .= get_emails_for_sect($sect); - mail($mailto,"note $new_id added to $sect",$msg,"From: $user\r\nMessage-ID: <note-$new_id@php.net>"); + mail($mailto,"note $new_id added to $sect",$msg,"From: $user\r\nMessage-ID: <note-$new_id@php.net>", "-fnoreply@php.net"); } else { // mail it. mail($failto, 'failed manual note query', "Query Failed: $query\nError: ".mysql_error(), - 'From: webmaster@php.net'); + 'From: webmaster@php.net', + "-fnoreply@php.net"); die("failed to insert record"); } http://cvs.php.net/viewvc.cgi/php-master-web/entry/cvs-account.php?r1=1.13&r2=1.14&diff_format=u Index: php-master-web/entry/cvs-account.php diff -u php-master-web/entry/cvs-account.php:1.13 php-master-web/entry/cvs-account.php:1.14 --- php-master-web/entry/cvs-account.php:1.13 Sun Jul 30 15:55:09 2006 +++ php-master-web/entry/cvs-account.php Sun Jun 17 17:00:48 2007 @@ -51,14 +51,14 @@ $from = '"'.stripslashes($name).'" <'.stripslashes($email).">"; - mail($mailto,"CVS Account Request: $username",$msg,"From: $from\r\nMessage-ID: <cvs-account-$new_id@php.net>"); + mail($mailto,"CVS Account Request: $username",$msg,"From: $from\r\nMessage-ID: <cvs-account-$new_id@php.net>", "-fnoreply@php.net"); $msg .= "\n-- \n"; $msg .= "approve: https://master.php.net/manage/users.php?action=approve&id=$new_id\n"; $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,"CVS Account Request: $username",$msg,"From: $from\r\nMessage-ID: <cvs-account-$new_id-admin@php.net>"); + mail($failto,"CVS Account Request: $username",$msg,"From: $from\r\nMessage-ID: <cvs-account-$new_id-admin@php.net>", "-fnoreply@php.net"); } else { mail($failto,"CVS Account Request: $username", "Failed to insert into database: ".mysql_error()."\n\n". http://cvs.php.net/viewvc.cgi/php-master-web/manage/event.php?r1=1.17&r2=1.18&diff_format=u Index: php-master-web/manage/event.php diff -u php-master-web/manage/event.php:1.17 php-master-web/manage/event.php:1.18 --- php-master-web/manage/event.php:1.17 Mon Jun 4 18:20:49 2007 +++ php-master-web/manage/event.php Sun Jun 17 17:00:48 2007 @@ -34,9 +34,9 @@ && mysql_affected_rows()) { $event = fetch_event($id); $message = "This event has been approved. It will appear on the PHP website shortly."; - if ($event['email']) mail($event['email'],"Event #$id Approved: $event[sdesc]",$message,"From: PHP Webmasters <php-mirrors@lists.php.net>"); + if ($event['email']) mail($event['email'],"Event #$id Approved: $event[sdesc]",$message,"From: PHP Webmasters <php-mirrors@lists.php.net>", "-fnoreply@php.net"); - mail($mailto,"Event #$id Approved: $event[sdesc]",$message,"From: $user@php.net\nIn-Reply-To: <event-$id@php.net>"); + mail($mailto,"Event #$id Approved: $event[sdesc]",$message,"From: $user@php.net\nIn-Reply-To: <event-$id@php.net>", "-fnoreply@php.net"); warn("record $id approved"); } else { @@ -50,9 +50,9 @@ $message = $event['approved'] ? "This event has been deleted." : "This event has been rejected."; $did = $event['approved'] ? 'Deleted' : 'Rejected'; - if ($event['email']) mail($event['email'],"Event #$id $did: $event[sdesc]",$message,"From: PHP Webmasters <php-mirrors@lists.php.net>"); + if ($event['email']) mail($event['email'],"Event #$id $did: $event[sdesc]",$message,"From: PHP Webmasters <php-mirrors@lists.php.net>", "-fnoreply@php.net"); - mail($mailto,"Event #$id $did: $event[sdesc]",$message,"From: $user@php.net\nIn-Reply-To: <event-$id@php.net>"); + mail($mailto,"Event #$id $did: $event[sdesc]",$message,"From: $user@php.net\nIn-Reply-To: <event-$id@php.net>", "-fnoreply@php.net"); warn("record $id ".strtolower($did)); http://cvs.php.net/viewvc.cgi/php-master-web/manage/users.php?r1=1.43&r2=1.44&diff_format=u Index: php-master-web/manage/users.php diff -u php-master-web/manage/users.php:1.43 php-master-web/manage/users.php:1.44 --- php-master-web/manage/users.php:1.43 Sun Jun 10 14:12:18 2007 +++ php-master-web/manage/users.php Sun Jun 17 17:00:48 2007 @@ -49,9 +49,9 @@ Welcome to the PHP development team! If you encounter any problems with your CVS account, feel free to send us a note at group@php.net."; - mail($userinfo[email],"CVS Account Request: $userinfo[username]",$message,"From: PHP Group <group@php.net>"); + mail($userinfo[email],"CVS Account Request: $userinfo[username]",$message,"From: PHP Group <group@php.net>", "-fnoreply@php.net"); - mail($mailto,"CVS 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>"); + mail($mailto,"CVS 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"); if (!$noclose) { echo '<script language="javascript">window.close();</script>'; exit; @@ -80,8 +80,8 @@ If you'd like to make another appeal for a CVS account, feel free to send us a note at group@php.net."; - mail($userinfo[email],"CVS Account Request: $userinfo[username]",$message,"From: PHP Group <group@php.net>"); - mail($mailto,$userinfo[cvsaccess] ? "CVS Account Deleted: $userinfo[username] deleted by $user" : "CVS 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>"); + mail($userinfo[email],"CVS Account Request: $userinfo[username]",$message,"From: PHP Group <group@php.net>", "-fnoreply@php.net"); + mail($mailto,$userinfo[cvsaccess] ? "CVS Account Deleted: $userinfo[username] deleted by $user" : "CVS 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"); db_query("DELETE FROM users_note WHERE userid=$id"); if (!$noclose) { echo '<script language="javascript">window.close();</script>';