Changeset 3507 for trunk/www/filemanager/upload/select.jsp

Timestamp:

Jun 18, 2007, 1:51:34 PM (16 years ago)

Author:

Nicklas Nordborg

Message:

References #470. Upload form can now handle file names with double extensions, for example .tar.gz

File:

• trunk/www/filemanager/upload/select.jsp (modified) (3 diffs)

trunk/www/filemanager/upload/select.jsp

@@ -215 +215 @@
       var isZip = false;
       var zipIndex = 0;
-      var dotIndex = filename.lastIndexOf('.');
-      if (dotIndex != -1)
-      {
-        var ext = filename.substr(dotIndex+1);
-        var zf = allExtensions[ext];
-        if (zf)
+      
+      for (var i = 0; i < allZipFormats.length; i++)
+      {
+        var zf = allZipFormats[i];
+        if (zf.matchesExtension(filename))
         {
           isZip = true;
           zipIndex = zf.index;
+          i = allZipFormats.length;
         }
       }
+      
       if (frm.temp_zip_format)
       {
@@ -296 +297 @@
     
     var allZipFormats = new Array();
-    var allExtensions = new Array();
     function ZipFormat(index, id, name, extensions)
     {
@@ -304 +304 @@
       this.extensions = extensions;
       
-      allZipFormats[allZipFormats] = this;
-      // Map extension to ZipFormat object
-      if (extensions && extensions.length)
-      {
-        for (var i = 0; i < extensions.length; i++)
+      allZipFormats[allZipFormats.length] = this;
+      
+      this.matchesExtension = function(filename)
+      {
+        for (var i = 0; i < this.extensions.length; i++)
         {
-          var ext = extensions[i];
-          if (!allExtensions[ext]) allExtensions[ext] = this;
-        }
-      }
-      
-      this.matchesExtension = function(filename)
-      {
-        var dotIndex = filename.lastIndexOf('.');
-        if (dotIndex != -1)
-        {
-          var ext = filename.substr(dotIndex+1);
-          for (var i = 0; i < this.extensions.length; i++)
+          var ext = '.' + this.extensions[i];
+          var index = filename.lastIndexOf(ext);
+          if (index > 0 && (index + ext.length == filename.length))
           {
-            if (ext == this.extensions[i]) return true;
+            return true;
           }
         }