diff options
Diffstat (limited to 'phpBB')
21 files changed, 1398 insertions, 992 deletions
diff --git a/phpBB/develop/create_schema_files.php b/phpBB/develop/create_schema_files.php index bc4e20e035..75017328a0 100644 --- a/phpBB/develop/create_schema_files.php +++ b/phpBB/develop/create_schema_files.php @@ -1628,115 +1628,6 @@ function get_schema_struct() 'imageset_name' => array('VCHAR_UNI:255', ''), 'imageset_copyright' => array('VCHAR_UNI', ''), 'imageset_path' => array('VCHAR:100', ''), - - 'site_logo' => array('VCHAR:200', ''), - 'upload_bar' => array('VCHAR:200', ''), - 'poll_left' => array('VCHAR:200', ''), - 'poll_center' => array('VCHAR:200', ''), - 'poll_right' => array('VCHAR:200', ''), - 'icon_friend' => array('VCHAR:200', ''), - 'icon_foe' => array('VCHAR:200', ''), - - 'forum_link' => array('VCHAR:200', ''), - 'forum_read' => array('VCHAR:200', ''), - 'forum_read_locked' => array('VCHAR:200', ''), - 'forum_read_subforum' => array('VCHAR:200', ''), - 'forum_unread' => array('VCHAR:200', ''), - 'forum_unread_locked' => array('VCHAR:200', ''), - 'forum_unread_subforum' => array('VCHAR:200', ''), - - 'topic_moved' => array('VCHAR:200', ''), - - 'topic_read' => array('VCHAR:200', ''), - 'topic_read_mine' => array('VCHAR:200', ''), - 'topic_read_hot' => array('VCHAR:200', ''), - 'topic_read_hot_mine' => array('VCHAR:200', ''), - 'topic_read_locked' => array('VCHAR:200', ''), - 'topic_read_locked_mine' => array('VCHAR:200', ''), - - 'topic_unread' => array('VCHAR:200', ''), - 'topic_unread_mine' => array('VCHAR:200', ''), - 'topic_unread_hot' => array('VCHAR:200', ''), - 'topic_unread_hot_mine' => array('VCHAR:200', ''), - 'topic_unread_locked' => array('VCHAR:200', ''), - 'topic_unread_locked_mine' => array('VCHAR:200', ''), - - 'sticky_read' => array('VCHAR:200', ''), - 'sticky_read_mine' => array('VCHAR:200', ''), - 'sticky_read_locked' => array('VCHAR:200', ''), - 'sticky_read_locked_mine' => array('VCHAR:200', ''), - 'sticky_unread' => array('VCHAR:200', ''), - 'sticky_unread_mine' => array('VCHAR:200', ''), - 'sticky_unread_locked' => array('VCHAR:200', ''), - 'sticky_unread_locked_mine' => array('VCHAR:200', ''), - - 'announce_read' => array('VCHAR:200', ''), - 'announce_read_mine' => array('VCHAR:200', ''), - 'announce_read_locked' => array('VCHAR:200', ''), - 'announce_read_locked_mine' => array('VCHAR:200', ''), - 'announce_unread' => array('VCHAR:200', ''), - 'announce_unread_mine' => array('VCHAR:200', ''), - 'announce_unread_locked' => array('VCHAR:200', ''), - 'announce_unread_locked_mine' => array('VCHAR:200', ''), - - 'global_read' => array('VCHAR:200', ''), - 'global_read_mine' => array('VCHAR:200', ''), - 'global_read_locked' => array('VCHAR:200', ''), - 'global_read_locked_mine' => array('VCHAR:200', ''), - 'global_unread' => array('VCHAR:200', ''), - 'global_unread_mine' => array('VCHAR:200', ''), - 'global_unread_locked' => array('VCHAR:200', ''), - 'global_unread_locked_mine' => array('VCHAR:200', ''), - - 'pm_read' => array('VCHAR:200', ''), - 'pm_unread' => array('VCHAR:200', ''), - - 'icon_contact_aim' => array('VCHAR:200', ''), - 'icon_contact_email' => array('VCHAR:200', ''), - 'icon_contact_icq' => array('VCHAR:200', ''), - 'icon_contact_jabber' => array('VCHAR:200', ''), - 'icon_contact_msnm' => array('VCHAR:200', ''), - 'icon_contact_pm' => array('VCHAR:200', ''), - 'icon_contact_yahoo' => array('VCHAR:200', ''), - 'icon_contact_www' => array('VCHAR:200', ''), - - 'icon_post_delete' => array('VCHAR:200', ''), - 'icon_post_edit' => array('VCHAR:200', ''), - 'icon_post_info' => array('VCHAR:200', ''), - 'icon_post_quote' => array('VCHAR:200', ''), - 'icon_post_report' => array('VCHAR:200', ''), - 'icon_post_target' => array('VCHAR:200', ''), - 'icon_post_target_unread' => array('VCHAR:200', ''), - - 'icon_topic_attach' => array('VCHAR:200', ''), - 'icon_topic_latest' => array('VCHAR:200', ''), - 'icon_topic_newest' => array('VCHAR:200', ''), - 'icon_topic_reported' => array('VCHAR:200', ''), - 'icon_topic_unapproved' => array('VCHAR:200', ''), - - 'icon_user_online' => array('VCHAR:200', ''), - 'icon_user_offline' => array('VCHAR:200', ''), - 'icon_user_profile' => array('VCHAR:200', ''), - 'icon_user_search' => array('VCHAR:200', ''), - 'icon_user_warn' => array('VCHAR:200', ''), - - 'button_pm_forward' => array('VCHAR:200', ''), - 'button_pm_new' => array('VCHAR:200', ''), - 'button_pm_reply' => array('VCHAR:200', ''), - 'button_topic_locked' => array('VCHAR:200', ''), - 'button_topic_new' => array('VCHAR:200', ''), - 'button_topic_reply' => array('VCHAR:200', ''), - - 'user_icon1' => array('VCHAR:200', ''), - 'user_icon2' => array('VCHAR:200', ''), - 'user_icon3' => array('VCHAR:200', ''), - 'user_icon4' => array('VCHAR:200', ''), - 'user_icon5' => array('VCHAR:200', ''), - 'user_icon6' => array('VCHAR:200', ''), - 'user_icon7' => array('VCHAR:200', ''), - 'user_icon8' => array('VCHAR:200', ''), - 'user_icon9' => array('VCHAR:200', ''), - 'user_icon10' => array('VCHAR:200', ''), ), 'PRIMARY_KEY' => 'imageset_id', 'KEYS' => array( @@ -1744,6 +1635,22 @@ function get_schema_struct() ), ); + $schema_data['phpbb_styles_imageset_data'] = array( + 'COLUMNS' => array( + 'image_id' => array('USINT', NULL, 'auto_increment'), + 'image_name' => array('VCHAR:200', ''), + 'image_filename' => array('VCHAR:200', ''), + 'image_lang' => array('VCHAR:30', ''), + 'image_height' => array('USINT', 0), + 'image_width' => array('USINT', 0), + 'imageset_id' => array('TINT:4', 0), + ), + 'PRIMARY_KEY' => 'image_id', + 'KEYS' => array( + 'imgset_id' => array('INDEX', 'imageset_id'), + ), + ); + $schema_data['phpbb_topics'] = array( 'COLUMNS' => array( 'topic_id' => array('UINT', NULL, 'auto_increment'), diff --git a/phpBB/includes/acp/acp_styles.php b/phpBB/includes/acp/acp_styles.php index f29010d1e6..c8a7d4885a 100644 --- a/phpBB/includes/acp/acp_styles.php +++ b/phpBB/includes/acp/acp_styles.php @@ -90,7 +90,7 @@ parse_css_file = {PARSE_CSS_FILE} 'site_logo', ), 'buttons' => array( - 'icon_contact_aim', 'icon_contact_email', 'icon_contact_icq', 'icon_contact_jabber', 'icon_contact_msnm', 'icon_contact_pm', 'icon_contact_yahoo', 'icon_contact_www', 'icon_post_delete', 'icon_post_edit', 'icon_post_info', 'icon_post_quote', 'icon_post_report', 'icon_user_online', 'icon_user_offline', 'icon_user_profile', 'icon_user_search', 'icon_user_warn', 'button_pm_forward', 'button_pm_new', 'button_pm_reply', 'button_topic_locked', 'button_topic_new', 'button_topic_reply', + 'icon_back_top', 'icon_contact_aim', 'icon_contact_email', 'icon_contact_icq', 'icon_contact_jabber', 'icon_contact_msnm', 'icon_contact_pm', 'icon_contact_yahoo', 'icon_contact_www', 'icon_post_delete', 'icon_post_edit', 'icon_post_info', 'icon_post_quote', 'icon_post_report', 'icon_user_online', 'icon_user_offline', 'icon_user_profile', 'icon_user_search', 'icon_user_warn', 'button_pm_forward', 'button_pm_new', 'button_pm_reply', 'button_topic_locked', 'button_topic_new', 'button_topic_reply', ), 'icons' => array( 'icon_post_target', 'icon_post_target_unread', 'icon_topic_attach', 'icon_topic_latest', 'icon_topic_newest', 'icon_topic_reported', 'icon_topic_unapproved', 'icon_friend', 'icon_foe', @@ -372,35 +372,111 @@ parse_css_file = {PARSE_CSS_FILE} { $sql_ary = array(); - $cfg_data = parse_cfg_file("{$phpbb_root_path}styles/{$imageset_row['imageset_path']}/imageset/imageset.cfg"); - $imageset_definitions = array(); foreach ($this->imageset_keys as $topic => $key_array) { $imageset_definitions = array_merge($imageset_definitions, $key_array); } - - foreach ($cfg_data as $key => $value) + + $cfg_data_imageset = parse_cfg_file("{$phpbb_root_path}styles/{$imageset_row['imageset_path']}/imageset/imageset.cfg"); + + $db->sql_transaction('begin'); + + $sql = 'DELETE FROM ' . STYLES_IMAGESET_DATA_TABLE . ' + WHERE imageset_id = ' . $style_id; + $result = $db->sql_query($sql); + + foreach ($cfg_data_imageset as $image_name => $value) { - if (strpos($key, 'img_') === 0) + if (strpos($value, '*') !== false) + { + if (substr($value, -1, 1) === '*') + { + list($image_filename, $image_height) = explode('*', $value); + $image_width = 0; + } + else + { + list($image_filename, $image_height, $image_width) = explode('*', $value); + } + } + else + { + $image_filename = $value; + $image_height = $image_width = 0; + } + + if (strpos($image_name, 'img_') === 0 && $image_filename) { - $key = substr($key, 4); - if (in_array($key, $imageset_definitions)) + $image_name = substr($image_name, 4); + if (in_array($image_name, $imageset_definitions)) { - $sql_ary[$key] = str_replace('{PATH}', "styles/{$imageset_row['imageset_path']}/imageset/", trim($value)); + $sql_ary = array( + 'image_name' => $image_name, + 'image_filename' => $image_filename, + 'image_height' => (int) $image_height, + 'image_width' => (int) $image_width, + 'imageset_id' => $style_id, + 'image_lang' => '', + ); + $db->sql_query('INSERT INTO ' . STYLES_IMAGESET_DATA_TABLE . ' ' . $db->sql_build_array('INSERT', $sql_ary)); } } } - unset($cfg_data); - if (sizeof($sql_ary)) + $sql = 'SELECT lang_dir + FROM ' . LANG_TABLE; + $result = $db->sql_query($sql); + + while ($row = $db->sql_fetchrow($result)) { - $sql = 'UPDATE ' . STYLES_IMAGESET_TABLE . ' SET ' . $db->sql_build_array('UPDATE', $sql_ary) . " - WHERE imageset_id = $style_id"; - $db->sql_query($sql); + if (@file_exists("{$phpbb_root_path}styles/{$imageset_row['imageset_path']}/imageset/{$row['lang_dir']}/imageset.cfg")) + { + $cfg_data_imageset_data = parse_cfg_file("{$phpbb_root_path}styles/{$imageset_row['imageset_path']}/imageset/{$row['lang_dir']}/imageset.cfg"); + foreach ($cfg_data_imageset_data as $image_name => $value) + { + if (strpos($value, '*') !== false) + { + if (substr($value, -1, 1) === '*') + { + list($image_filename, $image_height) = explode('*', $value); + $image_width = 0; + } + else + { + list($image_filename, $image_height, $image_width) = explode('*', $value); + } + } + else + { + $image_filename = $value; + $image_height = $image_width = 0; + } + + if (strpos($image_name, 'img_') === 0 && $image_filename) + { + $image_name = substr($image_name, 4); + if (in_array($image_name, $imageset_definitions)) + { + $sql_ary = array( + 'image_name' => $image_name, + 'image_filename' => $image_filename, + 'image_height' => $image_height, + 'image_width' => $image_width, + 'imageset_id' => $style_id, + 'image_lang' => $row['lang_dir'], + ); + $db->sql_query('INSERT INTO ' . STYLES_IMAGESET_DATA_TABLE . ' ' . $db->sql_build_array('INSERT', $sql_ary)); + } + } + } + } } + $db->sql_freeresult($result); + + $db->sql_transaction('commit'); - $cache->destroy('sql', STYLES_IMAGESET_TABLE); + $cache->destroy('sql', STYLES_IMAGESET_DATA_TABLE); add_log('admin', 'LOG_IMAGESET_REFRESHED', $imageset_row['imageset_name']); trigger_error($user->lang['IMAGESET_REFRESHED'] . adm_back_link($this->u_action)); @@ -1356,20 +1432,40 @@ parse_css_file = {PARSE_CSS_FILE} if ($imageset_id) { - $sql_select = ($imgname) ? ", $imgname" : ''; - - $sql = "SELECT imageset_path, imageset_name, imageset_copyright$sql_select - FROM " . STYLES_IMAGESET_TABLE . " + $sql = 'SELECT imageset_path, imageset_name + FROM ' . STYLES_IMAGESET_TABLE . " WHERE imageset_id = $imageset_id"; $result = $db->sql_query($sql); $imageset_row = $db->sql_fetchrow($result); $db->sql_freeresult($result); + $imageset_path = $imageset_row['imageset_path']; + $imageset_name = $imageset_row['imageset_name']; + + $sql_extra = ''; + if (strpos($imgname, '-') !== false) + { + list($imgname, $imgnamelang) = explode('-', $imgname); + $sql_extra = " AND image_lang IN('" . $db->sql_escape($imgnamelang) . "', '')"; + } + + $sql = 'SELECT image_filename, image_width, image_height, image_lang, image_id + FROM ' . STYLES_IMAGESET_DATA_TABLE . " + WHERE imageset_id = $imageset_id + AND image_name = '" . $db->sql_escape($imgname) . "'$sql_extra"; + $result = $db->sql_query($sql); + $imageset_data_row = $db->sql_fetchrow($result); + $image_filename = $imageset_data_row['image_filename']; + $image_width = $imageset_data_row['image_width']; + $image_height = $imageset_data_row['image_height']; + $image_lang = $imageset_data_row['image_lang']; + $image_id = $imageset_data_row['image_id']; + $db->sql_freeresult($result); + if (!$imageset_row) { trigger_error($user->lang['NO_IMAGESET'] . adm_back_link($this->u_action), E_USER_WARNING); } - extract($imageset_row); // Check to see whether the selected image exists in the table $valid_name = ($update) ? false : true; @@ -1390,7 +1486,8 @@ parse_css_file = {PARSE_CSS_FILE} // If imgwidth and imgheight are non-zero grab the actual size // from the image itself ... we ignore width settings for the poll center // image - $imgwidth = $imgheight = ''; + $imgwidth = $imgheight = 0; + $imglang = ''; if ($imageset_path && !file_exists("{$phpbb_root_path}styles/$imageset_path/imageset/$imgpath")) { @@ -1400,50 +1497,54 @@ parse_css_file = {PARSE_CSS_FILE} if ($imgsize && $imageset_path) { list($imgwidth, $imgheight) = getimagesize("{$phpbb_root_path}styles/$imageset_path/imageset/$imgpath"); - $imgheight = '*' . $imgheight; - $imgwidth = ($imgname != 'poll_center') ? '*' . $imgwidth : ''; + $imgwidth = ($imgname != 'poll_center') ? (int) $imgwidth : 0; + $imgheight = (int) $imgheight; } - $imgpath = preg_replace('/^([^\/]+\/)/', '{LANG}/', $imgpath) . $imgheight . $imgwidth; + if (strpos($imgpath, '/') !== false) + { + list($imglang, $imgfilename) = explode('/', $imgpath); + } + else + { + $imgfilename = $imgpath; + } - $sql = 'UPDATE ' . STYLES_IMAGESET_TABLE . " - SET $imgname = '" . $db->sql_escape($imgpath) . "' - WHERE imageset_id = $imageset_id"; - $db->sql_query($sql); + $sql_ary = array( + 'image_filename' => $imgfilename, + 'image_width' => $imgwidth, + 'image_height' => $imgheight, + 'image_lang' => $imglang, + ); - $cache->destroy('sql', STYLES_IMAGESET_TABLE); + // already exists + if ($imageset_data_row) + { + $sql = 'UPDATE ' . STYLES_IMAGESET_DATA_TABLE . ' + SET ' . $db->sql_build_array('UPDATE', $sql_ary) . " + WHERE image_id = $image_id"; + $db->sql_query($sql); + } + // does not exist + else if (!$imageset_data_row) + { + $sql_ary['image_name'] = $image_name; + $sql_ary['imageset_id'] = $imageset_id; + $db->sql_query('INSERT INTO ' . STYLES_IMAGESET_DATA_TABLE . ' ' . $db->sql_build_array('INSERT', $sql_ary)); + } + + $cache->destroy('sql', STYLES_IMAGESET_DATA_TABLE); add_log('admin', 'LOG_IMAGESET_EDIT', $imageset_name); $template->assign_var('SUCCESS', true); - $$imgname = $imgpath; } } } - // Generate list of image options - $img_options = ''; - foreach ($this->imageset_keys as $category => $img_ary) - { - $template->assign_block_vars('category', array( - 'NAME' => $user->lang['IMG_CAT_' . strtoupper($category)] - )); - - foreach ($img_ary as $img) - { - $template->assign_block_vars('category.images', array( - 'SELECTED' => ($img == $imgname), - 'VALUE' => $img, - 'TEXT' => (($category == 'custom') ? $img : $user->lang['IMG_' . strtoupper($img)]) - )); - } - } - - // TODO - // Check whether localised buttons exist in admins language first - // Clean up this code $imglang = ''; $imagesetlist = array('nolang' => array(), 'lang' => array()); + $langs = array(); $dir = "{$phpbb_root_path}styles/$imageset_path/imageset"; $dp = @opendir($dir); @@ -1454,66 +1555,85 @@ parse_css_file = {PARSE_CSS_FILE} { if (!is_file($dir . '/' . $file) && !is_link($dir . '/' . $file) && $file[0] != '.' && strtoupper($file) != 'CVS') { - $dp2 = @opendir("$dir/$file"); - - if (!$dp2) - { - continue; - } - - while (($file2 = readdir($dp2)) !== false) - { - if (preg_match('#\.(?:gif|jpg|png)$#', $file2)) - { - $imagesetlist['all_lang'][$file][] = "$file/$file2"; - } - } - closedir($dp2); + $langs[] = $file; } else if (preg_match('#\.(?:gif|jpg|png)$#', $file)) { $imagesetlist['nolang'][] = $file; } } + + if ($sql_extra) + { + $dp2 = @opendir("$dir/$imgnamelang"); + + if (!$dp2) + { + continue; + } + + while (($file2 = readdir($dp2)) !== false) + { + if (preg_match('#\.(?:gif|jpg|png)$#', $file2)) + { + $imagesetlist['lang'][] = "$imgnamelang/$file2"; + } + } + closedir($dp2); + } closedir($dp); } - // Make sure the list of possible images is sorted alphabetically - sort($imagesetlist['nolang']); - foreach ($imagesetlist['all_lang'] as $lang => $data) + // Generate list of image options + $img_options = ''; + foreach ($this->imageset_keys as $category => $img_ary) { - sort($imagesetlist['all_lang'][$lang]); - } + $template->assign_block_vars('category', array( + 'NAME' => $user->lang['IMG_CAT_' . strtoupper($category)] + )); - if (isset($imagesetlist['all_lang'][$user->img_lang]) && sizeof($imagesetlist['all_lang'][$user->img_lang])) - { - $imglang = $lang; - $imagesetlist['lang'] = $imagesetlist['all_lang'][$user->img_lang]; - } - else - { - foreach ($imagesetlist['all_lang'] as $lang => $data) + foreach ($img_ary as $img) { - if (sizeof($imagesetlist['all_lang'][$user->img_lang])) + if ($category == 'buttons') { - $imglang = $lang; - $imagesetlist['lang'] = $imagesetlist['all_lang'][$lang]; - break; + foreach ($langs as $language) + { + $template->assign_block_vars('category.images', array( + 'SELECTED' => ($img == $imgname), + 'VALUE' => $img . '-' . $language, + 'TEXT' => $user->lang['IMG_' . strtoupper($img)] . ' [ ' . $language . ' ]' + )); + } + } + else + { + $template->assign_block_vars('category.images', array( + 'SELECTED' => ($img == $imgname), + 'VALUE' => $img, + 'TEXT' => (($category == 'custom') ? $img : $user->lang['IMG_' . strtoupper($img)]) + )); } } } - unset($imagesetlist['all_lang']); + + // Make sure the list of possible images is sorted alphabetically + sort($imagesetlist['lang']); + sort($imagesetlist['nolang']); $imagesetlist_options = ''; foreach ($imagesetlist as $type => $img_ary) { - $template->assign_block_vars('imagesetlist', array( - 'TYPE' => ($type == 'lang') - )); + if ($type !== 'lang' || $sql_extra) + { + $template->assign_block_vars('imagesetlist', array( + 'TYPE' => ($type == 'lang') + )); + } + foreach ($img_ary as $img) { $imgtext = preg_replace('/^([^\/]+\/)/', '', $img); - $selected = (!empty($imgname) && strpos($$imgname, $imgtext) !== false); + $selected = (!empty($imgname) && strpos($image_filename, $imgtext) !== false); if ($selected) { $template->assign_var('IMAGE_SELECT', true); @@ -1526,9 +1646,9 @@ parse_css_file = {PARSE_CSS_FILE} } } - $imgsize_bool = (!empty($imgname) && ($imgsize || preg_match('#\*\d+#', $$imgname))) ? true : false; + $imgsize_bool = (!empty($imgname) && $image_width && $image_height) ? true : false; - $img_info = (!empty($imgname)) ? explode('*', $$imgname) : array(); + $image_request = '../styles/' . $imageset_path . '/imageset/' . ($image_lang ? $imgnamelang . '/' : '') . $image_filename; $template->assign_vars(array( 'S_EDIT_IMAGESET' => true, @@ -1537,7 +1657,7 @@ parse_css_file = {PARSE_CSS_FILE} 'IMAGE_OPTIONS' => $img_options, 'IMAGELIST_OPTIONS' => $imagesetlist_options, 'IMAGE_SIZE' => $imgsize_bool, - 'IMAGE_REQUEST' => (!empty($img_info[0])) ? '../styles/' . $imageset_path . '/imageset/' . str_replace('{LANG}', $imglang, $img_info[0]) : '', + 'IMAGE_REQUEST' => $image_request, 'U_ACTION' => $this->u_action . "&action=edit&id=$imageset_id", 'U_BACK' => $this->u_action, 'NAME' => $imageset_name, @@ -1637,6 +1757,12 @@ parse_css_file = {PARSE_CSS_FILE} set_config('default_style', $new_id); } } + else if ($mode == 'imageset') + { + $sql = 'DELETE FROM ' . STYLES_IMAGESET_DATA_TABLE . " + WHERE imageset_id = $style_id"; + $db->sql_query($sql); + } else { $sql = 'UPDATE ' . STYLES_TABLE . " @@ -1883,11 +2009,27 @@ parse_css_file = {PARSE_CSS_FILE} { $imageset_cfg = str_replace(array('{MODE}', '{NAME}', '{COPYRIGHT}', '{VERSION}'), array($mode, $style_row['imageset_name'], $style_row['imageset_copyright'], $config['version']), $this->imageset_cfg); + $imageset_main = array(); + + $sql = 'SELECT image_filename, image_name, image_height, image_width + FROM ' . STYLES_IMAGESET_DATA_TABLE . " + WHERE imageset_id = $style_id + AND image_lang = ''"; + $result = $db->sql_query($sql); + while ($row = $db->sql_fetchrow($result)) + { + $imageset_main[$row['image_name']] = $row['image_filename'] . ($row['image_height'] ? '*' . $row['image_height']: '') . ($row['image_width'] ? '*' . $row['image_width']: ''); + } + $db->sql_freeresult($result); + foreach ($this->imageset_keys as $topic => $key_array) { foreach ($key_array as $key) { - $imageset_cfg .= "\nimg_" . $key . ' = ' . str_replace("styles/{$style_row['imageset_path']}/imageset/", '{PATH}', $style_row[$key]); + if (isset($imageset_main[$key])) + { + $imageset_cfg .= "\nimg_" . $key . ' = ' . str_replace("styles/{$style_row['imageset_path']}/imageset/", '{PATH}', $imageset_main[$key]); + } } } @@ -3021,7 +3163,7 @@ parse_css_file = {PARSE_CSS_FILE} if ($row) { - // If it exist, we just use the stlye on installation + // If it exist, we just use the style on installation if ($action == 'install') { $id = $row[$mode . '_id']; @@ -3079,27 +3221,8 @@ parse_css_file = {PARSE_CSS_FILE} ); break; + // all the heavy lifting is done later case 'imageset': - $cfg_data = parse_cfg_file("$root_path$mode/imageset.cfg"); - - $imageset_definitions = array(); - foreach ($this->imageset_keys as $topic => $key_array) - { - $imageset_definitions = array_merge($imageset_definitions, $key_array); - } - - foreach ($cfg_data as $key => $value) - { - if (strpos($key, 'img_') === 0) - { - $key = substr($key, 4); - if (in_array($key, $imageset_definitions)) - { - $sql_ary[$key] = str_replace('{PATH}', "styles/$path/imageset/", trim($value)); - } - } - } - unset($cfg_data); break; } @@ -3116,6 +3239,106 @@ parse_css_file = {PARSE_CSS_FILE} $filelist = filelist("{$root_path}template", '', 'html'); $this->store_templates('insert', $id, $path, $filelist); } + else if ($mode == 'imageset') + { + $cfg_data = parse_cfg_file("$root_path$mode/imageset.cfg"); + + $imageset_definitions = array(); + foreach ($this->imageset_keys as $topic => $key_array) + { + $imageset_definitions = array_merge($imageset_definitions, $key_array); + } + + foreach ($cfg_data as $key => $value) + { + if (strpos($value, '*') !== false) + { + if (substr($value, -1, 1) === '*') + { + list($image_filename, $image_height) = explode('*', $value); + $image_width = 0; + } + else + { + list($image_filename, $image_height, $image_width) = explode('*', $value); + } + } + else + { + $image_filename = $value; + $image_height = $image_width = 0; + } + + if (strpos($key, 'img_') === 0&& $image_filename) + { + $key = substr($key, 4); + if (in_array($key, $imageset_definitions)) + { + $sql_ary = array( + 'image_name' => $key, + 'image_filename' => str_replace('{PATH}', "styles/$path/imageset/", trim($image_filename)), + 'image_height' => $image_height, + 'image_width' => $image_width, + 'imageset_id' => $id, + 'image_lang' => '', + ); + $db->sql_query('INSERT INTO ' . STYLES_IMAGESET_DATA_TABLE . ' ' . $db->sql_build_array('INSERT', $sql_ary)); + } + } + } + unset($cfg_data); + + $sql = 'SELECT lang_dir + FROM ' . LANG_TABLE; + $result = $db->sql_query($sql); + + while ($row = $db->sql_fetchrow($result)) + { + if (@file_exists("$root_path$mode/{$row['lang_dir']}/imageset.cfg")) + { + $cfg_data_imageset_data = parse_cfg_file("$root_path$mode/{$row['lang_dir']}/imageset.cfg"); + foreach ($cfg_data_imageset_data as $image_name => $value) + { + if (strpos($value, '*') !== false) + { + if (substr($value, -1, 1) === '*') + { + list($image_filename, $image_height) = explode('*', $value); + $image_width = 0; + } + else + { + list($image_filename, $image_height, $image_width) = explode('*', $value); + } + } + else + { + $image_filename = $value; + $image_height = $image_width = 0; + } + + if (strpos($image_name, 'img_') === 0 && $image_filename) + { + $image_name = substr($image_name, 4); + if (in_array($image_name, $imageset_definitions)) + { + $sql_ary = array( + 'image_name' => $image_name, + 'image_filename' => $image_filename, + 'image_height' => $image_height, + 'image_width' => $image_width, + 'imageset_id' => $id, + 'image_lang' => $row['lang_dir'], + ); + $db->sql_query('INSERT INTO ' . STYLES_IMAGESET_DATA_TABLE . ' ' . $db->sql_build_array('INSERT', $sql_ary)); + } + } + } + unset($cfg_data_imageset_data); + } + } + $db->sql_freeresult($result); + } $db->sql_transaction('commit'); diff --git a/phpBB/includes/constants.php b/phpBB/includes/constants.php index cb6b816224..37b448df9f 100644 --- a/phpBB/includes/constants.php +++ b/phpBB/includes/constants.php @@ -206,6 +206,7 @@ define('STYLES_TEMPLATE_TABLE', $table_prefix . 'styles_template'); define('STYLES_TEMPLATE_DATA_TABLE',$table_prefix . 'styles_template_data'); define('STYLES_THEME_TABLE', $table_prefix . 'styles_theme'); define('STYLES_IMAGESET_TABLE', $table_prefix . 'styles_imageset'); +define('STYLES_IMAGESET_DATA_TABLE',$table_prefix . 'styles_imageset_data'); define('TOPICS_TABLE', $table_prefix . 'topics'); define('TOPICS_POSTED_TABLE', $table_prefix . 'topics_posted'); define('TOPICS_TRACK_TABLE', $table_prefix . 'topics_track'); diff --git a/phpBB/includes/session.php b/phpBB/includes/session.php index 2b845bc4d7..fc380436d3 100644 --- a/phpBB/includes/session.php +++ b/phpBB/includes/session.php @@ -1166,6 +1166,7 @@ class user extends session var $lang_name; var $lang_path; var $img_lang; + var $img_array = array(); // Able to add new option (id 7) var $keyoptions = array('viewimg' => 0, 'viewflash' => 1, 'viewsmilies' => 2, 'viewsigs' => 3, 'viewavatars' => 4, 'viewcensors' => 5, 'attachsig' => 6, 'bbcode' => 8, 'smilies' => 9, 'popuppm' => 10); @@ -1366,6 +1367,17 @@ class user extends session $this->img_lang = (file_exists($phpbb_root_path . 'styles/' . $this->theme['imageset_path'] . '/imageset/' . $this->lang_name)) ? $this->lang_name : $config['default_lang']; + $sql = 'SELECT * + FROM ' . STYLES_IMAGESET_DATA_TABLE . ' + WHERE imageset_id = ' . $this->theme['imageset_id'] . " + AND image_lang IN('" . $db->sql_escape($this->img_lang) . "', '')"; + $result = $db->sql_query($sql, 3600); + + while ($row = $db->sql_fetchrow($result)) + { + $this->img_array[$row['image_name']] = $row; + } + // If this function got called from the error handler we are finished here. if (defined('IN_ERROR_HANDLER')) { @@ -1610,43 +1622,20 @@ class user extends session static $imgs; global $phpbb_root_path; - $img_data = &$imgs[$img . $suffix]; + $img_data = &$imgs[$img]; if (empty($img_data) || $width !== false) { - if (!isset($this->theme[$img]) || !$this->theme[$img]) + if (!isset($this->img_array[$img])) { // Do not fill the image to let designers decide what to do if the image is empty $img_data = ''; return $img_data; } - // Do not include dimensions? - if (strpos($this->theme[$img], '*') === false) - { - $imgsrc = trim($this->theme[$img]); - $width = $height = false; - } - else - { - if ($width === false) - { - list($imgsrc, $height, $width) = explode('*', $this->theme[$img]); - } - else - { - list($imgsrc, $height) = explode('*', $this->theme[$img]); - } - } - - if ($suffix !== '') - { - $imgsrc = str_replace('{SUFFIX}', $suffix, $imgsrc); - } - - $img_data['src'] = $phpbb_root_path . 'styles/' . $this->theme['imageset_path'] . '/imageset/' . str_replace('{LANG}', $this->img_lang, $imgsrc); - $img_data['width'] = $width; - $img_data['height'] = $height; + $img_data['src'] = $phpbb_root_path . 'styles/' . $this->theme['imageset_path'] . '/imageset/' . ($this->img_array[$img]['image_lang'] ? $this->img_array[$img]['image_lang'] .'/' : '') . $this->img_array[$img]['image_filename']; + $img_data['width'] = $this->img_array[$img]['image_width']; + $img_data['height'] = $this->img_array[$img]['image_height']; } $alt = (!empty($this->lang[$alt])) ? $this->lang[$alt] : $alt; diff --git a/phpBB/install/database_update.php b/phpBB/install/database_update.php index aee102ff37..a22f810e39 100644 --- a/phpBB/install/database_update.php +++ b/phpBB/install/database_update.php @@ -319,6 +319,9 @@ $database_update_info = array( USERS_TABLE => array( 'username_clean', ), + STYLES_IMAGESET_TABLE => array( + 'imgset_nm', + ), ), 'add_index' => array( SEARCH_WORDLIST_TABLE => array( @@ -343,6 +346,105 @@ $database_update_info = array( 'username_clean' => array('username_clean'), ), ), + // Add the following columns + 'drop_columns' => array( + STYLES_IMAGESET_TABLE => array( + 'site_logo', + 'upload_bar', + 'poll_left', + 'poll_center', + 'poll_right', + 'icon_friend', + 'icon_foe', + 'forum_link', + 'forum_read', + 'forum_read_locked', + 'forum_read_subforum', + 'forum_unread', + 'forum_unread_locked', + 'forum_unread_subforum', + 'topic_moved', + 'topic_read', + 'topic_read_mine', + 'topic_read_hot', + 'topic_read_hot_mine', + 'topic_read_locked', + 'topic_read_locked_mine', + 'topic_unread', + 'topic_unread_mine', + 'topic_unread_hot', + 'topic_unread_hot_mine', + 'topic_unread_locked', + 'topic_unread_locked_mine', + 'sticky_read', + 'sticky_read_mine', + 'sticky_read_locked', + 'sticky_read_locked_mine', + 'sticky_unread', + 'sticky_unread_mine', + 'sticky_unread_locked', + 'sticky_unread_locked_mine', + 'announce_read', + 'announce_read_mine', + 'announce_read_locked', + 'announce_read_locked_mine', + 'announce_unread', + 'announce_unread_mine', + 'announce_unread_locked', + 'announce_unread_locked_mine', + 'global_read', + 'global_read_mine', + 'global_read_locked', + 'global_read_locked_mine', + 'global_unread', + 'global_unread_mine', + 'global_unread_locked', + 'global_unread_locked_mine', + 'pm_read', + 'pm_unread', + 'icon_contact_aim', + 'icon_contact_email', + 'icon_contact_icq', + 'icon_contact_jabber', + 'icon_contact_msnm', + 'icon_contact_pm', + 'icon_contact_yahoo', + 'icon_contact_www', + 'icon_post_delete', + 'icon_post_edit', + 'icon_post_info', + 'icon_post_quote', + 'icon_post_report', + 'icon_post_target', + 'icon_post_target_unread', + 'icon_topic_attach', + 'icon_topic_latest', + 'icon_topic_newest', + 'icon_topic_reported', + 'icon_topic_unapproved', + 'icon_user_online', + 'icon_user_offline', + 'icon_user_profile', + 'icon_user_search', + 'icon_user_warn', + 'button_pm_forward', + 'button_pm_new', + 'button_pm_reply', + 'button_topic_locked', + 'button_topic_new', + 'button_topic_reply', + 'user_icon1', + 'user_icon2', + 'user_icon3', + 'user_icon4', + 'user_icon5', + 'user_icon6', + 'user_icon7', + 'user_icon8', + 'user_icon9', + 'user_icon10' + ), + ), ), ); @@ -521,6 +623,18 @@ foreach ($database_update_info as $version => $schema_changes) } } + // Drop columns? + if (!empty($schema_changes['drop_columns'])) + { + foreach ($schema_changes['drop_columns'] as $table => $columns) + { + foreach ($columns as $column) + { + sql_column_remove($map_dbms, $table, $column); + } + } + } + // Add primary keys? if (!empty($schema_changes['add_primary_keys'])) { @@ -577,6 +691,353 @@ $no_updates = true; // some code magic if (version_compare($current_version, '3.0.b5', '<=')) { + $tablename = $table_prefix . 'styles_imageset_data'; + switch ($map_dbms) + { + case 'mysql_41': + $sql_ary = array( + "CREATE TABLE $tablename ( + image_id smallint(4) UNSIGNED NOT NULL auto_increment, + image_name varchar(200) DEFAULT '' NOT NULL, + image_filename varchar(200) DEFAULT '' NOT NULL, + image_lang varchar(30) DEFAULT '' NOT NULL, + image_height smallint(4) UNSIGNED DEFAULT '0' NOT NULL, + image_width smallint(4) UNSIGNED DEFAULT '0' NOT NULL, + imageset_id tinyint(4) DEFAULT '0' NOT NULL, + PRIMARY KEY (image_id), + KEY imgset_id (imageset_id) + ) CHARACTER SET `utf8` COLLATE `utf8_bin`"); + break; + + case 'mysql_40': + $sql_ary = array( + "CREATE TABLE $tablename ( + image_id smallint(4) UNSIGNED NOT NULL auto_increment, + image_name varbinary(200) DEFAULT '' NOT NULL, + image_filename varbinary(200) DEFAULT '' NOT NULL, + image_lang varbinary(30) DEFAULT '' NOT NULL, + image_height smallint(4) UNSIGNED DEFAULT '0' NOT NULL, + image_width smallint(4) UNSIGNED DEFAULT '0' NOT NULL, + imageset_id tinyint(4) DEFAULT '0' NOT NULL, + PRIMARY KEY (image_id), + KEY imgset_id (imageset_id) + );"); + break; + + case 'mssql': + $sql_ary = array( + "CREATE TABLE [$tablename] ( + [image_id] [int] IDENTITY (1, 1) NOT NULL , + [image_name] [varchar] (200) DEFAULT ('') NOT NULL , + [image_filename] [varchar] (200) DEFAULT ('') NOT NULL , + [image_lang] [varchar] (30) DEFAULT ('') NOT NULL , + [image_height] [int] DEFAULT (0) NOT NULL , + [image_width] [int] DEFAULT (0) NOT NULL , + [imageset_id] [int] DEFAULT (0) NOT NULL + ) ON [PRIMARY]", + + "ALTER TABLE [$tablename] WITH NOCHECK ADD + CONSTRAINT [PK_$tablename] PRIMARY KEY CLUSTERED + ( + [image_id] + ) ON [PRIMARY]", + + "CREATE INDEX [imgset_id] ON [$tablename]([imageset_id]) ON [PRIMARY]", + ); + break; + + case 'oracle': + $sql_ary = array( + "CREATE TABLE $tablename ( + image_id number(4) NOT NULL, + image_name varchar2(200) DEFAULT '' , + image_filename varchar2(200) DEFAULT '' , + image_lang varchar2(30) DEFAULT '' , + image_height number(4) DEFAULT '0' NOT NULL, + image_width number(4) DEFAULT '0' NOT NULL, + imageset_id number(4) DEFAULT '0' NOT NULL, + CONSTRAINT pk_phpbb_styles_imageset_data PRIMARY KEY (image_id) + )", + + "CREATE INDEX {$tablename}_imgset_id ON $tablename (imageset_id)", + + "CREATE SEQUENCE {$tablename}_imgset_id_seq", + + "CREATE OR REPLACE TRIGGER t_$tablename + BEFORE INSERT ON $tablename + FOR EACH ROW WHEN ( + new.image_id IS NULL OR new.image_id = 0 + ) + BEGIN + SELECT {$tablename}_seq.nextval + INTO :new.image_id + FROM dual; + END", + ); + break; + + case 'postgres': + $sql_ary = array( + "CREATE SEQUENCE {$tablename}_seq;", + + "CREATE TABLE $tablename ( + image_id INT2 DEFAULT nextval('{$tablename}_seq'), + image_name varchar(200) DEFAULT '' NOT NULL, + image_filename varchar(200) DEFAULT '' NOT NULL, + image_lang varchar(30) DEFAULT '' NOT NULL, + image_height INT2 DEFAULT '0' NOT NULL CHECK (image_height >= 0), + image_width INT2 DEFAULT '0' NOT NULL CHECK (image_width >= 0), + imageset_id INT2 DEFAULT '0' NOT NULL, + PRIMARY KEY (image_id) + );", + + "CREATE INDEX {$tablename}_imgset_id ON $tablename (imageset_id);" + ); + break; + + case 'sqlite': + $sql_ary = array( + "CREATE TABLE $tablename ( + image_id INTEGER PRIMARY KEY NOT NULL , + image_name varchar(200) NOT NULL DEFAULT '', + image_filename varchar(200) NOT NULL DEFAULT '', + image_lang varchar(30) NOT NULL DEFAULT '', + image_height INTEGER UNSIGNED NOT NULL DEFAULT '0', + image_width INTEGER UNSIGNED NOT NULL DEFAULT '0', + imageset_id tinyint(4) NOT NULL DEFAULT '0' + );", + + "CREATE INDEX {$tablename}_imgset_id ON $tablename (imageset_id);" + ); + break; + + case 'firebird': + $sql_ary = array( + "CREATE TABLE $tablename ( + image_id INTEGER NOT NULL, + image_name VARCHAR(200) CHARACTER SET NONE DEFAULT '' NOT NULL, + image_filename VARCHAR(200) CHARACTER SET NONE DEFAULT '' NOT NULL, + image_lang VARCHAR(30) CHARACTER SET NONE DEFAULT '' NOT NULL, + image_height INTEGER DEFAULT 0 NOT NULL, + image_width INTEGER DEFAULT 0 NOT NULL, + imageset_id INTEGER DEFAULT 0 NOT NULL + );", + + "ALTER TABLE $tablename ADD PRIMARY KEY (image_id);", + + "CREATE INDEX {$tablename}_imgset_id ON $tablename(imageset_id);", + + "CREATE GENERATOR {$tablename}_gen;", + + "SET GENERATOR {$tablename}_gen TO 0;", + + "CREATE TRIGGER t_$tablename FOR $tablename + BEFORE INSERT + AS + BEGIN + NEW.image_id = GEN_ID({$tablename}_gen, 1); + END" + ); + break; + } + + // add the various statements + foreach ($sql_ary as $sql) + { + $db->sql_query($sql); + } + + $data = "INSERT INTO phpbb_styles_imageset_data (image_name, image_filename, image_lang, image_height, image_width, imageset_id) VALUES ('site_logo', 'site_logo.gif', '', 94, 170, 2); + INSERT INTO phpbb_styles_imageset_data (image_name, image_filename, image_lang, image_height, image_width, imageset_id) VALUES ('upload_bar', 'upload_bar.gif', '', 16, 280, 2); + INSERT INTO phpbb_styles_imageset_data (image_name, image_filename, image_lang, image_height, image_width, imageset_id) VALUES ('poll_left', 'poll_left.gif', '', 12, 4, 2); + INSERT INTO phpbb_styles_imageset_data (image_name, image_filename, image_lang, image_height, image_width, imageset_id) VALUES ('poll_center', 'poll_center.gif', '', 12, 0, 2); + INSERT INTO phpbb_styles_imageset_data (image_name, image_filename, image_lang, image_height, image_width, imageset_id) VALUES ('poll_right', 'poll_right.gif', '', 12, 4, 2); + INSERT INTO phpbb_styles_imageset_data (image_name, image_filename, image_lang, image_height, image_width, imageset_id) VALUES ('forum_link', 'forum_link.gif', '', 25, 46, 2); + INSERT INTO phpbb_styles_imageset_data (image_name, image_filename, image_lang, image_height, image_width, imageset_id) VALUES ('forum_read', 'forum_read.gif', '', 25, 46, 2); + INSERT INTO phpbb_styles_imageset_data (image_name, image_filename, image_lang, image_height, image_width, imageset_id) VALUES ('forum_read_locked', 'forum_read_locked.gif', '', 25, 46, 2); + INSERT INTO phpbb_styles_imageset_data (image_name, image_filename, image_lang, image_height, image_width, imageset_id) VALUES ('forum_read_subforum', 'forum_read_subforum.gif', '', 25, 46, 2); + INSERT INTO phpbb_styles_imageset_data (image_name, image_filename, image_lang, image_height, image_width, imageset_id) VALUES ('forum_unread', 'forum_unread.gif', '', 25, 46, 2); + INSERT INTO phpbb_styles_imageset_data (image_name, image_filename, image_lang, image_height, image_width, imageset_id) VALUES ('forum_unread_locked', 'forum_unread_locked.gif', '', 25, 46, 2); + INSERT INTO phpbb_styles_imageset_data (image_name, image_filename, image_lang, image_height, image_width, imageset_id) VALUES ('forum_unread_subforum', 'forum_unread_subforum.gif', '', 25, 46, 2); + INSERT INTO phpbb_styles_imageset_data (image_name, image_filename, image_lang, image_height, image_width, imageset_id) VALUES ('topic_moved', 'topic_moved.gif', '', 18, 19, 2); + INSERT INTO phpbb_styles_imageset_data (image_name, image_filename, image_lang, image_height, image_width, imageset_id) VALUES ('topic_read', 'topic_read.gif', '', 18, 19, 2); + INSERT INTO phpbb_styles_imageset_data (image_name, image_filename, image_lang, image_height, image_width, imageset_id) VALUES ('topic_read_mine', 'topic_read_mine.gif', '', 18, 19, 2); + INSERT INTO phpbb_styles_imageset_data (image_name, image_filename, image_lang, image_height, image_width, imageset_id) VALUES ('topic_read_hot', 'topic_read_hot.gif', '', 18, 19, 2); + INSERT INTO phpbb_styles_imageset_data (image_name, image_filename, image_lang, image_height, image_width, imageset_id) VALUES ('topic_read_hot_mine', 'topic_read_hot_mine.gif', '', 18, 19, 2); + INSERT INTO phpbb_styles_imageset_data (image_name, image_filename, image_lang, image_height, image_width, imageset_id) VALUES ('topic_read_locked', 'topic_read_locked.gif', '', 18, 19, 2); + INSERT INTO phpbb_styles_imageset_data (image_name, image_filename, image_lang, image_height, image_width, imageset_id) VALUES ('topic_read_locked_mine', 'topic_read_locked_mine.gif', '', 18, 19, 2); + INSERT INTO phpbb_styles_imageset_data (image_name, image_filename, image_lang, image_height, image_width, imageset_id) VALUES ('topic_unread', 'topic_unread.gif', '', 18, 19, 2); + INSERT INTO phpbb_styles_imageset_data (image_name, image_filename, image_lang, image_height, image_width, imageset_id) VALUES ('topic_unread_mine', 'topic_unread_mine.gif', '', 18, 19, 2); + INSERT INTO phpbb_styles_imageset_data (image_name, image_filename, image_lang, image_height, image_width, imageset_id) VALUES ('topic_unread_hot', 'topic_unread_hot.gif', '', 18, 19, 2); + INSERT INTO phpbb_styles_imageset_data (image_name, image_filename, image_lang, image_height, image_width, imageset_id) VALUES ('topic_unread_hot_mine', 'topic_unread_hot_mine.gif', '', 18, 19, 2); + INSERT INTO phpbb_styles_imageset_data (image_name, image_filename, image_lang, image_height, image_width, imageset_id) VALUES ('topic_unread_locked', 'topic_unread_locked.gif', '', 18, 19, 2); + INSERT INTO phpbb_styles_imageset_data (image_name, image_filename, image_lang, image_height, image_width, imageset_id) VALUES ('topic_unread_locked_mine', 'topic_unread_locked_mine.gif', '', 18, 19, 2); + INSERT INTO phpbb_styles_imageset_data (image_name, image_filename, image_lang, image_height, image_width, imageset_id) VALUES ('sticky_read', 'sticky_read.gif', '', 18, 19, 2); + INSERT INTO phpbb_styles_imageset_data (image_name, image_filename, image_lang, image_height, image_width, imageset_id) VALUES ('sticky_read_mine', 'sticky_read_mine.gif', '', 18, 19, 2); + INSERT INTO phpbb_styles_imageset_data (image_name, image_filename, image_lang, image_height, image_width, imageset_id) VALUES ('sticky_read_locked', 'sticky_read_locked.gif', '', 18, 19, 2); + INSERT INTO phpbb_styles_imageset_data (image_name, image_filename, image_lang, image_height, image_width, imageset_id) VALUES ('sticky_read_locked_mine', 'sticky_read_locked_mine.gif', '', 18, 19, 2); + INSERT INTO phpbb_styles_imageset_data (image_name, image_filename, image_lang, image_height, image_width, imageset_id) VALUES ('sticky_unread', 'sticky_unread.gif', '', 18, 19, 2); + INSERT INTO phpbb_styles_imageset_data (image_name, image_filename, image_lang, image_height, image_width, imageset_id) VALUES ('sticky_unread_mine', 'sticky_unread_mine.gif', '', 18, 19, 2); + INSERT INTO phpbb_styles_imageset_data (image_name, image_filename, image_lang, image_height, image_width, imageset_id) VALUES ('sticky_unread_locked', 'sticky_unread_locked.gif', '', 18, 19, 2); + INSERT INTO phpbb_styles_imageset_data (image_name, image_filename, image_lang, image_height, image_width, imageset_id) VALUES ('sticky_unread_locked_mine', 'sticky_unread_locked_mine.gif', '', 18, 19, 2); + INSERT INTO phpbb_styles_imageset_data (image_name, image_filename, image_lang, image_height, image_width, imageset_id) VALUES ('announce_read', 'announce_read.gif', '', 18, 19, 2); + INSERT INTO phpbb_styles_imageset_data (image_name, image_filename, image_lang, image_height, image_width, imageset_id) VALUES ('announce_read_mine', 'announce_read_mine.gif', '', 18, 19, 2); + INSERT INTO phpbb_styles_imageset_data (image_name, image_filename, image_lang, image_height, image_width, imageset_id) VALUES ('announce_read_locked', 'announce_read_locked.gif', '', 18, 19, 2); + INSERT INTO phpbb_styles_imageset_data (image_name, image_filename, image_lang, image_height, image_width, imageset_id) VALUES ('announce_read_locked_mine', 'announce_read_locked_mine.gif', '', 18, 19, 2); + INSERT INTO phpbb_styles_imageset_data (image_name, image_filename, image_lang, image_height, image_width, imageset_id) VALUES ('announce_unread', 'announce_unread.gif', '', 18, 19, 2); + INSERT INTO phpbb_styles_imageset_data (image_name, image_filename, image_lang, image_height, image_width, imageset_id) VALUES ('announce_unread_mine', 'announce_unread_mine.gif', '', 18, 19, 2); + INSERT INTO phpbb_styles_imageset_data (image_name, image_filename, image_lang, image_height, image_width, imageset_id) VALUES ('announce_unread_locked', 'announce_unread_locked.gif', '', 18, 19, 2); + INSERT INTO phpbb_styles_imageset_data (image_name, image_filename, image_lang, image_height, image_width, imageset_id) VALUES ('announce_unread_locked_mine', 'announce_unread_locked_mine.gif', '', 18, 19, 2); + INSERT INTO phpbb_styles_imageset_data (image_name, image_filename, image_lang, image_height, image_width, imageset_id) VALUES ('global_read', 'announce_read.gif', '', 18, 19, 2); + INSERT INTO phpbb_styles_imageset_data (image_name, image_filename, image_lang, image_height, image_width, imageset_id) VALUES ('global_read_mine', 'announce_read_mine.gif', '', 18, 19, 2); + INSERT INTO phpbb_styles_imageset_data (image_name, image_filename, image_lang, image_height, image_width, imageset_id) VALUES ('global_read_locked', 'announce_read_locked.gif', '', 18, 19, 2); + INSERT INTO phpbb_styles_imageset_data (image_name, image_filename, image_lang, image_height, image_width, imageset_id) VALUES ('global_read_locked_mine', 'announce_read_locked_mine.gif', '', 18, 19, 2); + INSERT INTO phpbb_styles_imageset_data (image_name, image_filename, image_lang, image_height, image_width, imageset_id) VALUES ('global_unread', 'announce_unread.gif', '', 18, 19, 2); + INSERT INTO phpbb_styles_imageset_data (image_name, image_filename, image_lang, image_height, image_width, imageset_id) VALUES ('global_unread_mine', 'announce_unread_mine.gif', '', 18, 19, 2); + INSERT INTO phpbb_styles_imageset_data (image_name, image_filename, image_lang, image_height, image_width, imageset_id) VALUES ('global_unread_locked', 'announce_unread_locked.gif', '', 18, 19, 2); + INSERT INTO phpbb_styles_imageset_data (image_name, image_filename, image_lang, image_height, image_width, imageset_id) VALUES ('global_unread_locked_mine', 'announce_unread_locked_mine.gif', '', 18, 19, 2); + INSERT INTO phpbb_styles_imageset_data (image_name, image_filename, image_lang, image_height, image_width, imageset_id) VALUES ('pm_read', 'topic_read.gif', '', 18, 19, 2); + INSERT INTO phpbb_styles_imageset_data (image_name, image_filename, image_lang, image_height, image_width, imageset_id) VALUES ('pm_unread', 'topic_unread.gif', '', 18, 19, 2); + INSERT INTO phpbb_styles_imageset_data (image_name, image_filename, image_lang, image_height, image_width, imageset_id) VALUES ('icon_post_target', 'icon_post_target.gif', '', 9, 12, 2); + INSERT INTO phpbb_styles_imageset_data (image_name, image_filename, image_lang, image_height, image_width, imageset_id) VALUES ('icon_post_target_unread', 'icon_post_target_unread.gif', '', 9, 12, 2); + INSERT INTO phpbb_styles_imageset_data (image_name, image_filename, image_lang, image_height, image_width, imageset_id) VALUES ('icon_topic_attach', 'icon_topic_attach.gif', '', 18, 14, 2); + INSERT INTO phpbb_styles_imageset_data (image_name, image_filename, image_lang, image_height, image_width, imageset_id) VALUES ('icon_topic_latest', 'icon_topic_latest.gif', '', 9, 18, 2); + INSERT INTO phpbb_styles_imageset_data (image_name, image_filename, image_lang, image_height, image_width, imageset_id) VALUES ('icon_topic_newest', 'icon_topic_newest.gif', '', 9, 18, 2); + INSERT INTO phpbb_styles_imageset_data (image_name, image_filename, image_lang, image_height, image_width, imageset_id) VALUES ('icon_topic_reported', 'icon_topic_reported.gif', '', 18, 19, 2); + INSERT INTO phpbb_styles_imageset_data (image_name, image_filename, image_lang, image_height, image_width, imageset_id) VALUES ('icon_topic_unapproved', 'icon_topic_unapproved.gif', '', 18, 19, 2); + INSERT INTO phpbb_styles_imageset_data (image_name, image_filename, image_lang, image_height, image_width, imageset_id) VALUES ('icon_contact_aim', 'icon_contact_aim.gif', 'en', 0, 0, 2); + INSERT INTO phpbb_styles_imageset_data (image_name, image_filename, image_lang, image_height, image_width, imageset_id) VALUES ('icon_contact_email', 'icon_contact_email.gif', 'en', 0, 0, 2); + INSERT INTO phpbb_styles_imageset_data (image_name, image_filename, image_lang, image_height, image_width, imageset_id) VALUES ('icon_contact_icq', 'icon_contact_icq.gif', 'en', 0, 0, 2); + INSERT INTO phpbb_styles_imageset_data (image_name, image_filename, image_lang, image_height, image_width, imageset_id) VALUES ('icon_contact_jabber', 'icon_contact_jabber.gif', 'en', 0, 0, 2); + INSERT INTO phpbb_styles_imageset_data (image_name, image_filename, image_lang, image_height, image_width, imageset_id) VALUES ('icon_contact_msnm', 'icon_contact_msnm.gif', 'en', 0, 0, 2); + INSERT INTO phpbb_styles_imageset_data (image_name, image_filename, image_lang, image_height, image_width, imageset_id) VALUES ('icon_contact_pm', 'icon_contact_pm.gif', 'en', 0, 0, 2); + INSERT INTO phpbb_styles_imageset_data (image_name, image_filename, image_lang, image_height, image_width, imageset_id) VALUES ('icon_contact_yahoo', 'icon_contact_yahoo.gif', 'en', 0, 0, 2); + INSERT INTO phpbb_styles_imageset_data (image_name, image_filename, image_lang, image_height, image_width, imageset_id) VALUES ('icon_contact_www', 'icon_contact_www.gif', 'en', 0, 0, 2); + INSERT INTO phpbb_styles_imageset_data (image_name, image_filename, image_lang, image_height, image_width, imageset_id) VALUES ('icon_post_delete', 'icon_post_delete.gif', 'en', 0, 0, 2); + INSERT INTO phpbb_styles_imageset_data (image_name, image_filename, image_lang, image_height, image_width, imageset_id) VALUES ('icon_post_edit', 'icon_post_edit.gif', 'en', 0, 0, 2); + INSERT INTO phpbb_styles_imageset_data (image_name, image_filename, image_lang, image_height, image_width, imageset_id) VALUES ('icon_post_info', 'icon_post_info.gif', 'en', 0, 0, 2); + INSERT INTO phpbb_styles_imageset_data (image_name, image_filename, image_lang, image_height, image_width, imageset_id) VALUES ('icon_post_quote', 'icon_post_quote.gif', 'en', 0, 0, 2); + INSERT INTO phpbb_styles_imageset_data (image_name, image_filename, image_lang, image_height, image_width, imageset_id) VALUES ('icon_post_report', 'icon_post_report.gif', 'en', 0, 0, 2); + INSERT INTO phpbb_styles_imageset_data (image_name, image_filename, image_lang, image_height, image_width, imageset_id) VALUES ('icon_user_online', 'icon_user_online.gif', 'en', 0, 0, 2); + INSERT INTO phpbb_styles_imageset_data (image_name, image_filename, image_lang, image_height, image_width, imageset_id) VALUES ('icon_user_offline', 'icon_user_offline.gif', 'en', 0, 0, 2); + INSERT INTO phpbb_styles_imageset_data (image_name, image_filename, image_lang, image_height, image_width, imageset_id) VALUES ('icon_user_profile', 'icon_user_profile.gif', 'en', 0, 0, 2); + INSERT INTO phpbb_styles_imageset_data (image_name, image_filename, image_lang, image_height, image_width, imageset_id) VALUES ('icon_user_search', 'icon_user_search.gif', 'en', 0, 0, 2); + INSERT INTO phpbb_styles_imageset_data (image_name, image_filename, image_lang, image_height, image_width, imageset_id) VALUES ('icon_user_warn', 'icon_user_warn.gif', 'en', 0, 0, 2); + INSERT INTO phpbb_styles_imageset_data (image_name, image_filename, image_lang, image_height, image_width, imageset_id) VALUES ('button_pm_new', 'button_pm_new.gif', 'en', 0, 0, 2); + INSERT INTO phpbb_styles_imageset_data (image_name, image_filename, image_lang, image_height, image_width, imageset_id) VALUES ('button_pm_reply', 'button_pm_reply.gif', 'en', 0, 0, 2); + INSERT INTO phpbb_styles_imageset_data (image_name, image_filename, image_lang, image_height, image_width, imageset_id) VALUES ('button_topic_locked', 'button_topic_locked.gif', 'en', 0, 0, 2); + INSERT INTO phpbb_styles_imageset_data (image_name, image_filename, image_lang, image_height, image_width, imageset_id) VALUES ('button_topic_new', 'button_topic_new.gif', 'en', 0, 0, 2); + INSERT INTO phpbb_styles_imageset_data (image_name, image_filename, image_lang, image_height, image_width, imageset_id) VALUES ('button_topic_reply', 'button_topic_reply.gif', 'en', 0, 0, 2); + INSERT INTO phpbb_styles_imageset_data (image_name, image_filename, image_lang, image_height, image_width, imageset_id) VALUES ('icon_contact_aim', 'icon_contact_aim.gif', 'nl', 0, 0, 2); + INSERT INTO phpbb_styles_imageset_data (image_name, image_filename, image_lang, image_height, image_width, imageset_id) VALUES ('icon_contact_email', 'icon_contact_email.gif', 'nl', 0, 0, 2); + INSERT INTO phpbb_styles_imageset_data (image_name, image_filename, image_lang, image_height, image_width, imageset_id) VALUES ('icon_contact_icq', 'icon_contact_icq.gif', 'nl', 0, 0, 2); + INSERT INTO phpbb_styles_imageset_data (image_name, image_filename, image_lang, image_height, image_width, imageset_id) VALUES ('icon_contact_jabber', 'icon_contact_jabber.gif', 'nl', 0, 0, 2); + INSERT INTO phpbb_styles_imageset_data (image_name, image_filename, image_lang, image_height, image_width, imageset_id) VALUES ('icon_contact_msnm', 'icon_contact_msnm.gif', 'nl', 0, 0, 2); + INSERT INTO phpbb_styles_imageset_data (image_name, image_filename, image_lang, image_height, image_width, imageset_id) VALUES ('icon_contact_pm', 'icon_contact_pm.gif', 'nl', 0, 0, 2); + INSERT INTO phpbb_styles_imageset_data (image_name, image_filename, image_lang, image_height, image_width, imageset_id) VALUES ('icon_contact_yahoo', 'icon_contact_yahoo.gif', 'nl', 0, 0, 2); + INSERT INTO phpbb_styles_imageset_data (image_name, image_filename, image_lang, image_height, image_width, imageset_id) VALUES ('icon_contact_www', 'icon_contact_www.gif', 'nl', 0, 0, 2); + INSERT INTO phpbb_styles_imageset_data (image_name, image_filename, image_lang, image_height, image_width, imageset_id) VALUES ('icon_post_delete', 'icon_post_delete.gif', 'nl', 0, 0, 2); + INSERT INTO phpbb_styles_imageset_data (image_name, image_filename, image_lang, image_height, image_width, imageset_id) VALUES ('icon_post_edit', 'icon_post_edit.gif', 'nl', 0, 0, 2); + INSERT INTO phpbb_styles_imageset_data (image_name, image_filename, image_lang, image_height, image_width, imageset_id) VALUES ('icon_post_info', 'icon_post_info.gif', 'nl', 0, 0, 2); + INSERT INTO phpbb_styles_imageset_data (image_name, image_filename, image_lang, image_height, image_width, imageset_id) VALUES ('icon_post_quote', 'icon_post_quote.gif', 'nl', 0, 0, 2); + INSERT INTO phpbb_styles_imageset_data (image_name, image_filename, image_lang, image_height, image_width, imageset_id) VALUES ('icon_post_report', 'icon_post_report.gif', 'nl', 0, 0, 2); + INSERT INTO phpbb_styles_imageset_data (image_name, image_filename, image_lang, image_height, image_width, imageset_id) VALUES ('icon_user_online', 'icon_user_online.gif', 'nl', 0, 0, 2); + INSERT INTO phpbb_styles_imageset_data (image_name, image_filename, image_lang, image_height, image_width, imageset_id) VALUES ('icon_user_offline', 'icon_user_offline.gif', 'nl', 0, 0, 2); + INSERT INTO phpbb_styles_imageset_data (image_name, image_filename, image_lang, image_height, image_width, imageset_id) VALUES ('icon_user_profile', 'icon_user_profile.gif', 'nl', 0, 0, 2); + INSERT INTO phpbb_styles_imageset_data (image_name, image_filename, image_lang, image_height, image_width, imageset_id) VALUES ('icon_user_search', 'icon_user_search.gif', 'nl', 0, 0, 2); + INSERT INTO phpbb_styles_imageset_data (image_name, image_filename, image_lang, image_height, image_width, imageset_id) VALUES ('icon_user_warn', 'icon_user_warn.gif', 'nl', 0, 0, 2); + INSERT INTO phpbb_styles_imageset_data (image_name, image_filename, image_lang, image_height, image_width, imageset_id) VALUES ('button_pm_new', 'button_pm_new.gif', 'nl', 0, 0, 2); + INSERT INTO phpbb_styles_imageset_data (image_name, image_filename, image_lang, image_height, image_width, imageset_id) VALUES ('button_pm_reply', 'button_pm_reply.gif', 'nl', 0, 0, 2); + INSERT INTO phpbb_styles_imageset_data (image_name, image_filename, image_lang, image_height, image_width, imageset_id) VALUES ('button_topic_locked', 'button_topic_locked.gif', 'nl', 0, 0, 2); + INSERT INTO phpbb_styles_imageset_data (image_name, image_filename, image_lang, image_height, image_width, imageset_id) VALUES ('button_topic_new', 'button_topic_new.gif', 'nl', 0, 0, 2); + INSERT INTO phpbb_styles_imageset_data (image_name, image_filename, image_lang, image_height, image_width, imageset_id) VALUES ('button_topic_reply', 'button_topic_reply.gif', 'nl', 0, 0, 2); + INSERT INTO phpbb_styles_imageset_data (image_name, image_filename, image_lang, image_height, image_width, imageset_id) VALUES ('site_logo', 'site_logo.gif', '', 52, 139, 1); + INSERT INTO phpbb_styles_imageset_data (image_name, image_filename, image_lang, image_height, image_width, imageset_id) VALUES ('upload_bar', 'progress_bar.gif', '', 16, 280, 1); + INSERT INTO phpbb_styles_imageset_data (image_name, image_filename, image_lang, image_height, image_width, imageset_id) VALUES ('forum_link', 'forum_link.gif', '', 27, 27, 1); + INSERT INTO phpbb_styles_imageset_data (image_name, image_filename, image_lang, image_height, image_width, imageset_id) VALUES ('forum_read', 'forum_read.gif', '', 27, 27, 1); + INSERT INTO phpbb_styles_imageset_data (image_name, image_filename, image_lang, image_height, image_width, imageset_id) VALUES ('forum_read_locked', 'forum_read_locked.gif', '', 27, 27, 1); + INSERT INTO phpbb_styles_imageset_data (image_name, image_filename, image_lang, image_height, image_width, imageset_id) VALUES ('forum_read_subforum', 'forum_read_subforum.gif', '', 27, 27, 1); + INSERT INTO phpbb_styles_imageset_data (image_name, image_filename, image_lang, image_height, image_width, imageset_id) VALUES ('forum_unread', 'forum_unread.gif', '', 27, 27, 1); + INSERT INTO phpbb_styles_imageset_data (image_name, image_filename, image_lang, image_height, image_width, imageset_id) VALUES ('forum_unread_locked', 'forum_read_locked.gif', '', 27, 27, 1); + INSERT INTO phpbb_styles_imageset_data (image_name, image_filename, image_lang, image_height, image_width, imageset_id) VALUES ('forum_unread_subforum', 'forum_unread_subforum.gif', '', 27, 27, 1); + INSERT INTO phpbb_styles_imageset_data (image_name, image_filename, image_lang, image_height, image_width, imageset_id) VALUES ('topic_moved', 'topic_moved.gif', '', 27, 27, 1); + INSERT INTO phpbb_styles_imageset_data (image_name, image_filename, image_lang, image_height, image_width, imageset_id) VALUES ('topic_read', 'topic_read.gif', '', 27, 27, 1); + INSERT INTO phpbb_styles_imageset_data (image_name, image_filename, image_lang, image_height, image_width, imageset_id) VALUES ('topic_read_mine', 'topic_read_mine.gif', '', 27, 27, 1); + INSERT INTO phpbb_styles_imageset_data (image_name, image_filename, image_lang, image_height, image_width, imageset_id) VALUES ('topic_read_hot', 'topic_read_hot.gif', '', 27, 27, 1); + INSERT INTO phpbb_styles_imageset_data (image_name, image_filename, image_lang, image_height, image_width, imageset_id) VALUES ('topic_read_hot_mine', 'topic_read_hot_mine.gif', '', 27, 27, 1); + INSERT INTO phpbb_styles_imageset_data (image_name, image_filename, image_lang, image_height, image_width, imageset_id) VALUES ('topic_read_locked', 'topic_read_locked.gif', '', 27, 27, 1); + INSERT INTO phpbb_styles_imageset_data (image_name, image_filename, image_lang, image_height, image_width, imageset_id) VALUES ('topic_read_locked_mine', 'topic_read_locked_mine.gif', '', 27, 27, 1); + INSERT INTO phpbb_styles_imageset_data (image_name, image_filename, image_lang, image_height, image_width, imageset_id) VALUES ('topic_unread', 'topic_unread.gif', '', 27, 27, 1); + INSERT INTO phpbb_styles_imageset_data (image_name, image_filename, image_lang, image_height, image_width, imageset_id) VALUES ('topic_unread_mine', 'topic_unread_mine.gif', '', 27, 27, 1); + INSERT INTO phpbb_styles_imageset_data (image_name, image_filename, image_lang, image_height, image_width, imageset_id) VALUES ('topic_unread_hot', 'topic_unread_hot.gif', '', 27, 27, 1); + INSERT INTO phpbb_styles_imageset_data (image_name, image_filename, image_lang, image_height, image_width, imageset_id) VALUES ('topic_unread_hot_mine', 'topic_unread_hot_mine.gif', '', 27, 27, 1); + INSERT INTO phpbb_styles_imageset_data (image_name, image_filename, image_lang, image_height, image_width, imageset_id) VALUES ('topic_unread_locked', 'topic_unread_locked.gif', '', 27, 27, 1); + INSERT INTO phpbb_styles_imageset_data (image_name, image_filename, image_lang, image_height, image_width, imageset_id) VALUES ('topic_unread_locked_mine', 'topic_unread_locked_mine.gif', '', 27, 27, 1); + INSERT INTO phpbb_styles_imageset_data (image_name, image_filename, image_lang, image_height, image_width, imageset_id) VALUES ('sticky_read', 'sticky_read.gif', '', 27, 27, 1); + INSERT INTO phpbb_styles_imageset_data (image_name, image_filename, image_lang, image_height, image_width, imageset_id) VALUES ('sticky_read_mine', 'sticky_read_mine.gif', '', 27, 27, 1); + INSERT INTO phpbb_styles_imageset_data (image_name, image_filename, image_lang, image_height, image_width, imageset_id) VALUES ('sticky_read_locked', 'sticky_read.gif', '', 27, 27, 1); + INSERT INTO phpbb_styles_imageset_data (image_name, image_filename, image_lang, image_height, image_width, imageset_id) VALUES ('sticky_read_locked_mine', 'sticky_read_mine.gif', '', 27, 27, 1); + INSERT INTO phpbb_styles_imageset_data (image_name, image_filename, image_lang, image_height, image_width, imageset_id) VALUES ('sticky_unread', 'sticky_unread.gif', '', 27, 27, 1); + INSERT INTO phpbb_styles_imageset_data (image_name, image_filename, image_lang, image_height, image_width, imageset_id) VALUES ('sticky_unread_mine', 'sticky_unread_mine.gif', '', 27, 27, 1); + INSERT INTO phpbb_styles_imageset_data (image_name, image_filename, image_lang, image_height, image_width, imageset_id) VALUES ('sticky_unread_locked', 'sticky_unread.gif', '', 27, 27, 1); + INSERT INTO phpbb_styles_imageset_data (image_name, image_filename, image_lang, image_height, image_width, imageset_id) VALUES ('sticky_unread_locked_mine', 'sticky_unread_locked_mine.gif', '', 27, 27, 1); + INSERT INTO phpbb_styles_imageset_data (image_name, image_filename, image_lang, image_height, image_width, imageset_id) VALUES ('announce_read', 'announce_read.gif', '', 27, 27, 1); + INSERT INTO phpbb_styles_imageset_data (image_name, image_filename, image_lang, image_height, image_width, imageset_id) VALUES ('announce_read_mine', 'announce_read_mine.gif', '', 27, 27, 1); + INSERT INTO phpbb_styles_imageset_data (image_name, image_filename, image_lang, image_height, image_width, imageset_id) VALUES ('announce_read_locked', 'announce_read_locked.gif', '', 27, 27, 1); + INSERT INTO phpbb_styles_imageset_data (image_name, image_filename, image_lang, image_height, image_width, imageset_id) VALUES ('announce_read_locked_mine', 'announce_read_locked_mine.gif', '', 27, 27, 1); + INSERT INTO phpbb_styles_imageset_data (image_name, image_filename, image_lang, image_height, image_width, imageset_id) VALUES ('announce_unread', 'announce_unread.gif', '', 27, 27, 1); + INSERT INTO phpbb_styles_imageset_data (image_name, image_filename, image_lang, image_height, image_width, imageset_id) VALUES ('announce_unread_mine', 'announce_unread_mine.gif', '', 27, 27, 1); + INSERT INTO phpbb_styles_imageset_data (image_name, image_filename, image_lang, image_height, image_width, imageset_id) VALUES ('announce_unread_locked', 'announce_unread.gif', '', 27, 27, 1); + INSERT INTO phpbb_styles_imageset_data (image_name, image_filename, image_lang, image_height, image_width, imageset_id) VALUES ('announce_unread_locked_mine', 'announce_unread_locked_mine.gif', '', 27, 27, 1); + INSERT INTO phpbb_styles_imageset_data (image_name, image_filename, image_lang, image_height, image_width, imageset_id) VALUES ('global_read', 'announce_read.gif', '', 27, 27, 1); + INSERT INTO phpbb_styles_imageset_data (image_name, image_filename, image_lang, image_height, image_width, imageset_id) VALUES ('global_read_mine', 'announce_read_mine.gif', '', 27, 27, 1); + INSERT INTO phpbb_styles_imageset_data (image_name, image_filename, image_lang, image_height, image_width, imageset_id) VALUES ('global_read_locked', 'announce_read_locked.gif', '', 27, 27, 1); + INSERT INTO phpbb_styles_imageset_data (image_name, image_filename, image_lang, image_height, image_width, imageset_id) VALUES ('global_read_locked_mine', 'announce_read_locked_mine.gif', '', 27, 27, 1); + INSERT INTO phpbb_styles_imageset_data (image_name, image_filename, image_lang, image_height, image_width, imageset_id) VALUES ('global_unread', 'announce_unread.gif', '', 27, 27, 1); + INSERT INTO phpbb_styles_imageset_data (image_name, image_filename, image_lang, image_height, image_width, imageset_id) VALUES ('global_unread_mine', 'announce_unread_mine.gif', '', 27, 27, 1); + INSERT INTO phpbb_styles_imageset_data (image_name, image_filename, image_lang, image_height, image_width, imageset_id) VALUES ('global_unread_locked', 'announce_unread_locked_mine.gif', '', 27, 27, 1); + INSERT INTO phpbb_styles_imageset_data (image_name, image_filename, image_lang, image_height, image_width, imageset_id) VALUES ('global_unread_locked_mine', 'announce_unread_locked_mine.gif', '', 27, 27, 1); + INSERT INTO phpbb_styles_imageset_data (image_name, image_filename, image_lang, image_height, image_width, imageset_id) VALUES ('pm_read', 'topic_read.gif', '', 27, 27, 1); + INSERT INTO phpbb_styles_imageset_data (image_name, image_filename, image_lang, image_height, image_width, imageset_id) VALUES ('pm_unread', 'topic_unread.gif', '', 27, 27, 1); + INSERT INTO phpbb_styles_imageset_data (image_name, image_filename, image_lang, image_height, image_width, imageset_id) VALUES ('icon_contact_aim', 'icon_contact_aim.gif', '', 20, 72, 1); + INSERT INTO phpbb_styles_imageset_data (image_name, image_filename, image_lang, image_height, image_width, imageset_id) VALUES ('icon_contact_email', 'icon_contact_email.gif', '', 20, 72, 1); + INSERT INTO phpbb_styles_imageset_data (image_name, image_filename, image_lang, image_height, image_width, imageset_id) VALUES ('icon_contact_icq', 'icon_contact_icq.gif', '', 20, 72, 1); + INSERT INTO phpbb_styles_imageset_data (image_name, image_filename, image_lang, image_height, image_width, imageset_id) VALUES ('icon_contact_jabber', 'icon_contact_jabber.gif', '', 20, 72, 1); + INSERT INTO phpbb_styles_imageset_data (image_name, image_filename, image_lang, image_height, image_width, imageset_id) VALUES ('icon_contact_msnm', 'icon_contact_msnm.gif', '', 20, 72, 1); + INSERT INTO phpbb_styles_imageset_data (image_name, image_filename, image_lang, image_height, image_width, imageset_id) VALUES ('icon_contact_www', 'icon_contact_www.gif', '', 20, 72, 1); + INSERT INTO phpbb_styles_imageset_data (image_name, image_filename, image_lang, image_height, image_width, imageset_id) VALUES ('icon_contact_yahoo', 'icon_contact_yahoo.gif', '', 20, 72, 1); + INSERT INTO phpbb_styles_imageset_data (image_name, image_filename, image_lang, image_height, image_width, imageset_id) VALUES ('icon_post_delete', 'icon_post_delete.gif', '', 20, 20, 1); + INSERT INTO phpbb_styles_imageset_data (image_name, image_filename, image_lang, image_height, image_width, imageset_id) VALUES ('icon_post_info', 'icon_post_info.gif', '', 20, 20, 1); + INSERT INTO phpbb_styles_imageset_data (image_name, image_filename, image_lang, image_height, image_width, imageset_id) VALUES ('icon_post_report', 'icon_post_report.gif', '', 20, 20, 1); + INSERT INTO phpbb_styles_imageset_data (image_name, image_filename, image_lang, image_height, image_width, imageset_id) VALUES ('icon_post_target', 'icon_post_target.gif', '', 9, 12, 1); + INSERT INTO phpbb_styles_imageset_data (image_name, image_filename, image_lang, image_height, image_width, imageset_id) VALUES ('icon_post_target_unread', 'icon_post_target_unread.gif', '', 9, 12, 1); + INSERT INTO phpbb_styles_imageset_data (image_name, image_filename, image_lang, image_height, image_width, imageset_id) VALUES ('icon_topic_attach', 'icon_topic_attach.gif', '', 10, 7, 1); + INSERT INTO phpbb_styles_imageset_data (image_name, image_filename, image_lang, image_height, image_width, imageset_id) VALUES ('icon_topic_latest', 'icon_topic_latest.gif', '', 9, 12, 1); + INSERT INTO phpbb_styles_imageset_data (image_name, image_filename, image_lang, image_height, image_width, imageset_id) VALUES ('icon_topic_newest', 'icon_topic_newest.gif', '', 9, 12, 1); + INSERT INTO phpbb_styles_imageset_data (image_name, image_filename, image_lang, image_height, image_width, imageset_id) VALUES ('icon_topic_reported', 'icon_topic_reported.gif', '', 14, 16, 1); + INSERT INTO phpbb_styles_imageset_data (image_name, image_filename, image_lang, image_height, image_width, imageset_id) VALUES ('icon_topic_unapproved', 'icon_topic_unapproved.gif', '', 14, 16, 1); + INSERT INTO phpbb_styles_imageset_data (image_name, image_filename, image_lang, image_height, image_width, imageset_id) VALUES ('icon_user_profile', 'icon_user_profile.gif', '', 11, 11, 1); + INSERT INTO phpbb_styles_imageset_data (image_name, image_filename, image_lang, image_height, image_width, imageset_id) VALUES ('icon_user_warn', 'icon_post_report.gif', '', 20, 20, 1); + INSERT INTO phpbb_styles_imageset_data (image_name, image_filename, image_lang, image_height, image_width, imageset_id) VALUES ('icon_contact_pm', 'icon_contact_pm.gif', 'en', 40, 28, 1); + INSERT INTO phpbb_styles_imageset_data (image_name, image_filename, image_lang, image_height, image_width, imageset_id) VALUES ('icon_post_edit', 'icon_post_edit.gif', 'en', 40, 42, 1); + INSERT INTO phpbb_styles_imageset_data (image_name, image_filename, image_lang, image_height, image_width, imageset_id) VALUES ('icon_post_quote', 'icon_post_quote.gif', 'en', 40, 54, 1); + INSERT INTO phpbb_styles_imageset_data (image_name, image_filename, image_lang, image_height, image_width, imageset_id) VALUES ('icon_user_online', 'icon_user_online.gif', 'en', 0, 0, 1); + INSERT INTO phpbb_styles_imageset_data (image_name, image_filename, image_lang, image_height, image_width, imageset_id) VALUES ('icon_user_offline', 'icon_user_offline.gif', 'en', 0, 0, 1); + INSERT INTO phpbb_styles_imageset_data (image_name, image_filename, image_lang, image_height, image_width, imageset_id) VALUES ('icon_user_search', 'icon_user_search.gif', 'en', 0, 0, 1); + INSERT INTO phpbb_styles_imageset_data (image_name, image_filename, image_lang, image_height, image_width, imageset_id) VALUES ('button_pm_forward', 'button_pm_forward.gif', 'en', 0, 0, 1); + INSERT INTO phpbb_styles_imageset_data (image_name, image_filename, image_lang, image_height, image_width, imageset_id) VALUES ('button_pm_new', 'button_pm_new.gif', 'en', 0, 0, 1); + INSERT INTO phpbb_styles_imageset_data (image_name, image_filename, image_lang, image_height, image_width, imageset_id) VALUES ('button_pm_reply', 'button_pm_reply.gif', 'en', 0, 0, 1); + INSERT INTO phpbb_styles_imageset_data (image_name, image_filename, image_lang, image_height, image_width, imageset_id) VALUES ('button_topic_locked', 'button_topic_locked.gif', 'en', 0, 0, 1); + INSERT INTO phpbb_styles_imageset_data (image_name, image_filename, image_lang, image_height, image_width, imageset_id) VALUES ('button_topic_new', 'button_topic_new.gif', 'en', 0, 0, 1); + INSERT INTO phpbb_styles_imageset_data (image_name, image_filename, image_lang, image_height, image_width, imageset_id) VALUES ('button_topic_reply', 'button_topic_reply.gif', 'en', 0, 0, 1);"; + $data = str_replace('phpbb_', $table_prefix, $data); + $sql_ary = explode("\n", $data); + + foreach ($sql_ary as $sql) + { + $db->sql_query($sql); + } + // sorting thang if ($map_dbms === 'mysql_41') { @@ -1080,6 +1541,103 @@ function sql_column_add($dbms, $table_name, $column_name, $column_data) } } +/** +* Drop column +*/ +function sql_column_remove($dbms, $table_name, $column_name) +{ + global $errored, $error_ary; + + switch ($dbms) + { + case 'firebird': + $sql = 'ALTER TABLE "' . $table_name . '" DROP "' . $column_name . '"'; + _sql($sql, $errored, $error_ary); + break; + + case 'mssql': + $sql = 'ALTER TABLE [' . $table_name . '] DROP COLUMN [' . $column_name . ']'; + _sql($sql, $errored, $error_ary); + break; + + case 'mysql_40': + case 'mysql_41': + $sql = 'ALTER TABLE `' . $table_name . '` DROP COLUMN `' . $column_name . '`'; + _sql($sql, $errored, $error_ary); + break; + + case 'oracle': + $sql = 'ALTER TABLE ' . $table_name . ' DROP ' . $column_name; + _sql($sql, $errored, $error_ary); + break; + + case 'postgres': + $sql = 'ALTER TABLE ' . $table_name . ' DROP COLUMN "' . $column_name . '"'; + _sql($sql, $errored, $error_ary); + break; + + case 'sqlite': + if (version_compare(sqlite_libversion(), '3.0') == -1) + { + global $db; + $sql = "SELECT sql + FROM sqlite_master + WHERE type = 'table' + AND name = '{$table_name}' + ORDER BY type DESC, name;"; + $result = $db->sql_query($sql); + + if (!$result) + { + break; + } + + $row = $db->sql_fetchrow($result); + $db->sql_freeresult($result); + + $db->sql_transaction('begin'); + + // Create a backup table and populate it, destroy the existing one + $db->sql_query(preg_replace('#CREATE\s+TABLE\s+"?' . $table_name . '"?#i', 'CREATE TEMPORARY TABLE ' . $table_name . '_temp', $row['sql'])); + $db->sql_query('INSERT INTO ' . $table_name . '_temp SELECT * FROM ' . $table_name); + $db->sql_query('DROP TABLE ' . $table_name); + + preg_match('#\((.*)\)#s', $row['sql'], $matches); + + $new_table_cols = trim($matches[1]); + $old_table_cols = preg_split('/,(?![\s\w]+\))/m', $new_table_cols); + $column_list = array(); + + foreach ($old_table_cols as $declaration) + { + $entities = preg_split('#\s+#', trim($declaration)); + if ($entities[0] == 'PRIMARY' || $entities[0] === '$column_name') + { + continue; + } + $column_list[] = $entities[0]; + } + + $columns = implode(',', $column_list); + + $new_table_cols = $new_table_cols = preg_replace('/' . $column_name . '[^,]+(?:,|$)/m', '', $new_table_cols); + + // create a new table and fill it up. destroy the temp one + $db->sql_query('CREATE TABLE ' . $table_name . ' (' . $new_table_cols . ');'); + $db->sql_query('INSERT INTO ' . $table_name . ' (' . $columns . ') SELECT ' . $columns . ' FROM ' . $table_name . '_temp;'); + $db->sql_query('DROP TABLE ' . $table_name . '_temp'); + + $db->sql_transaction('commit'); + } + else + { + $sql = 'ALTER TABLE ' . $table_name . ' DROP COLUMN ' . $column_name; + _sql($sql, $errored, $error_ary); + } + break; + } +} + function sql_index_drop($dbms, $index_name, $table_name) { global $dbms_type_map, $db; diff --git a/phpBB/install/schemas/firebird_schema.sql b/phpBB/install/schemas/firebird_schema.sql index 2e3ab48a97..e48b36c6b8 100644 --- a/phpBB/install/schemas/firebird_schema.sql +++ b/phpBB/install/schemas/firebird_schema.sql @@ -1148,101 +1148,7 @@ CREATE TABLE phpbb_styles_imageset ( imageset_id INTEGER NOT NULL, imageset_name VARCHAR(255) CHARACTER SET UTF8 DEFAULT '' NOT NULL COLLATE UNICODE, imageset_copyright VARCHAR(255) CHARACTER SET UTF8 DEFAULT '' NOT NULL COLLATE UNICODE, - imageset_path VARCHAR(100) CHARACTER SET NONE DEFAULT '' NOT NULL, - site_logo VARCHAR(200) CHARACTER SET NONE DEFAULT '' NOT NULL, - upload_bar VARCHAR(200) CHARACTER SET NONE DEFAULT '' NOT NULL, - poll_left VARCHAR(200) CHARACTER SET NONE DEFAULT '' NOT NULL, - poll_center VARCHAR(200) CHARACTER SET NONE DEFAULT '' NOT NULL, - poll_right VARCHAR(200) CHARACTER SET NONE DEFAULT '' NOT NULL, - icon_friend VARCHAR(200) CHARACTER SET NONE DEFAULT '' NOT NULL, - icon_foe VARCHAR(200) CHARACTER SET NONE DEFAULT '' NOT NULL, - forum_link VARCHAR(200) CHARACTER SET NONE DEFAULT '' NOT NULL, - forum_read VARCHAR(200) CHARACTER SET NONE DEFAULT '' NOT NULL, - forum_read_locked VARCHAR(200) CHARACTER SET NONE DEFAULT '' NOT NULL, - forum_read_subforum VARCHAR(200) CHARACTER SET NONE DEFAULT '' NOT NULL, - forum_unread VARCHAR(200) CHARACTER SET NONE DEFAULT '' NOT NULL, - forum_unread_locked VARCHAR(200) CHARACTER SET NONE DEFAULT '' NOT NULL, - forum_unread_subforum VARCHAR(200) CHARACTER SET NONE DEFAULT '' NOT NULL, - topic_moved VARCHAR(200) CHARACTER SET NONE DEFAULT '' NOT NULL, - topic_read VARCHAR(200) CHARACTER SET NONE DEFAULT '' NOT NULL, - topic_read_mine VARCHAR(200) CHARACTER SET NONE DEFAULT '' NOT NULL, - topic_read_hot VARCHAR(200) CHARACTER SET NONE DEFAULT '' NOT NULL, - topic_read_hot_mine VARCHAR(200) CHARACTER SET NONE DEFAULT '' NOT NULL, - topic_read_locked VARCHAR(200) CHARACTER SET NONE DEFAULT '' NOT NULL, - topic_read_locked_mine VARCHAR(200) CHARACTER SET NONE DEFAULT '' NOT NULL, - topic_unread VARCHAR(200) CHARACTER SET NONE DEFAULT '' NOT NULL, - topic_unread_mine VARCHAR(200) CHARACTER SET NONE DEFAULT '' NOT NULL, - topic_unread_hot VARCHAR(200) CHARACTER SET NONE DEFAULT '' NOT NULL, - topic_unread_hot_mine VARCHAR(200) CHARACTER SET NONE DEFAULT '' NOT NULL, - topic_unread_locked VARCHAR(200) CHARACTER SET NONE DEFAULT '' NOT NULL, - topic_unread_locked_mine VARCHAR(200) CHARACTER SET NONE DEFAULT '' NOT NULL, - sticky_read VARCHAR(200) CHARACTER SET NONE DEFAULT '' NOT NULL, - sticky_read_mine VARCHAR(200) CHARACTER SET NONE DEFAULT '' NOT NULL, - sticky_read_locked VARCHAR(200) CHARACTER SET NONE DEFAULT '' NOT NULL, - sticky_read_locked_mine VARCHAR(200) CHARACTER SET NONE DEFAULT '' NOT NULL, - sticky_unread VARCHAR(200) CHARACTER SET NONE DEFAULT '' NOT NULL, - sticky_unread_mine VARCHAR(200) CHARACTER SET NONE DEFAULT '' NOT NULL, - sticky_unread_locked VARCHAR(200) CHARACTER SET NONE DEFAULT '' NOT NULL, - sticky_unread_locked_mine VARCHAR(200) CHARACTER SET NONE DEFAULT '' NOT NULL, - announce_read VARCHAR(200) CHARACTER SET NONE DEFAULT '' NOT NULL, - announce_read_mine VARCHAR(200) CHARACTER SET NONE DEFAULT '' NOT NULL, - announce_read_locked VARCHAR(200) CHARACTER SET NONE DEFAULT '' NOT NULL, - announce_read_locked_mine VARCHAR(200) CHARACTER SET NONE DEFAULT '' NOT NULL, - announce_unread VARCHAR(200) CHARACTER SET NONE DEFAULT '' NOT NULL, - announce_unread_mine VARCHAR(200) CHARACTER SET NONE DEFAULT '' NOT NULL, - announce_unread_locked VARCHAR(200) CHARACTER SET NONE DEFAULT '' NOT NULL, - announce_unread_locked_mine VARCHAR(200) CHARACTER SET NONE DEFAULT '' NOT NULL, - global_read VARCHAR(200) CHARACTER SET NONE DEFAULT '' NOT NULL, - global_read_mine VARCHAR(200) CHARACTER SET NONE DEFAULT '' NOT NULL, - global_read_locked VARCHAR(200) CHARACTER SET NONE DEFAULT '' NOT NULL, - global_read_locked_mine VARCHAR(200) CHARACTER SET NONE DEFAULT '' NOT NULL, - global_unread VARCHAR(200) CHARACTER SET NONE DEFAULT '' NOT NULL, - global_unread_mine VARCHAR(200) CHARACTER SET NONE DEFAULT '' NOT NULL, - global_unread_locked VARCHAR(200) CHARACTER SET NONE DEFAULT '' NOT NULL, - global_unread_locked_mine VARCHAR(200) CHARACTER SET NONE DEFAULT '' NOT NULL, - pm_read VARCHAR(200) CHARACTER SET NONE DEFAULT '' NOT NULL, - pm_unread VARCHAR(200) CHARACTER SET NONE DEFAULT '' NOT NULL, - icon_contact_aim VARCHAR(200) CHARACTER SET NONE DEFAULT '' NOT NULL, - icon_contact_email VARCHAR(200) CHARACTER SET NONE DEFAULT '' NOT NULL, - icon_contact_icq VARCHAR(200) CHARACTER SET NONE DEFAULT '' NOT NULL, - icon_contact_jabber VARCHAR(200) CHARACTER SET NONE DEFAULT '' NOT NULL, - icon_contact_msnm VARCHAR(200) CHARACTER SET NONE DEFAULT '' NOT NULL, - icon_contact_pm VARCHAR(200) CHARACTER SET NONE DEFAULT '' NOT NULL, - icon_contact_yahoo VARCHAR(200) CHARACTER SET NONE DEFAULT '' NOT NULL, - icon_contact_www VARCHAR(200) CHARACTER SET NONE DEFAULT '' NOT NULL, - icon_post_delete VARCHAR(200) CHARACTER SET NONE DEFAULT '' NOT NULL, - icon_post_edit VARCHAR(200) CHARACTER SET NONE DEFAULT '' NOT NULL, - icon_post_info VARCHAR(200) CHARACTER SET NONE DEFAULT '' NOT NULL, - icon_post_quote VARCHAR(200) CHARACTER SET NONE DEFAULT '' NOT NULL, - icon_post_report VARCHAR(200) CHARACTER SET NONE DEFAULT '' NOT NULL, - icon_post_target VARCHAR(200) CHARACTER SET NONE DEFAULT '' NOT NULL, - icon_post_target_unread VARCHAR(200) CHARACTER SET NONE DEFAULT '' NOT NULL, - icon_topic_attach VARCHAR(200) CHARACTER SET NONE DEFAULT '' NOT NULL, - icon_topic_latest VARCHAR(200) CHARACTER SET NONE DEFAULT '' NOT NULL, - icon_topic_newest VARCHAR(200) CHARACTER SET NONE DEFAULT '' NOT NULL, - icon_topic_reported VARCHAR(200) CHARACTER SET NONE DEFAULT '' NOT NULL, - icon_topic_unapproved VARCHAR(200) CHARACTER SET NONE DEFAULT '' NOT NULL, - icon_user_online VARCHAR(200) CHARACTER SET NONE DEFAULT '' NOT NULL, - icon_user_offline VARCHAR(200) CHARACTER SET NONE DEFAULT '' NOT NULL, - icon_user_profile VARCHAR(200) CHARACTER SET NONE DEFAULT '' NOT NULL, - icon_user_search VARCHAR(200) CHARACTER SET NONE DEFAULT '' NOT NULL, - icon_user_warn VARCHAR(200) CHARACTER SET NONE DEFAULT '' NOT NULL, - button_pm_forward VARCHAR(200) CHARACTER SET NONE DEFAULT '' NOT NULL, - button_pm_new VARCHAR(200) CHARACTER SET NONE DEFAULT '' NOT NULL, - button_pm_reply VARCHAR(200) CHARACTER SET NONE DEFAULT '' NOT NULL, - button_topic_locked VARCHAR(200) CHARACTER SET NONE DEFAULT '' NOT NULL, - button_topic_new VARCHAR(200) CHARACTER SET NONE DEFAULT '' NOT NULL, - button_topic_reply VARCHAR(200) CHARACTER SET NONE DEFAULT '' NOT NULL, - user_icon1 VARCHAR(200) CHARACTER SET NONE DEFAULT '' NOT NULL, - user_icon2 VARCHAR(200) CHARACTER SET NONE DEFAULT '' NOT NULL, - user_icon3 VARCHAR(200) CHARACTER SET NONE DEFAULT '' NOT NULL, - user_icon4 VARCHAR(200) CHARACTER SET NONE DEFAULT '' NOT NULL, - user_icon5 VARCHAR(200) CHARACTER SET NONE DEFAULT '' NOT NULL, - user_icon6 VARCHAR(200) CHARACTER SET NONE DEFAULT '' NOT NULL, - user_icon7 VARCHAR(200) CHARACTER SET NONE DEFAULT '' NOT NULL, - user_icon8 VARCHAR(200) CHARACTER SET NONE DEFAULT '' NOT NULL, - user_icon9 VARCHAR(200) CHARACTER SET NONE DEFAULT '' NOT NULL, - user_icon10 VARCHAR(200) CHARACTER SET NONE DEFAULT '' NOT NULL + imageset_path VARCHAR(100) CHARACTER SET NONE DEFAULT '' NOT NULL );; ALTER TABLE phpbb_styles_imageset ADD PRIMARY KEY (imageset_id);; @@ -1260,6 +1166,32 @@ BEGIN END;; +# Table: 'phpbb_styles_imageset_data' +CREATE TABLE phpbb_styles_imageset_data ( + image_id INTEGER NOT NULL, + image_name VARCHAR(200) CHARACTER SET NONE DEFAULT '' NOT NULL, + image_filename VARCHAR(200) CHARACTER SET NONE DEFAULT '' NOT NULL, + image_lang VARCHAR(30) CHARACTER SET NONE DEFAULT '' NOT NULL, + image_height INTEGER DEFAULT 0 NOT NULL, + image_width INTEGER DEFAULT 0 NOT NULL, + imageset_id INTEGER DEFAULT 0 NOT NULL +);; + +ALTER TABLE phpbb_styles_imageset_data ADD PRIMARY KEY (image_id);; + +CREATE INDEX phpbb_styles_imageset_data_imgset_id ON phpbb_styles_imageset_data(imageset_id);; + +CREATE GENERATOR phpbb_styles_imageset_data_gen;; +SET GENERATOR phpbb_styles_imageset_data_gen TO 0;; + +CREATE TRIGGER t_phpbb_styles_imageset_data FOR phpbb_styles_imageset_data +BEFORE INSERT +AS +BEGIN + NEW.image_id = GEN_ID(phpbb_styles_imageset_data_gen, 1); +END;; + + # Table: 'phpbb_topics' CREATE TABLE phpbb_topics ( topic_id INTEGER NOT NULL, diff --git a/phpBB/install/schemas/mssql_schema.sql b/phpBB/install/schemas/mssql_schema.sql index 3fa46ff7dd..537da725a2 100644 --- a/phpBB/install/schemas/mssql_schema.sql +++ b/phpBB/install/schemas/mssql_schema.sql @@ -1356,101 +1356,7 @@ CREATE TABLE [phpbb_styles_imageset] ( [imageset_id] [int] IDENTITY (1, 1) NOT NULL , [imageset_name] [varchar] (255) DEFAULT ('') NOT NULL , [imageset_copyright] [varchar] (255) DEFAULT ('') NOT NULL , - [imageset_path] [varchar] (100) DEFAULT ('') NOT NULL , - [site_logo] [varchar] (200) DEFAULT ('') NOT NULL , - [upload_bar] [varchar] (200) DEFAULT ('') NOT NULL , - [poll_left] [varchar] (200) DEFAULT ('') NOT NULL , - [poll_center] [varchar] (200) DEFAULT ('') NOT NULL , - [poll_right] [varchar] (200) DEFAULT ('') NOT NULL , - [icon_friend] [varchar] (200) DEFAULT ('') NOT NULL , - [icon_foe] [varchar] (200) DEFAULT ('') NOT NULL , - [forum_link] [varchar] (200) DEFAULT ('') NOT NULL , - [forum_read] [varchar] (200) DEFAULT ('') NOT NULL , - [forum_read_locked] [varchar] (200) DEFAULT ('') NOT NULL , - [forum_read_subforum] [varchar] (200) DEFAULT ('') NOT NULL , - [forum_unread] [varchar] (200) DEFAULT ('') NOT NULL , - [forum_unread_locked] [varchar] (200) DEFAULT ('') NOT NULL , - [forum_unread_subforum] [varchar] (200) DEFAULT ('') NOT NULL , - [topic_moved] [varchar] (200) DEFAULT ('') NOT NULL , - [topic_read] [varchar] (200) DEFAULT ('') NOT NULL , - [topic_read_mine] [varchar] (200) DEFAULT ('') NOT NULL , - [topic_read_hot] [varchar] (200) DEFAULT ('') NOT NULL , - [topic_read_hot_mine] [varchar] (200) DEFAULT ('') NOT NULL , - [topic_read_locked] [varchar] (200) DEFAULT ('') NOT NULL , - [topic_read_locked_mine] [varchar] (200) DEFAULT ('') NOT NULL , - [topic_unread] [varchar] (200) DEFAULT ('') NOT NULL , - [topic_unread_mine] [varchar] (200) DEFAULT ('') NOT NULL , - [topic_unread_hot] [varchar] (200) DEFAULT ('') NOT NULL , - [topic_unread_hot_mine] [varchar] (200) DEFAULT ('') NOT NULL , - [topic_unread_locked] [varchar] (200) DEFAULT ('') NOT NULL , - [topic_unread_locked_mine] [varchar] (200) DEFAULT ('') NOT NULL , - [sticky_read] [varchar] (200) DEFAULT ('') NOT NULL , - [sticky_read_mine] [varchar] (200) DEFAULT ('') NOT NULL , - [sticky_read_locked] [varchar] (200) DEFAULT ('') NOT NULL , - [sticky_read_locked_mine] [varchar] (200) DEFAULT ('') NOT NULL , - [sticky_unread] [varchar] (200) DEFAULT ('') NOT NULL , - [sticky_unread_mine] [varchar] (200) DEFAULT ('') NOT NULL , - [sticky_unread_locked] [varchar] (200) DEFAULT ('') NOT NULL , - [sticky_unread_locked_mine] [varchar] (200) DEFAULT ('') NOT NULL , - [announce_read] [varchar] (200) DEFAULT ('') NOT NULL , - [announce_read_mine] [varchar] (200) DEFAULT ('') NOT NULL , - [announce_read_locked] [varchar] (200) DEFAULT ('') NOT NULL , - [announce_read_locked_mine] [varchar] (200) DEFAULT ('') NOT NULL , - [announce_unread] [varchar] (200) DEFAULT ('') NOT NULL , - [announce_unread_mine] [varchar] (200) DEFAULT ('') NOT NULL , - [announce_unread_locked] [varchar] (200) DEFAULT ('') NOT NULL , - [announce_unread_locked_mine] [varchar] (200) DEFAULT ('') NOT NULL , - [global_read] [varchar] (200) DEFAULT ('') NOT NULL , - [global_read_mine] [varchar] (200) DEFAULT ('') NOT NULL , - [global_read_locked] [varchar] (200) DEFAULT ('') NOT NULL , - [global_read_locked_mine] [varchar] (200) DEFAULT ('') NOT NULL , - [global_unread] [varchar] (200) DEFAULT ('') NOT NULL , - [global_unread_mine] [varchar] (200) DEFAULT ('') NOT NULL , - [global_unread_locked] [varchar] (200) DEFAULT ('') NOT NULL , - [global_unread_locked_mine] [varchar] (200) DEFAULT ('') NOT NULL , - [pm_read] [varchar] (200) DEFAULT ('') NOT NULL , - [pm_unread] [varchar] (200) DEFAULT ('') NOT NULL , - [icon_contact_aim] [varchar] (200) DEFAULT ('') NOT NULL , - [icon_contact_email] [varchar] (200) DEFAULT ('') NOT NULL , - [icon_contact_icq] [varchar] (200) DEFAULT ('') NOT NULL , - [icon_contact_jabber] [varchar] (200) DEFAULT ('') NOT NULL , - [icon_contact_msnm] [varchar] (200) DEFAULT ('') NOT NULL , - [icon_contact_pm] [varchar] (200) DEFAULT ('') NOT NULL , - [icon_contact_yahoo] [varchar] (200) DEFAULT ('') NOT NULL , - [icon_contact_www] [varchar] (200) DEFAULT ('') NOT NULL , - [icon_post_delete] [varchar] (200) DEFAULT ('') NOT NULL , - [icon_post_edit] [varchar] (200) DEFAULT ('') NOT NULL , - [icon_post_info] [varchar] (200) DEFAULT ('') NOT NULL , - [icon_post_quote] [varchar] (200) DEFAULT ('') NOT NULL , - [icon_post_report] [varchar] (200) DEFAULT ('') NOT NULL , - [icon_post_target] [varchar] (200) DEFAULT ('') NOT NULL , - [icon_post_target_unread] [varchar] (200) DEFAULT ('') NOT NULL , - [icon_topic_attach] [varchar] (200) DEFAULT ('') NOT NULL , - [icon_topic_latest] [varchar] (200) DEFAULT ('') NOT NULL , - [icon_topic_newest] [varchar] (200) DEFAULT ('') NOT NULL , - [icon_topic_reported] [varchar] (200) DEFAULT ('') NOT NULL , - [icon_topic_unapproved] [varchar] (200) DEFAULT ('') NOT NULL , - [icon_user_online] [varchar] (200) DEFAULT ('') NOT NULL , - [icon_user_offline] [varchar] (200) DEFAULT ('') NOT NULL , - [icon_user_profile] [varchar] (200) DEFAULT ('') NOT NULL , - [icon_user_search] [varchar] (200) DEFAULT ('') NOT NULL , - [icon_user_warn] [varchar] (200) DEFAULT ('') NOT NULL , - [button_pm_forward] [varchar] (200) DEFAULT ('') NOT NULL , - [button_pm_new] [varchar] (200) DEFAULT ('') NOT NULL , - [button_pm_reply] [varchar] (200) DEFAULT ('') NOT NULL , - [button_topic_locked] [varchar] (200) DEFAULT ('') NOT NULL , - [button_topic_new] [varchar] (200) DEFAULT ('') NOT NULL , - [button_topic_reply] [varchar] (200) DEFAULT ('') NOT NULL , - [user_icon1] [varchar] (200) DEFAULT ('') NOT NULL , - [user_icon2] [varchar] (200) DEFAULT ('') NOT NULL , - [user_icon3] [varchar] (200) DEFAULT ('') NOT NULL , - [user_icon4] [varchar] (200) DEFAULT ('') NOT NULL , - [user_icon5] [varchar] (200) DEFAULT ('') NOT NULL , - [user_icon6] [varchar] (200) DEFAULT ('') NOT NULL , - [user_icon7] [varchar] (200) DEFAULT ('') NOT NULL , - [user_icon8] [varchar] (200) DEFAULT ('') NOT NULL , - [user_icon9] [varchar] (200) DEFAULT ('') NOT NULL , - [user_icon10] [varchar] (200) DEFAULT ('') NOT NULL + [imageset_path] [varchar] (100) DEFAULT ('') NOT NULL ) ON [PRIMARY] GO @@ -1466,6 +1372,31 @@ GO /* + Table: 'phpbb_styles_imageset_data' +*/ +CREATE TABLE [phpbb_styles_imageset_data] ( + [image_id] [int] IDENTITY (1, 1) NOT NULL , + [image_name] [varchar] (200) DEFAULT ('') NOT NULL , + [image_filename] [varchar] (200) DEFAULT ('') NOT NULL , + [image_lang] [varchar] (30) DEFAULT ('') NOT NULL , + [image_height] [int] DEFAULT (0) NOT NULL , + [image_width] [int] DEFAULT (0) NOT NULL , + [imageset_id] [int] DEFAULT (0) NOT NULL +) ON [PRIMARY] +GO + +ALTER TABLE [phpbb_styles_imageset_data] WITH NOCHECK ADD + CONSTRAINT [PK_phpbb_styles_imageset_data] PRIMARY KEY CLUSTERED + ( + [image_id] + ) ON [PRIMARY] +GO + +CREATE INDEX [imgset_id] ON [phpbb_styles_imageset_data]([imageset_id]) ON [PRIMARY] +GO + + +/* Table: 'phpbb_topics' */ CREATE TABLE [phpbb_topics] ( diff --git a/phpBB/install/schemas/mysql_40_schema.sql b/phpBB/install/schemas/mysql_40_schema.sql index a1fec9867d..c2ecb99374 100644 --- a/phpBB/install/schemas/mysql_40_schema.sql +++ b/phpBB/install/schemas/mysql_40_schema.sql @@ -777,105 +777,25 @@ CREATE TABLE phpbb_styles_imageset ( imageset_name blob NOT NULL, imageset_copyright blob NOT NULL, imageset_path varbinary(100) DEFAULT '' NOT NULL, - site_logo varbinary(200) DEFAULT '' NOT NULL, - upload_bar varbinary(200) DEFAULT '' NOT NULL, - poll_left varbinary(200) DEFAULT '' NOT NULL, - poll_center varbinary(200) DEFAULT '' NOT NULL, - poll_right varbinary(200) DEFAULT '' NOT NULL, - icon_friend varbinary(200) DEFAULT '' NOT NULL, - icon_foe varbinary(200) DEFAULT '' NOT NULL, - forum_link varbinary(200) DEFAULT '' NOT NULL, - forum_read varbinary(200) DEFAULT '' NOT NULL, - forum_read_locked varbinary(200) DEFAULT '' NOT NULL, - forum_read_subforum varbinary(200) DEFAULT '' NOT NULL, - forum_unread varbinary(200) DEFAULT '' NOT NULL, - forum_unread_locked varbinary(200) DEFAULT '' NOT NULL, - forum_unread_subforum varbinary(200) DEFAULT '' NOT NULL, - topic_moved varbinary(200) DEFAULT '' NOT NULL, - topic_read varbinary(200) DEFAULT '' NOT NULL, - topic_read_mine varbinary(200) DEFAULT '' NOT NULL, - topic_read_hot varbinary(200) DEFAULT '' NOT NULL, - topic_read_hot_mine varbinary(200) DEFAULT '' NOT NULL, - topic_read_locked varbinary(200) DEFAULT '' NOT NULL, - topic_read_locked_mine varbinary(200) DEFAULT '' NOT NULL, - topic_unread varbinary(200) DEFAULT '' NOT NULL, - topic_unread_mine varbinary(200) DEFAULT '' NOT NULL, - topic_unread_hot varbinary(200) DEFAULT '' NOT NULL, - topic_unread_hot_mine varbinary(200) DEFAULT '' NOT NULL, - topic_unread_locked varbinary(200) DEFAULT '' NOT NULL, - topic_unread_locked_mine varbinary(200) DEFAULT '' NOT NULL, - sticky_read varbinary(200) DEFAULT '' NOT NULL, - sticky_read_mine varbinary(200) DEFAULT '' NOT NULL, - sticky_read_locked varbinary(200) DEFAULT '' NOT NULL, - sticky_read_locked_mine varbinary(200) DEFAULT '' NOT NULL, - sticky_unread varbinary(200) DEFAULT '' NOT NULL, - sticky_unread_mine varbinary(200) DEFAULT '' NOT NULL, - sticky_unread_locked varbinary(200) DEFAULT '' NOT NULL, - sticky_unread_locked_mine varbinary(200) DEFAULT '' NOT NULL, - announce_read varbinary(200) DEFAULT '' NOT NULL, - announce_read_mine varbinary(200) DEFAULT '' NOT NULL, - announce_read_locked varbinary(200) DEFAULT '' NOT NULL, - announce_read_locked_mine varbinary(200) DEFAULT '' NOT NULL, - announce_unread varbinary(200) DEFAULT '' NOT NULL, - announce_unread_mine varbinary(200) DEFAULT '' NOT NULL, - announce_unread_locked varbinary(200) DEFAULT '' NOT NULL, - announce_unread_locked_mine varbinary(200) DEFAULT '' NOT NULL, - global_read varbinary(200) DEFAULT '' NOT NULL, - global_read_mine varbinary(200) DEFAULT '' NOT NULL, - global_read_locked varbinary(200) DEFAULT '' NOT NULL, - global_read_locked_mine varbinary(200) DEFAULT '' NOT NULL, - global_unread varbinary(200) DEFAULT '' NOT NULL, - global_unread_mine varbinary(200) DEFAULT '' NOT NULL, - global_unread_locked varbinary(200) DEFAULT '' NOT NULL, - global_unread_locked_mine varbinary(200) DEFAULT '' NOT NULL, - pm_read varbinary(200) DEFAULT '' NOT NULL, - pm_unread varbinary(200) DEFAULT '' NOT NULL, - icon_contact_aim varbinary(200) DEFAULT '' NOT NULL, - icon_contact_email varbinary(200) DEFAULT '' NOT NULL, - icon_contact_icq varbinary(200) DEFAULT '' NOT NULL, - icon_contact_jabber varbinary(200) DEFAULT '' NOT NULL, - icon_contact_msnm varbinary(200) DEFAULT '' NOT NULL, - icon_contact_pm varbinary(200) DEFAULT '' NOT NULL, - icon_contact_yahoo varbinary(200) DEFAULT '' NOT NULL, - icon_contact_www varbinary(200) DEFAULT '' NOT NULL, - icon_post_delete varbinary(200) DEFAULT '' NOT NULL, - icon_post_edit varbinary(200) DEFAULT '' NOT NULL, - icon_post_info varbinary(200) DEFAULT '' NOT NULL, - icon_post_quote varbinary(200) DEFAULT '' NOT NULL, - icon_post_report varbinary(200) DEFAULT '' NOT NULL, - icon_post_target varbinary(200) DEFAULT '' NOT NULL, - icon_post_target_unread varbinary(200) DEFAULT '' NOT NULL, - icon_topic_attach varbinary(200) DEFAULT '' NOT NULL, - icon_topic_latest varbinary(200) DEFAULT '' NOT NULL, - icon_topic_newest varbinary(200) DEFAULT '' NOT NULL, - icon_topic_reported varbinary(200) DEFAULT '' NOT NULL, - icon_topic_unapproved varbinary(200) DEFAULT '' NOT NULL, - icon_user_online varbinary(200) DEFAULT '' NOT NULL, - icon_user_offline varbinary(200) DEFAULT '' NOT NULL, - icon_user_profile varbinary(200) DEFAULT '' NOT NULL, - icon_user_search varbinary(200) DEFAULT '' NOT NULL, - icon_user_warn varbinary(200) DEFAULT '' NOT NULL, - button_pm_forward varbinary(200) DEFAULT '' NOT NULL, - button_pm_new varbinary(200) DEFAULT '' NOT NULL, - button_pm_reply varbinary(200) DEFAULT '' NOT NULL, - button_topic_locked varbinary(200) DEFAULT '' NOT NULL, - button_topic_new varbinary(200) DEFAULT '' NOT NULL, - button_topic_reply varbinary(200) DEFAULT '' NOT NULL, - user_icon1 varbinary(200) DEFAULT '' NOT NULL, - user_icon2 varbinary(200) DEFAULT '' NOT NULL, - user_icon3 varbinary(200) DEFAULT '' NOT NULL, - user_icon4 varbinary(200) DEFAULT '' NOT NULL, - user_icon5 varbinary(200) DEFAULT '' NOT NULL, - user_icon6 varbinary(200) DEFAULT '' NOT NULL, - user_icon7 varbinary(200) DEFAULT '' NOT NULL, - user_icon8 varbinary(200) DEFAULT '' NOT NULL, - user_icon9 varbinary(200) DEFAULT '' NOT NULL, - user_icon10 varbinary(200) DEFAULT '' NOT NULL, PRIMARY KEY (imageset_id), UNIQUE imgset_nm (imageset_name(255)) ); +# Table: 'phpbb_styles_imageset_data' +CREATE TABLE phpbb_styles_imageset_data ( + image_id smallint(4) UNSIGNED NOT NULL auto_increment, + image_name varbinary(200) DEFAULT '' NOT NULL, + image_filename varbinary(200) DEFAULT '' NOT NULL, + image_lang varbinary(30) DEFAULT '' NOT NULL, + image_height smallint(4) UNSIGNED DEFAULT '0' NOT NULL, + image_width smallint(4) UNSIGNED DEFAULT '0' NOT NULL, + imageset_id tinyint(4) DEFAULT '0' NOT NULL, + PRIMARY KEY (image_id), + KEY imgset_id (imageset_id) +); + + # Table: 'phpbb_topics' CREATE TABLE phpbb_topics ( topic_id mediumint(8) UNSIGNED NOT NULL auto_increment, diff --git a/phpBB/install/schemas/mysql_41_schema.sql b/phpBB/install/schemas/mysql_41_schema.sql index 07f60d816e..a35fa79df8 100644 --- a/phpBB/install/schemas/mysql_41_schema.sql +++ b/phpBB/install/schemas/mysql_41_schema.sql @@ -777,105 +777,25 @@ CREATE TABLE phpbb_styles_imageset ( imageset_name varchar(255) DEFAULT '' NOT NULL, imageset_copyright varchar(255) DEFAULT '' NOT NULL, imageset_path varchar(100) DEFAULT '' NOT NULL, - site_logo varchar(200) DEFAULT '' NOT NULL, - upload_bar varchar(200) DEFAULT '' NOT NULL, - poll_left varchar(200) DEFAULT '' NOT NULL, - poll_center varchar(200) DEFAULT '' NOT NULL, - poll_right varchar(200) DEFAULT '' NOT NULL, - icon_friend varchar(200) DEFAULT '' NOT NULL, - icon_foe varchar(200) DEFAULT '' NOT NULL, - forum_link varchar(200) DEFAULT '' NOT NULL, - forum_read varchar(200) DEFAULT '' NOT NULL, - forum_read_locked varchar(200) DEFAULT '' NOT NULL, - forum_read_subforum varchar(200) DEFAULT '' NOT NULL, - forum_unread varchar(200) DEFAULT '' NOT NULL, - forum_unread_locked varchar(200) DEFAULT '' NOT NULL, - forum_unread_subforum varchar(200) DEFAULT '' NOT NULL, - topic_moved varchar(200) DEFAULT '' NOT NULL, - topic_read varchar(200) DEFAULT '' NOT NULL, - topic_read_mine varchar(200) DEFAULT '' NOT NULL, - topic_read_hot varchar(200) DEFAULT '' NOT NULL, - topic_read_hot_mine varchar(200) DEFAULT '' NOT NULL, - topic_read_locked varchar(200) DEFAULT '' NOT NULL, - topic_read_locked_mine varchar(200) DEFAULT '' NOT NULL, - topic_unread varchar(200) DEFAULT '' NOT NULL, - topic_unread_mine varchar(200) DEFAULT '' NOT NULL, - topic_unread_hot varchar(200) DEFAULT '' NOT NULL, - topic_unread_hot_mine varchar(200) DEFAULT '' NOT NULL, - topic_unread_locked varchar(200) DEFAULT '' NOT NULL, - topic_unread_locked_mine varchar(200) DEFAULT '' NOT NULL, - sticky_read varchar(200) DEFAULT '' NOT NULL, - sticky_read_mine varchar(200) DEFAULT '' NOT NULL, - sticky_read_locked varchar(200) DEFAULT '' NOT NULL, - sticky_read_locked_mine varchar(200) DEFAULT '' NOT NULL, - sticky_unread varchar(200) DEFAULT '' NOT NULL, - sticky_unread_mine varchar(200) DEFAULT '' NOT NULL, - sticky_unread_locked varchar(200) DEFAULT '' NOT NULL, - sticky_unread_locked_mine varchar(200) DEFAULT '' NOT NULL, - announce_read varchar(200) DEFAULT '' NOT NULL, - announce_read_mine varchar(200) DEFAULT '' NOT NULL, - announce_read_locked varchar(200) DEFAULT '' NOT NULL, - announce_read_locked_mine varchar(200) DEFAULT '' NOT NULL, - announce_unread varchar(200) DEFAULT '' NOT NULL, - announce_unread_mine varchar(200) DEFAULT '' NOT NULL, - announce_unread_locked varchar(200) DEFAULT '' NOT NULL, - announce_unread_locked_mine varchar(200) DEFAULT '' NOT NULL, - global_read varchar(200) DEFAULT '' NOT NULL, - global_read_mine varchar(200) DEFAULT '' NOT NULL, - global_read_locked varchar(200) DEFAULT '' NOT NULL, - global_read_locked_mine varchar(200) DEFAULT '' NOT NULL, - global_unread varchar(200) DEFAULT '' NOT NULL, - global_unread_mine varchar(200) DEFAULT '' NOT NULL, - global_unread_locked varchar(200) DEFAULT '' NOT NULL, - global_unread_locked_mine varchar(200) DEFAULT '' NOT NULL, - pm_read varchar(200) DEFAULT '' NOT NULL, - pm_unread varchar(200) DEFAULT '' NOT NULL, - icon_contact_aim varchar(200) DEFAULT '' NOT NULL, - icon_contact_email varchar(200) DEFAULT '' NOT NULL, - icon_contact_icq varchar(200) DEFAULT '' NOT NULL, - icon_contact_jabber varchar(200) DEFAULT '' NOT NULL, - icon_contact_msnm varchar(200) DEFAULT '' NOT NULL, - icon_contact_pm varchar(200) DEFAULT '' NOT NULL, - icon_contact_yahoo varchar(200) DEFAULT '' NOT NULL, - icon_contact_www varchar(200) DEFAULT '' NOT NULL, - icon_post_delete varchar(200) DEFAULT '' NOT NULL, - icon_post_edit varchar(200) DEFAULT '' NOT NULL, - icon_post_info varchar(200) DEFAULT '' NOT NULL, - icon_post_quote varchar(200) DEFAULT '' NOT NULL, - icon_post_report varchar(200) DEFAULT '' NOT NULL, - icon_post_target varchar(200) DEFAULT '' NOT NULL, - icon_post_target_unread varchar(200) DEFAULT '' NOT NULL, - icon_topic_attach varchar(200) DEFAULT '' NOT NULL, - icon_topic_latest varchar(200) DEFAULT '' NOT NULL, - icon_topic_newest varchar(200) DEFAULT '' NOT NULL, - icon_topic_reported varchar(200) DEFAULT '' NOT NULL, - icon_topic_unapproved varchar(200) DEFAULT '' NOT NULL, - icon_user_online varchar(200) DEFAULT '' NOT NULL, - icon_user_offline varchar(200) DEFAULT '' NOT NULL, - icon_user_profile varchar(200) DEFAULT '' NOT NULL, - icon_user_search varchar(200) DEFAULT '' NOT NULL, - icon_user_warn varchar(200) DEFAULT '' NOT NULL, - button_pm_forward varchar(200) DEFAULT '' NOT NULL, - button_pm_new varchar(200) DEFAULT '' NOT NULL, - button_pm_reply varchar(200) DEFAULT '' NOT NULL, - button_topic_locked varchar(200) DEFAULT '' NOT NULL, - button_topic_new varchar(200) DEFAULT '' NOT NULL, - button_topic_reply varchar(200) DEFAULT '' NOT NULL, - user_icon1 varchar(200) DEFAULT '' NOT NULL, - user_icon2 varchar(200) DEFAULT '' NOT NULL, - user_icon3 varchar(200) DEFAULT '' NOT NULL, - user_icon4 varchar(200) DEFAULT '' NOT NULL, - user_icon5 varchar(200) DEFAULT '' NOT NULL, - user_icon6 varchar(200) DEFAULT '' NOT NULL, - user_icon7 varchar(200) DEFAULT '' NOT NULL, - user_icon8 varchar(200) DEFAULT '' NOT NULL, - user_icon9 varchar(200) DEFAULT '' NOT NULL, - user_icon10 varchar(200) DEFAULT '' NOT NULL, PRIMARY KEY (imageset_id), UNIQUE imgset_nm (imageset_name) ) CHARACTER SET `utf8` COLLATE `utf8_bin`; +# Table: 'phpbb_styles_imageset_data' +CREATE TABLE phpbb_styles_imageset_data ( + image_id smallint(4) UNSIGNED NOT NULL auto_increment, + image_name varchar(200) DEFAULT '' NOT NULL, + image_filename varchar(200) DEFAULT '' NOT NULL, + image_lang varchar(30) DEFAULT '' NOT NULL, + image_height smallint(4) UNSIGNED DEFAULT '0' NOT NULL, + image_width smallint(4) UNSIGNED DEFAULT '0' NOT NULL, + imageset_id tinyint(4) DEFAULT '0' NOT NULL, + PRIMARY KEY (image_id), + KEY imgset_id (imageset_id) +) CHARACTER SET `utf8` COLLATE `utf8_bin`; + + # Table: 'phpbb_topics' CREATE TABLE phpbb_topics ( topic_id mediumint(8) UNSIGNED NOT NULL auto_increment, diff --git a/phpBB/install/schemas/oracle_schema.sql b/phpBB/install/schemas/oracle_schema.sql index a2e3532e2b..6fc1f4325b 100644 --- a/phpBB/install/schemas/oracle_schema.sql +++ b/phpBB/install/schemas/oracle_schema.sql @@ -1528,100 +1528,6 @@ CREATE TABLE phpbb_styles_imageset ( imageset_name varchar2(765) DEFAULT '' , imageset_copyright varchar2(765) DEFAULT '' , imageset_path varchar2(100) DEFAULT '' , - site_logo varchar2(200) DEFAULT '' , - upload_bar varchar2(200) DEFAULT '' , - poll_left varchar2(200) DEFAULT '' , - poll_center varchar2(200) DEFAULT '' , - poll_right varchar2(200) DEFAULT '' , - icon_friend varchar2(200) DEFAULT '' , - icon_foe varchar2(200) DEFAULT '' , - forum_link varchar2(200) DEFAULT '' , - forum_read varchar2(200) DEFAULT '' , - forum_read_locked varchar2(200) DEFAULT '' , - forum_read_subforum varchar2(200) DEFAULT '' , - forum_unread varchar2(200) DEFAULT '' , - forum_unread_locked varchar2(200) DEFAULT '' , - forum_unread_subforum varchar2(200) DEFAULT '' , - topic_moved varchar2(200) DEFAULT '' , - topic_read varchar2(200) DEFAULT '' , - topic_read_mine varchar2(200) DEFAULT '' , - topic_read_hot varchar2(200) DEFAULT '' , - topic_read_hot_mine varchar2(200) DEFAULT '' , - topic_read_locked varchar2(200) DEFAULT '' , - topic_read_locked_mine varchar2(200) DEFAULT '' , - topic_unread varchar2(200) DEFAULT '' , - topic_unread_mine varchar2(200) DEFAULT '' , - topic_unread_hot varchar2(200) DEFAULT '' , - topic_unread_hot_mine varchar2(200) DEFAULT '' , - topic_unread_locked varchar2(200) DEFAULT '' , - topic_unread_locked_mine varchar2(200) DEFAULT '' , - sticky_read varchar2(200) DEFAULT '' , - sticky_read_mine varchar2(200) DEFAULT '' , - sticky_read_locked varchar2(200) DEFAULT '' , - sticky_read_locked_mine varchar2(200) DEFAULT '' , - sticky_unread varchar2(200) DEFAULT '' , - sticky_unread_mine varchar2(200) DEFAULT '' , - sticky_unread_locked varchar2(200) DEFAULT '' , - sticky_unread_locked_mine varchar2(200) DEFAULT '' , - announce_read varchar2(200) DEFAULT '' , - announce_read_mine varchar2(200) DEFAULT '' , - announce_read_locked varchar2(200) DEFAULT '' , - announce_read_locked_mine varchar2(200) DEFAULT '' , - announce_unread varchar2(200) DEFAULT '' , - announce_unread_mine varchar2(200) DEFAULT '' , - announce_unread_locked varchar2(200) DEFAULT '' , - announce_unread_locked_mine varchar2(200) DEFAULT '' , - global_read varchar2(200) DEFAULT '' , - global_read_mine varchar2(200) DEFAULT '' , - global_read_locked varchar2(200) DEFAULT '' , - global_read_locked_mine varchar2(200) DEFAULT '' , - global_unread varchar2(200) DEFAULT '' , - global_unread_mine varchar2(200) DEFAULT '' , - global_unread_locked varchar2(200) DEFAULT '' , - global_unread_locked_mine varchar2(200) DEFAULT '' , - pm_read varchar2(200) DEFAULT '' , - pm_unread varchar2(200) DEFAULT '' , - icon_contact_aim varchar2(200) DEFAULT '' , - icon_contact_email varchar2(200) DEFAULT '' , - icon_contact_icq varchar2(200) DEFAULT '' , - icon_contact_jabber varchar2(200) DEFAULT '' , - icon_contact_msnm varchar2(200) DEFAULT '' , - icon_contact_pm varchar2(200) DEFAULT '' , - icon_contact_yahoo varchar2(200) DEFAULT '' , - icon_contact_www varchar2(200) DEFAULT '' , - icon_post_delete varchar2(200) DEFAULT '' , - icon_post_edit varchar2(200) DEFAULT '' , - icon_post_info varchar2(200) DEFAULT '' , - icon_post_quote varchar2(200) DEFAULT '' , - icon_post_report varchar2(200) DEFAULT '' , - icon_post_target varchar2(200) DEFAULT '' , - icon_post_target_unread varchar2(200) DEFAULT '' , - icon_topic_attach varchar2(200) DEFAULT '' , - icon_topic_latest varchar2(200) DEFAULT '' , - icon_topic_newest varchar2(200) DEFAULT '' , - icon_topic_reported varchar2(200) DEFAULT '' , - icon_topic_unapproved varchar2(200) DEFAULT '' , - icon_user_online varchar2(200) DEFAULT '' , - icon_user_offline varchar2(200) DEFAULT '' , - icon_user_profile varchar2(200) DEFAULT '' , - icon_user_search varchar2(200) DEFAULT '' , - icon_user_warn varchar2(200) DEFAULT '' , - button_pm_forward varchar2(200) DEFAULT '' , - button_pm_new varchar2(200) DEFAULT '' , - button_pm_reply varchar2(200) DEFAULT '' , - button_topic_locked varchar2(200) DEFAULT '' , - button_topic_new varchar2(200) DEFAULT '' , - button_topic_reply varchar2(200) DEFAULT '' , - user_icon1 varchar2(200) DEFAULT '' , - user_icon2 varchar2(200) DEFAULT '' , - user_icon3 varchar2(200) DEFAULT '' , - user_icon4 varchar2(200) DEFAULT '' , - user_icon5 varchar2(200) DEFAULT '' , - user_icon6 varchar2(200) DEFAULT '' , - user_icon7 varchar2(200) DEFAULT '' , - user_icon8 varchar2(200) DEFAULT '' , - user_icon9 varchar2(200) DEFAULT '' , - user_icon10 varchar2(200) DEFAULT '' , CONSTRAINT pk_phpbb_styles_imageset PRIMARY KEY (imageset_id), CONSTRAINT u_phpbb_imgset_nm UNIQUE (imageset_name) ) @@ -1645,6 +1551,40 @@ END; /* + Table: 'phpbb_styles_imageset_data' +*/ +CREATE TABLE phpbb_styles_imageset_data ( + image_id number(4) NOT NULL, + image_name varchar2(200) DEFAULT '' , + image_filename varchar2(200) DEFAULT '' , + image_lang varchar2(30) DEFAULT '' , + image_height number(4) DEFAULT '0' NOT NULL, + image_width number(4) DEFAULT '0' NOT NULL, + imageset_id number(4) DEFAULT '0' NOT NULL, + CONSTRAINT pk_phpbb_styles_imageset_data PRIMARY KEY (image_id) +) +/ + +CREATE INDEX phpbb_styles_imageset_data_imgset_id ON phpbb_styles_imageset_data (imageset_id) +/ + +CREATE SEQUENCE phpbb_styles_imageset_data_seq +/ + +CREATE OR REPLACE TRIGGER t_phpbb_styles_imageset_data +BEFORE INSERT ON phpbb_styles_imageset_data +FOR EACH ROW WHEN ( + new.image_id IS NULL OR new.image_id = 0 +) +BEGIN + SELECT phpbb_styles_imageset_data_seq.nextval + INTO :new.image_id + FROM dual; +END; +/ + + +/* Table: 'phpbb_topics' */ CREATE TABLE phpbb_topics ( diff --git a/phpBB/install/schemas/postgres_schema.sql b/phpBB/install/schemas/postgres_schema.sql index 910ae4f022..bc3b916007 100644 --- a/phpBB/install/schemas/postgres_schema.sql +++ b/phpBB/install/schemas/postgres_schema.sql @@ -1021,106 +1021,30 @@ CREATE TABLE phpbb_styles_imageset ( imageset_name varchar(255) DEFAULT '' NOT NULL, imageset_copyright varchar(255) DEFAULT '' NOT NULL, imageset_path varchar(100) DEFAULT '' NOT NULL, - site_logo varchar(200) DEFAULT '' NOT NULL, - upload_bar varchar(200) DEFAULT '' NOT NULL, - poll_left varchar(200) DEFAULT '' NOT NULL, - poll_center varchar(200) DEFAULT '' NOT NULL, - poll_right varchar(200) DEFAULT '' NOT NULL, - icon_friend varchar(200) DEFAULT '' NOT NULL, - icon_foe varchar(200) DEFAULT '' NOT NULL, - forum_link varchar(200) DEFAULT '' NOT NULL, - forum_read varchar(200) DEFAULT '' NOT NULL, - forum_read_locked varchar(200) DEFAULT '' NOT NULL, - forum_read_subforum varchar(200) DEFAULT '' NOT NULL, - forum_unread varchar(200) DEFAULT '' NOT NULL, - forum_unread_locked varchar(200) DEFAULT '' NOT NULL, - forum_unread_subforum varchar(200) DEFAULT '' NOT NULL, - topic_moved varchar(200) DEFAULT '' NOT NULL, - topic_read varchar(200) DEFAULT '' NOT NULL, - topic_read_mine varchar(200) DEFAULT '' NOT NULL, - topic_read_hot varchar(200) DEFAULT '' NOT NULL, - topic_read_hot_mine varchar(200) DEFAULT '' NOT NULL, - topic_read_locked varchar(200) DEFAULT '' NOT NULL, - topic_read_locked_mine varchar(200) DEFAULT '' NOT NULL, - topic_unread varchar(200) DEFAULT '' NOT NULL, - topic_unread_mine varchar(200) DEFAULT '' NOT NULL, - topic_unread_hot varchar(200) DEFAULT '' NOT NULL, - topic_unread_hot_mine varchar(200) DEFAULT '' NOT NULL, - topic_unread_locked varchar(200) DEFAULT '' NOT NULL, - topic_unread_locked_mine varchar(200) DEFAULT '' NOT NULL, - sticky_read varchar(200) DEFAULT '' NOT NULL, - sticky_read_mine varchar(200) DEFAULT '' NOT NULL, - sticky_read_locked varchar(200) DEFAULT '' NOT NULL, - sticky_read_locked_mine varchar(200) DEFAULT '' NOT NULL, - sticky_unread varchar(200) DEFAULT '' NOT NULL, - sticky_unread_mine varchar(200) DEFAULT '' NOT NULL, - sticky_unread_locked varchar(200) DEFAULT '' NOT NULL, - sticky_unread_locked_mine varchar(200) DEFAULT '' NOT NULL, - announce_read varchar(200) DEFAULT '' NOT NULL, - announce_read_mine varchar(200) DEFAULT '' NOT NULL, - announce_read_locked varchar(200) DEFAULT '' NOT NULL, - announce_read_locked_mine varchar(200) DEFAULT '' NOT NULL, - announce_unread varchar(200) DEFAULT '' NOT NULL, - announce_unread_mine varchar(200) DEFAULT '' NOT NULL, - announce_unread_locked varchar(200) DEFAULT '' NOT NULL, - announce_unread_locked_mine varchar(200) DEFAULT '' NOT NULL, - global_read varchar(200) DEFAULT '' NOT NULL, - global_read_mine varchar(200) DEFAULT '' NOT NULL, - global_read_locked varchar(200) DEFAULT '' NOT NULL, - global_read_locked_mine varchar(200) DEFAULT '' NOT NULL, - global_unread varchar(200) DEFAULT '' NOT NULL, - global_unread_mine varchar(200) DEFAULT '' NOT NULL, - global_unread_locked varchar(200) DEFAULT '' NOT NULL, - global_unread_locked_mine varchar(200) DEFAULT '' NOT NULL, - pm_read varchar(200) DEFAULT '' NOT NULL, - pm_unread varchar(200) DEFAULT '' NOT NULL, - icon_contact_aim varchar(200) DEFAULT '' NOT NULL, - icon_contact_email varchar(200) DEFAULT '' NOT NULL, - icon_contact_icq varchar(200) DEFAULT '' NOT NULL, - icon_contact_jabber varchar(200) DEFAULT '' NOT NULL, - icon_contact_msnm varchar(200) DEFAULT '' NOT NULL, - icon_contact_pm varchar(200) DEFAULT '' NOT NULL, - icon_contact_yahoo varchar(200) DEFAULT '' NOT NULL, - icon_contact_www varchar(200) DEFAULT '' NOT NULL, - icon_post_delete varchar(200) DEFAULT '' NOT NULL, - icon_post_edit varchar(200) DEFAULT '' NOT NULL, - icon_post_info varchar(200) DEFAULT '' NOT NULL, - icon_post_quote varchar(200) DEFAULT '' NOT NULL, - icon_post_report varchar(200) DEFAULT '' NOT NULL, - icon_post_target varchar(200) DEFAULT '' NOT NULL, - icon_post_target_unread varchar(200) DEFAULT '' NOT NULL, - icon_topic_attach varchar(200) DEFAULT '' NOT NULL, - icon_topic_latest varchar(200) DEFAULT '' NOT NULL, - icon_topic_newest varchar(200) DEFAULT '' NOT NULL, - icon_topic_reported varchar(200) DEFAULT '' NOT NULL, - icon_topic_unapproved varchar(200) DEFAULT '' NOT NULL, - icon_user_online varchar(200) DEFAULT '' NOT NULL, - icon_user_offline varchar(200) DEFAULT '' NOT NULL, - icon_user_profile varchar(200) DEFAULT '' NOT NULL, - icon_user_search varchar(200) DEFAULT '' NOT NULL, - icon_user_warn varchar(200) DEFAULT '' NOT NULL, - button_pm_forward varchar(200) DEFAULT '' NOT NULL, - button_pm_new varchar(200) DEFAULT '' NOT NULL, - button_pm_reply varchar(200) DEFAULT '' NOT NULL, - button_topic_locked varchar(200) DEFAULT '' NOT NULL, - button_topic_new varchar(200) DEFAULT '' NOT NULL, - button_topic_reply varchar(200) DEFAULT '' NOT NULL, - user_icon1 varchar(200) DEFAULT '' NOT NULL, - user_icon2 varchar(200) DEFAULT '' NOT NULL, - user_icon3 varchar(200) DEFAULT '' NOT NULL, - user_icon4 varchar(200) DEFAULT '' NOT NULL, - user_icon5 varchar(200) DEFAULT '' NOT NULL, - user_icon6 varchar(200) DEFAULT '' NOT NULL, - user_icon7 varchar(200) DEFAULT '' NOT NULL, - user_icon8 varchar(200) DEFAULT '' NOT NULL, - user_icon9 varchar(200) DEFAULT '' NOT NULL, - user_icon10 varchar(200) DEFAULT '' NOT NULL, PRIMARY KEY (imageset_id) ); CREATE UNIQUE INDEX phpbb_styles_imageset_imgset_nm ON phpbb_styles_imageset (imageset_name); /* + Table: 'phpbb_styles_imageset_data' +*/ +CREATE SEQUENCE phpbb_styles_imageset_data_seq; + +CREATE TABLE phpbb_styles_imageset_data ( + image_id INT2 DEFAULT nextval('phpbb_styles_imageset_data_seq'), + image_name varchar(200) DEFAULT '' NOT NULL, + image_filename varchar(200) DEFAULT '' NOT NULL, + image_lang varchar(30) DEFAULT '' NOT NULL, + image_height INT2 DEFAULT '0' NOT NULL CHECK (image_height >= 0), + image_width INT2 DEFAULT '0' NOT NULL CHECK (image_width >= 0), + imageset_id INT2 DEFAULT '0' NOT NULL, + PRIMARY KEY (image_id) +); + +CREATE INDEX phpbb_styles_imageset_data_imgset_id ON phpbb_styles_imageset_data (imageset_id); + +/* Table: 'phpbb_topics' */ CREATE SEQUENCE phpbb_topics_seq; diff --git a/phpBB/install/schemas/schema_data.sql b/phpBB/install/schemas/schema_data.sql index 82689af296..8fbf1b6b26 100644 --- a/phpBB/install/schemas/schema_data.sql +++ b/phpBB/install/schemas/schema_data.sql @@ -383,8 +383,193 @@ INSERT INTO phpbb_styles (style_name, style_copyright, style_active, template_id INSERT INTO phpbb_styles (style_name, style_copyright, style_active, template_id, theme_id, imageset_id) VALUES ('subsilver2', '© phpBB Group', 1, 2, 2, 2); # -- phpbb_styles_imageset -INSERT INTO phpbb_styles_imageset (imageset_name, imageset_copyright, imageset_path, site_logo, upload_bar, poll_left, poll_center, poll_right, icon_friend, icon_foe, forum_link, forum_read, forum_read_locked, forum_read_subforum, forum_unread, forum_unread_locked, forum_unread_subforum, topic_moved, topic_read, topic_read_mine, topic_read_hot, topic_read_hot_mine, topic_read_locked, topic_read_locked_mine, topic_unread, topic_unread_mine, topic_unread_hot, topic_unread_hot_mine, topic_unread_locked, topic_unread_locked_mine, sticky_read, sticky_read_mine, sticky_read_locked, sticky_read_locked_mine, sticky_unread, sticky_unread_mine, sticky_unread_locked, sticky_unread_locked_mine, announce_read, announce_read_mine, announce_read_locked, announce_read_locked_mine, announce_unread, announce_unread_mine, announce_unread_locked, announce_unread_locked_mine, global_read, global_read_mine, global_read_locked, global_read_locked_mine, global_unread, global_unread_mine, global_unread_locked, global_unread_locked_mine, pm_read, pm_unread, icon_contact_aim, icon_contact_email, icon_contact_icq, icon_contact_jabber, icon_contact_msnm, icon_contact_pm, icon_contact_yahoo, icon_contact_www, icon_post_delete, icon_post_edit, icon_post_info, icon_post_quote, icon_post_report, icon_post_target, icon_post_target_unread, icon_topic_attach, icon_topic_latest, icon_topic_newest, icon_topic_reported, icon_topic_unapproved, icon_user_online, icon_user_offline, icon_user_profile, icon_user_search, icon_user_warn, button_pm_forward, button_pm_new, button_pm_reply, button_topic_locked, button_topic_new, button_topic_reply, user_icon1, user_icon2, user_icon3, user_icon4, user_icon5, user_icon6, user_icon7, user_icon8, user_icon9, user_icon10) VALUES ('prosilver', '© phpBB Group', 'prosilver', 'site_logo.gif*52*139', 'progress_bar.gif*16*280', '', '', '', '', '', 'forum_link.gif*27*27', 'forum_read.gif*27*27', 'forum_read_locked.gif*27*27', 'forum_read_subforum.gif*27*27', 'forum_unread.gif*27*27', 'forum_read_locked.gif*27*27', 'forum_unread_subforum.gif*27*27', 'topic_moved.gif*27*27', 'topic_read.gif*27*27', 'topic_read_mine.gif*27*27', 'topic_read_hot.gif*27*27', 'topic_read_hot_mine.gif*27*27', 'topic_read_locked.gif*27*27', 'topic_read_locked_mine.gif*27*27', 'topic_unread.gif*27*27', 'topic_unread_mine.gif*27*27', 'topic_unread_hot.gif*27*27', 'topic_unread_hot_mine.gif*27*27', 'topic_unread_locked.gif*27*27', 'topic_unread_locked_mine.gif*27*27', 'sticky_read.gif*27*27', 'sticky_read_mine.gif*27*27', 'sticky_read.gif*27*27', 'sticky_read_mine.gif*27*27', 'sticky_unread.gif*27*27', 'sticky_unread_mine.gif*27*27', 'sticky_unread.gif*27*27', 'sticky_unread_locked_mine.gif*27*27', 'announce_read.gif*27*27', 'announce_read_mine.gif*27*27', 'announce_read_locked.gif*27*27', 'announce_read_locked_mine.gif*27*27', 'announce_unread.gif*27*27', 'announce_unread_mine.gif*27*27', 'announce_unread.gif*27*27', 'announce_unread_locked_mine.gif*27*27', 'announce_read.gif*27*27', 'announce_read_mine.gif*27*27', 'announce_read_locked.gif*27*27', 'announce_read_locked_mine.gif*27*27', 'announce_unread.gif*27*27', 'announce_unread_mine.gif*27*27', 'announce_unread_locked_mine.gif*27*27', 'announce_unread_locked_mine.gif*27*27', 'topic_read.gif*27*27', 'topic_unread.gif*27*27', 'icon_contact_aim.gif*20*72', 'icon_contact_email.gif*20*72', 'icon_contact_icq.gif*20*72', 'icon_contact_jabber.gif*20*72', 'icon_contact_msnm.gif*20*72', '{LANG}/icon_contact_pm.gif', 'icon_contact_yahoo.gif*20*72', 'icon_contact_www.gif*20*72', 'icon_post_delete.gif*20*20', '{LANG}/icon_post_edit.gif', 'icon_post_info.gif*20*20', '{LANG}/icon_post_quote.gif', 'icon_post_report.gif*20*20', 'icon_post_target.gif*9*12', 'icon_post_target_unread.gif*9*12', 'icon_topic_attach.gif*10*7', 'icon_topic_latest.gif*9*12', 'icon_topic_newest.gif*9*12', 'icon_topic_reported.gif*14*16', 'icon_topic_unapproved.gif*14*16', '{LANG}/icon_user_online.gif', '{LANG}/icon_user_offline.gif', 'icon_user_profile.gif*11*11', '{LANG}/icon_user_search.gif', 'icon_post_report.gif*20*20', '{LANG}/button_pm_forward.gif', '{LANG}/button_pm_new.gif', '{LANG}/button_pm_reply', '{LANG}/button_topic_locked.gif', '{LANG}/button_topic_new.gif', '{LANG}/button_topic_reply.gif', '', '', '', '', '', '', '', '', '', ''); -INSERT INTO phpbb_styles_imageset (imageset_name, imageset_copyright, imageset_path, site_logo, upload_bar, poll_left, poll_center, poll_right, icon_friend, icon_foe, forum_link, forum_read, forum_read_locked, forum_read_subforum, forum_unread, forum_unread_locked, forum_unread_subforum, topic_moved, topic_read, topic_read_mine, topic_read_hot, topic_read_hot_mine, topic_read_locked, topic_read_locked_mine, topic_unread, topic_unread_mine, topic_unread_hot, topic_unread_hot_mine, topic_unread_locked, topic_unread_locked_mine, sticky_read, sticky_read_mine, sticky_read_locked, sticky_read_locked_mine, sticky_unread, sticky_unread_mine, sticky_unread_locked, sticky_unread_locked_mine, announce_read, announce_read_mine, announce_read_locked, announce_read_locked_mine, announce_unread, announce_unread_mine, announce_unread_locked, announce_unread_locked_mine, global_read, global_read_mine, global_read_locked, global_read_locked_mine, global_unread, global_unread_mine, global_unread_locked, global_unread_locked_mine, pm_read, pm_unread, icon_contact_aim, icon_contact_email, icon_contact_icq, icon_contact_jabber, icon_contact_msnm, icon_contact_pm, icon_contact_yahoo, icon_contact_www, icon_post_delete, icon_post_edit, icon_post_info, icon_post_quote, icon_post_report, icon_post_target, icon_post_target_unread, icon_topic_attach, icon_topic_latest, icon_topic_newest, icon_topic_reported, icon_topic_unapproved, icon_user_online, icon_user_offline, icon_user_profile, icon_user_search, icon_user_warn, button_pm_forward, button_pm_new, button_pm_reply, button_topic_locked, button_topic_new, button_topic_reply, user_icon1, user_icon2, user_icon3, user_icon4, user_icon5, user_icon6, user_icon7, user_icon8, user_icon9, user_icon10) VALUES ('subsilver2', '© phpBB Group', 'subsilver2', 'site_logo.gif*94*170', 'upload_bar.gif*16*280', 'poll_left.gif*12*4', 'poll_center.gif*12*', 'poll_right.gif*12*4', '', '', 'forum_link.gif*25*46', 'forum_read.gif*25*46', 'forum_read_locked.gif*25*46', 'forum_read_subforum.gif*25*46', 'forum_unread.gif*25*46', 'forum_unread_locked.gif*25*46', 'forum_unread_subforum.gif*25*46', 'topic_moved.gif*18*19', 'topic_read.gif*18*19', 'topic_read_mine.gif*18*19', 'topic_read_hot.gif*18*19', 'topic_read_hot_mine.gif*18*19', 'topic_read_locked.gif*18*19', 'topic_read_locked_mine.gif*18*19', 'topic_unread.gif*18*19', 'topic_unread_mine.gif*18*19', 'topic_unread_hot.gif*18*19', 'topic_unread_hot_mine.gif*18*19', 'topic_unread_locked.gif*18*19', 'topic_unread_locked_mine.gif*18*19', 'sticky_read.gif*18*19', 'sticky_read_mine.gif*18*19', 'sticky_read_locked.gif*18*19', 'sticky_read_locked_mine.gif*18*19', 'sticky_unread.gif*18*19', 'sticky_unread_mine.gif*18*19', 'sticky_unread_locked.gif*18*19', 'sticky_unread_locked_mine.gif*18*19', 'announce_read.gif*18*19', 'announce_read_mine.gif*18*19', 'announce_read_locked.gif*18*19', 'announce_read_locked_mine.gif*18*19', 'announce_unread.gif*18*19', 'announce_unread_mine.gif*18*19', 'announce_unread_locked.gif*18*19', 'announce_unread_locked_mine.gif*18*19', 'announce_read.gif*18*19', 'announce_read_mine.gif*18*19', 'announce_read_locked.gif*18*19', 'announce_read_locked_mine.gif*18*19', 'announce_unread.gif*18*19', 'announce_unread_mine.gif*18*19', 'announce_unread_locked.gif*18*19', 'announce_unread_locked_mine.gif*18*19', 'topic_read.gif*18*19', 'topic_unread.gif*18*19', '{LANG}/icon_contact_aim.gif', '{LANG}/icon_contact_email.gif', '{LANG}/icon_contact_icq.gif', '{LANG}/icon_contact_jabber.gif', '{LANG}/icon_contact_msnm.gif', '{LANG}/icon_contact_pm.gif', '{LANG}/icon_contact_yahoo.gif', '{LANG}/icon_contact_www.gif', '{LANG}/icon_post_delete.gif', '{LANG}/icon_post_edit.gif', '{LANG}/icon_post_info.gif', '{LANG}/icon_post_quote.gif', '{LANG}/icon_post_report.gif', 'icon_post_target.gif*9*12', 'icon_post_target_unread.gif*9*12', 'icon_topic_attach.gif*18*14', 'icon_topic_latest.gif*9*18', 'icon_topic_newest.gif*9*18', 'icon_topic_reported.gif*18*19', 'icon_topic_unapproved.gif*18*19', '{LANG}/icon_user_online.gif', '{LANG}/icon_user_offline.gif', '{LANG}/icon_user_profile.gif', '{LANG}/icon_user_search.gif', '{LANG}/icon_user_warn.gif', '', '{LANG}/button_pm_new.gif', '{LANG}/button_pm_reply.gif', '{LANG}/button_topic_locked.gif', '{LANG}/button_topic_new.gif', '{LANG}/button_topic_reply.gif', '', '', '', '', '', '', '', '', '', ''); +INSERT INTO phpbb_styles_imageset (imageset_name, imageset_copyright, imageset_path) VALUES ('prosilver', '© phpBB Group', 'prosilver'); +INSERT INTO phpbb_styles_imageset (imageset_name, imageset_copyright, imageset_path) VALUES ('subsilver2', '© phpBB Group', 'subsilver2'); + +# -- phpbb_styles_imageset_data +INSERT INTO phpbb_styles_imageset_data (image_name, image_filename, image_lang, image_height, image_width, imageset_id) VALUES ('site_logo', 'site_logo.gif', '', 94, 170, 2); +INSERT INTO phpbb_styles_imageset_data (image_name, image_filename, image_lang, image_height, image_width, imageset_id) VALUES ('upload_bar', 'upload_bar.gif', '', 16, 280, 2); +INSERT INTO phpbb_styles_imageset_data (image_name, image_filename, image_lang, image_height, image_width, imageset_id) VALUES ('poll_left', 'poll_left.gif', '', 12, 4, 2); +INSERT INTO phpbb_styles_imageset_data (image_name, image_filename, image_lang, image_height, image_width, imageset_id) VALUES ('poll_center', 'poll_center.gif', '', 12, 0, 2); +INSERT INTO phpbb_styles_imageset_data (image_name, image_filename, image_lang, image_height, image_width, imageset_id) VALUES ('poll_right', 'poll_right.gif', '', 12, 4, 2); +INSERT INTO phpbb_styles_imageset_data (image_name, image_filename, image_lang, image_height, image_width, imageset_id) VALUES ('forum_link', 'forum_link.gif', '', 25, 46, 2); +INSERT INTO phpbb_styles_imageset_data (image_name, image_filename, image_lang, image_height, image_width, imageset_id) VALUES ('forum_read', 'forum_read.gif', '', 25, 46, 2); +INSERT INTO phpbb_styles_imageset_data (image_name, image_filename, image_lang, image_height, image_width, imageset_id) VALUES ('forum_read_locked', 'forum_read_locked.gif', '', 25, 46, 2); +INSERT INTO phpbb_styles_imageset_data (image_name, image_filename, image_lang, image_height, image_width, imageset_id) VALUES ('forum_read_subforum', 'forum_read_subforum.gif', '', 25, 46, 2); +INSERT INTO phpbb_styles_imageset_data (image_name, image_filename, image_lang, image_height, image_width, imageset_id) VALUES ('forum_unread', 'forum_unread.gif', '', 25, 46, 2); +INSERT INTO phpbb_styles_imageset_data (image_name, image_filename, image_lang, image_height, image_width, imageset_id) VALUES ('forum_unread_locked', 'forum_unread_locked.gif', '', 25, 46, 2); +INSERT INTO phpbb_styles_imageset_data (image_name, image_filename, image_lang, image_height, image_width, imageset_id) VALUES ('forum_unread_subforum', 'forum_unread_subforum.gif', '', 25, 46, 2); +INSERT INTO phpbb_styles_imageset_data (image_name, image_filename, image_lang, image_height, image_width, imageset_id) VALUES ('topic_moved', 'topic_moved.gif', '', 18, 19, 2); +INSERT INTO phpbb_styles_imageset_data (image_name, image_filename, image_lang, image_height, image_width, imageset_id) VALUES ('topic_read', 'topic_read.gif', '', 18, 19, 2); +INSERT INTO phpbb_styles_imageset_data (image_name, image_filename, image_lang, image_height, image_width, imageset_id) VALUES ('topic_read_mine', 'topic_read_mine.gif', '', 18, 19, 2); +INSERT INTO phpbb_styles_imageset_data (image_name, image_filename, image_lang, image_height, image_width, imageset_id) VALUES ('topic_read_hot', 'topic_read_hot.gif', '', 18, 19, 2); +INSERT INTO phpbb_styles_imageset_data (image_name, image_filename, image_lang, image_height, image_width, imageset_id) VALUES ('topic_read_hot_mine', 'topic_read_hot_mine.gif', '', 18, 19, 2); +INSERT INTO phpbb_styles_imageset_data (image_name, image_filename, image_lang, image_height, image_width, imageset_id) VALUES ('topic_read_locked', 'topic_read_locked.gif', '', 18, 19, 2); +INSERT INTO phpbb_styles_imageset_data (image_name, image_filename, image_lang, image_height, image_width, imageset_id) VALUES ('topic_read_locked_mine', 'topic_read_locked_mine.gif', '', 18, 19, 2); +INSERT INTO phpbb_styles_imageset_data (image_name, image_filename, image_lang, image_height, image_width, imageset_id) VALUES ('topic_unread', 'topic_unread.gif', '', 18, 19, 2); +INSERT INTO phpbb_styles_imageset_data (image_name, image_filename, image_lang, image_height, image_width, imageset_id) VALUES ('topic_unread_mine', 'topic_unread_mine.gif', '', 18, 19, 2); +INSERT INTO phpbb_styles_imageset_data (image_name, image_filename, image_lang, image_height, image_width, imageset_id) VALUES ('topic_unread_hot', 'topic_unread_hot.gif', '', 18, 19, 2); +INSERT INTO phpbb_styles_imageset_data (image_name, image_filename, image_lang, image_height, image_width, imageset_id) VALUES ('topic_unread_hot_mine', 'topic_unread_hot_mine.gif', '', 18, 19, 2); +INSERT INTO phpbb_styles_imageset_data (image_name, image_filename, image_lang, image_height, image_width, imageset_id) VALUES ('topic_unread_locked', 'topic_unread_locked.gif', '', 18, 19, 2); +INSERT INTO phpbb_styles_imageset_data (image_name, image_filename, image_lang, image_height, image_width, imageset_id) VALUES ('topic_unread_locked_mine', 'topic_unread_locked_mine.gif', '', 18, 19, 2); +INSERT INTO phpbb_styles_imageset_data (image_name, image_filename, image_lang, image_height, image_width, imageset_id) VALUES ('sticky_read', 'sticky_read.gif', '', 18, 19, 2); +INSERT INTO phpbb_styles_imageset_data (image_name, image_filename, image_lang, image_height, image_width, imageset_id) VALUES ('sticky_read_mine', 'sticky_read_mine.gif', '', 18, 19, 2); +INSERT INTO phpbb_styles_imageset_data (image_name, image_filename, image_lang, image_height, image_width, imageset_id) VALUES ('sticky_read_locked', 'sticky_read_locked.gif', '', 18, 19, 2); +INSERT INTO phpbb_styles_imageset_data (image_name, image_filename, image_lang, image_height, image_width, imageset_id) VALUES ('sticky_read_locked_mine', 'sticky_read_locked_mine.gif', '', 18, 19, 2); +INSERT INTO phpbb_styles_imageset_data (image_name, image_filename, image_lang, image_height, image_width, imageset_id) VALUES ('sticky_unread', 'sticky_unread.gif', '', 18, 19, 2); +INSERT INTO phpbb_styles_imageset_data (image_name, image_filename, image_lang, image_height, image_width, imageset_id) VALUES ('sticky_unread_mine', 'sticky_unread_mine.gif', '', 18, 19, 2); +INSERT INTO phpbb_styles_imageset_data (image_name, image_filename, image_lang, image_height, image_width, imageset_id) VALUES ('sticky_unread_locked', 'sticky_unread_locked.gif', '', 18, 19, 2); +INSERT INTO phpbb_styles_imageset_data (image_name, image_filename, image_lang, image_height, image_width, imageset_id) VALUES ('sticky_unread_locked_mine', 'sticky_unread_locked_mine.gif', '', 18, 19, 2); +INSERT INTO phpbb_styles_imageset_data (image_name, image_filename, image_lang, image_height, image_width, imageset_id) VALUES ('announce_read', 'announce_read.gif', '', 18, 19, 2); +INSERT INTO phpbb_styles_imageset_data (image_name, image_filename, image_lang, image_height, image_width, imageset_id) VALUES ('announce_read_mine', 'announce_read_mine.gif', '', 18, 19, 2); +INSERT INTO phpbb_styles_imageset_data (image_name, image_filename, image_lang, image_height, image_width, imageset_id) VALUES ('announce_read_locked', 'announce_read_locked.gif', '', 18, 19, 2); +INSERT INTO phpbb_styles_imageset_data (image_name, image_filename, image_lang, image_height, image_width, imageset_id) VALUES ('announce_read_locked_mine', 'announce_read_locked_mine.gif', '', 18, 19, 2); +INSERT INTO phpbb_styles_imageset_data (image_name, image_filename, image_lang, image_height, image_width, imageset_id) VALUES ('announce_unread', 'announce_unread.gif', '', 18, 19, 2); +INSERT INTO phpbb_styles_imageset_data (image_name, image_filename, image_lang, image_height, image_width, imageset_id) VALUES ('announce_unread_mine', 'announce_unread_mine.gif', '', 18, 19, 2); +INSERT INTO phpbb_styles_imageset_data (image_name, image_filename, image_lang, image_height, image_width, imageset_id) VALUES ('announce_unread_locked', 'announce_unread_locked.gif', '', 18, 19, 2); +INSERT INTO phpbb_styles_imageset_data (image_name, image_filename, image_lang, image_height, image_width, imageset_id) VALUES ('announce_unread_locked_mine', 'announce_unread_locked_mine.gif', '', 18, 19, 2); +INSERT INTO phpbb_styles_imageset_data (image_name, image_filename, image_lang, image_height, image_width, imageset_id) VALUES ('global_read', 'announce_read.gif', '', 18, 19, 2); +INSERT INTO phpbb_styles_imageset_data (image_name, image_filename, image_lang, image_height, image_width, imageset_id) VALUES ('global_read_mine', 'announce_read_mine.gif', '', 18, 19, 2); +INSERT INTO phpbb_styles_imageset_data (image_name, image_filename, image_lang, image_height, image_width, imageset_id) VALUES ('global_read_locked', 'announce_read_locked.gif', '', 18, 19, 2); +INSERT INTO phpbb_styles_imageset_data (image_name, image_filename, image_lang, image_height, image_width, imageset_id) VALUES ('global_read_locked_mine', 'announce_read_locked_mine.gif', '', 18, 19, 2); +INSERT INTO phpbb_styles_imageset_data (image_name, image_filename, image_lang, image_height, image_width, imageset_id) VALUES ('global_unread', 'announce_unread.gif', '', 18, 19, 2); +INSERT INTO phpbb_styles_imageset_data (image_name, image_filename, image_lang, image_height, image_width, imageset_id) VALUES ('global_unread_mine', 'announce_unread_mine.gif', '', 18, 19, 2); +INSERT INTO phpbb_styles_imageset_data (image_name, image_filename, image_lang, image_height, image_width, imageset_id) VALUES ('global_unread_locked', 'announce_unread_locked.gif', '', 18, 19, 2); +INSERT INTO phpbb_styles_imageset_data (image_name, image_filename, image_lang, image_height, image_width, imageset_id) VALUES ('global_unread_locked_mine', 'announce_unread_locked_mine.gif', '', 18, 19, 2); +INSERT INTO phpbb_styles_imageset_data (image_name, image_filename, image_lang, image_height, image_width, imageset_id) VALUES ('pm_read', 'topic_read.gif', '', 18, 19, 2); +INSERT INTO phpbb_styles_imageset_data (image_name, image_filename, image_lang, image_height, image_width, imageset_id) VALUES ('pm_unread', 'topic_unread.gif', '', 18, 19, 2); +INSERT INTO phpbb_styles_imageset_data (image_name, image_filename, image_lang, image_height, image_width, imageset_id) VALUES ('icon_post_target', 'icon_post_target.gif', '', 9, 12, 2); +INSERT INTO phpbb_styles_imageset_data (image_name, image_filename, image_lang, image_height, image_width, imageset_id) VALUES ('icon_post_target_unread', 'icon_post_target_unread.gif', '', 9, 12, 2); +INSERT INTO phpbb_styles_imageset_data (image_name, image_filename, image_lang, image_height, image_width, imageset_id) VALUES ('icon_topic_attach', 'icon_topic_attach.gif', '', 18, 14, 2); +INSERT INTO phpbb_styles_imageset_data (image_name, image_filename, image_lang, image_height, image_width, imageset_id) VALUES ('icon_topic_latest', 'icon_topic_latest.gif', '', 9, 18, 2); +INSERT INTO phpbb_styles_imageset_data (image_name, image_filename, image_lang, image_height, image_width, imageset_id) VALUES ('icon_topic_newest', 'icon_topic_newest.gif', '', 9, 18, 2); +INSERT INTO phpbb_styles_imageset_data (image_name, image_filename, image_lang, image_height, image_width, imageset_id) VALUES ('icon_topic_reported', 'icon_topic_reported.gif', '', 18, 19, 2); +INSERT INTO phpbb_styles_imageset_data (image_name, image_filename, image_lang, image_height, image_width, imageset_id) VALUES ('icon_topic_unapproved', 'icon_topic_unapproved.gif', '', 18, 19, 2); +INSERT INTO phpbb_styles_imageset_data (image_name, image_filename, image_lang, image_height, image_width, imageset_id) VALUES ('icon_contact_aim', 'icon_contact_aim.gif', 'en', 0, 0, 2); +INSERT INTO phpbb_styles_imageset_data (image_name, image_filename, image_lang, image_height, image_width, imageset_id) VALUES ('icon_contact_email', 'icon_contact_email.gif', 'en', 0, 0, 2); +INSERT INTO phpbb_styles_imageset_data (image_name, image_filename, image_lang, image_height, image_width, imageset_id) VALUES ('icon_contact_icq', 'icon_contact_icq.gif', 'en', 0, 0, 2); +INSERT INTO phpbb_styles_imageset_data (image_name, image_filename, image_lang, image_height, image_width, imageset_id) VALUES ('icon_contact_jabber', 'icon_contact_jabber.gif', 'en', 0, 0, 2); +INSERT INTO phpbb_styles_imageset_data (image_name, image_filename, image_lang, image_height, image_width, imageset_id) VALUES ('icon_contact_msnm', 'icon_contact_msnm.gif', 'en', 0, 0, 2); +INSERT INTO phpbb_styles_imageset_data (image_name, image_filename, image_lang, image_height, image_width, imageset_id) VALUES ('icon_contact_pm', 'icon_contact_pm.gif', 'en', 0, 0, 2); +INSERT INTO phpbb_styles_imageset_data (image_name, image_filename, image_lang, image_height, image_width, imageset_id) VALUES ('icon_contact_yahoo', 'icon_contact_yahoo.gif', 'en', 0, 0, 2); +INSERT INTO phpbb_styles_imageset_data (image_name, image_filename, image_lang, image_height, image_width, imageset_id) VALUES ('icon_contact_www', 'icon_contact_www.gif', 'en', 0, 0, 2); +INSERT INTO phpbb_styles_imageset_data (image_name, image_filename, image_lang, image_height, image_width, imageset_id) VALUES ('icon_post_delete', 'icon_post_delete.gif', 'en', 0, 0, 2); +INSERT INTO phpbb_styles_imageset_data (image_name, image_filename, image_lang, image_height, image_width, imageset_id) VALUES ('icon_post_edit', 'icon_post_edit.gif', 'en', 0, 0, 2); +INSERT INTO phpbb_styles_imageset_data (image_name, image_filename, image_lang, image_height, image_width, imageset_id) VALUES ('icon_post_info', 'icon_post_info.gif', 'en', 0, 0, 2); +INSERT INTO phpbb_styles_imageset_data (image_name, image_filename, image_lang, image_height, image_width, imageset_id) VALUES ('icon_post_quote', 'icon_post_quote.gif', 'en', 0, 0, 2); +INSERT INTO phpbb_styles_imageset_data (image_name, image_filename, image_lang, image_height, image_width, imageset_id) VALUES ('icon_post_report', 'icon_post_report.gif', 'en', 0, 0, 2); +INSERT INTO phpbb_styles_imageset_data (image_name, image_filename, image_lang, image_height, image_width, imageset_id) VALUES ('icon_user_online', 'icon_user_online.gif', 'en', 0, 0, 2); +INSERT INTO phpbb_styles_imageset_data (image_name, image_filename, image_lang, image_height, image_width, imageset_id) VALUES ('icon_user_offline', 'icon_user_offline.gif', 'en', 0, 0, 2); +INSERT INTO phpbb_styles_imageset_data (image_name, image_filename, image_lang, image_height, image_width, imageset_id) VALUES ('icon_user_profile', 'icon_user_profile.gif', 'en', 0, 0, 2); +INSERT INTO phpbb_styles_imageset_data (image_name, image_filename, image_lang, image_height, image_width, imageset_id) VALUES ('icon_user_search', 'icon_user_search.gif', 'en', 0, 0, 2); +INSERT INTO phpbb_styles_imageset_data (image_name, image_filename, image_lang, image_height, image_width, imageset_id) VALUES ('icon_user_warn', 'icon_user_warn.gif', 'en', 0, 0, 2); +INSERT INTO phpbb_styles_imageset_data (image_name, image_filename, image_lang, image_height, image_width, imageset_id) VALUES ('button_pm_new', 'button_pm_new.gif', 'en', 0, 0, 2); +INSERT INTO phpbb_styles_imageset_data (image_name, image_filename, image_lang, image_height, image_width, imageset_id) VALUES ('button_pm_reply', 'button_pm_reply.gif', 'en', 0, 0, 2); +INSERT INTO phpbb_styles_imageset_data (image_name, image_filename, image_lang, image_height, image_width, imageset_id) VALUES ('button_topic_locked', 'button_topic_locked.gif', 'en', 0, 0, 2); +INSERT INTO phpbb_styles_imageset_data (image_name, image_filename, image_lang, image_height, image_width, imageset_id) VALUES ('button_topic_new', 'button_topic_new.gif', 'en', 0, 0, 2); +INSERT INTO phpbb_styles_imageset_data (image_name, image_filename, image_lang, image_height, image_width, imageset_id) VALUES ('button_topic_reply', 'button_topic_reply.gif', 'en', 0, 0, 2); +INSERT INTO phpbb_styles_imageset_data (image_name, image_filename, image_lang, image_height, image_width, imageset_id) VALUES ('icon_contact_aim', 'icon_contact_aim.gif', 'nl', 0, 0, 2); +INSERT INTO phpbb_styles_imageset_data (image_name, image_filename, image_lang, image_height, image_width, imageset_id) VALUES ('icon_contact_email', 'icon_contact_email.gif', 'nl', 0, 0, 2); +INSERT INTO phpbb_styles_imageset_data (image_name, image_filename, image_lang, image_height, image_width, imageset_id) VALUES ('icon_contact_icq', 'icon_contact_icq.gif', 'nl', 0, 0, 2); +INSERT INTO phpbb_styles_imageset_data (image_name, image_filename, image_lang, image_height, image_width, imageset_id) VALUES ('icon_contact_jabber', 'icon_contact_jabber.gif', 'nl', 0, 0, 2); +INSERT INTO phpbb_styles_imageset_data (image_name, image_filename, image_lang, image_height, image_width, imageset_id) VALUES ('icon_contact_msnm', 'icon_contact_msnm.gif', 'nl', 0, 0, 2); +INSERT INTO phpbb_styles_imageset_data (image_name, image_filename, image_lang, image_height, image_width, imageset_id) VALUES ('icon_contact_pm', 'icon_contact_pm.gif', 'nl', 0, 0, 2); +INSERT INTO phpbb_styles_imageset_data (image_name, image_filename, image_lang, image_height, image_width, imageset_id) VALUES ('icon_contact_yahoo', 'icon_contact_yahoo.gif', 'nl', 0, 0, 2); +INSERT INTO phpbb_styles_imageset_data (image_name, image_filename, image_lang, image_height, image_width, imageset_id) VALUES ('icon_contact_www', 'icon_contact_www.gif', 'nl', 0, 0, 2); +INSERT INTO phpbb_styles_imageset_data (image_name, image_filename, image_lang, image_height, image_width, imageset_id) VALUES ('icon_post_delete', 'icon_post_delete.gif', 'nl', 0, 0, 2); +INSERT INTO phpbb_styles_imageset_data (image_name, image_filename, image_lang, image_height, image_width, imageset_id) VALUES ('icon_post_edit', 'icon_post_edit.gif', 'nl', 0, 0, 2); +INSERT INTO phpbb_styles_imageset_data (image_name, image_filename, image_lang, image_height, image_width, imageset_id) VALUES ('icon_post_info', 'icon_post_info.gif', 'nl', 0, 0, 2); +INSERT INTO phpbb_styles_imageset_data (image_name, image_filename, image_lang, image_height, image_width, imageset_id) VALUES ('icon_post_quote', 'icon_post_quote.gif', 'nl', 0, 0, 2); +INSERT INTO phpbb_styles_imageset_data (image_name, image_filename, image_lang, image_height, image_width, imageset_id) VALUES ('icon_post_report', 'icon_post_report.gif', 'nl', 0, 0, 2); +INSERT INTO phpbb_styles_imageset_data (image_name, image_filename, image_lang, image_height, image_width, imageset_id) VALUES ('icon_user_online', 'icon_user_online.gif', 'nl', 0, 0, 2); +INSERT INTO phpbb_styles_imageset_data (image_name, image_filename, image_lang, image_height, image_width, imageset_id) VALUES ('icon_user_offline', 'icon_user_offline.gif', 'nl', 0, 0, 2); +INSERT INTO phpbb_styles_imageset_data (image_name, image_filename, image_lang, image_height, image_width, imageset_id) VALUES ('icon_user_profile', 'icon_user_profile.gif', 'nl', 0, 0, 2); +INSERT INTO phpbb_styles_imageset_data (image_name, image_filename, image_lang, image_height, image_width, imageset_id) VALUES ('icon_user_search', 'icon_user_search.gif', 'nl', 0, 0, 2); +INSERT INTO phpbb_styles_imageset_data (image_name, image_filename, image_lang, image_height, image_width, imageset_id) VALUES ('icon_user_warn', 'icon_user_warn.gif', 'nl', 0, 0, 2); +INSERT INTO phpbb_styles_imageset_data (image_name, image_filename, image_lang, image_height, image_width, imageset_id) VALUES ('button_pm_new', 'button_pm_new.gif', 'nl', 0, 0, 2); +INSERT INTO phpbb_styles_imageset_data (image_name, image_filename, image_lang, image_height, image_width, imageset_id) VALUES ('button_pm_reply', 'button_pm_reply.gif', 'nl', 0, 0, 2); +INSERT INTO phpbb_styles_imageset_data (image_name, image_filename, image_lang, image_height, image_width, imageset_id) VALUES ('button_topic_locked', 'button_topic_locked.gif', 'nl', 0, 0, 2); +INSERT INTO phpbb_styles_imageset_data (image_name, image_filename, image_lang, image_height, image_width, imageset_id) VALUES ('button_topic_new', 'button_topic_new.gif', 'nl', 0, 0, 2); +INSERT INTO phpbb_styles_imageset_data (image_name, image_filename, image_lang, image_height, image_width, imageset_id) VALUES ('button_topic_reply', 'button_topic_reply.gif', 'nl', 0, 0, 2); +INSERT INTO phpbb_styles_imageset_data (image_name, image_filename, image_lang, image_height, image_width, imageset_id) VALUES ('site_logo', 'site_logo.gif', '', 52, 139, 1); +INSERT INTO phpbb_styles_imageset_data (image_name, image_filename, image_lang, image_height, image_width, imageset_id) VALUES ('upload_bar', 'progress_bar.gif', '', 16, 280, 1); +INSERT INTO phpbb_styles_imageset_data (image_name, image_filename, image_lang, image_height, image_width, imageset_id) VALUES ('forum_link', 'forum_link.gif', '', 27, 27, 1); +INSERT INTO phpbb_styles_imageset_data (image_name, image_filename, image_lang, image_height, image_width, imageset_id) VALUES ('forum_read', 'forum_read.gif', '', 27, 27, 1); +INSERT INTO phpbb_styles_imageset_data (image_name, image_filename, image_lang, image_height, image_width, imageset_id) VALUES ('forum_read_locked', 'forum_read_locked.gif', '', 27, 27, 1); +INSERT INTO phpbb_styles_imageset_data (image_name, image_filename, image_lang, image_height, image_width, imageset_id) VALUES ('forum_read_subforum', 'forum_read_subforum.gif', '', 27, 27, 1); +INSERT INTO phpbb_styles_imageset_data (image_name, image_filename, image_lang, image_height, image_width, imageset_id) VALUES ('forum_unread', 'forum_unread.gif', '', 27, 27, 1); +INSERT INTO phpbb_styles_imageset_data (image_name, image_filename, image_lang, image_height, image_width, imageset_id) VALUES ('forum_unread_locked', 'forum_read_locked.gif', '', 27, 27, 1); +INSERT INTO phpbb_styles_imageset_data (image_name, image_filename, image_lang, image_height, image_width, imageset_id) VALUES ('forum_unread_subforum', 'forum_unread_subforum.gif', '', 27, 27, 1); +INSERT INTO phpbb_styles_imageset_data (image_name, image_filename, image_lang, image_height, image_width, imageset_id) VALUES ('topic_moved', 'topic_moved.gif', '', 27, 27, 1); +INSERT INTO phpbb_styles_imageset_data (image_name, image_filename, image_lang, image_height, image_width, imageset_id) VALUES ('topic_read', 'topic_read.gif', '', 27, 27, 1); +INSERT INTO phpbb_styles_imageset_data (image_name, image_filename, image_lang, image_height, image_width, imageset_id) VALUES ('topic_read_mine', 'topic_read_mine.gif', '', 27, 27, 1); +INSERT INTO phpbb_styles_imageset_data (image_name, image_filename, image_lang, image_height, image_width, imageset_id) VALUES ('topic_read_hot', 'topic_read_hot.gif', '', 27, 27, 1); +INSERT INTO phpbb_styles_imageset_data (image_name, image_filename, image_lang, image_height, image_width, imageset_id) VALUES ('topic_read_hot_mine', 'topic_read_hot_mine.gif', '', 27, 27, 1); +INSERT INTO phpbb_styles_imageset_data (image_name, image_filename, image_lang, image_height, image_width, imageset_id) VALUES ('topic_read_locked', 'topic_read_locked.gif', '', 27, 27, 1); +INSERT INTO phpbb_styles_imageset_data (image_name, image_filename, image_lang, image_height, image_width, imageset_id) VALUES ('topic_read_locked_mine', 'topic_read_locked_mine.gif', '', 27, 27, 1); +INSERT INTO phpbb_styles_imageset_data (image_name, image_filename, image_lang, image_height, image_width, imageset_id) VALUES ('topic_unread', 'topic_unread.gif', '', 27, 27, 1); +INSERT INTO phpbb_styles_imageset_data (image_name, image_filename, image_lang, image_height, image_width, imageset_id) VALUES ('topic_unread_mine', 'topic_unread_mine.gif', '', 27, 27, 1); +INSERT INTO phpbb_styles_imageset_data (image_name, image_filename, image_lang, image_height, image_width, imageset_id) VALUES ('topic_unread_hot', 'topic_unread_hot.gif', '', 27, 27, 1); +INSERT INTO phpbb_styles_imageset_data (image_name, image_filename, image_lang, image_height, image_width, imageset_id) VALUES ('topic_unread_hot_mine', 'topic_unread_hot_mine.gif', '', 27, 27, 1); +INSERT INTO phpbb_styles_imageset_data (image_name, image_filename, image_lang, image_height, image_width, imageset_id) VALUES ('topic_unread_locked', 'topic_unread_locked.gif', '', 27, 27, 1); +INSERT INTO phpbb_styles_imageset_data (image_name, image_filename, image_lang, image_height, image_width, imageset_id) VALUES ('topic_unread_locked_mine', 'topic_unread_locked_mine.gif', '', 27, 27, 1); +INSERT INTO phpbb_styles_imageset_data (image_name, image_filename, image_lang, image_height, image_width, imageset_id) VALUES ('sticky_read', 'sticky_read.gif', '', 27, 27, 1); +INSERT INTO phpbb_styles_imageset_data (image_name, image_filename, image_lang, image_height, image_width, imageset_id) VALUES ('sticky_read_mine', 'sticky_read_mine.gif', '', 27, 27, 1); +INSERT INTO phpbb_styles_imageset_data (image_name, image_filename, image_lang, image_height, image_width, imageset_id) VALUES ('sticky_read_locked', 'sticky_read.gif', '', 27, 27, 1); +INSERT INTO phpbb_styles_imageset_data (image_name, image_filename, image_lang, image_height, image_width, imageset_id) VALUES ('sticky_read_locked_mine', 'sticky_read_mine.gif', '', 27, 27, 1); +INSERT INTO phpbb_styles_imageset_data (image_name, image_filename, image_lang, image_height, image_width, imageset_id) VALUES ('sticky_unread', 'sticky_unread.gif', '', 27, 27, 1); +INSERT INTO phpbb_styles_imageset_data (image_name, image_filename, image_lang, image_height, image_width, imageset_id) VALUES ('sticky_unread_mine', 'sticky_unread_mine.gif', '', 27, 27, 1); +INSERT INTO phpbb_styles_imageset_data (image_name, image_filename, image_lang, image_height, image_width, imageset_id) VALUES ('sticky_unread_locked', 'sticky_unread.gif', '', 27, 27, 1); +INSERT INTO phpbb_styles_imageset_data (image_name, image_filename, image_lang, image_height, image_width, imageset_id) VALUES ('sticky_unread_locked_mine', 'sticky_unread_locked_mine.gif', '', 27, 27, 1); +INSERT INTO phpbb_styles_imageset_data (image_name, image_filename, image_lang, image_height, image_width, imageset_id) VALUES ('announce_read', 'announce_read.gif', '', 27, 27, 1); +INSERT INTO phpbb_styles_imageset_data (image_name, image_filename, image_lang, image_height, image_width, imageset_id) VALUES ('announce_read_mine', 'announce_read_mine.gif', '', 27, 27, 1); +INSERT INTO phpbb_styles_imageset_data (image_name, image_filename, image_lang, image_height, image_width, imageset_id) VALUES ('announce_read_locked', 'announce_read_locked.gif', '', 27, 27, 1); +INSERT INTO phpbb_styles_imageset_data (image_name, image_filename, image_lang, image_height, image_width, imageset_id) VALUES ('announce_read_locked_mine', 'announce_read_locked_mine.gif', '', 27, 27, 1); +INSERT INTO phpbb_styles_imageset_data (image_name, image_filename, image_lang, image_height, image_width, imageset_id) VALUES ('announce_unread', 'announce_unread.gif', '', 27, 27, 1); +INSERT INTO phpbb_styles_imageset_data (image_name, image_filename, image_lang, image_height, image_width, imageset_id) VALUES ('announce_unread_mine', 'announce_unread_mine.gif', '', 27, 27, 1); +INSERT INTO phpbb_styles_imageset_data (image_name, image_filename, image_lang, image_height, image_width, imageset_id) VALUES ('announce_unread_locked', 'announce_unread.gif', '', 27, 27, 1); +INSERT INTO phpbb_styles_imageset_data (image_name, image_filename, image_lang, image_height, image_width, imageset_id) VALUES ('announce_unread_locked_mine', 'announce_unread_locked_mine.gif', '', 27, 27, 1); +INSERT INTO phpbb_styles_imageset_data (image_name, image_filename, image_lang, image_height, image_width, imageset_id) VALUES ('global_read', 'announce_read.gif', '', 27, 27, 1); +INSERT INTO phpbb_styles_imageset_data (image_name, image_filename, image_lang, image_height, image_width, imageset_id) VALUES ('global_read_mine', 'announce_read_mine.gif', '', 27, 27, 1); +INSERT INTO phpbb_styles_imageset_data (image_name, image_filename, image_lang, image_height, image_width, imageset_id) VALUES ('global_read_locked', 'announce_read_locked.gif', '', 27, 27, 1); +INSERT INTO phpbb_styles_imageset_data (image_name, image_filename, image_lang, image_height, image_width, imageset_id) VALUES ('global_read_locked_mine', 'announce_read_locked_mine.gif', '', 27, 27, 1); +INSERT INTO phpbb_styles_imageset_data (image_name, image_filename, image_lang, image_height, image_width, imageset_id) VALUES ('global_unread', 'announce_unread.gif', '', 27, 27, 1); +INSERT INTO phpbb_styles_imageset_data (image_name, image_filename, image_lang, image_height, image_width, imageset_id) VALUES ('global_unread_mine', 'announce_unread_mine.gif', '', 27, 27, 1); +INSERT INTO phpbb_styles_imageset_data (image_name, image_filename, image_lang, image_height, image_width, imageset_id) VALUES ('global_unread_locked', 'announce_unread_locked_mine.gif', '', 27, 27, 1); +INSERT INTO phpbb_styles_imageset_data (image_name, image_filename, image_lang, image_height, image_width, imageset_id) VALUES ('global_unread_locked_mine', 'announce_unread_locked_mine.gif', '', 27, 27, 1); +INSERT INTO phpbb_styles_imageset_data (image_name, image_filename, image_lang, image_height, image_width, imageset_id) VALUES ('pm_read', 'topic_read.gif', '', 27, 27, 1); +INSERT INTO phpbb_styles_imageset_data (image_name, image_filename, image_lang, image_height, image_width, imageset_id) VALUES ('pm_unread', 'topic_unread.gif', '', 27, 27, 1); +INSERT INTO phpbb_styles_imageset_data (image_name, image_filename, image_lang, image_height, image_width, imageset_id) VALUES ('icon_contact_aim', 'icon_contact_aim.gif', '', 20, 72, 1); +INSERT INTO phpbb_styles_imageset_data (image_name, image_filename, image_lang, image_height, image_width, imageset_id) VALUES ('icon_contact_email', 'icon_contact_email.gif', '', 20, 72, 1); +INSERT INTO phpbb_styles_imageset_data (image_name, image_filename, image_lang, image_height, image_width, imageset_id) VALUES ('icon_contact_icq', 'icon_contact_icq.gif', '', 20, 72, 1); +INSERT INTO phpbb_styles_imageset_data (image_name, image_filename, image_lang, image_height, image_width, imageset_id) VALUES ('icon_contact_jabber', 'icon_contact_jabber.gif', '', 20, 72, 1); +INSERT INTO phpbb_styles_imageset_data (image_name, image_filename, image_lang, image_height, image_width, imageset_id) VALUES ('icon_contact_msnm', 'icon_contact_msnm.gif', '', 20, 72, 1); +INSERT INTO phpbb_styles_imageset_data (image_name, image_filename, image_lang, image_height, image_width, imageset_id) VALUES ('icon_contact_www', 'icon_contact_www.gif', '', 20, 72, 1); +INSERT INTO phpbb_styles_imageset_data (image_name, image_filename, image_lang, image_height, image_width, imageset_id) VALUES ('icon_contact_yahoo', 'icon_contact_yahoo.gif', '', 20, 72, 1); +INSERT INTO phpbb_styles_imageset_data (image_name, image_filename, image_lang, image_height, image_width, imageset_id) VALUES ('icon_post_delete', 'icon_post_delete.gif', '', 20, 20, 1); +INSERT INTO phpbb_styles_imageset_data (image_name, image_filename, image_lang, image_height, image_width, imageset_id) VALUES ('icon_post_info', 'icon_post_info.gif', '', 20, 20, 1); +INSERT INTO phpbb_styles_imageset_data (image_name, image_filename, image_lang, image_height, image_width, imageset_id) VALUES ('icon_post_report', 'icon_post_report.gif', '', 20, 20, 1); +INSERT INTO phpbb_styles_imageset_data (image_name, image_filename, image_lang, image_height, image_width, imageset_id) VALUES ('icon_post_target', 'icon_post_target.gif', '', 9, 12, 1); +INSERT INTO phpbb_styles_imageset_data (image_name, image_filename, image_lang, image_height, image_width, imageset_id) VALUES ('icon_post_target_unread', 'icon_post_target_unread.gif', '', 9, 12, 1); +INSERT INTO phpbb_styles_imageset_data (image_name, image_filename, image_lang, image_height, image_width, imageset_id) VALUES ('icon_topic_attach', 'icon_topic_attach.gif', '', 10, 7, 1); +INSERT INTO phpbb_styles_imageset_data (image_name, image_filename, image_lang, image_height, image_width, imageset_id) VALUES ('icon_topic_latest', 'icon_topic_latest.gif', '', 9, 12, 1); +INSERT INTO phpbb_styles_imageset_data (image_name, image_filename, image_lang, image_height, image_width, imageset_id) VALUES ('icon_topic_newest', 'icon_topic_newest.gif', '', 9, 12, 1); +INSERT INTO phpbb_styles_imageset_data (image_name, image_filename, image_lang, image_height, image_width, imageset_id) VALUES ('icon_topic_reported', 'icon_topic_reported.gif', '', 14, 16, 1); +INSERT INTO phpbb_styles_imageset_data (image_name, image_filename, image_lang, image_height, image_width, imageset_id) VALUES ('icon_topic_unapproved', 'icon_topic_unapproved.gif', '', 14, 16, 1); +INSERT INTO phpbb_styles_imageset_data (image_name, image_filename, image_lang, image_height, image_width, imageset_id) VALUES ('icon_user_profile', 'icon_user_profile.gif', '', 11, 11, 1); +INSERT INTO phpbb_styles_imageset_data (image_name, image_filename, image_lang, image_height, image_width, imageset_id) VALUES ('icon_user_warn', 'icon_post_report.gif', '', 20, 20, 1); +INSERT INTO phpbb_styles_imageset_data (image_name, image_filename, image_lang, image_height, image_width, imageset_id) VALUES ('icon_contact_pm', 'icon_contact_pm.gif', 'en', 40, 28, 1); +INSERT INTO phpbb_styles_imageset_data (image_name, image_filename, image_lang, image_height, image_width, imageset_id) VALUES ('icon_post_edit', 'icon_post_edit.gif', 'en', 40, 42, 1); +INSERT INTO phpbb_styles_imageset_data (image_name, image_filename, image_lang, image_height, image_width, imageset_id) VALUES ('icon_post_quote', 'icon_post_quote.gif', 'en', 40, 54, 1); +INSERT INTO phpbb_styles_imageset_data (image_name, image_filename, image_lang, image_height, image_width, imageset_id) VALUES ('icon_user_online', 'icon_user_online.gif', 'en', 0, 0, 1); +INSERT INTO phpbb_styles_imageset_data (image_name, image_filename, image_lang, image_height, image_width, imageset_id) VALUES ('icon_user_offline', 'icon_user_offline.gif', 'en', 0, 0, 1); +INSERT INTO phpbb_styles_imageset_data (image_name, image_filename, image_lang, image_height, image_width, imageset_id) VALUES ('icon_user_search', 'icon_user_search.gif', 'en', 0, 0, 1); +INSERT INTO phpbb_styles_imageset_data (image_name, image_filename, image_lang, image_height, image_width, imageset_id) VALUES ('button_pm_forward', 'button_pm_forward.gif', 'en', 0, 0, 1); +INSERT INTO phpbb_styles_imageset_data (image_name, image_filename, image_lang, image_height, image_width, imageset_id) VALUES ('button_pm_new', 'button_pm_new.gif', 'en', 0, 0, 1); +INSERT INTO phpbb_styles_imageset_data (image_name, image_filename, image_lang, image_height, image_width, imageset_id) VALUES ('button_pm_reply', 'button_pm_reply.gif', 'en', 0, 0, 1); +INSERT INTO phpbb_styles_imageset_data (image_name, image_filename, image_lang, image_height, image_width, imageset_id) VALUES ('button_topic_locked', 'button_topic_locked.gif', 'en', 0, 0, 1); +INSERT INTO phpbb_styles_imageset_data (image_name, image_filename, image_lang, image_height, image_width, imageset_id) VALUES ('button_topic_new', 'button_topic_new.gif', 'en', 0, 0, 1); +INSERT INTO phpbb_styles_imageset_data (image_name, image_filename, image_lang, image_height, image_width, imageset_id) VALUES ('button_topic_reply', 'button_topic_reply.gif', 'en', 0, 0, 1); # -- phpbb_styles_template INSERT INTO phpbb_styles_template (template_name, template_copyright, template_path, bbcode_bitfield, template_storedb) VALUES ('prosilver', '© phpBB Group', 'prosilver', 'lNg=', 0); diff --git a/phpBB/install/schemas/sqlite_schema.sql b/phpBB/install/schemas/sqlite_schema.sql index 115c69376b..d1ac9abf81 100644 --- a/phpBB/install/schemas/sqlite_schema.sql +++ b/phpBB/install/schemas/sqlite_schema.sql @@ -749,105 +749,24 @@ CREATE TABLE phpbb_styles_imageset ( imageset_id INTEGER PRIMARY KEY NOT NULL , imageset_name varchar(255) NOT NULL DEFAULT '', imageset_copyright varchar(255) NOT NULL DEFAULT '', - imageset_path varchar(100) NOT NULL DEFAULT '', - site_logo varchar(200) NOT NULL DEFAULT '', - upload_bar varchar(200) NOT NULL DEFAULT '', - poll_left varchar(200) NOT NULL DEFAULT '', - poll_center varchar(200) NOT NULL DEFAULT '', - poll_right varchar(200) NOT NULL DEFAULT '', - icon_friend varchar(200) NOT NULL DEFAULT '', - icon_foe varchar(200) NOT NULL DEFAULT '', - forum_link varchar(200) NOT NULL DEFAULT '', - forum_read varchar(200) NOT NULL DEFAULT '', - forum_read_locked varchar(200) NOT NULL DEFAULT '', - forum_read_subforum varchar(200) NOT NULL DEFAULT '', - forum_unread varchar(200) NOT NULL DEFAULT '', - forum_unread_locked varchar(200) NOT NULL DEFAULT '', - forum_unread_subforum varchar(200) NOT NULL DEFAULT '', - topic_moved varchar(200) NOT NULL DEFAULT '', - topic_read varchar(200) NOT NULL DEFAULT '', - topic_read_mine varchar(200) NOT NULL DEFAULT '', - topic_read_hot varchar(200) NOT NULL DEFAULT '', - topic_read_hot_mine varchar(200) NOT NULL DEFAULT '', - topic_read_locked varchar(200) NOT NULL DEFAULT '', - topic_read_locked_mine varchar(200) NOT NULL DEFAULT '', - topic_unread varchar(200) NOT NULL DEFAULT '', - topic_unread_mine varchar(200) NOT NULL DEFAULT '', - topic_unread_hot varchar(200) NOT NULL DEFAULT '', - topic_unread_hot_mine varchar(200) NOT NULL DEFAULT '', - topic_unread_locked varchar(200) NOT NULL DEFAULT '', - topic_unread_locked_mine varchar(200) NOT NULL DEFAULT '', - sticky_read varchar(200) NOT NULL DEFAULT '', - sticky_read_mine varchar(200) NOT NULL DEFAULT '', - sticky_read_locked varchar(200) NOT NULL DEFAULT '', - sticky_read_locked_mine varchar(200) NOT NULL DEFAULT '', - sticky_unread varchar(200) NOT NULL DEFAULT '', - sticky_unread_mine varchar(200) NOT NULL DEFAULT '', - sticky_unread_locked varchar(200) NOT NULL DEFAULT '', - sticky_unread_locked_mine varchar(200) NOT NULL DEFAULT '', - announce_read varchar(200) NOT NULL DEFAULT '', - announce_read_mine varchar(200) NOT NULL DEFAULT '', - announce_read_locked varchar(200) NOT NULL DEFAULT '', - announce_read_locked_mine varchar(200) NOT NULL DEFAULT '', - announce_unread varchar(200) NOT NULL DEFAULT '', - announce_unread_mine varchar(200) NOT NULL DEFAULT '', - announce_unread_locked varchar(200) NOT NULL DEFAULT '', - announce_unread_locked_mine varchar(200) NOT NULL DEFAULT '', - global_read varchar(200) NOT NULL DEFAULT '', - global_read_mine varchar(200) NOT NULL DEFAULT '', - global_read_locked varchar(200) NOT NULL DEFAULT '', - global_read_locked_mine varchar(200) NOT NULL DEFAULT '', - global_unread varchar(200) NOT NULL DEFAULT '', - global_unread_mine varchar(200) NOT NULL DEFAULT '', - global_unread_locked varchar(200) NOT NULL DEFAULT '', - global_unread_locked_mine varchar(200) NOT NULL DEFAULT '', - pm_read varchar(200) NOT NULL DEFAULT '', - pm_unread varchar(200) NOT NULL DEFAULT '', - icon_contact_aim varchar(200) NOT NULL DEFAULT '', - icon_contact_email varchar(200) NOT NULL DEFAULT '', - icon_contact_icq varchar(200) NOT NULL DEFAULT '', - icon_contact_jabber varchar(200) NOT NULL DEFAULT '', - icon_contact_msnm varchar(200) NOT NULL DEFAULT '', - icon_contact_pm varchar(200) NOT NULL DEFAULT '', - icon_contact_yahoo varchar(200) NOT NULL DEFAULT '', - icon_contact_www varchar(200) NOT NULL DEFAULT '', - icon_post_delete varchar(200) NOT NULL DEFAULT '', - icon_post_edit varchar(200) NOT NULL DEFAULT '', - icon_post_info varchar(200) NOT NULL DEFAULT '', - icon_post_quote varchar(200) NOT NULL DEFAULT '', - icon_post_report varchar(200) NOT NULL DEFAULT '', - icon_post_target varchar(200) NOT NULL DEFAULT '', - icon_post_target_unread varchar(200) NOT NULL DEFAULT '', - icon_topic_attach varchar(200) NOT NULL DEFAULT '', - icon_topic_latest varchar(200) NOT NULL DEFAULT '', - icon_topic_newest varchar(200) NOT NULL DEFAULT '', - icon_topic_reported varchar(200) NOT NULL DEFAULT '', - icon_topic_unapproved varchar(200) NOT NULL DEFAULT '', - icon_user_online varchar(200) NOT NULL DEFAULT '', - icon_user_offline varchar(200) NOT NULL DEFAULT '', - icon_user_profile varchar(200) NOT NULL DEFAULT '', - icon_user_search varchar(200) NOT NULL DEFAULT '', - icon_user_warn varchar(200) NOT NULL DEFAULT '', - button_pm_forward varchar(200) NOT NULL DEFAULT '', - button_pm_new varchar(200) NOT NULL DEFAULT '', - button_pm_reply varchar(200) NOT NULL DEFAULT '', - button_topic_locked varchar(200) NOT NULL DEFAULT '', - button_topic_new varchar(200) NOT NULL DEFAULT '', - button_topic_reply varchar(200) NOT NULL DEFAULT '', - user_icon1 varchar(200) NOT NULL DEFAULT '', - user_icon2 varchar(200) NOT NULL DEFAULT '', - user_icon3 varchar(200) NOT NULL DEFAULT '', - user_icon4 varchar(200) NOT NULL DEFAULT '', - user_icon5 varchar(200) NOT NULL DEFAULT '', - user_icon6 varchar(200) NOT NULL DEFAULT '', - user_icon7 varchar(200) NOT NULL DEFAULT '', - user_icon8 varchar(200) NOT NULL DEFAULT '', - user_icon9 varchar(200) NOT NULL DEFAULT '', - user_icon10 varchar(200) NOT NULL DEFAULT '' + imageset_path varchar(100) NOT NULL DEFAULT '' ); CREATE UNIQUE INDEX phpbb_styles_imageset_imgset_nm ON phpbb_styles_imageset (imageset_name); +# Table: 'phpbb_styles_imageset_data' +CREATE TABLE phpbb_styles_imageset_data ( + image_id INTEGER PRIMARY KEY NOT NULL , + image_name varchar(200) NOT NULL DEFAULT '', + image_filename varchar(200) NOT NULL DEFAULT '', + image_lang varchar(30) NOT NULL DEFAULT '', + image_height INTEGER UNSIGNED NOT NULL DEFAULT '0', + image_width INTEGER UNSIGNED NOT NULL DEFAULT '0', + imageset_id tinyint(4) NOT NULL DEFAULT '0' +); + +CREATE INDEX phpbb_styles_imageset_data_imgset_id ON phpbb_styles_imageset_data (imageset_id); + # Table: 'phpbb_topics' CREATE TABLE phpbb_topics ( topic_id INTEGER PRIMARY KEY NOT NULL , diff --git a/phpBB/language/en/acp/styles.php b/phpBB/language/en/acp/styles.php index 73bbf0ad9f..cdf4694442 100644 --- a/phpBB/language/en/acp/styles.php +++ b/phpBB/language/en/acp/styles.php @@ -212,6 +212,8 @@ $lang = array_merge($lang, array( 'IMG_PM_READ' => 'Read private message', 'IMG_PM_UNREAD' => 'Unread private message', + 'IMG_ICON_BACK_TOP' => 'Top', + 'IMG_ICON_CONTACT_AIM' => 'AIM', 'IMG_ICON_CONTACT_EMAIL' => 'Send email', 'IMG_ICON_CONTACT_ICQ' => 'ICQ', diff --git a/phpBB/style.php b/phpBB/style.php index 8a190ed520..433a41e3e9 100644 --- a/phpBB/style.php +++ b/phpBB/style.php @@ -90,6 +90,19 @@ if ($id && $sid) $theme = $db->sql_fetchrow($result); $db->sql_freeresult($result); + $sql = 'SELECT * + FROM ' . STYLES_IMAGESET_DATA_TABLE . ' + WHERE imageset_id = ' . $id . " + AND image_lang IN('" . $db->sql_escape($user['user_lang']) . "', '')"; + $result = $db->sql_query($sql, 3600); + + $img_array = array(); + + while ($row = $db->sql_fetchrow($result)) + { + $img_array[$row['image_name']] = $row; + } + if (!$theme) { exit; @@ -140,49 +153,40 @@ if ($id && $sid) foreach ($matches[1] as $i => $img) { $img = strtolower($img); - if (!isset($theme[$img])) + if (!isset($img_array[$img])) { continue; } if (!isset($imgs[$img])) { - // Do not include dimensions? - if (strpos($theme[$img], '*') === false) - { - $imgsrc = trim($theme[$img]); - $width = $height = null; - } - else - { - list($imgsrc, $height, $width) = explode('*', $theme[$img]); - } - + $img_data = &$img_array[$img]; + $imgsrc = ($img_data['image_lang'] ? $img_data['image_lang'] . '/' : '') . $img_data['image_filename']; $imgs[$img] = array( - 'src' => $phpbb_root_path . 'styles/' . $theme['imageset_path'] . '/imageset/' . str_replace('{LANG}', $user['user_lang'], $imgsrc), - 'width' => $width, - 'height' => $height, + 'src' => $phpbb_root_path . 'styles/' . $theme['imageset_path'] . '/imageset/' . $imgsrc, + 'width' => $img_data['image_width'], + 'height' => $img_data['image_height'], ); } switch ($matches[2][$i]) { case 'SRC': - $replace = $imgs[$img]['src']; + $replace[] = $imgs[$img]['src']; break; case 'WIDTH': - $replace = $imgs[$img]['width']; + $replace[] = $imgs[$img]['width']; break; case 'HEIGHT': - $replace = $imgs[$img]['height']; + $replace[] = $imgs[$img]['height']; break; default: continue; } - $find = $matches[0][$i]; + $find[] = $matches[0][$i]; } if (sizeof($find)) diff --git a/phpBB/styles/prosilver/imageset/en/imageset.cfg b/phpBB/styles/prosilver/imageset/en/imageset.cfg new file mode 100644 index 0000000000..84029aa3b1 --- /dev/null +++ b/phpBB/styles/prosilver/imageset/en/imageset.cfg @@ -0,0 +1,35 @@ +# +# phpBB Imageset Configuration File +# +# @package phpBB3 +# @copyright (c) 2006 phpBB Group +# @license http://opensource.org/licenses/gpl-license.php GNU Public License +# +# +# At the left is the name, please do not change this +# At the right the value is entered +# For on/off options the valid values are on, off, 1, 0, true and false +# +# Values get trimmed, if you want to add a space in front or at the end of +# the value, then enclose the value with single or double quotes. +# Single and double quotes do not need to be escaped. +# +# + +# Images +img_icon_contact_pm = icon_contact_pm.gif*40*28 + +img_icon_post_edit = icon_post_edit.gif*40*42 +img_icon_post_quote = icon_post_quote.gif*40*54 + +img_icon_user_online = icon_user_online.gif +img_icon_user_offline = icon_user_offline.gif +img_icon_user_search = icon_user_search.gif + +img_button_pm_forward = button_pm_forward.gif +img_button_pm_new = button_pm_new.gif +img_button_pm_reply = button_pm_reply.gif + +img_button_topic_locked = button_topic_locked.gif +img_button_topic_new = button_topic_new.gif +img_button_topic_reply = button_topic_reply.gif diff --git a/phpBB/styles/prosilver/imageset/imageset.cfg b/phpBB/styles/prosilver/imageset/imageset.cfg index 0e0a85f5ce..08d974d582 100644 --- a/phpBB/styles/prosilver/imageset/imageset.cfg +++ b/phpBB/styles/prosilver/imageset/imageset.cfg @@ -91,14 +91,14 @@ img_icon_contact_email = icon_contact_email.gif*20*72 img_icon_contact_icq = icon_contact_icq.gif*20*72 img_icon_contact_jabber = icon_contact_jabber.gif*20*72 img_icon_contact_msnm = icon_contact_msnm.gif*20*72 -img_icon_contact_pm = {LANG}/icon_contact_pm.gif + img_icon_contact_www = icon_contact_www.gif*20*72 img_icon_contact_yahoo = icon_contact_yahoo.gif*20*72 img_icon_post_delete = icon_post_delete.gif*20*20 -img_icon_post_edit = {LANG}/icon_post_edit.gif + img_icon_post_info = icon_post_info.gif*20*20 -img_icon_post_quote = {LANG}/icon_post_quote.gif + img_icon_post_report = icon_post_report.gif*20*20 img_icon_post_target = icon_post_target.gif*9*12 img_icon_post_target_unread = icon_post_target_unread.gif*9*12 @@ -109,15 +109,8 @@ img_icon_topic_newest = icon_topic_newest.gif*9*12 img_icon_topic_reported = icon_topic_reported.gif*14*16 img_icon_topic_unapproved = icon_topic_unapproved.gif*14*16 -img_icon_user_online = {LANG}/icon_user_online.gif -img_icon_user_offline = {LANG}/icon_user_offline.gif + + img_icon_user_profile = icon_user_profile.gif*11*11 -img_icon_user_search = {LANG}/icon_user_search.gif -img_icon_user_warn = icon_post_report.gif*20*20 -img_button_pm_forward = {LANG}/button_pm_forward.gif -img_button_pm_new = {LANG}/button_pm_new.gif -img_button_pm_reply = {LANG}/button_pm_reply -img_button_topic_locked = {LANG}/button_topic_locked.gif -img_button_topic_new = {LANG}/button_topic_new.gif -img_button_topic_reply = {LANG}/button_topic_reply.gif +img_icon_user_warn = icon_post_report.gif*20*20 diff --git a/phpBB/styles/prosilver/theme/buttons.css b/phpBB/styles/prosilver/theme/buttons.css index 26d47ce745..d135625c4d 100644 --- a/phpBB/styles/prosilver/theme/buttons.css +++ b/phpBB/styles/prosilver/theme/buttons.css @@ -150,11 +150,11 @@ ul.profile-icons li a:hover { background: none; } .quote-icon, .quote-icon a { background: none top left no-repeat; } ul.profile-icons li.pm-icon { - width: 28px; + width: {IMG_ICON_CONTACT_PM_WIDTH}px; } ul.profile-icons li.quote-icon { - width: 54px; + width: {IMG_ICON_POST_QUOTE_WIDTH}px; margin-left: 10px; } @@ -173,7 +173,7 @@ div.rank-image { .edit-icon, .edit-icon a { background: none top left no-repeat; } ul.profile-icons li.edit-icon { - width: 41px; + width: {IMG_ICON_POST_EDIT_WIDTH}px; } .delete-icon, .delete-icon a { background: none top left no-repeat; } diff --git a/phpBB/styles/prosilver/theme/colours.css b/phpBB/styles/prosilver/theme/colours.css index 37ca60320a..d2d3f22bdb 100644 --- a/phpBB/styles/prosilver/theme/colours.css +++ b/phpBB/styles/prosilver/theme/colours.css @@ -598,12 +598,12 @@ Colours and backgrounds for buttons.css -------------------------------------------------------------- */ /* Big button images */ -.reply-icon, .reply-icon a { background-image: url("{T_IMAGESET_LANG_PATH}/button_topic_reply.gif"); } -.post-icon, .post-icon a { background-image: url("{T_IMAGESET_LANG_PATH}/button_topic_new.gif") ;} -.locked-icon, .locked-icon a { background-image: url("{T_IMAGESET_LANG_PATH}/button_topic_locked.gif"); } -.pmreply-icon, .pmreply-icon a { background-image: url("{T_IMAGESET_LANG_PATH}/button_pm_reply.gif") ;} -.newpm-icon, .newpm-icon a { background-image: url("{T_IMAGESET_LANG_PATH}/button_pm_new.gif") ;} -.forwardpm-icon, .forwardpm-icon a { background-image: url("{T_IMAGESET_LANG_PATH}/button_pm_forward.gif") ;} +.reply-icon, .reply-icon a { background-image: url("{IMG_BUTTON_TOPIC_REPLY_SRC}"); } +.post-icon, .post-icon a { background-image: url("{IMG_BUTTON_TOPIC_NEW_SRC}") ;} +.locked-icon, .locked-icon a { background-image: url("{IMG_BUTTON_TOPIC_LOCKED_SRC}"); } +.pmreply-icon, .pmreply-icon a { background-image: url("{IMG_BUTTON_PM_REPLY_SRC}") ;} +.newpm-icon, .newpm-icon a { background-image: url("{IMG_BUTTON_PM_NEW_SRC}") ;} +.forwardpm-icon, .forwardpm-icon a { background-image: url("{IMG_BUTTON_PM_FORWARD_SRC}") ;} a.print { background-image: url("{T_THEME_PATH}/images/icon_print.gif"); @@ -634,34 +634,23 @@ a.fontsize { .icon-search { background-image: url("{T_THEME_PATH}/images/icon_search.gif"); } /* Profile & navigation icons */ -.email-icon, .email-icon a { background-image: url("{T_IMAGESET_PATH}/icon_contact_email.gif"); } -.aim-icon, .aim-icon a { background-image: url("{T_IMAGESET_PATH}/icon_contact_aim.gif"); } -.yahoo-icon, .yahoo-icon a { background-image: url("{T_IMAGESET_PATH}/icon_contact_yahoo.gif"); } -.web-icon, .web-icon a { background-image: url("{T_IMAGESET_PATH}/icon_contact_www.gif"); } -.msnm-icon, .msnm-icon a { background-image: url("{T_IMAGESET_PATH}/icon_contact_msnm.gif"); } -.icq-icon, .icq-icon a { background-image: url("{T_IMAGESET_PATH}/icon_contact_icq.gif"); } -.pm-icon, .pm-icon a { background-image: url("{T_IMAGESET_LANG_PATH}/icon_contact_pm.gif"); } -.jabber-icon, .jabber-icon a { background-image: url("{T_IMAGESET_PATH}/icon_contact_jabber.gif"); } -.quote-icon, .quote-icon a { background-image: url("{T_IMAGESET_LANG_PATH}/icon_post_quote.gif"); } - -/* Profile & navigation icons */ -.email-icon, .email-icon a { background-image: url("{T_IMAGESET_PATH}/icon_contact_email.gif"); } -.aim-icon, .aim-icon a { background-image: url("{T_IMAGESET_PATH}/icon_contact_aim.gif"); } -.yahoo-icon, .yahoo-icon a { background-image: url("{T_IMAGESET_PATH}/icon_contact_yahoo.gif"); } -.web-icon, .web-icon a { background-image: url("{T_IMAGESET_PATH}/icon_contact_www.gif"); } -.msnm-icon, .msnm-icon a { background-image: url("{T_IMAGESET_PATH}/icon_contact_msnm.gif"); } -.icq-icon, .icq-icon a { background-image: url("{T_IMAGESET_PATH}/icon_contact_icq.gif"); } -.pm-icon, .pm-icon a { background-image: url("{T_IMAGESET_LANG_PATH}/icon_contact_pm.gif"); } -.jabber-icon, .jabber-icon a { background-image: url("{T_IMAGESET_PATH}/icon_contact_jabber.gif"); } -.quote-icon, .quote-icon a { background-image: url("{T_IMAGESET_LANG_PATH}/icon_post_quote.gif"); } +.email-icon, .email-icon a { background-image: url("{IMG_ICON_CONTACT_EMAIL_SRC}"); } +.aim-icon, .aim-icon a { background-image: url("{IMG_ICON_CONTACT_AIM_SRC}"); } +.yahoo-icon, .yahoo-icon a { background-image: url("{IMG_ICON_CONTACT_YAHOO_SRC}"); } +.web-icon, .web-icon a { background-image: url("{IMG_ICON_CONTACT_WWW_SRC}"); } +.msnm-icon, .msnm-icon a { background-image: url("{IMG_ICON_CONTACT_MSNM_SRC}"); } +.icq-icon, .icq-icon a { background-image: url("{IMG_ICON_CONTACT_ICQ_SRC}"); } +.pm-icon, .pm-icon a { background-image: url("{IMG_ICON_CONTACT_PM_SRC}"); } +.jabber-icon, .jabber-icon a { background-image: url("{IMG_ICON_CONTACT_JABBER_SRC}"); } +.quote-icon, .quote-icon a { background-image: url("{IMG_ICON_POST_QUOTE_SRC}"); } /* Moderator icons */ -.report-icon, .report-icon a { background-image: url("{T_IMAGESET_PATH}/icon_post_report.gif"); } -.warn-icon, .warn-icon a { background-image: url("{T_IMAGESET_PATH}/icon_post_report.gif"); } -.edit-icon, .edit-icon a { background-image: url("{T_IMAGESET_LANG_PATH}/icon_post_edit.gif"); } +.report-icon, .report-icon a { background-image: url("{IMG_ICON_POST_REPORT_SRC}"); } +.warn-icon, .warn-icon a { background-image: url("{IMG_ICON_POST_REPORT_SRC}"); } +.edit-icon, .edit-icon a { background-image: url("{IMG_ICON_POST_EDIT_SRC}"); } -.delete-icon, .delete-icon a { background-image: url("{T_IMAGESET_PATH}/icon_post_delete.gif"); } -.info-icon, .info-icon a { background-image: url("{T_IMAGESET_PATH}/icon_post_info.gif"); } +.delete-icon, .delete-icon a { background-image: url("{IMG_ICON_POST_DELETE_SRC}"); } +.info-icon, .info-icon a { background-image: url("{IMG_ICON_POST_INFO_SRC}"); } /* -------------------------------------------------------------- diff --git a/phpBB/styles/subsilver2/imageset/en/imageset.cfg b/phpBB/styles/subsilver2/imageset/en/imageset.cfg new file mode 100644 index 0000000000..c0cc699737 --- /dev/null +++ b/phpBB/styles/subsilver2/imageset/en/imageset.cfg @@ -0,0 +1,47 @@ +# +# phpBB Imageset Configuration File +# +# @package phpBB3 +# @copyright (c) 2005 phpBB Group +# @license http://opensource.org/licenses/gpl-license.php GNU Public License +# +# +# At the left is the name, please do not change this +# At the right the value is entered +# For on/off options the valid values are on, off, 1, 0, true and false +# +# Values get trimmed, if you want to add a space in front or at the end of +# the value, then enclose the value with single or double quotes. +# Single and double quotes do not need to be escaped. +# +# + +# Images +img_icon_contact_aim = icon_contact_aim.gif +img_icon_contact_email = icon_contact_email.gif +img_icon_contact_icq = icon_contact_icq.gif +img_icon_contact_jabber = icon_contact_jabber.gif +img_icon_contact_msnm = icon_contact_msnm.gif +img_icon_contact_pm = icon_contact_pm.gif +img_icon_contact_yahoo = icon_contact_yahoo.gif +img_icon_contact_www = icon_contact_www.gif + +img_icon_post_delete = icon_post_delete.gif +img_icon_post_edit = icon_post_edit.gif +img_icon_post_info = icon_post_info.gif +img_icon_post_quote = icon_post_quote.gif +img_icon_post_report = icon_post_report.gif + +img_icon_user_online = icon_user_online.gif +img_icon_user_offline = icon_user_offline.gif +img_icon_user_profile = icon_user_profile.gif +img_icon_user_search = icon_user_search.gif +img_icon_user_warn = icon_user_warn.gif + +img_button_pm_forward = +img_button_pm_new = button_pm_new.gif +img_button_pm_reply = button_pm_reply.gif +img_button_topic_locked = button_topic_locked.gif +img_button_topic_new = button_topic_new.gif +img_button_topic_reply = button_topic_reply.gif + diff --git a/phpBB/styles/subsilver2/imageset/imageset.cfg b/phpBB/styles/subsilver2/imageset/imageset.cfg index 80c9c349c6..b6192c0ede 100644 --- a/phpBB/styles/subsilver2/imageset/imageset.cfg +++ b/phpBB/styles/subsilver2/imageset/imageset.cfg @@ -109,16 +109,3 @@ img_icon_topic_newest = icon_topic_newest.gif*9*18 img_icon_topic_reported = icon_topic_reported.gif*18*19 img_icon_topic_unapproved = icon_topic_unapproved.gif*18*19 -img_icon_user_online = {LANG}/icon_user_online.gif -img_icon_user_offline = {LANG}/icon_user_offline.gif -img_icon_user_profile = {LANG}/icon_user_profile.gif -img_icon_user_search = {LANG}/icon_user_search.gif -img_icon_user_warn = {LANG}/icon_user_warn.gif - -img_button_pm_forward = -img_button_pm_new = {LANG}/button_pm_new.gif -img_button_pm_reply = {LANG}/button_pm_reply.gif -img_button_topic_locked = {LANG}/button_topic_locked.gif -img_button_topic_new = {LANG}/button_topic_new.gif -img_button_topic_reply = {LANG}/button_topic_reply.gif - |