From 60a18eb9d6bb99366e7d55fbf40deeaf9160428c Mon Sep 17 00:00:00 2001 From: "Paul S. Owen" Date: Fri, 21 Feb 2003 19:32:46 +0000 Subject: [PATCH] New images ... drop your old table and re-create it, dumping the imageset data from the basic file into the resulting tables git-svn-id: file:///svn/phpbb/trunk@3501 89ea8834-ac86-4346-8a33-228a782c2dd0 --- phpBB/install/schemas/mysql_basic.sql | 2 +- phpBB/install/schemas/mysql_schema.sql | 119 ++++++++++++++----------- 2 files changed, 66 insertions(+), 55 deletions(-) diff --git a/phpBB/install/schemas/mysql_basic.sql b/phpBB/install/schemas/mysql_basic.sql index 85ab5e11c1..7e3f2050d7 100644 --- a/phpBB/install/schemas/mysql_basic.sql +++ b/phpBB/install/schemas/mysql_basic.sql @@ -180,7 +180,7 @@ INSERT INTO phpbb_auth_options (auth_value, is_global) VALUES ('u_grpcolor', 1); INSERT INTO phpbb_styles (style_id, template_id, theme_id, imageset_id, style_name) VALUES (1, 1, 1, 1, 'subSilver'); # -- phpbb_styles_imageset -INSERT INTO phpbb_styles_imageset (imageset_id, imageset_name, imageset_path, post_new, post_locked, post_pm, reply_new, reply_pm, reply_locked, icon_quote, icon_edit, icon_search, icon_profile, icon_pm, icon_email, icon_www, icon_icq, icon_aim, icon_yim, icon_msnm, icon_no_email, icon_no_www, icon_no_icq, icon_no_aim, icon_no_yim, icon_no_msnm, icon_delete, icon_ip, goto_post, goto_post_new, goto_post_latest, goto_post_newest, forum, forum_new, forum_locked, sub_forum, sub_forum_new, folder, folder_new, folder_hot, folder_hot_new, folder_locked, folder_locked_new, folder_sticky, folder_sticky_new, folder_announce, folder_announce_new, topic_watch, topic_unwatch, poll_left, poll_center, poll_right, rating) VALUES (1, 'subSilver © phpBB Group', 'subSilver', '"imagesets/subSilver/{LANG}/post.gif" width="82" height="25" border="0"', '"imagesets/subSilver/{LANG}/reply-locked.gif" width="82" height="25" border="0"', '"imagesets/subSilver/{LANG}/post.gif" width="82" height="25" border="0"', '"imagesets/subSilver/{LANG}/reply.gif" width="88" height="25" border="0"', '"imagesets/subSilver/{LANG}/reply.gif" width="88" height="25" border="0"', '"imagesets/subSilver/{LANG}/reply-locked.gif" width="82" height="25" border="0"', '"imagesets/subSilver/{LANG}/icon_quote.gif" width="59" height="18" border="0"', '"imagesets/subSilver/{LANG}/icon_edit.gif" width="59" height="18" border="0"', '"imagesets/subSilver/{LANG}/icon_search.gif" width="59" height="18" border="0"', '"imagesets/subSilver/{LANG}/icon_profile.gif" width="59" height="18" border="0"', '"imagesets/subSilver/{LANG}/icon_pm.gif" width="59" height="18" border="0"', '"imagesets/subSilver/{LANG}/icon_email.gif" width="59" height="18" border="0"', '"imagesets/subSilver/{LANG}/icon_www.gif" width="59" height="18" border="0"', '"imagesets/subSilver/{LANG}/icon_icq_add.gif" width="59" height="18" border="0"', '"imagesets/subSilver/{LANG}/icon_aim.gif" width="59" height="18" border="0"', '"imagesets/subSilver/{LANG}/icon_yim.gif" width="59" height="18" border="0"', '"imagesets/subSilver/{LANG}/icon_msnm.gif" width="59" height="18" border="0"', '', '', '', '', '', '', '"imagesets/subSilver/icon_delete.gif" width="16" height="18" border="0"', '"imagesets/subSilver/{LANG}/icon_ip.gif" width="16" height="18" border="0"', '"imagesets/subSilver/icon_minipost.gif" width="12" height="9" border="0"', '"imagesets/subSilver/icon_minipost_new.gif" width="12" height="9" border="0"', '"imagesets/subSilver/icon_latest_reply.gif" width="18" height="9" border="0"', '"imagesets/subSilver/icon_newest_reply.gif" width="18" height="9" border="0"', '"imagesets/subSilver/folder_big.gif" width="46" height="25" border="0"', '"imagesets/subSilver/folder_new_big.gif" width="46" height="25" border="0"', '"imagesets/subSilver/folder_locked_big.gif" width="46" height="25" border="0"', '"imagesets/subSilver/subfolder_big.gif" width="46" height="25" border="0"', '"imagesets/subSilver/subfolder_new_big.gif" width="46" height="25" border="0"', '"imagesets/subSilver/folder.gif" width="19" height="18" border="0"', '"imagesets/subSilver/folder_new.gif" width="19" height="18" border="0"', '"imagesets/subSilver/folder_hot.gif" width="19" height="18" border="0"', '"imagesets/subSilver/folder_new_hot.gif" width="19" height="18" border="0"', '"imagesets/subSilver/folder_lock.gif" width="19" height="18" border="0"', '"imagesets/subSilver/folder_lock_new.gif" width="19" height="18" border="0"', '"imagesets/subSilver/folder_sticky.gif" width="19" height="18" border="0"', '"imagesets/subSilver/folder_sticky_new.gif" width="19" height="18" border="0"', '"imagesets/subSilver/folder_announce.gif" width="19" height="18" border="0"', '"imagesets/subSilver/folder_announce_new.gif" width="19" height="18" border="0"', '', '', '"imagesets/subSilver/voting_lcap.gif" width="4" height="12" border="0"', '"imagesets/subSilver/voting_rcap.gif" height="12" border="0"', '"imagesets/subSilver/voting_bar.gif" width="4" height="12" border="0"', '"imagesets/subSilver/ratings/{RATE}.gif" width="45" height="17" border="0"'); +INSERT INTO phpbb_styles_imageset (imageset_id, imageset_name, imageset_path, post_new, post_locked, post_pm, reply_new, reply_pm, reply_locked, icon_profile, icon_pm, icon_delete, icon_ip, icon_quote, icon_search, icon_edit, icon_email, icon_www, icon_icq, icon_aim, icon_yim, icon_msnm, icon_no_email, icon_no_www, icon_no_icq, icon_no_aim, icon_no_yim, icon_no_msnm, goto_post, goto_post_new, goto_post_latest, goto_post_newest, forum, forum_new, forum_locked, sub_forum, sub_forum_new, folder, folder_new, folder_hot, folder_hot_new, folder_locked, folder_locked_new, folder_sticky, folder_sticky_new, folder_announce, folder_announce_new, topic_watch, topic_unwatch, poll_left, poll_center, poll_right, rating, folder_posted, folder_new_posted, folder_locked_posted, folder_locked_new_posted, folder_sticky_posted, folder_sticky_new_posted, folder_announce_posted , folder_announce_new_posted, folder_hot_posted, folder_hot_new_posted) VALUES (1, 'subSilver © phpBB Group', 'subSilver', '"imagesets/subSilver/{LANG}/post.gif" width="82" height="25" border="0"', '"imagesets/subSilver/{LANG}/reply-locked.gif" width="82" height="25" border="0"', '"imagesets/subSilver/{LANG}/post.gif" width="82" height="25" border="0"', '"imagesets/subSilver/{LANG}/reply.gif" width="88" height="25" border="0"', '"imagesets/subSilver/{LANG}/reply.gif" width="88" height="25" border="0"', '"imagesets/subSilver/{LANG}/reply-locked.gif" width="82" height="25" border="0"', '"imagesets/subSilver/{LANG}/icon_profile.gif" width="59" height="18" border="0"', '"imagesets/subSilver/{LANG}/icon_pm.gif" width="59" height="18" border="0"', '"imagesets/subSilver/icon_delete.gif" width="16" height="18" border="0"', '"imagesets/subSilver/{LANG}/icon_ip.gif" width="16" height="18" border="0"', '"imagesets/subSilver/{LANG}/icon_quote.gif" width="59" height="18" border="0"', '"imagesets/subSilver/{LANG}/icon_search.gif" width="59" height="18" border="0"', '"imagesets/subSilver/{LANG}/icon_edit.gif" width="59" height="18" border="0"', '"imagesets/subSilver/{LANG}/icon_email.gif" width="59" height="18" border="0"', '"imagesets/subSilver/{LANG}/icon_www.gif" width="59" height="18" border="0"', '"imagesets/subSilver/{LANG}/icon_icq_add.gif" width="59" height="18" border="0"', '"imagesets/subSilver/{LANG}/icon_aim.gif" width="59" height="18" border="0"', '"imagesets/subSilver/{LANG}/icon_yim.gif" width="59" height="18" border="0"', '"imagesets/subSilver/{LANG}/icon_msnm.gif" width="59" height="18" border="0"', '', '', '', '', '', '', '"imagesets/subSilver/icon_minipost.gif" width="12" height="9" border="0"', '"imagesets/subSilver/icon_minipost_new.gif" width="12" height="9" border="0"', '"imagesets/subSilver/icon_latest_reply.gif" width="18" height="9" border="0"', '"imagesets/subSilver/icon_newest_reply.gif" width="18" height="9" border="0"', '"imagesets/subSilver/folder_big.gif" width="46" height="25" border="0"', '"imagesets/subSilver/folder_new_big.gif" width="46" height="25" border="0"', '"imagesets/subSilver/folder_locked_big.gif" width="46" height="25" border="0"', '"imagesets/subSilver/subfolder_big.gif" width="46" height="25" border="0"', '"imagesets/subSilver/subfolder_new_big.gif" width="46" height="25" border="0"', '"imagesets/subSilver/folder.gif" width="19" height="18" border="0"', '"imagesets/subSilver/folder_new.gif" width="19" height="18" border="0"', '"imagesets/subSilver/folder_hot.gif" width="19" height="18" border="0"', '"imagesets/subSilver/folder_new_hot.gif" width="19" height="18" border="0"', '"imagesets/subSilver/folder_lock.gif" width="19" height="18" border="0"', '"imagesets/subSilver/folder_lock_new.gif" width="19" height="18" border="0"', '"imagesets/subSilver/folder_sticky.gif" width="19" height="18" border="0"', '"imagesets/subSilver/folder_sticky_new.gif" width="19" height="18" border="0"', '"imagesets/subSilver/folder_announce.gif" width="19" height="18" border="0"', '"imagesets/subSilver/folder_announce_new.gif" width="19" height="18" border="0"', '', '', '"imagesets/subSilver/voting_lcap.gif" width="4" height="12" border="0"', '"imagesets/subSilver/voting_bar.gif" height="12" border="0"', '"imagesets/subSilver/voting_rcap.gif" width="4" height="12" border="0"', '"imagesets/subSilver/ratings/{RATE}.gif" width="45" height="17" border="0"', '"imagesets/subSilver/folder_posted.gif" width="19" height="18" border="0"', '"imagesets/subSilver/folder_new_posted.gif" width="19" height="18" border="0"', '"imagesets/subSilver/folder_lock_posted.gif" width="19" height="18" border="0"', '"imagesets/subSilver/folder_lock_new_posted.gif" width="19" height="18" border="0"', '"imagesets/subSilver/folder_sticky_posted.gif" width="19" height="18" border="0"', '"imagesets/subSilver/folder_sticky_new_posted.gif" width="19" height="18" border="0"', '"imagesets/subSilver/folder_announce_posted.gif" width="19" height="18" border="0"', '"imagesets/subSilver/folder_announce_new_posted.gif" width="19" height="18" border="0"', '"imagesets/subSilver/folder_hot_posted.gif" width="19" height="18" border="0"', '"imagesets/subSilver/folder_new_hot_posted.gif" width="19" height="18" border="0"'); # -- phpbb_styles_template INSERT INTO phpbb_styles_template (template_id, template_name, template_path, poll_length, pm_box_length, compile_crc) VALUES (1, 'subSilver © phpBB Group', 'subSilver', 205, 175, ''); diff --git a/phpBB/install/schemas/mysql_schema.sql b/phpBB/install/schemas/mysql_schema.sql index e7a571fe82..156606385f 100644 --- a/phpBB/install/schemas/mysql_schema.sql +++ b/phpBB/install/schemas/mysql_schema.sql @@ -357,6 +357,7 @@ CREATE TABLE phpbb_posts_text ( post_checksum varchar(32) NOT NULL, post_subject varchar(60), post_text text, + post_encoding varchar(11) DEFAULT 'iso-8859-1' NOT NULL, PRIMARY KEY (post_id) ); @@ -547,60 +548,70 @@ CREATE TABLE phpbb_styles_theme ( # Table structure for table 'phpbb_styles_imageset' # CREATE TABLE phpbb_styles_imageset ( - imageset_id tinyint(4) UNSIGNED NOT NULL auto_increment, - imageset_name varchar(100), - imageset_path varchar(30), - post_new varchar(200), - post_locked varchar(200), - post_pm varchar(200), - reply_new varchar(200), - reply_pm varchar(200), - reply_locked varchar(200), - icon_profile varchar(200), - icon_pm varchar(200), - icon_delete varchar(200), - icon_ip varchar(200), - icon_quote varchar(200), - icon_search varchar(200), - icon_edit varchar(200), - icon_email varchar(200), - icon_www varchar(200), - icon_icq varchar(200), - icon_aim varchar(200), - icon_yim varchar(200), - icon_msnm varchar(200), - icon_no_email varchar(200) DEFAULT '', - icon_no_www varchar(200) DEFAULT '', - icon_no_icq varchar(200) DEFAULT '', - icon_no_aim varchar(200) DEFAULT '', - icon_no_yim varchar(200) DEFAULT '', - icon_no_msnm varchar(200) DEFAULT '', - goto_post varchar(200), - goto_post_new varchar(200), - goto_post_latest varchar(200), - goto_post_newest varchar(200), - forum varchar(200), - forum_new varchar(200), - forum_locked varchar(200), - sub_forum varchar(200), - sub_forum_new varchar(200), - folder varchar(200), - folder_new varchar(200), - folder_hot varchar(200), - folder_hot_new varchar(200), - folder_locked varchar(200), - folder_locked_new varchar(200), - folder_sticky varchar(200), - folder_sticky_new varchar(200), - folder_announce varchar(200), - folder_announce_new varchar(200), - topic_watch varchar(200), - topic_unwatch varchar(200), - poll_left varchar(200), - poll_center varchar(200), - poll_right varchar(200), - rating varchar(200), - PRIMARY KEY (imageset_id) + imageset_id tinyint(4) unsigned NOT NULL auto_increment, + imageset_name varchar(100) default NULL, + imageset_path varchar(30) default NULL, + post_new varchar(200) default NULL, + post_locked varchar(200) default NULL, + post_pm varchar(200) default NULL, + reply_new varchar(200) default NULL, + reply_pm varchar(200) default NULL, + reply_locked varchar(200) default NULL, + icon_profile varchar(200) default NULL, + icon_pm varchar(200) default NULL, + icon_delete varchar(200) default NULL, + icon_ip varchar(200) default NULL, + icon_quote varchar(200) default NULL, + icon_search varchar(200) default NULL, + icon_edit varchar(200) default NULL, + icon_email varchar(200) default NULL, + icon_www varchar(200) default NULL, + icon_icq varchar(200) default NULL, + icon_aim varchar(200) default NULL, + icon_yim varchar(200) default NULL, + icon_msnm varchar(200) default NULL, + icon_no_email varchar(200) default '', + icon_no_www varchar(200) default '', + icon_no_icq varchar(200) default '', + icon_no_aim varchar(200) default '', + icon_no_yim varchar(200) default '', + icon_no_msnm varchar(200) default '', + goto_post varchar(200) default NULL, + goto_post_new varchar(200) default NULL, + goto_post_latest varchar(200) default NULL, + goto_post_newest varchar(200) default NULL, + forum varchar(200) default NULL, + forum_new varchar(200) default NULL, + forum_locked varchar(200) default NULL, + sub_forum varchar(200) default NULL, + sub_forum_new varchar(200) default NULL, + folder varchar(200) default NULL, + folder_posted varchar(200) NOT NULL default '', + folder_new varchar(200) default NULL, + folder_new_posted varchar(200) NOT NULL default '', + folder_hot varchar(200) default NULL, + folder_hot_posted varchar(200) NOT NULL default '', + folder_hot_new varchar(200) default NULL, + folder_hot_new_posted varchar(200) NOT NULL default '', + folder_locked varchar(200) default NULL, + folder_locked_posted varchar(200) NOT NULL default '', + folder_locked_new varchar(200) default NULL, + folder_locked_new_posted varchar(200) NOT NULL default '', + folder_sticky varchar(200) default NULL, + folder_sticky_posted varchar(200) NOT NULL default '', + folder_sticky_new varchar(200) default NULL, + folder_sticky_new_posted varchar(200) NOT NULL default '', + folder_announce varchar(200) default NULL, + folder_announce_posted varchar(200) NOT NULL default '', + folder_announce_new varchar(200) default NULL, + folder_announce_new_posted varchar(200) NOT NULL default '', + topic_watch varchar(200) default NULL, + topic_unwatch varchar(200) default NULL, + poll_left varchar(200) default NULL, + poll_center varchar(200) default NULL, + poll_right varchar(200) default NULL, + rating varchar(200) default NULL, + PRIMARY KEY (imageset_id) );