Commit: 180dccfe9d47aee09f93c7cbfd144677e17b3380 Author: Peter Kokot <peterko...@gmail.com> Wed, 17 Oct 2018 15:41:36 +0200 Parents: a47cb31dfb0595d753d361407b38efcef413bcef Branches: master
Link: http://git.php.net/?p=web/bugs.git;a=commitdiff;h=180dccfe9d47aee09f93c7cbfd144677e17b3380 Log: Trim trailing whitespace Changed paths: M include/classes/bug_diff_renderer.php M include/classes/bug_patchtracker.php M include/classes/bug_pdo.php M include/query.php M include/trusted-devs.php M scripts/cron/email-assigned M scripts/cron/no-feedback M templates/listpatches.php M www/admin/index.php M www/api.php M www/bug-pwd-finder.php M www/bug.php M www/bugs-generating-backtrace-win32.php M www/bugs-generating-backtrace.php M www/bugs-getting-valgrind-log.php M www/css/style.css M www/fix.php M www/gh-pull-add.php M www/how-to-report.php M www/index.php M www/js/Markdown.Converter.js M www/js/Markdown.Sanitizer.js M www/js/search.js M www/login.php M www/lstats.php M www/patch-add.php M www/quick-fix-desc.php M www/report.php M www/rpc.php M www/rss/rdf.php M www/rss/rss.php M www/search-howto.php
diff --git a/include/classes/bug_diff_renderer.php b/include/classes/bug_diff_renderer.php index 3feaef0..aec6809 100644 --- a/include/classes/bug_diff_renderer.php +++ b/include/classes/bug_diff_renderer.php @@ -46,7 +46,7 @@ class Bug_Diff_Renderer extends Text_Diff_Renderer array_walk($lines, create_function('&$a,$b', '$a=htmlspecialchars($a);')); return "\n" . parent::_context($lines); } - + function _deleted($lines) { array_walk($lines, create_function('&$a,$b', '$a=htmlspecialchars($a);')); diff --git a/include/classes/bug_patchtracker.php b/include/classes/bug_patchtracker.php index 8091303..39a79d5 100644 --- a/include/classes/bug_patchtracker.php +++ b/include/classes/bug_patchtracker.php @@ -142,7 +142,7 @@ class Bug_Patchtracker if (PEAR::isError($file)) { return $file; } - + if ($file->isValid()) { $newobsoletes = array(); foreach ($obsoletes as $who) { @@ -191,7 +191,7 @@ class Bug_Patchtracker $mime = $t[0]; } else // NOTE: I didn't have PHP 5.3 around with fileinfo enabled :) - { + { $mime = 'text/plain'; } if (!in_array($mime, $allowed_mime_types)) { diff --git a/include/classes/bug_pdo.php b/include/classes/bug_pdo.php index 57f70d9..f5e8efa 100644 --- a/include/classes/bug_pdo.php +++ b/include/classes/bug_pdo.php @@ -1,8 +1,8 @@ <?php /** * Thin compatibility layer between MDB2 and PDO for bugs.php.net. - * - * Please mind that it's not meant to implement full feature set, + * + * Please mind that it's not meant to implement full feature set, * but only this used by our existing codebase. New code interacting * with the database should be written using standard PDO's approach. * diff --git a/include/query.php b/include/query.php index bd6b6f3..8486b41 100644 --- a/include/query.php +++ b/include/query.php @@ -62,7 +62,7 @@ if (isset($_GET['cmd']) && $_GET['cmd'] == 'display') UNIX_TIMESTAMP(ts2) AS modified FROM bugdb '; - + if (in_array($order_by, array('votes_count', 'avg_score'))) { $query .= 'LEFT JOIN bugdb_votes v ON bugdb.id = v.bug'; } @@ -70,14 +70,14 @@ if (isset($_GET['cmd']) && $_GET['cmd'] == 'display') if ($commented_by != '') { $query .= ' LEFT JOIN bugdb_comments c ON bugdb.id = c.bug'; } - + $where_clause = ' WHERE 1 = 1 '; - + if (isset($user_flags) && ($user_flags & (BUGS_SECURITY_DEV | BUGS_TRUSTED_DEV))) { if ($private != '') { $where_clause .= ' AND bugdb.private = "Y" '; } - } else { + } else { /* Non trusted developer should see the Security related bug report just when it is public */ $where_clause .= ' AND (bugdb.bug_type <> "Security" OR private = "N") '; } @@ -172,11 +172,11 @@ if (isset($_GET['cmd']) && $_GET['cmd'] == 'display') if ($phpver != '') { $where_clause .= " AND bugdb.php_version LIKE '" . $dbh->escape($phpver) . "%'"; } - + if ($project != '') { $where_clause .= " AND EXISTS (SELECT 1 FROM bugdb_pseudo_packages b WHERE b.name = bugdb.package_name AND b.project = '". $dbh->escape($project) ."' LIMIT 1)"; } - + if ($cve_id != '') { $where_clause .= " AND bugdb.cve_id {$cve_id_not} LIKE '" . $dbh->escape($cve_id) . "%'"; } @@ -228,11 +228,11 @@ if (isset($_GET['cmd']) && $_GET['cmd'] == 'display') $order_by = $reorder_by; } } - + $order_by_clauses = array(); if (in_array($order_by, array('votes_count', 'avg_score'))) { $query .= ' GROUP BY bugdb.id'; - + switch ($order_by) { case 'avg_score': $order_by_clauses = array( diff --git a/include/trusted-devs.php b/include/trusted-devs.php index 59427ca..b7ced1f 100644 --- a/include/trusted-devs.php +++ b/include/trusted-devs.php @@ -15,8 +15,8 @@ $trusted_developers = array( 'pajoye', 'laruence', 'zeev', - 'pollita', - 'kalle', + 'pollita', + 'kalle', 'danbrown', 'nikic', ); @@ -67,8 +67,8 @@ $security_developers = array( 'nikic', 'leigh', 'kalle', - 'cmb', - 'danbrown', + 'cmb', + 'danbrown', 'yohgaki' ); diff --git a/scripts/cron/email-assigned b/scripts/cron/email-assigned index 61200b4..3a654cf 100755 --- a/scripts/cron/email-assigned +++ b/scripts/cron/email-assigned @@ -8,8 +8,8 @@ require __DIR__ . '/../../include/prepend.php'; is a little odd that way. 'No Feedback' was once a part of this, but no longer: http://news.php.net/php.webmaster/8828 */ -$sql = "SELECT id, package_name, bug_type, sdesc, status, assign, UNIX_TIMESTAMP(ts1) AS ts_opened, UNIX_TIMESTAMP(ts2) AS ts_changed - FROM `bugdb` +$sql = "SELECT id, package_name, bug_type, sdesc, status, assign, UNIX_TIMESTAMP(ts1) AS ts_opened, UNIX_TIMESTAMP(ts2) AS ts_changed + FROM `bugdb` WHERE length(assign) > 1 AND status IN ('Assigned', 'Open', 'Re-Opened', 'Feedback', 'Analyzed', 'Verified', 'Critical', 'Suspended') ORDER BY id"; diff --git a/scripts/cron/no-feedback b/scripts/cron/no-feedback index 335c472..cc658c9 100755 --- a/scripts/cron/no-feedback +++ b/scripts/cron/no-feedback @@ -11,7 +11,7 @@ $after = "7 DAY"; # Set "input" array $in = array('status' => 'No Feedback'); -# Update relevant reports +# Update relevant reports if ($dbh) { list($RESOLVE_REASONS, $FIX_VARIATIONS) = get_resolve_reasons($site); @@ -43,7 +43,7 @@ if ($dbh) // Update status $dbh->prepare(' UPDATE bugdb - SET status = "No Feedback", ts2 = NOW() + SET status = "No Feedback", ts2 = NOW() WHERE id = ? ')->execute(array( $bug['id'], diff --git a/templates/listpatches.php b/templates/listpatches.php index fc6ef33..325f907 100644 --- a/templates/listpatches.php +++ b/templates/listpatches.php @@ -9,7 +9,7 @@ <?php } ?> </td> </tr> -<?php +<?php foreach ($patches as $fpa) { $fixed[$fpa['patch']][] = [ $fpa['revision'], $fpa['developer'] ]; } foreach ($fixed as $pname => $revs) { ?> <tr> diff --git a/www/admin/index.php b/www/admin/index.php index cfb1da8..3b047b9 100644 --- a/www/admin/index.php +++ b/www/admin/index.php @@ -11,8 +11,8 @@ if (!$logged_in) { } $actions = array( - 'phpinfo' => 'phpinfo()', - 'list_lists' => 'Package mailing lists', + 'phpinfo' => 'phpinfo()', + 'list_lists' => 'Package mailing lists', 'list_responses' => 'Quick fix responses', 'mysql' => 'Database status', ); @@ -30,8 +30,8 @@ if ($action === 'phpinfo') { // Attempt to hide certain ENV vars $vars = array( - getenv('AUTH_TOKEN'), - getenv('USER_TOKEN'), + getenv('AUTH_TOKEN'), + getenv('USER_TOKEN'), getenv('USER_PWD_SALT') ); diff --git a/www/api.php b/www/api.php index e5c50c2..53228ff 100644 --- a/www/api.php +++ b/www/api.php @@ -13,11 +13,11 @@ $interval = isset($_GET['interval']) ? (int) $_GET['interval'] : 7; if ($type === 'docs' && $action === 'closed' && $interval) { - $query = + $query = " SELECT bugdb_comments.reporter_name, COUNT(*) as count - FROM bugdb_comments, bugdb - WHERE comment_type = 'log' + FROM bugdb_comments, bugdb + WHERE comment_type = 'log' AND (package_name IN ('Doc Build problem', 'Documentation problem', 'Translation problem', 'Online Doc Editor problem') OR bug_type = 'Documentation Problem') AND comment LIKE '%+Status: Closed</span>%' AND date_sub(curdate(), INTERVAL {$interval} DAY) <= ts @@ -25,18 +25,18 @@ if ($type === 'docs' && $action === 'closed' && $interval) { GROUP BY bugdb_comments.reporter_name ORDER BY count DESC "; - + //@todo add error handling $rows = $dbh->prepare($query)->execute(array())->fetchAll(MDB2_FETCHMODE_ASSOC); if (!$rows) { echo 'The fail train has arrived.'; exit; } - + echo serialize($rows); } else { - + echo "Unknown action"; - + } diff --git a/www/bug-pwd-finder.php b/www/bug-pwd-finder.php index 2c180f0..f7a6ac6 100644 --- a/www/bug-pwd-finder.php +++ b/www/bug-pwd-finder.php @@ -37,13 +37,13 @@ if (isset($_POST['captcha']) && $bug_id != '') { $errors[] = "No password found for #$bug_id bug report, sorry."; } else { $new_passwd = bugs_gen_passwd(); - + $dbh->prepare( 'UPDATE bugdb SET passwd = ? WHERE id = ? ')->execute(array(bugs_get_hash($new_passwd), $bug_id)); - + $resp = bugs_mail($row['email'], "Password for {$siteBig} bug report #{$bug_id}", "The password for {$siteBig} bug report #{$bug_id} has been set to: {$new_passwd}", @@ -74,7 +74,7 @@ if ($success) { $captcha = $numeralCaptcha->getOperation(); $_SESSION['answer'] = $numeralCaptcha->getAnswer(); - + ?> <p> @@ -91,7 +91,7 @@ in the bug report. <form method="post" action="bug-pwd-finder.php"> <p><b>Bug Report ID:</b> #<input type="text" size="20" name="id" value="<?php echo $bug_id; ?>"> <p><b>Solve the problem:<br><?php echo $captcha; ?> = ? <input type="text" name="captcha"></p> - + <input type="submit" value="Send"></p> </form> diff --git a/www/bug.php b/www/bug.php index 6f07dec..79be771 100644 --- a/www/bug.php +++ b/www/bug.php @@ -235,7 +235,7 @@ if (isset($_POST['ncomment']) && !isset($_POST['preview']) && $edit == 3) { } $res = bugs_add_comment($bug_id, $_POST['in']['commentemail'], $_POST['in']['name'], $ncomment, 'comment'); - + mark_related_bugs($_POST['in']['commentemail'], $_POST['in']['name'], $ncomment); } while (false); @@ -251,16 +251,16 @@ if (isset($_POST['ncomment']) && !isset($_POST['preview']) && $edit == 3) { if (is_spam($ncomment)) { $errors[] = SPAM_REJECT_MESSAGE; } - + $from = $_POST['in']['commentemail']; - + } elseif (isset($_POST['in']) && !isset($_POST['preview']) && $edit == 2) { // Edits submitted by original reporter for old bugs - + if (!$show_bug_info || !verify_bug_passwd($bug_id, bugs_get_hash($pw))) { $errors[] = 'The password you supplied was incorrect.'; } - + // Bug is private (just should be available to trusted developers, original reporter and assigned dev) if (!$show_bug_info && $bug['private'] == 'Y') { response_header('Private report'); @@ -268,13 +268,13 @@ if (isset($_POST['ncomment']) && !isset($_POST['preview']) && $edit == 3) { response_footer(); exit; } - + // Just trusted dev can change the package name of a Security related bug to another package if ($bug['private'] == 'Y' && !$is_security_developer && $bug['bug_type'] == 'Security' && $_POST['in']['bug_type'] != $bug['bug_type']) { - - $errors[] = 'You cannot change the bug type of a Security bug!'; + + $errors[] = 'You cannot change the bug type of a Security bug!'; } $ncomment = trim($_POST['ncomment']); @@ -315,10 +315,10 @@ if (isset($_POST['ncomment']) && !isset($_POST['preview']) && $edit == 3) { // the report as private if ($bug['private'] == 'N' && $_POST['in']['bug_type'] == 'Security' && $_POST['in']['bug_type'] != $bug['bug_type']) { - + $is_private = $_POST['in']['private'] = 'Y'; } - + $dbh->prepare(" UPDATE bugdb SET @@ -352,11 +352,11 @@ if (isset($_POST['ncomment']) && !isset($_POST['preview']) && $edit == 3) { $res = bugs_add_comment($bug_id, $from, '', $log_comment, 'log'); } } - + // Add normal comment if (!empty($ncomment)) { $res = bugs_add_comment($bug_id, $from, '', $ncomment, 'comment'); - + mark_related_bugs($from, '', $ncomment); } } @@ -371,7 +371,7 @@ if (isset($_POST['ncomment']) && !isset($_POST['preview']) && $edit == 3) { } elseif (isset($_POST['in']) && is_array($_POST['in']) && !isset($_POST['preview']) && $edit == 1) { // Edits submitted by developer - + // Bug is private (just should be available to trusted developers, submitter and assigned dev) if (!$show_bug_info && $bug['private'] == 'Y') { response_header('Private report'); @@ -379,7 +379,7 @@ if (isset($_POST['ncomment']) && !isset($_POST['preview']) && $edit == 3) { response_footer(); exit; } - + if ($logged_in != 'developer') { $errors[] = 'You have to login first in order to edit the bug report.'; } @@ -394,7 +394,7 @@ if (isset($_POST['ncomment']) && !isset($_POST['preview']) && $edit == 3) { if ($ncomment && is_spam($ncomment)) { $errors[] = SPAM_REJECT_MESSAGE; } - + // Just trusted dev can set CVE-ID if ($is_security_developer && !empty($_POST['in']['cve_id'])) { // Remove the CVE- prefix @@ -403,7 +403,7 @@ if (isset($_POST['ncomment']) && !isset($_POST['preview']) && $edit == 3) { if (empty($_POST['in']['cve_id'])) { $_POST['in']['cve_id'] = $bug['cve_id']; } - + if ($bug['private'] == 'N' && $bug['private'] != $is_private) { if ($_POST['in']['bug_type'] != 'Security') { $errors[] = 'Only Security bugs can be marked as private.'; @@ -468,7 +468,7 @@ if (isset($_POST['ncomment']) && !isset($_POST['preview']) && $edit == 3) { if ($bug['email'] != $_POST['in']['email'] && !empty($_POST['in']['email'])) { $query .= " email='{$_POST['in']['email']}',"; } - + // Changing the package to 'Security related' should mark the bug as private automatically if ($bug['bug_type'] != $_POST['in']['bug_type']) { if ($_POST['in']['bug_type'] == 'Security' && $_POST['in']['status'] != 'Closed') { @@ -494,8 +494,8 @@ if (isset($_POST['ncomment']) && !isset($_POST['preview']) && $edit == 3) { } $dbh->prepare($query . " - sdesc = ?, - status = ?, + sdesc = ?, + status = ?, package_name = ?, bug_type = ?, assign = ?, @@ -532,7 +532,7 @@ if (isset($_POST['ncomment']) && !isset($_POST['preview']) && $edit == 3) { // Add normal comment if (!empty($ncomment)) { $res = bugs_add_comment($bug_id, $from, $comment_name, $ncomment, 'comment'); - + mark_related_bugs($from, $comment_name, $ncomment); } } @@ -674,7 +674,7 @@ if (!$show_bug_info) { <th class="details">OS:</th> <td><?php echo htmlspecialchars($bug['php_os']); ?></td> </tr> - + <tr id="private"> <th class="details">Private report:</th> <td><?php echo $bug['private'] == 'Y' ? 'Yes' : 'No'; ?></td> @@ -743,7 +743,7 @@ if ($bug_id !== 'PREVIEW') { </div> </form> <br clear="all"> -<?php } +<?php } } // if ($bug_id != 'PREVIEW') { @@ -950,18 +950,18 @@ if ($edit == 1 || $edit == 2) { ?> </form> <?php } // if ($show_bug_info) -} // if ($edit == 1 || $edit == 2) +} // if ($edit == 1 || $edit == 2) ?> -<?php - if ($edit == 3 && $bug['private'] == 'N') { - +<?php + if ($edit == 3 && $bug['private'] == 'N') { + if ($bug['status'] === 'Spam') { echo 'This bug has a SPAM status, so no additional comments are needed.'; response_footer(); exit; } - + ?> <form name="comment" id="comment" action="bug.php" method="post"> @@ -1061,7 +1061,7 @@ if ($show_bug_info && $bug_id != 'PREVIEW' && $bug['status'] !== 'Spam') { require_once "{$ROOT_DIR}/include/classes/bug_patchtracker.php"; $patches = new Bug_Patchtracker; $p = $patches->listPatches($bug_id); - $revs = []; + $revs = []; echo "<h2>Patches</h2>\n"; foreach ($p as $patch) { @@ -1118,7 +1118,7 @@ if ($show_bug_info && is_array($bug_comments) && count($bug_comments) && $bug['s $class_extra = ($id == $active_history_tab) ? 'active' : ''; echo "<span id='{$id}' class='control {$class_extra}' onclick='do_comment(this);'>{$label}</span>"; } - + echo ' </div> '; @@ -1194,7 +1194,7 @@ function mark_related_bugs($from, $comment_name, $ncomment) global $bug_id; $related = get_ticket_links($ncomment); - + /** * Adds a new comment on the related bug pointing to the current report */ @@ -1245,7 +1245,7 @@ function output_note($com_id, $ts, $email, $comment, $comment_type, $comment_nam function delete_comment($bug_id, $com_id) { global $dbh; - + $dbh->prepare("DELETE FROM bugdb_comments WHERE bug='{$bug_id}' AND id='{$com_id}'")->execute(); } diff --git a/www/bugs-generating-backtrace-win32.php b/www/bugs-generating-backtrace-win32.php index d52ec5c..18acf3d 100644 --- a/www/bugs-generating-backtrace-win32.php +++ b/www/bugs-generating-backtrace-win32.php @@ -26,8 +26,8 @@ extensions into your extension directory.</p> <p>If you compile PHP by your own, you can also use a newer version of MSVC.</p> -<p>When PHP crashes, click <em>Cancel</em> to debug the process. Now MSVC starts -up in <em>Debug View</em>. If you don't already see the call stack, go into the +<p>When PHP crashes, click <em>Cancel</em> to debug the process. Now MSVC starts +up in <em>Debug View</em>. If you don't already see the call stack, go into the <em>View</em> menu and choose <em>Debug Windows</em> → <em>Call Stack</em>.</p> <p>You'll now see something similar to the following lines, this is the backtrace:</p> @@ -97,4 +97,4 @@ selection.</p> <p>What we need is the backtrace itself which can be found under "Thread X - System ID XXX".</p> <?php response_footer(); - + diff --git a/www/bugs-generating-backtrace.php b/www/bugs-generating-backtrace.php index 1cb1b05..caed58f 100644 --- a/www/bugs-generating-backtrace.php +++ b/www/bugs-generating-backtrace.php @@ -64,13 +64,13 @@ PHP configured with <code>--enable-debug</code>! </ul> </li> <li> - Set the ulimit (see above how to do it). + Set the ulimit (see above how to do it). </li> <li> Restart/rerun PHP. </li> </ul> -<p>After that any process crashing in your system, including PHP, will leave +<p>After that any process crashing in your system, including PHP, will leave its core file in the directory you've specified in <i>core_pattern</i>.</p> <h3>Once you have the core file:</h3> @@ -171,7 +171,7 @@ $14 = 0x80fa6fa "pg_result_error" $15 = 0x816cfc4 "result_error" (gdb) print (char *)executor_globals.active_op_array->filename $16 = 0x816afbc "/home/yohgaki/php/DEV/segfault.php" -(gdb) +(gdb) </code></pre> </ul> diff --git a/www/bugs-getting-valgrind-log.php b/www/bugs-getting-valgrind-log.php index 1a5c821..3dc9b3e 100644 --- a/www/bugs-getting-valgrind-log.php +++ b/www/bugs-getting-valgrind-log.php @@ -14,22 +14,22 @@ response_header('Generating a valgrind log'); <h3>Important!</h3> To get a meaningful log you must have -PHP configured with <code>--enable-debug</code> +PHP configured with <code>--enable-debug</code> and disable Zend memory manager. <h3>Disabling Zend MM</h3> <p> - Zend Engine uses its own routines to optimize memory management, + Zend Engine uses its own routines to optimize memory management, but because of this valgrind cannot see most of the memory issues. You must disable Zend memory manager before running PHP with valgrind. In order to do this you need to set USE_ZEND_ALLOC environment - variable to 0. + variable to 0. </p> <p> Use - <pre><code>export USE_ZEND_ALLOC=0</code></pre> or - <pre><code>setenv USE_ZEND_ALLOC 0</code></pre> (the syntax depends on + <pre><code>export USE_ZEND_ALLOC=0</code></pre> or + <pre><code>setenv USE_ZEND_ALLOC 0</code></pre> (the syntax depends on what your shell supports). </p> <p> @@ -42,8 +42,8 @@ and disable Zend memory manager. <p> To correctly show the stack frames for extensions compiled as shared libraries, set: - <pre><code>export ZEND_DONT_UNLOAD_MODULES=1</code></pre> or - <pre><code>setenv ZEND_DONT_UNLOAD_MODULES 1</code></pre> (the syntax depends on + <pre><code>export ZEND_DONT_UNLOAD_MODULES=1</code></pre> or + <pre><code>setenv ZEND_DONT_UNLOAD_MODULES 1</code></pre> (the syntax depends on what your shell supports). </p> @@ -54,8 +54,8 @@ and disable Zend memory manager. <h3>Running PHP CLI, Built-in Web Server or PHP CGI through valgrind</h3> <p> - To generate the valgrind log using PHP CLI/CGI, - you need to execute the following command: + To generate the valgrind log using PHP CLI/CGI, + you need to execute the following command: </p> <pre> @@ -77,9 +77,9 @@ and disable Zend memory manager. <h3>Running PHP Apache module through valgrind</h3> <p> - If you compiled PHP and Apache statically, make sure the Apache binary - is not stripped after <code>make install</code>, otherwise you lose - the required debug info. To check it, run <code>file /path/to/httpd</code>, + If you compiled PHP and Apache statically, make sure the Apache binary + is not stripped after <code>make install</code>, otherwise you lose + the required debug info. To check it, run <code>file /path/to/httpd</code>, it should output something like this (notice "not stripped"): </p> <pre> @@ -90,8 +90,8 @@ and disable Zend memory manager. </pre> <p> - To generate the valgrind log using PHP as Apache module, - you need to run the Apache itself under valgrind: + To generate the valgrind log using PHP as Apache module, + you need to run the Apache itself under valgrind: </p> <pre> diff --git a/www/css/style.css b/www/css/style.css index 45951b7..6c6d5da 100644 --- a/www/css/style.css +++ b/www/css/style.css @@ -198,7 +198,7 @@ td.form-input_center { background-color: #e8e8e8; } -td.form-input input, +td.form-input input, td.form-input_center input { font-size: 90%; } @@ -801,7 +801,7 @@ td.search-next { overflow: auto; margin: -6px 6px 6px -6px; /* IE6 specific: */ - _height:350px; + _height:350px; _margin:0; _overflow-x:hidden; } diff --git a/www/fix.php b/www/fix.php index 825e9ff..2834805 100644 --- a/www/fix.php +++ b/www/fix.php @@ -93,7 +93,7 @@ if ($logged_in == 'developer') { <tr> <th>Note:</th> <td colspan="5"><textarea cols="80" rows="8" name="ncomment" wrap="physical"><?php echo htmlspecialchars($ncomment); ?></textarea></td> - </tr> + </tr> </table> <input type="submit" value="Resolve"> </form> diff --git a/www/gh-pull-add.php b/www/gh-pull-add.php index f9babd0..8a32472 100644 --- a/www/gh-pull-add.php +++ b/www/gh-pull-add.php @@ -118,7 +118,7 @@ TXT; $res = bugs_add_comment($bug_id, $auth_user->email, $auth_user->name, $text, 'patch'); - // Send emails + // Send emails mail_bug_updates($buginfo, $buginfo, $auth_user->email, $text, 4, $bug_id); */ $pulls = $pullinfo->listPulls($bug_id); diff --git a/www/how-to-report.php b/www/how-to-report.php index 2b84efd..68bf6ed 100644 --- a/www/how-to-report.php +++ b/www/how-to-report.php @@ -88,7 +88,7 @@ as a feature request.)</p> can be found <a href="bugs-generating-backtrace.php">here for *NIX users</a> and <a href="bugs-generating-backtrace-win32.php">here for Windows users</a>. </li> - <li> + <li> <a href="http://valgrind.org">Valgrind</a> log can be also very useful. See <a href="bugs-getting-valgrind-log.php">instructions how to generate it</a>. </li> @@ -126,7 +126,7 @@ with the different bugs.</p> To Ask Questions The Smart Way</a> </li> <li> - mozilla.org's + mozilla.org's <a href="https://developer.mozilla.org/en-US/docs/Mozilla/QA/Bug_writing_guidelines">bug writing guidelines</a> </li> diff --git a/www/index.php b/www/index.php index 15acf27..bd91baa 100644 --- a/www/index.php +++ b/www/index.php @@ -42,7 +42,7 @@ if (bugid > 0) { <ul> <li> - Used the form above or our <a href="search.php">advanced search page</a> + Used the form above or our <a href="search.php">advanced search page</a> to make sure nobody has reported the bug already. </li> @@ -58,13 +58,13 @@ if (bugid > 0) { <li> Read the <a href="https://wiki.php.net/security">security guidelines</a>, if you think an issue might be security related. </li> - + <li> - See how to get a backtrace in case of a crash: + See how to get a backtrace in case of a crash: <a href="bugs-generating-backtrace.php">for *NIX</a> and <a href="bugs-generating-backtrace-win32.php">for Windows</a>. </li> - + <li> Make sure it isn't a support question. For support, see the <a href="http://www.php.net/support.php">support page</a>. @@ -80,12 +80,12 @@ page</a>.</p> <p>You can search all of the bugs that have been reported on our <a href="search.php">advanced search page</a>, or use the form -at the top of the page for a basic default search. Read the -<a href="search-howto.php">search howto</a> for instructions on +at the top of the page for a basic default search. Read the +<a href="search-howto.php">search howto</a> for instructions on how search works.</p> <p>If you have 10 minutes to kill and you want to help us out, grab a -random open bug and see if you can help resolve it. We have made it +random open bug and see if you can help resolve it. We have made it easy. Hit <a href="<?php echo $site_method?>://<?php echo $site_url?>/random"> <?php echo $site_method?>://<?php echo $site_url?>/random</a> to go directly to a random open bug.</p> @@ -94,7 +94,7 @@ to a random open bug.</p> <ul> <?php $base_default = "{$site_method}://{$site_url}/search.php?limit=30&order_by=id&direction=DESC&cmd=display&status=Open"; - + $searches = array( 'Most recent open bugs (all)' => '&bug_type=All', 'Most recent open bugs (all) with patch or pull request' => '&bug_type=All&patch=Y&pull=Y', diff --git a/www/js/Markdown.Converter.js b/www/js/Markdown.Converter.js index d01f1ab..cfec79e 100644 --- a/www/js/Markdown.Converter.js +++ b/www/js/Markdown.Converter.js @@ -4,7 +4,7 @@ if (typeof exports === "object" && typeof require === "function") // we're in a Markdown = exports; else Markdown = {}; - + // The following text is included for historical reasons, but should // be taken with a pinch of salt; it's not all true anymore. @@ -133,7 +133,7 @@ else // Don't do that. if (g_urls) throw new Error("Recursive call to converter.makeHtml"); - + // Create the private state objects. g_urls = new SaveHash(); g_titles = new SaveHash(); @@ -305,7 +305,7 @@ else text = text.replace(/^(<(p|div|h[1-6]|blockquote|pre|table|dl|ol|ul|script|noscript|form|fieldset|iframe|math)\b[^\r]*?.*<\/\2>[ \t]*(?=\n+)\n)/gm, hashElement); // Special case just for <hr />. It was easier to make a special case than - // to make the other regex more complicated. + // to make the other regex more complicated. /* text = text.replace(/ @@ -425,9 +425,9 @@ else // Must come after _DoAnchors(), because you can use < and > // delimiters in inline links like [this](<url>). text = _DoAutoLinks(text); - + text = text.replace(/~P/g, "://"); // put in place to prevent autolinking; reset now - + text = _EncodeAmpsAndAngles(text); text = _DoItalicsAndBold(text); @@ -443,7 +443,7 @@ else // don't conflict with their use in Markdown for code, italics and strong. // - // Build a regex to find HTML tags and comments. See Friedl's + // Build a regex to find HTML tags and comments. See Friedl's // "Mastering Regular Expressions", 2nd Ed., pp. 200-201. // SE: changed the comment part of the regex @@ -517,7 +517,7 @@ else | [^()] )*? - )>? + )>? [ \t]* ( // $5 (['"]) // quote char = $6 @@ -656,7 +656,7 @@ else return text; } - + function attributeEncode(text) { // unconditionally replace angle brackets here -- what ends up in an attribute (e.g. alt or title) // never makes sense to have verbatim HTML in it (and the sanitizer would totally break it) @@ -689,7 +689,7 @@ else return whole_match; } } - + alt_text = escapeCharacters(attributeEncode(alt_text), "*_[]()"); url = escapeCharacters(url, "*_"); var result = "<img src=\"" + url + "\" alt=\"" + alt_text + "\""; @@ -713,7 +713,7 @@ else // Setext-style headers: // Header 1 // ======== - // + // // Header 2 // -------- // @@ -872,7 +872,7 @@ else // // We changed this to behave identical to MarkdownSharp. This is the constructed RegEx, // with {MARKER} being one of \d+[.] or [*+-], depending on list_type: - + /* list_str = list_str.replace(/ (^[ \t]*) // leading whitespace = $1 @@ -920,7 +920,7 @@ else function _DoCodeBlocks(text) { // // Process Markdown `<pre><code>` blocks. - // + // /* text = text.replace(/ @@ -968,26 +968,26 @@ else function _DoCodeSpans(text) { // // * Backtick quotes are used for <code></code> spans. - // + // // * You can use multiple backticks as the delimiters if you want to // include literal backticks in the code span. So, this input: - // + // // Just type ``foo `bar` baz`` at the prompt. - // + // // Will translate to: - // + // // <p>Just type <code>foo `bar` baz</code> at the prompt.</p> - // + // // There's no arbitrary limit to the number of backticks you // can use as delimters. If you need three consecutive backticks // in your code, use four for delimiters, etc. // // * You can use spaces to get literal backticks at the edges: - // + // // ... type `` `bar` `` ... - // + // // Turns to: - // + // // ... type <code>`bar`</code> ... // @@ -1120,7 +1120,7 @@ else var grafs = text.split(/\n{2,}/g); var grafsOut = []; - + var markerRe = /~K(\d+)K/; // @@ -1201,11 +1201,11 @@ else // *except* for the <http://www.foo.com> case // automatically add < and > around unadorned raw hyperlinks - // must be preceded by space/BOF and followed by non-word/EOF character + // must be preceded by space/BOF and followed by non-word/EOF character text = text.replace(/(^|\s)(https?|ftp)(:\/\/[-A-Z0-9+&@#\/%?=~_|\[\]\(\)!:,\.;]*[-A-Z0-9+&@#\/%=~_|\[\]])($|\W)/gi, "$1<$2$3>$4"); // autolink anything like <http://example.com> - + var replacer = function (wholematch, m1) { return "<a href=\"" + m1 + "\">" + pluginHooks.plainLinkText(m1) + "</a>"; } text = text.replace(/<((https?|ftp):[^'">\s]+)>/gi, replacer); @@ -1287,7 +1287,7 @@ else var _problemUrlChars = /(?:["'*()[\]:]|~D)/g; - // hex-encodes some unusual "problem" chars in URLs to avoid URL detection problems + // hex-encodes some unusual "problem" chars in URLs to avoid URL detection problems function encodeProblemUrlChars(url) { if (!url) return ""; diff --git a/www/js/Markdown.Sanitizer.js b/www/js/Markdown.Sanitizer.js index cc5826f..c3283e5 100644 --- a/www/js/Markdown.Sanitizer.js +++ b/www/js/Markdown.Sanitizer.js @@ -7,7 +7,7 @@ output = window.Markdown; Converter = output.Converter; } - + output.getSanitizingConverter = function () { var converter = new Converter(); converter.hooks.chain("postConversion", sanitizeHtml); @@ -37,9 +37,9 @@ /// <summary> /// attempt to balance HTML tags in the html string /// by removing any unmatched opening or closing tags - /// IMPORTANT: we *assume* HTML has *already* been + /// IMPORTANT: we *assume* HTML has *already* been /// sanitized and is safe/sane before balancing! - /// + /// /// adapted from CODESNIPPET: A8591DBA-D1D3-11DE-947C-BA5556D89593 /// </summary> function balanceTags(html) { diff --git a/www/js/search.js b/www/js/search.js index 4692541..da9496b 100644 --- a/www/js/search.js +++ b/www/js/search.js @@ -7,8 +7,8 @@ var fnFormatSearchResult = function(value, data, currentValue) { return '<img src="https://secure.gravatar.com/avatar/' + users[value]["email"] + '.jpg?s=25"> ' + listing; }; -$('#assigned_user').autocomplete({ - minChars:2, +$('#assigned_user').autocomplete({ + minChars:2, maxHeight:400, width:300, fnFormatResult: fnFormatSearchResult, diff --git a/www/login.php b/www/login.php index dc7bd38..3aec62a 100644 --- a/www/login.php +++ b/www/login.php @@ -12,7 +12,7 @@ response_header('Login'); if (isset($_POST['user'])) { $referer = $_POST['referer']; - + bugs_authenticate($user, $pwd, $logged_in, $user_flags); if ($logged_in === 'developer') { diff --git a/www/lstats.php b/www/lstats.php index 4ae69a5..d8a8ae2 100644 --- a/www/lstats.php +++ b/www/lstats.php @@ -10,7 +10,7 @@ function status_print ($status, $num, $width, $align = STR_PAD_LEFT) function get_status_count ($status, $category = '') { global $phpver, $dbh; - + $query = "SELECT count(id) from bugdb WHERE"; if ($phpver > 0) { @@ -33,20 +33,20 @@ function get_status_count ($status, $category = '') return $row[0]; } -// Input +// Input $phpver = (isset($_GET['phpver']) ? (int) $_GET['phpver'] : false); if (!$phpver || ($phpver !== 5 && $phpver !== 7)) { - echo "<h3>Bug stats for both <a href='lstats.php?phpver=5'>PHP 5</a> and <a href='lstats.php?phpver=7'>PHP 7</a>:</h3>\n<pre>\n"; + echo "<h3>Bug stats for both <a href='lstats.php?phpver=5'>PHP 5</a> and <a href='lstats.php?phpver=7'>PHP 7</a>:</h3>\n<pre>\n"; } else { - echo "<h3>Bug stats for PHP $phpver:</h3>\n<pre>\n"; + echo "<h3>Bug stats for PHP $phpver:</h3>\n<pre>\n"; } if (isset($_GET['per_category'])) { $project = !empty($_GET['project']) ? $_GET['project'] : false; $pseudo_pkgs = get_pseudo_packages($project); - + $totals = array(); foreach ($pseudo_pkgs as $category => $data) { $count = get_status_count ("status NOT IN('to be documented', 'closed', 'not a bug', 'duplicate', 'wont fix', 'no feedback')", $category); @@ -58,7 +58,7 @@ if (isset($_GET['per_category'])) foreach ($totals as $category => $total) { status_print($category, $total, 40); } - + } else { foreach ($tla as $status => $short) { diff --git a/www/patch-add.php b/www/patch-add.php index 428e29b..92bbac1 100644 --- a/www/patch-add.php +++ b/www/patch-add.php @@ -140,7 +140,7 @@ TXT; $res = bugs_add_comment($bug_id, $auth_user->email, $auth_user->name, $text, 'patch'); - // Send emails + // Send emails mail_bug_updates($buginfo, $buginfo, $auth_user->email, $text, 4, $bug_id); $patches = $patchinfo->listPatches($bug_id); diff --git a/www/quick-fix-desc.php b/www/quick-fix-desc.php index 99c019f..5d6c67b 100644 --- a/www/quick-fix-desc.php +++ b/www/quick-fix-desc.php @@ -10,9 +10,9 @@ list($RESOLVE_REASONS, $FIX_VARIATIONS) = get_resolve_reasons($site); // Authenticate bugs_authenticate($user, $pw, $logged_in, $user_flags); -response_header('Quick Fix Descriptions'); +response_header('Quick Fix Descriptions'); -?> +?> <table border="1" cellpadding="3" cellspacing="1"> <?php @@ -37,7 +37,7 @@ foreach ($RESOLVE_REASONS as $key => $reason) { </tr>"; } } -} +} ?> </table> diff --git a/www/report.php b/www/report.php index 79d9226..1b9606e 100644 --- a/www/report.php +++ b/www/report.php @@ -1,9 +1,9 @@ -<?php +<?php // Obtain common includes require_once '../include/prepend.php'; -// Start session +// Start session session_start(); // Init variables @@ -64,7 +64,7 @@ if (isset($_POST['in'])) { $_POST['in']['did_luser_search'] = 1; $where_clause = "WHERE package_name != 'Feature/Change Request'"; - + if (!$is_security_developer) { $where_clause .= " AND private = 'N' "; } @@ -147,7 +147,7 @@ OUTPUT; // We displayed the luser search and they said it really was not already submitted, so let's allow them to submit. $ok_to_submit_report = true; } - + if (isset($_POST['edit_after_preview'])) { $ok_to_submit_report = false; response_header("Report - New"); @@ -171,11 +171,11 @@ OUTPUT; $fdesc .= "Actual result:\n--------------\n"; $fdesc .= $_POST['in']['actres'] . "\n"; } - + // Bug type 'Security' marks automatically the report as private $_POST['in']['private'] = ($_POST['in']['bug_type'] == 'Security') ? 'Y' : 'N'; $_POST['in']['block_user_comment'] = 'N'; - + if (isset($_POST['preview'])) { $_POST['in']['status'] = 'Open'; $_SESSION['bug_preview'] = $_POST['in']; @@ -229,7 +229,7 @@ OUTPUT; $redirectToPatchAdd = true; } } - + if (empty($_POST['in']['handle'])) { $mailfrom = spam_protect($_POST['in']['email'], 'text'); } else { @@ -268,7 +268,7 @@ REPORT; } else { $type = 'unknown'; } - + $project = !empty($_GET['project']) ? $_GET['project'] : false; // provide shortcut URLS for "quick bug fixes" @@ -418,7 +418,7 @@ display_bug_error($errors); </select> </td> </tr> - + <tr> <th class="form-label_left">Package affected:</th> <td class="form-input"> @@ -525,7 +525,7 @@ display_bug_error($errors); </td> </tr> -<?php if (!$logged_in) { +<?php if (!$logged_in) { $captcha = $numeralCaptcha->getOperation(); $_SESSION['answer'] = $numeralCaptcha->getAnswer(); if (!empty($_POST['captcha']) && empty($ok_to_submit_report)) { diff --git a/www/rpc.php b/www/rpc.php index 4a00a7c..0a97a49 100644 --- a/www/rpc.php +++ b/www/rpc.php @@ -42,7 +42,7 @@ if (!is_array($bug)) { if (!bugs_has_access($bug_id, $bug, $pwd, $user_flags)) { echo json_encode(array('result' => array('error' => 'No access to bug'))); exit; -} +} if (!empty($_POST['ncomment']) && !empty($_POST['user'])) { $user = htmlspecialchars(trim($_POST['user'])); @@ -55,15 +55,15 @@ if (!empty($_POST['ncomment']) && !empty($_POST['user'])) { if ($res) { /* Close the bug report as requested if it is not already closed */ if (!empty($_POST['status']) - && $bug['status'] !== 'Closed' + && $bug['status'] !== 'Closed' && $_POST['status'] === 'Closed') { /* Change the bug status to Closed */ bugs_status_change($bug_id, 'Closed'); - + $in = $bug; /* Just change the bug status */ $in['status'] = $_POST['status']; - + $changed = bug_diff($bug, $in); if (!empty($changed)) { $log_comment = bug_diff_render_html($changed); @@ -72,11 +72,11 @@ if (!empty($_POST['ncomment']) && !empty($_POST['user'])) { $res = bugs_add_comment($bug_id, $from, '', $log_comment, 'log'); } } - + /* Send a mail notification when automatically closing a bug */ mail_bug_updates($bug, $in, $from, $ncomment, 1, $bug_id); } - + echo json_encode(array('result' => array('status' => $bug))); exit; } else { diff --git a/www/rss/rdf.php b/www/rss/rdf.php index 9a50853..3982af1 100644 --- a/www/rss/rdf.php +++ b/www/rss/rdf.php @@ -48,7 +48,7 @@ switch ($bug['status']) { print '<?xml version="1.0"?>'; ?> -<rdf:RDF +<rdf:RDF xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://purl.org/rss/1.0/" xmlns:dc="http://purl.org/dc/elements/1.1/" @@ -118,7 +118,7 @@ print '<?xml version="1.0"?>'; </title> <link><?php echo $uri; ?>#<?php echo $comment['added']; ?></link> - + <description><![CDATA[<pre><?php echo clean($comment['comment']); ?></pre>]]></description> <content:encoded><![CDATA[<pre><?php echo clean($comment['comment']); ?></pre>]]></content:encoded> <dc:date><?php echo date(DATE_ATOM, $comment['added']); ?></dc:date> diff --git a/www/rss/rss.php b/www/rss/rss.php index 91298b7..b842726 100644 --- a/www/rss/rss.php +++ b/www/rss/rss.php @@ -11,7 +11,7 @@ $desc .= date(DATE_RSS, $bug['submitted']) . "\n"; $desc .= "PHP: {$bug['php_version']}, OS: {$bug['php_os']}\n\n"; $desc .= $bug['ldesc']; $desc = '<pre>' . clean($desc) . '</pre>'; - + ?> <rss version="2.0" xmlns:atom="http://www.w3.org/2005/Atom"> <channel> @@ -35,7 +35,7 @@ $desc = '<pre>' . clean($desc) . '</pre>'; <item> <title><?php echo clean($comment['email'] . " [$displayts]"); ?></title> <description><![CDATA[ <?php echo '<pre>', clean($comment['comment']), '</pre>'; ?>]]></description> - <pubDate><?php echo date('r', $comment['added']); ?></pubDate> + <pubDate><?php echo date('r', $comment['added']); ?></pubDate> <guid><?php echo $uri, '#', $comment['added']; ?></guid> </item> <?php } ?> diff --git a/www/search-howto.php b/www/search-howto.php index 52bbc3a..30a9fab 100755 --- a/www/search-howto.php +++ b/www/search-howto.php @@ -14,24 +14,24 @@ response_header("How to search the bug database"); <p> This HOWTO will allow for a useful experience while scouring the bug database. -Do note that a lot of information is entered in by the general public and +Do note that a lot of information is entered in by the general public and therefore cannot be fully trusted. Also, the information contained within a bug report is what setup found the bug, so other setups may apply. -</p> - +</p> + <h3>Basic Search</h3> <p> Within every <a href="<?php echo $basedir, '/'; ?>"><?php echo $site_url, $basedir; ?>/</a> webpage header is a search box, this is the <i>basic</i> search option. You may enter in a numeric bug ID to redirect to that bugs page or -enter in a search term to perform a default bug search. +enter in a search term to perform a default bug search. Load the advanced search to view the default values. </p> <h3>Advanced Search</h3> <p> -Some explanations for most of the PHP bugs <a href="search.php">advanced search</a> +Some explanations for most of the PHP bugs <a href="search.php">advanced search</a> options. </p> <table cellpadding="2" cellspacing="0" border="1" bgcolor="#eeeeee"> @@ -51,7 +51,7 @@ options. <li><i>any</i> : One or more (any) of the search terms may be present.</li> <li> <i>raw</i> : Allows full use of MySQL's - <a href="http://www.mysql.com/doc/en/Fulltext_Search.html">FULLTEXT</a> + <a href="http://www.mysql.com/doc/en/Fulltext_Search.html">FULLTEXT</a> boolean search operators. </li> </ul> @@ -61,8 +61,8 @@ options. not caring which shows up. Or a name that has changed in PHP 5 from PHP 4. Use of <strong>all</strong> makes sense if you require every term in your results, as this can provide precise searching. The <strong>raw</strong> - option is for custom searches, like you might require one term but also want - to disallow another from the result. Also, adding optional terms always + option is for custom searches, like you might require one term but also want + to disallow another from the result. Also, adding optional terms always affects relevancy/order. </td> </tr> @@ -73,7 +73,7 @@ options. Here are a few explanations: <ul> <li> - <strong>Open</strong>: This also includes <i>assigned</i>, <i>analyzed</i>, + <strong>Open</strong>: This also includes <i>assigned</i>, <i>analyzed</i>, <i>critical</i>, and <i>verified</i> bugs. (default) </li> <li> @@ -88,8 +88,8 @@ options. date as public comments do not. </li> <li> - <strong>Stale</strong>: Bugs last commented on at least 30 days ago that are not - closed, duplicates, or not-a-bug. Only developers and the original author can affect + <strong>Stale</strong>: Bugs last commented on at least 30 days ago that are not + closed, duplicates, or not-a-bug. Only developers and the original author can affect this date as public comments do not count. </li> <li><strong>All</strong>: All types, even not-a-bug.</li> @@ -101,7 +101,7 @@ options. <td>Category</td> <td> Bugs are categorized although sometimes it might seem like a bug could be in - multiple categories. You may choose a specific category or allow any, and + multiple categories. You may choose a specific category or allow any, and also disallow certain categories. If you're unable to locate a bug, consider trying a <i>feature request</i> or <i>any</i> status. </td> @@ -110,9 +110,9 @@ options. <tr valign="top"> <td>OS</td> <td> - Bugs that may be specific to an operating system. This value is entered in by the + Bugs that may be specific to an operating system. This value is entered in by the reporter as the OS they used while finding the bug so this may or may not have meaning. - Also, the value isn't regulated so for example Windows may be written as Win32, Win, + Also, the value isn't regulated so for example Windows may be written as Win32, Win, Windows, Win98, NT, etc. Or perhaps a distribution name rather than simply Linux. The query uses a SQL LIKE statement like so: <i>'%$os%'</i>. </td> @@ -122,7 +122,7 @@ options. <td>Version</td> <td> Limit bugs to a specific version of PHP. A one character integer of 3, 4 or - 5 is standard. Entering a length greater than one will perform a SQL LIKE + 5 is standard. Entering a length greater than one will perform a SQL LIKE statement like so: <i>'$version%'</i>. Defaults to both 4 and 5. </td> <td> @@ -147,8 +147,8 @@ options. <tr valign="top"> <td>Date</td> <td> - Limit bugs that were reported by a specific time period. This is not only the - amount of time since a comment or developer remark was last made, but this is + Limit bugs that were reported by a specific time period. This is not only the + amount of time since a comment or developer remark was last made, but this is the time when the bug was originally reported. </td> <td>
-- PHP Webmaster List Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php