From de92767e5af3f63ae16b09ceb7234db76795959b Mon Sep 17 00:00:00 2001
From: Lars Jung <lrsjng@gmail.com>
Date: Tue, 17 Apr 2012 23:38:15 +0200
Subject: [PATCH] Adds support for tarred downloads.

---
 README.md                                     |   2 +
 src/_h5ai/config.js                           |  19 ++--
 src/_h5ai/header.html                         |   5 +-
 src/_h5ai/images/h5ai-16x16.png               | Bin 409 -> 395 bytes
 src/_h5ai/images/h5ai-48x48.png               | Bin 1550 -> 1516 bytes
 src/_h5ai/index.html                          |   7 +-
 .../ext/{zipped-download.js => download.js}   |  28 +++---
 src/_h5ai/js/inc/ext/filter.js                |   4 +-
 src/_h5ai/js/inc/ext/l10n.js                  |   2 +-
 src/_h5ai/js/inc/ext/select.js                |   2 +-
 src/_h5ai/js/inc/ext/sort.js                  |   2 +-
 src/_h5ai/js/inc/ext/tree.js                  |   2 +-
 src/_h5ai/js/inc/h5ai-info.js                 |   2 +-
 .../js/{ => inc/lib}/modernizr-2.5.3.min.js   |   0
 src/_h5ai/js/inc/main.js                      |   2 +-
 src/_h5ai/js/inc/parser/generic-json.js       |  10 +-
 src/_h5ai/js/scripts.js                       |  24 +++--
 src/_h5ai/php/api.php                         |  38 ++++----
 src/_h5ai/php/inc/Archive.php                 |  77 +++++++++++++++
 src/_h5ai/php/inc/H5ai.php                    |   2 +-
 src/_h5ai/php/inc/ZipIt.php                   |  89 ------------------
 src/index.php                                 |   5 +-
 22 files changed, 160 insertions(+), 162 deletions(-)
 rename src/_h5ai/js/inc/ext/{zipped-download.js => download.js} (79%)
 rename src/_h5ai/js/{ => inc/lib}/modernizr-2.5.3.min.js (100%)
 create mode 100644 src/_h5ai/php/inc/Archive.php
 delete mode 100644 src/_h5ai/php/inc/ZipIt.php

diff --git a/README.md b/README.md
index f29cac09..cc9d9074 100644
--- a/README.md
+++ b/README.md
@@ -39,11 +39,13 @@ h5ai is provided under the terms of the [MIT License](http://github.com/lrsjng/h
 * hides broken tree view in IE < 9, adds a message to the footer
 * removes hash changes since they break logical browser history
 * fixes thumbnail size for portrait images in icon view
+* fixes problems with file type recognition
 * adds an info page at `/_h5ai`
 * sort order is preserved while browsing
 * removes PHP error messages on thumbnail generation
 * fixes PHP problems with zipped download
 * changes crumb image for folders with an index file
+* adds support for tarred downloads
 * adds `index.php` to use h5ai in non-Apache environments
 * switches from [Datejs](http://www.datejs.com) to [Moment.js](http://momentjs.com)
 * adds [underscore.js](http://underscorejs.org)
diff --git a/src/_h5ai/config.js b/src/_h5ai/config.js
index fdb1f6af..54e2c479 100644
--- a/src/_h5ai/config.js
+++ b/src/_h5ai/config.js
@@ -68,6 +68,15 @@ var H5AI_CONFIG = {
 			"footer": "_h5ai.footer.html"
 		},
 
+		/*
+		 * Requires PHP on the server.
+		 * Enable packaged download of selected entries. Supported formats: "tar", "zip".
+		 */
+		"download": {
+			"enabled": true,
+			"format": "zip"
+		},
+
 		/*
 		 * Allow filtering the displayed files and folders.
 		 * Note: filters will be treated as JavaScript regular expressions
@@ -181,14 +190,6 @@ var H5AI_CONFIG = {
 		"tree": {
 			"enabled": true,
 			"slide": true
-		},
-
-		/*
-		 * Requires PHP on the server.
-		 * Enable zipped download of selected entries.
-		 */
-		"zipped-download": {
-			"enabled": true
 		}
 	},
 
@@ -355,7 +356,7 @@ var H5AI_CONFIG = {
 			"folders": "Répertoires",
 			"files": "Fichiers",
 			"download": "télécharger",
-			"noMatch": "no match"
+			"noMatch": "rien trouvé"
 		},
 
 		"gr": {
diff --git a/src/_h5ai/header.html b/src/_h5ai/header.html
index 674814af..47cccb92 100644
--- a/src/_h5ai/header.html
+++ b/src/_h5ai/header.html
@@ -13,7 +13,8 @@
 	<link rel="apple-touch-icon" type="image/png" href="/_h5ai/images/h5ai-48x48.png">
 	<link rel="stylesheet" href="//fonts.googleapis.com/css?family=Ubuntu:regular,italic,bold">
 	<link rel="stylesheet" href="/_h5ai/css/styles.css">
-	<script src="/_h5ai/js/modernizr-2.5.3.min.js"></script>
+	<script src="/_h5ai/config.js"></script>
+	<script src="/_h5ai/js/scripts.js"></script>
 </head>
 <body id="h5ai-main">
 	<div id="topbar" class="clearfix">
@@ -31,8 +32,6 @@
 		<span class="right"></span>
 		<span class="center"></span>
 	</div>
-	<script src="/_h5ai/config.js"></script>
-	<script src="/_h5ai/js/scripts.js"></script>
 	<div id="data-apache-autoindex" class="hideOnJs">
 		<!--
 			The following code was generated by Apache's autoindex module. It is not valid HTML5, but this
diff --git a/src/_h5ai/images/h5ai-16x16.png b/src/_h5ai/images/h5ai-16x16.png
index 4a3815c050ac4bed616e9b21e678b43e8bd3b299..7c613e054b15f36f1c63d3a9e68c29f95ccafbf2 100644
GIT binary patch
delta 294
zcmV+>0oneU1B(NYZhr_#L_t(IjjfTfN&`_4Mb8Tl((Fb^WoM;gp=G|n%0dvdvdRyb
zA|GIFVWD7`Kd`q-FQl*%M6?ma*qC5;3(cFEXCVe8xUd^<fA5@o$Hf@wb+#^neSYg|
zscCx$$G1}o<YL72I-9n(zJYT!0Ah>`U!KYHEC4oVf>^Kn{(s@g&91w?*g0#gZXY$5
zSBehJY4rNU<e`7=gIYUD5<cFCr2>*9;Z3dWgJ>E)^HOF2l_^0q^`eGJC>;PGYWN_E
zRtyNDcoD;-@Kb*i$Pa-oKoCSLZ!oJ+b%R-jsvCS0=mG?4|FD6I4aVb9tC6Oq%#$ob
s#RfiD?B3l!o*zbNl?iY#pjPXC0ax*&Q)-+jm;e9(07*qoM6N<$f&u%5J^%m!

delta 308
zcmV-40n7f21DOMmZhsa@L_t(IjjfR}OT<tRgy)3^S|lgj4-i{LuS_LaT3HBMT3K3H
zTxsDiNMR{lWnp9QAF$E1ryzphfrubnFlT~fci&nlibMl1I`z)Cv$IB3G1%>$0NB8H
zoz8UK`sV&+g$9`qfG*9?A_xosKouC>KjAqq3m9<CrBDMs-hVzA?wIq#wdLW}-C5KL
z>vO6<ZdFy3Md=n7=2k3`B&%C{m=3#5No#t283&__qr?hJ>?lY6_}~SwQz3*Uw#0&}
z$h^z|P;mxgfh7?LlQ#eWNCcMI!ExiKeigHWB^HRZOu(NB+5x^2wC#ZZrGvkIfmm91
z@P2|wnq}j-6D>tv=6o^%i=?(9?O)&ACNPM-2#QpV>AwN&&acNIvYrzF0000<MNUMn
GLSTYeq>0o3

diff --git a/src/_h5ai/images/h5ai-48x48.png b/src/_h5ai/images/h5ai-48x48.png
index c4cc0c8425879102892a8852926c6ce6183097b4..f47e7e13caf09c921cab286694c6d9e5cdb82f7b 100644
GIT binary patch
delta 1424
zcmV;B1#kL}4D1V#ZhvV>L_t(&fz_H%h*eb_$3MUOM#u60$e4+NrAcm*go><1n}S;C
zA_!LzLD8y}5k=JX25HMy5d^gma^a>Rn1zJV!dwI`loBFw$`JoFe;ntZ^X~bzIDhWB
z=RIepbndGkT+V&>-goZzdw&1Vdr}ky|7Xd14d70tFTIfGxqkqw+_6-G3d{p@MN!<k
zd+-*Q8UY7>@Xc4B+jHQV$KJVTaNy}yOZpd^WPZN9@#nRv;RCN9eJjuNt3^@FE*s)R
zQVk3Mo1S`P=aIFH?VBDOUFtmRHxH~l`1L1;9yoOL_{({oU%!hO6=(y~K)Wakjc=v|
z`hhL?Zs5_Gn}6f~_)TlGzQ;d5{K7B)7HKyz%G|Z_`R~8^?(9dOo;dv@a3j8-5@-SI
z$45t3%-;O#ZsNET=||+*y}P%p1zyVYe6A>pIe#+{$n$)~o;?q(d+&{d2X{aGAgk96
z_5|(iWO{P!iLZ9<ef#joUw)Y9`K6*L+5l1%1$mygfPc*=K70SjzP-C%xivkCX*cGF
zOOmW_6)RV7;)kDp{o=*fK6n?nS`<a;!(>0Ob=Qt<`)4LDQMPC7RS|b&Jv!X`fwDcr
z%)}*j?bx;-*y1n;6Y2+sHm=Er=BES@6g%3l3)LXYyw+;tPW7oK8`oq*z-C|snDzwv
zfB{SyCV!9sR-*GJMBJ+sRY6d9Zbyre0f#wgz%9F?4!k06{k=A*Yh&3&-Kq<I{nedY
z4qD+&2xMxEV=DeDh-G6ZYDx*Q38}RRReP?+fGu%q1OPDZ$*=|@I6h9RO)&6Fha(~u
zxMg55MiLXqFve091&p0QGW${dj14$37J{On#(!e*YN#~OK>$^2LK3u~kT70;(J-jD
z2(3m{Q+vAZ1C9V1gHH)GL}+0GU41|-0h3^KW~0(vBy|o@5isDeIRXJmjR2(q<5pe#
z;VCq0N<M(1(P0$I+Y`X3LA6AU&E$51%#mm+3q)rMV5;z`C1wF1kSY%t>-ds^7-v43
zynkSs#m7-+Le`8z9_UD90HRvfyj)SlM=YNM8dHH=Fb_QVL0LnQloBS2KnBQc9F{7r
zH|h!=i^rutFLc*{D<xdgAj9gwC$gqOPzBzuRjh$pDFLKTYz)R2M6zJ>h#?eK4c9_G
zjQVO+)gY$369b5rZOc$V#T9aKH5v-R<$pzAk3?}IGiceafvD$!-~-P7-5kCcYBmn}
zFdEr@-3Nd)jD}3-Oh#Qx7gwRpC4vAxE-7>&CpN)}vkHGY>#~>Bbq&Y0nX2_sx;U{d
zmR%lD*N@p++;wIR2cb~Rb!egVPjogkRV_pXSTs0s^OE>M$WN8joY;g+9MCsgg@2|J
z+A`M<qnL#<u`#9Xc*L2G@4^}hpQ%K_RAW=B@IseN?5Kj@)(BfFO?PG<1J%11X(^?O
zw}jF`n=0Z`Ns78^VY3>Vq#r0jT?FzQM7=2DQc<5mJ6qhOl<<XInz(u$h5V<0?RMp~
z%XY4i6W>qvbory|NP}f}-I=RuA%EY;M>l&R9eWEvq=9Z7S+wsGId4zbKXv8>oLH33
zjicV=fZEIJBHevJ0rUHn$%*@h1~x2dq8`Z~S0*P2dyQ2>m;)wGp1F8F%UV?!{SO_2
zkYz1Sp1F7)m~fbb2Bv_K<0pSU)i!3$^H1*FzJ2S)b>e>J5!~p0ZmNw4;eWaGekjIm
zf>e!1Z?2kLkM2kP@W|!y$>Gz#jhy)Q{3-0OGgB#n3$wS{r;ZJuyMAo=-2FfoQ|hTq
z02hI?zy%xu@&8uI^E?9vfvs5ZD|&%)0hz~=xD1RHMPXaB^zSx#p7&uj(`p*wB2r@i
eYS4}^{taWVl6LUMh3EhP00{s|MNUMnLSTX}PO|X;

delta 1458
zcmV;j1x@<w3yutsZhwnOL_t(&fz_H#XdP7)$A4#DlA4+(+LWfTg<6fvf+DynxY9+@
zg$q#-w=M)XE~+Ak6jTtQF4T<+p`xOQu8LOCqC)9Hq(VV0HpNyjO-(<NyqE8}$Ho1a
zd*7SaM%y=258S-GnaRxmfA9I9k2?`n<^OD1-2krD`pOQ9NPizN2n?*_9xK42s;*s6
zVC%IG0uKE6cb^|PaM!LKk7QX^O43_vVe#yH2M;|YBEPC?-ZP|KOxiUdBAbBSzyI*g
z_iL^5eOyH&eH(_Dx@5k(|Irs71Lk`HQm-J?ve_K~hF6;x`<7d?SHF8}jxEEtJ@D=;
zPd&J}xIF#eVSjeoiXq?s*87tpvIMlsR=8{hMuGc|fA-uL%gvc}J*d$?$l%C0$n}7o
z+R}<%`0>Q4SD$|A;D^A4b`oVPAV9X*oMmbL@;V=LnfZ%T*NU~&vPS>t9b=>WfNy{W
zpc$V}2#83AB_K0@Ut(eQLQg>bTf6yI83(oje~HL~s(%`PF1V10H1_PdXY9?FpLucH
z*!bf^!^2zLCB5*Bb(uy#n{#tB=ccDVd3OKXuN^&leA>H`s461T0LBh|^v3J=?!NQM
z<+*9{)ddg_KBCZTHky7>096|O8`&^C#!n|EKX~|wea{2uRMq%Q+z)J?*tLCcYi5$Q
zl_mv$L4O4hv4b8D_Z$`bY)@ourAcdMl8Ig0_X3-7N!Am%3D`O`prhWUia)kD)@bw!
zeEBm9EUL=TfQ|xN9p)h70boS))iCpdh8vW7&Gq&r?YN`&CPAGuDHbCm4s#lXR25W{
zTZy!<Mz3Tbk^B3}Q(FjFSQcAb-iiriMsw6Ch<`$+1#@+vC5{U{G>syV1FgpXZfx)g
zRdl)n#$cn8XKIIl6|zEQVMtvJ(gKSmVv?&pfegsd9MnWW{lzip>IhgC#`=#MH^K^J
zF#!Nkqd^B2e1=~IR2=pSIyeX3=Kysif-6O{m=e%DBH)KX5i2pRDkp1)1_A+>fXfJA
zOn;85K@EtPiTVUqt@+uvzHhAWtHGGGqE4a^M!^`;sOd6e<rPun32H1ZHDFz+TNJV@
z0D$q6FOmOOXkG_S!0JS-T~<JV%&1AiXCh?p|CJSUP6d&GZ5}W<P!baW5H)K=rMA6B
zHPt|s+eqpYsYWZX=73pCJ2GRU5DJjFq<^l|;X|6_0*9?jA`?K2<`~TpuMt1{HEBR2
zA*<7YDZ*%p3*`pQZ7rl?5Xr0;xlB+kexH%s5?O9M0b&9|hX!2nqdtt*U{MX^i9{Oc
zSb<Cv4aD1~^=P1|hl-lW6?0e11L^E1B}BzNaT<xVYaRd)69{DCUJ`x-Cx{9xYJY8_
zjz)`8qCAY+V$N96df!*E*|-Kvzy}iDGjW4F)EaS59U?+?wP@S7q(U|T4N63eNi^Wx
zCCq-+k*Elx_QMjmQZ*{Jr8J@Xl%$lXA&`bGo@f=sm&n#)7b4dj@m;^-ns^B}s>kAz
zLNSCD=*+~nCl2ROS3=aaJL-2t+JD`NE-R2(lA5}WN|DxUv3BqRUCL>^2EvTj6h1pF
z(t=3(VzqNuA~Z9R@7F~n(O$7jLAPBAu)Sx|e1$|%s}+?gzDVdGpny3$JwLl+%ixHw
z|J!}Po<tTORQ{Z9&0@1z(%mlsbBB*jo|Me?z-mk}LNig#@Xw1efFfDO;eTV3CxJPK
zIjq0}aQfq~e>sxpX5-#H6FYZ~-?GUzG-5k65!c{kwl?zLk<j?q<L<maj%&=59R_t_
z-5-w|cT;@FA2*ztx;+2o(NkwW{r0ybz-fm$c}KPt*bUqb+>YIYzmaSf_yhPEIH9WN
zAtjJuL65u74Yk1RZp&B_Q!Bu%e^XiZqPu~8XLh6gCyN1A+h2751HM=MNo|poF8}}l
M07*qoM6N<$f=%ANCjbBd

diff --git a/src/_h5ai/index.html b/src/_h5ai/index.html
index 99da1342..4a9c3c33 100644
--- a/src/_h5ai/index.html
+++ b/src/_h5ai/index.html
@@ -14,7 +14,8 @@
 	<link rel="stylesheet" href="//fonts.googleapis.com/css?family=Ubuntu:regular,italic,bold">
 	<link rel="stylesheet" href="//fonts.googleapis.com/css?family=Miltonian+Tattoo:regular">
 	<link rel="stylesheet" href="/_h5ai/css/styles.css">
-	<script src="/_h5ai/js/modernizr-2.5.3.min.js"></script>
+	<script src="/_h5ai/config.js"></script>
+	<script src="/_h5ai/js/scripts.js"></script>
 </head>
 <body id="h5ai-info">
 	<h1><span class="h5ai">h5ai</span></h1>
@@ -25,7 +26,7 @@
 		<li id="test-cache"><span class="test-label">cache</span><span class="test-result">?</span></li>
 		<li id="test-thumbs"><span class="test-label">thumbnails</span><span class="test-result">?</span></li>
 		<li id="test-temp"><span class="test-label">temp directory</span><span class="test-result">?</span></li>
-		<li id="test-zips"><span class="test-label">zipped downloads</span><span class="test-result">?</span></li>
+		<li id="test-download"><span class="test-label">packaged downloads</span><span class="test-result">?</span></li>
 	</ul>
 	<div id="bottombar" class="clearfix">
 		<span class="left">
@@ -36,7 +37,5 @@
 		<span class="right"></span>
 		<span class="center"></span>
 	</div>
-	<script src="/_h5ai/config.js"></script>
-	<script src="/_h5ai/js/scripts.js"></script>
 </body>
 </html>
\ No newline at end of file
diff --git a/src/_h5ai/js/inc/ext/zipped-download.js b/src/_h5ai/js/inc/ext/download.js
similarity index 79%
rename from src/_h5ai/js/inc/ext/zipped-download.js
rename to src/_h5ai/js/inc/ext/download.js
index b0975c7b..a02a6c7e 100644
--- a/src/_h5ai/js/inc/ext/zipped-download.js
+++ b/src/_h5ai/js/inc/ext/download.js
@@ -1,11 +1,14 @@
 
-module.define('ext/zipped-download', [jQuery, 'core/settings', 'core/resource', 'core/event'], function ($, allsettings, resource, event) {
+module.define('ext/download', [jQuery, 'core/settings', 'core/resource', 'core/event'], function ($, allsettings, resource, event) {
 
 	var defaults = {
-			enabled: false
+			enabled: false,
+			format: 'tar'
 		},
 
-		settings = _.extend({}, defaults, allsettings['zipped-download']),
+		settings = _.extend({}, defaults, allsettings['download']),
+
+		formats = ['tar', 'zip'],
 
 		downloadBtnTemplate = '<li id="download">' +
 									'<a href="#">' +
@@ -38,7 +41,7 @@ module.define('ext/zipped-download', [jQuery, 'core/settings', 'core/resource',
 				if (response.status === 'ok') {
 					setTimeout(function () { // wait here so the img above can be updated in time
 
-						window.location = resource.api() + '?action=getzip&id=' + response.id;
+						window.location = resource.api() + '?action=getarchive&id=' + response.id + '&as=h5ai-selection.' + settings.format;
 					}, 200);
 				} else {
 					if (response.code === 401) {
@@ -57,14 +60,15 @@ module.define('ext/zipped-download', [jQuery, 'core/settings', 'core/resource',
 			}
 		},
 
-		requestZipping = function (hrefsStr) {
+		requestArchive = function (hrefsStr) {
 
 			$download.addClass('current');
 			$img.attr('src', resource.image('loading.gif', true));
 			$.ajax({
 				url: resource.api(),
 				data: {
-					action: 'zip',
+					action: 'archive',
+					format: settings.format,
 					hrefs: hrefsStr
 				},
 				type: 'POST',
@@ -91,7 +95,7 @@ module.define('ext/zipped-download', [jQuery, 'core/settings', 'core/resource',
 
 		onSelection = function (entries) {
 
-			var $downloadBtn = $('#download');
+			var $download = $('#download').appendTo('#navbar');
 
 			selectedHrefsStr = '';
 			if (entries.length) {
@@ -99,9 +103,9 @@ module.define('ext/zipped-download', [jQuery, 'core/settings', 'core/resource',
 
 					return entry.absHref;
 				}).join(':');
-				$downloadBtn.show();
+				$download.show();
 			} else {
-				$downloadBtn.hide();
+				$download.hide();
 				$downloadAuth.hide();
 			}
 		},
@@ -113,16 +117,16 @@ module.define('ext/zipped-download', [jQuery, 'core/settings', 'core/resource',
 			}
 
 			$download = $(downloadBtnTemplate)
-				.appendTo($('#navbar'))
+				.appendTo('#navbar')
 				.find('a').on('click', function (event) {
 
 					event.preventDefault();
 					$downloadAuth.hide();
-					requestZipping(selectedHrefsStr);
+					requestArchive(selectedHrefsStr);
 				});
 			$img = $download.find('img');
 
-			$downloadAuth = $(authTemplate).appendTo($('body'));
+			$downloadAuth = $(authTemplate).appendTo('body');
 			$downloadUser = $downloadAuth.find('#download-auth-user');
 			$downloadPassword = $downloadAuth.find('#download-auth-password');
 
diff --git a/src/_h5ai/js/inc/ext/filter.js b/src/_h5ai/js/inc/ext/filter.js
index b81d9c77..67762858 100644
--- a/src/_h5ai/js/inc/ext/filter.js
+++ b/src/_h5ai/js/inc/ext/filter.js
@@ -98,14 +98,14 @@ module.define('ext/filter', [jQuery, 'core/settings', 'core/resource'], function
 
 			$filter = $(template);
 			$input = $filter.find('input');
-			$noMatch = $(noMatchTemplate).appendTo($('#extended'));
+			$noMatch = $(noMatchTemplate).appendTo('#extended');
 
 			$filter
 				.on('click', function () {
 
 					$input.focus();
 				})
-				.appendTo($('#navbar'));
+				.appendTo('#navbar');
 
 			$input
 				.on('focus', function () {
diff --git a/src/_h5ai/js/inc/ext/l10n.js b/src/_h5ai/js/inc/ext/l10n.js
index 376f0745..da4a3d77 100644
--- a/src/_h5ai/js/inc/ext/l10n.js
+++ b/src/_h5ai/js/inc/ext/l10n.js
@@ -3,7 +3,7 @@ module.define('ext/l10n', [jQuery, 'core/settings', 'core/langs', 'core/format',
 
 	var defaults = {
 			enabled: true,
-			lang: "en",
+			lang: 'en',
 			useBrowserLang: true,
 			defaultDateFormat: 'YYYY-MM-DD HH:mm'
 		},
diff --git a/src/_h5ai/js/inc/ext/select.js b/src/_h5ai/js/inc/ext/select.js
index 97d18c0b..70a984f2 100644
--- a/src/_h5ai/js/inc/ext/select.js
+++ b/src/_h5ai/js/inc/ext/select.js
@@ -98,7 +98,7 @@ module.define('ext/select', [jQuery, 'core/settings', 'core/event'], function ($
 				return;
 			}
 
-			$selectionRect.hide().appendTo($('body'));
+			$selectionRect.hide().appendTo('body');
 
 			$document
 				.on('mousedown', '.noSelection', noSelection)
diff --git a/src/_h5ai/js/inc/ext/sort.js b/src/_h5ai/js/inc/ext/sort.js
index 912849c1..c30efef1 100644
--- a/src/_h5ai/js/inc/ext/sort.js
+++ b/src/_h5ai/js/inc/ext/sort.js
@@ -67,7 +67,7 @@ module.define('ext/sort', [jQuery, 'core/settings', 'core/resource', 'core/store
 
 			$all.removeClass('ascending').removeClass('descending');
 			order.head.addClass(order.clas);
-			$('#extended .entry').detach().sort(order.fn).appendTo($('#extended > ul'));
+			$('#extended .entry').detach().sort(order.fn).appendTo('#extended > ul');
 		},
 
 		init = function () {
diff --git a/src/_h5ai/js/inc/ext/tree.js b/src/_h5ai/js/inc/ext/tree.js
index 19476af6..94e9a9a6 100644
--- a/src/_h5ai/js/inc/ext/tree.js
+++ b/src/_h5ai/js/inc/ext/tree.js
@@ -197,7 +197,7 @@ module.define('ext/tree', [jQuery, 'core/settings', 'core/resource', 'core/event
 				return;
 			}
 
-			var $tree = $('<div id="tree" />').appendTo($('body'));
+			var $tree = $('<div id="tree" />').appendTo('body');
 
 			fetchTree(entry, parser, function (root) {
 
diff --git a/src/_h5ai/js/inc/h5ai-info.js b/src/_h5ai/js/inc/h5ai-info.js
index c15052eb..17897dd4 100644
--- a/src/_h5ai/js/inc/h5ai-info.js
+++ b/src/_h5ai/js/inc/h5ai-info.js
@@ -14,7 +14,7 @@ module.define('h5ai-info', [jQuery, 'core/resource'], function ($, resource) {
 
 		handleChecksResponse = function (response) {
 
-			_.each(['php', 'cache', 'thumbs', 'temp', 'zips'], function (test) {
+			_.each(['php', 'cache', 'thumbs', 'temp', 'download'], function (test) {
 
 				setCheckResult('#test-' + test, response && response[test]);
 			})
diff --git a/src/_h5ai/js/modernizr-2.5.3.min.js b/src/_h5ai/js/inc/lib/modernizr-2.5.3.min.js
similarity index 100%
rename from src/_h5ai/js/modernizr-2.5.3.min.js
rename to src/_h5ai/js/inc/lib/modernizr-2.5.3.min.js
diff --git a/src/_h5ai/js/inc/main.js b/src/_h5ai/js/inc/main.js
index bd69baf2..103e7e69 100644
--- a/src/_h5ai/js/inc/main.js
+++ b/src/_h5ai/js/inc/main.js
@@ -23,6 +23,7 @@
 
 	// @include "ext/crumb.js"
 	// @include "ext/custom.js"
+	// @include "ext/download.js"
 	// @include "ext/filter.js"
 	// @include "ext/folderstatus.js"
 	// @include "ext/l10n.js"
@@ -34,7 +35,6 @@
 	// @include "ext/thumbnails.js"
 	// @include "ext/title.js"
 	// @include "ext/tree.js"
-	// @include "ext/zipped-download.js"
 
 	// @include "h5ai-info.js"
 	// @include "h5ai-main.js"
diff --git a/src/_h5ai/js/inc/parser/generic-json.js b/src/_h5ai/js/inc/parser/generic-json.js
index cdacb072..d2b5530a 100644
--- a/src/_h5ai/js/inc/parser/generic-json.js
+++ b/src/_h5ai/js/inc/parser/generic-json.js
@@ -10,17 +10,17 @@ module.define('parser/generic-json', [jQuery, 'core/settings', 'model/entry'], f
 
 	var parseJson = function (absHref, json) {
 
-			_.each(json.entries, function (jsonEntry) {
-
-				Entry.get(jsonEntry.absHref, jsonEntry.time, jsonEntry.size, jsonEntry.status);
-			});
-
 			if (json.hasOwnProperty('customHeader')) {
 				settings.custom.header = json.customHeader;
 			}
 			if (json.hasOwnProperty('customFooter')) {
 				settings.custom.footer = json.customFooter;
 			}
+
+			return _.map(json.entries, function (jsonEntry) {
+
+				return Entry.get(jsonEntry.absHref, jsonEntry.time, jsonEntry.size, jsonEntry.status);
+			});
 		},
 
 		parseJsonStr = function (absHref, jsonStr) {
diff --git a/src/_h5ai/js/scripts.js b/src/_h5ai/js/scripts.js
index 8eaafabd..d4be42b9 100644
--- a/src/_h5ai/js/scripts.js
+++ b/src/_h5ai/js/scripts.js
@@ -1,20 +1,24 @@
 
-// jQuery and plugins
-// ------------------
+// libs
+// ----
+// @include "inc/lib/modernizr-2.5.3.min.js"
+// @include "inc/lib/moment-1.5.0.min.js"
+// @include "inc/lib/json2.js"
+// @include "inc/lib/base64.js"
+
+// underscore libs
+// ---------------
+// @include "inc/lib/underscore-1.3.1.min.js"
+// @include "inc/lib/module.js"
+
+// jQuery libs
+// -----------
 // @include "inc/lib/jquery-1.7.1.min.js"
 // @include "inc/lib/jquery.fracs-0.11.min.js"
 // @include "inc/lib/jquery.mousewheel-3.0.6.js"
 // @include "inc/lib/jquery.qrcode.js"
 // @include "inc/lib/jquery.scrollpanel.js"
-
-// non jQuery libs
-// ---------------
 // @include "inc/lib/amplify-1.1.0.min.js"
-// @include "inc/lib/base64.js"
-// @include "inc/lib/json2.js"
-// @include "inc/lib/moment-1.5.0.min.js"
-// @include "inc/lib/underscore-1.3.1.min.js"
-// @include "inc/lib/module.js"
 
 // h5ai
 // ----
diff --git a/src/_h5ai/php/api.php b/src/_h5ai/php/api.php
index e6e3419d..5f4b8ce0 100644
--- a/src/_h5ai/php/api.php
+++ b/src/_h5ai/php/api.php
@@ -108,40 +108,42 @@ else if ($action === "thumbsrc") {
 }
 
 
-else if ($action === "zip") {
+else if ($action === "archive") {
 
-	fail(0, "zipped download is disabled", !$options["zipped-download"]["enabled"]);
-	list($hrefs) = checkKeys(array("hrefs"));
+	fail(0, "download is disabled", !$options["download"]["enabled"]);
 
-	H5ai::req_once("/php/inc/ZipIt.php");
+	list($format, $hrefs) = checkKeys(array("format", "hrefs"));
 
-	$zipit = new ZipIt($h5ai);
+	H5ai::req_once("/php/inc/Archive.php");
+	$archive = new Archive($h5ai);
 
 	$hrefs = explode(":", trim($hrefs));
-	$zipFile = $zipit->zip($hrefs);
+	$target = $archive->create($format, $hrefs);
 
-	if (is_string($zipFile)) {
-		$response = array('status' => 'ok', 'id' => basename($zipFile), 'size' => filesize($zipFile));
+	if (is_string($target)) {
+		$response = array('status' => 'ok', 'id' => basename($target), 'size' => filesize($target));
 	} else {
-		$response = array('status' => 'failed', 'code' => $zipFile);
+		$response = array('status' => 'failed', 'code' => $target);
 	}
 	echo json_encode($response);
 }
 
 
-else if ($action === "getzip") {
+else if ($action === "getarchive") {
 
-	list($id) = checkKeys(array("id"));
-	fail(1, "zipped file not found: " . $id, !preg_match("/^h5ai-zip-/", $id));
+	fail(0, "download is disabled", !$options["download"]["enabled"]);
 
-	$zipFile = str_replace("\\", "/", sys_get_temp_dir()) . "/" . $id;
-	fail(2, "zipped file not found: " . $id, !file_exists($zipFile));
+	list($id,$as) = checkKeys(array("id", "as"));
+	fail(1, "file not found: " . $id, !preg_match("/^h5ai-selection-/", $id));
 
-	header("Content-Disposition: attachment; filename=\"h5ai-selection.zip\"");
+	$target = H5ai::normalize_path(sys_get_temp_dir(), true) . $id;
+	fail(2, "file not found: " . $id, !file_exists($target));
+
+	header("Content-Disposition: attachment; filename=\"$as\"");
 	header("Content-Type: application/octet-stream");
-	header("Content-Length: " . filesize($zipFile));
+	header("Content-Length: " . filesize($target));
 	header("Connection: close");
-	readfile($zipFile);
+	readfile($target);
 }
 
 
@@ -152,7 +154,7 @@ else if ($action === "checks") {
 		'cache' => $h5ai->checks["php"] && $h5ai->checks["cache"],
 		'thumbs' => $h5ai->checks["php"] && $h5ai->checks["cache"] && $h5ai->checks["gd"],
 		'temp' => $h5ai->checks["php"] && $h5ai->checks["temp"],
-		'zips' => $h5ai->checks["php"] && $h5ai->checks["temp"] && $h5ai->checks["zip"]
+		'download' => $h5ai->checks["php"] && $h5ai->checks["temp"] && $h5ai->checks["archive"]
 	);
 	echo json_encode($response);
 }
diff --git a/src/_h5ai/php/inc/Archive.php b/src/_h5ai/php/inc/Archive.php
new file mode 100644
index 00000000..dcf81c79
--- /dev/null
+++ b/src/_h5ai/php/inc/Archive.php
@@ -0,0 +1,77 @@
+<?php
+
+class Archive {
+
+	private $h5ai;
+
+
+	public function __construct($h5ai) {
+
+		$this->h5ai = $h5ai;
+	}
+
+
+	public function create($format, $hrefs) {
+
+		$target = H5ai::normalize_path(sys_get_temp_dir(), true) . "h5ai-selection-" . microtime(true) . "-" . rand() .  "." . $format;
+		$archive = new PharData($target);
+
+		foreach ($hrefs as $href) {
+			$d = H5ai::normalize_path(dirname($href), true);
+			$n = basename($href);
+			$code = $this->h5ai->getHttpCode($d);
+			if ($code == 401) {
+				return $code;
+			}
+
+			if ($code == "h5ai" && !$this->h5ai->ignoreThisFile($n)) {
+				$realFile = $this->h5ai->getAbsPath($href);
+				$archivedFile = preg_replace("!^" . $this->h5ai->getRootAbsPath() . "!", "", $realFile);
+				if (is_dir($realFile)) {
+					$rcode = $this->addDir($archive, $realFile, $archivedFile);
+					if ($rcode == 401) {
+						return $rcode;
+					}
+				} else {
+					$this->addFile($archive, $realFile, $archivedFile);
+				}
+			}
+		}
+
+		return filesize($target) ? $target : null;
+	}
+
+
+	private function addFile($archive, $realFile, $archivedFile) {
+
+		if (is_readable($realFile)) {
+			$archive->addFile($realFile, $archivedFile);
+		}
+	}
+
+
+	private function addDir($archive, $realDir, $archivedDir) {
+
+		$code = $this->h5ai->getHttpCode($this->h5ai->getAbsHref($realDir));
+
+		if ($code == "h5ai") {
+			$archive->addEmptyDir($archivedDir);
+			$files = $this->h5ai->readDir($realDir);
+			foreach ($files as $file) {
+				$realFile = $realDir . "/" . $file;
+				$archivedFile = $archivedDir . "/" . $file;
+				if (is_dir($realFile)) {
+					$rcode = $this->addDir($archive, $realFile, $archivedFile);
+					if ($rcode == 401) {
+						return $rcode;
+					}
+				} else {
+					$this->addFile($archive, $realFile, $archivedFile);
+				}
+			}
+		}
+		return $code;
+	}
+}
+
+?>
\ No newline at end of file
diff --git a/src/_h5ai/php/inc/H5ai.php b/src/_h5ai/php/inc/H5ai.php
index f00c50a6..748538a4 100644
--- a/src/_h5ai/php/inc/H5ai.php
+++ b/src/_h5ai/php/inc/H5ai.php
@@ -83,7 +83,7 @@ class H5ai {
 
 		$this->checks = array(
 			"php" => version_compare(PHP_VERSION, "5.2.0") >= 0,
-			"zip" => class_exists("ZipArchive"),
+			"archive" => class_exists("PharData"),
 			"gd" => GD_VERSION != "GD_VERSION",
 			"cache" => is_writable($this->h5aiAbsPath . "/cache"),
 			"temp" => is_writable(sys_get_temp_dir())
diff --git a/src/_h5ai/php/inc/ZipIt.php b/src/_h5ai/php/inc/ZipIt.php
deleted file mode 100644
index 78c23165..00000000
--- a/src/_h5ai/php/inc/ZipIt.php
+++ /dev/null
@@ -1,89 +0,0 @@
-<?php
-
-class ZipIt {
-
-	private $h5ai;
-
-
-	public static function isUsable() {
-
-		return class_exists("ZipArchive");
-	}
-
-
-	public function __construct($h5ai) {
-
-		$this->h5ai = $h5ai;
-	}
-
-
-	public function zip($hrefs) {
-
-		$zipFile = tempnam(sys_get_temp_dir(), "h5ai-zip-");
-		$zip = new ZipArchive();
-
-		if (!$zip->open($zipFile, ZIPARCHIVE::CREATE)) {
-			return null;
-		}
-
-		$zip->addEmptyDir("/");
-		foreach ($hrefs as $href) {
-			$d = H5ai::normalize_path(dirname($href), true);
-			$n = basename($href);
-			$code = $this->h5ai->getHttpCode($d);
-			if ($code == 401) {
-				return $code;
-			}
-
-			if ($code == "h5ai" && !$this->h5ai->ignoreThisFile($n)) {
-				$localFile = $this->h5ai->getAbsPath($href);
-				$file = preg_replace("!^" . $this->h5ai->getRootAbsPath() . "!", "", $localFile);
-				if (is_dir($localFile)) {
-					$rcode = $this->zipDir($zip, $localFile, $file);
-					if ($rcode == 401) {
-						return $rcode;
-					}
-				} else {
-					$this->zipFile($zip, $localFile, $file);
-				}
-			}
-		}
-
-		$zip->close();
-		return filesize($zipFile) ? $zipFile : null;
-	}
-
-
-	private function zipFile($zip, $localFile, $file) {
-
-		if (is_readable($localFile)) {
-			$zip->addFile($localFile, $file);
-		}
-	}
-
-
-	private function zipDir($zip, $localDir, $dir) {
-
-		$code = $this->h5ai->getHttpCode($this->h5ai->getAbsHref($localDir));
-
-		if ($code == 'h5ai') {
-			$zip->addEmptyDir($dir);
-			$files = $this->h5ai->readDir($localDir);
-			foreach ($files as $file) {
-				$localFile = $localDir . "/" . $file;
-				$file = $dir . "/" . $file;
-				if (is_dir($localFile)) {
-					$rcode = $this->zipDir($zip, $localFile, $file);
-					if ($rcode == 401) {
-						return $rcode;
-					}
-				} else {
-					$this->zipFile($zip, $localFile, $file);
-				}
-			}
-		}
-		return $code;
-	}
-}
-
-?>
\ No newline at end of file
diff --git a/src/index.php b/src/index.php
index 597cb4d0..842a9e3f 100644
--- a/src/index.php
+++ b/src/index.php
@@ -14,7 +14,8 @@
 	<link rel="apple-touch-icon" type="image/png" href="/_h5ai/images/h5ai-48x48.png">
 	<link rel="stylesheet" href="//fonts.googleapis.com/css?family=Ubuntu:regular,italic,bold">
 	<link rel="stylesheet" href="/_h5ai/css/styles.css">
-	<script src="/_h5ai/js/modernizr-2.5.3.min.js"></script>
+	<script src="/_h5ai/config.js"></script>
+	<script src="/_h5ai/js/scripts.js"></script>
 </head>
 <body id="h5ai-main">
 	<div id="topbar" class="clearfix">
@@ -32,8 +33,6 @@
 		<span class="right"></span>
 		<span class="center"></span>
 	</div>
-	<script src="/_h5ai/config.js"></script>
-	<script src="/_h5ai/js/scripts.js"></script>
 	<div id="data-generic-json" class="hidden">
 		<?php if (stripos($_SERVER["REQUEST_METHOD"], "HEAD") === false) {