From bc763b476e6e5f800a5f6b9f948f5011789c1656 Mon Sep 17 00:00:00 2001 From: Ibnu Maksum Date: Mon, 16 Oct 2023 13:44:00 +0700 Subject: [PATCH] Check radius in sync pool --- system/autoload/Mikrotik.php | 2 +- system/controllers/pool.php | 14 ++++++++------ 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/system/autoload/Mikrotik.php b/system/autoload/Mikrotik.php index 7357d5af..a7aefb35 100644 --- a/system/autoload/Mikrotik.php +++ b/system/autoload/Mikrotik.php @@ -21,7 +21,7 @@ class Mikrotik return new RouterOS\Client($iport[0], $user, $pass, ($iport[1]) ? $iport[1] : null); } catch (Exception $e) { $ui->assign("error_title", "Mikrotik Connection Error"); - $ui->assign("error_message", "Unable to connect to the router.
" . $e->getMessage()); + $ui->assign("error_message", "Unable to connect to the router : $ip
" . $e->getMessage() . '
' . $e->getTraceAsString() . '
'); $ui->display('router-error.tpl'); die(); } diff --git a/system/controllers/pool.php b/system/controllers/pool.php index 556c5919..2973ce0f 100644 --- a/system/controllers/pool.php +++ b/system/controllers/pool.php @@ -62,7 +62,7 @@ switch ($action) { $d = ORM::for_table('tbl_pool')->find_one($id); $mikrotik = Mikrotik::info($d['routers']); if ($d) { - if ($d['routers']!='radius') { + if ($d['routers'] != 'radius') { $client = Mikrotik::getClient($mikrotik['ip_address'], $mikrotik['username'], $mikrotik['password']); Mikrotik::removePool($client, $d['pool_name']); } @@ -75,11 +75,13 @@ switch ($action) { case 'sync': $pools = ORM::for_table('tbl_pool')->find_many(); $log = ''; - foreach($pools as $pool){ - $mikrotik = Mikrotik::info($pool['routers']); - $client = Mikrotik::getClient($mikrotik['ip_address'], $mikrotik['username'], $mikrotik['password']); - Mikrotik::addPool($client, $pool['pool_name'], $pool['range_ip']); - $log .= 'DONE: '.$pool['pool_name'].': '.$pool['range_ip'].'
'; + foreach ($pools as $pool) { + if ($pool['routers'] != 'radius') { + $mikrotik = Mikrotik::info($pool['routers']); + $client = Mikrotik::getClient($mikrotik['ip_address'], $mikrotik['username'], $mikrotik['password']); + Mikrotik::addPool($client, $pool['pool_name'], $pool['range_ip']); + $log .= 'DONE: ' . $pool['pool_name'] . ': ' . $pool['range_ip'] . '
'; + } } r2(U . 'pool/list', 's', $log); break;