'.$this->helper->e($this->session['flash_message']).'
';
+ unset($this->session['flash_message']);
+ }
+ else if (isset($this->session['flash_error_message'])) {
+ $html = ''.$this->helper->e($this->session['flash_error_message']).'
';
+ unset($this->session['flash_error_message']);
+ }
+
+ return $html;
+ }
+}
diff --git a/app/Helper/Asset.php b/app/Helper/Asset.php
new file mode 100644
index 000000000..fe2850810
--- /dev/null
+++ b/app/Helper/Asset.php
@@ -0,0 +1,51 @@
+';
+ }
+
+ /**
+ * Add a stylesheet asset
+ *
+ * @param string $filename Filename
+ * @param boolean $is_file Add file timestamp
+ * @param string $media Media
+ * @return string
+ */
+ public function css($filename, $is_file = true, $media = 'screen')
+ {
+ return '';
+ }
+
+ /**
+ * Get custom css
+ *
+ * @access public
+ * @return string
+ */
+ public function customCss()
+ {
+ if ($this->config->get('application_stylesheet')) {
+ return '';
+ }
+
+ return '';
+ }
+}
diff --git a/app/Helper/Datetime.php b/app/Helper/Datetime.php
new file mode 100644
index 000000000..3a9c4c485
--- /dev/null
+++ b/app/Helper/Datetime.php
@@ -0,0 +1,61 @@
+getWeekDay($day);
+ }
+
+ return $values;
+ }
+
+ /**
+ * Get the localized day name from the day number
+ *
+ * @access public
+ * @param integer $day Day number
+ * @return string
+ */
+ public function getWeekDay($day)
+ {
+ return dt('%A', strtotime('next Monday +'.($day - 1).' days'));
+ }
+}
diff --git a/app/Helper/File.php b/app/Helper/File.php
new file mode 100644
index 000000000..a35e42834
--- /dev/null
+++ b/app/Helper/File.php
@@ -0,0 +1,56 @@
+';
+ }
+
+ /**
+ * Display a hidden form field
+ *
+ * @access public
+ * @param string $name Field name
+ * @param array $values Form values
+ * @return string
+ */
+ public function hidden($name, array $values = array())
+ {
+ return 'formValue($values, $name).'/>';
+ }
+
+ /**
+ * Display a select field
+ *
+ * @access public
+ * @param string $name Field name
+ * @param array $options Options
+ * @param array $values Form values
+ * @param array $errors Form errors
+ * @param string $class CSS class
+ * @return string
+ */
+ public function select($name, array $options, array $values = array(), array $errors = array(), array $attributes = array(), $class = '')
+ {
+ $html = '';
+ $html .= $this->errorList($errors, $name);
+
+ return $html;
+ }
+
+ /**
+ * Display a radio field group
+ *
+ * @access public
+ * @param string $name Field name
+ * @param array $options Options
+ * @param array $values Form values
+ * @return string
+ */
+ public function radios($name, array $options, array $values = array())
+ {
+ $html = '';
+
+ foreach ($options as $value => $label) {
+ $html .= $this->radio($name, $label, $value, isset($values[$name]) && $values[$name] == $value);
+ }
+
+ return $html;
+ }
+
+ /**
+ * Display a radio field
+ *
+ * @access public
+ * @param string $name Field name
+ * @param string $label Form label
+ * @param string $value Form value
+ * @param boolean $selected Field selected or not
+ * @param string $class CSS class
+ * @return string
+ */
+ public function radio($name, $label, $value, $selected = false, $class = '')
+ {
+ return '';
+ }
+
+ /**
+ * Display a checkbox field
+ *
+ * @access public
+ * @param string $name Field name
+ * @param string $label Form label
+ * @param string $value Form value
+ * @param boolean $checked Field selected or not
+ * @param string $class CSS class
+ * @return string
+ */
+ public function checkbox($name, $label, $value, $checked = false, $class = '')
+ {
+ return '';
+ }
+
+ /**
+ * Display a form label
+ *
+ * @access public
+ * @param string $name Field name
+ * @param string $label Form label
+ * @param array $attributes HTML attributes
+ * @return string
+ */
+ public function label($label, $name, array $attributes = array())
+ {
+ return '';
+ }
+
+ /**
+ * Display a textarea
+ *
+ * @access public
+ * @param string $name Field name
+ * @param array $values Form values
+ * @param array $errors Form errors
+ * @param array $attributes HTML attributes
+ * @param string $class CSS class
+ * @return string
+ */
+ public function textarea($name, $values = array(), array $errors = array(), array $attributes = array(), $class = '')
+ {
+ $class .= $this->errorClass($errors, $name);
+
+ $html = '';
+ $html .= $this->errorList($errors, $name);
+
+ return $html;
+ }
+
+ /**
+ * Display a input field
+ *
+ * @access public
+ * @param string $type HMTL input tag type
+ * @param string $name Field name
+ * @param array $values Form values
+ * @param array $errors Form errors
+ * @param array $attributes HTML attributes
+ * @param string $class CSS class
+ * @return string
+ */
+ public function input($type, $name, $values = array(), array $errors = array(), array $attributes = array(), $class = '')
+ {
+ $class .= $this->errorClass($errors, $name);
+
+ $html = 'formValue($values, $name).' class="'.$class.'" ';
+ $html .= implode(' ', $attributes).'>';
+
+ if (in_array('required', $attributes)) {
+ $html .= '*';
+ }
+
+ $html .= $this->errorList($errors, $name);
+
+ return $html;
+ }
+
+ /**
+ * Display a text field
+ *
+ * @access public
+ * @param string $name Field name
+ * @param array $values Form values
+ * @param array $errors Form errors
+ * @param array $attributes HTML attributes
+ * @param string $class CSS class
+ * @return string
+ */
+ public function text($name, $values = array(), array $errors = array(), array $attributes = array(), $class = '')
+ {
+ return $this->input('text', $name, $values, $errors, $attributes, $class);
+ }
+
+ /**
+ * Display a password field
+ *
+ * @access public
+ * @param string $name Field name
+ * @param array $values Form values
+ * @param array $errors Form errors
+ * @param array $attributes HTML attributes
+ * @param string $class CSS class
+ * @return string
+ */
+ public function password($name, $values = array(), array $errors = array(), array $attributes = array(), $class = '')
+ {
+ return $this->input('password', $name, $values, $errors, $attributes, $class);
+ }
+
+ /**
+ * Display an email field
+ *
+ * @access public
+ * @param string $name Field name
+ * @param array $values Form values
+ * @param array $errors Form errors
+ * @param array $attributes HTML attributes
+ * @param string $class CSS class
+ * @return string
+ */
+ public function email($name, $values = array(), array $errors = array(), array $attributes = array(), $class = '')
+ {
+ return $this->input('email', $name, $values, $errors, $attributes, $class);
+ }
+
+ /**
+ * Display a number field
+ *
+ * @access public
+ * @param string $name Field name
+ * @param array $values Form values
+ * @param array $errors Form errors
+ * @param array $attributes HTML attributes
+ * @param string $class CSS class
+ * @return string
+ */
+ public function number($name, $values = array(), array $errors = array(), array $attributes = array(), $class = '')
+ {
+ return $this->input('number', $name, $values, $errors, $attributes, $class);
+ }
+
+ /**
+ * Display a numeric field (allow decimal number)
+ *
+ * @access public
+ * @param string $name Field name
+ * @param array $values Form values
+ * @param array $errors Form errors
+ * @param array $attributes HTML attributes
+ * @param string $class CSS class
+ * @return string
+ */
+ public function numeric($name, $values = array(), array $errors = array(), array $attributes = array(), $class = '')
+ {
+ return $this->input('text', $name, $values, $errors, $attributes, $class.' form-numeric');
+ }
+
+ /**
+ * Display the form error class
+ *
+ * @access private
+ * @param array $errors Error list
+ * @param string $name Field name
+ * @return string
+ */
+ private function errorClass(array $errors, $name)
+ {
+ return ! isset($errors[$name]) ? '' : ' form-error';
+ }
+
+ /**
+ * Display a list of form errors
+ *
+ * @access private
+ * @param array $errors List of errors
+ * @param string $name Field name
+ * @return string
+ */
+ private function errorList(array $errors, $name)
+ {
+ $html = '';
+
+ if (isset($errors[$name])) {
+
+ $html .= '- ';
+
+ foreach ($errors[$name] as $error) {
+ $html .= '
- '.$this->helper->e($error).' '; + } + + $html .= '
).'?s=25 "'.$this->helper->e($alt).'")
';
+ }
+
+ return '';
+ }
+}
diff --git a/app/Integration/Base.php b/app/Integration/Base.php
deleted file mode 100644
index dbb0349aa..000000000
--- a/app/Integration/Base.php
+++ /dev/null
@@ -1,53 +0,0 @@
-container = $container;
- }
-
- /**
- * Load automatically class from the container
- *
- * @access public
- * @param string $name
- * @return mixed
- */
- public function __get($name)
- {
- return $this->container[$name];
- }
-}
diff --git a/app/Integration/BitbucketWebhook.php b/app/Integration/BitbucketWebhook.php
index 7ff8087e6..75fc1c814 100644
--- a/app/Integration/BitbucketWebhook.php
+++ b/app/Integration/BitbucketWebhook.php
@@ -11,7 +11,7 @@ use Model\Task;
* @package integration
* @author Frederic Guillot
*/
-class BitbucketWebhook extends Base
+class BitbucketWebhook extends \Core\Base
{
/**
* Events
diff --git a/app/Integration/GithubWebhook.php b/app/Integration/GithubWebhook.php
index 0070c3093..d95eba782 100644
--- a/app/Integration/GithubWebhook.php
+++ b/app/Integration/GithubWebhook.php
@@ -11,7 +11,7 @@ use Model\Task;
* @package integration
* @author Frederic Guillot
*/
-class GithubWebhook extends Base
+class GithubWebhook extends \Core\Base
{
/**
* Events
diff --git a/app/Integration/GitlabWebhook.php b/app/Integration/GitlabWebhook.php
index e30a0b508..8a11f5c6c 100644
--- a/app/Integration/GitlabWebhook.php
+++ b/app/Integration/GitlabWebhook.php
@@ -12,7 +12,7 @@ use Model\Task;
* @package integration
* @author Frederic Guillot
*/
-class GitlabWebhook extends Base
+class GitlabWebhook extends \Core\Base
{
/**
* Events
diff --git a/app/Integration/HipchatWebhook.php b/app/Integration/HipchatWebhook.php
index 03b85232a..591909590 100644
--- a/app/Integration/HipchatWebhook.php
+++ b/app/Integration/HipchatWebhook.php
@@ -8,7 +8,7 @@ namespace Integration;
* @package integration
* @author Frederic Guillot
*/
-class HipchatWebhook extends Base
+class HipchatWebhook extends \Core\Base
{
/**
* Return true if Hipchat is enabled for this project or globally
diff --git a/app/Integration/Jabber.php b/app/Integration/Jabber.php
index d6917186e..c956cc47b 100644
--- a/app/Integration/Jabber.php
+++ b/app/Integration/Jabber.php
@@ -14,7 +14,7 @@ use Fabiang\Xmpp\Protocol\Presence;
* @package integration
* @author Frederic Guillot
*/
-class Jabber extends Base
+class Jabber extends \Core\Base
{
/**
* Return true if Jabber is enabled for this project or globally
@@ -82,7 +82,7 @@ class Jabber extends Base
if ($this->config->get('application_url')) {
$payload .= ' '.$this->config->get('application_url');
- $payload .= $this->helper->url('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));
}
$this->sendMessage($project_id, $payload);
diff --git a/app/Integration/MailgunWebhook.php b/app/Integration/MailgunWebhook.php
index 8e5425134..50d96a4a1 100644
--- a/app/Integration/MailgunWebhook.php
+++ b/app/Integration/MailgunWebhook.php
@@ -11,7 +11,7 @@ use Core\Tool;
* @package integration
* @author Frederic Guillot
*/
-class MailgunWebhook extends Base
+class MailgunWebhook extends \Core\Base
{
/**
* Parse incoming email
diff --git a/app/Integration/PostmarkWebhook.php b/app/Integration/PostmarkWebhook.php
index 642955df7..9051e5f7a 100644
--- a/app/Integration/PostmarkWebhook.php
+++ b/app/Integration/PostmarkWebhook.php
@@ -10,7 +10,7 @@ use HTML_To_Markdown;
* @package integration
* @author Frederic Guillot
*/
-class PostmarkWebhook extends Base
+class PostmarkWebhook extends \Core\Base
{
/**
* Parse incoming email
diff --git a/app/Integration/SendgridWebhook.php b/app/Integration/SendgridWebhook.php
index 142ed49f1..9125f00b2 100644
--- a/app/Integration/SendgridWebhook.php
+++ b/app/Integration/SendgridWebhook.php
@@ -11,7 +11,7 @@ use Core\Tool;
* @package integration
* @author Frederic Guillot
*/
-class SendgridWebhook extends Base
+class SendgridWebhook extends \Core\Base
{
/**
* Parse incoming email
diff --git a/app/Integration/SlackWebhook.php b/app/Integration/SlackWebhook.php
index b64096fb9..4d2ae3a34 100644
--- a/app/Integration/SlackWebhook.php
+++ b/app/Integration/SlackWebhook.php
@@ -8,7 +8,7 @@ namespace Integration;
* @package integration
* @author Frederic Guillot
*/
-class SlackWebhook extends Base
+class SlackWebhook extends \Core\Base
{
/**
* Return true if Slack is enabled for this project or globally
diff --git a/app/Model/Base.php b/app/Model/Base.php
index dd902bb34..03d0f8f0e 100644
--- a/app/Model/Base.php
+++ b/app/Model/Base.php
@@ -9,51 +9,8 @@ use Pimple\Container;
*
* @package model
* @author Frederic Guillot
- *
- * @property \Core\Session $session
- * @property \Core\Template $template
- * @property \Model\Acl $acl
- * @property \Model\Action $action
- * @property \Model\Authentication $authentication
- * @property \Model\Board $board
- * @property \Model\Budget $budget
- * @property \Model\Category $category
- * @property \Model\Comment $comment
- * @property \Model\CommentHistory $commentHistory
- * @property \Model\Color $color
- * @property \Model\Config $config
- * @property \Model\DateParser $dateParser
- * @property \Model\File $file
- * @property \Model\Helper $helper
- * @property \Model\LastLogin $lastLogin
- * @property \Model\Link $link
- * @property \Model\Notification $notification
- * @property \Model\Project $project
- * @property \Model\ProjectDuplication $projectDuplication
- * @property \Model\ProjectPermission $projectPermission
- * @property \Model\Subtask $subtask
- * @property \Model\SubtaskHistory $subtaskHistory
- * @property \Model\Swimlane $swimlane
- * @property \Model\Task $task
- * @property \Model\TaskCreation $taskCreation
- * @property \Model\TaskDuplication $taskDuplication
- * @property \Model\TaskExport $taskExport
- * @property \Model\TaskFinder $taskFinder
- * @property \Model\TaskHistory $taskHistory
- * @property \Model\TaskLink $taskLink
- * @property \Model\TaskPosition $taskPosition
- * @property \Model\TaskValidator $taskValidator
- * @property \Model\Timetable $timetable
- * @property \Model\TimetableDay $timetableDay
- * @property \Model\TimetableExtra $timetableExtra
- * @property \Model\TimetableOff $timetableOff
- * @property \Model\TimetableWeek $timetableWeek
- * @property \Model\SubtaskTimeTracking $subtaskTimeTracking
- * @property \Model\User $user
- * @property \Model\UserSession $userSession
- * @property \Model\Webhook $webhook
*/
-abstract class Base
+abstract class Base extends \Core\Base
{
/**
* Database instance
@@ -63,14 +20,6 @@ abstract class Base
*/
protected $db;
- /**
- * Container instance
- *
- * @access protected
- * @var \Pimple\Container
- */
- protected $container;
-
/**
* Constructor
*
@@ -83,18 +32,6 @@ abstract class Base
$this->db = $this->container['db'];
}
- /**
- * Load automatically models
- *
- * @access public
- * @param string $name Model name
- * @return mixed
- */
- public function __get($name)
- {
- return $this->container[$name];
- }
-
/**
* Save a record in the database
*
@@ -203,7 +140,7 @@ abstract class Base
'backgroundColor' => $this->color->getBackgroundColor($task['color_id']),
'borderColor' => $this->color->getBorderColor($task['color_id']),
'textColor' => 'black',
- 'url' => $this->helper->url('task', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id'])),
+ 'url' => $this->helper->url->to('task', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id'])),
);
}
}
diff --git a/app/Model/SubtaskForecast.php b/app/Model/SubtaskForecast.php
index 0cb3175de..263aa27a3 100644
--- a/app/Model/SubtaskForecast.php
+++ b/app/Model/SubtaskForecast.php
@@ -96,7 +96,7 @@ class SubtaskForecast extends Base
'id' => $subtasks[$offset]['id'].'-'.$subtasks[$offset]['task_id'].'-'.$offset,
'subtask_id' => $subtasks[$offset]['id'],
'title' => t('#%d', $subtasks[$offset]['task_id']).' '.$subtasks[$offset]['title'],
- 'url' => $this->helper->url('task', 'show', array('task_id' => $subtasks[$offset]['task_id'], 'project_id' => $subtasks[$offset]['project_id'])),
+ 'url' => $this->helper->url->to('task', 'show', array('task_id' => $subtasks[$offset]['task_id'], 'project_id' => $subtasks[$offset]['project_id'])),
'editable' => false,
'start' => date('Y-m-d\TH:i:s', $start),
);
diff --git a/app/Model/SubtaskTimeTracking.php b/app/Model/SubtaskTimeTracking.php
index 6d4a3467c..d4edf6602 100644
--- a/app/Model/SubtaskTimeTracking.php
+++ b/app/Model/SubtaskTimeTracking.php
@@ -196,7 +196,7 @@ class SubtaskTimeTracking extends Base
'backgroundColor' => $this->color->getBackgroundColor($row['color_id']),
'borderColor' => $this->color->getBorderColor($row['color_id']),
'textColor' => 'black',
- 'url' => $this->helper->url('task', 'show', array('task_id' => $row['task_id'], 'project_id' => $row['project_id'])),
+ 'url' => $this->helper->url->to('task', 'show', array('task_id' => $row['task_id'], 'project_id' => $row['project_id'])),
'editable' => false,
);
}
diff --git a/app/Model/TaskFilter.php b/app/Model/TaskFilter.php
index c4c568003..1fdf0a507 100644
--- a/app/Model/TaskFilter.php
+++ b/app/Model/TaskFilter.php
@@ -450,7 +450,7 @@ class TaskFilter extends Base
$vEvent->setModified($dateModif);
$vEvent->setUseTimezone(true);
$vEvent->setSummary(t('#%d', $task['id']).' '.$task['title']);
- $vEvent->setUrl($this->helper->getCurrentBaseUrl().$this->helper->url('task', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id'])));
+ $vEvent->setUrl($this->helper->url->base().$this->helper->url->to('task', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id'])));
if (! empty($task['creator_id'])) {
$vEvent->setOrganizer('MAILTO:'.($task['creator_email'] ?: $task['creator_username'].'@kanboard.local'));
diff --git a/app/Model/UserSession.php b/app/Model/UserSession.php
index efb027221..6703a1bc3 100644
--- a/app/Model/UserSession.php
+++ b/app/Model/UserSession.php
@@ -85,17 +85,6 @@ class UserSession extends Base
return isset($this->session['user']['id']) ? (int) $this->session['user']['id'] : 0;
}
- /**
- * Check if the given user_id is the connected user
- *
- * @param integer $user_id User id
- * @return boolean
- */
- public function isCurrentUser($user_id)
- {
- return $this->getId() == $user_id;
- }
-
/**
* Check is the user is connected
*
diff --git a/app/ServiceProvider/ClassProvider.php b/app/ServiceProvider/ClassProvider.php
index c016b7ebf..ced7c7c6b 100644
--- a/app/ServiceProvider/ClassProvider.php
+++ b/app/ServiceProvider/ClassProvider.php
@@ -55,9 +55,9 @@ class ClassProvider implements ServiceProviderInterface
'TaskValidator',
'Timetable',
'TimetableDay',
+ 'TimetableExtra',
'TimetableWeek',
'TimetableOff',
- 'TimetableExtra',
'Transition',
'User',
'UserSession',
@@ -65,23 +65,22 @@ class ClassProvider implements ServiceProviderInterface
),
'Core' => array(
'Helper',
- 'Template',
- 'Session',
- 'MemoryCache',
- 'FileCache',
- 'Request',
'HttpClient',
+ 'MemoryCache',
+ 'Request',
+ 'Session',
+ 'Template',
),
'Integration' => array(
- 'GitlabWebhook',
- 'GithubWebhook',
'BitbucketWebhook',
+ 'GithubWebhook',
+ 'GitlabWebhook',
'HipchatWebhook',
+ 'Jabber',
'MailgunWebhook',
+ 'PostmarkWebhook',
'SendgridWebhook',
'SlackWebhook',
- 'PostmarkWebhook',
- 'Jabber',
)
);
diff --git a/app/Subscriber/AuthSubscriber.php b/app/Subscriber/AuthSubscriber.php
index 161a7afd9..b814057fe 100644
--- a/app/Subscriber/AuthSubscriber.php
+++ b/app/Subscriber/AuthSubscriber.php
@@ -6,7 +6,7 @@ use Core\Request;
use Event\AuthEvent;
use Symfony\Component\EventDispatcher\EventSubscriberInterface;
-class AuthSubscriber extends Base implements EventSubscriberInterface
+class AuthSubscriber extends \Core\Base implements EventSubscriberInterface
{
public static function getSubscribedEvents()
{
diff --git a/app/Subscriber/Base.php b/app/Subscriber/Base.php
deleted file mode 100644
index 100406262..000000000
--- a/app/Subscriber/Base.php
+++ /dev/null
@@ -1,66 +0,0 @@
-container = $container;
- }
-
- /**
- * Load automatically models
- *
- * @access public
- * @param string $name Model name
- * @return mixed
- */
- public function __get($name)
- {
- return $this->container[$name];
- }
-}
diff --git a/app/Subscriber/BootstrapSubscriber.php b/app/Subscriber/BootstrapSubscriber.php
index 35d0eff9e..793ba3e76 100644
--- a/app/Subscriber/BootstrapSubscriber.php
+++ b/app/Subscriber/BootstrapSubscriber.php
@@ -4,7 +4,7 @@ namespace Subscriber;
use Symfony\Component\EventDispatcher\EventSubscriberInterface;
-class BootstrapSubscriber extends Base implements EventSubscriberInterface
+class BootstrapSubscriber extends \Core\Base implements EventSubscriberInterface
{
public static function getSubscribedEvents()
{
diff --git a/app/Subscriber/NotificationSubscriber.php b/app/Subscriber/NotificationSubscriber.php
index 09ca76259..92d46754b 100644
--- a/app/Subscriber/NotificationSubscriber.php
+++ b/app/Subscriber/NotificationSubscriber.php
@@ -9,7 +9,7 @@ use Model\Subtask;
use Model\File;
use Symfony\Component\EventDispatcher\EventSubscriberInterface;
-class NotificationSubscriber extends Base implements EventSubscriberInterface
+class NotificationSubscriber extends \Core\Base implements EventSubscriberInterface
{
private $templates = array(
Task::EVENT_CREATE => 'task_creation',
diff --git a/app/Subscriber/ProjectActivitySubscriber.php b/app/Subscriber/ProjectActivitySubscriber.php
index 8988d6c1a..31f771f84 100644
--- a/app/Subscriber/ProjectActivitySubscriber.php
+++ b/app/Subscriber/ProjectActivitySubscriber.php
@@ -8,7 +8,7 @@ use Model\Comment;
use Model\Subtask;
use Symfony\Component\EventDispatcher\EventSubscriberInterface;
-class ProjectActivitySubscriber extends Base implements EventSubscriberInterface
+class ProjectActivitySubscriber extends \Core\Base implements EventSubscriberInterface
{
public static function getSubscribedEvents()
{
diff --git a/app/Subscriber/ProjectDailySummarySubscriber.php b/app/Subscriber/ProjectDailySummarySubscriber.php
index f865c0368..9e4f15b0b 100644
--- a/app/Subscriber/ProjectDailySummarySubscriber.php
+++ b/app/Subscriber/ProjectDailySummarySubscriber.php
@@ -6,7 +6,7 @@ use Event\TaskEvent;
use Model\Task;
use Symfony\Component\EventDispatcher\EventSubscriberInterface;
-class ProjectDailySummarySubscriber extends Base implements EventSubscriberInterface
+class ProjectDailySummarySubscriber extends \Core\Base implements EventSubscriberInterface
{
public static function getSubscribedEvents()
{
diff --git a/app/Subscriber/ProjectModificationDateSubscriber.php b/app/Subscriber/ProjectModificationDateSubscriber.php
index 4c5380ff3..2c01173b9 100644
--- a/app/Subscriber/ProjectModificationDateSubscriber.php
+++ b/app/Subscriber/ProjectModificationDateSubscriber.php
@@ -6,7 +6,7 @@ use Event\GenericEvent;
use Model\Task;
use Symfony\Component\EventDispatcher\EventSubscriberInterface;
-class ProjectModificationDateSubscriber extends Base implements EventSubscriberInterface
+class ProjectModificationDateSubscriber extends \Core\Base implements EventSubscriberInterface
{
public static function getSubscribedEvents()
{
diff --git a/app/Subscriber/RecurringTaskSubscriber.php b/app/Subscriber/RecurringTaskSubscriber.php
index 87418814b..68d704f09 100644
--- a/app/Subscriber/RecurringTaskSubscriber.php
+++ b/app/Subscriber/RecurringTaskSubscriber.php
@@ -6,7 +6,7 @@ use Event\TaskEvent;
use Model\Task;
use Symfony\Component\EventDispatcher\EventSubscriberInterface;
-class RecurringTaskSubscriber extends Base implements EventSubscriberInterface
+class RecurringTaskSubscriber extends \Core\Base implements EventSubscriberInterface
{
public static function getSubscribedEvents()
{
diff --git a/app/Subscriber/SubtaskTimesheetSubscriber.php b/app/Subscriber/SubtaskTimesheetSubscriber.php
index acae9a4b8..fdaf442f7 100644
--- a/app/Subscriber/SubtaskTimesheetSubscriber.php
+++ b/app/Subscriber/SubtaskTimesheetSubscriber.php
@@ -6,7 +6,7 @@ use Symfony\Component\EventDispatcher\EventSubscriberInterface;
use Model\Subtask;
use Event\SubtaskEvent;
-class SubtaskTimesheetSubscriber extends Base implements EventSubscriberInterface
+class SubtaskTimesheetSubscriber extends \Core\Base implements EventSubscriberInterface
{
public static function getSubscribedEvents()
{
diff --git a/app/Subscriber/TaskMovedDateSubscriber.php b/app/Subscriber/TaskMovedDateSubscriber.php
index 0e36acfa0..eb04d62cd 100644
--- a/app/Subscriber/TaskMovedDateSubscriber.php
+++ b/app/Subscriber/TaskMovedDateSubscriber.php
@@ -6,7 +6,7 @@ use Event\TaskEvent;
use Model\Task;
use Symfony\Component\EventDispatcher\EventSubscriberInterface;
-class TaskMovedDateSubscriber extends Base implements EventSubscriberInterface
+class TaskMovedDateSubscriber extends \Core\Base implements EventSubscriberInterface
{
public static function getSubscribedEvents()
{
diff --git a/app/Subscriber/TransitionSubscriber.php b/app/Subscriber/TransitionSubscriber.php
index 347dd37d4..5804dab7a 100644
--- a/app/Subscriber/TransitionSubscriber.php
+++ b/app/Subscriber/TransitionSubscriber.php
@@ -6,7 +6,7 @@ use Event\TaskEvent;
use Model\Task;
use Symfony\Component\EventDispatcher\EventSubscriberInterface;
-class TransitionSubscriber extends Base implements EventSubscriberInterface
+class TransitionSubscriber extends \Core\Base implements EventSubscriberInterface
{
public static function getSubscribedEvents()
{
diff --git a/app/Subscriber/WebhookSubscriber.php b/app/Subscriber/WebhookSubscriber.php
index e28675bd1..5176a7ff7 100644
--- a/app/Subscriber/WebhookSubscriber.php
+++ b/app/Subscriber/WebhookSubscriber.php
@@ -11,7 +11,7 @@ use Model\File;
use Model\Subtask;
use Symfony\Component\EventDispatcher\EventSubscriberInterface;
-class WebhookSubscriber extends Base implements EventSubscriberInterface
+class WebhookSubscriber extends \Core\Base implements EventSubscriberInterface
{
public static function getSubscribedEvents()
{
diff --git a/app/Template/action/event.php b/app/Template/action/event.php
index 67a65c19a..7f968a971 100644
--- a/app/Template/action/event.php
+++ b/app/Template/action/event.php
@@ -3,15 +3,15 @@
-
diff --git a/app/Template/user/remove.php b/app/Template/user/remove.php
index e4b09cfa8..810a3a3ff 100644
--- a/app/Template/user/remove.php
+++ b/app/Template/user/remove.php
@@ -6,8 +6,8 @@
- a(t('Yes'), 'user', 'remove', array('user_id' => $user['id'], 'confirmation' => 'yes'), true, 'btn btn-red') ?>
+ url->link(t('Yes'), 'user', 'remove', array('user_id' => $user['id'], 'confirmation' => 'yes'), true, 'btn btn-red') ?>
- a(t('cancel'), 'user', 'show', array('user_id' => $user['id'])) ?>
+ url->link(t('cancel'), 'user', 'show', array('user_id' => $user['id'])) ?>
\ No newline at end of file
diff --git a/app/Template/user/sessions.php b/app/Template/user/sessions.php
index 5a06057cd..a7504a7a8 100644
--- a/app/Template/user/sessions.php
+++ b/app/Template/user/sessions.php
@@ -18,8 +18,8 @@