From daf1bb7d67b2bf0576def35e6770becdaa5d8adb Mon Sep 17 00:00:00 2001
From: iBNu Maksum <me@ibnux.net>
Date: Sun, 22 Dec 2024 15:10:01 +0700
Subject: [PATCH] fix radius rest pppoe_username

---
 radius.php | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/radius.php b/radius.php
index e4c37913..ef857563 100644
--- a/radius.php
+++ b/radius.php
@@ -162,14 +162,16 @@ try {
                         }
                     }
                 } else {
-                    $c = ORM::for_table('tbl_customers')->select('password')->select('pppoe_password')->whereRaw("BINARY pppoe_username = '$username' AND status = 'Active'")->find_one();
+                    $c = ORM::for_table('tbl_customers')->select('password')->select('username')->select('pppoe_password')->whereRaw("BINARY pppoe_username = '$username' AND status = 'Active'")->find_one();
                     if ($c) {
                         if (Password::chap_verify($c['password'], $CHAPassword, $CHAPchallenge)) {
                             $password = $c['password'];
+                            $username = $c['username'];
                             $isVoucher = false;
                             $isCHAP = true;
                         } else if (!empty($c['pppoe_password']) && Password::chap_verify($c['pppoe_password'], $CHAPassword, $CHAPchallenge)) {
                             $password = $c['pppoe_password'];
+                            $username = $c['username'];
                             $isVoucher = false;
                             $isCHAP = true;
                         } else {
@@ -202,6 +204,12 @@ try {
                 }
             }
             $tur = ORM::for_table('tbl_user_recharges')->whereRaw("BINARY username = '$username'")->find_one();
+            if (!$tur) {
+                // if check if pppoe_username
+                $c = ORM::for_table('tbl_customers')->select('username')->select('pppoe_password')->whereRaw("BINARY pppoe_username = '$username'")->find_one();
+                $username = $c['username'];
+                $tur = ORM::for_table('tbl_user_recharges')->whereRaw("BINARY username = '$username'")->find_one();
+            }
             if ($tur) {
                 if (!$isVoucher && !$isCHAP) {
                     $d = ORM::for_table('tbl_customers')->select('password')->select('pppoe_password')->whereRaw("BINARY username = '$username' AND status = 'Active'")->find_one();