Merge branch 'main' of https://gitlab.dfoso.id/dfoso/engineN

app/Config/App.php

@@ -16,7 +16,7 @@ class App extends BaseConfig
      *
      *    http://example.com/
      */
-    public $baseURL = BASEURL . '/engineN';
+    public $baseURL = BASE . '/engineN';
 
     /**
      * Allowed Hostnames in the Site URL other than the hostname in the baseURL.

app/Config/Constants.php

@@ -78,8 +78,14 @@ defined('EXIT_DATABASE')       || define('EXIT_DATABASE', 8);       // database
 defined('EXIT__AUTO_MIN')      || define('EXIT__AUTO_MIN', 9);      // lowest automatically-assigned error code
 defined('EXIT__AUTO_MAX')      || define('EXIT__AUTO_MAX', 125);    // highest automatically-assigned error code
 
-$protocol = isset($_SERVER['HTTPS']) && $_SERVER['HTTPS'] != 'off' ? 'https://'.$_SERVER['HTTP_HOST'] : 'http://'.$_SERVER['HTTP_HOST'];
-    defined('BASEURL') || define('BASEURL',$protocol);
+$base = ((isset($_SERVER['HTTPS']) && $_SERVER['HTTPS'] == "on") ? "https" : "https");
+$base .= "://" . $_SERVER['HTTP_HOST'];
+//$base .= str_replace(basename($_SERVER['SCRIPT_NAME']), "", $_SERVER['SCRIPT_NAME']);
+
+defined('BASE') || define('BASE', $base);
+
+//$protocol = isset($_SERVER['HTTPS']) && $_SERVER['HTTPS'] != 'off' ? 'https://'.$_SERVER['HTTP_HOST'] : 'http://'.$_SERVER['HTTP_HOST'];
+//    defined('BASEURL') || define('BASEURL',$protocol);
 
 /**
  * @deprecated Use \CodeIgniter\Events\Events::PRIORITY_LOW instead.