[prev in list] [next in list] [prev in thread] [next in thread]
List: php-doc-cvs
Subject: [DOC-CVS] cvs: phpdoc /en/faq installation.xml /en/features remote-files.xml /en/reference/array/f
From: "Philip Olson" <philip () php ! net>
Date: 2008-11-28 20:34:01
Message-ID: cvsphilip1227904441 () cvsserver
[Download RAW message or body]
philip Fri Nov 28 20:34:01 2008 UTC
Modified files:
/phpdoc/en/faq installation.xml
/phpdoc/en/features remote-files.xml
/phpdoc/en/reference/array/functions uksort.xml
/phpdoc/en/reference/filesystem/functions fnmatch.xml
/phpdoc/en/reference/strings/functions quotemeta.xml
str-ireplace.xml strtr.xml
/phpdoc/en/reference/xml examples.xml
Log:
Changed deprecated ereg to preferred preg from SeeAlso and Examples
["philip-20081128203401.txt" (text/plain)]
http://cvs.php.net/viewvc.cgi/phpdoc/en/faq/installation.xml?r1=1.52&r2=1.53&diff_format=u
Index: phpdoc/en/faq/installation.xml
diff -u phpdoc/en/faq/installation.xml:1.52 phpdoc/en/faq/installation.xml:1.53
--- phpdoc/en/faq/installation.xml:1.52 Mon May 5 00:40:30 2008
+++ phpdoc/en/faq/installation.xml Fri Nov 28 20:34:00 2008
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.52 $ -->
+<!-- $Revision: 1.53 $ -->
<chapter xml:id="faq.installation" xmlns="http://docbook.org/ns/docbook" \
xmlns:xlink="http://www.w3.org/1999/xlink"> <title>Installation</title>
<titleabbrev>Installation</titleabbrev>
@@ -151,7 +151,7 @@
</para>
<para>
If your script uses the regular expression functions
- (<function>ereg</function> and friends), you should make sure
+ (<function>preg_match</function> and friends), you should make sure
that you compiled PHP and Apache with the same regular
expression package. This should happen automatically with
PHP and Apache 1.3.x
http://cvs.php.net/viewvc.cgi/phpdoc/en/features/remote-files.xml?r1=1.29&r2=1.30&diff_format=u
Index: phpdoc/en/features/remote-files.xml
diff -u phpdoc/en/features/remote-files.xml:1.29 \
phpdoc/en/features/remote-files.xml:1.30
--- phpdoc/en/features/remote-files.xml:1.29 Mon Dec 3 15:12:47 2007
+++ phpdoc/en/features/remote-files.xml Fri Nov 28 20:34:00 2008
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.29 $ -->
+<!-- $Revision: 1.30 $ -->
<chapter xml:id="features.remote-files" xmlns="http://docbook.org/ns/docbook">
<title>Using remote files</title>
@@ -54,7 +54,7 @@
while (!feof ($file)) {
$line = fgets ($file, 1024);
/* This only works if the title and its tags are on one line */
- if (eregi ("<title>(.*)</title>", $line, $out)) {
+ if (preg_match ("@\<title\>(.*)\</title\>@i", $line, $out)) {
$title = $out[1];
break;
}
http://cvs.php.net/viewvc.cgi/phpdoc/en/reference/array/functions/uksort.xml?r1=1.22&r2=1.23&diff_format=u
Index: phpdoc/en/reference/array/functions/uksort.xml
diff -u phpdoc/en/reference/array/functions/uksort.xml:1.22 \
phpdoc/en/reference/array/functions/uksort.xml:1.23
--- phpdoc/en/reference/array/functions/uksort.xml:1.22 Sun Dec 30 19:17:05 2007
+++ phpdoc/en/reference/array/functions/uksort.xml Fri Nov 28 20:34:00 2008
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.22 $ -->
+<!-- $Revision: 1.23 $ -->
<refentry xml:id="function.uksort" xmlns="http://docbook.org/ns/docbook">
<refnamediv>
<refname>uksort</refname>
@@ -66,8 +66,8 @@
<?php
function cmp($a, $b)
{
- $a = ereg_replace('^(a|an|the) ', '', $a);
- $b = ereg_replace('^(a|an|the) ', '', $b);
+ $a = preg_replace('@^(a|an|the) @', '', $a);
+ $b = preg_replace('@^(a|an|the) @', '', $b);
return strcasecmp($a, $b);
}
http://cvs.php.net/viewvc.cgi/phpdoc/en/reference/filesystem/functions/fnmatch.xml?r1=1.15&r2=1.16&diff_format=u
Index: phpdoc/en/reference/filesystem/functions/fnmatch.xml
diff -u phpdoc/en/reference/filesystem/functions/fnmatch.xml:1.15 \
phpdoc/en/reference/filesystem/functions/fnmatch.xml:1.16
--- phpdoc/en/reference/filesystem/functions/fnmatch.xml:1.15 Sun Nov 4 21:38:36 \
2007
+++ phpdoc/en/reference/filesystem/functions/fnmatch.xml Fri Nov 28 20:34:00 2008
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.15 $ -->
+<!-- $Revision: 1.16 $ -->
<refentry xmlns="http://docbook.org/ns/docbook" xml:id="function.fnmatch">
<refnamediv>
<refname>fnmatch</refname>
@@ -43,7 +43,7 @@
The average user may be used to shell patterns or at least in their
simplest form to <literal>'?'</literal> and <literal>'*'</literal>
wildcards so using <function>fnmatch</function> instead of
- <function>ereg</function> or <function>preg_match</function> for
+ <function>preg_match</function> for
frontend search expression input may be way more convenient for
non-programming users.
</para>
@@ -102,7 +102,6 @@
<para>
<simplelist>
<member><function>glob</function></member>
- <member><function>ereg</function></member>
<member><function>preg_match</function></member>
<member><function>sscanf</function></member>
<member><function>printf</function></member>
http://cvs.php.net/viewvc.cgi/phpdoc/en/reference/strings/functions/quotemeta.xml?r1=1.9&r2=1.10&diff_format=u
Index: phpdoc/en/reference/strings/functions/quotemeta.xml
diff -u phpdoc/en/reference/strings/functions/quotemeta.xml:1.9 \
phpdoc/en/reference/strings/functions/quotemeta.xml:1.10
--- phpdoc/en/reference/strings/functions/quotemeta.xml:1.9 Wed Dec 5 10:23:19 2007
+++ phpdoc/en/reference/strings/functions/quotemeta.xml Fri Nov 28 20:34:00 2008
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.9 $ -->
+<!-- $Revision: 1.10 $ -->
<refentry xmlns="http://docbook.org/ns/docbook" xml:id="function.quotemeta">
<refnamediv>
<refname>quotemeta</refname>
@@ -58,7 +58,7 @@
<member><function>nl2br</function></member>
<member><function>stripslashes</function></member>
<member><function>stripcslashes</function></member>
- <member><function>ereg</function></member>
+ <member><function>preg_match</function></member>
</simplelist>
</para>
</refsect1>
http://cvs.php.net/viewvc.cgi/phpdoc/en/reference/strings/functions/str-ireplace.xml?r1=1.13&r2=1.14&diff_format=u
Index: phpdoc/en/reference/strings/functions/str-ireplace.xml
diff -u phpdoc/en/reference/strings/functions/str-ireplace.xml:1.13 \
phpdoc/en/reference/strings/functions/str-ireplace.xml:1.14
--- phpdoc/en/reference/strings/functions/str-ireplace.xml:1.13 Wed Jun 20 22:25:29 \
2007
+++ phpdoc/en/reference/strings/functions/str-ireplace.xml Fri Nov 28 20:34:00 2008
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.13 $ -->
+<!-- $Revision: 1.14 $ -->
<refentry xmlns="http://docbook.org/ns/docbook" xml:id="function.str-ireplace">
<refnamediv>
<refname>str_ireplace</refname>
@@ -20,7 +20,7 @@
<parameter>search</parameter> in <parameter>subject</parameter>
(ignoring case) replaced with the given <parameter>replace</parameter>
value. If you don't need fancy replacing rules, you should generally
- use this function instead of <function>eregi_replace</function> or
+ use this function instead of
<function>preg_replace</function> with the <literal>i</literal> modifier.
</para>
</refsect1>
http://cvs.php.net/viewvc.cgi/phpdoc/en/reference/strings/functions/strtr.xml?r1=1.7&r2=1.8&diff_format=u
Index: phpdoc/en/reference/strings/functions/strtr.xml
diff -u phpdoc/en/reference/strings/functions/strtr.xml:1.7 \
phpdoc/en/reference/strings/functions/strtr.xml:1.8
--- phpdoc/en/reference/strings/functions/strtr.xml:1.7 Fri Dec 7 01:18:14 2007
+++ phpdoc/en/reference/strings/functions/strtr.xml Fri Nov 28 20:34:00 2008
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.7 $ -->
+<!-- $Revision: 1.8 $ -->
<refentry xmlns="http://docbook.org/ns/docbook" xml:id="function.strtr" \
xmlns:xlink="http://www.w3.org/1999/xlink"> <refnamediv>
<refname>strtr</refname>
@@ -155,7 +155,7 @@
&reftitle.seealso;
<para>
<simplelist>
- <member><function>ereg_replace</function></member>
+ <member><function>preg_replace</function></member>
</simplelist>
</para>
</refsect1>
http://cvs.php.net/viewvc.cgi/phpdoc/en/reference/xml/examples.xml?r1=1.2&r2=1.3&diff_format=u
Index: phpdoc/en/reference/xml/examples.xml
diff -u phpdoc/en/reference/xml/examples.xml:1.2 \
phpdoc/en/reference/xml/examples.xml:1.3
--- phpdoc/en/reference/xml/examples.xml:1.2 Sun Dec 23 22:39:46 2007
+++ phpdoc/en/reference/xml/examples.xml Fri Nov 28 20:34:00 2008
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
-<!-- $Revision: 1.2 $ -->
+<!-- $Revision: 1.3 $ -->
<chapter xml:id="xml.examples" xmlns="http://docbook.org/ns/docbook" \
xmlns:xlink="http://www.w3.org/1999/xlink"> &reftitle.examples;
<section xml:id="example.xml-structure">
@@ -142,7 +142,7 @@
function trustedFile($file)
{
// only trust local files owned by ourselves
- if (!eregi("^([a-z]+)://", $file)
+ if (!preg_match("@^([a-z]+)\:\/\/@i", $file)
&& fileowner($file) == getmyuid()) {
return true;
}
--
PHP Documentation Commits Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic