cvs: phpweb / manual-lookup.php results.php search.php searchbar.php ws.php /include layout.inc prepend.inc
| From: | Rasmus Lerdorf | Date: | Tue, 28 Feb 2006 08:23:28 +0000 |
| Subject: | cvs: phpweb / manual-lookup.php results.php search.php searchbar.php ws.php /include layout.inc prepend.inc | ||
| Groups: | php.mirrors | ||
| Request: | Send a blank email to php-mirrors+get-30715@lists.php.net to get a copy of this message | ||
rasmus Tue Feb 28 08:23:28 2006 UTC
Modified files:
/phpweb manual-lookup.php results.php search.php searchbar.php
ws.php
/phpweb/include layout.inc prepend.inc
Log:
Some new search options
http://cvs.php.net/viewcvs.cgi/phpweb/manual-lookup.php?r1=1.22&r2=1.23&diff_format=u Index: phpweb/manual-lookup.php diff -u phpweb/manual-lookup.php:1.22 phpweb/manual-lookup.php:1.23 --- phpweb/manual-lookup.php:1.22 Fri Aug 8 13:46:28 2003 +++ phpweb/manual-lookup.php Tue Feb 28 08:23:28 2006 @@ -1,11 +1,11 @@ <?php -// $Id: manual-lookup.php,v 1.22 2003/08/08 13:46:28 goba Exp $ +// $Id: manual-lookup.php,v 1.23 2006/02/28 08:23:28 rasmus Exp $ $_SERVER['BASE_PAGE'] = 'manual-lookup.php'; -include_once $_SERVER['DOCUMENT_ROOT'] . '/include/prepend.inc'; -include_once $_SERVER['DOCUMENT_ROOT'] . '/include/loadavg.inc'; -include_once $_SERVER['DOCUMENT_ROOT'] . '/include/manual-lookup.inc'; +include $_SERVER['DOCUMENT_ROOT'] . '/include/prepend.inc'; +include $_SERVER['DOCUMENT_ROOT'] . '/include/loadavg.inc'; +include $_SERVER['DOCUMENT_ROOT'] . '/include/manual-lookup.inc'; -// BC code, so patter and function can equaly be used as +// BC code, so pattern and function can both be used as // parameters to specify the function name if (empty($_GET['function']) && !empty($_GET['pattern'])) { $_GET['function'] = $_GET['pattern']; @@ -22,6 +22,6 @@ // Fall back to a quick reference search $notfound = $_GET['function']; -include_once $_SERVER['DOCUMENT_ROOT'] . '/quickref.php'; +include $_SERVER['DOCUMENT_ROOT'] . '/quickref.php'; ?> http://cvs.php.net/viewcvs.cgi/phpweb/results.php?r1=1.5&r2=1.6&diff_format=u Index: phpweb/results.php diff -u phpweb/results.php:1.5 phpweb/results.php:1.6 --- phpweb/results.php:1.5 Tue Feb 28 05:14:26 2006 +++ phpweb/results.php Tue Feb 28 08:23:28 2006 @@ -1,5 +1,5 @@ <?php -// $Id: results.php,v 1.5 2006/02/28 05:14:26 rasmus Exp $ +// $Id: results.php,v 1.6 2006/02/28 08:23:28 rasmus Exp $ $_SERVER['BASE_PAGE'] = 'results.php'; include $_SERVER['DOCUMENT_ROOT'] . '/include/prepend.inc'; #include $_SERVER['DOCUMENT_ROOT'] . '/include/loadavg.inc'; @@ -19,7 +19,7 @@ $s = (int) $_GET['start']; $per_page = 15; -$valid_profiles = array('all', 'local', 'news', 'bugs'); +$valid_profiles = array('all', 'local', 'news', 'bugs', 'pear', 'pecl', 'talks'); $scope = in_array($_GET['p'], $valid_profiles) ? $_GET['p'] : 'all'; $data = file_get_contents("http://www.php.net/ws.php?profile=$scope&q=$q&results=$per_page&start=$s"); http://cvs.php.net/viewcvs.cgi/phpweb/search.php?r1=1.106&r2=1.107&diff_format=u Index: phpweb/search.php diff -u phpweb/search.php:1.106 phpweb/search.php:1.107 --- phpweb/search.php:1.106 Tue Feb 28 05:14:25 2006 +++ phpweb/search.php Tue Feb 28 08:23:28 2006 @@ -1,5 +1,5 @@ <?php -// $Id: search.php,v 1.106 2006/02/28 05:14:25 rasmus Exp $ +// $Id: search.php,v 1.107 2006/02/28 08:23:28 rasmus Exp $ $_SERVER['BASE_PAGE'] = 'search.php'; include_once $_SERVER['DOCUMENT_ROOT'] . '/include/prepend.inc'; @@ -73,8 +73,22 @@ "cmd=Display+Bugs&status=All&bug_type=Any&search_for={$ucp}" ); } - - // Covers "wholesite", "manual" and any malicious targets + + case "manual": + mirror_redirect($MYSITE . "results.php?q=inurl:manual/en+{$ucp}&p=local"); + break; + + case "news_archive": + $p = urlencode($_FORM['show']); + mirror_redirect($MYSITE . "results.php?q=title:news%2Barchive+{$ucp}&p=local"); + break; + + case "changelogs": + $p = urlencode($_FORM['show']); + mirror_redirect($MYSITE . "results.php?q=title:changelog%2Barchive+{$ucp}&p=all"); + break; + + // Covers the rest default: $p = urlencode($_FORM['show']); mirror_redirect($MYSITE . "results.php?q={$ucp}&l=$LANG&p=$p"); @@ -135,6 +149,11 @@ "local" => "this mirror only", "manual" => "online documentation [en]", "bugdb" => "bug database", + "news_archive" => "Site News Archive", + "changelogs" => "All Changelogs", + "pear" => "just pear.php.net", + "pecl" => "just pecl.php.net", + "talks" => "just talks.php.net", "maillist" => "general mailing list", "devlist" => "developer mailing list", "phpdoc" => "documentation mailing list", http://cvs.php.net/viewcvs.cgi/phpweb/searchbar.php?r1=1.20&r2=1.21&diff_format=u Index: phpweb/searchbar.php diff -u phpweb/searchbar.php:1.20 phpweb/searchbar.php:1.21 --- phpweb/searchbar.php:1.20 Sat Dec 31 22:43:23 2005 +++ phpweb/searchbar.php Tue Feb 28 08:23:28 2006 @@ -1,5 +1,5 @@ <?php -// $Id: searchbar.php,v 1.20 2005/12/31 22:43:23 jacques Exp $ +// $Id: searchbar.php,v 1.21 2006/02/28 08:23:28 rasmus Exp $ $_SERVER['BASE_PAGE'] = 'searchbar.php'; include_once $_SERVER['DOCUMENT_ROOT'] . "/include/prepend.inc"; @@ -36,9 +36,15 @@ in the<br /> <select name="show"> <option value="quickref" selected="selected">function list</option> - <option value="wholesite">whole site</option> + <option value="all" >all php.net sites</option> + <option value="local" >this mirror only</option> <option value="manual" >online documentation [en]</option> <option value="bugdb" >bug database</option> + <option value="news_archive">Site News Archive</option> + <option value="changelogs">All Changelogs</option> + <option value="pear" >just pear.php.net</option> + <option value="pecl" >just pecl.php.net</option> + <option value="talks" >just talks.php.net</option> <option value="maillist" >general mailing list</option> <option value="devlist" >developer mailing list</option> <option value="phpdoc" >documentation mailing list</option> http://cvs.php.net/viewcvs.cgi/phpweb/ws.php?r1=1.2&r2=1.3&diff_format=u Index: phpweb/ws.php diff -u phpweb/ws.php:1.2 phpweb/ws.php:1.3 --- phpweb/ws.php:1.2 Tue Feb 28 07:36:13 2006 +++ phpweb/ws.php Tue Feb 28 08:23:28 2006 @@ -9,7 +9,12 @@ $l = isset($_REQUEST['lang']) ? htmlspecialchars($_REQUEST['lang']) : 'en'; $sites = array( 'all'=>'site=php.net', 'local'=>'site=www.php.net', - 'news'=>'site=news.php.net'); + 'news'=>'site=news.php.net', + 'bugs'=>'site=bugs.php.net', + 'pear'=>'site=pear.php.net', + 'pecl'=>'site=pecl.php.net', + 'talks'=>'site=talks.php.net', + ); if(isset($sites[$_REQUEST['profile']])) $p = $sites[$_REQUEST['profile']]; else $p = $sites['all']; http://cvs.php.net/viewcvs.cgi/phpweb/include/layout.inc?r1=1.229&r2=1.230&diff_format=u Index: phpweb/include/layout.inc diff -u phpweb/include/layout.inc:1.229 phpweb/include/layout.inc:1.230 --- phpweb/include/layout.inc:1.229 Tue Feb 28 01:06:32 2006 +++ phpweb/include/layout.inc Tue Feb 28 08:23:28 2006 @@ -1,5 +1,5 @@ <?php -/* $Id: layout.inc,v 1.229 2006/02/28 01:06:32 imajes Exp $ */ +/* $Id: layout.inc,v 1.230 2006/02/28 08:23:28 rasmus Exp $ */ // Set the static content root differently on php.net $_SERVER['STATIC_ROOT'] = ($MYSITE == 'http://www.php.net/') ? @@ -151,12 +151,18 @@ <span>in the</span> <select name="show"> <option value="quickref" selected="selected">function list</option> - <option value="wholesite">whole site</option> + <option value="all" >all php.net sites</option> + <option value="local" >this mirror only</option> <option value="manual" >online documentation [en]</option> <option value="bugdb" >bug database</option> + <option value="news_archive">Site News Archive</option> + <option value="changelogs">All Changelogs</option> + <option value="pear" >just pear.php.net</option> + <option value="pecl" >just pecl.php.net</option> + <option value="talks" >just talks.php.net</option> <option value="maillist" >general mailing list</option> <option value="devlist" >developer mailing list</option> - <option value="phpdoc" >documentation mailing list </option> + <option value="phpdoc" >documentation mailing list</option> </select> <input type="image" src="{$_SERVER['STATIC_ROOT']}/images/small_submit_white.gif" @@ -500,13 +506,19 @@ <input class="small" type="text" name="pattern" value="" size="30" accesskey="s" /> <small>in the</small> <select name="show" class="small"> -<option value="quickref" selected="selected">function list</option> -<option value="wholesite">whole site</option> -<option value="manual">online documentation [en]</option> -<option value="bugdb">bug database</option> -<option value="maillist">general mailing list</option> -<option value="devlist">developer mailing list</option> -<option value="phpdoc">documentation mailing list </option> + <option value="quickref" selected="selected">function list</option> + <option value="all" >all php.net sites</option> + <option value="local" >this mirror only</option> + <option value="manual" >online documentation [en]</option> + <option value="bugdb" >bug database</option> + <option value="news_archive">Site News Archive</option> + <option value="changelogs">All Changelogs</option> + <option value="pear" >just pear.php.net</option> + <option value="pecl" >just pecl.php.net</option> + <option value="talks" >just talks.php.net</option> + <option value="maillist" >general mailing list</option> + <option value="devlist" >developer mailing list</option> + <option value="phpdoc" >documentation mailing list</option> </select> <?php echo make_submit('small_submit_white.gif', 'search', 'bottom'); ?> </form> http://cvs.php.net/viewcvs.cgi/phpweb/include/prepend.inc?r1=1.34&r2=1.35&diff_format=u Index: phpweb/include/prepend.inc diff -u phpweb/include/prepend.inc:1.34 phpweb/include/prepend.inc:1.35 --- phpweb/include/prepend.inc:1.34 Tue Feb 21 20:46:45 2006 +++ phpweb/include/prepend.inc Tue Feb 28 08:23:28 2006 @@ -1,6 +1,6 @@ <?php // -*- C++ -*- -// $Id: prepend.inc,v 1.34 2006/02/21 20:46:45 rasmus Exp $ +// $Id: prepend.inc,v 1.35 2006/02/28 08:23:28 rasmus Exp $ // See http://www.w3.org/Protocols/rfc2616/rfc2616-sec14.html#sec14.9 // for cache control header descriptions (used in many places on the site). @@ -25,6 +25,8 @@ // Put the magic quotes setting to $MQ $MQ = (boolean) get_magic_quotes_gpc(); +$APC = function_exists('apc_store'); + // Site details (mirror site information) include $_SERVER['DOCUMENT_ROOT'] . '/include/site.inc';
http://cvs.php.net/viewcvs.cgi/phpweb/manual-lookup.php?r1=1.22&r2=1.23&diff_format=u Index: phpweb/manual-lookup.php diff -u phpweb/manual-lookup.php:1.22 phpweb/manual-lookup.php:1.23 --- phpweb/manual-lookup.php:1.22 Fri Aug 8 13:46:28 2003 +++ phpweb/manual-lookup.php Tue Feb 28 08:23:28 2006 @@ -1,11 +1,11 @@ <?php -// $Id: manual-lookup.php,v 1.22 2003/08/08 13:46:28 goba Exp $ +// $Id: manual-lookup.php,v 1.23 2006/02/28 08:23:28 rasmus Exp $ $_SERVER['BASE_PAGE'] = 'manual-lookup.php'; -include_once $_SERVER['DOCUMENT_ROOT'] . '/include/prepend.inc'; -include_once $_SERVER['DOCUMENT_ROOT'] . '/include/loadavg.inc'; -include_once $_SERVER['DOCUMENT_ROOT'] . '/include/manual-lookup.inc'; +include $_SERVER['DOCUMENT_ROOT'] . '/include/prepend.inc'; +include $_SERVER['DOCUMENT_ROOT'] . '/include/loadavg.inc'; +include $_SERVER['DOCUMENT_ROOT'] . '/include/manual-lookup.inc'; -// BC code, so patter and function can equaly be used as +// BC code, so pattern and function can both be used as // parameters to specify the function name if (empty($_GET['function']) && !empty($_GET['pattern'])) { $_GET['function'] = $_GET['pattern']; @@ -22,6 +22,6 @@ // Fall back to a quick reference search $notfound = $_GET['function']; -include_once $_SERVER['DOCUMENT_ROOT'] . '/quickref.php'; +include $_SERVER['DOCUMENT_ROOT'] . '/quickref.php'; ?> http://cvs.php.net/viewcvs.cgi/phpweb/results.php?r1=1.5&r2=1.6&diff_format=u Index: phpweb/results.php diff -u phpweb/results.php:1.5 phpweb/results.php:1.6 --- phpweb/results.php:1.5 Tue Feb 28 05:14:26 2006 +++ phpweb/results.php Tue Feb 28 08:23:28 2006 @@ -1,5 +1,5 @@ <?php -// $Id: results.php,v 1.5 2006/02/28 05:14:26 rasmus Exp $ +// $Id: results.php,v 1.6 2006/02/28 08:23:28 rasmus Exp $ $_SERVER['BASE_PAGE'] = 'results.php'; include $_SERVER['DOCUMENT_ROOT'] . '/include/prepend.inc'; #include $_SERVER['DOCUMENT_ROOT'] . '/include/loadavg.inc'; @@ -19,7 +19,7 @@ $s = (int) $_GET['start']; $per_page = 15; -$valid_profiles = array('all', 'local', 'news', 'bugs'); +$valid_profiles = array('all', 'local', 'news', 'bugs', 'pear', 'pecl', 'talks'); $scope = in_array($_GET['p'], $valid_profiles) ? $_GET['p'] : 'all'; $data = file_get_contents("http://www.php.net/ws.php?profile=$scope&q=$q&results=$per_page&start=$s"); http://cvs.php.net/viewcvs.cgi/phpweb/search.php?r1=1.106&r2=1.107&diff_format=u Index: phpweb/search.php diff -u phpweb/search.php:1.106 phpweb/search.php:1.107 --- phpweb/search.php:1.106 Tue Feb 28 05:14:25 2006 +++ phpweb/search.php Tue Feb 28 08:23:28 2006 @@ -1,5 +1,5 @@ <?php -// $Id: search.php,v 1.106 2006/02/28 05:14:25 rasmus Exp $ +// $Id: search.php,v 1.107 2006/02/28 08:23:28 rasmus Exp $ $_SERVER['BASE_PAGE'] = 'search.php'; include_once $_SERVER['DOCUMENT_ROOT'] . '/include/prepend.inc'; @@ -73,8 +73,22 @@ "cmd=Display+Bugs&status=All&bug_type=Any&search_for={$ucp}" ); } - - // Covers "wholesite", "manual" and any malicious targets + + case "manual": + mirror_redirect($MYSITE . "results.php?q=inurl:manual/en+{$ucp}&p=local"); + break; + + case "news_archive": + $p = urlencode($_FORM['show']); + mirror_redirect($MYSITE . "results.php?q=title:news%2Barchive+{$ucp}&p=local"); + break; + + case "changelogs": + $p = urlencode($_FORM['show']); + mirror_redirect($MYSITE . "results.php?q=title:changelog%2Barchive+{$ucp}&p=all"); + break; + + // Covers the rest default: $p = urlencode($_FORM['show']); mirror_redirect($MYSITE . "results.php?q={$ucp}&l=$LANG&p=$p"); @@ -135,6 +149,11 @@ "local" => "this mirror only", "manual" => "online documentation [en]", "bugdb" => "bug database", + "news_archive" => "Site News Archive", + "changelogs" => "All Changelogs", + "pear" => "just pear.php.net", + "pecl" => "just pecl.php.net", + "talks" => "just talks.php.net", "maillist" => "general mailing list", "devlist" => "developer mailing list", "phpdoc" => "documentation mailing list", http://cvs.php.net/viewcvs.cgi/phpweb/searchbar.php?r1=1.20&r2=1.21&diff_format=u Index: phpweb/searchbar.php diff -u phpweb/searchbar.php:1.20 phpweb/searchbar.php:1.21 --- phpweb/searchbar.php:1.20 Sat Dec 31 22:43:23 2005 +++ phpweb/searchbar.php Tue Feb 28 08:23:28 2006 @@ -1,5 +1,5 @@ <?php -// $Id: searchbar.php,v 1.20 2005/12/31 22:43:23 jacques Exp $ +// $Id: searchbar.php,v 1.21 2006/02/28 08:23:28 rasmus Exp $ $_SERVER['BASE_PAGE'] = 'searchbar.php'; include_once $_SERVER['DOCUMENT_ROOT'] . "/include/prepend.inc"; @@ -36,9 +36,15 @@ in the<br /> <select name="show"> <option value="quickref" selected="selected">function list</option> - <option value="wholesite">whole site</option> + <option value="all" >all php.net sites</option> + <option value="local" >this mirror only</option> <option value="manual" >online documentation [en]</option> <option value="bugdb" >bug database</option> + <option value="news_archive">Site News Archive</option> + <option value="changelogs">All Changelogs</option> + <option value="pear" >just pear.php.net</option> + <option value="pecl" >just pecl.php.net</option> + <option value="talks" >just talks.php.net</option> <option value="maillist" >general mailing list</option> <option value="devlist" >developer mailing list</option> <option value="phpdoc" >documentation mailing list</option> http://cvs.php.net/viewcvs.cgi/phpweb/ws.php?r1=1.2&r2=1.3&diff_format=u Index: phpweb/ws.php diff -u phpweb/ws.php:1.2 phpweb/ws.php:1.3 --- phpweb/ws.php:1.2 Tue Feb 28 07:36:13 2006 +++ phpweb/ws.php Tue Feb 28 08:23:28 2006 @@ -9,7 +9,12 @@ $l = isset($_REQUEST['lang']) ? htmlspecialchars($_REQUEST['lang']) : 'en'; $sites = array( 'all'=>'site=php.net', 'local'=>'site=www.php.net', - 'news'=>'site=news.php.net'); + 'news'=>'site=news.php.net', + 'bugs'=>'site=bugs.php.net', + 'pear'=>'site=pear.php.net', + 'pecl'=>'site=pecl.php.net', + 'talks'=>'site=talks.php.net', + ); if(isset($sites[$_REQUEST['profile']])) $p = $sites[$_REQUEST['profile']]; else $p = $sites['all']; http://cvs.php.net/viewcvs.cgi/phpweb/include/layout.inc?r1=1.229&r2=1.230&diff_format=u Index: phpweb/include/layout.inc diff -u phpweb/include/layout.inc:1.229 phpweb/include/layout.inc:1.230 --- phpweb/include/layout.inc:1.229 Tue Feb 28 01:06:32 2006 +++ phpweb/include/layout.inc Tue Feb 28 08:23:28 2006 @@ -1,5 +1,5 @@ <?php -/* $Id: layout.inc,v 1.229 2006/02/28 01:06:32 imajes Exp $ */ +/* $Id: layout.inc,v 1.230 2006/02/28 08:23:28 rasmus Exp $ */ // Set the static content root differently on php.net $_SERVER['STATIC_ROOT'] = ($MYSITE == 'http://www.php.net/') ? @@ -151,12 +151,18 @@ <span>in the</span> <select name="show"> <option value="quickref" selected="selected">function list</option> - <option value="wholesite">whole site</option> + <option value="all" >all php.net sites</option> + <option value="local" >this mirror only</option> <option value="manual" >online documentation [en]</option> <option value="bugdb" >bug database</option> + <option value="news_archive">Site News Archive</option> + <option value="changelogs">All Changelogs</option> + <option value="pear" >just pear.php.net</option> + <option value="pecl" >just pecl.php.net</option> + <option value="talks" >just talks.php.net</option> <option value="maillist" >general mailing list</option> <option value="devlist" >developer mailing list</option> - <option value="phpdoc" >documentation mailing list </option> + <option value="phpdoc" >documentation mailing list</option> </select> <input type="image" src="{$_SERVER['STATIC_ROOT']}/images/small_submit_white.gif" @@ -500,13 +506,19 @@ <input class="small" type="text" name="pattern" value="" size="30" accesskey="s" /> <small>in the</small> <select name="show" class="small"> -<option value="quickref" selected="selected">function list</option> -<option value="wholesite">whole site</option> -<option value="manual">online documentation [en]</option> -<option value="bugdb">bug database</option> -<option value="maillist">general mailing list</option> -<option value="devlist">developer mailing list</option> -<option value="phpdoc">documentation mailing list </option> + <option value="quickref" selected="selected">function list</option> + <option value="all" >all php.net sites</option> + <option value="local" >this mirror only</option> + <option value="manual" >online documentation [en]</option> + <option value="bugdb" >bug database</option> + <option value="news_archive">Site News Archive</option> + <option value="changelogs">All Changelogs</option> + <option value="pear" >just pear.php.net</option> + <option value="pecl" >just pecl.php.net</option> + <option value="talks" >just talks.php.net</option> + <option value="maillist" >general mailing list</option> + <option value="devlist" >developer mailing list</option> + <option value="phpdoc" >documentation mailing list</option> </select> <?php echo make_submit('small_submit_white.gif', 'search', 'bottom'); ?> </form> http://cvs.php.net/viewcvs.cgi/phpweb/include/prepend.inc?r1=1.34&r2=1.35&diff_format=u Index: phpweb/include/prepend.inc diff -u phpweb/include/prepend.inc:1.34 phpweb/include/prepend.inc:1.35 --- phpweb/include/prepend.inc:1.34 Tue Feb 21 20:46:45 2006 +++ phpweb/include/prepend.inc Tue Feb 28 08:23:28 2006 @@ -1,6 +1,6 @@ <?php // -*- C++ -*- -// $Id: prepend.inc,v 1.34 2006/02/21 20:46:45 rasmus Exp $ +// $Id: prepend.inc,v 1.35 2006/02/28 08:23:28 rasmus Exp $ // See http://www.w3.org/Protocols/rfc2616/rfc2616-sec14.html#sec14.9 // for cache control header descriptions (used in many places on the site). @@ -25,6 +25,8 @@ // Put the magic quotes setting to $MQ $MQ = (boolean) get_magic_quotes_gpc(); +$APC = function_exists('apc_store'); + // Site details (mirror site information) include $_SERVER['DOCUMENT_ROOT'] . '/include/site.inc';