[Fmsystem-commits] [16137] fix upload and filenames on extract

[sigurdne]

Revision: 16137
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=16137
Author:   sigurdne
Date:     2017-01-03 18:18:26 +0000 (Tue, 03 Jan 2017)
Log Message:
-----------
fix upload and filenames on extract

Modified Paths:
--------------
    
branches/dev-syncromind-2/property/inc/import/class.import_component_files.inc.php
    branches/dev-syncromind-2/property/templates/base/multi_upload_file.xsl

Modified: 
branches/dev-syncromind-2/property/inc/import/class.import_component_files.inc.php
===================================================================
--- 
branches/dev-syncromind-2/property/inc/import/class.import_component_files.inc.php
  2017-01-03 17:50:05 UTC (rev 16136)
+++ 
branches/dev-syncromind-2/property/inc/import/class.import_component_files.inc.php
  2017-01-03 18:18:26 UTC (rev 16137)
@@ -245,7 +245,8 @@
                        {
                                for($i = 0; $i < $zip->numFiles; $i++) 
                                {
-                                       $file_name = str_replace('..', '.', 
iconv("CP850", "UTF-8", $zip->getNameIndex($i)));
+//                                     $file_name = str_replace('..', '.', 
iconv("CP850", "UTF-8", $zip->getNameIndex($i)));
+                                       $file_name = str_replace('..', '.', 
$zip->getNameIndex($i));
                                        $copy_to = $dir.'/'.$file_name;
                                        if (!is_dir(dirname($copy_to)))
                                        {

Modified: 
branches/dev-syncromind-2/property/templates/base/multi_upload_file.xsl
===================================================================
--- branches/dev-syncromind-2/property/templates/base/multi_upload_file.xsl     
2017-01-03 17:50:05 UTC (rev 16136)
+++ branches/dev-syncromind-2/property/templates/base/multi_upload_file.xsl     
2017-01-03 18:18:26 UTC (rev 16137)
@@ -99,7 +99,8 @@
                                //xhrFields: {withCredentials: true},
                                url: '<xsl:value-of 
select="multi_upload_action"/>',
                                limitConcurrentUploads: 4,
-                               maxChunkSize: 838855500
+                       //      maxChunkSize: 838855500
+                               maxChunkSize: 8388000
                                //acceptFileTypes: /(\.|\/)(png|pdf)$/i
                        });