kevinowino869/mitrobill
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

add to Address List

Browse Source
This commit is contained in:
Ibnu Maksum 2024-02-20 10:07:07 +07:00
parent cfb81596ae
commit 349a1d3250
No known key found for this signature in database
GPG Key ID: 7FC82848810579E5
10 changed files with 41 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
system/controllers/services.php
View File

@ -470,6 +470,7 @@ switch ($action) {
$routers = _post('routers'); $routers = _post('routers');
$pool = _post('pool_name'); $pool = _post('pool_name');
$pool_expired = _post('pool_expired'); $pool_expired = _post('pool_expired');
$list_expired = _post('list_expired');
$enabled = _post('enabled'); $enabled = _post('enabled');
$allow_purchase = _post('allow_purchase'); $allow_purchase = _post('allow_purchase');
@ -529,8 +530,9 @@ switch ($action) {
} else { } else {
$d->is_radius = 0; $d->is_radius = 0;
$d->routers = $routers; $d->routers = $routers;
$d->pool_expired = $pool_expired;
} }
$d->pool_expired = $pool_expired;
$d->list_expired = $list_expired;
$d->enabled = $enabled; $d->enabled = $enabled;
$d->allow_purchase = $allow_purchase; $d->allow_purchase = $allow_purchase;
$d->save(); $d->save();
@ -563,6 +565,7 @@ switch ($action) {
$routers = _post('routers'); $routers = _post('routers');
$pool = _post('pool_name'); $pool = _post('pool_name');
$pool_expired = _post('pool_expired'); $pool_expired = _post('pool_expired');
$list_expired = _post('list_expired');
$enabled = _post('enabled'); $enabled = _post('enabled');
$allow_purchase = _post('allow_purchase'); $allow_purchase = _post('allow_purchase');
@ -622,6 +625,7 @@ switch ($action) {
$d->routers = $routers; $d->routers = $routers;
$d->pool = $pool; $d->pool = $pool;
$d->pool_expired = $pool_expired; $d->pool_expired = $pool_expired;
$d->list_expired = $list_expired;
$d->enabled = $enabled; $d->enabled = $enabled;
$d->allow_purchase = $allow_purchase; $d->allow_purchase = $allow_purchase;
$d->save(); $d->save();

2
system/cron.php
View File

@ -46,6 +46,8 @@ foreach ($d as $ds) {
$client = Mikrotik::getClient($m['ip_address'], $m['username'], $m['password']); $client = Mikrotik::getClient($m['ip_address'], $m['username'], $m['password']);
if (!empty($p['pool_expired'])) { if (!empty($p['pool_expired'])) {
Mikrotik::setHotspotUserPackage($client, $c['username'], 'EXPIRED NUXBILL ' . $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 { } else {
Mikrotik::removeHotspotUser($client, $c['username']); Mikrotik::removeHotspotUser($client, $c['username']);
} }

3
system/lan/english.json
View File

@ -417,5 +417,6 @@
"Login": "Login", "Login": "Login",
"Expired_Action": "Expired Action", "Expired_Action": "Expired Action",
"Expired_Address_List_Name": "Expired Address List Name", "Expired_Address_List_Name": "Expired Address List Name",
"Address_List": "Address List" "Address_List": "Address List",
"Optional": "Optional"
} }

33
ui/ui/hotspot-add.tpl
View File

@ -147,19 +147,7 @@
</div> </div>
</div> </div>
</span> </span>
<div class="form-group"> <legend>{Lang::T('Expired Action')} <sub>{Lang::T('Optional')}</sub></legend>
<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>
<div class="form-group" id="ipPool"> <div class="form-group" id="ipPool">
<label class="col-md-2 control-label"><a <label class="col-md-2 control-label"><a
href="{$_url}pool/add">{Lang::T('Expired IP Pool')}</a></label> href="{$_url}pool/add">{Lang::T('Expired IP Pool')}</a></label>
@ -169,7 +157,7 @@
</select> </select>
</div> </div>
</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> <label class="col-md-2 control-label">{Lang::T('Address List')}</label>
<div class="col-md-6"> <div class="col-md-6">
<input type="text" class="form-control" name="list_expired" id="list_expired"> <input type="text" class="form-control" name="list_expired" id="list_expired">
@ -208,23 +196,6 @@
$("#routerChoose").removeClass('hidden'); $("#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> </script>
{/literal} {/literal}
{/if} {/if}

7
ui/ui/hotspot-edit.tpl
View File

@ -152,6 +152,7 @@
</div> </div>
</div> </div>
</span> </span>
<legend>{Lang::T('Expired Action')} <sub>{Lang::T('Optional')}</sub></legend>
<div class="form-group"> <div class="form-group">
<label class="col-md-2 control-label"><a <label class="col-md-2 control-label"><a
href="{$_url}pool/add">{Lang::T('Expired IP Pool')}</a></label> href="{$_url}pool/add">{Lang::T('Expired IP Pool')}</a></label>
@ -165,6 +166,12 @@
</select> </select>
</div> </div>
</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="form-group">
<div class="col-md-offset-2 col-md-10"> <div class="col-md-offset-2 col-md-10">
<button class="btn btn-success waves-effect waves-light" <button class="btn btn-success waves-effect waves-light"

2
ui/ui/hotspot.tpl
View File

@ -67,7 +67,7 @@
{/if} {/if}
{/if} {/if}
</td> </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> <td>
<a href="{$_url}services/edit/{$ds['id']}" <a href="{$_url}services/edit/{$ds['id']}"
class="btn btn-info btn-xs">{Lang::T('Edit')}</a> class="btn btn-info btn-xs">{Lang::T('Edit')}</a>

9
ui/ui/pppoe-add.tpl
View File

@ -91,7 +91,8 @@
</select> </select>
</div> </div>
</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 <label class="col-md-2 control-label"><a
href="{$_url}pool/add">{Lang::T('Expired IP Pool')}</a></label> href="{$_url}pool/add">{Lang::T('Expired IP Pool')}</a></label>
<div class="col-md-6"> <div class="col-md-6">
@ -100,6 +101,12 @@
</select> </select>
</div> </div>
</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="form-group">
<div class="col-md-offset-2 col-md-10"> <div class="col-md-offset-2 col-md-10">
<button class="btn btn-primary waves-effect waves-light" <button class="btn btn-primary waves-effect waves-light"

16
ui/ui/pppoe-edit.tpl
View File

@ -87,6 +87,14 @@
</select> </select>
</div> </div>
</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"> <div class="form-group">
<label class="col-md-2 control-label"><a <label class="col-md-2 control-label"><a
href="{$_url}pool/add">{Lang::T('Expired IP Pool')}</a></label> href="{$_url}pool/add">{Lang::T('Expired IP Pool')}</a></label>
@ -100,14 +108,12 @@
</select> </select>
</div> </div>
</div> </div>
<div class="form-group"> <div class="form-group" id="AddressList">
<label class="col-md-2 control-label">{Lang::T('Router Name')}</label> <label class="col-md-2 control-label">{Lang::T('Address List')}</label>
<div class="col-md-6"> <div class="col-md-6">
<input type="text" class="form-control" id="routers" name="routers" value="{$d['routers']}" <input type="text" class="form-control" name="list_expired" id="list_expired" value="{$d['list_expired']}">
readonly>
</div> </div>
</div> </div>
<div class="form-group"> <div class="form-group">
<div class="col-lg-offset-2 col-lg-10"> <div class="col-lg-offset-2 col-lg-10">
<button class="btn btn-success waves-effect waves-light" <button class="btn btn-success waves-effect waves-light"

2
ui/ui/pppoe.tpl
View File

@ -54,7 +54,7 @@
<td>{Lang::moneyFormat($ds['price'])}</td> <td>{Lang::moneyFormat($ds['price'])}</td>
<td>{$ds['validity']} {$ds['validity_unit']}</td> <td>{$ds['validity']} {$ds['validity_unit']}</td>
<td>{$ds['pool']}</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> <td>
{if $ds['is_radius']} {if $ds['is_radius']}
<span class="label label-primary">RADIUS</span> <span class="label label-primary">RADIUS</span>

3
update.php
View File

@ -118,6 +118,7 @@ if (empty($step)) {
} }
$step++; $step++;
} else { } else {
$path = 'ui/compiled/';
$version = json_decode(file_get_contents('version.json'), true)['version']; $version = json_decode(file_get_contents('version.json'), true)['version'];
$continue = false; $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/fonts/MaterialDesign/css/materialdesignicons.min.css">
<link rel="stylesheet" href="ui/ui/styles/modern-AdminLTE.min.css"> <link rel="stylesheet" href="ui/ui/styles/modern-AdminLTE.min.css">
<?php if ($continue) { ?> <?php if ($continue) { ?>
<meta http-equiv="refresh" content="3; ./update.php?step=<?= $step ?>"> <meta http-equiv="refresh" content="3; ./update.php?step=<?= $step ?>">
<?php } ?> <?php } ?>