Commit: 6a5d8a952a966df417461fe8e25f3c988ea489eb
Author: Hannes Magnusson <[email protected]> Tue, 28 Dec 2010 11:09:09
+0000
Parents: 851dcf9bee3b90d3afa23bdc1ece590501a1f0b2
Branches: master
Link:
http://git.php.net/?p=web/php.git;a=commitdiff;h=6a5d8a952a966df417461fe8e25f3c988ea489eb
Log:
Add current config option (ignored in old-web), and FIXME placeholders for pages
not in any menu yet
Changed paths:
M ChangeLog-4.php
M ChangeLog-5.php
M cal.php
M contact.php
M copyright.php
M credits.php
M cvsup.php
M docs.php
M download-docs.php
M download-logos.php
M downloads.php
M get-involved.php
M include/header.inc
M license/contrib-guidelines-code.php
M license/distrib-guidelines-code.php
M license/index.php
M links.php
M mailing-lists.php
M mirror.php
M mirroring-stats.php
M mirroring-troubles.php
M mirroring.php
M mirrors.php
M mod.php
M my.php
M privacy.php
M quickref.php
M results.php
M search.php
M security-note.php
M sidebars.php
M sitemap.php
M sites.php
M software.php
M source.php
M submit-event.php
M support.php
M svn-php.php
M svn.php
M thanks.php
M tips.php
M unsub.php
M urlhowto.php
M usage.php
diff --git a/ChangeLog-4.php b/ChangeLog-4.php
index d547b28..0259f9d 100644
--- a/ChangeLog-4.php
+++ b/ChangeLog-4.php
@@ -2,7 +2,7 @@
// $Id$
$_SERVER['BASE_PAGE'] = 'ChangeLog-4.php';
include_once $_SERVER['DOCUMENT_ROOT'] . '/include/prepend.inc';
-site_header("PHP 4 ChangeLog");
+site_header("PHP 4 ChangeLog", array("current" => "FIXME"));
function bugfix($number) { echo "Fixed bug "; bugl($number); }
function bugl($number) { echo "<a
href=\"http://bugs.php.net/$number\";>#$number</a>"; }
?>
diff --git a/ChangeLog-5.php b/ChangeLog-5.php
index dc0e4d2..be05265 100644
--- a/ChangeLog-5.php
+++ b/ChangeLog-5.php
@@ -2,7 +2,7 @@
// $Id$
$_SERVER['BASE_PAGE'] = 'ChangeLog-5.php';
include_once $_SERVER['DOCUMENT_ROOT'] . '/include/prepend.inc';
-site_header("PHP 5 ChangeLog");
+site_header("PHP 5 ChangeLog", array("current" => "FIXME"));
function bugfix($number) { echo "Fixed bug "; bugl($number); }
function bugl($number) { echo "<a
href=\"http://bugs.php.net/$number\";>#$number</a>"; }
function peclbugfix($number) { echo "Fixed PECL bug "; bugl($number); }
diff --git a/cal.php b/cal.php
index d352d6d..4414db0 100644
--- a/cal.php
+++ b/cal.php
@@ -30,7 +30,7 @@ if ($cy != 0 && !valid_year($cy)) {
if ($id) {
// Try to load event by ID and display header and info for that event
if ($event = load_event($id)) {
- site_header("Event: " . stripslashes(htmlentities($event['sdesc'],
ENT_QUOTES | ENT_IGNORE, 'UTF-8')));
+ site_header("Event: " . stripslashes(htmlentities($event['sdesc'],
ENT_QUOTES | ENT_IGNORE, 'UTF-8')), array("current" => "FIXME"));
display_event($event, 0);
$begun = TRUE;
}
@@ -51,7 +51,7 @@ elseif ($cy && $cm && $cd) {
// Try to load events for that day, and display them all
if ($events = load_events($date)) {
- site_header("Events: ".date("F j, Y", $date));
+ site_header("Events: ".date("F j, Y", $date), array("current" =>
"FIXME"));
echo "<h2>", date("F j, Y", $date), "</h2>\n";
foreach ($events as $event) {
display_event($event, 0);
@@ -87,7 +87,7 @@ if (!isset($cy) || $cy == 0) { $cy = date("Y"); }
$date = mktime(0, 0, 1, $cm, 1, $cy);
if (!$begun) {
- site_header("Events: ".date("F Y", $date));
+ site_header("Events: ".date("F Y", $date), array("current" => "FIXME"));
?>
<div class="tip">
<p>
diff --git a/contact.php b/contact.php
index e5de0ce..ce00f36 100644
--- a/contact.php
+++ b/contact.php
@@ -2,7 +2,7 @@
// $Id$
$_SERVER['BASE_PAGE'] = 'contact.php';
include_once $_SERVER['DOCUMENT_ROOT'] . '/include/prepend.inc';
-site_header("Contact");
+site_header("Contact", array("current" => "community"));
?>
<a name="ads"></a>
diff --git a/copyright.php b/copyright.php
index 8d5766f..cffe439 100644
--- a/copyright.php
+++ b/copyright.php
@@ -10,7 +10,7 @@ $SIDEBAR_DATA = '
<a href="/license/">see our licensing information page</a>.
</p>
';
-site_header("Copyright");
+site_header("Copyright", array("current" => "footer"));
?>
<a name="copyright"></a>
diff --git a/credits.php b/credits.php
index 5aa20e1..abfdb69 100644
--- a/credits.php
+++ b/credits.php
@@ -23,7 +23,7 @@ $credits = str_replace(
// If there is something left, print it out
if ($credits) {
- site_header("Credits");
+ site_header("Credits", array("current" => "community"));
echo $credits;
site_footer();
}
diff --git a/cvsup.php b/cvsup.php
index bc3b556..5506483 100644
--- a/cvsup.php
+++ b/cvsup.php
@@ -28,7 +28,7 @@ $SIDEBAR_DATA = '
Compiled snapshots for Windows users are also included.
</p>
';
-site_header("Using CVSup to maintain a local CVS repository");
+site_header("Using CVSup to maintain a local CVS repository", array("current"
=> "FIXME"));
?>
<h1>Using CVSup To Maintain A Local CVS Repository</h1>
diff --git a/docs.php b/docs.php
index d9f8808..7282ef8 100644
--- a/docs.php
+++ b/docs.php
@@ -39,7 +39,7 @@ $SIDEBAR_DATA='
</p>
';
-site_header("Documentation");
+site_header("Documentation", array("current" => "docs"));
?>
diff --git a/download-docs.php b/download-docs.php
index fec0bf3..5be38bb 100644
--- a/download-docs.php
+++ b/download-docs.php
@@ -45,7 +45,7 @@ $SIDEBAR_DATA='
</p>
';
-site_header("Download documentation");
+site_header("Download documentation", array("current" => "docs"));
// Format to look for
$formats = array(
diff --git a/download-logos.php b/download-logos.php
index 89b61f4..5c282f5 100644
--- a/download-logos.php
+++ b/download-logos.php
@@ -11,7 +11,7 @@ $SIDEBAR_DATA = '
under a GPL license.
</p>
';
-site_header("Download Logos");
+site_header("Download Logos", array("current" => "downloads"));
// Print recommended star cell
function print_star()
diff --git a/downloads.php b/downloads.php
index 3c20be1..f5e8070 100644
--- a/downloads.php
+++ b/downloads.php
@@ -78,6 +78,7 @@ site_header("Downloads",
"title" => "PHP Release feed"
),
),
+ "current" => "downloads",
)
);
?>
diff --git a/get-involved.php b/get-involved.php
index 69a00ba..0b4b980 100644
--- a/get-involved.php
+++ b/get-involved.php
@@ -3,7 +3,7 @@
$_SERVER['BASE_PAGE'] = 'get-involved.php';
include_once $_SERVER['DOCUMENT_ROOT'] . '/include/prepend.inc';
-site_header("Get Involved");
+site_header("Get Involved", array("current" => "community"));
?>
<aside class="tips">
diff --git a/include/header.inc b/include/header.inc
index 9bdf1f6..95b5b3e 100644
--- a/include/header.inc
+++ b/include/header.inc
@@ -45,7 +45,7 @@
<li id="headhome">
<a href="/" rel="home" class="menu-link">Home</a>
</li>
- <li>
+ <li class="<?php echo $curr == "downloads" ? "current" : ""?>">
<a href="/downloads.php" class="menu-link">Downloads</a>
</li>
<li class="parent <?php echo $curr == "docs" ? "current" : ""?>">
diff --git a/license/contrib-guidelines-code.php
b/license/contrib-guidelines-code.php
index f439616..f4b618b 100644
--- a/license/contrib-guidelines-code.php
+++ b/license/contrib-guidelines-code.php
@@ -2,7 +2,7 @@
// $Id$
$_SERVER['BASE_PAGE'] = 'license/contrib-guidelines-code.php';
include_once $_SERVER['DOCUMENT_ROOT'] . '/include/prepend.inc';
-site_header("License Information");
+site_header("License Information", array("current" => "help"));
?>
<h2>PHP Contributor Guidelines for Code Developers</h2>
diff --git a/license/distrib-guidelines-code.php
b/license/distrib-guidelines-code.php
index e355110..d4209f8 100644
--- a/license/distrib-guidelines-code.php
+++ b/license/distrib-guidelines-code.php
@@ -2,7 +2,7 @@
// $Id$
$_SERVER['BASE_PAGE'] = 'license/distrib-guidelines-code.php';
include_once $_SERVER['DOCUMENT_ROOT'] . '/include/prepend.inc';
-site_header("License Information");
+site_header("License Information", array("current" => "help"));
?>
<h2>PHP Distribution Guidelines</h2>
diff --git a/license/index.php b/license/index.php
index cb11162..62bd643 100644
--- a/license/index.php
+++ b/license/index.php
@@ -2,7 +2,7 @@
// $Id$
$_SERVER['BASE_PAGE'] = 'license/index.php';
include_once $_SERVER['DOCUMENT_ROOT'] . '/include/prepend.inc';
-site_header("License Information");
+site_header("License Information", array("current" => "help"));
?>
<h1>PHP Licensing</h1>
diff --git a/links.php b/links.php
index bcb5f0d..ce7b967 100644
--- a/links.php
+++ b/links.php
@@ -17,7 +17,7 @@ $SIDEBAR_DATA = '
the PHP license.
</p>
';
-site_header("Links");
+site_header("Links", array("current" => "community"));
?>
<h1>PHP Related Links</h1>
diff --git a/mailing-lists.php b/mailing-lists.php
index 8977843..aa0eaf2 100644
--- a/mailing-lists.php
+++ b/mailing-lists.php
@@ -40,7 +40,7 @@ $SIDEBAR_DATA = '
</ul>
';
-site_header("Mailing Lists");
+site_header("Mailing Lists", array("current" => "help"));
// Some mailing list is selected for [un]subscription
if (isset($_POST['maillist'])) {
diff --git a/mirror.php b/mirror.php
index b4a8bb8..d4b72fe 100644
--- a/mirror.php
+++ b/mirror.php
@@ -16,7 +16,7 @@ $SIDEBAR_DATA = '
mirroring page</a>.
</p>
';
-site_header("Information About This PHP Mirror Site");
+site_header("Information About This PHP Mirror Site", array("current" =>
"FIXME"));
?>
<h1>Information About This PHP Mirror Site</h1>
diff --git a/mirroring-stats.php b/mirroring-stats.php
index 277adac..aeaedf5 100644
--- a/mirroring-stats.php
+++ b/mirroring-stats.php
@@ -2,7 +2,7 @@
// $Id$
$_SERVER['BASE_PAGE'] = 'mirroring-stats.php';
include_once $_SERVER['DOCUMENT_ROOT'] . '/include/prepend.inc';
-site_header("Setting Up Local Stats");
+site_header("Setting Up Local Stats", array("current" => "FIXME"));
?>
<h1>Setting Up Local Stats</h1>
diff --git a/mirroring-troubles.php b/mirroring-troubles.php
index 038e199..b77f21c 100644
--- a/mirroring-troubles.php
+++ b/mirroring-troubles.php
@@ -13,7 +13,7 @@ $SIDEBAR_DATA = '
</p>
';
-site_header("The PHP mirrors problem and troubleshooting guide");
+site_header("The PHP mirrors problem and troubleshooting guide",
array("current" => "FIXME"));
?>
<h1>Common troubles that PHP.net mirrors face</h1>
diff --git a/mirroring.php b/mirroring.php
index e35c765..bcb1917 100644
--- a/mirroring.php
+++ b/mirroring.php
@@ -20,7 +20,7 @@ $SIDEBAR_DATA = '
';
*/
-site_header("Mirroring The PHP Website");
+site_header("Mirroring The PHP Website", array("current" => "FIXME"));
// Get a minute to print out for the cron example
function make_seed()
diff --git a/mirrors.php b/mirrors.php
index d5a9324..2142c95 100644
--- a/mirrors.php
+++ b/mirrors.php
@@ -3,7 +3,7 @@
$_SERVER['BASE_PAGE'] = 'mirrors.php';
include_once $_SERVER['DOCUMENT_ROOT'] . '/include/prepend.inc';
include_once $_SERVER['DOCUMENT_ROOT'] . '/include/mirrortable.inc';
-site_header("Mirror Sites");
+site_header("Mirror Sites", array("current" => "community"));
?>
<h1>Mirror Sites</h1>
diff --git a/mod.php b/mod.php
index 79afef3..24f02a9 100644
--- a/mod.php
+++ b/mod.php
@@ -10,7 +10,7 @@
$_SERVER['BASE_PAGE'] = 'mod.php';
include_once $_SERVER['DOCUMENT_ROOT'] . '/include/prepend.inc';
-site_header("Email confirmation");
+site_header("Email confirmation", array("current" => "community"));
// Only run on www.php.net
if ($MYSITE != "http://www.php.net/";) {
diff --git a/my.php b/my.php
index 5297906..8d80120 100644
--- a/my.php
+++ b/my.php
@@ -73,7 +73,7 @@ if (isset($_POST['beta'])) {
myphpnet_save();
-site_header("My PHP.net");
+site_header("My PHP.net", array("current" => "community"));
?>
<form action="/my.php" method="post">
diff --git a/privacy.php b/privacy.php
index d1dc879..4480f71 100644
--- a/privacy.php
+++ b/privacy.php
@@ -2,7 +2,7 @@
// $Id: tips.php 286580 2009-07-31 10:28:16Z bjori $
$_SERVER['BASE_PAGE'] = 'privacy.php';
include_once $_SERVER['DOCUMENT_ROOT'] . '/include/prepend.inc';
-site_header("Privacy Policy");
+site_header("Privacy Policy", array("current" => "footer"));
?>
<h1>Privacy Policy</h1>
diff --git a/quickref.php b/quickref.php
index 65e7555..21162b4 100644
--- a/quickref.php
+++ b/quickref.php
@@ -125,7 +125,7 @@ if (count($temp) > 0) {
if (count($maybe) > 0) { $head_options = array("noindex"); }
else { $head_options = array(); }
-site_header("Manual Quick Reference", $head_options);
+site_header("Manual Quick Reference", $head_options+array("current" =>
"docs"));
?>
<h1>PHP Function List</h1>
diff --git a/results.php b/results.php
index 950e1f6..1da6e8b 100644
--- a/results.php
+++ b/results.php
@@ -54,7 +54,7 @@ if (is_array($data)) {
$res = unserialize($data);
// HTTP status line is passed on, signifies an error
-site_header('Search results', array("noindex"));
+site_header('Search results', array("noindex", "current" => "FIXME")));
if (!is_array($res)) {
exit_with_pretty_error(null, 'Internal error', 'Please try again later');
diff --git a/search.php b/search.php
index c0e8831..e62d535 100644
--- a/search.php
+++ b/search.php
@@ -107,7 +107,7 @@ else {
"href" => $MYSITE . "phpnetimprovedsearch.src",
"title" => "Add PHP.net search"
);
- site_header("Search", array("link" => array($link)));
+ site_header("Search", array("link" => array($link), "current" => "FIXME"));
?>
<p>
The autocompleting search feature is accessible via the form elements at the
top
diff --git a/security-note.php b/security-note.php
index 138e668..f9f3441 100644
--- a/security-note.php
+++ b/security-note.php
@@ -2,7 +2,7 @@
// $Id$
$_SERVER['BASE_PAGE'] = 'security-note.php';
include_once $_SERVER['DOCUMENT_ROOT'] . '/include/prepend.inc';
-site_header("A Note on Security in PHP");
+site_header("A Note on Security in PHP", array("current" => "FIXME"));
?>
<h1>A Note on Security in PHP</h1>
diff --git a/sidebars.php b/sidebars.php
index 5981a20..8d1762c 100644
--- a/sidebars.php
+++ b/sidebars.php
@@ -2,7 +2,7 @@
// $Id$
$_SERVER['BASE_PAGE'] = 'sidebars.php';
include_once $_SERVER['DOCUMENT_ROOT'] . '/include/prepend.inc';
-site_header("PHP.net Search Bars");
+site_header("PHP.net Search Bars", array("current" => "help"));
?>
<h1>PHP.net Search Bars</h1>
diff --git a/sitemap.php b/sitemap.php
index 3561df8..046c567 100644
--- a/sitemap.php
+++ b/sitemap.php
@@ -2,7 +2,7 @@
// $Id$
$_SERVER['BASE_PAGE'] = 'sitemap.php';
include_once $_SERVER['DOCUMENT_ROOT'] . '/include/prepend.inc';
-site_header("Sitemap");
+site_header("Sitemap", array("current" => "help"));
?>
<h1>PHP.net Sitemap</h1>
diff --git a/sites.php b/sites.php
index bc672d1..7b69085 100644
--- a/sites.php
+++ b/sites.php
@@ -18,7 +18,7 @@ $SIDEBAR_DATA = '
pages you will find interesting.
</p>
';
-site_header("A Tourist's Guide");
+site_header("A Tourist's Guide", array("current" => "help"));
?>
<h1>PHP.net: A Tourist's Guide</h1>
diff --git a/software.php b/software.php
index 15a1189..6dd424b 100644
--- a/software.php
+++ b/software.php
@@ -2,7 +2,7 @@
// $Id$
$_SERVER['BASE_PAGE'] = 'software.php';
include_once $_SERVER['DOCUMENT_ROOT'] . '/include/prepend.inc';
-site_header("PHP Software");
+site_header("PHP Software", array("current" => "help"));
?>
<h1>PHP Software</h1>
diff --git a/source.php b/source.php
index 275c4b2..8213892 100644
--- a/source.php
+++ b/source.php
@@ -32,7 +32,7 @@ $SIDEBAR_DATA = '
<a href="http://svn.php.net/web/php/";>svn.php.net</a>.
</p>
';
-site_header("Show Source");
+site_header("Show Source", array("current" => "FIXME"));
// No file param specified
if (!isset($_GET['url']) || (isset($_GET['url']) && !is_string($_GET['url'])))
{
diff --git a/submit-event.php b/submit-event.php
index 2033823..e4abad8 100644
--- a/submit-event.php
+++ b/submit-event.php
@@ -4,7 +4,7 @@ $_SERVER['BASE_PAGE'] = 'submit-event.php';
include_once $_SERVER['DOCUMENT_ROOT'] . '/include/prepend.inc';
include_once $_SERVER['DOCUMENT_ROOT'] . '/include/posttohost.inc';
include_once $_SERVER['DOCUMENT_ROOT'] . '/include/email-validation.inc';
-site_header("Submit an Event");
+site_header("Submit an Event", array("current" => "FIXME"));
// No errors, processing depends on POST data
$errors = array();
diff --git a/support.php b/support.php
index 67ce1e7..19cdb53 100644
--- a/support.php
+++ b/support.php
@@ -2,7 +2,7 @@
// $Id$
$_SERVER['BASE_PAGE'] = 'support.php';
include_once $_SERVER['DOCUMENT_ROOT'] . '/include/prepend.inc';
-site_header("Getting Help");
+site_header("Getting Help", array("current" => "help"));
?>
<h1>Documentation</h1>
diff --git a/svn-php.php b/svn-php.php
index dd2c20d..318191c 100644
--- a/svn-php.php
+++ b/svn-php.php
@@ -20,7 +20,7 @@ $SIDEBAR_DATA = '
<a href="/svn.php">SVN</a>. No SVN account is required.
</p>
';
-site_header("Using SVN for PHP Development");
+site_header("Using SVN for PHP Development", array("current" => "FIXME"));
$groups = array(
"php" => "PHP Group",
diff --git a/svn.php b/svn.php
index 814f552..ba57a51 100644
--- a/svn.php
+++ b/svn.php
@@ -26,7 +26,7 @@ $SIDEBAR_DATA = '
Compiled snapshots for Windows users are also included.
</p>
';
-site_header("SVN Access");
+site_header("SVN Access", array("current" => "community"));
?>
<h1>SVN Access</h1>
diff --git a/thanks.php b/thanks.php
index a9658cc..7a8f549 100644
--- a/thanks.php
+++ b/thanks.php
@@ -2,7 +2,7 @@
// $Id$
$_SERVER['BASE_PAGE'] = 'thanks.php';
include_once $_SERVER['DOCUMENT_ROOT'] . '/include/prepend.inc';
-site_header("Thanks");
+site_header("Thanks", array("current" => "FIXME"));
?>
<h1>Thanks</h1>
diff --git a/tips.php b/tips.php
index aec9dfa..fc923e4 100644
--- a/tips.php
+++ b/tips.php
@@ -17,7 +17,7 @@ $SIDEBAR_DATA = '
<a href="/my.php">the My PHP.net page</a>.
</p>
';
-site_header("Quick Reference Tips");
+site_header("Quick Reference Tips", array("current" => "help"));
function tip_title($title, $author = '', $date = '')
{
diff --git a/unsub.php b/unsub.php
index 291f830..f778d46 100644
--- a/unsub.php
+++ b/unsub.php
@@ -12,7 +12,7 @@ $SIDEBAR_DATA = '
lists</a> on their own pages.
</p>
';
-site_header("Unsubscribing");
+site_header("Unsubscribing", array("current" => "community"));
?>
<h1>Unsubscribing From a Mailing List</h1>
diff --git a/urlhowto.php b/urlhowto.php
index d6f4fe8..d5c363a 100644
--- a/urlhowto.php
+++ b/urlhowto.php
@@ -31,7 +31,7 @@ $SIDEBAR_DATA='
</p>
';
-site_header("URL Howto");
+site_header("URL Howto", array("current" => "help"));
function a($href) {
global $MYSITE;
echo '<a href="' . $MYSITE . $href . '">' . $MYSITE . $href . '</a>';
diff --git a/usage.php b/usage.php
index 370413c..8529e48 100644
--- a/usage.php
+++ b/usage.php
@@ -2,7 +2,7 @@
// $Id$
$_SERVER['BASE_PAGE'] = 'usage.php';
include_once $_SERVER['DOCUMENT_ROOT'] . '/include/prepend.inc';
-site_header("PHP Usage Stats");
+site_header("PHP Usage Stats", array("current" => "FIXME"));
?>
<h1>Usage Stats for April 2007</h1>--
PHP Webmaster List Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
