kevinowino869/mitrobill
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/Focuslinkstech/phpnuxbill

Browse Source
This commit is contained in:
Focuslinkstech 2024-07-31 09:50:03 +01:00
commit 0bcac10eec
16 changed files with 65 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
config.sample.php
View File

@ -1,16 +1,18 @@
<?php
$db_host = "localhost"; # Database Host
$db_port = ""; # Database Port. Keep it blank if you are un sure.
$db_user = "root"; # Database Username
$db_password = ""; # Database Password
$db_name = "phpnuxbill"; # Database Name
$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);
#Please include http and do not use trailing slash after the url. For example use in this format- http://www.example.com Or http://www.example.com/finance
$_app_stage = 'Live'; # Do not change this
$db_host = "localhost"; # Database Host
$db_port = ""; # Database Port. Keep it blank if you are un sure.
$db_user = "root"; # Database Username
$db_pass = ""; # Database Password
$db_name = "phpnuxbill"; # Database Name

4
docs/index.html
View File

File diff suppressed because one or more lines are too long

8
init.php
View File

@ -67,10 +67,14 @@ 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)){
if($db_password != null && ($db_pass == null || empty($db_pass))){
// compability for old version
$db_pass = $db_password;
}
if($db_pass != null){
// compability for old version
$db_password = $db_pass;
}
ORM::configure("mysql:host=$db_host;dbname=$db_name");
ORM::configure('username', $db_user);
ORM::configure('password', $db_pass);
@ -329,7 +333,7 @@ function _alert($text, $type = 'success', $url = "home", $time = 3)
if (!isset($api_secret)) {
$api_secret = $db_password;
$api_secret = $db_pass;
}
function displayMaintenanceMessage(): void

10
install/step4.php
View File

@ -9,14 +9,14 @@
$appurl = $_POST['appurl'];
$db_host = $_POST['dbhost'];
$db_user = $_POST['dbuser'];
$db_password = $_POST['dbpass'];
$db_pass = $_POST['dbpass'];
$db_name = $_POST['dbname'];
$cn = '0';
try {
$dbh = new pdo(
"mysql:host=$db_host;dbname=$db_name",
"$db_user",
"$db_password",
"$db_pass",
array(PDO::ATTR_ERRMODE => PDO::ERRMODE_EXCEPTION)
);
$cn = '1';
@ -39,13 +39,13 @@ $_app_stage = "Live";
// Database PHPNuxBill
$db_host = "' . $db_host . '";
$db_user = "' . $db_user . '";
$db_pass = "' . $db_password . '";
$db_pass = "' . $db_pass . '";
$db_name = "' . $db_name . '";
// Database Radius
$radius_host = "' . $db_host . '";
$radius_user = "' . $db_user . '";
$radius_pass = "' . $db_password . '";
$radius_pass = "' . $db_pass . '";
$radius_name = "' . $db_name . '";
if($_app_stage!="Live"){
@ -70,7 +70,7 @@ $_app_stage = "Live";
// Database PHPNuxBill
$db_host = "' . $db_host . '";
$db_user = "' . $db_user . '";
$db_pass = "' . $db_password . '";
$db_pass = "' . $db_pass . '";
$db_name = "' . $db_name . '";
if($_app_stage!="Live"){

2
install/update.php
View File

@ -26,7 +26,7 @@
try{
$dbh = new pdo( "mysql:host=$db_host;dbname=$db_name",
"$db_user",
"$db_password",
"$db_pass",
array(PDO::ATTR_ERRMODE => PDO::ERRMODE_EXCEPTION));
echo "CREATE TABLE `tbl_payment_gateway` (

8
system/autoload/Admin.php
View File

@ -11,7 +11,7 @@ class Admin
public static function getID()
{
global $db_password, $config;
global $db_pass, $config;
$enable_session_timeout = $config['enable_session_timeout'];
$session_timeout_duration = $config['session_timeout_duration'] * 60; // Convert minutes to seconds
@ -27,7 +27,7 @@ class Admin
elseif (isset($_COOKIE['aid'])) {
// id.time.sha1
$tmp = explode('.', $_COOKIE['aid']);
if (sha1($tmp[0] . '.' . $tmp[1] . '.' . $db_password) == $tmp[2]) {
if (sha1($tmp[0] . '.' . $tmp[1] . '.' . $db_pass) == $tmp[2]) {
if (time() - $tmp[1] < 86400 * 7) {
$_SESSION['aid'] = $tmp[0];
if ($enable_session_timeout) {
@ -43,12 +43,12 @@ class Admin
public static function setCookie($aid)
{
global $db_password, $config;
global $db_pass, $config;
$enable_session_timeout = $config['enable_session_timeout'];
$session_timeout_duration = $config['session_timeout_duration'] * 60; // Convert minutes to seconds
if (isset($aid)) {
$time = time();
$token = $aid . '.' . $time . '.' . sha1($aid . '.' . $time . '.' . $db_password);
$token = $aid . '.' . $time . '.' . sha1($aid . '.' . $time . '.' . $db_pass);
setcookie('aid', $token, time() + 86400 * 7);
$_SESSION['aid'] = $aid;
if ($enable_session_timeout) {

9
system/autoload/Package.php
View File

@ -29,6 +29,11 @@ class Package
$isVoucher = false;
$c = [];
if($trx && $trx['status'] == 2){
// if its already paid, return it
return;
}
if ($id_customer == '' or $router_name == '' or $plan_id == '') {
return false;
}
@ -235,7 +240,7 @@ class Package
}
}
if ($b['status'] == 'on') {
//if ($b['status'] == 'on') {
$dvc = Package::getDevice($p);
if ($_app_stage != 'demo') {
if (file_exists($dvc)) {
@ -245,7 +250,7 @@ class Package
new Exception(Lang::T("Devices Not Found"));
}
}
}
//}
$b->customer_id = $id_customer;
$b->username = $c['username'];

8
system/autoload/User.php
View File

@ -10,13 +10,13 @@ class User
{
public static function getID()
{
global $db_password;
global $db_pass;
if (isset($_SESSION['uid']) && !empty($_SESSION['uid'])) {
return $_SESSION['uid'];
} else if (isset($_COOKIE['uid'])) {
// id.time.sha1
$tmp = explode('.', $_COOKIE['uid']);
if (sha1($tmp[0] . '.' . $tmp[1] . '.' . $db_password) == $tmp[2]) {
if (sha1($tmp[0] . '.' . $tmp[1] . '.' . $db_pass) == $tmp[2]) {
if (time() - $tmp[1] < 86400 * 30) {
$_SESSION['uid'] = $tmp[0];
return $tmp[0];
@ -159,10 +159,10 @@ class User
public static function setCookie($uid)
{
global $db_password;
global $db_pass;
if (isset($uid)) {
$time = time();
setcookie('uid', $uid . '.' . $time . '.' . sha1($uid . '.' . $time . '.' . $db_password), time() + 86400 * 30);
setcookie('uid', $uid . '.' . $time . '.' . sha1($uid . '.' . $time . '.' . $db_pass), time() + 86400 * 30);
}
}

8
system/controllers/accounts.php
View File

@ -149,8 +149,8 @@ switch ($action) {
mkdir($otpPath);
touch($otpPath . 'index.html');
}
$otpFile = $otpPath . sha1($username . $db_password) . ".txt";
$phoneFile = $otpPath . sha1($username . $db_password) . "_phone.txt";
$otpFile = $otpPath . sha1($username . $db_pass) . ".txt";
$phoneFile = $otpPath . sha1($username . $db_pass) . "_phone.txt";
// expired 10 minutes
if (file_exists($otpFile) && time() - filemtime($otpFile) < 1200) {
@ -189,8 +189,8 @@ switch ($action) {
}
if (!empty($config['sms_url'])) {
$otpFile = $otpPath . sha1($username . $db_password) . ".txt";
$phoneFile = $otpPath . sha1($username . $db_password) . "_phone.txt";
$otpFile = $otpPath . sha1($username . $db_pass) . ".txt";
$phoneFile = $otpPath . sha1($username . $db_pass) . "_phone.txt";
// Check if OTP file exists
if (!file_exists($otpFile)) {

7
system/controllers/dashboard.php
View File

@ -55,9 +55,10 @@ if ($imonth == '') {
}
$ui->assign('imonth', $imonth);
$cb = ORM::for_table('tbl_customers')->whereGte('balance', 0)->sum('balance');
$ui->assign('cb', $cb);
if ($config['enable_balance'] == 'yes'){
$cb = ORM::for_table('tbl_customers')->whereGte('balance', 0)->sum('balance');
$ui->assign('cb', $cb);
}
$u_act = ORM::for_table('tbl_user_recharges')->where('status', 'on')->count();
if (empty($u_act)) {

4
system/controllers/register.php
View File

@ -46,7 +46,7 @@ switch ($do) {
}
if (!empty($config['sms_url'])) {
$otpPath .= sha1($username . $db_password) . ".txt";
$otpPath .= sha1($username . $db_pass) . ".txt";
run_hook('validate_otp'); #HOOK
//expired 10 minutes
if (file_exists($otpPath) && time() - filemtime($otpPath) > 1200) {
@ -122,7 +122,7 @@ switch ($do) {
mkdir($otpPath);
touch($otpPath . 'index.html');
}
$otpPath .= sha1($username . $db_password) . ".txt";
$otpPath .= sha1($username . $db_pass) . ".txt";
//expired 10 minutes
if (file_exists($otpPath) && time() - filemtime($otpPath) < 1200) {
$ui->assign('username', $username);

2
system/controllers/settings.php
View File

@ -701,7 +701,7 @@ switch ($action) {
_alert(Lang::T('You do not have permission to access this page'), 'danger', "dashboard");
}
$dbc = new mysqli($db_host, $db_user, $db_password, $db_name);
$dbc = new mysqli($db_host, $db_user, $db_pass, $db_name);
if ($result = $dbc->query('SHOW TABLE STATUS')) {
$tables = array();
while ($row = $result->fetch_array()) {

7
system/lan/english.json
View File

@ -673,5 +673,10 @@
"End_Date": "End Date",
"New_Version_Notification": "New Version Notification",
"Enabled": "Enabled",
"This_is_to_notify_you_when_new_updates_is_available": "This is to notify you when new updates is available"
"This_is_to_notify_you_when_new_updates_is_available": "This is to notify you when new updates is available",
"Enable_Session_Timeout": "Enable Session Timeout",
"Logout_Admin_if_not_Available_Online_a_period_of_time": "Logout Admin if not Available\/Online a period of time",
"Timeout_Duration": "Timeout Duration",
"Enter_the_session_timeout_duration__minutes_": "Enter the session timeout duration (minutes)",
"Idle_Timeout__Logout_Admin_if_Idle_for_xx_minutes": "Idle Timeout, Logout Admin if Idle for xx minutes"
}

5
ui/ui/dashboard.tpl
View File

@ -53,7 +53,7 @@
<ol class="breadcrumb">
<li>{Lang::dateFormat($start_date)}</li>
<li>{Lang::dateFormat($current_date)}</li>
{if in_array($_admin['user_type'],['SuperAdmin','Admin', 'Report'])}
{if $_c['enable_balance'] == 'yes' && in_array($_admin['user_type'],['SuperAdmin','Admin', 'Report'])}
<li>
{Lang::T('Customer Balance')} <sup>{$_c['currency_code']}</sup>
<b>{number_format($cb,0,$_c['dec_point'],$_c['thousands_sep'])}</b>
@ -337,6 +337,9 @@
//lets calculate the inactive users as reported
var expired = u_all - u_act;
var inactive = c_all - u_all;
if(inactive < 0){
inactive = 0;
}
// Create the chart data
var data = {
labels: ['Active Users', 'Expired Users', 'Inactive Users'],

8
update.php
View File

@ -8,6 +8,11 @@
session_start();
include "config.php";
if($db_password != null && ($db_pass == null || empty($db_pass))){
// compability for old version
$db_pass = $db_password;
}
if (empty($update_url)) {
$update_url = 'https://github.com/hotspotbilling/phpnuxbill/archive/refs/heads/master.zip';
}
@ -100,11 +105,10 @@ if (empty($step)) {
}
} else if ($step == 4) {
if (file_exists("system/updates.json")) {
require 'config.php';
$db = new pdo(
"mysql:host=$db_host;dbname=$db_name",
$db_user,
$db_password,
$db_pass,
array(PDO::ATTR_ERRMODE => PDO::ERRMODE_EXCEPTION)
);

2
version.json
View File

@ -1,3 +1,3 @@
{
"version": "2024.7.26"
"version": "2024.7.27"
}