phpipam / phpipam

app/dashboard/widgets/iprequest.php

Indentation +33 added lines, -33 removed lines

@@ -2,14 +2,14 @@ 
 
 # required functions
 if(!is_object(@$User)) {
-	require( dirname(__FILE__) . '/../../../functions/functions.php' );
-	# classes
-	$Database	= new Database_PDO;
-	$User 		= new User ($Database);
-	$Tools 		= new Tools ($Database);
-	$Sections	= new Sections ($Database);
-	$Subnets 	= new Subnets ($Database);
-	$Result	    = new Result ();
+    require( dirname(__FILE__) . '/../../../functions/functions.php' );
+    # classes
+    $Database	= new Database_PDO;
+    $User 		= new User ($Database);
+    $Tools 		= new Tools ($Database);
+    $Sections	= new Sections ($Database);
+    $Subnets 	= new Subnets ($Database);
+    $Result	    = new Result ();
 
 }
 
@@ -24,31 +24,31 @@ 
 $subnets_count = 0;
 if ($sections!==false) {
     foreach ($sections as $section) {
-    	# cast
-    	$section = (array) $section;
+        # cast
+        $section = (array) $section;
 
-    	# check permission
-    	$permission = $Sections->check_permission ($User->user, $section['id']);
-    	if($permission > 0) {
-    		$subnets = $Subnets->fetch_section_subnets ($section['id']);
-    		if ($subnets!==false) {
-        		foreach($subnets as $subnet) {
-        			# check permission
-        			$subpermission = $Subnets->check_permission ($User->user, $subnet->id);
-        			if($subpermission > 0) {
-        				/* show only subnets that allow IP exporting */
-        				if($subnet->allowRequests == 1) {
-        					$subnets_count ++;
-        					/* must not have any nested subnets! */
-        					if(!$Subnets->has_slaves($subnet->id))
-        					{
-        						$html[] = '<option value="'. $subnet->id .'">' . $Subnets->transform_to_dotted($subnet->subnet) .'/'. $subnet->mask .' ['. $subnet->description .']</option>';
-        					}
-        				}
-        			}
-        		}
-    		}
-    	}
+        # check permission
+        $permission = $Sections->check_permission ($User->user, $section['id']);
+        if($permission > 0) {
+            $subnets = $Subnets->fetch_section_subnets ($section['id']);
+            if ($subnets!==false) {
+                foreach($subnets as $subnet) {
+                    # check permission
+                    $subpermission = $Subnets->check_permission ($User->user, $subnet->id);
+                    if($subpermission > 0) {
+                        /* show only subnets that allow IP exporting */
+                        if($subnet->allowRequests == 1) {
+                            $subnets_count ++;
+                            /* must not have any nested subnets! */
+                            if(!$Subnets->has_slaves($subnet->id))
+                            {
+                                $html[] = '<option value="'. $subnet->id .'">' . $Subnets->transform_to_dotted($subnet->subnet) .'/'. $subnet->mask .' ['. $subnet->description .']</option>';
+                            }
+                        }
+                    }
+                }
+            }
+        }
     }
 }
 ?>
@@ -73,7 +73,7 @@ 
         foreach ($html as $h) {
             print $h;
         }
-    	?>
+        ?>
 		</select>
 
 	</td>

Braces +1 added lines, -2 removed lines

@@ -40,8 +40,7 @@
         				if($subnet->allowRequests == 1) {
         					$subnets_count ++;
         					/* must not have any nested subnets! */
-        					if(!$Subnets->has_slaves($subnet->id))
-        					{
+        					if(!$Subnets->has_slaves($subnet->id)) {
         						$html[] = '<option value="'. $subnet->id .'">' . $Subnets->transform_to_dotted($subnet->subnet) .'/'. $subnet->mask .' ['. $subnet->description .']</option>';
         					}
         				}

Spacing +20 added lines, -20 removed lines

@@ -1,15 +1,15 @@ 
 <?php
 
 # required functions
-if(!is_object(@$User)) {
-	require( dirname(__FILE__) . '/../../../functions/functions.php' );
+if (!is_object (@$User)) {
+	require(dirname (__FILE__).'/../../../functions/functions.php');
 	# classes
 	$Database	= new Database_PDO;
-	$User 		= new User ($Database);
-	$Tools 		= new Tools ($Database);
+	$User = new User ($Database);
+	$Tools = new Tools ($Database);
 	$Sections	= new Sections ($Database);
 	$Subnets 	= new Subnets ($Database);
-	$Result	    = new Result ();
+	$Result = new Result ();
 
 }
 
@@ -19,30 +19,30 @@ 
 # prepare list of permitted subnets with requests
 
 // get all sections
-$sections = $Sections->fetch_all_sections();
+$sections = $Sections->fetch_all_sections ();
 
 $subnets_count = 0;
-if ($sections!==false) {
+if ($sections !== false) {
     foreach ($sections as $section) {
     	# cast
     	$section = (array) $section;
 
     	# check permission
     	$permission = $Sections->check_permission ($User->user, $section['id']);
-    	if($permission > 0) {
+    	if ($permission > 0) {
     		$subnets = $Subnets->fetch_section_subnets ($section['id']);
-    		if ($subnets!==false) {
-        		foreach($subnets as $subnet) {
+    		if ($subnets !== false) {
+        		foreach ($subnets as $subnet) {
         			# check permission
         			$subpermission = $Subnets->check_permission ($User->user, $subnet->id);
-        			if($subpermission > 0) {
+        			if ($subpermission > 0) {
         				/* show only subnets that allow IP exporting */
-        				if($subnet->allowRequests == 1) {
-        					$subnets_count ++;
+        				if ($subnet->allowRequests == 1) {
+        					$subnets_count++;
         					/* must not have any nested subnets! */
-        					if(!$Subnets->has_slaves($subnet->id))
+        					if (!$Subnets->has_slaves ($subnet->id))
         					{
-        						$html[] = '<option value="'. $subnet->id .'">' . $Subnets->transform_to_dotted($subnet->subnet) .'/'. $subnet->mask .' ['. $subnet->description .']</option>';
+        						$html[] = '<option value="'.$subnet->id.'">'.$Subnets->transform_to_dotted ($subnet->subnet).'/'.$subnet->mask.' ['.$subnet->description.']</option>';
         					}
         				}
         			}
@@ -59,14 +59,14 @@ 
 <?php
 // if no subnets exist print it!
 if (!isset($html)) {
-    $Result->show("info", _("No subnets available"), false);
+    $Result->show ("info", _ ("No subnets available"), false);
 }
 else {
 ?>
 
 <!-- select section -->
 <tr>
-	<td><?php print _('Select subnet'); ?> *</td>
+	<td><?php print _ ('Select subnet'); ?> *</td>
 	<td>
 		<select name="subnetId" id="subnetId" class="form-control" class="input-sm input-w-auto">
     	<?php
@@ -79,14 +79,14 @@ 
 	</td>
 </tr>
 <tr>
-	<td><?php print _('First IP Address available'); ?></td>
+	<td><?php print _ ('First IP Address available'); ?></td>
 	<td>
-		<input type="text" name="ip_addr" id="ip_addr_widget" class="form-control ip_addr" size="30" placeholder="<?php print _('IP Address'); ?>">
+		<input type="text" name="ip_addr" id="ip_addr_widget" class="form-control ip_addr" size="30" placeholder="<?php print _ ('IP Address'); ?>">
 	</td>
 </tr>
 <tr>
 	<td colspan='2'>
-		<button class="btn btn-sm btn-default pull-right" id="requestIP_widget"><?php print _('Request IP');?></button>
+		<button class="btn btn-sm btn-default pull-right" id="requestIP_widget"><?php print _ ('Request IP'); ?></button>
 	</td>
 </tr>
 </table>

app/dashboard/widgets/changelog.php

Indentation +87 added lines, -87 removed lines

@@ -6,15 +6,15 @@ 
 
 # required functions if requested via AJAX
 if(!is_object(@$User)) {
-	require( dirname(__FILE__) . '/../../../functions/functions.php' );
-	# classes
-	$Database	= new Database_PDO;
-	$User 		= new User ($Database);
-	$Tools 		= new Tools ($Database);
-	$Subnets 	= new Subnets ($Database);
-	$Sections 	= new Sections ($Database);
-	$Log		= new Logging ($Database);
-	$Result 	= new Result ();
+    require( dirname(__FILE__) . '/../../../functions/functions.php' );
+    # classes
+    $Database	= new Database_PDO;
+    $User 		= new User ($Database);
+    $Tools 		= new Tools ($Database);
+    $Subnets 	= new Subnets ($Database);
+    $Sections 	= new Sections ($Database);
+    $Log		= new Logging ($Database);
+    $Result 	= new Result ();
 }
 
 # user must be authenticated
@@ -22,98 +22,98 @@ 
 
 # if direct request that redirect to tools page
 if($_SERVER['HTTP_X_REQUESTED_WITH']!="XMLHttpRequest")	{
-	header("Location: ".create_link("tools","changelog"));
+    header("Location: ".create_link("tools","changelog"));
 }
 
 # changelog to syslog
 if ($User->settings->log!="syslog") {
-	/* get logs */
-	$clogs = $Log->fetch_all_changelogs (false, "", 50);
+    /* get logs */
+    $clogs = $Log->fetch_all_changelogs (false, "", 50);
 }
 
 # syslog
 if ($User->settings->log=="syslog") {
-	$Result->show("warning", _("Changelog files are sent to syslog"), false);
+    $Result->show("warning", _("Changelog files are sent to syslog"), false);
 }
 # none
 elseif(sizeof($clogs)==0) {
-	print "<blockquote style='margin-top:20px;margin-left:20px;'>";
-	print "<p>"._("No changelogs available")."</p>";
-	print "<small>"._("No changelog entries are available")."</small>";
-	print "</blockquote>";
+    print "<blockquote style='margin-top:20px;margin-left:20px;'>";
+    print "<p>"._("No changelogs available")."</p>";
+    print "<small>"._("No changelog entries are available")."</small>";
+    print "</blockquote>";
 }
 # print
 else {
 
-	# printout
-	print "<table class='table changelog table-hover table-top table-condensed'>";
-
-	# headers
-	print "<tr>";
-	print "	<th>"._('User')."</th>";
-	print "	<th>"._('Type')."</th>";
-	print "	<th>"._('Object')."</th>";
-	print "	<th>"._('Date')."</th>";
-	print "	<th>"._('Change')."</th>";
-	print "</tr>";
-
-	# logs
-	$pc = 0;					//print count
-	foreach($clogs as $l) {
-
-		# cast
-		$l = (array) $l;
-
-		if($pc < 5) {
-			# permissions
-			if($l['ctype']=="subnet")		{ $permission = $Subnets->check_permission ($User->user, $l['tid']); }
-			elseif($l['ctype']=="ip_addr")	{ $permission = $Subnets->check_permission ($User->user, $l['subnetId']); }
-			elseif($l['ctype']=="section")	{ $permission = $Sections->check_permission ($User->user, $l['sectionId']); }
-			else							{ $permission = 0; }
-
-			# if 0 ignore
-			if($permission > 0)	{
-				# format diff
-				$l['cdiff'] = str_replace("\n\n", "", trim($l['cdiff']));
-				$l['cdiff'] = str_replace("\n", "; ", $l['cdiff']);
-
-				# format type
-				switch($l['ctype']) {
-					case "ip_addr":							{ $l['ctype'] = "IP address";	break; }
-					case "subnet":  if($l['isFolder']==1) 	{ $l['ctype'] = "Folder"; }
-									else 					{ $l['ctype'] = "Subnet"; }
-					break;
-
-					case "section":							{ $l['ctype'] = "Section";	break; }
-				}
-
-				print "<tr>";
-				print "	<td>$l[real_name]</td>";
-				print "	<td>$l[ctype] / $l[caction] $l[cresult]</td>";
-
-				# subnet, section or ip address
-				if($l['ctype']=="IP address")	{
-					print "	<td><a href='".create_link("subnets",$l['sectionId'],$l['subnetId'],"address-details",$l['tid'])."'>".$Subnets->transform_address ($l['ip_addr'], "dotted")."</a></td>";
-				}
-				elseif($l['ctype']=="Subnet")   {
-					print "	<td><a href='".create_link("subnets",$l['sectionId'],$l['tid'])."'>".$Subnets->transform_address ($l['ip_addr'], "dotted")."/$l[mask]</a></td>";
-				}
-				elseif($l['ctype']=="Folder")   {
-					print "	<td><a href='".create_link("folder",$l['sectionId'],$l['tid'])."'>$l[sDescription]</a></td>";
-				}
-				elseif($l['ctype']=="Section")   {
-					print "	<td><a href='".create_link("subnets",$l['tid'])."'>$l[sDescription]</a></td>";
-				}
-				print "	<td>$l[cdate]</td>";
-				print "	<td>$l[cdiff]</td>";
-				print "</tr>";
-
-				// next item
-				$pc++;
-			}
-		}
-	}
-
-	print "</table>";
+    # printout
+    print "<table class='table changelog table-hover table-top table-condensed'>";
+
+    # headers
+    print "<tr>";
+    print "	<th>"._('User')."</th>";
+    print "	<th>"._('Type')."</th>";
+    print "	<th>"._('Object')."</th>";
+    print "	<th>"._('Date')."</th>";
+    print "	<th>"._('Change')."</th>";
+    print "</tr>";
+
+    # logs
+    $pc = 0;					//print count
+    foreach($clogs as $l) {
+
+        # cast
+        $l = (array) $l;
+
+        if($pc < 5) {
+            # permissions
+            if($l['ctype']=="subnet")		{ $permission = $Subnets->check_permission ($User->user, $l['tid']); }
+            elseif($l['ctype']=="ip_addr")	{ $permission = $Subnets->check_permission ($User->user, $l['subnetId']); }
+            elseif($l['ctype']=="section")	{ $permission = $Sections->check_permission ($User->user, $l['sectionId']); }
+            else							{ $permission = 0; }
+
+            # if 0 ignore
+            if($permission > 0)	{
+                # format diff
+                $l['cdiff'] = str_replace("\n\n", "", trim($l['cdiff']));
+                $l['cdiff'] = str_replace("\n", "; ", $l['cdiff']);
+
+                # format type
+                switch($l['ctype']) {
+                    case "ip_addr":							{ $l['ctype'] = "IP address";	break; }
+                    case "subnet":  if($l['isFolder']==1) 	{ $l['ctype'] = "Folder"; }
+                                    else 					{ $l['ctype'] = "Subnet"; }
+                    break;
+
+                    case "section":							{ $l['ctype'] = "Section";	break; }
+                }
+
+                print "<tr>";
+                print "	<td>$l[real_name]</td>";
+                print "	<td>$l[ctype] / $l[caction] $l[cresult]</td>";
+
+                # subnet, section or ip address
+                if($l['ctype']=="IP address")	{
+                    print "	<td><a href='".create_link("subnets",$l['sectionId'],$l['subnetId'],"address-details",$l['tid'])."'>".$Subnets->transform_address ($l['ip_addr'], "dotted")."</a></td>";
+                }
+                elseif($l['ctype']=="Subnet")   {
+                    print "	<td><a href='".create_link("subnets",$l['sectionId'],$l['tid'])."'>".$Subnets->transform_address ($l['ip_addr'], "dotted")."/$l[mask]</a></td>";
+                }
+                elseif($l['ctype']=="Folder")   {
+                    print "	<td><a href='".create_link("folder",$l['sectionId'],$l['tid'])."'>$l[sDescription]</a></td>";
+                }
+                elseif($l['ctype']=="Section")   {
+                    print "	<td><a href='".create_link("subnets",$l['tid'])."'>$l[sDescription]</a></td>";
+                }
+                print "	<td>$l[cdate]</td>";
+                print "	<td>$l[cdiff]</td>";
+                print "</tr>";
+
+                // next item
+                $pc++;
+            }
+        }
+    }
+
+    print "</table>";
 }
 ?>
\ No newline at end of file

Braces +7 added lines, -7 removed lines

@@ -21,7 +21,7 @@ 
 $User->check_user_session ();
 
 # if direct request that redirect to tools page
-if($_SERVER['HTTP_X_REQUESTED_WITH']!="XMLHttpRequest")	{
+if($_SERVER['HTTP_X_REQUESTED_WITH']!="XMLHttpRequest") {
 	header("Location: ".create_link("tools","changelog"));
 }
 
@@ -72,7 +72,7 @@ 
 			else							{ $permission = 0; }
 
 			# if 0 ignore
-			if($permission > 0)	{
+			if($permission > 0) {
 				# format diff
 				$l['cdiff'] = str_replace("\n\n", "", trim($l['cdiff']));
 				$l['cdiff'] = str_replace("\n", "; ", $l['cdiff']);
@@ -81,7 +81,7 @@ 
 				switch($l['ctype']) {
 					case "ip_addr":							{ $l['ctype'] = "IP address";	break; }
 					case "subnet":  if($l['isFolder']==1) 	{ $l['ctype'] = "Folder"; }
-									else 					{ $l['ctype'] = "Subnet"; }
+					else 					{ $l['ctype'] = "Subnet"; }
 					break;
 
 					case "section":							{ $l['ctype'] = "Section";	break; }
@@ -92,16 +92,16 @@ 
 				print "	<td>$l[ctype] / $l[caction] $l[cresult]</td>";
 
 				# subnet, section or ip address
-				if($l['ctype']=="IP address")	{
+				if($l['ctype']=="IP address") {
 					print "	<td><a href='".create_link("subnets",$l['sectionId'],$l['subnetId'],"address-details",$l['tid'])."'>".$Subnets->transform_address ($l['ip_addr'], "dotted")."</a></td>";
 				}
-				elseif($l['ctype']=="Subnet")   {
+				elseif($l['ctype']=="Subnet") {
 					print "	<td><a href='".create_link("subnets",$l['sectionId'],$l['tid'])."'>".$Subnets->transform_address ($l['ip_addr'], "dotted")."/$l[mask]</a></td>";
 				}
-				elseif($l['ctype']=="Folder")   {
+				elseif($l['ctype']=="Folder") {
 					print "	<td><a href='".create_link("folder",$l['sectionId'],$l['tid'])."'>$l[sDescription]</a></td>";
 				}
-				elseif($l['ctype']=="Section")   {
+				elseif($l['ctype']=="Section") {
 					print "	<td><a href='".create_link("subnets",$l['tid'])."'>$l[sDescription]</a></td>";
 				}
 				print "	<td>$l[cdate]</td>";

Spacing +43 added lines, -43 removed lines

@@ -5,41 +5,41 @@ 
  *********************************************/
 
 # required functions if requested via AJAX
-if(!is_object(@$User)) {
-	require( dirname(__FILE__) . '/../../../functions/functions.php' );
+if (!is_object (@$User)) {
+	require(dirname (__FILE__).'/../../../functions/functions.php');
 	# classes
 	$Database	= new Database_PDO;
-	$User 		= new User ($Database);
-	$Tools 		= new Tools ($Database);
+	$User = new User ($Database);
+	$Tools = new Tools ($Database);
 	$Subnets 	= new Subnets ($Database);
-	$Sections 	= new Sections ($Database);
-	$Log		= new Logging ($Database);
-	$Result 	= new Result ();
+	$Sections = new Sections ($Database);
+	$Log = new Logging ($Database);
+	$Result = new Result ();
 }
 
 # user must be authenticated
 $User->check_user_session ();
 
 # if direct request that redirect to tools page
-if($_SERVER['HTTP_X_REQUESTED_WITH']!="XMLHttpRequest")	{
-	header("Location: ".create_link("tools","changelog"));
+if ($_SERVER['HTTP_X_REQUESTED_WITH'] != "XMLHttpRequest") {
+	header ("Location: ".create_link ("tools", "changelog"));
 }
 
 # changelog to syslog
-if ($User->settings->log!="syslog") {
+if ($User->settings->log != "syslog") {
 	/* get logs */
 	$clogs = $Log->fetch_all_changelogs (false, "", 50);
 }
 
 # syslog
-if ($User->settings->log=="syslog") {
-	$Result->show("warning", _("Changelog files are sent to syslog"), false);
+if ($User->settings->log == "syslog") {
+	$Result->show ("warning", _ ("Changelog files are sent to syslog"), false);
 }
 # none
-elseif(sizeof($clogs)==0) {
+elseif (sizeof ($clogs) == 0) {
 	print "<blockquote style='margin-top:20px;margin-left:20px;'>";
-	print "<p>"._("No changelogs available")."</p>";
-	print "<small>"._("No changelog entries are available")."</small>";
+	print "<p>"._ ("No changelogs available")."</p>";
+	print "<small>"._ ("No changelog entries are available")."</small>";
 	print "</blockquote>";
 }
 # print
@@ -50,41 +50,41 @@ 
 
 	# headers
 	print "<tr>";
-	print "	<th>"._('User')."</th>";
-	print "	<th>"._('Type')."</th>";
-	print "	<th>"._('Object')."</th>";
-	print "	<th>"._('Date')."</th>";
-	print "	<th>"._('Change')."</th>";
+	print "	<th>"._ ('User')."</th>";
+	print "	<th>"._ ('Type')."</th>";
+	print "	<th>"._ ('Object')."</th>";
+	print "	<th>"._ ('Date')."</th>";
+	print "	<th>"._ ('Change')."</th>";
 	print "</tr>";
 
 	# logs
-	$pc = 0;					//print count
-	foreach($clogs as $l) {
+	$pc = 0; //print count
+	foreach ($clogs as $l) {
 
 		# cast
 		$l = (array) $l;
 
-		if($pc < 5) {
+		if ($pc < 5) {
 			# permissions
-			if($l['ctype']=="subnet")		{ $permission = $Subnets->check_permission ($User->user, $l['tid']); }
-			elseif($l['ctype']=="ip_addr")	{ $permission = $Subnets->check_permission ($User->user, $l['subnetId']); }
-			elseif($l['ctype']=="section")	{ $permission = $Sections->check_permission ($User->user, $l['sectionId']); }
-			else							{ $permission = 0; }
+			if ($l['ctype'] == "subnet") { $permission = $Subnets->check_permission ($User->user, $l['tid']); }
+			elseif ($l['ctype'] == "ip_addr") { $permission = $Subnets->check_permission ($User->user, $l['subnetId']); }
+			elseif ($l['ctype'] == "section") { $permission = $Sections->check_permission ($User->user, $l['sectionId']); }
+			else { $permission = 0; }
 
 			# if 0 ignore
-			if($permission > 0)	{
+			if ($permission > 0) {
 				# format diff
-				$l['cdiff'] = str_replace("\n\n", "", trim($l['cdiff']));
-				$l['cdiff'] = str_replace("\n", "; ", $l['cdiff']);
+				$l['cdiff'] = str_replace ("\n\n", "", trim ($l['cdiff']));
+				$l['cdiff'] = str_replace ("\n", "; ", $l['cdiff']);
 
 				# format type
-				switch($l['ctype']) {
-					case "ip_addr":							{ $l['ctype'] = "IP address";	break; }
-					case "subnet":  if($l['isFolder']==1) 	{ $l['ctype'] = "Folder"; }
-									else 					{ $l['ctype'] = "Subnet"; }
+				switch ($l['ctype']) {
+					case "ip_addr":							{ $l['ctype'] = "IP address"; break; }
+					case "subnet":  if ($l['isFolder'] == 1) { $l['ctype'] = "Folder"; }
+									else { $l['ctype'] = "Subnet"; }
 					break;
 
-					case "section":							{ $l['ctype'] = "Section";	break; }
+					case "section":							{ $l['ctype'] = "Section"; break; }
 				}
 
 				print "<tr>";
@@ -92,17 +92,17 @@ 
 				print "	<td>$l[ctype] / $l[caction] $l[cresult]</td>";
 
 				# subnet, section or ip address
-				if($l['ctype']=="IP address")	{
-					print "	<td><a href='".create_link("subnets",$l['sectionId'],$l['subnetId'],"address-details",$l['tid'])."'>".$Subnets->transform_address ($l['ip_addr'], "dotted")."</a></td>";
+				if ($l['ctype'] == "IP address") {
+					print "	<td><a href='".create_link ("subnets", $l['sectionId'], $l['subnetId'], "address-details", $l['tid'])."'>".$Subnets->transform_address ($l['ip_addr'], "dotted")."</a></td>";
 				}
-				elseif($l['ctype']=="Subnet")   {
-					print "	<td><a href='".create_link("subnets",$l['sectionId'],$l['tid'])."'>".$Subnets->transform_address ($l['ip_addr'], "dotted")."/$l[mask]</a></td>";
+				elseif ($l['ctype'] == "Subnet") {
+					print "	<td><a href='".create_link ("subnets", $l['sectionId'], $l['tid'])."'>".$Subnets->transform_address ($l['ip_addr'], "dotted")."/$l[mask]</a></td>";
 				}
-				elseif($l['ctype']=="Folder")   {
-					print "	<td><a href='".create_link("folder",$l['sectionId'],$l['tid'])."'>$l[sDescription]</a></td>";
+				elseif ($l['ctype'] == "Folder") {
+					print "	<td><a href='".create_link ("folder", $l['sectionId'], $l['tid'])."'>$l[sDescription]</a></td>";
 				}
-				elseif($l['ctype']=="Section")   {
-					print "	<td><a href='".create_link("subnets",$l['tid'])."'>$l[sDescription]</a></td>";
+				elseif ($l['ctype'] == "Section") {
+					print "	<td><a href='".create_link ("subnets", $l['tid'])."'>$l[sDescription]</a></td>";
 				}
 				print "	<td>$l[cdate]</td>";
 				print "	<td>$l[cdiff]</td>";

app/dashboard/widgets/ipcalc.php

Indentation +8 added lines, -8 removed lines

@@ -1,13 +1,13 @@ 
 <?php
 # required functions
 if(!is_object(@$User)) {
-	require( dirname(__FILE__) . '/../../../functions/functions.php' );
-	# classes
-	$Database	= new Database_PDO;
-	$User 		= new User ($Database);
-	$Tools 		= new Tools ($Database);
-	$Subnets 	= new Subnets ($Database);
-	$Addresses 	= new Addresses ($Database);
+    require( dirname(__FILE__) . '/../../../functions/functions.php' );
+    # classes
+    $Database	= new Database_PDO;
+    $User 		= new User ($Database);
+    $Tools 		= new Tools ($Database);
+    $Subnets 	= new Subnets ($Database);
+    $Addresses 	= new Addresses ($Database);
 }
 
 # user must be authenticated
@@ -15,7 +15,7 @@ 
 
 # if direct request that redirect to tools page
 if($_SERVER['HTTP_X_REQUESTED_WITH']!="XMLHttpRequest")	{
-	header("Location: ".create_link("tools", "ip-calculator"));
+    header("Location: ".create_link("tools", "ip-calculator"));
 }
 ?>
 

Braces +1 added lines, -1 removed lines

@@ -15,7 +15,7 @@
 $User->check_user_session ();
 
 # if direct request that redirect to tools page
-if($_SERVER['HTTP_X_REQUESTED_WITH']!="XMLHttpRequest")	{
+if($_SERVER['HTTP_X_REQUESTED_WITH']!="XMLHttpRequest") {
 	header("Location: ".create_link("tools","logs"));
 }
 

Spacing +10 added lines, -10 removed lines

@@ -1,21 +1,21 @@ 
 <?php
 # required functions
-if(!is_object(@$User)) {
-	require( dirname(__FILE__) . '/../../../functions/functions.php' );
+if (!is_object (@$User)) {
+	require(dirname (__FILE__).'/../../../functions/functions.php');
 	# classes
 	$Database	= new Database_PDO;
-	$User 		= new User ($Database);
-	$Tools 		= new Tools ($Database);
+	$User = new User ($Database);
+	$Tools = new Tools ($Database);
 	$Subnets 	= new Subnets ($Database);
-	$Addresses 	= new Addresses ($Database);
+	$Addresses = new Addresses ($Database);
 }
 
 # user must be authenticated
 $User->check_user_session ();
 
 # if direct request that redirect to tools page
-if($_SERVER['HTTP_X_REQUESTED_WITH']!="XMLHttpRequest")	{
-	header("Location: ".create_link("tools", "ip-calculator"));
+if ($_SERVER['HTTP_X_REQUESTED_WITH'] != "XMLHttpRequest") {
+	header ("Location: ".create_link ("tools", "ip-calculator"));
 }
 ?>
 
@@ -41,9 +41,9 @@ 
 	<div class="form-group">
 	<div class="col-sm-12">
 		<div class="input-group">
-		     <input type="text" class="form-control input-md" name="cidr" placeholder="<?php print _('10.11.12.3/24'); ?>">
+		     <input type="text" class="form-control input-md" name="cidr" placeholder="<?php print _ ('10.11.12.3/24'); ?>">
 			 <span class="input-group-btn">
-			 	<button type="submit" class="btn btn-md btn-default"><?php print _('Calculate');?></button>
+			 	<button type="submit" class="btn btn-md btn-default"><?php print _ ('Calculate'); ?></button>
 			 </span>
 		</div>
 	</div>
@@ -52,7 +52,7 @@ 
 
 
 <div class="ipCalcResult2">
-	<span class="text-muted"><?php print _('Please enter IP address and mask in CIDR format'); ?></span>
+	<span class="text-muted"><?php print _ ('Please enter IP address and mask in CIDR format'); ?></span>
 </div>
 
 </div>
\ No newline at end of file

app/dashboard/widgets/template.php

Indentation +6 added lines, -6 removed lines

@@ -8,11 +8,11 @@ 
 
 # required functions
 if(!is_object(@$User)) {
-	require( dirname(__FILE__) . '/../../../functions/functions.php' );
-	# classes
-	$Database	= new Database_PDO;
-	$User 		= new User ($Database);
-	$Tools 		= new Tools ($Database);
+    require( dirname(__FILE__) . '/../../../functions/functions.php' );
+    # classes
+    $Database	= new Database_PDO;
+    $User 		= new User ($Database);
+    $Tools 		= new Tools ($Database);
 }
 
 # user must be authenticated
@@ -20,7 +20,7 @@ 
 
 # if direct request that redirect to tools page
 if($_SERVER['HTTP_X_REQUESTED_WITH']!="XMLHttpRequest")	{
-	header("Location: ".create_link("administration","logs"));
+    header("Location: ".create_link("administration","logs"));
 }
 
 /* You can check who requested this, to adjust parameters  */

Braces +1 added lines, -1 removed lines

@@ -15,7 +15,7 @@
 $User->check_user_session ();
 
 # if direct request that redirect to tools page
-if($_SERVER['HTTP_X_REQUESTED_WITH']!="XMLHttpRequest")	{
+if($_SERVER['HTTP_X_REQUESTED_WITH']!="XMLHttpRequest") {
 	header("Location: ".create_link("tools","logs"));
 }
 

Spacing +9 added lines, -9 removed lines

@@ -7,25 +7,25 @@
 */
 
 # required functions
-if(!is_object(@$User)) {
-	require( dirname(__FILE__) . '/../../../functions/functions.php' );
+if (!is_object (@$User)) {
+	require(dirname (__FILE__).'/../../../functions/functions.php');
 	# classes
-	$Database	= new Database_PDO;
-	$User 		= new User ($Database);
-	$Tools 		= new Tools ($Database);
+	$Database = new Database_PDO;
+	$User = new User ($Database);
+	$Tools = new Tools ($Database);
 }
 
 # user must be authenticated
 $User->check_user_session ();
 
 # if direct request that redirect to tools page
-if($_SERVER['HTTP_X_REQUESTED_WITH']!="XMLHttpRequest")	{
-	header("Location: ".create_link("administration","logs"));
+if ($_SERVER['HTTP_X_REQUESTED_WITH'] != "XMLHttpRequest") {
+	header ("Location: ".create_link ("administration", "logs"));
 }
 
 /* You can check who requested this, to adjust parameters  */
-if($_SERVER['HTTP_X_REQUESTED_WITH']=="XMLHttpRequest")	{ $dashboard = true; }
-else													{ $dashboard = false; }
+if ($_SERVER['HTTP_X_REQUESTED_WITH'] == "XMLHttpRequest") { $dashboard = true; }
+else { $dashboard = false; }
 
 ?>
 

app/dashboard/widgets/tools.php

Indentation +22 added lines, -22 removed lines

@@ -1,13 +1,13 @@ 
 <?php
 # required functions
 if(!is_object(@$User)) {
-	require( dirname(__FILE__) . '/../../../functions/functions.php' );
-	# classes
-	$Database	= new Database_PDO;
-	$User 		= new User ($Database);
-	$Tools 		= new Tools ($Database);
-	$Subnets 	= new Subnets ($Database);
-	$Addresses 	= new Addresses ($Database);
+    require( dirname(__FILE__) . '/../../../functions/functions.php' );
+    # classes
+    $Database	= new Database_PDO;
+    $User 		= new User ($Database);
+    $Tools 		= new Tools ($Database);
+    $Subnets 	= new Subnets ($Database);
+    $Addresses 	= new Addresses ($Database);
 }
 
 # user must be authenticated
@@ -15,7 +15,7 @@ 
 
 # if direct request that redirect to tools page
 if($_SERVER['HTTP_X_REQUESTED_WITH']!="XMLHttpRequest")	{
-	header("Location: ".create_link("tools"));
+    header("Location: ".create_link("tools"));
 }
 
 # set items
@@ -80,21 +80,21 @@ 
 <?php
 # print
 foreach($tools_menu as $k=>$tool) {
-	# items
-	foreach($tool as $t) {
-		# remove unneeded
-		print "	<div class='col-xs-12 col-md-6 col-lg-6 widget-dash1'>";
-		print "	<div class='inner thumbnail'>";
-		print "		<div class='hContent'>";
-		print "			<div class='icon'><a href='".create_link("tools",$t['href'])."'><i class='fa $t[icon]'></i></a></div>";
-		print "			<div class='text'><a href='".create_link("tools",$t['href'])."'>"._($t['name'])."</a><hr><span class='text-muted'>"._($t['description'])."</span></div>";
-		print "		</div>";
-		print "	</div>";
-		print "	</div>";
-	}
+    # items
+    foreach($tool as $t) {
+        # remove unneeded
+        print "	<div class='col-xs-12 col-md-6 col-lg-6 widget-dash1'>";
+        print "	<div class='inner thumbnail'>";
+        print "		<div class='hContent'>";
+        print "			<div class='icon'><a href='".create_link("tools",$t['href'])."'><i class='fa $t[icon]'></i></a></div>";
+        print "			<div class='text'><a href='".create_link("tools",$t['href'])."'>"._($t['name'])."</a><hr><span class='text-muted'>"._($t['description'])."</span></div>";
+        print "		</div>";
+        print "	</div>";
+        print "	</div>";
+    }
 
-	# clear and break
-	print "<div class='clearfix'></div>";
+    # clear and break
+    print "<div class='clearfix'></div>";
 }
 ?>
 </div>

Braces +4 added lines, -3 removed lines

@@ -14,7 +14,7 @@ 
 $User->check_user_session ();
 
 # if direct request that redirect to tools page
-if($_SERVER['HTTP_X_REQUESTED_WITH']!="XMLHttpRequest")	{
+if($_SERVER['HTTP_X_REQUESTED_WITH']!="XMLHttpRequest") {
 	header("Location: ".create_link("tools"));
 }
 
@@ -25,8 +25,9 @@ 
 # Subnets
 $tools_menu['Subnets'][] 	= array("show"=>true,	"icon"=>"fa-sitemap", 	"name"=>"Subnets",  		   	"href"=>"subnets", 		"description"=>"Show all subnets");
 $tools_menu['Subnets'][] 	= array("show"=>true,	"icon"=>"fa-cloud", 	"name"=>"VLAN",  				"href"=>"vlan", 		"description"=>"Show VLANs and belonging subnets");
-if($User->settings->enableVRF == 1)
-$tools_menu['Subnets'][] 	= array("show"=>true,	"icon"=>"fa-cloud", 	 "name"=>"VRF",  				"href"=>"vrf", 			"description"=>"Show VRFs and belonging networks");
+if($User->settings->enableVRF == 1) {
+    $tools_menu['Subnets'][] 	= array("show"=>true,	"icon"=>"fa-cloud", 	 "name"=>"VRF",  				"href"=>"vrf", 			"description"=>"Show VRFs and belonging networks");
+}
 $tools_menu['Subnets'][] 	= array("show"=>true,	"icon"=>"fa-desktop", 	 "name"=>"Devices",  			"href"=>"devices", 		"description"=>"Show all configured devices");
 ?>
 

Spacing +18 added lines, -18 removed lines

@@ -1,33 +1,33 @@ 
 <?php
 # required functions
-if(!is_object(@$User)) {
-	require( dirname(__FILE__) . '/../../../functions/functions.php' );
+if (!is_object (@$User)) {
+	require(dirname (__FILE__).'/../../../functions/functions.php');
 	# classes
 	$Database	= new Database_PDO;
-	$User 		= new User ($Database);
-	$Tools 		= new Tools ($Database);
+	$User = new User ($Database);
+	$Tools = new Tools ($Database);
 	$Subnets 	= new Subnets ($Database);
-	$Addresses 	= new Addresses ($Database);
+	$Addresses = new Addresses ($Database);
 }
 
 # user must be authenticated
 $User->check_user_session ();
 
 # if direct request that redirect to tools page
-if($_SERVER['HTTP_X_REQUESTED_WITH']!="XMLHttpRequest")	{
-	header("Location: ".create_link("tools"));
+if ($_SERVER['HTTP_X_REQUESTED_WITH'] != "XMLHttpRequest") {
+	header ("Location: ".create_link ("tools"));
 }
 
 # set items
 # Tools
-$tools_menu['Tools'][] = array("show"=>true,	"icon"=>"fa-search", 		"name"=>"Search", 		 		"href"=>"search", 		"description"=>"Search database Addresses, subnets and VLANs");
-$tools_menu['Tools'][] = array("show"=>true,	"icon"=>"fa-calculator",	"name"=>"IP calculator", 		"href"=>"ip-calculator","description"=>"IPv4v6 calculator for subnet calculations");
+$tools_menu['Tools'][] = array ("show"=>true, "icon"=>"fa-search", "name"=>"Search", "href"=>"search", "description"=>"Search database Addresses, subnets and VLANs");
+$tools_menu['Tools'][] = array ("show"=>true, "icon"=>"fa-calculator", "name"=>"IP calculator", "href"=>"ip-calculator", "description"=>"IPv4v6 calculator for subnet calculations");
 # Subnets
-$tools_menu['Subnets'][] 	= array("show"=>true,	"icon"=>"fa-sitemap", 	"name"=>"Subnets",  		   	"href"=>"subnets", 		"description"=>"Show all subnets");
-$tools_menu['Subnets'][] 	= array("show"=>true,	"icon"=>"fa-cloud", 	"name"=>"VLAN",  				"href"=>"vlan", 		"description"=>"Show VLANs and belonging subnets");
-if($User->settings->enableVRF == 1)
-$tools_menu['Subnets'][] 	= array("show"=>true,	"icon"=>"fa-cloud", 	 "name"=>"VRF",  				"href"=>"vrf", 			"description"=>"Show VRFs and belonging networks");
-$tools_menu['Subnets'][] 	= array("show"=>true,	"icon"=>"fa-desktop", 	 "name"=>"Devices",  			"href"=>"devices", 		"description"=>"Show all configured devices");
+$tools_menu['Subnets'][] 	= array ("show"=>true, "icon"=>"fa-sitemap", "name"=>"Subnets", "href"=>"subnets", "description"=>"Show all subnets");
+$tools_menu['Subnets'][] 	= array ("show"=>true, "icon"=>"fa-cloud", "name"=>"VLAN", "href"=>"vlan", "description"=>"Show VLANs and belonging subnets");
+if ($User->settings->enableVRF == 1)
+$tools_menu['Subnets'][] 	= array ("show"=>true, "icon"=>"fa-cloud", "name"=>"VRF", "href"=>"vrf", "description"=>"Show VRFs and belonging networks");
+$tools_menu['Subnets'][] 	= array ("show"=>true, "icon"=>"fa-desktop", "name"=>"Devices", "href"=>"devices", "description"=>"Show all configured devices");
 ?>
 
 
@@ -79,15 +79,15 @@ 
 
 <?php
 # print
-foreach($tools_menu as $k=>$tool) {
+foreach ($tools_menu as $k=>$tool) {
 	# items
-	foreach($tool as $t) {
+	foreach ($tool as $t) {
 		# remove unneeded
 		print "	<div class='col-xs-12 col-md-6 col-lg-6 widget-dash1'>";
 		print "	<div class='inner thumbnail'>";
 		print "		<div class='hContent'>";
-		print "			<div class='icon'><a href='".create_link("tools",$t['href'])."'><i class='fa $t[icon]'></i></a></div>";
-		print "			<div class='text'><a href='".create_link("tools",$t['href'])."'>"._($t['name'])."</a><hr><span class='text-muted'>"._($t['description'])."</span></div>";
+		print "			<div class='icon'><a href='".create_link ("tools", $t['href'])."'><i class='fa $t[icon]'></i></a></div>";
+		print "			<div class='text'><a href='".create_link ("tools", $t['href'])."'>"._ ($t['name'])."</a><hr><span class='text-muted'>"._ ($t['description'])."</span></div>";
 		print "		</div>";
 		print "	</div>";
 		print "	</div>";

app/dashboard/widgets/statistics.php

Indentation +5 added lines, -5 removed lines

@@ -2,11 +2,11 @@
 
 # required functions
 if(!is_object(@$User)) {
-	require( dirname(__FILE__) . '/../../../functions/functions.php' );
-	# classes
-	$Database	= new Database_PDO;
-	$User 		= new User ($Database);
-	$Tools 		= new Tools ($Database);
+    require( dirname(__FILE__) . '/../../../functions/functions.php' );
+    # classes
+    $Database	= new Database_PDO;
+    $User 		= new User ($Database);
+    $Tools 		= new Tools ($Database);
 }
 
 # user must be authenticated

Spacing +13 added lines, -13 removed lines

@@ -1,12 +1,12 @@ 
 <?php
 
 # required functions
-if(!is_object(@$User)) {
-	require( dirname(__FILE__) . '/../../../functions/functions.php' );
+if (!is_object (@$User)) {
+	require(dirname (__FILE__).'/../../../functions/functions.php');
 	# classes
-	$Database	= new Database_PDO;
-	$User 		= new User ($Database);
-	$Tools 		= new Tools ($Database);
+	$Database = new Database_PDO;
+	$User = new User ($Database);
+	$Tools = new Tools ($Database);
 }
 
 # user must be authenticated
@@ -19,37 +19,37 @@ 
 
 	<!-- sections -->
 	<tr>
-		<td class="title"><?php print _('Number of Sections'); ?></td>
+		<td class="title"><?php print _ ('Number of Sections'); ?></td>
 		<td><?php print $Database->numObjects ("sections"); ?></td>
 	</tr>
 
 	<!-- subnets -->
 	<tr>
-		<td class="title"><?php print _('Number of Subnets'); ?></td>
-		<td><?php print $Database->numObjects ("subnets");; ?></td>
+		<td class="title"><?php print _ ('Number of Subnets'); ?></td>
+		<td><?php print $Database->numObjects ("subnets"); ; ?></td>
 	</tr>
 
 	<!-- VLAN -->
 	<tr>
-		<td class="title"><?php print _('Number of VLANs'); ?></td>
-		<td><?php print $Database->numObjects ("vlans");; ?></td>
+		<td class="title"><?php print _ ('Number of VLANs'); ?></td>
+		<td><?php print $Database->numObjects ("vlans"); ; ?></td>
 	</tr>
 
 	<!-- IPv4 addresses -->
 	<tr>
-		<td class="title"><?php print _('Number of IPv4 addresses'); ?></td>
+		<td class="title"><?php print _ ('Number of IPv4 addresses'); ?></td>
 		<td><?php print $Tools->count_subnets ("IPv4"); ?></td>
 	</tr>
 
 	<!-- IPv6 addresses -->
 	<tr>
-		<td class="title"><?php print _('Number of IPv6 addresses'); ?></td>
+		<td class="title"><?php print _ ('Number of IPv6 addresses'); ?></td>
 		<td><?php print $Tools->count_subnets ("IPv6"); ?></td>
 	</tr>
 
 	<!-- All users - only for admin! -->
 	<tr>
-		<td class="title"><?php print _('Number of users'); ?></td>
+		<td class="title"><?php print _ ('Number of users'); ?></td>
 		<td><?php print $Database->numObjects ("users"); ?></td>
 	</tr>
 

app/dashboard/widgets/favourite_subnets.php

Indentation +70 added lines, -70 removed lines

@@ -1,13 +1,13 @@ 
 <?php
 # required functions
 if(!isset($User)) {
-	require( dirname(__FILE__) . '/../../../functions/functions.php' );
-	# classes
-	$Database	= new Database_PDO;
-	$User 		= new User ($Database);
-	$Tools 		= new Tools ($Database);
-	$Subnets 	= new Subnets ($Database);
-	$Addresses 	= new Addresses ($Database);
+    require( dirname(__FILE__) . '/../../../functions/functions.php' );
+    # classes
+    $Database	= new Database_PDO;
+    $User 		= new User ($Database);
+    $Tools 		= new Tools ($Database);
+    $Subnets 	= new Subnets ($Database);
+    $Addresses 	= new Addresses ($Database);
 }
 
 # user must be authenticated
@@ -15,7 +15,7 @@ 
 
 # if direct request that redirect to tools page
 if($_SERVER['HTTP_X_REQUESTED_WITH']!="XMLHttpRequest")	{
-	header("Location: ".create_link("tools","favourites"));
+    header("Location: ".create_link("tools","favourites"));
 }
 ?>
 
@@ -33,76 +33,76 @@ 
 
 # print if none
 if(!$fsubnets) {
-	print "<blockquote style='margin-top:20px;margin-left:20px;'>";
-	print "<p>"._("No favourite subnets selected")."</p><br>";
-	print "<small>"._("You can add subnets to favourites by clicking star icon in subnet details")."!</small><br>";
-	print "</blockquote>";
+    print "<blockquote style='margin-top:20px;margin-left:20px;'>";
+    print "<p>"._("No favourite subnets selected")."</p><br>";
+    print "<small>"._("You can add subnets to favourites by clicking star icon in subnet details")."!</small><br>";
+    print "</blockquote>";
 }
 else {
-	print "<table class='table table-condensed table-hover table-top favs'>";
+    print "<table class='table table-condensed table-hover table-top favs'>";
 
-	# headers
-	print "<tr>";
-	print "	<th>"._('Object')."</th>";
-	print "	<th>"._('Description')."</th>";
-	print "	<th>"._('Section')."</th>";
-	print "	<th>"._('VLAN')."</th>";
-	print "	<th></th>";
-	print "</tr>";
+    # headers
+    print "<tr>";
+    print "	<th>"._('Object')."</th>";
+    print "	<th>"._('Description')."</th>";
+    print "	<th>"._('Section')."</th>";
+    print "	<th>"._('VLAN')."</th>";
+    print "	<th></th>";
+    print "</tr>";
 
-	# subnets
-	foreach($fsubnets as $f) {
+    # subnets
+    foreach($fsubnets as $f) {
 
-		# must be either subnet or folder
-		if(sizeof($f)>0) {
+        # must be either subnet or folder
+        if(sizeof($f)>0) {
 
             # add full information
             $fullinfo = $f['isFull']==1 ? " <span class='badge badge1 badge2 badge4'>"._("Full")."</span>" : "";
 
-			print "<tr class='favSubnet-$f[subnetId]'>";
-
-			if($f['isFolder']==1) {
-				$master = true;
-				print "	<td><a href='".create_link("folder",$f['sectionId'],$f['subnetId'])."'><i class='fa fa-sfolder fa-folder'></i> $f[description]</a></td>";
-			}
-			else {
-				//master?
-				if($Subnets->has_slaves ($f['subnetId'])) { $master = true;	 print "	<td><a href='".create_link("subnets",$f['sectionId'],$f['subnetId'])."'><i class='fa fa-sfolder fa-folder-o'></i>".$Subnets->transform_to_dotted($f['subnet'])."/$f[mask]</a> $fullinfo</td>"; }
-				else 									  { $master = false; print "	<td><a href='".create_link("subnets",$f['sectionId'],$f['subnetId'])."'><i class='fa fa-sfolder fa-sitemap' ></i>".$Subnets->transform_to_dotted($f['subnet'])."/$f[mask]</a> $fullinfo</td>"; }
-			}
-			print "	<td>$f[description]</td>";
-			print "	<td><a href='".create_link("subnets",$f['sectionId'])."'>$f[section]</a></td>";
-
-			# get vlan info
-			if(strlen($f['vlanId'])>0 && $f['vlanId']!=0) {
-				$vlan = $Tools->fetch_object("vlans", "vlanId", $f['vlanId']);
-				print "	<td>$vlan->number</td>";
-			} else {
-				print "	<td>/</td>";
-			}
-
-			# usage
-			if(!$master) {
-	    		$address_count = $Addresses->count_subnet_addresses ($f['subnetId']);
-	    		$subnet_usage = $Subnets->calculate_subnet_usage (gmp_strval($address_count), $f['mask'], $f['subnet'], $f['isFull']);
-	    	}
-
-			# add address
-			if($master===true || $f['isFolder']==1 || $Subnets->reformat_number($subnet_usage['freehosts'])=="0") 	{ $disabled = "disabled"; }
-			else																									{ $disabled = ""; }
-
-			# remove
-			print "	<td class='actions'>";
-			print "	<div class='btn-group'>";
-			print "	<a class='btn btn-xs btn-default modIPaddr btn-success $disabled' href='' data-container='body' rel='tooltip' title='"._('Add new IP address')."' data-subnetId='$f[subnetId]' data-action='add' data-id=''><i class='fa fa-plus'></i></a>";
-			print "	<a class='btn btn-xs btn-default editFavourite' data-subnetId='$f[subnetId]' data-action='remove' data-from='widget'><i class='fa fa-star favourite-$f[subnetId]' rel='tooltip' title='"._('Click to remove from favourites')."'></i></a>";
-			print "	</div>";
-			print " </td>";
-
-			print "</tr>";
-		}
-	}
-
-	print "</table>";
+            print "<tr class='favSubnet-$f[subnetId]'>";
+
+            if($f['isFolder']==1) {
+                $master = true;
+                print "	<td><a href='".create_link("folder",$f['sectionId'],$f['subnetId'])."'><i class='fa fa-sfolder fa-folder'></i> $f[description]</a></td>";
+            }
+            else {
+                //master?
+                if($Subnets->has_slaves ($f['subnetId'])) { $master = true;	 print "	<td><a href='".create_link("subnets",$f['sectionId'],$f['subnetId'])."'><i class='fa fa-sfolder fa-folder-o'></i>".$Subnets->transform_to_dotted($f['subnet'])."/$f[mask]</a> $fullinfo</td>"; }
+                else 									  { $master = false; print "	<td><a href='".create_link("subnets",$f['sectionId'],$f['subnetId'])."'><i class='fa fa-sfolder fa-sitemap' ></i>".$Subnets->transform_to_dotted($f['subnet'])."/$f[mask]</a> $fullinfo</td>"; }
+            }
+            print "	<td>$f[description]</td>";
+            print "	<td><a href='".create_link("subnets",$f['sectionId'])."'>$f[section]</a></td>";
+
+            # get vlan info
+            if(strlen($f['vlanId'])>0 && $f['vlanId']!=0) {
+                $vlan = $Tools->fetch_object("vlans", "vlanId", $f['vlanId']);
+                print "	<td>$vlan->number</td>";
+            } else {
+                print "	<td>/</td>";
+            }
+
+            # usage
+            if(!$master) {
+                $address_count = $Addresses->count_subnet_addresses ($f['subnetId']);
+                $subnet_usage = $Subnets->calculate_subnet_usage (gmp_strval($address_count), $f['mask'], $f['subnet'], $f['isFull']);
+            }
+
+            # add address
+            if($master===true || $f['isFolder']==1 || $Subnets->reformat_number($subnet_usage['freehosts'])=="0") 	{ $disabled = "disabled"; }
+            else																									{ $disabled = ""; }
+
+            # remove
+            print "	<td class='actions'>";
+            print "	<div class='btn-group'>";
+            print "	<a class='btn btn-xs btn-default modIPaddr btn-success $disabled' href='' data-container='body' rel='tooltip' title='"._('Add new IP address')."' data-subnetId='$f[subnetId]' data-action='add' data-id=''><i class='fa fa-plus'></i></a>";
+            print "	<a class='btn btn-xs btn-default editFavourite' data-subnetId='$f[subnetId]' data-action='remove' data-from='widget'><i class='fa fa-star favourite-$f[subnetId]' rel='tooltip' title='"._('Click to remove from favourites')."'></i></a>";
+            print "	</div>";
+            print " </td>";
+
+            print "</tr>";
+        }
+    }
+
+    print "</table>";
 }
 ?>
\ No newline at end of file

Braces +3 added lines, -2 removed lines

@@ -14,7 +14,7 @@ 
 $User->check_user_session ();
 
 # if direct request that redirect to tools page
-if($_SERVER['HTTP_X_REQUESTED_WITH']!="XMLHttpRequest")	{
+if($_SERVER['HTTP_X_REQUESTED_WITH']!="XMLHttpRequest") {
 	header("Location: ".create_link("tools","favourites"));
 }
 ?>
@@ -77,7 +77,8 @@ 
 			if(strlen($f['vlanId'])>0 && $f['vlanId']!=0) {
 				$vlan = $Tools->fetch_object("vlans", "vlanId", $f['vlanId']);
 				print "	<td>$vlan->number</td>";
-			} else {
+			}
+			else {
 				print "	<td>/</td>";
 			}
 

Spacing +30 added lines, -30 removed lines

@@ -1,21 +1,21 @@ 
 <?php
 # required functions
-if(!isset($User)) {
-	require( dirname(__FILE__) . '/../../../functions/functions.php' );
+if (!isset($User)) {
+	require(dirname (__FILE__).'/../../../functions/functions.php');
 	# classes
 	$Database	= new Database_PDO;
-	$User 		= new User ($Database);
-	$Tools 		= new Tools ($Database);
+	$User = new User ($Database);
+	$Tools = new Tools ($Database);
 	$Subnets 	= new Subnets ($Database);
-	$Addresses 	= new Addresses ($Database);
+	$Addresses = new Addresses ($Database);
 }
 
 # user must be authenticated
 $User->check_user_session ();
 
 # if direct request that redirect to tools page
-if($_SERVER['HTTP_X_REQUESTED_WITH']!="XMLHttpRequest")	{
-	header("Location: ".create_link("tools","favourites"));
+if ($_SERVER['HTTP_X_REQUESTED_WITH'] != "XMLHttpRequest") {
+	header ("Location: ".create_link ("tools", "favourites"));
 }
 ?>
 
@@ -32,10 +32,10 @@ 
 $fsubnets = $User->fetch_favourite_subnets ();
 
 # print if none
-if(!$fsubnets) {
+if (!$fsubnets) {
 	print "<blockquote style='margin-top:20px;margin-left:20px;'>";
-	print "<p>"._("No favourite subnets selected")."</p><br>";
-	print "<small>"._("You can add subnets to favourites by clicking star icon in subnet details")."!</small><br>";
+	print "<p>"._ ("No favourite subnets selected")."</p><br>";
+	print "<small>"._ ("You can add subnets to favourites by clicking star icon in subnet details")."!</small><br>";
 	print "</blockquote>";
 }
 else {
@@ -43,59 +43,59 @@ 
 
 	# headers
 	print "<tr>";
-	print "	<th>"._('Object')."</th>";
-	print "	<th>"._('Description')."</th>";
-	print "	<th>"._('Section')."</th>";
-	print "	<th>"._('VLAN')."</th>";
+	print "	<th>"._ ('Object')."</th>";
+	print "	<th>"._ ('Description')."</th>";
+	print "	<th>"._ ('Section')."</th>";
+	print "	<th>"._ ('VLAN')."</th>";
 	print "	<th></th>";
 	print "</tr>";
 
 	# subnets
-	foreach($fsubnets as $f) {
+	foreach ($fsubnets as $f) {
 
 		# must be either subnet or folder
-		if(sizeof($f)>0) {
+		if (sizeof ($f) > 0) {
 
             # add full information
-            $fullinfo = $f['isFull']==1 ? " <span class='badge badge1 badge2 badge4'>"._("Full")."</span>" : "";
+            $fullinfo = $f['isFull'] == 1 ? " <span class='badge badge1 badge2 badge4'>"._ ("Full")."</span>" : "";
 
 			print "<tr class='favSubnet-$f[subnetId]'>";
 
-			if($f['isFolder']==1) {
+			if ($f['isFolder'] == 1) {
 				$master = true;
-				print "	<td><a href='".create_link("folder",$f['sectionId'],$f['subnetId'])."'><i class='fa fa-sfolder fa-folder'></i> $f[description]</a></td>";
+				print "	<td><a href='".create_link ("folder", $f['sectionId'], $f['subnetId'])."'><i class='fa fa-sfolder fa-folder'></i> $f[description]</a></td>";
 			}
 			else {
 				//master?
-				if($Subnets->has_slaves ($f['subnetId'])) { $master = true;	 print "	<td><a href='".create_link("subnets",$f['sectionId'],$f['subnetId'])."'><i class='fa fa-sfolder fa-folder-o'></i>".$Subnets->transform_to_dotted($f['subnet'])."/$f[mask]</a> $fullinfo</td>"; }
-				else 									  { $master = false; print "	<td><a href='".create_link("subnets",$f['sectionId'],$f['subnetId'])."'><i class='fa fa-sfolder fa-sitemap' ></i>".$Subnets->transform_to_dotted($f['subnet'])."/$f[mask]</a> $fullinfo</td>"; }
+				if ($Subnets->has_slaves ($f['subnetId'])) { $master = true; print "	<td><a href='".create_link ("subnets", $f['sectionId'], $f['subnetId'])."'><i class='fa fa-sfolder fa-folder-o'></i>".$Subnets->transform_to_dotted ($f['subnet'])."/$f[mask]</a> $fullinfo</td>"; }
+				else { $master = false; print "	<td><a href='".create_link ("subnets", $f['sectionId'], $f['subnetId'])."'><i class='fa fa-sfolder fa-sitemap' ></i>".$Subnets->transform_to_dotted ($f['subnet'])."/$f[mask]</a> $fullinfo</td>"; }
 			}
 			print "	<td>$f[description]</td>";
-			print "	<td><a href='".create_link("subnets",$f['sectionId'])."'>$f[section]</a></td>";
+			print "	<td><a href='".create_link ("subnets", $f['sectionId'])."'>$f[section]</a></td>";
 
 			# get vlan info
-			if(strlen($f['vlanId'])>0 && $f['vlanId']!=0) {
-				$vlan = $Tools->fetch_object("vlans", "vlanId", $f['vlanId']);
+			if (strlen ($f['vlanId']) > 0 && $f['vlanId'] != 0) {
+				$vlan = $Tools->fetch_object ("vlans", "vlanId", $f['vlanId']);
 				print "	<td>$vlan->number</td>";
 			} else {
 				print "	<td>/</td>";
 			}
 
 			# usage
-			if(!$master) {
+			if (!$master) {
 	    		$address_count = $Addresses->count_subnet_addresses ($f['subnetId']);
-	    		$subnet_usage = $Subnets->calculate_subnet_usage (gmp_strval($address_count), $f['mask'], $f['subnet'], $f['isFull']);
+	    		$subnet_usage = $Subnets->calculate_subnet_usage (gmp_strval ($address_count), $f['mask'], $f['subnet'], $f['isFull']);
 	    	}
 
 			# add address
-			if($master===true || $f['isFolder']==1 || $Subnets->reformat_number($subnet_usage['freehosts'])=="0") 	{ $disabled = "disabled"; }
-			else																									{ $disabled = ""; }
+			if ($master === true || $f['isFolder'] == 1 || $Subnets->reformat_number ($subnet_usage['freehosts']) == "0") { $disabled = "disabled"; }
+			else { $disabled = ""; }
 
 			# remove
 			print "	<td class='actions'>";
 			print "	<div class='btn-group'>";
-			print "	<a class='btn btn-xs btn-default modIPaddr btn-success $disabled' href='' data-container='body' rel='tooltip' title='"._('Add new IP address')."' data-subnetId='$f[subnetId]' data-action='add' data-id=''><i class='fa fa-plus'></i></a>";
-			print "	<a class='btn btn-xs btn-default editFavourite' data-subnetId='$f[subnetId]' data-action='remove' data-from='widget'><i class='fa fa-star favourite-$f[subnetId]' rel='tooltip' title='"._('Click to remove from favourites')."'></i></a>";
+			print "	<a class='btn btn-xs btn-default modIPaddr btn-success $disabled' href='' data-container='body' rel='tooltip' title='"._ ('Add new IP address')."' data-subnetId='$f[subnetId]' data-action='add' data-id=''><i class='fa fa-plus'></i></a>";
+			print "	<a class='btn btn-xs btn-default editFavourite' data-subnetId='$f[subnetId]' data-action='remove' data-from='widget'><i class='fa fa-star favourite-$f[subnetId]' rel='tooltip' title='"._ ('Click to remove from favourites')."'></i></a>";
 			print "	</div>";
 			print " </td>";
 

app/dashboard/widgets/top10_percentage.php

Braces +3 added lines, -2 removed lines

@@ -22,7 +22,7 @@ 
 $slimit = 10;
 
 # if direct request include plot JS
-if($_SERVER['HTTP_X_REQUESTED_WITH']!="XMLHttpRequest")	{
+if($_SERVER['HTTP_X_REQUESTED_WITH']!="XMLHttpRequest") {
 	# get widget details
 	if(!$widget = $Tools->fetch_widget ("wfile", $_REQUEST['section'])) { $Result->show("danger", _("Invalid widget"), true); }
 	# reset size and limit
@@ -221,7 +221,8 @@ 
 	if($m!=0) {
 	?>
     $.plot($("#<?php print $type; ?>top10"), [ data ], options);
-    <?php } else { ?>
+    <?php }
+else { ?>
     $("#IPv4top10").hide();
     <?php } ?>
 });

Indentation +69 added lines, -69 removed lines

@@ -5,13 +5,13 @@ 
 
 # required functions
 if(!is_object(@$User)) {
-	require( dirname(__FILE__) . '/../../../functions/functions.php' );
-	# classes
-	$Database	= new Database_PDO;
-	$User 		= new User ($Database);
-	$Tools 		= new Tools ($Database);
-	$Subnets 	= new Subnets ($Database);
-	$Result		= new Result ();
+    require( dirname(__FILE__) . '/../../../functions/functions.php' );
+    # classes
+    $Database	= new Database_PDO;
+    $User 		= new User ($Database);
+    $Tools 		= new Tools ($Database);
+    $Subnets 	= new Subnets ($Database);
+    $Result		= new Result ();
 }
 
 # user must be authenticated
@@ -23,19 +23,19 @@ 
 
 # if direct request include plot JS
 if($_SERVER['HTTP_X_REQUESTED_WITH']!="XMLHttpRequest")	{
-	# get widget details
-	if(!$widget = $Tools->fetch_object ("widgets", "wfile", $_REQUEST['section'])) { $Result->show("danger", _("Invalid widget"), true); }
-	# reset size and limit
-	$height = 350;
-	$slimit = 20;
-	# include flot JS
-	print '<script language="javascript" type="text/javascript" src="js/1.2/flot/jquery.flot.js"></script>';
-	print '<script language="javascript" type="text/javascript" src="js/1.2/flot/jquery.flot.categories.js"></script>';
-	print '<!--[if lte IE 8]><script language="javascript" type="text/javascript" src="js/1.2/flot/excanvas.min.js"></script><![endif]-->';
-	# and print title
-	print "<div class='container'>";
-	print "<h4 style='margin-top:40px;'>$widget->wtitle</h4><hr>";
-	print "</div>";
+    # get widget details
+    if(!$widget = $Tools->fetch_object ("widgets", "wfile", $_REQUEST['section'])) { $Result->show("danger", _("Invalid widget"), true); }
+    # reset size and limit
+    $height = 350;
+    $slimit = 20;
+    # include flot JS
+    print '<script language="javascript" type="text/javascript" src="js/1.2/flot/jquery.flot.js"></script>';
+    print '<script language="javascript" type="text/javascript" src="js/1.2/flot/jquery.flot.categories.js"></script>';
+    print '<!--[if lte IE 8]><script language="javascript" type="text/javascript" src="js/1.2/flot/excanvas.min.js"></script><![endif]-->';
+    # and print title
+    print "<div class='container'>";
+    print "<h4 style='margin-top:40px;'>$widget->wtitle</h4><hr>";
+    print "</div>";
 }
 
 $type = "IPv4";
@@ -48,15 +48,15 @@ 
 $numbering = array();
 $m = 0;
 foreach($top_subnets as $subnet) {
-	# cast
-	$subnet = (array) $subnet;
-	# check if already in array
-	if(in_array($subnet['description'], $unique)) {
-		$numbering[$subnet['description']]++;
-		$top_subnets[$m]->description = $subnet['description'].' #'.$numbering[$subnet['description']];
-	}
-	$unique[] = $top_subnets[$m]->description;
-	$m++;
+    # cast
+    $subnet = (array) $subnet;
+    # check if already in array
+    if(in_array($subnet['description'], $unique)) {
+        $numbering[$subnet['description']]++;
+        $top_subnets[$m]->description = $subnet['description'].' #'.$numbering[$subnet['description']];
+    }
+    $unique[] = $top_subnets[$m]->description;
+    $m++;
 }
 
 # set maximum for graph
@@ -70,34 +70,34 @@ 
 
     var data = [
     <?php
-	$m=0;
-	foreach ($top_subnets as $subnet) {
-		# cast
-		$subnet = (array) $subnet;
-		if($m < $slimit) {
-			# verify user access
-			$sp = $Subnets->check_permission($User->user, $subnet['id']);
-			if($sp != 0) {
-				$subnet['subnet'] = $Subnets->transform_to_dotted($subnet['subnet']);
-				$subnet['descriptionLong'] = $subnet['description'];
+    $m=0;
+    foreach ($top_subnets as $subnet) {
+        # cast
+        $subnet = (array) $subnet;
+        if($m < $slimit) {
+            # verify user access
+            $sp = $Subnets->check_permission($User->user, $subnet['id']);
+            if($sp != 0) {
+                $subnet['subnet'] = $Subnets->transform_to_dotted($subnet['subnet']);
+                $subnet['descriptionLong'] = $subnet['description'];
 
-				# set percentage because of localisation
-				$subnet['percentage'] = str_replace(",", ".", $subnet['percentage']);
-				$subnet['percentage'] = $subnet['percentage'];
+                # set percentage because of localisation
+                $subnet['percentage'] = str_replace(",", ".", $subnet['percentage']);
+                $subnet['percentage'] = $subnet['percentage'];
 
-				# odd/even if more than 5 items
-				if(sizeof($top_subnets) > 5) {
-					if ($m&1) 	{ print "['|<br>" . addslashes($subnet['description']) . "', $subnet[percentage], '" . addslashes($subnet['descriptionLong']) . " ($subnet[subnet]/$subnet[mask])'],";	}
-					else	 	{ print "['" . addslashes($subnet['description']) . "', $subnet[percentage], '" . addslashes($subnet['descriptionLong']) . " ($subnet[subnet]/$subnet[mask])'],";	}
-				}
-				else {
-								{ print "['" . addslashes($subnet['description']) . "', $subnet[percentage], '" . addslashes($subnet['descriptionLong']) . " ($subnet[subnet]/$subnet[mask])'],";	}
-				}
-				$m++;
-			}
-		}
-	}
-	?>
+                # odd/even if more than 5 items
+                if(sizeof($top_subnets) > 5) {
+                    if ($m&1) 	{ print "['|<br>" . addslashes($subnet['description']) . "', $subnet[percentage], '" . addslashes($subnet['descriptionLong']) . " ($subnet[subnet]/$subnet[mask])'],";	}
+                    else	 	{ print "['" . addslashes($subnet['description']) . "', $subnet[percentage], '" . addslashes($subnet['descriptionLong']) . " ($subnet[subnet]/$subnet[mask])'],";	}
+                }
+                else {
+                                { print "['" . addslashes($subnet['description']) . "', $subnet[percentage], '" . addslashes($subnet['descriptionLong']) . " ($subnet[subnet]/$subnet[mask])'],";	}
+                }
+                $m++;
+            }
+        }
+    }
+    ?>
 	];
 
 	//show tooltips
@@ -217,8 +217,8 @@ 
     };
 
 	<?php
-	if($m!=0) {
-	?>
+    if($m!=0) {
+    ?>
     $.plot($("#<?php print $type; ?>top10"), [ data ], options);
     <?php } else { ?>
     $("#IPv4top10").hide();
@@ -228,26 +228,26 @@ 
 
 <?php
 if($m==0) {
-	print "<hr>";
+    print "<hr>";
 
-	print "<blockquote style='margin-top:20px;margin-left:20px;'>";
-	print "<p>"._("No $type hosts configured")."</p>";
-	print "<small>"._("Add some hosts to subnets to show graph of used hosts per subnet")."</small>";
-	print "</blockquote>";
+    print "<blockquote style='margin-top:20px;margin-left:20px;'>";
+    print "<p>"._("No $type hosts configured")."</p>";
+    print "<small>"._("Add some hosts to subnets to show graph of used hosts per subnet")."</small>";
+    print "</blockquote>";
 }
 ?>
 
 <?php
 }
 else {
-	print "<hr>";
-	print "<blockquote style='margin-top:20px;margin-left:20px;'>";
-	print "<p>"._("No $type hosts configured")."</p>";
-	print "<small>"._("Add some hosts to subnets to calculate usage percentage")."</small>";
-	print "</blockquote>";
+    print "<hr>";
+    print "<blockquote style='margin-top:20px;margin-left:20px;'>";
+    print "<p>"._("No $type hosts configured")."</p>";
+    print "<small>"._("Add some hosts to subnets to calculate usage percentage")."</small>";
+    print "</blockquote>";
 
-	#remove loading
-	?>
+    #remove loading
+    ?>
 	<script type="text/javascript">
 	$(document).ready(function() {
 		$("#IPv4top10").fadeOut('fast');

Spacing +31 added lines, -31 removed lines

@@ -4,11 +4,11 @@ 
  **********************************************/
 
 # required functions
-if(!is_object(@$User)) {
-	require( dirname(__FILE__) . '/../../../functions/functions.php' );
+if (!is_object (@$User)) {
+	require(dirname (__FILE__).'/../../../functions/functions.php');
 	# classes
 	$Database	= new Database_PDO;
-	$User 		= new User ($Database);
+	$User = new User ($Database);
 	$Tools 		= new Tools ($Database);
 	$Subnets 	= new Subnets ($Database);
 	$Result		= new Result ();
@@ -22,9 +22,9 @@ 
 $slimit = 10;
 
 # if direct request include plot JS
-if($_SERVER['HTTP_X_REQUESTED_WITH']!="XMLHttpRequest")	{
+if ($_SERVER['HTTP_X_REQUESTED_WITH'] != "XMLHttpRequest") {
 	# get widget details
-	if(!$widget = $Tools->fetch_object ("widgets", "wfile", $_REQUEST['section'])) { $Result->show("danger", _("Invalid widget"), true); }
+	if (!$widget = $Tools->fetch_object ("widgets", "wfile", $_REQUEST['section'])) { $Result->show ("danger", _ ("Invalid widget"), true); }
 	# reset size and limit
 	$height = 350;
 	$slimit = 20;
@@ -41,17 +41,17 @@ 
 $type = "IPv4";
 
 # get subnets statistic
-$top_subnets = $Tools->fetch_top_subnets($type, 1000000, true);
+$top_subnets = $Tools->fetch_top_subnets ($type, 1000000, true);
 
 /* detect duplicates */
-$unique = array();
-$numbering = array();
+$unique = array ();
+$numbering = array ();
 $m = 0;
-foreach($top_subnets as $subnet) {
+foreach ($top_subnets as $subnet) {
 	# cast
 	$subnet = (array) $subnet;
 	# check if already in array
-	if(in_array($subnet['description'], $unique)) {
+	if (in_array ($subnet['description'], $unique)) {
 		$numbering[$subnet['description']]++;
 		$top_subnets[$m]->description = $subnet['description'].' #'.$numbering[$subnet['description']];
 	}
@@ -60,38 +60,38 @@ 
 }
 
 # set maximum for graph
-$max = str_replace(",", ".", $top_subnets[0]->percentage);
+$max = str_replace (",", ".", $top_subnets[0]->percentage);
 
 # only print if some hosts exist
-if(sizeof($top_subnets)>0) {
+if (sizeof ($top_subnets) > 0) {
 ?>
 <script type="text/javascript">
 $(function () {
 
     var data = [
     <?php
-	$m=0;
+	$m = 0;
 	foreach ($top_subnets as $subnet) {
 		# cast
 		$subnet = (array) $subnet;
-		if($m < $slimit) {
+		if ($m < $slimit) {
 			# verify user access
-			$sp = $Subnets->check_permission($User->user, $subnet['id']);
-			if($sp != 0) {
-				$subnet['subnet'] = $Subnets->transform_to_dotted($subnet['subnet']);
+			$sp = $Subnets->check_permission ($User->user, $subnet['id']);
+			if ($sp != 0) {
+				$subnet['subnet'] = $Subnets->transform_to_dotted ($subnet['subnet']);
 				$subnet['descriptionLong'] = $subnet['description'];
 
 				# set percentage because of localisation
-				$subnet['percentage'] = str_replace(",", ".", $subnet['percentage']);
+				$subnet['percentage'] = str_replace (",", ".", $subnet['percentage']);
 				$subnet['percentage'] = $subnet['percentage'];
 
 				# odd/even if more than 5 items
-				if(sizeof($top_subnets) > 5) {
-					if ($m&1) 	{ print "['|<br>" . addslashes($subnet['description']) . "', $subnet[percentage], '" . addslashes($subnet['descriptionLong']) . " ($subnet[subnet]/$subnet[mask])'],";	}
-					else	 	{ print "['" . addslashes($subnet['description']) . "', $subnet[percentage], '" . addslashes($subnet['descriptionLong']) . " ($subnet[subnet]/$subnet[mask])'],";	}
+				if (sizeof ($top_subnets) > 5) {
+					if ($m & 1) { print "['|<br>".addslashes ($subnet['description'])."', $subnet[percentage], '".addslashes ($subnet['descriptionLong'])." ($subnet[subnet]/$subnet[mask])'],"; }
+					else { print "['".addslashes ($subnet['description'])."', $subnet[percentage], '".addslashes ($subnet['descriptionLong'])." ($subnet[subnet]/$subnet[mask])'],"; }
 				}
 				else {
-								{ print "['" . addslashes($subnet['description']) . "', $subnet[percentage], '" . addslashes($subnet['descriptionLong']) . " ($subnet[subnet]/$subnet[mask])'],";	}
+								{ print "['".addslashes ($subnet['description'])."', $subnet[percentage], '".addslashes ($subnet['descriptionLong'])." ($subnet[subnet]/$subnet[mask])'],"; }
 				}
 				$m++;
 			}
@@ -118,8 +118,8 @@ 
 
     //set JS array for clickable event
     <?php
-    $allLinks = json_encode($top_subnets);
-    echo "var all_links = ". $allLinks. ";\n";
+    $allLinks = json_encode ($top_subnets);
+    echo "var all_links = ".$allLinks.";\n";
     ?>
 
 	//open link
@@ -217,7 +217,7 @@ 
     };
 
 	<?php
-	if($m!=0) {
+	if ($m != 0) {
 	?>
     $.plot($("#<?php print $type; ?>top10"), [ data ], options);
     <?php } else { ?>
@@ -227,12 +227,12 @@ 
 </script>
 
 <?php
-if($m==0) {
+if ($m == 0) {
 	print "<hr>";
 
 	print "<blockquote style='margin-top:20px;margin-left:20px;'>";
-	print "<p>"._("No $type hosts configured")."</p>";
-	print "<small>"._("Add some hosts to subnets to show graph of used hosts per subnet")."</small>";
+	print "<p>"._ ("No $type hosts configured")."</p>";
+	print "<small>"._ ("Add some hosts to subnets to show graph of used hosts per subnet")."</small>";
 	print "</blockquote>";
 }
 ?>
@@ -242,8 +242,8 @@ 
 else {
 	print "<hr>";
 	print "<blockquote style='margin-top:20px;margin-left:20px;'>";
-	print "<p>"._("No $type hosts configured")."</p>";
-	print "<small>"._("Add some hosts to subnets to calculate usage percentage")."</small>";
+	print "<p>"._ ("No $type hosts configured")."</p>";
+	print "<small>"._ ("Add some hosts to subnets to calculate usage percentage")."</small>";
 	print "</blockquote>";
 
 	#remove loading
@@ -259,5 +259,5 @@ 
 
 
 <div id="IPv4top10" class="top10"  style="height:<?php print $height; ?>px;width:95%;margin-left:3%;">
-	<div style="text-align:center;padding-top:50px;"><strong><?php print _('Loading statistics'); ?></strong><br><i class='fa fa-spinner fa-spin'></i></div>
+	<div style="text-align:center;padding-top:50px;"><strong><?php print _ ('Loading statistics'); ?></strong><br><i class='fa fa-spinner fa-spin'></i></div>
 </div>

app/dashboard/widgets/requests.php

Indentation +24 added lines, -24 removed lines

@@ -2,12 +2,12 @@ 
 
 # required functions
 if(!is_object(@$User)) {
-	require( dirname(__FILE__) . '/../../../functions/functions.php' );
-	# classes
-	$Database	= new Database_PDO;
-	$User 		= new User ($Database);
-	$Tools 		= new Tools ($Database);
-	$Subnets 	= new Subnets ($Database);
+    require( dirname(__FILE__) . '/../../../functions/functions.php' );
+    # classes
+    $Database	= new Database_PDO;
+    $User 		= new User ($Database);
+    $Tools 		= new Tools ($Database);
+    $Subnets 	= new Subnets ($Database);
 }
 
 # user must be authenticated
@@ -15,7 +15,7 @@ 
 
 # if direct request that redirect to tools page
 if($_SERVER['HTTP_X_REQUESTED_WITH']!="XMLHttpRequest")	{
-	header("Location: ".create_link("administration","requests"));
+    header("Location: ".create_link("administration","requests"));
 }
 
 # fetch all requests
@@ -26,9 +26,9 @@ 
 
 <?php
 if(!$requests) {
-	print "<blockquote style='margin-top:20px;margin-left:20px;'>";
-	print "<small>"._("No IP address requests available")."!</small><br>";
-	print "</blockquote>";
+    print "<blockquote style='margin-top:20px;margin-left:20px;'>";
+    print "<small>"._("No IP address requests available")."!</small><br>";
+    print "</blockquote>";
 }
 # print
 else {
@@ -46,21 +46,21 @@ 
 </tr>
 
 <?php
-	# print requests
-	foreach($requests as $request) {
-		# cast
-		$request = (array) $request;
-		# get subnet details
-		$subnet = $Subnets->fetch_subnet ("id", $request['subnetId']);
+    # print requests
+    foreach($requests as $request) {
+        # cast
+        $request = (array) $request;
+        # get subnet details
+        $subnet = $Subnets->fetch_subnet ("id", $request['subnetId']);
 
-		print '<tr>'. "\n";
-		print "	<td><button class='btn btn-xs btn-default' data-requestid='$request[id]'><i class='fa fa-pencil'></i></button></td>";
-		print '	<td>'. $subnet->ip .'/'. $subnet->mask .' ('. $subnet->description .')</td>'. "\n";
-		print '	<td>'. $request['dns_name'] .'</td>'. "\n";
-		print '	<td>'. $request['description'] .'</td>'. "\n";
-		print '	<td>'. $request['requester'] .'</td>'. "\n";
-		print '</tr>'. "\n";
-	}
+        print '<tr>'. "\n";
+        print "	<td><button class='btn btn-xs btn-default' data-requestid='$request[id]'><i class='fa fa-pencil'></i></button></td>";
+        print '	<td>'. $subnet->ip .'/'. $subnet->mask .' ('. $subnet->description .')</td>'. "\n";
+        print '	<td>'. $request['dns_name'] .'</td>'. "\n";
+        print '	<td>'. $request['description'] .'</td>'. "\n";
+        print '	<td>'. $request['requester'] .'</td>'. "\n";
+        print '</tr>'. "\n";
+    }
 ?>
 
 </table>

Braces +1 added lines, -1 removed lines

@@ -15,7 +15,7 @@
 $User->check_user_session ();
 
 # if direct request that redirect to tools page
-if($_SERVER['HTTP_X_REQUESTED_WITH']!="XMLHttpRequest")	{
+if($_SERVER['HTTP_X_REQUESTED_WITH']!="XMLHttpRequest") {
 	header("Location: ".create_link("tools","logs"));
 }
 

Spacing +19 added lines, -19 removed lines

@@ -1,12 +1,12 @@ 
 <?php
 
 # required functions
-if(!is_object(@$User)) {
-	require( dirname(__FILE__) . '/../../../functions/functions.php' );
+if (!is_object (@$User)) {
+	require(dirname (__FILE__).'/../../../functions/functions.php');
 	# classes
 	$Database	= new Database_PDO;
-	$User 		= new User ($Database);
-	$Tools 		= new Tools ($Database);
+	$User = new User ($Database);
+	$Tools = new Tools ($Database);
 	$Subnets 	= new Subnets ($Database);
 }
 
@@ -14,8 +14,8 @@ 
 $User->check_user_session ();
 
 # if direct request that redirect to tools page
-if($_SERVER['HTTP_X_REQUESTED_WITH']!="XMLHttpRequest")	{
-	header("Location: ".create_link("administration","requests"));
+if ($_SERVER['HTTP_X_REQUESTED_WITH'] != "XMLHttpRequest") {
+	header ("Location: ".create_link ("administration", "requests"));
 }
 
 # fetch all requests
@@ -25,9 +25,9 @@ 
 
 
 <?php
-if(!$requests) {
+if (!$requests) {
 	print "<blockquote style='margin-top:20px;margin-left:20px;'>";
-	print "<small>"._("No IP address requests available")."!</small><br>";
+	print "<small>"._ ("No IP address requests available")."!</small><br>";
 	print "</blockquote>";
 }
 # print
@@ -39,27 +39,27 @@ 
 <!-- headers -->
 <tr>
 	<th></th>
-	<th><?php print _('Subnet'); ?></th>
-	<th><?php print _('Hostname'); ?></th>
-	<th><?php print _('Description'); ?></th>
-	<th><?php print _('Requested by'); ?></th>
+	<th><?php print _ ('Subnet'); ?></th>
+	<th><?php print _ ('Hostname'); ?></th>
+	<th><?php print _ ('Description'); ?></th>
+	<th><?php print _ ('Requested by'); ?></th>
 </tr>
 
 <?php
 	# print requests
-	foreach($requests as $request) {
+	foreach ($requests as $request) {
 		# cast
 		$request = (array) $request;
 		# get subnet details
 		$subnet = $Subnets->fetch_subnet ("id", $request['subnetId']);
 
-		print '<tr>'. "\n";
+		print '<tr>'."\n";
 		print "	<td><button class='btn btn-xs btn-default' data-requestid='$request[id]'><i class='fa fa-pencil'></i></button></td>";
-		print '	<td>'. $subnet->ip .'/'. $subnet->mask .' ('. $subnet->description .')</td>'. "\n";
-		print '	<td>'. $request['dns_name'] .'</td>'. "\n";
-		print '	<td>'. $request['description'] .'</td>'. "\n";
-		print '	<td>'. $request['requester'] .'</td>'. "\n";
-		print '</tr>'. "\n";
+		print '	<td>'.$subnet->ip.'/'.$subnet->mask.' ('.$subnet->description.')</td>'."\n";
+		print '	<td>'.$request['dns_name'].'</td>'."\n";
+		print '	<td>'.$request['description'].'</td>'."\n";
+		print '	<td>'.$request['requester'].'</td>'."\n";
+		print '</tr>'."\n";
 	}
 ?>