diff options
| author | Meik Sievertsen <acydburn@phpbb.com> | 2009-06-12 14:41:03 +0000 |
|---|---|---|
| committer | Meik Sievertsen <acydburn@phpbb.com> | 2009-06-12 14:41:03 +0000 |
| commit | 863d7a7614a09dac545d3c3201e67c3beddb3960 (patch) | |
| tree | 89aa2b24e8733e2b6a856c78b9ae82878b3419ff /phpBB/install | |
| parent | e71bae0e7ad7817e06fb786c3420a1a2158df8cc (diff) | |
| download | forums-863d7a7614a09dac545d3c3201e67c3beddb3960.tar forums-863d7a7614a09dac545d3c3201e67c3beddb3960.tar.gz forums-863d7a7614a09dac545d3c3201e67c3beddb3960.tar.bz2 forums-863d7a7614a09dac545d3c3201e67c3beddb3960.tar.xz forums-863d7a7614a09dac545d3c3201e67c3beddb3960.zip | |
First ATOM Feed commit/integration
- Idea and original RSS Feed 2.0 MOD (Version 1.0.8/9) by leviatan21
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@9575 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/install')
| -rw-r--r-- | phpBB/install/database_update.php | 64 | ||||
| -rw-r--r-- | phpBB/install/schemas/schema_data.sql | 11 |
2 files changed, 73 insertions, 2 deletions
diff --git a/phpBB/install/database_update.php b/phpBB/install/database_update.php index 171a8f1fc6..bb48b57a13 100644 --- a/phpBB/install/database_update.php +++ b/phpBB/install/database_update.php @@ -1022,9 +1022,69 @@ function change_database_data(&$no_updates, $version) case '3.0.5-RC1': break; + // Changes from 3.0.5 to 3.0.6-RC1 case '3.0.5': - // TODO: smarter detection here; problem without GD. - set_config('captcha_plugin', 'phpbb_captcha_nogd'); + // Let's see if the GD Captcha can be enabled... we simply look for what *is* enabled... + if (!empty($config['captcha_gd']) && !isset($config['captcha_plugin'])) + { + set_config('captcha_plugin', 'phpbb_captcha_gd'); + } + else if (!isset($config['captcha_plugin'])) + { + set_config('captcha_plugin', 'phpbb_captcha_nogd'); + } + + // Entries for the Feed Feature + set_config('feed_enable', '0'); + set_config('feed_limit', '10'); + + set_config('feed_overall_forums', '1'); + set_config('feed_overall_forums_limit', '15'); + + set_config('feed_overall_topics', '0'); + set_config('feed_overall_topics_limit', '15'); + + set_config('feed_forum', '1'); + set_config('feed_topic', '1'); + set_config('feed_news_id', ''); + + set_config('feed_item_statistics', '1'); + set_config('feed_exclude_id', ''); + + include_once($phpbb_root_path . 'includes/acp/acp_modules.' . $phpEx); + + $_module = new acp_modules(); + + // Set the module class + $_module->module_class = 'acp'; + + $sql = 'SELECT module_id + FROM ' . MODULES_TABLE . " + WHERE module_class = 'acp' + AND module_langname = 'ACP_BOARD_CONFIGURATION' + AND module_mode = '' + AND module_basename = ''"; + $result = $db->sql_query($sql); + $category_id = (int) $db->sql_fetchfield('module_id'); + $db->sql_freeresult($result); + + if ($category_id) + { + $module_data = array( + 'module_basename' => 'board', + 'module_enabled' => 1, + 'module_display' => 1, + 'parent_id' => $category_id, + 'module_class' => 'acp', + 'module_langname' => 'ACP_FEED_SETTINGS', + 'module_mode' => 'feed', + 'module_auth' => 'acl_a_board', + ); + + $_module->update_module_data($module_data, true); + } + + $_module->remove_cache_file(); $no_updates = false; break; diff --git a/phpBB/install/schemas/schema_data.sql b/phpBB/install/schemas/schema_data.sql index e41cf6794c..aea99e3305 100644 --- a/phpBB/install/schemas/schema_data.sql +++ b/phpBB/install/schemas/schema_data.sql @@ -93,6 +93,17 @@ INSERT INTO phpbb_config (config_name, config_value) VALUES ('enable_confirm', ' INSERT INTO phpbb_config (config_name, config_value) VALUES ('enable_pm_icons', '1'); INSERT INTO phpbb_config (config_name, config_value) VALUES ('enable_post_confirm', '1'); INSERT INTO phpbb_config (config_name, config_value) VALUES ('enable_queue_trigger', '0'); +INSERT INTO phpbb_config (config_name, config_value) VALUES ('feed_enable', '0'); +INSERT INTO phpbb_config (config_name, config_value) VALUES ('feed_limit', '10'); +INSERT INTO phpbb_config (config_name, config_value) VALUES ('feed_overall_forums', '1'); +INSERT INTO phpbb_config (config_name, config_value) VALUES ('feed_overall_forums_limit', '15'); +INSERT INTO phpbb_config (config_name, config_value) VALUES ('feed_overall_topics', '0'); +INSERT INTO phpbb_config (config_name, config_value) VALUES ('feed_overall_topics_limit', '15'); +INSERT INTO phpbb_config (config_name, config_value) VALUES ('feed_forum', '1'); +INSERT INTO phpbb_config (config_name, config_value) VALUES ('feed_topic', '1'); +INSERT INTO phpbb_config (config_name, config_value) VALUES ('feed_news_id', ''); +INSERT INTO phpbb_config (config_name, config_value) VALUES ('feed_item_statistics', '1'); +INSERT INTO phpbb_config (config_name, config_value) VALUES ('feed_exclude_id', ''); INSERT INTO phpbb_config (config_name, config_value) VALUES ('flood_interval', '15'); INSERT INTO phpbb_config (config_name, config_value) VALUES ('force_server_vars', '0'); INSERT INTO phpbb_config (config_name, config_value) VALUES ('form_token_lifetime', '7200'); |