Merge pull request #1 from fguillot/master

7 files changed, 186 insertions, 15 deletions

diff --git a/app/ServiceProvider/AuthenticationProvider.php b/app/ServiceProvider/AuthenticationProvider.php
index d59ffd9e..776e65d5 100644
--- a/app/ServiceProvider/AuthenticationProvider.php
+++ b/app/ServiceProvider/AuthenticationProvider.php
@@ -125,6 +125,7 @@ class AuthenticationProvider implements ServiceProviderInterface
         $acl->add('Board', 'readonly', Role::APP_PUBLIC);
         $acl->add('Ical', '*', Role::APP_PUBLIC);
         $acl->add('Feed', '*', Role::APP_PUBLIC);
+        $acl->add('AvatarFile', 'show', Role::APP_PUBLIC);
 
         $acl->add('Config', '*', Role::APP_ADMIN);
         $acl->add('Currency', '*', Role::APP_ADMIN);
diff --git a/app/ServiceProvider/AvatarProvider.php b/app/ServiceProvider/AvatarProvider.php
index 73d37d5c..aac4fcab 100644
--- a/app/ServiceProvider/AvatarProvider.php
+++ b/app/ServiceProvider/AvatarProvider.php
@@ -6,6 +6,7 @@ use Pimple\Container;
 use Pimple\ServiceProviderInterface;
 use Kanboard\Core\User\Avatar\AvatarManager;
 use Kanboard\User\Avatar\GravatarProvider;
+use Kanboard\User\Avatar\AvatarFileProvider;
 use Kanboard\User\Avatar\LetterAvatarProvider;
 
 /**
@@ -28,6 +29,7 @@ class AvatarProvider implements ServiceProviderInterface
         $container['avatarManager'] = new AvatarManager;
         $container['avatarManager']->register(new LetterAvatarProvider($container));
         $container['avatarManager']->register(new GravatarProvider($container));
+        $container['avatarManager']->register(new AvatarFileProvider($container));
         return $container;
     }
 }
diff --git a/app/ServiceProvider/ClassProvider.php b/app/ServiceProvider/ClassProvider.php
index b883c905..18c1d578 100644
--- a/app/ServiceProvider/ClassProvider.php
+++ b/app/ServiceProvider/ClassProvider.php
@@ -24,6 +24,7 @@ class ClassProvider implements ServiceProviderInterface
         'Model' => array(
             'Action',
             'ActionParameter',
+            'AvatarFile',
             'Board',
             'Category',
             'Color',
@@ -48,9 +49,7 @@ class ClassProvider implements ServiceProviderInterface
             'ProjectNotification',
             'ProjectMetadata',
             'ProjectGroupRole',
-            'ProjectGroupRoleFilter',
             'ProjectUserRole',
-            'ProjectUserRoleFilter',
             'RememberMeSession',
             'Subtask',
             'SubtaskTimeTracking',
@@ -62,7 +61,6 @@ class ClassProvider implements ServiceProviderInterface
             'TaskExternalLink',
             'TaskFinder',
             'TaskFile',
-            'TaskFilter',
             'TaskLink',
             'TaskModification',
             'TaskPermission',
@@ -78,15 +76,6 @@ class ClassProvider implements ServiceProviderInterface
             'UserUnreadNotification',
             'UserMetadata',
         ),
-        'Formatter' => array(
-            'TaskFilterGanttFormatter',
-            'TaskFilterAutoCompleteFormatter',
-            'TaskFilterCalendarFormatter',
-            'TaskFilterICalendarFormatter',
-            'ProjectGanttFormatter',
-            'UserFilterAutoCompleteFormatter',
-            'GroupAutoCompleteFormatter',
-        ),
         'Validator' => array(
             'ActionValidator',
             'AuthValidator',
diff --git a/app/ServiceProvider/DatabaseProvider.php b/app/ServiceProvider/DatabaseProvider.php
index 8cede8af..d323807d 100644
--- a/app/ServiceProvider/DatabaseProvider.php
+++ b/app/ServiceProvider/DatabaseProvider.php
@@ -44,8 +44,8 @@ class DatabaseProvider implements ServiceProviderInterface
         if ($db->schema()->check(\Schema\VERSION)) {
             return $db;
         } else {
-            $errors = $db->getLogMessages();
-            throw new RuntimeException('Unable to migrate database schema: '.(isset($errors[0]) ? $errors[0] : 'Unknown error'));
+            $messages = $db->getLogMessages();
+            throw new RuntimeException('Unable to run SQL migrations: '.implode(', ', $messages).' (You may have to fix it manually)');
         }
     }
 
diff --git a/app/ServiceProvider/FilterProvider.php b/app/ServiceProvider/FilterProvider.php
new file mode 100644
index 00000000..f3918d77
--- /dev/null
+++ b/app/ServiceProvider/FilterProvider.php
@@ -0,0 +1,174 @@
+<?php
+
+namespace Kanboard\ServiceProvider;
+
+use Kanboard\Core\Filter\LexerBuilder;
+use Kanboard\Core\Filter\QueryBuilder;
+use Kanboard\Filter\ProjectActivityCreationDateFilter;
+use Kanboard\Filter\ProjectActivityCreatorFilter;
+use Kanboard\Filter\ProjectActivityProjectNameFilter;
+use Kanboard\Filter\ProjectActivityTaskStatusFilter;
+use Kanboard\Filter\ProjectActivityTaskTitleFilter;
+use Kanboard\Filter\TaskAssigneeFilter;
+use Kanboard\Filter\TaskCategoryFilter;
+use Kanboard\Filter\TaskColorFilter;
+use Kanboard\Filter\TaskColumnFilter;
+use Kanboard\Filter\TaskCommentFilter;
+use Kanboard\Filter\TaskCreationDateFilter;
+use Kanboard\Filter\TaskCreatorFilter;
+use Kanboard\Filter\TaskDescriptionFilter;
+use Kanboard\Filter\TaskDueDateFilter;
+use Kanboard\Filter\TaskIdFilter;
+use Kanboard\Filter\TaskLinkFilter;
+use Kanboard\Filter\TaskModificationDateFilter;
+use Kanboard\Filter\TaskProjectFilter;
+use Kanboard\Filter\TaskReferenceFilter;
+use Kanboard\Filter\TaskStatusFilter;
+use Kanboard\Filter\TaskSubtaskAssigneeFilter;
+use Kanboard\Filter\TaskSwimlaneFilter;
+use Kanboard\Filter\TaskTitleFilter;
+use Kanboard\Model\Project;
+use Kanboard\Model\ProjectGroupRole;
+use Kanboard\Model\ProjectUserRole;
+use Kanboard\Model\User;
+use Pimple\Container;
+use Pimple\ServiceProviderInterface;
+
+/**
+ * Filter Provider
+ *
+ * @package serviceProvider
+ * @author  Frederic Guillot
+ */
+class FilterProvider implements ServiceProviderInterface
+{
+    /**
+     * Register providers
+     *
+     * @access public
+     * @param  \Pimple\Container $container
+     * @return \Pimple\Container
+     */
+    public function register(Container $container)
+    {
+        $this->createUserFilter($container);
+        $this->createProjectFilter($container);
+        $this->createTaskFilter($container);
+        return $container;
+    }
+
+    public function createUserFilter(Container $container)
+    {
+        $container['userQuery'] = $container->factory(function ($c) {
+            $builder = new QueryBuilder();
+            $builder->withQuery($c['db']->table(User::TABLE));
+            return $builder;
+        });
+
+        return $container;
+    }
+
+    public function createProjectFilter(Container $container)
+    {
+        $container['projectGroupRoleQuery'] = $container->factory(function ($c) {
+            $builder = new QueryBuilder();
+            $builder->withQuery($c['db']->table(ProjectGroupRole::TABLE));
+            return $builder;
+        });
+
+        $container['projectUserRoleQuery'] = $container->factory(function ($c) {
+            $builder = new QueryBuilder();
+            $builder->withQuery($c['db']->table(ProjectUserRole::TABLE));
+            return $builder;
+        });
+
+        $container['projectQuery'] = $container->factory(function ($c) {
+            $builder = new QueryBuilder();
+            $builder->withQuery($c['db']->table(Project::TABLE));
+            return $builder;
+        });
+
+        $container['projectActivityLexer'] = $container->factory(function ($c) {
+            $builder = new LexerBuilder();
+            $builder
+                ->withQuery($c['projectActivity']->getQuery())
+                ->withFilter(new ProjectActivityTaskTitleFilter(), true)
+                ->withFilter(new ProjectActivityTaskStatusFilter())
+                ->withFilter(new ProjectActivityProjectNameFilter())
+                ->withFilter(ProjectActivityCreationDateFilter::getInstance()
+                    ->setDateParser($c['dateParser'])
+                )
+                ->withFilter(ProjectActivityCreatorFilter::getInstance()
+                    ->setCurrentUserId($c['userSession']->getId())
+                )
+            ;
+
+            return $builder;
+        });
+
+        $container['projectActivityQuery'] = $container->factory(function ($c) {
+            $builder = new QueryBuilder();
+            $builder->withQuery($c['projectActivity']->getQuery());
+
+            return $builder;
+        });
+
+        return $container;
+    }
+
+    public function createTaskFilter(Container $container)
+    {
+        $container['taskQuery'] = $container->factory(function ($c) {
+            $builder = new QueryBuilder();
+            $builder->withQuery($c['taskFinder']->getExtendedQuery());
+            return $builder;
+        });
+
+        $container['taskLexer'] = $container->factory(function ($c) {
+            $builder = new LexerBuilder();
+
+            $builder
+                ->withQuery($c['taskFinder']->getExtendedQuery())
+                ->withFilter(TaskAssigneeFilter::getInstance()
+                    ->setCurrentUserId($c['userSession']->getId())
+                )
+                ->withFilter(new TaskCategoryFilter())
+                ->withFilter(TaskColorFilter::getInstance()
+                    ->setColorModel($c['color'])
+                )
+                ->withFilter(new TaskColumnFilter())
+                ->withFilter(new TaskCommentFilter())
+                ->withFilter(TaskCreationDateFilter::getInstance()
+                    ->setDateParser($c['dateParser'])
+                )
+                ->withFilter(TaskCreatorFilter::getInstance()
+                    ->setCurrentUserId($c['userSession']->getId())
+                )
+                ->withFilter(new TaskDescriptionFilter())
+                ->withFilter(TaskDueDateFilter::getInstance()
+                    ->setDateParser($c['dateParser'])
+                )
+                ->withFilter(new TaskIdFilter())
+                ->withFilter(TaskLinkFilter::getInstance()
+                    ->setDatabase($c['db'])
+                )
+                ->withFilter(TaskModificationDateFilter::getInstance()
+                    ->setDateParser($c['dateParser'])
+                )
+                ->withFilter(new TaskProjectFilter())
+                ->withFilter(new TaskReferenceFilter())
+                ->withFilter(new TaskStatusFilter())
+                ->withFilter(TaskSubtaskAssigneeFilter::getInstance()
+                    ->setCurrentUserId($c['userSession']->getId())
+                    ->setDatabase($c['db'])
+                )
+                ->withFilter(new TaskSwimlaneFilter())
+                ->withFilter(new TaskTitleFilter(), true)
+            ;
+
+            return $builder;
+        });
+
+        return $container;
+    }
+}
diff --git a/app/ServiceProvider/HelperProvider.php b/app/ServiceProvider/HelperProvider.php
index 37be5a05..bf3956a2 100644
--- a/app/ServiceProvider/HelperProvider.php
+++ b/app/ServiceProvider/HelperProvider.php
@@ -13,12 +13,14 @@ class HelperProvider implements ServiceProviderInterface
     {
         $container['helper'] = new Helper($container);
         $container['helper']->register('app', '\Kanboard\Helper\AppHelper');
+        $container['helper']->register('calendar', '\Kanboard\Helper\CalendarHelper');
         $container['helper']->register('asset', '\Kanboard\Helper\AssetHelper');
         $container['helper']->register('board', '\Kanboard\Helper\BoardHelper');
         $container['helper']->register('dt', '\Kanboard\Helper\DateHelper');
         $container['helper']->register('file', '\Kanboard\Helper\FileHelper');
         $container['helper']->register('form', '\Kanboard\Helper\FormHelper');
         $container['helper']->register('hook', '\Kanboard\Helper\HookHelper');
+        $container['helper']->register('ical', '\Kanboard\Helper\ICalHelper');
         $container['helper']->register('layout', '\Kanboard\Helper\LayoutHelper');
         $container['helper']->register('model', '\Kanboard\Helper\ModelHelper');
         $container['helper']->register('subtask', '\Kanboard\Helper\SubtaskHelper');
@@ -27,6 +29,8 @@ class HelperProvider implements ServiceProviderInterface
         $container['helper']->register('url', '\Kanboard\Helper\UrlHelper');
         $container['helper']->register('user', '\Kanboard\Helper\UserHelper');
         $container['helper']->register('avatar', '\Kanboard\Helper\AvatarHelper');
+        $container['helper']->register('projectHeader', '\Kanboard\Helper\ProjectHeaderHelper');
+        $container['helper']->register('projectActivity', '\Kanboard\Helper\ProjectActivityHelper');
 
         $container['template'] = new Template($container['helper']);
 
diff --git a/app/ServiceProvider/RouteProvider.php b/app/ServiceProvider/RouteProvider.php
index 0e7548d4..30d23a51 100644
--- a/app/ServiceProvider/RouteProvider.php
+++ b/app/ServiceProvider/RouteProvider.php
@@ -42,7 +42,7 @@ class RouteProvider implements ServiceProviderInterface
 
             // Search routes
             $container['route']->addRoute('search', 'search', 'index');
-            $container['route']->addRoute('search/:search', 'search', 'index');
+            $container['route']->addRoute('search/activity', 'search', 'activity');
 
             // ProjectCreation routes
             $container['route']->addRoute('project/create', 'ProjectCreation', 'create');
@@ -62,6 +62,7 @@ class RouteProvider implements ServiceProviderInterface
             $container['route']->addRoute('project/:project_id/enable', 'project', 'enable');
             $container['route']->addRoute('project/:project_id/permissions', 'ProjectPermission', 'index');
             $container['route']->addRoute('project/:project_id/import', 'taskImport', 'step1');
+            $container['route']->addRoute('project/:project_id/activity', 'activity', 'project');
 
             // Project Overview
             $container['route']->addRoute('project/:project_id/overview', 'ProjectOverview', 'show');