From f9753e91d288c4d87d6a83ffe994d312eae5a3fd Mon Sep 17 00:00:00 2001 From: Frédéric Guillot Date: Sun, 25 May 2014 15:02:27 -0400 Subject: Add subtasks --- app/Controller/Base.php | 1 + app/Controller/Subtask.php | 185 +++++++++++++++++++++++++++++++++++++ app/Controller/Task.php | 1 + app/Locales/de_DE/translations.php | 25 +++++ app/Locales/es_ES/translations.php | 25 +++++ app/Locales/fr_FR/translations.php | 25 +++++ app/Locales/pl_PL/translations.php | 25 +++++ app/Locales/pt_BR/translations.php | 25 +++++ app/Model/Base.php | 1 + app/Model/SubTask.php | 179 +++++++++++++++++++++++++++++++++++ app/Schema/Mysql.php | 19 +++- app/Schema/Sqlite.php | 18 +++- app/Templates/comment_remove.php | 2 +- app/Templates/file_show.php | 17 ++++ app/Templates/subtask_create.php | 25 +++++ app/Templates/subtask_edit.php | 30 ++++++ app/Templates/subtask_remove.php | 16 ++++ app/Templates/subtask_show.php | 60 ++++++++++++ app/Templates/task_show.php | 23 ++--- app/Templates/task_sidebar.php | 1 + app/helpers.php | 5 + 21 files changed, 689 insertions(+), 19 deletions(-) create mode 100644 app/Controller/Subtask.php create mode 100644 app/Model/SubTask.php create mode 100644 app/Templates/file_show.php create mode 100644 app/Templates/subtask_create.php create mode 100644 app/Templates/subtask_edit.php create mode 100644 app/Templates/subtask_remove.php create mode 100644 app/Templates/subtask_show.php (limited to 'app') diff --git a/app/Controller/Base.php b/app/Controller/Base.php index b21d9b8f..5829fc36 100644 --- a/app/Controller/Base.php +++ b/app/Controller/Base.php @@ -23,6 +23,7 @@ use Model\LastLogin; * @property \Model\Ldap $ldap * @property \Model\Project $project * @property \Model\RememberMe $rememberMe + * @property \Model\SubTask $subTask * @property \Model\Task $task * @property \Model\User $user */ diff --git a/app/Controller/Subtask.php b/app/Controller/Subtask.php new file mode 100644 index 00000000..5ef193c8 --- /dev/null +++ b/app/Controller/Subtask.php @@ -0,0 +1,185 @@ +subTask->getById($this->request->getIntegerParam('subtask_id')); + + if (! $subtask) { + $this->notfound(); + } + + return $subtask; + } + + /** + * Creation form + * + * @access public + */ + public function create() + { + $task = $this->getTask(); + + $this->response->html($this->taskLayout('subtask_create', array( + 'values' => array( + 'task_id' => $task['id'], + ), + 'errors' => array(), + 'users_list' => $this->project->getUsersList($task['project_id']), + 'task' => $task, + 'menu' => 'tasks', + 'title' => t('Add a sub-task') + ))); + } + + /** + * Validation and creation + * + * @access public + */ + public function save() + { + $task = $this->getTask(); + $values = $this->request->getValues(); + + list($valid, $errors) = $this->subTask->validate($values); + + if ($valid) { + + if ($this->subTask->create($values)) { + $this->session->flash(t('Sub-task added successfully.')); + } + else { + $this->session->flashError(t('Unable to create your sub-task.')); + } + + if (isset($values['another_subtask']) && $values['another_subtask'] == 1) { + $this->response->redirect('?controller=subtask&action=create&task_id='.$task['id']); + } + + $this->response->redirect('?controller=task&action=show&task_id='.$task['id'].'#subtasks'); + } + + $this->response->html($this->taskLayout('subtask_create', array( + 'values' => $values, + 'errors' => $errors, + 'users_list' => $this->project->getUsersList($task['project_id']), + 'task' => $task, + 'menu' => 'tasks', + 'title' => t('Add a sub-task') + ))); + } + + /** + * Edit form + * + * @access public + */ + public function edit() + { + $task = $this->getTask(); + $subtask = $this->getSubTask(); + + $this->response->html($this->taskLayout('subtask_edit', array( + 'values' => $subtask, + 'errors' => array(), + 'users_list' => $this->project->getUsersList($task['project_id']), + 'status_list' => $this->subTask->getStatusList(), + 'subtask' => $subtask, + 'task' => $task, + 'menu' => 'tasks', + 'title' => t('Edit a sub-task') + ))); + } + + /** + * Update and validate a subtask + * + * @access public + */ + public function update() + { + $task = $this->getTask(); + $subtask = $this->getSubtask(); + + $values = $this->request->getValues(); + list($valid, $errors) = $this->subTask->validate($values); + + if ($valid) { + + if ($this->subTask->update($values)) { + $this->session->flash(t('Sub-task updated successfully.')); + } + else { + $this->session->flashError(t('Unable to update your sub-task.')); + } + + $this->response->redirect('?controller=task&action=show&task_id='.$task['id'].'#subtasks'); + } + + $this->response->html($this->taskLayout('subtask_edit', array( + 'values' => $values, + 'errors' => $errors, + 'users_list' => $this->project->getUsersList($task['project_id']), + 'status_list' => $this->subTask->getStatusList(), + 'subtask' => $subtask, + 'task' => $task, + 'menu' => 'tasks', + 'title' => t('Edit a sub-task') + ))); + } + + /** + * Confirmation dialog before removing a subtask + * + * @access public + */ + public function confirm() + { + $task = $this->getTask(); + $subtask = $this->getSubtask(); + + $this->response->html($this->taskLayout('subtask_remove', array( + 'subtask' => $subtask, + 'task' => $task, + 'menu' => 'tasks', + 'title' => t('Remove a sub-task') + ))); + } + + /** + * Remove a subtask + * + * @access public + */ + public function remove() + { + $task = $this->getTask(); + $subtask = $this->getSubtask(); + + if ($this->subTask->remove($subtask['id'])) { + $this->session->flash(t('Sub-task removed successfully.')); + } + else { + $this->session->flashError(t('Unable to remove this sub-task.')); + } + + $this->response->redirect('?controller=task&action=show&task_id='.$task['id'].'#subtasks'); + } +} diff --git a/app/Controller/Task.php b/app/Controller/Task.php index 8230eef3..68e3728a 100644 --- a/app/Controller/Task.php +++ b/app/Controller/Task.php @@ -62,6 +62,7 @@ class Task extends Base $this->response->html($this->taskLayout('task_show', array( 'files' => $this->file->getAll($task['id']), 'comments' => $this->comment->getAll($task['id']), + 'subtasks' => $this->subTask->getAll($task['id']), 'task' => $task, 'columns_list' => $this->board->getColumnsList($task['project_id']), 'colors_list' => $this->task->getColors(), diff --git a/app/Locales/de_DE/translations.php b/app/Locales/de_DE/translations.php index 90958853..b554b01d 100644 --- a/app/Locales/de_DE/translations.php +++ b/app/Locales/de_DE/translations.php @@ -346,4 +346,29 @@ return array( // 'Add a comment' => '', // 'Edit a comment' => '', // 'Summary' => '', + // 'Time tracking' => '', + // 'Estimate:' => '', + // 'Spent:' => '', + // 'Do you really want to remove this sub-task?' => '', + // 'Remaining:' => '', + // 'hours' => '', + // 'spent' => '', + // 'estimated' => '', + // 'Sub-Tasks' => '', + // 'Add a sub-task' => '', + // 'Original Estimate' => '', + // 'Create another sub-task' => '', + // 'Time Spent' => '', + // 'Edit a sub-task' => '', + // 'Remove a sub-task' => '', + // 'The time must be a numeric value' => '', + // 'Todo' => '', + // 'In progress' => '', + // 'Done' => '', + // 'Sub-task removed successfully.' => '', + // 'Unable to remove this sub-task.' => '', + // 'Sub-task updated successfully.' => '', + // 'Unable to update your sub-task.' => '', + // 'Unable to create your sub-task.' => '', + // 'Sub-task added successfully.' => '', ); diff --git a/app/Locales/es_ES/translations.php b/app/Locales/es_ES/translations.php index d0d9efa8..0d8384dd 100644 --- a/app/Locales/es_ES/translations.php +++ b/app/Locales/es_ES/translations.php @@ -344,4 +344,29 @@ return array( // 'Add a comment' => '', // 'Edit a comment' => '', // 'Summary' => '', + // 'Time tracking' => '', + // 'Estimate:' => '', + // 'Spent:' => '', + // 'Do you really want to remove this sub-task?' => '', + // 'Remaining:' => '', + // 'hours' => '', + // 'spent' => '', + // 'estimated' => '', + // 'Sub-Tasks' => '', + // 'Add a sub-task' => '', + // 'Original Estimate' => '', + // 'Create another sub-task' => '', + // 'Time Spent' => '', + // 'Edit a sub-task' => '', + // 'Remove a sub-task' => '', + // 'The time must be a numeric value' => '', + // 'Todo' => '', + // 'In progress' => '', + // 'Done' => '', + // 'Sub-task removed successfully.' => '', + // 'Unable to remove this sub-task.' => '', + // 'Sub-task updated successfully.' => '', + // 'Unable to update your sub-task.' => '', + // 'Unable to create your sub-task.' => '', + // 'Sub-task added successfully.' => '', ); diff --git a/app/Locales/fr_FR/translations.php b/app/Locales/fr_FR/translations.php index d1ed9f91..56acbed5 100644 --- a/app/Locales/fr_FR/translations.php +++ b/app/Locales/fr_FR/translations.php @@ -344,4 +344,29 @@ return array( 'Add a comment' => 'Ajouter un commentaire', 'Edit a comment' => 'Modifier un commentaire', 'Summary' => 'Résumé', + 'Time tracking' => 'Gestion du temps', + 'Estimate:' => 'Estimation :', + 'Spent:' => 'Passé :', + 'Do you really want to remove this sub-task?' => 'Voulez-vous vraiment supprimer cette sous-tâche ?', + 'Remaining:' => 'Restant :', + 'hours' => 'heures', + 'spent' => 'passé', + 'estimated' => 'estimé', + 'Sub-Tasks' => 'Sous-Tâches', + 'Add a sub-task' => 'Ajouter une sous-tâche', + 'Original Estimate' => 'Estimation originale', + 'Create another sub-task' => 'Créer une autre sous-tâche', + 'Time Spent' => 'Temps passé', + 'Edit a sub-task' => 'Modifier une sous-tâche', + 'Remove a sub-task' => 'Supprimer une sous-tâche', + 'The time must be a numeric value' => 'Le temps doit-être une valeur numérique', + 'Todo' => 'À faire', + 'In progress' => 'En cours', + 'Done' => 'Terminé', + 'Sub-task removed successfully.' => 'Sous-tâche supprimée avec succès.', + 'Unable to remove this sub-task.' => 'Impossible de supprimer cette sous-tâche.', + 'Sub-task updated successfully.' => 'Sous-tâche mise à jour avec succès.', + 'Unable to update your sub-task.' => 'Impossible de mettre à jour votre sous-tâche.', + 'Unable to create your sub-task.' => 'Impossible de créer votre sous-tâche.', + 'Sub-task added successfully.' => 'Sous-tâche ajouté avec succès.', ); diff --git a/app/Locales/pl_PL/translations.php b/app/Locales/pl_PL/translations.php index 3490810a..dca01a2c 100644 --- a/app/Locales/pl_PL/translations.php +++ b/app/Locales/pl_PL/translations.php @@ -349,4 +349,29 @@ return array( // 'Add a comment' => '', // 'Edit a comment' => '', // 'Summary' => '', + // 'Time tracking' => '', + // 'Estimate:' => '', + // 'Spent:' => '', + // 'Do you really want to remove this sub-task?' => '', + // 'Remaining:' => '', + // 'hours' => '', + // 'spent' => '', + // 'estimated' => '', + // 'Sub-Tasks' => '', + // 'Add a sub-task' => '', + // 'Original Estimate' => '', + // 'Create another sub-task' => '', + // 'Time Spent' => '', + // 'Edit a sub-task' => '', + // 'Remove a sub-task' => '', + // 'The time must be a numeric value' => '', + // 'Todo' => '', + // 'In progress' => '', + // 'Done' => '', + // 'Sub-task removed successfully.' => '', + // 'Unable to remove this sub-task.' => '', + // 'Sub-task updated successfully.' => '', + // 'Unable to update your sub-task.' => '', + // 'Unable to create your sub-task.' => '', + // 'Sub-task added successfully.' => '', ); diff --git a/app/Locales/pt_BR/translations.php b/app/Locales/pt_BR/translations.php index 267006ce..00fcccef 100644 --- a/app/Locales/pt_BR/translations.php +++ b/app/Locales/pt_BR/translations.php @@ -345,4 +345,29 @@ return array( // 'Add a comment' => '', // 'Edit a comment' => '', // 'Summary' => '', + // 'Time tracking' => '', + // 'Estimate:' => '', + // 'Spent:' => '', + // 'Do you really want to remove this sub-task?' => '', + // 'Remaining:' => '', + // 'hours' => '', + // 'spent' => '', + // 'estimated' => '', + // 'Sub-Tasks' => '', + // 'Add a sub-task' => '', + // 'Original Estimate' => '', + // 'Create another sub-task' => '', + // 'Time Spent' => '', + // 'Edit a sub-task' => '', + // 'Remove a sub-task' => '', + // 'The time must be a numeric value' => '', + // 'Todo' => '', + // 'In progress' => '', + // 'Done' => '', + // 'Sub-task removed successfully.' => '', + // 'Unable to remove this sub-task.' => '', + // 'Sub-task updated successfully.' => '', + // 'Unable to update your sub-task.' => '', + // 'Unable to create your sub-task.' => '', + // 'Sub-task added successfully.' => '', ); diff --git a/app/Model/Base.php b/app/Model/Base.php index e95296bb..ddc06c3d 100644 --- a/app/Model/Base.php +++ b/app/Model/Base.php @@ -14,6 +14,7 @@ require __DIR__.'/../../vendor/SimpleValidator/Validators/AlphaNumeric.php'; require __DIR__.'/../../vendor/SimpleValidator/Validators/GreaterThan.php'; require __DIR__.'/../../vendor/SimpleValidator/Validators/Date.php'; require __DIR__.'/../../vendor/SimpleValidator/Validators/Email.php'; +require __DIR__.'/../../vendor/SimpleValidator/Validators/Numeric.php'; use Core\Event; use PicoDb\Database; diff --git a/app/Model/SubTask.php b/app/Model/SubTask.php new file mode 100644 index 00000000..21ccdaac --- /dev/null +++ b/app/Model/SubTask.php @@ -0,0 +1,179 @@ + t('Todo'), + self::STATUS_INPROGRESS => t('In progress'), + self::STATUS_DONE => t('Done'), + ); + + asort($status); + + return $status; + } + + /** + * Get all subtasks for a given task + * + * @access public + * @param integer $task_id Task id + * @return array + */ + public function getAll($task_id) + { + $status = $this->getStatusList(); + $subtasks = $this->db->table(self::TABLE) + ->eq('task_id', $task_id) + ->columns(self::TABLE.'.*', User::TABLE.'.username') + ->join(User::TABLE, 'id', 'user_id') + ->findAll(); + + foreach ($subtasks as &$subtask) { + $subtask['status_name'] = $status[$subtask['status']]; + } + + return $subtasks; + } + + /** + * Get a subtask by the id + * + * @access public + * @param integer $subtask_id Subtask id + * @return array + */ + public function getById($subtask_id) + { + return $this->db->table(self::TABLE)->eq('id', $subtask_id)->findOne(); + } + + /** + * Create + * + * @access public + * @param array $values Form values + * @return bool + */ + public function create(array $values) + { + if (isset($values['another_subtask'])) { + unset($values['another_subtask']); + } + + if (isset($values['time_estimated']) && empty($values['time_estimated'])) { + $values['time_estimated'] = 0; + } + + if (isset($values['time_spent']) && empty($values['time_spent'])) { + $values['time_spent'] = 0; + } + + return $this->db->table(self::TABLE)->save($values); + } + + /** + * Update + * + * @access public + * @param array $values Form values + * @return bool + */ + public function update(array $values) + { + if (isset($values['time_estimated']) && empty($values['time_estimated'])) { + $values['time_estimated'] = 0; + } + + if (isset($values['time_spent']) && empty($values['time_spent'])) { + $values['time_spent'] = 0; + } + + return $this->db->table(self::TABLE)->eq('id', $values['id'])->save($values); + } + + /** + * Remove + * + * @access public + * @param integer $subtask_id Subtask id + * @return bool + */ + public function remove($subtask_id) + { + return $this->db->table(self::TABLE)->eq('id', $subtask_id)->remove(); + } + + /** + * Validate creation/modification + * + * @access public + * @param array $values Form values + * @return array $valid, $errors [0] = Success or not, [1] = List of errors + */ + public function validate(array $values) + { + $v = new Validator($values, array( + new Validators\Required('task_id', t('The task id is required')), + new Validators\Integer('task_id', t('The task id must be an integer')), + new Validators\Required('title', t('The title is required')), + new Validators\MaxLength('title', t('The maximum length is %d characters', 100), 100), + new Validators\Integer('user_id', t('The user id must be an integer')), + new Validators\Integer('status', t('The status must be an integer')), + new Validators\Numeric('time_estimated', t('The time must be a numeric value')), + new Validators\Numeric('time_spent', t('The time must be a numeric value')), + )); + + return array( + $v->execute(), + $v->getErrors() + ); + } +} diff --git a/app/Schema/Mysql.php b/app/Schema/Mysql.php index d3b111f9..3df38dee 100644 --- a/app/Schema/Mysql.php +++ b/app/Schema/Mysql.php @@ -2,7 +2,24 @@ namespace Schema; -const VERSION = 17; +const VERSION = 18; + +function version_18($pdo) +{ + $pdo->exec(" + CREATE TABLE task_has_subtasks ( + id INT NOT NULL AUTO_INCREMENT, + title VARCHAR(255), + status INT DEFAULT 0, + time_estimated INT DEFAULT 0, + time_spent INT DEFAULT 0, + task_id INT, + user_id INT, + PRIMARY KEY (id), + FOREIGN KEY(task_id) REFERENCES tasks(id) ON DELETE CASCADE + ) ENGINE=InnoDB CHARSET=utf8" + ); +} function version_17($pdo) { diff --git a/app/Schema/Sqlite.php b/app/Schema/Sqlite.php index 94ef0316..663c7d34 100644 --- a/app/Schema/Sqlite.php +++ b/app/Schema/Sqlite.php @@ -2,7 +2,23 @@ namespace Schema; -const VERSION = 17; +const VERSION = 18; + +function version_18($pdo) +{ + $pdo->exec(" + CREATE TABLE task_has_subtasks ( + id INTEGER PRIMARY KEY, + title TEXT COLLATE NOCASE, + status INTEGER DEFAULT 0, + time_estimated INTEGER DEFAULT 0, + time_spent INTEGER DEFAULT 0, + task_id INTEGER, + user_id INTEGER, + FOREIGN KEY(task_id) REFERENCES tasks(id) ON DELETE CASCADE + )" + ); +} function version_17($pdo) { diff --git a/app/Templates/comment_remove.php b/app/Templates/comment_remove.php index 02a23f93..6409d7c0 100644 --- a/app/Templates/comment_remove.php +++ b/app/Templates/comment_remove.php @@ -1,5 +1,5 @@
-

+

diff --git a/app/Templates/file_show.php b/app/Templates/file_show.php new file mode 100644 index 00000000..674861dd --- /dev/null +++ b/app/Templates/file_show.php @@ -0,0 +1,17 @@ +
+

+
+ + \ No newline at end of file diff --git a/app/Templates/subtask_create.php b/app/Templates/subtask_create.php new file mode 100644 index 00000000..a456aa37 --- /dev/null +++ b/app/Templates/subtask_create.php @@ -0,0 +1,25 @@ +
+

+
+ +
+ + + + +
+ + +
+ + +
+ + + +
+ + + +
+
diff --git a/app/Templates/subtask_edit.php b/app/Templates/subtask_edit.php new file mode 100644 index 00000000..3080cdad --- /dev/null +++ b/app/Templates/subtask_edit.php @@ -0,0 +1,30 @@ +
+

+
+ +
+ + + + + +
+ + +
+ + +
+ + +
+ + +
+ +
+ + + +
+
diff --git a/app/Templates/subtask_remove.php b/app/Templates/subtask_remove.php new file mode 100644 index 00000000..2862176c --- /dev/null +++ b/app/Templates/subtask_remove.php @@ -0,0 +1,16 @@ +
+

+
+ +
+

+ +

+ +

+ +
+ + +
+
\ No newline at end of file diff --git a/app/Templates/subtask_show.php b/app/Templates/subtask_show.php new file mode 100644 index 00000000..b9385c7e --- /dev/null +++ b/app/Templates/subtask_show.php @@ -0,0 +1,60 @@ +
+

+
+ + + + + + + + + + + + + + + + + + + + + +
+ + + + + + + + + + + + + + + +
+ +
+

+
    +
    • +
    • +
  • 0 ? $total_remaining : 0) ?>
    • +
+
\ No newline at end of file diff --git a/app/Templates/task_show.php b/app/Templates/task_show.php index 53cdbae8..4c3d4697 100644 --- a/app/Templates/task_show.php +++ b/app/Templates/task_show.php @@ -62,23 +62,14 @@
-
-

-
+ $task, 'files' => $files)) ?> +
+ - + + +
+ $task, 'subtasks' => $subtasks)) ?>
diff --git a/app/Templates/task_sidebar.php b/app/Templates/task_sidebar.php index 8a3939b8..d97c44e2 100644 --- a/app/Templates/task_sidebar.php +++ b/app/Templates/task_sidebar.php @@ -5,6 +5,7 @@
    • +
    • diff --git a/app/helpers.php b/app/helpers.php index 8351328a..2dcb38e8 100644 --- a/app/helpers.php +++ b/app/helpers.php @@ -260,3 +260,8 @@ function form_number($name, $values = array(), array $errors = array(), array $a { return form_input('number', $name, $values, $errors, $attributes, $class); } + +function form_numeric($name, $values = array(), array $errors = array(), array $attributes = array(), $class = '') +{ + return form_input('text', $name, $values, $errors, $attributes, $class.' form-numeric'); +} -- cgit v1.2.3 From 60a45dbb685eb3b810dcced4820afe9d1f1ffe2d Mon Sep 17 00:00:00 2001 From: Frédéric Guillot Date: Sun, 25 May 2014 15:15:59 -0400 Subject: Improve file upload --- app/Controller/File.php | 11 +++++++++-- app/Locales/de_DE/translations.php | 2 ++ app/Locales/es_ES/translations.php | 2 ++ app/Locales/fr_FR/translations.php | 2 ++ app/Locales/pl_PL/translations.php | 2 ++ app/Locales/pt_BR/translations.php | 2 ++ app/Model/File.php | 2 +- app/Templates/file_new.php | 1 + 8 files changed, 21 insertions(+), 3 deletions(-) (limited to 'app') diff --git a/app/Controller/File.php b/app/Controller/File.php index 1604ab13..38cb82ab 100644 --- a/app/Controller/File.php +++ b/app/Controller/File.php @@ -24,6 +24,7 @@ class File extends Base $this->response->html($this->taskLayout('file_new', array( 'task' => $task, 'menu' => 'tasks', + 'max_size' => ini_get('upload_max_filesize'), 'title' => t('Attach a document') ))); } @@ -36,8 +37,14 @@ class File extends Base public function save() { $task = $this->getTask(); - $this->file->upload($task['project_id'], $task['id'], 'files'); - $this->response->redirect('?controller=task&action=show&task_id='.$task['id'].'#attachments'); + + if ($this->file->upload($task['project_id'], $task['id'], 'files') === true) { + $this->response->redirect('?controller=task&action=show&task_id='.$task['id'].'#attachments'); + } + else { + $this->session->flashError(t('Unable to upload the file.')); + $this->response->redirect('?controller=file&action=create&task_id='.$task['id']); + } } /** diff --git a/app/Locales/de_DE/translations.php b/app/Locales/de_DE/translations.php index b554b01d..3816a251 100644 --- a/app/Locales/de_DE/translations.php +++ b/app/Locales/de_DE/translations.php @@ -371,4 +371,6 @@ return array( // 'Unable to update your sub-task.' => '', // 'Unable to create your sub-task.' => '', // 'Sub-task added successfully.' => '', + // 'Maximum size: ' => '', + // 'Unable to upload the file.' => '', ); diff --git a/app/Locales/es_ES/translations.php b/app/Locales/es_ES/translations.php index 0d8384dd..35ce6c05 100644 --- a/app/Locales/es_ES/translations.php +++ b/app/Locales/es_ES/translations.php @@ -369,4 +369,6 @@ return array( // 'Unable to update your sub-task.' => '', // 'Unable to create your sub-task.' => '', // 'Sub-task added successfully.' => '', + // 'Maximum size: ' => '', + // 'Unable to upload the file.' => '', ); diff --git a/app/Locales/fr_FR/translations.php b/app/Locales/fr_FR/translations.php index 56acbed5..bc9b555f 100644 --- a/app/Locales/fr_FR/translations.php +++ b/app/Locales/fr_FR/translations.php @@ -369,4 +369,6 @@ return array( 'Unable to update your sub-task.' => 'Impossible de mettre à jour votre sous-tâche.', 'Unable to create your sub-task.' => 'Impossible de créer votre sous-tâche.', 'Sub-task added successfully.' => 'Sous-tâche ajouté avec succès.', + 'Maximum size: ' => 'Taille maximum : ', + 'Unable to upload the file.' => 'Impossible de transférer le fichier.', ); diff --git a/app/Locales/pl_PL/translations.php b/app/Locales/pl_PL/translations.php index dca01a2c..21b3e5a5 100644 --- a/app/Locales/pl_PL/translations.php +++ b/app/Locales/pl_PL/translations.php @@ -374,4 +374,6 @@ return array( // 'Unable to update your sub-task.' => '', // 'Unable to create your sub-task.' => '', // 'Sub-task added successfully.' => '', + // 'Maximum size: ' => '', + // 'Unable to upload the file.' => '', ); diff --git a/app/Locales/pt_BR/translations.php b/app/Locales/pt_BR/translations.php index 00fcccef..9939a0c3 100644 --- a/app/Locales/pt_BR/translations.php +++ b/app/Locales/pt_BR/translations.php @@ -370,4 +370,6 @@ return array( // 'Unable to update your sub-task.' => '', // 'Unable to create your sub-task.' => '', // 'Sub-task added successfully.' => '', + // 'Maximum size: ' => '', + // 'Unable to upload the file.' => '', ); diff --git a/app/Model/File.php b/app/Model/File.php index 41ecfba1..70b87b1b 100644 --- a/app/Model/File.php +++ b/app/Model/File.php @@ -159,7 +159,7 @@ class File extends Base if (@move_uploaded_file($uploaded_filename, self::BASE_PATH.$destination_filename)) { - $this->create( + return $this->create( $task_id, $original_filename, $destination_filename, diff --git a/app/Templates/file_new.php b/app/Templates/file_new.php index 43223d0c..643f340d 100644 --- a/app/Templates/file_new.php +++ b/app/Templates/file_new.php @@ -4,6 +4,7 @@
    +
    -- cgit v1.2.3 From b6c4c93fe7a8a86f9c2aca6a388cb897c6a968c5 Mon Sep 17 00:00:00 2001 From: Frédéric Guillot Date: Sun, 25 May 2014 18:12:27 -0400 Subject: Add more tests --- app/Model/Acl.php | 1 + tests/ActionTaskAssignColorCategoryTest.php | 76 +++++++++++++++++++++++++++++ tests/ActionTaskAssignColorUserTest.php | 16 ------ tests/ActionTest.php | 55 ++++++++++++++++++++- tests/Base.php | 2 + 5 files changed, 133 insertions(+), 17 deletions(-) create mode 100644 tests/ActionTaskAssignColorCategoryTest.php (limited to 'app') diff --git a/app/Model/Acl.php b/app/Model/Acl.php index c6ed8686..035fd7c3 100644 --- a/app/Model/Acl.php +++ b/app/Model/Acl.php @@ -36,6 +36,7 @@ class Acl extends Base 'config' => array('index', 'removeremembermetoken'), 'comment' => array('create', 'save', 'confirm', 'remove', 'update', 'edit', 'forbidden'), 'file' => array('create', 'save', 'download', 'confirm', 'remove', 'open', 'image'), + 'subtask' => array('create', 'save', 'edit', 'update', 'confirm', 'remove'), 'task' => array( 'show', 'create', diff --git a/tests/ActionTaskAssignColorCategoryTest.php b/tests/ActionTaskAssignColorCategoryTest.php new file mode 100644 index 00000000..18b4311e --- /dev/null +++ b/tests/ActionTaskAssignColorCategoryTest.php @@ -0,0 +1,76 @@ +db, $this->event)); + + $event = array( + 'project_id' => 2, + 'task_id' => 3, + 'column_id' => 5, + ); + + $this->assertFalse($action->isExecutable($event)); + $this->assertFalse($action->execute($event)); + } + + public function testExecute() + { + $action = new Action\TaskAssignColorCategory(1, new Task($this->db, $this->event)); + $action->setParam('category_id', 1); + $action->setParam('color_id', 'blue'); + + // We create a task in the first column + $t = new Task($this->db, $this->event); + $p = new Project($this->db, $this->event); + $c = new Category($this->db, $this->event); + + $this->assertEquals(1, $p->create(array('name' => 'test'))); + $this->assertEquals(1, $c->create(array('name' => 'c1'))); + $this->assertEquals(2, $c->create(array('name' => 'c2'))); + $this->assertEquals(1, $t->create(array('title' => 'test', 'project_id' => 1, 'column_id' => 1, 'color_id' => 'green', 'category_id' => 2))); + + // We create an event but we don't do anything + $event = array( + 'project_id' => 1, + 'task_id' => 1, + 'column_id' => 1, + 'category_id' => 2, + 'position' => 2, + ); + + // Our event should NOT be executed + $this->assertFalse($action->execute($event)); + + // Our task should be assigned to the ategory_id=1 and have the green color + $task = $t->getById(1); + $this->assertNotEmpty($task); + $this->assertEquals(2, $task['category_id']); + $this->assertEquals('green', $task['color_id']); + + // We create an event to move the task + $event = array( + 'project_id' => 1, + 'task_id' => 1, + 'column_id' => 1, + 'position' => 5, + 'category_id' => 1, + ); + + // Our event should be executed + $this->assertTrue($action->execute($event)); + + // Our task should have the blue color + $task = $t->getById(1); + $this->assertNotEmpty($task); + $this->assertEquals('blue', $task['color_id']); + } +} diff --git a/tests/ActionTaskAssignColorUserTest.php b/tests/ActionTaskAssignColorUserTest.php index 769ecc66..04e3172f 100644 --- a/tests/ActionTaskAssignColorUserTest.php +++ b/tests/ActionTaskAssignColorUserTest.php @@ -10,7 +10,6 @@ class ActionTaskAssignColorUser extends Base public function testBadProject() { $action = new Action\TaskAssignColorUser(3, new Task($this->db, $this->event)); - $action->setParam('column_id', 5); $event = array( 'project_id' => 2, @@ -22,24 +21,9 @@ class ActionTaskAssignColorUser extends Base $this->assertFalse($action->execute($event)); } - public function testBadColumn() - { - $action = new Action\TaskAssignColorUser(3, new Task($this->db, $this->event)); - $action->setParam('column_id', 5); - - $event = array( - 'project_id' => 3, - 'task_id' => 3, - 'column_id' => 3, - ); - - $this->assertFalse($action->execute($event)); - } - public function testExecute() { $action = new Action\TaskAssignColorUser(1, new Task($this->db, $this->event)); - $action->setParam('column_id', 2); $action->setParam('user_id', 1); $action->setParam('color_id', 'blue'); diff --git a/tests/ActionTest.php b/tests/ActionTest.php index 2757a069..391f0e25 100644 --- a/tests/ActionTest.php +++ b/tests/ActionTest.php @@ -6,6 +6,7 @@ use Model\Action; use Model\Project; use Model\Board; use Model\Task; +use Model\Category; class ActionTest extends Base { @@ -45,7 +46,7 @@ class ActionTest extends Base $this->assertEquals(4, $actions[0]['params'][0]['value']); } - public function testExecuteAction() + public function testEventMoveColumn() { $task = new Task($this->db, $this->event); $board = new Board($this->db, $this->event); @@ -91,6 +92,56 @@ class ActionTest extends Base $this->assertEquals(0, $t1['is_active']); } + public function testEventMovePosition() + { + $task = new Task($this->db, $this->event); + $board = new Board($this->db, $this->event); + $project = new Project($this->db, $this->event); + $action = new Action($this->db, $this->event); + + // We create a project + $this->assertEquals(1, $project->create(array('name' => 'unit_test'))); + + // We create a task + $this->assertEquals(1, $task->create(array( + 'title' => 'unit_test', + 'project_id' => 1, + 'owner_id' => 1, + 'color_id' => 'red', + 'column_id' => 1, + ))); + + // We create a new action, when the category_id=2 then the color_id should be green + $this->assertTrue($action->create(array( + 'project_id' => 1, + 'event_name' => Task::EVENT_MOVE_POSITION, + 'action_name' => 'TaskClose', + 'params' => array( + 'column_id' => 1, + 'color_id' => 'green', + ) + ))); + + // We bind events + $action->attachEvents(); + + $this->assertTrue($this->event->hasListener(Task::EVENT_MOVE_POSITION, 'Action\TaskClose')); + + // Our task should have the color red and position=0 + $t1 = $task->getById(1); + $this->assertEquals(0, $t1['position']); + $this->assertEquals(1, $t1['is_active']); + + // We move our task + $task->move(1, 1, 2); + $this->assertEquals(Task::EVENT_CLOSE, $this->event->getLastTriggeredEvent()); + + // Our task should be green and have the position 2 + $t1 = $task->getById(1); + $this->assertEquals(2, $t1['position']); + $this->assertEquals(0, $t1['is_active']); + } + public function testExecuteMultipleActions() { $task = new Task($this->db, $this->event); @@ -161,4 +212,6 @@ class ActionTest extends Base $this->assertEquals(2, $t2['project_id']); $this->assertEquals('unit_test', $t2['title']); } + + } diff --git a/tests/Base.php b/tests/Base.php index 9c8cfc4a..ce088b22 100644 --- a/tests/Base.php +++ b/tests/Base.php @@ -20,11 +20,13 @@ require_once __DIR__.'/../app/Model/Project.php'; require_once __DIR__.'/../app/Model/User.php'; require_once __DIR__.'/../app/Model/Board.php'; require_once __DIR__.'/../app/Model/Action.php'; +require_once __DIR__.'/../app/Model/Category.php'; require_once __DIR__.'/../app/Action/Base.php'; require_once __DIR__.'/../app/Action/TaskClose.php'; require_once __DIR__.'/../app/Action/TaskAssignSpecificUser.php'; require_once __DIR__.'/../app/Action/TaskAssignColorUser.php'; +require_once __DIR__.'/../app/Action/TaskAssignColorCategory.php'; require_once __DIR__.'/../app/Action/TaskAssignCurrentUser.php'; require_once __DIR__.'/../app/Action/TaskDuplicateAnotherProject.php'; -- cgit v1.2.3 From dbc4443bb18ab2f588b5f8e2f6dbec4332a46660 Mon Sep 17 00:00:00 2001 From: Frédéric Guillot Date: Sun, 25 May 2014 18:27:18 -0400 Subject: Make sure that files are removed when a task is deleted --- app/Model/File.php | 21 ++++++++++++++++++++- app/Model/Task.php | 3 +++ 2 files changed, 23 insertions(+), 1 deletion(-) (limited to 'app') diff --git a/app/Model/File.php b/app/Model/File.php index 70b87b1b..e5aa527e 100644 --- a/app/Model/File.php +++ b/app/Model/File.php @@ -54,6 +54,22 @@ class File extends Base return false; } + /** + * Remove all files for a given task + * + * @access public + * @param integer $task_id Task id + * @return bool + */ + public function removeAll($task_id) + { + $files = $this->getAll($task_id); + + foreach ($files as $file) { + $this->remove($file['id']); + } + } + /** * Create a file entry in the database * @@ -144,6 +160,7 @@ class File extends Base public function upload($project_id, $task_id, $form_name) { $this->setup(); + $result = array(); if (! empty($_FILES[$form_name])) { @@ -159,7 +176,7 @@ class File extends Base if (@move_uploaded_file($uploaded_filename, self::BASE_PATH.$destination_filename)) { - return $this->create( + $result[] = $this->create( $task_id, $original_filename, $destination_filename, @@ -169,5 +186,7 @@ class File extends Base } } } + + return count(array_unique($result)) === 1; } } diff --git a/app/Model/Task.php b/app/Model/Task.php index faa33ca9..45c68aec 100644 --- a/app/Model/Task.php +++ b/app/Model/Task.php @@ -441,6 +441,9 @@ class Task extends Base */ public function remove($task_id) { + $file = new File($this->db, $this->event); + $file->removeAll($task_id); + return $this->db->table(self::TABLE)->eq('id', $task_id)->remove(); } -- cgit v1.2.3 From 2cb6b77ac87c52e9655a1333d39d0263b4880ed5 Mon Sep 17 00:00:00 2001 From: Frédéric Guillot Date: Mon, 26 May 2014 12:27:33 -0400 Subject: Improve events handling --- README.markdown | 2 +- app/Core/Event.php | 27 +++++++++++++++++++++------ app/Model/Task.php | 10 ++++------ tests/ActionTest.php | 23 +++++++++++++++-------- tests/TaskTest.php | 19 ++++++++++--------- 5 files changed, 51 insertions(+), 30 deletions(-) (limited to 'app') diff --git a/README.markdown b/README.markdown index b4337988..e3c5b24c 100644 --- a/README.markdown +++ b/README.markdown @@ -21,7 +21,7 @@ Features - Multiple boards/projects - Boards customization, rename or add columns -- Tasks with different colors, Markdown support for the description +- Tasks with different colors, categories, sub-tasks, attachments, Markdown support for the description - Automatic actions - Users management with a basic privileges separation (administrator or regular user) - External authentication: Google Account and LDAP/ActiveDirectory diff --git a/app/Core/Event.php b/app/Core/Event.php index 2c029b49..ac81bf87 100644 --- a/app/Core/Event.php +++ b/app/Core/Event.php @@ -67,13 +67,16 @@ class Event */ public function trigger($eventName, array $data) { - $this->lastEvent = $eventName; - $this->events[] = $eventName; + if (! $this->isEventTriggered($eventName)) { - if (isset($this->listeners[$eventName])) { - foreach ($this->listeners[$eventName] as $listener) { - if ($listener->execute($data)) { - $this->lastListener = get_class($listener); + $this->lastEvent = $eventName; + $this->events[] = $eventName; + + if (isset($this->listeners[$eventName])) { + foreach ($this->listeners[$eventName] as $listener) { + if ($listener->execute($data)) { + $this->lastListener = get_class($listener); + } } } } @@ -112,6 +115,18 @@ class Event return $this->events; } + /** + * Check if an event have been triggered + * + * @access public + * @param string $eventName Event name + * @return bool + */ + public function isEventTriggered($eventName) + { + return in_array($eventName, $this->events); + } + /** * Check if a listener bind to an event * diff --git a/app/Model/Task.php b/app/Model/Task.php index 45c68aec..04500272 100644 --- a/app/Model/Task.php +++ b/app/Model/Task.php @@ -359,12 +359,10 @@ class Task extends Base // Trigger events if ($result) { - $events = array(); - - if (! in_array($this->event->getLastTriggeredEvent(), array(self::EVENT_CREATE_UPDATE))) { - $events[] = self::EVENT_CREATE_UPDATE; - $events[] = self::EVENT_UPDATE; - } + $events = array( + self::EVENT_CREATE_UPDATE, + self::EVENT_UPDATE, + ); if (isset($values['column_id']) && $original_task['column_id'] != $values['column_id']) { $events[] = self::EVENT_MOVE_COLUMN; diff --git a/tests/ActionTest.php b/tests/ActionTest.php index 391f0e25..5cab0fc0 100644 --- a/tests/ActionTest.php +++ b/tests/ActionTest.php @@ -86,6 +86,9 @@ class ActionTest extends Base // We move our task $task->move(1, 4, 1); + $this->assertTrue($this->event->isEventTriggered(Task::EVENT_MOVE_COLUMN)); + $this->assertTrue($this->event->isEventTriggered(Task::EVENT_UPDATE)); + // Our task should be closed $t1 = $task->getById(1); $this->assertEquals(4, $t1['column_id']); @@ -109,15 +112,16 @@ class ActionTest extends Base 'owner_id' => 1, 'color_id' => 'red', 'column_id' => 1, + 'category_id' => 1, ))); // We create a new action, when the category_id=2 then the color_id should be green $this->assertTrue($action->create(array( 'project_id' => 1, 'event_name' => Task::EVENT_MOVE_POSITION, - 'action_name' => 'TaskClose', + 'action_name' => 'TaskAssignColorCategory', 'params' => array( - 'column_id' => 1, + 'category_id' => 1, 'color_id' => 'green', ) ))); @@ -125,21 +129,24 @@ class ActionTest extends Base // We bind events $action->attachEvents(); - $this->assertTrue($this->event->hasListener(Task::EVENT_MOVE_POSITION, 'Action\TaskClose')); + $this->assertTrue($this->event->hasListener(Task::EVENT_MOVE_POSITION, 'Action\TaskAssignColorCategory')); // Our task should have the color red and position=0 $t1 = $task->getById(1); $this->assertEquals(0, $t1['position']); $this->assertEquals(1, $t1['is_active']); + $this->assertEquals('red', $t1['color_id']); // We move our task $task->move(1, 1, 2); - $this->assertEquals(Task::EVENT_CLOSE, $this->event->getLastTriggeredEvent()); + + $this->assertTrue($this->event->isEventTriggered(Task::EVENT_MOVE_POSITION)); // Our task should be green and have the position 2 $t1 = $task->getById(1); $this->assertEquals(2, $t1['position']); - $this->assertEquals(0, $t1['is_active']); + $this->assertEquals(1, $t1['is_active']); + $this->assertEquals('green', $t1['color_id']); } public function testExecuteMultipleActions() @@ -197,7 +204,9 @@ class ActionTest extends Base // We move our task $task->move(1, 4, 1); - $this->assertEquals(Task::EVENT_CREATE, $this->event->getLastTriggeredEvent()); + + $this->assertTrue($this->event->isEventTriggered(Task::EVENT_CLOSE)); + $this->assertTrue($this->event->isEventTriggered(Task::EVENT_MOVE_COLUMN)); // Our task should be closed $t1 = $task->getById(1); @@ -212,6 +221,4 @@ class ActionTest extends Base $this->assertEquals(2, $t2['project_id']); $this->assertEquals('unit_test', $t2['title']); } - - } diff --git a/tests/TaskTest.php b/tests/TaskTest.php index 2f645131..da7e6a70 100644 --- a/tests/TaskTest.php +++ b/tests/TaskTest.php @@ -110,7 +110,7 @@ class TaskTest extends Base // We duplicate our task $this->assertEquals(2, $t->duplicate(1)); - $this->assertEquals(Task::EVENT_CREATE, $this->event->getLastTriggeredEvent()); + $this->assertTrue($this->event->isEventTriggered(Task::EVENT_CREATE)); // Check the values of the duplicated task $task = $t->getById(2); @@ -136,7 +136,7 @@ class TaskTest extends Base // We duplicate our task to the 2nd project $this->assertEquals(2, $t->duplicateToAnotherProject(1, 2)); - $this->assertEquals(Task::EVENT_CREATE, $this->event->getLastTriggeredEvent()); + $this->assertTrue($this->event->isEventTriggered(Task::EVENT_CREATE)); // Check the values of the duplicated task $task = $t->getById(2); @@ -157,30 +157,31 @@ class TaskTest extends Base // We create task $this->assertEquals(1, $t->create(array('title' => 'test', 'project_id' => 1, 'column_id' => 1))); - $this->assertEquals(Task::EVENT_CREATE, $this->event->getLastTriggeredEvent()); + $this->assertTrue($this->event->isEventTriggered(Task::EVENT_CREATE)); // We update a task $this->assertTrue($t->update(array('title' => 'test2', 'id' => 1))); - $this->assertEquals(Task::EVENT_UPDATE, $this->event->getLastTriggeredEvent()); + $this->assertTrue($this->event->isEventTriggered(Task::EVENT_UPDATE)); + $this->assertTrue($this->event->isEventTriggered(Task::EVENT_CREATE_UPDATE)); // We close our task $this->assertTrue($t->close(1)); - $this->assertEquals(Task::EVENT_CLOSE, $this->event->getLastTriggeredEvent()); + $this->assertTrue($this->event->isEventTriggered(Task::EVENT_CLOSE)); // We open our task $this->assertTrue($t->open(1)); - $this->assertEquals(Task::EVENT_OPEN, $this->event->getLastTriggeredEvent()); + $this->assertTrue($this->event->isEventTriggered(Task::EVENT_OPEN)); // We change the column of our task $this->assertTrue($t->move(1, 2, 1)); - $this->assertEquals(Task::EVENT_MOVE_COLUMN, $this->event->getLastTriggeredEvent()); + $this->assertTrue($this->event->isEventTriggered(Task::EVENT_MOVE_COLUMN)); // We change the position of our task $this->assertTrue($t->move(1, 2, 2)); - $this->assertEquals(Task::EVENT_MOVE_POSITION, $this->event->getLastTriggeredEvent()); + $this->assertTrue($this->event->isEventTriggered(Task::EVENT_MOVE_POSITION)); // We change the column and the position of our task $this->assertTrue($t->move(1, 1, 3)); - $this->assertEquals(Task::EVENT_MOVE_COLUMN, $this->event->getLastTriggeredEvent()); + $this->assertTrue($this->event->isEventTriggered(Task::EVENT_MOVE_COLUMN)); } } -- cgit v1.2.3 From 93783274a438204a31865c848913088af96f0377 Mon Sep 17 00:00:00 2001 From: Frédéric Guillot Date: Mon, 26 May 2014 12:54:06 -0400 Subject: Improve automatic actions (move task to another position same columns) --- app/Core/Event.php | 11 +++++++++++ app/Model/Task.php | 2 ++ tests/ActionTest.php | 30 +++++++++++++++++++++++++----- 3 files changed, 38 insertions(+), 5 deletions(-) (limited to 'app') diff --git a/app/Core/Event.php b/app/Core/Event.php index ac81bf87..0e6df5e8 100644 --- a/app/Core/Event.php +++ b/app/Core/Event.php @@ -127,6 +127,17 @@ class Event return in_array($eventName, $this->events); } + /** + * Flush the list of triggered events + * + * @access public + */ + public function clearTriggeredEvents() + { + $this->events = array(); + $this->lastEvent = ''; + } + /** * Check if a listener bind to an event * diff --git a/app/Model/Task.php b/app/Model/Task.php index 04500272..70f1404c 100644 --- a/app/Model/Task.php +++ b/app/Model/Task.php @@ -456,6 +456,8 @@ class Task extends Base */ public function move($task_id, $column_id, $position) { + $this->event->clearTriggeredEvents(); + return $this->update(array( 'id' => $task_id, 'column_id' => $column_id, diff --git a/tests/ActionTest.php b/tests/ActionTest.php index 5cab0fc0..2eb12784 100644 --- a/tests/ActionTest.php +++ b/tests/ActionTest.php @@ -107,7 +107,7 @@ class ActionTest extends Base // We create a task $this->assertEquals(1, $task->create(array( - 'title' => 'unit_test', + 'title' => 'unit_test 0', 'project_id' => 1, 'owner_id' => 1, 'color_id' => 'red', @@ -115,6 +115,15 @@ class ActionTest extends Base 'category_id' => 1, ))); + $this->assertEquals(2, $task->create(array( + 'title' => 'unit_test 1', + 'project_id' => 1, + 'owner_id' => 1, + 'color_id' => 'yellow', + 'column_id' => 1, + 'category_id' => 1, + ))); + // We create a new action, when the category_id=2 then the color_id should be green $this->assertTrue($action->create(array( 'project_id' => 1, @@ -137,14 +146,25 @@ class ActionTest extends Base $this->assertEquals(1, $t1['is_active']); $this->assertEquals('red', $t1['color_id']); - // We move our task - $task->move(1, 1, 2); + $t1 = $task->getById(2); + $this->assertEquals(1, $t1['position']); + $this->assertEquals(1, $t1['is_active']); + $this->assertEquals('yellow', $t1['color_id']); + + // We move our tasks + $task->move(1, 1, 1); // task #1 to position 1 + $task->move(2, 1, 0); // task #2 to position 0 $this->assertTrue($this->event->isEventTriggered(Task::EVENT_MOVE_POSITION)); - // Our task should be green and have the position 2 + // Both tasks should be green $t1 = $task->getById(1); - $this->assertEquals(2, $t1['position']); + $this->assertEquals(1, $t1['position']); + $this->assertEquals(1, $t1['is_active']); + $this->assertEquals('green', $t1['color_id']); + + $t1 = $task->getById(2); + $this->assertEquals(0, $t1['position']); $this->assertEquals(1, $t1['is_active']); $this->assertEquals('green', $t1['color_id']); } -- cgit v1.2.3 From 73944ae3687525eb7fafa0a0de2b919b51974542 Mon Sep 17 00:00:00 2001 From: Frédéric Guillot Date: Tue, 27 May 2014 10:07:59 -0400 Subject: Improve assets loading (add helpers) --- app/Templates/board_index.php | 2 +- app/Templates/layout.php | 10 +++++----- app/Templates/task_layout.php | 3 ++- app/helpers.php | 10 ++++++++++ 4 files changed, 18 insertions(+), 7 deletions(-) (limited to 'app') diff --git a/app/Templates/board_index.php b/app/Templates/board_index.php index 8e664219..38fb985c 100644 --- a/app/Templates/board_index.php +++ b/app/Templates/board_index.php @@ -39,4 +39,4 @@ - + diff --git a/app/Templates/layout.php b/app/Templates/layout.php index 0bb8446d..3e3b2e89 100644 --- a/app/Templates/layout.php +++ b/app/Templates/layout.php @@ -6,12 +6,12 @@ - - - + + + - - + + diff --git a/app/Templates/task_layout.php b/app/Templates/task_layout.php index ce5f36c5..cc711b78 100644 --- a/app/Templates/task_layout.php +++ b/app/Templates/task_layout.php @@ -14,4 +14,5 @@
    - \ No newline at end of file + + diff --git a/app/helpers.php b/app/helpers.php index 2dcb38e8..d22a4869 100644 --- a/app/helpers.php +++ b/app/helpers.php @@ -2,6 +2,16 @@ namespace Helper; +function js($filename) +{ + return ''; +} + +function css($filename) +{ + return ''; +} + function template($name, array $args = array()) { $tpl = new \Core\Template; -- cgit v1.2.3 From c482e704697301a982e3c989ac795e0f4c2e899a Mon Sep 17 00:00:00 2001 From: Frédéric Guillot Date: Tue, 27 May 2014 11:40:07 -0400 Subject: Add a new automatic action: assign a category based on a defined color --- app/Action/TaskAssignCategoryColor.php | 85 ++++++++++++++++++++++++++++++++++ app/Locales/de_DE/translations.php | 3 +- app/Locales/es_ES/translations.php | 3 +- app/Locales/fr_FR/translations.php | 3 +- app/Locales/pl_PL/translations.php | 3 +- app/Locales/pt_BR/translations.php | 3 +- app/Model/Action.php | 6 ++- 7 files changed, 100 insertions(+), 6 deletions(-) create mode 100644 app/Action/TaskAssignCategoryColor.php (limited to 'app') diff --git a/app/Action/TaskAssignCategoryColor.php b/app/Action/TaskAssignCategoryColor.php new file mode 100644 index 00000000..19d7fa9c --- /dev/null +++ b/app/Action/TaskAssignCategoryColor.php @@ -0,0 +1,85 @@ +task = $task; + } + + /** + * Get the required parameter for the action (defined by the user) + * + * @access public + * @return array + */ + public function getActionRequiredParameters() + { + return array( + 'color_id' => t('Color'), + 'category_id' => t('Category'), + ); + } + + /** + * Get the required parameter for the event + * + * @access public + * @return string[] + */ + public function getEventRequiredParameters() + { + return array( + 'task_id', + 'color_id', + ); + } + + /** + * Execute the action + * + * @access public + * @param array $data Event data dictionary + * @return bool True if the action was executed or false when not executed + */ + public function doAction(array $data) + { + if ($data['color_id'] == $this->getParam('color_id')) { + + $this->task->update(array( + 'id' => $data['task_id'], + 'category_id' => $this->getParam('category_id'), + )); + + return true; + } + + return false; + } +} diff --git a/app/Locales/de_DE/translations.php b/app/Locales/de_DE/translations.php index 3816a251..24122b00 100644 --- a/app/Locales/de_DE/translations.php +++ b/app/Locales/de_DE/translations.php @@ -312,7 +312,8 @@ return array( // 'Unable to remove this task.' => '', // 'Remove a task' => '', // 'Do you really want to remove this task: "%s"?' => '', - // 'Assign a color to a specific category' => '', + // 'Assign automatically a color based on a category' => '', + // 'Assign automatically a category based on a color' => '', // 'Task creation or modification' => '', // 'Category' => '', // 'Category:' => '', diff --git a/app/Locales/es_ES/translations.php b/app/Locales/es_ES/translations.php index 35ce6c05..d5a8a104 100644 --- a/app/Locales/es_ES/translations.php +++ b/app/Locales/es_ES/translations.php @@ -310,7 +310,8 @@ return array( // 'Unable to remove this task.' => '', // 'Remove a task' => '', // 'Do you really want to remove this task: "%s"?' => '', - // 'Assign a color to a specific category' => '', + // 'Assign automatically a color based on a category' => '', + // 'Assign automatically a category based on a color' => '', // 'Task creation or modification' => '', // 'Category' => '', // 'Category:' => '', diff --git a/app/Locales/fr_FR/translations.php b/app/Locales/fr_FR/translations.php index bc9b555f..53ded262 100644 --- a/app/Locales/fr_FR/translations.php +++ b/app/Locales/fr_FR/translations.php @@ -310,7 +310,8 @@ return array( 'Unable to remove this task.' => 'Impossible de supprimer cette tâche.', 'Remove a task' => 'Supprimer une tâche', 'Do you really want to remove this task: "%s"?' => 'Voulez-vous vraiment supprimer cette tâche « %s » ?', - 'Assign a color to a specific category' => 'Assigner une couleur à une catégorie spécifique', + 'Assign automatically a color based on a category' => 'Assigner automatiquement une couleur par rapport à une catégorie définie', + 'Assign automatically a category based on a color' => 'Assigner automatiquement une catégorie par rapport à une couleur définie', 'Task creation or modification' => 'Création ou modification d\'une tâche', 'Category' => 'Catégorie', 'Category:' => 'Catégorie :', diff --git a/app/Locales/pl_PL/translations.php b/app/Locales/pl_PL/translations.php index 21b3e5a5..456a7253 100644 --- a/app/Locales/pl_PL/translations.php +++ b/app/Locales/pl_PL/translations.php @@ -315,7 +315,8 @@ return array( // 'Unable to remove this task.' => '', // 'Remove a task' => '', // 'Do you really want to remove this task: "%s"?' => '', - // 'Assign a color to a specific category' => '', + // 'Assign automatically a color based on a category' => '', + // 'Assign automatically a category based on a color' => '', // 'Task creation or modification' => '', // 'Category' => '', // 'Category:' => '', diff --git a/app/Locales/pt_BR/translations.php b/app/Locales/pt_BR/translations.php index 9939a0c3..19e3799d 100644 --- a/app/Locales/pt_BR/translations.php +++ b/app/Locales/pt_BR/translations.php @@ -311,7 +311,8 @@ return array( // 'Unable to remove this task.' => '', // 'Remove a task' => '', // 'Do you really want to remove this task: "%s"?' => '', - // 'Assign a color to a specific category' => '', + // 'Assign automatically a color based on a category' => '', + // 'Assign automatically a category based on a color' => '', // 'Task creation or modification' => '', // 'Category' => '', // 'Category:' => '', diff --git a/app/Model/Action.php b/app/Model/Action.php index 7cd917e9..0e3aee71 100644 --- a/app/Model/Action.php +++ b/app/Model/Action.php @@ -42,7 +42,8 @@ class Action extends Base 'TaskAssignCurrentUser' => t('Assign the task to the person who does the action'), 'TaskDuplicateAnotherProject' => t('Duplicate the task to another project'), 'TaskAssignColorUser' => t('Assign a color to a specific user'), - 'TaskAssignColorCategory' => t('Assign a color to a specific category'), + 'TaskAssignColorCategory' => t('Assign automatically a color based on a category'), + 'TaskAssignCategoryColor' => t('Assign automatically a category based on a color'), ); } @@ -237,6 +238,9 @@ class Action extends Base case 'TaskAssignColorCategory': $className = '\Action\TaskAssignColorCategory'; return new $className($project_id, new Task($this->db, $this->event)); + case 'TaskAssignCategoryColor': + $className = '\Action\TaskAssignCategoryColor'; + return new $className($project_id, new Task($this->db, $this->event)); default: throw new LogicException('Action not found: '.$name); } -- cgit v1.2.3 From 3fb5c556ec75c1a5f54171527a76530764cc24f4 Mon Sep 17 00:00:00 2001 From: Frédéric Guillot Date: Tue, 27 May 2014 12:54:42 -0400 Subject: Fix some Windows Server issues --- app/Core/Response.php | 22 +++++++++++++++++----- app/Core/Translator.php | 10 +++++++++- 2 files changed, 26 insertions(+), 6 deletions(-) (limited to 'app') diff --git a/app/Core/Response.php b/app/Core/Response.php index 87d2fa4a..11d7567a 100644 --- a/app/Core/Response.php +++ b/app/Core/Response.php @@ -10,6 +10,18 @@ namespace Core; */ class Response { + /** + * Send no cache headers + * + * @access public + */ + public function nocache() + { + header('Pragma: no-cache'); + header('Cache-Control: no-cache, must-revalidate'); + header('Expires: Sat, 26 Jul 1997 05:00:00 GMT'); + } + /** * Send a custom Content-Type header * @@ -66,7 +78,7 @@ class Response public function json(array $data, $status_code = 200) { $this->status($status_code); - + $this->nocache(); header('Content-Type: application/json'); echo json_encode($data); @@ -83,7 +95,7 @@ class Response public function text($data, $status_code = 200) { $this->status($status_code); - + $this->nocache(); header('Content-Type: text/plain; charset=utf-8'); echo $data; @@ -100,7 +112,7 @@ class Response public function html($data, $status_code = 200) { $this->status($status_code); - + $this->nocache(); header('Content-Type: text/html; charset=utf-8'); echo $data; @@ -117,7 +129,7 @@ class Response public function xml($data, $status_code = 200) { $this->status($status_code); - + $this->nocache(); header('Content-Type: text/xml; charset=utf-8'); echo $data; @@ -151,7 +163,7 @@ class Response public function binary($data, $status_code = 200) { $this->status($status_code); - + $this->nocache(); header('Content-Transfer-Encoding: binary'); header('Content-Type: application/octet-stream'); echo $data; diff --git a/app/Core/Translator.php b/app/Core/Translator.php index 015a76cb..d9386d3a 100644 --- a/app/Core/Translator.php +++ b/app/Core/Translator.php @@ -114,7 +114,15 @@ class Translator return ''; } - return strftime($this->get($format, $format), (int) $timestamp); + $format = $this->get($format, $format); + + if (strtoupper(substr(PHP_OS, 0, 3)) === 'WIN') { + $format = str_replace('%e', '%d', $format); + $format = str_replace('%G', '%Y', $format); + $format = str_replace('%k', '%H', $format); + } + + return strftime($format, (int) $timestamp); } /** -- cgit v1.2.3 From 445ef6d1481745cd4e7af7e671f534a25d4495dc Mon Sep 17 00:00:00 2001 From: Frédéric Guillot Date: Wed, 28 May 2014 15:14:52 -0400 Subject: Add CSRF protections --- app/Controller/Action.php | 1 + app/Controller/Base.php | 25 +++++++++- app/Controller/Board.php | 76 ++++++++++++++++------------ app/Controller/Category.php | 1 + app/Controller/Comment.php | 1 + app/Controller/Config.php | 4 ++ app/Controller/File.php | 1 + app/Controller/Project.php | 18 ++----- app/Controller/Subtask.php | 1 + app/Controller/Task.php | 3 ++ app/Controller/User.php | 20 +++----- app/Core/Request.php | 24 ++++++++- app/Core/Response.php | 4 +- app/Core/Security.php | 87 +++++++++++++++++++++++++++++++++ app/Model/Base.php | 19 ------- app/Model/Config.php | 7 +-- app/Model/Project.php | 3 +- app/Model/RememberMe.php | 8 +-- app/Schema/Mysql.php | 2 +- app/Schema/Sqlite.php | 4 +- app/Templates/action_index.php | 2 +- app/Templates/action_params.php | 2 +- app/Templates/action_remove.php | 2 +- app/Templates/app_forbidden.php | 9 ++++ app/Templates/board_assign.php | 2 +- app/Templates/board_edit.php | 8 +-- app/Templates/board_remove.php | 2 +- app/Templates/board_show.php | 2 +- app/Templates/category_edit.php | 2 +- app/Templates/category_index.php | 1 + app/Templates/category_remove.php | 2 +- app/Templates/comment_create.php | 2 +- app/Templates/comment_edit.php | 1 + app/Templates/comment_remove.php | 2 +- app/Templates/config_index.php | 10 ++-- app/Templates/file_new.php | 1 + app/Templates/file_remove.php | 2 +- app/Templates/layout.php | 2 +- app/Templates/project_edit.php | 1 + app/Templates/project_forbidden.php | 9 ---- app/Templates/project_index.php | 4 +- app/Templates/project_new.php | 1 + app/Templates/project_remove.php | 2 +- app/Templates/project_users.php | 4 +- app/Templates/subtask_create.php | 2 + app/Templates/subtask_edit.php | 2 + app/Templates/subtask_remove.php | 2 +- app/Templates/task_close.php | 2 +- app/Templates/task_edit.php | 2 + app/Templates/task_edit_description.php | 2 + app/Templates/task_new.php | 2 + app/Templates/task_open.php | 2 +- app/Templates/task_remove.php | 2 +- app/Templates/user_edit.php | 6 ++- app/Templates/user_forbidden.php | 9 ---- app/Templates/user_login.php | 2 + app/Templates/user_new.php | 2 + app/Templates/user_remove.php | 2 +- app/helpers.php | 10 ++++ assets/js/board.js | 4 +- tests/Base.php | 2 + 61 files changed, 299 insertions(+), 140 deletions(-) create mode 100644 app/Core/Security.php create mode 100644 app/Templates/app_forbidden.php delete mode 100644 app/Templates/project_forbidden.php delete mode 100644 app/Templates/user_forbidden.php (limited to 'app') diff --git a/app/Controller/Action.php b/app/Controller/Action.php index 2aa85c14..11dc3b29 100644 --- a/app/Controller/Action.php +++ b/app/Controller/Action.php @@ -129,6 +129,7 @@ class Action extends Base */ public function remove() { + $this->checkCSRFParam(); $action = $this->action->getById($this->request->getIntegerParam('action_id')); if ($action && $this->action->remove($action['id'])) { diff --git a/app/Controller/Base.php b/app/Controller/Base.php index 5829fc36..9b695a82 100644 --- a/app/Controller/Base.php +++ b/app/Controller/Base.php @@ -3,6 +3,7 @@ namespace Controller; use Core\Registry; +use Core\Security; use Core\Translator; use Model\LastLogin; @@ -160,6 +161,28 @@ abstract class Base $this->response->html($this->template->layout('app_notfound', array('title' => t('Page not found')))); } + /** + * Application forbidden page + * + * @access public + */ + public function forbidden() + { + $this->response->html($this->template->layout('app_forbidden', array('title' => t('Access Forbidden')))); + } + + /** + * Check if the CSRF token from the URL is correct + * + * @access protected + */ + protected function checkCSRFParam() + { + if (! Security::validateCSRFToken($this->request->getStringParam('csrf_token'))) { + $this->forbidden(); + } + } + /** * Check if the current user have access to the given project * @@ -171,7 +194,7 @@ abstract class Base if ($this->acl->isRegularUser()) { if ($project_id > 0 && ! $this->project->isUserAllowed($project_id, $this->acl->getUserId())) { - $this->response->redirect('?controller=project&action=forbidden'); + $this->forbidden(); } } } diff --git a/app/Controller/Board.php b/app/Controller/Board.php index 53fdeab9..67072895 100644 --- a/app/Controller/Board.php +++ b/app/Controller/Board.php @@ -4,6 +4,7 @@ namespace Controller; use Model\Project as ProjectModel; use Model\User as UserModel; +use Core\Security; /** * Board controller @@ -20,6 +21,7 @@ class Board extends Base */ public function moveUp() { + $this->checkCSRFParam(); $project_id = $this->request->getIntegerParam('project_id'); $column_id = $this->request->getIntegerParam('column_id'); @@ -35,6 +37,7 @@ class Board extends Base */ public function moveDown() { + $this->checkCSRFParam(); $project_id = $this->request->getIntegerParam('project_id'); $column_id = $this->request->getIntegerParam('column_id'); @@ -344,6 +347,7 @@ class Board extends Base */ public function remove() { + $this->checkCSRFParam(); $column = $this->board->getColumn($this->request->getIntegerParam('column_id')); if ($column && $this->board->removeColumn($column['id'])) { @@ -362,25 +366,31 @@ class Board extends Base */ public function save() { - $project_id = $this->request->getIntegerParam('project_id'); - $values = $this->request->getValues(); + if ($this->request->isAjax()) { - if ($project_id > 0 && ! $this->project->isUserAllowed($project_id, $this->acl->getUserId())) { - $this->response->text('Not Authorized', 401); - } + $project_id = $this->request->getIntegerParam('project_id'); + $values = $this->request->getValues(); - if (isset($values['positions'])) { - $this->board->saveTasksPosition($values['positions']); - } + if ($project_id > 0 && ! $this->project->isUserAllowed($project_id, $this->acl->getUserId())) { + $this->response->text('Not Authorized', 401); + } + + if (isset($values['positions'])) { + $this->board->saveTasksPosition($values['positions']); + } - $this->response->html( - $this->template->load('board_show', array( - 'current_project_id' => $project_id, - 'board' => $this->board->get($project_id), - 'categories' => $this->category->getList($project_id, false), - )), - 201 - ); + $this->response->html( + $this->template->load('board_show', array( + 'current_project_id' => $project_id, + 'board' => $this->board->get($project_id), + 'categories' => $this->category->getList($project_id, false), + )), + 201 + ); + } + else { + $this->response->status(401); + } } /** @@ -390,24 +400,30 @@ class Board extends Base */ public function check() { - $project_id = $this->request->getIntegerParam('project_id'); - $timestamp = $this->request->getIntegerParam('timestamp'); + if ($this->request->isAjax()) { - if ($project_id > 0 && ! $this->project->isUserAllowed($project_id, $this->acl->getUserId())) { - $this->response->text('Not Authorized', 401); - } + $project_id = $this->request->getIntegerParam('project_id'); + $timestamp = $this->request->getIntegerParam('timestamp'); - if ($this->project->isModifiedSince($project_id, $timestamp)) { - $this->response->html( - $this->template->load('board_show', array( - 'current_project_id' => $project_id, - 'board' => $this->board->get($project_id), - 'categories' => $this->category->getList($project_id, false), - )) - ); + if ($project_id > 0 && ! $this->project->isUserAllowed($project_id, $this->acl->getUserId())) { + $this->response->text('Not Authorized', 401); + } + + if ($this->project->isModifiedSince($project_id, $timestamp)) { + $this->response->html( + $this->template->load('board_show', array( + 'current_project_id' => $project_id, + 'board' => $this->board->get($project_id), + 'categories' => $this->category->getList($project_id, false), + )) + ); + } + else { + $this->response->status(304); + } } else { - $this->response->status(304); + $this->response->status(401); } } } diff --git a/app/Controller/Category.php b/app/Controller/Category.php index f96c1d4a..9b73f207 100644 --- a/app/Controller/Category.php +++ b/app/Controller/Category.php @@ -175,6 +175,7 @@ class Category extends Base */ public function remove() { + $this->checkCSRFParam(); $project = $this->getProject(); $category = $this->getCategory($project['id']); diff --git a/app/Controller/Comment.php b/app/Controller/Comment.php index 47eaf6b6..a0a11fc8 100644 --- a/app/Controller/Comment.php +++ b/app/Controller/Comment.php @@ -178,6 +178,7 @@ class Comment extends Base */ public function remove() { + $this->checkCSRFParam(); $task = $this->getTask(); $comment = $this->getComment(); diff --git a/app/Controller/Config.php b/app/Controller/Config.php index b4a5b8d3..daa57790 100644 --- a/app/Controller/Config.php +++ b/app/Controller/Config.php @@ -76,6 +76,7 @@ class Config extends Base */ public function downloadDb() { + $this->checkCSRFParam(); $this->response->forceDownload('db.sqlite.gz'); $this->response->binary($this->config->downloadDatabase()); } @@ -87,6 +88,7 @@ class Config extends Base */ public function optimizeDb() { + $this->checkCSRFParam(); $this->config->optimizeDatabase(); $this->session->flash(t('Database optimization done.')); $this->response->redirect('?controller=config'); @@ -99,6 +101,7 @@ class Config extends Base */ public function tokens() { + $this->checkCSRFParam(); $this->config->regenerateTokens(); $this->session->flash(t('All tokens have been regenerated.')); $this->response->redirect('?controller=config'); @@ -111,6 +114,7 @@ class Config extends Base */ public function removeRememberMeToken() { + $this->checkCSRFParam(); $this->rememberMe->remove($this->request->getIntegerParam('id')); $this->response->redirect('?controller=config&action=index#remember-me'); } diff --git a/app/Controller/File.php b/app/Controller/File.php index 38cb82ab..3c8c32d1 100644 --- a/app/Controller/File.php +++ b/app/Controller/File.php @@ -111,6 +111,7 @@ class File extends Base */ public function remove() { + $this->checkCSRFParam(); $task = $this->getTask(); $file = $this->file->getById($this->request->getIntegerParam('file_id')); diff --git a/app/Controller/Project.php b/app/Controller/Project.php index e539f364..0de67691 100644 --- a/app/Controller/Project.php +++ b/app/Controller/Project.php @@ -12,19 +12,6 @@ use Model\Task as TaskModel; */ class Project extends Base { - /** - * Display access forbidden page - * - * @access public - */ - public function forbidden() - { - $this->response->html($this->template->layout('project_forbidden', array( - 'menu' => 'projects', - 'title' => t('Access Forbidden') - ))); - } - /** * Task search for a given project * @@ -254,6 +241,7 @@ class Project extends Base */ public function remove() { + $this->checkCSRFParam(); $project_id = $this->request->getIntegerParam('project_id'); if ($project_id && $this->project->remove($project_id)) { @@ -272,6 +260,7 @@ class Project extends Base */ public function enable() { + $this->checkCSRFParam(); $project_id = $this->request->getIntegerParam('project_id'); if ($project_id && $this->project->enable($project_id)) { @@ -290,6 +279,7 @@ class Project extends Base */ public function disable() { + $this->checkCSRFParam(); $project_id = $this->request->getIntegerParam('project_id'); if ($project_id && $this->project->disable($project_id)) { @@ -353,6 +343,8 @@ class Project extends Base */ public function revoke() { + $this->checkCSRFParam(); + $values = array( 'project_id' => $this->request->getIntegerParam('project_id'), 'user_id' => $this->request->getIntegerParam('user_id'), diff --git a/app/Controller/Subtask.php b/app/Controller/Subtask.php index 5ef193c8..1c217fa2 100644 --- a/app/Controller/Subtask.php +++ b/app/Controller/Subtask.php @@ -170,6 +170,7 @@ class Subtask extends Base */ public function remove() { + $this->checkCSRFParam(); $task = $this->getTask(); $subtask = $this->getSubtask(); diff --git a/app/Controller/Task.php b/app/Controller/Task.php index 68e3728a..d44ba268 100644 --- a/app/Controller/Task.php +++ b/app/Controller/Task.php @@ -218,6 +218,7 @@ class Task extends Base */ public function close() { + $this->checkCSRFParam(); $task = $this->getTask(); if ($this->task->close($task['id'])) { @@ -252,6 +253,7 @@ class Task extends Base */ public function open() { + $this->checkCSRFParam(); $task = $this->getTask(); if ($this->task->open($task['id'])) { @@ -286,6 +288,7 @@ class Task extends Base */ public function remove() { + $this->checkCSRFParam(); $task = $this->getTask(); if ($this->task->remove($task['id'])) { diff --git a/app/Controller/User.php b/app/Controller/User.php index e3fd8253..fca33b28 100644 --- a/app/Controller/User.php +++ b/app/Controller/User.php @@ -10,19 +10,6 @@ namespace Controller; */ class User extends Base { - /** - * Display access forbidden page - * - * @access public - */ - public function forbidden() - { - $this->response->html($this->template->layout('user_forbidden', array( - 'menu' => 'users', - 'title' => t('Access Forbidden') - ))); - } - /** * Logout and destroy session * @@ -30,6 +17,7 @@ class User extends Base */ public function logout() { + $this->checkCSRFParam(); $this->rememberMe->destroy($this->acl->getUserId()); $this->session->close(); $this->response->redirect('?controller=user&action=login'); @@ -42,7 +30,9 @@ class User extends Base */ public function login() { - if (isset($_SESSION['user'])) $this->response->redirect('?controller=app'); + if (isset($_SESSION['user'])) { + $this->response->redirect('?controller=app'); + } $this->response->html($this->template->layout('user_login', array( 'errors' => array(), @@ -236,6 +226,7 @@ class User extends Base */ public function remove() { + $this->checkCSRFParam(); $user_id = $this->request->getIntegerParam('user_id'); if ($user_id && $this->user->remove($user_id)) { @@ -298,6 +289,7 @@ class User extends Base */ public function unlinkGoogle() { + $this->checkCSRFParam(); if ($this->google->unlink($this->acl->getUserId())) { $this->session->flash(t('Your Google Account is not linked anymore to your profile.')); } diff --git a/app/Core/Request.php b/app/Core/Request.php index 7e9f24ac..6bc738be 100644 --- a/app/Core/Request.php +++ b/app/Core/Request.php @@ -2,6 +2,8 @@ namespace Core; +use Core\Security; + /** * Request class * @@ -58,7 +60,12 @@ class Request public function getValues() { if (! empty($_POST)) { - return $_POST; + + if (Security::validateCSRFFormToken($_POST)) { + return $_POST; + } + + return array(); } $result = json_decode($this->getBody(), true); @@ -116,6 +123,19 @@ class Request */ public function isAjax() { - return isset($_SERVER['HTTP_X_REQUESTED_WITH']) && $_SERVER['HTTP_X_REQUESTED_WITH'] === 'XMLHttpRequest'; + return $this->getHeader('X-Requested-With') === 'XMLHttpRequest'; + } + + /** + * Return a HTTP header value + * + * @access public + * @param string $name Header name + * @return string + */ + public function getHeader($name) + { + $name = 'HTTP_'.str_replace('-', '_', strtoupper($name)); + return isset($_SERVER[$name]) ? $_SERVER[$name] : ''; } } diff --git a/app/Core/Response.php b/app/Core/Response.php index 11d7567a..aee029af 100644 --- a/app/Core/Response.php +++ b/app/Core/Response.php @@ -18,8 +18,10 @@ class Response public function nocache() { header('Pragma: no-cache'); - header('Cache-Control: no-cache, must-revalidate'); header('Expires: Sat, 26 Jul 1997 05:00:00 GMT'); + + // Use no-store due to a Chrome bug: https://code.google.com/p/chromium/issues/detail?id=28035 + header('Cache-Control: no-store, must-revalidate'); } /** diff --git a/app/Core/Security.php b/app/Core/Security.php new file mode 100644 index 00000000..0bd7c991 --- /dev/null +++ b/app/Core/Security.php @@ -0,0 +1,87 @@ +db = $db; $this->event = $event; } - - /** - * Generate a random token with different methods: openssl or /dev/urandom or fallback to uniqid() - * - * @static - * @access public - * @return string Random token - */ - public static function generateToken() - { - if (function_exists('openssl_random_pseudo_bytes')) { - return bin2hex(\openssl_random_pseudo_bytes(16)); - } - else if (ini_get('open_basedir') === '' && strtoupper(substr(PHP_OS, 0, 3)) !== 'WIN') { - return hash('sha256', file_get_contents('/dev/urandom', false, null, 0, 30)); - } - - return hash('sha256', uniqid(mt_rand(), true)); - } } diff --git a/app/Model/Config.php b/app/Model/Config.php index 23abd8b5..469e6447 100644 --- a/app/Model/Config.php +++ b/app/Model/Config.php @@ -5,6 +5,7 @@ namespace Model; use SimpleValidator\Validator; use SimpleValidator\Validators; use Core\Translator; +use Core\Security; /** * Config model @@ -29,7 +30,7 @@ class Config extends Base */ public function getTimezones() { - $timezones = \timezone_identifiers_list(); + $timezones = timezone_identifiers_list(); return array_combine(array_values($timezones), $timezones); } @@ -171,12 +172,12 @@ class Config extends Base */ public function regenerateTokens() { - $this->db->table(self::TABLE)->update(array('webhooks_token' => $this->generateToken())); + $this->db->table(self::TABLE)->update(array('webhooks_token' => Security::generateToken())); $projects = $this->db->table(Project::TABLE)->findAllByColumn('id'); foreach ($projects as $project_id) { - $this->db->table(Project::TABLE)->eq('id', $project_id)->update(array('token' => $this->generateToken())); + $this->db->table(Project::TABLE)->eq('id', $project_id)->update(array('token' => Security::generateToken())); } } } diff --git a/app/Model/Project.php b/app/Model/Project.php index 9fbb0806..e1465012 100644 --- a/app/Model/Project.php +++ b/app/Model/Project.php @@ -5,6 +5,7 @@ namespace Model; use SimpleValidator\Validator; use SimpleValidator\Validators; use Event\TaskModification; +use Core\Security; /** * Project model @@ -363,7 +364,7 @@ class Project extends Base { $this->db->startTransaction(); - $values['token'] = self::generateToken(); + $values['token'] = Security::generateToken(); if (! $this->db->table(self::TABLE)->save($values)) { $this->db->cancelTransaction(); diff --git a/app/Model/RememberMe.php b/app/Model/RememberMe.php index 1494b14a..c9ef819f 100644 --- a/app/Model/RememberMe.php +++ b/app/Model/RememberMe.php @@ -2,6 +2,8 @@ namespace Model; +use Core\Security; + /** * RememberMe model * @@ -174,8 +176,8 @@ class RememberMe extends Base */ public function create($user_id, $ip, $user_agent) { - $token = hash('sha256', $user_id.$user_agent.$ip.$this->generateToken()); - $sequence = $this->generateToken(); + $token = hash('sha256', $user_id.$user_agent.$ip.Security::generateToken()); + $sequence = Security::generateToken(); $expiration = time() + self::EXPIRATION; $this->cleanup($user_id); @@ -225,7 +227,7 @@ class RememberMe extends Base */ public function update($token, $sequence) { - $new_sequence = $this->generateToken(); + $new_sequence = Security::generateToken(); $this->db ->table(self::TABLE) diff --git a/app/Schema/Mysql.php b/app/Schema/Mysql.php index 3df38dee..5c7e256f 100644 --- a/app/Schema/Mysql.php +++ b/app/Schema/Mysql.php @@ -263,6 +263,6 @@ function version_1($pdo) $pdo->exec(" INSERT INTO config (webhooks_token) - VALUES ('".\Model\Base::generateToken()."') + VALUES ('".\Core\Security::generateToken()."') "); } diff --git a/app/Schema/Sqlite.php b/app/Schema/Sqlite.php index 663c7d34..bfe81c13 100644 --- a/app/Schema/Sqlite.php +++ b/app/Schema/Sqlite.php @@ -209,7 +209,7 @@ function version_3($pdo) foreach ($results as &$result) { $rq = $pdo->prepare('UPDATE projects SET token=? WHERE id=?'); - $rq->execute(array(\Model\Base::generateToken(), $result['id'])); + $rq->execute(array(\Core\Security::generateToken(), $result['id'])); } } } @@ -284,6 +284,6 @@ function version_1($pdo) $pdo->exec(" INSERT INTO config (language, webhooks_token) - VALUES ('en_US', '".\Model\Base::generateToken()."') + VALUES ('en_US', '".\Core\Security::generateToken()."') "); } diff --git a/app/Templates/action_index.php b/app/Templates/action_index.php index b515ccaa..36c333a9 100644 --- a/app/Templates/action_index.php +++ b/app/Templates/action_index.php @@ -56,7 +56,7 @@

    - + diff --git a/app/Templates/action_params.php b/app/Templates/action_params.php index 15a1d420..da685860 100644 --- a/app/Templates/action_params.php +++ b/app/Templates/action_params.php @@ -9,7 +9,7 @@

    - + diff --git a/app/Templates/action_remove.php b/app/Templates/action_remove.php index b90136e8..13679eab 100644 --- a/app/Templates/action_remove.php +++ b/app/Templates/action_remove.php @@ -9,7 +9,7 @@

    - +
    diff --git a/app/Templates/app_forbidden.php b/app/Templates/app_forbidden.php new file mode 100644 index 00000000..0c035404 --- /dev/null +++ b/app/Templates/app_forbidden.php @@ -0,0 +1,9 @@ +
    +
    +

    +
    + +

    + +

    +
    \ No newline at end of file diff --git a/app/Templates/board_assign.php b/app/Templates/board_assign.php index 74448a5c..6f92b375 100644 --- a/app/Templates/board_assign.php +++ b/app/Templates/board_assign.php @@ -18,7 +18,7 @@

    - + diff --git a/app/Templates/board_edit.php b/app/Templates/board_edit.php index 575536a8..05d9a6f6 100644 --- a/app/Templates/board_edit.php +++ b/app/Templates/board_edit.php @@ -9,7 +9,7 @@

    - + @@ -27,12 +27,12 @@
    +
    > diff --git a/app/Templates/category_edit.php b/app/Templates/category_edit.php index 99ba0c7c..1339f6da 100644 --- a/app/Templates/category_edit.php +++ b/app/Templates/category_edit.php @@ -8,7 +8,7 @@
    - + diff --git a/app/Templates/category_index.php b/app/Templates/category_index.php index db986143..7fb923ba 100644 --- a/app/Templates/category_index.php +++ b/app/Templates/category_index.php @@ -34,6 +34,7 @@

    + diff --git a/app/Templates/category_remove.php b/app/Templates/category_remove.php index cc2eb678..cfc23e07 100644 --- a/app/Templates/category_remove.php +++ b/app/Templates/category_remove.php @@ -9,7 +9,7 @@

    - +
    diff --git a/app/Templates/comment_create.php b/app/Templates/comment_create.php index a566d9c8..f598532d 100644 --- a/app/Templates/comment_create.php +++ b/app/Templates/comment_create.php @@ -3,7 +3,7 @@ - +
    diff --git a/app/Templates/comment_edit.php b/app/Templates/comment_edit.php index 0a17a95e..fdf3db54 100644 --- a/app/Templates/comment_edit.php +++ b/app/Templates/comment_edit.php @@ -4,6 +4,7 @@ +
    diff --git a/app/Templates/comment_remove.php b/app/Templates/comment_remove.php index 6409d7c0..7b117781 100644 --- a/app/Templates/comment_remove.php +++ b/app/Templates/comment_remove.php @@ -10,7 +10,7 @@ $comment, 'task' => $task, 'preview' => true)) ?>
    - +
    \ No newline at end of file diff --git a/app/Templates/config_index.php b/app/Templates/config_index.php index 6c610d2b..602e2070 100644 --- a/app/Templates/config_index.php +++ b/app/Templates/config_index.php @@ -7,6 +7,8 @@
    + +
    @@ -39,7 +41,7 @@
      -
      • +
    • @@ -50,11 +52,11 @@
    • - +
    • - +
      • @@ -112,7 +114,7 @@
    - +
    diff --git a/app/Templates/file_new.php b/app/Templates/file_new.php index 643f340d..7f7f1d1c 100644 --- a/app/Templates/file_new.php +++ b/app/Templates/file_new.php @@ -3,6 +3,7 @@ +
    diff --git a/app/Templates/file_remove.php b/app/Templates/file_remove.php index 1d26c15e..af77591c 100644 --- a/app/Templates/file_remove.php +++ b/app/Templates/file_remove.php @@ -8,7 +8,7 @@

    - +
    \ No newline at end of file diff --git a/app/Templates/layout.php b/app/Templates/layout.php index 3e3b2e89..aa430477 100644 --- a/app/Templates/layout.php +++ b/app/Templates/layout.php @@ -45,7 +45,7 @@
  • - + ()
    • diff --git a/app/Templates/project_edit.php b/app/Templates/project_edit.php index 557986bf..a882fbc6 100644 --- a/app/Templates/project_edit.php +++ b/app/Templates/project_edit.php @@ -8,6 +8,7 @@
    + diff --git a/app/Templates/project_forbidden.php b/app/Templates/project_forbidden.php deleted file mode 100644 index 1cba7b58..00000000 --- a/app/Templates/project_forbidden.php +++ /dev/null @@ -1,9 +0,0 @@ -
    -
    -

    -
    - -

    - -

    -
    \ No newline at end of file diff --git a/app/Templates/project_index.php b/app/Templates/project_index.php index 1a3dbd49..927924a5 100644 --- a/app/Templates/project_index.php +++ b/app/Templates/project_index.php @@ -78,9 +78,9 @@
  • - + - +
  • diff --git a/app/Templates/project_new.php b/app/Templates/project_new.php index 2026d461..b4ed9990 100644 --- a/app/Templates/project_new.php +++ b/app/Templates/project_new.php @@ -8,6 +8,7 @@
    + diff --git a/app/Templates/project_remove.php b/app/Templates/project_remove.php index e9f213b5..e25efa2f 100644 --- a/app/Templates/project_remove.php +++ b/app/Templates/project_remove.php @@ -9,7 +9,7 @@

    - +
    diff --git a/app/Templates/project_users.php b/app/Templates/project_users.php index 0448004f..8afac709 100644 --- a/app/Templates/project_users.php +++ b/app/Templates/project_users.php @@ -10,6 +10,8 @@ + + $project['id'])) ?> @@ -32,7 +34,7 @@ $username): ?>
  • - () + ()
    • diff --git a/app/Templates/subtask_create.php b/app/Templates/subtask_create.php index a456aa37..f1b27ab9 100644 --- a/app/Templates/subtask_create.php +++ b/app/Templates/subtask_create.php @@ -4,6 +4,8 @@ + + diff --git a/app/Templates/subtask_edit.php b/app/Templates/subtask_edit.php index 3080cdad..fc65d3b3 100644 --- a/app/Templates/subtask_edit.php +++ b/app/Templates/subtask_edit.php @@ -4,6 +4,8 @@ + + diff --git a/app/Templates/subtask_remove.php b/app/Templates/subtask_remove.php index 2862176c..12c99cf1 100644 --- a/app/Templates/subtask_remove.php +++ b/app/Templates/subtask_remove.php @@ -10,7 +10,7 @@

    - +
    \ No newline at end of file diff --git a/app/Templates/task_close.php b/app/Templates/task_close.php index 6843c2f6..5c75b72b 100644 --- a/app/Templates/task_close.php +++ b/app/Templates/task_close.php @@ -8,7 +8,7 @@

    - +
    \ No newline at end of file diff --git a/app/Templates/task_edit.php b/app/Templates/task_edit.php index d698c21d..c03c7d9a 100644 --- a/app/Templates/task_edit.php +++ b/app/Templates/task_edit.php @@ -8,6 +8,8 @@
    + +
    diff --git a/app/Templates/task_edit_description.php b/app/Templates/task_edit_description.php index 0bdc40a2..550dac73 100644 --- a/app/Templates/task_edit_description.php +++ b/app/Templates/task_edit_description.php @@ -4,6 +4,8 @@ + +
    diff --git a/app/Templates/task_new.php b/app/Templates/task_new.php index d233efd2..2938c4ca 100644 --- a/app/Templates/task_new.php +++ b/app/Templates/task_new.php @@ -5,6 +5,8 @@
    + +

    diff --git a/app/Templates/task_open.php b/app/Templates/task_open.php index 59ea0b54..3526ec81 100644 --- a/app/Templates/task_open.php +++ b/app/Templates/task_open.php @@ -8,7 +8,7 @@

    - +
    \ No newline at end of file diff --git a/app/Templates/task_remove.php b/app/Templates/task_remove.php index 60e4e8e7..dd4841db 100644 --- a/app/Templates/task_remove.php +++ b/app/Templates/task_remove.php @@ -8,7 +8,7 @@

    - +
    \ No newline at end of file diff --git a/app/Templates/user_edit.php b/app/Templates/user_edit.php index c857fe1c..6b83f748 100644 --- a/app/Templates/user_edit.php +++ b/app/Templates/user_edit.php @@ -8,6 +8,8 @@
    + +
    @@ -48,9 +50,9 @@ - + - + diff --git a/app/Templates/user_forbidden.php b/app/Templates/user_forbidden.php deleted file mode 100644 index 853159ba..00000000 --- a/app/Templates/user_forbidden.php +++ /dev/null @@ -1,9 +0,0 @@ -
    -
    -

    -
    - -

    - -

    -
    \ No newline at end of file diff --git a/app/Templates/user_login.php b/app/Templates/user_login.php index 878170e3..49902ebb 100644 --- a/app/Templates/user_login.php +++ b/app/Templates/user_login.php @@ -8,6 +8,8 @@ + +
    diff --git a/app/Templates/user_new.php b/app/Templates/user_new.php index 6ad976f2..3e22b7ee 100644 --- a/app/Templates/user_new.php +++ b/app/Templates/user_new.php @@ -8,6 +8,8 @@
    + +
    diff --git a/app/Templates/user_remove.php b/app/Templates/user_remove.php index a4db2e4a..61d4163b 100644 --- a/app/Templates/user_remove.php +++ b/app/Templates/user_remove.php @@ -7,7 +7,7 @@

    - +
    diff --git a/app/helpers.php b/app/helpers.php index d22a4869..2df4d839 100644 --- a/app/helpers.php +++ b/app/helpers.php @@ -2,6 +2,11 @@ namespace Helper; +function param_csrf() +{ + return '&csrf_token='.\Core\Security::getCSRFToken(); +} + function js($filename) { return ''; @@ -163,6 +168,11 @@ function form_value($values, $name) return isset($values[$name]) ? 'value="'.escape($values[$name]).'"' : ''; } +function form_csrf() +{ + return ''; +} + function form_hidden($name, $values = array()) { return ''; diff --git a/assets/js/board.js b/assets/js/board.js index 49dab9fa..7ff7445b 100644 --- a/assets/js/board.js +++ b/assets/js/board.js @@ -70,8 +70,9 @@ }); $.ajax({ + cache: false, url: "?controller=board&action=save&project_id=" + projectId, - data: {positions: data}, + data: {"positions": data, "csrf_token": $("#board").attr("data-csrf-token")}, type: "POST", success: function(data) { $("#board").remove(); @@ -90,6 +91,7 @@ if (is_visible() && projectId != undefined && timestamp != undefined) { $.ajax({ + cache: false, url: "?controller=board&action=check&project_id=" + projectId + "×tamp=" + timestamp, statusCode: { 200: function(data) { diff --git a/tests/Base.php b/tests/Base.php index ce088b22..d4065982 100644 --- a/tests/Base.php +++ b/tests/Base.php @@ -4,6 +4,8 @@ if (version_compare(PHP_VERSION, '5.5.0', '<')) { require __DIR__.'/../vendor/password.php'; } +require_once __DIR__.'/../app/Core/Security.php'; + require_once __DIR__.'/../vendor/PicoDb/Database.php'; require_once __DIR__.'/../app/Schema/Sqlite.php'; -- cgit v1.2.3 From 3fcd3d536883fccabef0dcdf1824fa84bcb77ca9 Mon Sep 17 00:00:00 2001 From: Frédéric Guillot Date: Wed, 28 May 2014 15:35:34 -0400 Subject: Reduce session time to 2 hours --- app/Core/Session.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'app') diff --git a/app/Core/Session.php b/app/Core/Session.php index 6ce1bd40..5c55311a 100644 --- a/app/Core/Session.php +++ b/app/Core/Session.php @@ -15,7 +15,7 @@ class Session * * @var integer */ - const SESSION_LIFETIME = 86400; // 1 day + const SESSION_LIFETIME = 7200; // 2 hours /** * Open a session @@ -35,7 +35,7 @@ class Session self::SESSION_LIFETIME, $base_path ?: '/', null, - isset($_SERVER['HTTPS']) && $_SERVER['HTTPS'] === 'on', + ! empty($_SERVER['HTTPS']), true ); -- cgit v1.2.3 From 99b5758dd63b8b4fc9fa7fbe3e2540c6d7d8d031 Mon Sep 17 00:00:00 2001 From: Frédéric Guillot Date: Wed, 28 May 2014 18:30:18 -0400 Subject: Fix typo (error message) --- app/Locales/de_DE/translations.php | 2 +- app/Locales/es_ES/translations.php | 2 +- app/Locales/fr_FR/translations.php | 2 +- app/Locales/pl_PL/translations.php | 2 +- app/Locales/pt_BR/translations.php | 2 +- app/Model/User.php | 4 ++-- 6 files changed, 7 insertions(+), 7 deletions(-) (limited to 'app') diff --git a/app/Locales/de_DE/translations.php b/app/Locales/de_DE/translations.php index 24122b00..97858079 100644 --- a/app/Locales/de_DE/translations.php +++ b/app/Locales/de_DE/translations.php @@ -126,7 +126,7 @@ return array( 'The username must be unique' => 'Der Benutzername muss eindeutig sein', 'The username must be alphanumeric' => 'Der Benutzername muss alphanumerisch sein', 'The user id is required' => 'Die Benutzer ID wird benötigt', - 'Passwords doesn\'t matches' => 'Passwörter passen nicht zusammen', + 'Passwords don\'t match' => 'Passwörter passen nicht zusammen', 'The confirmation is required' => 'Die Bestätigung wird benötigt', 'The column is required' => 'Die Spalte wird benötigt', 'The project is required' => 'Das Projekt wird benötigt', diff --git a/app/Locales/es_ES/translations.php b/app/Locales/es_ES/translations.php index d5a8a104..61080f85 100644 --- a/app/Locales/es_ES/translations.php +++ b/app/Locales/es_ES/translations.php @@ -125,7 +125,7 @@ return array( 'The username must be unique' => 'El nombre de usuario debe ser único', 'The username must be alphanumeric' => 'El nombre de usuario debe ser alfanumérico', 'The user id is required' => 'El identificador del usuario es obligatorio', - 'Passwords doesn\'t matches' => 'Las contraseñas no corresponden', + 'Passwords don\'t match' => 'Las contraseñas no corresponden', 'The confirmation is required' => 'La confirmación es obligatoria', 'The column is required' => 'La columna es obligatoria', 'The project is required' => 'El proyecto es obligatorio', diff --git a/app/Locales/fr_FR/translations.php b/app/Locales/fr_FR/translations.php index 53ded262..9c284892 100644 --- a/app/Locales/fr_FR/translations.php +++ b/app/Locales/fr_FR/translations.php @@ -125,7 +125,7 @@ return array( 'The username must be unique' => 'Le nom d\'utilisateur doit être unique', 'The username must be alphanumeric' => 'Le nom d\'utilisateur doit être alpha-numérique', 'The user id is required' => 'L\'id de l\'utilisateur est obligatoire', - 'Passwords doesn\'t matches' => 'Les mots de passe ne correspondent pas', + 'Passwords don\'t match' => 'Les mots de passe ne correspondent pas', 'The confirmation is required' => 'Le confirmation est requise', 'The column is required' => 'La colonne est obligatoire', 'The project is required' => 'Le projet est obligatoire', diff --git a/app/Locales/pl_PL/translations.php b/app/Locales/pl_PL/translations.php index 456a7253..0ab2db52 100644 --- a/app/Locales/pl_PL/translations.php +++ b/app/Locales/pl_PL/translations.php @@ -125,7 +125,7 @@ return array( 'The username must be unique' => 'Nazwa użytkownika musi być unikalna', 'The username must be alphanumeric' => 'Nazwa użytkownika musi być alfanumeryczna', 'The user id is required' => 'ID użytkownika jest wymagane', - 'Passwords doesn\'t matches' => 'Hasła nie pasują do siebie', + 'Passwords don\'t match' => 'Hasła nie pasują do siebie', 'The confirmation is required' => 'Wymagane jest potwierdzenie', 'The column is required' => 'Kolumna jest wymagana', 'The project is required' => 'Projekt jest wymagany', diff --git a/app/Locales/pt_BR/translations.php b/app/Locales/pt_BR/translations.php index 19e3799d..58d8f7ef 100644 --- a/app/Locales/pt_BR/translations.php +++ b/app/Locales/pt_BR/translations.php @@ -125,7 +125,7 @@ return array( 'The username must be unique' => 'O nome de usuário deve ser único', 'The username must be alphanumeric' => 'O nome de usuário deve ser alfanumérico, sem espaços ou _', 'The user id is required' => 'O id de usuário é obrigatório', - 'Passwords doesn\'t matches' => 'As senhas não conferem', + 'Passwords don\'t match' => 'As senhas não conferem', 'The confirmation is required' => 'A confirmação é obrigatória', 'The column is required' => 'A coluna é obrigatória', 'The project is required' => 'O projeto é obrigatório', diff --git a/app/Model/User.php b/app/Model/User.php index bce717a7..e651b5fd 100644 --- a/app/Model/User.php +++ b/app/Model/User.php @@ -203,7 +203,7 @@ class User extends Base new Validators\Required('password', t('The password is required')), new Validators\MinLength('password', t('The minimum length is %d characters', 6), 6), new Validators\Required('confirmation', t('The confirmation is required')), - new Validators\Equals('password', 'confirmation', t('Passwords doesn\'t matches')), + new Validators\Equals('password', 'confirmation', t('Passwords don\'t match')), new Validators\Integer('default_project_id', t('This value must be an integer')), new Validators\Integer('is_admin', t('This value must be an integer')), new Validators\Email('email', t('Email address invalid')), @@ -264,7 +264,7 @@ class User extends Base new Validators\Required('password', t('The password is required')), new Validators\MinLength('password', t('The minimum length is %d characters', 6), 6), new Validators\Required('confirmation', t('The confirmation is required')), - new Validators\Equals('password', 'confirmation', t('Passwords doesn\'t matches')), + new Validators\Equals('password', 'confirmation', t('Passwords don\'t match')), new Validators\Integer('default_project_id', t('This value must be an integer')), new Validators\Integer('is_admin', t('This value must be an integer')), new Validators\Email('email', t('Email address invalid')), -- cgit v1.2.3 From b6b124aadde36b545b166049fde2cfbbc8b0a553 Mon Sep 17 00:00:00 2001 From: Frédéric Guillot Date: Wed, 28 May 2014 18:36:09 -0400 Subject: Improve session destroy --- app/Core/Session.php | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) (limited to 'app') diff --git a/app/Core/Session.php b/app/Core/Session.php index 5c55311a..af7a9123 100644 --- a/app/Core/Session.php +++ b/app/Core/Session.php @@ -66,6 +66,25 @@ class Session */ public function close() { + // Flush all sessions variables + $_SESSION = array(); + + // Destroy the session cookie + if (ini_get('session.use_cookies')) { + $params = session_get_cookie_params(); + + setcookie( + session_name(), + '', + time() - 42000, + $params['path'], + $params['domain'], + $params['secure'], + $params['httponly'] + ); + } + + // Destroy session data session_destroy(); } -- cgit v1.2.3 From efdc959c555872677e599d2ff12e1263d719f3f2 Mon Sep 17 00:00:00 2001 From: Frédéric Guillot Date: Mon, 2 Jun 2014 21:03:10 -0400 Subject: Fix bug #108: useless require --- app/Model/User.php | 1 - 1 file changed, 1 deletion(-) (limited to 'app') diff --git a/app/Model/User.php b/app/Model/User.php index e651b5fd..6804d765 100644 --- a/app/Model/User.php +++ b/app/Model/User.php @@ -359,7 +359,6 @@ class User extends Base // LDAP authentication if (! $authenticated && LDAP_AUTH) { - require __DIR__.'/ldap.php'; $ldap = new Ldap($this->db, $this->event); $authenticated = $ldap->authenticate($username, $password); $method = LastLogin::AUTH_LDAP; -- cgit v1.2.3