summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFrédéric Guillot <fred@kanboard.net>2014-08-16 14:12:05 -0700
committerFrédéric Guillot <fred@kanboard.net>2014-08-16 14:12:05 -0700
commitdb3c006be80d6690892b11608619f9683824e21b (patch)
tree65fdc801aa83d40c50170e7ad11226e30be1f649
parent925b0ba2e56117e3bbe2947d7938ed35815efa1a (diff)
Various minor fixes
-rw-r--r--app/Auth/Base.php1
-rw-r--r--app/Event/WebhookListener.php8
-rw-r--r--app/Model/Base.php1
-rw-r--r--app/Model/Project.php2
-rw-r--r--app/common.php2
5 files changed, 10 insertions, 4 deletions
diff --git a/app/Auth/Base.php b/app/Auth/Base.php
index f9c1c329..e174ff8f 100644
--- a/app/Auth/Base.php
+++ b/app/Auth/Base.php
@@ -4,7 +4,6 @@ namespace Auth;
use Core\Tool;
use Core\Registry;
-use PicoDb\Database;
/**
* Base auth class
diff --git a/app/Event/WebhookListener.php b/app/Event/WebhookListener.php
index f9776653..4668b66e 100644
--- a/app/Event/WebhookListener.php
+++ b/app/Event/WebhookListener.php
@@ -22,6 +22,14 @@ class WebhookListener implements Listener
private $webhook;
/**
+ * Url to call
+ *
+ * @access private
+ * @var string
+ */
+ private $url = '';
+
+ /**
* Constructor
*
* @access public
diff --git a/app/Model/Base.php b/app/Model/Base.php
index 1439a36e..306cf854 100644
--- a/app/Model/Base.php
+++ b/app/Model/Base.php
@@ -26,6 +26,7 @@ use PicoDb\Database;
* @property \Model\SubTask $subTask
* @property \Model\Task $task
* @property \Model\User $user
+ * @property \Model\Webhook $webhook
*/
abstract class Base
{
diff --git a/app/Model/Project.php b/app/Model/Project.php
index 63458fa3..9f53fdda 100644
--- a/app/Model/Project.php
+++ b/app/Model/Project.php
@@ -431,7 +431,7 @@ class Project extends Base
unset($category['id']);
$category['project_id'] = $project_to;
- if (! $categoryModel->create($category)) {
+ if (! $this->category->create($category)) {
return false;
}
}
diff --git a/app/common.php b/app/common.php
index 55ecd894..f66a3fa9 100644
--- a/app/common.php
+++ b/app/common.php
@@ -158,8 +158,6 @@ $registry->mailer = function() use ($registry) {
require_once 'vendor/swiftmailer/swift_required.php';
- $transport = null;
-
switch (MAIL_TRANSPORT) {
case 'smtp':
$transport = Swift_SmtpTransport::newInstance(MAIL_SMTP_HOSTNAME, MAIL_SMTP_PORT);