svn: /pear/packages/Bugtracker/trunk/ include/functions.php www/bug.php www/patch-add.php
| From: | Philip Olson | Date: | Sat, 06 Mar 2010 00:36:16 +0000 |
| Subject: | svn: /pear/packages/Bugtracker/trunk/ include/functions.php www/bug.php www/patch-add.php | ||
| Groups: | php.pear.cvs php.pear.core | ||
| Request: | Send a blank email to pear-cvs+get-59010@lists.php.net to get a copy of this message | ||
philip Sat, 06 Mar 2010 00:36:16 +0000
Revision: http://svn.php.net/viewvc?view=revision&revision=295875
Log:
Disable @php.net emails for those without (and not logged in)
Changed paths:
U pear/packages/Bugtracker/trunk/include/functions.php
U pear/packages/Bugtracker/trunk/www/bug.php
U pear/packages/Bugtracker/trunk/www/patch-add.php
Modified: pear/packages/Bugtracker/trunk/include/functions.php
===================================================================
--- pear/packages/Bugtracker/trunk/include/functions.php 2010-03-06 00:23:16 UTC (rev 295874)
+++ pear/packages/Bugtracker/trunk/include/functions.php 2010-03-06 00:36:16 UTC (rev 295875)
@@ -1073,8 +1073,13 @@
/**
* Validate an email address
*/
-function is_valid_email($email)
+function is_valid_email($email, $phpnet_allowed = true)
{
+ if (!$phpnet_allowed) {
+ if (false !== stripos($email, '@php.net')) {
+ return false;
+ }
+ }
return (bool) preg_match("/^[.\\w+-]+@[.\\w-]+\\.\\w{2,}\z/i", $email);
}
Modified: pear/packages/Bugtracker/trunk/www/bug.php
===================================================================
--- pear/packages/Bugtracker/trunk/www/bug.php 2010-03-06 00:23:16 UTC (rev 295874)
+++ pear/packages/Bugtracker/trunk/www/bug.php 2010-03-06 00:36:16 UTC (rev 295875)
@@ -71,7 +71,7 @@
} else {
$email = isset($_POST['in']['commentemail']) ?
$_POST['in']['commentemail'] : '';
}
- if ($email == '' || !is_valid_email($email)) {
+ if ($email == '' || !is_valid_email($email, $logged_in)) {
$errors[] = 'You must provide a valid email address.';
} else {
// Unsubscribe
@@ -174,7 +174,7 @@
do {
if (!$logged_in) {
- if (!is_valid_email($_POST['in']['commentemail'])) {
+ if (!is_valid_email($_POST['in']['commentemail'], $logged_in)) {
$errors[] = 'You must provide a valid email address.';
response_header('Add Comment - Problems');
break; // skip bug comment addition
Modified: pear/packages/Bugtracker/trunk/www/patch-add.php
===================================================================
--- pear/packages/Bugtracker/trunk/www/patch-add.php 2010-03-06 00:23:16 UTC (rev 295874)
+++ pear/packages/Bugtracker/trunk/www/patch-add.php 2010-03-06 00:36:16 UTC (rev 295875)
@@ -63,7 +63,7 @@
$email = isset($_POST['email']) ? $_POST['email'] : '';
- if (!is_valid_email($email)) {
+ if (!is_valid_email($email, $logged_in)) {
$errors[] = 'Email address must be valid!';
}