Merged in from DEV trunk...

KTS-2912 "Document Indexing Diagnostics shows that there is a problem indixing a PDF file" Fixed. Commited By: Conrad Vermeulen Reviewed By: Jonathan Byrne KTS-2892 "Search for user by username returns all users and filter is ignored." Fixed. The sql function to get the list of users was overwriting the filter. Committed by: Megan Watson Reviewed by: Conrad Vermeulen KTS-2873 "Double quote (") is not accepted as valid input for metadata when the name of a Lookup field or a Tree field has a Double quote in." Fixed. Sanitised the values. Committed by: Megan Watson Reviewed by: Conrad Vermeulen KTC-331 "Bulk upload throws an exception shown on attached screenshot" Fixed. The upload is successful regardless of the exception, put @ in front of the chgrp() to suppress the error message. Committed by: Megan Watson Reviewed by: Conrad Vermeulen git-svn-id: https://kt-dms.svn.sourceforge.net/svnroot/kt-dms/STABLE/trunk@8031 c91229c3-7414-0410-bfa2-8a42b809f60b

Merged in from DEV trunk...
KTS-2912 "Document Indexing Diagnostics shows that there is a problem indixing a PDF file" Fixed. Commited By: Conrad Vermeulen Reviewed By: Jonathan Byrne KTS-2892 "Search for user by username returns all users and filter is ignored." Fixed. The sql function to get the list of users was overwriting the filter. Committed by: Megan Watson Reviewed by: Conrad Vermeulen KTS-2873 "Double quote (") is not accepted as valid input for metadata when the name of a Lookup field or a Tree field has a Double quote in." Fixed. Sanitised the values. Committed by: Megan Watson Reviewed by: Conrad Vermeulen KTC-331 "Bulk upload throws an exception shown on attached screenshot" Fixed. The upload is successful regardless of the exception, put @ in front of the chgrp() to suppress the error message. Committed by: Megan Watson Reviewed by: Conrad Vermeulen git-svn-id: https://kt-dms.svn.sourceforge.net/svnroot/kt-dms/STABLE/trunk@8031 c91229c3-7414-0410-bfa2-8a42b809f60b
kevin_fourie
1 parent d88cd616
Showing 9 changed files with 305 additions and 295 deletions
lib/documentmanagement/MDTree.inc
lib/users/User.inc
search2/indexing/extractorCore.inc.php
search2/indexing/extractors/OpenXmlTextExtractor.inc.php
search2/indexing/extractors/PDFExtractor.inc.php
search2/indexing/extractors/PSExtractor.inc.php
templates/kt3/fields/lookup.smarty
templates/ktcore/forms/widgets/selection.smarty
thirdparty/pear/File/Archive/Writer/Files.php
@@ -5,32 +5,32 @@
  * KnowledgeTree Open Source Edition
  * Document Management Made Simple
  * Copyright (C) 2004 - 2008 The Jam Warehouse Software (Pty) Limited
- * 
+ *
  * This program is free software; you can redistribute it and/or modify it under
  * the terms of the GNU General Public License version 3 as published by the
  * Free Software Foundation.
- * 
+ *
  * This program is distributed in the hope that it will be useful, but WITHOUT
  * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
  * FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
  * details.
- * 
+ *
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- * 
+ *
  * You can contact The Jam Warehouse Software (Pty) Limited, Unit 1, Tramber Place,
  * Blake Street, Observatory, 7925 South Africa. or email info@knowledgetree.com.
- * 
+ *
  * The interactive user interfaces in modified source and object code versions
  * of this program must display Appropriate Legal Notices, as required under
  * Section 5 of the GNU General Public License version 3.
- * 
+ *
  * In accordance with Section 7(b) of the GNU General Public License version 3,
  * these Appropriate Legal Notices must retain the display of the "Powered by
- * KnowledgeTree" logo and retain the original copyright notice. If the display of the 
+ * KnowledgeTree" logo and retain the original copyright notice. If the display of the
  * logo is not reasonably feasible for technical reasons, the Appropriate Legal Notices
- * must display the words "Powered by KnowledgeTree" and retain the original 
- * copyright notice. 
+ * must display the words "Powered by KnowledgeTree" and retain the original
+ * copyright notice.
  * Contributor( s): ______________________________________
  *
  */
@@ -44,7 +44,7 @@ require_once(KT_LIB_DIR . &quot;/util/sanitize.inc&quot;);
 class MDTreeNode extends KTEntity {
     /** boilerplate DB code. */
     /** primary key */
-    var $iId = -1; 
+    var $iId = -1;
     var $iFieldId;
     var $sName;
     var $iParentNode;
@@ -81,7 +81,7 @@ class MDTreeNode extends KTEntity {
 }
-/* simple class to encapsulate tree-as-a-whole behaviour. 
+/* simple class to encapsulate tree-as-a-whole behaviour.
     NBM - should this move, be refactored?  It certainly doesn't belong in the DB,
             since its just an aggregate utility.
 */
@@ -100,11 +100,11 @@ class MDTree {
         $this->contents = null;
         $this->mapnodes = null;
         $this->root = null;
-        $this->lookups = null;  
+        $this->lookups = null;
         $this->field_id = null;
     }
-    /* function buildForField 
+    /* function buildForField
      *
      * build a tree for a particular field instance.
      * sets contents, so we can edit "stuff".
@@ -112,7 +112,7 @@ class MDTree {
     function buildForField($iFieldId)
      {
         global $default;
-        // before we start, we need to check that 
+        // before we start, we need to check that
         // the specified field exists and is organised into a tree.
         $organisedField =& DocumentField::get($iFieldId);
         if (PEAR::isError($organisedField) || ($organisedField === false)) {
@@ -182,8 +182,8 @@ class MDTree {
             }
             $leafArray = null;
-            if (!array_key_exists("leaves", $target_set)) { 
-                $target_set["leaves"] = array($lookup_value->getId()); 
+            if (!array_key_exists("leaves", $target_set)) {
+                $target_set["leaves"] = array($lookup_value->getId());
             }
             else
             {
@@ -193,14 +193,14 @@ class MDTree {
             $this->lookups[$lookup_value->getId()] = $lookup_value;
-        }      
+        }
         $this->root =& $this->contents[0];
         $default->log->debug("MDTree::buildForField done: " . print_r($this, true));
-        
+
     }
     // handle deleting subtrees
-    function deleteNode($iNode) { 
+    function deleteNode($iNode) {
         $stack = array();
         array_push($stack, $iNode);
         while (count($stack) != 0)
@@ -215,7 +215,7 @@ class MDTree {
                         $this->lookups[$leaf]->setTreeParent(0);
                         $this->lookups[$leaf]->update();
                         $this->contents[0]["leaves"][] = $leaf;
-                    }   
+                    }
                 }
                 else array_push($stack, $value);
             }
@@ -225,7 +225,7 @@ class MDTree {
         $iParent = $this->mapnodes[$iNode]->getParentNode();
         foreach ($this->contents[$iParent] as $index => $val)
             if ($iNode === $val) unset($this->contents[$iParent][$index]);
-    }     
+    }
     // add a node to the mapping after the fact (e.g. created later in the process.)
     function addNode($oNode) {
@@ -244,7 +244,7 @@ class MDTree {
         $oNewParent = $this->mapnodes[$destination_parent_id];
         // we will have failed by here if its bogus.
         //$default->log->debug('MDTree::reparentKeyword '.print_r($oNewParent, true));
-        
+
         // if its 0 or NULL, we reparent to null.
         if (($oNewParent === null) or ($desintation_parent_id === 0)) {
             $new_home = 0;
@@ -256,19 +256,19 @@ class MDTree {
         if (!empty($this->contents[$oldparent])) {
              $KWIndex = array_search($lookup_id, $this->contents[$oldParent]["leaves"]);
              unset($this->contents[$oldParent]["leaves"][$KWIndex]);
-            
+
         }
         $this->contents[$new_home]["leaves"][] = $oKeyword->getId();
         $oKeyword->update();
-    }   
-    
+    }
+
     // STUB FUNCTIONS:  need to be filled in.
-    
+
     // REALLY need to deprecate this, but how?
     function render($bEditable) { return null; }     // render using a template (with edit / buttons.) FIXME build a widget / renderer.
-    
+
     /* ----------------------- EVIL HACK --------------------------
      *
@@ -307,7 +307,7 @@ class MDTree {
         }
         $treeStr .= '</ul>';
         return $treeStr;
-        
+
     }
     // I can't seem to do recursion in smarty, and recursive templates seems a bad solution.
@@ -348,7 +348,8 @@ class MDTree {
                     if ($leaf === $this->activevalue) {
                        $is_selected=' checked="checked"';
                     }
-                    $treeStr .= '<li class="leafnode"><input type="radio" name="'.$inputname.'" value="'.$treeToRender->lookups[$leaf]->getName().'" '.$is_selected.'>' . $treeToRender->lookups[$leaf]->getName() .'</input>';
+                    $sValue = htmlentities($treeToRender->lookups[$leaf]->getName());
+                    $treeStr .= '<li class="leafnode"><input type="radio" name="'.$inputname.'" value="'.$sValue.'" '.$is_selected.'>' . $sValue .'</input>';
                     $treeStr .=  '</li>';
                 }
             }
@@ -357,9 +358,9 @@ class MDTree {
         //$treeStr .= '</li></ul>';
         return $treeStr;
-    
+
     }
-    
+
     // again, not pretty.  set a particular item as "active"
     function setActiveItem($sMetadataMatch) {
         // also need to:
@@ -323,10 +323,19 @@ class User extends KTEntity {
     * @return Array array of User objects, false otherwise and set $_SESSION["errorMessage"]
     */
     function getList($sWhereClause = null, $aOptions = null) {
-	    if(!is_array($aOptions)) $aOptions = array($aOptions);
-		$aOptions['orderby'] = KTUtil::arrayGet($aOptions, 'orderby', 'name');
-		//if disabled = 2 then the user is deleted
-		$sWhereClause = 'disabled != \'2\'';
+        if(!is_array($aOptions)) $aOptions = array($aOptions);
+        $aOptions['orderby'] = KTUtil::arrayGet($aOptions, 'orderby', 'name');
+
+        // don't include deleted users: disabled = 2
+        if(!empty($sWhereClause)){
+            if(strpos(strtolower($sWhereClause), 'where ') === false){
+                $sWhereClause = '('.$sWhereClause.')';
+            }
+            $sWhereClause .= ' AND disabled != 2';
+        }else{
+            $sWhereClause = 'disabled != 2';
+        }
+
         return KTEntityUtil::getList2('User', $sWhereClause, $aOptions);
     }
@@ -370,7 +370,7 @@ abstract class ExternalDocumentExtractor extends DocumentExtractor
 			$script_name = $script_prefix . '.bat';
 			$script = "rem This is an auto generated file. \n";
-			$script .= $cmd . ' 2> ' . $script_out . "\r\n";
+			$script .= $cmd . ' 2> "' . $script_out . "\"\r\n";
 		}
 		else
 		{
@@ -378,7 +378,7 @@ abstract class ExternalDocumentExtractor extends DocumentExtractor
 			$script = "#!/bin/sh\n";
 			$script .= "# This is an auto generated file. \n";
-			$script .= $cmd . ' 2> ' . $script_out . "\n";
+			$script .= $cmd . ' 2> "' . $script_out . "\"\n";
 			$script .= "exit $?\n";
 		}
@@ -43,7 +43,7 @@ class OpenXmlTextExtractor extends ExternalDocumentExtractor
 		$config = KTConfig::getSingleton();
 		$this->unzip = KTUtil::findCommand("import/unzip", 'unzip');
-		$this->unzip_params = $config->get('extractorParameters/unzip', '\'{source}\' \'{part}\' -d \'{target_dir}\'');
+		$this->unzip_params = $config->get('extractorParameters/unzip', '"{source}" "{part}" -d "{target_dir}"');
 		parent::__construct();
 	}
@@ -41,7 +41,7 @@ class PDFExtractor extends ApplicationExtractor
 	public function __construct()
 	{
 		$config = KTConfig::getSingleton();
-		$params = $config->get('extractorParameters/pdftotext', '-nopgbrk -enc UTF-8 \'{source}\' \'{target}\'');
+		$params = $config->get('extractorParameters/pdftotext', '-nopgbrk -enc UTF-8 "{source}" "{target}"');
 		parent::__construct('externalBinary','pdftotext','pdftotext',_kt('PDF Text Extractor'),$params);
 	}
@@ -41,7 +41,7 @@ class PSExtractor extends ApplicationExtractor
 	public function __construct()
 	{
 		$config = KTConfig::getSingleton();
-		$params = $config->get('extractorParameters/pstotext', '\'{source}\' > \'{target}\'');
+		$params = $config->get('extractorParameters/pstotext', '"{source}" > "{target}"');
 		parent::__construct('externalBinary','pstotext','pstotext',_kt('PostScript Text Extractor'), $params);
 	}
@@ -13,7 +13,7 @@
       <select name="{$name}" {if $has_id}id="{$id}"{/if} {if $options.multi}multiple="true"{/if} {if $options.size}size="{$options.size}"{/if}>
       {foreach item=lookup key=lookup_key from=$options.vocab}
-           <option value="{$lookup_key}" {if ($value == $lookup_key)}selected="selected"{/if}>{$lookup|sanitize}</option>
+           <option value="{$lookup_key|sanitize}" {if ($value == $lookup_key)}selected="selected"{/if}>{$lookup|sanitize}</option>
       {/foreach}
       </select>
       <input type="hidden" name="kt_core_fieldsets_expect[{$name}]" value ="1" />
 {if empty($vocab)}
     <div class="ktInfoMessage"><span>{$context->sEmptyMessage}</span></div>
 {else}
-  <select name="{$name}" 
-    {if $has_id}id="{$id}"{/if} 
-    {if $options.multi}multiple="true"{/if} 
+  <select name="{$name}"
+    {if $has_id}id="{$id}"{/if}
+    {if $options.multi}multiple="true"{/if}
     >
     {if $options.initial_string}
     <option value="">{$options.initial_string}</option>
-    {/if}    
+    {/if}
   {foreach item=lookup key=lookup_key from=$vocab}
-       <option value="{$lookup_key}" {if ($value == $lookup_key)}selected="selected"{/if}>{$lookup}</option>
+       <option value="{$lookup_key|sanitize}" {if ($value == $lookup_key)}selected="selected"{/if}>{$lookup|sanitize}</option>
   {/foreach}
   </select>
 {/if}
-<?php
-/* vim: set expandtab tabstop=4 shiftwidth=4 softtabstop=4: */
-
-/**
- * Writer to files
- *
- * PHP versions 4 and 5
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330,Boston,MA 02111-1307 USA
- *
- * @category   File Formats
- * @package    File_Archive
- * @author     Vincent Lascaux <vincentlascaux@php.net>
- * @copyright  1997-2005 The PHP Group
- * @license    http://www.gnu.org/copyleft/lesser.html  LGPL
- * @version    CVS: $Id: Files.php,v 1.21 2005/06/18 23:08:16 vincentlascaux Exp $
- * @link       http://pear.php.net/package/File_Archive
- */
-
-require_once "File/Archive/Writer.php";
-
-/**
-  * Writer to files
-  */
-class File_Archive_Writer_Files extends File_Archive_Writer
-{
-    /**
-     * @var Object Handle to the file where the data are currently written
-     * @access private
-     */
-    var $handle = null;
-    var $basePath;
-    var $stat = array();
-    var $filename;
-
-    function File_Archive_Writer_Files($base = '')
-    {
-        if ($base === null || $base == '') {
-            $this->basePath = '';
-        } else {
-            if (substr($base, -1) == '/') {
-                $this->basePath = $base;
-            } else {
-                $this->basePath = $base.'/';
-            }
-        }
-    }
-
-    function getFilename($filename)
-    {
-        return $this->basePath.$filename;
-    }
-
-    /**
-     * Ensure that $pathname exists, or create it if it does not
-     * @access private
-     */
-    function mkdirr($pathname)
-    {
-        // Check if directory already exists
-        if (is_dir($pathname) || empty($pathname)) {
-            return;
-        }
-
-        // Ensure a file does not already exist with the same name
-        if (is_file($pathname)) {
-            return PEAR::raiseError(
-                "File $pathname exists, unable to create directory"
-            );
-        }
-
-        // Crawl up the directory tree
-        $next_pathname = substr(
-                    $pathname,
-                    0, strrpos($pathname, "/"));
-        $error = $this->mkdirr($next_pathname);
-        if (PEAR::isError($error)) {
-            return $error;
-        }
-        if (!@mkdir($pathname)) {
-            return PEAR::raiseError("Unable to create directory $pathname");
-        }
-    }
-
-    /**
-     * Open a file for writing from a given position
-     *
-     * @param string $filename The name of the file to open
-     * @param int $pos the initial position in the file
-     * @param $stat the stats of the file
-     */
-    function openFile($filename, $pos = 0)
-    {
-        $this->close();
-
-        $this->handle = fopen($filename, 'r+');
-        $this->stat = array();
-        $this->filename = $filename;
-
-        if (!is_resource($this->handle)) {
-            return PEAR::raiseError("Unable to open file $filename");
-        }
-
-        if ($pos > 0) {
-            if (fseek($this->handle, $pos) == -1) {
-                fread($this->handle, $pos);
-            }
-        }
-    }
-
-    /**
-     * Open a file for appending after having removed a block of data from it
-     * See File_Archive_Reader::makeWriterRemoveBlocks
-     */
-    function openFileRemoveBlock($filename, $pos, $blocks)
-    {
-        $error = $this->openFile($filename, $pos);
-        if (PEAR::isError($error)) {
-            return $error;
-        }
-
-        if (!empty($blocks)) {
-            //This will be used to read the initial file
-            //The data, with the unusefull block removed will be written to $this->handle
-            $read = fopen($filename, 'r');
-            if ($pos > 0) {
-                if (fseek($this->handle, $pos) == -1) {
-                    fread($this->handle, $pos);
-                }
-            }
-
-            $keep = false;
-            $data = '';
-            foreach ($blocks as $length) {
-                if ($keep) {
-                    while ($length > 0 &&
-                           ($data = fread($read, min($length, 8192))) != '') {
-                        $length -= strlen($data);
-                        fwrite($this->handle, $data);
-                    }
-                } else {
-                    fseek($read, $length, SEEK_CUR);
-                }
-                $keep = !$keep;
-            }
-            if ($keep) {
-                while(!feof($this->handle)) {
-                    fwrite($this->handle, fread($read, 8196));
-                }
-            }
-
-            fclose($read);
-        }
-
-        ftruncate($this->handle, ftell($this->handle));
-    }
-
-
-    /**
-     * @see File_Archive_Writer::newFile()
-     */
-    function newFile($filename, $stat = array(), $mime = "application/octet-stream")
-    {
-        $this->close();
-        $this->stat = $stat;
-        $this->filename = $this->getFilename($filename);
-
-        $pos = strrpos($this->filename, "/");
-        if ($pos !== false) {
-            $error = $this->mkdirr(substr($this->filename, 0, $pos));
-            if (PEAR::isError($error)) {
-                return $error;
-            }
-        }
-        $this->handle = @fopen($this->filename, "w");
-        if (!is_resource($this->handle)) {
-            return PEAR::raiseError("Unable to write to file $filename");
-        }
-    }
-    /**
-     * @see File_Archive_Writer::writeData()
-     */
-    function writeData($data) { fwrite($this->handle, $data); }
-    /**
-     * @see File_Archive_Writer::newFromTempFile()
-     */
-    function newFromTempFile($tmpfile, $filename, $stat = array(), $mime = "application/octet-stream")
-    {
-        $this->filename = filename;
-        $complete = $this->getFilename($filename);
-        $pos = strrpos($complete, "/");
-        if ($pos !== false) {
-            $error = $this->mkdirr(substr($complete, 0, $pos));
-            if (PEAR::isError($error)) {
-                return $error;
-            }
-        }
-
-        if ((file_exists($complete) && !@unlink($complete)) ||
-            !@rename($tmpfile, $complete)) {
-            return parent::newFromTempFile($tmpfile, $filename, $stat, $mime);
-        }
-    }
-
-
-    /**
-     * @see File_Archive_Writer::close()
-     */
-    function close()
-    {
-        if ($this->handle !== null) {
-            fclose($this->handle);
-            $this->handle = null;
-
-            if (isset($this->stat[9])) {
-                if (isset($this->stat[8])) {
-                    touch($this->filename, $this->stat[9], $this->stat[8]);
-                } else {
-                    touch($this->filename, $this->stat[9]);
-                }
-            } else if (isset($this->stat[8])) {
-                touch($this->filename, time(), $this->stat[8]);
-            }
-
-            if (isset($this->stat[2])) {
-                chmod($this->filename, $this->stat[2]);
-            }
-            if (isset($this->stat[5])) {
-                chgrp($this->filename, $this->stat[5]);
-            }
-            if (isset($this->stat[4])) {
-                chown($this->filename, $this->stat[4]);
-            }
-        }
-    }
-}
-
+<?php
+/* vim: set expandtab tabstop=4 shiftwidth=4 softtabstop=4: */
+
+/**
+ * Writer to files
+ *
+ * PHP versions 4 and 5
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330,Boston,MA 02111-1307 USA
+ *
+ * @category   File Formats
+ * @package    File_Archive
+ * @author     Vincent Lascaux <vincentlascaux@php.net>
+ * @copyright  1997-2005 The PHP Group
+ * @license    http://www.gnu.org/copyleft/lesser.html  LGPL
+ * @version    CVS: $Id: Files.php,v 1.21 2005/06/18 23:08:16 vincentlascaux Exp $
+ * @link       http://pear.php.net/package/File_Archive
+ */
+
+require_once "File/Archive/Writer.php";
+
+/**
+  * Writer to files
+  */
+class File_Archive_Writer_Files extends File_Archive_Writer
+{
+    /**
+     * @var Object Handle to the file where the data are currently written
+     * @access private
+     */
+    var $handle = null;
+    var $basePath;
+    var $stat = array();
+    var $filename;
+
+    function File_Archive_Writer_Files($base = '')
+    {
+        if ($base === null || $base == '') {
+            $this->basePath = '';
+        } else {
+            if (substr($base, -1) == '/') {
+                $this->basePath = $base;
+            } else {
+                $this->basePath = $base.'/';
+            }
+        }
+    }
+
+    function getFilename($filename)
+    {
+        return $this->basePath.$filename;
+    }
+
+    /**
+     * Ensure that $pathname exists, or create it if it does not
+     * @access private
+     */
+    function mkdirr($pathname)
+    {
+        // Check if directory already exists
+        if (is_dir($pathname) || empty($pathname)) {
+            return;
+        }
+
+        // Ensure a file does not already exist with the same name
+        if (is_file($pathname)) {
+            return PEAR::raiseError(
+                "File $pathname exists, unable to create directory"
+            );
+        }
+
+        // Crawl up the directory tree
+        $next_pathname = substr(
+                    $pathname,
+                    0, strrpos($pathname, "/"));
+        $error = $this->mkdirr($next_pathname);
+        if (PEAR::isError($error)) {
+            return $error;
+        }
+        if (!@mkdir($pathname)) {
+            return PEAR::raiseError("Unable to create directory $pathname");
+        }
+    }
+
+    /**
+     * Open a file for writing from a given position
+     *
+     * @param string $filename The name of the file to open
+     * @param int $pos the initial position in the file
+     * @param $stat the stats of the file
+     */
+    function openFile($filename, $pos = 0)
+    {
+        $this->close();
+
+        $this->handle = fopen($filename, 'r+');
+        $this->stat = array();
+        $this->filename = $filename;
+
+        if (!is_resource($this->handle)) {
+            return PEAR::raiseError("Unable to open file $filename");
+        }
+
+        if ($pos > 0) {
+            if (fseek($this->handle, $pos) == -1) {
+                fread($this->handle, $pos);
+            }
+        }
+    }
+
+    /**
+     * Open a file for appending after having removed a block of data from it
+     * See File_Archive_Reader::makeWriterRemoveBlocks
+     */
+    function openFileRemoveBlock($filename, $pos, $blocks)
+    {
+        $error = $this->openFile($filename, $pos);
+        if (PEAR::isError($error)) {
+            return $error;
+        }
+
+        if (!empty($blocks)) {
+            //This will be used to read the initial file
+            //The data, with the unusefull block removed will be written to $this->handle
+            $read = fopen($filename, 'r');
+            if ($pos > 0) {
+                if (fseek($this->handle, $pos) == -1) {
+                    fread($this->handle, $pos);
+                }
+            }
+
+            $keep = false;
+            $data = '';
+            foreach ($blocks as $length) {
+                if ($keep) {
+                    while ($length > 0 &&
+                           ($data = fread($read, min($length, 8192))) != '') {
+                        $length -= strlen($data);
+                        fwrite($this->handle, $data);
+                    }
+                } else {
+                    fseek($read, $length, SEEK_CUR);
+                }
+                $keep = !$keep;
+            }
+            if ($keep) {
+                while(!feof($this->handle)) {
+                    fwrite($this->handle, fread($read, 8196));
+                }
+            }
+
+            fclose($read);
+        }
+
+        ftruncate($this->handle, ftell($this->handle));
+    }
+
+
+    /**
+     * @see File_Archive_Writer::newFile()
+     */
+    function newFile($filename, $stat = array(), $mime = "application/octet-stream")
+    {
+        $this->close();
+        $this->stat = $stat;
+        $this->filename = $this->getFilename($filename);
+
+        $pos = strrpos($this->filename, "/");
+        if ($pos !== false) {
+            $error = $this->mkdirr(substr($this->filename, 0, $pos));
+            if (PEAR::isError($error)) {
+                return $error;
+            }
+        }
+        $this->handle = @fopen($this->filename, "w");
+        if (!is_resource($this->handle)) {
+            return PEAR::raiseError("Unable to write to file $filename");
+        }
+    }
+    /**
+     * @see File_Archive_Writer::writeData()
+     */
+    function writeData($data) { fwrite($this->handle, $data); }
+    /**
+     * @see File_Archive_Writer::newFromTempFile()
+     */
+    function newFromTempFile($tmpfile, $filename, $stat = array(), $mime = "application/octet-stream")
+    {
+        $this->filename = filename;
+        $complete = $this->getFilename($filename);
+        $pos = strrpos($complete, "/");
+        if ($pos !== false) {
+            $error = $this->mkdirr(substr($complete, 0, $pos));
+            if (PEAR::isError($error)) {
+                return $error;
+            }
+        }
+
+        if ((file_exists($complete) && !@unlink($complete)) ||
+            !@rename($tmpfile, $complete)) {
+            return parent::newFromTempFile($tmpfile, $filename, $stat, $mime);
+        }
+    }
+
+
+    /**
+     * @see File_Archive_Writer::close()
+     */
+    function close()
+    {
+        if ($this->handle !== null) {
+            fclose($this->handle);
+            $this->handle = null;
+
+            if (isset($this->stat[9])) {
+                if (isset($this->stat[8])) {
+                    touch($this->filename, $this->stat[9], $this->stat[8]);
+                } else {
+                    touch($this->filename, $this->stat[9]);
+                }
+            } else if (isset($this->stat[8])) {
+                touch($this->filename, time(), $this->stat[8]);
+            }
+
+            if (isset($this->stat[2])) {
+                @chmod($this->filename, $this->stat[2]);
+            }
+            if (isset($this->stat[5])) {
+                @chgrp($this->filename, $this->stat[5]);
+            }
+            if (isset($this->stat[4])) {
+                @chown($this->filename, $this->stat[4]);
+            }
+        }
+    }
+}
+
 ?>
 \ No newline at end of file