moved things around on setup page and changed db titles

Author: digininja

dvwa/includes/dvwaPage.inc.php

@@ -568,10 +568,11 @@ function tokenField() {  # Return a field for the (CSRF) token
 $DVWAOS           = 'Operating system: <em>' . ( strtoupper( substr (PHP_OS, 0, 3)) === 'WIN' ? 'Windows' : '*nix' ) . '</em>';
 $SERVER_NAME      = 'Web Server SERVER_NAME: <em>' . $_SERVER[ 'SERVER_NAME' ] . '</em>';                                                                                                          // CSRF
 
-$MYSQL_USER       = 'MySQL username: <em>' . $_DVWA[ 'db_user' ] . '</em>';
-$MYSQL_PASS       = 'MySQL password: <em>' . ( ($_DVWA[ 'db_password' ] != "" ) ? '******' : '*blank*' ) . '</em>';
-$MYSQL_DB         = 'MySQL database: <em>' . $_DVWA[ 'db_database' ] . '</em>';
-$MYSQL_SERVER     = 'MySQL host: <em>' . $_DVWA[ 'db_server' ] . '</em>';
+$MYSQL_USER       = 'Database username: <em>' . $_DVWA[ 'db_user' ] . '</em>';
+$MYSQL_PASS       = 'Database password: <em>' . ( ($_DVWA[ 'db_password' ] != "" ) ? '******' : '*blank*' ) . '</em>';
+$MYSQL_DB         = 'Database database: <em>' . $_DVWA[ 'db_database' ] . '</em>';
+$MYSQL_SERVER     = 'Database host: <em>' . $_DVWA[ 'db_server' ] . '</em>';
+$MYSQL_PORT       = 'Database port: <em>' . $_DVWA[ 'db_port' ] . '</em>';
 // -- END (Setup Functions)
 
 ?>

setup.php

@@ -57,12 +57,11 @@
 
 	<h2>Setup Check</h2>
 
-	{$DVWAOS}<br />
-	Backend database: <em>{$database_type_name}</em><br />
-	PHP version: <em>" . phpversion() . "</em><br />
-	<br />
 	{$SERVER_NAME}<br />
 	<br />
+	{$DVWAOS}<br />
+	<br />
+	PHP version: <em>" . phpversion() . "</em><br />
 	{$phpDisplayErrors}<br />
 	{$phpSafeMode}<br/ >
 	{$phpURLInclude}<br/ >
@@ -72,10 +71,12 @@
 	{$phpMySQL}<br />
 	{$phpPDO}<br />
 	<br />
+	Backend database: <em>{$database_type_name}</em><br />
 	{$MYSQL_USER}<br />
 	{$MYSQL_PASS}<br />
 	{$MYSQL_DB}<br />
 	{$MYSQL_SERVER}<br />
+	{$MYSQL_PORT}<br />
 	<br />
 	{$DVWARecaptcha}<br />
 	<br />