Changeset 112

Timestamp:

Sep 11, 2014 5:47:47 PM (11 years ago)

Author:

dungnv

Message:

 

File:

• pro-bachkim-filespace/sourcecode/api.violet.vn/www/apps/platform/modules/space/actions/actions.class.php (modified) (4 diffs)

pro-bachkim-filespace/sourcecode/api.violet.vn/www/apps/platform/modules/space/actions/actions.class.php

@@ -26 +26 @@
     $c->add(TblspacecategoryPeer::CAT_NAME, $folderName);
     $category = TblspacecategoryPeer::doSelectOne($c);
-    if ($category == null) {
-      $category = new Tblspacecategory();
-      $category->setCatName($folderName);
-      $category->setCatParent($parentId);
-      $category->setCatUser($userId);
-      $category->setCatDate(date('Y-m-d H:i:s'));
-      $category->save();
-    }
+    if ($category != null) {
+        $folderName = 'Copy of '.$folderName;
+    }
+    
+    $category = new Tblspacecategory();
+    $category->setCatName($folderName);
+    $category->setCatParent($parentId);
+    $category->setCatUser($userId);
+    $category->setCatDate(date('Y-m-d H:i:s'));
+    $category->save();
+    
     return $category->getCatId();
   }
@@ -84 +87 @@
     $c->add(TblspacecategoryPeer::CAT_ID, $dirId);
     $c->add(TblspacecategoryPeer::CAT_USER, $userId);
-    $currentCat = TblspacecategoryPeer::doSelectOne($c);        
+    $currentCat = TblspacecategoryPeer::doSelectOne($c);
         
     $newDir =  $this->CreateSpaceDir($currentCat->getCatName(), $destination, $userId);
@@ -90 +93 @@
     $aryNewTree['DIRECTORIES'][] = $newDir;
 
-    /* if (isset($sourceObj->files)) {
+    if (isset($sourceObj->files)) {
       $aryChidlFiles = $sourceObj->files;
       foreach ($aryChidlFiles as $key => $file) {
         $aryNewTree['FILES'][] = $this->CopySpaceFile();
       }
-    } */
+    }
 
     if (isset($sourceObj->childs)) {
@@ -272 +275 @@
                 if ($treeObj->type == 'directory') {
                         $this->CopySpaceDir($treeObj, $destination, $userId, $aryNewTree);
-                        //$aryNewTree['DIRECTORIES'][] = $treeObj->id;
                 }
                 else {
                         $aryNewTree['FILES'] = $this->CopySpaceFile($treeObj->id, $destination, $userid);
-                        //$aryNewTree['FILES'][] = $treeObj->id;
                 }
         }