[PHP-DOC] cvs: phpdoc /en/reference/mysqli reference.xml
georg Sun Mar 21 16:23:53 2004 EDT Modified files: /phpdoc/en/reference/mysqli reference.xml Log: fixed link for param_count property http://cvs.php.net/diff.php/phpdoc/en/reference/mysqli/reference.xml?r1=1.13&r2=1.14&ty=u Index: phpdoc/en/reference/mysqli/reference.xml diff -u phpdoc/en/reference/mysqli/reference.xml:1.13 phpdoc/en/reference/mysqli/reference.xml:1.14 --- phpdoc/en/reference/mysqli/reference.xml:1.13 Sun Mar 21 16:01:04 2004 +++ phpdoc/en/reference/mysqli/reference.xmlSun Mar 21 16:23:53 2004 @@ -1,5 +1,5 @@ - + Improved MySQL Extension mysqli @@ -251,7 +251,7 @@ errno - Returns errormessage for last statement function -param_count - Returns number of parameter for a given prepare statement +param_count - Returns number of parameter for a given prepare statement sqlstate - returns a string containing the SQLSTATE error code for the last statement function
[PHP-DOC] cvs: phpdoc /en/reference/mysqli reference.xml
georg Sun Mar 21 16:01:04 2004 EDT Modified files: /phpdoc/en/reference/mysqli reference.xml Log: si/get_metadata/result_metadata http://cvs.php.net/diff.php/phpdoc/en/reference/mysqli/reference.xml?r1=1.12&r2=1.13&ty=u Index: phpdoc/en/reference/mysqli/reference.xml diff -u phpdoc/en/reference/mysqli/reference.xml:1.12 phpdoc/en/reference/mysqli/reference.xml:1.13 --- phpdoc/en/reference/mysqli/reference.xml:1.12 Sat Mar 13 10:06:39 2004 +++ phpdoc/en/reference/mysqli/reference.xmlSun Mar 21 16:01:04 2004 @@ -1,5 +1,5 @@ - + Improved MySQL Extension mysqli @@ -90,6 +90,9 @@ get_server_info - returns version of the MySQL server +get_server_version - returns version of the MySQL server + + init - initializes mysqli object @@ -222,7 +225,7 @@ free_result - Frees stored result memory for the given statement handle -get_metadata - Retrieves a resultset from a prepared statement for metadata information +result_metadata - Retrieves a resultset from a prepared statement for metadata information prepare - prepares a SQL query
[PHP-DOC] cvs: livedocs / common.php
nlopess Sun Mar 21 15:10:48 2004 EDT
Modified files:
/livedocs common.php
Log:
fixing default language/DB
http://cvs.php.net/diff.php/livedocs/common.php?r1=1.10&r2=1.11&ty=u
Index: livedocs/common.php
diff -u livedocs/common.php:1.10 livedocs/common.php:1.11
--- livedocs/common.php:1.10Sun Mar 21 15:02:40 2004
+++ livedocs/common.php Sun Mar 21 15:10:47 2004
@@ -18,7 +18,7 @@
// | Common PHP header, with some basic settings |
// +--+
//
-// $Id: common.php,v 1.10 2004/03/21 20:02:40 nlopess Exp $
+// $Id: common.php,v 1.11 2004/03/21 20:10:47 nlopess Exp $
set_magic_quotes_runtime(0);
/*$compare = version_compare(phpversion(), '5.0.0RC1');
@@ -66,7 +66,10 @@
define('FALLBACK_BASE', PHPDOC . "/" . FALLBACK_LANG . "/");
$fb_idx = @sqlite_open(FALLBACK_INDEX);
-if ($lang == FALLBACK_LANG || !($idx = @sqlite_open(INDEX))) {
+
+if (file_exists(INDEX) && $lang != FALLBACK_LANG) {
+ $idx = @sqlite_open(INDEX);
+} else {
$idx = $fb_idx;
$lang = FALLBACK_LANG;
}
[PHP-DOC] cvs: livedocs / common.php
nlopess Sun Mar 21 15:02:42 2004 EDT
Modified files:
/livedocs common.php
Log:
fixing possible security bug in &lang
http://cvs.php.net/diff.php/livedocs/common.php?r1=1.9&r2=1.10&ty=u
Index: livedocs/common.php
diff -u livedocs/common.php:1.9 livedocs/common.php:1.10
--- livedocs/common.php:1.9 Sun Mar 21 05:45:15 2004
+++ livedocs/common.php Sun Mar 21 15:02:40 2004
@@ -18,7 +18,7 @@
// | Common PHP header, with some basic settings |
// +--+
//
-// $Id: common.php,v 1.9 2004/03/21 10:45:15 nlopess Exp $
+// $Id: common.php,v 1.10 2004/03/21 20:02:40 nlopess Exp $
set_magic_quotes_runtime(0);
/*$compare = version_compare(phpversion(), '5.0.0RC1');
@@ -53,6 +53,11 @@
}
} else {
$lang = preg_replace(LANGREG, '', $_GET['l']);
+
+ $languages = explode(' ', LANGUAGES);
+ if (!in_array($lang, $languages)){
+ $lang = FALLBACK_LANG;
+ }
}
define('BASE', PHPDOC . "/$lang/");
[PHP-DOC] cvs: livedocs / livedoc.php
nlopess Sun Mar 21 14:12:07 2004 EDT
Modified files:
/livedocs livedoc.php
Log:
little hack to display correctly the menu for func index
http://cvs.php.net/diff.php/livedocs/livedoc.php?r1=1.85&r2=1.86&ty=u
Index: livedocs/livedoc.php
diff -u livedocs/livedoc.php:1.85 livedocs/livedoc.php:1.86
--- livedocs/livedoc.php:1.85 Sun Mar 21 08:59:42 2004
+++ livedocs/livedoc.phpSun Mar 21 14:12:06 2004
@@ -18,7 +18,7 @@
// | Generate an HTML version of a phpdoc/docbook page on the fly |
// +--+
//
-// $Id: livedoc.php,v 1.85 2004/03/21 13:59:42 nlopess Exp $
+// $Id: livedoc.php,v 1.86 2004/03/21 19:12:06 nlopess Exp $
define('LIVEDOC_SOURCE', dirname(__FILE__));
include LIVEDOC_SOURCE . '/common.php';
@@ -60,6 +60,7 @@
if (isset($_GET['i'])) {
// Loading title and navigation data
+ $current_page = 'indexes';
list($title, $filename, $fileid, $dirid) = do_nav($idx, $fb_idx, $lang,
$current_page, $nav, $children);
echo manual_page_header();
[PHP-DOC] cvs: livedocs / config.php.in configure.in
nlopess Sun Mar 21 13:35:55 2004 EDT
Modified files:
/livedocs config.php.in configure.in
Log:
allow user to change default language
http://cvs.php.net/diff.php/livedocs/config.php.in?r1=1.6&r2=1.7&ty=u
Index: livedocs/config.php.in
diff -u livedocs/config.php.in:1.6 livedocs/config.php.in:1.7
--- livedocs/config.php.in:1.6 Sat Mar 20 11:43:31 2004
+++ livedocs/config.php.in Sun Mar 21 13:35:55 2004
@@ -19,9 +19,9 @@
// | the ./configure call |
// +--+
//
-// $Id: config.php.in,v 1.6 2004/03/20 16:43:31 didou Exp $
+// $Id: config.php.in,v 1.7 2004/03/21 18:35:55 nlopess Exp $
-define('FALLBACK_LANG', 'en');
+define('FALLBACK_LANG', '@DEFAULTLANG@');
define('PHPDOC', '@PHPDOCFORPHP@');
define('LIVEDOCS', '@LIVEDOCSFORPHP@');
define('OUTPUTDIR', '@OUTPUTDIRFORPHP@');
http://cvs.php.net/diff.php/livedocs/configure.in?r1=1.20&r2=1.21&ty=u
Index: livedocs/configure.in
diff -u livedocs/configure.in:1.20 livedocs/configure.in:1.21
--- livedocs/configure.in:1.20 Sun Mar 21 08:59:42 2004
+++ livedocs/configure.in Sun Mar 21 13:35:55 2004
@@ -1,5 +1,5 @@
## A configure script
-## $Id: configure.in,v 1.20 2004/03/21 13:59:42 nlopess Exp $
+## $Id: configure.in,v 1.21 2004/03/21 18:35:55 nlopess Exp $
AC_PREREQ(2.13)
AC_INIT(livedoc.php)
@@ -59,6 +59,10 @@
[THEMENAME="$withval"],
[THEMENAME="default"])
+AC_ARG_WITH(default-lang,[ --with-default-lang[=THEME_NAME] Default language
[default=en]],
+ [DEFAULTLANG="$withval"],
+ [DEFAULTLANG="en"])
+
AC_ARG_WITH(docs,[ --with-docs[=DIR] Docs location
[default=/dat/dev/php/phpdoc-all]],
[PHPDOC="$withval"],
[PHPDOC="/dat/dev/php/phpdoc-all"])
@@ -114,6 +118,7 @@
AC_SUBST(OUTPUTDIR)
AC_SUBST(LANGUAGES)
AC_SUBST(THEMENAME)
+AC_SUBST(DEFAULTLANG)
AC_SUBST(BUILDTYPE)
AC_SUBST(FORCE_DYNAMIC)
AC_SUBST(WEBBASE)
[PHP-DOC] cvs: phpdoc /en/reference/errorfunc/functions debug-backtrace.xml
didou Sun Mar 21 12:02:00 2004 EDT Modified files: /phpdoc/en/reference/errorfunc/functionsdebug-backtrace.xml Log: moving comments http://cvs.php.net/diff.php/phpdoc/en/reference/errorfunc/functions/debug-backtrace.xml?r1=1.11&r2=1.12&ty=u Index: phpdoc/en/reference/errorfunc/functions/debug-backtrace.xml diff -u phpdoc/en/reference/errorfunc/functions/debug-backtrace.xml:1.11 phpdoc/en/reference/errorfunc/functions/debug-backtrace.xml:1.12 --- phpdoc/en/reference/errorfunc/functions/debug-backtrace.xml:1.11Wed Jan 21 22:07:57 2004 +++ phpdoc/en/reference/errorfunc/functions/debug-backtrace.xml Sun Mar 21 12:01:59 2004 @@ -1,5 +1,5 @@ - + debug_backtrace @@ -92,22 +92,20 @@
[PHP-DOC] cvs: phpdoc /en/features commandline.xml
didou Sun Mar 21 12:00:21 2004 EDT Modified files: /phpdoc/en/features commandline.xml Log: adding php tags, CDATAs, CS and corrected a role http://cvs.php.net/diff.php/phpdoc/en/features/commandline.xml?r1=1.30&r2=1.31&ty=u Index: phpdoc/en/features/commandline.xml diff -u phpdoc/en/features/commandline.xml:1.30 phpdoc/en/features/commandline.xml:1.31 --- phpdoc/en/features/commandline.xml:1.30 Fri Feb 6 12:17:52 2004 +++ phpdoc/en/features/commandline.xml Sun Mar 21 12:00:21 2004 @@ -1,5 +1,5 @@ - + Using PHP from the command line @@ -226,7 +226,11 @@ opening it with @@ -238,7 +242,11 @@ opening it with @@ -250,7 +258,11 @@ opening it with @@ -263,7 +275,7 @@ Given the above, you don't need to open e.g. a stream for stderr yourself but simply use the constant instead of the stream resource: - + @@ -283,8 +295,8 @@ @@ -476,7 +488,7 @@ @@ -1101,7 +1113,9 @@ Batch file to run a command line PHP script (script.bat) +
[PHP-DOC] cvs: phpdoc /en/reference/dbx/functions dbx-query.xml
didou Sun Mar 21 11:59:26 2004 EDT Modified files: /phpdoc/en/reference/dbx/functions dbx-query.xml Log: adding php tags http://cvs.php.net/diff.php/phpdoc/en/reference/dbx/functions/dbx-query.xml?r1=1.15&r2=1.16&ty=u Index: phpdoc/en/reference/dbx/functions/dbx-query.xml diff -u phpdoc/en/reference/dbx/functions/dbx-query.xml:1.15 phpdoc/en/reference/dbx/functions/dbx-query.xml:1.16 --- phpdoc/en/reference/dbx/functions/dbx-query.xml:1.15Mon Dec 15 11:48:49 2003 +++ phpdoc/en/reference/dbx/functions/dbx-query.xml Sun Mar 21 11:59:26 2004 @@ -1,5 +1,5 @@ - + @@ -286,6 +286,8 @@ How to handle UNBUFFERED queries
[PHP-DOC] cvs: phpdoc /en/faq com.xml databases.xml
didou Sun Mar 21 11:53:09 2004 EDT
Modified files:
/phpdoc/en/faq com.xml databases.xml
Log:
adding php tags, CDATA sections and CS
http://cvs.php.net/diff.php/phpdoc/en/faq/com.xml?r1=1.10&r2=1.11&ty=u
Index: phpdoc/en/faq/com.xml
diff -u phpdoc/en/faq/com.xml:1.10 phpdoc/en/faq/com.xml:1.11
--- phpdoc/en/faq/com.xml:1.10 Sat Jan 4 07:18:22 2003
+++ phpdoc/en/faq/com.xml Sun Mar 21 11:53:08 2004
@@ -1,5 +1,5 @@
-
+
PHP and COM
PHP and COM
@@ -184,7 +184,11 @@
you can create that instance like shown:
- $word = new COM("C:\docs\word.doc");
+
This will create a new instance if there is no running instance available or it
will return a handle to the
http://cvs.php.net/diff.php/phpdoc/en/faq/databases.xml?r1=1.24&r2=1.25&ty=u
Index: phpdoc/en/faq/databases.xml
diff -u phpdoc/en/faq/databases.xml:1.24 phpdoc/en/faq/databases.xml:1.25
--- phpdoc/en/faq/databases.xml:1.24Mon Feb 23 10:38:38 2004
+++ phpdoc/en/faq/databases.xml Sun Mar 21 11:53:09 2004
@@ -1,5 +1,5 @@
-
+
Database issues
Database issues
@@ -275,16 +275,26 @@
result identifier. The proper way to do this is with code similar
to the following:
+
or
+
[PHP-DOC] cvs: phpdoc /en/security database.xml
didou Sun Mar 21 11:45:37 2004 EDT Modified files: /phpdoc/en/security database.xml Log: adding php tags http://cvs.php.net/diff.php/phpdoc/en/security/database.xml?r1=1.2&r2=1.3&ty=u Index: phpdoc/en/security/database.xml diff -u phpdoc/en/security/database.xml:1.2 phpdoc/en/security/database.xml:1.3 --- phpdoc/en/security/database.xml:1.2 Wed Feb 18 12:09:16 2004 +++ phpdoc/en/security/database.xml Sun Mar 21 11:45:37 2004 @@ -1,5 +1,5 @@ - + Database Security @@ -117,6 +117,8 @@ Using hashed password field @@ -166,12 +170,16 @@ @@ -224,10 +232,14 @@ @@ -260,7 +272,9 @@ @@ -272,11 +286,16 @@ @@ -288,8 +307,12 @@ Attacking the database hosts operating system (MSSQL Server) @@ -299,10 +322,14 @@ @@ -369,12 +396,16 @@ A more secure way to compose a query for paging
[PHP-DOC] cvs: phpdoc /en/reference/fdf/functions fdf-get-opt.xml
didou Sun Mar 21 10:33:14 2004 EDT Modified files: /phpdoc/en/reference/fdf/functions fdf-get-opt.xml Log: correct id http://cvs.php.net/diff.php/phpdoc/en/reference/fdf/functions/fdf-get-opt.xml?r1=1.1&r2=1.2&ty=u Index: phpdoc/en/reference/fdf/functions/fdf-get-opt.xml diff -u phpdoc/en/reference/fdf/functions/fdf-get-opt.xml:1.1 phpdoc/en/reference/fdf/functions/fdf-get-opt.xml:1.2 --- phpdoc/en/reference/fdf/functions/fdf-get-opt.xml:1.1 Wed Mar 19 12:06:49 2003 +++ phpdoc/en/reference/fdf/functions/fdf-get-opt.xml Sun Mar 21 10:33:14 2004 @@ -1,6 +1,6 @@ - - + + fdf_get_opt Gets a value from the opt array of a field
[PHP-DOC] cvs: phpdoc /en/reference/domxml/functions DomDocument-create-element-ns.xml
didou Sun Mar 21 10:32:18 2004 EDT Modified files: /phpdoc/en/reference/domxml/functions DomDocument-create-element-ns.xml Log: correct id http://cvs.php.net/diff.php/phpdoc/en/reference/domxml/functions/DomDocument-create-element-ns.xml?r1=1.3&r2=1.4&ty=u Index: phpdoc/en/reference/domxml/functions/DomDocument-create-element-ns.xml diff -u phpdoc/en/reference/domxml/functions/DomDocument-create-element-ns.xml:1.3 phpdoc/en/reference/domxml/functions/DomDocument-create-element-ns.xml:1.4 --- phpdoc/en/reference/domxml/functions/DomDocument-create-element-ns.xml:1.3 Mon Dec 15 13:42:07 2003 +++ phpdoc/en/reference/domxml/functions/DomDocument-create-element-ns.xml Sun Mar 21 10:32:18 2004 @@ -1,7 +1,7 @@ - + - + DomDocument->create_element_ns
[PHP-DOC] cvs: livedocs /themes/default html_format.php /themes/php.net html_format.php
didou Sun Mar 21 10:08:11 2004 EDT
Modified files:
/livedocs/themes/defaulthtml_format.php
/livedocs/themes/php.nethtml_format.php
Log:
two functions was needed nuno ;)
http://cvs.php.net/diff.php/livedocs/themes/default/html_format.php?r1=1.6&r2=1.7&ty=u
Index: livedocs/themes/default/html_format.php
diff -u livedocs/themes/default/html_format.php:1.6
livedocs/themes/default/html_format.php:1.7
--- livedocs/themes/default/html_format.php:1.6 Sun Mar 21 05:54:56 2004
+++ livedocs/themes/default/html_format.php Sun Mar 21 10:06:55 2004
@@ -18,7 +18,7 @@
// | headers and footers for the HTML rendering |
// +--+
//
-// $Id: html_format.php,v 1.6 2004/03/21 10:54:56 nlopess Exp $
+// $Id: html_format.php,v 1.7 2004/03/21 15:06:55 didou Exp $
// in livedoc.php
@@ -92,6 +92,36 @@
}
+
+function index_page_header()
+{
+ global $css_url;
+ $head =<
+
+
+Livedocs Index
+
+
+
+PHP Manual
+
+HEAD;
+
+return $head;
+}
+
+function index_page_footer()
+{
+ $foot =<<
+
+FOOT;
+
+return $foot;
+}
+
// in error.php
function error_page_header()
http://cvs.php.net/diff.php/livedocs/themes/php.net/html_format.php?r1=1.8&r2=1.9&ty=u
Index: livedocs/themes/php.net/html_format.php
diff -u livedocs/themes/php.net/html_format.php:1.8
livedocs/themes/php.net/html_format.php:1.9
--- livedocs/themes/php.net/html_format.php:1.8 Sun Mar 21 05:56:11 2004
+++ livedocs/themes/php.net/html_format.php Sun Mar 21 10:08:11 2004
@@ -18,7 +18,7 @@
// | headers and footers for the HTML rendering |
// +--+
//
-// $Id: html_format.php,v 1.8 2004/03/21 10:56:11 nlopess Exp $
+// $Id: html_format.php,v 1.9 2004/03/21 15:08:11 didou Exp $
// in livedoc.php
define(
@@ -140,6 +140,35 @@
}
+function index_page_header()
+{
+ global $css_url;
+ $head =<
+
+
+Livedocs Index
+
+
+
+PHP Manual
+
+HEAD;
+
+return $head;
+}
+
+function index_page_footer()
+{
+ $foot =<<
+
+FOOT;
+
+return $foot;
+}
+
// in error.php
function error_page_header()
[PHP-DOC] Re: cvs: livedocs /themes/default html_format.php /themes/php.net html_format.php
Nuno Lopes wrote: nlopess Sun Mar 21 05:56:11 2004 EDT Modified files: /livedocs/themes/default html_format.php /livedocs/themes/php.net html_format.php Log: these function are not need anymore I hope so :) Fatal error: Call to undefined function: index_page_header() in /root/livedocs/error.php on line 40 :/
Re: [PHP-DOC] cvs: livedocs /themes/default html_format.php
Derick Rethans wrote: On Sun, 21 Mar 2004, Nuno Lopes wrote: nlopess Sun Mar 21 05:56:11 2004 EDT Modified files: /livedocs/themes/default html_format.php /livedocs/themes/php.net html_format.php Log: these function are not need anymore I hope so :) Just wondering... is the old 'style' (like at http://docs.php.net) totally gone now? Nope, I keeped it when implementing the --with-theme option for configure. It's the default value "default" didou
[PHP-DOC] cvs: livedocs / configure.in handlers.php livedoc-index.php livedoc.php
nlopess Sun Mar 21 08:59:42 2004 EDT
Added files:
/livedocs handlers.php
Removed files:
/livedocs livedoc-index.php
Modified files:
/livedocs configure.in livedoc.php
Log:
fixing index for DYNAMIC
moving all special handlers to handlers.php
http://cvs.php.net/diff.php/livedocs/configure.in?r1=1.19&r2=1.20&ty=u
Index: livedocs/configure.in
diff -u livedocs/configure.in:1.19 livedocs/configure.in:1.20
--- livedocs/configure.in:1.19 Sat Mar 20 11:07:29 2004
+++ livedocs/configure.in Sun Mar 21 08:59:42 2004
@@ -1,5 +1,5 @@
## A configure script
-## $Id: configure.in,v 1.19 2004/03/20 16:07:29 didou Exp $
+## $Id: configure.in,v 1.20 2004/03/21 13:59:42 nlopess Exp $
AC_PREREQ(2.13)
AC_INIT(livedoc.php)
@@ -130,13 +130,14 @@
AC_MSG_ERROR([HEY!! You should probably mkdir $OUTPUTDIR...])
else
echo "Copying livedoc files to $OUTPUTDIR..."
- cp common.php config.php livedoc-index.php .htaccess $OUTPUTDIR
+ cp common.php config.php .htaccess $OUTPUTDIR
rm -f .htaccess
$lncmd $LIVEDOCS/livedoc.php $OUTPUTDIR/index.php
$lncmd $LIVEDOCS/error.php $OUTPUTDIR/error.php
$lncmd $LIVEDOCS/style_mapping.php $OUTPUTDIR/style_mapping.php
$lncmd $LIVEDOCS/xml_classes.php $OUTPUTDIR/xml_classes.php
$lncmd $LIVEDOCS/search.php $OUTPUTDIR/search.php
+ $lncmd $LIVEDOCS/handlers.php $OUTPUTDIR/handlers.php
rm -rf $OUTPUTDIR/themes
$lncmd $LIVEDOCS/themes $OUTPUTDIR/themes
echo ""
http://cvs.php.net/diff.php/livedocs/livedoc.php?r1=1.84&r2=1.85&ty=u
Index: livedocs/livedoc.php
diff -u livedocs/livedoc.php:1.84 livedocs/livedoc.php:1.85
--- livedocs/livedoc.php:1.84 Sun Mar 21 06:17:54 2004
+++ livedocs/livedoc.phpSun Mar 21 08:59:42 2004
@@ -18,13 +18,13 @@
// | Generate an HTML version of a phpdoc/docbook page on the fly |
// +--+
//
-// $Id: livedoc.php,v 1.84 2004/03/21 11:17:54 nlopess Exp $
+// $Id: livedoc.php,v 1.85 2004/03/21 13:59:42 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 . '/handlers.php';
include LIVEDOC_SOURCE . '/themes/' . THEME_NAME . '/html_format.php';
if (!isset($_GET['q'])) {
@@ -46,16 +46,16 @@
*/
$aliases = array(
'api' => 'streams',
- 'appendixes' => 'handle_appendixes',
+ 'appendixes' => 'handle_appendixes_funcref',
'faq' => 'faq.general',
'features'=> 'features.http-auth',
- 'funcref' => 'handle_funcref',
+ 'funcref' => 'handle_appendixes_funcref',
'getting-started' => 'introduction',
'installation'=> 'install.general',
'langref' => 'language.basic-syntax',
'manual' => 'handle_contents',
'security'=> 'security.index',
- 'indexes' => 'func_index'
+ 'indexes' => 'handle_index'
);
if (isset($_GET['i'])) {
@@ -63,7 +63,7 @@
list($title, $filename, $fileid, $dirid) = do_nav($idx, $fb_idx, $lang,
$current_page, $nav, $children);
echo manual_page_header();
- func_index();
+ handle_index();
$filename = 'index';
$file_revision = '1.1';
echo manual_page_footer();
@@ -444,31 +444,6 @@
return "$title";
}
-function handle_funcref()
-{
- global $current_page_title, $children, $lang;
-
- $ret = "$current_page_title\n";
- foreach ($children as $id => $title) {
- $url = generate_url_for_id($lang, $id);
- $ret .= "$title\n";
- }
- return $ret."";
-}
-
-function handle_appendixes()
-{
- global $current_page_title, $children, $lang;
-
- $ret = "$current_page_title\n";
- foreach ($children as $id => $title) {
- $url = generate_url_for_id($lang, $id);
- $ret .= "$title\n";
- }
- return $ret . "";
-
-}
-
function do_contents($id, $level)
{
global $lang;
@@ -498,13 +473,6 @@
return $ret .= "\n";
}
-function handle_contents()
-{
- global $current_page_title, $children, $lang;
-
- return "PHP ManualContents" .
do_contents(1, 0);
-}
-
function handle_include($node)
{
$filename = BASE . strtr($node->attributes['ref'], '.', '/') . '.xml';
http://cvs.php.net/co.php/livedocs/handlers.php?r=1.1&p=1
Index: livedocs/handlers.php
+++ livedocs/handlers.php
http://www.php.net/license/3_0.txt. |
// | If you did not receive a copy of the PHP license and are unable to |
// | obtain it through the world-wide-web, please send a note to |
// | [EMAIL PROTECTED] so we can mail you a copy immediately.
[PHP-DOC] cvs: livedocs / livedoc.php
nlopess Sun Mar 21 06:17:55 2004 EDT
Modified files:
/livedocs livedoc.php
Log:
fixing my crap
aliases back on-line
http://cvs.php.net/diff.php/livedocs/livedoc.php?r1=1.83&r2=1.84&ty=u
Index: livedocs/livedoc.php
diff -u livedocs/livedoc.php:1.83 livedocs/livedoc.php:1.84
--- livedocs/livedoc.php:1.83 Sat Mar 20 05:17:23 2004
+++ livedocs/livedoc.phpSun Mar 21 06:17:54 2004
@@ -18,7 +18,7 @@
// | Generate an HTML version of a phpdoc/docbook page on the fly |
// +--+
//
-// $Id: livedoc.php,v 1.83 2004/03/20 10:17:23 nlopess Exp $
+// $Id: livedoc.php,v 1.84 2004/03/21 11:17:54 nlopess Exp $
define('LIVEDOC_SOURCE', dirname(__FILE__));
include LIVEDOC_SOURCE . '/common.php';
@@ -40,10 +40,6 @@
$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
@@ -63,6 +59,9 @@
);
if (isset($_GET['i'])) {
+ // Loading title and navigation data
+ list($title, $filename, $fileid, $dirid) = do_nav($idx, $fb_idx, $lang,
$current_page, $nav, $children);
+
echo manual_page_header();
func_index();
$filename = 'index';
@@ -83,6 +82,9 @@
}
}
+// 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) {
Re: [PHP-DOC] cvs: livedocs /themes/default html_format.php /themes/php.net html_format.php
> Just wondering... is the old 'style' (like at http://docs.php.net) > totally gone now? > > Derick No, its totally the same, but these functions aren't needed anymore because they were used in the function index. Yesterday, I've changed the way that the function index works (now its using the manual style functions) and I've linked it from the main page. My last change has enabled me to parse language/functions.xml, but I broke aliases (Security, stream API, ...) I'll take a look into this tomorrow. Nuno
Re: [PHP-DOC] cvs: livedocs /themes/default html_format.php /themes/php.net html_format.php
On Sun, 21 Mar 2004, Nuno Lopes wrote: > nlopess Sun Mar 21 05:56:11 2004 EDT > > Modified files: > /livedocs/themes/default html_format.php > /livedocs/themes/php.net html_format.php > Log: > these function are not need anymore > I hope so :) Just wondering... is the old 'style' (like at http://docs.php.net) totally gone now? Derick
[PHP-DOC] cvs: livedocs /themes/default html_format.php /themes/php.net html_format.php
nlopess Sun Mar 21 05:56:11 2004 EDT
Modified files:
/livedocs/themes/defaulthtml_format.php
/livedocs/themes/php.nethtml_format.php
Log:
these function are not need anymore
I hope so :)
http://cvs.php.net/diff.php/livedocs/themes/default/html_format.php?r1=1.5&r2=1.6&ty=u
Index: livedocs/themes/default/html_format.php
diff -u livedocs/themes/default/html_format.php:1.5
livedocs/themes/default/html_format.php:1.6
--- livedocs/themes/default/html_format.php:1.5 Wed Feb 18 13:40:34 2004
+++ livedocs/themes/default/html_format.php Sun Mar 21 05:54:56 2004
@@ -18,7 +18,7 @@
// | headers and footers for the HTML rendering |
// +--+
//
-// $Id: html_format.php,v 1.5 2004/02/18 18:40:34 didou Exp $
+// $Id: html_format.php,v 1.6 2004/03/21 10:54:56 nlopess Exp $
// in livedoc.php
@@ -92,70 +92,6 @@
}
-
-function index_page_header()
-{
- global $css_url;
- $head =<
-
-
-Livedocs Index
-
-
-
-PHP Manual
-
-HEAD;
-
-return $head;
-}
-
-function index_page_footer()
-{
- $foot =<<
-
-FOOT;
-
-return $foot;
-}
-
-// in livedoc-index.php
-
-function functions_page_header()
-{
-global $css_url;
-$head =<
-
-
-Livedocs Index
-
-
-
-Index
-
-
-HEAD;
-
- return $head;
-}
-
-function functions_page_footer()
-{
- global $date;
- $foot =<
-
-
-Livedocs Index
-
-
-
-PHP Manual
-
-HEAD;
-
-return $head;
-}
-
-function index_page_footer()
-{
- $foot =<<
-
-FOOT;
-
-return $foot;
-}
-
-// in livedoc-index.php
-
-function functions_page_header()
-{
-global $css_url;
-$head =<
-
-
-Livedocs Index
-
-
-
-Index
-
-
-HEAD;
-
- return $head;
-}
-
-function functions_page_footer()
-{
- global $date;
- $foot =<
[PHP-DOC] cvs: livedocs / common.php mk_phpdoc.php mkindex.php
nlopess Sun Mar 21 05:45:15 2004 EDT
Modified files:
/livedocs common.php mk_phpdoc.php mkindex.php
Log:
fixing a bug in language/* parsing
http://cvs.php.net/diff.php/livedocs/common.php?r1=1.8&r2=1.9&ty=u
Index: livedocs/common.php
diff -u livedocs/common.php:1.8 livedocs/common.php:1.9
--- livedocs/common.php:1.8 Sat Mar 20 05:23:54 2004
+++ livedocs/common.php Sun Mar 21 05:45:15 2004
@@ -18,15 +18,15 @@
// | Common PHP header, with some basic settings |
// +--+
//
-// $Id: common.php,v 1.8 2004/03/20 10:23:54 nlopess Exp $
+// $Id: common.php,v 1.9 2004/03/21 10:45:15 nlopess Exp $
set_magic_quotes_runtime(0);
-$compare = version_compare(phpversion(), '5.0.0RC1');
+/*$compare = version_compare(phpversion(), '5.0.0RC1');
if ($compare == 1 || $compare == 0){
error_reporting(E_ALL | E_STRICT);
-} else {
+} else {*/
error_reporting(E_ALL);
-}
+//}
ini_set('display_errors', '1');
http://cvs.php.net/diff.php/livedocs/mk_phpdoc.php?r1=1.2&r2=1.3&ty=u
Index: livedocs/mk_phpdoc.php
diff -u livedocs/mk_phpdoc.php:1.2 livedocs/mk_phpdoc.php:1.3
--- livedocs/mk_phpdoc.php:1.2 Wed Mar 17 09:05:56 2004
+++ livedocs/mk_phpdoc.php Sun Mar 21 05:45:15 2004
@@ -18,11 +18,11 @@
// | Configuration file for phpdoc build |
// +--+
//
-// $Id: mk_phpdoc.php,v 1.2 2004/03/17 14:05:56 didou Exp $
+// $Id: mk_phpdoc.php,v 1.3 2004/03/21 10:45:15 nlopess Exp $
define('MK_VERSION', true);
-$parse_dirs = array('faq', 'reference', 'security', 'chapters', 'appendices');
+$parse_dirs = array('faq', 'reference', 'security', 'chapters', 'appendices',
'language');
$top_files = array('installpart.xml', 'manual.xml');
@@ -36,7 +36,7 @@
readdir($d); readdir($d);
while (($f = readdir($d))) {
-if ($f == 'functions.xml' || $f == 'CVS' || $f == '.cvsignore') {
+if (($f == 'functions.xml' && $section != 'language') || $f == 'CVS' || $f ==
'.cvsignore') {
continue;
}
switch (filetype($path . '/' . $f)) {
@@ -49,6 +49,7 @@
$docbook_id = 'function.' . substr($f, 0, -4);
}
break;
+case 'language' :
case 'faq':
case 'security' :
$docbook_id = $section . '.' . substr($f, 0, -4);
http://cvs.php.net/diff.php/livedocs/mkindex.php?r1=1.27&r2=1.28&ty=u
Index: livedocs/mkindex.php
diff -u livedocs/mkindex.php:1.27 livedocs/mkindex.php:1.28
--- livedocs/mkindex.php:1.27 Sat Mar 20 13:52:17 2004
+++ livedocs/mkindex.phpSun Mar 21 05:45:15 2004
@@ -19,7 +19,7 @@
// | construct an index |
// +--+
//
-// $Id: mkindex.php,v 1.27 2004/03/20 18:52:17 didou Exp $
+// $Id: mkindex.php,v 1.28 2004/03/21 10:45:15 nlopess Exp $
/* just to be on the safe side */
@@ -252,7 +252,7 @@
if (is_dir($full)) {
scan_dir($full, $relname);
} else if (substr($f, -4) == '.xml') {
- if ($f != 'functions.xml' || $relname ==
'language/functions.xml') {
+ if ($f != 'functions.xml' || $relname == 'language' .
DIRECTORY_SEPARATOR . 'functions.xml' ) {
$files[$f] = $full;
parse_file($full, $relname, $dirid);
}
[PHP-DOC] cvs: phpdoc /en/language control-structures.xml functions.xml
nlopess Sun Mar 21 05:27:53 2004 EDT Modified files: /phpdoc/en/language control-structures.xml functions.xml Log: better ids for livedocs http://cvs.php.net/diff.php/phpdoc/en/language/control-structures.xml?r1=1.88&r2=1.89&ty=u Index: phpdoc/en/language/control-structures.xml diff -u phpdoc/en/language/control-structures.xml:1.88 phpdoc/en/language/control-structures.xml:1.89 --- phpdoc/en/language/control-structures.xml:1.88 Tue Feb 17 16:01:16 2004 +++ phpdoc/en/language/control-structures.xml Sun Mar 21 05:27:53 2004 @@ -1,6 +1,6 @@ - - + + Control Structures http://cvs.php.net/diff.php/phpdoc/en/language/functions.xml?r1=1.44&r2=1.45&ty=u Index: phpdoc/en/language/functions.xml diff -u phpdoc/en/language/functions.xml:1.44 phpdoc/en/language/functions.xml:1.45 --- phpdoc/en/language/functions.xml:1.44 Tue Jan 6 04:20:49 2004 +++ phpdoc/en/language/functions.xmlSun Mar 21 05:27:53 2004 @@ -1,6 +1,6 @@ - - + + Functions
Re: [PHP-DOC] PHP manual translation
1. Do I need to run rpm -Uhv jade-1.2.x-y.src.rpm again? Actually I did try but the previous error remains. /I thought I need to SETENV or something! for scrollkeeper if so how could I do it? I am rather new to *nix world./ 2. I have Openjade installed so, do I need Jade now? No (and this means No for the first question too). 3. Is there any tool that could verify whether I have set up the environment correctly? /like one in OpenOffice Localization project!/ If you can do a 'make test', then your system is set up fine. Goba
Re: [PHP-DOC] PHP manual translation
> 2. I have Openjade installed so, do I need Jade now? If you have OpenJade, you don't need Jade. > 3. Is there any tool that could verify whether I have set up the > environment correctly? /like one in OpenOffice Localization project!/ No. Just try to do a CVS checkout of phpdoc and then do autoconf && ./configure && make test and see if it works. Nuno
