Fixed logfile writing in installation phase, .revision is now ignored
[mailer.git] / inc / install-inc.php
index 94dfbb38a5bf592b30de5a515216b4d1792494f2..bb7ea7bd1ff7dcf4253cec8f789af798566ed50e 100644 (file)
  * -------------------------------------------------------------------- *
  * Kurzbeschreibung  : Funktionen fuer die Installationsroutine         *
  * -------------------------------------------------------------------- *
- *                                                                      *
+ * $Revision:: 856                                                    $ *
+ * $Date:: 2009-03-06 20:24:32 +0100 (Fr, 06. Mär 2009)              $ *
+ * $Tag:: 0.2.1-FINAL                                                 $ *
+ * $Author:: stelzi                                                   $ *
+ * Needs to be in all Files and every File needs "svn propset           *
+ * svn:keywords Date Revision" (autoprobset!) at least!!!!!!            *
  * -------------------------------------------------------------------- *
  * Copyright (c) 2003 - 2008 by Roland Haeder                           *
  * For more information visit: http://www.mxchange.org                  *
  ************************************************************************/
 
 // 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);
 }
 
-//
-function install_WriteData ($file, $comment, $prefix, $suffix, $DATA, $SNEAK=0)
-{
-       $done = false;  $SNEAK++;
-       if (file_exists($file))
-       {
-               $search = "CFG: ".$comment;
-               $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)) {
-                                       $line = fgets ($fp, 10240);
-                                       if (strpos($line, $search) > -1) $next = 0;
-                                       if ($next > -1) {
-                                               if ($next == $SNEAK) {
-                                                       $next = -1;
-                                                       $line = $prefix.$DATA.$suffix."\n";
-                                               } else {
-                                                       $next++;
-                                               }
-                                       }
-                                       fputs($fp_tmp, $line);
-                               }
-                               fclose($fp_tmp);
-                               // Finished writing tmp file
-                               $done = true;
-                       }
+// Init variables
+$mysql = "";
+if ((REQUEST_ISSET_POST(('mysql'))) && (is_array(REQUEST_POST('mysql')))) $mysql = REQUEST_POST('mysql');
 
-                       // Close source directory
-                       fclose($fp);
+// Check if both passwords from SMTP are matching
+if ((REQUEST_ISSET_GET(('page')) && (REQUEST_GET('page') == 5))) {
+       // Okay, we have to check it
+       if (REQUEST_ISSET_POST(('smtp_user')) && (!REQUEST_ISSET_POST(('smtp_host')))) {
+               // Hostname not set
+               OUTPUT_HTML(getMessage('INSTALL_SMTP_HOSTNAME_EMPTY')."<br />");
+               REQUEST_SET_GET('page', 3);
+       } // END - if
 
-                       if (($done) && (is_writeable($file))) {
-                               // Copy back tmp file and delete tmp :-)
-                               @copy($tmp, $file);
-                               @unlink($tmp);
-                       } else {
-                               OUTPUT_HTML("<STRONG>TMP:</STRONG> UNDONE!");
-                       }
-               }
-       } else {
-               OUTPUT_HTML("<STRONG>404:</STRONG> ".$file."<BR>");
-       }
-}
+       if ((!REQUEST_ISSET_POST(('smtp_pass1'))) && (REQUEST_ISSET_POST(('smtp_pass2')))) {
+               // Password is empty
+               OUTPUT_HTML(getMessage('INSTALL_SMTP_PASS1_EMPTY')."<br />");
+               REQUEST_SET_GET('page', 3);
+       } // END - if
 
-//
-$mysql = "";
-if (isset($_POST['mysql']) && is_array($_POST['mysql'])) $mysql = $_POST['mysql'];
+       if ((REQUEST_ISSET_POST(('smtp_pass1'))) && (!REQUEST_ISSET_POST(('smtp_pass2')))) {
+               // Password repeat is empty
+               OUTPUT_HTML(getMessage('INSTALL_SMTP_PASS2_EMPTY')."<br />");
+               REQUEST_SET_GET('page', 3);
+       } // END - if
 
-if (URL != "http://your-server.com")
-{
-       // Already installed???
-       $burl = URL;
-}
- elseif ($burl == "")
-{
-       // Auto-detect URL
-       $burl = "http://".$SERVER_NAME.$_SERVER['PHP_SELF'];
-       $burl = substr($burl, 0, strpos($burl, "install.php"));
-}
-//
-if ((!mxchange_installed) || (!admin_registered))
+       if (REQUEST_POST('smtp_pass1') != REQUEST_POST('smtp_pass1')) {
+               // Passwords are not matching
+               OUTPUT_HTML(getMessage('INSTALL_SMTP_PASS_MISMATCH')."<br />");
+               REQUEST_SET_GET('page', 3);
+       } // END - if
+} // END - if
+
+// Is MXChange installed or no admin registered so far?
+if ((!isInstalled()) || (!isAdminRegistered()))
 {
        // Set URL for FORM actions
-       define('__BURL_ACTION', $burl);
+       define('__BURL_ACTION', constant('URL'));
 
        // Output page for entered value
-       switch ($_GET['page'])
+       switch (REQUEST_GET('page'))
        {
        case "welcome": // Welcome to the installation!
                LOAD_TEMPLATE("install_welcome");
                break;
 
        case "1": // Server path, base URL
-               define('__PATH_LEN'     , strlen(PATH));
-               define('__BURL_LEN'     , strlen($burl));
-               define('__TITLE_LEN'    , strlen(MAIN_TITLE));
-               define('__SLOGAN_LEN'   , strlen(SLOGAN));
-               define('__WEBMASTER_LEN', (strlen(WEBMASTER) * 3));
-
+               // @Profi-Concept: Hab meine Meinung doch geaendert! :-)
                // Load template
                LOAD_TEMPLATE("install_page1");
                break;
@@ -132,290 +102,294 @@ 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 ((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 (empty($mysql['type']))   $mysql['type']   = "MyISAM";
+               if (getTotalFatalErrors() > 0) {
+                       OUTPUT_HTML("<span class=\"install_fatal\">");
+                       foreach (getFatalArray() 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_PREFIX', $mysql['prefix']);
+               define('__TABLE_TYPE'  , $mysql['type']);
                define('__MYSQL_LOGIN' , $mysql['login']);
-               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']);
+               define('__SPATH_VALUE' , REQUEST_POST('spath'));
+               define('__BURL_VALUE'  , REQUEST_POST('burl'));
+               define('__TITLE_VALUE' , REQUEST_POST('title'));
+               define('__SLOGAN_VALUE', REQUEST_POST('slogan'));
+               define('__EMAIL_VALUE' , REQUEST_POST('email'));
 
                // Load template
                LOAD_TEMPLATE("install_page2");
                break;
 
+       case "3":
+               // Set more values
+               define('__SPATH_VALUE'  , REQUEST_POST('spath'));
+               define('__BURL_VALUE'   , REQUEST_POST('burl'));
+               define('__TITLE_VALUE'  , REQUEST_POST('title'));
+               define('__SLOGAN_VALUE' , REQUEST_POST('slogan'));
+               define('__EMAIL_VALUE'  , REQUEST_POST('email'));
+
+               // Use default SMTP data
+               $smtpHost  = constant('SMTP_HOSTNAME');
+               $smtpUser  = constant('SMTP_USER');
+               $smtpPass1 = constant('SMTP_PASSWORD');
+               $smtpPass2 = constant('SMTP_PASSWORD');
+
+               // Overwrite it with the data from sent (failed) form
+               if (REQUEST_ISSET_POST(('smtp_host'))) $smtpHost = REQUEST_POST('smtp_host');
+               if (REQUEST_ISSET_POST(('smtp_user'))) $smtpUser = REQUEST_POST('smtp_user');
+
+               // MySQL settings
+               define('__MYSQL_HOST'   , $mysql['host']);
+               define('__MYSQL_DBASE'  , $mysql['dbase']);
+               define('__MYSQL_PREFIX' , $mysql['prefix']);
+               define('__TABLE_TYPE'   , $mysql['type']);
+               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
-               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\">
-<TABLE border=\"0\" cellspacing=\"0\" cellpadding=\"0\" class=\"install_content\">
-<TR>
-  <TD colspan=\"2\" align=\"center\">
-    <STRONG class=\"install\">".HEADER_TEXT_PAGE5."</STRONG>
-  </TD>
-</TR>
-<TR><TD colspan=\"2\" height=\"21\" class=\"seperator\">&nbsp;</TD></TR>
-<TR>
-  <TD colspan=\"2\"><SPAN class=\"install_intro\">
-    ".TEXT_PAGE_5."
-  </SPAN></TD>
-</TR>
-<TR><TD colspan=\"2\" height=\"21\" class=\"seperator\">&nbsp;</TD></TR>
-<TR>
-  <TD class=\"install\" align=\"right\">".LANG_OUTPUT_MODE.":&nbsp;&nbsp;</TD>
-  <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>
-      <OPTION value=\"direct\"");
-               if (OUTPUT_MODE == "direct") OUTPUT_HTML(" selected=\"selected\"");
-               OUTPUT_HTML(">".MODE_DIRECT."</OPTION>
-    </SELECT>
-  </TD>
-</TR>
-<TR><TD colspan=\"2\" height=\"21\" 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\"");
-               if (warn_no_pass) OUTPUT_HTML(" selected=\"selected\"");
-               OUTPUT_HTML(">".YES."</OPTION>
-      <OPTION value=\"false\"");
-               if (!warn_no_pass) 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_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>
-      <OPTION value=\"false\"");
-               if (!frameset_active) 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\">".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>
-      <OPTION value=\"false\"");
-               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\">");
-               foreach ($mysql as $key=>$value)
-               {
-                       OUTPUT_HTML("    <INPUT type=\"hidden\" name=\"mysql[".$key."]\" value=\"".$value."\">");
+               // General settings
+               define('__SPATH_VALUE'  , REQUEST_POST('spath'));
+               define('__BURL_VALUE'   , REQUEST_POST('burl'));
+               define('__TITLE_VALUE'  , REQUEST_POST('title'));
+               define('__SLOGAN_VALUE' , REQUEST_POST('slogan'));
+               define('__EMAIL_VALUE'  , REQUEST_POST('email'));
+
+               // MySQL settings
+               define('__MYSQL_HOST'   , $mysql['host']);
+               define('__MYSQL_DBASE'  , $mysql['dbase']);
+               define('__MYSQL_PREFIX' , $mysql['prefix']);
+               define('__TABLE_TYPE'   , $mysql['type']);
+               define('__MYSQL_LOGIN'  , $mysql['login']);
+
+               // SMTP settings
+               define('__SMTP_HOST'    , REQUEST_POST('smtp_host'));
+               define('__SMTP_USER'    , REQUEST_POST('smtp_user'));
+               define('__SMTP_PASS'    , REQUEST_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\">
+    <div class=\"install\">{--HEADER_TEXT_PAGE5--}</strong>
+  </td>
+</tr>
+<tr><td colspan=\"2\" height=\"21\" class=\"seperator\">&nbsp;</td></tr>
+<tr>
+  <td colspan=\"2\"><span class=\"install_intro\">
+    {--TEXT_PAGE_5--}
+  </span></td>
+</tr>
+<tr><td colspan=\"2\" height=\"21\" class=\"seperator\">&nbsp;</td></tr>
+<tr>
+  <td class=\"install\" align=\"right\">{--LANG_OUTPUT_MODE--}:&nbsp;&nbsp;</td>
+  <td>
+    <select name=\"omode\" size=\"1\" class=\"install_select\">
+      <option value=\"render\"");
+               if (constant('OUTPUT_MODE') == "render") OUTPUT_HTML(" selected=\"selected\"");
+               OUTPUT_HTML(">{--MODE_RENDER--}</option>
+      <option value=\"direct\"");
+               if (constant('OUTPUT_MODE') == "direct") OUTPUT_HTML(" selected=\"selected\"");
+               OUTPUT_HTML(">{--MODE_DIRECT--}</option>
+    </select>
+  </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\"");
+               if (isBooleanConstantAndTrue('warn_no_pass')) OUTPUT_HTML(" selected=\"selected\"");
+               OUTPUT_HTML(">{--YES--}</option>
+      <option value=\"false\"");
+               if (!isBooleanConstantAndTrue('warn_no_pass')) OUTPUT_HTML(" selected=\"selected\"");
+               OUTPUT_HTML(">{--NO--}</option>
+    </select>
+  </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\"");
+               if (isBooleanConstantAndTrue('WRITE_FOOTER')) OUTPUT_HTML(" selected=\"selected\"");
+               OUTPUT_HTML(">{--YES--}</option>
+      <option value=\"false\"");
+               if (!isBooleanConstantAndTrue('WRITE_FOOTER')) OUTPUT_HTML(" selected=\"selected\"");
+               OUTPUT_HTML(">{--NO--}</option>
+    </select>
+  </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\"");
+               if (isBooleanConstantAndTrue('ENABLE_BACKLINK')) OUTPUT_HTML(" selected=\"selected\"");
+               OUTPUT_HTML(">{--YES--}</option>
+      <option value=\"false\"");
+               if (!isBooleanConstantAndTrue('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\">");
+               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."\">
-    <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=\"submit\" class=\"admin_submit submit\" name=\"finalize\" value=\"".NEXT_PAGE."\" class=\"install_submit\">
-  </TD>
-</TR>
-<TR><TD colspan=\"2\" height=\"21\" class=\"seperator\">&nbsp;</TD></TR>
-</TABLE>
-</FORM>");
+               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=\"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>
+<tr><td colspan=\"2\" height=\"21\" class=\"seperator\">&nbsp;</td></tr>
+</table>
+</form>");
                break;
 
        case "finalize": // Write captured data to files
-               if (!empty($_POST['finalize']))
-               {
-                       // You have submitted data then we have to reset the fatal messages
-                       $FATAL = array();
+               if ((REQUEST_ISSET_POST(('finalize'))) && (!isInstalled())) {
+                       // You have submitted data then we have to reset the SQLs
+                       INIT_SQLS();
 
                        // Connect to MySQL server
-                       $link = SQL_CONNECT($mysql['host'], $mysql['login'], $mysql['pass1'], __FILE__, __LINE__);
-                       if ($link)
-                       {
+                       SQL_CONNECT($mysql['host'], $mysql['login'], $mysql['pass1'], __FILE__, __LINE__);
+                       if (SQL_IS_LINK_UP()) {
                                // Seems to work, also right database?
-                               $db = SQL_SELECT_DB($mysql['dbase'], $link, __FILE__, __LINE__);
-                               if ($db)
-                               {
+                               if (SQL_SELECT_DB($mysql['dbase'], __FILE__, __LINE__) === true) {
                                        // 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_exists($ERRORS)) && (filesize($ERRORS) > 0))
-                                               {
-                                                       ADD_FATAL(MYSQLDUMP_ERROR);
-                                               }
-                                                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__);
-                                               }
-                                                else
-                                               {
-                                                       ADD_FATAL(INSTALL_MAYBE_DONE);
-                                               }
-                                       }
-                                        else
-                                       {
+                                       if ((FILE_READABLE(REQUEST_POST('spath')."install/tables.sql")) && (FILE_READABLE(REQUEST_POST('spath')."install/menu-".GET_LANGUAGE().".sql"))) {
+                                               // Both exists so import them
+                                               foreach (array("tables", "menu-".GET_LANGUAGE()) as $dump) {
+                                                       // Should be save here because file_exists() is there but we check it again. :)
+                                                       $FQFN = REQUEST_POST('spath') . "install/" . $dump . ".sql";
+                                                       if (FILE_READABLE($FQFN)) {
+                                                               // Read the file
+                                                               $fileContent = READ_FILE($FQFN, true);
+
+                                                               // Replace the {!prefix!} with actual one
+                                                               while (strpos($fileContent, "{!prefix!}") !== false) {
+                                                                       $fileContent = str_replace("{!prefix!}", $mysql['prefix'], $fileContent);
+                                                               } // END - while
+
+                                                               // Replace the {!type!} with actual one
+                                                               while (strpos($fileContent, "{!type!}") !== false) {
+                                                                       $fileContent = str_replace("{!type!}", $mysql['type'], $fileContent);
+                                                               } // END - while
+
+                                                               // And split it up against ;\n ...
+                                                               SET_SQLS(merge_array(GET_SQLS(), explode(";\n", $fileContent)));
+                                                       } else {
+                                                               // Not readable!
+                                                               debug_report_bug(sprintf("SQL dump %s is not readable!", $dump));
+                                                       }
+                                               } // END - foreach
+
+                                               // Are some SQLs found?
+                                               if (COUNT_SQLS() == 0) {
+                                                       // Abort here
+                                                       addFatalMessage(__FILE__, __LINE__, getMessage('INSTALL_SQL_IMPORT_FAILED'));
+                                                       return;
+                                               } // END - if
+
+                                               // Now run all queries through and try to keep out empty or comment queries
+                                               runFilterChain('run_sqls');
+
+                                               // Ok, all done. So we can write the config data to the php files
+                                               if (REQUEST_POST('spath') != constant('PATH')) changeDataInFile(REQUEST_POST('spath')."inc/config.php", "SERVER-PATH", "define('PATH', \"", "\");", REQUEST_POST('spath'), 0);
+                                               if (REQUEST_POST('burl')  != constant('URL'))  changeDataInFile(REQUEST_POST('spath')."inc/config.php", "HOST-URL", "define('URL', \"", "\");", REQUEST_POST('burl'), 0);
+                                               changeDataInFile(REQUEST_POST('spath')."inc/config.php", "MAIN_TITLE", "define('MAIN_TITLE', \"", "\");", REQUEST_POST('title'), 0);
+                                               changeDataInFile(REQUEST_POST('spath')."inc/config.php", "SLOGAN", "define('SLOGAN', \"", "\");", REQUEST_POST('slogan'), 0);
+                                               changeDataInFile(REQUEST_POST('spath')."inc/config.php", "WEBMASTER", "define('WEBMASTER', \"", "\");", REQUEST_POST('email'), 0);
+                                               changeDataInFile(REQUEST_POST('spath')."inc/config.php", "NULLPASS-WARNING", "define('warn_no_pass', ", ");", REQUEST_POST('warn_no_pass'), 0);
+                                               changeDataInFile(REQUEST_POST('spath')."inc/config.php", "WRITE-FOOTER", "define('WRITE_FOOTER', ", ");", REQUEST_POST('wfooter'), 0);
+                                               changeDataInFile(REQUEST_POST('spath')."inc/config.php", "BACKLINK", "define('ENABLE_BACKLINK', ", ");", REQUEST_POST('blink'), 0);
+                                               // DEACTIVATED: changeDataInFile(REQUEST_POST('spath')."inc/config.php", "OUTPUT-MODE", "define('OUTPUT_MODE', \"", "\");", REQUEST_POST('omode'), 0);
+                                               changeDataInFile(REQUEST_POST('spath')."inc/config.php", "MYSQL-HOST", "        'host'     => \"", "\",", $mysql['host'], 0);
+                                               changeDataInFile(REQUEST_POST('spath')."inc/config.php", "MYSQL-DBASE", "       'dbase'    => \"", "\",", $mysql['dbase'], 0);
+                                               changeDataInFile(REQUEST_POST('spath')."inc/config.php", "MYSQL-LOGIN", "       'login'    => \"", "\",", $mysql['login'], 0);
+                                               changeDataInFile(REQUEST_POST('spath')."inc/config.php", "MYSQL-PASSWORD", "    'password' => \"", "\",", $mysql['pass1'], 0);
+                                               changeDataInFile(REQUEST_POST('spath')."inc/config.php", "MYSQL-PREFIX", "define('_MYSQL_PREFIX', \"", "\");", $mysql['prefix'], 0);
+                                               changeDataInFile(REQUEST_POST('spath')."inc/config.php", "TABLE-TYPE", "define('_TABLE_TYPE', \"", "\");", $mysql['type'], 0);
+                                               changeDataInFile(REQUEST_POST('spath')."inc/config.php", "SMTP-HOSTNAME", "define('SMTP_HOSTNAME', \"", "\");", REQUEST_POST('smtp_host'), 0);
+                                               changeDataInFile(REQUEST_POST('spath')."inc/config.php", "SMTP-USER", "define('SMTP_USER', \"", "\");", REQUEST_POST('smtp_user'), 0);
+                                               changeDataInFile(REQUEST_POST('spath')."inc/config.php", "SMTP-PASSWORD", "define('SMTP_PASSWORD', \"", "\");", REQUEST_POST('smtp_pass1'), 0);
+                                               changeDataInFile(REQUEST_POST('spath')."inc/config.php", "INSTALLED", "define('mxchange_installed', ", ");", "true", 0);
+                                       } else {
                                                // Installation area not found!
-                                               ADD_FATAL(INSTALL_MISSING_DUMPS);
+                                               addFatalMessage(__FILE__, __LINE__, getMessage('INSTALL_MISSING_DUMPS'));
                                        }
-                               }
-                       }
-                       if ((sizeof($FATAL) > 0) || ($FATAL[0] != ""))
-                       {
+                               } // END - if
+                       } // END - if
+
+                       if (getTotalFatalErrors() > 0) {
                                $OUT = "";
-                               foreach ($FATAL as $value)
-                               {
-                                       $OUT .= "    <LI>".$value."</LI>\n";
-                               }
+                               foreach (getFatalArray() as $value) {
+                                       $OUT .= "    <li>".$value."</li>\n";
+                               } // END foreach
                                define('__FATAL_ERROR_LI', $OUT);
                                $OUT = "";
-                               foreach ($mysql as $key=>$value)
-                               {
-                                       $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']);
-
-                               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\">
-    <STRONG class=\"install\">".HEADER_MYSQL_ERRORS."</STRONG>
-  </TD>
-</TR>
-<TR><TD colspan=\"2\" height=\"21\" class=\"seperator\">&nbsp;</TD></TR>
-<TR>
-  <TD><SPAN class=\"install_intro\">
-    ".TEXT_MYSQL_ERRORS."
-  </SPAN></TD>
-</TR>
-<TR>
-  <TD align=\"center\"><STRONG>
-    <OL>
-".__FATAL_ERROR_LI."
-    </OL>
-".__MYSQL_DATA."
-    <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=\"submit\" class=\"admin_submit\" name=\"ok\" value=\"".RETURN_MYSQL_PAGE."\">
-  </STRONG></TD>
-</TR>
-</TABLE>
-</FORM>");
-                       }
-                        else
-                       {
+                               foreach ($mysql as $key => $value) {
+                                       $OUT .= "    <input type=\"hidden\" name=\"mysql[".$key."]\" value=\"".$value."\">\n";
+                               } // END foreach
+                               define('__MYSQL_DATA'   , $OUT);
+                               define('__SPATH_VALUE'  , REQUEST_POST('spath'));
+                               define('__BURL_VALUE'   , REQUEST_POST('burl'));
+                               define('__TITLE_VALUE'  , REQUEST_POST('title'));
+                               define('__SMTP_HOST'    , REQUEST_POST('smtp_host'));
+                               define('__SMTP_USER'    , REQUEST_POST('smtp_user'));
+                               define('__SMTP_PASS'    , REQUEST_POST('smtp_pass1'));
+
+                               // Load template
+                               LOAD_TEMPLATE("install_fatal_errors");
+                       } else {
                                // Installation is done!
-                               $URL = $burl."/install.php?page=finalize";
-                               LOAD_URL($URL);
+                               LOAD_URL("install.php?page=finalize");
                        }
-               }
-                elseif (mxchange_installed)
-               {
+               } elseif (isInstalled()) {
                        // 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>");
-               }
-                else
-               {
+                       LOAD_TEMPLATE("install_finished");
+               } else {
                        // Something goes wrong during installation! :-(
-                       ADD_FATAL(INSTALL_FINALIZER_FAILED);
-                       include ("inc/fatal_errors.php");
+                       addFatalMessage(__FILE__, __LINE__, getMessage('INSTALL_FINALIZER_FAILED'));
+                       LOAD_INC("inc/fatal_errors.php");
                }
                break;
 
        default:
-               OUTPUT_HTML("    <STRONG class=\"install_error\">".WRONG_PAGE."</STRONG>");
+               DEBUG_LOG(__FILE__, __LINE__, sprintf("Wrong page %s detected", REQUEST_GET('page')));
+               OUTPUT_HTML("    <div class=\"install_error\">{--WRONG_PAGE--}</strong>");
                break;
        }
+} else {
+       // Already installed!
+       addFatalMessage(__FILE__, __LINE__, getMessage('ALREADY_INSTALLED'));
 }
- else
-{
-       ADD_FATAL(ALREADY_INSTALLED);
-}
+
 //
 ?>