svn: web/php-bugs/trunk/
| From: | Jani Taskinen | Date: | Sun, 12 Jul 2009 21:18:45 +0000 |
| Subject: | svn: web/php-bugs/trunk/ | ||
| Groups: | php.webmaster | ||
| Request: | Send a blank email to php-webmaster+get-5334@lists.php.net to get a copy of this message | ||
jani Sun, 12 Jul 2009 21:18:45 +0000
ViewVC URL: http://svn.php.net/viewvc?view=revision&revision=283990
Changed paths:
U web/php-bugs/trunk/bug.php
U web/php-bugs/trunk/bugs-generating-backtrace.php
U web/php-bugs/trunk/fix.php
U web/php-bugs/trunk/how-to-report.php
A web/php-bugs/trunk/include/auth.inc
D web/php-bugs/trunk/include/cvs-auth.inc
U web/php-bugs/trunk/include/functions.inc
U web/php-bugs/trunk/include/resolve.inc
U web/php-bugs/trunk/index.php
U web/php-bugs/trunk/report.php
Log:
CVS -> SVN
Modified: web/php-bugs/trunk/bug.php =================================================================== --- web/php-bugs/trunk/bug.php 2009-07-12 21:09:12 UTC (rev 283989) +++ web/php-bugs/trunk/bug.php 2009-07-12 21:18:45 UTC (rev 283990) @@ -10,7 +10,7 @@ session_start(); require_once 'prepend.inc'; -require_once 'cvs-auth.inc'; +require_once 'auth.inc'; require_once 'trusted-devs.inc'; $mail_bugs_to = 'php-bugs@lists.php.net'; @@ -87,7 +87,7 @@ $errors[] = "You can not add comments for bugs with the statuses:" . join(', ', $no_comments_allowed); } - if (!is_cvs_user() && !validate_captcha()) { + if (!is_developer() && !validate_captcha()) { $errors[] = 'Incorrect CAPTCHA'; } @@ -202,7 +202,7 @@ $in['status'] = $RESOLVE_REASONS[$in['resolve']]['status']; } if ($in['status'] == 'Closed' && $bug['status'] == 'To be documented') { - $resolve_message = $FIX_VARIATIONS['fixedcvs']['Documentation problem']; + $resolve_message = $FIX_VARIATIONS['fixed']['Documentation problem']; } elseif (isset($FIX_VARIATIONS[$in['resolve']][$bug['bug_type']])) { $resolve_message = $FIX_VARIATIONS[$in['resolve']][$bug['bug_type']]; } else { @@ -390,16 +390,16 @@ else {?> <div class="explain"> <?php if (!$in) {?> -Welcome! If you don't have a CVS account, you can't do anything here. You can +Welcome! If you don't have a SVN account, you can't do anything here. You can <a href="<?php echo "$self?id=$id&edit=3"?>">add a comment by following this link</a> or if you reported this bug, you can <a href="<?php echo "$self?id=$id&edit=2"?>">edit this bug over here</a>. <?php }?> <table> <tr> - <th>CVS Username:</th> + <th>SVN Username:</th> <td><input type="text" name="user" value="<?php echo clean($user)?>" size="10" maxlength="20" /></td> - <th>CVS Password:</th> + <th>SVN Password:</th> <td><input type="password" name="pw" value="<?php echo clean($pw)?>" size="10" maxlength="20" /></td> <th> <label for="save">Remember:</label> Modified: web/php-bugs/trunk/bugs-generating-backtrace.php =================================================================== --- web/php-bugs/trunk/bugs-generating-backtrace.php 2009-07-12 21:09:12 UTC (rev 283989) +++ web/php-bugs/trunk/bugs-generating-backtrace.php 2009-07-12 21:18:45 UTC (rev 283990) @@ -131,7 +131,7 @@ (gdb) print (char *)executor_globals.active_op_array->function_name $15 = 0x816cfc4 "result_error" (gdb) print (char *)executor_globals.active_op_array->filename -$16 = 0x816afbc "/home/yohgaki/cvs/php/DEV/segfault.php" +$16 = 0x816afbc "/home/yohgaki/php/DEV/segfault.php" (gdb) </code></pre> </ul> Modified: web/php-bugs/trunk/fix.php =================================================================== --- web/php-bugs/trunk/fix.php 2009-07-12 21:09:12 UTC (rev 283989) +++ web/php-bugs/trunk/fix.php 2009-07-12 21:18:45 UTC (rev 283990) @@ -6,7 +6,7 @@ } require_once 'prepend.inc'; -require_once 'cvs-auth.inc'; +require_once 'auth.inc'; $mail_bugs_to = 'php-bugs@lists.php.net'; @@ -43,9 +43,9 @@ <input type="hidden" name="id" value="<?php echo $id?>" /> <table> <tr> - <th>CVS Username:</th> + <th>SVN Username:</th> <td><input type="text" name="user" value="<?php echo clean($user)?>" size="10" maxlength="20" /></td> - <th>CVS Password:</th> + <th>SVN Password:</th> <td><input type="password" name="pw" value="<?php echo clean($pw)?>" size="10" maxlength="20" /></td> <th> <label for="save">Remember:</label> Modified: web/php-bugs/trunk/how-to-report.php =================================================================== --- web/php-bugs/trunk/how-to-report.php 2009-07-12 21:09:12 UTC (rev 283989) +++ web/php-bugs/trunk/how-to-report.php 2009-07-12 21:18:45 UTC (rev 283990) @@ -48,13 +48,13 @@ can spend helping to fix that bug rather than sorting out duplicate bug reports.</p> -<h2>Try a CVS snapshot.</h2> +<h2>Try a snapshot.</h2> -<p>We will most likely ask you to try a CVS snapshot to verify whether the problem -has been fixed in our CVS repository or not. You can save yourself and us some +<p>We will most likely ask you to try a snapshot to verify whether the problem +has been fixed in our repository or not. You can save yourself and us some time if you first try to reproduce the bug with the latest stable snapshot. If -the bug still exists, select 5CVS.. as your version. Note that the format is -5CVS-YYYY-MM-DD. Here are the latest CVS snapshots for version 5 of PHP: +the bug still exists, select 5SVN.. as your version. Note that the format is +5SVN-YYYY-MM-DD. Here are the latest snapshots for version 5 of PHP: <ul> <li> <a href="http://windows.php.net/snapshots/">Windows</a> Copied: web/php-bugs/trunk/include/auth.inc (from rev 283981, web/php-bugs/trunk/include/cvs-auth.inc) =================================================================== --- web/php-bugs/trunk/include/auth.inc (rev 0) +++ web/php-bugs/trunk/include/auth.inc 2009-07-12 21:18:45 UTC (rev 283990) @@ -0,0 +1,51 @@ +<?php +/* $Id$ */ + +function verify_password($user, $pass) +{ + $post = http_build_query( + array( + "token" => getenv("TOKEN"), + "username" => $user, + "password" => $pass, + ) + ); + + $opts = array( + "method" => "POST", + "header" => "Content-type: application/x-www-form-urlencoded", + "content" => $post, + ); + + $ctx = stream_context_create(array("http" => $opts)); + + $s = file_get_contents("https://master.php.net/fetch/cvsauth.php", false, $ctx); + + $a = @unserialize($s); + if (!is_array($a)) { + echo "Unknown authentication error\n"; + exit; + } + if (isset($a["errno"])) { + echo "Authentication failed: ", $a["errstr"], "\n"; + return false; + } + + return true; +} + +function is_developer() +{ + if (empty($_COOKIE['MAGIC_COOKIE'])) { + return false; + } + + // 0 = username, 1 = password + $c = explode(':', base64_decode($_COOKIE['MAGIC_COOKIE']), 2); + + if (!verify_password($c[0], $c[1])) { + return false; + } + + return true; +} Deleted: web/php-bugs/trunk/include/cvs-auth.inc =================================================================== --- web/php-bugs/trunk/include/cvs-auth.inc 2009-07-12 21:09:12 UTC (rev 283989) +++ web/php-bugs/trunk/include/cvs-auth.inc 2009-07-12 21:18:45 UTC (rev 283990) @@ -1,51 +0,0 @@ -<?php -/* $Id$ */ - -function verify_password($user, $pass) -{ - $post = http_build_query( - array( - "token" => getenv("TOKEN"), - "username" => $user, - "password" => $pass, - ) - ); - - $opts = array( - "method" => "POST", - "header" => "Content-type: application/x-www-form-urlencoded", - "content" => $post, - ); - - $ctx = stream_context_create(array("http" => $opts)); - - $s = file_get_contents("https://master.php.net/fetch/cvsauth.php", false, $ctx); - - $a = @unserialize($s); - if (!is_array($a)) { - echo "Unknown authentication error\n"; - exit; - } - if (isset($a["errno"])) { - echo "Authentication failed: ", $a["errstr"], "\n"; - return false; - } - - return true; -} - -function is_cvs_user () -{ - if (empty($_COOKIE['MAGIC_COOKIE'])) { - return false; - } - - // 0 = username, 1 = password - $c = explode(':', base64_decode($_COOKIE['MAGIC_COOKIE']), 2); - - if (!verify_password($c[0], $c[1])) { - return false; - } - - return true; -} Modified: web/php-bugs/trunk/include/functions.inc =================================================================== --- web/php-bugs/trunk/include/functions.inc 2009-07-12 21:09:12 UTC (rev 283989) +++ web/php-bugs/trunk/include/functions.inc 2009-07-12 21:18:45 UTC (rev 283990) @@ -139,13 +139,13 @@ $date = date("Y-m-d"); $versions = array( "5.3.0", - "5.3CVS-{$date} (snap)", - "5.3CVS-{$date} (CVS)", + "5.3SVN-{$date} (snap)", + "5.3SVN-{$date} (SVN)", "5.2.10", - "5.2CVS-{$date} (snap)", - "5.2CVS-{$date} (CVS)", - "6CVS-{$date} (snap)", - "6CVS-{$date} (CVS)", + "5.2SVN-{$date} (snap)", + "5.2SVN-{$date} (SVN)", + "6SVN-{$date} (snap)", + "6SVN-{$date} (SVN)", "Irrelevant", ); echo "<option value=\"\">--Please Select--</option>\n"; @@ -511,11 +511,11 @@ $errors[] = "You must supply a long description of the bug you are reporting."; } - if ($initial && !is_cvs_user() && empty($in['passwd'])) { + if ($initial && !is_developer() && empty($in['passwd'])) { $errors[] = "You must supply a password for this bug report."; } - if ($initial && !is_cvs_user() && !validate_captcha()) { + if ($initial && !is_developer() && !validate_captcha()) { $errors[] = 'Incorrect CAPTCHA'; } Modified: web/php-bugs/trunk/include/resolve.inc =================================================================== --- web/php-bugs/trunk/include/resolve.inc 2009-07-12 21:09:12 UTC (rev 283989) +++ web/php-bugs/trunk/include/resolve.inc 2009-07-12 21:18:45 UTC (rev 283990) @@ -3,9 +3,9 @@ $RESOLVE_REASONS = array( 'trysnapshot52' => array( 'status' => 'Feedback', - 'desc' => 'Try a CVS snapshot (PHP 5.2)', + 'desc' => 'Try a snapshot (PHP 5.2)', 'message' => -'Please try using this CVS snapshot: +'Please try using this snapshot: http://snaps.php.net/php5.2-latest.tar.gz @@ -16,9 +16,9 @@ 'trysnapshot53' => array( 'status' => 'Feedback', - 'desc' => 'Try a CVS snapshot (PHP 5.3)', + 'desc' => 'Try a snapshot (PHP 5.3)', 'message' => -'Please try using this CVS snapshot: +'Please try using this snapshot: http://snaps.php.net/php5.3-latest.tar.gz @@ -29,9 +29,9 @@ 'trysnapshot60' => array( 'status' => 'Feedback', - 'desc' => 'Try a CVS snapshot (PHP 6.0)', + 'desc' => 'Try a snapshot (PHP 6.0)', 'message' => -'Please try using this CVS snapshot: +'Please try using this snapshot: http://snaps.php.net/php6.0-latest.tar.gz @@ -40,11 +40,11 @@ http://windows.php.net/snapshots/', ), - 'fixedcvs' => array( + 'fixed' => array( 'status' => 'Closed', - 'desc' => 'Fixed in CVS', + 'desc' => 'Fixed in SVN', 'message' => -'This bug has been fixed in CVS. +'This bug has been fixed in SVN. Snapshots of the sources are packaged every three hours; this change will be in the next snapshot. You can grab the snapshot at @@ -55,9 +55,9 @@ 'needdocs' => array( 'status' => 'To be documented', - 'desc' => 'Fixed in CVS and need be documented', + 'desc' => 'Fixed in SVN and need be documented', 'message' => -'This bug has been fixed in CVS. +'This bug has been fixed in SVN. Snapshots of the sources are packaged every three hours; this change will be in the next snapshot. You can grab the snapshot at @@ -272,11 +272,11 @@ ); $FIX_VARIATIONS = array( - 'fixedcvs' => array( + 'fixed' => array( 'Website problem' => -'This bug has been fixed in CVS. Since the websites are not directly -updated from the CVS server, the fix might need some time to spread +'This bug has been fixed in SVN. Since the websites are not directly +updated from the SVN server, the fix might need some time to spread across the globe to all mirror sites, including PHP.net itself. Thank you for the report, and for helping us make PHP.net better.', @@ -296,15 +296,15 @@ Thank you for the report, and for helping us make our documentation better.', 'Doc Build problem' => -'This bug has been fixed in CVS. Since the websites are not directly -updated from the CVS server, the fix might need some time to spread +'This bug has been fixed in SVN. Since the websites are not directly +updated from the SVN server, the fix might need some time to spread across the globe to all mirror sites, including PHP.net itself. Thank you for the report, and for helping us make PHP.net better.', 'DocWeb problem' => -'This bug has been fixed in CVS. Since the PHP Documentation Tools website -is updated from the CVS repository at a regular interval, the fix might need +'This bug has been fixed in SVN. Since the PHP Documentation Tools website +is updated from the SVN repository at a regular interval, the fix might need some time to take effect. Thank you for the report, and for helping us make DocWeb better.', Modified: web/php-bugs/trunk/index.php =================================================================== --- web/php-bugs/trunk/index.php 2009-07-12 21:09:12 UTC (rev 283989) +++ web/php-bugs/trunk/index.php 2009-07-12 21:18:45 UTC (rev 283990) @@ -20,8 +20,8 @@ <li>Used the form above or our <a href="search.php">advanced search page</a> to make sure nobody has reported the bug already.</li> -<li>Made sure you are using the latest stable version or a build from CVS, if -similar bugs have recently been fixed and committed. You can download CVS +<li>Made sure you are using the latest stable version or a build from SVN, if +similar bugs have recently been fixed and committed. You can download snapshots at <a href="http://snaps.php.net/">http://snaps.php.net</a></li> <li>Read our tips on <a href="how-to-report.php">how to report Modified: web/php-bugs/trunk/report.php =================================================================== --- web/php-bugs/trunk/report.php 2009-07-12 21:09:12 UTC (rev 283989) +++ web/php-bugs/trunk/report.php 2009-07-12 21:18:45 UTC (rev 283990) @@ -6,7 +6,7 @@ session_start(); require_once 'prepend.inc'; -require_once 'cvs-auth.inc'; +require_once 'auth.inc'; /* When user submits a report, do a search and display the results before allowing * them to continue */ @@ -67,7 +67,7 @@ <p>If you're sure that your report is a genuine bug that has not been reported before, you can scroll down and click the submit button to really enter the details into our database. </p> -<p>Please do not report compile errors for HEAD snapshots (currently 6CVS) via our bug +<p>Please do not report compile errors for HEAD snapshots (currently 6SVN) via our bug tracking system. If the same compile error persists for some time, please drop a mail to our <a href="http://www.php.net/mailing-lists.php">internals</a> list.</p> @@ -241,7 +241,7 @@ extensions (APC, eAccelerator, Turck MMCache, ionCube loader, Xcache, Xdebug) before submitting a *PHP* bug.</strong></p> -<p>Do not report compile errors in HEAD versions (currently 6CVS). If a compile error persists, please drop a mail +<p>Do not report compile errors in HEAD versions (currently 6SVN). If a compile error persists, please drop a mail to our <a href="http://www.php.net/mailing-lists.php">internals mailing list</a>.</p> <p><strong>Failure to follow these instructions may result in your bug @@ -288,7 +288,7 @@ </td></tr> </tr> <?php - if (!is_cvs_user()) { + if (!is_developer()) { ?> <tr> <th align="right">Password:</th> @@ -306,7 +306,7 @@ ?> <tr> <?php - if (is_cvs_user()) { + if (is_developer()) { ?> <th align="right">User:</th> <td colspan="2">
Modified: web/php-bugs/trunk/bug.php =================================================================== --- web/php-bugs/trunk/bug.php 2009-07-12 21:09:12 UTC (rev 283989) +++ web/php-bugs/trunk/bug.php 2009-07-12 21:18:45 UTC (rev 283990) @@ -10,7 +10,7 @@ session_start(); require_once 'prepend.inc'; -require_once 'cvs-auth.inc'; +require_once 'auth.inc'; require_once 'trusted-devs.inc'; $mail_bugs_to = 'php-bugs@lists.php.net'; @@ -87,7 +87,7 @@ $errors[] = "You can not add comments for bugs with the statuses:" . join(', ', $no_comments_allowed); } - if (!is_cvs_user() && !validate_captcha()) { + if (!is_developer() && !validate_captcha()) { $errors[] = 'Incorrect CAPTCHA'; } @@ -202,7 +202,7 @@ $in['status'] = $RESOLVE_REASONS[$in['resolve']]['status']; } if ($in['status'] == 'Closed' && $bug['status'] == 'To be documented') { - $resolve_message = $FIX_VARIATIONS['fixedcvs']['Documentation problem']; + $resolve_message = $FIX_VARIATIONS['fixed']['Documentation problem']; } elseif (isset($FIX_VARIATIONS[$in['resolve']][$bug['bug_type']])) { $resolve_message = $FIX_VARIATIONS[$in['resolve']][$bug['bug_type']]; } else { @@ -390,16 +390,16 @@ else {?> <div class="explain"> <?php if (!$in) {?> -Welcome! If you don't have a CVS account, you can't do anything here. You can +Welcome! If you don't have a SVN account, you can't do anything here. You can <a href="<?php echo "$self?id=$id&edit=3"?>">add a comment by following this link</a> or if you reported this bug, you can <a href="<?php echo "$self?id=$id&edit=2"?>">edit this bug over here</a>. <?php }?> <table> <tr> - <th>CVS Username:</th> + <th>SVN Username:</th> <td><input type="text" name="user" value="<?php echo clean($user)?>" size="10" maxlength="20" /></td> - <th>CVS Password:</th> + <th>SVN Password:</th> <td><input type="password" name="pw" value="<?php echo clean($pw)?>" size="10" maxlength="20" /></td> <th> <label for="save">Remember:</label> Modified: web/php-bugs/trunk/bugs-generating-backtrace.php =================================================================== --- web/php-bugs/trunk/bugs-generating-backtrace.php 2009-07-12 21:09:12 UTC (rev 283989) +++ web/php-bugs/trunk/bugs-generating-backtrace.php 2009-07-12 21:18:45 UTC (rev 283990) @@ -131,7 +131,7 @@ (gdb) print (char *)executor_globals.active_op_array->function_name $15 = 0x816cfc4 "result_error" (gdb) print (char *)executor_globals.active_op_array->filename -$16 = 0x816afbc "/home/yohgaki/cvs/php/DEV/segfault.php" +$16 = 0x816afbc "/home/yohgaki/php/DEV/segfault.php" (gdb) </code></pre> </ul> Modified: web/php-bugs/trunk/fix.php =================================================================== --- web/php-bugs/trunk/fix.php 2009-07-12 21:09:12 UTC (rev 283989) +++ web/php-bugs/trunk/fix.php 2009-07-12 21:18:45 UTC (rev 283990) @@ -6,7 +6,7 @@ } require_once 'prepend.inc'; -require_once 'cvs-auth.inc'; +require_once 'auth.inc'; $mail_bugs_to = 'php-bugs@lists.php.net'; @@ -43,9 +43,9 @@ <input type="hidden" name="id" value="<?php echo $id?>" /> <table> <tr> - <th>CVS Username:</th> + <th>SVN Username:</th> <td><input type="text" name="user" value="<?php echo clean($user)?>" size="10" maxlength="20" /></td> - <th>CVS Password:</th> + <th>SVN Password:</th> <td><input type="password" name="pw" value="<?php echo clean($pw)?>" size="10" maxlength="20" /></td> <th> <label for="save">Remember:</label> Modified: web/php-bugs/trunk/how-to-report.php =================================================================== --- web/php-bugs/trunk/how-to-report.php 2009-07-12 21:09:12 UTC (rev 283989) +++ web/php-bugs/trunk/how-to-report.php 2009-07-12 21:18:45 UTC (rev 283990) @@ -48,13 +48,13 @@ can spend helping to fix that bug rather than sorting out duplicate bug reports.</p> -<h2>Try a CVS snapshot.</h2> +<h2>Try a snapshot.</h2> -<p>We will most likely ask you to try a CVS snapshot to verify whether the problem -has been fixed in our CVS repository or not. You can save yourself and us some +<p>We will most likely ask you to try a snapshot to verify whether the problem +has been fixed in our repository or not. You can save yourself and us some time if you first try to reproduce the bug with the latest stable snapshot. If -the bug still exists, select 5CVS.. as your version. Note that the format is -5CVS-YYYY-MM-DD. Here are the latest CVS snapshots for version 5 of PHP: +the bug still exists, select 5SVN.. as your version. Note that the format is +5SVN-YYYY-MM-DD. Here are the latest snapshots for version 5 of PHP: <ul> <li> <a href="http://windows.php.net/snapshots/">Windows</a> Copied: web/php-bugs/trunk/include/auth.inc (from rev 283981, web/php-bugs/trunk/include/cvs-auth.inc) =================================================================== --- web/php-bugs/trunk/include/auth.inc (rev 0) +++ web/php-bugs/trunk/include/auth.inc 2009-07-12 21:18:45 UTC (rev 283990) @@ -0,0 +1,51 @@ +<?php +/* $Id$ */ + +function verify_password($user, $pass) +{ + $post = http_build_query( + array( + "token" => getenv("TOKEN"), + "username" => $user, + "password" => $pass, + ) + ); + + $opts = array( + "method" => "POST", + "header" => "Content-type: application/x-www-form-urlencoded", + "content" => $post, + ); + + $ctx = stream_context_create(array("http" => $opts)); + + $s = file_get_contents("https://master.php.net/fetch/cvsauth.php", false, $ctx); + + $a = @unserialize($s); + if (!is_array($a)) { + echo "Unknown authentication error\n"; + exit; + } + if (isset($a["errno"])) { + echo "Authentication failed: ", $a["errstr"], "\n"; + return false; + } + + return true; +} + +function is_developer() +{ + if (empty($_COOKIE['MAGIC_COOKIE'])) { + return false; + } + + // 0 = username, 1 = password + $c = explode(':', base64_decode($_COOKIE['MAGIC_COOKIE']), 2); + + if (!verify_password($c[0], $c[1])) { + return false; + } + + return true; +} Deleted: web/php-bugs/trunk/include/cvs-auth.inc =================================================================== --- web/php-bugs/trunk/include/cvs-auth.inc 2009-07-12 21:09:12 UTC (rev 283989) +++ web/php-bugs/trunk/include/cvs-auth.inc 2009-07-12 21:18:45 UTC (rev 283990) @@ -1,51 +0,0 @@ -<?php -/* $Id$ */ - -function verify_password($user, $pass) -{ - $post = http_build_query( - array( - "token" => getenv("TOKEN"), - "username" => $user, - "password" => $pass, - ) - ); - - $opts = array( - "method" => "POST", - "header" => "Content-type: application/x-www-form-urlencoded", - "content" => $post, - ); - - $ctx = stream_context_create(array("http" => $opts)); - - $s = file_get_contents("https://master.php.net/fetch/cvsauth.php", false, $ctx); - - $a = @unserialize($s); - if (!is_array($a)) { - echo "Unknown authentication error\n"; - exit; - } - if (isset($a["errno"])) { - echo "Authentication failed: ", $a["errstr"], "\n"; - return false; - } - - return true; -} - -function is_cvs_user () -{ - if (empty($_COOKIE['MAGIC_COOKIE'])) { - return false; - } - - // 0 = username, 1 = password - $c = explode(':', base64_decode($_COOKIE['MAGIC_COOKIE']), 2); - - if (!verify_password($c[0], $c[1])) { - return false; - } - - return true; -} Modified: web/php-bugs/trunk/include/functions.inc =================================================================== --- web/php-bugs/trunk/include/functions.inc 2009-07-12 21:09:12 UTC (rev 283989) +++ web/php-bugs/trunk/include/functions.inc 2009-07-12 21:18:45 UTC (rev 283990) @@ -139,13 +139,13 @@ $date = date("Y-m-d"); $versions = array( "5.3.0", - "5.3CVS-{$date} (snap)", - "5.3CVS-{$date} (CVS)", + "5.3SVN-{$date} (snap)", + "5.3SVN-{$date} (SVN)", "5.2.10", - "5.2CVS-{$date} (snap)", - "5.2CVS-{$date} (CVS)", - "6CVS-{$date} (snap)", - "6CVS-{$date} (CVS)", + "5.2SVN-{$date} (snap)", + "5.2SVN-{$date} (SVN)", + "6SVN-{$date} (snap)", + "6SVN-{$date} (SVN)", "Irrelevant", ); echo "<option value=\"\">--Please Select--</option>\n"; @@ -511,11 +511,11 @@ $errors[] = "You must supply a long description of the bug you are reporting."; } - if ($initial && !is_cvs_user() && empty($in['passwd'])) { + if ($initial && !is_developer() && empty($in['passwd'])) { $errors[] = "You must supply a password for this bug report."; } - if ($initial && !is_cvs_user() && !validate_captcha()) { + if ($initial && !is_developer() && !validate_captcha()) { $errors[] = 'Incorrect CAPTCHA'; } Modified: web/php-bugs/trunk/include/resolve.inc =================================================================== --- web/php-bugs/trunk/include/resolve.inc 2009-07-12 21:09:12 UTC (rev 283989) +++ web/php-bugs/trunk/include/resolve.inc 2009-07-12 21:18:45 UTC (rev 283990) @@ -3,9 +3,9 @@ $RESOLVE_REASONS = array( 'trysnapshot52' => array( 'status' => 'Feedback', - 'desc' => 'Try a CVS snapshot (PHP 5.2)', + 'desc' => 'Try a snapshot (PHP 5.2)', 'message' => -'Please try using this CVS snapshot: +'Please try using this snapshot: http://snaps.php.net/php5.2-latest.tar.gz @@ -16,9 +16,9 @@ 'trysnapshot53' => array( 'status' => 'Feedback', - 'desc' => 'Try a CVS snapshot (PHP 5.3)', + 'desc' => 'Try a snapshot (PHP 5.3)', 'message' => -'Please try using this CVS snapshot: +'Please try using this snapshot: http://snaps.php.net/php5.3-latest.tar.gz @@ -29,9 +29,9 @@ 'trysnapshot60' => array( 'status' => 'Feedback', - 'desc' => 'Try a CVS snapshot (PHP 6.0)', + 'desc' => 'Try a snapshot (PHP 6.0)', 'message' => -'Please try using this CVS snapshot: +'Please try using this snapshot: http://snaps.php.net/php6.0-latest.tar.gz @@ -40,11 +40,11 @@ http://windows.php.net/snapshots/', ), - 'fixedcvs' => array( + 'fixed' => array( 'status' => 'Closed', - 'desc' => 'Fixed in CVS', + 'desc' => 'Fixed in SVN', 'message' => -'This bug has been fixed in CVS. +'This bug has been fixed in SVN. Snapshots of the sources are packaged every three hours; this change will be in the next snapshot. You can grab the snapshot at @@ -55,9 +55,9 @@ 'needdocs' => array( 'status' => 'To be documented', - 'desc' => 'Fixed in CVS and need be documented', + 'desc' => 'Fixed in SVN and need be documented', 'message' => -'This bug has been fixed in CVS. +'This bug has been fixed in SVN. Snapshots of the sources are packaged every three hours; this change will be in the next snapshot. You can grab the snapshot at @@ -272,11 +272,11 @@ ); $FIX_VARIATIONS = array( - 'fixedcvs' => array( + 'fixed' => array( 'Website problem' => -'This bug has been fixed in CVS. Since the websites are not directly -updated from the CVS server, the fix might need some time to spread +'This bug has been fixed in SVN. Since the websites are not directly +updated from the SVN server, the fix might need some time to spread across the globe to all mirror sites, including PHP.net itself. Thank you for the report, and for helping us make PHP.net better.', @@ -296,15 +296,15 @@ Thank you for the report, and for helping us make our documentation better.', 'Doc Build problem' => -'This bug has been fixed in CVS. Since the websites are not directly -updated from the CVS server, the fix might need some time to spread +'This bug has been fixed in SVN. Since the websites are not directly +updated from the SVN server, the fix might need some time to spread across the globe to all mirror sites, including PHP.net itself. Thank you for the report, and for helping us make PHP.net better.', 'DocWeb problem' => -'This bug has been fixed in CVS. Since the PHP Documentation Tools website -is updated from the CVS repository at a regular interval, the fix might need +'This bug has been fixed in SVN. Since the PHP Documentation Tools website +is updated from the SVN repository at a regular interval, the fix might need some time to take effect. Thank you for the report, and for helping us make DocWeb better.', Modified: web/php-bugs/trunk/index.php =================================================================== --- web/php-bugs/trunk/index.php 2009-07-12 21:09:12 UTC (rev 283989) +++ web/php-bugs/trunk/index.php 2009-07-12 21:18:45 UTC (rev 283990) @@ -20,8 +20,8 @@ <li>Used the form above or our <a href="search.php">advanced search page</a> to make sure nobody has reported the bug already.</li> -<li>Made sure you are using the latest stable version or a build from CVS, if -similar bugs have recently been fixed and committed. You can download CVS +<li>Made sure you are using the latest stable version or a build from SVN, if +similar bugs have recently been fixed and committed. You can download snapshots at <a href="http://snaps.php.net/">http://snaps.php.net</a></li> <li>Read our tips on <a href="how-to-report.php">how to report Modified: web/php-bugs/trunk/report.php =================================================================== --- web/php-bugs/trunk/report.php 2009-07-12 21:09:12 UTC (rev 283989) +++ web/php-bugs/trunk/report.php 2009-07-12 21:18:45 UTC (rev 283990) @@ -6,7 +6,7 @@ session_start(); require_once 'prepend.inc'; -require_once 'cvs-auth.inc'; +require_once 'auth.inc'; /* When user submits a report, do a search and display the results before allowing * them to continue */ @@ -67,7 +67,7 @@ <p>If you're sure that your report is a genuine bug that has not been reported before, you can scroll down and click the submit button to really enter the details into our database. </p> -<p>Please do not report compile errors for HEAD snapshots (currently 6CVS) via our bug +<p>Please do not report compile errors for HEAD snapshots (currently 6SVN) via our bug tracking system. If the same compile error persists for some time, please drop a mail to our <a href="http://www.php.net/mailing-lists.php">internals</a> list.</p> @@ -241,7 +241,7 @@ extensions (APC, eAccelerator, Turck MMCache, ionCube loader, Xcache, Xdebug) before submitting a *PHP* bug.</strong></p> -<p>Do not report compile errors in HEAD versions (currently 6CVS). If a compile error persists, please drop a mail +<p>Do not report compile errors in HEAD versions (currently 6SVN). If a compile error persists, please drop a mail to our <a href="http://www.php.net/mailing-lists.php">internals mailing list</a>.</p> <p><strong>Failure to follow these instructions may result in your bug @@ -288,7 +288,7 @@ </td></tr> </tr> <?php - if (!is_cvs_user()) { + if (!is_developer()) { ?> <tr> <th align="right">Password:</th> @@ -306,7 +306,7 @@ ?> <tr> <?php - if (is_cvs_user()) { + if (is_developer()) { ?> <th align="right">User:</th> <td colspan="2">