Remove routing hacks

Author: SamuelTallet

autoload.php

@@ -1,12 +1,12 @@
 <?php
 
-if ( !file_exists($autoload_file = __DIR__ . '/vendor/autoload.php') ) {
+if ( !file_exists($autoload_file = MPG_ABS_PATH . '/vendor/autoload.php') ) {
     die('Install dependencies with `composer install` to run this script successfully.');
 }
 
 $loader = require_once $autoload_file;
 
-$loader->add('Controllers', __DIR__ . '/src');
-$loader->add('Helpers', __DIR__ . '/src');
-$loader->add('Normalizers', __DIR__ . '/src');
-$loader->add('Responses', __DIR__ . '/src');
+$loader->add('Controllers', MPG_ABS_PATH . '/src');
+$loader->add('Helpers', MPG_ABS_PATH . '/src');
+$loader->add('Normalizers', MPG_ABS_PATH . '/src');
+$loader->add('Responses', MPG_ABS_PATH . '/src');

index.php

@@ -18,7 +18,7 @@
  * 
  * @var string
  */
-define('MPG_APP_VERSION', '1.1.2');
+define('MPG_APP_VERSION', '1.1.3');
 
 /**
  * Development mode?
@@ -31,39 +31,58 @@
  * Absolute path. XXX Without trailing slash.
  * 
  * @var string
+ * @example /opt/mongodb-php-gui
  */
 define('MPG_ABS_PATH', __DIR__);
 
 $baseUrl = '//' . $_SERVER['HTTP_HOST'];
-$serverPath = str_replace('\\', '/', dirname($_SERVER['REQUEST_URI']));
-$serverPath = ( $serverPath === '/' ) ? '' : $serverPath;
+
+// If request matches a folder. For example: /mongo/
+if ( preg_match('#/$#', $_SERVER['REQUEST_URI']) ) {
+
+    $serverPath = $_SERVER['REQUEST_URI'];
+
+} else {
+
+    $serverPath = dirname($_SERVER['REQUEST_URI']);
+
+    // Normalize directory separator in server path.
+    if ( DIRECTORY_SEPARATOR !== '/' ) {
+        $serverPath = str_replace(DIRECTORY_SEPARATOR, '/', $serverPath);
+    }
+
+}
+
+$serverPath = rtrim($serverPath, '/');
+
 $baseUrl .= $serverPath;
 
 /**
  * Server path. XXX Without trailing slash.
  * 
  * @var string
+ * @example /mongo
  */
 define('MPG_SERVER_PATH', $serverPath);
 
 /**
  * Base URL. XXX Without trailing slash.
  * 
  * @var string
+ * @example http://127.0.0.1:5000/mongo
  */
 define('MPG_BASE_URL', $baseUrl);
 
-require __DIR__ . '/autoload.php';
-require __DIR__ . '/routes.php';
+require MPG_ABS_PATH . '/autoload.php';
+require MPG_ABS_PATH . '/routes.php';
 
 $application = new Application($router);
 $serverRequest = ServerRequestFactory::createFromGlobals();
 
-// XXX This hack makes index to work in sub-folder case.
 try {
     $response = $application->dispatch($serverRequest);
 } catch (NotFoundHttpException $e) {
-    header('Location: ' . rtrim($_SERVER['REQUEST_URI'], '/') . '/index');
+    die('Route not found. Try to append a slash to URL.');
 }
 
 $application->send($response);

routes.php

@@ -9,16 +9,7 @@
 
 $router = new Router();
 
-$router->get('/', function() {
-
-	LoginController::ensureUserIsLogged();
-
-	Controller::redirectTo('/queryDatabase');
-
-});
-
-// XXX This hack makes index to work in sub-folder case.
-$router->get(MPG_SERVER_PATH . '/index', function() {
+$router->get(MPG_SERVER_PATH . '/', function() {
 
 	LoginController::ensureUserIsLogged();
 

src/Controllers/LoginController.php

@@ -65,7 +65,7 @@ public function renderViewAction() : Response {
             } else {
 
                 $_SESSION['mpg']['user_is_logged'] = true;
-                Controller::redirectTo('/index');
+                Controller::redirectTo('/');
 
             }
 

views/login.tpl.php

@@ -5,7 +5,7 @@
     <meta charset="UTF-8">
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
 
-    <title><?php echo MPG_APP_NAME . ' v' . MPG_APP_VERSION; ?></title>
+    <title><?php echo MPG_APP_NAME; ?></title>
 
     <link rel="stylesheet" href="<?php echo MPG_BASE_URL; ?>/static/css/font-awesome.min.css">
     <link rel="stylesheet" href="<?php echo MPG_BASE_URL; ?>/static/css/bootstrap.min.css">

views/parts/menu.tpl.php

@@ -1,6 +1,6 @@
 <nav class="navbar sticky-top navbar-dark bg-mongodb">
 
-    <a class="navbar-brand" href="<?php echo MPG_BASE_URL; ?>/index"><?php echo MPG_APP_NAME; ?></a>
+    <a class="navbar-brand" href="<?php echo MPG_BASE_URL; ?>/"><?php echo MPG_APP_NAME; ?></a>
 
     <div class="navbar-nav">
         <a class="nav-item nav-link<?php echo ('collection' === $viewName) ? ' active' : ''; ?>" data-canonical-url="<?php echo MPG_BASE_URL; ?>/manageCollections" href="<?php echo MPG_BASE_URL; ?>/manageCollections">Manage collections</a>