ENH: Import now filter cvs folders

Author: Charles Marion

core/controllers/AssetstoreController.php

@@ -78,6 +78,7 @@ function deleteAction()
     $assetstoreId = $this->_getParam("assetstoreId");
     if(isset($assetstoreId))
       {
+      set_time_limit(0); // No time limit since import can take a long time  
       $assetstore = $this->Assetstore->load($assetstoreId);
       if($assetstore != false)
         {

core/controllers/ImportController.php

@@ -104,7 +104,7 @@ private function _recursiveParseDirectory($path, $currentdir)
 
       if($fileInfo->isDir()) // we have a directory
         {
-        if(!file_exists($fileInfo->getPathName()))
+        if(!file_exists($fileInfo->getPathName()) || $fileInfo->getFilename() == 'CVS')
           {
           continue;
           }

core/public/js/admin/admin.index.js

@@ -26,7 +26,7 @@
       {
       var element = $(this).attr('element');
       var html = '';
-      html += 'Do you really want to remove the assetstore? All the items located in it will be delete.';
+      html += 'Do you really want to remove the assetstore? All the items located in it will be delete. (Can take a wihle)';
       html += '<br/>';
       html += '<br/>';
       html += '<input style="margin-left:140px;" class="globalButton deleteAssetstoreYes" element="'+element+'" type="button" value="'+json.global.Yes+'"/>';