From 349a1d325034e24d7720984a17bf2d454e98a833 Mon Sep 17 00:00:00 2001
From: Ibnu Maksum <ibnumaksum@gmail.com>
Date: Tue, 20 Feb 2024 10:07:07 +0700
Subject: [PATCH] add to Address List

---
 system/controllers/services.php |  6 +++++-
 system/cron.php                 |  2 ++
 system/lan/english.json         |  3 ++-
 ui/ui/hotspot-add.tpl           | 33 ++-------------------------------
 ui/ui/hotspot-edit.tpl          |  7 +++++++
 ui/ui/hotspot.tpl               |  2 +-
 ui/ui/pppoe-add.tpl             |  9 ++++++++-
 ui/ui/pppoe-edit.tpl            | 16 +++++++++++-----
 ui/ui/pppoe.tpl                 |  2 +-
 update.php                      |  3 ++-
 10 files changed, 41 insertions(+), 42 deletions(-)

diff --git a/system/controllers/services.php b/system/controllers/services.php
index 38d2a29a..a46b1754 100644
--- a/system/controllers/services.php
+++ b/system/controllers/services.php
@@ -470,6 +470,7 @@ switch ($action) {
         $routers = _post('routers');
         $pool = _post('pool_name');
         $pool_expired = _post('pool_expired');
+        $list_expired = _post('list_expired');
         $enabled = _post('enabled');
         $allow_purchase = _post('allow_purchase');
 
@@ -529,8 +530,9 @@ switch ($action) {
             } else {
                 $d->is_radius = 0;
                 $d->routers = $routers;
-                $d->pool_expired = $pool_expired;
             }
+            $d->pool_expired = $pool_expired;
+            $d->list_expired = $list_expired;
             $d->enabled = $enabled;
             $d->allow_purchase = $allow_purchase;
             $d->save();
@@ -563,6 +565,7 @@ switch ($action) {
         $routers = _post('routers');
         $pool = _post('pool_name');
         $pool_expired = _post('pool_expired');
+        $list_expired = _post('list_expired');
         $enabled = _post('enabled');
         $allow_purchase = _post('allow_purchase');
 
@@ -622,6 +625,7 @@ switch ($action) {
             $d->routers = $routers;
             $d->pool = $pool;
             $d->pool_expired = $pool_expired;
+            $d->list_expired = $list_expired;
             $d->enabled = $enabled;
             $d->allow_purchase = $allow_purchase;
             $d->save();
diff --git a/system/cron.php b/system/cron.php
index 13526655..e3cdd5b2 100644
--- a/system/cron.php
+++ b/system/cron.php
@@ -46,6 +46,8 @@ foreach ($d as $ds) {
                 $client = Mikrotik::getClient($m['ip_address'], $m['username'], $m['password']);
                 if (!empty($p['pool_expired'])) {
                     Mikrotik::setHotspotUserPackage($client, $c['username'], 'EXPIRED NUXBILL ' . $p['pool_expired']);
+                }if (!empty($p['list_expired'])) {
+                    Mikrotik::addIpToAddressList($client, $ip, $p['list_expired'], $c['username']);
                 } else {
                     Mikrotik::removeHotspotUser($client, $c['username']);
                 }
diff --git a/system/lan/english.json b/system/lan/english.json
index bdf1f135..0f7f8bd3 100644
--- a/system/lan/english.json
+++ b/system/lan/english.json
@@ -417,5 +417,6 @@
     "Login": "Login",
     "Expired_Action": "Expired Action",
     "Expired_Address_List_Name": "Expired Address List Name",
-    "Address_List": "Address List"
+    "Address_List": "Address List",
+    "Optional": "Optional"
 }
\ No newline at end of file
diff --git a/ui/ui/hotspot-add.tpl b/ui/ui/hotspot-add.tpl
index 37784ee2..5d4c43be 100644
--- a/ui/ui/hotspot-add.tpl
+++ b/ui/ui/hotspot-add.tpl
@@ -147,19 +147,7 @@
                             </div>
                         </div>
                     </span>
-                    <div class="form-group">
-                        <label class="col-md-2 control-label">{Lang::T('Expired Action')}</label>
-                        <div class="col-md-10">
-                            <label><input type="radio" onclick="setExp(1)" checked name="exp_act" value="pool"> IP
-                                Pool</label>
-                            &nbsp;&nbsp;
-                            <label><input type="radio" onclick="setExp(2)" name="exp_act" value="list"> Address
-                                List</label>
-                            &nbsp;&nbsp;
-                            <label><input type="radio" onclick="setExp(0)" name="exp_act" value="none">
-                                None</label>
-                        </div>
-                    </div>
+                    <legend>{Lang::T('Expired Action')} <sub>{Lang::T('Optional')}</sub></legend>
                     <div class="form-group" id="ipPool">
                         <label class="col-md-2 control-label"><a
                                 href="{$_url}pool/add">{Lang::T('Expired IP Pool')}</a></label>
@@ -169,7 +157,7 @@
                             </select>
                         </div>
                     </div>
-                    <div class="form-group hidden" id="AddressList">
+                    <div class="form-group" id="AddressList">
                         <label class="col-md-2 control-label">{Lang::T('Address List')}</label>
                         <div class="col-md-6">
                             <input type="text" class="form-control" name="list_expired" id="list_expired">
@@ -208,23 +196,6 @@
                     $("#routerChoose").removeClass('hidden');
                 }
             }
-
-            function setExp(vl) {
-                if (vl == 1) {
-                    $('#list_expired').val('');
-                    $('#ipPool').removeClass('hidden');
-                    $('#AddressList').addClass('hidden');
-                } else if (vl == 2) {
-                    $('#pool_expired').prop('selectedIndex', 0);
-                    $('#ipPool').addClass('hidden');
-                    $('#AddressList').removeClass('hidden');
-                } else {
-                    $('#pool_expired').prop('selectedIndex', 0);
-                    $('#list_expired').val('');
-                    $('#ipPool').addClass('hidden');
-                    $('#AddressList').addClass('hidden');
-                }
-            }
         </script>
     {/literal}
 {/if}
diff --git a/ui/ui/hotspot-edit.tpl b/ui/ui/hotspot-edit.tpl
index 736241f8..4e7d1df1 100644
--- a/ui/ui/hotspot-edit.tpl
+++ b/ui/ui/hotspot-edit.tpl
@@ -152,6 +152,7 @@
                             </div>
                         </div>
                     </span>
+                    <legend>{Lang::T('Expired Action')} <sub>{Lang::T('Optional')}</sub></legend>
                     <div class="form-group">
                         <label class="col-md-2 control-label"><a
                                 href="{$_url}pool/add">{Lang::T('Expired IP Pool')}</a></label>
@@ -165,6 +166,12 @@
                             </select>
                         </div>
                     </div>
+                    <div class="form-group" id="AddressList">
+                        <label class="col-md-2 control-label">{Lang::T('Address List')}</label>
+                        <div class="col-md-6">
+                            <input type="text" class="form-control" name="list_expired" id="list_expired" value="{$d['list_expired']}">
+                        </div>
+                    </div>
                     <div class="form-group">
                         <div class="col-md-offset-2 col-md-10">
                             <button class="btn btn-success waves-effect waves-light"
diff --git a/ui/ui/hotspot.tpl b/ui/ui/hotspot.tpl
index f827d875..51fae5b1 100644
--- a/ui/ui/hotspot.tpl
+++ b/ui/ui/hotspot.tpl
@@ -67,7 +67,7 @@
                                             {/if}
                                         {/if}
                                     </td>
-                                    <td>{$ds['pool_expired']}</td>
+                                    <td>{$ds['pool_expired']}{if $ds['list_expired']}{if $ds['pool_expired']} | {/if}{$ds['list_expired']}{/if}</td>
                                     <td>
                                         <a href="{$_url}services/edit/{$ds['id']}"
                                             class="btn btn-info btn-xs">{Lang::T('Edit')}</a>
diff --git a/ui/ui/pppoe-add.tpl b/ui/ui/pppoe-add.tpl
index b469137d..27684df0 100644
--- a/ui/ui/pppoe-add.tpl
+++ b/ui/ui/pppoe-add.tpl
@@ -91,7 +91,8 @@
                             </select>
                         </div>
                     </div>
-                    <div class="form-group">
+                    <legend>{Lang::T('Expired Action')} <sub>{Lang::T('Optional')}</sub></legend>
+                    <div class="form-group" id="ipPool">
                         <label class="col-md-2 control-label"><a
                                 href="{$_url}pool/add">{Lang::T('Expired IP Pool')}</a></label>
                         <div class="col-md-6">
@@ -100,6 +101,12 @@
                             </select>
                         </div>
                     </div>
+                    <div class="form-group" id="AddressList">
+                        <label class="col-md-2 control-label">{Lang::T('Address List')}</label>
+                        <div class="col-md-6">
+                            <input type="text" class="form-control" name="list_expired" id="list_expired">
+                        </div>
+                    </div>
                     <div class="form-group">
                         <div class="col-md-offset-2 col-md-10">
                             <button class="btn btn-primary waves-effect waves-light"
diff --git a/ui/ui/pppoe-edit.tpl b/ui/ui/pppoe-edit.tpl
index 517c7511..2b8e28cc 100644
--- a/ui/ui/pppoe-edit.tpl
+++ b/ui/ui/pppoe-edit.tpl
@@ -87,6 +87,14 @@
                             </select>
                         </div>
                     </div>
+                    <div class="form-group">
+                        <label class="col-md-2 control-label">{Lang::T('Router Name')}</label>
+                        <div class="col-md-6">
+                            <input type="text" class="form-control" id="routers" name="routers" value="{$d['routers']}"
+                                readonly>
+                        </div>
+                    </div>
+                    <legend>{Lang::T('Expired Action')} <sub>{Lang::T('Optional')}</sub></legend>
                     <div class="form-group">
                         <label class="col-md-2 control-label"><a
                                 href="{$_url}pool/add">{Lang::T('Expired IP Pool')}</a></label>
@@ -100,14 +108,12 @@
                             </select>
                         </div>
                     </div>
-                    <div class="form-group">
-                        <label class="col-md-2 control-label">{Lang::T('Router Name')}</label>
+                    <div class="form-group" id="AddressList">
+                        <label class="col-md-2 control-label">{Lang::T('Address List')}</label>
                         <div class="col-md-6">
-                            <input type="text" class="form-control" id="routers" name="routers" value="{$d['routers']}"
-                                readonly>
+                            <input type="text" class="form-control" name="list_expired" id="list_expired" value="{$d['list_expired']}">
                         </div>
                     </div>
-
                     <div class="form-group">
                         <div class="col-lg-offset-2 col-lg-10">
                             <button class="btn btn-success waves-effect waves-light"
diff --git a/ui/ui/pppoe.tpl b/ui/ui/pppoe.tpl
index b2f8e289..12399793 100644
--- a/ui/ui/pppoe.tpl
+++ b/ui/ui/pppoe.tpl
@@ -54,7 +54,7 @@
                                     <td>{Lang::moneyFormat($ds['price'])}</td>
                                     <td>{$ds['validity']} {$ds['validity_unit']}</td>
                                     <td>{$ds['pool']}</td>
-                                    <td>{$ds['pool_expired']}</td>
+                                    <td>{$ds['pool_expired']}{if $ds['list_expired']}{if $ds['pool_expired']} | {/if}{$ds['list_expired']}{/if}</td>
                                     <td>
                                     {if $ds['is_radius']}
                                         <span class="label label-primary">RADIUS</span>
diff --git a/update.php b/update.php
index ceb2a13f..db635674 100644
--- a/update.php
+++ b/update.php
@@ -118,6 +118,7 @@ if (empty($step)) {
     }
     $step++;
 } else {
+    $path = 'ui/compiled/';
     $version = json_decode(file_get_contents('version.json'), true)['version'];
     $continue = false;
 }
@@ -185,7 +186,7 @@ function deleteFolder($path)
     <link rel="stylesheet" href="ui/ui/fonts/MaterialDesign/css/materialdesignicons.min.css">
 
     <link rel="stylesheet" href="ui/ui/styles/modern-AdminLTE.min.css">
-    
+
     <?php if ($continue) { ?>
         <meta http-equiv="refresh" content="3; ./update.php?step=<?= $step ?>">
     <?php } ?>