Fix Remove PPPOE user

Author: ibnux

system/autoload/Mikrotik.php

@@ -219,17 +219,17 @@ public static function setHotspotLimitUptime($client, $username)
 
     public static function removePpoeUser($client, $username)
     {
-        $printRequest = new RouterOS\Request(
-            '/ppp secret print .proplist=name',
-            RouterOS\Query::where('name', $username)
-        );
-        $id = $client->sendSync($printRequest)->getProperty('.id');
 
-        $removeRequest = new RouterOS\Request('/ppp/secret/remove');
-        $client(
-            $removeRequest
-                ->setArgument('numbers', $id)
-        );
+    $printRequest = new RouterOS\Request('/ppp/secret/print');
+    $printRequest->setArgument('.proplist', '.id');
+    $printRequest->setQuery(RouterOS\Query::where('name', $username));
+    $id = $client->sendSync($printRequest)->getProperty('.id');
+
+    $removeRequest = new RouterOS\Request('/ppp/secret/remove');
+    $client(
+        $removeRequest
+            ->setArgument('numbers', $id)
+    );
     }
 
     public static function addPpoeUser($client, $plan, $customer)

system/autoload/Package.php

@@ -249,6 +249,7 @@ public static function rechargeUser($id_customer, $router_name, $plan_id, $gatew
                 if (!$_c['radius_mode']) {
                     $client = Mikrotik::getClient($mikrotik['ip_address'], $mikrotik['username'], $mikrotik['password']);
                     Mikrotik::removeHotspotUser($client, $c['username']);
+                    Mikrotik::removePpoeUser($client, $c['username']);
                     Mikrotik::addPpoeUser($client, $p, $c);
                 }
 
@@ -327,24 +328,30 @@ public static function changeTo($username, $plan_id)
                 if (!$_c['radius_mode']) {
                     $client = Mikrotik::getClient($mikrotik['ip_address'], $mikrotik['username'], $mikrotik['password']);
                     Mikrotik::removeHotspotUser($client, $c['username']);
+                    Mikrotik::removePpoeUser($client, $c['username']);
                     Mikrotik::addHotspotUser($client, $p, $c);
                 }
             } else {
                 if (!$_c['radius_mode']) {
                     $client = Mikrotik::getClient($mikrotik['ip_address'], $mikrotik['username'], $mikrotik['password']);
+                    Mikrotik::removeHotspotUser($client, $c['username']);
+                    Mikrotik::removePpoeUser($client, $c['username']);
                     Mikrotik::addHotspotUser($client, $p, $c);
                 }
             }
         } else {
             if ($b) {
                 if (!$_c['radius_mode']) {
                     $client = Mikrotik::getClient($mikrotik['ip_address'], $mikrotik['username'], $mikrotik['password']);
+                    Mikrotik::removeHotspotUser($client, $c['username']);
                     Mikrotik::removePpoeUser($client, $c['username']);
                     Mikrotik::addPpoeUser($client, $p, $c);
                 }
             } else {
                 if (!$_c['radius_mode']) {
                     $client = Mikrotik::getClient($mikrotik['ip_address'], $mikrotik['username'], $mikrotik['password']);
+                    Mikrotik::removeHotspotUser($client, $c['username']);
+                    Mikrotik::removePpoeUser($client, $c['username']);
                     Mikrotik::addPpoeUser($client, $p, $c);
                 }
             }

system/cron.php

@@ -65,7 +65,7 @@ function _autoloader($class)
 
 $textExpired = Lang::getNotifText('expired');
 
-$d = ORM::for_table('tbl_user_recharges')->where('status', 'on')->where('expiration', date("Y-m-d"))->find_many();
+$d = ORM::for_table('tbl_user_recharges')->where('status', 'on')->where_lte('expiration', date("Y-m-d"))->find_many();
 echo "Found ".count($d)." user(s)\n";
 run_hook('cronjob'); #HOOK