/hotaru_settings_default.phpand rename it
/hotaru_settings.php."; +$lang["install_step2_instructions3"] = "Open
/hotaru_settings.phpand fill in the \"Database Details\" section."; +$lang["install_step2_instructions4"] = "Fill in the
baseurl, e.g. http://www.myhotarusite.com/. Don't forget the trailing slash (/)"; +$lang["install_step2_instructions5"] = "Save and upload
hotaru_settings.phpto your server, then click \"Next\"..."; +$lang["install_step2_warning"] = "Warning"; +$lang["install_step2_warning_note"] = "When you click \"Next\", new database tables will be created, deleting any old ones you may have!"; + + +/* Install Step 3 */ +$lang["install_step3"] = "Step 3/5: Create Database Tables"; +$lang["install_step3_creating_table"] = "Creating table"; +$lang["install_step3_already_exists"] = "It seems there are already tables for Hotaru CMS in the database."; +$lang["install_step3_continue"] = "Click \"Next\" to continue."; +$lang["install_step3_rebuild_note"] = "Note: If you'd like to start fresh, "; +$lang["install_step3_rebuild_link"] = "delete and rebuild the database tables"; +$lang["install_step3_success"] = "Database tables created successfully. Click \"Next\" to configure Hotaru CMS."; + +/* Install Step 4 */ +$lang["install_step4"] = "Step 4/5: Admin Registration"; +$lang["install_step4_instructions"] = "Register yourself as a site administrator"; +$lang["install_step4_username"] = "Username:"; +$lang["install_step4_email"] = "Email:"; +$lang["install_step4_password"] = "Password:"; +$lang["install_step4_password_verify"] = "Password (again):"; +$lang["install_step4_csrf_error"] = "Ah! You've triggered a CSRF error. That's only supposed to happen when someone tries hacking into the site..."; +$lang["install_step4_username_error"] = "Your username must be at least 4 characters and can contain letters, dashes and underscores only"; +$lang["install_step4_password_error"] = "The password must be at least 8 characters and can only contain letters, numbers and these symbols: @ * # - _"; +$lang["install_step4_password_match_error"] = "The password fields don't match"; +$lang["install_step4_email_error"] = "That doesn't parse as a valid email address"; +$lang["install_step4_make_note"] = "Make a note of your new username, email and password before clicking \"Next\"..."; +$lang["install_step4_update_success"] = "Updated successfully"; +$lang["install_step4_form_update"] = "Update"; + +/* Install Step 5 */ +$lang["install_step5"] = "Step 5/5: Completion"; +$lang["install_step5_installation_complete"] = "Installation has been successfully completed."; +$lang["install_step5_installation_delete"] = "You must delete the install folder or someone else could run the install script and wipe everything!"; +$lang["install_step5_installation_go_play"] = "Done? Okay, go and play with your new Hotaru site!"; +$lang["install_home"] = "Get Started!"; + +?> Index: /trunk/install/install_functions.php =================================================================== --- /trunk/install/install_functions.php (revision 1081) +++ /trunk/install/install_functions.php (revision 1081) @@ -0,0 +1,139 @@ + + * @copyright Copyright (c) 2009, Hotaru CMS + * @license http://www.gnu.org/copyleft/gpl.html GNU General Public License + * @link http://www.hotarucms.org/ + */ + + +/** + * Initialize Database + * + * @return object + */ +function init_database() +{ + $ezSQL = new ezSQL_mysql(DB_USER, DB_PASSWORD, DB_NAME, DB_HOST); + $ezSQL->query("SET NAMES 'utf8'"); + + return $ezSQL; +} + + +/** + * Initialize Inspekt + * + * @return object + */ +function init_inspekt_cage() +{ + $cage = Inspekt::makeSuperCage(); + + // Add Hotaru custom methods + $cage->addAccessor('testAlnumLines'); + $cage->addAccessor('testPage'); + $cage->addAccessor('testUsername'); + $cage->addAccessor('testPassword'); + $cage->addAccessor('getFriendlyUrl'); + $cage->addAccessor('getMixedString1'); + $cage->addAccessor('getMixedString2'); + $cage->addAccessor('getHtmLawed'); + + return $cage; +} + + +/** + * Delete all files in the specified directory except placeholder.txt + * + * @param string $dir - path to the cache folder + * @return bool + */ +function delete_files($dir) +{ + $handle=opendir($dir); + + while (($file = readdir($handle))!==false) { + if ($file != 'placeholder.txt') { + if (@unlink($dir.'/'.$file)) { + $success = true; + } else { + $success = false; + } + } + } + + closedir($handle); + + return $success; +} + + +/** + * List all plugin created tables + */ +function list_plugin_tables() +{ + global $db; + + // These should match the tables created in the install script. + $core_tables = array( + 'hotaru_settings', + 'hotaru_users', + 'hotaru_plugins', + 'hotaru_pluginsettings', + 'hotaru_pluginhooks', + 'hotaru_blocked' + ); + + $plugin_tables = array(); + + $db->select(DB_NAME); + + if (!$db->get_col("SHOW TABLES",0)) { return $plugin_tables; } + + foreach ( $db->get_col("SHOW TABLES",0) as $table_name ) + { + if (!in_array($table_name, $core_tables)) { + array_push($plugin_tables, $table_name); + } + } + + return $plugin_tables; +} + + +/** + * Delete plugin database table + * + * @param string $table_name - table to drop + */ +function drop_table($table_name) +{ + global $db; + + $db->query("DROP TABLE " . $table_name); +} Index: /trunk/install/install_tables.php =================================================================== --- /trunk/install/install_tables.php (revision 1081) +++ /trunk/install/install_tables.php (revision 1081) @@ -0,0 +1,510 @@ + + * @copyright Copyright (c) 2009, Hotaru CMS + * @license http://www.gnu.org/copyleft/gpl.html GNU General Public License + * @link http://www.hotarucms.org/ + */ + +/** + * Create database tables + * + * @param string $table_name + * + * Note: Deletes the table if it already exists, then makes it again + */ +function create_table($table_name) +{ + global $db, $lang, $h; + + $sql = 'DROP TABLE IF EXISTS `' . DB_PREFIX . $table_name . '`;'; + $db->query($sql); + + + // BLOCKED TABLE - blocked IPs, users, email types, etc... + + if ($table_name == "blocked") { + $sql = "CREATE TABLE `" . DB_PREFIX . $table_name . "` ( + `blocked_id` int(20) NOT NULL AUTO_INCREMENT PRIMARY KEY, + `blocked_type` varchar(64) NULL, + `blocked_value` text NULL, + `blocked_updatedts` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP, + `blocked_updateby` int(20) NOT NULL DEFAULT 0, + INDEX (`blocked_type`) + ) ENGINE=" . DB_ENGINE . " DEFAULT CHARSET=" . DB_CHARSET . " COLLATE=" . DB_COLLATE . " COMMENT='Blocked IPs, users, emails, etc';"; + echo $lang['install_step3_creating_table'] . ": '" . $table_name . "'...
![](" . BASEURL . "content/admin_themes/admin_default/images/hotaru.png)
";
+ $header .= "" . $lang['install_trouble'] . "
"; + $footer .= "";
+ $header .= "" . $lang['install_trouble'] . "
"; + $footer .= "