[Fmsystem-commits] [15468]

[nelson . guerra]

Revision: 15468
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=15468
Author:   nelson224
Date:     2016-08-15 23:13:37 +0000 (Mon, 15 Aug 2016)
Log Message:
-----------


Modified Paths:
--------------
    branches/dev-syncromind-2/property/inc/class.uiimport_components.inc.php

Modified: 
branches/dev-syncromind-2/property/inc/class.uiimport_components.inc.php
===================================================================
--- branches/dev-syncromind-2/property/inc/class.uiimport_components.inc.php    
2016-08-15 17:47:28 UTC (rev 15467)
+++ branches/dev-syncromind-2/property/inc/class.uiimport_components.inc.php    
2016-08-15 23:13:37 UTC (rev 15468)
@@ -48,7 +48,7 @@
                        $this->bocommon = CreateObject('property.bocommon');
                        $this->acl = & $GLOBALS['phpgw']->acl;
                        $this->db = & $GLOBALS['phpgw']->db;
-                       $this->tmp_upload_dir = 
'/var/lib/phpgw/syncromind/test/';
+                       $this->tmp_upload_dir = 
'/var/lib/phpgw/syncromind/tmp_upload/';
 
                        $GLOBALS['phpgw_info']['flags']['menu_selection'] = 
"property::documentation::generic";
                }
@@ -86,6 +86,12 @@
                        
                        $components_added = 
$GLOBALS['phpgw']->session->appsession('components', 'property');
 
+                       if (!count($components_added))
+                       {                       
+                               $message['error'][] = array('msg' => 'not 
stored components');
+                               return $this->jquery_results($message);
+                       }
+                               
                        $exceldata = 
$this->getexceldata($_FILES['file']['tmp_name'], true);
                        $relations = array();
                        
@@ -184,7 +190,7 @@
                        $bofiles->vfs->override_acl = 1;
 
                        $file_id = $bofiles->vfs->cp3(array(
-                                       'from' => $tmp_file,
+                                       'from' => 
$this->tmp_upload_dir.$tmp_file,
                                        'to' => $to_file,
                                        'id' => '',
                                        'relatives' => array(RELATIVE_NONE | 
VFS_REAL, RELATIVE_ALL)));