automatically configure git paths (dir + public clone url)

[phorkie.git] / src / phorkie / Tools.php

diff --git a/src/phorkie/Tools.php b/src/phorkie/Tools.php
index 7819cda77efb956bf6cf35ae58a20c9398c12a23..2febb29a222907621137239122a2f83493254dfe 100644 (file)
--- a/src/phorkie/Tools.php
+++ b/src/phorkie/Tools.php
@@ -48,6 +48,23 @@ class Tools
         return $prot . '://' . $_SERVER['HTTP_HOST'] . $GLOBALS['phorkie']['cfg']['baseurl'] . $path;
     }
 
+    /**
+     * Get the full URL to a path, but remove the .phar file from
+     * the base URL if necessary
+     *
+     * @param string $path Path to the file
+     *
+     * @return string Full URL without .phar/
+     */
+    public static function fullUrlNoPhar($path = '')
+    {
+        $base = static::fullUrl();
+        if (substr($base, -6) == '.phar/') {
+            $base = dirname($base) . '/';
+        }
+        return $base . $path;
+    }
+
     /**
      * Removes malicious parts from a file name
      *
@@ -86,6 +103,13 @@ class Tools
             return $scriptName . '/';
         }
 
+        if (isset($_GET['id'])) {
+            $idp = strpos($requestUri, '/' . $_GET['id'] . '/');
+            if ($idp !== false) {
+                return substr($requestUri, 0, $idp) . '/';
+            }
+        }
+
         if (substr($requestUri, -4) != '.php') {
             $requestUri .= '.php';
         }