diff options
Diffstat (limited to 'app')
| -rw-r--r-- | app/Action/TaskAssignColorColumn.php | 1 | ||||
| -rw-r--r-- | app/Helper/User.php | 11 | ||||
| -rw-r--r-- | app/Integration/Jabber.php | 1 | ||||
| -rw-r--r-- | app/Locale/fr_FR/translations.php | 2 | ||||
| -rw-r--r-- | app/Model/Base.php | 2 | ||||
| -rw-r--r-- | app/ServiceProvider/LoggingProvider.php | 6 | ||||
| -rw-r--r-- | app/Template/task/comments.php | 2 | ||||
| -rw-r--r-- | app/Template/twofactor/check.php | 2 |
8 files changed, 22 insertions, 5 deletions
diff --git a/app/Action/TaskAssignColorColumn.php b/app/Action/TaskAssignColorColumn.php index ee1d66ae..deb3e2b0 100644 --- a/app/Action/TaskAssignColorColumn.php +++ b/app/Action/TaskAssignColorColumn.php @@ -21,6 +21,7 @@ class TaskAssignColorColumn extends Base public function getCompatibleEvents() { return array( + Task::EVENT_CREATE, Task::EVENT_MOVE_COLUMN, ); } diff --git a/app/Helper/User.php b/app/Helper/User.php index 00018857..1cad6042 100644 --- a/app/Helper/User.php +++ b/app/Helper/User.php @@ -11,6 +11,17 @@ namespace Helper; class User extends \Core\Base { /** + * Get user id + * + * @access public + * @return integer + */ + public function getId() + { + return $this->userSession->getId(); + } + + /** * Get user profile * * @access public diff --git a/app/Integration/Jabber.php b/app/Integration/Jabber.php index c956cc47..a1191662 100644 --- a/app/Integration/Jabber.php +++ b/app/Integration/Jabber.php @@ -106,6 +106,7 @@ class Jabber extends \Core\Base $options->setUsername($params['username']); $options->setPassword($params['password']); $options->setTo($params['domain']); + $options->setLogger($this->container['logger']); $client = new Client($options); diff --git a/app/Locale/fr_FR/translations.php b/app/Locale/fr_FR/translations.php index 64cb0999..1f772233 100644 --- a/app/Locale/fr_FR/translations.php +++ b/app/Locale/fr_FR/translations.php @@ -240,7 +240,7 @@ return array( 'Assign the task to a specific user' => 'Assigner la tâche à un utilisateur spécifique', 'Assign the task to the person who does the action' => 'Assigner la tâche à la personne qui fait l\'action', 'Duplicate the task to another project' => 'Dupliquer la tâche vers un autre projet', - 'Move a task to another column' => 'Déplacement d\'une tâche vers un autre colonne', + 'Move a task to another column' => 'Déplacement d\'une tâche vers une autre colonne', 'Move a task to another position in the same column' => 'Déplacement d\'une tâche à une autre position mais dans la même colonne', 'Task modification' => 'Modification d\'une tâche', 'Task creation' => 'Création d\'une tâche', diff --git a/app/Model/Base.php b/app/Model/Base.php index 03d0f8f0..784545fe 100644 --- a/app/Model/Base.php +++ b/app/Model/Base.php @@ -121,7 +121,7 @@ abstract class Base extends \Core\Base "($start_column <= '$start_time' AND ($end_column = '0' OR $end_column IS NULL))", ); - return '('.implode(' OR ', $conditions).')'; + return $start_column.' IS NOT NULL AND '.$start_column.' > 0 AND ('.implode(' OR ', $conditions).')'; } /** diff --git a/app/ServiceProvider/LoggingProvider.php b/app/ServiceProvider/LoggingProvider.php index 76263da3..dd79d654 100644 --- a/app/ServiceProvider/LoggingProvider.php +++ b/app/ServiceProvider/LoggingProvider.php @@ -2,6 +2,7 @@ namespace ServiceProvider; +use Psr\Log\LogLevel; use Pimple\Container; use Pimple\ServiceProviderInterface; use SimpleLogger\Logger; @@ -12,8 +13,11 @@ class LoggingProvider implements ServiceProviderInterface { public function register(Container $container) { + $syslog = new Syslog('kanboard'); + $syslog->setLevel(LogLevel::ERROR); + $logger = new Logger; - $logger->setLogger(new Syslog('kanboard')); + $logger->setLogger($syslog); if (DEBUG) { $logger->setLogger(new File(DEBUG_FILE)); diff --git a/app/Template/task/comments.php b/app/Template/task/comments.php index f81e0dc9..a09862f9 100644 --- a/app/Template/task/comments.php +++ b/app/Template/task/comments.php @@ -18,7 +18,7 @@ <?= $this->render('comment/create', array( 'skip_cancel' => true, 'values' => array( - 'user_id' => $this->userSession->getId(), + 'user_id' => $this->user->getId(), 'task_id' => $task['id'], ), 'errors' => array(), diff --git a/app/Template/twofactor/check.php b/app/Template/twofactor/check.php index 0e29d526..68a58a6c 100644 --- a/app/Template/twofactor/check.php +++ b/app/Template/twofactor/check.php @@ -1,4 +1,4 @@ -<form method="post" action="<?= $this->url->href('twofactor', 'check', array('user_id' => $this->userSession->getId())) ?>" autocomplete="off"> +<form method="post" action="<?= $this->url->href('twofactor', 'check', array('user_id' => $this->user->getId())) ?>" autocomplete="off"> <?= $this->form->csrf() ?> <?= $this->form->label(t('Code'), 'code') ?> |