Fix cosmetic issues and update api documentation

11 files changed, 246 insertions, 273 deletions

diff --git a/ChangeLog b/ChangeLog
index 190a57ad..11dbbfb4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,10 @@
 Version 1.0.26 (unreleased)
 --------------
 
+Breaking changes:
+
+* API procedures: "moveColumnUp" and "moveColumnDown" are replace by "changeColumnPosition"
+
 New features:
 
 * Add drag and drop to change subtasks and columns positions
diff --git a/app/Api/File.php b/app/Api/File.php
index e4204e6d..71c31c76 100644
--- a/app/Api/File.php
+++ b/app/Api/File.php
@@ -2,7 +2,6 @@
 
 namespace Kanboard\Api;
 
-use Kanboard\Core\Base;
 use Kanboard\Core\ObjectStorage\ObjectStorageException;
 
 /**
diff --git a/app/Api/Task.php b/app/Api/Task.php
index f132bcd6..177a09c6 100644
--- a/app/Api/Task.php
+++ b/app/Api/Task.php
@@ -75,9 +75,9 @@ class Task extends Base
     }
 
     public function createTask($title, $project_id, $color_id = '', $column_id = 0, $owner_id = 0, $creator_id = 0,
-                               $date_due = '', $description = '', $category_id = 0, $score = 0, $swimlane_id = 0,
-                               $recurrence_status = 0, $recurrence_trigger = 0, $recurrence_factor = 0, $recurrence_timeframe = 0,
-                               $recurrence_basedate = 0, $reference = '')
+                                $date_due = '', $description = '', $category_id = 0, $score = 0, $swimlane_id = 0,
+                                $recurrence_status = 0, $recurrence_trigger = 0, $recurrence_factor = 0, $recurrence_timeframe = 0,
+                                $recurrence_basedate = 0, $reference = '')
     {
         $this->checkProjectPermission($project_id);
 
@@ -115,9 +115,9 @@ class Task extends Base
     }
 
     public function updateTask($id, $title = null, $color_id = null, $owner_id = null,
-                               $date_due = null, $description = null, $category_id = null, $score = null,
-                               $recurrence_status = null, $recurrence_trigger = null, $recurrence_factor = null,
-                               $recurrence_timeframe = null, $recurrence_basedate = null, $reference = null)
+                                $date_due = null, $description = null, $category_id = null, $score = null,
+                                $recurrence_status = null, $recurrence_trigger = null, $recurrence_factor = null,
+                                $recurrence_timeframe = null, $recurrence_basedate = null, $reference = null)
     {
         $this->checkTaskPermission($id);
 
diff --git a/app/Controller/Auth.php b/app/Controller/Auth.php
index b98dff5d..46b5a546 100644
--- a/app/Controller/Auth.php
+++ b/app/Controller/Auth.php
@@ -58,8 +58,7 @@ class Auth extends Base
         if (! DISABLE_LOGOUT) {
             $this->sessionManager->close();
             $this->response->redirect($this->helper->url->to('auth', 'login'));
-        }
-        else {
+        } else {
             $this->response->redirect($this->helper->url->to('auth', 'index'));
         }
     }
diff --git a/app/Core/Base.php b/app/Core/Base.php
index 31c07355..f1053114 100644
--- a/app/Core/Base.php
+++ b/app/Core/Base.php
@@ -63,6 +63,7 @@ use Pimple\Container;
  * @property \Kanboard\Model\Board                                      $board
  * @property \Kanboard\Model\Category                                   $category
  * @property \Kanboard\Model\Color                                      $color
+ * @property \Kanboard\Model\Column                                     $column
  * @property \Kanboard\Model\Comment                                    $comment
  * @property \Kanboard\Model\Config                                     $config
  * @property \Kanboard\Model\Currency                                   $currency
diff --git a/app/Model/Board.php b/app/Model/Board.php
index f677266f..c10be19f 100644
--- a/app/Model/Board.php
+++ b/app/Model/Board.php
@@ -2,8 +2,6 @@
 
 namespace Kanboard\Model;
 
-use PicoDb\Database;
-
 /**
  * Board model
  *
diff --git a/app/Model/LastLogin.php b/app/Model/LastLogin.php
index a1734819..feb5f5a3 100644
--- a/app/Model/LastLogin.php
+++ b/app/Model/LastLogin.php
@@ -65,9 +65,9 @@ class LastLogin extends Base
 
         if (count($connections) >= self::NB_LOGINS) {
             $this->db->table(self::TABLE)
-                     ->eq('user_id', $user_id)
-                     ->notin('id', array_slice($connections, 0, self::NB_LOGINS - 1))
-                     ->remove();
+                ->eq('user_id', $user_id)
+                ->notin('id', array_slice($connections, 0, self::NB_LOGINS - 1))
+                ->remove();
         }
     }
 
diff --git a/app/Model/User.php b/app/Model/User.php
index e2494c4c..2d87d35b 100644
--- a/app/Model/User.php
+++ b/app/Model/User.php
@@ -137,7 +137,7 @@ class User extends Base
      *
      * @access public
      * @param  string  $username  Username
-     * @return array
+     * @return integer
      */
     public function getIdByUsername($username)
     {
diff --git a/doc/api-board-procedures.markdown b/doc/api-board-procedures.markdown
index d8503d6d..6f8a878e 100644
--- a/doc/api-board-procedures.markdown
+++ b/doc/api-board-procedures.markdown
@@ -156,261 +156,3 @@ Response example:
     ]
 }
 ```
-
-## getColumns
-
-- Purpose: **Get all columns information for a given project**
-- Parameters:
-    - **project_id** (integer, required)
-- Result on success: **columns properties**
-- Result on failure: **empty list**
-
-Request example:
-
-```json
-{
-    "jsonrpc": "2.0",
-    "method": "getColumns",
-    "id": 887036325,
-    "params": [
-        1
-    ]
-}
-```
-
-Response example:
-
-```json
-{
-    "jsonrpc": "2.0",
-    "id": 887036325,
-    "result": [
-        {
-            "id": "1",
-            "title": "Backlog",
-            "position": "1",
-            "project_id": "1",
-            "task_limit": "0"
-        },
-        {
-            "id": "2",
-            "title": "Ready",
-            "position": "2",
-            "project_id": "1",
-            "task_limit": "0"
-        },
-        {
-            "id": "3",
-            "title": "Work in progress",
-            "position": "3",
-            "project_id": "1",
-            "task_limit": "0"
-        }
-    ]
-}
-```
-
-## getColumn
-
-- Purpose: **Get a single column**
-- Parameters:
-    - **column_id** (integer, required)
-- Result on success: **column properties**
-- Result on failure: **null**
-
-Request example:
-
-```json
-{
-    "jsonrpc": "2.0",
-    "method": "getColumn",
-    "id": 1242049935,
-    "params": [
-        2
-    ]
-}
-```
-
-Response example:
-
-```json
-{
-    "jsonrpc": "2.0",
-    "id": 1242049935,
-    "result": {
-        "id": "2",
-        "title": "Youpi",
-        "position": "2",
-        "project_id": "1",
-        "task_limit": "5"
-    }
-}
-```
-
-## moveColumnUp
-
-- Purpose: **Move up the column position**
-- Parameters:
-    - **project_id** (integer, required)
-    - **column_id** (integer, required)
-- Result on success: **true**
-- Result on failure: **false**
-
-Request example:
-
-```json
-{
-    "jsonrpc": "2.0",
-    "method": "moveColumnUp",
-    "id": 99275573,
-    "params": [
-        1,
-        2
-    ]
-}
-```
-
-Response example:
-
-```json
-{
-    "jsonrpc": "2.0",
-    "id": 99275573,
-    "result": true
-}
-```
-
-## moveColumnDown
-
-- Purpose: **Move down the column position**
-- Parameters:
-    - **project_id** (integer, required)
-    - **column_id** (integer, required)
-- Result on success: **true**
-- Result on failure: **false**
-
-Request example:
-
-```json
-{
-    "jsonrpc": "2.0",
-    "method": "moveColumnDown",
-    "id": 957090649,
-    "params": {
-        "project_id": 1,
-        "column_id": 2
-    }
-}
-```
-
-Response example:
-
-```json
-{
-    "jsonrpc": "2.0",
-    "id": 957090649,
-    "result": true
-}
-```
-
-## updateColumn
-
-- Purpose: **Update column properties**
-- Parameters:
-    - **column_id** (integer, required)
-    - **title** (string, required)
-    - **task_limit** (integer, optional)
-    - **description** (string, optional)
-- Result on success: **true**
-- Result on failure: **false**
-
-Request example:
-
-```json
-{
-    "jsonrpc": "2.0",
-    "method": "updateColumn",
-    "id": 480740641,
-    "params": [
-        2,
-        "Boo",
-        5
-    ]
-}
-```
-
-Response example:
-
-```json
-{
-    "jsonrpc": "2.0",
-    "id": 480740641,
-    "result": true
-}
-```
-
-## addColumn
-
-- Purpose: **Add a new column**
-- Parameters:
-    - **project_id** (integer, required)
-    - **title** (string, required)
-    - **task_limit** (integer, optional)
-    - **description** (string, optional)
-- Result on success: **column_id**
-- Result on failure: **false**
-
-Request example:
-
-```json
-{
-    "jsonrpc": "2.0",
-    "method": "addColumn",
-    "id": 638544704,
-    "params": [
-        1,
-        "Boo"
-    ]
-}
-```
-
-Response example:
-
-```json
-{
-    "jsonrpc": "2.0",
-    "id": 638544704,
-    "result": 5
-}
-```
-
-## removeColumn
-
-- Purpose: **Remove a column**
-- Parameters:
-    - **column_id** (integer, required)
-- Result on success: **true**
-- Result on failure: **false**
-
-Request example:
-
-```json
-{
-    "jsonrpc": "2.0",
-    "method": "removeColumn",
-    "id": 1433237746,
-    "params": [
-        1
-    ]
-}
-```
-
-Response example:
-
-```json
-{
-    "jsonrpc": "2.0",
-    "id": 1433237746,
-    "result": true
-}
-```
diff --git a/doc/api-column-procedures.markdown b/doc/api-column-procedures.markdown
new file mode 100644
index 00000000..5bae7f76
--- /dev/null
+++ b/doc/api-column-procedures.markdown
@@ -0,0 +1,229 @@
+API Column Procedures
+=====================
+
+## getColumns
+
+- Purpose: **Get all columns information for a given project**
+- Parameters:
+    - **project_id** (integer, required)
+- Result on success: **columns properties**
+- Result on failure: **empty list**
+
+Request example:
+
+```json
+{
+    "jsonrpc": "2.0",
+    "method": "getColumns",
+    "id": 887036325,
+    "params": [
+        1
+    ]
+}
+```
+
+Response example:
+
+```json
+{
+    "jsonrpc": "2.0",
+    "id": 887036325,
+    "result": [
+        {
+            "id": "1",
+            "title": "Backlog",
+            "position": "1",
+            "project_id": "1",
+            "task_limit": "0"
+        },
+        {
+            "id": "2",
+            "title": "Ready",
+            "position": "2",
+            "project_id": "1",
+            "task_limit": "0"
+        },
+        {
+            "id": "3",
+            "title": "Work in progress",
+            "position": "3",
+            "project_id": "1",
+            "task_limit": "0"
+        }
+    ]
+}
+```
+
+## getColumn
+
+- Purpose: **Get a single column**
+- Parameters:
+    - **column_id** (integer, required)
+- Result on success: **column properties**
+- Result on failure: **null**
+
+Request example:
+
+```json
+{
+    "jsonrpc": "2.0",
+    "method": "getColumn",
+    "id": 1242049935,
+    "params": [
+        2
+    ]
+}
+```
+
+Response example:
+
+```json
+{
+    "jsonrpc": "2.0",
+    "id": 1242049935,
+    "result": {
+        "id": "2",
+        "title": "Youpi",
+        "position": "2",
+        "project_id": "1",
+        "task_limit": "5"
+    }
+}
+```
+
+## changeColumnPosition
+
+- Purpose: **Change the column position**
+- Parameters:
+    - **project_id** (integer, required)
+    - **column_id** (integer, required)
+    - **position** (integer, required)
+- Result on success: **true**
+- Result on failure: **false**
+
+Request example:
+
+```json
+{
+    "jsonrpc": "2.0",
+    "method": "changeColumnPosition",
+    "id": 99275573,
+    "params": [
+        1,
+        2,
+        3
+    ]
+}
+```
+
+Response example:
+
+```json
+{
+    "jsonrpc": "2.0",
+    "id": 99275573,
+    "result": true
+}
+```
+
+## updateColumn
+
+- Purpose: **Update column properties**
+- Parameters:
+    - **column_id** (integer, required)
+    - **title** (string, required)
+    - **task_limit** (integer, optional)
+    - **description** (string, optional)
+- Result on success: **true**
+- Result on failure: **false**
+
+Request example:
+
+```json
+{
+    "jsonrpc": "2.0",
+    "method": "updateColumn",
+    "id": 480740641,
+    "params": [
+        2,
+        "Boo",
+        5
+    ]
+}
+```
+
+Response example:
+
+```json
+{
+    "jsonrpc": "2.0",
+    "id": 480740641,
+    "result": true
+}
+```
+
+## addColumn
+
+- Purpose: **Add a new column**
+- Parameters:
+    - **project_id** (integer, required)
+    - **title** (string, required)
+    - **task_limit** (integer, optional)
+    - **description** (string, optional)
+- Result on success: **column_id**
+- Result on failure: **false**
+
+Request example:
+
+```json
+{
+    "jsonrpc": "2.0",
+    "method": "addColumn",
+    "id": 638544704,
+    "params": [
+        1,
+        "Boo"
+    ]
+}
+```
+
+Response example:
+
+```json
+{
+    "jsonrpc": "2.0",
+    "id": 638544704,
+    "result": 5
+}
+```
+
+## removeColumn
+
+- Purpose: **Remove a column**
+- Parameters:
+    - **column_id** (integer, required)
+- Result on success: **true**
+- Result on failure: **false**
+
+Request example:
+
+```json
+{
+    "jsonrpc": "2.0",
+    "method": "removeColumn",
+    "id": 1433237746,
+    "params": [
+        1
+    ]
+}
+```
+
+Response example:
+
+```json
+{
+    "jsonrpc": "2.0",
+    "id": 1433237746,
+    "result": true
+}
+```
diff --git a/doc/api-json-rpc.markdown b/doc/api-json-rpc.markdown
index 34559df5..bb14b008 100644
--- a/doc/api-json-rpc.markdown
+++ b/doc/api-json-rpc.markdown
@@ -52,6 +52,7 @@ Usage
 - [Projects](api-project-procedures.markdown)
 - [Project Permissions](api-project-permission-procedures.markdown)
 - [Boards](api-board-procedures.markdown)
+- [Columns](api-column-procedures.markdown)
 - [Swimlanes](api-swimlane-procedures.markdown)
 - [Categories](api-category-procedures.markdown)
 - [Automatic Actions](api-action-procedures.markdown)