From 59df72d4763bbe640543f3026f33c15363e14116 Mon Sep 17 00:00:00 2001
From: Frederic Guillot <fred@kanboard.net>
Date: Sun, 12 Jul 2015 15:46:03 -0400
Subject: Fix some issue dur to url rewriting

---
 app/Integration/HipchatWebhook.php         | 3 +--
 app/Integration/Jabber.php                 | 3 +--
 app/Integration/SlackWebhook.php           | 3 +--
 app/Template/notification/footer.php       | 4 ++--
 app/Template/notification/task_overdue.php | 2 +-
 5 files changed, 6 insertions(+), 9 deletions(-)

(limited to 'app')

diff --git a/app/Integration/HipchatWebhook.php b/app/Integration/HipchatWebhook.php
index f1be0f34..1d08e514 100644
--- a/app/Integration/HipchatWebhook.php
+++ b/app/Integration/HipchatWebhook.php
@@ -72,8 +72,7 @@ class HipchatWebhook extends \Core\Base
             $html .= $this->projectActivity->getTitle($event);
 
             if ($this->config->get('application_url')) {
-                $html .= '<br/><a href="'.$this->config->get('application_url');
-                $html .= $this->helper->url->href('task', 'show', array('task_id' => $task_id, 'project_id' => $project_id)).'">';
+                $html .= '<br/><a href="'.$this->helper->url->href('task', 'show', array('task_id' => $task_id, 'project_id' => $project_id), false, '', true).'">';
                 $html .= t('view the task on Kanboard').'</a>';
             }
 
diff --git a/app/Integration/Jabber.php b/app/Integration/Jabber.php
index a1191662..3e403aab 100644
--- a/app/Integration/Jabber.php
+++ b/app/Integration/Jabber.php
@@ -81,8 +81,7 @@ class Jabber extends \Core\Base
             $payload = '['.$project['name'].'] '.str_replace('&quot;', '"', $this->projectActivity->getTitle($event)).(isset($event['task']['title']) ? ' ('.$event['task']['title'].')' : '');
 
             if ($this->config->get('application_url')) {
-                $payload .= ' '.$this->config->get('application_url');
-                $payload .= $this->helper->url->to('task', 'show', array('task_id' => $task_id, 'project_id' => $project_id));
+                $payload .= ' '.$this->helper->url->to('task', 'show', array('task_id' => $task_id, 'project_id' => $project_id), false, '', true);
             }
 
             $this->sendMessage($project_id, $payload);
diff --git a/app/Integration/SlackWebhook.php b/app/Integration/SlackWebhook.php
index 498cea09..d238652f 100644
--- a/app/Integration/SlackWebhook.php
+++ b/app/Integration/SlackWebhook.php
@@ -83,8 +83,7 @@ class SlackWebhook extends \Core\Base
             );
 
             if ($this->config->get('application_url')) {
-                $payload['text'] .= ' - <'.$this->config->get('application_url');
-                $payload['text'] .= $this->helper->url->href('task', 'show', array('task_id' => $task_id, 'project_id' => $project_id));
+                $payload['text'] .= ' - <'.$this->helper->url->href('task', 'show', array('task_id' => $task_id, 'project_id' => $project_id), false, '', true);
                 $payload['text'] .= '|'.t('view the task on Kanboard').'>';
             }
 
diff --git a/app/Template/notification/footer.php b/app/Template/notification/footer.php
index 69d2cf82..c3b37884 100644
--- a/app/Template/notification/footer.php
+++ b/app/Template/notification/footer.php
@@ -2,6 +2,6 @@
 Kanboard
 
 <?php if (isset($application_url) && ! empty($application_url)): ?>
-    - <a href="<?= $application_url.$this->url->href('task', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id'])) ?>"><?= t('view the task on Kanboard') ?></a>
-    - <a href="<?= $application_url.$this->url->href('board', 'show', array('project_id' => $task['project_id'])) ?>"><?= t('view the board on Kanboard') ?></a>
+    - <a href="<?= $this->url->href('task', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id']), false, '', true) ?>"><?= t('view the task on Kanboard') ?></a>
+    - <a href="<?= $this->url->href('board', 'show', array('project_id' => $task['project_id']), false, '', true) ?>"><?= t('view the board on Kanboard') ?></a>
 <?php endif ?>
diff --git a/app/Template/notification/task_overdue.php b/app/Template/notification/task_overdue.php
index dc2659dc..a231937b 100644
--- a/app/Template/notification/task_overdue.php
+++ b/app/Template/notification/task_overdue.php
@@ -5,7 +5,7 @@
         <li>
             (<strong>#<?= $task['id'] ?></strong>)
             <?php if ($application_url): ?>
-                <a href="<?= $application_url.$this->url->href('task', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id'])) ?>"><?= $this->e($task['title']) ?></a>
+                <a href="<?= $this->url->href('task', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id']), false, '', true) ?>"><?= $this->e($task['title']) ?></a>
             <?php else: ?>
                 <?= $this->e($task['title']) ?>
             <?php endif ?>
-- 
cgit v1.2.3