didou Mon Dec 15 11:54:11 2003 EDT
Modified files:
/phpdoc/en/reference/uodbc/functions odbc-fetch-into.xml
odbc-result.xml
odbc-setoption.xml
/phpdoc/en/reference/url/functions get-meta-tags.xml parse-url.xml
/phpdoc/en/reference/var/functions floatval.xml
import-request-variables.xml
is-bool.xml is-callable.xml
isset.xml print-r.xml
serialize.xml unserialize.xml
unset.xml var-dump.xml
var-export.xml
Log:
Merry XHTML and CS compliant christmas all \!
Index: phpdoc/en/reference/uodbc/functions/odbc-fetch-into.xml
diff -u phpdoc/en/reference/uodbc/functions/odbc-fetch-into.xml:1.3
phpdoc/en/reference/uodbc/functions/odbc-fetch-into.xml:1.4
--- phpdoc/en/reference/uodbc/functions/odbc-fetch-into.xml:1.3 Wed Jul 16 13:22:58
2003
+++ phpdoc/en/reference/uodbc/functions/odbc-fetch-into.xml Mon Dec 15 11:54:09
2003
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.3 $ -->
+<!-- $Revision: 1.4 $ -->
<!-- splitted from ./en/functions/uodbc.xml, last change in rev 1.34 -->
<refentry id="function.odbc-fetch-into">
<refnamediv>
@@ -105,7 +105,7 @@
<programlisting role="php">
<![CDATA[
<?php
-$rc = odbc_fetch_into($res_id,$my_array, 2);
+$rc = odbc_fetch_into($res_id, $my_array, 2);
?>
]]>
</programlisting>
Index: phpdoc/en/reference/uodbc/functions/odbc-result.xml
diff -u phpdoc/en/reference/uodbc/functions/odbc-result.xml:1.3
phpdoc/en/reference/uodbc/functions/odbc-result.xml:1.4
--- phpdoc/en/reference/uodbc/functions/odbc-result.xml:1.3 Sat Aug 16 14:59:12
2003
+++ phpdoc/en/reference/uodbc/functions/odbc-result.xml Mon Dec 15 11:54:10 2003
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.3 $ -->
+<!-- $Revision: 1.4 $ -->
<!-- splitted from ./en/functions/uodbc.xml, last change in rev 1.2 -->
<refentry id="function.odbc-result">
<refnamediv>
@@ -23,8 +23,8 @@
<informalexample>
<programlisting role="php">
<![CDATA[
-$item_3 = odbc_result ($Query_ID, 3);
-$item_val = odbc_result ($Query_ID, "val");
+$item_3 = odbc_result($Query_ID, 3);
+$item_val = odbc_result($Query_ID, "val");
]]>
</programlisting>
</informalexample>
Index: phpdoc/en/reference/uodbc/functions/odbc-setoption.xml
diff -u phpdoc/en/reference/uodbc/functions/odbc-setoption.xml:1.3
phpdoc/en/reference/uodbc/functions/odbc-setoption.xml:1.4
--- phpdoc/en/reference/uodbc/functions/odbc-setoption.xml:1.3 Wed Jul 16 13:22:58
2003
+++ phpdoc/en/reference/uodbc/functions/odbc-setoption.xml Mon Dec 15 11:54:10
2003
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.3 $ -->
+<!-- $Revision: 1.4 $ -->
<!-- splitted from ./en/functions/uodbc.xml, last change in rev 1.3 -->
<refentry id="function.odbc-setoption">
<refnamediv>
@@ -64,14 +64,14 @@
// This example has the same effect as
// odbc_autocommit($conn, true);
-odbc_setoption ($conn, 1, 102, 1);
+odbc_setoption($conn, 1, 102, 1);
// 2. Option 0 of SQLSetStmtOption() is SQL_QUERY_TIMEOUT.
// This example sets the query to timeout after 30 seconds.
-$result = odbc_prepare ($conn, $sql);
-odbc_setoption ($result, 2, 0, 30);
-odbc_execute ($result);
+$result = odbc_prepare($conn, $sql);
+odbc_setoption($result, 2, 0, 30);
+odbc_execute($result);
?>
]]>
</programlisting>
Index: phpdoc/en/reference/url/functions/get-meta-tags.xml
diff -u phpdoc/en/reference/url/functions/get-meta-tags.xml:1.5
phpdoc/en/reference/url/functions/get-meta-tags.xml:1.6
--- phpdoc/en/reference/url/functions/get-meta-tags.xml:1.5 Fri Nov 21 07:02:48
2003
+++ phpdoc/en/reference/url/functions/get-meta-tags.xml Mon Dec 15 11:54:10 2003
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.5 $ -->
+<!-- $Revision: 1.6 $ -->
<!-- splitted from ./en/functions/strings.xml, last change in rev 1.2 -->
<refentry id="function.get-meta-tags">
<refnamediv>
@@ -64,10 +64,10 @@
// Notice how the keys are all lowercase now, and
// how . was replaced by _ in the key.
-print $tags['author']; // name
-print $tags['keywords']; // php documentation
-print $tags['description']; // a php manual
-print $tags['geo_position']; // 49.33;-86.59
+echo $tags['author']; // name
+echo $tags['keywords']; // php documentation
+echo $tags['description']; // a php manual
+echo $tags['geo_position']; // 49.33;-86.59
?>
]]>
</programlisting>
Index: phpdoc/en/reference/url/functions/parse-url.xml
diff -u phpdoc/en/reference/url/functions/parse-url.xml:1.8
phpdoc/en/reference/url/functions/parse-url.xml:1.9
--- phpdoc/en/reference/url/functions/parse-url.xml:1.8 Mon Oct 13 04:48:19 2003
+++ phpdoc/en/reference/url/functions/parse-url.xml Mon Dec 15 11:54:10 2003
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.8 $ -->
+<!-- $Revision: 1.9 $ -->
<!-- splitted from ./en/functions/url.xml, last change in rev 1.2 -->
<refentry id="function.parse-url">
<refnamediv>
@@ -73,7 +73,7 @@
<example>
<title><function>parse_url</function> example</title>
<screen>
-$ php -r 'print_r( parse_url("http://username:[EMAIL
PROTECTED]/path?arg=value#anchor"));'
+$ php -r 'print_r(parse_url("http://username:[EMAIL
PROTECTED]/path?arg=value#anchor"));'
Array
(
[scheme] => http
@@ -85,7 +85,7 @@
[fragment] => anchor
)
-$ php -r 'print_r( parse_url("http://invalid_host..name/";));'
+$ php -r 'print_r(parse_url("http://invalid_host..name/";));'
Array
(
[scheme] => http
Index: phpdoc/en/reference/var/functions/floatval.xml
diff -u phpdoc/en/reference/var/functions/floatval.xml:1.3
phpdoc/en/reference/var/functions/floatval.xml:1.4
--- phpdoc/en/reference/var/functions/floatval.xml:1.3 Fri May 30 12:58:05 2003
+++ phpdoc/en/reference/var/functions/floatval.xml Mon Dec 15 11:54:11 2003
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.3 $ -->
+<!-- $Revision: 1.4 $ -->
<!-- splitted from ./en/functions/var.xml, last change in rev 1.66 -->
<refentry id="function.floatval">
<refnamediv>
@@ -23,8 +23,8 @@
<![CDATA[
<?php
$var = '122.34343The';
-$float_value_of_var = floatval ($var);
-print $float_value_of_var; // prints 122.34343
+$float_value_of_var = floatval($var);
+echo $float_value_of_var; // prints 122.34343
?>
]]>
</programlisting>
Index: phpdoc/en/reference/var/functions/import-request-variables.xml
diff -u phpdoc/en/reference/var/functions/import-request-variables.xml:1.9
phpdoc/en/reference/var/functions/import-request-variables.xml:1.10
--- phpdoc/en/reference/var/functions/import-request-variables.xml:1.9 Fri May 30
12:58:05 2003
+++ phpdoc/en/reference/var/functions/import-request-variables.xml Mon Dec 15
11:54:11 2003
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.9 $ -->
+<!-- $Revision: 1.10 $ -->
<!-- splitted from ./en/functions/var.xml, last change in rev 1.34 -->
<refentry id="function.import-request-variables">
<refnamediv>
@@ -62,7 +62,7 @@
// with an "rvar_" prefix
import_request_variables("gP", "rvar_");
-print $rvar_foo;
+echo $rvar_foo;
?>
]]>
</programlisting>
Index: phpdoc/en/reference/var/functions/is-bool.xml
diff -u phpdoc/en/reference/var/functions/is-bool.xml:1.4
phpdoc/en/reference/var/functions/is-bool.xml:1.5
--- phpdoc/en/reference/var/functions/is-bool.xml:1.4 Thu Feb 20 11:51:17 2003
+++ phpdoc/en/reference/var/functions/is-bool.xml Mon Dec 15 11:54:11 2003
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.4 $ -->
+<!-- $Revision: 1.5 $ -->
<!-- splitted from ./en/functions/var.xml, last change in rev 1.19 -->
<refentry id="function.is-bool">
<refnamediv>
@@ -29,12 +29,12 @@
// Since $a is a boolean, this is true
if (is_bool($a)) {
- print "Yes, this is a boolean";
+ echo "Yes, this is a boolean";
}
// Since $b is not a boolean, this is not true
if (is_bool($b)) {
- print "Yes, this is a boolean";
+ echo "Yes, this is a boolean";
}
?>
]]>
Index: phpdoc/en/reference/var/functions/is-callable.xml
diff -u phpdoc/en/reference/var/functions/is-callable.xml:1.5
phpdoc/en/reference/var/functions/is-callable.xml:1.6
--- phpdoc/en/reference/var/functions/is-callable.xml:1.5 Sat Aug 16 14:59:12
2003
+++ phpdoc/en/reference/var/functions/is-callable.xml Mon Dec 15 11:54:11 2003
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.5 $ -->
+<!-- $Revision: 1.6 $ -->
<!-- splitted from ./en/functions/var.xml, last change in rev 1.87 -->
<refentry id="function.is-callable">
<refnamediv>
@@ -23,10 +23,10 @@
function name.
</para>
<para>
- The var parameter can be either the name of a function stored in
+ The <parameter>var</parameter> parameter can be either the name of a function
stored in
a string variable, or an object and the name of a method within the
object, like this:
- <screen>array( $SomeObject, 'MethodName' )</screen>
+ <screen>array($SomeObject, 'MethodName')</screen>
</para>
<para>
If the <parameter>syntax_only</parameter> argument is &true; the
@@ -47,7 +47,7 @@
<informalexample>
<programlisting role="php">
<![CDATA[
-<? php
+<?php
// How to check a variable to see if it can be called
// as a function.
@@ -60,7 +60,7 @@
$functionVariable = 'someFunction';
-var_dump( is_callable( $functionVariable, false, $callable_name )); // bool(true)
+var_dump(is_callable($functionVariable, false, $callable_name)); // bool(true)
echo $callable_name, "\n"; // someFunction
@@ -77,9 +77,9 @@
$anObject = new someClass();
-$methodVariable = array( $anObject, 'someMethod' );
+$methodVariable = array($anObject, 'someMethod');
-var_dump( is_callable( $methodVariable, true, $callable_name )); // bool(true)
+var_dump(is_callable($methodVariable, true, $callable_name)); // bool(true)
echo $callable_name, "\n"; // someClass:someMethod
Index: phpdoc/en/reference/var/functions/isset.xml
diff -u phpdoc/en/reference/var/functions/isset.xml:1.11
phpdoc/en/reference/var/functions/isset.xml:1.12
--- phpdoc/en/reference/var/functions/isset.xml:1.11 Thu Jul 10 04:29:54 2003
+++ phpdoc/en/reference/var/functions/isset.xml Mon Dec 15 11:54:11 2003
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.11 $ -->
+<!-- $Revision: 1.12 $ -->
<!-- splitted from ./en/functions/var.xml, last change in rev 1.2 -->
<refentry id="function.isset">
<refnamediv>
@@ -44,7 +44,7 @@
// This will evaluate to &true; so the text will be printed.
if (isset($var)) {
- print "This var is set set so I will print.";
+ echo "This var is set set so I will print.";
}
// In the next examples we'll use var_dump to output
@@ -53,16 +53,16 @@
$a = "test";
$b = "anothertest";
-var_dump( isset($a) ); // TRUE
-var_dump( isset ($a, $b) ); // TRUE
+var_dump(isset($a)); // TRUE
+var_dump(isset($a, $b)); // TRUE
unset ($a);
-var_dump( isset ($a) ); // FALSE
-var_dump( isset ($a, $b) ); // FALSE
+var_dump(isset($a)); // FALSE
+var_dump(isset($a, $b)); // FALSE
$foo = NULL;
-var_dump( isset ($foo) ); // FALSE
+var_dump(isset($foo)); // FALSE
?>
]]>
@@ -78,13 +78,13 @@
$a = array ('test' => 1, 'hello' => NULL);
-var_dump( isset ($a['test']) ); // TRUE
-var_dump( isset ($a['foo']) ); // FALSE
-var_dump( isset ($a['hello']) ); // FALSE
+var_dump(isset($a['test'])); // TRUE
+var_dump(isset($a['foo'])); // FALSE
+var_dump(isset($a['hello'])); // FALSE
// The key 'hello' equals NULL so is considered unset
// If you want to check for NULL key values then try:
-var_dump( array_key_exists('hello', $a) ); // TRUE
+var_dump(array_key_exists('hello', $a)); // TRUE
?>
]]>
Index: phpdoc/en/reference/var/functions/print-r.xml
diff -u phpdoc/en/reference/var/functions/print-r.xml:1.6
phpdoc/en/reference/var/functions/print-r.xml:1.7
--- phpdoc/en/reference/var/functions/print-r.xml:1.6 Wed Jul 16 13:23:51 2003
+++ phpdoc/en/reference/var/functions/print-r.xml Mon Dec 15 11:54:11 2003
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.6 $ -->
+<!-- $Revision: 1.7 $ -->
<!-- splitted from ./en/functions/var.xml, last change in rev 1.5 -->
<refentry id="function.print-r">
<refnamediv>
@@ -39,7 +39,7 @@
<![CDATA[
<pre>
<?php
- $a = array ('a' => 'apple', 'b' => 'banana', 'c' => array ('x','y','z'));
+ $a = array ('a' => 'apple', 'b' => 'banana', 'c' => array ('x', 'y', 'z'));
print_r ($a);
?>
</pre>
@@ -80,7 +80,7 @@
<![CDATA[
<?php
$b = array ('m' => 'monkey', 'foo' => 'bar', 'x' => array ('x', 'y', 'z'));
- $results = print_r ($b, true); //$results now contains output from print_r
+ $results = print_r($b, true); //$results now contains output from print_r
?>
]]>
</programlisting>
Index: phpdoc/en/reference/var/functions/serialize.xml
diff -u phpdoc/en/reference/var/functions/serialize.xml:1.7
phpdoc/en/reference/var/functions/serialize.xml:1.8
--- phpdoc/en/reference/var/functions/serialize.xml:1.7 Sun Oct 26 11:32:28 2003
+++ phpdoc/en/reference/var/functions/serialize.xml Mon Dec 15 11:54:11 2003
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.7 $ -->
+<!-- $Revision: 1.8 $ -->
<!-- splitted from ./en/functions/var.xml, last change in rev 1.28 -->
<refentry id="function.serialize">
<refnamediv>
@@ -70,11 +70,11 @@
// information for the current user. We use serialize() to store
// it in a database at the end of the request.
-$conn = odbc_connect ("webdb", "php", "chicken");
-$stmt = odbc_prepare ($conn,
+$conn = odbc_connect("webdb", "php", "chicken");
+$stmt = odbc_prepare($conn,
"UPDATE sessions SET data = ? WHERE id = ?");
$sqldata = array (serialize($session_data), $PHP_AUTH_USER);
-if (!odbc_execute ($stmt, &$sqldata)) {
+if (!odbc_execute($stmt, &$sqldata)) {
$stmt = odbc_prepare($conn,
"INSERT INTO sessions (id, data) VALUES(?, ?)");
if (!odbc_execute($stmt, &$sqldata)) {
Index: phpdoc/en/reference/var/functions/unserialize.xml
diff -u phpdoc/en/reference/var/functions/unserialize.xml:1.12
phpdoc/en/reference/var/functions/unserialize.xml:1.13
--- phpdoc/en/reference/var/functions/unserialize.xml:1.12 Sun Mar 30 09:44:59
2003
+++ phpdoc/en/reference/var/functions/unserialize.xml Mon Dec 15 11:54:11 2003
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.12 $ -->
+<!-- $Revision: 1.13 $ -->
<!-- splitted from ./en/functions/var.xml, last change in rev 1.2 -->
<refentry id="function.unserialize">
<refnamediv>
@@ -54,7 +54,7 @@
$serialized_object='O:1:"a":1:{s:5:"value";s:3:"100";}';
// unserialize_callback_func directive available as of PHP 4.2.0
-ini_set('unserialize_callback_func','mycallback'); // set your callback_function
+ini_set('unserialize_callback_func', 'mycallback'); // set your callback_function
function mycallback($classname) {
// just include a file containing your classdefinition
@@ -85,16 +85,16 @@
// $session_data array from the string selected from a database.
// This example complements the one described with serialize().
-$conn = odbc_connect ("webdb", "php", "chicken");
-$stmt = odbc_prepare ($conn, "SELECT data FROM sessions WHERE id = ?");
+$conn = odbc_connect("webdb", "php", "chicken");
+$stmt = odbc_prepare($conn, "SELECT data FROM sessions WHERE id = ?");
$sqldata = array ($PHP_AUTH_USER);
-if (!odbc_execute ($stmt, &$sqldata) || !odbc_fetch_into ($stmt, &$tmp)) {
+if (!odbc_execute($stmt, &$sqldata) || !odbc_fetch_into($stmt, &$tmp)) {
// if the execute or fetch fails, initialize to empty array
$session_data = array();
} else {
// we should now have the serialized data in $tmp[0].
- $session_data = unserialize ($tmp[0]);
- if (!is_array ($session_data)) {
+ $session_data = unserialize($tmp[0]);
+ if (!is_array($session_data)) {
// something went wrong, initialize to empty array
$session_data = array();
}
Index: phpdoc/en/reference/var/functions/unset.xml
diff -u phpdoc/en/reference/var/functions/unset.xml:1.6
phpdoc/en/reference/var/functions/unset.xml:1.7
--- phpdoc/en/reference/var/functions/unset.xml:1.6 Tue Jul 15 03:05:22 2003
+++ phpdoc/en/reference/var/functions/unset.xml Mon Dec 15 11:54:11 2003
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.6 $ -->
+<!-- $Revision: 1.7 $ -->
<!-- splitted from ./en/functions/var.xml, last change in rev 1.2 -->
<refentry id="function.unset">
<refnamediv>
@@ -31,13 +31,13 @@
<![CDATA[
<?php
// destroy a single variable
-unset ($foo);
+unset($foo);
// destroy a single element of an array
-unset ($bar['quux']);
+unset($bar['quux']);
// destroy more than one variable
-unset ($foo1, $foo2, $foo3);
+unset($foo1, $foo2, $foo3);
?>
]]>
</programlisting>
Index: phpdoc/en/reference/var/functions/var-dump.xml
diff -u phpdoc/en/reference/var/functions/var-dump.xml:1.4
phpdoc/en/reference/var/functions/var-dump.xml:1.5
--- phpdoc/en/reference/var/functions/var-dump.xml:1.4 Tue Apr 1 07:15:03 2003
+++ phpdoc/en/reference/var/functions/var-dump.xml Mon Dec 15 11:54:11 2003
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.4 $ -->
+<!-- $Revision: 1.5 $ -->
<!-- splitted from ./en/functions/var.xml, last change in rev 1.84 -->
<refentry id="function.var-dump">
<refnamediv>
@@ -29,12 +29,17 @@
<title><function>var_dump</function> example</title>
<programlisting role="php">
<![CDATA[
-<pre>
<?php
$a = array (1, 2, array ("a", "b", "c"));
-var_dump ($a);
-
-/* output:
+var_dump($a);
+?>
+]]>
+ </programlisting>
+ <para>
+ Output:
+ </para>
+ <screen>
+<![CDATA[
array(3) {
[0]=>
int(1)
@@ -50,22 +55,28 @@
string(1) "c"
}
}
-
-*/
+]]>
+ </screen>
+ <programlisting role="php">
+<![CDATA[
+<?php
$b = 3.1;
-$c = TRUE;
-var_dump($b,$c);
-
-/* output:
-float(3.1)
-bool(true)
+$c = true;
+var_dump($b, $c);
-*/
?>
-</pre>
]]>
</programlisting>
+ <para>
+ output:
+ </para>
+ <screen>
+<![CDATA[
+float(3.1)
+bool(true)
+]]>
+ </screen>
</example>
</para>
</refsect1>
Index: phpdoc/en/reference/var/functions/var-export.xml
diff -u phpdoc/en/reference/var/functions/var-export.xml:1.2
phpdoc/en/reference/var/functions/var-export.xml:1.3
--- phpdoc/en/reference/var/functions/var-export.xml:1.2 Wed Apr 17 02:45:00
2002
+++ phpdoc/en/reference/var/functions/var-export.xml Mon Dec 15 11:54:11 2003
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.2 $ -->
+<!-- $Revision: 1.3 $ -->
<!-- splitted from ./en/functions/var.xml, last change in rev 1.6 -->
<refentry id="function.var-export">
<refnamediv>
@@ -30,12 +30,17 @@
<informalexample>
<programlisting role="php">
<![CDATA[
-<pre>
<?php
$a = array (1, 2, array ("a", "b", "c"));
-var_export ($a);
-
-/* output:
+var_export($a);
+?>
+]]>
+ </programlisting>
+ <para>
+ output:
+ </para>
+ <screen>
+<![CDATA[
array (
0 => 1,
1 => 2,
@@ -46,19 +51,27 @@
2 => 'c',
),
)
-*/
+]]>
+ </screen>
+ <programlisting role="php">
+<![CDATA[
+<?php
$b = 3.1;
-$v = var_export($b, TRUE);
+$v = var_export($b, true);
echo $v;
-/* output:
-3.1
-*/
?>
-</pre>
]]>
</programlisting>
+ <para>
+ output:
+ </para>
+ <screen>
+<![CDATA[
+3.1
+]]>
+ </screen>
</informalexample>
</para>
</refsect1>
