philip Mon Dec 3 16:59:00 2001 EDT
Modified files:
/phpdoc/en/functions pcre.xml pgsql.xml readline.xml session.xml
sockets.xml strings.xml url.xml var.xml
Log:
Typo fixes
Index: phpdoc/en/functions/pcre.xml
diff -u phpdoc/en/functions/pcre.xml:1.63 phpdoc/en/functions/pcre.xml:1.64
--- phpdoc/en/functions/pcre.xml:1.63 Wed Nov 21 18:05:18 2001
+++ phpdoc/en/functions/pcre.xml Mon Dec 3 16:58:59 2001
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.63 $ -->
+<!-- $Revision: 1.64 $ -->
<reference id="ref.pcre">
<title>Regular Expression Functions (Perl-Compatible)</title>
<titleabbrev>PCRE</titleabbrev>
@@ -439,24 +439,24 @@
// common HTML entities to their text equivalent.
$search = array ("'<script[^>]*?>.*?</script>'si", // Strip out javascript
- "'<[\/\!]*?[^<>]*?>'si", // Strip out html tags
- "'([\r\n])[\s]+'", // Strip out white space
- "'&(quot|#34);'i", // Replace html entities
- "'&(amp|#38);'i",
- "'&(lt|#60);'i",
- "'&(gt|#62);'i",
- "'&(nbsp|#160);'i",
- "'&(iexcl|#161);'i",
- "'&(cent|#162);'i",
- "'&(pound|#163);'i",
- "'&(copy|#169);'i",
- "'&#(\d+);'e"); // evaluate as php
+ "'<[\/\!]*?[^<>]*?>'si", // Strip out html tags
+ "'([\r\n])[\s]+'", // Strip out white space
+ "'&(quot|#34);'i", // Replace html entities
+ "'&(amp|#38);'i",
+ "'&(lt|#60);'i",
+ "'&(gt|#62);'i",
+ "'&(nbsp|#160);'i",
+ "'&(iexcl|#161);'i",
+ "'&(cent|#162);'i",
+ "'&(pound|#163);'i",
+ "'&(copy|#169);'i",
+ "'&#(\d+);'e"); // evaluate as php
$replace = array ("",
"",
"\\1",
"\"",
- "&",
+ "&",
"<",
">",
" ",
Index: phpdoc/en/functions/pgsql.xml
diff -u phpdoc/en/functions/pgsql.xml:1.48 phpdoc/en/functions/pgsql.xml:1.49
--- phpdoc/en/functions/pgsql.xml:1.48 Wed Nov 21 18:05:18 2001
+++ phpdoc/en/functions/pgsql.xml Mon Dec 3 16:58:59 2001
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.48 $ -->
+<!-- $Revision: 1.49 $ -->
<reference id="ref.pgsql">
<title>PostgreSQL functions</title>
<titleabbrev>PostgreSQL</titleabbrev>
@@ -161,7 +161,7 @@
<?php
$result = pg_exec ($conn, "INSERT INTO publisher VALUES ('Author')");
$cmdtuples = pg_cmdtuples ($result);
-echo $cmdtuples . " <- cmdtuples affected.";
+echo $cmdtuples . " cmdtuples affected.";
?>
]]>
</programlisting>
Index: phpdoc/en/functions/readline.xml
diff -u phpdoc/en/functions/readline.xml:1.14 phpdoc/en/functions/readline.xml:1.15
--- phpdoc/en/functions/readline.xml:1.14 Wed Nov 21 18:05:18 2001
+++ phpdoc/en/functions/readline.xml Mon Dec 3 16:58:59 2001
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.14 $ -->
+<!-- $Revision: 1.15 $ -->
<reference id="ref.readline">
<title>GNU Readline</title>
<titleabbrev>Readline</titleabbrev>
@@ -49,7 +49,7 @@
<programlisting role="php">
<![CDATA[
//get 3 commands from user
-for ($i=0; $i < 3; $i++) {
+for ($i=0; $i < 3; $i++) {
$line = readline ("Command: ");
readline_add_history ($line);
}
Index: phpdoc/en/functions/session.xml
diff -u phpdoc/en/functions/session.xml:1.57 phpdoc/en/functions/session.xml:1.58
--- phpdoc/en/functions/session.xml:1.57 Wed Nov 28 15:46:27 2001
+++ phpdoc/en/functions/session.xml Mon Dec 3 16:58:59 2001
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.57 $ -->
+<!-- $Revision: 1.58 $ -->
<reference id="ref.session">
<title>Session handling functions</title>
<titleabbrev>Sessions</titleabbrev>
@@ -152,7 +152,7 @@
$count++;
?>
-Hello visitor, you have seen this page <?php echo $count; ?> times.<p>
+Hello visitor, you have seen this page <?php echo $count; ?> times.<p>;
<?php
# the <?=SID?> is necessary to preserve the session id
Index: phpdoc/en/functions/sockets.xml
diff -u phpdoc/en/functions/sockets.xml:1.24 phpdoc/en/functions/sockets.xml:1.25
--- phpdoc/en/functions/sockets.xml:1.24 Wed Nov 21 18:05:18 2001
+++ phpdoc/en/functions/sockets.xml Mon Dec 3 16:58:59 2001
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.24 $ -->
+<!-- $Revision: 1.25 $ -->
<reference id="ref.sockets">
<title>Socket functions</title>
<titleabbrev>Sockets</titleabbrev>
@@ -552,11 +552,11 @@
<programlisting role="php">
<![CDATA[
<?php
-if (($socket = socket (AF_INET, SOCK_STREAM, 0)) < 0) {
+if (($socket = socket (AF_INET, SOCK_STREAM, 0)) < 0) {
echo "socket() failed: reason: " . strerror ($socket) . "\n";
}
-if (($ret = bind ($socket, '127.0.0.1', 80)) < 0) {
+if (($ret = bind ($socket, '127.0.0.1', 80)) < 0) {
echo "bind() failed: reason: " . strerror ($ret) . "\n";
}
?>
Index: phpdoc/en/functions/strings.xml
diff -u phpdoc/en/functions/strings.xml:1.127 phpdoc/en/functions/strings.xml:1.128
--- phpdoc/en/functions/strings.xml:1.127 Wed Nov 21 18:05:18 2001
+++ phpdoc/en/functions/strings.xml Mon Dec 3 16:59:00 2001
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.127 $ -->
+<!-- $Revision: 1.128 $ -->
<reference id="ref.strings">
<title>String functions</title>
<titleabbrev>Strings</titleabbrev>
@@ -1941,7 +1941,7 @@
<![CDATA[
// get author info and generate DocBook entry
$auth = "24\tLewis Carroll";
-$n = sscanf($auth,"%d\t%s %s", &$id, &$first, &$last);
+$n = sscanf($auth,"%d\t%s %s", &$id, &$first, &$last);
echo "<author id='$id'>
<firstname>$first</firstname>
<surname>$last</surname>
Index: phpdoc/en/functions/url.xml
diff -u phpdoc/en/functions/url.xml:1.20 phpdoc/en/functions/url.xml:1.21
--- phpdoc/en/functions/url.xml:1.20 Wed Nov 21 18:05:19 2001
+++ phpdoc/en/functions/url.xml Mon Dec 3 16:59:00 2001
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.20 $ -->
+<!-- $Revision: 1.21 $ -->
<reference id="ref.url">
<title>URL Functions</title>
<titleabbrev>URLs</titleabbrev>
@@ -188,7 +188,7 @@
while ($i < count($a)) {
$b = split('=', $a[$i]);
echo 'Value for parameter ', htmlspecialchars(urldecode($b[0])),
- ' is ', htmlspecialchars(urldecode($b[1])), "<br>";
+ ' is ', htmlspecialchars(urldecode($b[1])), "<br />\n";
$i++;
}
]]>
Index: phpdoc/en/functions/var.xml
diff -u phpdoc/en/functions/var.xml:1.77 phpdoc/en/functions/var.xml:1.78
--- phpdoc/en/functions/var.xml:1.77 Wed Nov 21 18:05:19 2001
+++ phpdoc/en/functions/var.xml Mon Dec 3 16:59:00 2001
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.77 $ -->
+<!-- $Revision: 1.78 $ -->
<reference id="ref.variables">
<title>Variable Functions</title>
<titleabbrev>Variables</titleabbrev>
@@ -985,7 +985,7 @@
$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)) {
@@ -1164,7 +1164,7 @@
$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 {
