diff --git a/phpBB/install/schemas/mysql_schema.sql b/phpBB/install/schemas/mysql_schema.sql index 810046e2e8..bf83fab1d9 100644 --- a/phpBB/install/schemas/mysql_schema.sql +++ b/phpBB/install/schemas/mysql_schema.sql @@ -215,7 +215,7 @@ CREATE TABLE phpbb_forums ( forum_last_poster_name varchar(30), forum_flags tinyint(4) DEFAULT '0' NOT NULL, display_on_index tinyint(1) DEFAULT '1' NOT NULL, - enable_indexing tinyint(1) DEFAULT '1' NOT NULL, + enable_indexing tinyint(1) DEFAULT '1' NOT NULL, enable_icons tinyint(1) DEFAULT '1' NOT NULL, enable_prune tinyint(1) DEFAULT '0' NOT NULL, prune_next int(11) UNSIGNED, @@ -265,12 +265,12 @@ CREATE TABLE phpbb_groups ( group_avatar_height tinyint(4) UNSIGNED DEFAULT '0' NOT NULL, group_rank smallint(5) DEFAULT '-1' NOT NULL, group_colour varchar(6) DEFAULT '' NOT NULL, - group_sig_chars mediumint(8) UNSIGNED DEFAULT '0' NOT NULL, + group_sig_chars mediumint(8) UNSIGNED DEFAULT '0' NOT NULL, group_receive_pm tinyint(1) DEFAULT '0' NOT NULL, - group_message_limit mediumint(8) UNSIGNED DEFAULT '0' NOT NULL, - group_chgpass smallint(6) DEFAULT '0' NOT NULL, + group_message_limit mediumint(8) UNSIGNED DEFAULT '0' NOT NULL, + group_chgpass smallint(6) DEFAULT '0' NOT NULL, group_description varchar(255) DEFAULT '' NOT NULL, - group_legend tinyint(1) DEFAULT '1' NOT NULL, + group_legend tinyint(1) DEFAULT '1' NOT NULL, PRIMARY KEY (group_id), KEY group_legend (group_legend) ); @@ -304,7 +304,7 @@ CREATE TABLE phpbb_log ( user_id mediumint(8) DEFAULT '0' NOT NULL, forum_id mediumint(8) UNSIGNED DEFAULT '0' NOT NULL, topic_id mediumint(8) UNSIGNED DEFAULT '0' NOT NULL, - reportee_id mediumint(8) UNSIGNED DEFAULT '0' NOT NULL, + reportee_id mediumint(8) UNSIGNED DEFAULT '0' NOT NULL, log_ip varchar(40) NOT NULL, log_time int(11) NOT NULL, log_operation text, @@ -313,7 +313,7 @@ CREATE TABLE phpbb_log ( KEY log_type (log_type), KEY forum_id (forum_id), KEY topic_id (topic_id), - KEY reportee_id (reportee_id), + KEY reportee_id (reportee_id), KEY user_id (user_id) ); @@ -569,8 +569,8 @@ CREATE TABLE phpbb_reports ( # Table: phpbb_search_results CREATE TABLE phpbb_search_results ( search_id int(11) UNSIGNED DEFAULT '0' NOT NULL, - session_id varchar(32) DEFAULT '' NOT NULL, - search_time int(11) DEFAULT '0' NOT NULL, + session_id varchar(32) DEFAULT '' NOT NULL, + search_time int(11) DEFAULT '0' NOT NULL, search_array text NOT NULL, PRIMARY KEY (search_id), KEY session_id (session_id) @@ -605,8 +605,8 @@ CREATE TABLE phpbb_sessions ( session_page varchar(100) DEFAULT '' NOT NULL, session_allow_viewonline tinyint(1) DEFAULT '1' NOT NULL, PRIMARY KEY (session_id), - KEY session_time (session_time), - KEY session_user_id (session_user_id) + KEY session_time (session_time), + KEY session_user_id (session_user_id) ); # Table: 'phpbb_sitelist' @@ -636,12 +636,12 @@ CREATE TABLE phpbb_styles ( style_id tinyint(4) UNSIGNED NOT NULL auto_increment, style_name varchar(30) DEFAULT '' NOT NULL, style_copyright varchar(50) DEFAULT '' NOT NULL, - style_active tinyint(1) DEFAULT '1' NOT NULL, + style_active tinyint(1) DEFAULT '1' NOT NULL, template_id tinyint(4) UNSIGNED NOT NULL, theme_id tinyint(4) UNSIGNED NOT NULL, imageset_id tinyint(4) UNSIGNED NOT NULL, PRIMARY KEY (style_id), - UNIQUE style_name (style_name), + UNIQUE style_name (style_name), KEY (template_id), KEY (theme_id), KEY (imageset_id) @@ -654,19 +654,19 @@ CREATE TABLE phpbb_styles_template ( template_copyright varchar(50) NOT NULL, template_path varchar(30) NOT NULL, bbcode_bitfield int(11) UNSIGNED DEFAULT '0' NOT NULL, - template_storedb tinyint(1) DEFAULT '0' NOT NULL, - PRIMARY KEY (template_id), + template_storedb tinyint(1) DEFAULT '0' NOT NULL, + PRIMARY KEY (template_id), UNIQUE template_name (template_name) ); # Table: 'phpbb_styles_template_data' CREATE TABLE phpbb_styles_template_data ( template_id tinyint(4) UNSIGNED NOT NULL, - template_filename varchar(50) DEFAULT '' NOT NULL, - template_included text NOT NULL, - template_mtime int(11) DEFAULT '0' NOT NULL, - template_data text, - KEY (template_id), + template_filename varchar(50) DEFAULT '' NOT NULL, + template_included text NOT NULL, + template_mtime int(11) DEFAULT '0' NOT NULL, + template_data text, + KEY (template_id), KEY (template_filename) ); @@ -676,8 +676,8 @@ CREATE TABLE phpbb_styles_theme ( theme_name varchar(30) DEFAULT '' NOT NULL, theme_copyright varchar(50) DEFAULT '' NOT NULL, theme_path varchar(30) DEFAULT '' NOT NULL, - theme_storedb tinyint(1) DEFAULT '0' NOT NULL, - theme_mtime int(11) DEFAULT '0' NOT NULL, + theme_storedb tinyint(1) DEFAULT '0' NOT NULL, + theme_mtime int(11) DEFAULT '0' NOT NULL, theme_data text DEFAULT '' NOT NULL, PRIMARY KEY (theme_id), UNIQUE theme_name (theme_name) @@ -698,7 +698,7 @@ CREATE TABLE phpbb_styles_imageset ( btn_profile varchar(200) DEFAULT '' NOT NULL, btn_pm varchar(200) DEFAULT '' NOT NULL, btn_delete varchar(200) DEFAULT '' NOT NULL, - btn_ip varchar(200) DEFAULT '' NOT NULL, + btn_info varchar(200) DEFAULT '' NOT NULL, btn_quote varchar(200) DEFAULT '' NOT NULL, btn_search varchar(200) DEFAULT '' NOT NULL, btn_edit varchar(200) DEFAULT '' NOT NULL, @@ -711,9 +711,9 @@ CREATE TABLE phpbb_styles_imageset ( btn_msnm varchar(200) DEFAULT '' NOT NULL, btn_jabber varchar(200) DEFAULT '' NOT NULL, btn_online varchar(200) DEFAULT '' NOT NULL, - btn_offline varchar(200) DEFAULT '' NOT NULL, - btn_friend varchar(200) DEFAULT '' NOT NULL, - btn_foe varchar(200) DEFAULT '' NOT NULL, + btn_offline varchar(200) DEFAULT '' NOT NULL, + btn_friend varchar(200) DEFAULT '' NOT NULL, + btn_foe varchar(200) DEFAULT '' NOT NULL, icon_unapproved varchar(200) DEFAULT '' NOT NULL, icon_reported varchar(200) DEFAULT '' NOT NULL, icon_attach varchar(200) DEFAULT '' NOT NULL, @@ -724,7 +724,7 @@ CREATE TABLE phpbb_styles_imageset ( forum varchar(200) DEFAULT '' NOT NULL, forum_new varchar(200) DEFAULT '' NOT NULL, forum_locked varchar(200) DEFAULT '' NOT NULL, - forum_link varchar(200) DEFAULT '' NOT NULL, + forum_link varchar(200) DEFAULT '' NOT NULL, sub_forum varchar(200) DEFAULT '' NOT NULL, sub_forum_new varchar(200) DEFAULT '' NOT NULL, folder varchar(200) DEFAULT '' NOT NULL, @@ -754,19 +754,19 @@ CREATE TABLE phpbb_styles_imageset ( folder_global_new_posted 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, + poll_right varchar(200) DEFAULT '' NOT NULL, attach_progress_bar 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), + 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 imageset_name (imageset_name) ); @@ -804,7 +804,7 @@ CREATE TABLE phpbb_topics ( poll_last_vote int(11), PRIMARY KEY (topic_id), KEY forum_id (forum_id), - KEY forum_id_type (forum_id, topic_type), + KEY forum_id_type (forum_id, topic_type), KEY topic_last_post_time (topic_last_post_time) ); @@ -830,35 +830,32 @@ CREATE TABLE phpbb_topics_watch ( # Table: 'phpbb_user_group' CREATE TABLE phpbb_user_group ( group_id mediumint(8) DEFAULT '0' NOT NULL, - user_id mediumint(8) UNSIGNED DEFAULT '0' NOT NULL, - group_leader tinyint(1) DEFAULT '0' NOT NULL, + user_id mediumint(8) UNSIGNED DEFAULT '0' NOT NULL, + group_leader tinyint(1) DEFAULT '0' NOT NULL, user_pending tinyint(1), KEY group_id (group_id), - KEY user_id (user_id), - KEY group_leader (group_leader) + KEY user_id (user_id), + KEY group_leader (group_leader) ); # Table: 'phpbb_users' CREATE TABLE phpbb_users ( user_id mediumint(8) UNSIGNED NOT NULL auto_increment, - user_type tinyint(1) DEFAULT '0' NOT NULL, + user_type tinyint(1) DEFAULT '0' NOT NULL, group_id mediumint(8) DEFAULT '3' NOT NULL, user_permissions text DEFAULT '' NOT NULL, user_ip varchar(40) DEFAULT '' NOT NULL, user_regdate int(11) DEFAULT '0' NOT NULL, username varchar(30) DEFAULT '' NOT NULL, user_password varchar(32) DEFAULT '' NOT NULL, - user_passchg int(11) DEFAULT '0' NOT NULL, + user_passchg int(11) DEFAULT '0' NOT NULL, user_email varchar(60) DEFAULT '' NOT NULL, - user_email_hash bigint(20) DEFAULT '0' NOT NULL, + user_email_hash bigint(20) DEFAULT '0' NOT NULL, user_birthday varchar(10) DEFAULT '' NOT NULL, user_lastvisit int(11) DEFAULT '0' NOT NULL, user_lastpost_time int(11) DEFAULT '0' NOT NULL, user_lastpage varchar(100) DEFAULT '' NOT NULL, - user_karma tinyint(1) DEFAULT '0' NOT NULL, - user_min_karma tinyint(1) DEFAULT '-5' NOT NULL, - user_warnings tinyint(4) DEFAULT '0' NOT NULL, - user_colour varchar(6) DEFAULT '' NOT NULL, + user_warnings tinyint(4) DEFAULT '0' NOT NULL, user_posts mediumint(8) UNSIGNED DEFAULT '0' NOT NULL, user_lang varchar(30) DEFAULT '' NOT NULL, user_timezone decimal(5,2) DEFAULT '0.0' NOT NULL, @@ -876,14 +873,14 @@ CREATE TABLE phpbb_users ( user_sortby_dir varchar(1) DEFAULT '' NOT NULL, user_show_days tinyint(1) DEFAULT '' NOT NULL, user_notify tinyint(1) DEFAULT '0' NOT NULL, - user_notify_pm tinyint(1) DEFAULT '1' NOT NULL, - user_notify_type tinyint(4) DEFAULT '0' NOT NULL, + user_notify_pm tinyint(1) DEFAULT '1' NOT NULL, + user_notify_type tinyint(4) DEFAULT '0' NOT NULL, user_allow_pm tinyint(1) DEFAULT '1' NOT NULL, user_allow_email tinyint(1) DEFAULT '1' NOT NULL, user_allow_viewonline tinyint(1) DEFAULT '1' NOT NULL, user_allow_viewemail tinyint(1) DEFAULT '1' NOT NULL, user_allow_massemail tinyint(1) DEFAULT '1' NOT NULL, - user_options int(11) DEFAULT '893' NOT NULL, + user_options int(11) DEFAULT '893' NOT NULL, user_avatar varchar(100) DEFAULT '' NOT NULL, user_avatar_type tinyint(2) DEFAULT '0' NOT NULL, user_avatar_width tinyint(4) UNSIGNED DEFAULT '0' NOT NULL, @@ -904,7 +901,7 @@ CREATE TABLE phpbb_users ( user_newpasswd varchar(32) DEFAULT '' NOT NULL, PRIMARY KEY (user_id), KEY user_birthday (user_birthday(6)), - KEY user_email_hash (user_email_hash), + KEY user_email_hash (user_email_hash), KEY username (username) ); diff --git a/phpBB/install/schemas/schema_data.sql b/phpBB/install/schemas/schema_data.sql index 2da3ca3c49..143cdc1404 100644 --- a/phpBB/install/schemas/schema_data.sql +++ b/phpBB/install/schemas/schema_data.sql @@ -307,7 +307,7 @@ INSERT INTO phpbb_styles (style_id, style_name, style_copyright, template_id, th # MSSQL IDENTITY phpbb_styles_imageset ON # # -- phpbb_styles_imageset -INSERT INTO phpbb_styles_imageset (imageset_id, imageset_name, imageset_copyright, imageset_path, site_logo, btn_post, btn_post_pm, btn_reply, btn_reply_pm, btn_locked, btn_profile, btn_pm, btn_delete, btn_ip, btn_quote, btn_search, btn_edit, btn_report, btn_email, btn_www, btn_icq, btn_aim, btn_yim, btn_msnm, btn_jabber, btn_online, btn_offline, btn_friend, btn_foe, icon_unapproved, icon_reported, icon_attach, icon_post, icon_post_new, icon_post_latest, icon_post_newest, forum, forum_new, forum_locked, forum_link, sub_forum, sub_forum_new, folder, folder_moved, folder_posted, folder_new, folder_new_posted, folder_hot, folder_hot_posted, folder_hot_new, folder_hot_new_posted, folder_locked, folder_locked_posted, folder_locked_new, folder_locked_new_posted, folder_sticky, folder_sticky_posted, folder_sticky_new, folder_sticky_new_posted, folder_announce, folder_announce_posted, folder_announce_new, folder_announce_new_posted, folder_global, folder_global_posted, folder_global_new, folder_global_new_posted, poll_left, poll_center, poll_right, attach_progress_bar, user_icon1, user_icon2, user_icon3, user_icon4, user_icon5, user_icon6, user_icon7, user_icon8, user_icon9, user_icon10) VALUES (1, 'subSilver', '© phpBB Group', 'subSilver', '', '{LANG}/btn_post.gif*27*97', '{LANG}/btn_post_pm.gif*27*97', '{LANG}/btn_reply.gif*27*97', '{LANG}/btn_reply_pm.gif*20*90', '{LANG}/btn_locked.gif*27*97', '{LANG}/btn_profile.gif*20*72', '{LANG}/btn_pm.gif*20*72', '{LANG}/btn_delete.gif*20*20', '{LANG}/btn_ip.gif*20*20', '{LANG}/btn_quote.gif*20*90', '{LANG}/btn_search.gif*20*72', '{LANG}/btn_edit.gif*20*90', '{LANG}/btn_report.gif*20*20', '{LANG}/btn_email.gif*20*72', '{LANG}/btn_www.gif*20*72', '{LANG}/btn_icq.gif*20*72', '{LANG}/btn_aim.gif*20*72', '{LANG}/btn_yim.gif*20*72', '{LANG}/btn_msnm.gif*20*72', '{LANG}/btn_jabber.gif*20*72', '{LANG}/btn_online.gif*20*72', '{LANG}/btn_offline.gif*20*72', '', '', 'icon_unapproved.gif*18*19', 'icon_reported.gif*18*19', 'icon_attach.gif*18*14', 'icon_minipost.gif*9*12', 'icon_minipost_new.gif*9*12', 'icon_latest_reply.gif*9*18', 'icon_newest_reply.gif*9*18', 'folder_big.gif*25*46', 'folder_new_big.gif*25*46', 'folder_locked_big.gif*25*46', 'folder_link_big.gif*25*46', 'subfolder_big.gif*25*46', 'subfolder_new_big.gif*25*46', 'folder.gif*18*19', 'folder_moved.gif*18*19', 'folder_posted.gif*18*19', 'folder_new.gif*18*19', 'folder_new_posted.gif*18*19', 'folder_hot.gif*18*19', 'folder_hot_posted.gif*18*19', 'folder_new_hot.gif*18*19', 'folder_new_hot_posted.gif*18*19', 'folder_lock.gif*18*19', 'folder_lock_posted.gif*18*19', 'folder_lock_new.gif*18*19', 'folder_lock_new_posted.gif*18*19', 'folder_sticky.gif*18*19', 'folder_sticky_posted.gif*18*19', 'folder_sticky_new.gif*18*19', 'folder_sticky_new_posted.gif*18*19', 'folder_announce.gif*18*19', 'folder_announce_posted.gif*18*19', 'folder_announce_new.gif*18*19', 'folder_announce_new_posted.gif*18*19', '', '', '', '', 'vote_lcap.gif*12*4', 'voting_bar.gif*12', 'vote_rcap.gif*12*4', 'progress_bar.gif*16*280', '', '', '', '', '', '', '', '', '', ''); +INSERT INTO phpbb_styles_imageset (imageset_id, imageset_name, imageset_copyright, imageset_path, site_logo, btn_post, btn_post_pm, btn_reply, btn_reply_pm, btn_locked, btn_profile, btn_pm, btn_delete, btn_info, btn_quote, btn_search, btn_edit, btn_report, btn_email, btn_www, btn_icq, btn_aim, btn_yim, btn_msnm, btn_jabber, btn_online, btn_offline, btn_friend, btn_foe, icon_unapproved, icon_reported, icon_attach, icon_post, icon_post_new, icon_post_latest, icon_post_newest, forum, forum_new, forum_locked, forum_link, sub_forum, sub_forum_new, folder, folder_moved, folder_posted, folder_new, folder_new_posted, folder_hot, folder_hot_posted, folder_hot_new, folder_hot_new_posted, folder_locked, folder_locked_posted, folder_locked_new, folder_locked_new_posted, folder_sticky, folder_sticky_posted, folder_sticky_new, folder_sticky_new_posted, folder_announce, folder_announce_posted, folder_announce_new, folder_announce_new_posted, folder_global, folder_global_posted, folder_global_new, folder_global_new_posted, poll_left, poll_center, poll_right, attach_progress_bar, user_icon1, user_icon2, user_icon3, user_icon4, user_icon5, user_icon6, user_icon7, user_icon8, user_icon9, user_icon10) VALUES (1, 'subSilver', '© phpBB Group', 'subSilver', '', '{LANG}/btn_post.gif*27*97', '{LANG}/btn_post_pm.gif*27*97', '{LANG}/btn_reply.gif*27*97', '{LANG}/btn_reply_pm.gif*20*90', '{LANG}/btn_locked.gif*27*97', '{LANG}/btn_profile.gif*20*72', '{LANG}/btn_pm.gif*20*72', '{LANG}/btn_delete.gif*20*20', '{LANG}/btn_info.gif*20*20', '{LANG}/btn_quote.gif*20*90', '{LANG}/btn_search.gif*20*72', '{LANG}/btn_edit.gif*20*90', '{LANG}/btn_report.gif*20*20', '{LANG}/btn_email.gif*20*72', '{LANG}/btn_www.gif*20*72', '{LANG}/btn_icq.gif*20*72', '{LANG}/btn_aim.gif*20*72', '{LANG}/btn_yim.gif*20*72', '{LANG}/btn_msnm.gif*20*72', '{LANG}/btn_jabber.gif*20*72', '{LANG}/btn_online.gif*20*72', '{LANG}/btn_offline.gif*20*72', '', '', 'icon_unapproved.gif*18*19', 'icon_reported.gif*18*19', 'icon_attach.gif*18*14', 'icon_minipost.gif*9*12', 'icon_minipost_new.gif*9*12', 'icon_latest_reply.gif*9*18', 'icon_newest_reply.gif*9*18', 'folder_big.gif*25*46', 'folder_new_big.gif*25*46', 'folder_locked_big.gif*25*46', 'folder_link_big.gif*25*46', 'subfolder_big.gif*25*46', 'subfolder_new_big.gif*25*46', 'folder.gif*18*19', 'folder_moved.gif*18*19', 'folder_posted.gif*18*19', 'folder_new.gif*18*19', 'folder_new_posted.gif*18*19', 'folder_hot.gif*18*19', 'folder_hot_posted.gif*18*19', 'folder_new_hot.gif*18*19', 'folder_new_hot_posted.gif*18*19', 'folder_lock.gif*18*19', 'folder_lock_posted.gif*18*19', 'folder_lock_new.gif*18*19', 'folder_lock_new_posted.gif*18*19', 'folder_sticky.gif*18*19', 'folder_sticky_posted.gif*18*19', 'folder_sticky_new.gif*18*19', 'folder_sticky_new_posted.gif*18*19', 'folder_announce.gif*18*19', 'folder_announce_posted.gif*18*19', 'folder_announce_new.gif*18*19', 'folder_announce_new_posted.gif*18*19', '', '', '', '', 'vote_lcap.gif*12*4', 'voting_bar.gif*12', 'vote_rcap.gif*12*4', 'progress_bar.gif*16*280', '', '', '', '', '', '', '', '', '', ''); # MSSQL IDENTITY phpbb_styles_imageset OFF # @@ -521,7 +521,7 @@ INSERT INTO phpbb_icons (icons_url, icons_width, icons_height, icons_order, disp INSERT INTO phpbb_icons (icons_url, icons_width, icons_height, icons_order, display_on_posting) VALUES ('smile/question.gif', 19, 19, 6, 1); INSERT INTO phpbb_icons (icons_url, icons_width, icons_height, icons_order, display_on_posting) VALUES ('smile/exclaim.gif', 19, 19, 7, 1); - + # MSSQL IDENTITY phpbb_search_wordlist ON # # -- wordlist diff --git a/phpBB/language/en/viewtopic.php b/phpBB/language/en/viewtopic.php index 3b51a027f1..cfb348fef1 100644 --- a/phpBB/language/en/viewtopic.php +++ b/phpBB/language/en/viewtopic.php @@ -7,8 +7,8 @@ // STARTED : Sat Dec 16, 2000 // COPYRIGHT : © 2001, 2003 phpBB Group // WWW : http://www.phpbb.com/ -// LICENCE : GPL v2.0 [ see /docs/COPYING ] -// +// LICENCE : GPL v2.0 [ see /docs/COPYING ] +// // ------------------------------------------------------------- // DO NOT CHANGE @@ -17,7 +17,7 @@ if (empty($lang) || !is_array($lang)) $lang = array(); } -// DEVELOPERS PLEASE NOTE +// DEVELOPERS PLEASE NOTE // // Placeholders can now contain order information, e.g. instead of // 'Page %s of %s' you can (and should) write 'Page %1$s of %2$s', this allows @@ -92,7 +92,7 @@ $lang += array( 'UNLOCK_TOPIC' => 'Unlock Topic', - 'VIEW_IP' => 'IP', + 'VIEW_INFO' => 'Post details', 'VIEW_NEXT_TOPIC' => 'Next topic', 'VIEW_PREVIOUS_TOPIC' => 'Previous topic', 'VIEW_RESULTS' => 'View Results', diff --git a/phpBB/styles/subSilver/imageset/en/btn_info.gif b/phpBB/styles/subSilver/imageset/en/btn_info.gif new file mode 100644 index 0000000000..166de2724f Binary files /dev/null and b/phpBB/styles/subSilver/imageset/en/btn_info.gif differ diff --git a/phpBB/styles/subSilver/template/viewtopic_body.html b/phpBB/styles/subSilver/template/viewtopic_body.html index ab63f6de5e..276856a4c0 100644 --- a/phpBB/styles/subSilver/template/viewtopic_body.html +++ b/phpBB/styles/subSilver/template/viewtopic_body.html @@ -59,7 +59,7 @@
- + @@ -121,7 +121,10 @@ @@ -132,9 +135,9 @@ - + diff --git a/phpBB/viewtopic.php b/phpBB/viewtopic.php index b9f1408518..616c145da9 100644 --- a/phpBB/viewtopic.php +++ b/phpBB/viewtopic.php @@ -3,12 +3,12 @@ // // $Id$ // -// FILENAME : viewtopic.php +// FILENAME : viewtopic.php // STARTED : Sat Feb 13, 2001 // COPYRIGHT : © 2001, 2003 phpBB Group // WWW : http://www.phpbb.com/ -// LICENCE : GPL vs2.0 [ see /docs/COPYING ] -// +// LICENCE : GPL vs2.0 [ see /docs/COPYING ] +// // ------------------------------------------------------------- define('IN_PHPBB', true); @@ -58,7 +58,7 @@ if ($view && !$post_id) break; default: - $sql_lastread = 'LEFT JOIN ' . TOPICS_TRACK_TABLE . ' tt ON (tt.user_id = ' . $user->data['user_id'] . ' + $sql_lastread = 'LEFT JOIN ' . TOPICS_TRACK_TABLE . ' tt ON (tt.user_id = ' . $user->data['user_id'] . ' AND tt.topic_id = p.topic_id)'; $sql_unread_time = ' tt.mark_time OR tt.mark_time IS NULL'; } @@ -79,11 +79,11 @@ if ($view && !$post_id) } $sql = 'SELECT p.post_id - FROM (' . POSTS_TABLE . " p + FROM (' . POSTS_TABLE . " p $sql_lastread, " . TOPICS_TABLE . " t) WHERE t.topic_id = $topic_id - AND p.topic_id = t.topic_id - " . (($auth->acl_get('m_approve', $forum_id)) ? '' : 'AND p.post_approved = 1') . " + AND p.topic_id = t.topic_id + " . (($auth->acl_get('m_approve', $forum_id)) ? '' : 'AND p.post_approved = 1') . " AND (p.post_time > $sql_unread_time OR p.post_id = t.topic_last_post_id) ORDER BY p.post_time ASC"; @@ -112,7 +112,7 @@ if ($view && !$post_id) FROM ' . TOPICS_TABLE . ' t, ' . TOPICS_TABLE . " t2 WHERE t2.topic_id = $topic_id AND t.forum_id = t2.forum_id - " . (($auth->acl_get('m_approve', $forum_id)) ? '' : 'AND t.topic_approved = 1') . " + " . (($auth->acl_get('m_approve', $forum_id)) ? '' : 'AND t.topic_approved = 1') . " AND t.topic_last_post_time $sql_condition t2.topic_last_post_time ORDER BY t.topic_last_post_time $sql_ordering"; $result = $db->sql_query_limit($sql, 1); @@ -161,7 +161,7 @@ if ($user->data['user_id'] != ANONYMOUS) default: $extra_fields .= ', tw.notify_status' . (($config['allow_bookmarks']) ? ', bm.order_id as bookmarked' : ''); - $join_sql_table .= ' LEFT JOIN ' . TOPICS_WATCH_TABLE . ' tw ON (tw.user_id = ' . $user->data['user_id'] . ' + $join_sql_table .= ' LEFT JOIN ' . TOPICS_WATCH_TABLE . ' tw ON (tw.user_id = ' . $user->data['user_id'] . ' AND t.topic_id = tw.topic_id)'; $join_sql_table .= ($config['allow_bookmarks']) ? ' LEFT JOIN ' . BOOKMARKS_TABLE . ' bm ON (bm.user_id = ' . $user->data['user_id'] . ' AND t.topic_id = bm.topic_id)' : ''; @@ -234,7 +234,7 @@ else // Check sticky/announcement time limit if (($topic_type == POST_STICKY || $topic_type == POST_ANNOUNCE) && $topic_time_limit && $topic_time + $topic_time_limit < time()) { - $sql = 'UPDATE ' . TOPICS_TABLE . ' + $sql = 'UPDATE ' . TOPICS_TABLE . ' SET topic_type = ' . POST_NORMAL . ', topic_time_limit = 0 WHERE topic_id = ' . $topic_id; $db->sql_query($sql); @@ -370,11 +370,11 @@ if ($config['allow_bookmarks'] && $user->data['user_id'] != ANONYMOUS && request } else { - $sql = 'DELETE FROM ' . BOOKMARKS_TABLE . " + $sql = 'DELETE FROM ' . BOOKMARKS_TABLE . " WHERE user_id = {$user->data['user_id']} AND topic_id = $topic_id"; $db->sql_query($sql); - + // Works because of current order_id selected as bookmark value (please do not change because of simplicity) $where_sql = " AND order_id > $bookmarked"; $sign = '-'; @@ -453,7 +453,7 @@ $template->assign_vars(array( 'TOPIC_TITLE' => $topic_title, 'PAGINATION' => $pagination, 'PAGE_NUMBER' => on_page($total_posts, $config['posts_per_page'], $start), - 'TOTAL_POSTS' => ($total_posts == 1) ? $user->lang['VIEW_TOPIC_POST'] : sprintf($user->lang['VIEW_TOPIC_POSTS'], $total_posts), + 'TOTAL_POSTS' => ($total_posts == 1) ? $user->lang['VIEW_TOPIC_POST'] : sprintf($user->lang['VIEW_TOPIC_POSTS'], $total_posts), 'U_MCP' => ($auth->acl_get('m_', $forum_id)) ? "mcp.$phpEx?sid=" . $user->session_id . "&mode=topic_view&f=$forum_id&t=$topic_id&start=$start&$u_sort_param" : '', 'MODERATORS' => (isset($forum_moderators[$forum_id]) && sizeof($forum_moderators[$forum_id])) ? implode(', ', $forum_moderators[$forum_id]) : '', @@ -462,8 +462,8 @@ $template->assign_vars(array( 'REPLY_IMG' => ($forum_status == ITEM_LOCKED || $topic_status == ITEM_LOCKED) ? $user->img('btn_locked', 'TOPIC_LOCKED') : $user->img('btn_reply', 'REPLY_TO_TOPIC'), 'EDIT_IMG' => $user->img('btn_edit', 'EDIT_POST'), 'DELETE_IMG' => $user->img('btn_delete', 'DELETE_POST'), - 'IP_IMG' => $user->img('btn_ip', 'VIEW_IP'), - 'PROFILE_IMG' => $user->img('btn_profile', 'READ_PROFILE'), + 'INFO_IMG' => $user->img('btn_info', 'VIEW_INFO'), + 'PROFILE_IMG' => $user->img('btn_profile', 'READ_PROFILE'), 'SEARCH_IMG' => $user->img('btn_search', 'SEARCH_USER_POSTS'), 'PM_IMG' => $user->img('btn_pm', 'SEND_PRIVATE_MESSAGE'), 'EMAIL_IMG' => $user->img('btn_email', 'SEND_EMAIL'), @@ -482,10 +482,10 @@ $template->assign_vars(array( 'S_SELECT_SORT_DAYS' => $s_limit_days, 'S_TOPIC_ACTION' => "viewtopic.$phpEx$SID&f=$forum_id&t=$topic_id&start=$start", 'S_TOPIC_MOD' => ($topic_mod != '') ? '' : '', - 'S_MOD_ACTION' => "mcp.$phpEx?sid=" . $user->session_id . "&t=$topic_id&f=$forum_id&quickmod=1", + 'S_MOD_ACTION' => "mcp.$phpEx?sid=" . $user->session_id . "&t=$topic_id&f=$forum_id&quickmod=1", - 'S_DISPLAY_SEARCHBOX' => ($auth->acl_get('f_search', $forum_id)) ? true : false, - 'S_SEARCHBOX_ACTION' => "search.$phpEx$SID&f=$forum_id", + 'S_DISPLAY_SEARCHBOX' => ($auth->acl_get('f_search', $forum_id)) ? true : false, + 'S_SEARCHBOX_ACTION' => "search.$phpEx$SID&f=$forum_id", 'U_TOPIC' => "{$server_path}viewtopic.$phpEx?f=$forum_id&t=$topic_id", 'U_FORUM' => $server_path, @@ -495,14 +495,14 @@ $template->assign_vars(array( 'U_VIEW_OLDER_TOPIC' => "viewtopic.$phpEx$SID&f=$forum_id&t=$topic_id&view=previous", 'U_VIEW_NEWER_TOPIC' => "viewtopic.$phpEx$SID&f=$forum_id&t=$topic_id&view=next", 'U_PRINT_TOPIC' => ($auth->acl_get('f_print', $forum_id)) ? $viewtopic_url . '&view=print' : '', - 'U_EMAIL_TOPIC' => ($auth->acl_get('f_email', $forum_id) && $config['email_enable']) ? "memberlist.$phpEx$SID&mode=email&t=$topic_id" : '', + 'U_EMAIL_TOPIC' => ($auth->acl_get('f_email', $forum_id) && $config['email_enable']) ? "memberlist.$phpEx$SID&mode=email&t=$topic_id" : '', - 'U_WATCH_TOPIC' => $s_watching_topic['link'], - 'L_WATCH_TOPIC' => $s_watching_topic['title'], + 'U_WATCH_TOPIC' => $s_watching_topic['link'], + 'L_WATCH_TOPIC' => $s_watching_topic['title'], 'U_BOOKMARK_TOPIC' => ($user->data['user_id'] != ANONYMOUS && $config['allow_bookmarks']) ? $viewtopic_url . '&bookmark=1' : '', 'L_BOOKMARK_TOPIC' => ($user->data['user_id'] != ANONYMOUS && $config['allow_bookmarks'] && $bookmarked) ? $user->lang['BOOKMARK_TOPIC_REMOVE'] : $user->lang['BOOKMARK_TOPIC'], - + 'U_POST_NEW_TOPIC' => "posting.$phpEx$SID&mode=post&f=$forum_id", 'U_POST_REPLY_TOPIC' => "posting.$phpEx$SID&mode=reply&f=$forum_id&t=$topic_id", 'U_BUMP_TOPIC' => (bump_topic_allowed($forum_id, $topic_bumped, $topic_last_post_time, $topic_poster, $topic_last_poster_id)) ? "posting.$phpEx$SID&mode=bump&f=$forum_id&t=$topic_id" : '') @@ -550,10 +550,10 @@ if (!empty($poll_start)) } } - $s_can_vote = (((!sizeof($cur_voted_id) && $auth->acl_get('f_vote', $forum_id)) || - $auth->acl_get('f_votechg', $forum_id)) && + $s_can_vote = (((!sizeof($cur_voted_id) && $auth->acl_get('f_vote', $forum_id)) || + $auth->acl_get('f_votechg', $forum_id)) && (($poll_length != 0 && $poll_start + $poll_length > time()) || $poll_length == 0) && - $topic_status != ITEM_LOCKED && + $topic_status != ITEM_LOCKED && $forum_status != ITEM_LOCKED) ? true : false; $s_display_results = (!$s_can_vote || ($s_can_vote && $voted_id) || $view == 'viewpoll') ? true : false; @@ -575,15 +575,15 @@ if (!empty($poll_start)) continue; } - $sql = 'UPDATE ' . POLL_OPTIONS_TABLE . " - SET poll_option_total = poll_option_total + 1 - WHERE poll_option_id = $option + $sql = 'UPDATE ' . POLL_OPTIONS_TABLE . " + SET poll_option_total = poll_option_total + 1 + WHERE poll_option_id = $option AND topic_id = $topic_id"; $db->sql_query($sql); if ($user->data['user_id'] != ANONYMOUS) { - $sql = 'INSERT INTO ' . POLL_VOTES_TABLE . " (topic_id, poll_option_id, vote_user_id, vote_user_ip) + $sql = 'INSERT INTO ' . POLL_VOTES_TABLE . " (topic_id, poll_option_id, vote_user_id, vote_user_ip) VALUES ($topic_id, $option, " . $user->data['user_id'] . ", '$user->ip')"; $db->sql_query($sql); } @@ -593,17 +593,17 @@ if (!empty($poll_start)) { if (!in_array($option, $voted_id)) { - $sql = 'UPDATE ' . POLL_OPTIONS_TABLE . " - SET poll_option_total = poll_option_total - 1 - WHERE poll_option_id = $option + $sql = 'UPDATE ' . POLL_OPTIONS_TABLE . " + SET poll_option_total = poll_option_total - 1 + WHERE poll_option_id = $option AND topic_id = $topic_id"; $db->sql_query($sql); if ($user->data['user_id'] != ANONYMOUS) { - $sql = 'DELETE FROM ' . POLL_VOTES_TABLE . " + $sql = 'DELETE FROM ' . POLL_VOTES_TABLE . " WHERE topic_id = $topic_id - AND poll_option_id = $option + AND poll_option_id = $option AND vote_user_id = " . $user->data['user_id']; $db->sql_query($sql); } @@ -615,9 +615,9 @@ if (!empty($poll_start)) $user->set_cookie('poll_' . $topic_id, implode(',', $voted_id), time() + 31536000); } -//, topic_last_post_time = ' . time() . " - $sql = 'UPDATE ' . TOPICS_TABLE . ' - SET poll_last_vote = ' . time() . " +//, topic_last_post_time = ' . time() . " + $sql = 'UPDATE ' . TOPICS_TABLE . ' + SET poll_last_vote = ' . time() . " WHERE topic_id = $topic_id"; $db->sql_query($sql); @@ -645,7 +645,7 @@ if (!empty($poll_start)) 'POLL_OPTION_CAPTION' => $poll_option['poll_option_text'], 'POLL_OPTION_RESULT' => $poll_option['poll_option_total'], 'POLL_OPTION_PERCENT' => $option_pct_txt, - 'POLL_OPTION_IMG' => $user->img('poll_center', $option_pct_txt, round($option_pct * 250)), + 'POLL_OPTION_IMG' => $user->img('poll_center', $option_pct_txt, round($option_pct * 250)), 'POLL_OPTION_VOTED' => (in_array($poll_option['poll_option_id'], $cur_voted_id)) ? true : false) ); } @@ -656,13 +656,13 @@ if (!empty($poll_start)) 'POLL_LEFT_CAP_IMG' => $user->img('poll_left'), 'POLL_RIGHT_CAP_IMG'=> $user->img('poll_right'), - 'L_MAX_VOTES' => ($poll_max_options == 1) ? $user->lang['MAX_OPTION_SELECT'] : sprintf($user->lang['MAX_OPTIONS_SELECT'], $poll_max_options), - 'L_POLL_LENGTH' => ($poll_length) ? sprintf($user->lang['POLL_RUN_TILL'], $user->format_date($poll_length + $poll_start)) : '', + 'L_MAX_VOTES' => ($poll_max_options == 1) ? $user->lang['MAX_OPTION_SELECT'] : sprintf($user->lang['MAX_OPTIONS_SELECT'], $poll_max_options), + 'L_POLL_LENGTH' => ($poll_length) ? sprintf($user->lang['POLL_RUN_TILL'], $user->format_date($poll_length + $poll_start)) : '', - 'S_HAS_POLL' => true, - 'S_CAN_VOTE' => $s_can_vote, + 'S_HAS_POLL' => true, + 'S_CAN_VOTE' => $s_can_vote, 'S_DISPLAY_RESULTS' => $s_display_results, - 'S_IS_MULTI_CHOICE' => ($poll_max_options > 1) ? true : false, + 'S_IS_MULTI_CHOICE' => ($poll_max_options > 1) ? true : false, 'S_POLL_ACTION' => $viewtopic_url, 'U_VIEW_RESULTS' => $viewtopic_url . '&view=viewpoll') @@ -725,8 +725,8 @@ if (empty($post_list)) } $sql = 'SELECT u.username, u.user_id, u.user_colour, u.user_posts, u.user_from, u.user_website, u.user_email, u.user_icq, u.user_aim, u.user_yim, u.user_jabber, u.user_regdate, u.user_msnm, u.user_allow_viewemail, u.user_allow_viewonline, u.user_rank, u.user_sig, u.user_sig_bbcode_uid, u.user_sig_bbcode_bitfield, u.user_avatar, u.user_avatar_type, u.user_avatar_width, u.user_avatar_height, z.friend, z.foe, p.* - FROM ((' . POSTS_TABLE . ' p - LEFT JOIN ' . ZEBRA_TABLE . ' z ON (z.user_id = ' . $user->data['user_id'] . ' AND z.zebra_id = p.poster_id)), ' . USERS_TABLE . ' u) + FROM ((' . POSTS_TABLE . ' p + LEFT JOIN ' . ZEBRA_TABLE . ' z ON (z.user_id = ' . $user->data['user_id'] . ' AND z.zebra_id = p.poster_id)), ' . USERS_TABLE . ' u) WHERE p.post_id IN (' . implode(', ', $post_list) . ') AND u.user_id = p.poster_id'; $result = $db->sql_query($sql); @@ -744,7 +744,7 @@ while ($row = $db->sql_fetchrow($result)) { $rowset[$row['post_id']] = array( 'foe' => true, - 'post_id' => $row['post_id'], + 'post_id' => $row['post_id'], 'poster' => $poster, ); @@ -756,7 +756,7 @@ while ($row = $db->sql_fetchrow($result)) if ($row['post_attachment'] && $config['allow_attachments']) { $attach_list[] = $row['post_id']; - + if ($row['post_approved']) { $has_attachments = TRUE; @@ -785,8 +785,8 @@ while ($row = $db->sql_fetchrow($result)) 'bbcode_bitfield' => $row['bbcode_bitfield'], 'enable_html' => $row['enable_html'], 'enable_smilies' => $row['enable_smilies'], - 'enable_sig' => $row['enable_sig'], - 'friend' => $row['friend'], + 'enable_sig' => $row['enable_sig'], + 'friend' => $row['friend'], ); // Define the global bbcode bitfield, will be used to load bbcodes @@ -853,7 +853,7 @@ while ($row = $db->sql_fetchrow($result)) 'sig_bbcode_uid' => (!empty($row['user_sig_bbcode_uid'])) ? $row['user_sig_bbcode_uid'] : '', 'sig_bbcode_bitfield' => (!empty($row['user_sig_bbcode_bitfield'])) ? $row['user_sig_bbcode_bitfield'] : '', - 'viewonline' => $row['user_allow_viewonline'], + 'viewonline' => $row['user_allow_viewonline'], 'avatar' => '', @@ -948,8 +948,8 @@ if ($config['load_cp_viewtopic']) // Generate online information for user if ($config['load_onlinetrack'] && sizeof($id_cache)) { - $sql = 'SELECT session_user_id, MAX(session_time) as online_time, MIN(session_allow_viewonline) AS viewonline - FROM ' . SESSIONS_TABLE . ' + $sql = 'SELECT session_user_id, MAX(session_time) as online_time, MIN(session_allow_viewonline) AS viewonline + FROM ' . SESSIONS_TABLE . ' WHERE session_user_id IN (' . implode(', ', $id_cache) . ') GROUP BY session_user_id'; $result = $db->sql_query($sql); @@ -969,7 +969,7 @@ if (sizeof($attach_list)) { include($phpbb_root_path . 'includes/functions_display.' . $phpEx); - $sql = 'SELECT * + $sql = 'SELECT * FROM ' . ATTACHMENTS_TABLE . ' WHERE post_msg_id IN (' . implode(', ', $attach_list) . ') AND in_message = 0 @@ -985,8 +985,8 @@ if (sizeof($attach_list)) // No attachments exist, but post table thinks they do so go ahead and reset post_attach flags if (!sizeof($attachments)) { - $sql = 'UPDATE ' . POSTS_TABLE . ' - SET post_attachment = 0 + $sql = 'UPDATE ' . POSTS_TABLE . ' + SET post_attachment = 0 WHERE post_id IN (' . implode(', ', $attach_list) . ')'; $db->sql_query($sql); @@ -1003,16 +1003,16 @@ if (sizeof($attach_list)) if (!$db->sql_fetchrow($result)) { - $sql = 'UPDATE ' . TOPICS_TABLE . " - SET topic_attachment = 0 + $sql = 'UPDATE ' . TOPICS_TABLE . " + SET topic_attachment = 0 WHERE topic_id = $topic_id"; $db->sql_query($sql); } } else { - $sql = 'UPDATE ' . TOPICS_TABLE . " - SET topic_attachment = 0 + $sql = 'UPDATE ' . TOPICS_TABLE . " + SET topic_attachment = 0 WHERE topic_id = $topic_id"; $db->sql_query($sql); } @@ -1020,8 +1020,8 @@ if (sizeof($attach_list)) else if ($has_attachments && !$topic_data['topic_attachment']) { // Topic has approved attachments but its flag is wrong - $sql = 'UPDATE ' . TOPICS_TABLE . " - SET topic_attachment = 1 + $sql = 'UPDATE ' . TOPICS_TABLE . " + SET topic_attachment = 1 WHERE topic_id = $topic_id"; $db->sql_query($sql); @@ -1062,7 +1062,7 @@ for ($i = 0, $end = sizeof($post_list); $i < $end; ++$i) if (isset($row['foe']) && $row['foe']) { $template->assign_block_vars('postrow', array( - 'S_IGNORE_POST' => true, + 'S_IGNORE_POST' => true, 'L_IGNORE_POST' => sprintf($user->lang['POST_BY_FOE'], $row['poster'], "', '')) ); @@ -1077,7 +1077,7 @@ for ($i = 0, $end = sizeof($post_list); $i < $end; ++$i) else { $template->assign_block_vars('postrow', array( - 'S_IGNORE_POST' => true, + 'S_IGNORE_POST' => true, 'L_IGNORE_POST' => sprintf($user->lang['POST_ENCODING'], $row['poster'], '', '')) ); @@ -1140,7 +1140,7 @@ for ($i = 0, $end = sizeof($post_list); $i < $end; ++$i) // Remove all post_ids already parsed (we do not have to check them) $post_storage_list = array_slice($post_list, $i); - $sql = 'SELECT DISTINCT u.user_id, u.username, u.user_colour + $sql = 'SELECT DISTINCT u.user_id, u.username, u.user_colour FROM ' . POSTS_TABLE . ' p, ' . USERS_TABLE . ' u WHERE p.post_id IN (' . implode(', ', $post_storage_list) . ") AND p.post_edit_count <> 0 @@ -1153,7 +1153,7 @@ for ($i = 0, $end = sizeof($post_list); $i < $end; ++$i) $post_edit_list[$user_edit_row['user_id']] = $user_edit_row; } $db->sql_freeresult($result2); - + unset($post_storage_list); } $l_edit_time_total = ($row['post_edit_count'] == 1) ? $user->lang['EDITED_TIME_TOTAL'] : $user->lang['EDITED_TIMES_TOTAL']; @@ -1170,7 +1170,7 @@ for ($i = 0, $end = sizeof($post_list); $i < $end; ++$i) // Bump information if ($topic_bumped && $row['post_id'] == $topic_last_post_id) { - // It is safe to grab the username from the user cache array, we are at the last + // It is safe to grab the username from the user cache array, we are at the last // post and only the topic poster and last poster are allowed to bump $l_bumped_by = '

' . sprintf($user->lang['BUMPED_BY'], $user_cache[$topic_bumper]['username'], $user->format_date($topic_last_post_time)); } @@ -1194,7 +1194,7 @@ for ($i = 0, $end = sizeof($post_list); $i < $end; ++$i) { // Flip index if we are displaying the reverse way $index = ($config['display_order']) ? ($tpl_size-($matches[1][$num] + 1)) : $matches[1][$num]; - + $replace['from'][] = $matches[0][$index]; $replace['to'][] = (isset($tpl[$index])) ? $tpl[$index] : sprintf($user->lang['MISSING_INLINE_ATTACHMENT'], $matches[2][$num]); @@ -1205,7 +1205,7 @@ for ($i = 0, $end = sizeof($post_list); $i < $end; ++$i) if (isset($replace['from'])) { $message = str_replace($replace['from'], $replace['to'], $message); - + foreach (array_unique($unset_tpl) as $index) { unset($attachments[$row['post_id']][$index]); @@ -1240,11 +1240,11 @@ for ($i = 0, $end = sizeof($post_list); $i < $end; ++$i) 'MINI_POST_IMG' => ($user->data['user_id'] != ANONYMOUS && $row['post_time'] > $user->data['user_lastvisit'] && $row['post_time'] > $topic_last_read) ? $user->img('icon_post_new', 'NEW_POST') : $user->img('icon_post', 'POST'), 'POST_ICON_IMG' => (!empty($row['icon_id'])) ? '' : '', 'ICQ_STATUS_IMG' => $user_cache[$poster_id]['icq_status_img'], - 'ONLINE_IMG' => ($poster_id == ANONYMOUS || !$config['load_onlinetrack']) ? '' : (($user_cache[$poster_id]['online']) ? $user->img('btn_online', 'ONLINE') : $user->img('btn_offline', 'OFFLINE')), + 'ONLINE_IMG' => ($poster_id == ANONYMOUS || !$config['load_onlinetrack']) ? '' : (($user_cache[$poster_id]['online']) ? $user->img('btn_online', 'ONLINE') : $user->img('btn_offline', 'OFFLINE')), 'U_EDIT' => (($user->data['user_id'] == $poster_id && $auth->acl_get('f_edit', $forum_id) && ($row['post_time'] > time() - $config['edit_time'] || !$config['edit_time'])) || $auth->acl_get('m_edit', $forum_id)) ? "posting.$phpEx$SID&mode=edit&f=$forum_id&p=" . $row['post_id'] : '', - 'U_QUOTE' => ($auth->acl_get('f_quote', $forum_id)) ? "posting.$phpEx$SID&mode=quote&f=$forum_id&p=" . $row['post_id'] : '', - 'U_IP' => ($auth->acl_get('m_ip', $forum_id)) ? "mcp.$phpEx?sid=" . $user->session_id . "&mode=post_details&p=" . $row['post_id'] . "#ip" : '', + 'U_QUOTE' => ($auth->acl_get('f_quote', $forum_id)) ? "posting.$phpEx$SID&mode=quote&f=$forum_id&p=" . $row['post_id'] : '', + 'U_INFO' => ($auth->acl_get('m_', $forum_id)) ? "mcp.$phpEx$SID&mode=post_details&p=" . $row['post_id'] : '', 'U_DELETE' => (($user->data['user_id'] == $poster_id && $auth->acl_get('f_delete', $forum_id) && $topic_data['topic_last_post_id'] == $row['post_id'] && ($row['post_time'] > time() - $config['edit_time'] || !$config['edit_time'])) || $auth->acl_get('m_delete', $forum_id)) ? "posting.$phpEx$SID&mode=delete&f=$forum_id&p=" . $row['post_id'] : '', 'U_PROFILE' => $user_cache[$poster_id]['profile'], @@ -1256,24 +1256,21 @@ for ($i = 0, $end = sizeof($post_list); $i < $end; ++$i) 'U_AIM' => $user_cache[$poster_id]['aim'], 'U_MSN' => $user_cache[$poster_id]['msn'], 'U_YIM' => $user_cache[$poster_id]['yim'], - 'U_JABBER' => $user_cache[$poster_id]['jabber'], + 'U_JABBER' => $user_cache[$poster_id]['jabber'], - 'U_RATE_GOOD' => "viewtopic.$phpEx$SID&rate=good&p=" . $row['post_id'], - 'U_RATE_BAD' => "viewtopic.$phpEx$SID&rate=bad&p=" . $row['post_id'], 'U_REPORT' => "report.$phpEx$SID&p=" . $row['post_id'], 'U_MCP_REPORT' => ($auth->acl_gets('m_', 'a_', 'f_report', $forum_id)) ? "mcp.$phpEx$SID&mode=post_details&p=" . $row['post_id'] : '', 'U_MCP_APPROVE' => ($auth->acl_get('m_approve', $forum_id)) ? "mcp.$phpEx$SID&i=queue&mode=approve&post_id_list[]=" . $row['post_id'] : '', - 'U_MCP_DETAILS' => ($auth->acl_get('m_', $forum_id)) ? "mcp.$phpEx$SID&mode=post_details&p=" . $row['post_id'] : '', 'U_MINI_POST' => "viewtopic.$phpEx$SID&p=" . $row['post_id'] . '#' . $row['post_id'], 'U_POST_ID' => ($unread_post_id == $row['post_id']) ? 'unread' : $row['post_id'], 'POST_ID' => $row['post_id'], - 'U_NEXT_POST_ID' => ($i < $i_total && isset($rowset[$i + 1])) ? $rowset[$i + 1]['post_id'] : '', - 'U_PREV_POST_ID' => $prev_post_id, + 'U_NEXT_POST_ID' => ($i < $i_total && isset($rowset[$i + 1])) ? $rowset[$i + 1]['post_id'] : '', + 'U_PREV_POST_ID' => $prev_post_id, 'S_HAS_ATTACHMENTS' => (!empty($attachments[$row['post_id']])) ? TRUE : FALSE, 'S_POST_UNAPPROVED' => ($row['post_approved']) ? FALSE : TRUE, 'S_POST_REPORTED' => ($row['post_reported'] && $auth->acl_get('m_', $forum_id)) ? TRUE : FALSE, - 'S_DISPLAY_NOTICE' => $display_notice && $row['post_attachment'], + 'S_DISPLAY_NOTICE' => $display_notice && $row['post_attachment'], 'S_FRIEND' => ($row['friend']) ? true : false ); @@ -1283,7 +1280,7 @@ for ($i = 0, $end = sizeof($post_list); $i < $end; ++$i) }*/ $template->assign_block_vars('postrow', $postrow); - + // Display not already displayed Attachments for this post, we already parsed them. ;) if (isset($attachments[$row['post_id']]) && sizeof($attachments[$row['post_id']])) { @@ -1315,8 +1312,8 @@ if (!preg_match("#&t=$topic_id#", $user->data['session_page'])) // Update the attachment download counts if (sizeof($update_count)) { - $sql = 'UPDATE ' . ATTACHMENTS_TABLE . ' - SET download_count = download_count + 1 + $sql = 'UPDATE ' . ATTACHMENTS_TABLE . ' + SET download_count = download_count + 1 WHERE attach_id IN (' . implode(', ', array_unique($update_count)) . ')'; $db->sql_query($sql); }
{POLL_QUESTION}
{L_POLL_LENGTH}		{postrow.POSTER_NAME} - + + + +
 {L_POST_SUBJECT}: {postrow.POST_SUBJECT}
{postrow.MINI_POST_IMG}{L_POSTED}: {postrow.POST_DATE} 
{postrow.POST_ICON_IMG}
 {L_POST_SUBJECT}: {postrow.POST_SUBJECT}
{postrow.MINI_POST_IMG}{L_POSTED}: {postrow.POST_DATE} 
- +
- + @@ -184,7 +187,7 @@

- +
@@ -230,7 +233,7 @@ - +
{L_ATTACHMENTS}: {L_RATE}: {L_RATE_GOOD} / {L_RATE_BAD} {REPORT_IMG} {IP_IMG} {DELETE_IMG} {REPORT_IMG} {INFO_IMG} {DELETE_IMG}
@@ -244,7 +247,7 @@
[ {L_POST_DETAILS} ] 
 {PROFILE_IMG} {PM_IMG} {EMAIL_IMG}  
{QUOTE_IMG} {EDIT_IMG}