From 561d44cdde0e41a8b44a5eafe467fbc134a741d7 Mon Sep 17 00:00:00 2001
From: Andreas Hackl <a@r0.at>
Date: Sat, 8 Jun 2024 16:39:22 +0200
Subject: [PATCH] move $_SERVER['REQUEST_URI'] out of SITE_URL

the code needs 2 things:
- the URL without any path after the host, e.g. to append file download
  paths to
- the whole URL including path (and potentially including the php file's
  name!), e.g. to add ?sharex to

those shouldn't have been mashed together, and with this, aren't anymore

part of #29
---
 index.php | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/index.php b/index.php
index 54e2f79..10c6b6c 100755
--- a/index.php
+++ b/index.php
@@ -23,7 +23,12 @@ class CONFIG
     public static function SITE_URL() : string
     {
         $proto = ($_SERVER['HTTPS'] ?? 'off') == 'on' || CONFIG::FORCE_HTTPS ? 'https' : 'http';
-        return "$proto://{$_SERVER['HTTP_HOST']}{$_SERVER['REQUEST_URI']}";
+        return "$proto://{$_SERVER['HTTP_HOST']}";
+    }
+
+    public static function SCRIPT_URL() : string
+    {
+        return CONFIG::SITE_URL().$_SERVER['REQUEST_URI'];
     }
 };
 
@@ -173,7 +178,7 @@ function store_file(string $name, string $tmpfile, bool $formatted = false) : vo
     }
 
     //print the download link of the file
-    $url = sprintf(CONFIG::SITE_URL().CONFIG::DOWNLOAD_PATH, $basename);
+    $url = sprintf(CONFIG::SITE_URL().'/'.CONFIG::DOWNLOAD_PATH, $basename);
 
     if ($formatted)
     {
@@ -258,7 +263,7 @@ function send_text_file(string $filename, string $content) : void
 function send_sharex_config() : void
 {
     $name = $_SERVER['SERVER_NAME'];
-    $site_url = str_replace("?sharex", "", CONFIG::SITE_URL());
+    $site_url = str_replace("?sharex", "", CONFIG::SCRIPT_URL());
     send_text_file($name.'.sxcu', <<<EOT
 {
   "Name": "$name",
@@ -275,7 +280,7 @@ EOT);
 function send_hupl_config() : void
 {
     $name = $_SERVER['SERVER_NAME'];
-    $site_url = str_replace("?hupl", "", CONFIG::SITE_URL());
+    $site_url = str_replace("?hupl", "", CONFIG::SCRIPT_URL());
     send_text_file($name.'.hupl', <<<EOT
 {
   "name": "$name",
@@ -290,7 +295,7 @@ EOT);
 // use it, how to upload, etc.
 function print_index() : void
 {
-    $site_url = CONFIG::SITE_URL();
+    $site_url = CONFIG::SCRIPT_URL();
     $sharex_url = $site_url.'?sharex';
     $hupl_url = $site_url.'?hupl';
     $decay = CONFIG::DECAY_EXP;