diff --git a/phpBB/admin/admin_db_utilities.php b/phpBB/admin/admin_db_utilities.php index 62deb9daad..ed7588c0c2 100644 --- a/phpBB/admin/admin_db_utilities.php +++ b/phpBB/admin/admin_db_utilities.php @@ -693,7 +693,7 @@ if( isset($HTTP_GET_VARS['perform']) || isset($HTTP_POST_VARS['perform']) ) include('./page_footer_admin.'.$phpEx); } - $tables = array('auth_access', 'banlist', 'categories', 'config', 'disallow', 'forums', 'forum_prune', 'groups', 'posts', 'posts_text', 'privmsgs', 'privmsgs_text', 'ranks', 'search_results', 'search_wordlist', 'search_wordmatch', 'sessions', 'smilies', 'themes', 'themes_name', 'topics', 'topics_watch', 'user_group', 'users', 'vote_desc', 'vote_results', 'vote_voters', 'words'); + $tables = array('auth_access', 'banlist', 'categories', 'config', 'disallow', 'forums', 'forum_prune', 'groups', 'posts', 'posts_text', 'privmsgs', 'privmsgs_text', 'ranks', 'search_results', 'search_wordlist', 'search_wordmatch', 'sessions', 'smilies', 'themes', 'themes_name', 'topics', 'topics_watch', 'user_group', 'users', 'vote_desc', 'vote_results', 'vote_voters', 'words', 'confirm'); $additional_tables = (isset($HTTP_POST_VARS['additional_tables'])) ? $HTTP_POST_VARS['additional_tables'] : ( (isset($HTTP_GET_VARS['additional_tables'])) ? $HTTP_GET_VARS['additional_tables'] : "" ); diff --git a/phpBB/admin/index.php b/phpBB/admin/index.php index 24ab19b3aa..817d088a5f 100644 --- a/phpBB/admin/index.php +++ b/phpBB/admin/index.php @@ -560,6 +560,71 @@ elseif( isset($HTTP_GET_VARS['pane']) && $HTTP_GET_VARS['pane'] == 'right' ) ); } + // Check for new version + $current_version = explode('.', '2' . $board_config['version']); + $minor_revision = (int) $current_version[2]; + + $errno = 0; + $errstr = $version_info = ''; + + if ($fsock = @fsockopen('www.phpbb.com', 80, $errno, $errstr)) + { + @fputs($fsock, "GET /updatecheck/20x.txt HTTP/1.1\r\n"); + @fputs($fsock, "HOST: www.phpbb.com\r\n"); + @fputs($fsock, "Connection: close\r\n\r\n"); + + $get_info = false; + while (!@feof($fsock)) + { + if ($get_info) + { + $version_info .= @fread($fsock, 1024); + } + else + { + if (@fgets($fsock, 1024) == "\r\n") + { + $get_info = true; + } + } + } + @fclose($fsock); + + $version_info = explode("\n", $version_info); + $latest_head_revision = (int) $version_info[0]; + $latest_minor_revision = (int) $version_info[2]; + $latest_version = (int) $version_info[0] . '.' . (int) $version_info[1] . '.' . (int) $version_info[2]; + + if ($latest_head_revision == 2 && $minor_revision == $latest_minor_revision) + { + $version_info = '

' . $lang['Version_up_to_date'] . '

'; + } + else + { + $version_info = '

' . $lang['Version_not_up_to_date']; + $version_info .= '
' . sprintf($lang['Latest_version_info'], $latest_version) . sprintf($lang['Current_version_info'], '2' . $board_config['version']) . '

'; + } + } + else + { + if ($errstr) + { + $version_info = '

' . sprintf($lang['Connect_socket_error'], $errstr) . '

'; + } + else + { + $version_info = '

' . $lang['Socket_functions_disabled'] . '

'; + } + } + + $version_info .= '

' . $lang['Mailing_list_subscribe_reminder'] . '

'; + + + $template->assign_vars(array( + 'VERSION_INFO' => $version_info, + 'L_VERSION_INFORMATION' => $lang['Version_information']) + ); + $template->pparse("body"); include('./page_footer_admin.'.$phpEx); diff --git a/phpBB/common.php b/phpBB/common.php index f9a9e4e190..a6a1d78362 100644 --- a/phpBB/common.php +++ b/phpBB/common.php @@ -50,6 +50,7 @@ if (!isset($HTTP_POST_VARS) && isset($_POST)) if (@phpversion() < '4.0.0') { // PHP3 path; in PHP3, globals are _always_ registered + $not_unset = array('HTTP_GET_VARS', 'HTTP_POST_VARS', 'HTTP_COOKIE_VARS', 'HTTP_SERVER_VARS', 'HTTP_ENV_VARS', 'HTTP_POST_FILES', 'phpEx', 'phpbb_root_path'); // We 'flip' the array of variables to test like this so that // we can validate later with isset($test[$var]) (no in_array()) @@ -62,7 +63,7 @@ if (@phpversion() < '4.0.0') while (list($var,) = @each($$input)) { // Validate the variable to be unset - if (!isset($test[$var]) && $var != 'test' && $var != 'input') + if (!isset($test[$var]) && $var != 'test' && $var != 'input' && $var != 'not_unset' && !in_array($var, $not_unset)) { unset($$var); } @@ -72,7 +73,8 @@ if (@phpversion() < '4.0.0') else if (@ini_get('register_globals') == '1' || strtolower(@ini_get('register_globals')) == 'on') { // PHP4+ path - + $not_unset = array('HTTP_GET_VARS', 'HTTP_POST_VARS', 'HTTP_COOKIE_VARS', 'HTTP_SERVER_VARS', 'HTTP_SESSION_VARS', 'HTTP_ENV_VARS', 'HTTP_POST_FILES', 'phpEx', 'phpbb_root_path'); + // Not only will array_merge give a warning if a parameter // is not an array, it will actually fail. So we check if // HTTP_SESSION_VARS has been initialised. @@ -86,10 +88,14 @@ else if (@ini_get('register_globals') == '1' || strtolower(@ini_get('register_gl $input = array_merge($HTTP_GET_VARS, $HTTP_POST_VARS, $HTTP_COOKIE_VARS, $HTTP_SERVER_VARS, $HTTP_SESSION_VARS, $HTTP_ENV_VARS, $HTTP_POST_FILES); unset($input['input']); - + unset($input['not_unset']); + while (list($var,) = @each($input)) { - unset($$var); + if (!in_array($var, $not_unset)) + { + unset($$var); + } } unset($input); @@ -199,7 +205,7 @@ include($phpbb_root_path . 'includes/db.'.$phpEx); // even bother complaining ... go scream and shout at the idiots out there who feel // "clever" is doing harm rather than good ... karma is a great thing ... :) // -$client_ip = ( !empty($HTTP_SERVER_VARS['REMOTE_ADDR']) ) ? $HTTP_SERVER_VARS['REMOTE_ADDR'] : ( ( !empty($HTTP_ENV_VARS['REMOTE_ADDR']) ) ? $HTTP_ENV_VARS['REMOTE_ADDR'] : $REMOTE_ADDR ); +$client_ip = ( !empty($HTTP_SERVER_VARS['REMOTE_ADDR']) ) ? $HTTP_SERVER_VARS['REMOTE_ADDR'] : ( ( !empty($HTTP_ENV_VARS['REMOTE_ADDR']) ) ? $HTTP_ENV_VARS['REMOTE_ADDR'] : getenv('REMOTE_ADDR') ); $user_ip = encode_ip($client_ip); // diff --git a/phpBB/docs/CHANGELOG.html b/phpBB/docs/CHANGELOG.html index 5f256f0920..1c14b0e446 100644 --- a/phpBB/docs/CHANGELOG.html +++ b/phpBB/docs/CHANGELOG.html @@ -3,7 +3,7 @@ -phpBB 2.0.11 :: Changelog +phpBB 2.0.12 :: Changelog + + + + + + + +
+ + + + +
Forum HomeUpdating to latest stable release
+ +
+ +

Information

+ +Database type    :: ' . SQL_LAYER . '
'; + +$sql = "SELECT config_value + FROM " . CONFIG_TABLE . " + WHERE config_name = 'version'"; +if (!($result = $db->sql_query($sql))) +{ + die("Couldn't obtain version info"); +} + +$row = $db->sql_fetchrow($result); + +$sql = array(); + +switch ($row['config_value']) +{ + case '': + echo 'Previous version :: < RC-3


'; + break; + case 'RC-3': + echo 'Previous version :: RC-3


'; + break; + case 'RC-4': + echo 'Previous version :: RC-4


'; + break; + default: + echo 'Previous version :: 2' . $row['config_value'] . '
'; + break; +} + +echo 'Updated version  :: 2' . $updates_to_version . '

' ."\n"; + +// +// Schema updates +// +switch ($row['config_value']) +{ + case '': + switch (SQL_LAYER) + { + case 'mysql': + case 'mysql4': + $sql[] = "ALTER TABLE " . USERS_TABLE . " DROP + COLUMN user_autologin_key"; + + $sql[] = "ALTER TABLE " . RANKS_TABLE . " DROP + COLUMN rank_max"; + + $sql[] = "ALTER TABLE " . USERS_TABLE . " + ADD COLUMN user_session_time int(11) DEFAULT '0' NOT NULL, + ADD COLUMN user_session_page smallint(5) DEFAULT '0' NOT NULL, + ADD INDEX (user_session_time)"; + $sql[] = "ALTER TABLE " . SEARCH_TABLE . " + MODIFY search_id int(11) NOT NULL"; + + $sql[] = "ALTER TABLE " . TOPICS_TABLE . " + MODIFY topic_moved_id mediumint(8) UNSIGNED DEFAULT '0' NOT NULL, + ADD COLUMN topic_first_post_id mediumint(8) UNSIGNED DEFAULT '0' NOT NULL, + ADD INDEX (topic_first_post_id)"; + + $sql[] = "ALTER TABLE " . THEMES_NAME_TABLE . " + ADD COLUMN tr_class1_name varchar(50) NULL, + ADD COLUMN tr_class2_name varchar(50) NULL, + ADD COLUMN tr_class3_name varchar(50) NULL, + ADD COLUMN th_class1_name varchar(50) NULL, + ADD COLUMN th_class2_name varchar(50) NULL, + ADD COLUMN th_class3_name varchar(50) NULL, + ADD COLUMN td_class1_name varchar(50) NULL, + ADD COLUMN td_class2_name varchar(50) NULL, + ADD COLUMN td_class3_name varchar(50) NULL, + ADD COLUMN span_class1_name varchar(50) NULL, + ADD COLUMN span_class2_name varchar(50) NULL, + ADD COLUMN span_class3_name varchar(50) NULL"; + break; + case 'postgresql': + $sql[] = "ALTER TABLE " . USERS_TABLE . " + ADD COLUMN user_session_time int4"; + $sql[] = "ALTER TABLE " . USERS_TABLE . " + ADD COLUMN user_session_page int2"; + $sql[] = "ALTER TABLE " . USERS_TABLE . " + ALTER COLUMN user_session_time SET DEFAULT '0'"; + $sql[] = "ALTER TABLE " . USERS_TABLE . " + ALTER COLUMN user_session_page SET DEFAULT '0'"; + $sql[] = "CREATE INDEX user_session_time_" . $table_prefix . "users_index + ON " . USERS_TABLE . " (user_session_time)"; + + $sql[] = "ALTER TABLE " . TOPICS_TABLE . " + ADD COLUMN topic_first_post_id int4"; + $sql[] = "CREATE INDEX topic_first_post_id_" . $table_prefix . "topics_index + ON " . TOPICS_TABLE . " (topic_first_post_id)"; + + $sql[] = "ALTER TABLE " . THEMES_NAME_TABLE . " + ADD COLUMN tr_class1_name varchar(50) NULL"; + $sql[] = "ALTER TABLE " . THEMES_NAME_TABLE . " + ADD COLUMN tr_class2_name varchar(50) NULL"; + $sql[] = "ALTER TABLE " . THEMES_NAME_TABLE . " + ADD COLUMN tr_class3_name varchar(50) NULL"; + $sql[] = "ALTER TABLE " . THEMES_NAME_TABLE . " + ADD COLUMN th_class1_name varchar(50) NULL"; + $sql[] = "ALTER TABLE " . THEMES_NAME_TABLE . " + ADD COLUMN th_class2_name varchar(50) NULL"; + $sql[] = "ALTER TABLE " . THEMES_NAME_TABLE . " + ADD COLUMN th_class3_name varchar(50) NULL"; + $sql[] = "ALTER TABLE " . THEMES_NAME_TABLE . " + ADD COLUMN td_class1_name varchar(50) NULL"; + $sql[] = "ALTER TABLE " . THEMES_NAME_TABLE . " + ADD COLUMN td_class2_name varchar(50) NULL"; + $sql[] = "ALTER TABLE " . THEMES_NAME_TABLE . " + ADD COLUMN td_class3_name varchar(50) NULL"; + $sql[] = "ALTER TABLE " . THEMES_NAME_TABLE . " + ADD COLUMN span_class1_name varchar(50) NULL"; + $sql[] = "ALTER TABLE " . THEMES_NAME_TABLE . " + ADD COLUMN span_class2_name varchar(50) NULL"; + $sql[] = "ALTER TABLE " . THEMES_NAME_TABLE . " + ADD COLUMN span_class3_name varchar(50) NULL"; + break; + + case 'mssql-odbc': + case 'mssql': + $sql[] = "ALTER TABLE " . USERS_TABLE . " DROP + COLUMN user_autologin_key"; + + $sql[] = "ALTER TABLE " . USERS_TABLE . " ADD + user_session_time int NOT NULL, + user_session_page smallint NOT NULL, + CONSTRAINT [DF_" . $table_prefix . "users_user_session_time] DEFAULT (0) FOR [user_session_time], + CONSTRAINT [DF_" . $table_prefix . "users_user_session_page] DEFAULT (0) FOR [user_session_page]"; + $sql[] = "CREATE INDEX [IX_" . $table_prefix . "users] + ON [" . USERS_TABLE . "]([user_session_time]) ON [PRIMARY]"; + + /* --------------------------------------------------------------------- + DROP FORUM TABLE -- if this may cause you problems you can safely + comment it out, remember to manually remove the IDENTITY setting on + the forum_id column + --------------------------------------------------------------------- */ + $sql [] = "ALTER TABLE " . FORUMS_TABLE . " DROP + CONSTRAINT [DF_" . $table_prefix . "forums_forum_posts], + CONSTRAINT [DF_" . $table_prefix . "forums_forum_topics], + CONSTRAINT [DF_" . $table_prefix . "forums_forum_last_post_id], + CONSTRAINT [DF_" . $table_prefix . "forums_prune_enable], + CONSTRAINT [DF_" . $table_prefix . "forums_auth_view], + CONSTRAINT [DF_" . $table_prefix . "forums_auth_read], + CONSTRAINT [DF_" . $table_prefix . "forums_auth_post], + CONSTRAINT [DF_" . $table_prefix . "forums_auth_reply], + CONSTRAINT [DF_" . $table_prefix . "forums_auth_edit], + CONSTRAINT [DF_" . $table_prefix . "forums_auth_delete], + CONSTRAINT [DF_" . $table_prefix . "forums_auth_sticky], + CONSTRAINT [DF_" . $table_prefix . "forums_auth_announce], + CONSTRAINT [DF_" . $table_prefix . "forums_auth_vote], + CONSTRAINT [DF_" . $table_prefix . "forums_auth_pollcreate], + CONSTRAINT [DF_" . $table_prefix . "forums_auth_attachments]"; + $sql[] = "CREATE TABLE Tmp_" . FORUMS_TABLE . " + (forum_id int NOT NULL, cat_id int NOT NULL, forum_name varchar(100) NOT NULL, forum_desc varchar(255) NULL, forum_status smallint NOT NULL, forum_order int NOT NULL, forum_posts int NOT NULL, forum_topics smallint NOT NULL, forum_last_post_id int NOT NULL, prune_next int NULL, prune_enable smallint NOT NULL, auth_view smallint NOT NULL, auth_read smallint NOT NULL, auth_post smallint NOT NULL, auth_reply smallint NOT NULL, auth_edit smallint NOT NULL, auth_delete smallint NOT NULL, auth_sticky smallint NOT NULL, auth_announce smallint NOT NULL, auth_vote smallint NOT NULL, auth_pollcreate smallint NOT NULL, auth_attachments smallint NOT NULL) ON [PRIMARY]"; + $sql[] = "ALTER TABLE [Tmp_" . FORUMS_TABLE . "] WITH NOCHECK ADD + CONSTRAINT [DF_" . $table_prefix . "forums_forum_posts] DEFAULT (0) FOR [forum_posts], + CONSTRAINT [DF_" . $table_prefix . "forums_forum_topics] DEFAULT (0) FOR [forum_topics], + CONSTRAINT [DF_" . $table_prefix . "forums_forum_last_post_id] DEFAULT (0) FOR [forum_last_post_id], + CONSTRAINT [DF_" . $table_prefix . "forums_prune_enable] DEFAULT (0) FOR [prune_enable], + CONSTRAINT [DF_" . $table_prefix . "forums_auth_view] DEFAULT (0) FOR [auth_view], + CONSTRAINT [DF_" . $table_prefix . "forums_auth_read] DEFAULT (0) FOR [auth_read], + CONSTRAINT [DF_" . $table_prefix . "forums_auth_post] DEFAULT (0) FOR [auth_post], + CONSTRAINT [DF_" . $table_prefix . "forums_auth_reply] DEFAULT (0) FOR [auth_reply], + CONSTRAINT [DF_" . $table_prefix . "forums_auth_edit] DEFAULT (0) FOR [auth_edit], + CONSTRAINT [DF_" . $table_prefix . "forums_auth_delete] DEFAULT (0) FOR [auth_delete], + CONSTRAINT [DF_" . $table_prefix . "forums_auth_sticky] DEFAULT (0) FOR [auth_sticky], + CONSTRAINT [DF_" . $table_prefix . "forums_auth_announce] DEFAULT (0) FOR [auth_announce], + CONSTRAINT [DF_" . $table_prefix . "forums_auth_vote] DEFAULT (0) FOR [auth_vote], + CONSTRAINT [DF_" . $table_prefix . "forums_auth_pollcreate] DEFAULT (0) FOR [auth_pollcreate], + CONSTRAINT [DF_" . $table_prefix . "forums_auth_attachments] DEFAULT (0) FOR [auth_attachments]"; + $sql[] = "INSERT INTO Tmp_" . FORUMS_TABLE . " (forum_id, cat_id, forum_name, forum_desc, forum_status, forum_order, forum_posts, forum_topics, forum_last_post_id, prune_next, prune_enable, auth_view, auth_read, auth_post, auth_reply, auth_edit, auth_delete, auth_sticky, auth_announce, auth_vote, auth_pollcreate, auth_attachments) + SELECT forum_id, cat_id, forum_name, forum_desc, forum_status, forum_order, forum_posts, forum_topics, forum_last_post_id, prune_next, prune_enable, auth_view, auth_read, auth_post, auth_reply, auth_edit, auth_delete, auth_sticky, auth_announce, auth_vote, auth_pollcreate, auth_attachments FROM " . FORUMS_TABLE . " TABLOCKX"; + $sql[] = "DROP TABLE " . FORUMS_TABLE; + $sql[] = "EXECUTE sp_rename N'Tmp_" . FORUMS_TABLE . "', N'" . FORUMS_TABLE . "', 'OBJECT'"; + $sql[] = "ALTER TABLE " . FORUMS_TABLE . " ADD + CONSTRAINT [PK_" . $table_prefix . "forums] PRIMARY KEY CLUSTERED (forum_id) ON [PRIMARY]"; + $sql[] = "CREATE NONCLUSTERED INDEX [IX_" . $table_prefix . "forums] + ON " . FORUMS_TABLE . " (cat_id, forum_order, forum_last_post_id) ON [PRIMARY]"; + /* -------------------------------------------------------------- + END OF DROP FORUM -- don't remove anything after this point! + -------------------------------------------------------------- */ + + $sql[] = "DROP INDEX " . RANKS_TABLE . ".IX_" . $table_prefix . "ranks"; + $sql[] = "ALTER TABLE " . RANKS_TABLE . " DROP + COLUMN rank_max"; + $sql[] = "CREATE INDEX [IX_" . $table_prefix . "ranks] + ON [" . RANKS_TABLE . "]([rank_min], [rank_special]) ON [PRIMARY]"; + + $sql[] = "DROP INDEX " . TOPICS_TABLE . ".IX_" . $table_prefix . "topics"; + $sql[] = "ALTER TABLE " . TOPICS_TABLE . " ADD + topic_first_post_id int NULL, + CONSTRAINT [DF_" . $table_prefix . "topics_topic_first_post_id] FOR [topic_first_post_id]"; + $sql[] = "CREATE INDEX [IX_" . $table_prefix . "topics] + ON [" . TOPICS_TABLE . "]([forum_id], [topic_type], [topic_first_post_id], [topic_last_post_id]) ON [PRIMARY]"; + + $sql[] = "ALTER TABLE " . SEARCH_WORD_TABLE . " DROP + CONSTRAINT [PK_" . $table_prefix . "search_wordlist]"; + $sql[] = "CREATE UNIQUE INDEX [IX_" . $table_prefix . "search_wordlist] + ON [" . SEARCH_WORD_TABLE . "]([word_text]) WITH IGNORE_DUP_KEY ON [PRIMARY]"; + $sql[] = "CREATE INDEX [IX_" . $table_prefix . "search_wordlist_1] + ON [" . SEARCH_WORD_TABLE . "]([word_common]) ON [PRIMARY]"; + + $sql[] = "CREATE INDEX [IX_" . $table_prefix . "search_wordmatch_1] + ON [" . SEARCH_MATCH_TABLE . "]([word_id]) ON [PRIMARY]"; + + $sql[] = "ALTER TABLE " . THEMES_NAME_TABLE . " ADD + tr_class1_name varchar(50) NULL, + tr_class2_name varchar(50) NULL, + tr_class3_name varchar(50) NULL, + th_class1_name varchar(50) NULL, + th_class2_name varchar(50) NULL, + th_class3_name varchar(50) NULL, + td_class1_name varchar(50) NULL, + td_class2_name varchar(50) NULL, + td_class3_name varchar(50) NULL, + span_class1_name varchar(50) NULL, + span_class2_name varchar(50) NULL, + span_class3_name varchar(50) NULL"; + break; + + case 'msaccess': + $sql[] = "ALTER TABLE " . USERS_TABLE . " DROP + COLUMN user_autologin_key"; + + $sql[] = "ALTER TABLE " . USERS_TABLE . " ADD + user_session_time int NOT NULL, + user_session_page smallint NOT NULL"; + $sql[] = "CREATE INDEX user_session_time + ON " . USERS_TABLE . " (user_session_time)"; + + $sql[] = "ALTER TABLE " . TOPICS_TABLE . " ADD + topic_first_post_id int NULL"; + $sql[] = "CREATE INDEX topic_first_post_id + ON " . TOPICS_TABLE . " (topic_first_post_id)"; + + $sql[] = "ALTER TABLE " . THEMES_NAME_TABLE . " ADD + tr_class1_name varchar(50) NULL, + tr_class2_name varchar(50) NULL, + tr_class3_name varchar(50) NULL, + th_class1_name varchar(50) NULL, + th_class2_name varchar(50) NULL, + th_class3_name varchar(50) NULL, + td_class1_name varchar(50) NULL, + td_class2_name varchar(50) NULL, + td_class3_name varchar(50) NULL, + span_class1_name varchar(50) NULL, + span_class2_name varchar(50) NULL, + span_class3_name varchar(50) NULL"; + break; + + default: + die("No DB LAYER found!"); + break; + } + + case 'RC-3': + case 'RC-4': + case '.0.0': + switch (SQL_LAYER) + { + case 'mysql': + case 'mysql4': + $sql[] = "ALTER TABLE " . USERS_TABLE . " + MODIFY COLUMN user_id mediumint(8) NOT NULL, + MODIFY COLUMN user_timezone decimal(5,2) DEFAULT '0' NOT NULL"; + break; + case 'postgresql': + $sql[] = "ALTER TABLE " . USERS_TABLE . " + RENAME COLUMN user_timezone TO user_timezone_old"; + $sql[] = "ALTER TABLE " . USERS_TABLE . " + ADD COLUMN user_timezone decimal(5)"; + break; + case 'mssql': + case 'mssql-odbc': + $sql[] = "ALTER TABLE " . USERS_TABLE . " + ALTER COLUMN [user_timezone] [decimal] (5,2) NOT NULL"; + break; + } + + case '.0.1': + switch (SQL_LAYER) + { + case 'mysql': + case 'mysql4': + $sql[] = "ALTER TABLE " . GROUPS_TABLE . " + MODIFY COLUMN group_id mediumint(8) NOT NULL auto_increment"; + break; + case 'mssql': + case 'mssql-odbc': + /* --------------------------------------------------------------------- + DROP GROUP TABLE -- if this may cause you problems you can safely + comment it out, remember to manually add the IDENTITY setting on + the group_id column + --------------------------------------------------------------------- */ + $sql[] = "CREATE TABLE Tmp_" . GROUPS_TABLE . " + (group_id int IDENTITY (1, 1) NOT NULL, group_type smallint NULL, group_name varchar(50) NOT NULL, group_description varchar(255) NOT NULL, group_moderator int NULL, group_single_user smallint NOT NULL) ON [PRIMARY]"; + $sql[] = "SET IDENTITY_INSERT " . GROUPS_TABLE . " ON"; + $sql[] = "INSERT INTO Tmp_" . GROUPS_TABLE . " (group_id, group_type, group_name, group_description, group_moderator, group_single_user) + SELECT group_id, group_type, group_name, group_description, group_moderator, group_single_user FROM " . GROUPS_TABLE . " TABLOCKX"; + $sql[] = "SET IDENTITY_INSERT " . GROUPS_TABLE . " OFF"; + $sql[] = "DROP TABLE " . GROUPS_TABLE; + $sql[] = "EXECUTE sp_rename N'Tmp_" . GROUPS_TABLE . "', N'" . GROUPS_TABLE . "', 'OBJECT'"; + $sql[] = "ALTER TABLE " . GROUPS_TABLE . " ADD + CONSTRAINT [PK_" . $table_prefix . "groups] PRIMARY KEY CLUSTERED (group_id) ON [PRIMARY]"; + $sql[] = "CREATE INDEX [IX_" . $table_prefix . "groups] + ON " . GROUPS_TABLE . " (group_single_user) ON [PRIMARY]"; + /* -------------------------------------------------------------- + END OF DROP GROUP -- don't remove anything after this point! + -------------------------------------------------------------- */ + break; + + } + + case '.0.3': + + switch (SQL_LAYER) + { + case 'mysql': + case 'mysql4': + // Add indexes to post_id in search match table (+ word_id for MS Access) + $sql[] = "ALTER TABLE " . SEARCH_MATCH_TABLE . " + ADD INDEX post_id (post_id)"; + + // Modify user_timezone to decimal(5,2) for mysql ... mysql4/mssql/pgsql/msaccess + // should be completely unaffected + // Change default user_notify to 0 + $sql[] = "ALTER TABLE " . USERS_TABLE . " + MODIFY COLUMN user_timezone decimal(5,2) DEFAULT '0' NOT NULL, + MODIFY COLUMN user_notify tinyint(1) DEFAULT '0' NOT NULL"; + + // Adjust field type for prune_days, prune_freq ... was too small + $sql[] = "ALTER TABLE " . PRUNE_TABLE . " + MODIFY COLUMN prune_days smallint(5) UNSIGNED NOT NULL, + MODIFY COLUMN prune_freq smallint(5) UNSIGNED NOT NULL"; + break; + + case 'msaccess': + // Add indexes to post_id in search match table (+ word_id for MS Access) + $sql[] = "CREATE INDEX " . SEARCH_MATCH_TABLE . " + ON " . SEARCH_MATCH_TABLE . " ([post_id])"; + $sql[] = "CREATE INDEX " . SEARCH_MATCH_TABLE . "_1 + ON " . SEARCH_MATCH_TABLE . " ([word_id])"; + break; + + case 'postgresql': + // Add indexes to post_id in search match table (+ word_id for MS Access) + $sql[] = "CREATE INDEX post_id_" . SEARCH_MATCH_TABLE . " + ON " . SEARCH_MATCH_TABLE . " (post_id)"; + + // Regenerate groups table with incremented group_id for pgsql + // ... missing in 2.0.3 ... + $sql[] = "CREATE SEQUENCE " . GROUPS_TABLE . "_id_seq start 3 increment 1 maxvalue 2147483647 minvalue 1 cache 1"; + $sql[] = "CREATE TABLE tmp_" . GROUPS_TABLE . " + AS SELECT group_id, group_name, group_type, group_description, group_moderator, group_single_user + FROM " . GROUPS_TABLE; + $sql[] = "DROP TABLE " . GROUPS_TABLE; + $sql[] = "CREATE TABLE phpbb_groups (group_id int DEFAULT nextval('" . GROUPS_TABLE . "_id_seq'::text) NOT NULL, group_name varchar(40) NOT NULL, group_type int2 DEFAULT '1' NOT NULL, group_description varchar(255) NOT NULL, group_moderator int4 DEFAULT '0' NOT NULL, group_single_user int2 DEFAULT '0' NOT NULL, CONSTRAINT phpbb_groups_pkey PRIMARY KEY (group_id))"; + $sql[] = "INSERT INTO " . GROUPS_TABLE . " (group_id, group_name, group_type, group_description, group_moderator, group_single_user) + SELECT group_id, group_name, group_type, group_description, group_moderator, group_single_user + FROM tmp_" . GROUPS_TABLE; + $sql[] = "DROP TABLE tmp_" . GROUPS_TABLE; + break; + } + + case '.0.4': + + switch (SQL_LAYER) + { + case 'mssql': + case 'mssql-odbc': + // Add missing defaults to MSSQL post table schema, failed in previous updates + $sql[] = "ALTER TABLE [" . POSTS_TABLE . "] WITH NOCHECK ADD + CONSTRAINT [DF_" . POSTS_TABLE . "_enable_bbcode] DEFAULT (1) FOR [enable_bbcode], + CONSTRAINT [DF_" . POSTS_TABLE . "_enable_html] DEFAULT (0) FOR [enable_html], + CONSTRAINT [DF_" . POSTS_TABLE . "_enable_smilies] DEFAULT (1) FOR [enable_smilies], + CONSTRAINT [DF_" . POSTS_TABLE . "_enable_sig] DEFAULT (1) FOR [enable_sig], + CONSTRAINT [DF_" . POSTS_TABLE . "_post_edit_count] DEFAULT (0) FOR [post_edit_count]"; + break; + } + + // Add tables for visual confirmation ... saves me the trouble of writing a seperate + // script :D + switch (SQL_LAYER) + { + case 'mysql': + case 'mysql4': + $sql[] = 'CREATE TABLE ' . $table_prefix . 'confirm (confirm_id char(32) DEFAULT \'\' NOT NULL, session_id char(32) DEFAULT \'\' NOT NULL, code char(6) DEFAULT \'\' NOT NULL, PRIMARY KEY (session_id, confirm_id))'; + break; + + case 'mssql': + case 'mssql-odbc': + $sql[] = 'CREATE TABLE [' . $table_prefix . 'confirm] ([confirm_id] [char] (32) NOT NULL , [session_id] [char] (32) NOT NULL , [code] [char] (6) NOT NULL ) ON [PRIMARY]'; + $sql[] = 'ALTER TABLE [' . $table_prefix . 'confirm] WITH NOCHECK ADD CONSTRAINT [PK_' . $table_prefix . 'confirm] PRIMARY KEY CLUSTERED ( [session_id],[confirm_id]) ON [PRIMARY]'; + $sql[] = 'ALTER TABLE [' . $table_prefix . 'confirm] WITH NOCHECK ADD CONSTRAINT [DF_' . $table_prefix . 'confirm_confirm_id] DEFAULT (\'\') FOR [confirm_id], CONSTRAINT [DF_' . $table_prefix . 'confirm_session_id] DEFAULT (\'\') FOR [session_id], CONSTRAINT [DF_' . $table_prefix . 'confirm_code] DEFAULT (\'\') FOR [code]'; + break; + + case 'msaccess': + $sql[] = 'CREATE TABLE ' . $table_prefix . 'confirm (confirm_id char(32) NOT NULL, session_id char(32) NOT NULL, code char(6) NOT NULL)'; + $sql[] = 'ALTER TABLE ' . $table_prefix . 'confirm ADD (PRIMARY KEY (session_id, confirm_id))'; + break; + + case 'postgresql': + $sql[] = 'CREATE TABLE ' . $table_prefix . 'confirm (confirm_id char(32) DEFAULT \'\' NOT NULL, session_id char(32) DEFAULT \'\' NOT NULL, code char(6) DEFAULT \'\' NOT NULL, CONSTRAINT phpbb_confirm_pkey PRIMARY KEY (session_id, confirm_id))'; + break; + } + + break; +} + +echo "

Updating database schema

\n"; +echo "

Progress :: "; +flush(); + +$error_ary = array(); +$errored = false; +if (count($sql)) +{ + for ($i = 0; $i < count($sql); $i++) + { + _sql($sql[$i], $errored, $error_ary); + } + + echo " Done
Result   :: \n"; + + if ($errored) + { + echo " Some queries failed, the statements and errors are listing below\n

\n

This is probably nothing to worry about, update will continue. Should this fail to complete you may need to seek help at our development board. See README for details on how to obtain advice.

\n"; + } + else + { + echo "No errors\n"; + } +} +else +{ + echo " No updates required

\n"; +} + +// +// Data updates +// +unset($sql); +$error_ary = array(); +$errored = false; + +echo "

Updating data

\n"; +echo "

Progress :: "; +flush(); + +switch ($row['config_value']) +{ + case '': + $sql = "SELECT themes_id + FROM " . THEMES_TABLE . " + WHERE template_name = 'subSilver'"; + $result = _sql($sql, $errored, $error_ary); + + if ($row = $db->sql_fetchrow($result)) + { + $theme_id = $row['themes_id']; + + $sql = "UPDATE " . THEMES_TABLE . " + SET head_stylesheet = 'subSilver.css', body_background = '', body_bgcolor = 'E5E5E5', body_text = '000000', body_link = '006699', body_vlink = '5493B4', body_alink = '', body_hlink = 'DD6900', tr_color1 = 'EFEFEF', tr_color2 = 'DEE3E7', tr_color3 = 'D1D7DC', tr_class1 = '', tr_class2 = '', tr_class3 = '', th_color1 = '98AAB1', th_color2 = '006699', th_color3 = 'FFFFFF', th_class1 = 'cellpic1.gif', th_class2 = 'cellpic3.gif', th_class3 = 'cellpic2.jpg', td_color1 = 'FAFAFA', td_color2 = 'FFFFFF', td_color3 = '', td_class1 = 'row1', td_class2 = 'row2', td_class3 = '', fontface1 = 'Verdana, Arial, Helvetica, sans-serif', fontface2 = 'Trebuchet MS', fontface3 = 'Courier, ''Courier New'', sans-serif', fontsize1 = 10, fontsize2 = 11, fontsize3 = 12, fontcolor1 = '444444', fontcolor2 = '006600', fontcolor3 = 'FFA34F', span_class1 = '', span_class2 = '', span_class3 = '' + WHERE themes_id = $theme_id"; + _sql($sql, $errored, $error_ary); + + $sql = "DELETE FROM " . THEMES_NAME_TABLE . " + WHERE themes_id = $theme_id"; + _sql($sql, $errored, $error_ary); + + $sql = "INSERT INTO " . THEMES_NAME_TABLE . " (themes_id, tr_color1_name, tr_color2_name, tr_color3_name, tr_class1_name, tr_class2_name, tr_class3_name, th_color1_name, th_color2_name, th_color3_name, th_class1_name, th_class2_name, th_class3_name, td_color1_name, td_color2_name, td_color3_name, td_class1_name, td_class2_name, td_class3_name, fontface1_name, fontface2_name, fontface3_name, fontsize1_name, fontsize2_name, fontsize3_name, fontcolor1_name, fontcolor2_name, fontcolor3_name, span_class1_name, span_class2_name, span_class3_name) + VALUES ($theme_id, 'The lightest row colour', 'The medium row color', 'The darkest row colour', '', '', '', 'Border round the whole page', 'Outer table border', 'Inner table border', 'Silver gradient picture', 'Blue gradient picture', 'Fade-out gradient on index', 'Background for quote boxes', 'All white areas', '', 'Background for topic posts', '2nd background for topic posts', '', 'Main fonts', 'Additional topic title font', 'Form fonts', 'Smallest font size', 'Medium font size', 'Normal font size (post body etc)', 'Quote & copyright text', 'Code text colour', 'Main table header text colour', '', '', '')"; + _sql($sql, $errored, $error_ary); + } + $db->sql_freeresult($result); + + $sql = "SELECT MIN(post_id) AS first_post_id, topic_id + FROM " . POSTS_TABLE . " + GROUP BY topic_id + ORDER BY topic_id ASC"; + $result = _sql($sql, $errored, $error_ary); + + if ($row = $db->sql_fetchrow($result)) + { + do + { + $sql = "UPDATE " . TOPICS_TABLE . " + SET topic_first_post_id = " . $row['first_post_id'] . " + WHERE topic_id = " . $row['topic_id']; + _sql($sql, $errored, $error_ary); + } + while ($row = $db->sql_fetchrow($result)); + } + $db->sql_freeresult($result); + + $sql = "SELECT DISTINCT u.user_id + FROM " . USERS_TABLE . " u, " . USER_GROUP_TABLE . " ug, " . AUTH_ACCESS_TABLE . " aa + WHERE aa.auth_mod = 1 + AND ug.group_id = aa.group_id + AND u.user_id = ug.user_id + AND u.user_level <> " . ADMIN; + $result = _sql($sql, $errored, $error_ary); + + $mod_user = array(); + while ($row = $db->sql_fetchrow($result)) + { + $mod_user[] = $row['user_id']; + } + $db->sql_freeresult($result); + + if (count($mod_user)) + { + $sql = "UPDATE " . USERS_TABLE . " + SET user_level = " . MOD . " + WHERE user_id IN (" . implode(', ', $mod_user) . ")"; + _sql($sql, $errored, $error_ary); + } + + $sql = "INSERT INTO " . CONFIG_TABLE . " (config_name, config_value) + VALUES ('server_name', 'www.myserver.tld')"; + _sql($sql, $errored, $error_ary); + + $sql = "INSERT INTO " . CONFIG_TABLE . " (config_name, config_value) + VALUES ('script_path', '/phpBB2/')"; + _sql($sql, $errored, $error_ary); + + $sql = "INSERT INTO " . CONFIG_TABLE . " (config_name, config_value) + VALUES ('server_port', '80')"; + _sql($sql, $errored, $error_ary); + + $sql = "INSERT INTO " . CONFIG_TABLE . " (config_name, config_value) + VALUES ('record_online_users', '1')"; + _sql($sql, $errored, $error_ary); + + $sql = "INSERT INTO " . CONFIG_TABLE . " (config_name, config_value) + VALUES ('record_online_date', '" . time() . "')"; + _sql($sql, $errored, $error_ary); + + case 'RC-3': + case 'RC-4': + case '.0.0': + case '.0.1': + if (SQL_LAYER == 'postgresql') + { + $sql = "SELECT user_id, user_timezone_old + FROM " . USERS_TABLE; + $result = _sql($sql, $errored, $error_ary); + + while ($row = $db->sql_fetchrow($result)) + { + $sql = "UPDATE " . USERS_TABLE . " + SET user_timezone = " . $row['user_timezone_old'] . " + WHERE user_id = " . $row['user_id']; + _sql($sql, $errored, $error_ary); + } + $db->sql_freeresult($result); + } + + $sql = "SELECT topic_id, topic_moved_id + FROM " . TOPICS_TABLE . " + WHERE topic_moved_id <> 0 + AND topic_status = " . TOPIC_MOVED; + $result = _sql($sql, $errored, $error_ary); + + $topic_ary = array(); + while ($row = $db->sql_fetchrow($result)) + { + $topic_ary[$row['topic_id']] = $row['topic_moved_id']; + } + $db->sql_freeresult($result); + + while (list($topic_id, $topic_moved_id) = each($topic_ary)) + { + $sql = "SELECT MAX(post_id) AS last_post, MIN(post_id) AS first_post, COUNT(post_id) AS total_posts + FROM " . POSTS_TABLE . " + WHERE topic_id = $topic_moved_id"; + $result = _sql($sql, $errored, $error_ary); + + $sql = ($row = $db->sql_fetchrow($result)) ? "UPDATE " . TOPICS_TABLE . " SET topic_replies = " . ($row['total_posts'] - 1) . ", topic_first_post_id = " . $row['first_post'] . ", topic_last_post_id = " . $row['last_post'] . " WHERE topic_id = $topic_id" : "DELETE FROM " . TOPICS_TABLE . " WHERE topic_id = " . $row['topic_id']; + _sql($sql, $errored, $error_ary); + } + + unset($sql); + + sync('all forums'); + + case '.0.2': + + case '.0.3': + + // Topics will resync automatically + + // Remove stop words from search match and search words + $dirname = 'language'; + $dir = opendir($phpbb_root_path . $dirname); + + while ($file = readdir($dir)) + { + if (preg_match("#^lang_#i", $file) && !is_file($phpbb_root_path . $dirname . "/" . $file) && !is_link($phpbb_root_path . $dirname . "/" . $file) && file_exists($phpbb_root_path . $dirname . "/" . $file . '/search_stopwords.txt')) + { + + $stopword_list = trim(preg_replace('#([\w\.\-_\+\'±µ-ÿ\\\]+?)[ \n\r]*?(,|$)#', '\'\1\'\2', str_replace("'", "\'", implode(', ', file($phpbb_root_path . $dirname . "/" . $file . '/search_stopwords.txt'))))); + + $sql = "SELECT word_id + FROM " . SEARCH_WORD_TABLE . " + WHERE word_text IN ($stopword_list)"; + $result = _sql($sql, $errored, $error_ary); + + $word_id_sql = ''; + if ($row = $db->sql_fetchrow($result)) + { + do + { + $word_id_sql .= (($word_id_sql != '') ? ', ' : '') . $row['word_id']; + } + while ($row = $db->sql_fetchrow($result)); + + $sql = "DELETE FROM " . SEARCH_WORD_TABLE . " + WHERE word_id IN ($word_id_sql)"; + _sql($sql, $errored, $error_ary); + + $sql = "DELETE FROM " . SEARCH_MATCH_TABLE . " + WHERE word_id IN ($word_id_sql)"; + _sql($sql, $errored, $error_ary); + } + $db->sql_freeresult($result); + } + } + closedir($dir); + + // Mark common words ... + remove_common('global', 4/10); + + // remove superfluous polls ... grab polls with topics then delete polls + // not in that list + $sql = "SELECT v.vote_id + FROM " . TOPICS_TABLE . " t, " . VOTE_DESC_TABLE . " v + WHERE v.topic_id = t.topic_id"; + $result = _sql($sql, $errored, $error_ary); + + $vote_id_sql = ''; + if ($row = $db->sql_fetchrow($result)) + { + do + { + $vote_id_sql .= (($vote_id_sql != '') ? ', ' : '') . $row['vote_id']; + } + while ($row = $db->sql_fetchrow($result)); + + $sql = "DELETE FROM " . VOTE_DESC_TABLE . " + WHERE vote_id NOT IN ($vote_id_sql)"; + _sql($sql, $errored, $error_ary); + + $sql = "DELETE FROM " . VOTE_RESULTS_TABLE . " + WHERE vote_id NOT IN ($vote_id_sql)"; + _sql($sql, $errored, $error_ary); + + $sql = "DELETE FROM " . VOTE_USERS_TABLE . " + WHERE vote_id NOT IN ($vote_id_sql)"; + _sql($sql, $errored, $error_ary); + } + $db->sql_freeresult($result); + + // update pm counters + $sql = "SELECT privmsgs_to_userid, COUNT(privmsgs_id) AS unread_count + FROM " . PRIVMSGS_TABLE . " + WHERE privmsgs_type = " . PRIVMSGS_UNREAD_MAIL . " + GROUP BY privmsgs_to_userid"; + $result = _sql($sql, $errored, $error_ary); + + if ($row = $db->sql_fetchrow($result)) + { + $update_users = array(); + do + { + $update_users[$row['unread_count']][] = $row['privmsgs_to_userid']; + } + while ($row = $db->sql_fetchrow($result)); + + while (list($num, $user_ary) = each($update_users)) + { + $user_ids = implode(', ', $user_ary); + + $sql = "UPDATE " . USERS_TABLE . " + SET user_unread_privmsg = $num + WHERE user_id IN ($user_ids)"; + _sql($sql, $errored, $error_ary); + } + unset($update_list); + } + $db->sql_freeresult($result); + + $sql = "SELECT privmsgs_to_userid, COUNT(privmsgs_id) AS new_count + FROM " . PRIVMSGS_TABLE . " + WHERE privmsgs_type = " . PRIVMSGS_NEW_MAIL . " + GROUP BY privmsgs_to_userid"; + $result = _sql($sql, $errored, $error_ary); + + if ($row = $db->sql_fetchrow($result)) + { + $update_users = array(); + do + { + $update_users[$row['new_count']][] = $row['privmsgs_to_userid']; + } + while ($row = $db->sql_fetchrow($result)); + + while (list($num, $user_ary) = each($update_users)) + { + $user_ids = implode(', ', $user_ary); + + $sql = "UPDATE " . USERS_TABLE . " + SET user_new_privmsg = $num + WHERE user_id IN ($user_ids)"; + _sql($sql, $errored, $error_ary); + } + unset($update_list); + } + $db->sql_freeresult($result); + + // Remove superfluous watched topics + $sql = "SELECT t.topic_id + FROM " . TOPICS_TABLE . " t, " . TOPICS_WATCH_TABLE . " w + WHERE w.topic_id = t.topic_id"; + $result = _sql($sql, $errored, $error_ary); + + $topic_id_sql = ''; + if ($row = $db->sql_fetchrow($result)) + { + do + { + $topic_id_sql .= (($topic_id_sql != '') ? ', ' : '') . $row['topic_id']; + } + while ($row = $db->sql_fetchrow($result)); + + $sql = "DELETE FROM " . TOPICS_WATCH_TABLE . " + WHERE topic_id NOT IN ($topic_id_sql)"; + _sql($sql, $errored, $error_ary); + } + $db->sql_freeresult($result); + + // Reset any email addresses which are non-compliant ... something + // not done in the upgrade script and thus which may affect some + // mysql users + switch (SQL_LAYER) + { + case 'mysql': + $sql = "UPDATE " . USERS_TABLE . " + SET user_email = '' + WHERE user_email NOT REGEXP '^[a-zA-Z0-9_\+\.\-]+@.*[a-zA-Z0-9_\-]+\.[a-zA-Z]{2,}$'"; + _sql($sql, $errored, $error_ary); + } + + case '.0.4': + + // Add the confirmation code switch ... save time and trouble elsewhere + $sql = 'INSERT INTO ' . CONFIG_TABLE . " (config_name, config_value) + VALUES ('enable_confirm', '0')"; + _sql($sql, $errored, $error_ary); + + $sql = "INSERT INTO " . CONFIG_TABLE . " (config_name, config_value) + VALUES ('sendmail_fix', '0')"; + _sql($sql, $errored, $error_ary); + + case '.0.5': + + $sql = "SELECT user_id, username + FROM " . USERS_TABLE; + $result = _sql($sql, $errored, $error_ary); + + while ($row = $db->sql_fetchrow($result)) + { + if (!preg_match('#(>)|(<)|(")|(&)#', $row['username'])) + { + if ($row['username'] != htmlspecialchars($row['username'])) + { + $sql = "UPDATE " . USERS_TABLE . " + SET username = '" . str_replace("'", "''", htmlspecialchars($row['username'])) . "' + WHERE user_id = " . $row['user_id']; + _sql($sql, $errored, $error_ary); + } + } + } + $db->sql_freeresult($result); + + break; + + default: + echo " No updates where required

\n"; + break; +} + +echo "

Updating version and optimizing tables

\n"; +echo "

Progress :: "; +flush(); + +// update the version +$sql = "UPDATE " . CONFIG_TABLE . " + SET config_value = '$updates_to_version' + WHERE config_name = 'version'"; +_sql($sql, $errored, $error_ary); + +// Optimize/vacuum analyze the tables where appropriate +// this should be done for each version in future along with +// the version number update +switch (SQL_LAYER) +{ + case 'mysql': + case 'mysql4': + $sql = 'OPTIMIZE TABLE ' . $table_prefix . 'auth_access, ' . $table_prefix . 'banlist, ' . $table_prefix . 'categories, ' . $table_prefix . 'config, ' . $table_prefix . 'disallow, ' . $table_prefix . 'forum_prune, ' . $table_prefix . 'forums, ' . $table_prefix . 'groups, ' . $table_prefix . 'posts, ' . $table_prefix . 'posts_text, ' . $table_prefix . 'privmsgs, ' . $table_prefix . 'privmsgs_text, ' . $table_prefix . 'ranks, ' . $table_prefix . 'search_results, ' . $table_prefix . 'search_wordlist, ' . $table_prefix . 'search_wordmatch, ' . $table_prefix . 'smilies, ' . $table_prefix . 'themes, ' . $table_prefix . 'themes_name, ' . $table_prefix . 'topics, ' . $table_prefix . 'topics_watch, ' . $table_prefix . 'user_group, ' . $table_prefix . 'users, ' . $table_prefix . 'vote_desc, ' . $table_prefix . 'vote_results, ' . $table_prefix . 'vote_voters, ' . $table_prefix . 'words'; + _sql($sql, $errored, $error_ary); + break; + + case 'postgresql': + _sql("VACUUM ANALYZE", $errored, $error_ary); + break; +} + +echo " Done
Result   :: \n"; + +if ($errored) +{ + echo " Some queries failed, the statements and errors are listing below\n

\n

This is probably nothing to worry about, update will continue. Should this fail to complete you may need to seek help at our development board. See README for details on how to obtain advice.

\n"; +} +else +{ + echo "No errors\n"; +} + +echo "

Update completed

\n"; +echo "\n" . '

Please make sure you have updated your board files too, this file is only updating your database.

'; +echo "\n

You should now visit the General Configuration settings page in the Administration Panel and check the General Configuration of the board. If you updated from versions prior to RC-3 you must update some entries. If you do not do this emails sent from the board will contain incorrect information. Don't forget to delete this file!

\n"; + +?> + +
+ + + diff --git a/phpBB/language/lang_english/lang_admin.php b/phpBB/language/lang_english/lang_admin.php index 6a06f56229..4e479d6330 100644 --- a/phpBB/language/lang_english/lang_admin.php +++ b/phpBB/language/lang_english/lang_admin.php @@ -724,6 +724,18 @@ $lang['Install_No_Ext'] = 'The PHP configuration on your server doesn\'t support $lang['Install_No_PCRE'] = 'phpBB2 Requires the Perl-Compatible Regular Expressions Module for PHP which your PHP configuration doesn\'t appear to support!'; +// +// Version Check +// +$lang['Version_up_to_date'] = 'Your installation is up to date, no updates are available for your version of phpBB.'; +$lang['Version_not_up_to_date'] = 'Your installation does not seem to be up to date. Updates are available for your version of phpBB, please visit http://www.phpbb.com/downloads.php to obtain the latest version.'; +$lang['Latest_version_info'] = 'The latest available version is phpBB %s.'; +$lang['Current_version_info'] = 'You are running phpBB %s.'; +$lang['Connect_socket_error'] = 'Unable to open connection to phpBB Server, reported error is:
%s'; +$lang['Socket_functions_disabled'] = 'Unable to use socket functions.'; +$lang['Mailing_list_subscribe_reminder'] = 'For the latest information on updates to phpBB, why not subscribe to our mailing list.'; +$lang['Version_information'] = 'Version Information'; + // // That's all Folks! // ------------------------------------------------- diff --git a/phpBB/templates/subSilver/admin/index_body.tpl b/phpBB/templates/subSilver/admin/index_body.tpl index ec1eab7ce0..f8fe7c3c88 100644 --- a/phpBB/templates/subSilver/admin/index_body.tpl +++ b/phpBB/templates/subSilver/admin/index_body.tpl @@ -77,3 +77,9 @@
+ +

{L_VERSION_INFORMATION}

+ +{VERSION_INFO} + +
diff --git a/phpBB/templates/subSilver/overall_footer.tpl b/phpBB/templates/subSilver/overall_footer.tpl index 8852e6b0b9..0e2a66bbf5 100644 --- a/phpBB/templates/subSilver/overall_footer.tpl +++ b/phpBB/templates/subSilver/overall_footer.tpl @@ -10,7 +10,7 @@ The phpBB Group : 2002 // --> -Powered by phpBB © 2001, 2004 phpBB Group
{TRANSLATION_INFO} +Powered by phpBB © 2001, 2005 phpBB Group
{TRANSLATION_INFO} diff --git a/phpBB/templates/subSilver/simple_footer.tpl b/phpBB/templates/subSilver/simple_footer.tpl index 68c2b00413..92d54d45bf 100644 --- a/phpBB/templates/subSilver/simple_footer.tpl +++ b/phpBB/templates/subSilver/simple_footer.tpl @@ -5,12 +5,12 @@ This not only gives respect to the large amount of time given freely by the developers but also helps build interest, traffic and use of phpBB 2.0. If you cannot (for good reason) retain the full copyright we request you at least leave in place the - Powered by phpBB {PHPBB_VERSION} line, with phpBB linked to www.phpbb.com. If you refuse + Powered by phpBB line, with phpBB linked to www.phpbb.com. If you refuse to include even this then support on our forums may be affected. The phpBB Group : 2002 // --> -Powered by phpBB {PHPBB_VERSION} © 2001,2002 phpBB Group +Powered by phpBB © 2001, 2005 phpBB Group diff --git a/phpBB/viewtopic.php b/phpBB/viewtopic.php index ab00df9476..29a09c1d96 100644 --- a/phpBB/viewtopic.php +++ b/phpBB/viewtopic.php @@ -495,6 +495,7 @@ if (isset($HTTP_GET_VARS['highlight'])) unset($words); $highlight = urlencode($HTTP_GET_VARS['highlight']); + $highlight_match = phpbb_rtrim($highlight_match, "\\"); } //