diff options
| author | Graham Eames <grahamje@users.sourceforge.net> | 2006-01-08 19:43:37 +0000 |
|---|---|---|
| committer | Graham Eames <grahamje@users.sourceforge.net> | 2006-01-08 19:43:37 +0000 |
| commit | 6ef34f7961d786c2d89d52584f341910dcb8b3a7 (patch) | |
| tree | 1dade3fb79c5016125fb01dba350f2f623484358 /phpBB | |
| parent | 61e827879746fe4c654deeb1369c79dabc4ef6e7 (diff) | |
| download | forums-6ef34f7961d786c2d89d52584f341910dcb8b3a7.tar forums-6ef34f7961d786c2d89d52584f341910dcb8b3a7.tar.gz forums-6ef34f7961d786c2d89d52584f341910dcb8b3a7.tar.bz2 forums-6ef34f7961d786c2d89d52584f341910dcb8b3a7.tar.xz forums-6ef34f7961d786c2d89d52584f341910dcb8b3a7.zip | |
A few changes to the installer as a result of changes elsewhere
git-svn-id: file:///svn/phpbb/trunk@5439 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB')
| -rw-r--r-- | phpBB/install/install.php | 60 | ||||
| -rwxr-xr-x | phpBB/language/en/install.php | 11 |
2 files changed, 41 insertions, 30 deletions
diff --git a/phpBB/install/install.php b/phpBB/install/install.php index 828b5fa77a..f9ef1136e5 100644 --- a/phpBB/install/install.php +++ b/phpBB/install/install.php @@ -24,6 +24,7 @@ $phpbb_root_path = './../'; $phpEx = substr(strrchr(__FILE__, '.'), 1); require($phpbb_root_path . 'includes/functions.'.$phpEx); include($phpbb_root_path . 'includes/session.'.$phpEx); +include($phpbb_root_path . 'includes/auth.'.$phpEx); include($phpbb_root_path . 'includes/acm/acm_file.'.$phpEx); include($phpbb_root_path . 'includes/acm/acm_main.'.$phpEx); include($phpbb_root_path . 'includes/functions_admin.'.$phpEx); @@ -360,6 +361,20 @@ if ($stage == 0) ?></td> </tr> <tr> + <td>• <b><?php echo $lang['PHP_REGISTER_GLOBALS']; ?>: </b></td> + <td><?php + if (@ini_get('register_globals') || strtolower(@ini_get('register_globals')) == 'on') + { + $passed['db'] = false; + echo '<b style="color:red">' . $lang['NO'] . '</b>'; + } + else + { + echo '<b style="color:green">' . $lang['YES'] . '</b>'; + } +?></td> + </tr> + <tr> <td rowspan="<?php echo sizeof($dlls_db); ?>" valign="top">• <b><?php echo $lang['PHP_REQD_DB']; ?>: </b></td> <?php @@ -1261,30 +1276,24 @@ function inst_page_header() global $phpEx, $lang; ?> -<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"> +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<html xmlns="http://www.w3.org/1999/xhtml" dir="ltr"> <html> <head> -<link rel="stylesheet" href="../adm/subSilver.css" type="text/css"> -<style type="text/css"> -<!-- -th { background-image: url('../adm/images/cellpic3.gif') } -td.cat { background-image: url('../adm/images/cellpic1.gif') } -//--> -</style> +<meta http-equiv="content-type" content="text/html; charset=utf-8" /> +<link href="../adm/style/admin.css" rel="stylesheet" type="text/css" media="screen" /> <title><?php echo $lang['WELCOME_INSTALL']; ?></title> </head> <body> -<table width="100%" cellspacing="0" cellpadding="0" border="0"> - <tr> - <td><img src="../adm/images/header_left.jpg" width="200" height="60" alt="phpBB Logo" title="phpBB Logo" border="0"/></td> - <td width="100%" background="../adm/images/header_bg.jpg" height="60" align="right" nowrap="nowrap"><span class="maintitle"><?php echo $lang['WELCOME_INSTALL']; ?></span> </td> - </tr> -</table> - -<table width="85%" cellspacing="0" cellpadding="0" border="0" align="center"> - <tr> - <td><br clear="all" /> +<div id="wrap"> + <div id="page-header"> + <h1><?php echo $lang['WELCOME_INSTALL']; ?></h1> + </div> + <div id="page-body"> + <div class="panel"> + <span class="corners-top"><span></span></span> + <div id="content"> <form action="<?php echo "install.$phpEx"; ?>" name="installation" method="post"> @@ -1322,13 +1331,14 @@ function inst_page_footer() { ?> - -<div class="copyright" align="center">Powered by phpBB © <a href="http://www.phpbb.com/" target="_phpbb" class="copyright">phpBB Group</a>, 2003</div> - - <br clear="all" /></td> - </tr> -</table> - + </div> + <span class="corners-bottom"><span></span></span> + </div> + </div> + <div id="page-footer"> + Powered by phpBB © <?php echo date('Y'); ?> <a href="http://www.phpbb.com/">phpBB Group</a> + </div> +</div> </body> </html> <?php diff --git a/phpBB/language/en/install.php b/phpBB/language/en/install.php index 3076065d12..fa57a6017b 100755 --- a/phpBB/language/en/install.php +++ b/phpBB/language/en/install.php @@ -69,7 +69,7 @@ $lang = array_merge($lang, array( 'DLL_XML' => 'XML support [ Jabber ]', 'DLL_ZLIB' => 'zlib Compression support [ Visual confirmation, gz, .tar.gz, .zip ]', 'DL_CONFIG' => 'Download config', - 'DL_CONFIG_EXPLAIN' => 'You may download the complete config.php to your own PC. You will then need to upload the file manually, replacing any existing config.php in your phpBB 2.2 root directory. Please remember to upload the file in ASCII format (see your FTP application documentation if you are unsure how to achieve this). When you have uploaded the config.php please click "Done" to move to the next stage.', + 'DL_CONFIG_EXPLAIN' => 'You may download the complete config.php to your own PC. You will then need to upload the file manually, replacing any existing config.php in your phpBB 3.0 root directory. Please remember to upload the file in ASCII format (see your FTP application documentation if you are unsure how to achieve this). When you have uploaded the config.php please click "Done" to move to the next stage.', 'DL_DOWNLOAD' => 'Download', 'DL_DONE' => 'Done', @@ -90,7 +90,7 @@ $lang = array_merge($lang, array( '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 2.2. 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_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_LOGIN' => 'Login', 'INSTALL_NEXT' => 'Next stage', @@ -98,10 +98,10 @@ $lang = array_merge($lang, array( '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 2.2. However if you do have them they will will enable greater functionality.', + '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_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.1.0 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_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', @@ -121,8 +121,9 @@ $lang = array_merge($lang, array( 'PHP_AND_APPS' => 'PHP and Applications', 'PHP_REQD_DB' => 'Supported Databases', + 'PHP_REGISTER_GLOBALS' => 'PHP setting "register_globals" is not enabled', 'PHP_SAFE_MODE' => 'Safe Mode', - 'PHP_VERSION_REQD' => 'PHP version >= 4.1.0', + 'PHP_VERSION_REQD' => 'PHP version >= 4.3.3', '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.', |