[git] web/bugs.git branch master updated. c3110c3

From:	rasmus@php.net	Date:	Fri, 27 Jan 2012 19:54:48 +0000
Subject:	[git] web/bugs.git branch master updated. c3110c3
Groups:	php.webmaster
Request:	Send a blank email to php-webmaster+get-12981@lists.php.net to get a copy of this message

The branch, master on web/bugs.git has been updated via c3110c33dc09810fbc7bf0aac7fc00b5d630f46f (commit) from f4dfa3cc904dec7b6dacb71cbf53361d1a4a7eac (commit) http://git.php.net/?p=web/bugs.git;a=log;h=c3110c33dc09810fbc7bf0aac7fc00b5d630f46f;hp=f4dfa3cc904dec7b6dacb71cbf53361d1a4a7eac Summary of changes: include/functions.php | 37 ++++++++++++++++++------------------- include/prepend.php | 2 ++ include/query.php | 8 ++++---- local_config.php.sample | 1 + www/bug.php | 10 +++++----- www/css/style.css | 2 +- www/fix.php | 4 ++-- www/index.php | 2 +- www/js/userlisting.php | 2 +- www/login.php | 2 +- www/lstats.php | 2 +- www/patch-add.php | 2 +- www/report.php | 6 +++--- www/rss/bug.php | 4 ++-- www/rss/rdf.php | 4 ++-- www/rss/rss.php | 2 +- www/rss/search.php | 18 +++++++++--------- www/search-howto.php | 6 +++--- www/stats.php | 2 +- 19 files changed, 59 insertions(+), 57 deletions(-) -- Log ---------------------------------------- commit c3110c33dc09810fbc7bf0aac7fc00b5d630f46f Author: Rasmus Lerdorf <rasmus@php.net> Date: Fri Jan 27 11:48:04 2012 -0800 - The end of an era - switch "Bogus" to "Not a bug" by popular demand - Switch back to master - Add site_method to make it easier to install on non-ssl test sites diff --git a/include/functions.php b/include/functions.php index be70bba..f88007e 100644 --- a/include/functions.php +++ b/include/functions.php @@ -11,7 +11,7 @@ define('BUGS_SECURITY_DEV', 1<<3); // used in mail_bug_updates(), below, and class for search results $tla = array( 'Open' => 'Opn', - 'Bogus' => 'Bgs', + 'Not a bug' => 'Nab', 'Feedback' => 'Fbk', 'No Feedback' => 'NoF', 'Wont fix' => 'Wfx', @@ -56,7 +56,7 @@ $state_types = array ( 'Old Feedback' => 0, 'Stale' => 0, 'Fresh' => 0, - 'Bogus' => 1, + 'Not a bug' => 1, 'Spam' => 1, 'All' => 0, ); @@ -84,7 +84,7 @@ function verify_password($user, $pass) $ctx = stream_context_create(array('http' => $opts)); - $s = file_get_contents('https://master2.php.net/fetch/cvsauth.php', false, $ctx); + $s = file_get_contents('https://master.php.net/fetch/cvsauth.php', false, $ctx); $a = @unserialize($s); if (!is_array($a)) { @@ -585,8 +585,8 @@ function show_state_options($state, $user_mode = 0, $default = '', $assigned = 0 echo "<option>$state</option>\n"; break; } - /* Allow state 'Closed' always when current state is not 'Bogus' */ - if ($state != 'Bogus') { + /* Allow state 'Closed' always when current state is not 'Not a bug' */ + if ($state != 'Not a bug') { echo "<option>Closed</option>\n"; } } else { @@ -886,7 +886,7 @@ function bug_diff_render_html($diff) */ function mail_bug_updates($bug, $in, $from, $ncomment, $edit = 1, $id = false) { - global $tla, $bug_types, $siteBig, $site_url, $basedir; + global $tla, $bug_types, $siteBig, $site_method, $site_url, $basedir; $text = array(); $headers = array(); @@ -982,7 +982,7 @@ function mail_bug_updates($bug, $in, $from, $ncomment, $edit = 1, $id = false) $user_text = <<< USER_TEXT ATTENTION! Do NOT reply to this email! To reply, use the web interface found at -https://{$site_url}{$basedir}/bug.php?id={$bug['id']}&edit=2 +{$site_method}://{$site_url}{$basedir}/bug.php?id={$bug['id']}&edit=2 {$header_text} {$wrapped_text} @@ -990,13 +990,13 @@ USER_TEXT; /* developer text with headers, previous messages, and edit link */ $dev_text = <<< DEV_TEXT -Edit report at https://{$site_url}{$basedir}/bug.php?id={$bug['id']}&edit=1 +Edit report at {$site_method}://{$site_url}{$basedir}/bug.php?id={$bug['id']}&edit=1 {$header_text} {$wrapped_text} -- -Edit this bug report at https://{$site_url}{$basedir}/bug.php?id={$bug['id']}&edit=1 +Edit this bug report at {$site_method}://{$site_url}{$basedir}/bug.php?id={$bug['id']}&edit=1 DEV_TEXT; if (preg_match('/.*@php\.net\z/', $bug['email'])) { @@ -1118,7 +1118,7 @@ function format_date($ts = null, $format = 'Y-m-d H:i e') */ function get_old_comments($bug_id, $all = 0) { - global $dbh, $site_url, $basedir; + global $dbh, $site_method, $site_url, $basedir; $divider = str_repeat('-', 72); $max_message_length = 10 * 1024; @@ -1177,7 +1177,7 @@ Previous Comments: The remainder of the comments for this report are too long. To view the rest of the comments, please view the bug report online at - https://{$site_url}{$basedir}/bug.php?id={$bug_id} + {$site_method}://{$site_url}{$basedir}/bug.php?id={$bug_id} "; } @@ -1426,7 +1426,7 @@ function format_search_string($search, $boolean_search = false) */ function unsubscribe_hash($bug_id, $email) { - global $dbh, $siteBig, $site_url, $bugEmail; + global $dbh, $siteBig, $site_method, $site_url, $bugEmail; $now = time(); $hash = crypt($email . $bug_id, $now); @@ -1452,10 +1452,10 @@ A request has been made to remove your subscription to {$siteBig} bug #{$bug_id} To view the bug in question please use this link: -https://{$site_url}{$basedir}/bug.php?id={$bug_id} +{$site_method}://{$site_url}{$basedir}/bug.php?id={$bug_id} To confirm the removal please use this link: -https://{$site_url}{$basedir}/bug.php?id={$bug_id}&unsubscribe=1&t={$hash} +{$site_method}://{$site_url}{$basedir}/bug.php?id={$bug_id}&unsubscribe=1&t={$hash} USER_TEXT; @@ -1649,7 +1649,7 @@ function bugs_mail($to, $subject, $message, $headers = '', $params = '') */ function response_header($title, $extraHeaders = '') { - global $_header_done, $self, $auth_user, $logged_in, $siteBig, $site_url, $basedir; + global $_header_done, $self, $auth_user, $logged_in, $siteBig, $site_method, $site_url, $basedir; $is_logged = false; @@ -1673,10 +1673,10 @@ function response_header($title, $extraHeaders = '') <html> <head> <?php echo $extraHeaders; ?> - <base href="https://<?php echo $site_url, $basedir; ?>/" /> + <base href="<?php echo $site_method?>://<?php echo $site_url, $basedir; ?>/" /> <title><?php echo $siteBig; ?> :: <?php echo $title; ?></title> - <link rel="shortcut icon" href="https://<?php echo $site_url, $basedir; ?>/images/favicon.ico" /> - <link rel="stylesheet" href="https://<?php echo $site_url, $basedir; ?>/css/style.css" /> + <link rel="shortcut icon" href="<?php echo $site_method?>://<?php echo $site_url, $basedir; ?>/images/favicon.ico" /> + <link rel="stylesheet" href="<?php echo $site_method?>://<?php echo $site_url, $basedir; ?>/css/style.css" /> </head> <body> @@ -1831,7 +1831,6 @@ function handle_pear_errors ($error_obj) $error .= "It's our guess that the database is down. Argh!!!\n"; // FIXME: If logged in, show other stuff.... - response_footer($error); exit; } diff --git a/include/prepend.php b/include/prepend.php index 845cc11..10a16fb 100644 --- a/include/prepend.php +++ b/include/prepend.php @@ -20,6 +20,7 @@ if (file_exists($local_cfg)) { require $local_cfg; } else { $site_data = array ( + 'method' => 'https', 'url' => 'bugs.php.net', 'basedir' => '', 'email' => 'php-bugs@lists.php.net', @@ -42,6 +43,7 @@ if (!isset($site_data['security_email'])) { // DO NOT EDIT ANYTHING BELOW THIS LINE, edit $site_data above instead! $logged_in = false; +$site_method = $site_data['method']; $site_url = $site_data['url']; $bugEmail = $site_data['email']; $docBugEmail = $site_data['doc_email']; diff --git a/include/query.php b/include/query.php index d48d22d..ce2d349 100644 --- a/include/query.php +++ b/include/query.php @@ -108,7 +108,7 @@ if (isset($_GET['cmd']) && $_GET['cmd'] == 'display') case 'Wont fix': case 'No Feedback': case 'Feedback': - case 'Bogus': + case 'Not a bug': $where_clause .= " AND bugdb.status='$status'"; break; case 'Old Feedback': @@ -116,15 +116,15 @@ if (isset($_GET['cmd']) && $_GET['cmd'] == 'display') AND TO_DAYS(NOW())-TO_DAYS(bugdb.ts2) > 60"; break; case 'Fresh': - $where_clause .= " AND bugdb.status NOT IN ('Closed', 'Duplicate', 'Bogus') + $where_clause .= " AND bugdb.status NOT IN ('Closed', 'Duplicate', 'Not a bug') AND TO_DAYS(NOW())-TO_DAYS(bugdb.ts2) < 30"; break; case 'Stale': - $where_clause .= " AND bugdb.status NOT IN ('Closed', 'Duplicate', 'Bogus') + $where_clause .= " AND bugdb.status NOT IN ('Closed', 'Duplicate', 'Not a bug') AND TO_DAYS(NOW())-TO_DAYS(bugdb.ts2) > 30"; break; case 'Not Assigned': - $where_clause .= " AND bugdb.status NOT IN ('Closed', 'Duplicate', 'Bogus', 'Assigned', 'Wont Fix', 'Suspended')"; + $where_clause .= " AND bugdb.status NOT IN ('Closed', 'Duplicate', 'Not a bug', 'Assigned', 'Wont Fix', 'Suspended')"; break; case 'OpenFeedback': $where_clause .= " AND bugdb.status IN ('Open', 'Re-Opened', 'Assigned','Analyzed', 'Critical', 'Verified', 'Feedback')"; diff --git a/local_config.php.sample b/local_config.php.sample index 02dc1ae..6a02dce 100644 --- a/local_config.php.sample +++ b/local_config.php.sample @@ -5,6 +5,7 @@ */ $site_data = array ( + 'method' => 'https', 'url' => 'bugs.php.net', 'basedir' => '/bugs', 'email' => 'php-bugs@lists.php.net', diff --git a/www/bug.php b/www/bug.php index e58b8b5..adb3437 100644 --- a/www/bug.php +++ b/www/bug.php @@ -403,11 +403,11 @@ if (isset($_POST['ncomment']) && !isset($_POST['preview']) && $edit == 3) { if (empty($_POST['in']['status'])) { $errors[] = "You must provide a status"; } else { - if ($_POST['in']['status'] == 'Bogus' && - !in_array($bug['status'], array ('Bogus', 'Closed', 'Duplicate', 'No feedback', 'Wont fix')) && + if ($_POST['in']['status'] == 'Not a bug' && + !in_array($bug['status'], array ('Not a bug', 'Closed', 'Duplicate', 'No feedback', 'Wont fix')) && strlen(trim($ncomment)) == 0 ) { - $errors[] = "You must provide a comment when marking a bug 'Bogus'"; + $errors[] = "You must provide a comment when marking a bug 'Not a bug'"; } elseif (!empty($_POST['in']['resolve'])) { if (!$trytoforce && isset($RESOLVE_REASONS[$_POST['in']['resolve']]) && $RESOLVE_REASONS[$_POST['in']['resolve']]['status'] == $bug['status']) @@ -576,7 +576,7 @@ switch ($thanks) display_bug_success('Your comment was added to the bug successfully.'); break; case 4: - $bug_url = "https://{$site_url}{$basedir}/bug.php?id={$bug_id}"; + $bug_url = "{$site_method}://{$site_url}{$basedir}/bug.php?id={$bug_id}"; display_bug_success(" Thank you for your help! If the status of the bug report you submitted changes, you will be notified. @@ -1189,5 +1189,5 @@ function control($num, $desc) function canvote($thanks, $status) { - return ($thanks != 4 && $thanks != 6 && $status != 'Closed' && $status != 'Bogus' && $status != 'Duplicate'); + return ($thanks != 4 && $thanks != 6 && $status != 'Closed' && $status != 'Not a bug' && $status != 'Duplicate'); } diff --git a/www/css/style.css b/www/css/style.css index e16c53e..2788bf5 100644 --- a/www/css/style.css +++ b/www/css/style.css @@ -733,7 +733,7 @@ td.search-next { .Ana { background-color: #99bbaa; } -.Bgs { +.Nab { background-color: #aaaaaa; } .Csd { diff --git a/www/fix.php b/www/fix.php index 71ae860..5a6dbf6 100644 --- a/www/fix.php +++ b/www/fix.php @@ -45,8 +45,8 @@ if (!$reason || !isset($RESOLVE_REASONS[$reason])) { $errors[] = 'You have to use a valid reason to resolve this bug.'; } -if (isset($RESOLVE_REASONS[$reason]) && $RESOLVE_REASONS[$reason]['status'] == 'Bogus' && $ncomment == '') { - $errors[] = 'You must provide a comment when marking a bug \'Bogus\''; +if (isset($RESOLVE_REASONS[$reason]) && $RESOLVE_REASONS[$reason]['status'] == 'Not a bug' && $ncomment == '') { + $errors[] = 'You must provide a comment when marking a bug \'Not a bug\''; } // Handle errors diff --git a/www/index.php b/www/index.php index 79f8267..a0da9c2 100644 --- a/www/index.php +++ b/www/index.php @@ -65,7 +65,7 @@ how search works. Common searches <ul> <?php - $base_default = 'https://bugs.php.net/search.php?boolean=0&limit=30&order_by=id&direction=DESC&cmd=display&status=Open&bug_age=0&bug_updated=0'; + $base_default = "{$site_method}://{$site_url}/search.php?boolean=0&limit=30&order_by=id&direction=DESC&cmd=display&status=Open&bug_age=0&bug_updated=0"; $searches = array( 'Most recent open bugs (all)' => array( 'base' => $base_default, diff --git a/www/js/userlisting.php b/www/js/userlisting.php index 84a3d16..e53709d 100644 --- a/www/js/userlisting.php +++ b/www/js/userlisting.php @@ -9,7 +9,7 @@ function getAllUsers() $ctx = stream_context_create(array('http' => $opts)); $token = getenv('USER_TOKEN'); - $retval = @file_get_contents('https://master2.php.net/fetch/allusers.php?&token=' . rawurlencode($token), false, $ctx); + $retval = @file_get_contents('https://master.php.net/fetch/allusers.php?&token=' . rawurlencode($token), false, $ctx); if (!$retval) { return; diff --git a/www/login.php b/www/login.php index 99b6c71..dc3611c 100644 --- a/www/login.php +++ b/www/login.php @@ -18,7 +18,7 @@ if (isset($_POST['user'])) { if ($logged_in === 'developer') { if (!empty($_POST['referer']) && - preg_match('/^https:\/\/'. preg_quote($site_url) .'/i', $referer)) { + preg_match("/^{$site_method}:\/\/". preg_quote($site_url) .'/i', $referer)) { header('location: '. $referer); exit; } diff --git a/www/lstats.php b/www/lstats.php index 14e960b..d6980f9 100644 --- a/www/lstats.php +++ b/www/lstats.php @@ -48,7 +48,7 @@ if (isset($_GET['per_category'])) $totals = array(); foreach ($pseudo_pkgs as $category => $data) { - $count = get_status_count ("status NOT IN('to be documented', 'closed', 'bogus', 'duplicate', 'wont fix', 'no feedback')", $category); + $count = get_status_count ("status NOT IN('to be documented', 'closed', 'not a bug', 'duplicate', 'wont fix', 'no feedback')", $category); if ($count > 0) { $totals[$category] = $count; } diff --git a/www/patch-add.php b/www/patch-add.php index b709170..bbe6808 100644 --- a/www/patch-add.php +++ b/www/patch-add.php @@ -128,7 +128,7 @@ if (isset($_POST['addpatch'])) { } // Add a comment to the bug report. - $patch_url = "https://{$site_url}{$basedir}/patch-display.php?bug={$bug_id}&patch={$patch_name_url}&revision={$e}"; + $patch_url = "{$site_method}://{$site_url}{$basedir}/patch-display.php?bug={$bug_id}&patch={$patch_name_url}&revision={$e}"; $text = <<<TXT The following patch has been added/updated: diff --git a/www/report.php b/www/report.php index 94b072c..60f7a2f 100644 --- a/www/report.php +++ b/www/report.php @@ -237,7 +237,7 @@ REPORT; $ascii_report = "{$report}{$_POST['in']['sdesc']}\n\n" . wordwrap($fdesc); $ascii_report.= "\n-- \nEdit bug report at "; - $ascii_report.= "https://{$site_url}{$basedir}/bug.php?id=$cid&edit="; + $ascii_report.= "{$site_method}://{$site_url}{$basedir}/bug.php?id=$cid&edit="; list($mailto, $mailfrom, $params) = get_package_mail($package_name, false, $_POST['in']['bug_type']); @@ -274,7 +274,7 @@ REPORT; } foreach ($RESOLVE_REASONS as $k => $v) { if (!$v['webonly']) { - $dev_extra .= str_pad("{$v['title']}:", $maxkeysize) . " https://bugs.php.net/fix.php?id={$cid}&r={$k}\n"; + $dev_extra .= str_pad("{$v['title']}:", $maxkeysize) . " {$site_method}://{$site_url}/fix.php?id={$cid}&r={$k}\n"; } } @@ -352,7 +352,7 @@ if (!isset($_POST['in'])) { - Failure to follow these instructions may result in your bug simply being marked as "bogus." + Failure to follow these instructions may result in your bug simply being marked as "not a bug." Report <img src="images/pear_item.gif">PEAR related bugs <a href="http://pear.php.net/bugs/">here</a> diff --git a/www/rss/bug.php b/www/rss/bug.php index 7a21aa5..3268404 100644 --- a/www/rss/bug.php +++ b/www/rss/bug.php @@ -33,12 +33,12 @@ if ($format == 'xml') { exit; } elseif ($format == "rss2") { header('Content-type: application/rss+xml; charset=utf-8'); - $uri = "https://{$site_url}{$basedir}/bug.php?id={$bug['id']}"; + $uri = "{$site_method}://{$site_url}{$basedir}/bug.php?id={$bug['id']}"; include './rss.php'; exit; } else { header('Content-type: application/rdf+xml; charset=utf-8'); - $uri = "https://{$site_url}{$basedir}/bug.php?id={$bug['id']}"; + $uri = "{$site_method}://{$site_url}{$basedir}/bug.php?id={$bug['id']}"; include './rdf.php'; exit; } diff --git a/www/rss/rdf.php b/www/rss/rdf.php index 423143f..9a50853 100644 --- a/www/rss/rdf.php +++ b/www/rss/rdf.php @@ -22,7 +22,7 @@ switch ($bug['status']) { case 'No Feedback': $state = 'http://xmlns.com/baetle/#Incomplete'; break; - case 'Bogus': + case 'Not a bug': $state = 'http://xmlns.com/baetle/#WorksForMe'; break; case 'Duplicate': @@ -69,7 +69,7 @@ print '<?xml version="1.0"?>'; <dc:creator><?php echo $site; ?>-webmaster@lists.php.net</dc:creator> <dc:publisher><?php echo $site; ?>-webmaster@lists.php.net</dc:publisher> - <admin:generatorAgent rdf:resource="https://<?php echo $site_url, $basedir; ?>" /> + <admin:generatorAgent rdf:resource="<?php echo $site_method?>://<?php echo $site_url, $basedir; ?>" /> <sy:updatePeriod>hourly</sy:updatePeriod> <sy:updateFrequency>1</sy:updateFrequency> <sy:updateBase>2000-01-01T12:00+00:00</sy:updateBase> diff --git a/www/rss/rss.php b/www/rss/rss.php index 4bdf261..91298b7 100644 --- a/www/rss/rss.php +++ b/www/rss/rss.php @@ -20,7 +20,7 @@ $desc = '<pre>' . clean($desc) . '</pre>'; <description><?php echo clean("[{$bug['status']}] {$bug['sdesc']}"); ?></description> <pubDate><?php echo date('r', $bug['submitted']); ?></pubDate> <lastBuildDate><?php echo date('r', ($bug['modified']) ? $bug['modified'] : $bug['submitted']); ?></lastBuildDate> - <atom:link href="<?php echo "https://{$site_url}{$basedir}/rss/bug.php?id={$bug['id']}&format=rss2"; ?>" rel="self" type="application/rss+xml" /> + <atom:link href="<?php echo "{$site_method}://{$site_url}{$basedir}/rss/bug.php?id={$bug['id']}&format=rss2"; ?>" rel="self" type="application/rss+xml" /> <item> <title><?php echo ($bug['assign']) ? clean($bug['assign']) : clean(substr($bug['email'], 0, strpos($bug['email'], '@'))), "@... [{$bug['ts1']}]"; ?></title> <description><![CDATA[ <?php echo $desc; ?> ]]></description> diff --git a/www/rss/search.php b/www/rss/search.php index 4c6e2a4..3855642 100644 --- a/www/rss/search.php +++ b/www/rss/search.php @@ -37,14 +37,14 @@ href="http://www.w3.org/2000/08/w3c-synd/style.css" type="text/css" <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/" xmlns:sy="http://purl.org/rss/1.0/modules/syndication/" xmlns:admin="http://webns.net/mvcb/" xmlns:content="http://purl.org/rss/1.0/modules/content/">'; -echo "\n <channel rdf:about=\"https://{$site_url}{$basedir}/rss/search.php\">\n"; +echo "\n <channel rdf:about=\"{$site_method}://{$site_url}{$basedir}/rss/search.php\">\n"; echo " <title>{$siteBig} Bug Search Results</title>\n"; -echo " <link>https://{$site_url}{$basedir}/rss/search.php?" , clean(http_build_query($_GET)) , "</link>\n"; +echo " <link>{$site_method}://{$site_url}{$basedir}/rss/search.php?" , clean(http_build_query($_GET)) , "</link>\n"; echo " <description>Search Results</description>\n"; echo " <dc:language>en-us</dc:language>\n"; echo " <dc:creator>{$site}-webmaster@lists.php.net</dc:creator>\n"; echo " <dc:publisher>{$site}-webmaster@lists.php.net</dc:publisher>\n"; -echo " <admin:generatorAgent rdf:resource=\"https://{$site_url}{$basedir}\"/>\n"; +echo " <admin:generatorAgent rdf:resource=\"{$site_method}://{$site_url}{$basedir}\"/>\n"; echo " <sy:updatePeriod>hourly</sy:updatePeriod>\n"; echo " <sy:updateFrequency>1</sy:updateFrequency>\n"; echo " <sy:updateBase>2000-01-01T12:00+00:00</sy:updateBase>\n"; @@ -66,10 +66,10 @@ if ($total_rows > 0) { $desc .= $row['ldesc']; $desc = '<pre>' . clean($desc) . '</pre>'; - echo " <rdf:li rdf:resource=\"https://{$site_url}{$basedir}/{$row['id']}\" />\n"; - $items .= " <item rdf:about=\"https://{$site_url}{$basedir}/{$row['id']}\">\n"; + echo " <rdf:li rdf:resource=\"{$site_method}://{$site_url}{$basedir}/{$row['id']}\" />\n"; + $items .= " <item rdf:about=\"{$site_method}://{$site_url}{$basedir}/{$row['id']}\">\n"; $items .= ' <title>' . clean("{$row['bug_type']} {$row['id']} [{$row['status']}] {$row['sdesc']}") . "</title>\n"; - $items .= " <link>https://{$site_url}{$basedir}/{$row['id']}</link>\n"; + $items .= " <link>{$site_method}://{$site_url}{$basedir}/{$row['id']}</link>\n"; $items .= ' <content:encoded><![CDATA[' . $desc . "]]></content:encoded>\n"; $items .= ' <description><![CDATA[' . $desc . "]]></description>\n"; if (!$row['unchanged']) { @@ -90,10 +90,10 @@ echo <<< DATA </items> </channel> - <image rdf:about="https://{$site_url}{$basedir}/images/{$site}-logo.gif"> + <image rdf:about="{$site_method}://{$site_url}{$basedir}/images/{$site}-logo.gif"> <title>{$siteBig} Bugs</title> - <url>https://{$site_url}{$basedir}/images/{$site}-logo.gif</url> - <link>https://{$site_url}{$basedir}</link> + <url>{$site_method}://{$site_url}{$basedir}/images/{$site}-logo.gif</url> + <link>{$site_method}://{$site_url}{$basedir}</link> </image> {$items} diff --git a/www/search-howto.php b/www/search-howto.php index 0c50e2f..8b23638 100755 --- a/www/search-howto.php +++ b/www/search-howto.php @@ -80,15 +80,15 @@ options. <li>Old feedback: Bugs that have been requesting feedback for over60 days.</li> <li> Fresh : Bugs commented on in the last 30 days that are not closed, - duplicates, or bogus. Only developers and the original author can affect this + duplicates, or not-a-bug. Only developers and the original author can affect this date as public comments do not. </li> <li> Stale: Bugs last commented on at least 30 days ago that are not - closed, duplicates, or bogus. Only developers and the original author can affect + closed, duplicates, or not-a-bug. Only developers and the original author can affect this date as public comments do not count. </li> - <li>All: All types, even bogus.</li> + <li>All: All types, even not-a-bug.</li> </ul> </td> <td>If you're only interested in critical bugs, or want to see which have been verified, or perhaps just those seeking feedback.</td> diff --git a/www/stats.php b/www/stats.php index eb28de3..9f2c960 100644 --- a/www/stats.php +++ b/www/stats.php @@ -17,7 +17,7 @@ $titles = array( 'Feedback' => 'Fdbk', 'No Feedback' => 'No Fdbk', 'Suspended' => 'Susp', - 'Bogus' => 'Bogus', + 'Not a bug' => 'Not a bug', 'Duplicate' => 'Dupe', 'Wont fix' => 'Wont Fix', ); Thank you for your contribution.