mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-02-15 13:34:41 +01:00
Code Issues Releases Wiki Activity

#5640

Browse Source 
git-svn-id: file:///svn/phpbb/trunk@6676 89ea8834-ac86-4346-8a33-228a782c2dd0
This commit is contained in:
David M 2006-11-27 21:24:15 +00:00
parent 49e8de0ca2
commit f56c1a85d3
2 changed files with 25 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
phpBB/install/install_install.php
View File

@ -129,7 +129,7 @@ class install_install extends module
'BODY' => $lang['REQUIREMENTS_EXPLAIN'],
));
$passed = array('php' => false, 'db' => false, 'files' => false);
$passed = array('php' => false, 'db' => false, 'files' => false, 'pcre' => false);
// Test for basic PHP settings
$template->assign_block_vars('checks', array(
@ -186,6 +186,26 @@ class install_install extends module
'S_LEGEND' => false,
));
// Check for PCRE UTF-8 support
if (preg_match('//u', ''))
{
$passed['pcre'] = true;
$result = '<b style="color:green">' . $lang['YES'] . '</b>';
}
else
{
$result = '<b style="color:red">' . $lang['NO'] . '</b>';
}
$template->assign_block_vars('checks', array(
'TITLE' => $lang['PCRE_UTF_SUPPORT'],
'TITLE_EXPLAIN' => $lang['PCRE_UTF_SUPPORT_EXPLAIN'],
'RESULT' => $result,
'S_EXPLAIN' => true,
'S_LEGEND' => false,
));
// Test for available database modules
$template->assign_block_vars('checks', array(
'S_LEGEND' => true,
@ -395,8 +415,8 @@ class install_install extends module
// 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&amp;sub=database&amp;language=$language" : $this->p_master->module_url . "?mode=$mode&amp;sub=requirements&amp;language=$language ";
$submit = ($passed['php'] && $passed['db'] && $passed['files']) ? $lang['INSTALL_START'] : $lang['INSTALL_TEST'];
$url = ($passed['php'] && $passed['db'] && $passed['files'] && $passed['pcre']) ? $this->p_master->module_url . "?mode=$mode&amp;sub=database&amp;language=$language" : $this->p_master->module_url . "?mode=$mode&amp;sub=requirements&amp;language=$language ";
$submit = ($passed['php'] && $passed['db'] && $passed['files'] && $passed['pcre']) ? $lang['INSTALL_START'] : $lang['INSTALL_TEST'];
$template->assign_vars(array(

2
phpBB/language/en/install.php
View File

@ -222,6 +222,8 @@ $lang = array_merge($lang, array(
'NO_TABLES_FOUND' => 'No tables found.',
// TODO: Write some explanatory introduction text
'OVERVIEW_BODY' => 'Welcome to our public beta of the next-generation of phpBB after 2.0.x, phpBB 3.0! This beta release is intended for advanced users to try out on dedicated development enviroments to help us finish creating the best Opensource Bulletin Board solution available.</p><p><strong style="text-transform: uppercase;">Note:</strong> This release is <strong style="text-transform: uppercase;">not final</strong> and made available for testing purposes <strong style="text-transform: uppercase;">only</strong>.</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.',
'PCRE_UTF_SUPPORT' => 'PCRE UTF-8 Support',
'PCRE_UTF_SUPPORT_EXPLAIN' => 'phpBB will <strong>not</strong> run if your PHP installation is not compiled with UTF-8 support in the PCRE extension',
'PHP_OPTIONAL_MODULE' => 'Optional Modules',
'PHP_OPTIONAL_MODULE_EXPLAIN' => '<strong>Optional</strong> - 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',