[Fmsystem-commits] [16130] Backport diff from Syncromind to trunk

[sigurdne]

Revision: 16130
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=16130
Author:   sigurdne
Date:     2017-01-01 18:51:30 +0000 (Sun, 01 Jan 2017)
Log Message:
-----------
Backport diff from Syncromind to trunk

Modified Paths:
--------------
    trunk/phpgwapi/inc/class.vfs_sql.inc.php
    trunk/property/inc/class.multiuploader.inc.php
    trunk/property/templates/base/multi_upload_file.xsl

Property Changed:
----------------
    trunk/
    trunk/booking/
    trunk/bookingfrontend/


Property changes on: trunk
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/dev-syncromind:13653
/branches/dev-syncromind-2:14933-16101
/branches/stavangerkommune:12743-12875,12986
   + /branches/dev-syncromind:13653
/branches/dev-syncromind-2:14933-16129
/branches/stavangerkommune:12743-12875,12986


Property changes on: trunk/booking
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/dev-syncromind-2/booking:14933-16101
/branches/stavangerkommune/booking:9468-12740,12743-12875,12986
   + /branches/dev-syncromind-2/booking:14933-16129
/branches/stavangerkommune/booking:9468-12740,12743-12875,12986


Property changes on: trunk/bookingfrontend
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/dev-syncromind-2/bookingfrontend:14933-16101
/branches/stavangerkommune/bookingfrontend:9468-12740,12986
   + /branches/dev-syncromind-2/bookingfrontend:14933-16129
/branches/stavangerkommune/bookingfrontend:9468-12740,12986

Modified: trunk/phpgwapi/inc/class.vfs_sql.inc.php
===================================================================
--- trunk/phpgwapi/inc/class.vfs_sql.inc.php    2017-01-01 18:24:47 UTC (rev 
16129)
+++ trunk/phpgwapi/inc/class.vfs_sql.inc.php    2017-01-01 18:51:30 UTC (rev 
16130)
@@ -1157,7 +1157,7 @@
                        (
                                'owner_id'      => $this->working_id,
                                'directory'     => $p->fake_leading_dirs_clean,
-                               'name'          => $p->fake_name_clean
+                               'name'          => $p->fake_name
                        );
 
                        $cols = implode(',', array_keys($value_set));
@@ -1167,7 +1167,7 @@
                        $query = $GLOBALS['phpgw']->db->query($sql, __LINE__, 
__FILE__);
                        
                        $last_insert_id = 
$GLOBALS['phpgw']->db->get_last_insert_id('phpgw_vfs', 'file_id');
-                       
+
                        $this->set_attributes(array(
                                'string'                => $p->fake_full_path,
                                'relatives'             => array($p->mask),
@@ -1780,7 +1780,7 @@
                        {
                                throw new Exception('nothing to copy from');
                        }
-
+                       
                        if(!is_array($data))
                        {
                                $data = array();
@@ -1919,7 +1919,7 @@
                                                        'relatives'     => 
array($data['relatives'][0])
                                                )
                                        );
-
+ 
                                        if(!$this->acl_check(array(
                                                        'string'        => 
$p->fake_full_path,
                                                        'relatives'     => 
array($p->mask),
@@ -1942,12 +1942,17 @@
                                                }
                                        }
                                        
-                                       $file_name = $t->fake_leading_dirs 
.'/'.$data['id'].'_#' .$t->fake_name_clean;
+                                       $file_name = $t->fake_leading_dirs 
.'/'.$data['id'].'_#' .$t->fake_name;
                                        $t2 = $this->path_parts(array(
                                                        'string'        => 
$file_name,
                                                        'relatives'     => 
array($data['relatives'][1])
                                                )
-                                       );      
+                                       );                                      
        
+
+                                       if (!$this->fileoperation->rename($t, 
$t2))
+                                       {
+                                               return false;
+                                       }
                                                        
                                        $query = 
$GLOBALS['phpgw']->db->query("UPDATE phpgw_vfs SET 
owner_id='{$this->working_id}',"
                                        . " 
directory='{$t2->fake_leading_dirs_clean}',"
@@ -2015,7 +2020,7 @@
                                                                . " 
directory='{$t2->fake_leading_dirs_clean}',"
                                                                . " 
name='{$t2->fake_name_clean}'"
                                                                . " WHERE 
owner_id='{$this->working_id}' AND directory='{$t->fake_leading_dirs_clean}'"
-                                                               . " AND 
name='{$GLOBALS['phpgw']->db->db_addslashes($t->fake_name_clean)}'", __LINE__, 
__FILE__);       
+                                                               . " AND 
name='{$t->fake_name_clean}'", __LINE__, __FILE__);     
 
                                                                $t = $t2;
                                                        }

Modified: trunk/property/inc/class.multiuploader.inc.php
===================================================================
--- trunk/property/inc/class.multiuploader.inc.php      2017-01-01 18:24:47 UTC 
(rev 16129)
+++ trunk/property/inc/class.multiuploader.inc.php      2017-01-01 18:51:30 UTC 
(rev 16130)
@@ -348,4 +348,42 @@
                        return $this->generate_response($response, 
$print_response);
                }
                
+               public function generate_response($content, $print_response = 
true) {
+                       $this->response = $content;
+                       
+                       if ($print_response) 
+                       {
+                               $content_files = 
scandir($this->options['upload_dir']);
+                               $count_files = 0;
+                               foreach($content_files as $key => $value)
+                               {
+                                       $path = 
realpath($this->options['upload_dir'].'/'.$value);
+                                       if(is_file($path)) 
+                                       {                               
+                                               $count_files ++;
+                                       } 
+                               }
+                               $content['num_files'] = $count_files;
+                       
+                               $json = json_encode($content);
+                               $redirect = 
stripslashes($this->get_post_param('redirect'));
+                               if ($redirect && 
preg_match($this->options['redirect_allow_target'], $redirect)) {
+                                       $this->header('Location: 
'.sprintf($redirect, rawurlencode($json)));
+                                       return;
+                               }
+                               $this->head();
+                               if 
($this->get_server_var('HTTP_CONTENT_RANGE')) {
+                                       $files = 
isset($content[$this->options['param_name']]) ?
+                                               
$content[$this->options['param_name']] : null;
+                                       if ($files && is_array($files) && 
is_object($files[0]) && $files[0]->size) {
+                                               $this->header('Range: 0-'.(
+                                                       
$this->fix_integer_overflow((int)$files[0]->size) - 1
+                                               ));
+                                       }
+                               }
+                               $this->body($json);
+                       }
+                       return $content;
+               }
+               
        }
\ No newline at end of file

Modified: trunk/property/templates/base/multi_upload_file.xsl
===================================================================
--- trunk/property/templates/base/multi_upload_file.xsl 2017-01-01 18:24:47 UTC 
(rev 16129)
+++ trunk/property/templates/base/multi_upload_file.xsl 2017-01-01 18:51:30 UTC 
(rev 16130)
@@ -96,7 +96,7 @@
                                //xhrFields: {withCredentials: true},
                                url: '<xsl:value-of 
select="multi_upload_action"/>',
                                limitConcurrentUploads: 4,
-                               maxChunkSize: 10000000000
+                               maxChunkSize: 838855500
                                //acceptFileTypes: /(\.|\/)(png|pdf)$/i
                        });
                                
@@ -110,6 +110,11 @@
                                )
                        );
                                
+                       $('#multi_upload_file')
+                               .bind('fileuploadcompleted', function (e, data) 
{ 
+                               console.log(data.result.num_files);     
+                       });
+                                                               
                        // Load existing files:
                        
$('#multi_upload_file').addClass('fileupload-processing');
                        $.ajax({