From e9fedf3e5cd63aea4da7a71f6647ee427c62fa49 Mon Sep 17 00:00:00 2001
From: Frederic Guillot <fred@kanboard.net>
Date: Sat, 5 Dec 2015 20:31:27 -0500
Subject: Rewrite of the authentication and authorization system

---
 app/common.php | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

(limited to 'app/common.php')

diff --git a/app/common.php b/app/common.php
index 56f3c70f..fe5a7e69 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,7 +14,6 @@ if (getenv('DATABASE_URL')) {
     define('DB_NAME', ltrim($dbopts["path"], '/'));
 }
 
-// Include custom config file
 if (file_exists('config.php')) {
     require 'config.php';
 }
@@ -26,11 +25,10 @@ $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\PluginProvider);
-- 
cgit v1.2.3