phpipam / phpipam

app/admin/powerDNS/domains.php

Spacing +4 added lines, -4 removed lines

@@ -1,7 +1,7 @@
 <?php
 # print all domains or show records
-if (@$_GET['sPage']=="page")		{ include("domains-print.php"); }
-elseif (@$_GET['sPage']=="search")	{ include("domains-print.php"); }
-elseif (isset($_GET['sPage']))		{ include("domain-records.php"); }
-else								{ include("domains-print.php"); }
+if (@$_GET['sPage'] == "page") { include("domains-print.php"); }
+elseif (@$_GET['sPage'] == "search") { include("domains-print.php"); }
+elseif (isset($_GET['sPage'])) { include("domain-records.php"); }
+else { include("domains-print.php"); }
 ?>
\ No newline at end of file

app/admin/racks/index.php

Spacing +6 added lines, -6 removed lines

@@ -5,21 +5,21 @@
  ***************************/
 
 # verify that user is logged in
-$User->check_user_session();
+$User->check_user_session ();
 
 # fetch custom fields
-$custom = $Tools->fetch_custom_fields('racks');
+$custom = $Tools->fetch_custom_fields ('racks');
 
 # get hidden fields
-$hidden_custom_fields = json_decode($User->settings->hiddenCustomFields, true);
-$hidden_custom_fields = is_array(@$hidden_custom_fields['racks']) ? $hidden_custom_fields['racks'] : array();
+$hidden_custom_fields = json_decode ($User->settings->hiddenCustomFields, true);
+$hidden_custom_fields = is_array (@$hidden_custom_fields['racks']) ? $hidden_custom_fields['racks'] : array ();
 
 # create csrf token
 $csrf = $User->create_csrf_cookie ();
 
 
 # all racks or one ?
-if (isset($_GET['subnetId']))   { include("print-single-rack.php"); }
-else                            { include("print-racks.php"); }
+if (isset($_GET['subnetId'])) { include("print-single-rack.php"); }
+else { include("print-racks.php"); }
 
 ?>
\ No newline at end of file

app/admin/powerDNS/defaults.php

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>
 

functions/classes/class.DNS.php

Spacing +23 added lines, -23 removed lines

@@ -54,13 +54,13 @@ 
 	 * @param Database_PDO $Database
 	 * @param mixed $settings (default: null)
 	 */
-	public function __construct (Database_PDO $Database, $settings=null) {
+	public function __construct (Database_PDO $Database, $settings = null) {
 		# initialize Result
 		$this->Result = new Result ();
 		# initialize object
 		$this->Database = $Database;
 		// settings
-		$this->settings = !is_null($settings) ? (object) $settings : $this->get_settings ();
+		$this->settings = !is_null ($settings) ? (object) $settings : $this->get_settings ();
 		// initialize resolver
 		$this->initialize_pear_net_DNS2 ();
 	}
@@ -75,20 +75,20 @@ 
 	 */
 	private function set_nameservers ($nsid = null) {
 		// null ?
-		if (is_null($nsid))								{ return false; }
+		if (is_null ($nsid)) { return false; }
 		// not numeric
-		elseif (!is_numeric($nsid))						{ return false; }
+		elseif (!is_numeric ($nsid)) { return false; }
 		// ok
 		else {
 			// fetch nameservers
-			$nameservers =  $this->fetch_object ("nameservers", "id", $nsid);
+			$nameservers = $this->fetch_object ("nameservers", "id", $nsid);
 			// error
-			if ($nameservers===false)					{ return false; }
+			if ($nameservers === false) { return false; }
 			// ok
 			else {
-				if (strlen($nameservers->namesrv1)==0)	{ return false; }
+				if (strlen ($nameservers->namesrv1) == 0) { return false; }
 				else {
-					$this->ns = explode(";", $nameservers->namesrv1);
+					$this->ns = explode (";", $nameservers->namesrv1);
 				}
 			}
 		}
@@ -112,36 +112,36 @@ 
 		$address = $this->transform_address ($address, "dotted");
 
 		// if both are set ignore
-		if (strlen($hostname)>1 && strlen($address)>0) {
-											{ return array("class"=>"", "address"=>$address, "name"=>$hostname); }
+		if (strlen ($hostname) > 1 && strlen ($address) > 0) {
+											{ return array ("class"=>"", "address"=>$address, "name"=>$hostname); }
 		}
 		// if settings permits to check or override is set
-		elseif($this->settings->enableDNSresolving == 1 || $override===true) {
+		elseif ($this->settings->enableDNSresolving == 1 || $override === true) {
 			// if address is set fetch A record
-			if ($address!==false && strlen($address)>0) {
+			if ($address !== false && strlen ($address) > 0) {
 				// set resolve type
 				$this->type = "PTR";
 
 				// resolve
 				$resolved = $this->resolve_address_net_dns ($address);
 				// false ?
-				if ($resolved===false)		{ return array("class"=>"", 		"address"=>$address, "name"=>$hostname); }
-				else						{ return array("class"=>"resolved", "address"=>$address, "name"=>$resolved); }
+				if ($resolved === false) { return array ("class"=>"", "address"=>$address, "name"=>$hostname); }
+				else { return array ("class"=>"resolved", "address"=>$address, "name"=>$resolved); }
 			}
 			// if hostname is set fetch PTR record
-			elseif($hostname!==false && strlen($hostname)>0) {
+			elseif ($hostname !== false && strlen ($hostname) > 0) {
 				// set resolve type
 				$this->type = "A";
 
 				// resolve
 				$resolved = $this->resolve_address_net_dns ($hostname);
 				// false ?
-				if ($resolved===false)		{ return array("class"=>"",			"address"=>$address, "name"=>$hostname); }
-				else						{ return array("class"=>"resolved", "address"=>$resolved, "name"=>$hostname); }
+				if ($resolved === false) { return array ("class"=>"", "address"=>$address, "name"=>$hostname); }
+				else { return array ("class"=>"resolved", "address"=>$resolved, "name"=>$hostname); }
 			}
 		}
 		// dont check
-		else 								{ return array("class"=>"",			"address"=>$address, "name"=>$hostname); }
+		else { return array ("class"=>"", "address"=>$address, "name"=>$hostname); }
 	}
 
 	/**
@@ -158,19 +158,19 @@ 
 
 		// try to get record
 		try {
-		    $result = $this->DNS2->query($address, $this->type);
-		} catch(Net_DNS2_Exception $e) {
+		    $result = $this->DNS2->query ($address, $this->type);
+		} catch (Net_DNS2_Exception $e) {
 			// log error
-			$this->resolve_error = $e->getMessage();
+			$this->resolve_error = $e->getMessage ();
 			return false;
 		}
 
 		// return response
 		if (isset($result->answer)) {
 			// set what to search
-			$search = $this->type=="PTR" ? "ptrdname" : "address";
+			$search = $this->type == "PTR" ? "ptrdname" : "address";
 
-			foreach($result->answer as $mxrr) {
+			foreach ($result->answer as $mxrr) {
 				if ($mxrr->$search) {
 					return $mxrr->$search;
 				}

app/tools/instructions/index.php

Spacing +5 added lines, -5 removed lines

@@ -5,19 +5,19 @@
  **********************************************/
 
 /* fetch instructions and print them in instructions div */
-$instructions = $Tools->fetch_object("instructions", "id", 1);
+$instructions = $Tools->fetch_object ("instructions", "id", 1);
 $instructions = $instructions->instructions;
 
 /* format line breaks */
-$instructions = stripslashes($instructions);		//show html
+$instructions = stripslashes ($instructions); //show html
 
 /* prevent <script> */
-$instructions = str_replace("<script", "<div class='error'><xmp><script", $instructions);
-$instructions = str_replace("</script>", "</script></xmp></div>", $instructions);
+$instructions = str_replace ("<script", "<div class='error'><xmp><script", $instructions);
+$instructions = str_replace ("</script>", "</script></xmp></div>", $instructions);
 
 ?>
 
-<h4><?php print _('Instructions for managing IP addresses');?></h4>
+<h4><?php print _ ('Instructions for managing IP addresses'); ?></h4>
 <hr>
 
 <div class="instructions well">

config.dist.php

Spacing +19 added lines, -19 removed lines

@@ -18,11 +18,11 @@ 
 
      php 5.3.7 required
 */
-$db['ssl']        = false;                           # true/false, enable or disable SSL as a whole
-$db['ssl_key']    = "/path/to/cert.key";             # path to an SSL key file. Only makes sense combined with ssl_cert
-$db['ssl_cert']   = "/path/to/cert.crt";             # path to an SSL certificate file. Only makes sense combined with ssl_key
-$db['ssl_ca']     = "/path/to/ca.crt";               # path to a file containing SSL CA certs
-$db['ssl_capath'] = "/path/to/ca_certs";             # path to a directory containing CA certs
+$db['ssl']        = false; # true/false, enable or disable SSL as a whole
+$db['ssl_key']    = "/path/to/cert.key"; # path to an SSL key file. Only makes sense combined with ssl_cert
+$db['ssl_cert']   = "/path/to/cert.crt"; # path to an SSL certificate file. Only makes sense combined with ssl_key
+$db['ssl_ca']     = "/path/to/ca.crt"; # path to a file containing SSL CA certs
+$db['ssl_capath'] = "/path/to/ca_certs"; # path to a directory containing CA certs
 $db['ssl_cipher'] = "DHE-RSA-AES256-SHA:AES128-SHA"; # one or more SSL Ciphers
 
 /**
@@ -47,36 +47,36 @@ 
  *  Also change
  *	RewriteBase / in .htaccess
  ******************************/
-if(!defined('BASE'))
-define('BASE', "/");
+if (!defined ('BASE'))
+define ('BASE', "/");
 
 /**
  * Multicast unique mac requirement - section or vlan
  */
-if(!defined('MCUNIQUE'))
-define('MCUNIQUE', "section");
+if (!defined ('MCUNIQUE'))
+define ('MCUNIQUE', "section");
 
 
 /*  proxy connection details
  ******************************/
-$proxy_enabled  = false;                                  # Enable/Disable usage of the Proxy server
-$proxy_server   = "myproxy.something.com";                # Proxy server FQDN or IP
-$proxy_port     = "8080";                                 # Proxy server port
-$proxy_user     = "USERNAME";                             # Proxy Username
-$proxy_pass     = "PASSWORD";                             # Proxy Password
-$proxy_use_auth = false;                                  # Enable/Disable Proxy authentication
+$proxy_enabled  = false; # Enable/Disable usage of the Proxy server
+$proxy_server   = "myproxy.something.com"; # Proxy server FQDN or IP
+$proxy_port     = "8080"; # Proxy server port
+$proxy_user     = "USERNAME"; # Proxy Username
+$proxy_pass     = "PASSWORD"; # Proxy Password
+$proxy_use_auth = false; # Enable/Disable Proxy authentication
 
 /**
  * proxy to use for every internet access like update check
  */
-$proxy_auth     = base64_encode("$proxy_user:$proxy_pass");
+$proxy_auth = base64_encode ("$proxy_user:$proxy_pass");
 
 if ($proxy_enabled == true && $proxy_use_auth == false) {
-    stream_context_set_default(array('http' => array('proxy'=>'tcp://'.$proxy_server.':'.$proxy_port)));
+    stream_context_set_default (array ('http' => array ('proxy'=>'tcp://'.$proxy_server.':'.$proxy_port)));
 }
 elseif ($proxy_enabled == true && $proxy_use_auth == true) {
-    stream_context_set_default(
-        array('http' => array(
+    stream_context_set_default (
+        array ('http' => array (
               'proxy' => "tcp://$proxy_server:$proxy_port",
               'request_fulluri' => true,
               'header' => "Proxy-Authorization: Basic $proxy_auth"

app/footer.php

Spacing +6 added lines, -6 removed lines

@@ -5,22 +5,22 @@
 	<td>
 		<?php
 		// set href
-		$href = REVISION=="000" ? "http://phpipam.net" : "http://phpipam.net";
+		$href = REVISION == "000" ? "http://phpipam.net" : "http://phpipam.net";
 		?>
-		<a href="<?php print $href; ?>">phpIPAM IP address management <?php print '[v'. VERSION. ']'; ?><?php if(REVISION > 0) { print " rev".REVISION; } ?></a>
+		<a href="<?php print $href; ?>">phpIPAM IP address management <?php print '[v'.VERSION.']'; ?><?php if (REVISION > 0) { print " rev".REVISION; } ?></a>
 	</td>
 
 	<?php
 	# exclude install
-	if($_GET['page']!="install") { ?>
+	if ($_GET['page'] != "install") { ?>
 	<td>
-		<?php print _('In case of problems please contact').' <a href="mailto:'. $User->settings->siteAdminMail .'">'. $User->settings->siteAdminName .'</a>'; ?>
+		<?php print _ ('In case of problems please contact').' <a href="mailto:'.$User->settings->siteAdminMail.'">'.$User->settings->siteAdminName.'</a>'; ?>
 	</td>
 	<?php
 	/* hide donations button */
-	if($User->settings->donate == 0) {
+	if ($User->settings->donate == 0) {
 
-print '	<td id="donate" class="hidden-xs hidden-sm" rel="tooltip" data-html="true" title="'._('phpIPAM is free, open-source project').'.<br>'._('If you like the software you can donate by clicking this button to support further development').'.">
+print '	<td id="donate" class="hidden-xs hidden-sm" rel="tooltip" data-html="true" title="'._ ('phpIPAM is free, open-source project').'.<br>'._ ('If you like the software you can donate by clicking this button to support further development').'.">
 	<input type="hidden" name="cmd" value="_s-xclick">
 <input type="hidden" name="encrypted" value="-----BEGIN PKCS7-----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-----END PKCS7-----
 ">

app/temp_share/subnet-details.php

Spacing +45 added lines, -45 removed lines

@@ -1,78 +1,78 @@ 
 <!-- subnet details upper table -->
-<h4><?php print _('Subnet details'); ?></h4>
+<h4><?php print _ ('Subnet details'); ?></h4>
 <hr>
 
 <table class="ipaddress_subnet table-condensed table-full">
 	<tr>
-		<th><?php print _('Subnet details'); ?></th>
+		<th><?php print _ ('Subnet details'); ?></th>
 		<td><?php print "<b>$subnet[ip]/$subnet[mask]</b> ($subnet_detailed[netmask])"; ?></td>
 	</tr>
 	<tr>
-		<th><?php print _('Hierarchy'); ?></th>
+		<th><?php print _ ('Hierarchy'); ?></th>
 		<td>
-			<?php $Subnets->print_breadcrumbs($Sections, $Subnets, array("page"=>"subnets", "section"=>$subnet['sectionId'], "subnetId"=>$subnet['id'])); ?>
+			<?php $Subnets->print_breadcrumbs ($Sections, $Subnets, array ("page"=>"subnets", "section"=>$subnet['sectionId'], "subnetId"=>$subnet['id'])); ?>
 		</td>
 	</tr>
 	<tr>
-		<th><?php print _('Subnet description'); ?></th>
-		<td><?php print html_entity_decode($subnet['description']); ?></td>
+		<th><?php print _ ('Subnet description'); ?></th>
+		<td><?php print html_entity_decode ($subnet['description']); ?></td>
 	</tr>
 	<tr>
-		<th><?php print _('Permission'); ?></th>
-		<td><?php print $Subnets->parse_permissions($subnet_permission); ?></td>
+		<th><?php print _ ('Permission'); ?></th>
+		<td><?php print $Subnets->parse_permissions ($subnet_permission); ?></td>
 	</tr>
-	<?php if(!$slaves) { ?>
+	<?php if (!$slaves) { ?>
 	<tr>
-		<th><?php print _('Subnet Usage'); ?></th>
+		<th><?php print _ ('Subnet Usage'); ?></th>
 		<td>
 			<?php
-				  print ''._('Used').':  '. $Subnets->reformat_number ($subnet_usage['used']) .' |
-						 '._('Free').':  '. $Subnets->reformat_number ($subnet_usage['freehosts']) .' ('. $subnet_usage['freehosts_percent']  .'%) |
-						 '._('Total').': '. $Subnets->reformat_number ($subnet_usage['maxhosts']);
+				  print ''._ ('Used').':  '.$Subnets->reformat_number ($subnet_usage['used']).' |
+						 '._ ('Free').':  '.$Subnets->reformat_number ($subnet_usage['freehosts']).' ('.$subnet_usage['freehosts_percent'].'%) |
+						 '._ ('Total').': '.$Subnets->reformat_number ($subnet_usage['maxhosts']);
 			?>
 		</td>
 	</tr>
 
 	<!-- gateway -->
 	<?php
-	$gateway = $Subnets->find_gateway($subnet['id']);
-	if($gateway !==false) { ?>
+	$gateway = $Subnets->find_gateway ($subnet['id']);
+	if ($gateway !== false) { ?>
 	<tr>
-		<th><?php print _('Gateway'); ?></th>
-		<td><strong><?php print $Subnets->transform_to_dotted($gateway->ip_addr);?></strong></td>
+		<th><?php print _ ('Gateway'); ?></th>
+		<td><strong><?php print $Subnets->transform_to_dotted ($gateway->ip_addr); ?></strong></td>
 	</tr>
 	<?php } ?>
 
 	<?php } ?>
 	<tr>
-		<th><?php print _('VLAN'); ?></th>
+		<th><?php print _ ('VLAN'); ?></th>
 		<td>
 		<?php
-		if(empty($vlan['number']) || $vlan['number'] == 0) { $vlan['number'] = "<span class='text-muted'>/</span>"; }	//Display fix for emprt VLAN
+		if (empty($vlan['number']) || $vlan['number'] == 0) { $vlan['number'] = "<span class='text-muted'>/</span>"; }	//Display fix for emprt VLAN
 		print $vlan['number'];
 
-		if(!empty($vlan['name'])) 		 { print ' - '.$vlan['name']; }					//Print name if provided
-		if(!empty($vlan['description'])) { print ' ['. $vlan['description'] .']'; }		//Print description if provided
+		if (!empty($vlan['name'])) { print ' - '.$vlan['name']; }					//Print name if provided
+		if (!empty($vlan['description'])) { print ' ['.$vlan['description'].']'; }		//Print description if provided
 		?>
 		</td>
 	</tr>
 
 	<?php
 	# VRF
-	if(!empty($subnet['vrfId']) && $settings->enableVRF==1) {
+	if (!empty($subnet['vrfId']) && $settings->enableVRF == 1) {
 		# get vrf details
-		$vrf = (array) $Tools->fetch_object ("vrf", "vrfId" ,$subnet['vrfId']);
+		$vrf = (array) $Tools->fetch_object ("vrf", "vrfId", $subnet['vrfId']);
 		# set text
 		$vrfText = $vrf['name'];
-		if(!empty($vrf['description'])) { $vrfText .= " [$vrf[description]]";}
+		if (!empty($vrf['description'])) { $vrfText .= " [$vrf[description]]"; }
 
 		print "<tr>";
-		print "	<th>"._('VRF')."</th>";
+		print "	<th>"._ ('VRF')."</th>";
 		print "	<td>$vrfText</td>";
 		print "</tr>";
 	}
 
-	if(!$slaves) {
+	if (!$slaves) {
 		# divider
 		print "<tr>";
 		print "	<th><hr></th>";
@@ -80,41 +80,41 @@ 
 		print "</tr>";
 
 		# Are IP requests allowed?
-		if ($settings->enableIPrequests==1) {
+		if ($settings->enableIPrequests == 1) {
 			print "<tr>";
-			print "	<th>"._('IP requests')."</th>";
-			if($subnet['allowRequests'] == 1) 		{ print "	<td>"._('enabled')."</td>"; }		# yes
-			else 									{ print "	<td class='info2'>"._('disabled')."</td>";}		# no
+			print "	<th>"._ ('IP requests')."</th>";
+			if ($subnet['allowRequests'] == 1) { print "	<td>"._ ('enabled')."</td>"; }		# yes
+			else { print "	<td class='info2'>"._ ('disabled')."</td>"; }		# no
 			print "</tr>";
 		}
 		# ping-check hosts inside subnet
 		print "<tr>";
-		print "	<th>"._('Hosts check')."</th>";
-		if($subnet['pingSubnet'] == 1) 				{ print "	<td>"._('enabled')."</td>"; }		# yes
-		else 										{ print "	<td class='info2'>"._('disabled')."</td>";}		# no
+		print "	<th>"._ ('Hosts check')."</th>";
+		if ($subnet['pingSubnet'] == 1) { print "	<td>"._ ('enabled')."</td>"; }		# yes
+		else { print "	<td class='info2'>"._ ('disabled')."</td>"; }		# no
 		print "</tr>";
 		# scan subnet for new hosts *
 		print "<tr>";
-		print "	<th>"._('Discover new hosts')."</th>";
-		if($subnet['discoverSubnet'] == 1) 			{ print "	<td>"._('enabled')."</td>"; }		# yes
-		else 										{ print "	<td class='info2'>"._('disabled')."</td>";}		# no
+		print "	<th>"._ ('Discover new hosts')."</th>";
+		if ($subnet['discoverSubnet'] == 1) { print "	<td>"._ ('enabled')."</td>"; }		# yes
+		else { print "	<td class='info2'>"._ ('disabled')."</td>"; }		# no
 		print "</tr>";
 	}
 	?>
 
 	<?php
 	# custom subnet fields
-	if(sizeof($custom_fields) > 0) {
-		foreach($custom_fields as $key=>$field) {
-			if(strlen($subnet[$key])>0) {
-				$subnet[$key] = str_replace(array("\n", "\r\n"), "<br>",$subnet[$key]);
+	if (sizeof ($custom_fields) > 0) {
+		foreach ($custom_fields as $key=>$field) {
+			if (strlen ($subnet[$key]) > 0) {
+				$subnet[$key] = str_replace (array ("\n", "\r\n"), "<br>", $subnet[$key]);
 				$html_custom[] = "<tr>";
 				$html_custom[] = "	<th>$key</th>";
 				$html_custom[] = "	<td>";
 				#booleans
-				if($field['type']=="tinyint(1)")	{
-					if($subnet[$key] == "0")		{ $html_custom[] = _("No"); }
-					elseif($subnet[$key] == "1")	{ $html_custom[] = _("Yes"); }
+				if ($field['type'] == "tinyint(1)") {
+					if ($subnet[$key] == "0") { $html_custom[] = _ ("No"); }
+					elseif ($subnet[$key] == "1") { $html_custom[] = _ ("Yes"); }
 				}
 				else {
 					$html_custom[] = $subnet[$key];
@@ -125,14 +125,14 @@ 
 		}
 
 		# any?
-		if(isset($html_custom)) {
+		if (isset($html_custom)) {
 			# divider
 			print "<tr>";
 			print "	<th><hr></th>";
 			print "	<td></td>";
 			print "</tr>";
 
-			print implode("\n", $html_custom);
+			print implode ("\n", $html_custom);
 		}
 	}
 	print "<tr>";

app/temp_share/subnet-addresses.php

Spacing +79 added lines, -79 removed lines

@@ -14,14 +14,14 @@ 
 # reset custom fields to ip addresses
 $custom_fields = $Tools->fetch_custom_fields ('ipaddresses');
 # set hidden custom fields
-$hidden_cfields = json_decode($settings->hiddenCustomFields, true);
-$hidden_cfields = is_array($hidden_cfields['ipaddresses']) ? $hidden_cfields['ipaddresses'] : array();
+$hidden_cfields = json_decode ($settings->hiddenCustomFields, true);
+$hidden_cfields = is_array ($hidden_cfields['ipaddresses']) ? $hidden_cfields['ipaddresses'] : array ();
 
 # set selected address fields array
 $selected_ip_fields = $settings->IPfilter;
-$selected_ip_fields = explode(";", $selected_ip_fields);																			//format to array
-$selected_ip_fields_size = in_array('state', $selected_ip_fields) ? (sizeof($selected_ip_fields)-1) : sizeof($selected_ip_fields);	//set size of selected fields
-if($selected_ip_fields_size==1 && strlen($selected_ip_fields[0])==0) { $selected_ip_fields_size = 0; }								//fix for 0
+$selected_ip_fields = explode (";", $selected_ip_fields); //format to array
+$selected_ip_fields_size = in_array ('state', $selected_ip_fields) ? (sizeof ($selected_ip_fields) - 1) : sizeof ($selected_ip_fields); //set size of selected fields
+if ($selected_ip_fields_size == 1 && strlen ($selected_ip_fields[0]) == 0) { $selected_ip_fields_size = 0; }								//fix for 0
 
 
 /* Addresses and fields manupulations */
@@ -30,28 +30,28 @@ 
 $addresses_visual = $addresses;
 
 # set colspan for output
-$colspan['empty']  = $selected_ip_fields_size + sizeof($custom_fields) +4;		//empty colspan
-$colspan['unused'] = $selected_ip_fields_size + sizeof($custom_fields) +3;		//unused colspan
-$colspan['dhcp']   = $selected_ip_fields_size + sizeof($custom_fields);			//dhcp colspan
+$colspan['empty']  = $selected_ip_fields_size + sizeof ($custom_fields) + 4; //empty colspan
+$colspan['unused'] = $selected_ip_fields_size + sizeof ($custom_fields) + 3; //unused colspan
+$colspan['dhcp']   = $selected_ip_fields_size + sizeof ($custom_fields); //dhcp colspan
 
 # remove custom fields if all are empty!
-foreach($custom_fields as $field) {
-	$sizeMyFields[$field['name']] = 0;				// default value
+foreach ($custom_fields as $field) {
+	$sizeMyFields[$field['name']] = 0; // default value
 	# check against each IP address
-	if($addresses!==false) {
-		foreach($addresses as $ip) {
+	if ($addresses !== false) {
+		foreach ($addresses as $ip) {
 			$ip = (array) $ip;
-			if(strlen($ip[$field['name']]) > 0) {
-				$sizeMyFields[$field['name']]++;		// +1
+			if (strlen ($ip[$field['name']]) > 0) {
+				$sizeMyFields[$field['name']]++; // +1
 			}
 		}
 		# unset if value == 0
-		if($sizeMyFields[$field['name']] == 0) {
+		if ($sizeMyFields[$field['name']] == 0) {
 			unset($custom_fields[$field['name']]);
 
 			$colspan['empty']--;
-			$colspan['unused']--;						//unused  span -1
-			$colspan['dhcp']--;							//dhcp span -1
+			$colspan['unused']--; //unused  span -1
+			$colspan['dhcp']--; //dhcp span -1
 		}
 	}
 }
@@ -61,14 +61,14 @@ 
 # set page limit for pagination
 $page_limit = 100000000;
 # set ping statuses for warning and offline
-$statuses = explode(";", $settings->pingStatus);
+$statuses = explode (";", $settings->pingStatus);
 ?>
 
 <!-- print title and pagenum -->
 <h4 style="margin-top:40px;">
 <?php
-if(!$slaves)		{ print _("IP addresses in subnet "); }
-else 				{ print _("IP addresses belonging to ALL nested subnets"); }
+if (!$slaves) { print _ ("IP addresses in subnet "); }
+else { print _ ("IP addresses belonging to ALL nested subnets"); }
 ?>
 </h4>
 
@@ -83,26 +83,26 @@ 
 	<?php
 
 	# IP address - mandatory
-												  print "<th class='s_ipaddr'>"._('IP address')."</th>";
+												  print "<th class='s_ipaddr'>"._ ('IP address')."</th>";
 	# hostname - mandatory
-												  print "<th>"._('Hostname')."</th>";
+												  print "<th>"._ ('Hostname')."</th>";
 	# Description - mandatory
-												  print "<th>"._('Description')."</th>";
+												  print "<th>"._ ('Description')."</th>";
 	# MAC address
-	if(in_array('mac', $selected_ip_fields)) 	{ print "<th></th>"; }
+	if (in_array ('mac', $selected_ip_fields)) { print "<th></th>"; }
 	# note
-	if(in_array('note', $selected_ip_fields)) 	{ print "<th></th>"; }
+	if (in_array ('note', $selected_ip_fields)) { print "<th></th>"; }
 	# switch
-	if(in_array('switch', $selected_ip_fields)) { print "<th class='hidden-xs hidden-sm hidden-md'>"._('Device')."</th>"; }
+	if (in_array ('switch', $selected_ip_fields)) { print "<th class='hidden-xs hidden-sm hidden-md'>"._ ('Device')."</th>"; }
 	# port
-	if(in_array('port', $selected_ip_fields)) 	{ print "<th class='hidden-xs hidden-sm hidden-md'>"._('Port')."</th>"; }
+	if (in_array ('port', $selected_ip_fields)) { print "<th class='hidden-xs hidden-sm hidden-md'>"._ ('Port')."</th>"; }
 	# owner
-	if(in_array('owner', $selected_ip_fields)) 	{ print "<th class='hidden-xs hidden-sm hidden-md'>"._('Owner')."</th>"; }
+	if (in_array ('owner', $selected_ip_fields)) { print "<th class='hidden-xs hidden-sm hidden-md'>"._ ('Owner')."</th>"; }
 
 	# custom fields
-	if(sizeof($custom_fields) > 0) {
-		foreach($custom_fields as $myField) 	{
-			if(!in_array($myField['name'], $hidden_cfields)) {
+	if (sizeof ($custom_fields) > 0) {
+		foreach ($custom_fields as $myField) {
+			if (!in_array ($myField['name'], $hidden_cfields)) {
 				print "<th class='hidden-xs hidden-sm hidden-md'>$myField[name]</th>";
 			}
 		}
@@ -114,28 +114,28 @@ 
 
 <?php
 /* Addresses content print */
-$n = 0;							//addresses index
-$m = sizeof($addresses) -1;		//last address index
+$n = 0; //addresses index
+$m = sizeof ($addresses) - 1; //last address index
 
 # if no IP is configured only display free subnet!
-if ($addresses===false || sizeof($addresses)==0) {
-   	$unused = $Addresses->find_unused_addresses($Subnets->transform_to_decimal($subnet_detailed['network']), $Subnets->transform_to_decimal($subnet_detailed['broadcast']), $subnet['mask'], $empty=true );
-	print '<tr class="th"><td colspan="'.$colspan['empty'].'" class="unused">'.$unused['ip'].' (' .$Subnets->reformat_number($unused['hosts']).')</td></tr>'. "\n";
+if ($addresses === false || sizeof ($addresses) == 0) {
+   	$unused = $Addresses->find_unused_addresses ($Subnets->transform_to_decimal ($subnet_detailed['network']), $Subnets->transform_to_decimal ($subnet_detailed['broadcast']), $subnet['mask'], $empty = true);
+	print '<tr class="th"><td colspan="'.$colspan['empty'].'" class="unused">'.$unused['ip'].' ('.$Subnets->reformat_number ($unused['hosts']).')</td></tr>'."\n";
 }
 # print IP address
 else {
-	foreach($addresses as $dummy) {
+	foreach ($addresses as $dummy) {
        	#
        	# first check for gaps from network to first host
        	#
 
        	# check gap between network address and first IP address
-       	if ( $n == 0 ) 																	{ $unused = $Addresses->find_unused_addresses ( $Subnets->transform_to_decimal($subnet_detailed['network']), $addresses[$n]->ip_addr, $subnet['mask']); }
+       	if ($n == 0) { $unused = $Addresses->find_unused_addresses ($Subnets->transform_to_decimal ($subnet_detailed['network']), $addresses[$n]->ip_addr, $subnet['mask']); }
        	# check unused space between IP addresses
-       	else 																			{ $unused = $Addresses->find_unused_addresses ( $addresses[$n-1]->ip_addr, $addresses[$n]->ip_addr, $subnet['mask'] );  }
+       	else { $unused = $Addresses->find_unused_addresses ($addresses[$n - 1]->ip_addr, $addresses[$n]->ip_addr, $subnet['mask']); }
 
        	# if there is some result for unused print it - if sort == ip_addr
-	    if ( $unused ) {
+	    if ($unused) {
     		print "<tr class='th'>";
     		print "	<td></td>";
     		print "	<td colspan='$colspan[unused]' class='unused'>$unused[ip] ($unused[hosts])</td>";
@@ -147,20 +147,20 @@ 
 	    #
 
 	    # ip - range
-	    if($addresses[$n]->class=="range-dhcp")
+	    if ($addresses[$n]->class == "range-dhcp")
 	    {
 	    	print "<tr class='dhcp'>";
 		    print "	<td>";
 		    # status icon
-		    if($subnet['pingSubnet']=="1") {
+		    if ($subnet['pingSubnet'] == "1") {
 		    print "		<span class='status status-padded'></span>";
 			}
-		    print 		$Subnets->transform_to_dotted( $addresses[$n]->ip_addr).' - '.$Subnets->transform_to_dotted( $addresses[$n]->stopIP)." (".$addresses[$n]->numHosts.")";
-		    print 		$Addresses->address_type_format_tag($addresses[$n]->state);
+		    print 		$Subnets->transform_to_dotted ($addresses[$n]->ip_addr).' - '.$Subnets->transform_to_dotted ($addresses[$n]->stopIP)." (".$addresses[$n]->numHosts.")";
+		    print 		$Addresses->address_type_format_tag ($addresses[$n]->state);
 		    print "	</td>";
-			print "	<td>"._("DHCP range")."</td>";
+			print "	<td>"._ ("DHCP range")."</td>";
     		print "	<td>".$addresses[$n]->description."</td>";
-    		if($colspan['dhcp']!=0)
+    		if ($colspan['dhcp'] != 0)
     		print "	<td colspan='$colspan[dhcp]' class='unused'></td>";
 		    // tr ends after!
 
@@ -170,69 +170,69 @@ 
 	    {
 	        /*	set class for reserved and offline - if set! */
 		    $stateClass = "";
-	        if(in_array('state', $selected_ip_fields)) {
-		        if ($addresses[$n]->state == 0) 	 	{ $stateClass = _("Offline"); }
-		        else if ($addresses[$n]->state == 2) 	{ $stateClass = _("Reserved"); }
-		        else if ($addresses[$n]->state == 3) 	{ $stateClass = _("DHCP"); }
+	        if (in_array ('state', $selected_ip_fields)) {
+		        if ($addresses[$n]->state == 0) { $stateClass = _ ("Offline"); }
+		        else if ($addresses[$n]->state == 2) { $stateClass = _ ("Reserved"); }
+		        else if ($addresses[$n]->state == 3) { $stateClass = _ ("DHCP"); }
 		    }
 
 	 		print "<tr class='$stateClass'>";
 
 		    // gateway
-		    $gw = $addresses[$n]->is_gateway==1 ? "gateway" : "";
+		    $gw = $addresses[$n]->is_gateway == 1 ? "gateway" : "";
 
-		    print "	<td class='ipaddress $gw'><a href='".create_link("temp_share",$_GET['section'],$addresses[$n]->id)."'>".$Subnets->transform_to_dotted( $addresses[$n]->ip_addr)."</a>";
-		    if($addresses[$n]->is_gateway==1)						{ print " <i class='fa fa-info-circle fa-gateway' rel='tooltip' title='"._('Address is marked as gateway')."'></i>"; }
-		    if(in_array('state', $selected_ip_fields)) 				{ print $Addresses->address_type_format_tag($addresses[$n]->state); }
+		    print "	<td class='ipaddress $gw'><a href='".create_link ("temp_share", $_GET['section'], $addresses[$n]->id)."'>".$Subnets->transform_to_dotted ($addresses[$n]->ip_addr)."</a>";
+		    if ($addresses[$n]->is_gateway == 1) { print " <i class='fa fa-info-circle fa-gateway' rel='tooltip' title='"._ ('Address is marked as gateway')."'></i>"; }
+		    if (in_array ('state', $selected_ip_fields)) { print $Addresses->address_type_format_tag ($addresses[$n]->state); }
 		    print "</td>";
 
 		    # resolve dns name
-		    $resolve = $DNS->resolve_address($addresses[$n]->ip_addr, $addresses[$n]->dns_name, false, $subnet['nameserverId']);
+		    $resolve = $DNS->resolve_address ($addresses[$n]->ip_addr, $addresses[$n]->dns_name, false, $subnet['nameserverId']);
 																	{ print "<td class='$resolve[class] hostname'>$resolve[name]</td>"; }
 
 			# print description - mandatory
         													  		  print "<td class='description'>".$addresses[$n]->description."</td>";
 			# Print mac address icon!
-			if(in_array('mac', $selected_ip_fields)) {
-				if(!empty($addresses[$n]->mac)) 					{ print "<td class='narrow'><i class='info fa fa-gray fa-sitemap' rel='tooltip' data-container='body' title='"._('MAC').": ".$addresses[$n]->mac."'></i></td>"; }
-				else 												{ print "<td class='narrow'></td>"; }
+			if (in_array ('mac', $selected_ip_fields)) {
+				if (!empty($addresses[$n]->mac)) { print "<td class='narrow'><i class='info fa fa-gray fa-sitemap' rel='tooltip' data-container='body' title='"._ ('MAC').": ".$addresses[$n]->mac."'></i></td>"; }
+				else { print "<td class='narrow'></td>"; }
 			}
 
 
        		# print info button for hover
-       		if(in_array('note', $selected_ip_fields)) {
-        		if(!empty($addresses[$n]->note)) 					{ print "<td class='narrow'><i class='fa fa-gray fa-comment-o' rel='tooltip' data-container='body' data-html='true' title='".str_replace("\n", "<br>",$addresses[$n]->note)."'></td>"; }
-        		else 												{ print "<td class='narrow'></td>"; }
+       		if (in_array ('note', $selected_ip_fields)) {
+        		if (!empty($addresses[$n]->note)) { print "<td class='narrow'><i class='fa fa-gray fa-comment-o' rel='tooltip' data-container='body' data-html='true' title='".str_replace ("\n", "<br>", $addresses[$n]->note)."'></td>"; }
+        		else { print "<td class='narrow'></td>"; }
         	}
 
         	# print device
-        	if(in_array('switch', $selected_ip_fields)) {
+        	if (in_array ('switch', $selected_ip_fields)) {
 	        	# get device details
-	        	$device = (array) $Tools->fetch_object("devices", "id", $addresses[$n]->switch);
+	        	$device = (array) $Tools->fetch_object ("devices", "id", $addresses[$n]->switch);
 																	  print "<td class='hidden-xs hidden-sm hidden-md'>".@$device['hostname']."</td>";
 			}
 
 			# print port
-			if(in_array('port', $selected_ip_fields)) 				{ print "<td class='hidden-xs hidden-sm hidden-md'>".$addresses[$n]->port."</td>"; }
+			if (in_array ('port', $selected_ip_fields)) { print "<td class='hidden-xs hidden-sm hidden-md'>".$addresses[$n]->port."</td>"; }
 
 			# print owner
-			if(in_array('owner', $selected_ip_fields)) 				{ print "<td class='hidden-xs hidden-sm'>".$addresses[$n]->owner."</td>"; }
+			if (in_array ('owner', $selected_ip_fields)) { print "<td class='hidden-xs hidden-sm'>".$addresses[$n]->owner."</td>"; }
 
 			# print custom fields
-			if(sizeof($custom_fields) > 0) {
-				foreach($custom_fields as $myField) 					{
-					if(!in_array($myField['name'], $hidden_cfields)) 	{
+			if (sizeof ($custom_fields) > 0) {
+				foreach ($custom_fields as $myField) {
+					if (!in_array ($myField['name'], $hidden_cfields)) {
 						print "<td class='customField hidden-xs hidden-sm hidden-md'>";
 
 						//booleans
-						if($myField['type']=="tinyint(1)")	{
-							if($addresses[$n]->$myField['name'] == "0")		{ print _("No"); }
-							elseif($addresses[$n]->$myField['name'] == "1")	{ print _("Yes"); }
+						if ($myField['type'] == "tinyint(1)") {
+							if ($addresses[$n]->$myField['name'] == "0") { print _ ("No"); }
+							elseif ($addresses[$n]->$myField['name'] == "1") { print _ ("Yes"); }
 						}
 						//text
-						elseif($myField['type']=="text") {
-							if(strlen($addresses[$n]->$myField['name'])>0)	{ print "<i class='fa fa-gray fa-comment' rel='tooltip' data-container='body' data-html='true' title='".str_replace("\n", "<br>", $addresses[$n][$myField['name']])."'>"; }
-							else											{ print ""; }
+						elseif ($myField['type'] == "text") {
+							if (strlen ($addresses[$n]->$myField['name']) > 0) { print "<i class='fa fa-gray fa-comment' rel='tooltip' data-container='body' data-html='true' title='".str_replace ("\n", "<br>", $addresses[$n][$myField['name']])."'>"; }
+							else { print ""; }
 						}
 						else {
 							print $addresses[$n]->$myField['name'];
@@ -243,17 +243,17 @@ 
 				}
 			}
 	    }
-		print '</tr>'. "\n";
+		print '</tr>'."\n";
 
 		/*	if last one return ip address and broadcast IP
 		****************************************************/
-		if ( $n == $m )
+		if ($n == $m)
 		{
 			# compressed?
-			if(isset($addresses[$n]->stopIP))	{ $unused = $Addresses->find_unused_addresses ( $addresses[$n]->stopIP,  $Subnets->transform_to_decimal($subnet_detailed['broadcast']), $subnet['mask'] ); }
-			else 								{ $unused = $Addresses->find_unused_addresses ( $addresses[$n]->ip_addr, $Subnets->transform_to_decimal($subnet_detailed['broadcast']), $subnet['mask'] ); }
+			if (isset($addresses[$n]->stopIP)) { $unused = $Addresses->find_unused_addresses ($addresses[$n]->stopIP, $Subnets->transform_to_decimal ($subnet_detailed['broadcast']), $subnet['mask']); }
+			else { $unused = $Addresses->find_unused_addresses ($addresses[$n]->ip_addr, $Subnets->transform_to_decimal ($subnet_detailed['broadcast']), $subnet['mask']); }
 
-        	if ( $unused  ) {
+        	if ($unused) {
         		print "<tr class='th'>";
         		print "	<td></td>";
         		print "	<td colspan='$colspan[unused]' class='unused'>$unused[ip] ($unused[hosts])</td>";