Avoid passing application_url argument to all notification templates

24 files changed, 23 insertions, 27 deletions

diff --git a/app/Action/TaskEmail.php b/app/Action/TaskEmail.php
index 559c2c0b..5a8b5518 100644
--- a/app/Action/TaskEmail.php
+++ b/app/Action/TaskEmail.php
@@ -88,7 +88,6 @@ class TaskEmail extends Base
                 $this->getParam('subject'),
                 $this->template->render('notification/task_create', array(
                     'task' => $data['task'],
-                    'application_url' => $this->configModel->get('application_url'),
                 ))
             );
 
diff --git a/app/Action/TaskEmailNoActivity.php b/app/Action/TaskEmailNoActivity.php
index cac4281e..1aaecf11 100644
--- a/app/Action/TaskEmailNoActivity.php
+++ b/app/Action/TaskEmailNoActivity.php
@@ -116,7 +116,7 @@ class TaskEmailNoActivity extends Base
             $user['email'],
             $user['name'] ?: $user['username'],
             $this->getParam('subject'),
-            $this->template->render('notification/task_create', array('task' => $task, 'application_url' => $this->configModel->get('application_url')))
+            $this->template->render('notification/task_create', array('task' => $task))
         );
 
         return true;
diff --git a/app/Notification/MailNotification.php b/app/Notification/MailNotification.php
index 9e042820..90ca4324 100644
--- a/app/Notification/MailNotification.php
+++ b/app/Notification/MailNotification.php
@@ -62,10 +62,7 @@ class MailNotification extends Base implements NotificationInterface
      */
     public function getMailContent($event_name, array $event_data)
     {
-        return $this->template->render(
-            'notification/'.str_replace('.', '_', $event_name),
-            $event_data + array('application_url' => $this->configModel->get('application_url'))
-        );
+        return $this->template->render('notification/'.str_replace('.', '_', $event_name), $event_data);
     }
 
     /**
diff --git a/app/Template/notification/comment_create.php b/app/Template/notification/comment_create.php
index 41262a7e..8b8251c6 100644
--- a/app/Template/notification/comment_create.php
+++ b/app/Template/notification/comment_create.php
@@ -8,4 +8,4 @@
 
 <?= $this->text->markdown($comment['comment'], true) ?>
 
-<?= $this->render('notification/footer', array('task' => $task, 'application_url' => $application_url)) ?>
\ No newline at end of file
+<?= $this->render('notification/footer', array('task' => $task)) ?>
\ No newline at end of file
diff --git a/app/Template/notification/comment_delete.php b/app/Template/notification/comment_delete.php
index 14babbd9..d49f10b8 100644
--- a/app/Template/notification/comment_delete.php
+++ b/app/Template/notification/comment_delete.php
@@ -4,4 +4,4 @@
 
 <?= $this->text->markdown($comment['comment'], true) ?>
 
-<?= $this->render('notification/footer', array('task' => $task, 'application_url' => $application_url)) ?>
+<?= $this->render('notification/footer', array('task' => $task)) ?>
diff --git a/app/Template/notification/comment_update.php b/app/Template/notification/comment_update.php
index f1cffae6..c22e8f1a 100644
--- a/app/Template/notification/comment_update.php
+++ b/app/Template/notification/comment_update.php
@@ -4,4 +4,4 @@
 
 <?= $this->text->markdown($comment['comment'], true) ?>
 
-<?= $this->render('notification/footer', array('task' => $task, 'application_url' => $application_url)) ?>
\ No newline at end of file
+<?= $this->render('notification/footer', array('task' => $task)) ?>
\ No newline at end of file
diff --git a/app/Template/notification/comment_user_mention.php b/app/Template/notification/comment_user_mention.php
index 0990e7ab..a3f387be 100644
--- a/app/Template/notification/comment_user_mention.php
+++ b/app/Template/notification/comment_user_mention.php
@@ -4,4 +4,4 @@
 
 <?= $this->text->markdown($comment['comment'], true) ?>
 
-<?= $this->render('notification/footer', array('task' => $task, 'application_url' => $application_url)) ?>
\ No newline at end of file
+<?= $this->render('notification/footer', array('task' => $task)) ?>
\ No newline at end of file
diff --git a/app/Template/notification/footer.php b/app/Template/notification/footer.php
index da437eea..b057a60c 100644
--- a/app/Template/notification/footer.php
+++ b/app/Template/notification/footer.php
@@ -1,7 +1,7 @@
 <hr/>
 Kanboard
 
-<?php if (isset($application_url) && ! empty($application_url)): ?>
+<?php if ($this->app->config('application_url') != ''): ?>
     - <?= $this->url->absoluteLink(t('view the task on Kanboard'), 'TaskViewController', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id'])) ?>
     - <?= $this->url->absoluteLink(t('view the board on Kanboard'), 'BoardViewController', 'show', array('project_id' => $task['project_id'])) ?>
 <?php endif ?>
diff --git a/app/Template/notification/subtask_create.php b/app/Template/notification/subtask_create.php
index f6f8ba13..23df3666 100644
--- a/app/Template/notification/subtask_create.php
+++ b/app/Template/notification/subtask_create.php
@@ -14,4 +14,4 @@
     </li>
 </ul>
 
-<?= $this->render('notification/footer', array('task' => $task, 'application_url' => $application_url)) ?>
\ No newline at end of file
+<?= $this->render('notification/footer', array('task' => $task)) ?>
\ No newline at end of file
diff --git a/app/Template/notification/subtask_delete.php b/app/Template/notification/subtask_delete.php
index 8c5f262c..24562eba 100644
--- a/app/Template/notification/subtask_delete.php
+++ b/app/Template/notification/subtask_delete.php
@@ -8,4 +8,4 @@
     <li><?= t('Assignee:') ?> <?= $this->text->e($subtask['name'] ?: $subtask['username'] ?: '?') ?></li>
 </ul>
 
-<?= $this->render('notification/footer', array('task' => $task, 'application_url' => $application_url)) ?>
+<?= $this->render('notification/footer', array('task' => $task)) ?>
diff --git a/app/Template/notification/subtask_update.php b/app/Template/notification/subtask_update.php
index e6785f2c..0c235942 100644
--- a/app/Template/notification/subtask_update.php
+++ b/app/Template/notification/subtask_update.php
@@ -18,4 +18,4 @@
     </li>
 </ul>
 
-<?= $this->render('notification/footer', array('task' => $task, 'application_url' => $application_url)) ?>
\ No newline at end of file
+<?= $this->render('notification/footer', array('task' => $task)) ?>
\ No newline at end of file
diff --git a/app/Template/notification/task_assignee_change.php b/app/Template/notification/task_assignee_change.php
index f075fdbf..608d8d72 100644
--- a/app/Template/notification/task_assignee_change.php
+++ b/app/Template/notification/task_assignee_change.php
@@ -17,4 +17,4 @@
     <?= $this->text->markdown($task['description'], true) ?: t('There is no description.') ?>
 <?php endif ?>
 
-<?= $this->render('notification/footer', array('task' => $task, 'application_url' => $application_url)) ?>
\ No newline at end of file
+<?= $this->render('notification/footer', array('task' => $task)) ?>
\ No newline at end of file
diff --git a/app/Template/notification/task_close.php b/app/Template/notification/task_close.php
index 4202e092..b5763c75 100644
--- a/app/Template/notification/task_close.php
+++ b/app/Template/notification/task_close.php
@@ -2,4 +2,4 @@
 
 <p><?= t('The task #%d have been closed.', $task['id']) ?></p>
 
-<?= $this->render('notification/footer', array('task' => $task, 'application_url' => $application_url)) ?>
\ No newline at end of file
+<?= $this->render('notification/footer', array('task' => $task)) ?>
\ No newline at end of file
diff --git a/app/Template/notification/task_create.php b/app/Template/notification/task_create.php
index 3439e357..6e80b26a 100644
--- a/app/Template/notification/task_create.php
+++ b/app/Template/notification/task_create.php
@@ -40,4 +40,4 @@
     <?= $this->text->markdown($task['description'], true) ?>
 <?php endif ?>
 
-<?= $this->render('notification/footer', array('task' => $task, 'application_url' => $application_url)) ?>
\ No newline at end of file
+<?= $this->render('notification/footer', array('task' => $task)) ?>
\ No newline at end of file
diff --git a/app/Template/notification/task_file_create.php b/app/Template/notification/task_file_create.php
index c19f7279..c552546c 100644
--- a/app/Template/notification/task_file_create.php
+++ b/app/Template/notification/task_file_create.php
@@ -2,4 +2,4 @@
 
 <p><?= t('New attachment added "%s"', $file['name']) ?></p>
 
-<?= $this->render('notification/footer', array('task' => $task, 'application_url' => $application_url)) ?>
+<?= $this->render('notification/footer', array('task' => $task)) ?>
diff --git a/app/Template/notification/task_internal_link_create_update.php b/app/Template/notification/task_internal_link_create_update.php
index b66a1531..a2333703 100644
--- a/app/Template/notification/task_internal_link_create_update.php
+++ b/app/Template/notification/task_internal_link_create_update.php
@@ -8,4 +8,4 @@
     ) ?>
 </p>
 
-<?= $this->render('notification/footer', array('task' => $task, 'application_url' => $application_url)) ?>
+<?= $this->render('notification/footer', array('task' => $task)) ?>
diff --git a/app/Template/notification/task_internal_link_delete.php b/app/Template/notification/task_internal_link_delete.php
index d556fb20..c366001c 100644
--- a/app/Template/notification/task_internal_link_delete.php
+++ b/app/Template/notification/task_internal_link_delete.php
@@ -8,4 +8,4 @@
     ) ?>
 </p>
 
-<?= $this->render('notification/footer', array('task' => $task, 'application_url' => $application_url)) ?>
+<?= $this->render('notification/footer', array('task' => $task)) ?>
diff --git a/app/Template/notification/task_move_column.php b/app/Template/notification/task_move_column.php
index 263adebf..7159cb06 100644
--- a/app/Template/notification/task_move_column.php
+++ b/app/Template/notification/task_move_column.php
@@ -8,4 +8,4 @@
     <li><?= t('Task position:').' '.$this->text->e($task['position']) ?></li>
 </ul>
 
-<?= $this->render('notification/footer', array('task' => $task, 'application_url' => $application_url)) ?>
\ No newline at end of file
+<?= $this->render('notification/footer', array('task' => $task)) ?>
\ No newline at end of file
diff --git a/app/Template/notification/task_move_position.php b/app/Template/notification/task_move_position.php
index 263adebf..7159cb06 100644
--- a/app/Template/notification/task_move_position.php
+++ b/app/Template/notification/task_move_position.php
@@ -8,4 +8,4 @@
     <li><?= t('Task position:').' '.$this->text->e($task['position']) ?></li>
 </ul>
 
-<?= $this->render('notification/footer', array('task' => $task, 'application_url' => $application_url)) ?>
\ No newline at end of file
+<?= $this->render('notification/footer', array('task' => $task)) ?>
\ No newline at end of file
diff --git a/app/Template/notification/task_move_swimlane.php b/app/Template/notification/task_move_swimlane.php
index cbbd620d..cdf16559 100644
--- a/app/Template/notification/task_move_swimlane.php
+++ b/app/Template/notification/task_move_swimlane.php
@@ -16,4 +16,4 @@
     <li><?= t('Task position:').' '.$this->text->e($task['position']) ?></li>
 </ul>
 
-<?= $this->render('notification/footer', array('task' => $task, 'application_url' => $application_url)) ?>
\ No newline at end of file
+<?= $this->render('notification/footer', array('task' => $task)) ?>
\ No newline at end of file
diff --git a/app/Template/notification/task_open.php b/app/Template/notification/task_open.php
index 2c85e9f7..5bd0d1a4 100644
--- a/app/Template/notification/task_open.php
+++ b/app/Template/notification/task_open.php
@@ -2,4 +2,4 @@
 
 <p><?= t('The task #%d have been opened.', $task['id']) ?></p>
 
-<?= $this->render('notification/footer', array('task' => $task, 'application_url' => $application_url)) ?>
+<?= $this->render('notification/footer', array('task' => $task)) ?>
diff --git a/app/Template/notification/task_update.php b/app/Template/notification/task_update.php
index 9abe8e0a..8d39b152 100644
--- a/app/Template/notification/task_update.php
+++ b/app/Template/notification/task_update.php
@@ -1,4 +1,4 @@
 <h2><?= $this->text->e($task['title']) ?> (#<?= $task['id'] ?>)</h2>
 
 <?= $this->render('task/changes', array('changes' => $changes, 'task' => $task, 'public' => true)) ?>
-<?= $this->render('notification/footer', array('task' => $task, 'application_url' => $application_url)) ?>
\ No newline at end of file
+<?= $this->render('notification/footer', array('task' => $task)) ?>
\ No newline at end of file
diff --git a/app/Template/notification/task_user_mention.php b/app/Template/notification/task_user_mention.php
index 71ad348b..dfd6e723 100644
--- a/app/Template/notification/task_user_mention.php
+++ b/app/Template/notification/task_user_mention.php
@@ -4,4 +4,4 @@
 <h2><?= t('Description') ?></h2>
 <?= $this->text->markdown($task['description'], true) ?>
 
-<?= $this->render('notification/footer', array('task' => $task, 'application_url' => $application_url)) ?>
\ No newline at end of file
+<?= $this->render('notification/footer', array('task' => $task)) ?>
\ No newline at end of file
diff --git a/app/Template/task_mail/email.php b/app/Template/task_mail/email.php
index 51f88178..70db572e 100644
--- a/app/Template/task_mail/email.php
+++ b/app/Template/task_mail/email.php
@@ -43,4 +43,4 @@
     <?= $this->text->markdown($task['description'], true) ?>
 <?php endif ?>
 
-<?= $this->render('notification/footer', array('task' => $task, 'application_url' => $this->app->config('application_url'))) ?>
\ No newline at end of file
+<?= $this->render('notification/footer', array('task' => $task)) ?>
\ No newline at end of file