diff -r de56132c008d -r bdac73ed481e install/includes/stages/login.php
--- a/install/includes/stages/login.php	Sun Mar 28 21:49:26 2010 -0400
+++ b/install/includes/stages/login.php	Sun Mar 28 23:10:46 2010 -0400
@@ -14,7 +14,7 @@
  */
 
 if ( !defined('IN_ENANO_INSTALL') )
-  die();
+	die();
 
 // AES functions required
 require_once( ENANO_ROOT . '/includes/rijndael.php' );
@@ -25,28 +25,28 @@
 require( ENANO_ROOT . '/config.new.php' );
 if ( !defined('ENANO_INSTALL_HAVE_CONFIG') )
 {
-  die('Config file is corrupt');
+	die('Config file is corrupt');
 }
 $db = new $dbdriver();
 $result = $db->connect();
 if ( !$result )
-  die('DB privileges were revoked');
+	die('DB privileges were revoked');
 
 // Is the key in the database?
 $q = $db->sql_query('SELECT config_value FROM ' . table_prefix . 'config WHERE config_name = \'install_aes_key\';');
 if ( !$q )
-  $db->_die();
+	$db->_die();
 if ( $db->numrows() > 0 )
 {
-  list($install_aes_key) = $db->fetchrow_num();
+	list($install_aes_key) = $db->fetchrow_num();
 }
 else
 {
-  $aes = AESCrypt::singleton(AES_BITS, AES_BLOCKSIZE);
-  $install_aes_key = $aes->gen_readymade_key();
-  
-  if ( ! $db->sql_query('INSERT INTO ' . table_prefix . 'config ( config_name, config_value ) VALUES ( \'install_aes_key\', \'' . $install_aes_key .'\' ); ') )
-    $db->_die();
+	$aes = AESCrypt::singleton(AES_BITS, AES_BLOCKSIZE);
+	$install_aes_key = $aes->gen_readymade_key();
+	
+	if ( ! $db->sql_query('INSERT INTO ' . table_prefix . 'config ( config_name, config_value ) VALUES ( \'install_aes_key\', \'' . $install_aes_key .'\' ); ') )
+		$db->_die();
 }
 $db->free_result($q);
 
@@ -60,174 +60,174 @@
 
 <script type="text/javascript">
 
-  // <![CDATA[
-  
-  function verify(target)
-  {
-    var frm = document.forms [ 'install_login' ];
-    var undefined;
-    var passed = true;
-    
-    var data = {
-      username: frm.username.value,
-      password: frm.password.value,
-      password_confirm: frm.password_confirm.value,
-      email: frm.email.value
-    };
-    
-    if ( !target )
-      target = { name: undefined };
-    
-    if ( target.name == undefined || target.name == 'username' )
-    {
-      var matches = validateUsername(data.username);
-      document.getElementById('s_username').src = ( matches ) ? img_good : img_bad;
-      if ( !matches )
-        passed = false;
-    }
-    
-    if ( target.name == undefined || target.name == 'password' || target.name == 'password_confirm' )
-    {
-      var matches = ( data.password.length >= 6 && data.password == data.password_confirm ) ;
-      document.getElementById('s_password').src = ( matches ) ? img_good : img_bad;
-      if ( !matches )
-        passed = false;
-    }
-    
-    if ( target.name == undefined || target.name == 'email' )
-    {
-      var matches = validateEmail(data.email);
-      document.getElementById('s_email').src = ( matches ) ? img_good : img_bad;
-      if ( !matches )
-        passed = false;
-    }
-    
-    return passed;
-  }
-  
-  function verify_submit()
-  {
-    if ( verify() )
-      return true;
-    alert($lang.get('login_err_verify_failure'));
-    return false;
-  }
-  
-  function submit_encrypt()
-  {
-    var frm = document.forms [ 'install_login' ];
-    var password = frm.password.value;
-    var pass_conf = frm.password_confirm.value;
-    var crypt_key = frm.crypt_key.value;
-    
-    if ( password != pass_conf )
-      return false;
-    
-    if ( !aes_self_test() )
-      // Return true to prevent form from failing
-      return true;
-      
-    if ( frm.crypt_key.KeyBak )
-    {
-      crypt_key = frm.crypt_key.KeyBak;
-    }
-    frm.crypt_key.KeyBak = crypt_key;
-    
-    password = stringToByteArray(password);
-    crypt_key = hexToByteArray(crypt_key);
-    
-    var crypt_data = rijndaelEncrypt(password, crypt_key, 'ECB');
-    
-    if ( !crypt_data )
-    {
-      alert($lang.get('login_err_rijndael_failed'));
-      return false;
-    }
-  
-    crypt_data = byteArrayToHex(crypt_data);
-    
-    frm.password.value = '';
-    frm.password_confirm.value = '';
-    frm.crypt_key.value = '';
-    frm.crypt_data.value = crypt_data;
-    
-    return true;
-  }
-  
-  addOnloadHook(function()
-    {
-      load_component('crypto');
-      load_component('l10n');
-    });
-  
-  // ]]>
+	// <![CDATA[
+	
+	function verify(target)
+	{
+		var frm = document.forms [ 'install_login' ];
+		var undefined;
+		var passed = true;
+		
+		var data = {
+			username: frm.username.value,
+			password: frm.password.value,
+			password_confirm: frm.password_confirm.value,
+			email: frm.email.value
+		};
+		
+		if ( !target )
+			target = { name: undefined };
+		
+		if ( target.name == undefined || target.name == 'username' )
+		{
+			var matches = validateUsername(data.username);
+			document.getElementById('s_username').src = ( matches ) ? img_good : img_bad;
+			if ( !matches )
+				passed = false;
+		}
+		
+		if ( target.name == undefined || target.name == 'password' || target.name == 'password_confirm' )
+		{
+			var matches = ( data.password.length >= 6 && data.password == data.password_confirm ) ;
+			document.getElementById('s_password').src = ( matches ) ? img_good : img_bad;
+			if ( !matches )
+				passed = false;
+		}
+		
+		if ( target.name == undefined || target.name == 'email' )
+		{
+			var matches = validateEmail(data.email);
+			document.getElementById('s_email').src = ( matches ) ? img_good : img_bad;
+			if ( !matches )
+				passed = false;
+		}
+		
+		return passed;
+	}
+	
+	function verify_submit()
+	{
+		if ( verify() )
+			return true;
+		alert($lang.get('login_err_verify_failure'));
+		return false;
+	}
+	
+	function submit_encrypt()
+	{
+		var frm = document.forms [ 'install_login' ];
+		var password = frm.password.value;
+		var pass_conf = frm.password_confirm.value;
+		var crypt_key = frm.crypt_key.value;
+		
+		if ( password != pass_conf )
+			return false;
+		
+		if ( !aes_self_test() )
+			// Return true to prevent form from failing
+			return true;
+			
+		if ( frm.crypt_key.KeyBak )
+		{
+			crypt_key = frm.crypt_key.KeyBak;
+		}
+		frm.crypt_key.KeyBak = crypt_key;
+		
+		password = stringToByteArray(password);
+		crypt_key = hexToByteArray(crypt_key);
+		
+		var crypt_data = rijndaelEncrypt(password, crypt_key, 'ECB');
+		
+		if ( !crypt_data )
+		{
+			alert($lang.get('login_err_rijndael_failed'));
+			return false;
+		}
+	
+		crypt_data = byteArrayToHex(crypt_data);
+		
+		frm.password.value = '';
+		frm.password_confirm.value = '';
+		frm.crypt_key.value = '';
+		frm.crypt_data.value = crypt_data;
+		
+		return true;
+	}
+	
+	addOnloadHook(function()
+		{
+			load_component('crypto');
+			load_component('l10n');
+		});
+	
+	// ]]>
 
 </script>
 
 <form action="install.php?stage=confirm" method="post" name="install_login" onsubmit="return ( verify_submit() && submit_encrypt() );"><?php
-  foreach ( $_POST as $key => &$value )
-  {
-    if ( !preg_match('/^[a-z0-9_]+$/', $key) )
-      die('You idiot hacker...');
-    if ( $key == '_cont' )
-      continue;
-    $value_clean = str_replace(array('\\', '"', '<', '>'), array('\\\\', '\\"', '&lt;', '&gt;'), $value);
-    echo "\n  <input type=\"hidden\" name=\"$key\" value=\"$value_clean\" />";
-  }
-  
-  $https = ( isset($_SERVER['HTTPS']) && $_SERVER['HTTPS'] != 'off' );
-  $scriptpath_full = 'http' . ( $https ? 's' : '' ) . '://' . $_SERVER['HTTP_HOST'] . scriptPath . '/';
-  ?>
-  
-  <input type="hidden" name="crypt_key" value="<?php echo $install_aes_key; ?>" />
-  <input type="hidden" name="crypt_data" value="" />
-  
-  <table border="0" cellspacing="0" cellpadding="10" style="width: 100%;">
-  
-    <tr>
-      <td style="width: 50%;">
-        <b><?php echo $lang->get('login_field_username'); ?></b>
-      </td>
-      <td style="width: 50%;">
-        <input type="text" tabindex="1" name="username" size="15" onkeyup="verify(this);" />
-      </td>
-      <td>
-        <img id="s_username" alt="Good/bad icon" src="../images/checkbad.png" />
-      </td>
-    </tr>
-    
-    <tr>
-      <td>
-        <b><?php echo $lang->get('login_field_password'); ?></b><br />
-        <?php echo $lang->get('login_aes_blurb'); ?>
-      </td>
-      <td>
-        <input type="password" tabindex="2" name="password" size="15" onkeyup="password_score_field(this); verify(this);" /><br />
-        <br />
-        <div id="pwmeter"></div>
-        <br />
-        <input type="password" tabindex="3" name="password_confirm" size="15" onkeyup="verify(this);" /> <small><?php echo $lang->get('login_field_password_confirm'); ?></small>
-      </td>
-      <td>
-        <img id="s_password" alt="Good/bad icon" src="../images/checkbad.png" />
-      </td>
-    </tr>
-    
-    <tr>
-      <td style="width: 50%;">
-        <b><?php echo $lang->get('login_field_email'); ?></b>
-      </td>
-      <td style="width: 50%;">
-        <input type="text" tabindex="4" name="email" size="30" onkeyup="verify(this);" />
-      </td>
-      <td>
-        <img id="s_email" alt="Good/bad icon" src="../images/checkbad.png" />
-      </td>
-    </tr>
-  
-  </table>
-  
-  <div style="text-align: center;">
-    <input type="submit" name="_cont" value="<?php echo $lang->get('meta_btn_continue'); ?>" />
-  </div>
+	foreach ( $_POST as $key => &$value )
+	{
+		if ( !preg_match('/^[a-z0-9_]+$/', $key) )
+			die('You idiot hacker...');
+		if ( $key == '_cont' )
+			continue;
+		$value_clean = str_replace(array('\\', '"', '<', '>'), array('\\\\', '\\"', '&lt;', '&gt;'), $value);
+		echo "\n  <input type=\"hidden\" name=\"$key\" value=\"$value_clean\" />";
+	}
+	
+	$https = ( isset($_SERVER['HTTPS']) && $_SERVER['HTTPS'] != 'off' );
+	$scriptpath_full = 'http' . ( $https ? 's' : '' ) . '://' . $_SERVER['HTTP_HOST'] . scriptPath . '/';
+	?>
+	
+	<input type="hidden" name="crypt_key" value="<?php echo $install_aes_key; ?>" />
+	<input type="hidden" name="crypt_data" value="" />
+	
+	<table border="0" cellspacing="0" cellpadding="10" style="width: 100%;">
+	
+		<tr>
+			<td style="width: 50%;">
+				<b><?php echo $lang->get('login_field_username'); ?></b>
+			</td>
+			<td style="width: 50%;">
+				<input type="text" tabindex="1" name="username" size="15" onkeyup="verify(this);" />
+			</td>
+			<td>
+				<img id="s_username" alt="Good/bad icon" src="../images/checkbad.png" />
+			</td>
+		</tr>
+		
+		<tr>
+			<td>
+				<b><?php echo $lang->get('login_field_password'); ?></b><br />
+				<?php echo $lang->get('login_aes_blurb'); ?>
+			</td>
+			<td>
+				<input type="password" tabindex="2" name="password" size="15" onkeyup="password_score_field(this); verify(this);" /><br />
+				<br />
+				<div id="pwmeter"></div>
+				<br />
+				<input type="password" tabindex="3" name="password_confirm" size="15" onkeyup="verify(this);" /> <small><?php echo $lang->get('login_field_password_confirm'); ?></small>
+			</td>
+			<td>
+				<img id="s_password" alt="Good/bad icon" src="../images/checkbad.png" />
+			</td>
+		</tr>
+		
+		<tr>
+			<td style="width: 50%;">
+				<b><?php echo $lang->get('login_field_email'); ?></b>
+			</td>
+			<td style="width: 50%;">
+				<input type="text" tabindex="4" name="email" size="30" onkeyup="verify(this);" />
+			</td>
+			<td>
+				<img id="s_email" alt="Good/bad icon" src="../images/checkbad.png" />
+			</td>
+		</tr>
+	
+	</table>
+	
+	<div style="text-align: center;">
+		<input type="submit" name="_cont" value="<?php echo $lang->get('meta_btn_continue'); ?>" />
+	</div>
 </form>