pajoye Sat Aug 12 15:54:51 2006 UTC
Modified files:
/phpdoc/en/reference/zip/functions ziparchive-addfile.xml
ziparchive-addfromstring.xml
ziparchive-deleteindex.xml
ziparchive-deletename.xml
ziparchive-extractto.xml
ziparchive-getarchivecomment.xml
ziparchive-getfromindex.xml
ziparchive-getfromname.xml
ziparchive-getstream.xml
Log:
- add check for the return values ZipArchive::open, some examples
were not updated. Braindead--;
http://cvs.php.net/viewvc.cgi/phpdoc/en/reference/zip/functions/ziparchive-addfile.xml?r1=1.2&r2=1.3&diff_format=u
Index: phpdoc/en/reference/zip/functions/ziparchive-addfile.xml
diff -u phpdoc/en/reference/zip/functions/ziparchive-addfile.xml:1.2
phpdoc/en/reference/zip/functions/ziparchive-addfile.xml:1.3
--- phpdoc/en/reference/zip/functions/ziparchive-addfile.xml:1.2 Fri Aug
11 17:59:01 2006
+++ phpdoc/en/reference/zip/functions/ziparchive-addfile.xml Sat Aug 12
15:54:51 2006
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.2 $ -->
+<!-- $Revision: 1.3 $ -->
<refentry id="function.ziparchive-addfile">
<refnamediv>
<refname>ZipArchive::addFile</refname>
@@ -59,7 +59,7 @@
<![CDATA[
<?php
$zip = new ZipArchive;
-if ($zip->open('test.zip')) {
+if ($zip->open('test.zip') === TRUE) {
$zip->addFile('/path/to/index.txt'), 'newname.txt');
$zip->close();
echo 'ok';
http://cvs.php.net/viewvc.cgi/phpdoc/en/reference/zip/functions/ziparchive-addfromstring.xml?r1=1.2&r2=1.3&diff_format=u
Index: phpdoc/en/reference/zip/functions/ziparchive-addfromstring.xml
diff -u phpdoc/en/reference/zip/functions/ziparchive-addfromstring.xml:1.2
phpdoc/en/reference/zip/functions/ziparchive-addfromstring.xml:1.3
--- phpdoc/en/reference/zip/functions/ziparchive-addfromstring.xml:1.2 Fri Aug
11 17:59:01 2006
+++ phpdoc/en/reference/zip/functions/ziparchive-addfromstring.xml Sat Aug
12 15:54:51 2006
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.2 $ -->
+<!-- $Revision: 1.3 $ -->
<refentry id="function.ziparchive-addfromstring">
<refnamediv>
<refname>ZipArchive::addFromString</refname>
@@ -55,7 +55,7 @@
<?php
$zip = new ZipArchive;
$res = $zip->open('test.zip', ZipArchive::CREATE);
-if ($res) {
+if ($res === TRUE) {
$zip->addFromString('test.txt', 'file content goes here');
$zip->close();
echo 'ok';
@@ -72,7 +72,7 @@
<![CDATA[
<?php
$zip = new ZipArchive;
-if ($zip->open(realpath('test.zip'))) {
+if ($zip->open('test.zip') === TRUE) {
$zip->addFromString('dir/test.txt', 'file content goes here');
$zip->close();
echo 'ok';
http://cvs.php.net/viewvc.cgi/phpdoc/en/reference/zip/functions/ziparchive-deleteindex.xml?r1=1.2&r2=1.3&diff_format=u
Index: phpdoc/en/reference/zip/functions/ziparchive-deleteindex.xml
diff -u phpdoc/en/reference/zip/functions/ziparchive-deleteindex.xml:1.2
phpdoc/en/reference/zip/functions/ziparchive-deleteindex.xml:1.3
--- phpdoc/en/reference/zip/functions/ziparchive-deleteindex.xml:1.2 Fri Aug
11 17:59:01 2006
+++ phpdoc/en/reference/zip/functions/ziparchive-deleteindex.xml Sat Aug
12 15:54:51 2006
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.2 $ -->
+<!-- $Revision: 1.3 $ -->
<refentry id="function.ziparchive-deleteindex">
<refnamediv>
<refname>ZipArchive::deleteIndex</refname>
@@ -44,7 +44,7 @@
<![CDATA[
<?php
$zip = new ZipArchive;
-if ($zip->open(realpath('test.zip'))) {
+if ($zip->open('test.zip') === TRUE) {
$zip->deleteIndex(2);
$zip->close();
echo 'ok';
http://cvs.php.net/viewvc.cgi/phpdoc/en/reference/zip/functions/ziparchive-deletename.xml?r1=1.2&r2=1.3&diff_format=u
Index: phpdoc/en/reference/zip/functions/ziparchive-deletename.xml
diff -u phpdoc/en/reference/zip/functions/ziparchive-deletename.xml:1.2
phpdoc/en/reference/zip/functions/ziparchive-deletename.xml:1.3
--- phpdoc/en/reference/zip/functions/ziparchive-deletename.xml:1.2 Fri Aug
11 17:59:01 2006
+++ phpdoc/en/reference/zip/functions/ziparchive-deletename.xml Sat Aug 12
15:54:51 2006
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.2 $ -->
+<!-- $Revision: 1.3 $ -->
<refentry id="function.ziparchive-deletename">
<refnamediv>
<refname>ZipArchive::deleteName</refname>
@@ -44,7 +44,7 @@
<![CDATA[
<?php
$zip = new ZipArchive;
-if ($zip->open(realpath('test1.zip'))) {
+if ($zip->open('test1.zip') === TRUE) {
$zip->deleteName('testfromfile.php');
$zip->close();
echo 'ok';
http://cvs.php.net/viewvc.cgi/phpdoc/en/reference/zip/functions/ziparchive-extractto.xml?r1=1.1&r2=1.2&diff_format=u
Index: phpdoc/en/reference/zip/functions/ziparchive-extractto.xml
diff -u phpdoc/en/reference/zip/functions/ziparchive-extractto.xml:1.1
phpdoc/en/reference/zip/functions/ziparchive-extractto.xml:1.2
--- phpdoc/en/reference/zip/functions/ziparchive-extractto.xml:1.1 Fri Aug
11 17:27:59 2006
+++ phpdoc/en/reference/zip/functions/ziparchive-extractto.xml Sat Aug 12
15:54:51 2006
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.1 $ -->
+<!-- $Revision: 1.2 $ -->
<refentry id="function.ziparchive-extractto">
<refnamediv>
<refname>ZipArchive::extractTo</refname>
@@ -61,7 +61,7 @@
<![CDATA[
<?php
$zip = new ZipArchive;
-if ($zip->open('test.zip')) {
+if ($zip->open('test.zip') === TRUE) {
$zip->extractTo('/my/destination/dir/');
$zip->close();
echo 'ok';
http://cvs.php.net/viewvc.cgi/phpdoc/en/reference/zip/functions/ziparchive-getarchivecomment.xml?r1=1.2&r2=1.3&diff_format=u
Index: phpdoc/en/reference/zip/functions/ziparchive-getarchivecomment.xml
diff -u phpdoc/en/reference/zip/functions/ziparchive-getarchivecomment.xml:1.2
phpdoc/en/reference/zip/functions/ziparchive-getarchivecomment.xml:1.3
--- phpdoc/en/reference/zip/functions/ziparchive-getarchivecomment.xml:1.2
Fri Aug 11 17:59:01 2006
+++ phpdoc/en/reference/zip/functions/ziparchive-getarchivecomment.xml Sat Aug
12 15:54:51 2006
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.2 $ -->
+<!-- $Revision: 1.3 $ -->
<refentry id="function.ziparchive-getarchivecomment">
<refnamediv>
<refname>ZipArchive::getArchiveComment</refname>
@@ -63,4 +63,4 @@
vim600: syn=xml fen fdm=syntax fdl=2 si
vim: et tw=78 syn=sgml
vi: ts=1 sw=1
--->
\ No newline at end of file
+-->
http://cvs.php.net/viewvc.cgi/phpdoc/en/reference/zip/functions/ziparchive-getfromindex.xml?r1=1.1&r2=1.2&diff_format=u
Index: phpdoc/en/reference/zip/functions/ziparchive-getfromindex.xml
diff -u phpdoc/en/reference/zip/functions/ziparchive-getfromindex.xml:1.1
phpdoc/en/reference/zip/functions/ziparchive-getfromindex.xml:1.2
--- phpdoc/en/reference/zip/functions/ziparchive-getfromindex.xml:1.1 Fri Aug
11 17:27:59 2006
+++ phpdoc/en/reference/zip/functions/ziparchive-getfromindex.xml Sat Aug
12 15:54:51 2006
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.1 $ -->
+<!-- $Revision: 1.2 $ -->
<refentry id="function.ziparchive-getfromindex">
<refnamediv>
<refname>ZipArchive::getFromIndex</refname>
@@ -66,7 +66,7 @@
<![CDATA[
<?php
$zip = new ZipArchive;
-if ($zip->open(realpath('test.zip'))) {
+if ($zip->open('test.zip') === TRUE) {
echo $zip->getFromIndex(2);
$zip->close();
} else {
http://cvs.php.net/viewvc.cgi/phpdoc/en/reference/zip/functions/ziparchive-getfromname.xml?r1=1.1&r2=1.2&diff_format=u
Index: phpdoc/en/reference/zip/functions/ziparchive-getfromname.xml
diff -u phpdoc/en/reference/zip/functions/ziparchive-getfromname.xml:1.1
phpdoc/en/reference/zip/functions/ziparchive-getfromname.xml:1.2
--- phpdoc/en/reference/zip/functions/ziparchive-getfromname.xml:1.1 Fri Aug
11 17:27:59 2006
+++ phpdoc/en/reference/zip/functions/ziparchive-getfromname.xml Sat Aug
12 15:54:51 2006
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.1 $ -->
+<!-- $Revision: 1.2 $ -->
<refentry id="function.ziparchive-getfromname">
<refnamediv>
<refname>ZipArchive::getFromName</refname>
@@ -76,7 +76,7 @@
<![CDATA[
<?php
$zip = new ZipArchive;
-if ($zip->open(realpath('test1.zip'))) {
+if ($zip->open('test1.zip') === TRUE) {
echo $zip->getFromName('testfromfile.php');
$zip->close();
} else {
@@ -92,10 +92,11 @@
<![CDATA[
<?php
$z = new ZipArchive();
-$z->open(dirname(__FILE__) . '/test_im.zip');
-$im_string = $z->getFromName("pear_item.gif");
-$im = imagecreatefromstring($im_string);
-imagepng($im, 'b.png');
+if ($z->open(dirname(__FILE__) . '/test_im.zip')) {
+ $im_string = $z->getFromName("pear_item.gif");
+ $im = imagecreatefromstring($im_string);
+ imagepng($im, 'b.png');
+}
?>
]]>
</programlisting>
http://cvs.php.net/viewvc.cgi/phpdoc/en/reference/zip/functions/ziparchive-getstream.xml?r1=1.2&r2=1.3&diff_format=u
Index: phpdoc/en/reference/zip/functions/ziparchive-getstream.xml
diff -u phpdoc/en/reference/zip/functions/ziparchive-getstream.xml:1.2
phpdoc/en/reference/zip/functions/ziparchive-getstream.xml:1.3
--- phpdoc/en/reference/zip/functions/ziparchive-getstream.xml:1.2 Fri Aug
11 17:59:01 2006
+++ phpdoc/en/reference/zip/functions/ziparchive-getstream.xml Sat Aug 12
15:54:51 2006
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.2 $ -->
+<!-- $Revision: 1.3 $ -->
<refentry id="function.ziparchive-getstream">
<refnamediv>
<refname>ZipArchive::getStream</refname>
@@ -46,17 +46,18 @@
<?php
$content = '';
$z = new ZipArchive();
-$z->open(dirname(__FILE__) . '/test.zip');
-$fp = $z->getStream('test');
-if(!$fp) exit("failed\n");
+if ($z->open('test.zip')) {
+ $fp = $z->getStream('test');
+ if(!$fp) exit("failed\n");
-while (!feof($fp)) {
- $contents .= fread($fp, 2);
-}
+ while (!feof($fp)) {
+ $contents .= fread($fp, 2);
+ }
-fclose($fp);
-file_put_contents('t',$contents);
-echo "done.\n";
+ fclose($fp);
+ file_put_contents('t',$contents);
+ echo "done.\n";
+}
?>
]]>
</programlisting>
