' . $e->getTraceAsString() . ''); $ui->assign("error_title", "PHPNuxBill Crash"); @@ -142,7 +142,7 @@ try { $e->getTraceAsString() ); if (!Admin::getID()) { - $ui->display('user-ui/error.tpl'); die(); + $ui->display('customer/error.tpl'); die(); } $ui->assign("error_message", $e->getMessage() . '
' . $e->getTraceAsString() . ''); $ui->assign("error_title", "PHPNuxBill Crash"); diff --git a/system/controllers/accounts.php b/system/controllers/accounts.php index 544d8a36..d907588f 100644 --- a/system/controllers/accounts.php +++ b/system/controllers/accounts.php @@ -18,7 +18,7 @@ switch ($action) { case 'change-password': run_hook('customer_view_change_password'); #HOOK - $ui->display('user-ui/change-password.tpl'); + $ui->display('customer/change-password.tpl'); break; case 'change-password-post': @@ -67,7 +67,7 @@ switch ($action) { case 'profile': run_hook('customer_view_edit_profile'); #HOOK - $ui->display('user-ui/profile.tpl'); + $ui->display('customer/profile.tpl'); break; case 'edit-profile-post': $fullname = _post('fullname'); @@ -101,7 +101,7 @@ switch ($action) { case 'phone-update': $ui->assign('new_phone', $_SESSION['new_phone']); - $ui->display('user-ui/phone-update.tpl'); + $ui->display('customer/phone-update.tpl'); break; case 'phone-update-otp': @@ -211,7 +211,7 @@ switch ($action) { case 'email-update': $ui->assign('new_email', $_SESSION['new_email']); - $ui->display('user-ui/email-update.tpl'); + $ui->display('customer/email-update.tpl'); break; case 'email-update-otp': $email = trim(_post('email')); diff --git a/system/controllers/forgot.php b/system/controllers/forgot.php index 0caefa38..23d028c2 100644 --- a/system/controllers/forgot.php +++ b/system/controllers/forgot.php @@ -166,4 +166,4 @@ foreach ($fs as $file) { $ui->assign('step', $step); $ui->assign('_title', Lang::T('Forgot Password')); -$ui->display('user-ui/forgot.tpl'); +$ui->display('customer/forgot.tpl'); diff --git a/system/controllers/home.php b/system/controllers/home.php index 9c6ddb87..82d91d9a 100644 --- a/system/controllers/home.php +++ b/system/controllers/home.php @@ -336,4 +336,4 @@ $abills = User::getAttributes("Bill"); $ui->assign('abills', $abills); run_hook('view_customer_dashboard'); #HOOK -$ui->display('user-ui/dashboard.tpl'); +$ui->display('customer/dashboard.tpl'); diff --git a/system/controllers/login.php b/system/controllers/login.php index 94b74f01..3a25e6dc 100644 --- a/system/controllers/login.php +++ b/system/controllers/login.php @@ -292,10 +292,10 @@ switch ($do) { if ($config['disable_registration'] == 'yes') { $ui->assign('_title', Lang::T('Activation')); $ui->assign('code', alphanumeric(_get('code'), "-")); - $ui->display('user-ui/login-noreg.tpl'); + $ui->display('customer/login-noreg.tpl'); } else { $ui->assign('_title', Lang::T('Login')); - $ui->display('user-ui/login.tpl'); + $ui->display('customer/login.tpl'); } break; } diff --git a/system/controllers/mail.php b/system/controllers/mail.php index 6549adac..32c41bbc 100644 --- a/system/controllers/mail.php +++ b/system/controllers/mail.php @@ -29,7 +29,7 @@ switch ($action) { $ui->assign('tipe', 'view'); $ui->assign('_system_menu', 'inbox'); $ui->assign('_title', Lang::T('Inbox')); - $ui->display('user-ui/inbox.tpl'); + $ui->display('customer/inbox.tpl'); break; case 'delete': if($routes['2']){ @@ -57,5 +57,5 @@ switch ($action) { $ui->assign('mails', $mails); $ui->assign('_system_menu', 'inbox'); $ui->assign('_title', Lang::T('Inbox')); - $ui->display('user-ui/inbox.tpl'); + $ui->display('customer/inbox.tpl'); } \ No newline at end of file diff --git a/system/controllers/page.php b/system/controllers/page.php index dcf9663d..13d89ef6 100644 --- a/system/controllers/page.php +++ b/system/controllers/page.php @@ -16,6 +16,6 @@ if(file_exists(__DIR__."/../../pages/".str_replace(".","",$action).".html")){ $ui->assign("PageFile",$action); $ui->assign("pageHeader",$action); run_hook('customer_view_page'); #HOOK - $ui->display('user-ui/pages.tpl'); + $ui->display('customer/pages.tpl'); }else - $ui->display('user-ui/404.tpl'); \ No newline at end of file + $ui->display('customer/404.tpl'); \ No newline at end of file diff --git a/system/controllers/register.php b/system/controllers/register.php index daa0d55e..80bf5e16 100644 --- a/system/controllers/register.php +++ b/system/controllers/register.php @@ -63,7 +63,7 @@ switch ($do) { $ui->assign('notify', 'Wrong Verification code'); $ui->assign('notify_t', 'd'); $ui->assign('_title', Lang::T('Register')); - $ui->display('user-ui/register-otp.tpl'); + $ui->display('customer/register-otp.tpl'); exit(); } else { unlink($otpPath); @@ -98,7 +98,7 @@ switch ($do) { $ui->assign('notify_t', 'd'); $ui->assign('_title', Lang::T('Register')); run_hook('view_otp_register'); #HOOK - $ui->display('user-ui/register-rotp.tpl'); + $ui->display('customer/register-rotp.tpl'); } } else { $ui->assign('username', $username); @@ -109,7 +109,7 @@ switch ($do) { $ui->assign('notify', $msg); $ui->assign('notify_t', 'd'); $ui->assign('_title', Lang::T('Register')); - $ui->display('user-ui/register.tpl'); + $ui->display('customer/register.tpl'); } break; @@ -132,7 +132,7 @@ switch ($do) { $ui->assign('notify', 'Please wait ' . (600 - (time() - filemtime($otpPath))) . ' seconds before sending another SMS'); $ui->assign('notify_t', 'd'); $ui->assign('_title', Lang::T('Register')); - $ui->display('user-ui/register-otp.tpl'); + $ui->display('customer/register-otp.tpl'); } else { $otp = rand(100000, 999999); file_put_contents($otpPath, $otp); @@ -141,12 +141,12 @@ switch ($do) { $ui->assign('notify', 'Registration code has been sent to your phone'); $ui->assign('notify_t', 's'); $ui->assign('_title', Lang::T('Register')); - $ui->display('user-ui/register-otp.tpl'); + $ui->display('customer/register-otp.tpl'); } } else { $ui->assign('_title', Lang::T('Register')); run_hook('view_otp_register'); #HOOK - $ui->display('user-ui/register-rotp.tpl'); + $ui->display('customer/register-rotp.tpl'); } } else { $ui->assign('username', ""); @@ -156,7 +156,7 @@ switch ($do) { $ui->assign('otp', false); $ui->assign('_title', Lang::T('Register')); run_hook('view_register'); #HOOK - $ui->display('user-ui/register.tpl'); + $ui->display('customer/register.tpl'); } break; } diff --git a/system/controllers/voucher.php b/system/controllers/voucher.php index c04795b8..b64d084d 100644 --- a/system/controllers/voucher.php +++ b/system/controllers/voucher.php @@ -17,7 +17,7 @@ switch ($action) { case 'activation': run_hook('view_activate_voucher'); #HOOK $ui->assign('code', alphanumeric(_get('code'), "-_.,")); - $ui->display('user-ui/activation.tpl'); + $ui->display('customer/activation.tpl'); break; case 'activation-post': @@ -46,7 +46,7 @@ switch ($action) { $ui->assign('d', $d); run_hook('customer_view_activation_list'); #HOOK - $ui->display('user-ui/activation-list.tpl'); + $ui->display('customer/activation-list.tpl'); break; case 'invoice': @@ -58,7 +58,7 @@ switch ($action) { } if ($in) { Package::createInvoice($in); - $ui->display('user-ui/invoice-customer.tpl'); + $ui->display('customer/invoice-customer.tpl'); } else { r2(U . 'voucher/list-activated', 'e', Lang::T('Not Found')); } diff --git a/system/vendor/smarty/smarty/libs/sysplugins/smarty_internal_templatebase.php b/system/vendor/smarty/smarty/libs/sysplugins/smarty_internal_templatebase.php index 8d41ebcf..e60b3323 100644 --- a/system/vendor/smarty/smarty/libs/sysplugins/smarty_internal_templatebase.php +++ b/system/vendor/smarty/smarty/libs/sysplugins/smarty_internal_templatebase.php @@ -131,13 +131,7 @@ abstract class Smarty_Internal_TemplateBase extends Smarty_Internal_Data public function display($template = null, $cache_id = null, $compile_id = null, $parent = null) { // display template - if(strpos($template, "user-ui") === false){ - if(strpos($template, "section/user-") === false){ - $template = str_replace("user-",'', $template); - }else{ - $template = str_replace("section/user-",'user-ui/', $template); - } - } + $template = str_replace("section/user-",'customer/', $template); $this->_execute($template, $cache_id, $compile_id, $parent, 1); } diff --git a/ui/ui/user-ui/404.tpl b/ui/ui/customer/404.tpl similarity index 79% rename from ui/ui/user-ui/404.tpl rename to ui/ui/customer/404.tpl index eaf0b977..21a49ccf 100644 --- a/ui/ui/user-ui/404.tpl +++ b/ui/ui/customer/404.tpl @@ -1,4 +1,4 @@ -{include file="user-ui/header-public.tpl"} +{include file="customer/header-public.tpl"}
{Lang::T('Coming Soon! Next Version...')}