Security line in all includes changed
[mailer.git] / inc / install-inc.php
index f4146a7..55eb350 100644 (file)
  ************************************************************************/
 
 // Some security stuff...
  ************************************************************************/
 
 // Some security stuff...
-if (ereg(basename(__FILE__), $_SERVER['PHP_SELF']))
-{
+if (!defined('__SECURITY')) {
        $INC = substr(dirname(__FILE__), 0, strpos(dirname(__FILE__), "/inc") + 4) . "/security.php";
        require($INC);
 }
 
 //
        $INC = substr(dirname(__FILE__), 0, strpos(dirname(__FILE__), "/inc") + 4) . "/security.php";
        require($INC);
 }
 
 //
-function install_WriteData ($file, $COMMENT, $PREFIX, $SUFFIX, $DATA, $SNEAK=0)
-{
-       $DONE = false;  $SNEAK++;
-       if (file_exists($file))
-       {
-               $search = "CFG: ".$COMMENT;
+function install_WriteData ($file, $comment, $prefix, $suffix, $DATA, $sneak=0) {
+       // Initialize all and count up the "seak" value
+       $done = false;
+       $next = -1;
+       $sneak++;
+
+       if (FILE_READABLE($file)) {
+               $search = "CFG: ".$comment;
                $tmp = $file.".tmp";
                $tmp = $file.".tmp";
-               $fp = @fopen($file, 'r') or OUTPUT_HTML ("<STRONG>READ:</STRONG> ".$file."<BR>");
-               if (is_resource($fp))
-               {
-                       $fp_tmp = @fopen($tmp, 'w') or OUTPUT_HTML ("<STRONG>WRITE:</STRONG> ".$tmp."<BR>");
-                       if (is_resource($fp_tmp))
-                       {
-                               while (! feof($fp))
-                               {
+               $fp = @fopen($file, 'r') or OUTPUT_HTML("<STRONG>READ:</STRONG> ".$file."<br />");
+               if (is_resource($fp)) {
+                       $fp_tmp = @fopen($tmp, 'w') or OUTPUT_HTML("<STRONG>WRITE:</STRONG> ".$tmp."<br />");
+                       if (is_resource($fp_tmp)) {
+                               while (!feof($fp)) {
                                        $line = fgets ($fp, 10240);
                                        $line = fgets ($fp, 10240);
-                                       if (strpos($line, $search) > -1) $next = 0;
-                                       if ($next > -1)
-                                       {
-                                               if ($next == $SNEAK)
-                                               {
+                                       //* DEBUG: */ echo $search."/<font color=\"red\">".htmlentities($line)."</font><br />\n";
+                                       $found = strpos($line, $search);
+                                       //* DEBUG: */ echo "FOUND: <font color=\"brown\">";
+                                       //* DEBUG: */ var_dump($found);
+                                       //* DEBUG: */ echo "</font><br />\n";
+                                       if ($found !== false) $next = 0;
+                                       if ($next > -1) {
+                                               if ($next == $sneak) {
                                                        $next = -1;
                                                        $next = -1;
-                                                       $line = $PREFIX.$DATA.$SUFFIX."\n";
-                                               }
-                                                else
-                                               {
+                                                       $line = $prefix.$DATA.$suffix."\n";
+                                                       //* DEBUG: */ echo "NEW: <font color=\"blue\">".htmlentities($line)."</font><br />\n";
+                                               } else {
                                                        $next++;
                                                }
                                        }
                                                        $next++;
                                                }
                                        }
+                                       //* DEBUG: */ echo "WRITE: <font color=\"green\">".htmlentities($line)."</font><br />\n";
                                        fputs($fp_tmp, $line);
                                }
                                fclose($fp_tmp);
                                        fputs($fp_tmp, $line);
                                }
                                fclose($fp_tmp);
+
                                // Finished writing tmp file
                                // Finished writing tmp file
-                               $DONE = true;
+                               $done = true;
                        }
 
                        // Close source directory
                        fclose($fp);
 
                        }
 
                        // Close source directory
                        fclose($fp);
 
-                       if (($DONE) && (is_writeable($file)))
-                       {
+                       if (($done) && (is_writeable($file))) {
                                // Copy back tmp file and delete tmp :-)
                                @copy($tmp, $file);
                                @unlink($tmp);
                                // Copy back tmp file and delete tmp :-)
                                @copy($tmp, $file);
                                @unlink($tmp);
-                       }
-                        else
-                       {
-                               OUTPUT_HTML ("<STRONG>TMP:</STRONG> UNDONE!");
+                       } else {
+                               OUTPUT_HTML("<STRONG>TMP:</STRONG> UNDONE!");
                        }
                }
                        }
                }
-       }
-        else
-       {
-               OUTPUT_HTML ("<STRONG>404:</STRONG> ".$file."<BR>");
+       } else {
+               OUTPUT_HTML("<STRONG>404:</STRONG> ".$file."<br />");
        }
 }
 
        }
 }
 
@@ -104,19 +101,42 @@ function install_WriteData ($file, $COMMENT, $PREFIX, $SUFFIX, $DATA, $SNEAK=0)
 $mysql = "";
 if (isset($_POST['mysql']) && is_array($_POST['mysql'])) $mysql = $_POST['mysql'];
 
 $mysql = "";
 if (isset($_POST['mysql']) && is_array($_POST['mysql'])) $mysql = $_POST['mysql'];
 
-if (URL != "http://your-server.com")
-{
+if (URL != "http://your-server.com") {
        // Already installed???
        $burl = URL;
        // Already installed???
        $burl = URL;
-}
- elseif ($burl == "")
-{
+} elseif ($burl == "") {
        // Auto-detect URL
        $burl = "http://".$SERVER_NAME.$_SERVER['PHP_SELF'];
        $burl = substr($burl, 0, strpos($burl, "install.php"));
 }
        // Auto-detect URL
        $burl = "http://".$SERVER_NAME.$_SERVER['PHP_SELF'];
        $burl = substr($burl, 0, strpos($burl, "install.php"));
 }
-//
-if ((!mxchange_installed) || (!admin_registered))
+
+// Check if both passwords from SMTP are matching
+if ((isset($_GET['page']) && ($_GET['page'] == 5))) {
+       // Okay, we have to check it
+       if (!empty($_POST['smtp_user']) && (empty($_POST['smtp_host']))) {
+               // Hostname not set
+               OUTPUT_HTML(INSTALL_SMTP_HOSTNAME_EMPTY."<br />");
+               $_GET['page'] = 3;
+       }
+       if ((empty($_POST['smtp_pass1'])) && (!empty($_POST['smtp_pass2']))) {
+               // Password is empty
+               OUTPUT_HTML(INSTALL_SMTP_PASS1_EMPTY."<br />");
+               $_GET['page'] = 3;
+       }
+       if ((!empty($_POST['smtp_pass1'])) && (empty($_POST['smtp_pass2']))) {
+               // Password repeat is empty
+               OUTPUT_HTML(INSTALL_SMTP_PASS2_EMPTY."<br />");
+               $_GET['page'] = 3;
+       }
+       if ($_POST['smtp_pass1'] != $_POST['smtp_pass1']) {
+               // Passwords are not matching
+               OUTPUT_HTML(INSTALL_SMTP_PASS_MISMATCH."<br />");
+               $_GET['page'] = 3;
+       }
+}
+
+// Is MXChange installed or no admin registered so far?
+if ((!isBooleanConstantAndTrue('mxchange_installed')) || (!isBooleanConstantAndTrue('admin_registered')))
 {
        // Set URL for FORM actions
        define('__BURL_ACTION', $burl);
 {
        // Set URL for FORM actions
        define('__BURL_ACTION', $burl);
@@ -144,14 +164,12 @@ if ((!mxchange_installed) || (!admin_registered))
                if (empty($mysql['login']))  $mysql['login']  = "your_login";
                if (empty($mysql['host']))   $mysql['host']   = "localhost";
                if (empty($mysql['prefix'])) $mysql['prefix'] = "mxchange_";
                if (empty($mysql['login']))  $mysql['login']  = "your_login";
                if (empty($mysql['host']))   $mysql['host']   = "localhost";
                if (empty($mysql['prefix'])) $mysql['prefix'] = "mxchange_";
-               if ((sizeof($FATAL) > 0) || (!empty($FATAL[0])))
-               {
-                       OUTPUT_HTML ("<SPAN class=\"install_fatal\">");
-                       foreach ($FATAL as $key=>$err)
-                       {
-                               OUTPUT_HTML ("  <STRONG>&middot;</STRONG>&nbsp;".FATAL_NO.($key + 1).":&nbsp;".$err."<BR>\n");
+               if ((sizeof($FATAL) > 0) || (!empty($FATAL[0]))) {
+                       OUTPUT_HTML("<SPAN class=\"install_fatal\">");
+                       foreach ($FATAL as $key => $err) {
+                               OUTPUT_HTML("  <STRONG>&middot;</STRONG>&nbsp;".FATAL_NO.($key + 1).":&nbsp;".$err."<br />");
                        }
                        }
-                       OUTPUT_HTML ("</SPAN><BR>");
+                       OUTPUT_HTML("</SPAN><br />");
                }
                define('__MYSQL_HOST'  , $mysql['host']);
                define('__MYSQL_DBASE' , $mysql['dbase']);
                }
                define('__MYSQL_HOST'  , $mysql['host']);
                define('__MYSQL_DBASE' , $mysql['dbase']);
@@ -167,13 +185,61 @@ if ((!mxchange_installed) || (!admin_registered))
                LOAD_TEMPLATE("install_page2");
                break;
 
                LOAD_TEMPLATE("install_page2");
                break;
 
+       case "3":
+               // Set more values
+               define('__SPATH_VALUE'  , $_POST['spath']);
+               define('__BURL_VALUE'   , $_POST['burl']);
+               define('__TITLE_VALUE'  , $_POST['title']);
+               define('__SLOGAN_VALUE' , $_POST['slogan']);
+               define('__EMAIL_VALUE'  , $_POST['email']);
+
+               // Use default SMTP data
+               $smtpHost  = SMTP_HOSTNAME;
+               $smtpUser  = SMTP_USER;
+               $smtpPass1 = SMTP_PASSWORD;
+               $smtpPass2 = SMTP_PASSWORD;
+
+               // Overwrite it with the data from sent (failed) form
+               if (!empty($_POST['smtp_host'])) $smtpHost = $_POST['smtp_host'];
+               if (!empty($_POST['smtp_user'])) $smtpUser = $_POST['smtp_user'];
+
+               // MySQL settings
+               define('__MYSQL_HOST'   , $mysql['host']);
+               define('__MYSQL_DBASE'  , $mysql['dbase']);
+               define('__MYSQL_PREFIX' , $mysql['prefix']);
+               define('__MYSQL_LOGIN'  , $mysql['login']);
+               define('__MYSQL_PASS1'  , $mysql['pass1']);
+               define('__MYSQL_PASS2'  , $mysql['pass2']);
+
+               // Set constants for SMTP data
+               define('__SMTP_HOST'    , $smtpHost);
+               define('__SMTP_USER'    , $smtpUser);
+               define('__SMTP_PASS1'   , $smtpPass1);
+               define('__SMTP_PASS2'   , $smtpPass2);
+
+               // Load template
+               LOAD_TEMPLATE("install_page3");
+               break;
+
        case "5": // Misc settings
        case "5": // Misc settings
-               define('__SPATH_VALUE' , $_POST['spath']);
-               define('__BURL_VALUE'  , $_POST['burl']);
-               define('__TITLE_VALUE' , $_POST['title']);
-               define('__SLOGAN_VALUE', $_POST['slogan']);
-               define('__EMAIL_VALUE' , $_POST['email']);
-               OUTPUT_HTML ("<FORM action=\"".__BURL_ACTION."/install.php?page=finalize\" method=\"POST\" target=\"_self\">
+               // General settings
+               define('__SPATH_VALUE'  , $_POST['spath']);
+               define('__BURL_VALUE'   , $_POST['burl']);
+               define('__TITLE_VALUE'  , $_POST['title']);
+               define('__SLOGAN_VALUE' , $_POST['slogan']);
+               define('__EMAIL_VALUE'  , $_POST['email']);
+
+               // MySQL settings
+               define('__MYSQL_HOST'   , $mysql['host']);
+               define('__MYSQL_DBASE'  , $mysql['dbase']);
+               define('__MYSQL_PREFIX' , $mysql['prefix']);
+               define('__MYSQL_LOGIN'  , $mysql['login']);
+
+               // SMTP settings
+               define('__SMTP_HOST'    , $_POST['smtp_host']);
+               define('__SMTP_USER'    , $_POST['smtp_user']);
+               define('__SMTP_PASS'    , $_POST['smtp_pass1']);
+               OUTPUT_HTML("<FORM action=\"".__BURL_ACTION."/install.php?page=finalize\" method=\"POST\" target=\"_self\">
 <TABLE border=\"0\" cellspacing=\"0\" cellpadding=\"0\" class=\"install_content\">
 <TR>
   <TD colspan=\"2\" align=\"center\">
 <TABLE border=\"0\" cellspacing=\"0\" cellpadding=\"0\" class=\"install_content\">
 <TR>
   <TD colspan=\"2\" align=\"center\">
@@ -192,82 +258,70 @@ if ((!mxchange_installed) || (!admin_registered))
   <TD>
     <SELECT name=\"omode\" size=\"1\" class=\"install_select\">
       <OPTION value=\"render\"");
   <TD>
     <SELECT name=\"omode\" size=\"1\" class=\"install_select\">
       <OPTION value=\"render\"");
-               if (OUTPUT_MODE == "render") OUTPUT_HTML (" selected=\"selected\"");
-               OUTPUT_HTML (">".MODE_RENDER."</OPTION>
+               if (OUTPUT_MODE == "render") OUTPUT_HTML(" selected=\"selected\"");
+               OUTPUT_HTML(">".MODE_RENDER."</OPTION>
       <OPTION value=\"direct\"");
       <OPTION value=\"direct\"");
-               if (OUTPUT_MODE == "direct") OUTPUT_HTML (" selected=\"selected\"");
-               OUTPUT_HTML (">".MODE_DIRECT."</OPTION>
+               if (OUTPUT_MODE == "direct") OUTPUT_HTML(" selected=\"selected\"");
+               OUTPUT_HTML(">".MODE_DIRECT."</OPTION>
     </SELECT>
   </TD>
 </TR>
     </SELECT>
   </TD>
 </TR>
-<TR><TD colspan=\"2\" height=\"21\" class=\"seperator\">&nbsp;</TD></TR>
+<TR><TD colspan=\"2\" height=\"10\" class=\"seperator\">&nbsp;</TD></TR>
 <TR>
   <TD class=\"install\" align=\"right\">".WARN_NO_PASSWORD.":&nbsp;&nbsp;</TD>
   <TD>
     <SELECT name=\"warn_no_pass\" size=\"1\" class=\"install_select\">
       <OPTION value=\"true\"");
 <TR>
   <TD class=\"install\" align=\"right\">".WARN_NO_PASSWORD.":&nbsp;&nbsp;</TD>
   <TD>
     <SELECT name=\"warn_no_pass\" size=\"1\" class=\"install_select\">
       <OPTION value=\"true\"");
-               if (warn_no_pass) OUTPUT_HTML (" selected=\"selected\"");
-               OUTPUT_HTML (">".YES."</OPTION>
+               if (isBooleanConstantAndTrue('warn_no_pass')) OUTPUT_HTML(" selected=\"selected\"");
+               OUTPUT_HTML(">".YES."</OPTION>
       <OPTION value=\"false\"");
       <OPTION value=\"false\"");
-               if (!warn_no_pass) OUTPUT_HTML (" selected=\"selected\"");
-               OUTPUT_HTML (">".NO."</OPTION>
+               if (!isBooleanConstantAndTrue('warn_no_pass')) OUTPUT_HTML(" selected=\"selected\"");
+               OUTPUT_HTML(">".NO."</OPTION>
     </SELECT>
   </TD>
 </TR>
     </SELECT>
   </TD>
 </TR>
-<TR><TD colspan=\"2\" height=\"21\" class=\"seperator\">&nbsp;</TD></TR>
+<TR><TD colspan=\"2\" height=\"10\" class=\"seperator\">&nbsp;</TD></TR>
 <TR>
   <TD class=\"install\" align=\"right\">".LANG_WRITE_FOOTER.":&nbsp;&nbsp;</TD>
   <TD>
     <SELECT name=\"wfooter\" size=\"1\" class=\"install_select\">
       <OPTION value=\"true\"");
 <TR>
   <TD class=\"install\" align=\"right\">".LANG_WRITE_FOOTER.":&nbsp;&nbsp;</TD>
   <TD>
     <SELECT name=\"wfooter\" size=\"1\" class=\"install_select\">
       <OPTION value=\"true\"");
-               if (WRITE_FOOTER) OUTPUT_HTML (" selected=\"selected\"");
-               OUTPUT_HTML (">".YES."</OPTION>
-      <OPTION value=\"false\"");
-               if (!WRITE_FOOTER) OUTPUT_HTML (" selected=\"selected\"");
-               OUTPUT_HTML (">".NO."</OPTION>
-    </SELECT>
-  </TD>
-</TR>
-<TR><TD colspan=\"2\" height=\"21\" class=\"seperator\">&nbsp;</TD></TR>
-<TR>
-  <TD class=\"install\" align=\"right\">".LANG_FRAMESET_ACTIVE.":&nbsp;&nbsp;</TD>
-  <TD>
-    <SELECT name=\"frameset\" size=\"1\" class=\"install_select\">
-      <OPTION value=\"true\"");
-               if (frameset_active) OUTPUT_HTML (" selected=\"selected\"");
-               OUTPUT_HTML (">".YES."</OPTION>
+               if (isBooleanConstantAndTrue('WRITE_FOOTER')) OUTPUT_HTML(" selected=\"selected\"");
+               OUTPUT_HTML(">".YES."</OPTION>
       <OPTION value=\"false\"");
       <OPTION value=\"false\"");
-               if (!frameset_active) OUTPUT_HTML (" selected=\"selected\"");
-               OUTPUT_HTML (">".NO."</OPTION>
+               if (!isBooleanConstantAndTrue('WRITE_FOOTER')) OUTPUT_HTML(" selected=\"selected\"");
+               OUTPUT_HTML(">".NO."</OPTION>
     </SELECT>
   </TD>
 </TR>
     </SELECT>
   </TD>
 </TR>
-<TR><TD colspan=\"2\" height=\"21\" class=\"seperator\">&nbsp;</TD></TR>
+<TR><TD colspan=\"2\" height=\"10\" class=\"seperator\">&nbsp;</TD></TR>
 <TR>
   <TD class=\"install\" align=\"right\">".INSTALL_ENABLE_BACKLINK.":&nbsp;&nbsp;</TD>
   <TD>
     <SELECT name=\"blink\" size=\"1\" class=\"install_select\">
       <OPTION value=\"true\"");
 <TR>
   <TD class=\"install\" align=\"right\">".INSTALL_ENABLE_BACKLINK.":&nbsp;&nbsp;</TD>
   <TD>
     <SELECT name=\"blink\" size=\"1\" class=\"install_select\">
       <OPTION value=\"true\"");
-               if (ENABLE_BACKLINK) OUTPUT_HTML (" selected=\"selected\"");
-               OUTPUT_HTML (">".YES."</OPTION>
+               if (ENABLE_BACKLINK) OUTPUT_HTML(" selected=\"selected\"");
+               OUTPUT_HTML(">".YES."</OPTION>
       <OPTION value=\"false\"");
       <OPTION value=\"false\"");
-               if (!ENABLE_BACKLINK) OUTPUT_HTML (" selected=\"selected\"");
-               OUTPUT_HTML (">".NO."</OPTION>
+               if (!ENABLE_BACKLINK) OUTPUT_HTML(" selected=\"selected\"");
+               OUTPUT_HTML(">".NO."</OPTION>
     </SELECT>
   </TD>
 </TR>
 <TR><TD colspan=\"2\" height=\"21\" class=\"seperator\">&nbsp;</TD></TR>
 <TR>
   <TD colspan=\"2\" align=\"center\">");
     </SELECT>
   </TD>
 </TR>
 <TR><TD colspan=\"2\" height=\"21\" class=\"seperator\">&nbsp;</TD></TR>
 <TR>
   <TD colspan=\"2\" align=\"center\">");
-               foreach ($mysql as $key=>$value)
-               {
-                       OUTPUT_HTML ("    <INPUT type=\"hidden\" name=\"mysql[".$key."]\" value=\"".$value."\">");
+               foreach ($mysql as $key => $value) {
+                       OUTPUT_HTML("    <INPUT type=\"hidden\" name=\"mysql[".$key."]\" value=\"".$value."\">");
                }
                }
-               OUTPUT_HTML ("    <INPUT type=\"hidden\" name=\"spath\" value=\"".__SPATH_VALUE."\">
+               OUTPUT_HTML("    <INPUT type=\"hidden\" name=\"spath\" value=\"".__SPATH_VALUE."\">
     <INPUT type=\"hidden\" name=\"burl\" value=\"".__BURL_VALUE."\">
     <INPUT type=\"hidden\" name=\"title\" value=\"".__TITLE_VALUE."\">
     <INPUT type=\"hidden\" name=\"slogan\" value=\"".__SLOGAN_VALUE."\">
     <INPUT type=\"hidden\" name=\"email\" value=\"".__EMAIL_VALUE."\">
     <INPUT type=\"hidden\" name=\"burl\" value=\"".__BURL_VALUE."\">
     <INPUT type=\"hidden\" name=\"title\" value=\"".__TITLE_VALUE."\">
     <INPUT type=\"hidden\" name=\"slogan\" value=\"".__SLOGAN_VALUE."\">
     <INPUT type=\"hidden\" name=\"email\" value=\"".__EMAIL_VALUE."\">
+    <INPUT type=\"hidden\" name=\"smtp_host\" value=\"".__SMTP_HOST."\">
+    <INPUT type=\"hidden\" name=\"smtp_user\" value=\"".__SMTP_USER."\">
+    <INPUT type=\"hidden\" name=\"smtp_pass\" value=\"".__SMTP_PASS."\">
     <INPUT type=\"submit\" class=\"admin_submit submit\" name=\"finalize\" value=\"".NEXT_PAGE."\" class=\"install_submit\">
   </TD>
 </TR>
     <INPUT type=\"submit\" class=\"admin_submit submit\" name=\"finalize\" value=\"".NEXT_PAGE."\" class=\"install_submit\">
   </TD>
 </TR>
@@ -277,68 +331,76 @@ if ((!mxchange_installed) || (!admin_registered))
                break;
 
        case "finalize": // Write captured data to files
                break;
 
        case "finalize": // Write captured data to files
-               if (!empty($_POST['finalize']))
-               {
+               if ((!empty($_POST['finalize'])) && (!isBooleanConstantAndTrue('mxchange_installed'))) {
                        // You have submitted data then we have to reset the fatal messages
                        // You have submitted data then we have to reset the fatal messages
-                       $FATAL = array();
+                       $FATAL = array(); $SQLs = array();
 
                        // Connect to MySQL server
                        $link = SQL_CONNECT($mysql['host'], $mysql['login'], $mysql['pass1'], __FILE__, __LINE__);
 
                        // Connect to MySQL server
                        $link = SQL_CONNECT($mysql['host'], $mysql['login'], $mysql['pass1'], __FILE__, __LINE__);
-                       if ($link)
-                       {
+                       if ($link) {
                                // Seems to work, also right database?
                                $db = SQL_SELECT_DB($mysql['dbase'], $link, __FILE__, __LINE__);
                                // Seems to work, also right database?
                                $db = SQL_SELECT_DB($mysql['dbase'], $link, __FILE__, __LINE__);
-                               if ($db)
-                               {
+                               if ($db) {
                                        // Automatically run install.sql
                                        // Automatically run install.sql
-                                       if (file_exists($_POST['spath']."install/tables.sql"))
-                                       {
-                                               $ERRORS = $_POST['spath']."inc/sql.err";
-                                               $cmd = array(
-                                                       // "Dump" tha' s*** up... ;-) > /dev/null
-                                                       "mysql ".$mysql['dbase']." --force --host=".$mysql['host']." --user=".$mysql['login']." --password=".$mysql['pass1']." < ".$_POST['spath']."install/tables.sql",
-                                                       "mysql ".$mysql['dbase']." --force --host=".$mysql['host']." --user=".$mysql['login']." --password=".$mysql['pass1']." < ".$_POST['spath']."install/menu-".GET_LANGUAGE().".sql"
-                                               );
-
-                                               foreach ($cmd as $c)
-                                               {
-                                                       @system($c);
-                                               }
+                                       if ((FILE_READABLE($_POST['spath']."install/tables.sql")) && (FILE_READABLE($_POST['spath']."install/menu-".GET_LANGUAGE().".sql"))) {
+                                               // Both exists so import them
+                                               foreach (array("tables.sql", "menu-".GET_LANGUAGE().".sql") as $dump) {
+                                                       // Should be save here because file_exists() is there but we check it again. :)
+                                                       $file = secureString($_POST['spath']) . "install/" . $dump;
+                                                       if (FILE_READABLE($file)) {
+                                                               // Load the file
+                                                               $sql = implode("", file($file));
+
+                                                               // Remove some unwanted chars
+                                                               $sql = str_replace("\r", "", $sql);
+                                                               $sql = str_replace("\n\n", "\n", $sql);
 
 
-                                               if ((file_exists($ERRORS)) && (filesize($ERRORS) > 0))
-                                               {
-                                                       ADD_FATAL(MYSQLDUMP_ERROR);
+                                                               // And split it up against ;\n ...
+                                                               $SQLs = array_merge($SQLs, explode(";\n", $sql));
+                                                       }
                                                }
                                                }
-                                                elseif (!mxchange_installed)
-                                               {
-                                                       // Remove error file if empty
-                                                       if (file_exists($ERRORS)) @unlink ($ERRORS);
-
-                                                       // Ok, all done. So we can write the config data to the php files
-                                                       if ($_POST['spath'] != PATH) install_WriteData($_POST['spath']."inc/config.php", "SERVER-PATH", "define ('PATH', \"", "\");", $_POST['spath'], 0);
-                                                       if ($_POST['burl']  != URL)  install_WriteData($_POST['spath']."inc/config.php", "HOST-URL", "define ('URL', \"", "\");", $_POST['burl'], 0);
-                                                       install_WriteData($_POST['spath']."inc/config.php", "MAIN_TITLE", "define ('MAIN_TITLE', \"", "\");", $_POST['title'], 0);
-                                                       install_WriteData($_POST['spath']."inc/config.php", "SLOGAN", "define ('SLOGAN', \"", "\");", $_POST['slogan'], 0);
-                                                       install_WriteData($_POST['spath']."inc/config.php", "WEBMASTER", "define ('WEBMASTER', \"", "\");", $_POST['email'], 0);
-                                                       install_WriteData($_POST['spath']."inc/config.php", "NULLPASS-WARNING", "define ('warn_no_pass', ", ");", $_POST['warn_no_pass'], 0);
-                                                       install_WriteData($_POST['spath']."inc/config.php", "WRITE-FOOTER", "define ('WRITE_FOOTER', ", ");", $_POST['wfooter'], 0);
-                                                       install_WriteData($_POST['spath']."inc/config.php", "BACKLINK", "define ('ENABLED_BACKLINK', ", ");", $_POST['blink'], 0);
-                                                       // install_WriteData($_POST['spath']."inc/config.php", "FRAMESET", "define ('frameset_active', ", ");", $_POST['frameset'], 0);
-                                                       // install_WriteData($_POST['spath']."inc/config.php", "OUTPUT-MODE", "define ('OUTPUT_MODE', \"", "\");", $_POST['omode'], 0);
-                                                       install_WriteData($_POST['spath']."inc/config.php", "MYSQL-HOST", "     'host'     => \"", "\",", $mysql['host'], 0);
-                                                       install_WriteData($_POST['spath']."inc/config.php", "MYSQL-DBASE", "    'dbase'    => \"", "\",", $mysql['dbase'], 0);
-                                                       install_WriteData($_POST['spath']."inc/config.php", "MYSQL-LOGIN", "    'login'    => \"", "\",", $mysql['login'], 0);
-                                                       install_WriteData($_POST['spath']."inc/config.php", "MYSQL-PASSWORD", " 'password' => \"", "\",", $mysql['pass1'], 0);
-                                                       install_WriteData($_POST['spath']."inc/config.php", "MYSQL-PREFIX", "define ('_MYSQL_PREFIX', \"", "\");", $mysql['prefix'], 0);
-                                                       install_WriteData($_POST['spath']."inc/config.php", "INSTALLED", "define ('mxchange_installed', ", ");", "true", 0);
-
-                                                       // Close the link
-                                                       SQL_CLOSE($link, __FILE__, __LINE__);
+
+                                               // Are some SQLs found?
+                                               if (count($SQLs) == 0) {
+                                                       // Abort here
+                                                       ADD_FATAL(INSTALL_SQL_IMPORT_FAILED);
+                                                       return;
                                                }
                                                }
-                                                else
-                                               {
-                                                       ADD_FATAL(INSTALL_MAYBE_DONE);
+
+                                               // Now run all queries through and try to keep out empty or comment queries
+                                               foreach ($SQLs as $sql) {
+                                                       // Trim spaces away
+                                                       $sql = trim($sql);
+
+                                                       // Is this query not empty and not a comment?
+                                                       if ((!empty($sql)) && (substr($sql, 0, 2) != "--") && (substr($sql, 0, 1) != "#")) {
+                                                               // Then run it!
+                                                               SQL_QUERY($sql, __FILE__, __LINE__);
+                                                       }
                                                }
                                                }
+
+                                               // Ok, all done. So we can write the config data to the php files
+                                               if ($_POST['spath'] != PATH) install_WriteData($_POST['spath']."inc/config.php", "SERVER-PATH", "define('PATH', \"", "\");", $_POST['spath'], 0);
+                                               if ($_POST['burl']  != URL)  install_WriteData($_POST['spath']."inc/config.php", "HOST-URL", "define('URL', \"", "\");", $_POST['burl'], 0);
+                                               install_WriteData($_POST['spath']."inc/config.php", "MAIN_TITLE", "define('MAIN_TITLE', \"", "\");", $_POST['title'], 0);
+                                               install_WriteData($_POST['spath']."inc/config.php", "SLOGAN", "define('SLOGAN', \"", "\");", $_POST['slogan'], 0);
+                                               install_WriteData($_POST['spath']."inc/config.php", "WEBMASTER", "define('WEBMASTER', \"", "\");", $_POST['email'], 0);
+                                               install_WriteData($_POST['spath']."inc/config.php", "NULLPASS-WARNING", "define('warn_no_pass', ", ");", $_POST['warn_no_pass'], 0);
+                                               install_WriteData($_POST['spath']."inc/config.php", "WRITE-FOOTER", "define('WRITE_FOOTER', ", ");", $_POST['wfooter'], 0);
+                                               install_WriteData($_POST['spath']."inc/config.php", "BACKLINK", "define('ENABLE_BACKLINK', ", ");", $_POST['blink'], 0);
+                                               // install_WriteData($_POST['spath']."inc/config.php", "OUTPUT-MODE", "define('OUTPUT_MODE', \"", "\");", $_POST['omode'], 0);
+                                               install_WriteData($_POST['spath']."inc/config.php", "MYSQL-HOST", "     'host'     => \"", "\",", $mysql['host'], 0);
+                                               install_WriteData($_POST['spath']."inc/config.php", "MYSQL-DBASE", "    'dbase'    => \"", "\",", $mysql['dbase'], 0);
+                                               install_WriteData($_POST['spath']."inc/config.php", "MYSQL-LOGIN", "    'login'    => \"", "\",", $mysql['login'], 0);
+                                               install_WriteData($_POST['spath']."inc/config.php", "MYSQL-PASSWORD", " 'password' => \"", "\",", $mysql['pass1'], 0);
+                                               install_WriteData($_POST['spath']."inc/config.php", "MYSQL-PREFIX", "define('_MYSQL_PREFIX', \"", "\");", $mysql['prefix'], 0);
+                                               install_WriteData($_POST['spath']."inc/config.php", "SMTP-HOSTNAME", "define('SMTP_HOSTNAME', \"", "\");", $_POST['smtp_host'], 0);
+                                               install_WriteData($_POST['spath']."inc/config.php", "SMTP-USER", "define('SMTP_USER', \"", "\");", $_POST['smtp_user'], 0);
+                                               install_WriteData($_POST['spath']."inc/config.php", "SMTP-PASSWORD", "define('SMTP_PASSWORD', \"", "\");", $_POST['smtp_pass'], 0);
+                                               install_WriteData($_POST['spath']."inc/config.php", "INSTALLED", "define('mxchange_installed', ", ");", "true", 0);
+
+                                               // Close the link
+                                               SQL_CLOSE($link, __FILE__, __LINE__);
                                        }
                                         else
                                        {
                                        }
                                         else
                                        {
@@ -347,7 +409,7 @@ if ((!mxchange_installed) || (!admin_registered))
                                        }
                                }
                        }
                                        }
                                }
                        }
-                       if ((sizeof($FATAL) > 0) || ($FATAL[0] != ""))
+                       if ((sizeof($FATAL) > 0) || ($FATAL[0] != ''))
                        {
                                $OUT = "";
                                foreach ($FATAL as $value)
                        {
                                $OUT = "";
                                foreach ($FATAL as $value)
@@ -356,16 +418,19 @@ if ((!mxchange_installed) || (!admin_registered))
                                }
                                define('__FATAL_ERROR_LI', $OUT);
                                $OUT = "";
                                }
                                define('__FATAL_ERROR_LI', $OUT);
                                $OUT = "";
-                               foreach ($mysql as $key=>$value)
+                               foreach ($mysql as $key => $value)
                                {
                                        $OUT .= "    <INPUT type=\"hidden\" name=\"mysql[".$key."]\" value=\"".$value."\">\n";
                                }
                                {
                                        $OUT .= "    <INPUT type=\"hidden\" name=\"mysql[".$key."]\" value=\"".$value."\">\n";
                                }
-                               define('__MYSQL_DATA' , $OUT);
-                               define('__SPATH_VALUE', $_POST['spath']);
-                               define('__BURL_VALUE' , $_POST['burl']);
-                               define('__TITLE_VALUE', $_POST['title']);
+                               define('__MYSQL_DATA'   , $OUT);
+                               define('__SPATH_VALUE'  , $_POST['spath']);
+                               define('__BURL_VALUE'   , $_POST['burl']);
+                               define('__TITLE_VALUE'  , $_POST['title']);
+                               define('__SMTP_HOST'    , $_POST['smtp_host']);
+                               define('__SMTP_USER'    , $_POST['smtp_user']);
+                               define('__SMTP_PASS'    , $_POST['smtp_pass']);
 
 
-                               OUTPUT_HTML ("<FORM action=\"".__BURL_ACTION."/install.php?page=2\" method=\"POST\">
+                               OUTPUT_HTML("<FORM action=\"".__BURL_ACTION."/install.php?page=2\" method=\"POST\">
 <TABLE border=\"0\" cellspacing=\"0\" cellpadding=\"0\" class=\"install_content\">
 <TR>
   <TD align=\"center\">
 <TABLE border=\"0\" cellspacing=\"0\" cellpadding=\"0\" class=\"install_content\">
 <TR>
   <TD align=\"center\">
@@ -400,17 +465,10 @@ if ((!mxchange_installed) || (!admin_registered))
                                LOAD_URL($URL);
                        }
                }
                                LOAD_URL($URL);
                        }
                }
-                elseif (mxchange_installed)
+                elseif (isBooleanConstantAndTrue('mxchange_installed'))
                {
                        // Redirection after writing data... :-)
                {
                        // Redirection after writing data... :-)
-                       OUTPUT_HTML ("<SPAN class=\"install_finished\">".INSTALL_FINISHED."</SPAN><BR>
-<BR>
-<SPAN class=\"install_security\">".INSTALL_FIN_SECU."</SPAN><BR>
-<BR>
-<FORM action=\"modules.php\" method=\"GET\">
-  <INPUT type=\"hidden\" name=\"module\" value=\"admin\">
-  <INPUT type=\"submit\" class=\"admin_submit submit\" value=\"".CONTINUE_ADMIN."\" class=\"install_submit\">
-</FORM>");
+                       LOAD_TEMPLATE("install_finished");
                }
                 else
                {
                }
                 else
                {
@@ -421,7 +479,7 @@ if ((!mxchange_installed) || (!admin_registered))
                break;
 
        default:
                break;
 
        default:
-               OUTPUT_HTML ("    <STRONG class=\"install_error\">".WRONG_PAGE."</STRONG>");
+               OUTPUT_HTML("    <STRONG class=\"install_error\">".WRONG_PAGE."</STRONG>");
                break;
        }
 }
                break;
        }
 }