X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;ds=sidebyside;f=inc%2Finstall-inc.php;h=1631b93f876f8ebd40a986a44e34684ad3a2de38;hb=ee71bda9cc7d75f090ae2e1a2d05d4903523e112;hp=1b9ecb61af12783a006787fc589f3350f5034292;hpb=3daede4c904e23905c3e48dd6749019deca0a0e0;p=mailer.git
diff --git a/inc/install-inc.php b/inc/install-inc.php
index 1b9ecb61af..1631b93f87 100644
--- a/inc/install-inc.php
+++ b/inc/install-inc.php
@@ -41,120 +41,56 @@ if (!defined('__SECURITY')) {
require($INC);
}
-//
-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";
- $fp = @fopen($file, 'r') or OUTPUT_HTML("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);
-
- // Finished writing tmp file
- $done = true;
- } // END - if
-
- // Close source directory
- fclose($fp);
+// Load sql_patches here
+LOAD_EXTENSION("sql_patches");
- 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."
");
- }
-}
-
-//
+// Init variables
$mysql = "";
-if (isset($_POST['mysql']) && is_array($_POST['mysql'])) $mysql = $_POST['mysql'];
-
-if (URL != "http://your-server.com") {
- // Already installed???
- $burl = URL;
-} elseif (empty($burl)) {
- // Auto-detect URL
- $burl = "http://".$SERVER_NAME.$_SERVER['PHP_SELF'];
- $burl = substr($burl, 0, strpos($burl, "install.php"));
-}
+if ((REQUEST_ISSET_POST(('mysql'))) && (is_array(REQUEST_POST('mysql')))) $mysql = REQUEST_POST('mysql');
// Check if both passwords from SMTP are matching
-if ((isset($_GET['page']) && ($_GET['page'] == 5))) {
+if ((REQUEST_ISSET_GET(('page')) && (REQUEST_GET('page') == 5))) {
// Okay, we have to check it
- if (!empty($_POST['smtp_user']) && (empty($_POST['smtp_host']))) {
+ if (REQUEST_ISSET_POST(('smtp_user')) && (!REQUEST_ISSET_POST(('smtp_host')))) {
// Hostname not set
- OUTPUT_HTML(INSTALL_SMTP_HOSTNAME_EMPTY."
");
- $_GET['page'] = 3;
+ OUTPUT_HTML(getMessage('INSTALL_SMTP_HOSTNAME_EMPTY')."
");
+ REQUEST_SET_GET('page', 3);
} // END - if
- if ((empty($_POST['smtp_pass1'])) && (!empty($_POST['smtp_pass2']))) {
+
+ if ((!REQUEST_ISSET_POST(('smtp_pass1'))) && (REQUEST_ISSET_POST(('smtp_pass2')))) {
// Password is empty
- OUTPUT_HTML(INSTALL_SMTP_PASS1_EMPTY."
");
- $_GET['page'] = 3;
+ OUTPUT_HTML(getMessage('INSTALL_SMTP_PASS1_EMPTY')."
");
+ REQUEST_SET_GET('page', 3);
} // END - if
- if ((!empty($_POST['smtp_pass1'])) && (empty($_POST['smtp_pass2']))) {
+
+ if ((REQUEST_ISSET_POST(('smtp_pass1'))) && (!REQUEST_ISSET_POST(('smtp_pass2')))) {
// Password repeat is empty
- OUTPUT_HTML(INSTALL_SMTP_PASS2_EMPTY."
");
- $_GET['page'] = 3;
+ OUTPUT_HTML(getMessage('INSTALL_SMTP_PASS2_EMPTY')."
");
+ REQUEST_SET_GET('page', 3);
} // END - if
- if ($_POST['smtp_pass1'] != $_POST['smtp_pass1']) {
+
+ if (REQUEST_POST('smtp_pass1') != REQUEST_POST('smtp_pass1')) {
// Passwords are not matching
- OUTPUT_HTML(INSTALL_SMTP_PASS_MISMATCH."
");
- $_GET['page'] = 3;
+ OUTPUT_HTML(getMessage('INSTALL_SMTP_PASS_MISMATCH')."
");
+ REQUEST_SET_GET('page', 3);
} // END - if
} // END - if
// Is MXChange installed or no admin registered so far?
-if ((!isBooleanConstantAndTrue('mxchange_installed')) || (!isBooleanConstantAndTrue('admin_registered')))
+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;
@@ -164,22 +100,24 @@ if ((!isBooleanConstantAndTrue('mxchange_installed')) || (!isBooleanConstantAndT
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['type'])) $mysql['type'] = "MyISAM";
if (getTotalFatalErrors() > 0) {
- OUTPUT_HTML("");
- foreach ($FATAL as $key => $err) {
- OUTPUT_HTML(" · ".FATAL_NO.($key + 1).": ".$err."
");
+ OUTPUT_HTML("");
+ foreach (getFatalArray() as $key => $err) {
+ OUTPUT_HTML(" · {--FATAL_NO--}".($key + 1).": ".$err."
");
}
- OUTPUT_HTML("
");
+ OUTPUT_HTML("
");
}
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");
@@ -187,26 +125,27 @@ if ((!isBooleanConstantAndTrue('mxchange_installed')) || (!isBooleanConstantAndT
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']);
+ 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 = SMTP_HOSTNAME;
- $smtpUser = SMTP_USER;
- $smtpPass1 = SMTP_PASSWORD;
- $smtpPass2 = SMTP_PASSWORD;
+ $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'];
+ 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']);
@@ -223,250 +162,232 @@ if ((!isBooleanConstantAndTrue('mxchange_installed')) || (!isBooleanConstantAndT
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']);
+ 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' , $_POST['smtp_host']);
- define('__SMTP_USER' , $_POST['smtp_user']);
- define('__SMTP_PASS' , $_POST['smtp_pass1']);
- 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();
+ 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_READABLE($_POST['spath']."install/tables.sql")) && (FILE_READABLE($_POST['spath']."install/menu-".GET_LANGUAGE().".sql"))) {
+ 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.sql", "menu-".GET_LANGUAGE().".sql") as $dump) {
+ foreach (array("tables", "menu-".GET_LANGUAGE()) 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)) {
+ $FQFN = REQUEST_POST('spath') . "install/" . $dump . ".sql";
+ if (FILE_READABLE($FQFN)) {
// Read the file
- $SQLs = READ_FILE($file, true);
+ $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 ...
- $SQLs = merge_array($SQLs, explode(";\n", $sql));
- } // END - if
+ 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) {
+ if (COUNT_SQLS() == 0) {
// Abort here
- addFatalMessage(INSTALL_SQL_IMPORT_FAILED);
+ 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
- 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__);
- } // END - if
- } // END - foreach
+ runFilterChain('run_sqls');
// 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);
+ 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!
- addFatalMessage(INSTALL_MISSING_DUMPS);
+ addFatalMessage(__FILE__, __LINE__, getMessage('INSTALL_MISSING_DUMPS'));
}
} // END - if
} // END - if
if (getTotalFatalErrors() > 0) {
$OUT = "";
- foreach ($FATAL as $value) {
- $OUT .= " ".$value."\n";
+ foreach (getFatalArray() as $value) {
+ $OUT .= " ".$value."\n";
} // END foreach
define('__FATAL_ERROR_LI', $OUT);
$OUT = "";
foreach ($mysql as $key => $value) {
- $OUT .= " \n";
+ $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']);
-
- OUTPUT_HTML("");
+ 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!
- LOAD_URL($burl."/install.php?page=finalize");
+ LOAD_URL("install.php?page=finalize");
}
- } elseif (isBooleanConstantAndTrue('mxchange_installed')) {
+ } elseif (isInstalled()) {
// Redirection after writing data... :-)
LOAD_TEMPLATE("install_finished");
} else {
// Something goes wrong during installation! :-(
- addFatalMessage(INSTALL_FINALIZER_FAILED);
- include ("inc/fatal_errors.php");
+ addFatalMessage(__FILE__, __LINE__, 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."");
+ DEBUG_LOG(__FILE__, __LINE__, sprintf("Wrong page %s detected", REQUEST_GET('page')));
+ OUTPUT_HTML(" {--WRONG_PAGE--}");
break;
}
} else {
- addFatalMessage(ALREADY_INSTALLED);
+ // Already installed!
+ addFatalMessage(__FILE__, __LINE__, getMessage('ALREADY_INSTALLED'));
}
+
//
?>