phpipam / phpipam

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>

app/dashboard/widgets/error_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, 1, 2, 2);
+    # print last 5 access logs
+    $logs = $Log->fetch_logs(5, NULL, NULL, NULL, 1, 2, 2);
 
-	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

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

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 -->

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

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">

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

app/install/index.php

Indentation +15 added lines, -15 removed lines

@@ -17,19 +17,19 @@ 
 
 # If User is not available create fake user object for create_link!
 if(!is_object(@$User)) {
-	$User = new StdClass ();
-	@$User->settings->prettyLinks = "No";
+    $User = new StdClass ();
+    @$User->settings->prettyLinks = "No";
 }
 
 # if already installed than redirect !
 if($Install->check_db_connection(false) && $Install->check_table("vrf", false)) {
 
-	# check if installation parts 2 and 3 are running, otherwise die!
-	$admin = $Tools->fetch_object ("users", "id", 1);
-	if($admin->password!='$6$rounds=3000$JQEE6dL9NpvjeFs4$RK5X3oa28.Uzt/h5VAfdrsvlVe.7HgQUYKMXTJUsud8dmWfPzZQPbRbk8xJn1Kyyt4.dWm4nJIYhAV2mbOZ3g.') {
-		header("Location: ".create_link("dashboard"));
-		die();
-	}
+    # check if installation parts 2 and 3 are running, otherwise die!
+    $admin = $Tools->fetch_object ("users", "id", 1);
+    if($admin->password!='$6$rounds=3000$JQEE6dL9NpvjeFs4$RK5X3oa28.Uzt/h5VAfdrsvlVe.7HgQUYKMXTJUsud8dmWfPzZQPbRbk8xJn1Kyyt4.dWm4nJIYhAV2mbOZ3g.') {
+        header("Location: ".create_link("dashboard"));
+        die();
+    }
 }
 # printout
 ?>
@@ -113,13 +113,13 @@ 
 if(!isset($_GET['section']))										{ include("select_install_type.php"); }
 # open subpage
 else {
-	//check if subnetId == configure than already installed
-	if(@$_GET['subnetId']=="configure")								{ include(dirname(__FILE__)."/postinstall_configure.php"); }
-	else {
-		// verify that page exists
-		if(!file_exists(dirname(__FILE__)."/$_GET[section].php"))	{ include("invalid_install_type.php"); }
-		else														{ include(dirname(__FILE__)."/$_GET[section].php"); }
-	}
+    //check if subnetId == configure than already installed
+    if(@$_GET['subnetId']=="configure")								{ include(dirname(__FILE__)."/postinstall_configure.php"); }
+    else {
+        // verify that page exists
+        if(!file_exists(dirname(__FILE__)."/$_GET[section].php"))	{ include("invalid_install_type.php"); }
+        else														{ include(dirname(__FILE__)."/$_GET[section].php"); }
+    }
 }
 ?>
 

app/install/install-execute.php

Indentation +4 added lines, -4 removed lines

@@ -18,9 +18,9 @@ 
 
 # if already installed ignore!
 if($Install->check_table ("widgets", false) && @$_POST['dropdb']!="on") {
-	# check for possible errors
-	if(sizeof($errors = $Tools->verify_database())>0) 						{ }
-	else 																	{ $Result->show("danger", _("Database already installed"), true);}
+    # check for possible errors
+    if(sizeof($errors = $Tools->verify_database())>0) 						{ }
+    else 																	{ $Result->show("danger", _("Database already installed"), true);}
 }
 
 # get possible advanced options
@@ -30,6 +30,6 @@ 
 
 # try to install new database */
 if($Install->install_database ($_POST['mysqlrootuser'], $_POST['mysqlrootpass'], $dropdb, $createdb, $creategrants)) {
- 	$Result->show("success alert-block", 'Database installed successfully! <a href="?page=install&section=install_automatic&subnetId=configure" class="btn btn-sm btn-default">Continue</a>', true);
+        $Result->show("success alert-block", 'Database installed successfully! <a href="?page=install&section=install_automatic&subnetId=configure" class="btn btn-sm btn-default">Continue</a>', true);
 }
 ?>
\ No newline at end of file