3 files changed, 63 insertions, 11 deletions
diff --git a/app/Api/File.php b/app/Api/File.php
index 269803e1..e4204e6d 100644
--- a/app/Api/File.php
+++ b/app/Api/File.php
@@ -2,6 +2,7 @@
 
 namespace Kanboard\Api;
 
+use Kanboard\Core\Base;
 use Kanboard\Core\ObjectStorage\ObjectStorageException;
 
 /**
@@ -10,22 +11,22 @@ use Kanboard\Core\ObjectStorage\ObjectStorageException;
  * @package  api
  * @author   Frederic Guillot
  */
-class File extends \Kanboard\Core\Base
+class File extends Base
 {
-    public function getFile($file_id)
+    public function getTaskFile($file_id)
     {
-        return $this->file->getById($file_id);
+        return $this->taskFile->getById($file_id);
     }
 
-    public function getAllFiles($task_id)
+    public function getAllTaskFiles($task_id)
     {
-        return $this->file->getAll($task_id);
+        return $this->taskFile->getAll($task_id);
     }
 
-    public function downloadFile($file_id)
+    public function downloadTaskFile($file_id)
     {
         try {
-            $file = $this->file->getById($file_id);
+            $file = $this->taskFile->getById($file_id);
 
             if (! empty($file)) {
                 return base64_encode($this->objectStorage->get($file['path']));
@@ -36,23 +37,55 @@ class File extends \Kanboard\Core\Base
         }
     }
 
-    public function createFile($project_id, $task_id, $filename, $blob)
+    public function createTaskFile($project_id, $task_id, $filename, $blob)
     {
         try {
-            return $this->file->uploadContent($project_id, $task_id, $filename, $blob);
+            return $this->taskFile->uploadContent($task_id, $filename, $blob);
         } catch (ObjectStorageException $e) {
             $this->logger->error($e->getMessage());
             return false;
         }
     }
 
+    public function removeTaskFile($file_id)
+    {
+        return $this->taskFile->remove($file_id);
+    }
+
+    public function removeAllTaskFiles($task_id)
+    {
+        return $this->taskFile->removeAll($task_id);
+    }
+
+    // Deprecated procedures
+
+    public function getFile($file_id)
+    {
+        return $this->getTaskFile($file_id);
+    }
+
+    public function getAllFiles($task_id)
+    {
+        return $this->getAllTaskFiles($task_id);
+    }
+
+    public function downloadFile($file_id)
+    {
+        return $this->downloadTaskFile($file_id);
+    }
+
+    public function createFile($project_id, $task_id, $filename, $blob)
+    {
+        return $this->createTaskFile($project_id, $task_id, $filename, $blob);
+    }
+
     public function removeFile($file_id)
     {
-        return $this->file->remove($file_id);
+        return $this->removeTaskFile($file_id);
     }
 
     public function removeAllFiles($task_id)
     {
-        return $this->file->removeAll($task_id);
+        return $this->removeAllTaskFiles($task_id);
     }
 }
diff --git a/app/Api/Me.php b/app/Api/Me.php
index df8ec070..ccc809ed 100644
--- a/app/Api/Me.php
+++ b/app/Api/Me.php
@@ -38,6 +38,10 @@ class Me extends Base
 
     public function createMyPrivateProject($name, $description = null)
     {
+        if ($this->config->get('disable_private_project', 0) == 1) {
+            return false;
+        }
+
         $values = array(
             'name' => $name,
             'description' => $description,
diff --git a/app/Api/User.php b/app/Api/User.php
index 9f26615d..48337ac6 100644
--- a/app/Api/User.php
+++ b/app/Api/User.php
@@ -36,6 +36,21 @@ class User extends \Kanboard\Core\Base
         return $this->user->remove($user_id);
     }
 
+    public function disableUser($user_id)
+    {
+        return $this->user->disable($user_id);
+    }
+
+    public function enableUser($user_id)
+    {
+        return $this->user->enable($user_id);
+    }
+
+    public function isActiveUser($user_id)
+    {
+        return $this->user->isActive($user_id);
+    }
+
     public function createUser($username, $password, $name = '', $email = '', $role = Role::APP_USER)
     {
         $values = array(