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

Enhance registration process with OTP verification

Browse Source 
- Separate username and phone number handling
- Improve Phone Number validation and handling
- Stop changes to the registration form when the wrong password is entered
- Enhance error messages for better user experience
This commit is contained in:
Taukir Ahmed 2024-10-25 14:51:01 +06:00 committed by GitHub
parent e8a800bbd6
commit 01c2808e43
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 38 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

62
system/controllers/register.php
View File

@ -22,12 +22,14 @@ switch ($do) {
$password = _post('password'); $password = _post('password');
$cpassword = _post('cpassword'); $cpassword = _post('cpassword');
$address = _post('address'); $address = _post('address');
// Separate phone number input if OTP is required
if (!empty($config['sms_url']) && $_c['sms_otp_registration'] == 'yes') { if (!empty($config['sms_url']) && $_c['sms_otp_registration'] == 'yes') {
$phonenumber = Lang::phoneFormat($username); $phone_number = alphanumeric(_post('phone_number'), "+_.@-");
$username = $phonenumber; } else {
} else if (strlen($username) < 21) { $phone_number = $username; // When OTP is not required, treat username as phone number
$phonenumber = $username;
} }
$msg = ''; $msg = '';
if (Validator::Length($username, 35, 2) == false) { if (Validator::Length($username, 35, 2) == false) {
$msg .= 'Username should be between 3 to 55 characters' . '<br>'; $msg .= 'Username should be between 3 to 55 characters' . '<br>';
@ -45,10 +47,11 @@ switch ($do) {
$msg .= Lang::T('Passwords does not match') . '<br>'; $msg .= Lang::T('Passwords does not match') . '<br>';
} }
// OTP verification if OTP is enabled
if (!empty($config['sms_url']) && $_c['sms_otp_registration'] == 'yes') { if (!empty($config['sms_url']) && $_c['sms_otp_registration'] == 'yes') {
$otpPath .= sha1($username . $db_pass) . ".txt"; $otpPath .= sha1($phone_number . $db_pass) . ".txt";
run_hook('validate_otp'); #HOOK run_hook('validate_otp'); #HOOK
//expired 10 minutes // Expire after 10 minutes
if (file_exists($otpPath) && time() - filemtime($otpPath) > 1200) { if (file_exists($otpPath) && time() - filemtime($otpPath) > 1200) {
unlink($otpPath); unlink($otpPath);
r2(U . 'register', 's', 'Verification code expired'); r2(U . 'register', 's', 'Verification code expired');
@ -59,7 +62,7 @@ switch ($do) {
$ui->assign('fullname', $fullname); $ui->assign('fullname', $fullname);
$ui->assign('address', $address); $ui->assign('address', $address);
$ui->assign('email', $email); $ui->assign('email', $email);
$ui->assign('phonenumber', $phonenumber); $ui->assign('phone_number', $phone_number);
$ui->assign('notify', 'Wrong Verification code'); $ui->assign('notify', 'Wrong Verification code');
$ui->assign('notify_t', 'd'); $ui->assign('notify_t', 'd');
$ui->assign('_title', Lang::T('Register')); $ui->assign('_title', Lang::T('Register'));
@ -72,10 +75,13 @@ switch ($do) {
r2(U . 'register', 's', 'No Verification code'); r2(U . 'register', 's', 'No Verification code');
} }
} }
// Check if username already exists
$d = ORM::for_table('tbl_customers')->where('username', $username)->find_one(); $d = ORM::for_table('tbl_customers')->where('username', $username)->find_one();
if ($d) { if ($d) {
$msg .= Lang::T('Account already axist') . '<br>'; $msg .= Lang::T('Account already exists') . '<br>';
} }
if ($msg == '') { if ($msg == '') {
run_hook('register_user'); #HOOK run_hook('register_user'); #HOOK
$d = ORM::for_table('tbl_customers')->create(); $d = ORM::for_table('tbl_customers')->create();
@ -84,7 +90,7 @@ switch ($do) {
$d->fullname = $fullname; $d->fullname = $fullname;
$d->address = $address; $d->address = $address;
$d->email = $email; $d->email = $email;
$d->phonenumber = $phonenumber; $d->phonenumber = $phone_number;
if ($d->save()) { if ($d->save()) {
$user = $d->id(); $user = $d->id();
r2(U . 'login', 's', Lang::T('Register Success! You can login now')); r2(U . 'login', 's', Lang::T('Register Success! You can login now'));
@ -93,7 +99,7 @@ switch ($do) {
$ui->assign('fullname', $fullname); $ui->assign('fullname', $fullname);
$ui->assign('address', $address); $ui->assign('address', $address);
$ui->assign('email', $email); $ui->assign('email', $email);
$ui->assign('phonenumber', $phonenumber); $ui->assign('phone_number', $phone_number);
$ui->assign('notify', 'Failed to register'); $ui->assign('notify', 'Failed to register');
$ui->assign('notify_t', 'd'); $ui->assign('notify_t', 'd');
$ui->assign('_title', Lang::T('Register')); $ui->assign('_title', Lang::T('Register'));
@ -105,30 +111,36 @@ switch ($do) {
$ui->assign('fullname', $fullname); $ui->assign('fullname', $fullname);
$ui->assign('address', $address); $ui->assign('address', $address);
$ui->assign('email', $email); $ui->assign('email', $email);
$ui->assign('phonenumber', $phonenumber); $ui->assign('phone_number', $phone_number);
$ui->assign('notify', $msg); $ui->assign('notify', $msg);
$ui->assign('notify_t', 'd'); $ui->assign('notify_t', 'd');
$ui->assign('_title', Lang::T('Register')); $ui->assign('_title', Lang::T('Register'));
$ui->display('customer/register.tpl'); // Check if OTP is enabled
if (!empty($config['sms_url']) && $_c['sms_otp_registration'] == 'yes') {
// Display register-otp.tpl if OTP is enabled
$ui->display('customer/register-otp.tpl');
} else {
// Display register.tpl if OTP is not enabled
$ui->display('customer/register.tpl');
}
} }
break; break;
default: default:
if (!empty($config['sms_url']) && $_c['sms_otp_registration'] == 'yes') { if (!empty($config['sms_url']) && $_c['sms_otp_registration'] == 'yes') {
$username = _post('username'); $phone_number = _post('phone_number');
if (!empty($username)) { if (!empty($phone_number)) {
$d = ORM::for_table('tbl_customers')->where('username', $username)->find_one(); $d = ORM::for_table('tbl_customers')->where('username', $phone_number)->find_one();
if ($d) { if ($d) {
r2(U . 'register', 's', Lang::T('Account already axist')); r2(U . 'register', 's', Lang::T('Account already exists'));
} }
if (!file_exists($otpPath)) { if (!file_exists($otpPath)) {
mkdir($otpPath); mkdir($otpPath);
touch($otpPath . 'index.html'); touch($otpPath . 'index.html');
} }
$otpPath .= sha1($username . $db_pass) . ".txt"; $otpPath .= sha1($phone_number . $db_pass) . ".txt";
//expired 10 minutes
if (file_exists($otpPath) && time() - filemtime($otpPath) < 600) { if (file_exists($otpPath) && time() - filemtime($otpPath) < 600) {
$ui->assign('username', $username); $ui->assign('phone_number', $phone_number);
$ui->assign('notify', 'Please wait ' . (600 - (time() - filemtime($otpPath))) . ' seconds before sending another SMS'); $ui->assign('notify', 'Please wait ' . (600 - (time() - filemtime($otpPath))) . ' seconds before sending another SMS');
$ui->assign('notify_t', 'd'); $ui->assign('notify_t', 'd');
$ui->assign('_title', Lang::T('Register')); $ui->assign('_title', Lang::T('Register'));
@ -137,14 +149,14 @@ switch ($do) {
$otp = rand(100000, 999999); $otp = rand(100000, 999999);
file_put_contents($otpPath, $otp); file_put_contents($otpPath, $otp);
if($config['phone_otp_type'] == 'whatsapp'){ if($config['phone_otp_type'] == 'whatsapp'){
Message::sendWhatsapp($username, $config['CompanyName'] . "\n\n".Lang::T("Registration code")."\n$otp"); Message::sendWhatsapp($phone_number, $config['CompanyName'] . "\n\n".Lang::T("Registration code")."\n$otp");
}else if($config['phone_otp_type'] == 'both'){ }else if($config['phone_otp_type'] == 'both'){
Message::sendWhatsapp($username, $config['CompanyName'] . "\n\n".Lang::T("Registration code")."\n$otp"); Message::sendWhatsapp($phone_number, $config['CompanyName'] . "\n\n".Lang::T("Registration code")."\n$otp");
Message::sendSMS($username, $config['CompanyName'] . "\n\n".Lang::T("Registration code")."\n$otp"); Message::sendSMS($phone_number, $config['CompanyName'] . "\n\n".Lang::T("Registration code")."\n$otp");
}else{ }else{
Message::sendSMS($username, $config['CompanyName'] . "\n\n".Lang::T("Registration code")."\n$otp"); Message::sendSMS($phone_number, $config['CompanyName'] . "\n\n".Lang::T("Registration code")."\n$otp");
} }
$ui->assign('username', $username); $ui->assign('phone_number', $phone_number);
$ui->assign('notify', 'Registration code has been sent to your phone'); $ui->assign('notify', 'Registration code has been sent to your phone');
$ui->assign('notify_t', 's'); $ui->assign('notify_t', 's');
$ui->assign('_title', Lang::T('Register')); $ui->assign('_title', Lang::T('Register'));
@ -167,3 +179,5 @@ switch ($do) {
} }
break; break;
} }
?>