Merge branch 'Development' of https://github.com/Focuslinkstech/phpnuxbill into Development

system/autoload/Lang.php

@@ -127,7 +127,7 @@ class Lang
 
         if (!$full)
             $string = array_slice($string, 0, 1);
-        return $string ? implode(', ', $string) . ' ago' : 'just now';
+            return $string ? implode(', ', $string) .' '. Lang::T('ago') : Lang::T('just now');
     }
 
     public static function nl2br($text)

system/autoload/Package.php

@@ -175,7 +175,7 @@ class Package
             };
             $time = date("23:59:00");
         } else if ($p['validity_unit'] == 'Days') {
-            $datetime = date("Y-m-d H:i:s", strtotime('+' . $p['validity'] . ' day'));
+            $datetime = explode(' ', date("Y-m-d H:i:s", strtotime('+' . $p['validity'] . ' day')));
             $date_exp = $datetime[0];
             $time = $datetime[1];
         } else if ($p['validity_unit'] == 'Hrs') {

system/autoload/Radius.php

@@ -92,7 +92,7 @@ class Radius
     {
         $rates = explode('/', $rate);
  ##burst fixed
-		if (str_contains($rate, ' ')) {
+		if (strpos($rate, ' ')) {
           $ratos = $rates[0].'/'.$rates[1].' '.$rates[2].'/'.$rates[3].'/'.$rates[4].'/'.$rates[5].'/'.$rates[6];
          } else {
 		 $ratos = $rates[0].'/'.$rates[1];

system/autoload/User.php

@@ -74,7 +74,7 @@ class User
                 list($cost, $rem) = explode(":", $v);
                 // :0 installment is done
                 if ($rem != 0) {
-                    User::setAttribute($k, "$cost:".($rem - 1), $id);
+                    User::setAttribute($k, "$cost:" . ($rem - 1), $id);
                 }
             }
         }
@@ -177,21 +177,13 @@ class User
         }
         $d = ORM::for_table('tbl_user_recharges')
             ->select('tbl_user_recharges.id', 'id')
-            ->select('customer_id')
-            ->select('username')
-            ->select('plan_id')
-            ->select('namebp')
-            ->select('recharged_on')
-            ->select('recharged_time')
-            ->select('expiration')
-            ->select('time')
-            ->select('status')
-            ->select('method')
-            ->select('plan_type')
-            ->select('tbl_user_recharges.routers', 'routers')
-            ->select('tbl_user_recharges.type', 'type')
-            ->select('admin_id')
-            ->select('prepaid')
+            ->selects([
+                'customer_id', 'username', 'plan_id', 'namebp', 'recharged_on', 'recharged_time', 'expiration', 'time',
+                'status', 'method', 'plan_type',
+                ['tbl_user_recharges.routers', 'routers'],
+                ['tbl_user_recharges.type', 'type'],
+                'admin_id', 'prepaid'
+            ])
             ->where('customer_id', $id)
             ->join('tbl_plans', array('tbl_plans.id', '=', 'tbl_user_recharges.plan_id'))
             ->find_many();