[Tikiwiki-cvs/svn] SF.net SVN: tikiwiki:[27643] trunk

[<sy...@us...>]

Revision: 27643
          http://tikiwiki.svn.sourceforge.net/tikiwiki/?rev=27643&view=rev
Author:   sylvieg
Date:     2010-06-15 19:54:35 +0000 (Tue, 15 Jun 2010)

Log Message:
-----------
[FIX]tracker export: the function addEmptyDir does not exist on Debian Etch

Modified Paths:
--------------
    trunk/lib/trackers/trackerlib.php
    trunk/tiki-export_tracker.php

Modified: trunk/lib/trackers/trackerlib.php
===================================================================
--- trunk/lib/trackers/trackerlib.php	2010-06-15 19:43:13 UTC (rev 27642)
+++ trunk/lib/trackers/trackerlib.php	2010-06-15 19:54:35 UTC (rev 27643)
@@ -3937,18 +3937,18 @@
 	function export_attachment($itemId, $archive) {
 		global $prefs;
 		$files = $this->list_item_attachments( $itemId, 0, -1, 'attId_asc' );
-		if (!empty($files['cant'])) {
-			$archive->addEmptyDir($itemId);
-		}
 		foreach( $files['data'] as $file ) {
 			$localZip = "item_$itemId/".$file['filename'];
 			$complete = $this->get_item_attachment( $file['attId'] );
 			if (!empty($complete['path']) && file_exists($prefs['t_use_dir'].$complete['path'])) {
-				$archive->addFile($prefs['t_use_dir'].$complete['path'], $localZip);
-			} else {
-				$archive->addFromString($localZip, $complete['data']);
+				if (!$archive->addFile($prefs['t_use_dir'].$complete['path'], $localZip))
+					return false;
+			} elseif (!empty($complete['data'])) {
+				if (!$archive->addFromString($localZip, $complete['data']))
+					return false;
 			}
 		}
+		return true;
 	}
 
 }

Modified: trunk/tiki-export_tracker.php
===================================================================
--- trunk/tiki-export_tracker.php	2010-06-15 19:43:13 UTC (rev 27642)
+++ trunk/tiki-export_tracker.php	2010-06-15 19:54:35 UTC (rev 27643)
@@ -234,7 +234,11 @@
 	}
 	if ($tracker_info['useAttachments'] == 'y' && !empty($_REQUEST['zip'])) {
 		foreach ($items['data'] as $v) {
-			$trklib->export_attachment($v['itemId'], $archive);
+			if (!$trklib->export_attachment($v['itemId'], $archive)) {
+				$smarty->assign('msg', tra('Problem zip'));
+				$smarty->display('error.tpl');
+				die;
+			}
 		}
 	}
 }


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.