From 699289662b7dfd72185e68d33328c7b6e390ef2e Mon Sep 17 00:00:00 2001
From: Ibnu Maksum <ibnumaksum@gmail.com>
Date: Fri, 1 Mar 2024 09:37:13 +0700
Subject: [PATCH] Fix Upload URL

---
 system/controllers/export.php   | 11 +++++++----
 system/controllers/settings.php |  6 ++++--
 2 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/system/controllers/export.php b/system/controllers/export.php
index 3fff53fc..6508fa74 100644
--- a/system/controllers/export.php
+++ b/system/controllers/export.php
@@ -62,10 +62,11 @@ switch ($action) {
         $title = ' Reports [' . $mdate . ']';
         $title = str_replace('-', ' ', $title);
 
+        $UPLOAD_URL_PATH = str_replace($root_path, '',  $UPLOAD_PATH);
         if (file_exists($UPLOAD_PATH . '/logo.png')) {
-            $logo = $UPLOAD_PATH . '/logo.png';
+            $logo = $UPLOAD_URL_PATH . '/logo.png';
         } else {
-            $logo = $UPLOAD_PATH . '/logo.default.png';
+            $logo = $UPLOAD_URL_PATH . '/logo.default.png';
         }
 
         if ($x) {
@@ -234,10 +235,12 @@ EOF;
 
         $title = ' Reports [' . $mdate . ']';
         $title = str_replace('-', ' ', $title);
+
+        $UPLOAD_URL_PATH = str_replace($root_path, '',  $UPLOAD_PATH);
         if (file_exists($UPLOAD_PATH . '/logo.png')) {
-            $logo = $UPLOAD_PATH . '/logo.png';
+            $logo = $UPLOAD_URL_PATH . '/logo.png';
         } else {
-            $logo = $UPLOAD_PATH . '/logo.default.png';
+            $logo = $UPLOAD_URL_PATH . '/logo.default.png';
         }
 
         if ($x) {
diff --git a/system/controllers/settings.php b/system/controllers/settings.php
index a2f33fdd..40e476d9 100644
--- a/system/controllers/settings.php
+++ b/system/controllers/settings.php
@@ -30,10 +30,12 @@ switch ($action) {
             r2(U . "settings/app", 's', 'Test Telegram has been send<br>Result: ' . $result);
         }
 
+        $UPLOAD_URL_PATH = str_replace($root_path,'',  $UPLOAD_PATH);
+
         if (file_exists($UPLOAD_PATH . DIRECTORY_SEPARATOR . 'logo.png')) {
-            $logo = $UPLOAD_PATH . DIRECTORY_SEPARATOR . 'logo.png?' . time();
+            $logo = $UPLOAD_URL_PATH . DIRECTORY_SEPARATOR . 'logo.png?' . time();
         } else {
-            $logo = $UPLOAD_PATH . DIRECTORY_SEPARATOR . 'logo.default.png';
+            $logo = $UPLOAD_URL_PATH . DIRECTORY_SEPARATOR . 'logo.default.png';
         }
         $ui->assign('logo', $logo);
         if ($config['radius_enable'] && empty($config['radius_client'])) {