nlopess Sat Mar 20 05:17:26 2004 EDT
Modified files:
/livedocs BUGS livedoc-index.php livedoc.php
Log:
function index no longer redirects to the search page
http://cvs.php.net/diff.php/livedocs/BUGS?r1=1.4&r2=1.5&ty=u
Index: livedocs/BUGS
diff -u livedocs/BUGS:1.4 livedocs/BUGS:1.5
--- livedocs/BUGS:1.4 Fri Feb 27 15:06:42 2004
+++ livedocs/BUGS Sat Mar 20 05:17:23 2004
@@ -10,8 +10,6 @@
pattern syntax docs (it thinks that those are functions but this is
not true at all)
- - The 'Function Index' redirects to the search page
-
- Table spans don't work. Check nl_langinfo() function for an example
-$Revision: 1.4 $
+$Revision: 1.5 $
http://cvs.php.net/diff.php/livedocs/livedoc-index.php?r1=1.9&r2=1.10&ty=u
Index: livedocs/livedoc-index.php
diff -u livedocs/livedoc-index.php:1.9 livedocs/livedoc-index.php:1.10
--- livedocs/livedoc-index.php:1.9 Wed Feb 18 13:21:48 2004
+++ livedocs/livedoc-index.php Sat Mar 20 05:17:23 2004
@@ -18,22 +18,20 @@
// | Livedocs index |
// +----------------------------------------------------------------------+
//
-// $Id: livedoc-index.php,v 1.9 2004/02/18 18:21:48 didou Exp $
+// $Id: livedoc-index.php,v 1.10 2004/03/20 10:17:23 nlopess Exp $
-echo functions_page_header();
+function func_index() {
+ GLOBAL $idx, $lang;
-$alphabet = range('a', 'z');
-foreach ($alphabet as $char) {
- echo "<a href='" . WEBBASE . "index.php?l=$lang&s=INDEX&i=$char'>$char</a>
";
-}
+ $alphabet = range('a', 'z');
+ foreach ($alphabet as $char) {
+ echo "<a href='" . WEBBASE . "index.php?l=$lang&i=$char'>$char</a> ";
+ }
-echo "</div><hr />\n";
+ echo "</div><hr />\n";
-if (!isset($_GET['i'])) {
- /* Show alphabet */
-} else {
/* Sanitize index letter */
- if (strlen($_GET['i']) < 1) {
+ if (!isset($_GET['i'])) {
$idxl = 'a';
} else {
$idxl = substr($_GET['i'], 0, 1);
@@ -54,9 +52,6 @@
}
}
-$date = date("d-m-Y H:i:s");
-echo functions_page_footer();
-
function sqlite_starts_with($title, $char) {
$title = strtolower($title);
$char = strtolower($char);
http://cvs.php.net/diff.php/livedocs/livedoc.php?r1=1.82&r2=1.83&ty=u
Index: livedocs/livedoc.php
diff -u livedocs/livedoc.php:1.82 livedocs/livedoc.php:1.83
--- livedocs/livedoc.php:1.82 Tue Mar 9 07:04:00 2004
+++ livedocs/livedoc.php Sat Mar 20 05:17:23 2004
@@ -18,12 +18,13 @@
// | Generate an HTML version of a phpdoc/docbook page on the fly |
// +----------------------------------------------------------------------+
//
-// $Id: livedoc.php,v 1.82 2004/03/09 12:04:00 didou Exp $
-
+// $Id: livedoc.php,v 1.83 2004/03/20 10:17:23 nlopess Exp $
+
define('LIVEDOC_SOURCE', dirname(__FILE__));
include LIVEDOC_SOURCE . '/common.php';
include LIVEDOC_SOURCE . '/xml_classes.php';
include LIVEDOC_SOURCE . '/style_mapping.php';
+include LIVEDOC_SOURCE . '/livedoc-index.php';
include LIVEDOC_SOURCE . '/themes/' . THEME_NAME . '/html_format.php';
if (!isset($_GET['q'])) {
@@ -31,11 +32,18 @@
// Else, we display a page with the closest matches and we stop the script.
// If something goes wrong with the database, $current_page will default
// to some value.
-include LIVEDOC_SOURCE . '/error.php';
+ include LIVEDOC_SOURCE . '/error.php';
} else {
$current_page = preg_replace(IDREG, '', $_GET['q']);
}
+
+$date = gmdate('Y-m-d H:i:s') . ' GMT';
+
+// Loading title and navigation data
+list($title, $filename, $fileid, $dirid) = do_nav($idx, $fb_idx, $lang,
$current_page, $nav, $children);
+
+
/*****************************************************************************
* Aliases and XML -> style mapping
* Please keep the arrays sorted by keys
@@ -50,11 +58,16 @@
'installation' => 'install.general',
'langref' => 'language.basic-syntax',
'manual' => 'handle_contents',
- 'security' => 'security.index'
+ 'security' => 'security.index',
+ 'indexes' => 'func_index'
);
-if (isset($_GET['s'])) {
- include LIVEDOC_SOURCE . '/livedoc-index.php';
+if (isset($_GET['i'])) {
+ echo manual_page_header();
+ func_index();
+ $filename = 'index';
+ $file_revision = '1.1';
+ echo manual_page_footer();
exit;
}
@@ -70,12 +83,6 @@
}
}
-
-/*****************************************************************************
- * Loading title and navigation data
- */
-list($title, $filename, $fileid, $dirid) = do_nav($idx, $fb_idx, $lang,
$current_page, $nav, $children);
-
if (!$special_content) {
if ($filename == null) {
@@ -102,7 +109,6 @@
echo $page->transform($map, $current_page);
}
-$date = gmdate('Y-m-d H:i:s') . ' GMT';
if (empty($file_revision)) {
$file_revision = 'unknown revision';
}
