New files from unstable branch

[fa-stable.git] / install / save.php

diff --git a/install/save.php b/install/save.php
index 801c2a1ab7a66902e22255c47d8558d4be743996..1e568b653d8d6a9f4a399fccb0f899d1bb1b4712 100644 (file)
--- a/install/save.php
+++ b/install/save.php
@@ -27,7 +27,8 @@ if (!function_exists("_")) {
 //
 function display_error($message)
 {
-       global $_POST;
+       global $_POST, $path_to_root;
+
        if(isset($message) AND $message != '')
        {
                // Copy values entered into session so user doesn't have to re-enter everything
@@ -264,7 +265,7 @@ if (!isset($_POST['admin_email']) || $_POST['admin_email'] == '')
 }
 else
 {
-       if (eregi("^([0-9a-zA-Z]+[-._+&])*[0-9a-zA-Z]+@([-0-9a-zA-Z]+[.])+[a-zA-Z]{2,6}$", $_POST['admin_email']))
+       if (preg_match("/^([0-9a-zA-Z]+[-._+&])*[0-9a-zA-Z]+@([-0-9a-zA-Z]+[.])+[a-zA-Z]{2,6}$/i", $_POST['admin_email']))
        {
                $admin_email = $_POST['admin_email'];
        }
@@ -381,8 +382,10 @@ if (!$db)
 }
 
 session_unset();
+session_regenerate_id();
 session_destroy();
 $_SESSION = array();
+
 header("Location: ".$path_to_root."/index.php");
 exit();