com web/php: Kill reST things: error.php mailing-lists.php reST/index.php sitemap.php sitemap.xml source.php urlhowto.php

Commit: 74bc9e6ad77fb860ae8e171d46b4914a3737d7a9 Author: Hannes Magnusson <bjori@mongodb.com> Sun, 27 Oct 2013 16:42:56 -0700 Parents: 75e51b72ec44b2c03be8718529f47f63b1c1717f Branches: master Link: http://git.php.net/?p=web/php.git;a=commitdiff;h=74bc9e6ad77fb860ae8e171d46b4914a3737d7a9 Log: Kill reST things It doesn't even render correctly, and has gone more or less unused Changed paths: M error.php M mailing-lists.php D reST/index.php M sitemap.php M sitemap.xml M source.php M urlhowto.php Diff: diff --git a/error.php b/error.php index e86503d..669328a 100644 --- a/error.php +++ b/error.php @@ -180,13 +180,6 @@ if (preg_match("!^get/([^/]+)/from/([^/]+)(/mirror)?$!", $URI, $dlinfo)) { exit; } -// The rest rendering -if (strpos($URI, "reST/") === 0) { - $_GET["rel_path"] = substr($URI, 5); - include $_SERVER['DOCUMENT_ROOT'] ."/reST/index.php"; - exit; -} - // php.net/42 --> likely a bug number if (is_numeric($URI)) { mirror_redirect("http://bugs.php.net/bug.php?id=$URI"); @@ -459,6 +452,11 @@ $external_redirects = array( "rev" => "http://doc.php.net/php/$LANG/revcheck.php", "release/5_3_0.php" => "/releases/5_3_0.php", // PHP 5.3.0 release announcement had a typo "ideas.php" => "http://wiki.php.net/ideas", // BC + // We used to do reST rendering of README files + "reST/README.RELEASE_PROCESS" => "http://git.php.net/?p=php-src.git;a=blob_plain;f=README.RELEASE_PROCESS;hb=HEAD", + "reST/README.MAILINGLIST_RULES" => "http://git.php.net/?p=php-src.git;a=blob_plain;f=README.MAILINGLIST_RULES;hb=HEAD", + "reST/README.GIT-RULES" => "http://git.php.net/?p=php-src.git;a=blob_plain;f=README.GIT-RULES;hb=HEAD", + "reST/CODING_STANDARDS" => "http://git.php.net/?p=php-src.git;a=blob_plain;f=CODING_STANDARDS;hb=HEAD", ); // ============================================================================ diff --git a/mailing-lists.php b/mailing-lists.php index 766e4de..143642f 100644 --- a/mailing-lists.php +++ b/mailing-lists.php @@ -167,7 +167,7 @@ if (isset($_POST['maillist'])) { </ul> <p> And make sure you have read our - <a href="/reST/README.MAILINGLIST_RULES">Mailinglist Rules</a>. + <a href="//git.php.net/?p=php-src.git;a=blob_plain;f=README.MAILINGLIST_RULES;hb=HEAD">Mailinglist Rules</a>. </p> <?php diff --git a/reST/index.php b/reST/index.php deleted file mode 100644 index 2c9e046..0000000 --- a/reST/index.php +++ /dev/null @@ -1,60 +0,0 @@ -<?php -// $Id$ -$_SERVER['BASE_PAGE'] = 'reST/index.php'; -include_once $_SERVER['DOCUMENT_ROOT'] . '/include/prepend.inc'; -include_once $_SERVER['DOCUMENT_ROOT'] . '/include/shared-manual.inc'; - -// Pregenerated (on master) cache -$rest_dir = $_SERVER['DOCUMENT_ROOT'].'/reST/cache/'; - -$path = isset($_GET['rel_path']) ? $_GET['rel_path'] : ""; - -// Set "this pages ID" (for the notes system) -$PGI["this"] = array("reST/" . ($path ? $path : "index.php"), ""); -$_SERVER['BASE_HREF'] = $MYSITE . $_SERVER['BASE_PAGE']; - - -$SIDEBAR_DATA = '<h3>File list</h3> -<ul class="simple" id="reSTlist">'; - -$restfiles = glob($rest_dir. "/*"); - -//$list = $lastdir = ""; -$list = ""; -foreach($restfiles as $filename) { - $link = basename($filename, ".rest"); - - $filename = basename($link); - - // Only use the "last part" of the filename (i.e. README.FOOBAR => FOOBAR) - if (strpos($filename, ".") !== false) { - $filename = substr($filename, strpos($filename, ".")+1); - } - - $filename = str_replace(array("-", "_"), " ", $filename); - $list .= '<li><a href="/reST/' .$link.'">'.$filename.'</a></li>'."\n"; -} - -if ($list) { - $SIDEBAR_DATA .= "$list</ul>"; -} else { - $SIDEBAR_DATA .= "<li>No files available</li>"; -} -$SIDEBAR_DATA .= "</ul>"; - - -$filename = $rest_dir. "/" .str_replace('/', '_', $path).'.rest'; -if (($k = array_search($filename, $restfiles)) === false) { - site_header("reST"); - if($path) { - echo '<p class="warn">Unknown file</p>'; - } - echo "<p>Please select a file from the filelist on the left</p>"; -} else { - site_header(basename($path)); - include $restfiles[$k]; - manual_notes(); -} - -site_footer(); - diff --git a/sitemap.php b/sitemap.php index 8137190..fe8b774 100644 --- a/sitemap.php +++ b/sitemap.php @@ -43,7 +43,6 @@ site_header("Sitemap", array("current" => "help")); <li><a href="/docs.php">Online Documentation</a></li> <li><a href="/faq.php">Frequently Asked Questions</a></li> <li><a href="/download-docs.php">Download documentation</a></li> - <li><a href="/reST">Internal documentations for developers</a></li> </ul> </li> <li>Other support pages diff --git a/sitemap.xml b/sitemap.xml index 1859ab4..2346dcc 100755 --- a/sitemap.xml +++ b/sitemap.xml @@ -95,9 +95,6 @@ <loc>http://php.net/releases/</loc> </url> <url> - <loc>http://php.net/reST/</loc> - </url> - <url> <loc>http://php.net/search.php</loc> </url> <url> diff --git a/source.php b/source.php index 82abfed..2d51bcc 100644 --- a/source.php +++ b/source.php @@ -50,7 +50,7 @@ $dir = dirname($_GET['url']); if (!empty($dir) && !preg_match("!^(\\.|/)$!", $dir)) { // Check if the specified dir is valid - $legal_dirs = array("/manual", "/include", "/stats", "/error", "/license", "/conferences", "/archive", "/releases", "/security", "/reST"); + $legal_dirs = array("/manual", "/include", "/stats", "/error", "/license", "/conferences", "/archive", "/releases", "/security"); if ((preg_match("!^/manual/!", $dir) || in_array($dir, $legal_dirs)) && strpos($dir, "..") === FALSE) { $page_name = $_SERVER['DOCUMENT_ROOT'] . $_GET['url']; diff --git a/urlhowto.php b/urlhowto.php index af20e68..196bd12 100644 --- a/urlhowto.php +++ b/urlhowto.php @@ -156,8 +156,8 @@ function a($href) { <h2>PHP Developer shortcuts</h2> <ul> - <li>Snap downloads: <a href="http://snaps.php.net/?53">http://snaps.php.net/?53</a> - (ex: latest 5.3 snap. Use ?trunk or ?latest for latest trunk) + <li>Snap downloads: <a href="http://snaps.php.net/?55">http://snaps.php.net/?53</a> + (ex: latest 5.5 snap. Use ?latest for latest master) </li> <li>Changelog information: <a href="http://php.net/changelog">http://php.net/changelog</a> (ex: latest PHP changelog. php5news = latest PHP 5 NEWS, phptrunknews = latest PHP trunk NEWS) @@ -165,9 +165,6 @@ function a($href) { <li>Bugs: <a href="http://php.net/42">http://php.net/42</a> (any numeric value redirects to said bug # at bugs.php.net) </li> - <li>reST based README info: <a href="http://php.net/reST/">http://php.net/reST/</a> - (lists several README files) - </li> </ul> <h2>Even smarter tricks</h2>