Added it translation. Switched to wepp.

README.md

@@ -10,6 +10,18 @@ It uses the [Faenza icon set](http://tiheum.deviantart.com/art/Faenza-Icons-1733
 ## Changelog
 
 
+### v0.15.2 · *2011-09-18*
+
+* added it translation by [Salvo Gentile](http://github.com/SalvoGentile) and [Marco Patriarca](http://github.com/Fexys)
+* switched build process from scripp to wepp
+
+
+### v0.15.1 · *2011-09-06*
+
+* fixed security issues with the zipped download feature
+* made zipped download optional (but enabled by default)
+
+
 ### v0.15 · *2011-09-04*
 
 * added zipped download for selected files

build.properties

@@ -1,20 +1,20 @@
-custom                           = true
+custom             = true
 
 
 # project
-project.name                     = h5ai
+project.name       = h5ai
-project.version                  = 0.15
+project.version    = 0.15.2
 
 
 # src
-src.dir                          = src
+src.dir            = src
 
 
 # build
-build.dir                        = build
+build.dir          = build
-release.dir                      = release
+release.dir        = release
 
 
-# libs
+# tools
-lib.scripp.jar                   = tools/scripp.jar
+wepp               = tools/wepp
 

build.xml

@@ -3,8 +3,10 @@
     name="h5ai"
     basedir="."
     default="release"
-    xmlns:scripp="antlib:de.larsjung.scripp.ant"
 >
+
+    <import file="tools/wepp.ant.xml" />
+
     <target name="init">
         <property file="build.properties" />
         <tstamp>
@@ -12,20 +14,13 @@
         </tstamp>
         <property name="build.label" value="${project.name} ${project.version} b${build.stamp}" />
         <echo>Build: ${build.label}</echo>
-        <taskdef
-            resource="de/larsjung/scripp/ant/antlib.xml"
-            uri="antlib:de.larsjung.scripp.ant"
-            classpath="${lib.scripp.jar}"
-        />
     </target>
 
-
     <target name="clean" depends="init">
         <delete dir="${build.dir}" />
         <delete dir="${release.dir}" />
     </target>
 
-
     <target name="build-prepare" depends="clean">
         <mkdir dir="${build.dir}" />
         <copy todir="${build.dir}">
@@ -41,19 +36,16 @@
         </replace>
     </target>
 
-
     <target name="build" depends="build-prepare">
-        <scripp.dir dir="${build.dir}/h5ai/css" />
+        <wepp.dir dir="${build.dir}/h5ai/css" />
-        <scripp.dir dir="${build.dir}/h5ai/js" />
+        <wepp.dir dir="${build.dir}/h5ai/js" />
     </target>
 
-
     <target name="build-uncompressed" depends="build-prepare">
-        <scripp.dir dir="${build.dir}/h5ai/css" compress="false" />
+        <wepp.dir dir="${build.dir}/h5ai/css" args="--nc" />
-        <scripp.dir dir="${build.dir}/h5ai/js" compress="false" />
+        <wepp.dir dir="${build.dir}/h5ai/js" args="--nc" />
     </target>
 
-
     <target name="release" depends="build">
         <mkdir dir="${release.dir}" />
         <zip destfile="${release.dir}/${project.name}-${project.version}.zip" basedir="${build.dir}" />
@@ -62,20 +54,4 @@
         <delete file="${release.dir}/${project.name}-${project.version}.tar" />
     </target>
 
-
-    <macrodef name="scripp.dir">
-        <attribute name="dir" />
-        <attribute name="compress" default="true" />
-        <sequential>
-            <scripp:process compress="@{compress}">
-                <fileset dir="@{dir}" includes="**/*.less,**/*.css,**/*.js" excludes="inc/**/*,**/*.min.css,**/*.min.js" />
-                <globmapper from="*.less" to="*.css" />
-                <globmapper from="*.css" to="*.css" />
-                <globmapper from="*.js" to="*.js" />
-            </scripp:process>
-            <delete dir="@{dir}/inc">
-                <fileset dir="@{dir}" includes="**/*.less" />
-            </delete>
-        </sequential>
-    </macrodef>
 </project>

src/h5ai/js/inc/h5ai.js

@@ -28,7 +28,9 @@ var H5ai = function (options, langs) {
             dateFormat: "Y-m-d H:i",
             ignore: ["h5ai", "h5ai.header.html", "h5ai.footer.html"],
             ignoreRE: ["/^\\./"],
-            showThumbs: true
+            showThumbs: true,
+            
+            zippedDownload: true
         },
         settings = $.extend({}, defaults, options),
         pathClick = function (fn) {
@@ -292,7 +294,7 @@ var H5ai = function (options, langs) {
                 });
             });
         },
-        initSelect = function () {
+        initZippedDownload = function () {
 
             var x = 0,
                 y = 0,
@@ -362,9 +364,11 @@ var H5ai = function (options, langs) {
                     return false;
                 };
 
-            $("body>nav,body>footer,#tree,#extended a").bind("mousedown", noSelection);
+            if (settings.zippedDownload) {
-            $("#extended a").live("mousedown", noSelection);
+                $("body>nav,body>footer,#tree,#extended a").bind("mousedown", noSelection);
-            $window.bind("mousedown", selectionStart);
+                $("#extended a").live("mousedown", noSelection);
+                $window.bind("mousedown", selectionStart);
+            }
         },
         init = function () {
 
@@ -376,7 +380,7 @@ var H5ai = function (options, langs) {
             initLangSelector(langs);
             localize(langs, settings.lang, settings.useBrowserLang);
             initIndicators();
-            initSelect();
+            initZippedDownload();
         },
         h5ai = {
             settings: settings,

src/h5ai/options.js

@@ -97,7 +97,13 @@ h5aiOptions = {
      * Only used in PHP implementation.
      * Show thumbnails in Icons view.
      */
-    "showThumbs": true
+    "showThumbs": true,
+
+    /*
+     * Enable zipped download of selected entries. Requieres
+     * PHP on the server.
+     */
+    "zippedDownload": true
 };
 
 
@@ -117,7 +123,8 @@ h5aiLangs = {
         "parentDirectory": "Parent Directory",
         "empty": "empty",
         "folders": "folders",
-        "files": "files"
+        "files": "files",
+        "download": "download"
     },
 
     "de": {
@@ -130,7 +137,8 @@ h5aiLangs = {
         "parentDirectory": "Übergeordnetes Verzeichnis",
         "empty": "leer",
         "folders": "Ordner",
-        "files": "Dateien"
+        "files": "Dateien",
+        "download": "Download"
     },
 
     "fr": {
@@ -143,7 +151,8 @@ h5aiLangs = {
         "parentDirectory": "Dossier parent",
         "empty": "vide",
         "folders": "Répertoires",
-        "files": "Fichiers"
+        "files": "Fichiers",
+        "download": "download"
     },
 
     "nl": {
@@ -155,8 +164,9 @@ h5aiLangs = {
         "size": "Grootte",
         "parentDirectory": "Bovenliggende map",
         "empty": "lege",
-        "folders": "[?folders?]",
+        "folders": "folders",
-        "files": "[?files?]"
+        "files": "files",
+        "download": "download"
     },
 
     "sv": {
@@ -168,8 +178,9 @@ h5aiLangs = {
         "size": "Filstorlek",
         "parentDirectory": "Till överordnad mapp",
         "empty": "tom",
-        "folders": "[?folders?]",
+        "folders": "folders",
-        "files": "[?files?]"
+        "files": "files",
+        "download": "download"
     },
 
     "cs": {
@@ -182,7 +193,8 @@ h5aiLangs = {
         "parentDirectory": "Nadřazený adresář",
         "empty": "prázdný",
         "folders": "složek",
-        "files": "souborů"
+        "files": "souborů",
+        "download": "download"
     },
 
     "sk": {
@@ -195,7 +207,8 @@ h5aiLangs = {
         "parentDirectory": "Nadriadený priečinok",
         "empty": "prázdny",
         "folders": "priečinkov",
-        "files": "súborov"
+        "files": "súborov",
+        "download": "download"
     },
 
     "es": {
@@ -207,8 +220,9 @@ h5aiLangs = {
         "size": "Tamaño",
         "parentDirectory": "Directorio superior",
         "empty": "vacío",
-        "folders": "[?folders?]",
+        "folders": "folders",
-        "files": "[?files?]"
+        "files": "files",
+        "download": "download"
     },
 
     "tr": {
@@ -220,8 +234,9 @@ h5aiLangs = {
         "size": "Boyut",
         "parentDirectory": "Üst Dizin",
         "empty": "boş",
-        "folders": "[?folders?]",
+        "folders": "klasörler",
-        "files": "[?files?]"
+        "files": "dosyalar",
+        "download": "indir"
     },
 
     "pt": {
@@ -234,7 +249,8 @@ h5aiLangs = {
         "parentDirectory": "Diretório superior",
         "empty": "vazio",
         "folders": "pastas",
-        "files": "arquivos"
+        "files": "arquivos",
+        "download": "download"
     },
 
     "bg": {
@@ -247,7 +263,8 @@ h5aiLangs = {
         "parentDirectory": "Предходна директория",
         "empty": "празно",
         "folders": "папки",
-        "files": "файлове"
+        "files": "файлове",
+        "download": "download"
     },
 
     "lv": {
@@ -260,7 +277,8 @@ h5aiLangs = {
         "parentDirectory": "Vecākdirektorijs",
         "empty": "tukšs",
         "folders": "mapes",
-        "files": "faili"
+        "files": "faili",
+        "download": "lejupielādēt"
     },
 
     "zh-cn": {
@@ -273,7 +291,8 @@ h5aiLangs = {
         "parentDirectory": "上层文件夹",
         "empty": "空文件夹",
         "folders": "文件夹",
-        "files": "文件"
+        "files": "文件",
+        "download": "download"
     },
 
     "pl": {
@@ -286,7 +305,8 @@ h5aiLangs = {
         "parentDirectory": "Katalog nadrzędny",
         "empty": "pusty",
         "folders": "foldery",
-        "files": "pliki"
+        "files": "pliki",
+        "download": "download"
     },
 
     "ru": {
@@ -299,6 +319,21 @@ h5aiLangs = {
         "parentDirectory": "Главная директория",
         "empty": "пусто",
         "folders": "папки",
-        "files": "файлы"
+        "files": "файлы",
-    }
+        "download": "download"
+    },
+
+    "it": {
+       "lang": "italiano",
+       "details": "dettagli",
+       "icons": "icone",
+       "name": "Nome",
+       "lastModified": "Ultima modifica",
+       "size": "Dimensione",
+       "parentDirectory": "Cartella Superiore",
+       "empty": "vuota",
+       "folders": "cartelle",
+       "files": "file",
+       "download": "download"
+   }
 };

src/h5ai/php/h5ai.php

@@ -27,7 +27,7 @@ class H5ai {
         $this->sortOrder = array(
             "column" => array_key_exists("col", $_REQUEST) ? $_REQUEST["col"] : $defaultSortOrder["column"],
             "ascending" => array_key_exists("asc", $_REQUEST) ? $_REQUEST["asc"] !== "false" : $defaultSortOrder["ascending"]
-      );
+        );
         $this->dateFormat = $this->options["options"]["dateFormat"];
         $this->view = array_key_exists("view", $_REQUEST) ? $_REQUEST["view"] : $this->options["options"]["viewmodes"][0];
         if (!in_array($this->view, H5ai::$VIEWMODES)) {
@@ -96,7 +96,14 @@ class H5ai {
         if ($absPath === null) {
             return $this->absHref;
         }
-        return $this->normalizePath(rawurlencode(preg_replace("!^" . $this->docRoot . "!", "", $absPath)), $endWithSlash);
+        $absHref = preg_replace("!^" . $this->docRoot . "!", "", $absPath);
+        $parts = explode("/", $absHref);
+        $encodedParts = array();
+        foreach ($parts as $part) {
+            $encodedParts[] = rawurlencode($part);
+        }
+        $endodedAbsHref = implode("/", $encodedParts);
+        return $this->normalizePath($endodedAbsHref, $endWithSlash);
     }
 
     public function getAbsPath($absHref = null) {

src/h5ai/php/zipcontent.php

@@ -11,14 +11,18 @@ require_once "zipit.php";
 $h5ai = new H5ai();
 $zipit = new ZipIt($h5ai);
 
-$files = explode(":", trim($_REQUEST["hrefs"]));
+$hrefs = explode(":", trim($_REQUEST["hrefs"]));
 
-$zipFile = $zipit->zip($files);
+$zipFile = $zipit->zip($hrefs);
 
-header("Content-Disposition: attachment; filename=\"h5ai-selection.zip\"");
+if ($zipFile !== false) {
-header("Content-Type: application/force-download");
+    header("Content-Disposition: attachment; filename=\"h5ai-selection.zip\"");
-header("Content-Length: " . filesize($zipFile));
+    header("Content-Type: application/force-download");
-header("Connection: close");
+    header("Content-Length: " . filesize($zipFile));
-readfile($zipFile);
+    header("Connection: close");
+    readfile($zipFile);
+} else {
+    echo "sorry, something went wrong while building the zip.";
+}
 
 ?>

src/h5ai/php/zipit.php

@@ -18,12 +18,16 @@ class ZipIt {
         }
 
         foreach ($hrefs as $href) {
-            $localFile = $this->h5ai->getAbsPath($href);
+            $d = dirname($href);
-            $file = preg_replace("!^" . $this->h5ai->getDocRoot() . "!", "", $localFile);
+            $n = basename($href);
-            if (is_dir($localFile)) {
+            if ($this->h5ai->getHttpCode($this->h5ai->getAbsHref($d)) === "h5ai" && !$this->h5ai->ignoreThisFile($n)) {
-                $this->zipDir($zip, $localFile, $file);
+                $localFile = $this->h5ai->getAbsPath($href);
-            } else {
+                $file = preg_replace("!^" . $this->h5ai->getDocRoot() . "!", "", $localFile);
-                $this->zipFile($zip, $localFile, $file);
+                if (is_dir($localFile)) {
+                    $this->zipDir($zip, $localFile, $file);
+                } else {
+                    $this->zipFile($zip, $localFile, $file);
+                }
             }
         }
 
@@ -40,15 +44,17 @@ class ZipIt {
 
     private function zipDir($zip, $localDir, $dir) {
             
-        $zip->addEmptyDir($dir);
+        if ($this->h5ai->getHttpCode($this->h5ai->getAbsHref($localDir)) === "h5ai") {
-        $files = $this->h5ai->readDir($localDir);
+            $zip->addEmptyDir($dir);
-        foreach ($files as $file) {
+            $files = $this->h5ai->readDir($localDir);
-            $localFile = $localDir . "/" . $file;
+            foreach ($files as $file) {
-            $file = $dir . "/" . $file;
+                $localFile = $localDir . "/" . $file;
-            if (is_dir($localFile)) {
+                $file = $dir . "/" . $file;
-                $this->zipDir($zip, $localFile, $file);
+                if (is_dir($localFile)) {
-            } else {
+                    $this->zipDir($zip, $localFile, $file);
-                $this->zipFile($zip, $localFile, $file);
+                } else {
+                    $this->zipFile($zip, $localFile, $file);
+                }
             }
         }
     }

tools/wepp

@@ -0,0 +1,4 @@
+#! /usr/bin/env node
+// -*- js -*-
+
+require("wepp").processArgs(process.argv);

tools/wepp.ant.xml

@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="utf-8"?>
+<project name="wepp.macros" basedir=".">
+
+    <macrodef name="wepp">
+        <attribute name="file" />
+        <attribute name="toFile" />
+        <attribute name="args" default="" />
+        <sequential>
+            <exec executable="${wepp}">
+                <arg line="@{args}" />
+                <arg value="--in" />
+                <arg value="@{file}" />
+                <arg value="--out" />
+                <arg value="@{toFile}" />
+            </exec>
+        </sequential>
+    </macrodef>
+
+    <macrodef name="wepp.dir">
+        <attribute name="dir" />
+        <attribute name="args" default="" />
+        <sequential>
+            <exec executable="${wepp}">
+                <arg line="@{args}" />
+                <arg value="--inDir" />
+                <arg value="@{dir}" />
+                <arg value="--outDir" />
+                <arg value="@{dir}" />
+            </exec>
+            <delete dir="@{dir}/inc">
+                <fileset
+                    dir="."
+                    includes="@{dir}/**/*.less"
+                    excludes="@{dir}/inc/**,@{dir}/lib/**"
+                />
+            </delete>
+        </sequential>
+    </macrodef>
+
+</project>