cvs: php-bugs-web / bug.php report.php /include functions.inc

philip Thu Nov 20 17:19:24 2008 UTC Modified files: /php-bugs-web bug.php report.php /php-bugs-web/include functions.inc Log: Remove CAPTCHA check for people logged in as php.net CVS users http://cvs.php.net/viewvc.cgi/php-bugs-web/bug.php?r1=1.95&r2=1.96&diff_format=u Index: php-bugs-web/bug.php diff -u php-bugs-web/bug.php:1.95 php-bugs-web/bug.php:1.96 --- php-bugs-web/bug.php:1.95 Sun Nov 9 15:49:24 2008 +++ php-bugs-web/bug.php Thu Nov 20 17:19:24 2008 @@ -87,7 +87,7 @@ $errors[] = "You can not add comments for bugs with the statuses:" . join(', ', $no_comments_allowed); } - if (!validate_captcha()) { + if (!is_cvs_user() && !validate_captcha()) { $errors[] = 'Incorrect CAPTCHA'; } http://cvs.php.net/viewvc.cgi/php-bugs-web/report.php?r1=1.72&r2=1.73&diff_format=u Index: php-bugs-web/report.php diff -u php-bugs-web/report.php:1.72 php-bugs-web/report.php:1.73 --- php-bugs-web/report.php:1.72 Thu Nov 20 01:19:23 2008 +++ php-bugs-web/report.php Thu Nov 20 17:19:24 2008 @@ -258,12 +258,6 @@ <th align="right">Your email address:</th> <td colspan="2"> <input type="text" size="20" maxlength="50" name="in[email]" value="<?php echo clean($in['email']);?>" /> - <?php - // Temporary test code (tm) - if (is_cvs_user($_COOKIE['MAGIC_COOKIE'])) { - echo " (logged in)"; - } - ?> </td> </tr><tr> <th align="right">PHP version:</th> @@ -297,11 +291,24 @@ </font></td> </tr> <tr> - <th align="right">CAPTCHA:</th> + <?php + if (is_cvs_user()) { + ?> + <th align="right">User:</th> + <td colspan="2"> + <?php echo $user; ?> + </td> + <?php + } else { + ?> + <th align="right">CAPTCHA:</th> <td colspan="2"><font size="-1"> <?php echo generate_captcha(); ?> </font></td> - </tr> + <?php + } + ?> + </tr> </table> <table> http://cvs.php.net/viewvc.cgi/php-bugs-web/include/functions.inc?r1=1.248&r2=1.249&diff_format=u Index: php-bugs-web/include/functions.inc diff -u php-bugs-web/include/functions.inc:1.248 php-bugs-web/include/functions.inc:1.249 --- php-bugs-web/include/functions.inc:1.248 Thu Nov 6 22:18:29 2008 +++ php-bugs-web/include/functions.inc Thu Nov 20 17:19:24 2008 @@ -516,7 +516,7 @@ $errors[] = "You must supply a password for this bug report."; } - if ($initial && !validate_captcha()) { + if ($initial && !is_cvs_user() && !validate_captcha()) { $errors[] = 'Incorrect CAPTCHA'; }