From 99f9f73a701218ea0d937d7d59cc5a238e524764 Mon Sep 17 00:00:00 2001 From: Ibnu Maksum Date: Thu, 8 Sep 2022 14:00:46 +0700 Subject: [PATCH] dont show disabled plan and routers --- system/boot.php | 1 + system/controllers/autoload.php | 4 ++-- system/controllers/order.php | 4 ++-- system/controllers/prepaid.php | 20 ++++++++++---------- ui/ui/app-settings.tpl | 13 ++++++++++--- 5 files changed, 25 insertions(+), 17 deletions(-) diff --git a/system/boot.php b/system/boot.php index 334897a6..f02cb946 100644 --- a/system/boot.php +++ b/system/boot.php @@ -87,6 +87,7 @@ $ui->setCompileDir('ui/compiled/'); $ui->setConfigDir('ui/conf/'); $ui->setCacheDir('ui/cache/'); $ui->assign('app_url', APP_URL); +$ui->assign('_domain', str_replace('www.', '', parse_url(APP_URL,PHP_URL_HOST))); define('U', APP_URL . '/index.php?_route='); $ui->assign('_url', APP_URL . '/index.php?_route='); $ui->assign('_theme', $_theme); diff --git a/system/controllers/autoload.php b/system/controllers/autoload.php index a452c3bb..b58efc05 100644 --- a/system/controllers/autoload.php +++ b/system/controllers/autoload.php @@ -20,7 +20,7 @@ switch ($action) { break; case 'server': - $d = ORM::for_table('tbl_routers')->find_many(); + $d = ORM::for_table('tbl_routers')->where('enabled', '1')->find_many(); $ui->assign('d',$d); $ui->display('autoload-server.tpl'); @@ -29,7 +29,7 @@ switch ($action) { case 'plan': $server = _post('server'); $jenis = _post('jenis'); - $d = ORM::for_table('tbl_plans')->where('routers', $server)->where('type', $jenis)->find_many(); + $d = ORM::for_table('tbl_plans')->where('routers', $server)->where('type', $jenis)->where('enabled', '1')->find_many(); $ui->assign('d',$d); $ui->display('autoload.tpl'); diff --git a/system/controllers/order.php b/system/controllers/order.php index 00f2b157..ae6cd587 100644 --- a/system/controllers/order.php +++ b/system/controllers/order.php @@ -20,7 +20,7 @@ switch ($action) { break; case 'ppoe': $ui->assign('_title', 'Order PPOE Internet- '. $config['CompanyName']);$routers = ORM::for_table('tbl_routers')->find_many(); - $plans = ORM::for_table('tbl_plans')->where('type', 'PPPOE')->find_many(); + $plans = ORM::for_table('tbl_plans')->where('type', 'PPPOE')->where('enabled', '1')->find_many(); $ui->assign('routers',$routers); $ui->assign('plans', $plans); $ui->display('user-orderPPOE.tpl'); @@ -28,7 +28,7 @@ switch ($action) { case 'hotspot': $ui->assign('_title', 'Order Hotspot Internet- '. $config['CompanyName']); $routers = ORM::for_table('tbl_routers')->find_many(); - $plans = ORM::for_table('tbl_plans')->where('type', 'Hotspot')->find_many(); + $plans = ORM::for_table('tbl_plans')->where('type', 'Hotspot')->where('enabled', '1')->find_many(); $ui->assign('routers',$routers); $ui->assign('plans', $plans); $ui->display('user-orderHotspot.tpl'); diff --git a/system/controllers/prepaid.php b/system/controllers/prepaid.php index 4b93bd6d..c2cdd00c 100644 --- a/system/controllers/prepaid.php +++ b/system/controllers/prepaid.php @@ -43,9 +43,9 @@ switch ($action) { case 'recharge': $c = ORM::for_table('tbl_customers')->find_many(); $ui->assign('c', $c); - $p = ORM::for_table('tbl_plans')->find_many(); + $p = ORM::for_table('tbl_plans')->where('enabled', '1')->find_many(); $ui->assign('p', $p); - $r = ORM::for_table('tbl_routers')->find_many(); + $r = ORM::for_table('tbl_routers')->where('enabled', '1')->find_many(); $ui->assign('r', $r); $ui->display('recharge.tpl'); @@ -57,9 +57,9 @@ switch ($action) { $c = ORM::for_table('tbl_customers')->find_many(); $ui->assign('c', $c); - $p = ORM::for_table('tbl_plans')->find_many(); + $p = ORM::for_table('tbl_plans')->where('enabled', '1')->find_many(); $ui->assign('p', $p); - $r = ORM::for_table('tbl_routers')->find_many(); + $r = ORM::for_table('tbl_routers')->where('enabled', '1')->find_many(); $ui->assign('r', $r); $ui->display('recharge-user.tpl'); @@ -82,7 +82,7 @@ switch ($action) { if ($msg == '') { $c = ORM::for_table('tbl_customers')->where('id', $id_customer)->find_one(); - $p = ORM::for_table('tbl_plans')->where('id', $plan)->find_one(); + $p = ORM::for_table('tbl_plans')->where('id', $plan)->where('enabled', '1')->find_one(); $b = ORM::for_table('tbl_user_recharges')->where('customer_id', $id_customer)->find_one(); $mikrotik = Router::_info($server); @@ -457,7 +457,7 @@ switch ($action) { $d = ORM::for_table('tbl_user_recharges')->find_one($id); if ($d) { $ui->assign('d', $d); - $p = ORM::for_table('tbl_plans')->find_many(); + $p = ORM::for_table('tbl_plans')->where('enabled', '1')->find_many(); $ui->assign('p', $p); $ui->display('prepaid-edit.tpl'); @@ -552,7 +552,7 @@ switch ($action) { if ($code != '') { $ui->assign('code', $code); $paginator = Paginator::bootstrap('tbl_voucher', 'code', '%' . $code . '%'); - $d = ORM::for_table('tbl_plans') + $d = ORM::for_table('tbl_plans')->where('enabled', '1') ->join('tbl_voucher', array('tbl_plans.id', '=', 'tbl_voucher.id_plan')) ->where_like('tbl_plans.code', '%' . $code . '%') ->offset($paginator['startpoint']) @@ -560,7 +560,7 @@ switch ($action) { ->find_many(); } else { $paginator = Paginator::bootstrap('tbl_voucher'); - $d = ORM::for_table('tbl_plans') + $d = ORM::for_table('tbl_plans')->where('enabled', '1') ->join('tbl_voucher', array('tbl_plans.id', '=', 'tbl_voucher.id_plan')) ->offset($paginator['startpoint']) ->limit($paginator['limit'])->find_many(); @@ -575,9 +575,9 @@ switch ($action) { $c = ORM::for_table('tbl_customers')->find_many(); $ui->assign('c', $c); - $p = ORM::for_table('tbl_plans')->find_many(); + $p = ORM::for_table('tbl_plans')->where('enabled', '1')->find_many(); $ui->assign('p', $p); - $r = ORM::for_table('tbl_routers')->find_many(); + $r = ORM::for_table('tbl_routers')->where('enabled', '1')->find_many(); $ui->assign('r', $r); $ui->display('voucher-add.tpl'); diff --git a/ui/ui/app-settings.tpl b/ui/ui/app-settings.tpl index e7862072..30cbb300 100644 --- a/ui/ui/app-settings.tpl +++ b/ui/ui/app-settings.tpl @@ -37,8 +37,6 @@ - -
@@ -51,6 +49,13 @@

With Radius user can use Hotspot or PPOE.

+
+ +
+ +

system/config.php

+
+
Telegram Notification
@@ -115,8 +120,10 @@ add dst-host=*.tawk.to
+ 
/ip hotspot walled-garden
+add dst-host={$_domain}
+add dst-host=*.{$_domain}
-