Skip to content

Commit

Permalink
install process review, part #2
Browse files Browse the repository at this point in the history
  • Loading branch information
silvercircle committed Nov 25, 2011
1 parent 07cb6e4 commit ad6633b
Show file tree
Hide file tree
Showing 11 changed files with 137 additions and 210 deletions.
7 changes: 7 additions & 0 deletions .htaccess
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
<IfModule mod_rewrite.c>
RewriteEngine On
RewriteBase /
RewriteCond %{REQUEST_FILENAME} !-f
RewriteCond %{REQUEST_FILENAME} !-d
RewriteRule ^(.*)$ index.php?q=$1 [L,QSA]
</IfModule>
55 changes: 55 additions & 0 deletions Settings.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,55 @@
<?php
/**
* @name EosAlpha BBS
* @copyright 2011 Alex Vie silvercircle(AT)gmail(DOT)com
*
* This software is a derived product, based on:
*
* Simple Machines Forum (SMF)
* copyright: 2011 Simple Machines (http://www.simplemachines.org)
* license: BSD, See included LICENSE.TXT for terms and conditions.
*
* @version 1.0pre
*/

########## Maintenance ##########
# Note: If $maintenance is set to 2, the forum will be unusable! Change it to 0 to fix it.
$maintenance = 0; # Set to 1 to enable Maintenance Mode, 2 to make the forum untouchable. (you'll have to make it 0 again manually!)
$mtitle = 'Maintenance Mode'; # Title for the Maintenance Mode message.
$mmessage = 'Offline for a short maintainance period.'; # Description of why the forum is in maintenance mode.

########## Forum Info ##########
$mbname = 'My Community'; # The name of your forum.
$language = 'english'; # The default language file set for the forum.
$boardurl = 'http://127.0.0.1/smf'; # URL to your forum's folder. (without the trailing /!)
$webmaster_email = 'noreply@myserver.com'; # Email address to send emails from. (like noreply@yourdomain.com.)
$cookiename = 'SMFCookie20'; # Name of the cookie to set for authentication.
########## Database Info ##########
$db_type = 'mysql';
$db_server = 'localhost';
$db_name = 'smf';
$db_user = 'root';
$db_passwd = '';
$ssi_db_user = '';
$ssi_db_passwd = '';
$db_prefix = 'smf_';
$db_persist = 0;
$db_error_send = 1;

########## Directories/Files ##########
# Note: These directories do not have to be changed unless you move things.
$boarddir = dirname(__FILE__); # The absolute path to the forum's folder. (not just '.'!)
$sourcedir = dirname(__FILE__) . '/Sources'; # Path to the Sources directory.
$cachedir = dirname(__FILE__) . '/cache'; # Path to the cache directory.
########## Error-Catching ##########
# Note: You shouldn't touch these settings.
$db_last_error = 0;

$ssi_db_user = '';
$db_character_set = 'utf8';
$db_show_debug = false;
$g_disable_all_hooks = false;
$db_cache_api = 'file';
$db_cache_memcached = 'localhost:11211';
$db_no_admin_security = false;
?>
49 changes: 0 additions & 49 deletions Settings_bak.php

This file was deleted.

15 changes: 0 additions & 15 deletions Sources/DbExtra-mysql.php
Original file line number Diff line number Diff line change
Expand Up @@ -423,19 +423,4 @@ function smf_db_table_sql($tableName)

return $schema_create;
}

// Get the version number.
function smf_db_get_version()
{
$request = smf_db_query( '
SELECT VERSION()',
array(
)
);
list ($ver) = mysql_fetch_row($request);
mysql_free_result($request);

return $ver;
}

?>
4 changes: 2 additions & 2 deletions Sources/Load.php
Original file line number Diff line number Diff line change
Expand Up @@ -2441,11 +2441,11 @@ function loadDatabase()

// If we are in SSI try them first, but don't worry if it doesn't work, we have the normal username and password we can use.
if (SMF == 'SSI' && !empty($ssi_db_user) && !empty($ssi_db_passwd))
$db_connection = smf_db_initiate($db_server, $db_name, $ssi_db_user, $ssi_db_passwd, $db_prefix, array('persist' => $db_persist, 'non_fatal' => true, 'dont_select_db' => true));
$db_connection = smf_db_initiate($db_server, $db_name, $ssi_db_user, $ssi_db_passwd, array('persist' => $db_persist, 'non_fatal' => true, 'dont_select_db' => true));

// Either we aren't in SSI mode, or it failed.
if (empty($db_connection))
$db_connection = smf_db_initiate($db_server, $db_name, $db_user, $db_passwd, $db_prefix, array('persist' => $db_persist, 'dont_select_db' => SMF == 'SSI'));
$db_connection = smf_db_initiate($db_server, $db_name, $db_user, $db_passwd, array('persist' => $db_persist, 'dont_select_db' => SMF == 'SSI'));

// Safe guard here, if there isn't a valid connection lets put a stop to it.
if (!$db_connection)
Expand Down
13 changes: 12 additions & 1 deletion Sources/Subs-Db-mysql.php
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
*/

// Initialize the database settings
function smf_db_initiate($db_server, $db_name, $db_user, $db_passwd, $db_prefix, $db_options = array())
function smf_db_initiate($db_server, $db_name, $db_user, $db_passwd, $db_options = array())
{
global $mysql_set_mode;

Expand Down Expand Up @@ -681,4 +681,15 @@ function smf_db_escape_wildcard_string($string, $translate_human_wildcards=false

return strtr($string, $replacements);
}
// Get the version number.
function smf_db_get_version() {
$request = smf_db_query('
SELECT VERSION()', array(
)
);
list ($ver) = mysql_fetch_row($request);
mysql_free_result($request);

return $ver;
}
?>
23 changes: 7 additions & 16 deletions Themes/default/languages/Install.english.php
Original file line number Diff line number Diff line change
Expand Up @@ -13,42 +13,39 @@
$txt['install_step_admin'] = 'Admin Account';
$txt['install_step_delete'] = 'Finalize Install';

$txt['smf_installer'] = 'SMF Installer';
$txt['smf_installer'] = 'EosAlpha Installer';
$txt['installer_language'] = 'Language';
$txt['installer_language_set'] = 'Set';
$txt['congratulations'] = 'Congratulations, the installation process is complete!';
$txt['congratulations_help'] = 'If at any time you need support, or SMF fails to work properly, please remember that <a href="http://www.simplemachines.org/community/index.php" target="_blank">help is available</a> if you need it.';
$txt['congratulations_help'] = 'If at any time you need support, or EosAlpha fails to work properly, please remember that <a href="http://forum.miranda.or.at/index.php" target="_blank">help is available</a> if you need it.';
$txt['still_writable'] = 'Your installation directory is still writable. It\'s a good idea to chmod it so that it is not writable for security reasons.';
$txt['delete_installer'] = 'Click here to delete this install.php file now.';
$txt['delete_installer_maybe'] = '<em>(doesn\'t work on all servers.)</em>';
$txt['go_to_your_forum'] = 'Now you can see <a href="%1$s">your newly installed forum</a> and begin to use it. You should first make sure you are logged in, after which you will be able to access the administration center.';
$txt['good_luck'] = 'Good luck!<br />Simple Machines';

$txt['install_welcome'] = 'Welcome';
$txt['install_welcome_desc'] = 'Welcome to SMF. This script will guide you through the process for installing %1$s. We\'ll gather a few details about your forum over the next few steps, and after a couple of minutes your forum will be ready for use.';
$txt['install_welcome_desc'] = 'Welcome to EosAlpha BBS. This script will guide you through the process for installing %1$s. We\'ll gather a few details about your forum over the next few steps, and after a couple of minutes your forum will be ready for use.';
$txt['install_all_lovely'] = 'We\'ve completed some initial tests on your server and everything appears to be in order. Simply click the &quot;Continue&quot; button below to get started.';

$txt['user_refresh_install'] = 'Forum Refreshed';
$txt['user_refresh_install_desc'] = 'While installing, the installer found that (with the details you provided) one or more of the tables this installer might create already existed.<br />Any missing tables in your installation have been recreated with the default data, but no data was deleted from existing tables.';

$txt['default_topic_subject'] = 'Welcome to SMF!';
$txt['default_topic_message'] = 'Welcome to Simple Machines Forum!<br /><br />We hope you enjoy using your forum.&nbsp; If you have any problems, please feel free to [url=http://www.simplemachines.org/community/index.php]ask us for assistance[/url].<br /><br />Thanks!<br />Simple Machines';
$txt['default_topic_subject'] = 'Welcome to EosAlpha!';
$txt['default_topic_message'] = 'Welcome to EosAlpha Bulletin Board System!<br /><br />We hope you enjoy using your forum.&nbsp; If you have any problems, please feel free to [url=http://www.simplemachines.org/community/index.php]ask us for assistance[/url].<br /><br />Thanks!<br />Simple Machines';
$txt['default_board_name'] = 'General Discussion';
$txt['default_board_description'] = 'Feel free to talk about anything and everything in this board.';
$txt['default_category_name'] = 'General Category';
$txt['default_time_format'] = '%B %d, %Y, %I:%M:%S %p';
$txt['default_news'] = 'SMF - Just Installed!';
$txt['default_news'] = 'EosAlpha - Just Installed!';
$txt['default_karmaLabel'] = 'Karma:';
$txt['default_karmaSmiteLabel'] = '[smite]';
$txt['default_karmaApplaudLabel'] = '[applaud]';
$txt['default_reserved_names'] = 'Admin\nWebmaster\nGuest\nroot';
$txt['default_smileyset_name'] = 'Alienine\'s Set';
$txt['default_aaron_smileyset_name'] = 'Aaron\'s Set';
$txt['default_akyhne_smileyset_name'] = 'Akyhne\'s Set';
$txt['default_theme_name'] = 'SMF Default Theme - Curve';
$txt['default_core_theme_name'] = 'Core Theme';
$txt['default_classic_theme_name'] = 'Classic YaBB SE Theme';
$txt['default_babylon_theme_name'] = 'Babylon Theme';
$txt['default_theme_name'] = 'EosAlpha Default Theme';

$txt['default_administrator_group'] = 'Administrator';
$txt['default_global_moderator_group'] = 'Global Moderator';
Expand Down Expand Up @@ -101,12 +98,6 @@
$txt['install_settings_dbsession_title'] = 'Use the database for sessions instead of using files.';
$txt['install_settings_dbsession_info1'] = 'This feature is almost always for the best, as it makes sessions more dependable.';
$txt['install_settings_dbsession_info2'] = 'This feature is generally a good idea, but may not work properly on this server.';
$txt['install_settings_utf8'] = 'UTF-8 Character Set';
$txt['install_settings_utf8_title'] = 'Use UTF-8 as default character set';
$txt['install_settings_utf8_info'] = 'This feature lets both the database and the forum use an international character set, UTF-8. This can be useful when working with multiple languages that use different character sets.';
$txt['install_settings_stats'] = 'Allow Stat Collection';
$txt['install_settings_stats_title'] = 'Allow Simple Machines to Collect Basic Stats Monthly';
$txt['install_settings_stats_info'] = 'If enabled, this will allow Simple Machines to visit your site once a month to collect basic statistics. This will help us make decisions as to which configurations to optimize the software for. For more information please visit our <a href="http://www.simplemachines.org/about/stats.php" target="_blank">info page</a>.';
$txt['install_settings_proceed'] = 'Proceed';

$txt['db_settings'] = 'Database Server Settings';
Expand Down
Loading

0 comments on commit ad6633b

Please sign in to comment.