Merge remote-tracking branch 'refs/remotes/upstream/master'

Conflicts:
	app/Locale/de_DE/translations.php

1 files changed, 96 insertions, 44 deletions

diff --git a/app/Model/ProjectDuplication.php b/app/Model/ProjectDuplication.php
index f0c66834..9c5f80ad 100644
--- a/app/Model/ProjectDuplication.php
+++ b/app/Model/ProjectDuplication.php
@@ -2,6 +2,8 @@
 
 namespace Kanboard\Model;
 
+use Kanboard\Core\Security\Role;
+
 /**
  * Project Duplication
  *
@@ -12,6 +14,28 @@ namespace Kanboard\Model;
 class ProjectDuplication extends Base
 {
     /**
+     * Get list of optional models to duplicate
+     *
+     * @access public
+     * @return string[]
+     */
+    public function getOptionalSelection()
+    {
+        return array('category', 'projectPermission', 'action', 'swimlane', 'task');
+    }
+
+    /**
+     * Get list of all possible models to duplicate
+     *
+     * @access public
+     * @return string[]
+     */
+    public function getPossibleSelection()
+    {
+        return array('board', 'category', 'projectPermission', 'action', 'swimlane', 'task');
+    }
+
+    /**
      * Get a valid project name for the duplication
      *
      * @access public
@@ -31,78 +55,106 @@ class ProjectDuplication extends Base
     }
 
     /**
-     * Create a project from another one
-     *
-     * @param  integer    $project_id      Project Id
-     * @return integer                     Cloned Project Id
-     */
-    public function copy($project_id)
-    {
-        $project = $this->project->getById($project_id);
-
-        $values = array(
-            'name' => $this->getClonedProjectName($project['name']),
-            'is_active' => true,
-            'last_modified' => 0,
-            'token' => '',
-            'is_public' => 0,
-            'is_private' => empty($project['is_private']) ? 0 : 1,
-        );
-
-        if (! $this->db->table(Project::TABLE)->save($values)) {
-            return 0;
-        }
-
-        return $this->db->getLastId();
-    }
-
-    /**
      * Clone a project with all settings
      *
-     * @param  integer    $project_id       Project Id
-     * @param  array      $part_selection   Selection of optional project parts to duplicate. Possible options: 'swimlane', 'action', 'category', 'task'
-     * @return integer                      Cloned Project Id
+     * @param  integer    $src_project_id       Project Id
+     * @param  array      $selection            Selection of optional project parts to duplicate
+     * @param  integer    $owner_id             Owner of the project
+     * @param  string     $name                 Name of the project
+     * @param  boolean    $private              Force the project to be private
+     * @return integer                          Cloned Project Id
      */
-    public function duplicate($project_id, $part_selection = array('category', 'action'))
+    public function duplicate($src_project_id, $selection = array('projectPermission', 'category', 'action'), $owner_id = 0, $name = null, $private = null)
     {
         $this->db->startTransaction();
 
         // Get the cloned project Id
-        $clone_project_id = $this->copy($project_id);
+        $dst_project_id = $this->copy($src_project_id, $owner_id, $name, $private);
 
-        if (! $clone_project_id) {
+        if ($dst_project_id === false) {
             $this->db->cancelTransaction();
             return false;
         }
 
         // Clone Columns, Categories, Permissions and Actions
-        $optional_parts = array('swimlane', 'action', 'category');
-        foreach (array('board', 'category', 'projectPermission', 'action', 'swimlane') as $model) {
+        foreach ($this->getPossibleSelection() as $model) {
 
             // Skip if optional part has not been selected
-            if (in_array($model, $optional_parts) && ! in_array($model, $part_selection)) {
+            if (in_array($model, $this->getOptionalSelection()) && ! in_array($model, $selection)) {
                 continue;
             }
 
-            if (! $this->$model->duplicate($project_id, $clone_project_id)) {
+            // Skip permissions for private projects
+            if ($private && $model === 'projectPermission') {
+                continue;
+            }
+
+            if (! $this->$model->duplicate($src_project_id, $dst_project_id)) {
                 $this->db->cancelTransaction();
                 return false;
             }
         }
 
+        if (! $this->makeOwnerManager($dst_project_id, $owner_id)) {
+            $this->db->cancelTransaction();
+            return false;
+        }
+
         $this->db->closeTransaction();
 
-        // Clone Tasks if in $part_selection
-        if (in_array('task', $part_selection)) {
-            $tasks = $this->taskFinder->getAll($project_id);
+        return (int) $dst_project_id;
+    }
+
+    /**
+     * Create a project from another one
+     *
+     * @access private
+     * @param  integer    $src_project_id
+     * @param  integer    $owner_id
+     * @param  string     $name
+     * @param  boolean    $private
+     * @return integer
+     */
+    private function copy($src_project_id, $owner_id = 0, $name = null, $private = null)
+    {
+        $project = $this->project->getById($src_project_id);
+        $is_private = empty($project['is_private']) ? 0 : 1;
+
+        $values = array(
+            'name' => $name ?: $this->getClonedProjectName($project['name']),
+            'is_active' => 1,
+            'last_modified' => time(),
+            'token' => '',
+            'is_public' => 0,
+            'is_private' => $private ? 1 : $is_private,
+            'owner_id' => $owner_id,
+        );
+
+        if (! $this->db->table(Project::TABLE)->save($values)) {
+            return false;
+        }
+
+        return $this->db->getLastId();
+    }
+
+    /**
+     * Make sure that the creator of the duplicated project is alsp owner
+     *
+     * @access private
+     * @param  integer $dst_project_id
+     * @param  integer $owner_id
+     * @return boolean
+     */
+    private function makeOwnerManager($dst_project_id, $owner_id)
+    {
+        if ($owner_id > 0) {
+            $this->projectUserRole->removeUser($dst_project_id, $owner_id);
 
-            foreach ($tasks as $task) {
-                if (! $this->taskDuplication->duplicateToProject($task['id'], $clone_project_id)) {
-                    return false;
-                }
+            if (! $this->projectUserRole->addUser($dst_project_id, $owner_id, Role::PROJECT_MANAGER)) {
+                return false;
             }
         }
 
-        return (int) $clone_project_id;
+        return true;
     }
 }