[Fmsystem-commits] [15961]

[nelson . guerra]

Revision: 15961
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=15961
Author:   nelson224
Date:     2016-11-08 00:01:38 +0000 (Tue, 08 Nov 2016)
Log Message:
-----------


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

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
  2016-11-07 15:36:19 UTC (rev 15960)
+++ 
branches/dev-syncromind-2/property/inc/import/class.import_component_files.inc.php
  2016-11-08 00:01:38 UTC (rev 15961)
@@ -218,10 +218,41 @@
                        }
                }
                
+               private function _un_zip($file, $dir)
+               {
+                       $zip = new ZipArchive;
+                       if ($zip->open($file) === TRUE) 
+                       {
+                               $zip->extractTo($dir);
+                               $zip->close();
+                               return true;
+                       } else {
+                               return false;
+                       }
+               }
+               
+               private function _un_rar($file, $dir)
+               {
+                       $archive = RarArchive::open($file);
+                       $entries = $archive->getEntries();
+                       foreach ($entries as $entry) {
+                               $entry->extract($dir);
+                       }
+                       $archive->close();      
+                       
+                       /*$rar_file = rar_open($file);
+                       $entries = rar_list($rar_file);
+                       foreach ($entries as $entry) {
+                               $entry->extract($dir);
+                       }
+                       rar_close($rar_file);*/
+               }
+               
                private function _get_uploaded_files()
                {
                        $file = 'Dokumentasjon.zip';
-                       $dir = 'Dokumentasjon';
+                       $info = pathinfo($this->path_upload_dir.$file);
+                       $dir = $info['filename'];
                        
                        if (is_dir($this->path_upload_dir.$dir))
                        {
@@ -229,15 +260,16 @@
                        }
                        else if (is_file($this->path_upload_dir.$file))
                        {
-                               $zip = new ZipArchive;
-                               if ($zip->open($this->path_upload_dir.$file) 
=== TRUE) 
+                               if ($info['extension'] == 'zip')
                                {
-                                       
$zip->extractTo($this->path_upload_dir.$dir);
-                                       $zip->close();
-                                       $list_files  = 
$this->_get_dir_contents($this->path_upload_dir.$dir);
-                               } else {
-                                       $list_files  = array();
+                                       
$this->_un_zip($this->path_upload_dir.$file, $this->path_upload_dir.$dir);
+                               } 
+                               else if ($info['extension'] == 'rar')
+                               {
+                                       
$this->_un_rar($this->path_upload_dir.$file, $this->path_upload_dir.$dir);
                                }
+                               
+                               $list_files  = 
$this->_get_dir_contents($this->path_upload_dir.$dir);
                        }       
 
                        return $list_files;
@@ -284,7 +316,7 @@
                        $message = array();
        
                        $uploaded_files = $this->_get_uploaded_files();
-                       
+
                        $patrones = array('(\\/)', '(\\\\)', '(")');
                        $sustituciones = array('_', '_', '_');
                        foreach ($exceldata as $k => $row)