KTS-2768

"DMS crashes when clicking 'Bulk Download' on a folder view folders in view" Fixed. Changed the name of the zip file. Committed By: Megan Watson Reviewed By: Jonathan Byrne git-svn-id: https://kt-dms.svn.sourceforge.net/svnroot/kt-dms/trunk@8219 c91229c3-7414-0410-bfa2-8a42b809f60b

KTS-2768
"DMS crashes when clicking 'Bulk Download' on a folder view folders in view" Fixed. Changed the name of the zip file. Committed By: Megan Watson Reviewed By: Jonathan Byrne git-svn-id: https://kt-dms.svn.sourceforge.net/svnroot/kt-dms/trunk@8219 c91229c3-7414-0410-bfa2-8a42b809f60b
Megan Watson
1 parent b2eafbf5
Showing 2 changed files with 15 additions and 5 deletions
lib/foldermanagement/compressionArchiveUtil.inc.php
plugins/ktstandard/KTBulkExportPlugin.php
@@ -58,19 +58,23 @@ class ZipFolder {
         $this->oStorage =& KTStorageManagerUtil::getSingleton();
         $this->sOutputEncoding = $this->oKTConfig->get('export/encoding', 'UTF-8');
+        
+        $this->sPattern = "[\*|\%|\\\|\/|\<|\>|\+|\:|\?|\||\'|\"]";
+        $this->sFolderPattern = "[\*|\%|\<|\>|\+|\:|\?|\||\'|\"]";
         $sBasedir = $this->oKTConfig->get("urls/tmpDirectory");
         $sTmpPath = tempnam($sBasedir, 'kt_compress_zip');
         unlink($sTmpPath);
         mkdir($sTmpPath, 0700);
+        
+        // Hard coding the zip file name - else it doesn't download properly
+        $sZipFileName = 'kt_zip';
         $this->sTmpPath = $sTmpPath;
         $this->sZipFileName = $sZipFileName;
         $this->aPaths = array();
-        $this->sPattern = "[\*|\%|\\\|\/|\<|\>|\+|\:|\?|\||\'|\"]";
-        $this->sFolderPattern = "[\*|\%|\<|\>|\+|\:|\?|\||\'|\"]";
         $aReplace = array(
             "[" => "[[]",
@@ -178,6 +182,8 @@ class ZipFolder {
         putenv("LANG=$loc");
         putenv("LANGUAGE=$loc");
         $loc = setlocale(LC_ALL, $loc);
+        
+        
         $sManifest = sprintf("%s/%s", $this->sTmpPath, "MANIFEST");
         file_put_contents($sManifest, join("\n", $this->aPaths));
@@ -187,6 +193,7 @@ class ZipFolder {
         $aCmd = array($sZipCommand, "-r", $sZipFile, ".", "-i@MANIFEST");
         $sOldPath = getcwd();
         chdir($this->sTmpPath);
+        
         // Note that the popen means that pexec will return a file descriptor
         $aOptions = array('popen' => 'r');
         $fh = KTUtil::pexec($aCmd, $aOptions);
@@ -218,7 +225,7 @@ class ZipFolder {
             'dir' => $this->oZip->sTmpPath,
         );
         $_SESSION['zipcompression']['exportcode'] = $sExportCode;
-
+        
         $this->sZipFile = $sZipFile;
         return $sExportCode;
     }
@@ -244,7 +251,7 @@ class ZipFolder {
         if (!file_exists($sZipFile)) {
             return PEAR::raiseError(_kt('The ZIP file can only be downloaded once - if you cancel the download, you will need to reload the page.'));
         }
-
+        
         header("Content-Type: application/zip; charset=utf-8");
         header("Content-Length: ". filesize($sZipFile));
         header("Content-Disposition: attachment; filename=\"" . $this->sZipFileName . ".zip" . "\"");
@@ -223,7 +223,10 @@ class KTBulkExportAction extends KTFolderAction {
         $folderName = $this->oFolder->getName();
         $this->oZip = new ZipFolder($folderName);
-        if(!$this->oZip->downloadZipFile($sCode)){
+        $res = $this->oZip->downloadZipFile($sCode);
+        
+        if(PEAR::isError($res)){
+        	$this->addErrorMessage($res->getMessage());
             redirect(generateControllerUrl("browse", "fBrowseType=folder&fFolderId=" . $this->oFolder->getId()));
         }
         exit(0);