cvs: bugtracker /template/generic/report report.php
| From: | Barry Carlyon | Date: | Wed, 13 Aug 2008 11:13:24 +0000 |
| Subject: | cvs: bugtracker /template/generic/report report.php | ||
| Groups: | php.webmaster | ||
| Request: | Send a blank email to php-webmaster+get-2390@lists.php.net to get a copy of this message | ||
bcarlyon Wed Aug 13 11:13:24 2008 UTC
Modified files:
/bugtracker/template/generic/report report.php
Log:
Fixing reporting bugs when you are logged in
http://cvs.php.net/viewvc.cgi/bugtracker/template/generic/report/report.php?r1=1.12&r2=1.13&diff_format=u
Index: bugtracker/template/generic/report/report.php
diff -u bugtracker/template/generic/report/report.php:1.12
bugtracker/template/generic/report/report.php:1.13
--- bugtracker/template/generic/report/report.php:1.12 Mon Aug 11 10:51:24 2008
+++ bugtracker/template/generic/report/report.php Wed Aug 13 11:13:24 2008
@@ -29,26 +29,24 @@
$content = '';
-$form_data['email'] = loadvar('email');
$form_data['php_version'] = loadvar('php_version');
$form_data['bug_type'] = loadvar('bug_type');
$form_data['os_version'] = loadvar('os_version');
$form_data['summary'] = loadvar('summary');
-$form_data['password'] = loadvar('password');
$form_data['description'] = loadvar('description');
$form_data['reproduce'] = loadvar('reproduce');
$form_data['expected'] = loadvar('expected');
$form_data['actual'] = loadvar('actual');
-//$_POST['recaptcha_challenge_field'] =
isset($_POST['recaptcha_challenge_field']) ? $_POST['recaptcha_challenge_field']
: '';
-//$_POST['recaptcha_response_field'] =
isset($_POST['recaptcha_response_field']) ? $_POST['recaptcha_response_field'] :
'';
-$form_data['recaptcha_challenge_field'] = loadvar('recaptcha_challenge_field');
-$form_data['recaptcha_response_field'] = loadvar('recaptcha_response_field');
//lazy mans method
foreach($form_data as $ref => $data)
{
$error_data[$ref] = $data ? FALSE : TRUE;
}
+$form_data['recaptcha_challenge_field'] = loadvar('recaptcha_challenge_field');
+$form_data['recaptcha_response_field'] = loadvar('recaptcha_response_field');
+$form_data['email'] = loadvar('email');
+$form_data['password'] = loadvar('password');
//lets validatate the code field and others if needed
if ($form_data['reproduce'])
@@ -65,9 +63,6 @@
$error_data['actual'] = FALSE;
}
-//email
-$error_data['email'] = check_email_mx($form_data['email']) ? FALSE : '*
Invalid';
-
//which form elements are req*?
//email and password needed if not logged in
//up to summary + description
@@ -76,6 +71,13 @@
//lets do the captcha check
if (!$user->logged_in) {
+ $error_data['password'] = $form_data['password'] ? FALSE : TRUE;
+ $error_data['email'] = $form_data['email'] ? FALSE : TRUE;
+ $error_data['recaptcha_challenge_field'] =
$form_data['recaptcha_challenge_field'] ? FALSE : TRUE;
+ $error_data['recaptcha_response_field'] =
$form_data['recaptcha_response_field'] ? FALSE : TRUE;
+ //email
+ $error_data['email'] = check_email_mx($form_data['email']) ? FALSE : '*
Invalid';
+
//check captcha
require_once($_SERVER['DOCUMENT_ROOT'] . '../includes/recaptchalib.php');
@@ -107,6 +109,7 @@
if ($errors)
{
$form_data['form_error'] = 'Please correct the errors shown';
+print_r($error_data);
include($_SERVER['DOCUMENT_ROOT'] . '../template/generic/report/index.php');
}
else