phpipam / phpipam

app/admin/nameservers/edit-result.php

Indentation +17 added lines, -17 removed lines

@@ -25,38 +25,38 @@
 
 # Name and primary nameserver must be present!
 if ($_POST['action']!="delete") {
-	if($_POST['name'] == "") 				{ $Result->show("danger", _("Name is mandatory"), true); }
-	if(trim($_POST['namesrv-1']) == "") 	{ $Result->show("danger", _("Primary nameserver is mandatory"), true); }
+    if($_POST['name'] == "") 				{ $Result->show("danger", _("Name is mandatory"), true); }
+    if(trim($_POST['namesrv-1']) == "") 	{ $Result->show("danger", _("Primary nameserver is mandatory"), true); }
 }
 
 // merge nameservers
 foreach($_POST as $key=>$line) {
-	if (strlen(strstr($key,"namesrv-"))>0) {
-		if (strlen($line)>0) {
-			$all_nameservers[] = trim($line);
-		}
-	}
+    if (strlen(strstr($key,"namesrv-"))>0) {
+        if (strlen($line)>0) {
+            $all_nameservers[] = trim($line);
+        }
+    }
 }
 $_POST['namesrv1'] = isset($all_nameservers) ? implode(";", $all_nameservers) : "";
 
 // set sections
 foreach($_POST as $key=>$line) {
-	if (strlen(strstr($key,"section-"))>0) {
-		$key2 = str_replace("section-", "", $key);
-		$temp[] = $key2;
-		unset($_POST[$key]);
-	}
+    if (strlen(strstr($key,"section-"))>0) {
+        $key2 = str_replace("section-", "", $key);
+        $temp[] = $key2;
+        unset($_POST[$key]);
+    }
 }
 # glue sections together
 $_POST['permissions'] = sizeof($temp)>0 ? implode(";", $temp) : null;
 
 # set update array
 $values = array("id"=>@$_POST['nameserverId'],
-				"name"=>$_POST['name'],
-				"permissions"=>$_POST['permissions'],
-				"namesrv1"=>$_POST['namesrv1'],
-				"description"=>$_POST['description']
-				);
+                "name"=>$_POST['name'],
+                "permissions"=>$_POST['permissions'],
+                "namesrv1"=>$_POST['namesrv1'],
+                "description"=>$_POST['description']
+                );
 # update
 if(!$Admin->object_modify("nameservers", $_POST['action'], "id", $values))	{ $Result->show("danger",  _("Failed to $_POST[action] nameserver set").'!', true); }
 else																		{ $Result->show("success", _("Nameserver set $_POST[action] successfull").'!', false); }

app/admin/nameservers/edit.php

Indentation +35 added lines, -35 removed lines

@@ -23,9 +23,9 @@ 
 
 # get Nameserver sets
 if($_POST['action']!="add") {
-	$nameservers = $Admin->fetch_object ("nameservers", "id", $_POST['nameserverId']);
-	$nameservers!==false ? : $Result->show("danger", _("Invalid ID"), true, true);
-	$nameservers = (array) $nameservers;
+    $nameservers = $Admin->fetch_object ("nameservers", "id", $_POST['nameserverId']);
+    $nameservers!==false ? : $Result->show("danger", _("Invalid ID"), true, true);
+    $nameservers = (array) $nameservers;
 }
 
 # disable edit on delete
@@ -59,20 +59,20 @@ 
 	<tbody id="nameservers">
 	<!-- Nameservers -->
 	<?php
-	//loop
-	$m=1;
-	foreach ($nameservers['namesrv1'] as $ns) {
-		print "<tr id='namesrv-$m'>";
-		print "	<td>"._("Nameserver")." $m</td>";
-		print "	<td>";
-		print "	<input type='text' class='rd form-control input-sm' name='namesrv-$m' value='$ns' $readonly>";
-		print "	</td>";
-		print "	<td><button class='btn btn-sm btn-default' id='remove_nameserver' data-id='namesrv-".$m."'><i class='fa fa-trash-o'></i></button></td>";
-		print "</tr>";
-		//next
-		$m++;
-	}
-	?>
+    //loop
+    $m=1;
+    foreach ($nameservers['namesrv1'] as $ns) {
+        print "<tr id='namesrv-$m'>";
+        print "	<td>"._("Nameserver")." $m</td>";
+        print "	<td>";
+        print "	<input type='text' class='rd form-control input-sm' name='namesrv-$m' value='$ns' $readonly>";
+        print "	</td>";
+        print "	<td><button class='btn btn-sm btn-default' id='remove_nameserver' data-id='namesrv-".$m."'><i class='fa fa-trash-o'></i></button></td>";
+        print "</tr>";
+        //next
+        $m++;
+    }
+    ?>
 	</tbody>
 
 	<tbody>
@@ -90,8 +90,8 @@ 
 		<td><?php print _('Description'); ?></td>
 		<td>
 			<?php
-			if( ($_POST['action'] == "edit") || ($_POST['action'] == "delete") ) { print '<input type="hidden" name="nameserverId" value="'. $_POST['nameserverId'] .'">'. "\n";}
-			?>
+            if( ($_POST['action'] == "edit") || ($_POST['action'] == "delete") ) { print '<input type="hidden" name="nameserverId" value="'. $_POST['nameserverId'] .'">'. "\n";}
+            ?>
 			<input type="hidden" name="action" value="<?php print $_POST['action']; ?>">
 			<input type="hidden" name="csrf_cookie" value="<?php print $csrf; ?>">
 			<input type="text" class="description form-control input-sm" name="description" placeholder="<?php print _('Description'); ?>" value="<?php print @$nameservers['description']; ?>" <?php print $readonly; ?>>
@@ -104,19 +104,19 @@ 
 		<td style="vertical-align: top !important"><?php print _('Sections to display nameserver set in'); ?>:</td>
 		<td>
 		<?php
-		# select sections
-		$sections = $Sections->fetch_all_sections();
-		# reformat domains sections to array
-		$nameservers_sections = explode(";", @$nameservers['permissions']);
-		$nameservers_sections = is_array($nameservers_sections) ? $nameservers_sections : array();
-		// loop
-		if ($sections !== false) {
-			foreach($sections as $section) {
-				if(in_array($section->id, @$nameservers_sections)) 	{ print '<div class="checkbox" style="margin:0px;"><input type="checkbox" name="section-'. $section->id .'" value="on" checked> '. $section->name .'</div>'. "\n"; }
-				else 												{ print '<div class="checkbox" style="margin:0px;"><input type="checkbox" name="section-'. $section->id .'" value="on">'. $section->name .'</span></div>'. "\n"; }
-			}
-		}
-		?>
+        # select sections
+        $sections = $Sections->fetch_all_sections();
+        # reformat domains sections to array
+        $nameservers_sections = explode(";", @$nameservers['permissions']);
+        $nameservers_sections = is_array($nameservers_sections) ? $nameservers_sections : array();
+        // loop
+        if ($sections !== false) {
+            foreach($sections as $section) {
+                if(in_array($section->id, @$nameservers_sections)) 	{ print '<div class="checkbox" style="margin:0px;"><input type="checkbox" name="section-'. $section->id .'" value="on" checked> '. $section->name .'</div>'. "\n"; }
+                else 												{ print '<div class="checkbox" style="margin:0px;"><input type="checkbox" name="section-'. $section->id .'" value="on">'. $section->name .'</span></div>'. "\n"; }
+            }
+        }
+        ?>
 		</td>
 		<td></td>
 	</tr>
@@ -126,9 +126,9 @@ 
 	</form>
 
 	<?php
-	//print delete warning
-	if($_POST['action'] == "delete")	{ $Result->show("warning", "<strong>"._('Warning').":</strong> "._("removing nameserver set will also remove all references from belonging subnets!"), false);}
-	?>
+    //print delete warning
+    if($_POST['action'] == "delete")	{ $Result->show("warning", "<strong>"._('Warning').":</strong> "._("removing nameserver set will also remove all references from belonging subnets!"), false);}
+    ?>
 </div>
 
 

app/admin/widgets/index.php

Indentation +42 added lines, -42 removed lines

@@ -27,57 +27,57 @@
 
 	<!-- Language list -->
 	<?php
-	/* no results */
-	if($widgets===false) { ?>
+    /* no results */
+    if($widgets===false) { ?>
 		<tr>
 			<td colspan="4"><div class="alert alert-info alert-nomargin"><?php print _('No widgets created yet'); ?></div></td>
 		</tr>
 	<?php } else {
-		# headers
-		print "<thead>";
-		print "<tr>";
-		print "	<th>"._('Title')."</th>";
-		print "	<th>"._('Description')."</th>";
-		print "	<th>"._('File')."</th>";
-		print "	<th>"._('Admin')."</th>";
-		print "	<th>"._('Active')."</th>";
-		print "	<th>"._('Parameters')."</th>";
-		print "	<th>"._('Validity')."</th>";
-		print "	<th></th>";
-		print "</tr>";
-		print "</thead>";
+        # headers
+        print "<thead>";
+        print "<tr>";
+        print "	<th>"._('Title')."</th>";
+        print "	<th>"._('Description')."</th>";
+        print "	<th>"._('File')."</th>";
+        print "	<th>"._('Admin')."</th>";
+        print "	<th>"._('Active')."</th>";
+        print "	<th>"._('Parameters')."</th>";
+        print "	<th>"._('Validity')."</th>";
+        print "	<th></th>";
+        print "</tr>";
+        print "</thead>";
 
         print "<tbody>";
-		# print
-		foreach($widgets as $w) {
-			# cast
-			$w = (array) $w;
+        # print
+        foreach($widgets as $w) {
+            # cast
+            $w = (array) $w;
 
-			# verify validity
-			$valid = $Tools->verify_widget($w['wfile']);
+            # verify validity
+            $valid = $Tools->verify_widget($w['wfile']);
 
-			if($valid)  { $vPrint = "<span class='alert alert-success'>"._('Valid')."</span>"; }
-			else		{ $vPrint = "<span class='alert alert-danger'>"._('Invalid')."</span>"; }
+            if($valid)  { $vPrint = "<span class='alert alert-success'>"._('Valid')."</span>"; }
+            else		{ $vPrint = "<span class='alert alert-danger'>"._('Invalid')."</span>"; }
 
-			print "<tr>";
-			print "	<td>"._($w['wtitle'])."</td>";
-			print "	<td>"._($w['wdescription'])."</td>";
-			print "	<td>$w[wfile].php</td>";
-			print "	<td>"._($w['wadminonly'])."</td>";
-			print "	<td>"._($w['wactive'])."</td>";
-			print "	<td>"._($w['wparams'])."</td>";
-			print "	<td>$vPrint</td>";
-			print "	<td>";
-			print "	<div class='btn-group'>";
-			print "		<button class='btn btn-xs btn-default wedit' data-action='edit' data-wid='$w[wid]'><i class='fa fa-pencil'></i></button>";
-			print "		<button class='btn btn-xs btn-default wedit' data-action='delete' data-wid='$w[wid]'><i class='fa fa-times'></i></button>";
-			print "	</div>";
-			print "	</td>";
-			print "</tr>";
-		}
-		print "</tbody>";
-	}
-	?>
+            print "<tr>";
+            print "	<td>"._($w['wtitle'])."</td>";
+            print "	<td>"._($w['wdescription'])."</td>";
+            print "	<td>$w[wfile].php</td>";
+            print "	<td>"._($w['wadminonly'])."</td>";
+            print "	<td>"._($w['wactive'])."</td>";
+            print "	<td>"._($w['wparams'])."</td>";
+            print "	<td>$vPrint</td>";
+            print "	<td>";
+            print "	<div class='btn-group'>";
+            print "		<button class='btn btn-xs btn-default wedit' data-action='edit' data-wid='$w[wid]'><i class='fa fa-pencil'></i></button>";
+            print "		<button class='btn btn-xs btn-default wedit' data-action='delete' data-wid='$w[wid]'><i class='fa fa-times'></i></button>";
+            print "	</div>";
+            print "	</td>";
+            print "</tr>";
+        }
+        print "</tbody>";
+    }
+    ?>
 
 
 </table>

app/admin/widgets/edit-result.php

Indentation +10 added lines, -10 removed lines

@@ -25,7 +25,7 @@ 
 
 # ID must be numeric */
 if($_POST['action']!="add") {
-	if(!is_numeric($_POST['wid']))								{ $Result->show("danger", _("Invalid ID"), true); }
+    if(!is_numeric($_POST['wid']))								{ $Result->show("danger", _("Invalid ID"), true); }
 }
 # Title and path must be present!
 if($_POST['action']!="delete") {
@@ -37,15 +37,15 @@ 
 
 # set update values
 $values = array("wid"=>@$_POST['wid'],
-				"wtitle"=>$_POST['wtitle'],
-				"wdescription"=>@$_POST['wdescription'],
-				"wfile"=>$_POST['wfile'],
-				"wadminonly"=>$_POST['wadminonly'],
-				"wactive"=>$_POST['wactive'],
-				"wparams"=>$_POST['wparams'],
-				"whref"=>$_POST['whref'],
-				"wsize"=>$_POST['wsize']
-				);
+                "wtitle"=>$_POST['wtitle'],
+                "wdescription"=>@$_POST['wdescription'],
+                "wfile"=>$_POST['wfile'],
+                "wadminonly"=>$_POST['wadminonly'],
+                "wactive"=>$_POST['wactive'],
+                "wparams"=>$_POST['wparams'],
+                "whref"=>$_POST['whref'],
+                "wsize"=>$_POST['wsize']
+                );
 # update
 if(!$Admin->object_modify("widgets", $_POST['action'], "wid", $values))	{ $Result->show("danger",  _("Widget $_POST[action] error")."!", true); }
 else																	{ $Result->show("success", _("Widget $_POST[action] success")."!", true); }

app/admin/widgets/edit.php

Indentation +3 added lines, -3 removed lines

@@ -22,9 +22,9 @@
 
 # fetch widget
 if($_POST['action']!="add") {
-	$w = $Admin->fetch_object ("widgets", "wid", $_POST['wid']);
-	$w!==false ? : $Result->show("danger", _("Invalid ID"), true, true);
-	$w = (array) $w;
+    $w = $Admin->fetch_object ("widgets", "wid", $_POST['wid']);
+    $w!==false ? : $Result->show("danger", _("Invalid ID"), true, true);
+    $w = (array) $w;
 }
 ?>
 

app/admin/ripe-import/import-subnets.php

Indentation +57 added lines, -57 removed lines

@@ -24,73 +24,73 @@
 
 //get unique keys for subnets because they are not sequential if deleted!!!
 foreach($_POST as $key=>$line) {
-	if (strlen(strstr($key,"subnet"))>0) {
-		$allSubnets[] = $key;
-	}
+    if (strlen(strstr($key,"subnet"))>0) {
+        $allSubnets[] = $key;
+    }
 }
 
 # format and verify each record
 foreach($allSubnets as $subnet) {
-	//get sequential number
-	$m = str_replace("subnet-", "", $subnet);
-
-	//reformat subnet
-	$_temp = explode("/", $_POST['subnet-' . $m]);
-
-	//set subnet details for importing
-	$subnet_import['subnet'] 	   = $Subnets->transform_to_decimal($_temp[0]);
-	$subnet_import['mask'] 	   	   = $_temp[1];
-	$subnet_import['sectionId']    = $_POST['section-' . $m];
-	$subnet_import['description']  = $_POST['description-' . $m];
-	$subnet_import['vlanId'] 	   = $_POST['vlan-' . $m];
-	$subnet_import['vrfId'] 	   = $_POST['vrf-' . $m];
-	$subnet_import['showName']	   = $_POST['showName-' . $m];
-
-	//cidr
-	if(strlen($err=$Subnets->verify_cidr($Subnets->transform_to_dotted($subnet_import['subnet'])."/".$subnet_import['mask']))>5) {
-		$errors[] = $err;
-	}
-	//overlapping, only root !
-	else if (strlen($err=$Subnets->verify_subnet_overlapping ($subnet_import['sectionId'], $Subnets->transform_to_dotted($subnet_import['subnet'])."/".$subnet_import['mask'], $subnet_import['vrfId']))>5) {
-		$errors[] = $err;
-	}
-	//set insert
-	else {
-		$subnets_to_insert[] = $subnet_import;
-	}
+    //get sequential number
+    $m = str_replace("subnet-", "", $subnet);
+
+    //reformat subnet
+    $_temp = explode("/", $_POST['subnet-' . $m]);
+
+    //set subnet details for importing
+    $subnet_import['subnet'] 	   = $Subnets->transform_to_decimal($_temp[0]);
+    $subnet_import['mask'] 	   	   = $_temp[1];
+    $subnet_import['sectionId']    = $_POST['section-' . $m];
+    $subnet_import['description']  = $_POST['description-' . $m];
+    $subnet_import['vlanId'] 	   = $_POST['vlan-' . $m];
+    $subnet_import['vrfId'] 	   = $_POST['vrf-' . $m];
+    $subnet_import['showName']	   = $_POST['showName-' . $m];
+
+    //cidr
+    if(strlen($err=$Subnets->verify_cidr($Subnets->transform_to_dotted($subnet_import['subnet'])."/".$subnet_import['mask']))>5) {
+        $errors[] = $err;
+    }
+    //overlapping, only root !
+    else if (strlen($err=$Subnets->verify_subnet_overlapping ($subnet_import['sectionId'], $Subnets->transform_to_dotted($subnet_import['subnet'])."/".$subnet_import['mask'], $subnet_import['vrfId']))>5) {
+        $errors[] = $err;
+    }
+    //set insert
+    else {
+        $subnets_to_insert[] = $subnet_import;
+    }
 }
 
 
 # print errors if they exist or success
 if(isset($errors)) {
-	print '<div class="alert alert-danger alert-absolute">'._('Please fix the following errors before inserting').':<hr>'. "\n";
-	foreach ($errors as $line) {
-		print $line.'<br>';
-	}
-	print '</div>';
+    print '<div class="alert alert-danger alert-absolute">'._('Please fix the following errors before inserting').':<hr>'. "\n";
+    foreach ($errors as $line) {
+        print $line.'<br>';
+    }
+    print '</div>';
 }
 else {
-	$errors_import_failed = 0;
-
-	//insert if all other is ok!
-	foreach($subnets_to_insert as $subnet_import) {
-		//formulate insert query
-		$values = array("sectionId"=>$subnet_import['sectionId'],
-						"subnet"=>$subnet_import['subnet'],
-						"mask"=>$subnet_import['mask'],
-						"description"=>$subnet_import['description'],
-						"vlanId"=>$subnet_import['vlanId'],
-						"vrfId"=>$subnet_import['vrfId'],
-						"masterSubnetId"=>0,
-						"showName"=>$subnet_import['showName']
-						);
-
-		if(!$Admin->object_modify("subnets", "add", "id", $values)) {
-			$Result->show("danger", _('Failed to import subnet').' '. $Subnets->transform_to_dotted($subnet_import['subnet'])."/".$subnet_import['mask'], false);
-			$errors_import_failed++;
-		}
-	}
-	//check if all is ok and print it!
-	if($errors_import_failed == 0) 	{ $Result->show("success", _("Import successfull")."!", false); }
+    $errors_import_failed = 0;
+
+    //insert if all other is ok!
+    foreach($subnets_to_insert as $subnet_import) {
+        //formulate insert query
+        $values = array("sectionId"=>$subnet_import['sectionId'],
+                        "subnet"=>$subnet_import['subnet'],
+                        "mask"=>$subnet_import['mask'],
+                        "description"=>$subnet_import['description'],
+                        "vlanId"=>$subnet_import['vlanId'],
+                        "vrfId"=>$subnet_import['vrfId'],
+                        "masterSubnetId"=>0,
+                        "showName"=>$subnet_import['showName']
+                        );
+
+        if(!$Admin->object_modify("subnets", "add", "id", $values)) {
+            $Result->show("danger", _('Failed to import subnet').' '. $Subnets->transform_to_dotted($subnet_import['subnet'])."/".$subnet_import['mask'], false);
+            $errors_import_failed++;
+        }
+    }
+    //check if all is ok and print it!
+    if($errors_import_failed == 0) 	{ $Result->show("success", _("Import successfull")."!", false); }
 }
 ?>
\ No newline at end of file

app/admin/ripe-import/ripe-telnet.php

Indentation +93 added lines, -93 removed lines

@@ -20,7 +20,7 @@ 
 
 //strip AS if provided, to get just the number
 if(substr($_POST['as'], 0,2)=="AS" || substr($_POST['as'], 0,2)=="as") {
-	$_POST['as'] = substr($_POST['as'], 2);
+    $_POST['as'] = substr($_POST['as'], 2);
 };
 
 
@@ -34,100 +34,100 @@ 
 
 //none found
 if(sizeof(@$subnet) == 0) {
-	print "<hr>";
-	$Result->show("danger alert-absolute", _('No subnets found').'!', true);
+    print "<hr>";
+    $Result->show("danger alert-absolute", _('No subnets found').'!', true);
 }
 else {
-	//form
-	print '<form name="asImport" id="asImport">';
-	//table
-	print '<table class="asImport table table-striped table-condensed table-top table-auto">';
-	//headers
-	print '<tr>';
-	print '	<th colspan="5">'._('I found the following routes belonging to AS').' '.$_POST['as'].':</th>';
-	print '</tr> ';
-
-	print "<tr>";
-	print "	<th></th>";
-	print "	<th>"._('Subnet')."</th>";
-	print "	<th>"._('select section')."</th>";
-	print "	<th>"._('Description')."</th>";
-	print "	<th>"._('VLAN')."</th>";
-	print "	<th>"._('VRF')."</th>";
-	print "	<th>"._('Show name')."</th>";
-
-	print "</tr>";
-
-	//print found subnets
-	$m = 0;
-	foreach ($subnet as $route) {
-		# only not empty
-		if(strlen($route)>2) {
-			print '<tr>'. "\n";
-
-			//delete
-			print '<td class="removeSubnet">'. "\n";
-			print '	<button class="btn btn-xs btn-default btn-danger" rel="tooltip" title="'._('Remove this subnet').'"><i class="fa fa-times"></i></button>'. "\n";
-			print '</td>'. "\n";
-			//subnet
-			print '<td>'. "\n";
-			print '<input type="text" class="form-control input-sm" name="subnet-'. $m .'" value="'. $route .'">'. "\n";
-			print '</td>'. "\n";
-			//section
-			print '<td>'. "\n";
-			print '<select name="section-'. $m .'" class="form-control input-sm input-w-auto">'. "\n";
-			foreach($sections as $section) {
-				print '<option value="'. $section->id .'">'. $section->name .'</option>';
-			}
-			print '</select>'. "\n";
-			print '</td>'. "\n";
-			//description
-			print '<td>'. "\n";
-			print '<input type="text" class="form-control input-sm input-w-250" name="description-'. $m .'">'. "\n";
-			print '</td>'. "\n";
-			//VLAN
-			print '<td>'. "\n";
-			print '<select name="vlan-'. $m .'" class="form-control input-sm input-w-auto">'. "\n";
-			print '<option value="0">No VLAN</option>';
-			if(sizeof(@$vlans)>0) {
-				foreach($vlans as $vlan) {
-					# set description
-					$vlan_description = strlen($vlan->description)>0 ? " (".$vlan->description.")" : "";
-					print '<option value="'.$vlan->vlanId.'">'.$vlan->number.$vlan_description.'</option>';
-				}
-			}
-			//VRF
-			print '<td>'. "\n";
-			print '<select name="vrf-'. $m .'" class="form-control input-sm input-w-auto">'. "\n";
-			print '<option value="0">No VRF</option>';
-			if(sizeof(@$vrfs)>0) {
-				foreach($vrfs as $vrf) {
-					# set description
-					$vrf_description = strlen($vrf->description)>0 ? " (".$vrf->description.")" : "";
-					print '<option value="'.$vrf->vrfId.'">'.$vrf->name.$vrf_description.'</option>';
-				}
-			}
-			//show name
-			print '<td>'. "\n";
-			print '<select name="showName-'. $m .'" class="form-control input-sm input-w-auto">'. "\n";
-			print '<option value="0">'._('No') .'</option>';
-			print '<option value="1">'._('Yes').'</option>';
-			print '</td>'. "\n";
-
-			print '</tr>'. "\n";
-		}
-		$m++;
-	}
-
-	//submit
-	print '<tr style="border-top:1px solid white" class="th">'. "\n";
-	print '<td colspan="7" style="text-align:right">'. "\n";
-	print '	<input type="submit" class="btn btn-sm btn-default" value="'._('Import to database').'">'. "\n";
-	print '</td>'. "\n";
-	print '</tr>'. "\n";
-
-	print '</table>'. "\n";
-	print '</form>'. "\n";
+    //form
+    print '<form name="asImport" id="asImport">';
+    //table
+    print '<table class="asImport table table-striped table-condensed table-top table-auto">';
+    //headers
+    print '<tr>';
+    print '	<th colspan="5">'._('I found the following routes belonging to AS').' '.$_POST['as'].':</th>';
+    print '</tr> ';
+
+    print "<tr>";
+    print "	<th></th>";
+    print "	<th>"._('Subnet')."</th>";
+    print "	<th>"._('select section')."</th>";
+    print "	<th>"._('Description')."</th>";
+    print "	<th>"._('VLAN')."</th>";
+    print "	<th>"._('VRF')."</th>";
+    print "	<th>"._('Show name')."</th>";
+
+    print "</tr>";
+
+    //print found subnets
+    $m = 0;
+    foreach ($subnet as $route) {
+        # only not empty
+        if(strlen($route)>2) {
+            print '<tr>'. "\n";
+
+            //delete
+            print '<td class="removeSubnet">'. "\n";
+            print '	<button class="btn btn-xs btn-default btn-danger" rel="tooltip" title="'._('Remove this subnet').'"><i class="fa fa-times"></i></button>'. "\n";
+            print '</td>'. "\n";
+            //subnet
+            print '<td>'. "\n";
+            print '<input type="text" class="form-control input-sm" name="subnet-'. $m .'" value="'. $route .'">'. "\n";
+            print '</td>'. "\n";
+            //section
+            print '<td>'. "\n";
+            print '<select name="section-'. $m .'" class="form-control input-sm input-w-auto">'. "\n";
+            foreach($sections as $section) {
+                print '<option value="'. $section->id .'">'. $section->name .'</option>';
+            }
+            print '</select>'. "\n";
+            print '</td>'. "\n";
+            //description
+            print '<td>'. "\n";
+            print '<input type="text" class="form-control input-sm input-w-250" name="description-'. $m .'">'. "\n";
+            print '</td>'. "\n";
+            //VLAN
+            print '<td>'. "\n";
+            print '<select name="vlan-'. $m .'" class="form-control input-sm input-w-auto">'. "\n";
+            print '<option value="0">No VLAN</option>';
+            if(sizeof(@$vlans)>0) {
+                foreach($vlans as $vlan) {
+                    # set description
+                    $vlan_description = strlen($vlan->description)>0 ? " (".$vlan->description.")" : "";
+                    print '<option value="'.$vlan->vlanId.'">'.$vlan->number.$vlan_description.'</option>';
+                }
+            }
+            //VRF
+            print '<td>'. "\n";
+            print '<select name="vrf-'. $m .'" class="form-control input-sm input-w-auto">'. "\n";
+            print '<option value="0">No VRF</option>';
+            if(sizeof(@$vrfs)>0) {
+                foreach($vrfs as $vrf) {
+                    # set description
+                    $vrf_description = strlen($vrf->description)>0 ? " (".$vrf->description.")" : "";
+                    print '<option value="'.$vrf->vrfId.'">'.$vrf->name.$vrf_description.'</option>';
+                }
+            }
+            //show name
+            print '<td>'. "\n";
+            print '<select name="showName-'. $m .'" class="form-control input-sm input-w-auto">'. "\n";
+            print '<option value="0">'._('No') .'</option>';
+            print '<option value="1">'._('Yes').'</option>';
+            print '</td>'. "\n";
+
+            print '</tr>'. "\n";
+        }
+        $m++;
+    }
+
+    //submit
+    print '<tr style="border-top:1px solid white" class="th">'. "\n";
+    print '<td colspan="7" style="text-align:right">'. "\n";
+    print '	<input type="submit" class="btn btn-sm btn-default" value="'._('Import to database').'">'. "\n";
+    print '</td>'. "\n";
+    print '</tr>'. "\n";
+
+    print '</table>'. "\n";
+    print '</form>'. "\n";
 }
 ?>
 <div class="ripeImportResult"></div>
\ No newline at end of file

app/admin/users/ad-search-result-groups-membership.php

Indentation +40 added lines, -40 removed lines

@@ -29,52 +29,52 @@
 
 //open connection
 try {
-	if($server->type == "NetIQ") { $params->account_suffix = ""; }
-	//set options
-	$options = array(
-			'base_dn'=>$params->base_dn,
-			'account_suffix'=>$params->account_suffix,
-			'domain_controllers'=>explode(";",$params->domain_controllers),
-			'use_ssl'=>$params->use_ssl,
-			'use_tls'=>$params->use_tls,
-			'ad_port'=>$params->ad_port
-			);
-	//AD
-	$adldap = new adLDAP($options);
+    if($server->type == "NetIQ") { $params->account_suffix = ""; }
+    //set options
+    $options = array(
+            'base_dn'=>$params->base_dn,
+            'account_suffix'=>$params->account_suffix,
+            'domain_controllers'=>explode(";",$params->domain_controllers),
+            'use_ssl'=>$params->use_ssl,
+            'use_tls'=>$params->use_tls,
+            'ad_port'=>$params->ad_port
+            );
+    //AD
+    $adldap = new adLDAP($options);
 
-	//try to login with higher credentials for search
-	$authUser = $adldap->authenticate($params->adminUsername, $params->adminPassword);
-	if ($authUser == false) {
-		$Result->show("danger", _("Invalid credentials"), true);
-	}
+    //try to login with higher credentials for search
+    $authUser = $adldap->authenticate($params->adminUsername, $params->adminPassword);
+    if ($authUser == false) {
+        $Result->show("danger", _("Invalid credentials"), true);
+    }
 
-	// set OpenLDAP flag
-	if($server->type == "LDAP") { $adldap->setUseOpenLDAP(true); }
+    // set OpenLDAP flag
+    if($server->type == "LDAP") { $adldap->setUseOpenLDAP(true); }
 
-	//fetch all groups
-	$all_groups = $Admin->fetch_all_objects ("userGroups", "g_id");
-	if($all_groups !== false) {
-		foreach($all_groups as $k=>$g) {
-			//members
-			$domain_group_members = $adldap->group()->members($g->g_name);
-			//false
-			if($domain_group_members!==false) {
-				foreach($domain_group_members as $m) {
-					if($m==$_POST['username']) {
-						$membership[] = $g->g_id;
-					}
-				}
-			}
-		}
-	}
+    //fetch all groups
+    $all_groups = $Admin->fetch_all_objects ("userGroups", "g_id");
+    if($all_groups !== false) {
+        foreach($all_groups as $k=>$g) {
+            //members
+            $domain_group_members = $adldap->group()->members($g->g_name);
+            //false
+            if($domain_group_members!==false) {
+                foreach($domain_group_members as $m) {
+                    if($m==$_POST['username']) {
+                        $membership[] = $g->g_id;
+                    }
+                }
+            }
+        }
+    }
 
-	# if something set print it
-	if (isset($membership)) {
-		print trim(implode(";", array_filter($membership)));
-	}
+    # if something set print it
+    if (isset($membership)) {
+        print trim(implode(";", array_filter($membership)));
+    }
 
 }
 catch (adLDAPException $e) {
-	$Result->show("danger", $e->getMessage(), true);
+    $Result->show("danger", $e->getMessage(), true);
 }
 ?>
\ No newline at end of file

app/admin/users/ad-search-result.php

Indentation +56 added lines, -56 removed lines

@@ -32,70 +32,70 @@
 
 //open connection
 try {
-	if($server->type == "NetIQ") { $params->account_suffix = ""; }
-	//set options
-	$options = array(
-			'base_dn'=>$params->base_dn,
-			'account_suffix'=>$params->account_suffix,
-			'domain_controllers'=>explode(";",$params->domain_controllers),
-			'use_ssl'=>$params->use_ssl,
-			'use_tls'=>$params->use_tls,
-			'ad_port'=>$params->ad_port
-			);
-	//AD
-	$adldap = new adLDAP($options);
-
-	//try to login with higher credentials for search
-	$authUser = $adldap->authenticate($params->adminUsername, $params->adminPassword);
-	if ($authUser == false) {
-		$Result->show("danger", _("Invalid credentials"), true);
-	}
-
-	// set OpenLDAP flag
-	if($server->type == "LDAP") { $adldap->setUseOpenLDAP(true); }
-
-	//search for domain user!
-	$userinfo = $adldap->user()->info("$_POST[dname]*", array("*"),false,$server->type);
-
-	//echo $adldap->getLastError();
+    if($server->type == "NetIQ") { $params->account_suffix = ""; }
+    //set options
+    $options = array(
+            'base_dn'=>$params->base_dn,
+            'account_suffix'=>$params->account_suffix,
+            'domain_controllers'=>explode(";",$params->domain_controllers),
+            'use_ssl'=>$params->use_ssl,
+            'use_tls'=>$params->use_tls,
+            'ad_port'=>$params->ad_port
+            );
+    //AD
+    $adldap = new adLDAP($options);
+
+    //try to login with higher credentials for search
+    $authUser = $adldap->authenticate($params->adminUsername, $params->adminPassword);
+    if ($authUser == false) {
+        $Result->show("danger", _("Invalid credentials"), true);
+    }
+
+    // set OpenLDAP flag
+    if($server->type == "LDAP") { $adldap->setUseOpenLDAP(true); }
+
+    //search for domain user!
+    $userinfo = $adldap->user()->info("$_POST[dname]*", array("*"),false,$server->type);
+
+    //echo $adldap->getLastError();
 }
 catch (adLDAPException $e) {
-	$Result->show("danger", $e->getMessage(), true);
+    $Result->show("danger", $e->getMessage(), true);
 }
 
 
 //check for found
 if(!isset($userinfo['count'])) {
-	print "<div class='alert alert-info'>";
-	print _('No users found')."!<hr>";
-	print _('Possible reasons').":";
-	print "<ul>";
-	print "<li>"._('Username not existing')."</li>";
-	print "<li>"._('Invalid baseDN setting for AD')."</li>";
-	print "<li>"._('AD account does not have enough privileges for search')."</li>";
-	print "</div>";
+    print "<div class='alert alert-info'>";
+    print _('No users found')."!<hr>";
+    print _('Possible reasons').":";
+    print "<ul>";
+    print "<li>"._('Username not existing')."</li>";
+    print "<li>"._('Invalid baseDN setting for AD')."</li>";
+    print "<li>"._('AD account does not have enough privileges for search')."</li>";
+    print "</div>";
 } else {
-	print _(" Following users were found").": ($userinfo[count]):<hr>";
-
-	print "<table class='table table-striped'>";
-
-	unset($userinfo['count']);
-	if(sizeof(@$userinfo)>0 && isset($userinfo)) {
-		// loop
-		foreach($userinfo as $u) {
-			print "<tr>";
-			print "	<td>".$u['displayname'][0];
-			print "</td>";
-			print "	<td>".$u['samaccountname'][0]."</td>";
-			print "	<td>".$u['mail'][0]."</td>";
-			//actions
-			print " <td style='width:10px;'>";
-			print "		<a href='' class='btn btn-sm btn-default btn-success userselect' data-uname='".$u['displayname'][0]."' data-username='".$u['samaccountname'][0]."' data-email='".$u['mail'][0]."' data-server='".$_POST['server']."' data-server-type='".$server->type."'>"._('Select')."</a>";
-			print "	</td>";
-			print "</tr>";
-		}
-	}
-	print "</table>";
+    print _(" Following users were found").": ($userinfo[count]):<hr>";
+
+    print "<table class='table table-striped'>";
+
+    unset($userinfo['count']);
+    if(sizeof(@$userinfo)>0 && isset($userinfo)) {
+        // loop
+        foreach($userinfo as $u) {
+            print "<tr>";
+            print "	<td>".$u['displayname'][0];
+            print "</td>";
+            print "	<td>".$u['samaccountname'][0]."</td>";
+            print "	<td>".$u['mail'][0]."</td>";
+            //actions
+            print " <td style='width:10px;'>";
+            print "		<a href='' class='btn btn-sm btn-default btn-success userselect' data-uname='".$u['displayname'][0]."' data-username='".$u['samaccountname'][0]."' data-email='".$u['mail'][0]."' data-server='".$_POST['server']."' data-server-type='".$server->type."'>"._('Select')."</a>";
+            print "	</td>";
+            print "</tr>";
+        }
+    }
+    print "</table>";
 }
 
 ?>
\ No newline at end of file