From 56762ef2770f93d17751dc056feff18f21ee8cb8 Mon Sep 17 00:00:00 2001 From: iBNu Maksum Date: Wed, 5 Feb 2025 14:13:21 +0700 Subject: [PATCH] pretty url stage 6 --- system/autoload/Text.php | 16 +++ ui/ui/admin/customers/add.tpl | 4 +- ui/ui/admin/customers/edit.tpl | 6 +- ui/ui/admin/customers/list.tpl | 33 ++--- ui/ui/admin/customers/view.tpl | 35 +++-- ui/ui/admin/hotspot/add.tpl | 23 ++-- ui/ui/admin/hotspot/edit.tpl | 8 +- ui/ui/admin/hotspot/list.tpl | 27 ++-- ui/ui/admin/logs/radius.tpl | 12 +- ui/ui/admin/logs/system.tpl | 6 +- ui/ui/admin/maps/customers.tpl | 49 ++++--- ui/ui/admin/maps/routers.tpl | 7 +- ui/ui/admin/message/bulk.tpl | 2 +- ui/ui/admin/message/single.tpl | 17 ++- ui/ui/admin/paymentgateway/audit-view.tpl | 10 +- ui/ui/admin/paymentgateway/audit.tpl | 19 +-- ui/ui/admin/paymentgateway/list.tpl | 6 +- ui/ui/admin/plan/active.tpl | 112 +++++++-------- ui/ui/admin/plan/deposit.tpl | 24 ++-- ui/ui/admin/plan/edit.tpl | 4 +- ui/ui/admin/plan/invoice.tpl | 10 +- ui/ui/admin/plan/recharge-confirm.tpl | 159 +++++++++++----------- ui/ui/admin/plan/recharge.tpl | 23 ++-- ui/ui/admin/plan/refill.tpl | 6 +- ui/ui/admin/pool/add.tpl | 6 +- ui/ui/admin/pool/edit.tpl | 63 +++++---- ui/ui/admin/pool/list.tpl | 21 +-- ui/ui/admin/port/add.tpl | 58 ++++---- ui/ui/admin/port/edit.tpl | 53 ++++---- ui/ui/admin/port/list.tpl | 10 +- ui/ui/admin/pppoe/add.tpl | 10 +- ui/ui/admin/pppoe/edit.tpl | 25 ++-- ui/ui/admin/pppoe/list.tpl | 29 ++-- ui/ui/admin/print/voucher.tpl | 58 ++++---- ui/ui/admin/radius/nas-add.tpl | 23 ++-- ui/ui/admin/radius/nas-edit.tpl | 50 ++++--- ui/ui/admin/radius/nas.tpl | 14 +- ui/ui/admin/reports/activation.tpl | 12 +- ui/ui/admin/reports/list.tpl | 106 ++++++++------- ui/ui/admin/reports/period-view.tpl | 4 +- ui/ui/admin/reports/period.tpl | 7 +- ui/ui/admin/routers/add.tpl | 4 +- ui/ui/admin/routers/edit.tpl | 4 +- 43 files changed, 639 insertions(+), 536 deletions(-) diff --git a/system/autoload/Text.php b/system/autoload/Text.php index e11cfef9..f60b9621 100644 --- a/system/autoload/Text.php +++ b/system/autoload/Text.php @@ -110,6 +110,12 @@ class Text return $result; } + /** + * ...$data means it can take any number of arguments. + * it can url($var1, $var2, $var3) or url($var1) + * and variable will be merge with implode + * @return string the URL with all the arguments combined. + */ public static function url(...$data){ global $config; $url = implode("", $data); @@ -125,4 +131,14 @@ class Text return U . $url; } } + + // this will return & or ? + public static function isQA(){ + global $config; + if ($config['url_canonical'] == 'yes') { + return '?'; + } else { + return '&'; + } + } } diff --git a/ui/ui/admin/customers/add.tpl b/ui/ui/admin/customers/add.tpl index 73618f90..003a496f 100644 --- a/ui/ui/admin/customers/add.tpl +++ b/ui/ui/admin/customers/add.tpl @@ -1,6 +1,6 @@ {include file="sections/header.tpl"} -
+
@@ -207,7 +207,7 @@ -
{Lang::T('Cancel')} +
{Lang::T('Cancel')} {literal} diff --git a/ui/ui/admin/customers/edit.tpl b/ui/ui/admin/customers/edit.tpl index 59b58b45..01612ce4 100644 --- a/ui/ui/admin/customers/edit.tpl +++ b/ui/ui/admin/customers/edit.tpl @@ -1,6 +1,6 @@ {include file="sections/header.tpl"} -
+
@@ -247,7 +247,7 @@ type="submit"> {Lang::T('Save Changes')} -
{Lang::T('Cancel')} +
{Lang::T('Cancel')} @@ -330,7 +330,7 @@ function deletePhoto(id) { if (confirm('Delete photo?')) { if (confirm('Are you sure to delete photo?')) { - window.location.href = '{$_url}customers/edit/'+id+'/deletePhoto' + window.location.href = '{Text::url('')}customers/edit/'+id+'/deletePhoto' } } } diff --git a/ui/ui/admin/customers/list.tpl b/ui/ui/admin/customers/list.tpl index 5feb42ca..9e260443 100644 --- a/ui/ui/admin/customers/list.tpl +++ b/ui/ui/admin/customers/list.tpl @@ -17,15 +17,16 @@
{if in_array($_admin['user_type'],['SuperAdmin','Admin'])} {/if} {Lang::T('Manage Contact')}
-