From d5d03875f0dd6c46634484e4b71543c6b028c036 Mon Sep 17 00:00:00 2001
From: Ibnu Maksum <ibnumaksum@gmail.com>
Date: Wed, 24 Jul 2024 09:20:21 +0700
Subject: [PATCH] fix installation

---
 init.php          |  7 +++-
 install/step4.php | 81 +++++++++++++++++++++++------------------------
 2 files changed, 46 insertions(+), 42 deletions(-)

diff --git a/init.php b/init.php
index 16e7bd3..baf747b 100644
--- a/init.php
+++ b/init.php
@@ -67,9 +67,13 @@ require_once $root_path . File::pathFixer('system/orm.php');
 require_once $root_path . File::pathFixer('system/autoload/PEAR2/Autoload.php');
 include $root_path . File::pathFixer('system/autoload/Hookers.php');
 
+if(!empty($db_password)){
+    // compability for old version
+    $db_pass = $db_password;
+}
 ORM::configure("mysql:host=$db_host;dbname=$db_name");
 ORM::configure('username', $db_user);
-ORM::configure('password', $db_password);
+ORM::configure('password', $db_pass);
 ORM::configure('return_result_sets', true);
 if ($_app_stage != 'Live') {
     ORM::configure('logging', true);
@@ -112,6 +116,7 @@ date_default_timezone_set($config['timezone']);
 
 if ((!empty($radius_user) && $config['radius_enable']) || _post('radius_enable')) {
     if(!empty($radius_password)){
+        // compability for old version
         $radius_pass = $radius_password;
     }
     ORM::configure("mysql:host=$radius_host;dbname=$radius_name", null, 'radius');
diff --git a/install/step4.php b/install/step4.php
index c7b3040..751c571 100644
--- a/install/step4.php
+++ b/install/step4.php
@@ -28,61 +28,60 @@ if ($cn == '1') {
     if (isset($_POST['radius']) && $_POST['radius'] == 'yes') {
         $input = '<?php
 
-$protocol = (!empty($_SERVER[\'HTTPS\']) && $_SERVER[\'HTTPS\'] !== \'off\' || $_SERVER[\'SERVER_PORT\'] == 443) ? "https://" : "http://";
-$host = $_SERVER[\'HTTP_HOST\'];
-$baseDir = rtrim(dirname($_SERVER[\'SCRIPT_NAME\']), \'/\\\');
-define(\'APP_URL\', $protocol . $host . $baseDir);
+$protocol = (!empty($_SERVER["HTTPS"]) && $_SERVER["HTTPS"] !== "off" || $_SERVER["SERVER_PORT"] == 443) ? "https://" : "http://";
+$host = $_SERVER["HTTP_HOST"];
+$baseDir = rtrim(dirname($_SERVER["SCRIPT_NAME"]), "/\\");
+define("APP_URL", $protocol . $host . $baseDir);
 
-$_app_stage = \'Live\';
+// Live, Dev, Demo
+$_app_stage = "Live";
 
 // Database PHPNuxBill
-$db_host	    = \'' . $db_host . '\';
-$db_user        = \'' . $db_user . '\';
-$db_password	= \'' . $db_password . '\';
-$db_name	    = \'' . $db_name . '\';
+$db_host	    = "' . $db_host . '";
+$db_user        = "' . $db_user . '";
+$db_pass    	= "' . $db_password . '";
+$db_name	    = "' . $db_name . '";
 
 // Database Radius
-$radius_host	    = \'' . $db_host . '\';
-$radius_user        = \'' . $db_user . '\';
-$radius_pass    	= \'' . $db_password . '\';
-$radius_name	    = \'' . $db_name . '\';
+$radius_host	    = "' . $db_host . '";
+$radius_user        = "' . $db_user . '";
+$radius_pass    	= "' . $db_password . '";
+$radius_name	    = "' . $db_name . '";
 
-if($_app_stage!=\'Live\'){
+if($_app_stage!="Live"){
     error_reporting(E_ERROR);
-    ini_set(\'display_errors\', 1);
-    ini_set(\'display_startup_errors\', 1);
+    ini_set("display_errors", 1);
+    ini_set("display_startup_errors", 1);
 }else{
     error_reporting(E_ERROR);
-    ini_set(\'display_errors\', 0);
-    ini_set(\'display_startup_errors\', 0);
-}
-';
+    ini_set("display_errors", 0);
+    ini_set("display_startup_errors", 0);
+}';
     } else {
         $input = '<?php
+$protocol = (!empty($_SERVER["HTTPS"]) && $_SERVER["HTTPS"] !== "off" || $_SERVER["SERVER_PORT"] == 443) ? "https://" : "http://";
+$host = $_SERVER["HTTP_HOST"];
+$baseDir = rtrim(dirname($_SERVER["SCRIPT_NAME"]), "/\\");
+define("APP_URL", $protocol . $host . $baseDir);
 
-    $protocol = (!empty($_SERVER[\'HTTPS\']) && $_SERVER[\'HTTPS\'] !== \'off\' || $_SERVER[\'SERVER_PORT\'] == 443) ? "https://" : "http://";
-    $host = $_SERVER[\'HTTP_HOST\'];
-    $baseDir = rtrim(dirname($_SERVER[\'SCRIPT_NAME\']), \'/\\\');
-    define(\'APP_URL\', $protocol . $host . $baseDir);
+// Live, Dev, Demo
+$_app_stage = "Live";
 
-    $_app_stage = \'Live\';
+// Database PHPNuxBill
+$db_host	    = "' . $db_host . '";
+$db_user        = "' . $db_user . '";
+$db_pass	    = "' . $db_password . '";
+$db_name	    = "' . $db_name . '";
 
-    // Database PHPNuxBill
-    $db_host	    = \'' . $db_host . '\';
-    $db_user        = \'' . $db_user . '\';
-    $db_password	= \'' . $db_password . '\';
-    $db_name	    = \'' . $db_name . '\';
-
-    if($_app_stage!=\'Live\'){
-        error_reporting(E_ERROR);
-        ini_set(\'display_errors\', 1);
-        ini_set(\'display_startup_errors\', 1);
-    }else{
-        error_reporting(E_ERROR);
-        ini_set(\'display_errors\', 0);
-        ini_set(\'display_startup_errors\', 0);
-    }
-    ';
+if($_app_stage!="Live"){
+    error_reporting(E_ERROR);
+    ini_set("display_errors", 1);
+    ini_set("display_startup_errors", 1);
+}else{
+    error_reporting(E_ERROR);
+    ini_set("display_errors", 0);
+    ini_set("display_startup_errors", 0);
+}';
     }
     $wConfig = "../config.php";
     $fh = fopen($wConfig, 'w') or die("Can't create config file, your server does not support 'fopen' function,