phpipam / phpipam

app/dashboard/widgets/access_logs.php

Indentation +41 added lines, -41 removed lines

@@ -2,13 +2,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);
-	$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);
+    $Log		= new Logging ($Database);
+    $Result		= new Result ();
 }
 
 # user must be authenticated
@@ -16,52 +16,52 @@ 
 
 # if direct request that redirect to tools page
 if($_SERVER['HTTP_X_REQUESTED_WITH']!="XMLHttpRequest")	{
-	header("Location: ".create_link("tools","logs"));
+    header("Location: ".create_link("tools","logs"));
 }
 
 # if syslog print
 if ($User->settings->log=="syslog") {
-	$Result->show("warning", _("Log files are sent to syslog"));
+    $Result->show("warning", _("Log files are sent to syslog"));
 }
 else {
-	# print last 5 access logs
-	$logs = $Log->fetch_logs(5, NULL, NULL, NULL, 0, 0, 0);
+    # print last 5 access logs
+    $logs = $Log->fetch_logs(5, NULL, NULL, NULL, 0, 0, 0);
 
-	print "<table class='table table-condensed table-hover table-top'>";
+    print "<table class='table table-condensed table-hover table-top'>";
 
-	# headers
-	print "<tr>";
-	print "	<th>"._('Severity')."</th>";
-	print "	<th>"._('Command')."</th>";
-	print "	<th>"._('Date')."</th>";
-	print "	<th>"._('Username')."</th>";
-	print "</tr>";
+    # headers
+    print "<tr>";
+    print "	<th>"._('Severity')."</th>";
+    print "	<th>"._('Command')."</th>";
+    print "	<th>"._('Date')."</th>";
+    print "	<th>"._('Username')."</th>";
+    print "</tr>";
 
-	# logs
-	foreach($logs as $log) {
-		# cast
-		$log = (array) $log;
-		# reformat severity
-		if($log['severity'] == 0)		{ $log['severityText'] = _("Info"); }
-		else if($log['severity'] == 1)	{ $log['severityText'] = _("Warn"); }
-		else if($log['severity'] == 2)	{ $log['severityText'] = _("Err"); }
+    # logs
+    foreach($logs as $log) {
+        # cast
+        $log = (array) $log;
+        # reformat severity
+        if($log['severity'] == 0)		{ $log['severityText'] = _("Info"); }
+        else if($log['severity'] == 1)	{ $log['severityText'] = _("Warn"); }
+        else if($log['severity'] == 2)	{ $log['severityText'] = _("Err"); }
 
-		print "<tr>";
-		print "	<td><span class='severity$log[severity]'>$log[severityText]</span></td>";
-		print "	<td><a class='openLogDetail' data-logid='$log[id]'>$log[command]</a></td>";
-		print "	<td>$log[date]</td>";
-		print "	<td>$log[username]</td>";
+        print "<tr>";
+        print "	<td><span class='severity$log[severity]'>$log[severityText]</span></td>";
+        print "	<td><a class='openLogDetail' data-logid='$log[id]'>$log[command]</a></td>";
+        print "	<td>$log[date]</td>";
+        print "	<td>$log[username]</td>";
 
-		print "</tr>";
-	}
+        print "</tr>";
+    }
 
-	print "</table>";
+    print "</table>";
 
-	# print if none
-	if(sizeof($logs) == 0) {
-		print "<blockquote style='margin-top:20px;margin-left:20px;'>";
-		print "<p>"._("No logs available")."</p>";
-		print "</blockquote>";
-	}
+    # print if none
+    if(sizeof($logs) == 0) {
+        print "<blockquote style='margin-top:20px;margin-left:20px;'>";
+        print "<p>"._("No logs available")."</p>";
+        print "</blockquote>";
+    }
 }
 ?>
\ No newline at end of file

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 +20 added lines, -20 removed lines

@@ -1,13 +1,13 @@ 
 <?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);
+	$Database = new Database_PDO;
+	$User = new User ($Database);
 	$Tools 		= new Tools ($Database);
-	$Log		= new Logging ($Database);
+	$Log = new Logging ($Database);
 	$Result		= new Result ();
 }
 
@@ -15,36 +15,36 @@ 
 $User->check_user_session ();
 
 # if direct request that redirect to tools page
-if($_SERVER['HTTP_X_REQUESTED_WITH']!="XMLHttpRequest")	{
-	header("Location: ".create_link("tools","logs"));
+if ($_SERVER['HTTP_X_REQUESTED_WITH'] != "XMLHttpRequest") {
+	header ("Location: ".create_link ("tools", "logs"));
 }
 
 # if syslog print
-if ($User->settings->log=="syslog") {
-	$Result->show("warning", _("Log files are sent to syslog"));
+if ($User->settings->log == "syslog") {
+	$Result->show ("warning", _ ("Log files are sent to syslog"));
 }
 else {
 	# print last 5 access logs
-	$logs = $Log->fetch_logs(5, NULL, NULL, NULL, 0, 0, 0);
+	$logs = $Log->fetch_logs (5, NULL, NULL, NULL, 0, 0, 0);
 
 	print "<table class='table table-condensed table-hover table-top'>";
 
 	# headers
 	print "<tr>";
-	print "	<th>"._('Severity')."</th>";
-	print "	<th>"._('Command')."</th>";
-	print "	<th>"._('Date')."</th>";
-	print "	<th>"._('Username')."</th>";
+	print "	<th>"._ ('Severity')."</th>";
+	print "	<th>"._ ('Command')."</th>";
+	print "	<th>"._ ('Date')."</th>";
+	print "	<th>"._ ('Username')."</th>";
 	print "</tr>";
 
 	# logs
-	foreach($logs as $log) {
+	foreach ($logs as $log) {
 		# cast
 		$log = (array) $log;
 		# reformat severity
-		if($log['severity'] == 0)		{ $log['severityText'] = _("Info"); }
-		else if($log['severity'] == 1)	{ $log['severityText'] = _("Warn"); }
-		else if($log['severity'] == 2)	{ $log['severityText'] = _("Err"); }
+		if ($log['severity'] == 0) { $log['severityText'] = _ ("Info"); }
+		else if ($log['severity'] == 1) { $log['severityText'] = _ ("Warn"); }
+		else if ($log['severity'] == 2) { $log['severityText'] = _ ("Err"); }
 
 		print "<tr>";
 		print "	<td><span class='severity$log[severity]'>$log[severityText]</span></td>";
@@ -58,9 +58,9 @@ 
 	print "</table>";
 
 	# print if none
-	if(sizeof($logs) == 0) {
+	if (sizeof ($logs) == 0) {
 		print "<blockquote style='margin-top:20px;margin-left:20px;'>";
-		print "<p>"._("No logs available")."</p>";
+		print "<p>"._ ("No logs available")."</p>";
 		print "</blockquote>";
 	}
 }

app/dashboard/widget-popup.php

Indentation +20 added lines, -20 removed lines

@@ -28,26 +28,26 @@
 <!-- content -->
 <div class="pContent">
 	<?php
-	print "<ul id='sortablePopup' class='sortable'>";
-	# print widghets that are not yet selected
-	$m = 0;
-	foreach($widgets as $k=>$w) {
-		if(!in_array($k, $uwidgets))	{
-			$wtmp = (array) $widgets[$k];
-			# size fix
-			if(strlen($wtmp['wsize'])==0)	{ $wtmp['wsize']=6; }
-			print "<li id='$k'>";
-			print "	<a href='' class='btn btn-xs fa-marg-right  btn-default widget-add' id='w-$wtmp[wfile]' data-size='$wtmp[wsize]' data-htitle='$wtmp[wtitle]'><i class='fa fa-plus'></i></a>"._($wtmp['wtitle']);
-			print "	<div class='muted' style='margin-left:27px;'>"._($wtmp['wdescription'])."</div>";
-			print "</li>";
-			$m++;
-		}
-	}
-	print "</ul>";
-
-	# print empty
-	if($m==0)	{ $Result->show("info", _("All available widgets are already on dashboard"), false); }
-	?>
+    print "<ul id='sortablePopup' class='sortable'>";
+    # print widghets that are not yet selected
+    $m = 0;
+    foreach($widgets as $k=>$w) {
+        if(!in_array($k, $uwidgets))	{
+            $wtmp = (array) $widgets[$k];
+            # size fix
+            if(strlen($wtmp['wsize'])==0)	{ $wtmp['wsize']=6; }
+            print "<li id='$k'>";
+            print "	<a href='' class='btn btn-xs fa-marg-right  btn-default widget-add' id='w-$wtmp[wfile]' data-size='$wtmp[wsize]' data-htitle='$wtmp[wtitle]'><i class='fa fa-plus'></i></a>"._($wtmp['wtitle']);
+            print "	<div class='muted' style='margin-left:27px;'>"._($wtmp['wdescription'])."</div>";
+            print "</li>";
+            $m++;
+        }
+    }
+    print "</ul>";
+
+    # print empty
+    if($m==0)	{ $Result->show("info", _("All available widgets are already on dashboard"), false); }
+    ?>
 </div>
 
 <!-- footer -->

Braces +1 added lines, -1 removed lines

@@ -32,7 +32,7 @@
 	# print widghets that are not yet selected
 	$m = 0;
 	foreach($widgets as $k=>$w) {
-		if(!in_array($k, $uwidgets))	{
+		if(!in_array($k, $uwidgets)) {
 			$wtmp = (array) $widgets[$k];
 			# size fix
 			if(strlen($wtmp['wsize'])==0)	{ $wtmp['wsize']=6; }

Spacing +14 added lines, -14 removed lines

@@ -1,11 +1,11 @@ 
 <?php
 
 # show available widgets
-require(dirname(__FILE__) . '../../../functions/functions.php');
+require(dirname (__FILE__).'../../../functions/functions.php');
 
 # Classes
-$Database	= new Database_PDO;
-$User 		= new User ($Database);
+$Database = new Database_PDO;
+$User = new User ($Database);
 $Tools 		= new Tools ($Database);
 $Result 	= new Result ();
 
@@ -13,17 +13,17 @@ 
 $User->check_user_session (false);
 
 # user widgets form database
-$uwidgets = explode(";",$User->user->widgets);	//selected
-$uwidgets = array_filter((array) $uwidgets);
+$uwidgets = explode (";", $User->user->widgets); //selected
+$uwidgets = array_filter ((array) $uwidgets);
 
 # fetch all widgets
-$widgets = $Tools->fetch_widgets ($User->is_admin(false), false);
+$widgets = $Tools->fetch_widgets ($User->is_admin (false), false);
 $widgets = (array) $widgets;
 
 ?>
 
 <!-- header -->
-<div class="pHeader"><?php print _('Add new widget to dashboard'); ?></div>
+<div class="pHeader"><?php print _ ('Add new widget to dashboard'); ?></div>
 
 <!-- content -->
 <div class="pContent">
@@ -31,14 +31,14 @@ 
 	print "<ul id='sortablePopup' class='sortable'>";
 	# print widghets that are not yet selected
 	$m = 0;
-	foreach($widgets as $k=>$w) {
-		if(!in_array($k, $uwidgets))	{
+	foreach ($widgets as $k=>$w) {
+		if (!in_array ($k, $uwidgets)) {
 			$wtmp = (array) $widgets[$k];
 			# size fix
-			if(strlen($wtmp['wsize'])==0)	{ $wtmp['wsize']=6; }
+			if (strlen ($wtmp['wsize']) == 0) { $wtmp['wsize'] = 6; }
 			print "<li id='$k'>";
-			print "	<a href='' class='btn btn-xs fa-marg-right  btn-default widget-add' id='w-$wtmp[wfile]' data-size='$wtmp[wsize]' data-htitle='$wtmp[wtitle]'><i class='fa fa-plus'></i></a>"._($wtmp['wtitle']);
-			print "	<div class='muted' style='margin-left:27px;'>"._($wtmp['wdescription'])."</div>";
+			print "	<a href='' class='btn btn-xs fa-marg-right  btn-default widget-add' id='w-$wtmp[wfile]' data-size='$wtmp[wsize]' data-htitle='$wtmp[wtitle]'><i class='fa fa-plus'></i></a>"._ ($wtmp['wtitle']);
+			print "	<div class='muted' style='margin-left:27px;'>"._ ($wtmp['wdescription'])."</div>";
 			print "</li>";
 			$m++;
 		}
@@ -46,11 +46,11 @@ 
 	print "</ul>";
 
 	# print empty
-	if($m==0)	{ $Result->show("info", _("All available widgets are already on dashboard"), false); }
+	if ($m == 0) { $Result->show ("info", _ ("All available widgets are already on dashboard"), false); }
 	?>
 </div>
 
 <!-- footer -->
 <div class="pFooter">
-	<button class="btn btn-sm btn-default hidePopups"><?php print _('Cancel'); ?></button>
+	<button class="btn btn-sm btn-default hidePopups"><?php print _ ('Cancel'); ?></button>
 </div>
\ No newline at end of file

app/dashboard/index.php

Indentation +67 added lines, -67 removed lines

@@ -94,20 +94,20 @@ 
 
 # if user has no groups and is not admin print warning
 if ($User->isadmin!==true && (strlen($User->user->groups)==0 || $User->user->groups==="null") ) {
-	print '<div class="row-fluid">';
-	print "	<div class='col-xs-12 col-sm-12 col-md-12 col-lg-12' style='min-height:10px'>";
-	print "	<div class='inner' style='min-height:10px'>";
-	print " <h4>"._("No groups")."</h4>";
-	print "	<div class='hContent'>";
-	print "		<div class='alert alert-info' style='margin:10px;'>"._("You are not member of any group. Please contact system administrator!")."</div>";
-	print "	</div>";
-	print "	</div>";
-	print "	</div>";
-	print "</div>";
-	print "<div class='clearfix'></div>";
-
-	// reset uwidgets
-	$uwidgets = array("tools", "ipcalc");
+    print '<div class="row-fluid">';
+    print "	<div class='col-xs-12 col-sm-12 col-md-12 col-lg-12' style='min-height:10px'>";
+    print "	<div class='inner' style='min-height:10px'>";
+    print " <h4>"._("No groups")."</h4>";
+    print "	<div class='hContent'>";
+    print "		<div class='alert alert-info' style='margin:10px;'>"._("You are not member of any group. Please contact system administrator!")."</div>";
+    print "	</div>";
+    print "	</div>";
+    print "	</div>";
+    print "</div>";
+    print "<div class='clearfix'></div>";
+
+    // reset uwidgets
+    $uwidgets = array("tools", "ipcalc");
 }
 
 # split widgets to rows (chunks)
@@ -115,22 +115,22 @@ 
 $m=0;							//to calculate chunk index
 
 foreach($uwidgets as $uk=>$uv) {
-	//get fetails
-	$wdet = (array) $widgets[$uv];
-	if(strlen($wdet['wsize'])==0)	{ $wsize = 6; }
-	else							{ $wsize = $wdet['wsize']; }
-
-	//calculate current size
-	$currSize = $currSize + $wsize;
-
-	//ok, we have sizes, we need to split them into chunks of 12
-	if($currSize > 12) {
-		$m++; 					//new index
-		$currSize = $wsize; 	//reset size
-	}
-
-	//add to array
-	$uwidgetschunk[$m][] = $uv;
+    //get fetails
+    $wdet = (array) $widgets[$uv];
+    if(strlen($wdet['wsize'])==0)	{ $wsize = 6; }
+    else							{ $wsize = $wdet['wsize']; }
+
+    //calculate current size
+    $currSize = $currSize + $wsize;
+
+    //ok, we have sizes, we need to split them into chunks of 12
+    if($currSize > 12) {
+        $m++; 					//new index
+        $currSize = $wsize; 	//reset size
+    }
+
+    //add to array
+    $uwidgetschunk[$m][] = $uv;
 }
 
 # print
@@ -140,46 +140,46 @@ 
 
 if(sizeof($uwidgets)>1) {
 
-	print '<div class="row-fluid">';
-
-	foreach($uwidgetschunk as $w) {
-		# print itams in a row
-		foreach($w as $c) {
-
-			/* print items */
-			$wdet = (array) $widgets[$c];
-			if(array_key_exists($c, $widgets)) {
-				//reset size if not set
-				if(strlen($wdet['wsize'])==0)	{ $wdet['wsize'] = 6; }
-
-				print "	<div class='col-xs-12 col-sm-12 col-md-12 col-lg-$wdet[wsize] widget-dash' id='w-$wdet[wfile]'>";
-				print "	<div class='inner'><i class='fa fa-times remove-widget icon-action fa-gray pull-right'></i>";
-				// href?
-				if($wdet['whref']=="yes")	{ print "<a href='".create_link("widgets",$wdet['wfile'])."'> <h4>"._($wdet['wtitle'])."<i class='fa fa-external-link fa-gray pull-right'></i></h4></a>"; }
-				else						{ print "<h4>"._($wdet['wtitle'])."</h4>"; }
-				print "		<div class='hContent'>";
-				print "			<div style='text-align:center;padding-top:50px;'><strong>"._('Loading statistics')."</strong><br><i class='fa fa-spinner fa-spin'></i></div>";
-				print "		</div>";
-				print "	</div>";
-				print "	</div>";
-
-			}
-			# invalid widget
-			else {
-				print "	<div class='col-xs-12 col-sm-12 col-md-12 col-lg-6' id='w-$c'>";
-				print "	<div class='inner'>";
-				print "		<blockquote style='margin-top:20px;margin-left:20px;'><p>Invalid widget $c</p></blockquote>";
-				print "	</div>";
-				print "	</div>";
-			}
-
-		}
-	}
-	print "</div>";
+    print '<div class="row-fluid">';
+
+    foreach($uwidgetschunk as $w) {
+        # print itams in a row
+        foreach($w as $c) {
+
+            /* print items */
+            $wdet = (array) $widgets[$c];
+            if(array_key_exists($c, $widgets)) {
+                //reset size if not set
+                if(strlen($wdet['wsize'])==0)	{ $wdet['wsize'] = 6; }
+
+                print "	<div class='col-xs-12 col-sm-12 col-md-12 col-lg-$wdet[wsize] widget-dash' id='w-$wdet[wfile]'>";
+                print "	<div class='inner'><i class='fa fa-times remove-widget icon-action fa-gray pull-right'></i>";
+                // href?
+                if($wdet['whref']=="yes")	{ print "<a href='".create_link("widgets",$wdet['wfile'])."'> <h4>"._($wdet['wtitle'])."<i class='fa fa-external-link fa-gray pull-right'></i></h4></a>"; }
+                else						{ print "<h4>"._($wdet['wtitle'])."</h4>"; }
+                print "		<div class='hContent'>";
+                print "			<div style='text-align:center;padding-top:50px;'><strong>"._('Loading statistics')."</strong><br><i class='fa fa-spinner fa-spin'></i></div>";
+                print "		</div>";
+                print "	</div>";
+                print "	</div>";
+
+            }
+            # invalid widget
+            else {
+                print "	<div class='col-xs-12 col-sm-12 col-md-12 col-lg-6' id='w-$c'>";
+                print "	<div class='inner'>";
+                print "		<blockquote style='margin-top:20px;margin-left:20px;'><p>Invalid widget $c</p></blockquote>";
+                print "	</div>";
+                print "	</div>";
+            }
+
+        }
+    }
+    print "</div>";
 }
 # empty
 else {
-	print "<br><div class='alert alert-warning'><strong>"._('No widgets selected')."!</strong> <hr>"._('Please select widgets to be displayed on dashboard on user menu page')."!</div>";
+    print "<br><div class='alert alert-warning'><strong>"._('No widgets selected')."!</strong> <hr>"._('Please select widgets to be displayed on dashboard on user menu page')."!</div>";
 }
 ?>
 <hr>
\ No newline at end of file

Spacing +24 added lines, -24 removed lines

@@ -6,7 +6,7 @@ 
  *******************************************/
 
 # verify that user is logged in
-$User->check_user_session();
+$User->check_user_session ();
 
 ?>
 <script type="text/javascript">
@@ -86,20 +86,20 @@ 
 <?php
 
 # fetch all widgets
-$widgets = $Tools->fetch_widgets ($User->is_admin(false), false);
+$widgets = $Tools->fetch_widgets ($User->is_admin (false), false);
 $widgets = (array) $widgets;
 
 # show user-selected widgets
-$uwidgets = array_filter(explode(";",$User->user->widgets));
+$uwidgets = array_filter (explode (";", $User->user->widgets));
 
 # if user has no groups and is not admin print warning
-if ($User->is_admin(false)!==true && (strlen($User->user->groups)==0 || $User->user->groups==="null") ) {
+if ($User->is_admin (false) !== true && (strlen ($User->user->groups) == 0 || $User->user->groups === "null")) {
 	print '<div class="row-fluid">';
 	print "	<div class='col-xs-12 col-sm-12 col-md-12 col-lg-12' style='min-height:10px'>";
 	print "	<div class='inner' style='min-height:10px'>";
-	print " <h4>"._("No groups")."</h4>";
+	print " <h4>"._ ("No groups")."</h4>";
 	print "	<div class='hContent'>";
-	print "		<div class='alert alert-info' style='margin:10px;'>"._("You are not member of any group. Please contact system administrator!")."</div>";
+	print "		<div class='alert alert-info' style='margin:10px;'>"._ ("You are not member of any group. Please contact system administrator!")."</div>";
 	print "	</div>";
 	print "	</div>";
 	print "	</div>";
@@ -107,26 +107,26 @@ 
 	print "<div class='clearfix'></div>";
 
 	// reset uwidgets
-	$uwidgets = array("tools", "ipcalc");
+	$uwidgets = array ("tools", "ipcalc");
 }
 
 # split widgets to rows (chunks)
-$currSize = 0;					//to calculate size
-$m=0;							//to calculate chunk index
+$currSize = 0; //to calculate size
+$m = 0; //to calculate chunk index
 
-foreach($uwidgets as $uk=>$uv) {
+foreach ($uwidgets as $uk=>$uv) {
 	//get fetails
 	$wdet = (array) $widgets[$uv];
-	if(strlen($wdet['wsize'])==0)	{ $wsize = 6; }
-	else							{ $wsize = $wdet['wsize']; }
+	if (strlen ($wdet['wsize']) == 0) { $wsize = 6; }
+	else { $wsize = $wdet['wsize']; }
 
 	//calculate current size
 	$currSize = $currSize + $wsize;
 
 	//ok, we have sizes, we need to split them into chunks of 12
-	if($currSize > 12) {
-		$m++; 					//new index
-		$currSize = $wsize; 	//reset size
+	if ($currSize > 12) {
+		$m++; //new index
+		$currSize = $wsize; //reset size
 	}
 
 	//add to array
@@ -138,27 +138,27 @@ 
 print "	<a href='' class='btn btn-sm btn-default btn-success add-new-widget'><i class='fa fa-plus'></i> Add new widget</a>";
 print "</div>";
 
-if(sizeof($uwidgets)>1) {
+if (sizeof ($uwidgets) > 1) {
 
 	print '<div class="row-fluid">';
 
-	foreach($uwidgetschunk as $w) {
+	foreach ($uwidgetschunk as $w) {
 		# print itams in a row
-		foreach($w as $c) {
+		foreach ($w as $c) {
 
 			/* print items */
 			$wdet = (array) $widgets[$c];
-			if(array_key_exists($c, $widgets)) {
+			if (array_key_exists ($c, $widgets)) {
 				//reset size if not set
-				if(strlen($wdet['wsize'])==0)	{ $wdet['wsize'] = 6; }
+				if (strlen ($wdet['wsize']) == 0) { $wdet['wsize'] = 6; }
 
 				print "	<div class='col-xs-12 col-sm-12 col-md-12 col-lg-$wdet[wsize] widget-dash' id='w-$wdet[wfile]'>";
 				print "	<div class='inner'><i class='fa fa-times remove-widget icon-action fa-gray pull-right'></i>";
 				// href?
-				if($wdet['whref']=="yes")	{ print "<a href='".create_link("widgets",$wdet['wfile'])."'> <h4>"._($wdet['wtitle'])."<i class='fa fa-external-link fa-gray pull-right'></i></h4></a>"; }
-				else						{ print "<h4>"._($wdet['wtitle'])."</h4>"; }
+				if ($wdet['whref'] == "yes") { print "<a href='".create_link ("widgets", $wdet['wfile'])."'> <h4>"._ ($wdet['wtitle'])."<i class='fa fa-external-link fa-gray pull-right'></i></h4></a>"; }
+				else { print "<h4>"._ ($wdet['wtitle'])."</h4>"; }
 				print "		<div class='hContent'>";
-				print "			<div style='text-align:center;padding-top:50px;'><strong>"._('Loading statistics')."</strong><br><i class='fa fa-spinner fa-spin'></i></div>";
+				print "			<div style='text-align:center;padding-top:50px;'><strong>"._ ('Loading statistics')."</strong><br><i class='fa fa-spinner fa-spin'></i></div>";
 				print "		</div>";
 				print "	</div>";
 				print "	</div>";
@@ -179,7 +179,7 @@ 
 }
 # empty
 else {
-	print "<br><div class='alert alert-warning'><strong>"._('No widgets selected')."!</strong> <hr>"._('Please select widgets to be displayed on dashboard on user menu page')."!</div>";
+	print "<br><div class='alert alert-warning'><strong>"._ ('No widgets selected')."!</strong> <hr>"._ ('Please select widgets to be displayed on dashboard on user menu page')."!</div>";
 }
 ?>
 <hr>
\ No newline at end of file

app/install/install_automatic.php

Spacing +1 added lines, -1 removed lines

@@ -74,7 +74,7 @@
 				<hr>
 				<div class="btn-block">
 					<!-- Back -->
-					<a class="btn btn-sm btn-default" href="<?php print create_link("install",null,null,null,null,true); ?>" ><i class='fa fa-angle-left'></i> Back</a>
+					<a class="btn btn-sm btn-default" href="<?php print create_link ("install", null, null, null, null, true); ?>" ><i class='fa fa-angle-left'></i> Back</a>
 					<a class="install btn btn-sm btn-info" version="0">Install phpipam database</a>
 				</div>
 			</div>

app/install/postinstall_configure.php

Indentation +34 added lines, -34 removed lines

@@ -10,40 +10,40 @@
 		<hr>
 
 		<?php
-		# lets verify database
-		$errors = $Tools->verify_database ();
-
-		/* print result */
-		if( (isset($errors['tableError'])) || (isset($errors['fieldError'])) ) {
-
-			print "<div class='alert alert-danger alert-block'>";
-			print "<strong>Some tables or fields are missing in database:</strong><hr>";
-
-			//tables
-			if (isset($errors['tableError'])) {
-				print '<b>Missing tables:</b>'. "\n";
-				print '<ul class="fix-table">'. "\n";
-				foreach ($errors['tableError'] as $table) {
-					print "<li>$table</li>";
-				}
-				print '</ul>'. "\n";
-			}
-			//fields
-			if (isset($errors['fieldError'])) {
-				print '<b>Missing fields:</b>'. "\n";
-				print '<ul class="fix-field">'. "\n";
-				foreach ($errors['fieldError'] as $table=>$field) {
-					print '<li>';
-					print 'Table `'. $table .'`: missing field `'. $field .'`;';
-					print '</li>'. "\n";
-				}
-				print '</ul>'. "\n";
-			}
-			print "</div>";
-		}
-		# no db errors, lets configure !
-		else {
-		?>
+        # lets verify database
+        $errors = $Tools->verify_database ();
+
+        /* print result */
+        if( (isset($errors['tableError'])) || (isset($errors['fieldError'])) ) {
+
+            print "<div class='alert alert-danger alert-block'>";
+            print "<strong>Some tables or fields are missing in database:</strong><hr>";
+
+            //tables
+            if (isset($errors['tableError'])) {
+                print '<b>Missing tables:</b>'. "\n";
+                print '<ul class="fix-table">'. "\n";
+                foreach ($errors['tableError'] as $table) {
+                    print "<li>$table</li>";
+                }
+                print '</ul>'. "\n";
+            }
+            //fields
+            if (isset($errors['fieldError'])) {
+                print '<b>Missing fields:</b>'. "\n";
+                print '<ul class="fix-field">'. "\n";
+                foreach ($errors['fieldError'] as $table=>$field) {
+                    print '<li>';
+                    print 'Table `'. $table .'`: missing field `'. $field .'`;';
+                    print '</li>'. "\n";
+                }
+                print '</ul>'. "\n";
+            }
+            print "</div>";
+        }
+        # no db errors, lets configure !
+        else {
+        ?>
 
 
 		<form name="postinstall" id="postinstall" class="form-inline" method="post">

Spacing +11 added lines, -11 removed lines

@@ -14,30 +14,30 @@ 
 		$errors = $Tools->verify_database ();
 
 		/* print result */
-		if( (isset($errors['tableError'])) || (isset($errors['fieldError'])) ) {
+		if ((isset($errors['tableError'])) || (isset($errors['fieldError']))) {
 
 			print "<div class='alert alert-danger alert-block'>";
 			print "<strong>Some tables or fields are missing in database:</strong><hr>";
 
 			//tables
 			if (isset($errors['tableError'])) {
-				print '<b>Missing tables:</b>'. "\n";
-				print '<ul class="fix-table">'. "\n";
+				print '<b>Missing tables:</b>'."\n";
+				print '<ul class="fix-table">'."\n";
 				foreach ($errors['tableError'] as $table) {
 					print "<li>$table</li>";
 				}
-				print '</ul>'. "\n";
+				print '</ul>'."\n";
 			}
 			//fields
 			if (isset($errors['fieldError'])) {
-				print '<b>Missing fields:</b>'. "\n";
-				print '<ul class="fix-field">'. "\n";
+				print '<b>Missing fields:</b>'."\n";
+				print '<ul class="fix-field">'."\n";
 				foreach ($errors['fieldError'] as $table=>$field) {
 					print '<li>';
-					print 'Table `'. $table .'`: missing field `'. $field .'`;';
-					print '</li>'. "\n";
+					print 'Table `'.$table.'`: missing field `'.$field.'`;';
+					print '</li>'."\n";
 				}
-				print '</ul>'. "\n";
+				print '</ul>'."\n";
 			}
 			print "</div>";
 		}
@@ -77,7 +77,7 @@ 
 			<!-- Database location -->
 			<div class="col-xs-12 col-md-4"><strong>Site URL</strong></div>
 			<div class="col-xs-12 col-md-8">
-				<input type="text" style="width:100%;" name="siteURL" class="form-control" autocomplete="off" autocorrect="off" autocapitalize="off" spellcheck="false" value="<?php print $_SERVER['SCRIPT_URI'];  ?>">
+				<input type="text" style="width:100%;" name="siteURL" class="form-control" autocomplete="off" autocorrect="off" autocapitalize="off" spellcheck="false" value="<?php print $_SERVER['SCRIPT_URI']; ?>">
 				<div class="text-muted"></div>
 			</div>
 
@@ -86,7 +86,7 @@ 
 				<hr>
 				<div class="btn-block">
 					<!-- Back -->
-					<a class="btn btn-sm btn-default" href="<?php print create_link("install","install_automatic",null,null,null,true); ?>" ><i class='fa fa-angle-left'></i> Back</a>
+					<a class="btn btn-sm btn-default" href="<?php print create_link ("install", "install_automatic", null, null, null, true); ?>" ><i class='fa fa-angle-left'></i> Back</a>
 					<input type="submit" class="btn btn-sm btn-info" version="0" value="Save settings">
 				</div>
 			</div>

app/install/install_manual.php

Spacing +4 added lines, -4 removed lines

@@ -6,7 +6,7 @@ 
 	<div style="padding:10px;">
 
 		<!-- Back -->
-		<a href="<?php print create_link("install",null,null,null,null,true); ?>" class="btn btn-sm btn-default"><i class='fa fa-angle-left'></i> Back</a>
+		<a href="<?php print create_link ("install", null, null, null, null, true); ?>" class="btn btn-sm btn-default"><i class='fa fa-angle-left'></i> Back</a>
 		<!-- Instructions -->
 		<div style="margin-top:10px;padding:30px 20px;">
 			For importing database file with mysqlimport tool please follow below instructions:<hr>
@@ -19,7 +19,7 @@ 
 					Copy below SQL queries and paste them to mysql
 				</li>
 				<li>Finished ! Now login with <strong>Admin/ipamadmin</strong> to webpage<br>
-				<a href="<?php print create_link(null,null,null,null,null,true); ?>" class="btn btn-sm btn-info">Login</a>
+				<a href="<?php print create_link (null, null, null, null, null, true); ?>" class="btn btn-sm btn-info">Login</a>
 				</li>
 			</ol> 
 			<hr>
@@ -44,8 +44,8 @@ 
 $file .= "# Create tables and import data\n";
 $file .= "# ------------------------------------------------------------\n\n\n\n";
 
-$file .= file_get_contents("db/SCHEMA.sql"); 
-print_r($file); ?>
+$file .= file_get_contents ("db/SCHEMA.sql"); 
+print_r ($file); ?>
 </pre>
 		</div>
 			

app/install/postinstall_submit.php

Indentation +12 added lines, -12 removed lines

@@ -17,23 +17,23 @@
 # only permit if Admin user has default pass !!!
 $admin = $Admin->fetch_object ("users","username","Admin");
 if($admin->password!='$6$rounds=3000$JQEE6dL9NpvjeFs4$RK5X3oa28.Uzt/h5VAfdrsvlVe.7HgQUYKMXTJUsud8dmWfPzZQPbRbk8xJn1Kyyt4.dWm4nJIYhAV2mbOZ3g.') {
-	$Result->show("danger", "Not allowed!", true);
+    $Result->show("danger", "Not allowed!", true);
 }
 # update
 else {
-	# check lenghts
-	if(strlen($_POST['password1'])<8)				{ $Result->show("danger", _("Password must be at least 8 characters long!"), true); }
-	if(strlen($_POST['password2'])<8)				{ $Result->show("danger", _("Password must be at least 8 characters long!"), true); }
+    # check lenghts
+    if(strlen($_POST['password1'])<8)				{ $Result->show("danger", _("Password must be at least 8 characters long!"), true); }
+    if(strlen($_POST['password2'])<8)				{ $Result->show("danger", _("Password must be at least 8 characters long!"), true); }
 
-	# check password match
-	if($_POST['password1']!=$_POST['password2'])	{ $Result->show("danger", _("Passwords do not match"), true); }
+    # check password match
+    if($_POST['password1']!=$_POST['password2'])	{ $Result->show("danger", _("Passwords do not match"), true); }
 
-	# Crypt password
-	$_POST['password1'] = $User->crypt_user_pass ($_POST['password1']);
+    # Crypt password
+    $_POST['password1'] = $User->crypt_user_pass ($_POST['password1']);
 
-	# all good, update password!
-	$Install->postauth_update($_POST['password1'], $_POST['siteTitle'], $_POST['siteURL']);
-	# ok
-													{ $Result->show("success", "Settings updated, installation complete!<hr><a class='btn btn-sm btn-default' href='".create_link("login")."'>Proceed to login</a>", false); }
+    # all good, update password!
+    $Install->postauth_update($_POST['password1'], $_POST['siteTitle'], $_POST['siteURL']);
+    # ok
+                                                    { $Result->show("success", "Settings updated, installation complete!<hr><a class='btn btn-sm btn-default' href='".create_link("login")."'>Proceed to login</a>", false); }
 }
 ?>
\ No newline at end of file

Spacing +12 added lines, -12 removed lines

@@ -5,35 +5,35 @@
  */
 
 # functions
-require( dirname(__FILE__) . '/../../functions/functions.php' );
+require(dirname (__FILE__).'/../../functions/functions.php');
 
 # objects
-$Database 	= new Database_PDO;
+$Database = new Database_PDO;
 $Admin 		= new Admin ($Database, false);
-$Install 	= new Install ($Database);
-$User		= new User ($Database);
+$Install = new Install ($Database);
+$User = new User ($Database);
 $Result		= new Result;
 
 # only permit if Admin user has default pass !!!
-$admin = $Admin->fetch_object ("users","username","Admin");
-if($admin->password!='$6$rounds=3000$JQEE6dL9NpvjeFs4$RK5X3oa28.Uzt/h5VAfdrsvlVe.7HgQUYKMXTJUsud8dmWfPzZQPbRbk8xJn1Kyyt4.dWm4nJIYhAV2mbOZ3g.') {
-	$Result->show("danger", "Not allowed!", true);
+$admin = $Admin->fetch_object ("users", "username", "Admin");
+if ($admin->password != '$6$rounds=3000$JQEE6dL9NpvjeFs4$RK5X3oa28.Uzt/h5VAfdrsvlVe.7HgQUYKMXTJUsud8dmWfPzZQPbRbk8xJn1Kyyt4.dWm4nJIYhAV2mbOZ3g.') {
+	$Result->show ("danger", "Not allowed!", true);
 }
 # update
 else {
 	# check lenghts
-	if(strlen($_POST['password1'])<8)				{ $Result->show("danger", _("Password must be at least 8 characters long!"), true); }
-	if(strlen($_POST['password2'])<8)				{ $Result->show("danger", _("Password must be at least 8 characters long!"), true); }
+	if (strlen ($_POST['password1']) < 8) { $Result->show ("danger", _ ("Password must be at least 8 characters long!"), true); }
+	if (strlen ($_POST['password2']) < 8) { $Result->show ("danger", _ ("Password must be at least 8 characters long!"), true); }
 
 	# check password match
-	if($_POST['password1']!=$_POST['password2'])	{ $Result->show("danger", _("Passwords do not match"), true); }
+	if ($_POST['password1'] != $_POST['password2']) { $Result->show ("danger", _ ("Passwords do not match"), true); }
 
 	# Crypt password
 	$_POST['password1'] = $User->crypt_user_pass ($_POST['password1']);
 
 	# all good, update password!
-	$Install->postauth_update($_POST['password1'], $_POST['siteTitle'], $_POST['siteURL']);
+	$Install->postauth_update ($_POST['password1'], $_POST['siteTitle'], $_POST['siteURL']);
 	# ok
-													{ $Result->show("success", "Settings updated, installation complete!<hr><a class='btn btn-sm btn-default' href='".create_link("login")."'>Proceed to login</a>", false); }
+													{ $Result->show ("success", "Settings updated, installation complete!<hr><a class='btn btn-sm btn-default' href='".create_link ("login")."'>Proceed to login</a>", false); }
 }
 ?>
\ No newline at end of file

app/install/invalid_install_type.php

Spacing +2 added lines, -2 removed lines

@@ -4,9 +4,9 @@
 
 	<div class="hContent">
 	<div style="padding:10px;">
-		<?php $Result->show("danger", "This installation type does not exist. Please select valid installation method!", false); ?>
+		<?php $Result->show ("danger", "This installation type does not exist. Please select valid installation method!", false); ?>
 
-		<a href="<?php print create_link("install",null,null,null,null,true); ?>" class="btn btn-sm btn-default"><i class='fa fa-angle-left'></i> Back</a>
+		<a href="<?php print create_link ("install", null, null, null, null, true); ?>" class="btn btn-sm btn-default"><i class='fa fa-angle-left'></i> Back</a>
 
 	</div>
 	</div>

app/install/install_mysqlimport.php

Spacing +3 added lines, -3 removed lines

@@ -6,7 +6,7 @@ 
 	<div style="padding:10px;">
 
 		<!-- Back -->
-		<a href="<?php print create_link("install",null,null,null,null,true); ?>" class="btn btn-sm btn-default"><i class='fa fa-angle-left'></i> Back</a>
+		<a href="<?php print create_link ("install", null, null, null, null, true); ?>" class="btn btn-sm btn-default"><i class='fa fa-angle-left'></i> Back</a>
 		<!-- Instructions -->
 		<div style="margin-top:10px;padding:30px 20px;">
 			For installation with mysqlimport please follow below steps:<hr>
@@ -27,11 +27,11 @@ 
 				</li>
 				
 				<li>Set permissions for phpipam user
-				<pre>GRANT ALL on `<?php print $db['name'];?>`.* to <?php print $db['user'];?>@localhost identified by '<?php print $db['pass'];?>';</pre>
+				<pre>GRANT ALL on `<?php print $db['name']; ?>`.* to <?php print $db['user']; ?>@localhost identified by '<?php print $db['pass']; ?>';</pre>
 				</li>
 				
 				<li>Finished ! Now login with <strong>Admin/ipamadmin</strong> to webpage<br>
-				<a href="<?php print create_link(null,null,null,null,null,true); ?>" class="btn btn-sm btn-info">Login</a>
+				<a href="<?php print create_link (null, null, null, null, null, true); ?>" class="btn btn-sm btn-info">Login</a>
 				</li>
 			</ol> 
 			<hr>