diff --git a/lib/foldermanagement/compressionArchiveUtil.inc.php b/lib/foldermanagement/compressionArchiveUtil.inc.php index fcec614..3a93872 100644 --- a/lib/foldermanagement/compressionArchiveUtil.inc.php +++ b/lib/foldermanagement/compressionArchiveUtil.inc.php @@ -208,13 +208,13 @@ class ZipFolder { return PEAR::raiseError(_kt("No folders or documents found to compress")); } - $sZipFile = sprintf("%s/%s.".$this->extension, $this->sTmpPath, $this->sZipFileName); + /*$sZipFile = sprintf("%s/%s.".$this->extension, $this->sTmpPath, $this->sZipFileName); $sZipFile = str_replace('<', '', str_replace('', '', $sZipFile))); $archive = new KTPclZip($sZipFile); - $archive->createZipFile($this->sTmpPath.'/Root Folder'); + $archive->createZipFile($this->sTmpPath.'/Root Folder');*/ - /* + $config = KTConfig::getSingleton(); $useBinary = true; //$config->get('export/useBinary', false); @@ -267,7 +267,7 @@ class ZipFolder { File_Archive::toArchive($this->sZipFileName.'.'.$this->extension, File_Archive::toFiles($this->sTmpPath), $this->extension) ); } - */ + // Save the zip file and path into session $_SESSION['zipcompression'] = KTUtil::arrayGet($_SESSION, 'zipcompression', array()); @@ -354,9 +354,9 @@ class ZipFolder { } function _convertEncoding($sMystring, $bEncode) { - if (strcasecmp($this->sOutputEncoding, "UTF-8") === 0) { + /*if (strcasecmp($this->sOutputEncoding, "UTF-8") === 0) { return $sMystring; - } + }*/ if ($bEncode) { return iconv("UTF-8", $this->sOutputEncoding, $sMystring); } else { diff --git a/lib/import/bulkimport.inc.php b/lib/import/bulkimport.inc.php index e73fc59..6578a14 100644 --- a/lib/import/bulkimport.inc.php +++ b/lib/import/bulkimport.inc.php @@ -199,4 +199,4 @@ class KTBulkImportManager { } } -?> \ No newline at end of file +?> diff --git a/lib/import/zipimportstorage.inc.php b/lib/import/zipimportstorage.inc.php index 96ff25a..d02f876 100644 --- a/lib/import/zipimportstorage.inc.php +++ b/lib/import/zipimportstorage.inc.php @@ -137,10 +137,10 @@ class KTZipImportStorage extends KTFSImportStorage { // todo: replace file archive for tar, etc if($this->sExtension == 'zip'){ - $archive = new KTPclZip($this->sZipPath); - $archive->extractZipFile($sTmpPath); + /*$archive = new KTPclZip($this->sZipPath); + $archive->extractZipFile($sTmpPath);*/ - /* ** Original zip functionality using the unzip binary ** * + /* ** Original zip functionality using the unzip binary ** */ $sUnzipCommand = KTUtil::findCommand("import/unzip", "unzip"); if (empty($sUnzipCommand)) { return PEAR::raiseError(_kt("unzip command not found on system"));