[#272] Switch to new logic

catalyst · Sep 5, 2023 · 588a52d · 588a52d
1 parent 02961ba
commit 588a52d
Show file tree

Hide file tree

Showing 2 changed files with 42 additions and 2 deletions.
diff --git a/classes/script_metadata.php b/classes/script_metadata.php
@@ -224,6 +224,44 @@ public static function get_request(): string {
         return $request;
     }
 
+    /**
+     * Gets the name of the script.
+     * Parameters are share the names of globals as a hint to the caller.
+     * @param string $ME
+     * @param string $SCRIPT
+     * @return string the request path for this profile.
+     */
+    public static function get_normalised_relative_script_path(?string $ME, ?string $SCRIPT): string {
+        if (isset($ME)) {
+            $scriptpath = $ME;
+        } else if (isset($SCRIPT)) {
+            $scriptpath = $SCRIPT;
+        } else {
+            return self::REQUEST_UNKNOWN;
+        }
+
+        // Remove consecutive slashes.
+        $scriptpath = preg_replace('/\/+/', '/', $scriptpath);
+
+        // Strip pathinfo.
+        $scriptpath = preg_replace('/\.php.*$/', '.php', $scriptpath, 1);
+
+        // Strip off the query string ($ME includes this).
+        $scriptpath = preg_replace('/\?.*$/', '', $scriptpath);
+
+        // Remove 'index.php' from the end ($SCRIPT includes this).
+        $scriptpath = preg_replace('/\/index\.php$/', '', $scriptpath, 1);
+
+        // Remove leading and trailing slashes.
+        $scriptpath = trim($scriptpath, '/');
+
+        if ($scriptpath === '') {
+            return '/';
+        }
+
+        return $scriptpath;
+    }
+
     /**
      * Checks the current response headers and tries to resolve the content type
      * e.g. to store as part of the profile.
@@ -401,7 +439,7 @@ public static function get_timer_interval(): float {
     public static function get_sampling_period(): float {
         $period = get_config('tool_excimer', 'sample_ms') / 1000;
         $insensiblerange = $period >= self::SAMPLING_PERIOD_MIN && $period <= self::SAMPLING_PERIOD_MAX;
-        if (! $insensiblerange) {
+        if (!$insensiblerange) {
             set_config('sample_ms', self::SAMPLING_PERIOD_DEFAULT * 1000, 'tool_excimer');
             $period = self::SAMPLING_PERIOD_DEFAULT;
         }

diff --git a/classes/web_processor.php b/classes/web_processor.php
@@ -59,7 +59,9 @@ public function init(manager $manager) {
         // Record and set initial memory usage at this point.
         $memoryusage = memory_get_usage();
 
-        $request = script_metadata::get_request();
+        global $ME, $SCRIPT;
+
+        $request = script_metadata::get_normalised_relative_script_path($ME, $SCRIPT);
         $starttime = (int) $manager->get_starttime();
         $this->sampleset = new sample_set($request, $starttime);