mirror of
https://github.com/hotspotbilling/phpnuxbill.git
synced 2025-08-03 09:45:03 +02:00
Merge branch 'master' of https://github.com/Focuslinkstech/phpnuxbill
This commit is contained in:
commit
0bcac10eec
16 changed files with 65 additions and 41 deletions
|
@ -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)) {
|
||||
|
|
|
@ -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)) {
|
||||
|
|
|
@ -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);
|
||||
|
|
|
@ -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()) {
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue