From 92485e9bb530e0fddfecf1d9b1dbe0afc8ddb5cd Mon Sep 17 00:00:00 2001
From: Toby Zerner <toby.zerner@gmail.com>
Date: Fri, 14 Aug 2015 12:53:42 +0930
Subject: [PATCH] Route using the base path

---
 admin.php | 4 +++-
 api.php   | 3 ++-
 index.php | 4 +++-
 3 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/admin.php b/admin.php
index 22c174f..8cc23df 100644
--- a/admin.php
+++ b/admin.php
@@ -14,7 +14,9 @@ $app->register('Flarum\Admin\AdminServiceProvider');
 $admin = new MiddlewarePipe();
 $admin->pipe($app->make('Flarum\Api\Middleware\ReadJsonParameters'));
 $admin->pipe($app->make('Flarum\Admin\Middleware\LoginWithCookieAndCheckAdmin'));
-$admin->pipe('/admin', $app->make('Flarum\Http\RouterMiddleware', ['routes' => $app->make('flarum.admin.routes')]));
+
+$adminPath = parse_url(Core::config('admin_url'), PHP_URL_PATH);
+$admin->pipe($adminPath, $app->make('Flarum\Http\RouterMiddleware', ['routes' => $app->make('flarum.admin.routes')]));
 
 // Handle errors
 if (Core::inDebugMode()) {
diff --git a/api.php b/api.php
index 2f822cb..df00402 100644
--- a/api.php
+++ b/api.php
@@ -15,7 +15,8 @@ $api = new MiddlewarePipe();
 $api->pipe($app->make('Flarum\Api\Middleware\ReadJsonParameters'));
 $api->pipe($app->make('Flarum\Api\Middleware\LoginWithHeader'));
 
-$api->pipe('/api', $app->make('Flarum\Http\RouterMiddleware', ['routes' => $app->make('flarum.api.routes')]));
+$apiPath = parse_url(Core::config('api_url'), PHP_URL_PATH);
+$api->pipe($apiPath, $app->make('Flarum\Http\RouterMiddleware', ['routes' => $app->make('flarum.api.routes')]));
 
 // Handle errors
 if (Core::inDebugMode()) {
diff --git a/index.php b/index.php
index d531aaa..55473fd 100644
--- a/index.php
+++ b/index.php
@@ -14,7 +14,9 @@ $app->register('Flarum\Forum\ForumServiceProvider');
 $flarum = new MiddlewarePipe();
 $flarum->pipe($app->make('Flarum\Forum\Middleware\LoginWithCookie'));
 $flarum->pipe($app->make('Flarum\Api\Middleware\ReadJsonParameters'));
-$flarum->pipe('/', $app->make('Flarum\Http\RouterMiddleware', ['routes' => $app->make('flarum.forum.routes')]));
+
+$basePath = parse_url(Core::config('base_url'), PHP_URL_PATH);
+$flarum->pipe($basePath, $app->make('Flarum\Http\RouterMiddleware', ['routes' => $app->make('flarum.forum.routes')]));
 
 // Handle errors
 if (Core::inDebugMode()) {