irchtml Thu Apr 1 01:31:15 2004 EDT
Modified files:
/phpdoc/en/features remote-files.xml
/phpdoc/en/language oop.xml
/phpdoc/en/reference/filesystem/functions fwrite.xml popen.xml
/phpdoc/en/reference/network/functions fsockopen.xml
/phpdoc/en/reference/stream reference.xml
/phpdoc/en/reference/stream/functions stream-set-timeout.xml
stream-set-write-buffer.xml
stream-socket-accept.xml
stream-socket-client.xml
stream-socket-server.xml
/phpdoc/en/reference/xsl reference.xml
/phpdoc/en/security filesystem.xml variables.xml
Log:
ref.xsl: fixed build issues (functions will be coming in a few)
others: fputs() -> fwrite() (use of aliases deprecated)
http://cvs.php.net/diff.php/phpdoc/en/features/remote-files.xml?r1=1.22&r2=1.23&ty=u
Index: phpdoc/en/features/remote-files.xml
diff -u phpdoc/en/features/remote-files.xml:1.22
phpdoc/en/features/remote-files.xml:1.23
--- phpdoc/en/features/remote-files.xml:1.22 Tue Feb 4 08:05:06 2003
+++ phpdoc/en/features/remote-files.xml Thu Apr 1 01:31:12 2004
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.22 $ -->
+<!-- $Revision: 1.23 $ -->
<chapter id="features.remote-files">
<title>Using remote files</title>
@@ -89,7 +89,7 @@
exit;
}
/* Write the data here. */
-fputs ($file, $_SERVER['HTTP_USER_AGENT'] . "\n");
+fwrite ($file, $_SERVER['HTTP_USER_AGENT'] . "\n");
fclose ($file);
?>
]]>
http://cvs.php.net/diff.php/phpdoc/en/language/oop.xml?r1=1.49&r2=1.50&ty=u
Index: phpdoc/en/language/oop.xml
diff -u phpdoc/en/language/oop.xml:1.49 phpdoc/en/language/oop.xml:1.50
--- phpdoc/en/language/oop.xml:1.49 Tue Jan 6 04:20:49 2004
+++ phpdoc/en/language/oop.xml Thu Apr 1 01:31:13 2004
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.49 $ -->
+<!-- $Revision: 1.50 $ -->
<chapter id="language.oop">
<title>Classes and Objects</title>
@@ -695,7 +695,7 @@
$s = serialize($a);
// store $s somewhere where page2.php can find it.
$fp = fopen("store", "w");
- fputs($fp, $s);
+ fwrite($fp, $s);
fclose($fp);
// page2.php:
http://cvs.php.net/diff.php/phpdoc/en/reference/filesystem/functions/fwrite.xml?r1=1.9&r2=1.10&ty=u
Index: phpdoc/en/reference/filesystem/functions/fwrite.xml
diff -u phpdoc/en/reference/filesystem/functions/fwrite.xml:1.9
phpdoc/en/reference/filesystem/functions/fwrite.xml:1.10
--- phpdoc/en/reference/filesystem/functions/fwrite.xml:1.9 Mon Feb 23 03:09:31
2004
+++ phpdoc/en/reference/filesystem/functions/fwrite.xml Thu Apr 1 01:31:13 2004
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.9 $ -->
+<!-- $Revision: 1.10 $ -->
<!-- splitted from ./en/functions/filesystem.xml, last change in rev 1.2 -->
<refentry id="function.fwrite">
<refnamediv>
@@ -81,8 +81,7 @@
</para>
<simpara>
See also <function>fread</function>, <function>fopen</function>,
- <function>fsockopen</function>, <function>popen</function>, and
- <function>fputs</function>.
+ <function>fsockopen</function>, and <function>popen</function>.
</simpara>
</refsect1>
</refentry>
http://cvs.php.net/diff.php/phpdoc/en/reference/filesystem/functions/popen.xml?r1=1.12&r2=1.13&ty=u
Index: phpdoc/en/reference/filesystem/functions/popen.xml
diff -u phpdoc/en/reference/filesystem/functions/popen.xml:1.12
phpdoc/en/reference/filesystem/functions/popen.xml:1.13
--- phpdoc/en/reference/filesystem/functions/popen.xml:1.12 Thu Feb 19 12:53:49
2004
+++ phpdoc/en/reference/filesystem/functions/popen.xml Thu Apr 1 01:31:13 2004
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.12 $ -->
+<!-- $Revision: 1.13 $ -->
<!-- splitted from ./en/functions/filesystem.xml, last change in rev 1.2 -->
<refentry id="function.popen">
<refnamediv>
@@ -23,7 +23,7 @@
only be used for reading or writing) and must be closed with
<function>pclose</function>. This pointer may be used with
<function>fgets</function>, <function>fgetss</function>, and
- <function>fputs</function>.
+ <function>fwrite</function>.
</para>
<para>
If an error occurs, returns &false;.
http://cvs.php.net/diff.php/phpdoc/en/reference/network/functions/fsockopen.xml?r1=1.13&r2=1.14&ty=u
Index: phpdoc/en/reference/network/functions/fsockopen.xml
diff -u phpdoc/en/reference/network/functions/fsockopen.xml:1.13
phpdoc/en/reference/network/functions/fsockopen.xml:1.14
--- phpdoc/en/reference/network/functions/fsockopen.xml:1.13 Wed Dec 31 04:33:11
2003
+++ phpdoc/en/reference/network/functions/fsockopen.xml Thu Apr 1 01:31:13 2004
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.13 $ -->
+<!-- $Revision: 1.14 $ -->
<!-- splitted from ./en/functions/network.xml, last change in rev 1.2 -->
<refentry id="function.fsockopen">
<refnamediv>
@@ -44,7 +44,7 @@
<function>fsockopen</function> returns a file pointer which may
be used together with the other file functions (such as
<function>fgets</function>, <function>fgetss</function>,
- <function>fputs</function>, <function>fclose</function>, and
+ <function>fwrite</function>, <function>fclose</function>, and
<function>feof</function>).
</para>
<para>
@@ -82,7 +82,7 @@
$out .= "Host: www.example.com\r\n";
$out .= "Connection: Close\r\n\r\n";
- fputs($fp, $out);
+ fwrte($fp, $out);
while (!feof($fp)) {
echo fgets($fp, 128);
}
@@ -130,7 +130,7 @@
See also <function>pfsockopen</function>,
<function>stream_set_blocking</function>,
<function>stream_set_timeout</function>, <function>fgets</function>,
- <function>fgetss</function>, <function>fputs</function>,
+ <function>fgetss</function>, <function>fwrte</function>,
<function>fclose</function>, <function>feof</function>, and
the <link linkend="ref.curl">Curl extension</link>.
</para>
http://cvs.php.net/diff.php/phpdoc/en/reference/stream/reference.xml?r1=1.21&r2=1.22&ty=u
Index: phpdoc/en/reference/stream/reference.xml
diff -u phpdoc/en/reference/stream/reference.xml:1.21
phpdoc/en/reference/stream/reference.xml:1.22
--- phpdoc/en/reference/stream/reference.xml:1.21 Tue Feb 24 03:46:24 2004
+++ phpdoc/en/reference/stream/reference.xml Thu Apr 1 01:31:14 2004
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.21 $ -->
+<!-- $Revision: 1.22 $ -->
<reference id="ref.stream">
<title>Stream Functions</title>
<titleabbrev>Streams</titleabbrev>
@@ -204,14 +204,14 @@
$data = "foo=" . urlencode("Value for Foo") . "&bar=" . urlencode("Value for Bar");
-fputs($sock, "POST /form_action.php HTTP/1.0\r\n");
-fputs($sock, "Host: secure.example.com\r\n");
-fputs($sock, "Content-type: application/x-www-form-urlencoded\r\n");
-fputs($sock, "Content-length: " . strlen($data) . "\r\n");
-fputs($sock, "Accept: */*\r\n");
-fputs($sock, "\r\n");
-fputs($sock, "$data\r\n");
-fputs($sock, "\r\n");
+fwrite($sock, "POST /form_action.php HTTP/1.0\r\n");
+fwrite($sock, "Host: secure.example.com\r\n");
+fwrite($sock, "Content-type: application/x-www-form-urlencoded\r\n");
+fwrite($sock, "Content-length: " . strlen($data) . "\r\n");
+fwrite($sock, "Accept: */*\r\n");
+fwrite($sock, "\r\n");
+fwrite($sock, "$data\r\n");
+fwrite($sock, "\r\n");
$headers = "";
while ($str = trim(fgets($sock, 4096)))
http://cvs.php.net/diff.php/phpdoc/en/reference/stream/functions/stream-set-timeout.xml?r1=1.5&r2=1.6&ty=u
Index: phpdoc/en/reference/stream/functions/stream-set-timeout.xml
diff -u phpdoc/en/reference/stream/functions/stream-set-timeout.xml:1.5
phpdoc/en/reference/stream/functions/stream-set-timeout.xml:1.6
--- phpdoc/en/reference/stream/functions/stream-set-timeout.xml:1.5 Mon Dec 15
11:53:49 2003
+++ phpdoc/en/reference/stream/functions/stream-set-timeout.xml Thu Apr 1 01:31:14
2004
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.5 $ -->
+<!-- $Revision: 1.6 $ -->
<!-- splitted from ./en/functions/network.xml, last change in rev 1.18 -->
<refentry id="function.stream-set-timeout">
<refnamediv>
@@ -27,7 +27,7 @@
if (!$fp) {
echo "Unable to open\n";
} else {
- fputs($fp, "GET / HTTP/1.0\n\n");
+ fwrite($fp, "GET / HTTP/1.0\n\n");
stream_set_timeout($fp, 2);
$res = fread($fp, 2000);
var_dump(stream_get_meta_data($fp));
http://cvs.php.net/diff.php/phpdoc/en/reference/stream/functions/stream-set-write-buffer.xml?r1=1.2&r2=1.3&ty=u
Index: phpdoc/en/reference/stream/functions/stream-set-write-buffer.xml
diff -u phpdoc/en/reference/stream/functions/stream-set-write-buffer.xml:1.2
phpdoc/en/reference/stream/functions/stream-set-write-buffer.xml:1.3
--- phpdoc/en/reference/stream/functions/stream-set-write-buffer.xml:1.2 Wed
Jul 16 13:21:38 2003
+++ phpdoc/en/reference/stream/functions/stream-set-write-buffer.xml Thu Apr 1
01:31:14 2004
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.2 $ -->
+<!-- $Revision: 1.3 $ -->
<!-- splitted from ./en/functions/filesystem.xml, last change in rev 1.2 -->
<refentry id="function.stream-set-write-buffer">
<refnamediv>
@@ -41,7 +41,7 @@
$fp = fopen($file, "w");
if ($fp) {
stream_set_write_buffer($fp, 0);
- fputs($fp, $output);
+ fwrite($fp, $output);
fclose($fp);
}
?>
http://cvs.php.net/diff.php/phpdoc/en/reference/stream/functions/stream-socket-accept.xml?r1=1.1&r2=1.2&ty=u
Index: phpdoc/en/reference/stream/functions/stream-socket-accept.xml
diff -u phpdoc/en/reference/stream/functions/stream-socket-accept.xml:1.1
phpdoc/en/reference/stream/functions/stream-socket-accept.xml:1.2
--- phpdoc/en/reference/stream/functions/stream-socket-accept.xml:1.1 Fri Apr 4
16:01:35 2003
+++ phpdoc/en/reference/stream/functions/stream-socket-accept.xml Thu Apr 1
01:31:14 2004
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.1 $ -->
+<!-- $Revision: 1.2 $ -->
<refentry id="function.stream-socket-accept">
<refnamediv>
<refname>stream_socket_accept</refname>
@@ -37,7 +37,7 @@
<function>stream_set_blocking</function>,
<function>stream_set_timeout</function>,
<function>fgets</function>,
- <function>fgetss</function>, <function>fputs</function>,
+ <function>fgetss</function>, <function>fwrite</function>,
<function>fclose</function>, <function>feof</function>, and
the <link linkend="ref.curl">Curl extension</link>.
</para>
http://cvs.php.net/diff.php/phpdoc/en/reference/stream/functions/stream-socket-client.xml?r1=1.8&r2=1.9&ty=u
Index: phpdoc/en/reference/stream/functions/stream-socket-client.xml
diff -u phpdoc/en/reference/stream/functions/stream-socket-client.xml:1.8
phpdoc/en/reference/stream/functions/stream-socket-client.xml:1.9
--- phpdoc/en/reference/stream/functions/stream-socket-client.xml:1.8 Wed Jan 28
19:35:30 2004
+++ phpdoc/en/reference/stream/functions/stream-socket-client.xml Thu Apr 1
01:31:14 2004
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.8 $ -->
+<!-- $Revision: 1.9 $ -->
<refentry id="function.stream-socket-client">
<refnamediv>
<refname>stream_socket_client</refname>
@@ -50,7 +50,7 @@
stream resource which may
be used together with the other file functions (such as
<function>fgets</function>, <function>fgetss</function>,
- <function>fputs</function>, <function>fclose</function>, and
+ <function>fwrite</function>, <function>fclose</function>, and
<function>feof</function>).
</para>
<para>
@@ -86,7 +86,7 @@
if (!$fp) {
echo "$errstr ($errno)<br />\n";
} else {
- fputs($fp, "GET / HTTP/1.0\r\nHost: www.example.com\r\nAccept: */*\r\n\r\n");
+ fwrite($fp, "GET / HTTP/1.0\r\nHost: www.example.com\r\nAccept: */*\r\n\r\n");
while (!feof($fp)) {
echo fgets($fp, 1024);
}
@@ -130,7 +130,7 @@
<function>stream_set_blocking</function>,
<function>stream_set_timeout</function>,
<function>fgets</function>,
- <function>fgetss</function>, <function>fputs</function>,
+ <function>fgetss</function>, <function>fwrite</function>,
<function>fclose</function>, <function>feof</function>, and
the <link linkend="ref.curl">Curl extension</link>.
</para>
http://cvs.php.net/diff.php/phpdoc/en/reference/stream/functions/stream-socket-server.xml?r1=1.13&r2=1.14&ty=u
Index: phpdoc/en/reference/stream/functions/stream-socket-server.xml
diff -u phpdoc/en/reference/stream/functions/stream-socket-server.xml:1.13
phpdoc/en/reference/stream/functions/stream-socket-server.xml:1.14
--- phpdoc/en/reference/stream/functions/stream-socket-server.xml:1.13 Mon Mar 29
18:21:04 2004
+++ phpdoc/en/reference/stream/functions/stream-socket-server.xml Thu Apr 1
01:31:14 2004
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.13 $ -->
+<!-- $Revision: 1.14 $ -->
<refentry id="function.stream-socket-server">
<refnamediv>
<refname>stream_socket_server</refname>
@@ -68,7 +68,7 @@
echo "$errstr ($errno)<br />\n";
} else {
while ($conn = stream_socket_accept($socket)) {
- fputs($conn, 'The local time is ' . date('n/j/Y g:i a') . "\n");
+ fwrite($conn, 'The local time is ' . date('n/j/Y g:i a') . "\n");
fclose($conn);
}
fclose($socket);
@@ -113,7 +113,7 @@
<function>stream_set_blocking</function>,
<function>stream_set_timeout</function>,
<function>fgets</function>,
- <function>fgetss</function>, <function>fputs</function>,
+ <function>fgetss</function>, <function>fwrite</function>,
<function>fclose</function>, <function>feof</function>, and
the <link linkend="ref.curl">Curl extension</link>.
</para>
http://cvs.php.net/diff.php/phpdoc/en/reference/xsl/reference.xml?r1=1.2&r2=1.3&ty=u
Index: phpdoc/en/reference/xsl/reference.xml
diff -u phpdoc/en/reference/xsl/reference.xml:1.2
phpdoc/en/reference/xsl/reference.xml:1.3
--- phpdoc/en/reference/xsl/reference.xml:1.2 Sun Mar 28 01:46:36 2004
+++ phpdoc/en/reference/xsl/reference.xml Thu Apr 1 01:31:15 2004
@@ -1,10 +1,11 @@
<?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.2 $ -->
+<!-- $Revision: 1.3 $ -->
<reference id="ref.xsl">
<title>XSL functions</title>
<titleabbrev>XSL</titleabbrev>
<partintro>
+
<section id="xsl.intro">
&reftitle.intro;
&warn.experimental;
@@ -23,13 +24,14 @@
directory.
</para>
</section>
+
<section id="xsl.examples">
&reftitle.examples;
<para>
In this small tutorial we will learn how to transform an XML
document into HTML.
</para>
- <section id="xsl.examples.sources">
+ <para>
<example>
<title>A simple XSL tree</title>
<programlisting role="xml">
@@ -49,6 +51,8 @@
]]>
</programlisting>
</example>
+ </para>
+ <para>
<example>
<title>Corresponding XML tree</title>
<programlisting role="xml">
@@ -68,14 +72,15 @@
]]>
</programlisting>
</example>
- </section>
- <example>
- <title>Making XML into HTML</title>
- <simpara>
- The following PHP code uses the XML and XSL extensions to
- transform XML into presentable HTML.
- </simpara>
- <programlisting role="php">
+ </para>
+ <para>
+ <example>
+ <title>Making XML into HTML</title>
+ <simpara>
+ The following PHP code uses the XML and XSL extensions to
+ transform XML into presentable HTML.
+ </simpara>
+ <programlisting role="php">
<![CDATA[
<?php
/* Load the two XML sources */
@@ -91,11 +96,11 @@
echo $proc->transformToXML($xml); // actual transformation
?>
]]>
- </programlisting>
- <simpara>
- This should produce an HTML fragment similar to the following:
- </simpara>
- <screen>
+ </programlisting>
+ <simpara>
+ This should produce an HTML fragment similar to the following:
+ </simpara>
+ <screen>
<![CDATA[
Hey! Welcome to my sweet CD collection!
@@ -107,12 +112,13 @@
<h2> by kennyt</h2>
<h3> - 2004</h3>
]]>
- </screen>
- </example>
+ </screen>
+ </example>
+ </para>
</section>
</partintro>
-&reference.xsl.functions;
+ &reference.xsl.functions;
</reference>
<!-- Keep this comment at the end of the file
http://cvs.php.net/diff.php/phpdoc/en/security/filesystem.xml?r1=1.1&r2=1.2&ty=u
Index: phpdoc/en/security/filesystem.xml
diff -u phpdoc/en/security/filesystem.xml:1.1 phpdoc/en/security/filesystem.xml:1.2
--- phpdoc/en/security/filesystem.xml:1.1 Mon Jan 26 08:22:25 2004
+++ phpdoc/en/security/filesystem.xml Thu Apr 1 01:31:15 2004
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.1 $ -->
+<!-- $Revision: 1.2 $ -->
<!-- splitted from ./index.xml, last change in rev 1.66 -->
<sect1 id="security.filesystem">
<title>Filesystem Security</title>
@@ -94,7 +94,7 @@
$fp = fopen("/home/logging/filedelete.log","+a"); //log the deletion
$logstring = "$username $homedir $file_to_delete";
-fputs ($fp, $logstring);
+fwrite ($fp, $logstring);
fclose($fp);
echo "$file_to_delete has been deleted!";
http://cvs.php.net/diff.php/phpdoc/en/security/variables.xml?r1=1.1&r2=1.2&ty=u
Index: phpdoc/en/security/variables.xml
diff -u phpdoc/en/security/variables.xml:1.1 phpdoc/en/security/variables.xml:1.2
--- phpdoc/en/security/variables.xml:1.1 Mon Jan 26 08:22:25 2004
+++ phpdoc/en/security/variables.xml Thu Apr 1 01:31:15 2004
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.1 $ -->
+<!-- $Revision: 1.2 $ -->
<!-- splitted from ./index.xml, last change in rev 1.66 -->
<sect1 id="security.variables">
<title>User Submitted Data</title>
@@ -19,7 +19,7 @@
unlink ($evil_var);
// Write logging of their access... or maybe an /etc/passwd entry?
-fputs ($fp, $evil_var);
+fwrite ($fp, $evil_var);
// Execute something trivial.. or rm -rf *?
system ($evil_var);
