summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--app/Action/TaskAssignColorColumn.php1
-rw-r--r--app/Helper/User.php11
-rw-r--r--app/Integration/Jabber.php1
-rw-r--r--app/Locale/fr_FR/translations.php2
-rw-r--r--app/Model/Base.php2
-rw-r--r--app/ServiceProvider/LoggingProvider.php6
-rw-r--r--app/Template/task/comments.php2
-rw-r--r--app/Template/twofactor/check.php2
-rw-r--r--composer.json2
-rw-r--r--composer.lock63
10 files changed, 53 insertions, 39 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') ?>
diff --git a/composer.json b/composer.json
index 3dea99ed..39585052 100644
--- a/composer.json
+++ b/composer.json
@@ -9,7 +9,7 @@
"fabiang/xmpp" : "0.6.1",
"fguillot/json-rpc" : "0.0.3",
"fguillot/picodb" : "0.0.3",
- "fguillot/simpleLogger" : "0.0.1",
+ "fguillot/simpleLogger" : "0.0.2",
"fguillot/simple-validator" : "0.0.3",
"lusitanian/oauth" : "0.3.5",
"nickcernis/html-to-markdown" : "2.2.1",
diff --git a/composer.lock b/composer.lock
index 31db7e80..cbcacef9 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
"Read more about it at http://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file",
"This file is @generated automatically"
],
- "hash": "d9fb1c5d3bbca8db5851cef5bb5473e5",
+ "hash": "4aed9321378ab6e96c0fd0170b379c38",
"packages": [
{
"name": "christian-riesen/base32",
@@ -370,16 +370,16 @@
},
{
"name": "fguillot/simpleLogger",
- "version": "v0.0.1",
+ "version": "v0.0.2",
"source": {
"type": "git",
"url": "https://github.com/fguillot/simpleLogger.git",
- "reference": "81df5643931d97e0101b4757d9454dbcb13a3fa9"
+ "reference": "97bc14002f18d2fc18ee124c877ac3e55b3fa88b"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/fguillot/simpleLogger/zipball/81df5643931d97e0101b4757d9454dbcb13a3fa9",
- "reference": "81df5643931d97e0101b4757d9454dbcb13a3fa9",
+ "url": "https://api.github.com/repos/fguillot/simpleLogger/zipball/97bc14002f18d2fc18ee124c877ac3e55b3fa88b",
+ "reference": "97bc14002f18d2fc18ee124c877ac3e55b3fa88b",
"shasum": ""
},
"require": {
@@ -403,7 +403,7 @@
],
"description": "PHP library to write logs (compatible with PSR-3)",
"homepage": "https://github.com/fguillot/simpleLogger",
- "time": "2015-01-02 03:40:21"
+ "time": "2015-05-30 19:25:09"
},
{
"name": "lusitanian/oauth",
@@ -651,21 +651,20 @@
},
{
"name": "symfony/console",
- "version": "v2.6.7",
- "target-dir": "Symfony/Component/Console",
+ "version": "v2.7.0",
"source": {
"type": "git",
"url": "https://github.com/symfony/Console.git",
- "reference": "ebc5679854aa24ed7d65062e9e3ab0b18a917272"
+ "reference": "7f0bec04961c61c961df0cb8c2ae88dbfd83f399"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/Console/zipball/ebc5679854aa24ed7d65062e9e3ab0b18a917272",
- "reference": "ebc5679854aa24ed7d65062e9e3ab0b18a917272",
+ "url": "https://api.github.com/repos/symfony/Console/zipball/7f0bec04961c61c961df0cb8c2ae88dbfd83f399",
+ "reference": "7f0bec04961c61c961df0cb8c2ae88dbfd83f399",
"shasum": ""
},
"require": {
- "php": ">=5.3.3"
+ "php": ">=5.3.9"
},
"require-dev": {
"psr/log": "~1.0",
@@ -681,11 +680,11 @@
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "2.6-dev"
+ "dev-master": "2.7-dev"
}
},
"autoload": {
- "psr-0": {
+ "psr-4": {
"Symfony\\Component\\Console\\": ""
}
},
@@ -705,25 +704,24 @@
],
"description": "Symfony Console Component",
"homepage": "https://symfony.com",
- "time": "2015-05-02 15:18:45"
+ "time": "2015-05-29 16:22:24"
},
{
"name": "symfony/event-dispatcher",
- "version": "v2.6.7",
- "target-dir": "Symfony/Component/EventDispatcher",
+ "version": "v2.7.0",
"source": {
"type": "git",
"url": "https://github.com/symfony/EventDispatcher.git",
- "reference": "672593bc4b0043a0acf91903bb75a1c82d8f2e02"
+ "reference": "687039686d0e923429ba6e958d0baa920cd5d458"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/EventDispatcher/zipball/672593bc4b0043a0acf91903bb75a1c82d8f2e02",
- "reference": "672593bc4b0043a0acf91903bb75a1c82d8f2e02",
+ "url": "https://api.github.com/repos/symfony/EventDispatcher/zipball/687039686d0e923429ba6e958d0baa920cd5d458",
+ "reference": "687039686d0e923429ba6e958d0baa920cd5d458",
"shasum": ""
},
"require": {
- "php": ">=5.3.3"
+ "php": ">=5.3.9"
},
"require-dev": {
"psr/log": "~1.0",
@@ -740,11 +738,11 @@
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "2.6-dev"
+ "dev-master": "2.7-dev"
}
},
"autoload": {
- "psr-0": {
+ "psr-4": {
"Symfony\\Component\\EventDispatcher\\": ""
}
},
@@ -764,27 +762,26 @@
],
"description": "Symfony EventDispatcher Component",
"homepage": "https://symfony.com",
- "time": "2015-05-02 15:18:45"
+ "time": "2015-05-02 15:21:08"
}
],
"packages-dev": [
{
"name": "symfony/stopwatch",
- "version": "v2.6.7",
- "target-dir": "Symfony/Component/Stopwatch",
+ "version": "v2.7.0",
"source": {
"type": "git",
"url": "https://github.com/symfony/Stopwatch.git",
- "reference": "b470f87c69837cb71115f1fa720388bb19b63635"
+ "reference": "7702945bceddc0e1f744519abb8a2baeb94bd5ce"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/Stopwatch/zipball/b470f87c69837cb71115f1fa720388bb19b63635",
- "reference": "b470f87c69837cb71115f1fa720388bb19b63635",
+ "url": "https://api.github.com/repos/symfony/Stopwatch/zipball/7702945bceddc0e1f744519abb8a2baeb94bd5ce",
+ "reference": "7702945bceddc0e1f744519abb8a2baeb94bd5ce",
"shasum": ""
},
"require": {
- "php": ">=5.3.3"
+ "php": ">=5.3.9"
},
"require-dev": {
"symfony/phpunit-bridge": "~2.7"
@@ -792,11 +789,11 @@
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "2.6-dev"
+ "dev-master": "2.7-dev"
}
},
"autoload": {
- "psr-0": {
+ "psr-4": {
"Symfony\\Component\\Stopwatch\\": ""
}
},
@@ -816,7 +813,7 @@
],
"description": "Symfony Stopwatch Component",
"homepage": "https://symfony.com",
- "time": "2015-05-02 15:18:45"
+ "time": "2015-05-02 15:21:08"
}
],
"aliases": [],
generated by cgit v1.2.3 (git 2.46.0) at 2024-11-23 13:42:38 +0000