diff options
| author | David M <davidmj@users.sourceforge.net> | 2006-11-03 23:09:16 +0000 |
|---|---|---|
| committer | David M <davidmj@users.sourceforge.net> | 2006-11-03 23:09:16 +0000 |
| commit | 8b0ec6e02d5a53ea3d1b87abd122d39cc3e8366f (patch) | |
| tree | 22bae5ecbab9dbf8390ab3763f53c15c822c9198 /phpBB/install | |
| parent | 7ab232a45504ef357a19d9ab58dd27c454e12784 (diff) | |
| download | forums-8b0ec6e02d5a53ea3d1b87abd122d39cc3e8366f.tar forums-8b0ec6e02d5a53ea3d1b87abd122d39cc3e8366f.tar.gz forums-8b0ec6e02d5a53ea3d1b87abd122d39cc3e8366f.tar.bz2 forums-8b0ec6e02d5a53ea3d1b87abd122d39cc3e8366f.tar.xz forums-8b0ec6e02d5a53ea3d1b87abd122d39cc3e8366f.zip | |
- compress is nicer (fixed a bug :P)
- UTF-8 code is nicer (fixed a bug :P)
- new CAPTCHA. Replaced the old one for size and usability issues. The old CAPTCHA will most likely be released as a separate package
git-svn-id: file:///svn/phpbb/trunk@6549 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/install')
| -rwxr-xr-x | phpBB/install/install_install.php | 16 | ||||
| -rw-r--r-- | phpBB/install/schemas/schema_data.sql | 15 |
2 files changed, 13 insertions, 18 deletions
diff --git a/phpBB/install/install_install.php b/phpBB/install/install_install.php index 36f99db0d3..df834a367e 100755 --- a/phpBB/install/install_install.php +++ b/phpBB/install/install_install.php @@ -1185,12 +1185,12 @@ class install_install extends module SET forum_last_post_time = $current_time", ); - // This is for people who have TTF disabled - if (!(@function_exists('imagettfbbox') && @function_exists('imagettftext'))) + // This is for people who have TTF and GD + if (@extension_loaded('gd') && function_exists('imagettfbbox') && function_exists('imagettftext')) { $sql_ary[] = 'UPDATE ' . $table_prefix . "config - SET config_value = '0' - WHERE config_name = 'policy_shape'"; + SET config_value = '1' + WHERE config_name = 'captcha_gd'"; } foreach ($sql_ary as $sql) @@ -1732,11 +1732,17 @@ class install_install extends module { case 'mysql': case 'mysqli': - case 'sqlite': $sql = 'SHOW TABLES'; $field = "Tables_in_{$dbname}"; break; + case 'sqlite': + $sql = 'SELECT name + FROM sqlite_master + WHERE type = "table"'; + $field = 'name'; + break; + case 'mssql': case 'mssql_odbc': $sql = "SELECT name diff --git a/phpBB/install/schemas/schema_data.sql b/phpBB/install/schemas/schema_data.sql index e7785f5d62..82a6608ae6 100644 --- a/phpBB/install/schemas/schema_data.sql +++ b/phpBB/install/schemas/schema_data.sql @@ -163,19 +163,8 @@ INSERT INTO phpbb_config (config_name, config_value) VALUES ('pass_complex', '.* INSERT INTO phpbb_config (config_name, config_value) VALUES ('pm_edit_time', '0'); INSERT INTO phpbb_config (config_name, config_value) VALUES ('pm_max_boxes', '4'); INSERT INTO phpbb_config (config_name, config_value) VALUES ('pm_max_msgs', '50'); -INSERT INTO phpbb_config (config_name, config_value) VALUES ('policy_overlap', '0'); -INSERT INTO phpbb_config (config_name, config_value) VALUES ('policy_overlap_noise_pixel', '1'); -INSERT INTO phpbb_config (config_name, config_value) VALUES ('policy_overlap_noise_line', '1'); -INSERT INTO phpbb_config (config_name, config_value) VALUES ('policy_entropy', '1'); -INSERT INTO phpbb_config (config_name, config_value) VALUES ('policy_entropy_noise_pixel', '2'); -INSERT INTO phpbb_config (config_name, config_value) VALUES ('policy_entropy_noise_line', '1'); -INSERT INTO phpbb_config (config_name, config_value) VALUES ('policy_shape', '1'); -INSERT INTO phpbb_config (config_name, config_value) VALUES ('policy_shape_noise_pixel', '1'); -INSERT INTO phpbb_config (config_name, config_value) VALUES ('policy_shape_noise_line', '1'); -INSERT INTO phpbb_config (config_name, config_value) VALUES ('policy_3dbitmap', '0'); -INSERT INTO phpbb_config (config_name, config_value) VALUES ('policy_cells', '0'); -INSERT INTO phpbb_config (config_name, config_value) VALUES ('policy_stencil', '0'); -INSERT INTO phpbb_config (config_name, config_value) VALUES ('policy_composite', '0'); +INSERT INTO phpbb_config (config_name, config_value) VALUES ('captcha_gd', '0'); +INSERT INTO phpbb_config (config_name, config_value) VALUES ('captcha_gd_noise', '1'); INSERT INTO phpbb_config (config_name, config_value) VALUES ('posts_per_page', '10'); INSERT INTO phpbb_config (config_name, config_value) VALUES ('print_pm', '1'); INSERT INTO phpbb_config (config_name, config_value) VALUES ('queue_interval', '600'); |