From 00cc4482307ef012091c332312983748a8711ce3 Mon Sep 17 00:00:00 2001
From: Ibnu Maksum <ibnumaksum@gmail.com>
Date: Mon, 18 Sep 2023 13:55:52 +0700
Subject: [PATCH 1/4] change password view

---
 ui/ui/customers-view.tpl | 25 ++++++++++++++++---------
 ui/ui/user-dashboard.tpl | 11 +++++++----
 2 files changed, 23 insertions(+), 13 deletions(-)

diff --git a/ui/ui/customers-view.tpl b/ui/ui/customers-view.tpl
index b48d79bc..0041ce03 100644
--- a/ui/ui/customers-view.tpl
+++ b/ui/ui/customers-view.tpl
@@ -24,14 +24,17 @@
                 <p class="text-muted">{Lang::nl2br($d['address'])}</p>
                 <ul class="list-group list-group-unbordered">
                     <li class="list-group-item">
-                        <b>{$_L['Password']}</b> <span class="pull-right" style="background-color: black; color:black;"
-                            onclick="this.select()">{$d['password']}</span>
+                        <b>{$_L['Password']}</b> <input type="password" value="{$d['password']}"
+                            style=" border: 0px; text-align: right;" class="pull-right"
+                            onmouseleave="this.type = 'password'" onmouseenter="this.type = 'text'"
+                            onclick="this.select()">
                     </li>
                     {if $d['pppoe_password'] != ''}
                         <li class="list-group-item">
-                            <b>PPPOE {$_L['Password']}</b> <span class="pull-right"
-                                style="background-color: black; color:black;"
-                                onclick="this.select()">{$d['pppoe_password']}</span>
+                            <b>PPPOE {$_L['Password']}</b> <input type="password" value="{$d['pppoe_password']}"
+                            style=" border: 0px; text-align: right;" class="pull-right"
+                            onmouseleave="this.type = 'password'" onmouseenter="this.type = 'text'"
+                            onclick="this.select()">
                         </li>
                     {/if}
                     <li class="list-group-item">
@@ -87,21 +90,25 @@
                     <div class="row">
                         <div class="col-xs-4">
                             <a href="{$_url}customers/deactivate/{$d['id']}" id="{$d['id']}"
-                                class="btn btn-danger btn-block btn-sm" onclick="return confirm('This will deactivate Customer Plan, and make it expired')">{Lang::T('Deactivate')}</a>
+                                class="btn btn-danger btn-block btn-sm"
+                                onclick="return confirm('This will deactivate Customer Plan, and make it expired')">{Lang::T('Deactivate')}</a>
                         </div>
                         <div class="col-xs-4">
-                            <a href="{$_url}customers/recharge/{$d['id']}" onclick="return confirm('This will extend Customer plan, same as recharge')"
+                            <a href="{$_url}customers/recharge/{$d['id']}"
+                                onclick="return confirm('This will extend Customer plan, same as recharge')"
                                 class="btn btn-success btn-sm btn-block">{Lang::T('Recharge')}</a>
                         </div>
                         <div class="col-xs-4">
-                            <a href="{$_url}customers/sync/{$d['id']}" onclick="return confirm('This will sync Customer to Mikrotik?')"
+                            <a href="{$_url}customers/sync/{$d['id']}"
+                                onclick="return confirm('This will sync Customer to Mikrotik?')"
                                 class="btn btn-primary btn-sm btn-block">{Lang::T('Sync')}</a>
                         </div>
                     </div>
                 </div>
             </div>
         {else}
-        <a href="{$_url}prepaid/recharge/{$d['id']}" class="btn btn-success btn-sm btn-block mt-1">{Lang::T('Recharge')}</a><br>
+            <a href="{$_url}prepaid/recharge/{$d['id']}"
+                class="btn btn-success btn-sm btn-block mt-1">{Lang::T('Recharge')}</a><br>
         {/if}
         <a href="{$_url}customers/list" class="btn btn-primary btn-sm btn-block mt-1">{Lang::T('Back')}</a><br>
     </div>
diff --git a/ui/ui/user-dashboard.tpl b/ui/ui/user-dashboard.tpl
index 35319640..c6a0e8db 100644
--- a/ui/ui/user-dashboard.tpl
+++ b/ui/ui/user-dashboard.tpl
@@ -69,8 +69,9 @@
                 </tr>
                 <tr>
                     <td class="small text-success text-uppercase text-normal">{$_L['Password']}</td>
-                    <td class="small mb15"><input type="text" value="{$_user['password']}"
-                            style="background-color: black; color:black; width:100%; border: 0px;"
+                    <td class="small mb15"><input type="password" value="{$_user['password']}"
+                            style="width:100%; border: 0px;"
+                            onmouseleave="this.type = 'password'" onmouseenter="this.type = 'text'"
                             onclick="this.select()"></td>
                 </tr>
                 {if $_c['enable_balance'] == 'yes'}
@@ -167,7 +168,8 @@
                             </div>
                             <div class="form-group col-sm-2" align="center">
                                 <button class="btn btn-success btn-block" id="sendBtn" type="submit" name="send"
-                                    onclick="return confirm('{Lang::T("Are You Sure?")}')" value="balance"><i class="glyphicon glyphicon-send"></i></button>
+                                    onclick="return confirm('{Lang::T("Are You Sure?")}')" value="balance"><i
+                                        class="glyphicon glyphicon-send"></i></button>
                             </div>
                         </div>
                     </form>
@@ -195,7 +197,8 @@
                             </div>
                             <div class="form-group col-sm-2" align="center">
                                 <button class="btn btn-success btn-block" id="sendBtn" type="submit" name="send"
-                                    onclick="return confirm('{Lang::T("Are You Sure?")}')" value="plan"><i class="glyphicon glyphicon-send"></i></button>
+                                    onclick="return confirm('{Lang::T("Are You Sure?")}')" value="plan"><i
+                                        class="glyphicon glyphicon-send"></i></button>
                             </div>
                         </div>
                     </form>

From b98d0b230dad6f20b0cbdad87b858ea969c5d730 Mon Sep 17 00:00:00 2001
From: Ibnu Maksum <ibnumaksum@gmail.com>
Date: Mon, 18 Sep 2023 13:56:11 +0700
Subject: [PATCH 2/4] click to view customer from voucher list

---
 ui/ui/voucher.tpl | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/ui/ui/voucher.tpl b/ui/ui/voucher.tpl
index 582ffe0f..e72a3bab 100644
--- a/ui/ui/voucher.tpl
+++ b/ui/ui/voucher.tpl
@@ -49,16 +49,19 @@
                         </thead>
                         <tbody>
                             {foreach $d as $ds}
-                                <tr>
+                                <tr {if $ds['status'] eq '1'}class="danger"{/if}>
                                     <td>{$ds['id']}</td>
                                     <td>{$ds['type']}</td>
                                     <td>{$ds['routers']}</td>
                                     <td>{$ds['name_plan']}</td>
-                                    <td><span style="background-color: black; color:black;">{$ds['code']}</span></td>
-                                    <td align="center">{if $ds['status'] eq '0'} <label class="btn-tag btn-tag-success">Not
+                                    <td width="10px"><input type="password" value="{$ds['code']}"
+                                            style="width:120px;border: 0px; text-align: right;" class="pull-right"
+                                            onmouseleave="this.type = 'password'" onmouseenter="this.type = 'text'"
+                                            onclick="this.select()"></td>
+                            <td align="center">{if $ds['status'] eq '0'} <label class="btn-tag btn-tag-success">Not
                                             Use</label> {else} <label class="btn-tag btn-tag-danger">Used</label>
                                         {/if}</td>
-                                    <td align="center">{if $ds['user'] eq '0'} - {else} {$ds['user']} {/if}</td>
+                                    <td align="center">{if $ds['user'] eq '0'} - {else}<a href="{$_url}customers/viewu/{$ds['user']}">{$ds['user']}</a>{/if}</td>
                                     <td>
                                         <a href="{$_url}prepaid/voucher-delete/{$ds['id']}" id="{$ds['id']}"
                                             class="btn btn-danger btn-xs"

From e59bf7123049e0cf8d9f512d3d9da10617714031 Mon Sep 17 00:00:00 2001
From: Ibnu Maksum <ibnumaksum@gmail.com>
Date: Mon, 18 Sep 2023 15:03:25 +0700
Subject: [PATCH 3/4] Add Privacy Policy and Terms of Condition

---
 pages_template/Privacy_Policy.html      |  62 ++++++
 pages_template/Terms_of_Conditions.html | 119 ++++++++++++
 system/controllers/pages.php            |   9 +-
 system/lan/english/common.lan.php       |   4 +-
 ui/ui/page-edit.tpl                     |   2 +-
 ui/ui/print-voucher.tpl                 | 238 ++++++++++++++----------
 ui/ui/register-otp.tpl                  |   6 +
 ui/ui/register-rotp.tpl                 |   6 +
 ui/ui/register.tpl                      |  12 +-
 ui/ui/sections/header.tpl               |  11 +-
 ui/ui/sections/user-footer.tpl          |  10 +
 ui/ui/user-login.tpl                    |   8 +-
 12 files changed, 371 insertions(+), 116 deletions(-)
 create mode 100644 pages_template/Privacy_Policy.html
 create mode 100644 pages_template/Terms_of_Conditions.html

diff --git a/pages_template/Privacy_Policy.html b/pages_template/Privacy_Policy.html
new file mode 100644
index 00000000..4337e888
--- /dev/null
+++ b/pages_template/Privacy_Policy.html
@@ -0,0 +1,62 @@
+<h1>Privacy Policy for PHPNuxBill</h1>
+
+<p>At PHPNuxBill, accessible from https://github.com/hotspotbilling/phpnuxbill, one of our main priorities is the
+    privacy of our visitors. This Privacy Policy document contains types of information that is collected and recorded
+    by PHPNuxBill and how we use it.</p>
+
+<p>If you have additional questions or require more information about our Privacy Policy, do not hesitate to contact us.
+</p>
+
+<h2>Log Files</h2>
+
+<p>PHPNuxBill follows a standard procedure of using log files. These files log visitors when they visit websites. All
+    hosting companies do this and a part of hosting services' analytics. The information collected by log files include
+    internet protocol (IP) addresses, browser type, Internet Service Provider (ISP), date and time stamp, referring/exit
+    pages, and possibly the number of clicks. These are not linked to any information that is personally identifiable.
+    The purpose of the information is for analyzing trends, administering the site, tracking users' movement on the
+    website, and gathering demographic information. Our Privacy Policy was created with the help of the <a
+        href="https://www.privacypolicyonline.com/privacy-policy-generator/">Privacy Policy Generator</a>.</p>
+
+
+
+
+<h2>Privacy Policies</h2>
+
+<P>You may consult this list to find the Privacy Policy for each of the advertising partners of PHPNuxBill.</p>
+
+<p>Third-party ad servers or ad networks uses technologies like cookies, JavaScript, or Web Beacons that are used in
+    their respective advertisements and links that appear on PHPNuxBill, which are sent directly to users' browser. They
+    automatically receive your IP address when this occurs. These technologies are used to measure the effectiveness of
+    their advertising campaigns and/or to personalize the advertising content that you see on websites that you visit.
+</p>
+
+<p>Note that PHPNuxBill has no access to or control over these cookies that are used by third-party advertisers.</p>
+
+<h2>Third Party Privacy Policies</h2>
+
+<p>PHPNuxBill's Privacy Policy does not apply to other advertisers or websites. Thus, we are advising you to consult the
+    respective Privacy Policies of these third-party ad servers for more detailed information. It may include their
+    practices and instructions about how to opt-out of certain options. </p>
+
+<p>You can choose to disable cookies through your individual browser options. To know more detailed information about
+    cookie management with specific web browsers, it can be found at the browsers' respective websites. What Are
+    Cookies?</p>
+
+<h2>Children's Information</h2>
+
+<p>Another part of our priority is adding protection for children while using the internet. We encourage parents and
+    guardians to observe, participate in, and/or monitor and guide their online activity.</p>
+
+<p>PHPNuxBill does not knowingly collect any Personal Identifiable Information from children under the age of 13. If you
+    think that your child provided this kind of information on our website, we strongly encourage you to contact us
+    immediately and we will do our best efforts to promptly remove such information from our records.</p>
+
+<h2>Online Privacy Policy Only</h2>
+
+<p>This Privacy Policy applies only to our online activities and is valid for visitors to our website with regards to
+    the information that they shared and/or collect in PHPNuxBill. This policy is not applicable to any information
+    collected offline or via channels other than this website.</p>
+
+<h2>Consent</h2>
+
+<p>By using our website, you hereby consent to our Privacy Policy and agree to its Terms and Conditions.</p>
\ No newline at end of file
diff --git a/pages_template/Terms_of_Conditions.html b/pages_template/Terms_of_Conditions.html
new file mode 100644
index 00000000..b2cd68bc
--- /dev/null
+++ b/pages_template/Terms_of_Conditions.html
@@ -0,0 +1,119 @@
+<h2><strong>Terms and Conditions</strong></h2>
+
+<p>Welcome to PHPNuxBill!</p>
+
+<p>These terms and conditions outline the rules and regulations for the use of PHPNuxBill's Website, located at https://github.com/hotspotbilling/phpnuxbill.</p>
+
+<p>By accessing this website we assume you accept these terms and conditions. Do not continue to use PHPNuxBill if you do not agree to take all of the terms and conditions stated on this page.</p>
+
+<p>The following terminology applies to these Terms and Conditions, Privacy Statement and Disclaimer Notice and all Agreements: "Client", "You" and "Your" refers to you, the person log on this website and compliant to the Company’s terms and conditions. "The Company", "Ourselves", "We", "Our" and "Us", refers to our Company. "Party", "Parties", or "Us", refers to both the Client and ourselves. All terms refer to the offer, acceptance and consideration of payment necessary to undertake the process of our assistance to the Client in the most appropriate manner for the express purpose of meeting the Client’s needs in respect of provision of the Company’s stated services, in accordance with and subject to, prevailing law of Netherlands. Any use of the above terminology or other words in the singular, plural, capitalization and/or he/she or they, are taken as interchangeable and therefore as referring to same. Our Terms and Conditions were created with the help of the <a href="https://www.privacypolicyonline.com/terms-conditions-generator/">Terms & Conditions Generator</a>.</p>
+
+<h3><strong>Cookies</strong></h3>
+
+<p>We employ the use of cookies. By accessing PHPNuxBill, you agreed to use cookies in agreement with the PHPNuxBill's Privacy Policy.</p>
+
+<p>Most interactive websites use cookies to let us retrieve the user's details for each visit. Cookies are used by our website to enable the functionality of certain areas to make it easier for people visiting our website. Some of our affiliate/advertising partners may also use cookies.</p>
+
+<h3><strong>License</strong></h3>
+
+<p>Unless otherwise stated, PHPNuxBill and/or its licensors own the intellectual property rights for all material on PHPNuxBill. All intellectual property rights are reserved. You may access this from PHPNuxBill for your own personal use subjected to restrictions set in these terms and conditions.</p>
+
+<p>You must not:</p>
+<ul>
+    <li>Republish material from PHPNuxBill</li>
+    <li>Sell, rent or sub-license material from PHPNuxBill</li>
+    <li>Reproduce, duplicate or copy material from PHPNuxBill</li>
+    <li>Redistribute content from PHPNuxBill</li>
+</ul>
+
+<p>This Agreement shall begin on the date hereof.</p>
+
+<p>Parts of this website offer an opportunity for users to post and exchange opinions and information in certain areas of the website. PHPNuxBill does not filter, edit, publish or review Comments prior to their presence on the website. Comments do not reflect the views and opinions of PHPNuxBill,its agents and/or affiliates. Comments reflect the views and opinions of the person who post their views and opinions. To the extent permitted by applicable laws, PHPNuxBill shall not be liable for the Comments or for any liability, damages or expenses caused and/or suffered as a result of any use of and/or posting of and/or appearance of the Comments on this website.</p>
+
+<p>PHPNuxBill reserves the right to monitor all Comments and to remove any Comments which can be considered inappropriate, offensive or causes breach of these Terms and Conditions.</p>
+
+<p>You warrant and represent that:</p>
+
+<ul>
+    <li>You are entitled to post the Comments on our website and have all necessary licenses and consents to do so;</li>
+    <li>The Comments do not invade any intellectual property right, including without limitation copyright, patent or trademark of any third party;</li>
+    <li>The Comments do not contain any defamatory, libelous, offensive, indecent or otherwise unlawful material which is an invasion of privacy</li>
+    <li>The Comments will not be used to solicit or promote business or custom or present commercial activities or unlawful activity.</li>
+</ul>
+
+<p>You hereby grant PHPNuxBill a non-exclusive license to use, reproduce, edit and authorize others to use, reproduce and edit any of your Comments in any and all forms, formats or media.</p>
+
+<h3><strong>Hyperlinking to our Content</strong></h3>
+
+<p>The following organizations may link to our Website without prior written approval:</p>
+
+<ul>
+    <li>Government agencies;</li>
+    <li>Search engines;</li>
+    <li>News organizations;</li>
+    <li>Online directory distributors may link to our Website in the same manner as they hyperlink to the Websites of other listed businesses; and</li>
+    <li>System wide Accredited Businesses except soliciting non-profit organizations, charity shopping malls, and charity fundraising groups which may not hyperlink to our Web site.</li>
+</ul>
+
+<p>These organizations may link to our home page, to publications or to other Website information so long as the link: (a) is not in any way deceptive; (b) does not falsely imply sponsorship, endorsement or approval of the linking party and its products and/or services; and (c) fits within the context of the linking party's site.</p>
+
+<p>We may consider and approve other link requests from the following types of organizations:</p>
+
+<ul>
+    <li>commonly-known consumer and/or business information sources;</li>
+    <li>dot.com community sites;</li>
+    <li>associations or other groups representing charities;</li>
+    <li>online directory distributors;</li>
+    <li>internet portals;</li>
+    <li>accounting, law and consulting firms; and</li>
+    <li>educational institutions and trade associations.</li>
+</ul>
+
+<p>We will approve link requests from these organizations if we decide that: (a) the link would not make us look unfavorably to ourselves or to our accredited businesses; (b) the organization does not have any negative records with us; (c) the benefit to us from the visibility of the hyperlink compensates the absence of PHPNuxBill; and (d) the link is in the context of general resource information.</p>
+
+<p>These organizations may link to our home page so long as the link: (a) is not in any way deceptive; (b) does not falsely imply sponsorship, endorsement or approval of the linking party and its products or services; and (c) fits within the context of the linking party's site.</p>
+
+<p>If you are one of the organizations listed in paragraph 2 above and are interested in linking to our website, you must inform us by sending an e-mail to PHPNuxBill. Please include your name, your organization name, contact information as well as the URL of your site, a list of any URLs from which you intend to link to our Website, and a list of the URLs on our site to which you would like to link. Wait 2-3 weeks for a response.</p>
+
+<p>Approved organizations may hyperlink to our Website as follows:</p>
+
+<ul>
+    <li>By use of our corporate name; or</li>
+    <li>By use of the uniform resource locator being linked to; or</li>
+    <li>By use of any other description of our Website being linked to that makes sense within the context and format of content on the linking party's site.</li>
+</ul>
+
+<p>No use of PHPNuxBill's logo or other artwork will be allowed for linking absent a trademark license agreement.</p>
+
+<h3><strong>iFrames</strong></h3>
+
+<p>Without prior approval and written permission, you may not create frames around our Webpages that alter in any way the visual presentation or appearance of our Website.</p>
+
+<h3><strong>Content Liability</strong></h3>
+
+<p>We shall not be hold responsible for any content that appears on your Website. You agree to protect and defend us against all claims that is rising on your Website. No link(s) should appear on any Website that may be interpreted as libelous, obscene or criminal, or which infringes, otherwise violates, or advocates the infringement or other violation of, any third party rights.</p>
+
+<h3><strong>Reservation of Rights</strong></h3>
+
+<p>We reserve the right to request that you remove all links or any particular link to our Website. You approve to immediately remove all links to our Website upon request. We also reserve the right to amen these terms and conditions and it's linking policy at any time. By continuously linking to our Website, you agree to be bound to and follow these linking terms and conditions.</p>
+
+<h3><strong>Removal of links from our website</strong></h3>
+
+<p>If you find any link on our Website that is offensive for any reason, you are free to contact and inform us any moment. We will consider requests to remove links but we are not obligated to or so or to respond to you directly.</p>
+
+<p>We do not ensure that the information on this website is correct, we do not warrant its completeness or accuracy; nor do we promise to ensure that the website remains available or that the material on the website is kept up to date.</p>
+
+<h3><strong>Disclaimer</strong></h3>
+
+<p>To the maximum extent permitted by applicable law, we exclude all representations, warranties and conditions relating to our website and the use of this website. Nothing in this disclaimer will:</p>
+
+<ul>
+    <li>limit or exclude our or your liability for death or personal injury;</li>
+    <li>limit or exclude our or your liability for fraud or fraudulent misrepresentation;</li>
+    <li>limit any of our or your liabilities in any way that is not permitted under applicable law; or</li>
+    <li>exclude any of our or your liabilities that may not be excluded under applicable law.</li>
+</ul>
+
+<p>The limitations and prohibitions of liability set in this Section and elsewhere in this disclaimer: (a) are subject to the preceding paragraph; and (b) govern all liabilities arising under the disclaimer, including liabilities arising in contract, in tort and for breach of statutory duty.</p>
+
+<p>As long as the website and the information and services on the website are provided free of charge, we will not be liable for any loss or damage of any nature.</p>
\ No newline at end of file
diff --git a/system/controllers/pages.php b/system/controllers/pages.php
index 53031d22..923002c2 100644
--- a/system/controllers/pages.php
+++ b/system/controllers/pages.php
@@ -11,21 +11,24 @@ $admin = Admin::_info();
 $ui->assign('_admin', $admin);
 
 if(strpos($action,"-post")===false){
-    $path = __DIR__."/../../pages/".str_replace(".","",$action).".html";
+    $path = "pages/".str_replace(".","",$action).".html";
     //echo $path;
     run_hook('view_edit_pages'); #HOOK
+    if(!file_exists($path)){
+        touch($path);
+    }
     if(file_exists($path)){
         $html = file_get_contents($path);
         $ui->assign("htmls",str_replace(["<div","</div>"],"",$html));
         $ui->assign("writeable",is_writable($path));
-        $ui->assign("pageHeader",$action);
+        $ui->assign("pageHeader",str_replace('_', ' ', $action));
         $ui->assign("PageFile",$action);
         $ui->display('page-edit.tpl');
     }else
         $ui->display('a404.tpl');
 }else{
     $action = str_replace("-post","",$action);
-    $path = __DIR__."/../../pages/".str_replace(".","",$action).".html";
+    $path = "pages/".str_replace(".","",$action).".html";
     if(file_exists($path)){
         $html = _post("html");
         run_hook('save_pages'); #HOOK
diff --git a/system/lan/english/common.lan.php b/system/lan/english/common.lan.php
index e5e49c8f..71a9a4c1 100644
--- a/system/lan/english/common.lan.php
+++ b/system/lan/english/common.lan.php
@@ -252,8 +252,8 @@ $_L['Community'] = 'Community';
 $_L['1_user_can_be_used_for_many_devices'] = '1 user can be used for many devices?';
 $_L['Cannot_be_change_after_saved'] = 'Cannot be change after saved';
 
-$_L['Explain_Coverage_of_router'] = 'Jelaskan Cakupan wilayah hotspot';
-$_L['Name_of_Area_that_router_operated'] = 'Nama Lokasi/Wilayah Router beroperasi';
+$_L['Explain_Coverage_of_router'] = 'Explain Coverage of router';
+$_L['Name_of_Area_that_router_operated'] = 'Name of Area that router operated';
 $_L['Payment_Notification_URL_Recurring_Notification_URL_Pay_Account_Notification_URL'] = 'Payment Notification URL, Recurring Notification URL, Pay Account Notification URL';
 $_L['Finish_Redirect_URL_Unfinish_Redirect_URL_Error_Redirect_URL'] = 'Finish Redirect URL, Unfinish Redirect URL, Error Redirect URL';
 $_L['Status'] = 'Status';
diff --git a/ui/ui/page-edit.tpl b/ui/ui/page-edit.tpl
index a029eea2..3eb0ce3c 100644
--- a/ui/ui/page-edit.tpl
+++ b/ui/ui/page-edit.tpl
@@ -2,7 +2,7 @@
 <div class="row">
     <div class="col-sm-12">
         <div class="panel mb20 panel-primary panel-hovered">
-            <div class="panel-heading">{$_L[$pageHeader]}</div>
+            <div class="panel-heading">{$pageHeader}</div>
                 <div id="myNicPanel" style="width: 100%;"></div>
                 <div id="panel-edit" class="panel-body">{$htmls}</div>
             {if $writeable}
diff --git a/ui/ui/print-voucher.tpl b/ui/ui/print-voucher.tpl
index ce38327b..7520cf2b 100644
--- a/ui/ui/print-voucher.tpl
+++ b/ui/ui/print-voucher.tpl
@@ -1,136 +1,168 @@
 <!DOCTYPE html>
 <html>
+
 <head>
     <title>{$_title}</title>
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
     <link rel="shortcut icon" type="image/x-icon" href="ui/ui/images/favicon.ico">
     <style>
-	.ukuran {
-		size:A4;
-	}
+        .ukuran {
+            size: A4;
+        }
 
-	body,td,th {
-		font-size: 12px;
-		font-family: Segoe, "Segoe UI", "DejaVu Sans", "Trebuchet MS", Verdana, sans-serif;
-	}
-	page[size="A4"] {
-	  background: white;
-	  width: 21cm;
-	  height: 29.7cm;
-	  display: block;
-	  margin: 0 auto;
-	  margin-bottom: 0.5cm;
-	  html, body {
-		width: 210mm;
-		height: 297mm;
-	  }
-	}
-	@media print {
-        body {
-            size: auto;
-            margin: 0;
-            box-shadow: 0;
+        body,
+        td,
+        th {
+            font-size: 12px;
+            font-family: Segoe, "Segoe UI", "DejaVu Sans", "Trebuchet MS", Verdana, sans-serif;
         }
+
         page[size="A4"] {
-            margin: 0;
-            size: auto;
-            box-shadow: 0;
+            background: white;
+            width: 21cm;
+            height: 29.7cm;
+            display: block;
+            margin: 0 auto;
+            margin-bottom: 0.5cm;
+
+            html,
+            body {
+                width: 210mm;
+                height: 297mm;
+            }
         }
-        .page-break	{ display: block; page-break-before: always; }
-        .no-print, .no-print *
-        {
-            display: none !important;
+
+        @media print {
+            body {
+                size: auto;
+                margin: 0;
+                box-shadow: 0;
+            }
+
+            page[size="A4"] {
+                margin: 0;
+                size: auto;
+                box-shadow: 0;
+            }
+
+            .page-break {
+                display: block;
+                page-break-before: always;
+            }
+
+            .no-print,
+            .no-print * {
+                display: none !important;
+            }
         }
-    }
     </style>
 </head>
 
 <body>
-<page size="A4">
+    <page size="A4">
         <form method="post" action="{$_url}prepaid/print-voucher/" class="no-print">
-        <table width="100%" border="0" cellspacing="0" cellpadding="1" class="btn btn-default btn-sm">
-            <tr>
-                <td>ID &gt; <input type="text" name="from_id" style="width:40px" value="{$from_id}"> limit <input type="text" name="limit" style="width:40px" value="{$limit}"></td>
-                <td>PageBreak after  <input type="text" style="width:40px" name="pagebreak" value="{$pagebreak}"> vouchers</td>
-                <td>Plans <select id="plan_id" name="planid" style="width:150px">
-                <option value="0">--all--</option>
-                {foreach $plans as $plan}
-                    <option value="{$plan['id']}" {if $plan['id']==$planid}selected{/if}>{$plan['name_plan']}</option>
-                {/foreach}
-                </select></td>
-                <td><button type="submit">submit</button></td>
-            </tr>
-        </table><hr>
-        <center><button type="button" id="actprint" class="btn btn-default btn-sm no-print">{$_L['Click_Here_to_Print']}</button><br>
-        {$_L['Print_Info']}<br>
-        show {$v|@count} vouchers from {$vc} vouchers<br>
-        from ID {$v[0]['id']} limit {$limit} vouchers
-        </center>
+            <table width="100%" border="0" cellspacing="0" cellpadding="1" class="btn btn-default btn-sm">
+                <tr>
+                    <td>ID &gt; <input type="text" name="from_id" style="width:40px" value="{$from_id}"> limit <input
+                            type="text" name="limit" style="width:40px" value="{$limit}"></td>
+                    <td>PageBreak after <input type="text" style="width:40px" name="pagebreak" value="{$pagebreak}">
+                        vouchers</td>
+                    <td>Plans <select id="plan_id" name="planid" style="width:150px">
+                            <option value="0">--all--</option>
+                            {foreach $plans as $plan}
+                                <option value="{$plan['id']}" {if $plan['id']==$planid}selected{/if}>{$plan['name_plan']}
+                                </option>
+                            {/foreach}
+                        </select></td>
+                    <td><button type="submit">submit</button></td>
+                </tr>
+            </table>
+            <hr>
+            <center><button type="button" id="actprint"
+                    class="btn btn-default btn-sm no-print">{$_L['Click_Here_to_Print']}</button><br>
+                {$_L['Print_Info']}<br>
+                show {$v|@count} vouchers from {$vc} vouchers<br>
+                from ID {$v[0]['id']} limit {$limit} vouchers
+            </center>
         </form>
         <div id="printable">
             <hr>
             {foreach $v as $vs}
-            {$jml = $jml + 1}
-            <table width="100%" height="200" border="0" cellspacing="0" cellpadding="1" style="margin-bottom:5px">
-                <tbody>
-                    <tr><td align="center" valign="middle"></td></tr>
-                    <tr>
-                    <td align="center" valign="top">
-                        <table width="100%" border="0" cellspacing="0" cellpadding="2">
+                {$jml = $jml + 1}
+                <table width="100%" height="200" border="0" cellspacing="0" cellpadding="1" style="margin-bottom:5px">
+                    <tbody>
                         <tr>
-                            <td width="50%" valign="middle" style="padding-right:10px">
-                            <center><strong style="font-size:38px">{$_L['Voucher_Hotspot']}</strong><span class="no-print">  ID {$vs['id']}</span></center>
-                            <table width="100%" border="1" cellspacing="0" cellpadding="1" bordercolor="#757575">
-                                <tbody>
-                                <tr>
-                                    <td rowspan="5" width="1"><img src="qrcode/?data={$vs['code']}"></td>
-                                </tr>
-                                <tr>
-                                    <td valign="middle" align="center" style="font-size:25px">{Lang::moneyFormat($vs['price'])}</td>
-                                </tr>
-                                <tr>
-                                    <td valign="middle" align="center" style="font-size:20px">{$_L['Code_Voucher']}</td>
-                                </tr>
-                                <tr>
-                                    <td valign="middle" align="center" style="font-size:25px">{$vs['code']}</td>
-                                </tr>
-                                <tr>
-                                    <td valign="middle" align="center" style="font-size:15px">{$vs['name_plan']}</td>
-                                </tr>
-                                </tbody>
-                            </table>
-                            </td>
-                            <td valign="top" style="padding-left:10px">
-                                {include file="$_path/../pages/Voucher.html"}
+                            <td align="center" valign="middle"></td>
+                        </tr>
+                        <tr>
+                            <td align="center" valign="top">
+                                <table width="100%" border="0" cellspacing="0" cellpadding="2">
+                                    <tr>
+                                        <td width="50%" valign="middle" style="padding-right:10px">
+                                            <center><strong style="font-size:38px">{$_L['Voucher_Hotspot']}</strong><span
+                                                    class="no-print"> ID {$vs['id']}</span></center>
+                                            <table width="100%" border="1" cellspacing="0" cellpadding="1"
+                                                bordercolor="#757575">
+                                                <tbody>
+                                                    <tr>
+                                                        <td rowspan="5" width="1"><img src="qrcode/?data={$vs['code']}">
+                                                        </td>
+                                                    </tr>
+                                                    <tr>
+                                                        <td valign="middle" align="center" style="font-size:25px">
+                                                            {Lang::moneyFormat($vs['price'])}</td>
+                                                    </tr>
+                                                    <tr>
+                                                        <td valign="middle" align="center" style="font-size:20px">
+                                                            {$_L['Code_Voucher']}</td>
+                                                    </tr>
+                                                    <tr>
+                                                        <td valign="middle" align="center" style="font-size:25px">
+                                                            {$vs['code']}</td>
+                                                    </tr>
+                                                    <tr>
+                                                        <td valign="middle" align="center" style="font-size:15px">
+                                                            {$vs['name_plan']}</td>
+                                                    </tr>
+                                                </tbody>
+                                            </table>
+                                        </td>
+                                        <td valign="top" style="padding-left:10px">
+                                            {include file="$_path/../pages/Voucher.html"}
+                                        </td>
+                                    </tr>
+                                </table>
                             </td>
                         </tr>
-                        </table>
-                    </td>
-                    </tr>
-                </tbody>
+                    </tbody>
                 </table>
                 <hr>
                 {if $jml == $pagebreak}
-                {$jml = 0}
-                <!-- pageBreak -->
-                <div class="page-break"><div class="no-print" style="background-color: #E91E63; color:#FFF;" align="center">-- pageBreak --<hr></div></div>
+                    {$jml = 0}
+                    <!-- pageBreak -->
+                    <div class="page-break">
+                        <div class="no-print" style="background-color: #E91E63; color:#FFF;" align="center">-- pageBreak --
+                            <hr>
+                        </div>
+                    </div>
                 {/if}
-                {/foreach}
+            {/foreach}
         </div>
-</page>
-<script src="ui/ui/scripts/jquery-1.10.2.js"></script>
-{if isset($xfooter)}
-    {$xfooter}
-{/if}
-<script>
-    jQuery(document).ready(function() {
-        // initiate layout and plugins
-        $("#actprint").click(function() {
-            window.print();
-            return false;
+    </page>
+    <script src="ui/ui/scripts/jquery-1.10.2.js"></script>
+    {if isset($xfooter)}
+        {$xfooter}
+    {/if}
+    <script>
+        jQuery(document).ready(function() {
+            // initiate layout and plugins
+            $("#actprint").click(function() {
+                window.print();
+                return false;
+            });
         });
-    });
-</script>
+    </script>
 
 </body>
+
 </html>
\ No newline at end of file
diff --git a/ui/ui/register-otp.tpl b/ui/ui/register-otp.tpl
index 5855d79b..ab55baa0 100644
--- a/ui/ui/register-otp.tpl
+++ b/ui/ui/register-otp.tpl
@@ -103,6 +103,12 @@
                                         <a href="{$_url}register" class="btn btn-success">{$_L['Cancel']}</a>
                                     </div>
                                 </div>
+                                <br>
+                                <center>
+                                    <a href="./pages/Privacy_Policy.html" target="_blank">Privacy</a>
+                                    &bull;
+                                    <a href="./pages/Terms_of_Conditions.html" target="_blank">ToC</a>
+                                </center>
                             </div>
                         </div>
                     </div>
diff --git a/ui/ui/register-rotp.tpl b/ui/ui/register-rotp.tpl
index a1e2b402..04a720a1 100644
--- a/ui/ui/register-rotp.tpl
+++ b/ui/ui/register-rotp.tpl
@@ -78,6 +78,12 @@
                                         type="submit">{Lang::T('Request OTP')}</button>
                                 </div>
                             </div>
+                            <br>
+                            <center>
+                                <a href="./pages/Privacy_Policy.html" target="_blank">Privacy</a>
+                                &bull;
+                                <a href="./pages/Terms_of_Conditions.html" target="_blank">ToC</a>
+                            </center>
                         </div>
                     </div>
                 </div>
diff --git a/ui/ui/register.tpl b/ui/ui/register.tpl
index c0777380..da77841a 100644
--- a/ui/ui/register.tpl
+++ b/ui/ui/register.tpl
@@ -86,14 +86,20 @@
                                 </div>
                                 <br>
                                 <div class="btn-group btn-group-justified mb15">
-                                <div class="btn-group">
-                                    <a href="{$_url}login" class="btn btn-warning">{$_L['Cancel']}</a>
-                                </div>
+                                    <div class="btn-group">
+                                        <a href="{$_url}login" class="btn btn-warning">{$_L['Cancel']}</a>
+                                    </div>
                                     <div class="btn-group">
                                         <button class="btn btn-success waves-effect waves-light"
                                             type="submit">{$_L['Register']}</button>
                                     </div>
                                 </div>
+                                <br>
+                                <center>
+                                    <a href="./pages/Privacy_Policy.html" target="_blank">Privacy</a>
+                                    &bull;
+                                    <a href="./pages/Terms_of_Conditions.html" target="_blank">ToC</a>
+                                </center>
                             </div>
                         </div>
                     </div>
diff --git a/ui/ui/sections/header.tpl b/ui/ui/sections/header.tpl
index ad2fa9ca..ce3619fa 100644
--- a/ui/ui/sections/header.tpl
+++ b/ui/ui/sections/header.tpl
@@ -218,14 +218,19 @@
                                 <li {if $_routes[1] eq 'Voucher'}class="active" {/if}><a
                                         href="{$_url}pages/Voucher">{$_L['Voucher']} Template</a></li>
                                 <li {if $_routes[1] eq 'Announcement'}class="active" {/if}><a
-                                        href="{$_url}pages/Announcement">{$_L['Announcement']} Editor</a></li>
+                                        href="{$_url}pages/Announcement">{$_L['Announcement']}</a></li>
                                 <li {if $_routes[1] eq 'Registration_Info'}class="active" {/if}><a
-                                        href="{$_url}pages/Registration_Info">{$_L['Registration_Info']} Editor</a></li>
+                                    href="{$_url}pages/Registration_Info">{$_L['Registration_Info']}</a></li>
+                                <li {if $_routes[1] eq 'Privacy_Policy'}class="active" {/if}><a
+                                    href="{$_url}pages/Privacy_Policy">Privacy Policy</a></li>
+                                <li {if $_routes[1] eq 'Terms_of_Conditions'}class="active" {/if}><a
+                                        href="{$_url}pages/Terms_of_Conditions">Terms and Conditions</a></li>
                                 {$_MENU_PAGES}
                             </ul>
                         </li>
                         {$_MENU_AFTER_PAGES}
-                        <li class="{if $_system_menu eq 'settings' || $_system_menu eq 'paymentgateway' }active{/if} treeview">
+                        <li
+                            class="{if $_system_menu eq 'settings' || $_system_menu eq 'paymentgateway' }active{/if} treeview">
                             <a href="#">
                                 <i class="ion ion-gear-a"></i> <span>{$_L['Settings']}</span>
                                 <span class="pull-right-container">
diff --git a/ui/ui/sections/user-footer.tpl b/ui/ui/sections/user-footer.tpl
index 7c690beb..7bfb581c 100644
--- a/ui/ui/sections/user-footer.tpl
+++ b/ui/ui/sections/user-footer.tpl
@@ -3,12 +3,22 @@
         {if isset($_c['CompanyFooter'])}
             <footer class="main-footer">
                 {$_c['CompanyFooter']}
+                <div class="pull-right hidden-xs">
+                    <a href="./pages/Privacy_Policy.html" target="_blank">Privacy</a>
+                    &bull;
+                    <a href="./pages/Terms_of_Conditions.html" target="_blank">ToC</a>
+                </div>
             </footer>
         {else}
             <footer class="main-footer">
                 PHPNuxBill by <a href="https://github.com/hotspotbilling/phpnuxbill" rel="nofollow noreferrer noopener"
                     target="_blank">iBNuX</a>, Theme by <a href="https://adminlte.io/" rel="nofollow noreferrer noopener"
                     target="_blank">AdminLTE</a>
+                    <div class="pull-right hidden-xs">
+                        <a href="./pages/Privacy_Policy.html" target="_blank">Privacy</a>
+                        &bull;
+                        <a href="./pages/Terms_of_Conditions.html" target="_blank">ToC</a>
+                    </div>
             </footer>
         {/if}
         </div>
diff --git a/ui/ui/user-login.tpl b/ui/ui/user-login.tpl
index 5d5ea4de..be8bb430 100644
--- a/ui/ui/user-login.tpl
+++ b/ui/ui/user-login.tpl
@@ -47,7 +47,8 @@
                                     {if $_c['country_code_phone']!= ''}
                                         <span class="input-group-addon" id="basic-addon1">+</span>
                                     {else}
-                                        <span class="input-group-addon" id="basic-addon1"><i class="glyphicon glyphicon-phone-alt"></i></span>
+                                        <span class="input-group-addon" id="basic-addon1"><i
+                                                class="glyphicon glyphicon-phone-alt"></i></span>
                                     {/if}
                                     <input type="text" class="form-control" name="username"
                                         placeholder="{if $_c['country_code_phone']!= ''}{$_c['country_code_phone']}{/if} {$_L['Phone_Number']}">
@@ -76,6 +77,11 @@
                                     <button type="submit" class="btn btn-primary">{$_L['Login']}</button>
                                 </div>
                             </div>
+                            <br><center>
+                            <a href="./pages/Privacy_Policy.html" target="_blank">Privacy</a>
+                            &bull;
+                            <a href="./pages/Terms_of_Conditions.html" target="_blank">ToC</a>
+                            </center>
                         </form>
                     </div>
                 </div>

From 6acc342b26a3afb84835883fe33a017907826718 Mon Sep 17 00:00:00 2001
From: Ibnu Maksum <ibnumaksum@gmail.com>
Date: Mon, 18 Sep 2023 15:07:08 +0700
Subject: [PATCH 4/4] Privacy and ToC not hidden

---
 ui/ui/sections/user-footer.tpl | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/ui/ui/sections/user-footer.tpl b/ui/ui/sections/user-footer.tpl
index 7bfb581c..45c89d1e 100644
--- a/ui/ui/sections/user-footer.tpl
+++ b/ui/ui/sections/user-footer.tpl
@@ -3,7 +3,7 @@
         {if isset($_c['CompanyFooter'])}
             <footer class="main-footer">
                 {$_c['CompanyFooter']}
-                <div class="pull-right hidden-xs">
+                <div class="pull-right">
                     <a href="./pages/Privacy_Policy.html" target="_blank">Privacy</a>
                     &bull;
                     <a href="./pages/Terms_of_Conditions.html" target="_blank">ToC</a>
@@ -14,7 +14,7 @@
                 PHPNuxBill by <a href="https://github.com/hotspotbilling/phpnuxbill" rel="nofollow noreferrer noopener"
                     target="_blank">iBNuX</a>, Theme by <a href="https://adminlte.io/" rel="nofollow noreferrer noopener"
                     target="_blank">AdminLTE</a>
-                    <div class="pull-right hidden-xs">
+                    <div class="pull-right">
                         <a href="./pages/Privacy_Policy.html" target="_blank">Privacy</a>
                         &bull;
                         <a href="./pages/Terms_of_Conditions.html" target="_blank">ToC</a>