diff options
Diffstat (limited to 'phpBB/install/install.php')
| -rw-r--r-- | phpBB/install/install.php | 20 |
1 files changed, 14 insertions, 6 deletions
diff --git a/phpBB/install/install.php b/phpBB/install/install.php index 5582a3af20..78d2c9b776 100644 --- a/phpBB/install/install.php +++ b/phpBB/install/install.php @@ -25,6 +25,7 @@ define('IN_PHPBB', true); //error_reporting (E_ERROR | E_WARNING | E_PARSE); set_magic_quotes_runtime(0); +@set_time_limit(120); // Include essential scripts $phpbb_root_path = './../'; @@ -53,11 +54,11 @@ $cache = new acm(); // Try opening config file if (@file_exists($phpbb_root_path . 'config.'.$phpEx)) { - include($phpbb_root_path . 'config.'.$phpEx); +// include($phpbb_root_path . 'config.'.$phpEx); if (defined('PHPBB_INSTALLED')) { - redirect("../index.$phpEx"); +// redirect("../index.$phpEx"); } } @@ -93,16 +94,16 @@ $available_dbms = array( 'COMMENTS' => 'remove_remarks' ), 'mysql' => array( - 'LABEL' => 'MySQL 3.x', + 'LABEL' => 'MySQL', 'SCHEMA' => 'mysql', 'MODULE' => 'mysql', 'DELIM' => ';', 'COMMENTS' => 'remove_remarks' ), 'mysql4' => array( - 'LABEL' => 'MySQL 4.x', + 'LABEL' => 'MySQL 4.1.x', 'SCHEMA' => 'mysql', - 'MODULE' => 'mysql', + 'MODULE' => 'mysqli', 'DELIM' => ';', 'COMMENTS' => 'remove_remarks' ), @@ -141,6 +142,13 @@ $available_dbms = array( 'DELIM' => ';', 'COMMENTS' => 'remove_comments' ), + 'sqlite' => array( + 'LABEL' => 'SQLite', + 'SCHEMA' => 'sqlite', + 'MODULE' => 'sqlite', + 'DELIM' => ';', + 'COMMENTS' => 'remove_remarks' + ), ); $suffix = ((defined('PHP_OS')) && (preg_match('#win#i', PHP_OS))) ? 'dll' : 'so'; @@ -405,7 +413,7 @@ if ($stage == 0) foreach ($locations as $location) { - if (file_exists($location . 'convert' . $exe) && is_executable($location . 'convert' . $exe)) + if (file_exists($location . 'convert' . $exe) && is_readable($location . 'convert' . $exe)) { $img_imagick = str_replace('\\', '/', $location); continue; |