phpipam / phpipam

app/admin/powerDNS/domain-edit.php

Indentation +53 added lines, -53 removed lines

@@ -26,8 +26,8 @@ 
 
 # get VRF
 if($_POST['action']!="add") {
-	$domain = $PowerDNS->fetch_domain ($_POST['id']);
-	$domain!==false ? : $Result->show("danger", _("Invalid ID"), true, true);
+    $domain = $PowerDNS->fetch_domain ($_POST['id']);
+    $domain!==false ? : $Result->show("danger", _("Invalid ID"), true, true);
 }
 
 # disable edit on delete
@@ -69,23 +69,23 @@ 
 		<td>
 			<select name="type" class="form-control input-w-auto" <?php print $readonly; ?>>
 			<?php
-			// loop
-			foreach($PowerDNS->domain_types as $type) {
-				// active
-				if ($type == @$domain->type)	{ $selected = "selected"; }
-				else							{ $selected = ""; }
-				// print
-				print "<option value='$type' $selected>$type</option>";
-			}
-			?>
+            // loop
+            foreach($PowerDNS->domain_types as $type) {
+                // active
+                if ($type == @$domain->type)	{ $selected = "selected"; }
+                else							{ $selected = ""; }
+                // print
+                print "<option value='$type' $selected>$type</option>";
+            }
+            ?>
 			</select>
 		</td>
 	</tr>
 
 	<?php
-	// we need default parameters only if we create new domain !
-	if($_POST['action']=="add") {
-	?>
+    // we need default parameters only if we create new domain !
+    if($_POST['action']=="add") {
+    ?>
 
 	<tbody class="defaults">
 
@@ -116,15 +116,15 @@ 
 		<td>
 		<select name="ttl" class="form-control input-w-auto input-sm" <?php print $readonly; ?>>
 		<?php
-		// loop
-		foreach($PowerDNS->ttl as $k=>$ttl) {
-			// active
-			if ($k == @$pdns->ttl)	{ $selected = "selected"; }
-			else					{ $selected = ""; }
-			// print
-			print "<option value='$k' $selected>$ttl ($k)</option>";
-		}
-		?>
+        // loop
+        foreach($PowerDNS->ttl as $k=>$ttl) {
+            // active
+            if ($k == @$pdns->ttl)	{ $selected = "selected"; }
+            else					{ $selected = ""; }
+            // print
+            print "<option value='$k' $selected>$ttl ($k)</option>";
+        }
+        ?>
 		</select>
 		</td>
 	</tr>
@@ -134,15 +134,15 @@ 
 		<td>
 		<select name="refresh" class="form-control input-w-auto input-sm" <?php print $readonly; ?>>
 		<?php
-		// loop
-		foreach($PowerDNS->ttl as $k=>$ttl) {
-			// active
-			if ($k == @$pdns->refresh)	{ $selected = "selected"; }
-			else						{ $selected = ""; }
-			// print
-			print "<option value='$k' $selected>$ttl ($k)</option>";
-		}
-		?>
+        // loop
+        foreach($PowerDNS->ttl as $k=>$ttl) {
+            // active
+            if ($k == @$pdns->refresh)	{ $selected = "selected"; }
+            else						{ $selected = ""; }
+            // print
+            print "<option value='$k' $selected>$ttl ($k)</option>";
+        }
+        ?>
 		</select>
 		</td>
 	</tr>
@@ -152,15 +152,15 @@ 
 		<td>
 		<select name="retry" class="form-control input-w-auto input-sm" <?php print $readonly; ?>>
 		<?php
-		// loop
-		foreach($PowerDNS->ttl as $k=>$ttl) {
-			// active
-			if ($k == @$pdns->retry)	{ $selected = "selected"; }
-			else						{ $selected = ""; }
-			// print
-			print "<option value='$k' $selected>$ttl ($k)</option>";
-		}
-		?>
+        // loop
+        foreach($PowerDNS->ttl as $k=>$ttl) {
+            // active
+            if ($k == @$pdns->retry)	{ $selected = "selected"; }
+            else						{ $selected = ""; }
+            // print
+            print "<option value='$k' $selected>$ttl ($k)</option>";
+        }
+        ?>
 		</select>		</td>
 	</tr>
 	<!-- ttl -->
@@ -169,15 +169,15 @@ 
 		<td>
 		<select name="nxdomain_ttl" class="form-control input-w-auto input-sm" <?php print $readonly; ?>>
 		<?php
-		// loop
-		foreach($PowerDNS->ttl as $k=>$ttl) {
-			// active
-			if ($k == @$pdns->nxdomain_ttl)	{ $selected = "selected"; }
-			else							{ $selected = ""; }
-			// print
-			print "<option value='$k' $selected>$ttl ($k)</option>";
-		}
-		?>
+        // loop
+        foreach($PowerDNS->ttl as $k=>$ttl) {
+            // active
+            if ($k == @$pdns->nxdomain_ttl)	{ $selected = "selected"; }
+            else							{ $selected = ""; }
+            // print
+            print "<option value='$k' $selected>$ttl ($k)</option>";
+        }
+        ?>
 		</select>
 		</td>
 	</tr>
@@ -195,9 +195,9 @@ 
 	</form>
 
 	<?php
-	//print delete warning
-	if($_POST['action'] == "delete")	{ $Result->show("warning", "<strong>"._('Warning').":</strong> "._("removing Domain will also remove all referenced entries!"), false);}
-	?>
+    //print delete warning
+    if($_POST['action'] == "delete")	{ $Result->show("warning", "<strong>"._('Warning').":</strong> "._("removing Domain will also remove all referenced entries!"), false);}
+    ?>
 </div>
 
 

Braces +6 added lines, -2 removed lines

@@ -204,8 +204,12 @@
 <!-- footer -->
 <div class="pFooter">
 	<div class="btn-group">
-		<button class="btn btn-sm btn-default <?php if(@$_POST['secondary']=="true") { print "hidePopup2"; } else { print "hidePopups"; } ?>"><?php print _('Cancel'); ?></button>
-		<button class="btn btn-sm btn-default <?php if($_POST['action']=="delete") { print "btn-danger"; } else { print "btn-success"; } ?> <?php if(@$_POST['secondary']=="true") { print "editDomainSubmit2"; } ?>" id="editDomainSubmit"><i class="fa <?php if($_POST['action']=="add") { print "fa-plus"; } else if ($_POST['action']=="delete") { print "fa-trash-o"; } else { print "fa-check"; } ?>"></i> <?php print ucwords(_($_POST['action'])); ?></button>
+		<button class="btn btn-sm btn-default <?php if(@$_POST['secondary']=="true") { print "hidePopup2"; }
+else { print "hidePopups"; } ?>"><?php print _('Cancel'); ?></button>
+		<button class="btn btn-sm btn-default <?php if($_POST['action']=="delete") { print "btn-danger"; }
+else { print "btn-success"; } ?> <?php if(@$_POST['secondary']=="true") { print "editDomainSubmit2"; } ?>" id="editDomainSubmit"><i class="fa <?php if($_POST['action']=="add") { print "fa-plus"; }
+else if ($_POST['action']=="delete") { print "fa-trash-o"; }
+else { print "fa-check"; } ?>"></i> <?php print ucwords(_($_POST['action'])); ?></button>
 	</div>
 	<!-- result -->
 	<div class="domain-edit-result"></div>

Spacing +41 added lines, -41 removed lines

@@ -5,18 +5,18 @@ 
  ************************************************/
 
 /* functions */
-require( dirname(__FILE__) . '/../../../functions/functions.php');
+require(dirname (__FILE__).'/../../../functions/functions.php');
 
 # initialize user object
-$Database 	= new Database_PDO;
-$User 		= new User ($Database);
+$Database = new Database_PDO;
+$User = new User ($Database);
 $Admin	 	= new Admin ($Database);
 $Tools	 	= new Tools ($Database);
 $Result 	= new Result ();
-$PowerDNS 	= new PowerDNS ($Database);
+$PowerDNS = new PowerDNS ($Database);
 
 # verify that user is logged in
-$User->check_user_session();
+$User->check_user_session ();
 
 # create csrf token
 $csrf = $User->csrf_cookie ("create", "domain");
@@ -25,18 +25,18 @@ 
 $pdns = $PowerDNS->db_settings;
 
 # get VRF
-if($_POST['action']!="add") {
+if ($_POST['action'] != "add") {
 	$domain = $PowerDNS->fetch_domain ($_POST['id']);
-	$domain!==false ? : $Result->show("danger", _("Invalid ID"), true, true);
+	$domain !== false ? : $Result->show ("danger", _ ("Invalid ID"), true, true);
 }
 
 # disable edit on delete
-$readonly = $_POST['action']=="delete" ? "readonly" : "";
+$readonly = $_POST['action'] == "delete" ? "readonly" : "";
 ?>
 
 
 <!-- header -->
-<div class="pHeader"><?php print ucwords(_("$_POST[action]")); ?> <?php print _('domain'); ?></div>
+<div class="pHeader"><?php print ucwords (_ ("$_POST[action]")); ?> <?php print _ ('domain'); ?></div>
 
 <!-- content -->
 <div class="pContent">
@@ -46,9 +46,9 @@ 
 
 	<!-- name  -->
 	<tr>
-		<td style="width:150px;"><?php print _('Name'); ?></td>
+		<td style="width:150px;"><?php print _ ('Name'); ?></td>
 		<td>
-			<input type="text" class="name form-control input-sm" name="name" placeholder="<?php print _('FQDN domain name'); ?>" value="<?php print $domain->name; ?>" <?php print $readonly; ?> <?php if($_POST['action']!="add") { print "disabled='disabled'"; } ?>>
+			<input type="text" class="name form-control input-sm" name="name" placeholder="<?php print _ ('FQDN domain name'); ?>" value="<?php print $domain->name; ?>" <?php print $readonly; ?> <?php if ($_POST['action'] != "add") { print "disabled='disabled'"; } ?>>
 			<input type="hidden" name="action" value="<?php print $_POST['action']; ?>">
 			<input type="hidden" name="id" value="<?php print @$_POST['id']; ?>">
             <input type="hidden" name="csrf_cookie" value="<?php print $csrf; ?>">
@@ -57,23 +57,23 @@ 
 
 	<!-- master -->
 	<tr>
-		<td><?php print _('Master NS'); ?></td>
+		<td><?php print _ ('Master NS'); ?></td>
 		<td>
-			<input type="text" class="name form-control input-sm" name="master" placeholder="<?php print _('NULL'); ?>" value="<?php print $domain->master; ?>" <?php print $readonly; ?>>
+			<input type="text" class="name form-control input-sm" name="master" placeholder="<?php print _ ('NULL'); ?>" value="<?php print $domain->master; ?>" <?php print $readonly; ?>>
 		</td>
 	</tr>
 
 	<!-- type -->
 	<tr>
-		<td><?php print _('Domain type'); ?></td>
+		<td><?php print _ ('Domain type'); ?></td>
 		<td>
 			<select name="type" class="form-control input-w-auto" <?php print $readonly; ?>>
 			<?php
 			// loop
-			foreach($PowerDNS->domain_types as $type) {
+			foreach ($PowerDNS->domain_types as $type) {
 				// active
-				if ($type == @$domain->type)	{ $selected = "selected"; }
-				else							{ $selected = ""; }
+				if ($type == @$domain->type) { $selected = "selected"; }
+				else { $selected = ""; }
 				// print
 				print "<option value='$type' $selected>$type</option>";
 			}
@@ -84,43 +84,43 @@ 
 
 	<?php
 	// we need default parameters only if we create new domain !
-	if($_POST['action']=="add") {
+	if ($_POST['action'] == "add") {
 	?>
 
 	<tbody class="defaults">
 
 	<!-- hr -->
 	<tr>
-		<td colspan="2"><hr><strong><?php print _("Default record values (SOA, NS)"); ?></strong><br><br></td>
+		<td colspan="2"><hr><strong><?php print _ ("Default record values (SOA, NS)"); ?></strong><br><br></td>
 	</tr>
 
 	<!-- defualt values for SOA and NS records -->
 
 	<!-- ns -->
 	<tr>
-		<td><?php print _('Name servers'); ?></th>
+		<td><?php print _ ('Name servers'); ?></th>
 		<td>
 			<input type="text" class="form-control input-sm" name="ns" value="<?php print $pdns->ns; ?>">
 		</td>
 	</tr>
 	<!-- mail -->
 	<tr>
-		<td><?php print _('Hostmaster'); ?></th>
+		<td><?php print _ ('Hostmaster'); ?></th>
 		<td>
 			<input type="text" class="form-control input-sm" name="hostmaster" value="<?php print $pdns->hostmaster; ?>">
 		</td>
 	</tr>
 	<!-- ttl -->
 	<tr>
-		<td><?php print _('TTL'); ?></th>
+		<td><?php print _ ('TTL'); ?></th>
 		<td>
 		<select name="ttl" class="form-control input-w-auto input-sm" <?php print $readonly; ?>>
 		<?php
 		// loop
-		foreach($PowerDNS->ttl as $k=>$ttl) {
+		foreach ($PowerDNS->ttl as $k=>$ttl) {
 			// active
-			if ($k == @$pdns->ttl)	{ $selected = "selected"; }
-			else					{ $selected = ""; }
+			if ($k == @$pdns->ttl) { $selected = "selected"; }
+			else { $selected = ""; }
 			// print
 			print "<option value='$k' $selected>$ttl ($k)</option>";
 		}
@@ -130,15 +130,15 @@ 
 	</tr>
 	<!-- refresh -->
 	<tr>
-		<td><?php print _('Refresh'); ?></th>
+		<td><?php print _ ('Refresh'); ?></th>
 		<td>
 		<select name="refresh" class="form-control input-w-auto input-sm" <?php print $readonly; ?>>
 		<?php
 		// loop
-		foreach($PowerDNS->ttl as $k=>$ttl) {
+		foreach ($PowerDNS->ttl as $k=>$ttl) {
 			// active
-			if ($k == @$pdns->refresh)	{ $selected = "selected"; }
-			else						{ $selected = ""; }
+			if ($k == @$pdns->refresh) { $selected = "selected"; }
+			else { $selected = ""; }
 			// print
 			print "<option value='$k' $selected>$ttl ($k)</option>";
 		}
@@ -148,15 +148,15 @@ 
 	</tr>
 	<!-- ttl -->
 	<tr>
-		<td><?php print _('Retry'); ?></th>
+		<td><?php print _ ('Retry'); ?></th>
 		<td>
 		<select name="retry" class="form-control input-w-auto input-sm" <?php print $readonly; ?>>
 		<?php
 		// loop
-		foreach($PowerDNS->ttl as $k=>$ttl) {
+		foreach ($PowerDNS->ttl as $k=>$ttl) {
 			// active
-			if ($k == @$pdns->retry)	{ $selected = "selected"; }
-			else						{ $selected = ""; }
+			if ($k == @$pdns->retry) { $selected = "selected"; }
+			else { $selected = ""; }
 			// print
 			print "<option value='$k' $selected>$ttl ($k)</option>";
 		}
@@ -165,15 +165,15 @@ 
 	</tr>
 	<!-- ttl -->
 	<tr>
-		<td><?php print _('NXDOMAIN ttl'); ?></th>
+		<td><?php print _ ('NXDOMAIN ttl'); ?></th>
 		<td>
 		<select name="nxdomain_ttl" class="form-control input-w-auto input-sm" <?php print $readonly; ?>>
 		<?php
 		// loop
-		foreach($PowerDNS->ttl as $k=>$ttl) {
+		foreach ($PowerDNS->ttl as $k=>$ttl) {
 			// active
-			if ($k == @$pdns->nxdomain_ttl)	{ $selected = "selected"; }
-			else							{ $selected = ""; }
+			if ($k == @$pdns->nxdomain_ttl) { $selected = "selected"; }
+			else { $selected = ""; }
 			// print
 			print "<option value='$k' $selected>$ttl ($k)</option>";
 		}
@@ -186,7 +186,7 @@ 
 	<tr>
 		<td></td>
 		<td>
-			<input type="checkbox" class="hideDefaults" value="1" name="manual"> <?php print _("Dont create default records (SOA, NS)"); ?>
+			<input type="checkbox" class="hideDefaults" value="1" name="manual"> <?php print _ ("Dont create default records (SOA, NS)"); ?>
 		</td>
 	</tr>
 	<?php } ?>
@@ -196,7 +196,7 @@ 
 
 	<?php
 	//print delete warning
-	if($_POST['action'] == "delete")	{ $Result->show("warning", "<strong>"._('Warning').":</strong> "._("removing Domain will also remove all referenced entries!"), false);}
+	if ($_POST['action'] == "delete") { $Result->show ("warning", "<strong>"._ ('Warning').":</strong> "._ ("removing Domain will also remove all referenced entries!"), false); }
 	?>
 </div>
 
@@ -204,8 +204,8 @@ 
 <!-- footer -->
 <div class="pFooter">
 	<div class="btn-group">
-		<button class="btn btn-sm btn-default <?php if(@$_POST['secondary']=="true") { print "hidePopup2"; } else { print "hidePopups"; } ?>"><?php print _('Cancel'); ?></button>
-		<button class="btn btn-sm btn-default <?php if($_POST['action']=="delete") { print "btn-danger"; } else { print "btn-success"; } ?> <?php if(@$_POST['secondary']=="true") { print "editDomainSubmit2"; } ?>" id="editDomainSubmit"><i class="fa <?php if($_POST['action']=="add") { print "fa-plus"; } else if ($_POST['action']=="delete") { print "fa-trash-o"; } else { print "fa-check"; } ?>"></i> <?php print ucwords(_($_POST['action'])); ?></button>
+		<button class="btn btn-sm btn-default <?php if (@$_POST['secondary'] == "true") { print "hidePopup2"; } else { print "hidePopups"; } ?>"><?php print _ ('Cancel'); ?></button>
+		<button class="btn btn-sm btn-default <?php if ($_POST['action'] == "delete") { print "btn-danger"; } else { print "btn-success"; } ?> <?php if (@$_POST['secondary'] == "true") { print "editDomainSubmit2"; } ?>" id="editDomainSubmit"><i class="fa <?php if ($_POST['action'] == "add") { print "fa-plus"; } else if ($_POST['action'] == "delete") { print "fa-trash-o"; } else { print "fa-check"; } ?>"></i> <?php print ucwords (_ ($_POST['action'])); ?></button>
 	</div>
 	<!-- result -->
 	<div class="domain-edit-result"></div>

app/admin/powerDNS/defaults.php

Indentation +45 added lines, -45 removed lines

@@ -49,15 +49,15 @@ 
 	<td>
 		<select name="refresh" class="form-control input-w-auto input-sm" <?php print $readonly; ?>>
 		<?php
-		// loop
-		foreach($PowerDNS->ttl as $k=>$ttl) {
-			// active
-			if ($k == @$pdns->refresh)	{ $selected = "selected"; }
-			else						{ $selected = ""; }
-			// print
-			print "<option value='$k' $selected>$ttl ($k)</option>";
-		}
-		?>
+        // loop
+        foreach($PowerDNS->ttl as $k=>$ttl) {
+            // active
+            if ($k == @$pdns->refresh)	{ $selected = "selected"; }
+            else						{ $selected = ""; }
+            // print
+            print "<option value='$k' $selected>$ttl ($k)</option>";
+        }
+        ?>
 		</select>
 	</td>
 	<td>
@@ -70,15 +70,15 @@ 
 	<td>
 		<select name="retry" class="form-control input-w-auto input-sm" <?php print $readonly; ?>>
 		<?php
-		// loop
-		foreach($PowerDNS->ttl as $k=>$ttl) {
-			// active
-			if ($k == @$pdns->retry)	{ $selected = "selected"; }
-			else						{ $selected = ""; }
-			// print
-			print "<option value='$k' $selected>$ttl ($k)</option>";
-		}
-		?>
+        // loop
+        foreach($PowerDNS->ttl as $k=>$ttl) {
+            // active
+            if ($k == @$pdns->retry)	{ $selected = "selected"; }
+            else						{ $selected = ""; }
+            // print
+            print "<option value='$k' $selected>$ttl ($k)</option>";
+        }
+        ?>
 		</select>
 	</td>
 	<td>
@@ -91,15 +91,15 @@ 
 	<td>
 		<select name="expire" class="form-control input-w-auto input-sm" <?php print $readonly; ?>>
 		<?php
-		// loop
-		foreach($PowerDNS->ttl as $k=>$ttl) {
-			// active
-			if ($k == @$pdns->expire)	{ $selected = "selected"; }
-			else						{ $selected = ""; }
-			// print
-			print "<option value='$k' $selected>$ttl ($k)</option>";
-		}
-		?>
+        // loop
+        foreach($PowerDNS->ttl as $k=>$ttl) {
+            // active
+            if ($k == @$pdns->expire)	{ $selected = "selected"; }
+            else						{ $selected = ""; }
+            // print
+            print "<option value='$k' $selected>$ttl ($k)</option>";
+        }
+        ?>
 		</select>
 	</td>
 	<td>
@@ -112,15 +112,15 @@ 
 	<td>
 		<select name="nxdomain_ttl" class="form-control input-w-auto input-sm" <?php print $readonly; ?>>
 		<?php
-		// loop
-		foreach($PowerDNS->ttl as $k=>$ttl) {
-			// active
-			if ($k == @$pdns->nxdomain_ttl)	{ $selected = "selected"; }
-			else							{ $selected = ""; }
-			// print
-			print "<option value='$k' $selected>$ttl ($k)</option>";
-		}
-		?>
+        // loop
+        foreach($PowerDNS->ttl as $k=>$ttl) {
+            // active
+            if ($k == @$pdns->nxdomain_ttl)	{ $selected = "selected"; }
+            else							{ $selected = ""; }
+            // print
+            print "<option value='$k' $selected>$ttl ($k)</option>";
+        }
+        ?>
 		</select>
 	</td>
 	<td>
@@ -133,15 +133,15 @@ 
 	<td>
 		<select name="ttl" class="form-control input-w-auto input-sm" <?php print $readonly; ?>>
 		<?php
-		// loop
-		foreach($PowerDNS->ttl as $k=>$ttl) {
-			// active
-			if ($k == @$pdns->ttl)	{ $selected = "selected"; }
-			else					{ $selected = ""; }
-			// print
-			print "<option value='$k' $selected>$ttl ($k)</option>";
-		}
-		?>
+        // loop
+        foreach($PowerDNS->ttl as $k=>$ttl) {
+            // active
+            if ($k == @$pdns->ttl)	{ $selected = "selected"; }
+            else					{ $selected = ""; }
+            // print
+            print "<option value='$k' $selected>$ttl ($k)</option>";
+        }
+        ?>
 		</select>	</td>
 	<td>
 		<span class="text-muted"><?php print _("Default TTL for domain records"); ?></span>

Spacing +34 added lines, -34 removed lines

@@ -5,7 +5,7 @@ 
  *************************************************/
 
 # verify that user is logged in
-$User->check_user_session();
+$User->check_user_session ();
 
 # create csrf token
 $csrf = $User->create_csrf_cookie ();
@@ -17,55 +17,55 @@ 
 
 <!-- site settings -->
 <tr class="settings-title">
-	<th colspan="3"><h4><?php print _('Default value settings'); ?></h4><hr></th>
+	<th colspan="3"><h4><?php print _ ('Default value settings'); ?></h4><hr></th>
 </tr>
 
 <!-- ns -->
 <tr>
-	<td><?php print _('Name servers'); ?></th>
+	<td><?php print _ ('Name servers'); ?></th>
 	<td style="width:300px;">
 		<input type="text" class="form-control input-sm" name="ns" value="<?php print $pdns->ns; ?>">
 		<input type="hidden" name="csrf_cookie" value="<?php print $csrf; ?>">
 	</td>
 	<td>
-		<span class="text-muted"><?php print _("Enter name servers, separate multiple with ;"); ?></span>
+		<span class="text-muted"><?php print _ ("Enter name servers, separate multiple with ;"); ?></span>
 	</td>
 </tr>
 </tr>
 
 <!-- mail -->
 <tr>
-	<td><?php print _('Hostmaster'); ?></th>
+	<td><?php print _ ('Hostmaster'); ?></th>
 	<td>
 		<input type="text" class="form-control input-sm" name="hostmaster" value="<?php print $pdns->hostmaster; ?>">
 	</td>
 	<td>
-		<span class="text-muted"><?php print _("Enter default hostmaster for domain"); ?></span>
+		<span class="text-muted"><?php print _ ("Enter default hostmaster for domain"); ?></span>
 	</td>
 </tr>
 
 <!-- default PTR domain -->
 <tr>
-	<td><?php print _('Default PTR domain'); ?></th>
+	<td><?php print _ ('Default PTR domain'); ?></th>
 	<td>
 		<input type="text" class="form-control input-sm" name="def_ptr_domain" placeholder="Not used" value="<?php print $pdns->def_ptr_domain; ?>">
 	</td>
 	<td>
-		<span class="text-muted"><?php print _("Default PTR domain if no valid hostname for PTR is provided"); ?></span>
+		<span class="text-muted"><?php print _ ("Default PTR domain if no valid hostname for PTR is provided"); ?></span>
 	</td>
 </tr>
 
 <!-- refresh -->
 <tr>
-	<td><?php print _('Refresh'); ?></th>
+	<td><?php print _ ('Refresh'); ?></th>
 	<td>
 		<select name="refresh" class="form-control input-w-auto input-sm" <?php print $readonly; ?>>
 		<?php
 		// loop
-		foreach($PowerDNS->ttl as $k=>$ttl) {
+		foreach ($PowerDNS->ttl as $k=>$ttl) {
 			// active
-			if ($k == @$pdns->refresh)	{ $selected = "selected"; }
-			else						{ $selected = ""; }
+			if ($k == @$pdns->refresh) { $selected = "selected"; }
+			else { $selected = ""; }
 			// print
 			print "<option value='$k' $selected>$ttl ($k)</option>";
 		}
@@ -73,20 +73,20 @@ 
 		</select>
 	</td>
 	<td>
-		<span class="text-muted"><?php print _("How often a secondary will poll the primary server to see if the serial number for the zone has increased."); ?></span>
+		<span class="text-muted"><?php print _ ("How often a secondary will poll the primary server to see if the serial number for the zone has increased."); ?></span>
 	</td>
 </tr>
 <!-- retry -->
 <tr>
-	<td><?php print _('Retry'); ?></th>
+	<td><?php print _ ('Retry'); ?></th>
 	<td>
 		<select name="retry" class="form-control input-w-auto input-sm" <?php print $readonly; ?>>
 		<?php
 		// loop
-		foreach($PowerDNS->ttl as $k=>$ttl) {
+		foreach ($PowerDNS->ttl as $k=>$ttl) {
 			// active
-			if ($k == @$pdns->retry)	{ $selected = "selected"; }
-			else						{ $selected = ""; }
+			if ($k == @$pdns->retry) { $selected = "selected"; }
+			else { $selected = ""; }
 			// print
 			print "<option value='$k' $selected>$ttl ($k)</option>";
 		}
@@ -94,20 +94,20 @@ 
 		</select>
 	</td>
 	<td>
-		<span class="text-muted"><?php print _("If a secondary was unable to contact the primary at the last refresh, wait the retry value before trying again."); ?></span>
+		<span class="text-muted"><?php print _ ("If a secondary was unable to contact the primary at the last refresh, wait the retry value before trying again."); ?></span>
 	</td>
 </tr>
 <!-- expire -->
 <tr>
-	<td><?php print _('Expire'); ?></th>
+	<td><?php print _ ('Expire'); ?></th>
 	<td>
 		<select name="expire" class="form-control input-w-auto input-sm" <?php print $readonly; ?>>
 		<?php
 		// loop
-		foreach($PowerDNS->ttl as $k=>$ttl) {
+		foreach ($PowerDNS->ttl as $k=>$ttl) {
 			// active
-			if ($k == @$pdns->expire)	{ $selected = "selected"; }
-			else						{ $selected = ""; }
+			if ($k == @$pdns->expire) { $selected = "selected"; }
+			else { $selected = ""; }
 			// print
 			print "<option value='$k' $selected>$ttl ($k)</option>";
 		}
@@ -115,20 +115,20 @@ 
 		</select>
 	</td>
 	<td>
-		<span class="text-muted"><?php print _("How long a secondary will still treat its copy of the zone data as valid if it can't contact the primary."); ?></span>
+		<span class="text-muted"><?php print _ ("How long a secondary will still treat its copy of the zone data as valid if it can't contact the primary."); ?></span>
 	</td>
 </tr>
 <!-- NXDOMAIN -->
 <tr>
-	<td><?php print _('NXDOMAIN TTL'); ?></th>
+	<td><?php print _ ('NXDOMAIN TTL'); ?></th>
 	<td>
 		<select name="nxdomain_ttl" class="form-control input-w-auto input-sm" <?php print $readonly; ?>>
 		<?php
 		// loop
-		foreach($PowerDNS->ttl as $k=>$ttl) {
+		foreach ($PowerDNS->ttl as $k=>$ttl) {
 			// active
-			if ($k == @$pdns->nxdomain_ttl)	{ $selected = "selected"; }
-			else							{ $selected = ""; }
+			if ($k == @$pdns->nxdomain_ttl) { $selected = "selected"; }
+			else { $selected = ""; }
 			// print
 			print "<option value='$k' $selected>$ttl ($k)</option>";
 		}
@@ -136,34 +136,34 @@ 
 		</select>
 	</td>
 	<td>
-		<span class="text-muted"><?php print _("negative caching time - the time a NAME ERROR = NXDOMAIN result may be cached by any resolver"); ?></span>
+		<span class="text-muted"><?php print _ ("negative caching time - the time a NAME ERROR = NXDOMAIN result may be cached by any resolver"); ?></span>
 	</td>
 </tr>
 <!-- TTL -->
 <tr>
-	<td><?php print _('Default TTL'); ?></th>
+	<td><?php print _ ('Default TTL'); ?></th>
 	<td>
 		<select name="ttl" class="form-control input-w-auto input-sm" <?php print $readonly; ?>>
 		<?php
 		// loop
-		foreach($PowerDNS->ttl as $k=>$ttl) {
+		foreach ($PowerDNS->ttl as $k=>$ttl) {
 			// active
-			if ($k == @$pdns->ttl)	{ $selected = "selected"; }
-			else					{ $selected = ""; }
+			if ($k == @$pdns->ttl) { $selected = "selected"; }
+			else { $selected = ""; }
 			// print
 			print "<option value='$k' $selected>$ttl ($k)</option>";
 		}
 		?>
 		</select>	</td>
 	<td>
-		<span class="text-muted"><?php print _("Default TTL for domain records"); ?></span>
+		<span class="text-muted"><?php print _ ("Default TTL for domain records"); ?></span>
 	</td>
 </tr>
 <!-- submit -->
 <tr>
 	<td></td>
 	<td style="text-align: right">
-		<input type="submit" class="btn btn-success btn-sm" value="<?php print _("Save"); ?>">
+		<input type="submit" class="btn btn-success btn-sm" value="<?php print _ ("Save"); ?>">
 	</td>
 </tr>
 

app/admin/powerDNS/index.php

Indentation +19 added lines, -19 removed lines

@@ -36,25 +36,25 @@ 
 <!-- tabs -->
 <ul class="nav nav-tabs">
 	<?php
-	// tabs
-	$tabs = array("domains", "host_records", "reverse_v4", "reverse_v6", "settings", "defaults");
+    // tabs
+    $tabs = array("domains", "host_records", "reverse_v4", "reverse_v6", "settings", "defaults");
 
-	// default tab
-	if(!isset($_GET['subnetId'])) {
-		if(!$test)	{ $_GET['subnetId'] = "settings"; }
-		else		{ $_GET['subnetId'] = "domains"; }
-	}
+    // default tab
+    if(!isset($_GET['subnetId'])) {
+        if(!$test)	{ $_GET['subnetId'] = "settings"; }
+        else		{ $_GET['subnetId'] = "domains"; }
+    }
 
-	// check
-	if(!in_array($_GET['subnetId'], $tabs)) 	{ $Result->show("danger", "Invalid request", true); }
+    // check
+    if(!in_array($_GET['subnetId'], $tabs)) 	{ $Result->show("danger", "Invalid request", true); }
 
-	// print
-	foreach($tabs as $t) {
-		$title = str_replace('_', ' ', $t);
-		$class = $_GET['subnetId']==$t ? "class='active'" : "";
-		print "<li role='presentation' $class><a href=".create_link("administration", "powerDNS", "$t").">". _(ucwords($title))."</a></li>";
-	}
-	?>
+    // print
+    foreach($tabs as $t) {
+        $title = str_replace('_', ' ', $t);
+        $class = $_GET['subnetId']==$t ? "class='active'" : "";
+        print "<li role='presentation' $class><a href=".create_link("administration", "powerDNS", "$t").">". _(ucwords($title))."</a></li>";
+    }
+    ?>
 </ul>
 
 <div>
@@ -62,9 +62,9 @@ 
 // include content
 $pdns_section = $_GET['subnetId'];
 if (preg_match("/reverse_/", $pdns_section)) {
-	$filename = 'domains.php';
+    $filename = 'domains.php';
 } else {
-	$filename = "$_GET[subnetId].php";
+    $filename = "$_GET[subnetId].php";
 }
 
 // include file
@@ -75,7 +75,7 @@ 
 
 <?php
 } else {
-	$Result->show("info", _('Please enable powerDNS module under server management'), false);
+    $Result->show("info", _('Please enable powerDNS module under server management'), false);
 }
 ?>
 </div>
\ No newline at end of file

Braces +4 added lines, -2 removed lines

@@ -63,7 +63,8 @@ 
 $pdns_section = $_GET['subnetId'];
 if (preg_match("/reverse_/", $pdns_section)) {
 	$filename = 'domains.php';
-} else {
+}
+else {
 	$filename = "$_GET[subnetId].php";
 }
 
@@ -74,7 +75,8 @@ 
 </div>
 
 <?php
-} else {
+}
+else {
 	$Result->show("info", _('Please enable powerDNS module under server management'), false);
 }
 ?>

Spacing +21 added lines, -21 removed lines

@@ -6,29 +6,29 @@ 
  *************************************************/
 
 # verify that user is logged in
-$User->check_user_session();
+$User->check_user_session ();
 ?>
 
 <!-- display existing groups -->
-<h4><?php print _('PowerDNS management'); ?></h4>
+<h4><?php print _ ('PowerDNS management'); ?></h4>
 <hr><br>
 
-<?php if($User->settings->enablePowerDNS==1) { ?>
+<?php if ($User->settings->enablePowerDNS == 1) { ?>
 
 <?php
 # powerDNS class
 $PowerDNS = new PowerDNS ($Database);
 
 // check connection
-$test = $PowerDNS->db_check();
+$test = $PowerDNS->db_check ();
 // save settings for powerDNS default
 $pdns = $PowerDNS->db_settings;
 
 // check if TTL is set
-if ($test!==false) {
-    $test_ttl = json_decode($User->settings->powerDNS);
-    if ($test_ttl->ttl==NULL) {
-        $Result->show("warning", "Please set <a href='".create_link("administration", "powerDNS", "defaults")."'>default powerDNS values</a>!", false);
+if ($test !== false) {
+    $test_ttl = json_decode ($User->settings->powerDNS);
+    if ($test_ttl->ttl == NULL) {
+        $Result->show ("warning", "Please set <a href='".create_link ("administration", "powerDNS", "defaults")."'>default powerDNS values</a>!", false);
     }
 }
 
@@ -37,22 +37,22 @@ 
 <ul class="nav nav-tabs">
 	<?php
 	// tabs
-	$tabs = array("domains", "host_records", "reverse_v4", "reverse_v6", "settings", "defaults");
+	$tabs = array ("domains", "host_records", "reverse_v4", "reverse_v6", "settings", "defaults");
 
 	// default tab
-	if(!isset($_GET['subnetId'])) {
-		if(!$test)	{ $_GET['subnetId'] = "settings"; }
-		else		{ $_GET['subnetId'] = "domains"; }
+	if (!isset($_GET['subnetId'])) {
+		if (!$test) { $_GET['subnetId'] = "settings"; }
+		else { $_GET['subnetId'] = "domains"; }
 	}
 
 	// check
-	if(!in_array($_GET['subnetId'], $tabs)) 	{ $Result->show("danger", "Invalid request", true); }
+	if (!in_array ($_GET['subnetId'], $tabs)) { $Result->show ("danger", "Invalid request", true); }
 
 	// print
-	foreach($tabs as $t) {
-		$title = str_replace('_', ' ', $t);
-		$class = $_GET['subnetId']==$t ? "class='active'" : "";
-		print "<li role='presentation' $class><a href=".create_link("administration", "powerDNS", "$t").">". _(ucwords($title))."</a></li>";
+	foreach ($tabs as $t) {
+		$title = str_replace ('_', ' ', $t);
+		$class = $_GET['subnetId'] == $t ? "class='active'" : "";
+		print "<li role='presentation' $class><a href=".create_link ("administration", "powerDNS", "$t").">"._ (ucwords ($title))."</a></li>";
 	}
 	?>
 </ul>
@@ -61,21 +61,21 @@ 
 <?php
 // include content
 $pdns_section = $_GET['subnetId'];
-if (preg_match("/reverse_/", $pdns_section)) {
+if (preg_match ("/reverse_/", $pdns_section)) {
 	$filename = 'domains.php';
 } else {
 	$filename = "$_GET[subnetId].php";
 }
 
 // include file
-if(!file_exists(dirname(__FILE__) . '/'.$filename)) 	{ $Result->show("danger", "Invalid request", true); }
-else													{ include(dirname(__FILE__) . '/'.$filename); }
+if (!file_exists (dirname (__FILE__).'/'.$filename)) { $Result->show ("danger", "Invalid request", true); }
+else { include(dirname (__FILE__).'/'.$filename); }
 ?>
 </div>
 
 <?php
 } else {
-	$Result->show("info", _('Please enable powerDNS module under server management'), false);
+	$Result->show ("info", _ ('Please enable powerDNS module under server management'), false);
 }
 ?>
 </div>
\ No newline at end of file

app/admin/powerDNS/settings.php

Indentation +3 added lines, -3 removed lines

@@ -90,7 +90,7 @@
 <!-- check -->
 <div class="check" style="height:60px;">
 	<?php
-	if ($test==false)		{ $Result->show("danger alert-absolute", "Failed to connect to database:<hr> ".$PowerDNS->error); }
-	else					{ $Result->show("success alert-absolute", "Database connection ok"); }
-	?>
+    if ($test==false)		{ $Result->show("danger alert-absolute", "Failed to connect to database:<hr> ".$PowerDNS->error); }
+    else					{ $Result->show("success alert-absolute", "Database connection ok"); }
+    ?>
 </div>
\ No newline at end of file

Braces +4 added lines, -1 removed lines

@@ -69,7 +69,10 @@
 <tr>
 	<td><?php print _('Autoserial'); ?></th>
 	<td>
-        <input type="checkbox" class="input-switch" value="Yes" name="autoserial" <?php if(@$pdns->autoserial == "Yes") print 'checked'; ?>>
+        <input type="checkbox" class="input-switch" value="Yes" name="autoserial" <?php if(@$pdns->autoserial == "Yes") {
+    print 'checked';
+}
+?>>
 	</td>
 </tr>
 <!-- submit -->

Spacing +12 added lines, -12 removed lines

@@ -5,7 +5,7 @@ 
  *************************************************/
 
 # verify that user is logged in
-$User->check_user_session();
+$User->check_user_session ();
 
 # create csrf token
 $csrf = $User->csrf_cookie ("create", "pdns_settings");
@@ -30,12 +30,12 @@ 
 
 <!-- site settings -->
 <tr class="settings-title">
-	<th colspan="3"><h4><?php print _('Database settings'); ?></h4><hr></th>
+	<th colspan="3"><h4><?php print _ ('Database settings'); ?></h4><hr></th>
 </tr>
 
 <!-- host -->
 <tr>
-	<td><?php print _('Host'); ?></th>
+	<td><?php print _ ('Host'); ?></th>
 	<td style="width:300px;">
 		<input type="text" class="form-control input-sm" name="host" value="<?php print $pdns->host; ?>">
 		<input type="hidden" name="csrf_cookie" value="<?php print $csrf; ?>">
@@ -43,44 +43,44 @@ 
 </tr>
 <!-- db -->
 <tr>
-	<td><?php print _('Database'); ?></th>
+	<td><?php print _ ('Database'); ?></th>
 	<td>
 		<input type="text" class="form-control input-sm" name="name" value="<?php print $pdns->name; ?>">
 	</td>
 </tr>
 <!-- user -->
 <tr>
-	<td><?php print _('Username'); ?></th>
+	<td><?php print _ ('Username'); ?></th>
 	<td>
 		<input type="text" class="form-control input-sm" name="username" value="<?php print $pdns->username; ?>">
 	</td>
 </tr>
 <!-- pass -->
 <tr>
-	<td><?php print _('Password'); ?></th>
+	<td><?php print _ ('Password'); ?></th>
 	<td>
 		<input type="password" class="form-control input-sm" name="password" value="<?php print $pdns->password; ?>">
 	</td>
 </tr>
 <!-- port -->
 <tr>
-	<td><?php print _('Port'); ?></th>
+	<td><?php print _ ('Port'); ?></th>
 	<td>
 		<input type="text" class="form-control input-sm" name="port" value="<?php print $pdns->port; ?>">
 	</td>
 </tr>
 <!-- autoserial -->
 <tr>
-	<td><?php print _('Autoserial'); ?></th>
+	<td><?php print _ ('Autoserial'); ?></th>
 	<td>
-        <input type="checkbox" class="input-switch" value="Yes" name="autoserial" <?php if(@$pdns->autoserial == "Yes") print 'checked'; ?>>
+        <input type="checkbox" class="input-switch" value="Yes" name="autoserial" <?php if (@$pdns->autoserial == "Yes") print 'checked'; ?>>
 	</td>
 </tr>
 <!-- submit -->
 <tr>
 	<td></td>
 	<td style="text-align: right">
-		<input type="submit" class="btn btn-default btn-sm" value="<?php print _("Save"); ?>">
+		<input type="submit" class="btn btn-default btn-sm" value="<?php print _ ("Save"); ?>">
 	</td>
 </tr>
 
@@ -94,7 +94,7 @@ 
 <!-- check -->
 <div class="check" style="height:60px;">
 	<?php
-	if ($test==false)		{ $Result->show("danger alert-absolute", "Failed to connect to database:<hr> ".$PowerDNS->error); }
-	else					{ $Result->show("success alert-absolute", "Database connection ok"); }
+	if ($test == false) { $Result->show ("danger alert-absolute", "Failed to connect to database:<hr> ".$PowerDNS->error); }
+	else { $Result->show ("success alert-absolute", "Database connection ok"); }
 	?>
 </div>
\ No newline at end of file

app/admin/powerDNS/defaults-save.php

Indentation +2 added lines, -2 removed lines

@@ -46,8 +46,8 @@
 
 # set update values
 $values = array("id"=>1,
-				"powerDNS"=>json_encode($values),
-				);
+                "powerDNS"=>json_encode($values),
+                );
 if(!$Admin->object_modify("settings", "edit", "id", $values))	{ $Result->show("danger",  _("Cannot update settings"), true); }
 else															{ $Result->show("success", _("Settings updated successfully"), true); }
 ?>
\ No newline at end of file

Spacing +14 added lines, -14 removed lines

@@ -5,28 +5,28 @@ 
  **************************/
 
 /* functions */
-require( dirname(__FILE__) . '/../../../functions/functions.php');
+require(dirname (__FILE__).'/../../../functions/functions.php');
 
 # initialize user object
-$Database 	= new Database_PDO;
-$User 		= new User ($Database);
+$Database = new Database_PDO;
+$User = new User ($Database);
 $Admin	 	= new Admin ($Database);
 $Result 	= new Result ();
 
 # verify that user is logged in
-$User->check_user_session();
+$User->check_user_session ();
 
 # validate csrf cookie
-$User->csrf_cookie ("validate", "pdns_defaults", $_POST['csrf_cookie']) === false ? $Result->show("danger", _("Invalid CSRF cookie"), true) : "";
+$User->csrf_cookie ("validate", "pdns_defaults", $_POST['csrf_cookie']) === false ? $Result->show ("danger", _ ("Invalid CSRF cookie"), true) : "";
 
 // validations
-if(strlen($_POST['ttl'])==0)	{ $_POST['ttl'] = $PowerDNS->defaults->ttl; }
+if (strlen ($_POST['ttl']) == 0) { $_POST['ttl'] = $PowerDNS->defaults->ttl; }
 
 // formulate json
 $values = new StdClass ();
 
 // get old settings for defaults
-$old_values = json_decode($User->settings->powerDNS);
+$old_values = json_decode ($User->settings->powerDNS);
 
 $values->host 		= $old_values->host;
 $values->name 		= $old_values->name;
@@ -36,19 +36,19 @@ 
 $values->autoserial = @$old_values->autoserial;
 
 // defaults
-$values->ns 		= $_POST['ns'];
+$values->ns = $_POST['ns'];
 $values->hostmaster = $_POST['hostmaster'];
 $values->def_ptr_domain = $_POST['def_ptr_domain'];
-$values->refresh 	= $_POST['refresh'];
+$values->refresh = $_POST['refresh'];
 $values->retry 		= $_POST['retry'];
 $values->expire 	= $_POST['expire'];
 $values->nxdomain_ttl = $_POST['nxdomain_ttl'];
-$values->ttl 		= $_POST['ttl'];
+$values->ttl = $_POST['ttl'];
 
 # set update values
-$values = array("id"=>1,
-				"powerDNS"=>json_encode($values),
+$values = array ("id"=>1,
+				"powerDNS"=>json_encode ($values),
 				);
-if(!$Admin->object_modify("settings", "edit", "id", $values))	{ $Result->show("danger",  _("Cannot update settings"), true); }
-else															{ $Result->show("success", _("Settings updated successfully"), true); }
+if (!$Admin->object_modify ("settings", "edit", "id", $values)) { $Result->show ("danger", _ ("Cannot update settings"), true); }
+else { $Result->show ("success", _ ("Settings updated successfully"), true); }
 ?>
\ No newline at end of file

app/admin/powerDNS/record-edit.php

Indentation +61 added lines, -61 removed lines

@@ -29,49 +29,49 @@ 
 
 # get record
 if($_POST['action']!="add") {
-	$record = $PowerDNS->fetch_record ($_POST['id']);
-	$record!==false ? : $Result->show("danger", _("Invalid ID"), true, true);
+    $record = $PowerDNS->fetch_record ($_POST['id']);
+    $record!==false ? : $Result->show("danger", _("Invalid ID"), true, true);
 }
 # new record
 else {
-	// from IP table
-	// we provide record hostname and strip domain from it
-	if (!is_numeric($_POST['domain_id']) && !is_numeric($_POST['id'])) {
-		// fetch all domains
-		$all_domains = $PowerDNS->fetch_all_domains ();
-		if ($all_domains!==false) {
-			foreach($all_domains as $dk=>$domain_s) {
-				// loop through and find all matches
-				if (strpos($_POST['domain_id'],$domain_s->name) !== false) {
-					// check best match to avoid for example a.example.net.nz1 added to example.net.nz
-					if (substr($_POST['domain_id'], -strlen($domain_s->name)) === $domain_s->name) {
-						$matches[$dk] = $domain_s;
-					}
-				}
-			}
-			// match found ?
-			if (isset($matches)) {
-				foreach($matches as $k=>$m){
-					$length = strlen($m->name);
-					if($length > $max){ $max = $length; $element_id = $k; }
-				}
-				// save longest match id
-				$_POST['domain_id'] = $all_domains[$element_id]->id;
-			}
-		}
-		// die if not existing
-		if (!is_numeric($_POST['domain_id'])) {
-    		# admin?
-    		if ($User->is_admin())   { $Result->show("danger", _("Domain")." <strong>".$_POST['domain_id']."</strong><span class='ip_dns_addr hidden'>".$_POST['id']."</span> "._("does not exist")."!"."<hr><button class='btn btn-sm btn-default editDomain2 editDomain' data-action='add' data-id='0'><i class='fa fa-plus'></i> "._('Create domain')."</button>", true, true); }
-    		else                     { $Result->show("danger", _("Domain")." <strong>".$_POST['domain_id']."</strong> "._("does not exist")."!", true, true); }
-		}
-		else {
-			$record = new StdClass ();
-			$record->ttl = 3600;
-			$record->name = $post['domain_id'];
-			$record->content = $_POST['id'];
-		}
-	}
+    // from IP table
+    // we provide record hostname and strip domain from it
+    if (!is_numeric($_POST['domain_id']) && !is_numeric($_POST['id'])) {
+        // fetch all domains
+        $all_domains = $PowerDNS->fetch_all_domains ();
+        if ($all_domains!==false) {
+            foreach($all_domains as $dk=>$domain_s) {
+                // loop through and find all matches
+                if (strpos($_POST['domain_id'],$domain_s->name) !== false) {
+                    // check best match to avoid for example a.example.net.nz1 added to example.net.nz
+                    if (substr($_POST['domain_id'], -strlen($domain_s->name)) === $domain_s->name) {
+                        $matches[$dk] = $domain_s;
+                    }
+                }
+            }
+            // match found ?
+            if (isset($matches)) {
+                foreach($matches as $k=>$m){
+                    $length = strlen($m->name);
+                    if($length > $max){ $max = $length; $element_id = $k; }
+                }
+                // save longest match id
+                $_POST['domain_id'] = $all_domains[$element_id]->id;
+            }
+        }
+        // die if not existing
+        if (!is_numeric($_POST['domain_id'])) {
+            # admin?
+            if ($User->is_admin())   { $Result->show("danger", _("Domain")." <strong>".$_POST['domain_id']."</strong><span class='ip_dns_addr hidden'>".$_POST['id']."</span> "._("does not exist")."!"."<hr><button class='btn btn-sm btn-default editDomain2 editDomain' data-action='add' data-id='0'><i class='fa fa-plus'></i> "._('Create domain')."</button>", true, true); }
+            else                     { $Result->show("danger", _("Domain")." <strong>".$_POST['domain_id']."</strong> "._("does not exist")."!", true, true); }
+        }
+        else {
+            $record = new StdClass ();
+            $record->ttl = 3600;
+            $record->name = $post['domain_id'];
+            $record->content = $_POST['id'];
+        }
+    }
 }
 
 // get domain
@@ -80,9 +80,9 @@ 
 
 // default
 if (!isset($record)) {
-	$record = new StdClass ();
-	$record->ttl = 3600;
-	$record->name = $domain->name;
+    $record = new StdClass ();
+    $record->ttl = 3600;
+    $record->name = $domain->name;
 }
 
 // if IPv6 automaticall add AAAA record!
@@ -122,15 +122,15 @@ 
 		<td>
 			<select name="type" class="form-control input-w-auto input-sm" <?php print $readonly; ?>>
 			<?php
-			// loop
-			foreach($PowerDNS->record_types as $type) {
-				// active
-				if ($type == @$record->type)	{ $selected = "selected"; }
-				else							{ $selected = ""; }
-				// print
-				print "<option value='$type' $selected>$type</option>";
-			}
-			?>
+            // loop
+            foreach($PowerDNS->record_types as $type) {
+                // active
+                if ($type == @$record->type)	{ $selected = "selected"; }
+                else							{ $selected = ""; }
+                // print
+                print "<option value='$type' $selected>$type</option>";
+            }
+            ?>
 			</select>
 		</td>
 	</tr>
@@ -150,15 +150,15 @@ 
 		<td>
 			<select name="ttl" class="form-control input-w-auto input-sm" <?php print $readonly; ?>>
 			<?php
-			// loop
-			foreach($PowerDNS->ttl as $k=>$type) {
-				// active
-				if ($k == @$record->ttl)		{ $selected = "selected"; }
-				else							{ $selected = ""; }
-				// print
-				print "<option value='$k' $selected>$type</option>";
-			}
-			?>
+            // loop
+            foreach($PowerDNS->ttl as $k=>$type) {
+                // active
+                if ($k == @$record->ttl)		{ $selected = "selected"; }
+                else							{ $selected = ""; }
+                // print
+                print "<option value='$k' $selected>$type</option>";
+            }
+            ?>
 			</select>
 		</td>
 	</tr>

Braces +8 added lines, -2 removed lines

@@ -178,7 +178,10 @@ 
 		<td>
 			<select name="disabled" class="form-control input-w-auto input-sm" <?php print $readonly; ?>>
 				<option value="0"><?php print _('No'); ?></option>
-				<option value="1" <?php if($record->disabled==1) print "selected='selected'"; ?>><?php print _('Yes'); ?></option>
+				<option value="1" <?php if($record->disabled==1) {
+    print "selected='selected'";
+}
+?>><?php print _('Yes'); ?></option>
 			</select>
 		</td>
 	</tr>
@@ -196,7 +199,10 @@ 
 		<?php if($_POST['action']!=="delete" && isset($record->id)) { ?>
 		<button class="btn btn-sm btn-default btn-danger" id="editRecordSubmitDelete"><i class="fa fa-trash-o"></i> <?php print _("Delete"); ?></button>
 		<?php } ?>
-		<button class="btn btn-sm btn-default <?php if($_POST['action']=="delete") { print "btn-danger"; } else { print "btn-success"; } ?>" id="editRecordSubmit"><i class="fa <?php if($_POST['action']=="add") { print "fa-plus"; } else if ($_POST['action']=="delete") { print "fa-trash-o"; } else { print "fa-check"; } ?>"></i> <?php print ucwords(_($_POST['action'])); ?></button>
+		<button class="btn btn-sm btn-default <?php if($_POST['action']=="delete") { print "btn-danger"; }
+else { print "btn-success"; } ?>" id="editRecordSubmit"><i class="fa <?php if($_POST['action']=="add") { print "fa-plus"; }
+else if ($_POST['action']=="delete") { print "fa-trash-o"; }
+else { print "fa-check"; } ?>"></i> <?php print ucwords(_($_POST['action'])); ?></button>
 	</div>
 	<!-- result -->
 	<div class="record-edit-result"></div>

Spacing +43 added lines, -43 removed lines

@@ -5,18 +5,18 @@ 
  ************************************************/
 
 /* functions */
-require( dirname(__FILE__) . '/../../../functions/functions.php');
+require(dirname (__FILE__).'/../../../functions/functions.php');
 
 # initialize user object
-$Database 	= new Database_PDO;
-$User 		= new User ($Database);
+$Database = new Database_PDO;
+$User = new User ($Database);
 $Admin	 	= new Admin ($Database, false);
 $Tools	 	= new Tools ($Database);
 $Result 	= new Result ();
-$PowerDNS 	= new PowerDNS ($Database);
+$PowerDNS = new PowerDNS ($Database);
 
 # verify that user is logged in
-$User->check_user_session();
+$User->check_user_session ();
 
 # create csrf token
 $csrf = $User->csrf_cookie ("create", "record");
@@ -28,42 +28,42 @@ 
 $post = $_POST;
 
 # get record
-if($_POST['action']!="add") {
+if ($_POST['action'] != "add") {
 	$record = $PowerDNS->fetch_record ($_POST['id']);
-	$record!==false ? : $Result->show("danger", _("Invalid ID"), true, true);
+	$record !== false ? : $Result->show ("danger", _ ("Invalid ID"), true, true);
 }
 # new record
 else {
 	// from IP table
 	// we provide record hostname and strip domain from it
-	if (!is_numeric($_POST['domain_id']) && !is_numeric($_POST['id'])) {
+	if (!is_numeric ($_POST['domain_id']) && !is_numeric ($_POST['id'])) {
 		// fetch all domains
 		$all_domains = $PowerDNS->fetch_all_domains ();
-		if ($all_domains!==false) {
-			foreach($all_domains as $dk=>$domain_s) {
+		if ($all_domains !== false) {
+			foreach ($all_domains as $dk=>$domain_s) {
 				// loop through and find all matches
-				if (strpos($_POST['domain_id'],$domain_s->name) !== false) {
+				if (strpos ($_POST['domain_id'], $domain_s->name) !== false) {
 					// check best match to avoid for example a.example.net.nz1 added to example.net.nz
-					if (substr($_POST['domain_id'], -strlen($domain_s->name)) === $domain_s->name) {
+					if (substr ($_POST['domain_id'], -strlen ($domain_s->name)) === $domain_s->name) {
 						$matches[$dk] = $domain_s;
 					}
 				}
 			}
 			// match found ?
 			if (isset($matches)) {
-				foreach($matches as $k=>$m){
-					$length = strlen($m->name);
-					if($length > $max){ $max = $length; $element_id = $k; }
+				foreach ($matches as $k=>$m) {
+					$length = strlen ($m->name);
+					if ($length > $max) { $max = $length; $element_id = $k; }
 				}
 				// save longest match id
 				$_POST['domain_id'] = $all_domains[$element_id]->id;
 			}
 		}
 		// die if not existing
-		if (!is_numeric($_POST['domain_id'])) {
+		if (!is_numeric ($_POST['domain_id'])) {
     		# admin?
-    		if ($User->is_admin())   { $Result->show("danger", _("Domain")." <strong>".$_POST['domain_id']."</strong><span class='ip_dns_addr hidden'>".$_POST['id']."</span> "._("does not exist")."!"."<hr><button class='btn btn-sm btn-default editDomain2 editDomain' data-action='add' data-id='0'><i class='fa fa-plus'></i> "._('Create domain')."</button>", true, true); }
-    		else                     { $Result->show("danger", _("Domain")." <strong>".$_POST['domain_id']."</strong> "._("does not exist")."!", true, true); }
+    		if ($User->is_admin ()) { $Result->show ("danger", _ ("Domain")." <strong>".$_POST['domain_id']."</strong><span class='ip_dns_addr hidden'>".$_POST['id']."</span> "._ ("does not exist")."!"."<hr><button class='btn btn-sm btn-default editDomain2 editDomain' data-action='add' data-id='0'><i class='fa fa-plus'></i> "._ ('Create domain')."</button>", true, true); }
+    		else { $Result->show ("danger", _ ("Domain")." <strong>".$_POST['domain_id']."</strong> "._ ("does not exist")."!", true, true); }
 		}
 		else {
 			$record = new StdClass ();
@@ -76,7 +76,7 @@ 
 
 // get domain
 $domain = $PowerDNS->fetch_domain ($_POST['domain_id']);
-$domain!==false ? : $Result->show("danger", _("Invalid ID"), true, true);
+$domain !== false ? : $Result->show ("danger", _ ("Invalid ID"), true, true);
 
 // default
 if (!isset($record)) {
@@ -86,17 +86,17 @@ 
 }
 
 // if IPv6 automaticall add AAAA record!
-if ($User->identify_address($record->content)=="IPv6") {
+if ($User->identify_address ($record->content) == "IPv6") {
     $record->type = "AAAA";
 }
 
 # disable edit on delete
-$readonly = $_POST['action']=="delete" ? "readonly" : "";
+$readonly = $_POST['action'] == "delete" ? "readonly" : "";
 ?>
 
 
 <!-- header -->
-<div class="pHeader"><?php print ucwords(_("$_POST[action]")); ?> <?php print _('DNS record'); ?> <?php print _('for domain'); ?> <strong><?php print $domain->name; ?></strong></div>
+<div class="pHeader"><?php print ucwords (_ ("$_POST[action]")); ?> <?php print _ ('DNS record'); ?> <?php print _ ('for domain'); ?> <strong><?php print $domain->name; ?></strong></div>
 
 <!-- content -->
 <div class="pContent">
@@ -106,9 +106,9 @@ 
 
 	<!-- name  -->
 	<tr>
-		<td style="width:150px;"><?php print _('Name'); ?></td>
+		<td style="width:150px;"><?php print _ ('Name'); ?></td>
 		<td>
-			<input type="text" class="name form-control input-sm" name="name" placeholder="<?php print _('www.example.com'); ?>" value="<?php print $record->name; ?>" <?php print $readonly; ?>>
+			<input type="text" class="name form-control input-sm" name="name" placeholder="<?php print _ ('www.example.com'); ?>" value="<?php print $record->name; ?>" <?php print $readonly; ?>>
 			<input type="hidden" name="action" value="<?php print $_POST['action']; ?>">
 			<input type="hidden" name="id" value="<?php print @$_POST['id']; ?>">
 			<input type="hidden" name="domain_id" value="<?php print @$_POST['domain_id']; ?>">
@@ -118,15 +118,15 @@ 
 
 	<!-- type -->
 	<tr>
-		<td><?php print _('Record type'); ?></td>
+		<td><?php print _ ('Record type'); ?></td>
 		<td>
 			<select name="type" class="form-control input-w-auto input-sm" <?php print $readonly; ?>>
 			<?php
 			// loop
-			foreach($PowerDNS->record_types as $type) {
+			foreach ($PowerDNS->record_types as $type) {
 				// active
-				if ($type == @$record->type)	{ $selected = "selected"; }
-				else							{ $selected = ""; }
+				if ($type == @$record->type) { $selected = "selected"; }
+				else { $selected = ""; }
 				// print
 				print "<option value='$type' $selected>$type</option>";
 			}
@@ -137,24 +137,24 @@ 
 
 	<!-- Content  -->
 	<tr>
-		<td><?php print _('Content'); ?></td>
+		<td><?php print _ ('Content'); ?></td>
 		<td>
-			<input type="text" class="name form-control input-sm" name="content" placeholder="<?php print _('10.10.10.1'); ?>" value="<?php print $record->content; ?>" <?php print $readonly; ?>>
+			<input type="text" class="name form-control input-sm" name="content" placeholder="<?php print _ ('10.10.10.1'); ?>" value="<?php print $record->content; ?>" <?php print $readonly; ?>>
 
 		</td>
 	</tr>
 
 	<!-- TTL  -->
 	<tr>
-		<td><?php print _('TTL'); ?></td>
+		<td><?php print _ ('TTL'); ?></td>
 		<td>
 			<select name="ttl" class="form-control input-w-auto input-sm" <?php print $readonly; ?>>
 			<?php
 			// loop
-			foreach($PowerDNS->ttl as $k=>$type) {
+			foreach ($PowerDNS->ttl as $k=>$type) {
 				// active
-				if ($k == @$record->ttl)		{ $selected = "selected"; }
-				else							{ $selected = ""; }
+				if ($k == @$record->ttl) { $selected = "selected"; }
+				else { $selected = ""; }
 				// print
 				print "<option value='$k' $selected>$type</option>";
 			}
@@ -165,20 +165,20 @@ 
 
 	<!-- Prio  -->
 	<tr>
-		<td><?php print _('Priority'); ?></td>
+		<td><?php print _ ('Priority'); ?></td>
 		<td>
-			<input type="text" class="name form-control input-sm input-w-100" name="prio" placeholder="<?php print _('Priority'); ?>" value="<?php print $record->prio; ?>" <?php print $readonly; ?>>
+			<input type="text" class="name form-control input-sm input-w-100" name="prio" placeholder="<?php print _ ('Priority'); ?>" value="<?php print $record->prio; ?>" <?php print $readonly; ?>>
 
 		</td>
 	</tr>
 
 	<!-- Disabled  -->
 	<tr>
-		<td><?php print _('Disabled'); ?></td>
+		<td><?php print _ ('Disabled'); ?></td>
 		<td>
 			<select name="disabled" class="form-control input-w-auto input-sm" <?php print $readonly; ?>>
-				<option value="0"><?php print _('No'); ?></option>
-				<option value="1" <?php if($record->disabled==1) print "selected='selected'"; ?>><?php print _('Yes'); ?></option>
+				<option value="0"><?php print _ ('No'); ?></option>
+				<option value="1" <?php if ($record->disabled == 1) print "selected='selected'"; ?>><?php print _ ('Yes'); ?></option>
 			</select>
 		</td>
 	</tr>
@@ -192,11 +192,11 @@ 
 <!-- footer -->
 <div class="pFooter">
 	<div class="btn-group">
-		<button class="btn btn-sm btn-default hidePopups"><?php print _('Cancel'); ?></button>
-		<?php if($_POST['action']!=="delete" && isset($record->id)) { ?>
-		<button class="btn btn-sm btn-default btn-danger" id="editRecordSubmitDelete"><i class="fa fa-trash-o"></i> <?php print _("Delete"); ?></button>
+		<button class="btn btn-sm btn-default hidePopups"><?php print _ ('Cancel'); ?></button>
+		<?php if ($_POST['action'] !== "delete" && isset($record->id)) { ?>
+		<button class="btn btn-sm btn-default btn-danger" id="editRecordSubmitDelete"><i class="fa fa-trash-o"></i> <?php print _ ("Delete"); ?></button>
 		<?php } ?>
-		<button class="btn btn-sm btn-default <?php if($_POST['action']=="delete") { print "btn-danger"; } else { print "btn-success"; } ?>" id="editRecordSubmit"><i class="fa <?php if($_POST['action']=="add") { print "fa-plus"; } else if ($_POST['action']=="delete") { print "fa-trash-o"; } else { print "fa-check"; } ?>"></i> <?php print ucwords(_($_POST['action'])); ?></button>
+		<button class="btn btn-sm btn-default <?php if ($_POST['action'] == "delete") { print "btn-danger"; } else { print "btn-success"; } ?>" id="editRecordSubmit"><i class="fa <?php if ($_POST['action'] == "add") { print "fa-plus"; } else if ($_POST['action'] == "delete") { print "fa-trash-o"; } else { print "fa-check"; } ?>"></i> <?php print ucwords (_ ($_POST['action'])); ?></button>
 	</div>
 	<!-- result -->
 	<div class="record-edit-result"></div>

app/admin/powerDNS/record-edit-result.php

Indentation +8 added lines, -8 removed lines

@@ -25,27 +25,27 @@
 
 # fetch old record
 if($_POST['action']!="add") {
-	$record = $PowerDNS->fetch_record ($_POST['id']);
-	$record!==false ? : $Result->show("danger", _("Invalid ID"), true, true);
+    $record = $PowerDNS->fetch_record ($_POST['id']);
+    $record!==false ? : $Result->show("danger", _("Invalid ID"), true, true);
 }
 
 # edit and add - check that smth is in name and content!
 if ($_POST['action']!="delete") {
-	if (strlen($_POST['name'])<2)		{ $Result->show ("danger", _("Invalid name"), true); }
-	if (strlen($_POST['content'])<2)	{ $Result->show ("danger", _("Invalid content"), true); }
+    if (strlen($_POST['name'])<2)		{ $Result->show ("danger", _("Invalid name"), true); }
+    if (strlen($_POST['content'])<2)	{ $Result->show ("danger", _("Invalid content"), true); }
 }
 
 
 # validate and set values
 if($_POST['action']=="edit") {
-	$values = $PowerDNS->formulate_update_record ($_POST['name'], $_POST['type'], $_POST['content'], $_POST['ttl'], $_POST['prio'], $_POST['disabled'], $record->change_date);
-	$values['domain_id'] = $_POST['domain_id'];
+    $values = $PowerDNS->formulate_update_record ($_POST['name'], $_POST['type'], $_POST['content'], $_POST['ttl'], $_POST['prio'], $_POST['disabled'], $record->change_date);
+    $values['domain_id'] = $_POST['domain_id'];
 }
 elseif($_POST['action']=="add") {
-	$values = $PowerDNS->formulate_new_record ($_POST['domain_id'], $_POST['name'], $_POST['type'], $_POST['content'], $_POST['ttl'], $_POST['prio'], $_POST['disabled']);
+    $values = $PowerDNS->formulate_new_record ($_POST['domain_id'], $_POST['name'], $_POST['type'], $_POST['content'], $_POST['ttl'], $_POST['prio'], $_POST['disabled']);
 }
 elseif($_POST['action']=="delete") {
-	$values['domain_id'] = $_POST['domain_id'];
+    $values['domain_id'] = $_POST['domain_id'];
 }
 
 # add id

Spacing +17 added lines, -17 removed lines

@@ -5,56 +5,56 @@
  ***************************/
 
 /* functions */
-require( dirname(__FILE__) . '/../../../functions/functions.php');
+require(dirname (__FILE__).'/../../../functions/functions.php');
 
 # initialize user object
-$Database 	= new Database_PDO;
-$User 		= new User ($Database);
+$Database = new Database_PDO;
+$User = new User ($Database);
 $Admin	 	= new Admin ($Database, false);
 $Result 	= new Result ();
-$PowerDNS 	= new PowerDNS ($Database);
+$PowerDNS = new PowerDNS ($Database);
 
 # verify that user is logged in
-$User->check_user_session();
+$User->check_user_session ();
 
 # strip input tags
-$_POST = $Admin->strip_input_tags($_POST);
+$_POST = $Admin->strip_input_tags ($_POST);
 
 # validate csrf cookie
-$User->csrf_cookie ("validate", "record", $_POST['csrf_cookie']) === false ? $Result->show("danger", _("Invalid CSRF cookie"), true) : "";
+$User->csrf_cookie ("validate", "record", $_POST['csrf_cookie']) === false ? $Result->show ("danger", _ ("Invalid CSRF cookie"), true) : "";
 
 # fetch old record
-if($_POST['action']!="add") {
+if ($_POST['action'] != "add") {
 	$record = $PowerDNS->fetch_record ($_POST['id']);
-	$record!==false ? : $Result->show("danger", _("Invalid ID"), true, true);
+	$record !== false ? : $Result->show ("danger", _ ("Invalid ID"), true, true);
 }
 
 # edit and add - check that smth is in name and content!
-if ($_POST['action']!="delete") {
-	if (strlen($_POST['name'])<2)		{ $Result->show ("danger", _("Invalid name"), true); }
-	if (strlen($_POST['content'])<2)	{ $Result->show ("danger", _("Invalid content"), true); }
+if ($_POST['action'] != "delete") {
+	if (strlen ($_POST['name']) < 2) { $Result->show ("danger", _ ("Invalid name"), true); }
+	if (strlen ($_POST['content']) < 2) { $Result->show ("danger", _ ("Invalid content"), true); }
 }
 
 
 # validate and set values
-if($_POST['action']=="edit") {
+if ($_POST['action'] == "edit") {
 	$values = $PowerDNS->formulate_update_record ($_POST['name'], $_POST['type'], $_POST['content'], $_POST['ttl'], $_POST['prio'], $_POST['disabled'], $record->change_date);
 	$values['domain_id'] = $_POST['domain_id'];
 }
-elseif($_POST['action']=="add") {
+elseif ($_POST['action'] == "add") {
 	$values = $PowerDNS->formulate_new_record ($_POST['domain_id'], $_POST['name'], $_POST['type'], $_POST['content'], $_POST['ttl'], $_POST['prio'], $_POST['disabled']);
 }
-elseif($_POST['action']=="delete") {
+elseif ($_POST['action'] == "delete") {
 	$values['domain_id'] = $_POST['domain_id'];
 }
 
 # add id
-$values['id'] 		 = @$_POST['id'];
+$values['id'] = @$_POST['id'];
 
 # remove empty records
 $values = $PowerDNS->remove_empty_array_fields ($values);
 
 # update
-$PowerDNS->record_edit($_POST['action'], $values);
+$PowerDNS->record_edit ($_POST['action'], $values);
 
 ?>
\ No newline at end of file

app/admin/vrfs/vrf-scan-result.php

Indentation +28 added lines, -28 removed lines

@@ -34,43 +34,43 @@
 
 # ok, lets get results form post array!
 foreach($_POST as $key=>$line) {
-	// IP address
-	if(substr($key, 0,2)=="rd") 			    { $res[substr($key, 2)]['rd']  	        = $line; }
-	// mac
-	elseif(substr($key, 0,4)=="name") 		    { $res[substr($key, 4)]['name']  	    = $line; }
-	// description
-	elseif(substr($key, 0,11)=="description") 	{ $res[substr($key, 11)]['description'] = $line; }
-	// custom fields
-	elseif (isset($required_fields)) {
-    	foreach ($required_fields as $k=>$f) {
-        	if((strpos($key, $f['name'])) !== false) {
+    // IP address
+    if(substr($key, 0,2)=="rd") 			    { $res[substr($key, 2)]['rd']  	        = $line; }
+    // mac
+    elseif(substr($key, 0,4)=="name") 		    { $res[substr($key, 4)]['name']  	    = $line; }
+    // description
+    elseif(substr($key, 0,11)=="description") 	{ $res[substr($key, 11)]['description'] = $line; }
+    // custom fields
+    elseif (isset($required_fields)) {
+        foreach ($required_fields as $k=>$f) {
+            if((strpos($key, $f['name'])) !== false) {
                                                 { $res[substr($key, strlen($f['name']))][$f['name']] = $line; }
-        	}
-    	}
-	}
+            }
+        }
+    }
 }
 
 # insert entries
 if(sizeof($res)>0) {
-	$errors = 0;
-	foreach($res as $r) {
-		# set insert values
-		$values = array("rd"=>$r['rd'],
-						"name"=>$r['name'],
-						"description"=>$r['description']
-						);
+    $errors = 0;
+    foreach($res as $r) {
+        # set insert values
+        $values = array("rd"=>$r['rd'],
+                        "name"=>$r['name'],
+                        "description"=>$r['description']
+                        );
         # custom fields
-		if (isset($required_fields)) {
-			foreach ($required_fields as $k=>$f) {
-				$values[$f['name']] = $r[$f['name']];
-			}
-		}
+        if (isset($required_fields)) {
+            foreach ($required_fields as $k=>$f) {
+                $values[$f['name']] = $r[$f['name']];
+            }
+        }
         # insert vrfs
         if(!$Admin->object_modify("vrf", "add", "vrfId", $values))	{ $Result->show("danger", _("Failed to import entry")." ".$r['number']." ".$r['name'], false); $errors++; }
-	}
+    }
 
-	# success if no errors
-	if($errors==0) {  $Result->show("success", _("Scan results added to database")."!", true); }
+    # success if no errors
+    if($errors==0) {  $Result->show("success", _("Scan results added to database")."!", true); }
 }
 # error
 else { $Result->show("danger", _("No entries available"), true); }

Spacing +22 added lines, -22 removed lines

@@ -4,58 +4,58 @@ 
  *******************************/
 
 /* functions */
-require( dirname(__FILE__) . '/../../../functions/functions.php');
+require(dirname (__FILE__).'/../../../functions/functions.php');
 
 # initialize user object
-$Database 	= new Database_PDO;
-$User 		= new User ($Database);
+$Database = new Database_PDO;
+$User = new User ($Database);
 $Admin	 	= new Admin ($Database);
 $Subnets	= new Subnets ($Database);
-$Addresses	= new Addresses ($Database);
-$Tools      = new Tools ($Database);
+$Addresses = new Addresses ($Database);
+$Tools = new Tools ($Database);
 $Result 	= new Result ();
 
 # verify that user is logged in
-$User->check_user_session();
+$User->check_user_session ();
 
 # check for number of input values
-$max = ini_get("max_input_vars");
-if(sizeof($_POST)>=ini_get("max_input_vars")) 							{ $Result->show("danger", _("Number of discovered hosts exceed maximum possible defined by php.ini - set to ")." $max <hr>"._("Please adjust your php.ini settings for value `max_input_vars`"), true); }
+$max = ini_get ("max_input_vars");
+if (sizeof ($_POST) >= ini_get ("max_input_vars")) { $Result->show ("danger", _ ("Number of discovered hosts exceed maximum possible defined by php.ini - set to ")." $max <hr>"._ ("Please adjust your php.ini settings for value `max_input_vars`"), true); }
 
 // fetch custom fields and check for required
 $required_fields = $Tools->fetch_custom_fields ('vrf');
-if($required_fields!==false) {
+if ($required_fields !== false) {
     foreach ($required_fields as $k=>$f) {
-        if ($f['Null']!="NO") {
+        if ($f['Null'] != "NO") {
             unset($required_fields[$k]);
         }
     }
 }
 
 # ok, lets get results form post array!
-foreach($_POST as $key=>$line) {
+foreach ($_POST as $key=>$line) {
 	// IP address
-	if(substr($key, 0,2)=="rd") 			    { $res[substr($key, 2)]['rd']  	        = $line; }
+	if (substr ($key, 0, 2) == "rd") { $res[substr ($key, 2)]['rd'] = $line; }
 	// mac
-	elseif(substr($key, 0,4)=="name") 		    { $res[substr($key, 4)]['name']  	    = $line; }
+	elseif (substr ($key, 0, 4) == "name") { $res[substr ($key, 4)]['name'] = $line; }
 	// description
-	elseif(substr($key, 0,11)=="description") 	{ $res[substr($key, 11)]['description'] = $line; }
+	elseif (substr ($key, 0, 11) == "description") { $res[substr ($key, 11)]['description'] = $line; }
 	// custom fields
 	elseif (isset($required_fields)) {
     	foreach ($required_fields as $k=>$f) {
-        	if((strpos($key, $f['name'])) !== false) {
-                                                { $res[substr($key, strlen($f['name']))][$f['name']] = $line; }
+        	if ((strpos ($key, $f['name'])) !== false) {
+                                                { $res[substr ($key, strlen ($f['name']))][$f['name']] = $line; }
         	}
     	}
 	}
 }
 
 # insert entries
-if(sizeof($res)>0) {
+if (sizeof ($res) > 0) {
 	$errors = 0;
-	foreach($res as $r) {
+	foreach ($res as $r) {
 		# set insert values
-		$values = array("rd"=>$r['rd'],
+		$values = array ("rd"=>$r['rd'],
 						"name"=>$r['name'],
 						"description"=>$r['description']
 						);
@@ -66,12 +66,12 @@ 
 			}
 		}
         # insert vrfs
-        if(!$Admin->object_modify("vrf", "add", "vrfId", $values))	{ $Result->show("danger", _("Failed to import entry")." ".$r['number']." ".$r['name'], false); $errors++; }
+        if (!$Admin->object_modify ("vrf", "add", "vrfId", $values)) { $Result->show ("danger", _ ("Failed to import entry")." ".$r['number']." ".$r['name'], false); $errors++; }
 	}
 
 	# success if no errors
-	if($errors==0) {  $Result->show("success", _("Scan results added to database")."!", true); }
+	if ($errors == 0) {  $Result->show ("success", _ ("Scan results added to database")."!", true); }
 }
 # error
-else { $Result->show("danger", _("No entries available"), true); }
+else { $Result->show ("danger", _ ("No entries available"), true); }
 ?>
\ No newline at end of file

app/admin/vrfs/index.php

Indentation +87 added lines, -87 removed lines

@@ -40,95 +40,95 @@
 # first check if they exist!
 if($all_vrfs===false) { $Result->show("info", _("No VRFs configured")."!", false);}
 else {
-	print '<table id="vrfManagement" class="table sorted table-striped table-top table-hover">'. "\n";
-
-	# headers
-	print "<thead>";
-	print '<tr>'. "\n";
-	print '	<th>'._('Name').'</th>'. "\n";
-	print '	<th>'._('RD').'</th>'. "\n";
-	print '	<th>'._('Sections').'</th>'. "\n";
-	print '	<th>'._('Description').'</th>'. "\n";
-	if(sizeof($custom) > 0) {
-		foreach($custom as $field) {
-			if(!in_array($field['name'], $hidden_fields)) {
-				print "<th class='customField hidden-xs hidden-sm'>$field[name]</th>";
-			}
-		}
-	}
-	print '	<th></th>'. "\n";
-	print '</tr>'. "\n";
-	print "</thead>";
+    print '<table id="vrfManagement" class="table sorted table-striped table-top table-hover">'. "\n";
+
+    # headers
+    print "<thead>";
+    print '<tr>'. "\n";
+    print '	<th>'._('Name').'</th>'. "\n";
+    print '	<th>'._('RD').'</th>'. "\n";
+    print '	<th>'._('Sections').'</th>'. "\n";
+    print '	<th>'._('Description').'</th>'. "\n";
+    if(sizeof($custom) > 0) {
+        foreach($custom as $field) {
+            if(!in_array($field['name'], $hidden_fields)) {
+                print "<th class='customField hidden-xs hidden-sm'>$field[name]</th>";
+            }
+        }
+    }
+    print '	<th></th>'. "\n";
+    print '</tr>'. "\n";
+    print "</thead>";
 
     print "<tbody>";
-	# loop
-	foreach ($all_vrfs as $vrf) {
-		//cast
-		$vrf = (array) $vrf;
-
-    	// format sections
-    	if(strlen($vrf['sections'])==0) {
-    		$sections = "All sections";
-    	}
-    	else {
-    		//explode
-    		unset($sec);
-    		$sections_tmp = explode(";", $vrf['sections']);
-    		foreach($sections_tmp as $t) {
-    			//fetch section
-    			$tmp_section = $Sections->fetch_section(null, $t);
-    			$sec[] = " &middot; ".$tmp_section->name;
-    		}
-    		//implode
-    		$sections = implode("<br>", $sec);
-    	}
-
-		//print details
-		print '<tr class="text-top">'. "\n";
-		print '	<td class="name">'. $vrf['name'] .'</td>'. "\n";
-		print '	<td class="rd">'. $vrf['rd'] .'</td>'. "\n";
-		print "	<td><span class='text-muted'>$sections</span></td>";
-		print '	<td class="description">'. $vrf['description'] .'</td>'. "\n";
-
-		// custom fields
-		if(sizeof($custom) > 0) {
-			foreach($custom as $field) {
-				if(!in_array($field['name'], $hidden_fields)) {
-
-					print "<td class='customField hidden-xs hidden-sm'>";
-
-					// create links
-					$vrf[$field['name']] = $Result->create_links ($vrf[$field['name']], $field['type']);
-
-					//booleans
-					if($field['type']=="tinyint(1)")	{
-						if($vrf[$field['name']] == "0")		{ print _("No"); }
-						elseif($vrf[$field['name']] == "1")	{ print _("Yes"); }
-					}
-					//text
-					elseif($field['type']=="text") {
-						if(strlen($vrf[$field['name']])>0)	{ print "<i class='fa fa-gray fa-comment' rel='tooltip' data-container='body' data-html='true' title='".str_replace("\n", "<br>", $vrf[$field['name']])."'>"; }
-						else											{ print ""; }
-					}
-					else {
-						print $vrf[$field['name']];
-
-					}
-					print "</td>";
-				}
-			}
-		}
-
-		print "	<td class='actions'>";
-		print "	<div class='btn-group'>";
-		print "		<button class='btn btn-xs btn-default vrfManagement' data-action='edit'   data-vrfid='$vrf[vrfId]'><i class='fa fa-pencil'></i></button>";
-		print "		<button class='btn btn-xs btn-default vrfManagement' data-action='delete' data-vrfid='$vrf[vrfId]'><i class='fa fa-times'></i></button>";
-		print "	</div>";
-		print "	</td>";
-		print '</tr>'. "\n";
-	}
-	print "</tbody>";
-	print '</table>'. "\n";
+    # loop
+    foreach ($all_vrfs as $vrf) {
+        //cast
+        $vrf = (array) $vrf;
+
+        // format sections
+        if(strlen($vrf['sections'])==0) {
+            $sections = "All sections";
+        }
+        else {
+            //explode
+            unset($sec);
+            $sections_tmp = explode(";", $vrf['sections']);
+            foreach($sections_tmp as $t) {
+                //fetch section
+                $tmp_section = $Sections->fetch_section(null, $t);
+                $sec[] = " &middot; ".$tmp_section->name;
+            }
+            //implode
+            $sections = implode("<br>", $sec);
+        }
+
+        //print details
+        print '<tr class="text-top">'. "\n";
+        print '	<td class="name">'. $vrf['name'] .'</td>'. "\n";
+        print '	<td class="rd">'. $vrf['rd'] .'</td>'. "\n";
+        print "	<td><span class='text-muted'>$sections</span></td>";
+        print '	<td class="description">'. $vrf['description'] .'</td>'. "\n";
+
+        // custom fields
+        if(sizeof($custom) > 0) {
+            foreach($custom as $field) {
+                if(!in_array($field['name'], $hidden_fields)) {
+
+                    print "<td class='customField hidden-xs hidden-sm'>";
+
+                    // create links
+                    $vrf[$field['name']] = $Result->create_links ($vrf[$field['name']], $field['type']);
+
+                    //booleans
+                    if($field['type']=="tinyint(1)")	{
+                        if($vrf[$field['name']] == "0")		{ print _("No"); }
+                        elseif($vrf[$field['name']] == "1")	{ print _("Yes"); }
+                    }
+                    //text
+                    elseif($field['type']=="text") {
+                        if(strlen($vrf[$field['name']])>0)	{ print "<i class='fa fa-gray fa-comment' rel='tooltip' data-container='body' data-html='true' title='".str_replace("\n", "<br>", $vrf[$field['name']])."'>"; }
+                        else											{ print ""; }
+                    }
+                    else {
+                        print $vrf[$field['name']];
+
+                    }
+                    print "</td>";
+                }
+            }
+        }
+
+        print "	<td class='actions'>";
+        print "	<div class='btn-group'>";
+        print "		<button class='btn btn-xs btn-default vrfManagement' data-action='edit'   data-vrfid='$vrf[vrfId]'><i class='fa fa-pencil'></i></button>";
+        print "		<button class='btn btn-xs btn-default vrfManagement' data-action='delete' data-vrfid='$vrf[vrfId]'><i class='fa fa-times'></i></button>";
+        print "	</div>";
+        print "	</td>";
+        print '</tr>'. "\n";
+    }
+    print "</tbody>";
+    print '</table>'. "\n";
 }
 ?>
 

Braces +1 added lines, -1 removed lines

@@ -101,7 +101,7 @@
 					$vrf[$field['name']] = $Result->create_links ($vrf[$field['name']], $field['type']);
 
 					//booleans
-					if($field['type']=="tinyint(1)")	{
+					if($field['type']=="tinyint(1)") {
 						if($vrf[$field['name']] == "0")		{ print _("No"); }
 						elseif($vrf[$field['name']] == "1")	{ print _("Yes"); }
 					}

Spacing +42 added lines, -42 removed lines

@@ -5,31 +5,31 @@ 
  ************************************************/
 
 # verify that user is logged in
-$User->check_user_session();
+$User->check_user_session ();
 
 # fetch all vrfs
-$all_vrfs = $Admin->fetch_all_objects("vrf", "name");
+$all_vrfs = $Admin->fetch_all_objects ("vrf", "name");
 
 # fetch custom fields
-$custom = $Tools->fetch_custom_fields('vrf');
+$custom = $Tools->fetch_custom_fields ('vrf');
 
 # set hidden fields
-$hidden_fields = json_decode($User->settings->hiddenCustomFields, true);
-$hidden_fields = is_array(@$hidden_fields['vrf']) ? $hidden_fields['vrf'] : array();
+$hidden_fields = json_decode ($User->settings->hiddenCustomFields, true);
+$hidden_fields = is_array (@$hidden_fields['vrf']) ? $hidden_fields['vrf'] : array ();
 
 # set size of custom fields
-$custom_size = sizeof($custom) - sizeof($hidden_fields);
+$custom_size = sizeof ($custom) - sizeof ($hidden_fields);
 ?>
 
-<h4><?php print _('Manage VRF'); ?></h4>
+<h4><?php print _ ('Manage VRF'); ?></h4>
 <hr><br>
 
 <div class="btn-group">
-    <button class='btn btn-sm btn-default vrfManagement' data-action='add' data-vrfid='' style='margin-bottom:10px;'><i class='fa fa-plus'></i> <?php print _('Add VRF'); ?></button>
+    <button class='btn btn-sm btn-default vrfManagement' data-action='add' data-vrfid='' style='margin-bottom:10px;'><i class='fa fa-plus'></i> <?php print _ ('Add VRF'); ?></button>
     <?php
     // snmp
-    if($User->is_admin()===true && $User->settings->enableSNMP==1) { ?>
-	<button class="btn btn-sm btn-default" id="snmp-vrf" data-action="add"><i class="fa fa-cogs"></i> <?php print _('Scan for VRFs'); ?></button>
+    if ($User->is_admin () === true && $User->settings->enableSNMP == 1) { ?>
+	<button class="btn btn-sm btn-default" id="snmp-vrf" data-action="add"><i class="fa fa-cogs"></i> <?php print _ ('Scan for VRFs'); ?></button>
 	<?php } ?>
 
 </div>
@@ -38,26 +38,26 @@ 
 <?php
 
 # first check if they exist!
-if($all_vrfs===false) { $Result->show("info", _("No VRFs configured")."!", false);}
+if ($all_vrfs === false) { $Result->show ("info", _ ("No VRFs configured")."!", false); }
 else {
-	print '<table id="vrfManagement" class="table sorted table-striped table-top table-hover">'. "\n";
+	print '<table id="vrfManagement" class="table sorted table-striped table-top table-hover">'."\n";
 
 	# headers
 	print "<thead>";
-	print '<tr>'. "\n";
-	print '	<th>'._('Name').'</th>'. "\n";
-	print '	<th>'._('RD').'</th>'. "\n";
-	print '	<th>'._('Sections').'</th>'. "\n";
-	print '	<th>'._('Description').'</th>'. "\n";
-	if(sizeof($custom) > 0) {
-		foreach($custom as $field) {
-			if(!in_array($field['name'], $hidden_fields)) {
+	print '<tr>'."\n";
+	print '	<th>'._ ('Name').'</th>'."\n";
+	print '	<th>'._ ('RD').'</th>'."\n";
+	print '	<th>'._ ('Sections').'</th>'."\n";
+	print '	<th>'._ ('Description').'</th>'."\n";
+	if (sizeof ($custom) > 0) {
+		foreach ($custom as $field) {
+			if (!in_array ($field['name'], $hidden_fields)) {
 				print "<th class='customField hidden-xs hidden-sm'>$field[name]</th>";
 			}
 		}
 	}
-	print '	<th></th>'. "\n";
-	print '</tr>'. "\n";
+	print '	<th></th>'."\n";
+	print '</tr>'."\n";
 	print "</thead>";
 
     print "<tbody>";
@@ -67,33 +67,33 @@ 
 		$vrf = (array) $vrf;
 
     	// format sections
-    	if(strlen($vrf['sections'])==0) {
+    	if (strlen ($vrf['sections']) == 0) {
     		$sections = "All sections";
     	}
     	else {
     		//explode
     		unset($sec);
-    		$sections_tmp = explode(";", $vrf['sections']);
-    		foreach($sections_tmp as $t) {
+    		$sections_tmp = explode (";", $vrf['sections']);
+    		foreach ($sections_tmp as $t) {
     			//fetch section
-    			$tmp_section = $Sections->fetch_section(null, $t);
+    			$tmp_section = $Sections->fetch_section (null, $t);
     			$sec[] = " &middot; ".$tmp_section->name;
     		}
     		//implode
-    		$sections = implode("<br>", $sec);
+    		$sections = implode ("<br>", $sec);
     	}
 
 		//print details
-		print '<tr class="text-top">'. "\n";
-		print '	<td class="name">'. $vrf['name'] .'</td>'. "\n";
-		print '	<td class="rd">'. $vrf['rd'] .'</td>'. "\n";
+		print '<tr class="text-top">'."\n";
+		print '	<td class="name">'.$vrf['name'].'</td>'."\n";
+		print '	<td class="rd">'.$vrf['rd'].'</td>'."\n";
 		print "	<td><span class='text-muted'>$sections</span></td>";
-		print '	<td class="description">'. $vrf['description'] .'</td>'. "\n";
+		print '	<td class="description">'.$vrf['description'].'</td>'."\n";
 
 		// custom fields
-		if(sizeof($custom) > 0) {
-			foreach($custom as $field) {
-				if(!in_array($field['name'], $hidden_fields)) {
+		if (sizeof ($custom) > 0) {
+			foreach ($custom as $field) {
+				if (!in_array ($field['name'], $hidden_fields)) {
 
 					print "<td class='customField hidden-xs hidden-sm'>";
 
@@ -101,14 +101,14 @@ 
 					$vrf[$field['name']] = $Result->create_links ($vrf[$field['name']], $field['type']);
 
 					//booleans
-					if($field['type']=="tinyint(1)")	{
-						if($vrf[$field['name']] == "0")		{ print _("No"); }
-						elseif($vrf[$field['name']] == "1")	{ print _("Yes"); }
+					if ($field['type'] == "tinyint(1)") {
+						if ($vrf[$field['name']] == "0") { print _ ("No"); }
+						elseif ($vrf[$field['name']] == "1") { print _ ("Yes"); }
 					}
 					//text
-					elseif($field['type']=="text") {
-						if(strlen($vrf[$field['name']])>0)	{ print "<i class='fa fa-gray fa-comment' rel='tooltip' data-container='body' data-html='true' title='".str_replace("\n", "<br>", $vrf[$field['name']])."'>"; }
-						else											{ print ""; }
+					elseif ($field['type'] == "text") {
+						if (strlen ($vrf[$field['name']]) > 0) { print "<i class='fa fa-gray fa-comment' rel='tooltip' data-container='body' data-html='true' title='".str_replace ("\n", "<br>", $vrf[$field['name']])."'>"; }
+						else { print ""; }
 					}
 					else {
 						print $vrf[$field['name']];
@@ -125,10 +125,10 @@ 
 		print "		<button class='btn btn-xs btn-default vrfManagement' data-action='delete' data-vrfid='$vrf[vrfId]'><i class='fa fa-times'></i></button>";
 		print "	</div>";
 		print "	</td>";
-		print '</tr>'. "\n";
+		print '</tr>'."\n";
 	}
 	print "</tbody>";
-	print '</table>'. "\n";
+	print '</table>'."\n";
 }
 ?>