mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-08-01 14:30:32 +02:00
Code Issues Releases Wiki Activity

- Modules are not added correctly [#6370]

Browse Source 
- Minor bug in ucp_prefs_personal.html (Opera) [#6348]
- MCP-Warnings section colspan problem in Opera [#6338]
- Loading extensions on install [#6332]
- Adjust PM rules if folder removed [#6326]
- #6318
- Coppa registration [#6306]
- Quick-Mod Topic Type Changes Fail when Topic == Global [#6228]
- added the possibility to change topic type for more than one topic (within mcp)


git-svn-id: file:///svn/phpbb/trunk@6781 89ea8834-ac86-4346-8a33-228a782c2dd0
This commit is contained in:
Meik Sievertsen
2006-12-18 17:29:39 +00:00
parent 4e5466d276
commit 7ca8a4a662
17 changed files with 158 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
phpBB/install/install_install.php
View File

@@ -97,7 +97,6 @@ class install_install extends module
case 'create_table':
$this->load_schema($mode, $sub);
break;
case 'final' :
@@ -206,8 +205,16 @@ class install_install extends module
'S_LEGEND' => false,
));
/**
* Better not enabling and adding to the loaded extensions due to the specific requirements needed
if (!@extension_loaded('mbstring'))
{
$this->can_load_dll('mbstring');
}
*/
$passed['mbstring'] = true;
if (extension_loaded('mbstring'))
if (@extension_loaded('mbstring'))
{
// Test for available database modules
$template->assign_block_vars('checks', array(
@@ -338,7 +345,7 @@ class install_install extends module
}
// Can we find Imagemagick anywhere on the system?
$exe = ((defined('PHP_OS')) && (preg_match('#^win#i', PHP_OS))) ? '.exe' : '';
$exe = (defined('PHP_OS') && strpos(strtolower(PHP_OS), 'win') === 0) ? '.exe' : '';
$magic_home = getenv('MAGICK_HOME');
$img_imagick = '';
@@ -831,6 +838,8 @@ class install_install extends module
$load_extensions = array();
$check_exts = array_merge(array($this->available_dbms[$dbms]['MODULE']), $this->php_dlls_other);
$suffix = (defined('PHP_OS') && strpos(strtolower(PHP_OS), 'win') === 0) ? 'dll' : 'so';
foreach ($check_exts as $dll)
{
if (!@extension_loaded($dll))
@@ -839,6 +848,7 @@ class install_install extends module
{
continue;
}
$load_extensions[] = "$dll.$suffix";
}
}
@@ -1086,7 +1096,7 @@ class install_install extends module
// If we get here and the extension isn't loaded it should be safe to just go ahead and load it
if (!@extension_loaded($this->available_dbms[$dbms]['MODULE']))
{
@dl($this->available_dbms[$dbms]['MODULE'] . ".$prefix");
$this->can_load_dll($this->available_dbms[$dbms]['MODULE']);
}
$dbpasswd = htmlspecialchars_decode($dbpasswd);
@@ -1305,6 +1315,11 @@ class install_install extends module
SET forum_last_post_time = $current_time",
);
if (!@extension_loaded('gd'))
{
$this->can_load_dll('gd');
}
// This is for people who have TTF and GD
if (@extension_loaded('gd') && function_exists('imagettfbbox') && function_exists('imagettftext'))
{
@@ -1356,6 +1371,12 @@ class install_install extends module
$dbpasswd = htmlspecialchars_decode($dbpasswd);
// If we get here and the extension isn't loaded it should be safe to just go ahead and load it
if (!@extension_loaded($this->available_dbms[$dbms]['MODULE']))
{
$this->can_load_dll($this->available_dbms[$dbms]['MODULE']);
}
// Load the appropriate database class if not already loaded
include($phpbb_root_path . 'includes/db/' . $this->available_dbms[$dbms]['DRIVER'] . '.' . $phpEx);
@@ -1770,6 +1791,11 @@ class install_install extends module
{
global $suffix;
if (empty($suffix))
{
$suffix = (defined('PHP_OS') && strpos(strtolower(PHP_OS), 'win') === 0) ? 'dll' : 'so';
}
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;
}