diff --git a/system/controllers/accounts.php b/system/controllers/accounts.php index 1c40cef8..8e4414be 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-change-password.tpl'); + $ui->display('user-ui/change-password.tpl'); break; case 'change-password-post': @@ -71,7 +71,7 @@ switch ($action) { if ($d) { run_hook('customer_view_edit_profile'); #HOOK $ui->assign('d', $d); - $ui->display('user-profile.tpl'); + $ui->display('user-ui/profile.tpl'); } else { r2(U . 'home', 'e', Lang::T('Account Not Found')); } @@ -119,7 +119,7 @@ switch ($action) { //run_hook('customer_view_edit_profile'); #HOOK $ui->assign('d', $d); $ui->assign('new_phone', $_SESSION['new_phone']); - $ui->display('user-phone-update.tpl'); + $ui->display('user-ui/phone-update.tpl'); } else { r2(U . 'home', 'e', Lang::T('Account Not Found')); } diff --git a/system/controllers/home.php b/system/controllers/home.php index 3e99d443..7c51018a 100644 --- a/system/controllers/home.php +++ b/system/controllers/home.php @@ -325,4 +325,4 @@ $abills = User::getAttributes("Bill"); $ui->assign('abills', $abills); run_hook('view_customer_dashboard'); #HOOK -$ui->display('user-dashboard.tpl'); +$ui->display('user-ui/dashboard.tpl'); diff --git a/system/controllers/login.php b/system/controllers/login.php index e44da6d1..75bf4a35 100644 --- a/system/controllers/login.php +++ b/system/controllers/login.php @@ -291,9 +291,9 @@ switch ($do) { run_hook('customer_view_login'); #HOOK if ($config['disable_registration'] == 'yes') { $ui->assign('code', alphanumeric(_get('code'), "-")); - $ui->display('user-login-noreg.tpl'); + $ui->display('user-ui/login-noreg.tpl'); } else { - $ui->display('user-login.tpl'); + $ui->display('user-ui/login.tpl'); } break; } diff --git a/system/controllers/mail.php b/system/controllers/mail.php index c54318fd..6549adac 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-inbox.tpl'); + $ui->display('user-ui/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-inbox.tpl'); + $ui->display('user-ui/inbox.tpl'); } \ No newline at end of file diff --git a/system/controllers/order.php b/system/controllers/order.php index 7848d2a8..ac4151e2 100644 --- a/system/controllers/order.php +++ b/system/controllers/order.php @@ -15,7 +15,7 @@ switch ($action) { $ui->assign('_system_menu', 'voucher'); $ui->assign('_title', Lang::T('Order Voucher')); run_hook('customer_view_order'); #HOOK - $ui->display('user-order.tpl'); + $ui->display('user-ui/order.tpl'); break; case 'history': $ui->assign('_system_menu', 'history'); @@ -24,7 +24,7 @@ switch ($action) { $ui->assign('d', $d); $ui->assign('_title', Lang::T('Order History')); run_hook('customer_view_order_history'); #HOOK - $ui->display('user-orderHistory.tpl'); + $ui->display('user-ui/orderHistory.tpl'); break; case 'balance': if (strpos($user['email'], '@') === false) { @@ -34,7 +34,7 @@ switch ($action) { $ui->assign('_system_menu', 'balance'); $plans_balance = ORM::for_table('tbl_plans')->where('enabled', '1')->where('type', 'Balance')->where('prepaid', 'yes')->find_many(); $ui->assign('plans_balance', $plans_balance); - $ui->display('user-orderBalance.tpl'); + $ui->display('user-ui/orderBalance.tpl'); break; case 'package': if (strpos($user['email'], '@') === false) { @@ -73,7 +73,7 @@ switch ($action) { $ui->assign('plans_pppoe', $plans_pppoe); $ui->assign('plans_hotspot', $plans_hotspot); run_hook('customer_view_order_plan'); #HOOK - $ui->display('user-orderPlan.tpl'); + $ui->display('user-ui/orderPlan.tpl'); break; case 'unpaid': $d = ORM::for_table('tbl_payment_gateway') @@ -138,7 +138,7 @@ switch ($action) { $ui->assign('plan', $plan); $ui->assign('bandw', $bandw); $ui->assign('_title', 'TRX #' . $trxid); - $ui->display('user-orderView.tpl'); + $ui->display('user-ui/orderView.tpl'); break; case 'pay': if ($config['enable_balance'] != 'yes') { @@ -328,7 +328,7 @@ switch ($action) { $ui->assign('router', $router_name); $ui->assign('plan', $plan); $ui->assign('tax', $tax); - $ui->display('user-sendPlan.tpl'); + $ui->display('user-ui/sendPlan.tpl'); break; case 'gateway': $ui->assign('_title', Lang::T('Select Payment Gateway')); @@ -366,7 +366,7 @@ switch ($action) { $ui->assign('add_cost', $add_cost); $ui->assign('bills', $bills); $ui->assign('plan', $plan); - $ui->display('user-selectGateway.tpl'); + $ui->display('user-ui/selectGateway.tpl'); break; } else { if (empty($pgs[0])) { diff --git a/system/controllers/page.php b/system/controllers/page.php index d1bd9ad9..dcf9663d 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-pages.tpl'); + $ui->display('user-ui/pages.tpl'); }else - $ui->display('404.tpl'); \ No newline at end of file + $ui->display('user-ui/404.tpl'); \ No newline at end of file diff --git a/system/controllers/register.php b/system/controllers/register.php index 25e41480..29985801 100644 --- a/system/controllers/register.php +++ b/system/controllers/register.php @@ -62,7 +62,7 @@ switch ($do) { $ui->assign('phonenumber', $phonenumber); $ui->assign('notify', 'Wrong Verification code'); $ui->assign('notify_t', 'd'); - $ui->display('register-otp.tpl'); + $ui->display('user-ui/register-otp.tpl'); exit(); } else { unlink($otpPath); @@ -96,7 +96,7 @@ switch ($do) { $ui->assign('notify', 'Failed to register'); $ui->assign('notify_t', 'd'); run_hook('view_otp_register'); #HOOK - $ui->display('register-rotp.tpl'); + $ui->display('user-ui/register-rotp.tpl'); } } else { $ui->assign('username', $username); @@ -106,7 +106,7 @@ switch ($do) { $ui->assign('phonenumber', $phonenumber); $ui->assign('notify', $msg); $ui->assign('notify_t', 'd'); - $ui->display('register.tpl'); + $ui->display('user-ui/register.tpl'); } break; @@ -128,7 +128,7 @@ switch ($do) { $ui->assign('username', $username); $ui->assign('notify', 'Please wait ' . (1200 - (time() - filemtime($otpPath))) . ' seconds before sending another SMS'); $ui->assign('notify_t', 'd'); - $ui->display('register-otp.tpl'); + $ui->display('user-ui/register-otp.tpl'); } else { $otp = rand(100000, 999999); file_put_contents($otpPath, $otp); @@ -136,11 +136,11 @@ switch ($do) { $ui->assign('username', $username); $ui->assign('notify', 'Verification code has been sent to your phone'); $ui->assign('notify_t', 's'); - $ui->display('register-otp.tpl'); + $ui->display('user-ui/register-otp.tpl'); } } else { run_hook('view_otp_register'); #HOOK - $ui->display('register-rotp.tpl'); + $ui->display('user-ui/register-rotp.tpl'); } } else { $ui->assign('username', ""); @@ -149,7 +149,7 @@ switch ($do) { $ui->assign('email', ""); $ui->assign('otp', false); run_hook('view_register'); #HOOK - $ui->display('register.tpl'); + $ui->display('user-ui/register.tpl'); } break; } diff --git a/system/controllers/voucher.php b/system/controllers/voucher.php index d4b1ddc7..c04795b8 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-activation.tpl'); + $ui->display('user-ui/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-activation-list.tpl'); + $ui->display('user-ui/activation-list.tpl'); break; case 'invoice': @@ -58,7 +58,7 @@ switch ($action) { } if ($in) { Package::createInvoice($in); - $ui->display('invoice-customer.tpl'); + $ui->display('user-ui/invoice-customer.tpl'); } else { r2(U . 'voucher/list-activated', 'e', Lang::T('Not Found')); } diff --git a/ui/ui/404.tpl b/ui/ui/user-ui/404.tpl similarity index 77% rename from ui/ui/404.tpl rename to ui/ui/user-ui/404.tpl index 0e8c674e..4d975e4c 100644 --- a/ui/ui/404.tpl +++ b/ui/ui/user-ui/404.tpl @@ -1,4 +1,4 @@ -{include file="sections/user-header.tpl"} +{include file="user-ui/header.tpl"}
@@ -7,4 +7,4 @@
-{include file="sections/user-footer.tpl"} +{include file="user-ui/footer.tpl"} diff --git a/ui/ui/user-activation-list.tpl b/ui/ui/user-ui/activation-list.tpl similarity index 96% rename from ui/ui/user-activation-list.tpl rename to ui/ui/user-ui/activation-list.tpl index 11513f14..5a0fe1ca 100644 --- a/ui/ui/user-activation-list.tpl +++ b/ui/ui/user-ui/activation-list.tpl @@ -1,4 +1,4 @@ -{include file="sections/user-header.tpl"} +{include file="user-ui/header.tpl"}
@@ -41,4 +41,4 @@
-{include file="sections/user-footer.tpl"} \ No newline at end of file +{include file="user-ui/footer.tpl"} \ No newline at end of file diff --git a/ui/ui/user-activation.tpl b/ui/ui/user-ui/activation.tpl similarity index 95% rename from ui/ui/user-activation.tpl rename to ui/ui/user-ui/activation.tpl index 7f36045b..82ee6831 100644 --- a/ui/ui/user-activation.tpl +++ b/ui/ui/user-ui/activation.tpl @@ -1,4 +1,4 @@ -{include file="sections/user-header.tpl"} +{include file="user-ui/user-header.tpl"}
@@ -38,4 +38,4 @@
-{include file="sections/user-footer.tpl"} \ No newline at end of file +{include file="user-ui/footer.tpl"} \ No newline at end of file diff --git a/ui/ui/user-change-password.tpl b/ui/ui/user-ui/change-password.tpl similarity index 95% rename from ui/ui/user-change-password.tpl rename to ui/ui/user-ui/change-password.tpl index 6094354e..60a252cc 100644 --- a/ui/ui/user-change-password.tpl +++ b/ui/ui/user-ui/change-password.tpl @@ -1,4 +1,4 @@ -{include file="sections/user-header.tpl"} +{include file="user-ui/header.tpl"}
@@ -40,4 +40,4 @@
-{include file="sections/user-footer.tpl"} \ No newline at end of file +{include file="user-ui/footer.tpl"} \ No newline at end of file diff --git a/ui/ui/user-dashboard.tpl b/ui/ui/user-ui/dashboard.tpl similarity index 99% rename from ui/ui/user-dashboard.tpl rename to ui/ui/user-ui/dashboard.tpl index 1fdc44c8..82d5e9f1 100644 --- a/ui/ui/user-dashboard.tpl +++ b/ui/ui/user-ui/dashboard.tpl @@ -1,4 +1,4 @@ -{include file="sections/user-header.tpl"} +{include file="user-ui/header.tpl"}
@@ -398,4 +398,4 @@ document.write(''); {/if} -{include file="sections/user-footer.tpl"} \ No newline at end of file +{include file="user-ui/footer.tpl"} \ No newline at end of file diff --git a/ui/ui/sections/user-footer.tpl b/ui/ui/user-ui/footer.tpl similarity index 100% rename from ui/ui/sections/user-footer.tpl rename to ui/ui/user-ui/footer.tpl diff --git a/ui/ui/sections/user-header.tpl b/ui/ui/user-ui/header.tpl similarity index 100% rename from ui/ui/sections/user-header.tpl rename to ui/ui/user-ui/header.tpl diff --git a/ui/ui/user-inbox.tpl b/ui/ui/user-ui/inbox.tpl similarity index 98% rename from ui/ui/user-inbox.tpl rename to ui/ui/user-ui/inbox.tpl index a9fd9e95..89210942 100644 --- a/ui/ui/user-inbox.tpl +++ b/ui/ui/user-ui/inbox.tpl @@ -1,4 +1,4 @@ -{include file="sections/user-header.tpl"} +{include file="user-ui/header.tpl"} {if $tipe == 'view'}
@@ -110,4 +110,4 @@ {/if} -{include file="sections/user-footer.tpl"} \ No newline at end of file +{include file="user-ui/footer.tpl"} \ No newline at end of file diff --git a/ui/ui/user-ui/index.html b/ui/ui/user-ui/index.html new file mode 100644 index 00000000..97579708 --- /dev/null +++ b/ui/ui/user-ui/index.html @@ -0,0 +1,8 @@ + + + 403 Forbidden + + +

Directory access is forbidden.

+ + \ No newline at end of file diff --git a/ui/ui/invoice-customer.tpl b/ui/ui/user-ui/invoice-customer.tpl similarity index 91% rename from ui/ui/invoice-customer.tpl rename to ui/ui/user-ui/invoice-customer.tpl index 8b369d06..171f4900 100644 --- a/ui/ui/invoice-customer.tpl +++ b/ui/ui/user-ui/invoice-customer.tpl @@ -1,4 +1,4 @@ -{include file="sections/user-header.tpl"} +{include file="user-ui/header.tpl"}
@@ -18,4 +18,4 @@
-{include file="sections/user-footer.tpl"} \ No newline at end of file +{include file="user-ui/footer.tpl"} \ No newline at end of file diff --git a/ui/ui/user-login-noreg.tpl b/ui/ui/user-ui/login-noreg.tpl similarity index 100% rename from ui/ui/user-login-noreg.tpl rename to ui/ui/user-ui/login-noreg.tpl diff --git a/ui/ui/user-login.tpl b/ui/ui/user-ui/login.tpl similarity index 100% rename from ui/ui/user-login.tpl rename to ui/ui/user-ui/login.tpl diff --git a/ui/ui/user-orderBalance.tpl b/ui/ui/user-ui/orderBalance.tpl similarity index 95% rename from ui/ui/user-orderBalance.tpl rename to ui/ui/user-ui/orderBalance.tpl index 91b97aa7..d7f5edc9 100644 --- a/ui/ui/user-orderBalance.tpl +++ b/ui/ui/user-ui/orderBalance.tpl @@ -1,4 +1,4 @@ -{include file="sections/user-header.tpl"} +{include file="user-ui/header.tpl"}
@@ -34,4 +34,4 @@
-{include file="sections/user-footer.tpl"} \ No newline at end of file +{include file="user-ui/footer.tpl"} \ No newline at end of file diff --git a/ui/ui/user-orderHistory.tpl b/ui/ui/user-ui/orderHistory.tpl similarity index 97% rename from ui/ui/user-orderHistory.tpl rename to ui/ui/user-ui/orderHistory.tpl index 03aa2379..3f60a74c 100644 --- a/ui/ui/user-orderHistory.tpl +++ b/ui/ui/user-ui/orderHistory.tpl @@ -1,4 +1,4 @@ -{include file="sections/user-header.tpl"} +{include file="user-ui/header.tpl"}
@@ -53,4 +53,4 @@
-{include file="sections/user-footer.tpl"} \ No newline at end of file +{include file="user-ui/footer.tpl"} \ No newline at end of file diff --git a/ui/ui/user-orderPlan.tpl b/ui/ui/user-ui/orderPlan.tpl similarity index 99% rename from ui/ui/user-orderPlan.tpl rename to ui/ui/user-ui/orderPlan.tpl index 191c945c..74dda812 100644 --- a/ui/ui/user-orderPlan.tpl +++ b/ui/ui/user-ui/orderPlan.tpl @@ -1,4 +1,4 @@ -{include file="sections/user-header.tpl"} +{include file="user-ui/header.tpl"}
@@ -421,4 +421,4 @@ {/foreach}
-{include file="sections/user-footer.tpl"} \ No newline at end of file +{include file="user-ui/footer.tpl"} \ No newline at end of file diff --git a/ui/ui/user-orderView.tpl b/ui/ui/user-ui/orderView.tpl similarity index 99% rename from ui/ui/user-orderView.tpl rename to ui/ui/user-ui/orderView.tpl index f1de1117..6f62ad76 100644 --- a/ui/ui/user-orderView.tpl +++ b/ui/ui/user-ui/orderView.tpl @@ -1,4 +1,4 @@ -{include file="sections/user-header.tpl"} +{include file="user-ui/header.tpl"}
@@ -150,4 +150,4 @@
-{include file="sections/user-footer.tpl"} \ No newline at end of file +{include file="user-ui/footer.tpl"} \ No newline at end of file diff --git a/ui/ui/user-pages.tpl b/ui/ui/user-ui/pages.tpl similarity index 80% rename from ui/ui/user-pages.tpl rename to ui/ui/user-ui/pages.tpl index 7d6bb8a9..93e79d55 100644 --- a/ui/ui/user-pages.tpl +++ b/ui/ui/user-ui/pages.tpl @@ -1,4 +1,4 @@ -{include file="sections/user-header.tpl"} +{include file="user-ui/header.tpl"}
@@ -12,4 +12,4 @@
-{include file="sections/user-footer.tpl"} +{include file="user-ui/footer.tpl"} diff --git a/ui/ui/user-phone-update.tpl b/ui/ui/user-ui/phone-update.tpl similarity index 97% rename from ui/ui/user-phone-update.tpl rename to ui/ui/user-ui/phone-update.tpl index 1553842c..2f69a782 100644 --- a/ui/ui/user-phone-update.tpl +++ b/ui/ui/user-ui/phone-update.tpl @@ -1,4 +1,4 @@ -{include file="sections/user-header.tpl"} +{include file="user-ui/header.tpl"} @@ -77,4 +77,4 @@ -{include file="sections/user-footer.tpl"} \ No newline at end of file +{include file="user-ui/footer.tpl"} \ No newline at end of file diff --git a/ui/ui/user-profile.tpl b/ui/ui/user-ui/profile.tpl similarity index 98% rename from ui/ui/user-profile.tpl rename to ui/ui/user-ui/profile.tpl index 78c1477d..cede2f77 100644 --- a/ui/ui/user-profile.tpl +++ b/ui/ui/user-ui/profile.tpl @@ -1,4 +1,4 @@ -{include file="sections/user-header.tpl"} +{include file="user-ui/header.tpl"}
@@ -84,4 +84,4 @@
-{include file="sections/user-footer.tpl"} \ No newline at end of file +{include file="user-ui/footer.tpl"} \ No newline at end of file diff --git a/ui/ui/register-otp.tpl b/ui/ui/user-ui/register-otp.tpl similarity index 100% rename from ui/ui/register-otp.tpl rename to ui/ui/user-ui/register-otp.tpl diff --git a/ui/ui/register-rotp.tpl b/ui/ui/user-ui/register-rotp.tpl similarity index 100% rename from ui/ui/register-rotp.tpl rename to ui/ui/user-ui/register-rotp.tpl diff --git a/ui/ui/register.tpl b/ui/ui/user-ui/register.tpl similarity index 100% rename from ui/ui/register.tpl rename to ui/ui/user-ui/register.tpl diff --git a/ui/ui/user-selectGateway.tpl b/ui/ui/user-ui/selectGateway.tpl similarity index 98% rename from ui/ui/user-selectGateway.tpl rename to ui/ui/user-ui/selectGateway.tpl index 6fd37475..11816a41 100644 --- a/ui/ui/user-selectGateway.tpl +++ b/ui/ui/user-ui/selectGateway.tpl @@ -1,4 +1,4 @@ -{include file="sections/user-header.tpl"} +{include file="user-ui/header.tpl"}
@@ -113,4 +113,4 @@
-{include file="sections/user-footer.tpl"} \ No newline at end of file +{include file="user-ui/footer.tpl"} \ No newline at end of file diff --git a/ui/ui/user-sendPlan.tpl b/ui/ui/user-ui/sendPlan.tpl similarity index 97% rename from ui/ui/user-sendPlan.tpl rename to ui/ui/user-ui/sendPlan.tpl index fb3ac4e3..c756a0f3 100644 --- a/ui/ui/user-sendPlan.tpl +++ b/ui/ui/user-ui/sendPlan.tpl @@ -1,4 +1,4 @@ -{include file="sections/user-header.tpl"} +{include file="user-ui/header.tpl"}
@@ -64,4 +64,4 @@
-{include file="sections/user-footer.tpl"} \ No newline at end of file +{include file="suser-ui/footer.tpl"} \ No newline at end of file