diff -r fdaf9070566c -r 8978cb3541ca install/includes/payload.php --- a/install/includes/payload.php Thu Jan 17 02:03:33 2008 -0500 +++ b/install/includes/payload.php Thu Jan 17 19:49:14 2008 -0500 @@ -89,7 +89,7 @@ function stg_load_schema() { - global $db, $dbdriver, $installer_version; + global $db, $dbdriver, $installer_version, $lang_id, $languages; static $sql_parser = false; if ( is_object($sql_parser) ) @@ -114,6 +114,18 @@ return false; } + $wkt = ENANO_ROOT . "/language/{$languages[$lang_id]['dir']}/install/mainpage-default.wkt"; + if ( !file_exists( $wkt ) ) + { + echo '
Error: could not locate wikitext for main page (' . $wkt . ')
'; + return false; + } + $wkt = @file_get_contents($wkt); + if ( empty($wkt) ) + return false; + + $wkt = $db->escape($wkt); + $vars = array( 'TABLE_PREFIX' => $_POST['table_prefix'], 'SITE_NAME' => $db->escape($_POST['site_name']), @@ -128,7 +140,8 @@ 'ADMIN_EMAIL' => $db->escape($_POST['email']), 'REAL_NAME' => '', // This has always been stubbed. 'ADMIN_EMBED_PHP' => strval(AUTH_DISALLOW), - 'UNIX_TIME' => strval(time()) + 'UNIX_TIME' => strval(time()), + 'MAIN_PAGE_CONTENT' => $wkt ); $sql_parser->assign_vars($vars); @@ -279,7 +292,7 @@ RewriteCond %{REQUEST_FILENAME} !-d # Main rule - short and sweet -RewriteRule (.*) index.php?title=\$1 +RewriteRule (.*) index.php?title=\$1 [L,QSA] EOF; fwrite($hh, $hhc); @@ -310,3 +323,19 @@ return true; } + +function stg_init_logs() +{ + global $db, $session, $paths, $template, $plugins; // Common objects + global $installer_version; + + $q = $db->sql_query('INSERT INTO ' . table_prefix . 'logs(log_type,action,time_id,date_string,author,page_text,edit_summary) VALUES(\'security\', \'install_enano\', ' . time() . ', \'' . enano_date('d M Y h:i a') . '\', \'' . $db->escape($_POST['admin_user']) . '\', \'' . $db->escape(enano_version()) . '\', \'' . $db->escape($_SERVER['REMOTE_ADDR']) . '\');'); + if ( !$q ) + { + echo '

MySQL return: ' . $db->sql_error() . '

'; + return false; + } + + return true; +} +