Revert "BUG: refs #1055. Uploaded items should inherit parent permissions"

This reverts commit 50c6f93.

Conflicts:
	core/controllers/components/UploadComponent.php

Author: jcfr

core/controllers/components/ApisystemComponent.php

@@ -276,6 +276,9 @@ function linkCreate($args)
             is supplied.
    * @param filename The filename of the file you will upload, will be used as the
             bitstream's name and the item's name (unless <b>itemname</b> is supplied).
+   * @param itemprivacy (Optional)
+            When passing the <b>folderid</b> param, the privacy status of the newly
+            created item, Default 'Public', possible values [Public|Private].
    * @param itemdescription (Optional)
             When passing the <b>folderid</b> param, the description of the item,
             if not supplied the item's description will be blank.
@@ -343,9 +346,19 @@ function uploadGeneratetoken($args)
         {
         throw new Exception('Create new item failed', MIDAS_INTERNAL_ERROR);
         }
-      $itemModel->copyParentPolicies($item, $folder);
       $itempolicyuserModel = MidasLoader::loadModel('Itempolicyuser');
       $itempolicyuserModel->createPolicy($userDao, $item, MIDAS_POLICY_ADMIN);
+
+      if(isset($args['itemprivacy']))
+        {
+        $privacyCode = $apihelperComponent->getValidPrivacyCode($args['itemprivacy']);
+        }
+      else
+        {
+        // Public by default
+        $privacyCode = MIDAS_PRIVACY_PUBLIC;
+        }
+      $apihelperComponent->setItemPrivacy($item, $privacyCode);
       }
 
     if(array_key_exists('checksum', $args))

core/controllers/components/UploadComponent.php

@@ -20,7 +20,8 @@
 
 /** This class handles the upload of files into the different assetstores */
 class UploadComponent extends AppComponent
-  {
+{
+
   /** Helper function to create the two-level hierarchy */
   private function _createAssetstoreDirectory($directorypath)
     {
@@ -118,9 +119,14 @@ function uploadBitstream($bitstreamdao, $assetstoredao, $copy = false)
   public function createLinkItem($userDao, $name, $url, $parent = null, $sizebytes = 0, $checksum = ' ')
     {
     $itemModel = MidasLoader::loadModel('Item');
+    $feedModel = MidasLoader::loadModel('Feed');
     $folderModel = MidasLoader::loadModel('Folder');
+    $bitstreamModel = MidasLoader::loadModel('Bitstream');
     $assetstoreModel = MidasLoader::loadModel('Assetstore');
+    $feedpolicygroupModel = MidasLoader::loadModel('Feedpolicygroup');
     $itemRevisionModel = MidasLoader::loadModel('ItemRevision');
+    $feedpolicyuserModel = MidasLoader::loadModel('Feedpolicyuser');
+    $itempolicyuserModel = MidasLoader::loadModel('Itempolicyuser');
 
     if($userDao == null)
       {
@@ -146,13 +152,13 @@ public function createLinkItem($userDao, $name, $url, $parent = null, $sizebytes
     $item->setPrivacyStatus(MIDAS_PRIVACY_PRIVATE); // Must set this flag private initially
     $itemModel->save($item, false);
 
-    //$feed = $feedModel->createFeed($userDao, MIDAS_FEED_CREATE_ITEM, $item);
+    $feed = $feedModel->createFeed($userDao, MIDAS_FEED_CREATE_ITEM, $item);
 
     $folderModel->addItem($parent, $item);
-    $itemModel->copyParentPolicies($item, $parent /*, $feed*/);
+    $itemModel->copyParentPolicies($item, $parent, $feed);
 
-    //$feedpolicyuserModel->createPolicy($userDao, $feed, MIDAS_POLICY_ADMIN);
-    //$itempolicyuserModel->createPolicy($userDao, $item, MIDAS_POLICY_ADMIN);
+    $feedpolicyuserModel->createPolicy($userDao, $feed, MIDAS_POLICY_ADMIN);
+    $itempolicyuserModel->createPolicy($userDao, $item, MIDAS_POLICY_ADMIN);
 
     Zend_Loader::loadClass('ItemRevisionDao', BASE_PATH . '/core/models/dao');
     $itemRevisionDao = new ItemRevisionDao;
@@ -194,9 +200,13 @@ public function createLinkItem($userDao, $name, $url, $parent = null, $sizebytes
   public function createUploadedItem($userDao, $name, $path, $parent = null, $license = null, $filemd5 = '', $copy = false, $revOnCollision = false)
     {
     $itemModel = MidasLoader::loadModel('Item');
+    $feedModel = MidasLoader::loadModel('Feed');
     $folderModel = MidasLoader::loadModel('Folder');
+    $bitstreamModel = MidasLoader::loadModel('Bitstream');
     $assetstoreModel = MidasLoader::loadModel('Assetstore');
+    $feedpolicygroupModel = MidasLoader::loadModel('Feedpolicygroup');
     $itemRevisionModel = MidasLoader::loadModel('ItemRevision');
+    $feedpolicyuserModel = MidasLoader::loadModel('Feedpolicyuser');
     $itempolicyuserModel = MidasLoader::loadModel('Itempolicyuser');
 
     if($userDao == null)
@@ -235,11 +245,11 @@ public function createUploadedItem($userDao, $name, $path, $parent = null, $lice
 
       $folderModel->addItem($parent, $item);
 
-      //$feed = $feedModel->createFeed($userDao, MIDAS_FEED_CREATE_ITEM, $item);
+      $feed = $feedModel->createFeed($userDao, MIDAS_FEED_CREATE_ITEM, $item);
 
-      $itemModel->copyParentPolicies($item, $parent /*, $feed*/);
+      $itemModel->copyParentPolicies($item, $parent, $feed);
       $itempolicyuserModel->createPolicy($userDao, $item, MIDAS_POLICY_ADMIN);
-      //$feedpolicyuserModel->createPolicy($userDao, $feed, MIDAS_POLICY_ADMIN);
+      $feedpolicyuserModel->createPolicy($userDao, $feed, MIDAS_POLICY_ADMIN);
       $this->getLogger()->debug('Item uploaded ('.$item->getName().', id='.$item->getKey().')');
       }
 
@@ -295,9 +305,12 @@ public function createNewRevision($userDao, $name, $path, $changes, $itemId, $it
       }
 
     $itemModel = MidasLoader::loadModel('Item');
+    $feedModel = MidasLoader::loadModel('Feed');
     $bitstreamModel = MidasLoader::loadModel('Bitstream');
     $assetstoreModel = MidasLoader::loadModel('Assetstore');
+    $feedpolicygroupModel = MidasLoader::loadModel('Feedpolicygroup');
     $itemRevisionModel = MidasLoader::loadModel('ItemRevision');
+    $feedpolicyuserModel = MidasLoader::loadModel('Feedpolicyuser');
 
     $item = $itemModel->load($itemId);
 
@@ -334,6 +347,24 @@ public function createNewRevision($userDao, $name, $path, $changes, $itemId, $it
       $itemRevisionDao->setDate(date("Y-m-d H:i:s"));
       $itemRevisionDao->setLicenseId($license);
       $itemModel->addRevision($item, $itemRevisionDao);
+
+      $feed = $feedModel->createFeed($userDao, MIDAS_FEED_CREATE_REVISION, $itemRevisionDao);
+
+      $groupPolicies = $item->getItempolicygroup();
+      $userPolicies = $item->getItempolicyuser();
+
+      //copy policies
+      if($feed != null && $feed instanceof FeedDao)
+        {
+        foreach($groupPolicies as $key => $policy)
+          {
+          $feedpolicygroupModel->createPolicy($policy->getGroup(), $feed, $policy->getPolicy());
+          }
+        foreach($userPolicies as $key => $policy)
+          {
+          $feedpolicyuserModel->createPolicy($policy->getUser(), $feed, $policy->getPolicy());
+          }
+        }
       }
     else
       {