ENH: fixed bug #296 Added folder upload

Only works using chrome browser

Author: Charles Ma

core/controllers/UploadController.php

@@ -13,7 +13,7 @@
 /** Upload Controller */
 class UploadController extends AppController
   {
-  public $_models = array('Assetstore', 'User', 'Item', 'ItemRevision', 'Folder', 'Itempolicyuser', 'Itempolicygroup', 'Group', 'Feed', "Feedpolicygroup", "Feedpolicyuser", 'Bitstream', 'Assetstore');
+  public $_models = array('Folderpolicygroup', 'Folderpolicyuser', 'Assetstore', 'User', 'Item', 'ItemRevision', 'Folder', 'Itempolicyuser', 'Itempolicygroup', 'Group', 'Feed', "Feedpolicygroup", "Feedpolicyuser", 'Bitstream', 'Assetstore');
   public $_daos = array('Assetstore', 'User', 'Item', 'ItemRevision', 'Bitstream', 'Folder');
   public $_components = array('Httpupload', 'Upload');
   public $_forms = array('Upload');
@@ -242,6 +242,7 @@ public function saveuploadedAction()
 
     $this->disableLayout();
     $this->disableView();
+    $pathClient = $this->_getParam("path");
 
     if($this->isTestingEnv())
       {
@@ -259,6 +260,19 @@ public function saveuploadedAction()
       $filename = $upload->getFilename(null, false);
       }
 
+    if(!empty($pathClient))
+      {
+      $tmpArray = split(';;', $pathClient);
+      foreach($tmpArray as $value)
+        {
+        if(strpos($value, $filename) !== false)
+          {
+          $pathClient = $value;
+          break;
+          }
+        }
+      }
+      
     $parent = $this->_getParam("parent");
     $license = $this->_getParam("license");
     if(!empty($path) && file_exists($path) && $file_size > 0)
@@ -271,6 +285,40 @@ public function saveuploadedAction()
         }
       else
         {
+        if(!empty($pathClient))
+          {
+          $parentDao = $this->Folder->load($parent);
+          $this->getLogger()->info($pathClient);
+          $folders = split('/', $pathClient);
+          unset($folders[count($folders) - 1]);
+          foreach($folders as $folderName)
+            {
+            if($this->Folder->getFolderExists($folderName, $parentDao))
+              {
+              $parentDao = $this->Folder->getFolderByName($parentDao, $folderName);
+              }
+            else
+              {
+              $new_folder = $this->Folder->createFolder($folderName, '', $parentDao);
+              $policyGroup = $parentDao->getFolderpolicygroup();
+              $policyUser = $parentDao->getFolderpolicyuser();
+              foreach($policyGroup as $policy)
+                {
+                $group = $policy->getGroup();
+                $policyValue = $policy->getPolicy();
+                $this->Folderpolicygroup->createPolicy($group, $new_folder, $policyValue);
+                }
+              foreach($policyUser as $policy)
+                {
+                $user = $policy->getUser();
+                $policyValue = $policy->getPolicy();
+                $this->Folderpolicyuser->createPolicy($user, $new_folder, $policyValue);
+                }
+              $parentDao = $new_folder;
+              }
+            }
+          $parent = $parentDao->getKey();
+          }
         $item = $this->Component->Upload->createUploadedItem($this->userSession->Dao, $filename, $path, $parent, $license);
         $this->userSession->uploaded[] = $item->getKey();
         }

core/public/js/upload/upload.simpleupload.js

@@ -10,6 +10,46 @@
         //uploadStart(file);
       }
 
+    // detect chrom or firefox 7+
+    try {
+        var is_chrome = /chrome/.test( navigator.userAgent.toLowerCase() );
+        var version = jQuery.browser.version.split('.');
+        version = parseInt(version[0]);
+        var is_firefox = jQuery.browser.mozilla != undefined && version > 6;  
+    
+        if(is_chrome)
+          {
+          $('#changeUploadMode').show();
+          }
+        } catch (exception) { }
+
+    var mode = "file";
+    var htmlFileMode = $('.file_upload_label').html();
+    var htmlFolderMode = $('.file_upload_label_folder').html();
+    $('#uploadModeFileLink').hide();
+    $('.uploadModeLink').click(function(){
+      if(mode == 'file')
+        {
+        mode = 'folder'; 
+        $('#fileUploaderInput').attr('webkitdirectory', '');
+        $('#fileUploaderInput').attr('directory', '');
+        $('#fileUploaderInput').attr('mozdirectory', '');
+        $('.file_upload_label').html(htmlFolderMode);
+        $('#uploadModeFileLink').show();
+        $('#uploadModeFolderLink').hide();
+        }
+      else
+        {
+        mode = 'file'; 
+        $('#fileUploaderInput').removeAttr('webkitdirectory');
+        $('#fileUploaderInput').removeAttr('directory');
+        $('#fileUploaderInput').removeAttr('mozdirectory');
+        $('.file_upload_label').html(htmlFileMode);
+        $('#uploadModeFileLink').hide();
+        $('#uploadModeFolderLink').show();
+        }
+    });
+    
 
 		$( "#uploadTabs" ).tabs({
 			ajaxOptions: {
@@ -78,12 +118,23 @@
         $('#file_upload').fileUploadUIX({
           beforeSend: function (event, files, index, xhr, handler, callBack) {
             handler.uploadRow.find('.file_upload_start').click(function () {
+              var path = '';
+              $.each(files, function (index, file) {
+                    path += file.webkitRelativePath+';;';
+                });
                 handler.formData = {
                     parent: $('#destinationId').val(),
+                    path: path,
                     license: $('select[name=licenseSelect]').val()
                 };
                 callBack();
             });
+          $('.file_name').each(function(){
+            if($(this).html() == '.' || $(this).html() == '..'  )
+              {
+              $(this).parent('tr').find('.file_upload_cancel button').click();
+              }
+          });
           },
          onComplete:  function (event, files, index, xhr, handler) {
               $('.uploadedSimple').val(parseInt($('.uploadedSimple').val())+1);

core/translation/fr-main.csv

@@ -255,4 +255,7 @@ Add Metadata;Ajouter M
 Name of the folder;Nom du r�pertoire
 Optional;Optionel
 Teaser;Courte descriptionMy Language;Ma Langue
-Delete the post;Supprimer la publication
+Delete the post;Supprimer la publication
+or;ou
+upload a folder;ajouter un r�pertoire
+upload files;ajouter des fichiers

core/views/upload/simpleupload.phtml

@@ -26,10 +26,16 @@ PURPOSE.  See the above copyright notices for more information.
       <div id="jqueryFileUploadContent">
         <div id="file_upload">
             <form action="<?php echo $this->webroot?>/upload/saveuploaded" method="POST" enctype="multipart/form-data">
-                <input type="file" name="file[]" multiple>
+                <input id="fileUploaderInput" type="file" name="file[]" multiple>
                 <button type="submit">Upload</button>
                 <div class="file_upload_label"><?php echo $this->t('Browse or drop files')?></div>
+                <div class="file_upload_label_folder"><?php echo $this->t('Browse')?></div>
             </form>
+            <div id="changeUploadMode" style="display:none;">
+              <br/>
+              <?php echo $this->t('or')?> <a style="color:blue; cursor:pointer;" class="uploadModeLink" id="uploadModeFolderLink"><?php echo $this->t('upload a folder')?></a>
+              <a style="color:#56758B; cursor:pointer;" class="uploadModeLink" id="uploadModeFileLink"><?php echo $this->t('upload files')?></a>
+            </div>
             <table class="files">
                 <tr class="file_upload_template" style="display:none;">
                     <td class="file_name"></td>
@@ -142,6 +148,4 @@ PURPOSE.  See the above copyright notices for more information.
       <?php
       }
 ?>
-<script type="text/javascript" src="<?php echo $this->coreWebroot?>/public/js/upload/upload.simpleupload.js"></script>
-
-
+<script type="text/javascript" src="<?php echo $this->coreWebroot?>/public/js/upload/upload.simpleupload.js"></script>