fix redirects when running as phar

diff --git a/build.xml b/build.xml
index 2bf0ce1b56f2cc24847124fd77e61a67636d3c3c..f1d99e00b62323b2c2483c9e676bac3f1061ffd8 100644 (file)
--- a/build.xml
+++ b/build.xml
@@ -50,6 +50,7 @@
    <include name="PEAR/Exception.php"/>
    <include name="PEAR.php"/>
    <include name="PEAR5.php"/>
+   <include name="System.php"/>
   </pearPackageFileset>
   <pearPackageFileset id="dep-Getopt" package="pear.php.net/Console_Getopt" />
 

diff --git a/src/phancap/Config.php b/src/phancap/Config.php
index 1bb43796dbc61a8db4ffff76fd2e00dd0da7904c..5034b0f3c153daae2ed82360ffb4549966e21b12 100644 (file)
--- a/src/phancap/Config.php
+++ b/src/phancap/Config.php
@@ -118,15 +118,23 @@ class Config
             . preg_replace('/#.*$/', '', $_SERVER['REQUEST_URI']);
     }
 
+    /**
+     * @return string Directory of URL without trailing slash,
+     *                and without .phar file
+     */
     protected function getCurrentUrlDir()
     {
         $url = $this->getCurrentUrl();
         $url = preg_replace('/\?.*$/', '', $url);
-        if (substr($url, -1) == '/') {
-            return $url;
+        if (substr($url, -1) != '/') {
+            $url = substr($url, 0, -strlen(basename($url)) - 1);
+        }
+        if (\Phar::running()) {
+            //remove .phar file name
+            $url = substr($url, 0, -strlen(basename($url)) - 1);
         }
 
-        return substr($url, 0, -strlen(basename($url)) - 1);
+        return $url;
     }
 }
 ?>

diff --git a/src/phar-stub.php b/src/phar-stub.php
index 04aa11190ad1f67383486de65108c2f0bd5f9d8d..5188983d2739e548a0feaa9ac5418325defaaea1 100644 (file)
--- a/src/phar-stub.php
+++ b/src/phar-stub.php
@@ -28,25 +28,31 @@ $web = 'www/index.php';
  */
 function rewritePath($path)
 {
-    if ($path == '' || $path == '/') {
+    if ($path == '') {
+        //we need a / to get the relative links on index.php work
+        if (!isset($_SERVER['REQUEST_SCHEME'])) {
+            $_SERVER['REQUEST_SCHEME'] = 'http';
+        }
+        $url = $_SERVER['REQUEST_SCHEME'] . '://'
+            . $_SERVER['HTTP_HOST']
+            . preg_replace('/[?#].*$/', '', $_SERVER['REQUEST_URI'])
+            . '/';
+        header('Location: ' . $url);
+        exit(0);
+    } else if( $path == '/') {
         return 'www/index.php';
-    } else if ($path == '/get' || $path == '/get.php') {
-        return 'www/get.php';
-    } else if ($path == '/setup' || $path == '/setup.php') {
-        return 'www/setup.php';
     }
-    return $path;
+    return 'www' . $path;
 }
 
-//Phar::interceptFileFuncs();
 set_include_path(
     'phar://' . __FILE__
     . PATH_SEPARATOR . 'phar://' . __FILE__ . '/lib/'
 );
 Phar::webPhar(null, $web, null, array(), 'rewritePath');
 
-//work around https://bugs.php.net/bug.php?id=52322
-//require 'phar://' . __FILE__ . '/' . $web;
-echo "cli\n";
+//TODO: implement CLI setup check
+echo "phancap can only be used in the browser\n";
+exit(1);
 __HALT_COMPILER();
 ?>