X-Git-Url: https://git.mxchange.org/?p=mailer.git;a=blobdiff_plain;f=inc%2Finstall-inc.php;h=681e7c14aa5bf0f802276cad573ab586cb6f0aad;hp=c24f262f5d9f77bf84a641a4f12367e506a86fe6;hb=18307767587d0bbb96c9e545790e590ebf3ea396;hpb=595124165eb35633520ee0c8e7d5196ba515c00f diff --git a/inc/install-inc.php b/inc/install-inc.php index c24f262f5d..681e7c14aa 100644 --- a/inc/install-inc.php +++ b/inc/install-inc.php @@ -1,7 +1,7 @@ READ: ".$file."
"); - if (is_resource($fp)) { - $fp_tmp = @fopen($tmp, 'w') or OUTPUT_HTML("WRITE: ".$tmp."
"); - if (is_resource($fp_tmp)) { - while (!feof($fp)) { - $line = fgets ($fp, 10240); - //* DEBUG: */ echo $search."/".htmlentities($line)."
\n"; - $found = strpos($line, $search); - //* DEBUG: */ echo "FOUND: "; - //* DEBUG: */ var_dump($found); - //* DEBUG: */ echo "
\n"; - if ($found !== false) $next = 0; - if ($next > -1) { - if ($next == $sneak) { - $next = -1; - $line = $prefix.$DATA.$suffix."\n"; - //* DEBUG: */ echo "NEW: ".htmlentities($line)."
\n"; - } else { - $next++; - } - } // END - if - //* DEBUG: */ echo "WRITE: ".htmlentities($line)."
\n"; - fputs($fp_tmp, $line); - } // END - while - fclose($fp_tmp); + die(); +} // END - if - // Finished writing tmp file - $done = true; - } // END - if +// Load extension timezone +loadExtension('timezone', 'test'); - // Close source directory - fclose($fp); +// Set config entry +setConfigEntry('timezone', 'Europe/Berlin'); - if (($done) && (is_writeable($file))) { - // Copy back tmp file and delete tmp :-) - @copy($tmp, $file); - @unlink($tmp); - } else { - OUTPUT_HTML("TMP: UNDONE!"); - } - } // END - if - } else { - OUTPUT_HTML("404: ".$file."
"); - } -} +// And init timezone +FILTER_INIT_TIMEZONE(array()); -// -$mysql = ""; -if (isset($_POST['mysql']) && is_array($_POST['mysql'])) $mysql = $_POST['mysql']; - -if (URL != "http://your-server.com") { - // Already installed??? - $burl = constant('URL'); -} elseif (empty($burl)) { - // Auto-detect URL - $burl = "http://".$SERVER_NAME.$_SERVER['PHP_SELF']; - $burl = substr($burl, 0, strpos($burl, "install.php")); -} +// Init variables +$GLOBALS['install_mysql'] = array(); +if ((isPostRequestParameterSet('mysql')) && (is_array(postRequestParameter('mysql')))) { + // Transfer 'mysql' array + $GLOBALS['install_mysql'] = postRequestParameter('mysql'); +} // END - if // Check if both passwords from SMTP are matching -if ((isset($_GET['page']) && ($_GET['page'] == 5))) { +if ((isGetRequestParameterSet('page') && (getRequestParameter('page') == 5))) { // Okay, we have to check it - if (!empty($_POST['smtp_user']) && (empty($_POST['smtp_host']))) { + if (isPostRequestParameterSet('smtp_user') && (!isPostRequestParameterSet('smtp_host'))) { // Hostname not set - OUTPUT_HTML(getMessage('INSTALL_SMTP_HOSTNAME_EMPTY')."
"); - $_GET['page'] = 3; + addToInstallContent('
{--INSTALL_SMTP_HOSTNAME_EMPTY--}
'); + setGetRequestParameter('page', 3); } // END - if - if ((empty($_POST['smtp_pass1'])) && (!empty($_POST['smtp_pass2']))) { + + if ((!isPostRequestParameterSet('smtp_pass1')) && (isPostRequestParameterSet('smtp_pass2'))) { // Password is empty - OUTPUT_HTML(getMessage('INSTALL_SMTP_PASS1_EMPTY')."
"); - $_GET['page'] = 3; + addToInstallContent('
{--INSTALL_SMTP_PASS1_EMPTY--}
'); + setGetRequestParameter('page', 3); } // END - if - if ((!empty($_POST['smtp_pass1'])) && (empty($_POST['smtp_pass2']))) { + + if ((isPostRequestParameterSet('smtp_pass1')) && (!isPostRequestParameterSet('smtp_pass2'))) { // Password repeat is empty - OUTPUT_HTML(getMessage('INSTALL_SMTP_PASS2_EMPTY')."
"); - $_GET['page'] = 3; + addToInstallContent('
{--INSTALL_SMTP_PASS2_EMPTY--}
'); + setGetRequestParameter('page', 3); } // END - if - if ($_POST['smtp_pass1'] != $_POST['smtp_pass1']) { + + if (postRequestParameter('smtp_pass1') != postRequestParameter('smtp_pass1')) { // Passwords are not matching - OUTPUT_HTML(getMessage('INSTALL_SMTP_PASS_MISMATCH')."
"); - $_GET['page'] = 3; + addToInstallContent('
{--INSTALL_SMTP_PASS_MISMATCH--}
'); + setGetRequestParameter('page', 3); } // END - if } // END - if -// 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); - +// Is the mailer installed or no admin registered so far? +if ((!isInstalled()) || (!isAdminRegistered())) { // Output page for entered value - switch ($_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)); - - // Load template - LOAD_TEMPLATE("install_page1"); - break; - - case "2": // MySQL data (alone!) - if (empty($mysql['dbase'])) $mysql['dbase'] = "your_database"; - if (empty($mysql['login'])) $mysql['login'] = "your_login"; - if (empty($mysql['host'])) $mysql['host'] = "localhost"; - if (empty($mysql['prefix'])) $mysql['prefix'] = "mxchange_"; - if (getTotalFatalErrors() > 0) { - OUTPUT_HTML(""); - foreach ($FATAL as $key => $err) { - OUTPUT_HTML(" · {!FATAL_NO!}".($key + 1).": ".$err."
"); - } - OUTPUT_HTML("
"); - } - define('__MYSQL_HOST' , $mysql['host']); - define('__MYSQL_DBASE' , $mysql['dbase']); - define('__MYSQL_PREFIX', $mysql['prefix']); - 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']); - - // Load template - 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 = 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 (!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 - // 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("
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-
{!HEADER_TEXT_PAGE5!} -
 
- {!TEXT_PAGE_5!} -
 
{!LANG_OUTPUT_MODE!}:   - -
 
{!WARN_NO_PASSWORD!}:   - -
 
{!LANG_WRITE_FOOTER!}:   - -
 
{!INSTALL_ENABLE_BACKLINK!}:   - -
 
"); - foreach ($mysql as $key => $value) { - OUTPUT_HTML(" "); - } - OUTPUT_HTML(" - - - - - - - - -
 
-
"); - break; - - case "finalize": // Write captured data to files - if ((!empty($_POST['finalize'])) && (!isBooleanConstantAndTrue('mxchange_installed'))) { - // You have submitted data then we have to reset the fatal messages - $SQLs = array(); - - // Connect to MySQL server - $link = SQL_CONNECT($mysql['host'], $mysql['login'], $mysql['pass1'], __FILE__, __LINE__); - if ($link) { - // Seems to work, also right database? - $db = SQL_SELECT_DB($mysql['dbase'], $link, __FILE__, __LINE__); - if ($db) { - // Automatically run install.sql - 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)) { - // Read the file - $SQLs = READ_FILE($file, true); - - // And split it up against ;\n ... - $SQLs = merge_array($SQLs, explode(";\n", $sql)); - } // END - if - } // END - foreach + switch (getRequestParameter('page')) { + case 'welcome': // Welcome to the installation! + addTemplateToInstallContent('install_welcome'); + break; + + case '1': // Server path, base URL + // Load template + addTemplateToInstallContent('install_page1'); + break; + + case '2': // Database login data + if (empty($GLOBALS['install_mysql']['dbase'])) $GLOBALS['install_mysql']['dbase'] = 'your_database'; + if (empty($GLOBALS['install_mysql']['login'])) $GLOBALS['install_mysql']['login'] = 'your_login'; + if (empty($GLOBALS['install_mysql']['host'])) $GLOBALS['install_mysql']['host'] = 'localhost'; + if (empty($GLOBALS['install_mysql']['prefix'])) $GLOBALS['install_mysql']['prefix'] = 'mailer'; + if (empty($GLOBALS['install_mysql']['type'])) $GLOBALS['install_mysql']['type'] = 'MyISAM'; + if (ifFatalErrorsDetected()) { + addToInstallContent('
'); + } // END - if + + $content['mysql_host'] = $GLOBALS['install_mysql']['host']; + $content['mysql_dbase'] = $GLOBALS['install_mysql']['dbase']; + $content['mysql_prefix'] = $GLOBALS['install_mysql']['prefix']; + $content['mysql_login'] = $GLOBALS['install_mysql']['login']; + $content['table_type'] = $GLOBALS['install_mysql']['type']; + $content['spath'] = postRequestParameter('spath'); + $content['burl'] = postRequestParameter('burl'); + $content['title'] = postRequestParameter('title'); + $content['slogan'] = postRequestParameter('slogan'); + $content['email'] = postRequestParameter('email'); + + // Load template + addTemplateToInstallContent('install_page2', $content); + break; + + case '3': + // Set more values + $content['spath'] = postRequestParameter('spath'); + $content['burl'] = postRequestParameter('burl'); + $content['title'] = postRequestParameter('title'); + $content['slogan'] = postRequestParameter('slogan'); + $content['email'] = postRequestParameter('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 (isPostRequestParameterSet('smtp_host')) $smtpHost = postRequestParameter('smtp_host'); + if (isPostRequestParameterSet('smtp_user')) $smtpUser = postRequestParameter('smtp_user'); + if (isPostRequestParameterSet('smtp_pass')) { + $smtpPass1 = postRequestParameter('smtp_pass'); + $smtpPass2 = postRequestParameter('smtp_pass'); + } // END - if - // Are some SQLs found? - if (count($SQLs) == 0) { - // Abort here - addFatalMessage(getMessage('INSTALL_SQL_IMPORT_FAILED')); + // Database login data + $content['mysql_host'] = $GLOBALS['install_mysql']['host']; + $content['mysql_dbase'] = $GLOBALS['install_mysql']['dbase']; + $content['mysql_prefix'] = $GLOBALS['install_mysql']['prefix']; + $content['table_type'] = $GLOBALS['install_mysql']['type']; + $content['mysql_login'] = $GLOBALS['install_mysql']['login']; + $content['mysql_pass1'] = $GLOBALS['install_mysql']['pass1']; + $content['mysql_pass2'] = $GLOBALS['install_mysql']['pass2']; + + // Set constants for SMTP data + $content['smtp_host'] = $smtpHost; + $content['smtp_user'] = $smtpUser; + $content['smtp_pass1'] = $smtpPass1; + $content['smtp_pass2'] = $smtpPass2; + + // Load template + addTemplateToInstallContent('install_page3', $content); + break; + + case '5': // Misc settings + // General settings + $content['spath'] = postRequestParameter('spath'); + $content['burl'] = postRequestParameter('burl'); + $content['title'] = postRequestParameter('title'); + $content['slogan'] = postRequestParameter('slogan'); + $content['email'] = postRequestParameter('email'); + + // SMTP settings + $content['smtp_host'] = postRequestParameter('smtp_host'); + $content['smtp_user'] = postRequestParameter('smtp_user'); + $content['smtp_pass'] = postRequestParameter('smtp_pass1'); + + // Database login data + $OUT = ''; + foreach ($GLOBALS['install_mysql'] as $key => $value) { + $OUT .= ' '; + } // END - foreach + $content['mysql_hidden'] = $OUT; + + // Load template + addTemplateToInstallContent('install_page5', $content); + break; + + case 'finalize': // Write captured data to files + if ((isPostRequestParameterSet('finalize')) && (!isInstalled())) { + // You have submitted data then we have to reset the SQLs + initSqls(); + + // Restore PHPs error handler to prevent ours to handle errors, + // e.g. failed connection attempts. We want to handle them on + // our own. + restore_error_handler(); + + // Connect to database server + SQL_CONNECT($GLOBALS['install_mysql']['host'], $GLOBALS['install_mysql']['login'], $GLOBALS['install_mysql']['pass1'], __FILE__, __LINE__); + + // Is the link up? + if (SQL_IS_LINK_UP()) { + // Seems to work, also right database? + if (SQL_SELECT_DB($GLOBALS['install_mysql']['dbase'], __FILE__, __LINE__) === true) { + // Check for dumps + if ((!isFileReadable(postRequestParameter('spath') . 'install/tables.sql')) || (!isFileReadable(postRequestParameter('spath') . 'install/menu-'.getLanguage().'.sql'))) { + // Installation area not found + addFatalMessage(__FILE__, __LINE__, '{--INSTALL_MISSING_DUMPS--}'); return; } // END - if - // 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__); + // Any errors detected? + if (!ifFatalErrorsDetected()) { + // Set type and prefix from POST data + setConfigEntry('_TABLE_TYPE' , postRequestParameter('mysql', 'type')); + setConfigEntry('_MYSQL_PREFIX', postRequestParameter('mysql', 'prefix')); + + // Both exists so import them + foreach (array('tables', 'menu-'.getLanguage()) as $dump) { + // Should be save here because file_exists() is there but we check it again. :) + $FQFN = postRequestParameter('spath') . 'install/' . $dump . '.sql'; + + // Is the file readable? + if (isFileReadable($FQFN)) { + // Read the file + $fileContent = readSqlDump($FQFN); + + // Split it up against ";\n" and merge it into existing SQLs + mergeSqls(explode(";\n", $fileContent), 'install'); + } else { + // Not readable! + debug_report_bug(__FILE__, __LINE__, sprintf("SQL dump %s is not readable!", $dump)); + } + } // END - foreach + //* DEBUG: */ die(__FUNCTION__.'['.__LINE__.']:'
'.print_r(getSqls(), true).'
'); + + // Are some SQLs found? + if (countSqls() == 0) { + // Abort here + addFatalMessage(__FILE__, __LINE__, '{--INSTALL_SQL_IMPORT_FAILED--}'); + return; } // END - if - } // END - foreach - - // Ok, all done. So we can write the config data to the php files - if ($_POST['spath'] != constant('PATH')) install_WriteData($_POST['spath']."inc/config.php", "SERVER-PATH", "define('PATH', \"", "\");", $_POST['spath'], 0); - if ($_POST['burl'] != constant('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); - } else { - // Installation area not found! - addFatalMessage(getMessage('INSTALL_MISSING_DUMPS')); - } + + // Now run all queries through and try to keep out empty or comment queries + runFilterChain('run_sqls'); + + // Copy the config template and verify it + doInstallWriteLocalConfig(); + } // END - if + } // END - if } // END - if - } // END - if - if (getTotalFatalErrors() > 0) { - $OUT = ""; - foreach ($FATAL as $value) { - $OUT .= "
  • ".$value."
    • \n"; - } // END foreach - define('__FATAL_ERROR_LI', $OUT); - $OUT = ""; - foreach ($mysql as $key => $value) { - $OUT .= " \n"; - } // END foreach - 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']); - - // Load template - LOAD_TEMPLATE("install_fatal_errors"); + if (ifFatalErrorsDetected()) { + $OUT = ''; + foreach (getFatalArray() as $value) { + $OUT .= '
  • ' . $value . '
    • '; + } // END foreach + $content['fatal_errors'] = $OUT; + $OUT = ''; + foreach ($GLOBALS['install_mysql'] as $key => $value) { + $OUT .= ' '; + } // END foreach + $content['mysql_hidden'] = $OUT; + $content['spath'] = postRequestParameter('spath'); + $content['burl'] = postRequestParameter('burl'); + $content['title'] = postRequestParameter('title'); + $content['smtp_host'] = postRequestParameter('smtp_host'); + $content['smtp_user'] = postRequestParameter('smtp_user'); + $content['smtp_pass'] = postRequestParameter('smtp_pass1'); + + // Load template + addTemplateToInstallContent('install_fatal_errors', $content); + + // We have handled all fatal errors here + initFatalMessages(); + } else { + // Installation is done! + redirectToUrl('install.php?page=finished'); + } } else { - // Installation is done! - LOAD_URL($burl."/install.php?page=finalize"); + // Something goes wrong during installation! :-( + addFatalMessage(__FILE__, __LINE__, '{--INSTALL_FINALIZER_FAILED--}'); } - } elseif (isBooleanConstantAndTrue('mxchange_installed')) { - // Redirection after writing data... :-) - LOAD_TEMPLATE("install_finished"); - } else { - // Something goes wrong during installation! :-( - addFatalMessage(getMessage('INSTALL_FINALIZER_FAILED')); - LOAD_INC("inc/fatal_errors.php"); - } - break; - - default: - DEBUG_LOG(__FILE__, __LINE__, sprintf("Wrong page %s detected!}, $_GET['page'])); - OUTPUT_HTML("
    {!WRONG_PAGE!}"); - break; - } + break; + + case 'finished': + if (isInstalled()) { + // Load template that we are finished + addTemplateToInstallContent('install_finished'); + } else { + // Not finished + redirectToUrl('install.php'); + } + break; + + default: + logDebugMessage(__FILE__, __LINE__, sprintf("Wrong page %s detected", getRequestParameter('page'))); + addTemplateToInstallContent('admin_settings_unsaved', '{--WRONG_PAGE--}'); + break; + } // END - switch } else { - addFatalMessage(ALREADY_INSTALLED); + // Already installed! + addFatalMessage(__FILE__, __LINE__, '{--ALREADY_INSTALLED--}'); } -// + +// [EOF] ?>