X-Git-Url: https://git.cweiske.de/phorkie.git/blobdiff_plain/bbe055e8c11da1ec0eddee461a31fb5acf382c92..98ce84ca45e25b42c49f6031193920e2c2e8c973:/src/stub-phar.php

diff --git a/src/stub-phar.php b/src/stub-phar.php
index ac82a38..859152b 100644
--- a/src/stub-phar.php
+++ b/src/stub-phar.php
@@ -9,7 +9,7 @@
  * @author    Christian Weiske <cweiske@cweiske.de>
  * @copyright 2014 Christian Weiske
  * @license   http://www.gnu.org/licenses/agpl.html GNU AGPL v3
- * @link      http://phorkie.sf.net/
+ * @link      https://cweiske.de/phorkie.htm
  */
 if (!in_array('phar', stream_get_wrappers()) || !class_exists('Phar', false)) {
     echo "Phar extension not avaiable\n";
@@ -47,7 +47,10 @@ function rewritePath($path)
 
     $path = rewriteWithHtaccess($path);
 
-    if (substr($path, -4) == '.css' || substr($path, -3) == '.js') {
+    if (substr($path, -4) == '.css'
+        || substr($path, -3) == '.js'
+        || substr($path, 0, 9) == '/phorkie/'
+    ) {
         header('Expires: ' . date('r', time() + 86400 * 7));
     }
     return 'www' . $path;
@@ -55,10 +58,10 @@ function rewritePath($path)
 
 function rewriteWithHtaccess($path)
 {
-    //remove the trailing slash /
+    //remove the leading slash /
     $cpath = substr($path, 1);
     $bFoundMatch = false;
-    $map = include(__DIR__ . '/../src/gen-rewritemap.php');
+    $map = include('phar://' . __FILE__ . '/src/gen-rewritemap.php');
     foreach ($map as $pattern => $replace) {
         if (preg_match($pattern, $cpath, $matches)) {
             $bFoundMatch = true;