cvs: pearweb /include pear-format-html.php /public_html/bugs search.php /public_html/bugs/include functions.inc
| From: | Greg Beaver | Date: | Tue, 24 Apr 2007 03:03:38 +0000 |
| Subject: | cvs: pearweb /include pear-format-html.php /public_html/bugs search.php /public_html/bugs/include functions.inc | ||
| Groups: | php.pear.cvs php.pear.core | ||
| Request: | Send a blank email to pear-cvs+get-46122@lists.php.net to get a copy of this message | ||
cellog Tue Apr 24 03:03:38 2007 UTC
Modified files:
/pearweb/include pear-format-html.php
/pearweb/public_html/bugs search.php
/pearweb/public_html/bugs/include functions.inc
Log:
implement Request #6829 Full involved bugs information in personal menu
http://cvs.php.net/viewvc.cgi/pearweb/include/pear-format-html.php?r1=1.202&r2=1.203&diff_format=u
Index: pearweb/include/pear-format-html.php
diff -u pearweb/include/pear-format-html.php:1.202 pearweb/include/pear-format-html.php:1.203
--- pearweb/include/pear-format-html.php:1.202 Sun Apr 22 05:44:23 2007
+++ pearweb/include/pear-format-html.php Tue Apr 24 03:03:38 2007
@@ -15,7 +15,7 @@
+----------------------------------------------------------------------+
| Authors: |
+----------------------------------------------------------------------+
- $Id: pear-format-html.php,v 1.202 2007/04/22 05:44:23 dufuz Exp $
+ $Id: pear-format-html.php,v 1.203 2007/04/24 03:03:38 cellog Exp $
*/
PEAR::setErrorHandling(PEAR_ERROR_CALLBACK, 'error_handler');
@@ -164,7 +164,9 @@
print 'Logged in as ' . strtoupper($auth_user->handle) . ' (';
print '<a class="menuWhite" href="/user/' .
$auth_user->handle . '">Info</a> | ';
print '<a class="menuWhite" href="/account-edit.php?handle=' .
$auth_user->handle . '">Profile</a> | ';
- print '<a class="menuWhite" href="/bugs/search.php?handle=' .
$auth_user->handle .
'&cmd=display&status=OpenFeedback">Bugs</a>';
+ print '<a class="menuWhite" href="/bugs/search.php?handle=' .
$auth_user->handle .
'&cmd=display&status=OpenFeedback&showmenu=1">Bugs</a> |
';
+ print '<a class="menuWhite" href="/bugs/search.php?handle=' .
$auth_user->handle . '&cmd=display&status=All&author_email=' .
$auth_user->handle .
+ '&direction=DESC&order_by=ts1&showmenu=1">My
Bugs</a>';
print ")</small><br />\n";
if (empty($_SERVER['QUERY_STRING'])) {
http://cvs.php.net/viewvc.cgi/pearweb/public_html/bugs/search.php?r1=1.80&r2=1.81&diff_format=u
Index: pearweb/public_html/bugs/search.php
diff -u pearweb/public_html/bugs/search.php:1.80 pearweb/public_html/bugs/search.php:1.81
--- pearweb/public_html/bugs/search.php:1.80 Sun Apr 22 06:13:07 2007
+++ pearweb/public_html/bugs/search.php Tue Apr 24 03:03:38 2007
@@ -15,7 +15,7 @@
* @package Bugs
* @copyright Copyright (c) 1997-2005 The PHP Group
* @license http://www.php.net/license/3_0.txt
PHP License
- * @version $Id: search.php,v 1.80 2007/04/22 06:13:07 dufuz Exp $
+ * @version $Id: search.php,v 1.81 2007/04/24 03:03:38 cellog Exp $
*/
/**
@@ -405,7 +405,6 @@
'?cmd=display' .
$package_name_string .
$package_nname_string .
- '&status=' . urlencode(rinse($status)) .
'&search_for=' . urlencode(rinse($search_for)) .
'&php_os=' . urlencode(rinse($php_os)) .
'&boolean=' . BOOLEAN_SEARCH .
@@ -423,8 +422,13 @@
'&maintain=' . urlencode($maintain);
display_bug_error($warnings, 'warnings', 'WARNING:');
- show_bugs_menu($_GET['package_name'], $status);
+ if (isset($_GET['showmenu'])) {
+ show_bugs_menu($_GET['package_name'], $status, $link .
'&showmenu=1');
+ } else {
+ show_bugs_menu($_GET['package_name'], $status);
+ }
+ $link .= '&status=' . urlencode(rinse($status));
?>
<table border="0" cellspacing="2" width="100%">
http://cvs.php.net/viewvc.cgi/pearweb/public_html/bugs/include/functions.inc?r1=1.143&r2=1.144&diff_format=u
Index: pearweb/public_html/bugs/include/functions.inc
diff -u pearweb/public_html/bugs/include/functions.inc:1.143
pearweb/public_html/bugs/include/functions.inc:1.144
--- pearweb/public_html/bugs/include/functions.inc:1.143 Sun Apr 22 06:13:07 2007
+++ pearweb/public_html/bugs/include/functions.inc Tue Apr 24 03:03:38 2007
@@ -15,7 +15,7 @@
* @package Bugs
* @copyright Copyright (c) 1997-2005 The PHP Group
* @license http://www.php.net/license/3_0.txt
PHP License
- * @version $Id: functions.inc,v 1.143 2007/04/22 06:13:07 dufuz Exp $
+ * @version $Id: functions.inc,v 1.144 2007/04/24 03:03:38 cellog Exp $
*/
@@ -1145,11 +1145,11 @@
*
* @return void
*/
-function show_bugs_menu($pkgname, $status = null)
+function show_bugs_menu($pkgname, $status = null, $fulllink = false)
{
global $dbh, $pseudo_pkgs;
- if (empty($pkgname)) {
+ if (empty($pkgname) && !$fulllink) {
return;
}
@@ -1170,7 +1170,7 @@
echo "\n\n<!-- BEGIN BUG NAV -->\n\n";
echo '<table width="100%" border="0"><tr><td>'
. "\n ";
- if (count($pkgname) == 1) {
+ if (count($pkgname) == 1 && !$fulllink) {
if ($home) {
echo make_link('/package/' . $pkgname[0], 'Package home');
echo delim();
@@ -1180,7 +1180,7 @@
echo delim();
}
- if (count($pkgname) == 1) {
+ if (count($pkgname) == 1 && !$fulllink) {
echo make_link('/bugs/search.php?package_name[]=' . $pkgname[0], 'New
search');
echo delim();
echo make_link('/bugs/roadmap.php?package=' . $pkgname[0], 'Development Road
Map');
@@ -1195,17 +1195,22 @@
$style['All'] = ($status == 'All') ?'
class="status_active"':'';
echo '<td style="text-align: right;">' . "\n Status: ";
- echo make_link('/bugs/search.php?cmd=display&' . $pkgs .
+ if (!$fulllink) {
+ $fulllink = '/bugs/search.php?cmd=display&' . $pkgs;
+ }
+ echo make_link($fulllink .
'&status=Open', 'Open', '',
$style['Open']);
echo delim();
- echo make_link('/bugs/search.php?cmd=display&' . $pkgs .
+ echo make_link($fulllink .
'&status=Feedback', 'Feedback', '',
$style['Feedback']);
echo delim();
- echo make_link('/bugs/search.php?cmd=display&' . $pkgs .
+ echo make_link($fulllink .
'&status=All', 'All', '',
$style['All']);
- echo delim();
- echo make_link('/bugs/search.php?cmd=display&' . $pkgs .
- '&status=CRSLR', 'CRSLR', '',
$style['CRSLR'], 'Closed reports since last release');
+ if (count($pkgname) == 1) {
+ echo delim();
+ echo make_link($fulllink .
+ '&status=CRSLR', 'CRSLR', '',
$style['CRSLR'], 'Closed reports since last release');
+ }
echo "\n</td></tr></table>\n";
echo '<hr />';
echo "\n\n<!-- END BUG NAV -->\n\n";