Removed leading / from resources and use only the last part of the re…

…quest uri for routing.
k9krew · Nov 9, 2013 · 2bef0c0 · 2bef0c0
1 parent 1bb1d8d
commit 2bef0c0
Show file tree

Hide file tree

Showing 8 changed files with 28 additions and 18 deletions.
diff --git a/.gitignore b/.gitignore
@@ -0,0 +1,2 @@
+/public/.htaccess
+
diff --git a/bootstrap.php b/bootstrap.php
@@ -53,7 +53,9 @@
 /**
  * Setup routing
  */
-switch(trim($_SERVER['REQUEST_URI'], '/')) {
+
+$request = explode('/', $_SERVER['REQUEST_URI']);
+switch(end($request)) {
     case 'configuration':
         ob_start();
         require __DIR__ . '/template/configuration.phtml';

diff --git a/public/.htaccess.dist b/public/.htaccess.dist
@@ -0,0 +1,6 @@
+RewriteEngine on
+RewriteCond %{REQUEST_FILENAME} !-f
+RewriteCond %{REQUEST_FILENAME} !-d
+RewriteCond %{REQUEST_URI} !=favicon.ico
+RewriteRule ^ /index.php [L]
+
diff --git a/public/js/main.js b/public/js/main.js
@@ -108,7 +108,7 @@
 
             if ($(td).hasClass('active')) {
                 $(td).removeClass('active');
-                td.querySelector('img').src = '/style/toggle-expand.png';
+                td.querySelector('img').src = 'style/toggle-expand.png';
                 td.querySelector('img').setAttribute('alt', '+');
                 var rows = document.querySelectorAll('.script');
                 for (var i = 0, l = rows.length; i < l; i++) {
@@ -120,7 +120,7 @@
                 }
             } else {
                 $(td).addClass('active');
-                td.querySelector('img').src = '/style/toggle-collapse.png';
+                td.querySelector('img').src = 'style/toggle-collapse.png';
                 td.querySelector('img').setAttribute('alt', '-');
                 var rows = document.querySelectorAll('.script');
                 for (var i = 0, l = rows.length; i < l; i++) {

diff --git a/template/cached.phtml b/template/cached.phtml
@@ -20,7 +20,7 @@ foreach($status->getCachedScripts() as $data) {
                 <?php $i = 0; ?>
                 <?php foreach ($directories as $directory => $scripts) { ?>
                     <tr class="<?= $classCycler->next(); ?>">
-                        <td colspan="6" class="directory" data-directoryid="<?= ++$i; ?>"><img src="/style/toggle-expand.png" alt="+"><?= $directory . sprintf($translator->translate('scripts.directory.script_count'), count($scripts)); ?></td>
+                        <td colspan="6" class="directory" data-directoryid="<?= ++$i; ?>"><img src="style/toggle-expand.png" alt="+"><?= $directory . sprintf($translator->translate('scripts.directory.script_count'), count($scripts)); ?></td>
                     </tr>
                     <tr class="script heading" data-directoryid="<?= $i; ?>">
                         <th class="full_path"><?= $translator->translate('scripts.full_path'); ?></th>
@@ -38,7 +38,7 @@ foreach($status->getCachedScripts() as $data) {
                             <td class="last_used_timestamp"><?= $script['last_used_timestamp']; ?></td>
                             <td class="timestamp"><?= $script['timestamp']; ?></td>
                             <td class="invalidate">
-                                <form action="/invalidate" method="post">
+                                <form action="invalidate" method="post">
                                     <input type="hidden" name="csrfToken" value="<?= $csrfToken->get(); ?>">
                                     <input type="hidden" name="key" value="<?= $script['full_path']; ?>">
                                     <input type="submit" name="submit" value="<?= $translator->translate('script.invalidate'); ?>">

diff --git a/template/configuration.phtml b/template/configuration.phtml
@@ -10,7 +10,7 @@ $classCycler = new OpCacheGUI\Presentation\ClassCycler(['odd', 'even']);
             <tr class="<?= $classCycler->next(); ?>">
                 <th><?= $translator->translate('config.' . $key); ?></th>
                 <?php if (in_array($key, ['opcache.enable', 'opcache.enable_cli', 'opcache.use_cwd', 'opcache.validate_timestamps', 'opcache.inherited_hack', 'opcache.dups_fix', 'opcache.revalidate_path', 'opcache.save_comments', 'opcache.load_comments', 'opcache.fast_shutdown', 'opcache.enable_file_override'])) { ?>
-                    <th><img src="/style/bullet-<?= $directiveItem ? 'green' : 'red'; ?>-icon.png"></th>
+                    <th><img src="style/bullet-<?= $directiveItem ? 'green' : 'red'; ?>-icon.png"></th>
                 <?php } else { ?>
                     <th><?= $directiveItem; ?></th>
                 <?php } ?>

diff --git a/template/page.phtml b/template/page.phtml
@@ -3,20 +3,20 @@
     <head>
         <title>OpCacheGUI 1.0</title>
         <meta charset="utf-8">
-        <link rel="stylesheet" type="text/css" href="/style/style.css">
-        <link rel="shortcut icon" href="/favicon.ico">
+        <link rel="stylesheet" type="text/css" href="style/style.css">
+        <link rel="shortcut icon" href="favicon.ico">
         <script>'article aside footer header nav section time'.replace(/\w+/g,function(n){document.createElement(n)})</script>
     </head>
     <body>
         <header>
             <div class="content">
-                <h1><a href="/">PHP <?= phpversion(); ?> OpCache x</a></h1>
+                <h1><a href="">PHP <?= phpversion(); ?> OpCache x</a></h1>
                 <nav>
                     <ul>
-                        <li<?= $active == 'status' ? ' class="active"' : null ?>><a href="/"><?= $translator->translate('menu.status'); ?></a></li>
-                        <li<?= $active == 'config' ? ' class="active"' : null ?>><a href="/configuration"><?= $translator->translate('menu.config'); ?></a></li>
-                        <li<?= $active == 'cached' ? ' class="active"' : null ?>><a href="/cached-scripts"><?= $translator->translate('menu.scripts'); ?></a></li>
-                        <li<?= $active == 'graphs' ? ' class="active"' : null ?>><a href="/graphs"><?= $translator->translate('menu.graphs'); ?></a></li>
+                        <li<?= $active == 'status' ? ' class="active"' : null ?>><a href="status"><?= $translator->translate('menu.status'); ?></a></li>
+                        <li<?= $active == 'config' ? ' class="active"' : null ?>><a href="configuration"><?= $translator->translate('menu.config'); ?></a></li>
+                        <li<?= $active == 'cached' ? ' class="active"' : null ?>><a href="cached-scripts"><?= $translator->translate('menu.scripts'); ?></a></li>
+                        <li<?= $active == 'graphs' ? ' class="active"' : null ?>><a href="graphs"><?= $translator->translate('menu.graphs'); ?></a></li>
                     </ul>
                 </nav>
             </div>
@@ -33,8 +33,8 @@
                 <li>Maintained by <a href="https://github.com/PeeHaa" target="_blank">Pieter Hordijk</a></li>
             </ul>
         </footer>
-        <script src="/js/Chart.js"></script>
-        <script src="/js/DomHandler.js"></script>
-        <script src="/js/main.js"></script>
+        <script src="js/Chart.js"></script>
+        <script src="js/DomHandler.js"></script>
+        <script src="js/main.js"></script>
     </body>
 </html>
diff --git a/template/status.phtml b/template/status.phtml
@@ -6,7 +6,7 @@ $classCycler = new OpCacheGUI\Presentation\ClassCycler(['odd', 'even']);
 <article class="cols-3 first">
     <h2>
         <?= $translator->translate('status.title'); ?>
-        <form action="/reset" method="post" id="reset" data-confirmation="<?= $translator->translate('confirmation.reset'); ?>" data-yes="<?= $translator->translate('confirmation.yes'); ?>" data-no="<?= $translator->translate('confirmation.no'); ?>">
+        <form action="reset" method="post" id="reset" data-confirmation="<?= $translator->translate('confirmation.reset'); ?>" data-yes="<?= $translator->translate('confirmation.yes'); ?>" data-no="<?= $translator->translate('confirmation.no'); ?>">
             <input type="hidden" name="csrfToken" value="<?= $csrfToken->get(); ?>">
             <input type="submit" name="submit" value="<?= $translator->translate('reset.submit'); ?>">
         </form>
@@ -15,7 +15,7 @@ $classCycler = new OpCacheGUI\Presentation\ClassCycler(['odd', 'even']);
         <?php foreach ($status->getStatusInfo() as $key => $statusItem) { ?>
             <tr class="<?= $classCycler->next(); ?>">
                 <th><?= $translator->translate('status.' . $key); ?></th>
-                <td><img src="/style/bullet-<?= $statusItem ? 'green' : 'red'; ?>-icon.png"></td>
+                <td><img src="style/bullet-<?= $statusItem ? 'green' : 'red'; ?>-icon.png"></td>
             </tr>
         <?php } ?>
     </table>