hotspotbilling/phpnuxbill
1
1
Fork 0
mirror of https://github.com/hotspotbilling/phpnuxbill.git synced 2024-09-20 06:46:22 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #303 from agstrxyz/patch-15

Browse source 
Update MikrotikVpn.php
This commit is contained in:
iBNu Maksum 2024-09-13 16:44:06 +07:00 committed by GitHub
parent c0c54ce767 3c6ef3bcf3
commit 5f7f785d99
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
system/devices/MikrotikVpn.php
View file

@ -400,8 +400,10 @@ class MikrotikVpn
$this->checkPort($cust['id'], 'Web', $plan['routers']); $this->checkPort($cust['id'], 'Web', $plan['routers']);
$tcf = ORM::for_table('tbl_customers_fields') $tcf = ORM::for_table('tbl_customers_fields')
->where('customer_id', $cust['id']) ->where('customer_id', $cust['id'])
->find_many(); ->find_many();
$ip = ORM::for_table('tbl_port_pool')
->where('routers', $plan['routers'])
->find_one();
foreach ($tcf as $cf) { foreach ($tcf as $cf) {
$dst = $cf['field_value']; $dst = $cf['field_value'];
$cmnt = $cf['field_name']; $cmnt = $cf['field_name'];
@ -421,7 +423,7 @@ class MikrotikVpn
->setArgument('action', 'dst-nat') ->setArgument('action', 'dst-nat')
->setArgument('to-addresses', $ips) ->setArgument('to-addresses', $ips)
->setArgument('to-ports', $tp) ->setArgument('to-ports', $tp)
->setArgument('address', $ip) ->setArgument('dst-address', $ip['public_ip'])
->setArgument('comment', $cmnt.' || '.$cust['username']) ->setArgument('comment', $cmnt.' || '.$cust['username'])
); );
} }
@ -434,9 +436,7 @@ class MikrotikVpn
if ($_app_stage == 'demo') { if ($_app_stage == 'demo') {
return null; return null;
} }
$tcf = ORM::for_table('tbl_customers_fields')
->where('customer_id', $cstid)
->find_many();
$cst = ORM::for_table('tbl_customers')->find_one($cstid); $cst = ORM::for_table('tbl_customers')->find_one($cstid);
$printRequest = new RouterOS\Request('/ip/firewall/nat/print'); $printRequest = new RouterOS\Request('/ip/firewall/nat/print');
$printRequest->setQuery(RouterOS\Query::where('to-addresses', $cst['pppoe_ip'])); $printRequest->setQuery(RouterOS\Query::where('to-addresses', $cst['pppoe_ip']));