Merge pull request #1 from fguillot/master

Update from upstream

1 files changed, 13 insertions, 8 deletions

diff --git a/app/common.php b/app/common.php
index 85a2b7d2..e2fe6aff 100644
--- a/app/common.php
+++ b/app/common.php
@@ -1,6 +1,6 @@
 <?php
 
-require dirname(__DIR__) . '/vendor/autoload.php';
+require __DIR__.'/../vendor/autoload.php';
 
 // Automatically parse environment configuration (Heroku)
 if (getenv('DATABASE_URL')) {
@@ -14,22 +14,27 @@ if (getenv('DATABASE_URL')) {
     define('DB_NAME', ltrim($dbopts["path"], '/'));
 }
 
-// Include custom config file
 if (file_exists('config.php')) {
     require 'config.php';
 }
 
+if (file_exists('data'.DIRECTORY_SEPARATOR.'config.php')) {
+    require 'data'.DIRECTORY_SEPARATOR.'config.php';
+}
+
 require __DIR__.'/constants.php';
 require __DIR__.'/check_setup.php';
 
 $container = new Pimple\Container;
+$container->register(new Kanboard\ServiceProvider\SessionProvider);
 $container->register(new Kanboard\ServiceProvider\LoggingProvider);
 $container->register(new Kanboard\ServiceProvider\DatabaseProvider);
+$container->register(new Kanboard\ServiceProvider\AuthenticationProvider);
+$container->register(new Kanboard\ServiceProvider\NotificationProvider);
 $container->register(new Kanboard\ServiceProvider\ClassProvider);
 $container->register(new Kanboard\ServiceProvider\EventDispatcherProvider);
-
-if (ENABLE_URL_REWRITE) {
-    require __DIR__.'/routes.php';
-}
-
-$container['pluginLoader']->scan();
+$container->register(new Kanboard\ServiceProvider\GroupProvider);
+$container->register(new Kanboard\ServiceProvider\RouteProvider);
+$container->register(new Kanboard\ServiceProvider\ActionProvider);
+$container->register(new Kanboard\ServiceProvider\ExternalLinkProvider);
+$container->register(new Kanboard\ServiceProvider\PluginProvider);