cvs: pear /File_Archive Archive.php
| From: | Vincent Lascaux | Date: | Mon, 15 Aug 2005 18:08:57 +0000 |
| Subject: | cvs: pear /File_Archive Archive.php | ||
| Groups: | php.pear.cvs | ||
| Request: | Send a blank email to pear-cvs+get-33989@lists.php.net to get a copy of this message | ||
vincentlascaux Mon Aug 15 14:08:57 2005 EDT
Modified files:
/pear/File_Archive Archive.php
Log:
Bug 4953
http://cvs.php.net/diff.php/pear/File_Archive/Archive.php?r1=1.83&r2=1.84&ty=u
Index: pear/File_Archive/Archive.php
diff -u pear/File_Archive/Archive.php:1.83 pear/File_Archive/Archive.php:1.84
--- pear/File_Archive/Archive.php:1.83 Mon Aug 15 14:03:02 2005
+++ pear/File_Archive/Archive.php Mon Aug 15 14:08:52 2005
@@ -27,7 +27,7 @@
* @author Vincent Lascaux <vincentlascaux@php.net>
* @copyright 1997-2005 The PHP Group
* @license http://www.gnu.org/copyleft/lesser.html LGPL
- * @version CVS: $Id: Archive.php,v 1.83 2005/08/15 18:03:02 vincentlascaux Exp $
+ * @version CVS: $Id: Archive.php,v 1.84 2005/08/15 18:08:52 vincentlascaux Exp $
* @link http://pear.php.net/package/File_Archive
*/
@@ -377,8 +377,6 @@
} else {
require_once "File/Archive/Reader/File.php";
-// $parsedURL = parse_url($std);
-// $realPath = isset($parsedURL['path']) ? $parsedURL['path'] :
'';
$realPath = $std;
// Try to find a file with a known extension in the path (
@@ -405,35 +403,6 @@
(!File_Archive::isKnownExtension($extension) ||
(is_dir($file) && $source==null)));
- //Build the URL back, with the new path to a file with an archive extension
- // or to a file / directory is is_file / is_dir cant be used (HTTP, or $source !==
null)
-/* $parsedURL['path'] = $file;
- $file = '';
-
- //Rebuild the real URL with the smaller path
- if (isset($parsedURL['scheme'])) {
- $file .= $parsedURL['scheme'].'://';
- }
- if (isset($parsedURL['user'])) {
- $file .= $parsedURL['user'];
- if (isset($parsedURL['pass'])) {
- $file .= ':'.$parsedURL['pass'];
- }
- $file .= '@';
- }
- if (isset($parsedURL['host'])) {
- $file .= $parsedURL['host'];
- }
- if (isset($parsedURL['port'])) {
- $file .= ':'.$parsedURL['port'];
- }
- $file .= $parsedURL['path'];
- if (isset($parsedURL['query'])) {
- $file .= '?'.$parsedURL['query'];
- }
- if (isset($parsedURL['fragment'])) {
- $file .= '#'.$parsedURL['fragment'];
- } */
$reachable = $file;
//If we are reading from the file system