Minor cleanup to some code in installation/upgrade which refused to a…

…ccept valid email address...changed expValidator code to use same routine as other email checking methods.

Fixed installation create administrator failure to go back to install-7 instead of old create admin file.
Simplified install/upgrade check in exponent.php

framework/core/subsystems/expValidator.php

@@ -447,6 +447,9 @@ public static function flashAndReturnToForm($queue='message', $msg, $post=null)
 	 * @return bool
 	 */
 	public static function validate_email_address($email) {
+		return expValidator::isValidEmail($email);
+
+		// old code
         // First, we check that there's one @ symbol, and that the lengths are right
 //        if (!ereg("^[^@]{1,64}@[^@]{1,255}$", $email)) {
         if (!preg_match("^[^@]{1,64}@[^@]{1,255}$", $email)) {

index.php

@@ -71,12 +71,7 @@ function epb($buffer, $mode) {
 		//exponent_users_login("anonymous", "anonymous");
 	}
 
-	if (@file_exists(BASE.'install/not_configured')) {
-		header('Location: '.URL_FULL.'install/index.php');
-		exit('Redirecting to the Exponent Install Wizard');
-	}
-
-	if (!(file_exists(BASE.'conf/config.php'))) {
+	if (@file_exists(BASE.'install/not_configured') || !(file_exists(BASE.'conf/config.php'))) {
 		header('Location: '.URL_FULL.'install/index.php');
 		exit('Redirecting to the Exponent Install Wizard');
 	}

install/pages/install-7.php

@@ -29,7 +29,7 @@
 } else {
     if (expValidator::validate_email_address($_POST['email']) == false) {
         flash('You must supply a valid email address.');
-        header('Location: index.php?page=admin_user&erremail=true');
+        header('Location: index.php?page=install-6&erremail=true');
         exit();
     }
 	$user->password = md5($_POST['password']);