diff options
| -rw-r--r-- | app/Controller/ActionCreationController.php | 4 | ||||
| -rw-r--r-- | app/Controller/AuthController.php | 2 | ||||
| -rw-r--r-- | app/Controller/BaseController.php | 2 | ||||
| -rw-r--r-- | app/Controller/PasswordResetController.php | 10 | ||||
| -rw-r--r-- | app/Model/LastLoginModel.php | 2 |
5 files changed, 15 insertions, 5 deletions
diff --git a/app/Controller/ActionCreationController.php b/app/Controller/ActionCreationController.php index e984f8d4..abd8abd3 100644 --- a/app/Controller/ActionCreationController.php +++ b/app/Controller/ActionCreationController.php @@ -40,7 +40,7 @@ class ActionCreationController extends BaseController return $this->create(); } - $this->response->html($this->template->render('action_creation/event', array( + return $this->response->html($this->template->render('action_creation/event', array( 'values' => $values, 'project' => $project, 'available_actions' => $this->actionManager->getAvailableActions(), @@ -72,7 +72,7 @@ class ActionCreationController extends BaseController $projects_list = $this->projectUserRoleModel->getActiveProjectsByUser($this->userSession->getId()); unset($projects_list[$project['id']]); - $this->response->html($this->template->render('action_creation/params', array( + return $this->response->html($this->template->render('action_creation/params', array( 'values' => $values, 'action_params' => $action_params, 'columns_list' => $this->columnModel->getList($project['id']), diff --git a/app/Controller/AuthController.php b/app/Controller/AuthController.php index dc46070c..d1fba92c 100644 --- a/app/Controller/AuthController.php +++ b/app/Controller/AuthController.php @@ -61,7 +61,7 @@ class AuthController extends BaseController $this->sessionManager->close(); $this->response->redirect($this->helper->url->to('AuthController', 'login')); } else { - $this->response->redirect($this->helper->url->to('AuthController', 'index')); + $this->response->redirect($this->helper->url->to('DashboardController', 'show')); } } diff --git a/app/Controller/BaseController.php b/app/Controller/BaseController.php index ae2dc006..5233e27f 100644 --- a/app/Controller/BaseController.php +++ b/app/Controller/BaseController.php @@ -74,7 +74,7 @@ abstract class BaseController extends Base { $task_id = $this->request->getIntegerParam('task_id'); $file_id = $this->request->getIntegerParam('file_id'); - $model = 'projectFile'; + $model = 'projectFileModel'; if ($task_id > 0) { $model = 'taskFileModel'; diff --git a/app/Controller/PasswordResetController.php b/app/Controller/PasswordResetController.php index 18b4be80..a1780ed9 100644 --- a/app/Controller/PasswordResetController.php +++ b/app/Controller/PasswordResetController.php @@ -14,6 +14,10 @@ class PasswordResetController extends BaseController { /** * Show the form to reset the password + * + * @param array $values + * @param array $errors + * @throws \Kanboard\Core\Controller\BaseException */ public function create(array $values = array(), array $errors = array()) { @@ -46,6 +50,10 @@ class PasswordResetController extends BaseController /** * Show the form to set a new password + * + * @param array $values + * @param array $errors + * @throws \Kanboard\Core\Controller\BaseException */ public function change(array $values = array(), array $errors = array()) { @@ -93,6 +101,8 @@ class PasswordResetController extends BaseController /** * Send the email + * + * @param string $username */ private function sendEmail($username) { diff --git a/app/Model/LastLoginModel.php b/app/Model/LastLoginModel.php index 16821392..caaa4a80 100644 --- a/app/Model/LastLoginModel.php +++ b/app/Model/LastLoginModel.php @@ -68,7 +68,7 @@ class LastLoginModel 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)) + ->notIn('id', array_slice($connections, 0, self::NB_LOGINS - 1)) ->remove(); } } |