Merge branch 'Development' into feature/radius

system/autoload/Lang.php

@@ -56,7 +56,11 @@ class Lang
     }
 
     public static function arrayCount($arr){
-        return count($arr);
+        if(is_array($arr)){
+            return count($arr);
+        }else{
+            return 0;
+        }
     }
 
     public static function getNotifText($key){

system/autoload/Validator.php

@@ -299,4 +299,23 @@ class Validator
         return (bool)in_array($format, $formats);
     }
 
+    public static function countRouterPlan($plans, $router){
+        $n = 0;
+        foreach ($plans as $plan){
+            if($plan['routers'] == $router){
+                $n++;
+            }
+        }
+        return $n;
+    }
+
+    public static function isRouterHasPlan($plans, $router){
+        foreach ($plans as $plan){
+            if($plan['routers'] == $router){
+                return true;
+            }
+        }
+        return false;
+    }
+
 }