diff options
author | Graham Eames <grahamje@users.sourceforge.net> | 2006-03-18 16:39:05 +0000 |
---|---|---|
committer | Graham Eames <grahamje@users.sourceforge.net> | 2006-03-18 16:39:05 +0000 |
commit | de9418db2fdd3b3dc916d1363b9f51ebee3851ff (patch) | |
tree | 30ae5b599faa6804adb288f68231615ff48a5cbb /phpBB | |
parent | 957502a28b1d2afec74cad30731dc2ee101cafe3 (diff) | |
download | forums-de9418db2fdd3b3dc916d1363b9f51ebee3851ff.tar forums-de9418db2fdd3b3dc916d1363b9f51ebee3851ff.tar.gz forums-de9418db2fdd3b3dc916d1363b9f51ebee3851ff.tar.bz2 forums-de9418db2fdd3b3dc916d1363b9f51ebee3851ff.tar.xz forums-de9418db2fdd3b3dc916d1363b9f51ebee3851ff.zip |
Replacing the first part of the installer ready for some testing
This will bounce you back to the previous installer part way through
git-svn-id: file:///svn/phpbb/trunk@5654 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB')
-rwxr-xr-x | phpBB/adm/style/install_install.html | 50 | ||||
-rw-r--r-- | phpBB/common.php | 4 | ||||
-rwxr-xr-x | phpBB/install/index.php | 6 | ||||
-rwxr-xr-x | phpBB/install/install_install.php | 417 | ||||
-rwxr-xr-x | phpBB/language/en/install.php | 41 |
5 files changed, 500 insertions, 18 deletions
diff --git a/phpBB/adm/style/install_install.html b/phpBB/adm/style/install_install.html new file mode 100755 index 0000000000..8e982fca44 --- /dev/null +++ b/phpBB/adm/style/install_install.html @@ -0,0 +1,50 @@ +<!-- INCLUDE install_header.html --> + +<form id="install_install" method="post" action="{U_ACTION}"> + +<h2>{TITLE}</h2> +{BODY} + +<!-- BEGIN checks --> + <!-- IF checks.S_LEGEND --> + <!-- IF not checks.S_FIRST_ROW --> + </fieldset> + <!-- ENDIF --> + <fieldset> + <legend>{checks.LEGEND}</legend> + <!-- IF checks.LEGEND_EXPLAIN --><p>{checks.LEGEND_EXPLAIN}</p><!-- ENDIF --> + <!-- ELSE --> + + <dl> + <dt>{checks.TITLE}:</label><!-- IF checks.S_EXPLAIN --><br /><span>{checks.TITLE_EXPLAIN}</span><!-- ENDIF --></dt> + <dd>{checks.RESULT}</dd> + </dl> + <!-- ENDIF --> +<!-- END checks --> + +<!-- BEGIN options --> + <!-- IF options.S_LEGEND --> + <!-- IF not options.S_FIRST_ROW --> + </fieldset> + <!-- ENDIF --> + <fieldset> + <legend>{options.LEGEND}</legend> + <!-- ELSE --> + + <dl> + <dt><label for="{options.KEY}">{options.TITLE}:</label><!-- IF options.S_EXPLAIN --><br /><span>{options.TITLE_EXPLAIN}</span><!-- ENDIF --></dt> + <dd>{options.CONTENT}</dd> + </dl> + + <!-- ENDIF --> +<!-- END options --> +</fieldset> + +<!-- IF L_SUBMIT --> +<fieldset class="submit-buttons"> + <!-- IF L_SUBMIT --><input class="button1" type="submit" id="submit" name="submit" value="{L_SUBMIT}" /><!-- ENDIF --> +</fieldset> +<!-- ENDIF --> + +</form> +<!-- INCLUDE install_footer.html -->
\ No newline at end of file diff --git a/phpBB/common.php b/phpBB/common.php index c5ef578231..5551d6d0a5 100644 --- a/phpBB/common.php +++ b/phpBB/common.php @@ -77,7 +77,7 @@ require($phpbb_root_path . 'config.'.$phpEx); if (!defined('PHPBB_INSTALLED')) { - header('Location: install/install.'.$phpEx); + header('Location: install/index.'.$phpEx); exit; } @@ -138,4 +138,4 @@ if (file_exists('install')) // trigger_error('REMOVE_INSTALL'); } -?>
\ No newline at end of file +?> diff --git a/phpBB/install/index.php b/phpBB/install/index.php index d63973360e..7756bf82ca 100755 --- a/phpBB/install/index.php +++ b/phpBB/install/index.php @@ -206,7 +206,7 @@ class module { $this->sub = strtolower((in_array(strtoupper($selected_submod), $row['module_subs'])) ? $selected_submod : $row['module_subs'][0]); } - elseif (is_array($row['module_stages'])) + else if (is_array($row['module_stages'])) { $this->sub = strtolower((in_array(strtoupper($selected_submod), $row['module_stages'])) ? $selected_submod : $row['module_stages'][0]); } @@ -339,7 +339,7 @@ class module $cat = $cat_ary['name']; $l_cat = (!empty($lang['CAT_' . $cat])) ? $lang['CAT_' . $cat] : preg_replace('#_#', ' ', $cat); $cat = strtolower($cat); - $url = 'index.' . $phpEx . '?mode=' . $cat; + $url = $this->module_url . '?mode=' . $cat; if ($this->mode == $cat) { @@ -356,7 +356,7 @@ class module { $l_option = (!empty($lang['SUB_' . $option])) ? $lang['SUB_' . $option] : preg_replace('#_#', ' ', $option); $option = strtolower($option); - $url = 'index.' . $phpEx . '?mode=' . $this->mode . '&sub=' . $option; + $url = $this->module_url . '?mode=' . $this->mode . '&sub=' . $option; $template->assign_block_vars('l_block1', array( 'L_TITLE' => $l_option, diff --git a/phpBB/install/install_install.php b/phpBB/install/install_install.php new file mode 100755 index 0000000000..eaeb045b0f --- /dev/null +++ b/phpBB/install/install_install.php @@ -0,0 +1,417 @@ +<?php +/** +* +* @package install +* @version $Id$ +* @copyright (c) 2005 phpBB Group +* @license http://opensource.org/licenses/gpl-license.php GNU Public License +* +*/ + +/** +*/ + +if (!empty($setmodules)) +{ + $module[] = array( + 'module_type' => 'install', + 'module_title' => 'INSTALL', + 'module_filename' => substr(basename(__FILE__), 0, -strlen($phpEx)-1), + 'module_order' => 10, + 'module_subs' => '', + 'module_stages' => array('INTRO', 'REQUIREMENTS', 'BASIC', 'CONFIG_FILE', 'ADVANCED', 'FINAL'), + 'module_reqs' => '' + ); + + return; +} + +class install_install extends module +{ + function install_install(&$p_master) + { + $this->p_master = &$p_master; + } + + function main($mode, $sub) + { + global $lang, $template; + + switch($sub) + { + case 'intro' : + $this->page_title = $lang['SUB_INTRO']; + + $template->assign_vars(array( + 'TITLE' => $lang['INSTALL_INTRO'], + 'BODY' => $lang['INSTALL_INTRO_BODY'], + 'L_SUBMIT' => $lang['NEXT'], + 'U_ACTION' => $this->p_master->module_url . "?mode=$mode&sub=requirements", + )); + + break; + + case 'requirements' : + $this->check_server_requirements($mode, $sub); + + break; + } + + $this->tpl_name = 'install_install'; + } + + /** + * Checks that the server we are installing on meets the requirements for running phpBB + */ + function check_server_requirements($mode, $sub) + { + global $lang, $template, $phpbb_root_path, $phpEx; + + $this->page_title = $lang['STAGE_REQUIREMENTS']; + + $template->assign_vars(array( + 'TITLE' => $lang['REQUIREMENTS_TITLE'], + 'BODY' => $lang['REQUIREMENTS_EXPLAIN'], + )); + + $passed = array('php' => false, 'db' => false, 'files' => false); + + // Test for basic PHP settings + $template->assign_block_vars('checks', array( + 'S_LEGEND' => true, + 'S_FIRST_ROW' => true, + 'LEGEND' => $lang['PHP_SETTINGS'], + 'LEGEND_EXPLAIN' => $lang['PHP_SETTINGS_EXPLAIN'], + )); + + // Test the minimum PHP version + $php_version = phpversion(); + + if (version_compare($php_version, '4.3.3') < 0) + { + $result = '<b style="color:red">' . $lang['NO'] . '</b>'; + } + else + { + $passed['php'] = true; + // We also give feedback on whether we're running in safe mode + $result = '<b style="color:green">' . $lang['YES']; + if (@ini_get('safe_mode') || strtolower(@ini_get('safe_mode')) == 'on') + { + $result .= ', ' . $lang['PHP_SAFE_MODE']; + } + $result .= '</b>'; + } + $template->assign_block_vars('checks', array( + 'TITLE' => $lang['PHP_VERSION_REQD'], + 'RESULT' => $result, + + 'S_EXPLAIN' => false, + 'S_LEGEND' => false, + )); + + // Check for register_globals being enabled + if (@ini_get('register_globals') == '1' || strtolower(@ini_get('register_globals')) == 'on') + { + $result = '<b style="color:red">' . $lang['NO'] . '</b>'; + } + else + { + $result = '<b style="color:green">' . $lang['YES'] . '</b>'; + } + + $template->assign_block_vars('checks', array( + 'TITLE' => $lang['PHP_REGISTER_GLOBALS'], + 'TITLE_EXPLAIN' => $lang['PHP_REGISTER_GLOBALS_EXPLAIN'], + 'RESULT' => $result, + + 'S_EXPLAIN' => true, + 'S_LEGEND' => false, + )); + + // Test for available database modules + $template->assign_block_vars('checks', array( + 'S_LEGEND' => true, + 'S_FIRST_ROW' => false, + 'LEGEND' => $lang['PHP_SUPPORTED_DB'], + 'LEGEND_EXPLAIN' => $lang['PHP_SUPPORTED_DB_EXPLAIN'], + )); + + $dlls_db = array(); + $passed['db'] = false; + foreach ($this->available_dbms as $db_name => $db_ary) + { + $dll = $db_ary['MODULE']; + + if (!extension_loaded($dll)) + { + if (!$this->can_load_dll($dll)) + { + $template->assign_block_vars('checks', array( + 'TITLE' => $lang['DLL_' . strtoupper($db_name)], + 'RESULT' => '<b style="color:red">' . $lang['UNAVAILABLE'] . '</b>', + + 'S_EXPLAIN' => false, + 'S_LEGEND' => false, + )); + continue; + } + } + + $template->assign_block_vars('checks', array( + 'TITLE' => $lang['DLL_' . strtoupper($db_name)], + 'RESULT' => '<b style="color:green">' . $lang['AVAILABLE'] . '</b>', + + 'S_EXPLAIN' => false, + 'S_LEGEND' => false, + )); + $passed['db'] = true; + } + + // Test for other modules + $template->assign_block_vars('checks', array( + 'S_LEGEND' => true, + 'S_FIRST_ROW' => false, + 'LEGEND' => $lang['PHP_OPTIONAL_MODULE'], + 'LEGEND_EXPLAIN' => $lang['PHP_OPTIONAL_MODULE_EXPLAIN'], + )); + + foreach ($this->php_dlls_other as $dll) + { + if (!extension_loaded($dll)) + { + if (!$this->can_load_dll($dll)) + { + $template->assign_block_vars('checks', array( + 'TITLE' => $lang['DLL_' . strtoupper($dll)], + 'RESULT' => '<b style="color:red">' . $lang['UNAVAILABLE'] . '</b>', + + 'S_EXPLAIN' => false, + 'S_LEGEND' => false, + )); + continue; + } + } + $template->assign_block_vars('checks', array( + 'TITLE' => $lang['DLL_' . strtoupper($dll)], + 'RESULT' => '<b style="color:green">' . $lang['AVAILABLE'] . '</b>', + + 'S_EXPLAIN' => false, + 'S_LEGEND' => false, + )); + } + + // Can we find Imagemagick anywhere on the system? + $exe = ((defined('PHP_OS')) && (preg_match('#win#i', PHP_OS))) ? '.exe' : ''; + + $magic_home = getenv('MAGICK_HOME'); + $img_imagick = ''; + if (empty($magic_home)) + { + $locations = array('C:/WINDOWS/', 'C:/WINNT/', 'C:/WINDOWS/SYSTEM/', 'C:/WINNT/SYSTEM/', 'C:/WINDOWS/SYSTEM32/', 'C:/WINNT/SYSTEM32/', '/usr/bin/', '/usr/sbin/', '/usr/local/bin/', '/usr/local/sbin/', '/opt/', '/usr/imagemagick/', '/usr/bin/imagemagick/'); + $path_locations = str_replace('\\', '/', (explode(($exe) ? ';' : ':', getenv('PATH')))); + + $locations = array_merge($path_locations, $locations); + foreach ($locations as $location) + { + // The path might not end properly, fudge it + if (substr($location, -1, 1) !== '/') + { + $location .= '/'; + } + + if (@is_readable($location . 'mogrify' . $exe) && @filesize($location . 'mogrify' . $exe) > 3000) + { + $img_imagick = str_replace('\\', '/', $location); + continue; + } + } + } + else + { + $img_imagick = str_replace('\\', '/', $magic_home); + } + + $template->assign_block_vars('checks', array( + 'TITLE' => $lang['APP_MAGICK'], + 'RESULT' => ($img_imagick) ? '<b style="color:green">' . $lang['AVAILABLE'] . ', ' . $img_imagick . '</b>' : '<b style="color:blue">' . $lang['NO_LOCATION'] . '</b>', + + 'S_EXPLAIN' => false, + 'S_LEGEND' => false, + )); + + // Check permissions on files/directories we need access to + $template->assign_block_vars('checks', array( + 'S_LEGEND' => true, + 'S_FIRST_ROW' => false, + 'LEGEND' => $lang['FILES_REQUIRED'], + 'LEGEND_EXPLAIN' => $lang['FILES_REQUIRED_EXPLAIN'], + )); + + $directories = array('cache/', 'files/', 'store/'); + + umask(0); + + $passed['files'] = true; + foreach ($directories as $dir) + { + $write = $exists = true; + if (file_exists($phpbb_root_path . $dir)) + { + if (!is_writeable($phpbb_root_path . $dir)) + { + $write = (@chmod($phpbb_root_path . $dir, 0777)) ? true : false; + } + } + else + { + $write = $exists = (@mkdir($phpbb_root_path . $dir, 0777)) ? true : false; + } + + $passed['files'] = ($exists && $write && $passed['files']) ? true : false; + + $exists = ($exists) ? '<b style="color:green">' . $lang['FILE_FOUND'] . '</b>' : '<b style="color:red">' . $lang['FILE_NOT_FOUND'] . '</b>'; + $write = ($write) ? ', <b style="color:green">' . $lang['FILE_WRITEABLE'] . '</b>' : (($exists) ? ', <b style="color:red">' . $lang['FILE_UNWRITEABLE'] . '</b>' : ''); + + $template->assign_block_vars('checks', array( + 'TITLE' => $dir, + 'RESULT' => $exists . $write, + + 'S_EXPLAIN' => false, + 'S_LEGEND' => false, + )); + } + + // Check permissions on files/directories it would be useful access to + $template->assign_block_vars('checks', array( + 'S_LEGEND' => true, + 'S_FIRST_ROW' => false, + 'LEGEND' => $lang['FILES_OPTIONAL'], + 'LEGEND_EXPLAIN' => $lang['FILES_OPTIONAL_EXPLAIN'], + )); + + // config.php ... let's just warn the user it's not writeable + $dir = 'config.'.$phpEx; + $write = $exists = true; + if (file_exists($phpbb_root_path . $dir)) + { + if (!is_writeable($phpbb_root_path . $dir)) + { + $write = false; + } + } + else + { + $write = $exists = false; + } + + $exists = ($exists) ? '<b style="color:green">' . $lang['FILE_FOUND'] . '</b>' : '<b style="color:red">' . $lang['FILE_NOT_FOUND'] . '</b>'; + $write = ($write) ? ', <b style="color:green">' . $lang['FILE_WRITEABLE'] . '</b>' : (($exists) ? ', <b style="color:red">' . $lang['FILE_UNWRITEABLE'] . '</b>' : ''); + + $template->assign_block_vars('checks', array( + 'TITLE' => $dir, + 'RESULT' => $exists . $write, + + 'S_EXPLAIN' => false, + 'S_LEGEND' => false, + )); + + // And finally where do we want to go next (well today is taken isn't it :P) + $s_hidden_fields = ($img_imagick) ? '<input type="hidden" name="img_imagick" value="' . addslashes($img_imagick) . '" />' : ''; + +// $url = ($passed['php'] && $passed['db'] && $passed['files']) ? $this->p_master->module_url . "?mode=$mode&sub=database" : $this->p_master->module_url . "?mode=$mode&sub=requirements"; +// The road ahead is still under construction, follow the diversion back to the olod installer..... ;) + $url = ($passed['php'] && $passed['db'] && $passed['files']) ? "install.$phpEx?stage=1" : $this->p_master->module_url . "?mode=$mode&sub=requirements"; + $submit = ($passed['php'] && $passed['db'] && $passed['files']) ? $lang['INSTALL_START'] : $lang['INSTALL_TEST']; + + + $template->assign_vars(array( + 'L_SUBMIT' => $submit, + 'S_HIDDEN' => $s_hidden_fields, + 'U_ACTION' => $url, + )); + } + + function can_load_dll($dll) + { + global $suffix; + + return ((@ini_get('enable_dl') || strtolower(@ini_get('enable_dl')) == 'on') && (!@ini_get('safe_mode') || strtolower(@ini_get('safe_mode')) == 'off') && @dl($dll . ".$suffix")) ? true : false; + } + + /** + * Specific PHP modules we may require for certain optional or extended features + */ + var $php_dlls_other = array('zlib', 'ftp', 'xml'); + + /** + * Details of the database management systems supported + */ + var $available_dbms = array( + 'firebird' => array( + 'LABEL' => 'FireBird', + 'SCHEMA' => 'firebird', + 'MODULE' => 'interbase', + 'DELIM' => ';;', + 'COMMENTS' => 'remove_remarks' + ), + 'mysql' => array( + 'LABEL' => 'MySQL', + 'SCHEMA' => 'mysql', + 'MODULE' => 'mysql', + 'DELIM' => ';', + 'COMMENTS' => 'remove_remarks' + ), + 'mysqli' => array( + 'LABEL' => 'MySQL 4.1.x/5.x (MySQLi)', + 'SCHEMA' => 'mysql', + 'MODULE' => 'mysqli', + 'DELIM' => ';', + 'COMMENTS' => 'remove_remarks' + ), + 'mysql4' => array( + 'LABEL' => 'MySQL 4.x/5.x', + 'SCHEMA' => 'mysql', + 'MODULE' => 'mysql', + 'DELIM' => ';', + 'COMMENTS' => 'remove_remarks' + ), + 'mssql' => array( + 'LABEL' => 'MS SQL Server 7/2000', + 'SCHEMA' => 'mssql', + 'MODULE' => 'mssql', + 'DELIM' => 'GO', + 'COMMENTS' => 'remove_comments' + ), + 'mssql_odbc'=> array( + 'LABEL' => 'MS SQL Server [ ODBC ]', + 'SCHEMA' => 'mssql', + 'MODULE' => 'odbc', + 'DELIM' => 'GO', + 'COMMENTS' => 'remove_comments' + ), + 'oracle' => array( + 'LABEL' => 'Oracle', + 'SCHEMA' => 'oracle', + 'MODULE' => 'oci8', + 'DELIM' => '/', + 'COMMENTS' => 'remove_comments' + ), + 'postgres' => array( + 'LABEL' => 'PostgreSQL 7.x', + 'SCHEMA' => 'postgres', + 'MODULE' => 'pgsql', + 'DELIM' => ';', + 'COMMENTS' => 'remove_comments' + ), + 'sqlite' => array( + 'LABEL' => 'SQLite', + 'SCHEMA' => 'sqlite', + 'MODULE' => 'sqlite', + 'DELIM' => ';', + 'COMMENTS' => 'remove_remarks' + ), + ); +} + +?>
\ No newline at end of file diff --git a/phpBB/language/en/install.php b/phpBB/language/en/install.php index ac2b3f8ce9..6df64608c0 100755 --- a/phpBB/language/en/install.php +++ b/phpBB/language/en/install.php @@ -79,6 +79,10 @@ $lang = array_merge($lang, array( 'FILE_NOT_FOUND' => 'Cannot find', 'FILE_UNWRITEABLE' => 'Unwriteable', 'FILE_WRITEABLE' => 'Writeable', + 'FILES_OPTIONAL' => 'Optional Files and Directories', + 'FILES_OPTIONAL_EXPLAIN' => '<b>Optional</b> - These files, directories or permissions are not required. The installation routines will attempt to use various techniques to complete if they do not exist or cannot be written to. However, the presence of these files, directories or permissions will speed installation.', + 'FILES_REQUIRED' => 'Files and Directories', + 'FILES_REQUIRED_EXPLAIN' => '<b>Required</b> - In order to function correctly phpBB needs to be able to access or write to certain files or directories. If you see "Not Found" you need to create the relevant file or directory. If you see "Unwriteable" you need to change the permissions on the file or directory to allow phpBB to write to it.', 'FTP_CONFIG' => 'Transfer config by FTP', 'FTP_CONFIG_EXPLAIN' => 'phpBB has detected the presence of the ftp module on this server. You may attempt to install your config.php via this if you wish. You will need to supply the information listed below. Remember your username and password are those to your server! (ask your hosting provider for details if you are unsure what these are)', 'FTP_PASSWORD' => 'FTP Password', @@ -91,22 +95,23 @@ $lang = array_merge($lang, array( 'INITIAL_CONFIG' => 'Basic Configuration', 'INITIAL_CONFIG_EXPLAIN' => 'Now that install has determined your server can run phpBB you need to supply some specific information. If you do not know how to connect to your database please contact your hosting provider (in the first instance) or use the phpBB support forums. When entering data please ensure you check it thoroughly before continuing.', - 'INSTALL_ADVICE' => 'Installation Compatibility', - 'INSTALL_ADVICE_EXPLAIN' => 'Before proceeding with full installation phpBB will carry out some tests on your server and basic install. Please ensure you read through the results thoroughly and do not proceed until all tests are passed.', 'INSTALL_CONGRATS' => 'Congratulations', 'INSTALL_CONGRATS_EXPLAIN' => 'You have now successfully installed phpBB 3.0. Clicking the button below will take you to your Administration Control Panel (ACP). Take some time to examine the options available to you. Remember that help is available online via the Userguide and the phpBB support forums, see the %sREADME%s for further information.', - 'INSTALL_DB_CONNECT' => 'Successfull Connection', + 'INSTALL_DB_CONNECT' => 'Successful Connection', + 'INSTALL_INTRO' => 'Welcome to Installation', + 'INSTALL_INTRO_BODY' => '<p>With this option, it is possible to install phpBB onto your server.</p><p>In order to proceed, you will need the following information to hand:</p> + <ul> + <li>Database server name</li> + <li>Database name</li> + <li>Database username and password</li> + </ul> + <p>Some more introductory text can go here...</p>', + 'INSTALL_INTRO_NEXT' => 'To commence the installation, please press the button below.', 'INSTALL_LOGIN' => 'Login', 'INSTALL_NEXT' => 'Next stage', 'INSTALL_NEXT_FAIL' => 'Some tests failed and you should correct these problems before proceeding to the next stage. Failure to do so may result in an incomplete installation.', 'INSTALL_NEXT_PASS' => 'All the basic tests have been passed and you may proceed to the next stage of installation. If you have changed any permissions, modules, etc. and wish to re-test you can do so if you wish.', - 'INSTALL_OPTIONAL' => 'Optional', - 'INSTALL_OPTIONAL_FILES' => 'These files, directories or permissions are optional. The installation routines will attempt to use various techniques to complete if they do not exist or cannot be written to. However, the presence of these files, directories or permissions will speed installation.', - 'INSTALL_OPTIONAL_PHP' => 'These modules or applications are optional, you do not need these to use phpBB 3.0. However if you do have them they will will enable greater functionality.', 'INSTALL_PANEL' => 'Installation Panel', - 'INSTALL_REQUIRED' => 'Required', - 'INSTALL_REQUIRED_FILES' => 'In order to function correctly phpBB needs to be able to access or write to certain files or directories. If you see "Not Found" you need to create the relevant file or directory. If you see "Unwriteable" you need to change the permissions on the file or directory to allow phpBB to write to it.', - 'INSTALL_REQUIRED_PHP' => 'You must be running at least PHP 4.3.3 with support for at least one compatible database. If no support modules are shown as available you should contact your hosting provider or review the relevant PHP installation documentation for advice. If "safe mode" is displayed below your PHP installation is running in that mode. This will impose limitations on remote administration and similar features.', 'INSTALL_SEND_CONFIG' => 'Unfortunately phpBB could not write the configuration information directly to your config.php. This may be because the file does not exist or is not writeable. A number of options will be listed below enabling you to complete installation of config.php.', 'INSTALL_START' => 'Start Install', 'INSTALL_TEST' => 'Test Again', @@ -126,14 +131,22 @@ $lang = array_merge($lang, array( // TODO: Write some explanatory introduction text 'OVERVIEW_BODY' => '<p>Some brief explanatory text about phpBB will go here.</p><p>This installation system will guide you through the process of installing phpBB, converting from a different software package or updating to the latest version of phpBB. For more information on each option, select it from the menu above</p>', - 'PHP_AND_APPS' => 'PHP and Applications', - 'PHP_REQD_DB' => 'Supported Databases', - 'PHP_REGISTER_GLOBALS' => 'PHP setting "register_globals" is not enabled', + 'PHP_OPTIONAL_MODULE' => 'Optional Modules', + 'PHP_OPTIONAL_MODULE_EXPLAIN' => '<b>Optional</b> - These modules or applications are optional, you do not need these to use phpBB 3.0. However if you do have them they will will enable greater functionality.', + 'PHP_SUPPORTED_DB' => 'Supported Databases', + 'PHP_SUPPORTED_DB_EXPLAIN' => '<b>Required</b> - You must have support for at least one compatible database within PHP. If no database modules are shown as available you should contact your hosting provider or review the relevant PHP installation documentation for advice.', + 'PHP_REGISTER_GLOBALS' => 'PHP setting "register_globals" is disabled', + 'PHP_REGISTER_GLOBALS_EXPLAIN' => 'Put an explanation of register_globals here', 'PHP_SAFE_MODE' => 'Safe Mode', + 'PHP_SETTINGS' => 'PHP Version and Settings', + 'PHP_SETTINGS_EXPLAIN' => '<b>Required</b> - You must be running at least version 4.3.3 of PHP in order to install phpBB. If "safe mode" is displayed below your PHP installation is running in that mode. This will impose limitations on remote administration and similar features.', 'PHP_VERSION_REQD' => 'PHP version >= 4.3.3', +// 'REQUIRED' => 'Required', + 'REQUIREMENTS_TITLE' => 'Installation Compatibility', + 'REQUIREMENTS_EXPLAIN' => 'Before proceeding with full installation phpBB will carry out some tests on your server configuration and files to ensure that you are able to install and run phpBB. Please ensure you read through the results thoroughly and do not proceed until all the required tests are passed. If you wish to enable any of the functionality listed by the optional tests, you should ensure that these tests are passed also.', 'RETRY_WRITE' => 'Retry writing config', - 'RETRY_WRITE_EXPLAIN' => 'If you wish you can change the permissions on config.php to allow phpBB to write to it. Should you wish to do that you can click Retry below to try again. Remember to return the permissions on config.php after phpBB2 has finished installation.', + 'RETRY_WRITE_EXPLAIN' => 'If you wish you can change the permissions on config.php to allow phpBB to write to it. Should you wish to do that you can click Retry below to try again. Remember to return the permissions on config.php after phpBB has finished installation.', 'SCRIPT_PATH' => 'Script path', 'SCRIPT_PATH_EXPLAIN' => 'The path where phpBB2 is located relative to the domain name', @@ -142,6 +155,8 @@ $lang = array_merge($lang, array( 'SERVER_NAME_EXPLAIN' => 'The domain name this board runs from', 'SERVER_PORT' => 'Server port', 'SERVER_PORT_EXPLAIN' => 'The port your server is running on, usually 80, only change if different', + 'STAGE_INTRO' => 'Introduction', + 'STAGE_REQUIREMENTS' => 'Requirements', 'SUB_INTRO' => 'Introduction', 'SUB_LICENSE' => 'License', 'SUB_SUPPORT' => 'Support', |