diff options
Diffstat (limited to 'app')
| -rw-r--r-- | app/Api/File.php | 1 | ||||
| -rw-r--r-- | app/Api/Task.php | 12 | ||||
| -rw-r--r-- | app/Controller/Auth.php | 3 | ||||
| -rw-r--r-- | app/Core/Base.php | 1 | ||||
| -rw-r--r-- | app/Model/Board.php | 2 | ||||
| -rw-r--r-- | app/Model/LastLogin.php | 6 | ||||
| -rw-r--r-- | app/Model/User.php | 2 |
7 files changed, 12 insertions, 15 deletions
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) { |