Added 'Allow duplicate vlans' option under settings that allows vlan duplicates and fixed vlan edit bug if vlan number is changed #phpipam#991

Author: phpipam

Diff for: app/admin/settings/index.php

@@ -446,6 +446,17 @@
 	</td>
 </tr>
 
+<!-- vlanDuplicate -->
+<tr>
+	<td class="title"><?php print _("Allow duplicate vlans"); ?></td>
+	<td>
+		<input type="checkbox" class="input-switch" value="1" name="vlanDuplicate" <?php if($settings['vlanDuplicate'] == 1) print 'checked'; ?>>
+	</td>
+	<td class="info2">
+		<?php print _('Allow duplicated vlans inside L2 domain'); ?>
+	</td>
+</tr>
+
 
 <!-- ICPM -->
 <tr class="settings-title">

Diff for: app/admin/vlans/edit-result.php

@@ -34,11 +34,13 @@
 $custom = $Tools->fetch_custom_fields('vlans');
 
 //if it already exist die
-if($User->settings->vlanDuplicate==0 && $_POST['action']=="add") {
+if($User->settings->vlanDuplicate==0 && ($_POST['action']=="add" || $_POST['action']=="edit")) {
 	$check_vlan = $Admin->fetch_multiple_objects ("vlans", "domainId", $_POST['domainId'], "vlanId");
+	// check
 	if($check_vlan!==false) {
 		foreach($check_vlan as $v) {
-			if($v->number == $_POST['number']) {
+			if ($v->vlanId==$_POST['vlanId']) {}
+			elseif($v->number == $_POST['number']) {
 																			{ $Result->show("danger", _("VLAN already exists"), true); }
 			}
 		}
@@ -86,6 +88,4 @@
 if($_POST['action']=="delete") { $Admin->remove_object_references ("subnets", "vlanId", $_POST['vlanId']); }
 
 # print value for on the fly
-if($_POST['action']=="add")	   { print '<p id="vlanidforonthefly"    style="display:none">'.$Admin->lastId.'</p>'; }
-
-?>
+if($_POST['action']=="add")	   { print '<p id="vlanidforonthefly"    style="display:none">'.$Admin->lastId.'</p>'; }

Diff for: misc/Roadmap

@@ -22,6 +22,7 @@ https://github.com/phpipam/phpipam/milestone/2
         #109  IP deletion request for non administrative users
         #1068 Custom section and other fields
         #1023 Location tags, subnet tags, ...
+        #998  User credentials security constraints are too tight and not configurable
 
     API:
         #800  Changelog Doesn't Track Changes Made Via API