diff -r de56132c008d -r bdac73ed481e install/includes/stages/database_postgresql.php
--- a/install/includes/stages/database_postgresql.php	Sun Mar 28 21:49:26 2010 -0400
+++ b/install/includes/stages/database_postgresql.php	Sun Mar 28 23:10:46 2010 -0400
@@ -14,152 +14,152 @@
  */
 
 if ( !defined('IN_ENANO_INSTALL') )
-  die();
+	die();
 
 if ( isset($_POST['_cont']) )
 {
-  $allow_go = true;
-  // Do we have everything? If so, continue with installation.
-  foreach ( array('db_host', 'db_name', 'db_user', 'db_pass', 'db_port') as $field )
-  {
-    if ( empty($_POST[$field]) )
-    {
-      $allow_go = false;
-    }
-  }
-  if ( $allow_go )
-  {
-    require( ENANO_ROOT . '/install/includes/stages/database_post.php' );
-    return true;
-  }
+	$allow_go = true;
+	// Do we have everything? If so, continue with installation.
+	foreach ( array('db_host', 'db_name', 'db_user', 'db_pass', 'db_port') as $field )
+	{
+		if ( empty($_POST[$field]) )
+		{
+			$allow_go = false;
+		}
+	}
+	if ( $allow_go )
+	{
+		require( ENANO_ROOT . '/install/includes/stages/database_post.php' );
+		return true;
+	}
 }
 
 if ( isset($_POST['ajax_test']) )
 {
-  // Test the database connection
-  $return = array(
-      'can_install' => false,
-      'host_good' => true,
-      'creating_user' => false,
-      'db_exist' => false,
-      'creating_db' => false,
-      'creating_db_grant' => false,
-      'root_fail' => false,
-      'version' => array(
-        'version' => 'unknown',
-        'good' => 'indeterminate'
-      ),
-      'last_error' => ''
-    );
-  
-  if ( !isset($_POST['info']) )
-    die();
-  
-  $info = $_POST['info'];
-  
-  // From here on out will be JSON responses
-  header('Content-type: application/json');
-  
-  try
-  {
-    $info = @enano_json_decode($info);
-  }
-  catch ( Zend_Json_Exception $e )
-  {
-    die(enano_json_encode(array(
-        'mode' => 'error',
-        'error' => 'Exception in JSON decoder'
-      )));
-  }
-  
-  if ( !is_int($info['db_port']) )
-  {
-    $return['host_good'] = false;
-    echo enano_json_encode($return);
-    exit;
-  }
-  
-  $port = $info['db_port'] ? $info['db_port'] : 5432;
-  
-  // Try to connect as the normal user
-  // generate connection string
-  $conn_string = "dbname = '" . addslashes($info['db_name']) . "' port = '$port' host = '" . addslashes($info['db_host']) . "' " . 
-                 "user= '" . addslashes($info['db_user']) . "' password = '" . addslashes($info['db_pass']) . "'";
-  $test = @pg_connect($conn_string);
-  if ( !$test )
-  {
-    // Connection as normal user failed. PgSQL doesn't give us an error string so
-    // just try to connect as root. If even that fails, exit with an error
-    $return['creating_user'] = true;
-    if ( !empty($info['db_root_user']) && !empty($info['db_root_pass']) )
-    {
-      $conn_string_root = "dbname = '" . addslashes($info['db_name']) . "' port = '$port' host = '" . addslashes($info['db_host']) . "' " . 
-                          "user= '" . addslashes($info['db_root_user']) . "' password = '" . addslashes($info['db_root_pass']) . "'";
-      // Attempt connection as root
-      $test_root = @pg_connect($conn_string_root);
-      if ( !$test_root )
-      {
-        $return['root_fail'] = true;
-      }
-      else
-      {
-        $return['can_install'] = true;
-      }
-    }
-  }
-  else
-  {
-    $return['can_install'] = true;
-  }
-  
-  $did_version_check = false;
-  
-  if ( isset($test) && @is_resource($test) )
-  {
-    $server_info = @pg_version($test);
-    if ( isset($server_info['server']) )
-    {
-      $did_version_check = true;
-      $return['version'] = array(
-          'version' => $server_info['server'],
-          'good' => ( version_compare($server_info['server'], '8.2.5', '>=') )
-        );
-    }
-    @pg_close($test);
-  }
-  
-  if ( isset($test_root) && @is_resource($test_root) )
-  {
-    $server_info = @pg_version($test_root);
-    if ( isset($server_info['server']) )
-    {
-      $did_version_check = true;
-      $return['version'] = array(
-          'version' => $server_info['server'],
-          'good' => ( version_compare($server_info['server'], '8.2.5', '>=') )
-        );
-    }
-    @pg_close($test_root);
-  }
-  
-  if ( !$did_version_check )
-  {
-    $return['version'] = array(
-        'version' => 'indeterminate',
-        'good' => false
-      );
-  }
-  else
-  {
-    if ( !$return['version']['good'] )
-    {
-      $return['can_install'] = false;
-    }
-  }
-  
-  echo enano_json_encode($return);
-  
-  exit();
+	// Test the database connection
+	$return = array(
+			'can_install' => false,
+			'host_good' => true,
+			'creating_user' => false,
+			'db_exist' => false,
+			'creating_db' => false,
+			'creating_db_grant' => false,
+			'root_fail' => false,
+			'version' => array(
+				'version' => 'unknown',
+				'good' => 'indeterminate'
+			),
+			'last_error' => ''
+		);
+	
+	if ( !isset($_POST['info']) )
+		die();
+	
+	$info = $_POST['info'];
+	
+	// From here on out will be JSON responses
+	header('Content-type: application/json');
+	
+	try
+	{
+		$info = @enano_json_decode($info);
+	}
+	catch ( Zend_Json_Exception $e )
+	{
+		die(enano_json_encode(array(
+				'mode' => 'error',
+				'error' => 'Exception in JSON decoder'
+			)));
+	}
+	
+	if ( !is_int($info['db_port']) )
+	{
+		$return['host_good'] = false;
+		echo enano_json_encode($return);
+		exit;
+	}
+	
+	$port = $info['db_port'] ? $info['db_port'] : 5432;
+	
+	// Try to connect as the normal user
+	// generate connection string
+	$conn_string = "dbname = '" . addslashes($info['db_name']) . "' port = '$port' host = '" . addslashes($info['db_host']) . "' " . 
+ 								"user= '" . addslashes($info['db_user']) . "' password = '" . addslashes($info['db_pass']) . "'";
+	$test = @pg_connect($conn_string);
+	if ( !$test )
+	{
+		// Connection as normal user failed. PgSQL doesn't give us an error string so
+		// just try to connect as root. If even that fails, exit with an error
+		$return['creating_user'] = true;
+		if ( !empty($info['db_root_user']) && !empty($info['db_root_pass']) )
+		{
+			$conn_string_root = "dbname = '" . addslashes($info['db_name']) . "' port = '$port' host = '" . addslashes($info['db_host']) . "' " . 
+													"user= '" . addslashes($info['db_root_user']) . "' password = '" . addslashes($info['db_root_pass']) . "'";
+			// Attempt connection as root
+			$test_root = @pg_connect($conn_string_root);
+			if ( !$test_root )
+			{
+				$return['root_fail'] = true;
+			}
+			else
+			{
+				$return['can_install'] = true;
+			}
+		}
+	}
+	else
+	{
+		$return['can_install'] = true;
+	}
+	
+	$did_version_check = false;
+	
+	if ( isset($test) && @is_resource($test) )
+	{
+		$server_info = @pg_version($test);
+		if ( isset($server_info['server']) )
+		{
+			$did_version_check = true;
+			$return['version'] = array(
+					'version' => $server_info['server'],
+					'good' => ( version_compare($server_info['server'], '8.2.5', '>=') )
+				);
+		}
+		@pg_close($test);
+	}
+	
+	if ( isset($test_root) && @is_resource($test_root) )
+	{
+		$server_info = @pg_version($test_root);
+		if ( isset($server_info['server']) )
+		{
+			$did_version_check = true;
+			$return['version'] = array(
+					'version' => $server_info['server'],
+					'good' => ( version_compare($server_info['server'], '8.2.5', '>=') )
+				);
+		}
+		@pg_close($test_root);
+	}
+	
+	if ( !$did_version_check )
+	{
+		$return['version'] = array(
+				'version' => 'indeterminate',
+				'good' => false
+			);
+	}
+	else
+	{
+		if ( !$return['version']['good'] )
+		{
+			$return['can_install'] = false;
+		}
+	}
+	
+	echo enano_json_encode($return);
+	
+	exit();
 }
 
 $ui->add_header('<script type="text/javascript" src="includes/js/formutils.js"></script>');
@@ -169,173 +169,173 @@
 
 <script type="text/javascript">
 
-  var img_bad = '../images/checkbad.png';
-  var img_good = '../images/check.png';
-  var img_neu = '../images/checkunk.png';
-  
-  var tested = false;
+	var img_bad = '../images/checkbad.png';
+	var img_good = '../images/check.png';
+	var img_neu = '../images/checkunk.png';
+	
+	var tested = false;
 
-  function verify(field)
-  {
-    if ( tested && !field )
-      return true;
-    tested = false;
-    if ( document.getElementById('verify_error').className != '' )
-    {
-      document.getElementById('verify_error').className = '';
-      document.getElementById('verify_error').innerHTML = '';
-    }
-    var frm = document.forms.database_info;
-    // List of fields
-    var fields = {
-      db_host: frm.db_host,
-      db_port: frm.db_port,
-      db_name: frm.db_name,
-      db_user: frm.db_user,
-      db_pass: frm.db_pass,
-      table_prefix: frm.table_prefix,
-      db_root_user: frm.db_root_user,
-      db_root_pass: frm.db_root_pass
-    };
-    var passed = true;
-    // Main validation
-    if ( field == fields.db_host || !field )
-    {
-      var matches = fields.db_host.value.match(/^([a-z0-9_-]+)((\.([a-z0-9_-]+))*)?$/);
-      document.getElementById('s_db_host').src = ( matches ) ? img_neu : img_bad;
-      if ( !matches )
-        passed = false;
-    }
-    if ( field == fields.db_port || !field )
-    {
-      var matches = fields.db_port.value.match(/^[0-9]+$/);
-      document.getElementById('s_db_port').src = ( matches ) ? img_neu : img_bad;
-      if ( !matches )
-        passed = false;
-    }
-    if ( field == fields.db_name || !field )
-    {
-      var matches = fields.db_name.value.match(/^[A-z0-9_-]+$/);
-      document.getElementById('s_db_name').src = ( matches ) ? img_neu : img_bad;
-      if ( !matches )
-        passed = false;
-    }
-    if ( field == fields.db_user || field == fields.db_pass || !field )
-    {
-      var matches = fields.db_user.value.match(/^[A-z0-9_-]+$/);
-      document.getElementById('s_db_auth').src = ( matches ) ? img_neu : img_bad;
-      if ( !matches )
-        passed = false;
-    }
-    if ( field == fields.table_prefix || !field )
-    {
-      var matches = fields.table_prefix.value.match(/^[a-z0-9_]*$/);
-      document.getElementById('s_table_prefix').src = ( matches ) ? img_good : img_bad;
-      if ( !matches )
-        passed = false;
-    }
-    if ( field == fields.db_root_user || field == fields.db_root_pass || !field )
-    {
-      var matches = ( ( fields.db_root_user.value.match(/^[A-z0-9_-]+$/) && fields.db_root_pass.value.match(/^.+$/) ) || fields.db_root_user.value == '' );
-      document.getElementById('s_db_root').src = ( matches ) ? img_neu : img_bad;
-      if ( !matches )
-        passed = false;
-    }
-    return passed;
-  }
-  
-  function ajaxTestConnection()
-  {
-    if ( !verify() )
-    {
-      document.body.scrollTop = 0;
-      $('enano-body').effect('shake', {}, 750);
-      document.getElementById('verify_error').className = 'error-box-mini';
-      document.getElementById('verify_error').innerHTML = $lang.get('meta_msg_err_verification');
-      return false;
-    }
-    install_set_ajax_loading();
-    
-    var frm = document.forms.database_info;
-    var connection_info = 'info=' + ajaxEscape(toJSONString({
-        db_host: frm.db_host.value,
-        db_port: parseInt(frm.db_port.value),
-        db_name: frm.db_name.value,
-        db_user: frm.db_user.value,
-        db_pass: frm.db_pass.value,
-        db_root_user: frm.db_root_user.value,
-        db_root_pass: frm.db_root_pass.value
-      }));
-    
-    ajaxPost(scriptPath + '/install/install.php?stage=database', connection_info + '&driver=postgresql&ajax_test=on&language=' + enano_lang_code[ENANO_LANG_ID], function(ajax)
-      {
-        if ( ajax.readyState == 4 && ajax.status == 200 )
-        {
-          setTimeout('install_unset_ajax_loading();', 750);
-          // Process response
-          var response = String(ajax.responseText + '');
-          if ( response.substr(0, 1) != '{' )
-          {
-            alert('Received an invalid JSON response from the server.');
-            return false;
-          }
-          response = parseJSON(response);
-          document.getElementById('e_db_host').innerHTML = '';
-          document.getElementById('e_db_name').innerHTML = '';
-          document.getElementById('e_db_auth').innerHTML = '';
-          document.getElementById('e_db_root').innerHTML = '';
-          if ( response.can_install )
-          {
-            tested = true;
-            var statuses = ['s_db_host', 's_db_name', 's_db_auth', 's_table_prefix', 's_db_root', 's_pgsql_version'];
-            for ( var i in statuses )
-            {
-              var img = document.getElementById(statuses[i]);
-              if ( img )
-                img.src = img_good;
-            }
-            document.getElementById('e_pgsql_version').innerHTML = $lang.get('dbpgsql_msg_info_version_good');
-            document.getElementById('verify_error').className = 'info-box-mini';
-            document.getElementById('verify_error').innerHTML = $lang.get('dbpgsql_msg_test_success');
-            if ( response.creating_db )
-            {
-              document.getElementById('e_db_name').innerHTML = $lang.get('dbpgsql_msg_warn_creating_db');
-            }
-            if ( response.creating_user )
-            {
-              document.getElementById('e_db_auth').innerHTML = $lang.get('dbpgsql_msg_warn_creating_user');
-            }
-          }
-          else
-          {
-            // Oh dear, oh dear, oh dear, oh dear, oh dear...
-            if ( response.creating_db )
-            {
-              document.getElementById('e_db_name').innerHTML = $lang.get('dbpgsql_msg_err_dbexist', { pg_error: response.last_error });
-              document.getElementById('s_db_name').src = img_bad;
-            }
-            if ( response.creating_user )
-            {
-              document.getElementById('e_db_auth').innerHTML = $lang.get('dbpgsql_msg_err_auth', { pg_error: response.last_error });
-              document.getElementById('s_db_auth').src = img_bad;
-            }
-            if ( !response.host_good )
-            {
-              document.getElementById('e_db_host').innerHTML = $lang.get('dbpgsql_msg_err_connect', { db_host: frm.db_host.value, pg_error: response.last_error });
-              document.getElementById('s_db_host').src = img_bad;
-            }
-            if ( !response.version.good )
-            {
-              if ( response.version.version == 'indeterminate' )
-                document.getElementById('e_pgsql_version').innerHTML = $lang.get('dbpgsql_msg_warn_pg_version');
-              else
-                document.getElementById('e_pgsql_version').innerHTML = $lang.get('dbpgsql_msg_err_version', { pg_version: response.version.version });
-              document.getElementById('s_pgsql_version').src = img_bad;
-            }
-          }
-        }
-      });
-  }
+	function verify(field)
+	{
+		if ( tested && !field )
+			return true;
+		tested = false;
+		if ( document.getElementById('verify_error').className != '' )
+		{
+			document.getElementById('verify_error').className = '';
+			document.getElementById('verify_error').innerHTML = '';
+		}
+		var frm = document.forms.database_info;
+		// List of fields
+		var fields = {
+			db_host: frm.db_host,
+			db_port: frm.db_port,
+			db_name: frm.db_name,
+			db_user: frm.db_user,
+			db_pass: frm.db_pass,
+			table_prefix: frm.table_prefix,
+			db_root_user: frm.db_root_user,
+			db_root_pass: frm.db_root_pass
+		};
+		var passed = true;
+		// Main validation
+		if ( field == fields.db_host || !field )
+		{
+			var matches = fields.db_host.value.match(/^([a-z0-9_-]+)((\.([a-z0-9_-]+))*)?$/);
+			document.getElementById('s_db_host').src = ( matches ) ? img_neu : img_bad;
+			if ( !matches )
+				passed = false;
+		}
+		if ( field == fields.db_port || !field )
+		{
+			var matches = fields.db_port.value.match(/^[0-9]+$/);
+			document.getElementById('s_db_port').src = ( matches ) ? img_neu : img_bad;
+			if ( !matches )
+				passed = false;
+		}
+		if ( field == fields.db_name || !field )
+		{
+			var matches = fields.db_name.value.match(/^[A-z0-9_-]+$/);
+			document.getElementById('s_db_name').src = ( matches ) ? img_neu : img_bad;
+			if ( !matches )
+				passed = false;
+		}
+		if ( field == fields.db_user || field == fields.db_pass || !field )
+		{
+			var matches = fields.db_user.value.match(/^[A-z0-9_-]+$/);
+			document.getElementById('s_db_auth').src = ( matches ) ? img_neu : img_bad;
+			if ( !matches )
+				passed = false;
+		}
+		if ( field == fields.table_prefix || !field )
+		{
+			var matches = fields.table_prefix.value.match(/^[a-z0-9_]*$/);
+			document.getElementById('s_table_prefix').src = ( matches ) ? img_good : img_bad;
+			if ( !matches )
+				passed = false;
+		}
+		if ( field == fields.db_root_user || field == fields.db_root_pass || !field )
+		{
+			var matches = ( ( fields.db_root_user.value.match(/^[A-z0-9_-]+$/) && fields.db_root_pass.value.match(/^.+$/) ) || fields.db_root_user.value == '' );
+			document.getElementById('s_db_root').src = ( matches ) ? img_neu : img_bad;
+			if ( !matches )
+				passed = false;
+		}
+		return passed;
+	}
+	
+	function ajaxTestConnection()
+	{
+		if ( !verify() )
+		{
+			document.body.scrollTop = 0;
+			$('enano-body').effect('shake', {}, 750);
+			document.getElementById('verify_error').className = 'error-box-mini';
+			document.getElementById('verify_error').innerHTML = $lang.get('meta_msg_err_verification');
+			return false;
+		}
+		install_set_ajax_loading();
+		
+		var frm = document.forms.database_info;
+		var connection_info = 'info=' + ajaxEscape(toJSONString({
+				db_host: frm.db_host.value,
+				db_port: parseInt(frm.db_port.value),
+				db_name: frm.db_name.value,
+				db_user: frm.db_user.value,
+				db_pass: frm.db_pass.value,
+				db_root_user: frm.db_root_user.value,
+				db_root_pass: frm.db_root_pass.value
+			}));
+		
+		ajaxPost(scriptPath + '/install/install.php?stage=database', connection_info + '&driver=postgresql&ajax_test=on&language=' + enano_lang_code[ENANO_LANG_ID], function(ajax)
+			{
+				if ( ajax.readyState == 4 && ajax.status == 200 )
+				{
+					setTimeout('install_unset_ajax_loading();', 750);
+					// Process response
+					var response = String(ajax.responseText + '');
+					if ( response.substr(0, 1) != '{' )
+					{
+						alert('Received an invalid JSON response from the server.');
+						return false;
+					}
+					response = parseJSON(response);
+					document.getElementById('e_db_host').innerHTML = '';
+					document.getElementById('e_db_name').innerHTML = '';
+					document.getElementById('e_db_auth').innerHTML = '';
+					document.getElementById('e_db_root').innerHTML = '';
+					if ( response.can_install )
+					{
+						tested = true;
+						var statuses = ['s_db_host', 's_db_name', 's_db_auth', 's_table_prefix', 's_db_root', 's_pgsql_version'];
+						for ( var i in statuses )
+						{
+							var img = document.getElementById(statuses[i]);
+							if ( img )
+								img.src = img_good;
+						}
+						document.getElementById('e_pgsql_version').innerHTML = $lang.get('dbpgsql_msg_info_version_good');
+						document.getElementById('verify_error').className = 'info-box-mini';
+						document.getElementById('verify_error').innerHTML = $lang.get('dbpgsql_msg_test_success');
+						if ( response.creating_db )
+						{
+							document.getElementById('e_db_name').innerHTML = $lang.get('dbpgsql_msg_warn_creating_db');
+						}
+						if ( response.creating_user )
+						{
+							document.getElementById('e_db_auth').innerHTML = $lang.get('dbpgsql_msg_warn_creating_user');
+						}
+					}
+					else
+					{
+						// Oh dear, oh dear, oh dear, oh dear, oh dear...
+						if ( response.creating_db )
+						{
+							document.getElementById('e_db_name').innerHTML = $lang.get('dbpgsql_msg_err_dbexist', { pg_error: response.last_error });
+							document.getElementById('s_db_name').src = img_bad;
+						}
+						if ( response.creating_user )
+						{
+							document.getElementById('e_db_auth').innerHTML = $lang.get('dbpgsql_msg_err_auth', { pg_error: response.last_error });
+							document.getElementById('s_db_auth').src = img_bad;
+						}
+						if ( !response.host_good )
+						{
+							document.getElementById('e_db_host').innerHTML = $lang.get('dbpgsql_msg_err_connect', { db_host: frm.db_host.value, pg_error: response.last_error });
+							document.getElementById('s_db_host').src = img_bad;
+						}
+						if ( !response.version.good )
+						{
+							if ( response.version.version == 'indeterminate' )
+								document.getElementById('e_pgsql_version').innerHTML = $lang.get('dbpgsql_msg_warn_pg_version');
+							else
+								document.getElementById('e_pgsql_version').innerHTML = $lang.get('dbpgsql_msg_err_version', { pg_version: response.version.version });
+							document.getElementById('s_pgsql_version').src = img_bad;
+						}
+					}
+				}
+			});
+	}
 
 </script>
 
@@ -344,144 +344,144 @@
 <input type="hidden" name="driver" value="postgresql" />
 
 <table border="0" cellspacing="0" cellpadding="10" width="100%">
-  <tr>
-    <td colspan="3" style="text-align: center">
-      <h3><?php echo $lang->get('dbpgsql_table_title'); ?></h3>
-    </td>
-  </tr>
-  <tr>
-    <td>
-      <b><?php echo $lang->get('dbpgsql_field_hostname_title'); ?></b>
-      <br /><?php echo $lang->get('dbpgsql_field_hostname_body'); ?>
-      <br /><span style="color: #993300" id="e_db_host"></span>
-    </td>
-    <td>
-      <input onkeyup="verify(this);" tabindex="1" name="db_host" size="30" type="text" />
-    </td>
-    <td>
-      <img id="s_db_host" alt="Good/bad icon" src="../images/checkbad.png" />
-    </td>
-  </tr>
-  <tr>
-    <td>
-      <b><?php echo $lang->get('dbpgsql_field_port_title'); ?></b>
-      <br /><?php echo $lang->get('dbpgsql_field_port_body'); ?>
-      <br /><span style="color: #993300" id="e_db_port"></span>
-    </td>
-    <td>
-      <input onkeyup="verify(this);" tabindex="2" name="db_port" size="5" type="text" value="5432" />
-    </td>
-    <td>
-      <img id="s_db_port" alt="Good/bad icon" src="../images/checkbad.png" />
-    </td>
-  </tr>
-  <tr>
-    <td>
-      <b><?php echo $lang->get('dbpgsql_field_dbname_title'); ?></b><br />
-      <?php echo $lang->get('dbpgsql_field_dbname_body'); ?><br />
-      <span style="color: #993300" id="e_db_name"></span>
-    </td>
-    <td>
-      <input onkeyup="verify(this);" tabindex="2" name="db_name" size="30" type="text" />
-    </td>
-    <td>
-      <img id="s_db_name" alt="Good/bad icon" src="../images/checkbad.png" />
-    </td>
-  </tr>
-  <tr>
-    <td>
-      <b><?php echo $lang->get('dbpgsql_field_dbauth_title'); ?></b><br />
-      <?php echo $lang->get('dbpgsql_field_dbauth_body'); ?><br />
-      <span style="color: #993300" id="e_db_auth"></span>
-    </td>
-    <td>
-      <input onkeyup="verify(this);" tabindex="3" name="db_user" size="30" type="text" /><br />
-      <br />
-      <input name="db_pass" size="30" tabindex="4" type="password" />
-    </td>
-    <td>
-      <img id="s_db_auth" alt="Good/bad icon" src="../images/checkbad.png" />
-    </td>
-  </tr>
-  <tr>
-    <td colspan="3" style="text-align: center">
-      <h3><?php echo $lang->get('database_heading_optionalinfo'); ?></h3>
-    </td>
-  </tr>
-  <tr>
-    <td>
-      <b><?php echo $lang->get('dbpgsql_field_tableprefix_title'); ?></b><br />
-      <?php echo $lang->get('dbpgsql_field_tableprefix_body'); ?>
-    </td>
-    <td>
-      <input onkeyup="verify(this);" tabindex="5" name="table_prefix" size="30" type="text" />
-    </td>
-    <td>
-      <img id="s_table_prefix" alt="Good/bad icon" src="../images/check.png" />
-    </td>
-  </tr>
-  <tr>
-    <td>
-      <b><?php echo $lang->get('dbpgsql_field_rootauth_title'); ?></b><br />
-      <?php echo $lang->get('dbpgsql_field_rootauth_body'); ?><br />
-      <span style="color: #993300" id="e_db_root"></span>
-    </td>
-    <td>
-      <input onkeyup="verify(this);" tabindex="6" name="db_root_user" size="30" type="text" /><br />
-      <br />
-      <input onkeyup="verify(this);" tabindex="7" name="db_root_pass" size="30" type="password" />
-    </td>
-    <td>
-      <img id="s_db_root" alt="Good/bad icon" src="../images/check.png" />
-    </td>
-  </tr>
-  <tr>
-    <td>
-      <b><?php echo $lang->get('dbpgsql_field_pgsqlversion_title'); ?></b>
-    </td>
-    <td id="e_pgsql_version">
-      <?php echo $lang->get('dbpgsql_field_pgsqlversion_blurb_willbechecked'); ?>
-    </td>
-    <td>
-      <img id="s_pgsql_version" alt="Good/bad icon" src="../images/checkunk.png" />
-    </td>
-  </tr>
-  <tr>
-    <td>
-      <b><?php echo $lang->get('dbpgsql_field_droptables_title'); ?></b><br />
-      <?php echo $lang->get('dbpgsql_field_droptables_body'); ?>
-    </td>
-    <td colspan="2">
-      <input type="checkbox" tabindex="8" name="drop_tables" id="dtcheck" />  <label for="dtcheck"><?php echo $lang->get('dbpgsql_field_droptables_lbl'); ?></label>
-    </td>
-  </tr>
-  <tr>
-    <td colspan="3" style="text-align: center">
-      <input type="button" value="<?php echo $lang->get('dbpgsql_btn_testconnection'); ?>" onclick="ajaxTestConnection();" />
-      <div id="verify_error"></div>
-    </td>
-  </tr>
+	<tr>
+		<td colspan="3" style="text-align: center">
+			<h3><?php echo $lang->get('dbpgsql_table_title'); ?></h3>
+		</td>
+	</tr>
+	<tr>
+		<td>
+			<b><?php echo $lang->get('dbpgsql_field_hostname_title'); ?></b>
+			<br /><?php echo $lang->get('dbpgsql_field_hostname_body'); ?>
+			<br /><span style="color: #993300" id="e_db_host"></span>
+		</td>
+		<td>
+			<input onkeyup="verify(this);" tabindex="1" name="db_host" size="30" type="text" />
+		</td>
+		<td>
+			<img id="s_db_host" alt="Good/bad icon" src="../images/checkbad.png" />
+		</td>
+	</tr>
+	<tr>
+		<td>
+			<b><?php echo $lang->get('dbpgsql_field_port_title'); ?></b>
+			<br /><?php echo $lang->get('dbpgsql_field_port_body'); ?>
+			<br /><span style="color: #993300" id="e_db_port"></span>
+		</td>
+		<td>
+			<input onkeyup="verify(this);" tabindex="2" name="db_port" size="5" type="text" value="5432" />
+		</td>
+		<td>
+			<img id="s_db_port" alt="Good/bad icon" src="../images/checkbad.png" />
+		</td>
+	</tr>
+	<tr>
+		<td>
+			<b><?php echo $lang->get('dbpgsql_field_dbname_title'); ?></b><br />
+			<?php echo $lang->get('dbpgsql_field_dbname_body'); ?><br />
+			<span style="color: #993300" id="e_db_name"></span>
+		</td>
+		<td>
+			<input onkeyup="verify(this);" tabindex="2" name="db_name" size="30" type="text" />
+		</td>
+		<td>
+			<img id="s_db_name" alt="Good/bad icon" src="../images/checkbad.png" />
+		</td>
+	</tr>
+	<tr>
+		<td>
+			<b><?php echo $lang->get('dbpgsql_field_dbauth_title'); ?></b><br />
+			<?php echo $lang->get('dbpgsql_field_dbauth_body'); ?><br />
+			<span style="color: #993300" id="e_db_auth"></span>
+		</td>
+		<td>
+			<input onkeyup="verify(this);" tabindex="3" name="db_user" size="30" type="text" /><br />
+			<br />
+			<input name="db_pass" size="30" tabindex="4" type="password" />
+		</td>
+		<td>
+			<img id="s_db_auth" alt="Good/bad icon" src="../images/checkbad.png" />
+		</td>
+	</tr>
+	<tr>
+		<td colspan="3" style="text-align: center">
+			<h3><?php echo $lang->get('database_heading_optionalinfo'); ?></h3>
+		</td>
+	</tr>
+	<tr>
+		<td>
+			<b><?php echo $lang->get('dbpgsql_field_tableprefix_title'); ?></b><br />
+			<?php echo $lang->get('dbpgsql_field_tableprefix_body'); ?>
+		</td>
+		<td>
+			<input onkeyup="verify(this);" tabindex="5" name="table_prefix" size="30" type="text" />
+		</td>
+		<td>
+			<img id="s_table_prefix" alt="Good/bad icon" src="../images/check.png" />
+		</td>
+	</tr>
+	<tr>
+		<td>
+			<b><?php echo $lang->get('dbpgsql_field_rootauth_title'); ?></b><br />
+			<?php echo $lang->get('dbpgsql_field_rootauth_body'); ?><br />
+			<span style="color: #993300" id="e_db_root"></span>
+		</td>
+		<td>
+			<input onkeyup="verify(this);" tabindex="6" name="db_root_user" size="30" type="text" /><br />
+			<br />
+			<input onkeyup="verify(this);" tabindex="7" name="db_root_pass" size="30" type="password" />
+		</td>
+		<td>
+			<img id="s_db_root" alt="Good/bad icon" src="../images/check.png" />
+		</td>
+	</tr>
+	<tr>
+		<td>
+			<b><?php echo $lang->get('dbpgsql_field_pgsqlversion_title'); ?></b>
+		</td>
+		<td id="e_pgsql_version">
+			<?php echo $lang->get('dbpgsql_field_pgsqlversion_blurb_willbechecked'); ?>
+		</td>
+		<td>
+			<img id="s_pgsql_version" alt="Good/bad icon" src="../images/checkunk.png" />
+		</td>
+	</tr>
+	<tr>
+		<td>
+			<b><?php echo $lang->get('dbpgsql_field_droptables_title'); ?></b><br />
+			<?php echo $lang->get('dbpgsql_field_droptables_body'); ?>
+		</td>
+		<td colspan="2">
+			<input type="checkbox" tabindex="8" name="drop_tables" id="dtcheck" />  <label for="dtcheck"><?php echo $lang->get('dbpgsql_field_droptables_lbl'); ?></label>
+		</td>
+	</tr>
+	<tr>
+		<td colspan="3" style="text-align: center">
+			<input type="button" value="<?php echo $lang->get('dbpgsql_btn_testconnection'); ?>" onclick="ajaxTestConnection();" />
+			<div id="verify_error"></div>
+		</td>
+	</tr>
 
 </table>
 
 <table border="0">
-  <tr>
-    <td>
-      <input type="submit" tabindex="9" value="<?php echo $lang->get('meta_btn_continue'); ?>" onclick="return verify();" name="_cont" />
-    </td>
-    <td>
-      <p>
-        <span style="font-weight: bold;"><?php echo $lang->get('meta_lbl_before_continue'); ?></span><br />
-        &bull; <?php echo $lang->get('database_objective_test'); ?><br />
-        &bull; <?php echo $lang->get('database_objective_uncrypt'); ?>
-      </p>
-    </td>
-  </tr>
+	<tr>
+		<td>
+			<input type="submit" tabindex="9" value="<?php echo $lang->get('meta_btn_continue'); ?>" onclick="return verify();" name="_cont" />
+		</td>
+		<td>
+			<p>
+				<span style="font-weight: bold;"><?php echo $lang->get('meta_lbl_before_continue'); ?></span><br />
+				&bull; <?php echo $lang->get('database_objective_test'); ?><br />
+				&bull; <?php echo $lang->get('database_objective_uncrypt'); ?>
+			</p>
+		</td>
+	</tr>
 </table>
 
 </form>
 
 <script type="text/javascript">
-  verify();
+	verify();
 </script>