GNetDevelopment
diff --git a/‎app/admin/nat/item-add-search.php‎
Lines changed: 6 additions & 1 deletion b/‎app/admin/nat/item-add-search.php‎
Lines changed: 6 additions & 1 deletion
diff --git a/‎db/SCHEMA.sql‎
Lines changed: 1 addition & 1 deletion b/‎db/SCHEMA.sql‎
Lines changed: 1 addition & 1 deletion
diff --git a/‎functions/classes/class.Tools.php‎
Lines changed: 3 additions & 3 deletions b/‎functions/classes/class.Tools.php‎
Lines changed: 3 additions & 3 deletions
diff --git a/‎functions/locale/zh_TW‎
Lines changed: 1 addition & 0 deletions b/‎functions/locale/zh_TW‎
Lines changed: 1 addition & 0 deletions
diff --git a/‎functions/locale/zh_TW.UTF-8/LC_MESSAGES/phpipam.mo‎
166 KB b/‎functions/locale/zh_TW.UTF-8/LC_MESSAGES/phpipam.mo‎
166 KB
@@ -61,7 +61,12 @@
 $result_subnets   = $Tools->search_subnets($search_term, $search_term_edited['high'], $search_term_edited['low'], $_REQUEST['ip']. array());
 
 # if some found print
-if(sizeof($result_addresses)>0 && sizeof($result_subnets)>0) {
+if(sizeof($result_addresses)>0 || sizeof($result_subnets)>0) {
+
+    // init arrays
+    $html1 = [];
+    $html2 = [];
+
     if(sizeof($result_subnets)>0) {
         $html1[] = "<h4>Subnets</h4>";
         foreach ($result_subnets as $s) {
 
@@ -995,4 +995,4 @@ CREATE TABLE `routing_subnets` (
 # ------------------------------------------------------------
 
 UPDATE `settings` SET `version` = "1.4";
-UPDATE `settings` SET `dbversion` = 24;
+UPDATE `settings` SET `dbversion` = 25;
@@ -218,11 +218,11 @@ public function search_subnets($search_term, $high = "", $low = "", $search_req,
 	 */
 	private function search_subnets_range ($search_term, $high, $low, $custom_fields = array()) {
 		# reformat low/high
-		if($high==0 && $low==0)	{ $high = "1"; $low="1"; }
+		if($high==0 && $low==0)	{ $high = "1"; $low = "1"; }
 
 		# set search query
 		$query[] = "select * from `subnets` where `description` like :search_term ";
-		$query[] = "or `subnet` between :low and :high ";
+		$query[] = "or (`subnet` >= :low and `subnet` <= :high )";
 		# custom
 	    if(sizeof($custom_fields) > 0) {
 			foreach($custom_fields as $myField) {
@@ -274,7 +274,7 @@ private function search_subnets_inside ($high, $low) {
 					# parse address
 					$net = $this->Net_IPv4->parseAddress($this->transform_address($s['subnet']).'/'.$s['mask'], "dotted");
 
-					if($low>$this->transform_to_decimal(@$net->network) && $low<$this->transform_address($net->broadcast, "decimal")) {
+					if($low>=$this->transform_to_decimal(@$net->network) && $low<=$this->transform_address($net->broadcast, "decimal")) {
 						$ids[] = $s['id'];
 					}
 				}
 
@@ -0,0 +1 @@
+zh_TW.UTF-8