From 63235f31e03cfdf3c399a74697087122a6fcff2b Mon Sep 17 00:00:00 2001
From: david <darranz@rodax-software.com>
Date: Fri, 10 Sep 2010 17:22:23 +0000
Subject: [PATCH] =?UTF-8?q?Arreglado=20problemas=20con=20los=20acentos=20a?=
 =?UTF-8?q?l=20cargar/descargar=20informaci=C3=B3n=20en=20un=20fichero=20Z?=
 =?UTF-8?q?IP.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

git-svn-id: https://192.168.0.254/svn/Proyectos.Incam_SGD/trunk@5 eb19766c-00d9-a042-a3a0-45cb8ec72764
---
 lib/foldermanagement/compressionArchiveUtil.inc.php | 12 ++++++------
 lib/import/bulkimport.inc.php                       |  2 +-
 lib/import/zipimportstorage.inc.php                 |  6 +++---
 3 files changed, 10 insertions(+), 10 deletions(-)

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('</', '', 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"));