Merge branch 'fronkdev'

application/Termination/Termination.php

@@ -236,25 +236,28 @@ class Termination extends mfBaseModel {
         $return["pairs"] = [];
 
         $ports = preg_replace('/[^0-9-]+/', "", $ports);
-    if(strpos($ports, "-") !== false) {
-      // port range
-      $this->log->debug("is range");
-      $port_parts = explode("-", $ports);
-      if(is_array($port_parts) && count($port_parts) == 2) {
-        $from = intval($port_parts[0]);
-        $to = intval($port_parts[1]);
 
-        if($from > $to) {
+        $port_parts = false;
-          $tmp = $from;
+        if(preg_match('/^(\d+)-(\d+)$/', $ports, $m)) {
-          $from = $to;
+            $port_parts = [$m[1], $m[2]];
-          $to = $tmp;
+        }
+
+        if(!is_array($port_parts) || count($port_parts) < 2) {
+            // not a valid port range, treat as single port
+            $return["range"][] = $ports;
+        } else {
+            // valid port range
+            $from = $port_parts[0];
+            $to = $port_parts[1];
+
+            if($port_parts[0] > $port_parts[1]) {
+                $from = $port_parts[1];
+                $to = $port_parts[0];
             }
 
             $range = [];
             $pairs = [];
 
-        
-        
             for($i = $from; $i <= $to; $i++) {
                 $range[] = intval($i);
                 if($i + 1 <= $to) {
@@ -265,11 +268,6 @@ class Termination extends mfBaseModel {
             $return["range"] = $range;
             $return["pairs"] = $pairs;
         }
-    } else {
-      // single port
-      $this->log->debug("not a range");
-      $return["range"][] = $ports;
-    }
 
         //var_dump($return);exit;
         return $return;