diff --git a/system/controllers/register.php b/system/controllers/register.php index 9b55439a..c1b3651e 100644 --- a/system/controllers/register.php +++ b/system/controllers/register.php @@ -59,11 +59,8 @@ switch ($do) { $ui->assign('address', $address); $ui->assign('email', $email); $ui->assign('phonenumber', $phonenumber); - $ui->assign('notify', '<div class="alert alert-success"> - <button type="button" class="close" data-dismiss="alert"> - <span aria-hidden="true">×</span> - </button> - <div>Verification code is Wrong</div></div>'); + $ui->assign('notify', 'Wrong Verification code'); + $ui->assign('notify_t', 'd'); $ui->display('register-otp.tpl'); exit(); }else{ @@ -95,11 +92,8 @@ switch ($do) { $ui->assign('address', $address); $ui->assign('email', $email); $ui->assign('phonenumber', $phonenumber); - $ui->assign('notify', '<div class="alert alert-danger"> - <button type="button" class="close" data-dismiss="alert"> - <span aria-hidden="true">×</span> - </button> - <div>Failed to register</div></div>'); + $ui->assign('notify', 'Failed to register'); + $ui->assign('notify_t', 'd'); run_hook('view_otp_register'); #HOOK $ui->display('register-rotp.tpl'); } @@ -109,11 +103,8 @@ switch ($do) { $ui->assign('address', $address); $ui->assign('email', $email); $ui->assign('phonenumber', $phonenumber); - $ui->assign('notify', '<div class="alert alert-danger"> - <button type="button" class="close" data-dismiss="alert"> - <span aria-hidden="true">×</span> - </button> - <div>' . $msg . '</div></div>'); + $ui->assign('notify', $msg); + $ui->assign('notify_t', 'd'); $ui->display('register.tpl'); } break; @@ -134,22 +125,16 @@ switch ($do) { //expired 10 minutes if(file_exists($otpPath) && time()-filemtime($otpPath)<1200){ $ui->assign('username', $username); - $ui->assign('notify', '<div class="alert alert-success"> - <button type="button" class="close" data-dismiss="alert"> - <span aria-hidden="true">×</span> - </button> - <div>Please wait '.(1200-(time()-filemtime($otpPath))).' seconds before sending another SMS</div></div>'); + $ui->assign('notify', 'Please wait '.(1200-(time()-filemtime($otpPath))).' seconds before sending another SMS'); + $ui->assign('notify_t', 'd'); $ui->display('register-otp.tpl'); }else{ $otp = rand(100000,999999); file_put_contents($otpPath, $otp); Message::sendSMS($username,$config['CompanyName']."\nYour Verification code are: $otp"); $ui->assign('username', $username); - $ui->assign('notify', '<div class="alert alert-success"> - <button type="button" class="close" data-dismiss="alert"> - <span aria-hidden="true">×</span> - </button> - <div>Verification code has been sent to your phone</div></div>'); + $ui->assign('notify', 'Verification code has been sent to your phone'); + $ui->assign('notify_t', 's'); $ui->display('register-otp.tpl'); } }else{ diff --git a/ui/ui/register-otp.tpl b/ui/ui/register-otp.tpl index 4a0d167f..b6b25aad 100644 --- a/ui/ui/register-otp.tpl +++ b/ui/ui/register-otp.tpl @@ -22,10 +22,11 @@ <hr> </div> {if isset($notify)} - <div class="row"> - <div class="col-md-6 col-md-offset-3"> - {$notify} - </div> + <div class="alert alert-{if $notify_t == 's'}success{else}danger{/if}"> + <button type="button" class="close" data-dismiss="alert"> + <span aria-hidden="true">×</span> + </button> + <div>{$notify}</div> </div> {/if} <div class="row"> diff --git a/ui/ui/register-rotp.tpl b/ui/ui/register-rotp.tpl index dbb5646a..7ea3f751 100644 --- a/ui/ui/register-rotp.tpl +++ b/ui/ui/register-rotp.tpl @@ -34,10 +34,11 @@ <hr> </div> {if isset($notify)} - <div class="row"> - <div class="col-md-6 col-md-offset-3"> - {$notify} - </div> + <div class="alert alert-{if $notify_t == 's'}success{else}danger{/if}"> + <button type="button" class="close" data-dismiss="alert"> + <span aria-hidden="true">×</span> + </button> + <div>{$notify}</div> </div> {/if} <div class="row"> diff --git a/ui/ui/register.tpl b/ui/ui/register.tpl index 09b02474..e7b23c93 100644 --- a/ui/ui/register.tpl +++ b/ui/ui/register.tpl @@ -22,10 +22,11 @@ <hr> </div> {if isset($notify)} - <div class="row"> - <div class="col-md-6 col-md-offset-3"> - {$notify} - </div> + <div class="alert alert-{if $notify_t == 's'}success{else}danger{/if}"> + <button type="button" class="close" data-dismiss="alert"> + <span aria-hidden="true">×</span> + </button> + <div>{$notify}</div> </div> {/if} <div class="row"> diff --git a/ui/ui/user-login.tpl b/ui/ui/user-login.tpl index 0d09fb6d..dbbaa827 100644 --- a/ui/ui/user-login.tpl +++ b/ui/ui/user-login.tpl @@ -21,10 +21,11 @@ <hr> </div> {if isset($notify)} - <div class="row"> - <div class="col-sm-6 col-sm-offset-3"> - {$notify} - </div> + <div class="alert alert-{if $notify_t == 's'}success{else}danger{/if}"> + <button type="button" class="close" data-dismiss="alert"> + <span aria-hidden="true">×</span> + </button> + <div>{$notify}</div> </div> {/if} <div class="row">