mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-07-19 16:11:21 +02:00
Code Issues Releases Wiki Activity

Icon updates

Browse Source 
git-svn-id: file:///svn/phpbb/trunk@3357 89ea8834-ac86-4346-8a33-228a782c2dd0
This commit is contained in:
Paul S. Owen
2003-01-22 16:46:44 +00:00
parent 90eb7c5179
commit 01517e23fd
2 changed files with 43 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
phpBB/viewforum.php
View File

@@ -535,7 +535,7 @@ if ($forum_data['forum_postable'])
'VIEWS' => $topic_rowset[$i]['topic_views'], 'VIEWS' => $topic_rowset[$i]['topic_views'],
'TOPIC_TITLE' => $topic_title, 'TOPIC_TITLE' => $topic_title,
'TOPIC_TYPE' => $topic_type, 'TOPIC_TYPE' => $topic_type,
'TOPIC_ICON' => (!empty($topic_rowset[$i]['topic_icon']) ) ? '<img src="' . $config['icons_path'] . '/' . $icons[$topic_rowset[$i]['topic_icon']]['img'] . '" width="' . $icons[$topic_rowset[$i]['topic_icon']]['width'] . '" height="' . $icons[$topic_rowset[$i]['topic_icon']]['height'] . '" alt="" title="" />' : '', 'TOPIC_ICON' => (!empty($topic_rowset[$i]['icon_id']) ) ? '<img src="' . $config['icons_path'] . '/' . $icons[$topic_rowset[$i]['icon_id']]['img'] . '" width="' . $icons[$topic_rowset[$i]['icon_id']]['width'] . '" height="' . $icons[$topic_rowset[$i]['icon_id']]['height'] . '" alt="" title="" />' : '',
'S_ROW_COUNT' => $i, 'S_ROW_COUNT' => $i,

54
phpBB/viewtopic.php
View File

@@ -39,6 +39,8 @@ if (empty($topic_id) && empty($post_id))
$user->start(); $user->start();
// End session management // End session management
// Find topic id if user requested a newer or older topic // Find topic id if user requested a newer or older topic
if (isset($_GET['view']) && empty($post_id)) if (isset($_GET['view']) && empty($post_id))
{ {
@@ -53,9 +55,8 @@ if (isset($_GET['view']) && empty($post_id))
AND p.topic_id = $topic_id AND p.topic_id = $topic_id
AND p.post_approved = 1 AND p.post_approved = 1
AND p.post_time >= u.user_lastvisit AND p.post_time >= u.user_lastvisit
ORDER BY p.post_time ASC ORDER BY p.post_time ASC";
LIMIT 1"; $result = $db->sql_query_limit($sql, 1);
$result = $db->sql_query($sql);
if (!($row = $db->sql_fetchrow($result))) if (!($row = $db->sql_fetchrow($result)))
{ {
@@ -79,9 +80,8 @@ if (isset($_GET['view']) && empty($post_id))
WHERE t2.topic_id = $topic_id WHERE t2.topic_id = $topic_id
AND t.forum_id = t2.forum_id AND t.forum_id = t2.forum_id
AND t.topic_last_post_time $sql_condition t2.topic_last_post_time AND t.topic_last_post_time $sql_condition t2.topic_last_post_time
ORDER BY t.topic_last_post_time $sql_ordering ORDER BY t.topic_last_post_time $sql_ordering";
LIMIT 1"; $result = $db->sql_query_limit($sql, 1);
$result = $db->sql_query($sql);
if (!($row = $db->sql_fetchrow($result))) if (!($row = $db->sql_fetchrow($result)))
{ {
@@ -95,6 +95,8 @@ if (isset($_GET['view']) && empty($post_id))
} }
} }
// Look at this query ... perhaps a re-think? Perhaps store topic ids rather // Look at this query ... perhaps a re-think? Perhaps store topic ids rather
// than last/first post ids and have a redirect at the top of this page // than last/first post ids and have a redirect at the top of this page
// for latest post, newest post for a given topic_id? // for latest post, newest post for a given topic_id?
@@ -170,7 +172,6 @@ watch_topic_forum('topic', $s_watching_topic, $s_watching_topic_img, $user->data
// Post ordering options // Post ordering options
$previous_days = array(0 => $user->lang['ALL_POSTS'], 1 => $user->lang['1_DAY'], 7 => $user->lang['7_DAYS'], 14 => $user->lang['2_WEEKS'], 30 => $user->lang['1_MONTH'], 90 => $user->lang['3_MONTHS'], 180 => $user->lang['6_MONTHS'], 364 => $user->lang['1_YEAR']); $previous_days = array(0 => $user->lang['ALL_POSTS'], 1 => $user->lang['1_DAY'], 7 => $user->lang['7_DAYS'], 14 => $user->lang['2_WEEKS'], 30 => $user->lang['1_MONTH'], 90 => $user->lang['3_MONTHS'], 180 => $user->lang['6_MONTHS'], 364 => $user->lang['1_YEAR']);
$sort_by_text = array('a' => $user->lang['AUTHOR'], 't' => $user->lang['POST_TIME'], 's' => $user->lang['SUBJECT']); $sort_by_text = array('a' => $user->lang['AUTHOR'], 't' => $user->lang['POST_TIME'], 's' => $user->lang['SUBJECT']);
@@ -244,9 +245,6 @@ $select_post_days .= '</select>';
$sql = "SELECT * $sql = "SELECT *
FROM " . RANKS_TABLE; FROM " . RANKS_TABLE;
$result = $db->sql_query($sql); $result = $db->sql_query($sql);
@@ -260,6 +258,10 @@ $db->sql_freeresult($result);
// Grab icons
$icons = array();
obtain_icons($icons);
// Was a highlight request part of the URI? // Was a highlight request part of the URI?
@@ -281,6 +283,8 @@ if (isset($_GET['highlight']))
$highlight = urlencode($_GET['highlight']); $highlight = urlencode($_GET['highlight']);
} }
// Quick mod tools // Quick mod tools
$s_forum_rules = ''; $s_forum_rules = '';
get_forum_rules('topic', $s_forum_rules, $forum_id); get_forum_rules('topic', $s_forum_rules, $forum_id);
@@ -306,6 +310,8 @@ $view_next_topic_url = 'viewtopic.' . $phpEx . $SID . '&amp;f=' . $forum_id . '&
$reply_img = ($forum_status == ITEM_LOCKED || $topic_status == ITEM_LOCKED) ? $user->img('reply_locked', $user->lang['Topic_locked']) : $user->img('reply_new', $user->lang['Reply_to_topic']); $reply_img = ($forum_status == ITEM_LOCKED || $topic_status == ITEM_LOCKED) ? $user->img('reply_locked', $user->lang['Topic_locked']) : $user->img('reply_new', $user->lang['Reply_to_topic']);
$post_img = ($forum_status == ITEM_LOCKED) ? $user->img('post_locked', $user->lang['Forum_locked']) : $user->img('post_new', $user->lang['Post_new_topic']); $post_img = ($forum_status == ITEM_LOCKED) ? $user->img('post_locked', $user->lang['Forum_locked']) : $user->img('post_new', $user->lang['Post_new_topic']);
// Set a cookie for this topic // Set a cookie for this topic
if ($user->data['user_id'] != ANONYMOUS) if ($user->data['user_id'] != ANONYMOUS)
{ {
@@ -360,6 +366,8 @@ if ($parent_id > 0)
} }
} }
// Build navigation links // Build navigation links
foreach ($forum_parents as $parent_forum_id => $parent_name) foreach ($forum_parents as $parent_forum_id => $parent_name)
{ {
@@ -373,6 +381,8 @@ $template->assign_block_vars('navlinks', array(
'U_VIEW_FORUM' => 'viewforum.' . $phpEx . $SID . '&amp;f=' . $forum_id 'U_VIEW_FORUM' => 'viewforum.' . $phpEx . $SID . '&amp;f=' . $forum_id
)); ));
// Moderators // Moderators
$forum_moderators = array(); $forum_moderators = array();
get_moderators($forum_moderators, $forum_id); get_moderators($forum_moderators, $forum_id);
@@ -533,9 +543,8 @@ $sql = "SELECT u.username, u.user_id, u.user_posts, u.user_from, u.user_karma, u
AND pt.post_id = p.post_id AND pt.post_id = p.post_id
$limit_posts_time $limit_posts_time
AND u.user_id = p.poster_id AND u.user_id = p.poster_id
ORDER BY $sort_order ORDER BY $sort_order";
LIMIT $start, " . $config['posts_per_page']; $result = $db->sql_query_limit($sql, $start, $config['posts_per_page']);
$result = $db->sql_query($sql);
if ($row = $db->sql_fetchrow($result)) if ($row = $db->sql_fetchrow($result))
{ {
@@ -789,10 +798,13 @@ if ($row = $db->sql_fetchrow($result))
// Second parse bbcode here // Second parse bbcode here
// If we allow users to disable display of emoticons // If we allow users to disable display of emoticons
// we'll need an appropriate check and preg_replace here // we'll need an appropriate check and preg_replace here
$message = (empty($row['enable_smilies']) || empty($config['enable_smilies'])) ? preg_replace('#<!\-\- s(.*?) \-\-><img src="\{SMILE_PATH\}\/.*? \/><!\-\- s\1 \-\->#', '\1', $message) : str_replace('<img src="{SMILE_PATH}', '<img src="' . $config['smilies_path'], $message); $message = (empty($row['enable_smilies']) || empty($config['enable_smilies'])) ? preg_replace('#<!\-\- s(.*?) \-\-><img src="\{SMILE_PATH\}\/.*? \/><!\-\- s\1 \-\->#', '\1', $message) : str_replace('<img src="{SMILE_PATH}', '<img src="' . $config['smilies_path'], $message);
// Highlight active words (primarily for search) // Highlight active words (primarily for search)
if ($highlight_match) if ($highlight_match)
{ {
@@ -801,6 +813,8 @@ if ($row = $db->sql_fetchrow($result))
$message = str_replace('\"', '"', substr(preg_replace('#(\>(((?>([^><]+|(?R)))*)\<))#se', "preg_replace('#\b(" . $highlight_match . ")\b#i', '<span class=\"hilit\">\\\\1</span>', '\\0')", '>' . $message . '<'), 1, -1)); $message = str_replace('\"', '"', substr(preg_replace('#(\>(((?>([^><]+|(?R)))*)\<))#se', "preg_replace('#\b(" . $highlight_match . ")\b#i', '<span class=\"hilit\">\\\\1</span>', '\\0')", '>' . $message . '<'), 1, -1));
} }
// Replace naughty words such as farty pants // Replace naughty words such as farty pants
if (sizeof($censors)) if (sizeof($censors))
{ {
@@ -808,8 +822,10 @@ if ($row = $db->sql_fetchrow($result))
$message = str_replace('\"', '"', substr(preg_replace('#(\>(((?>([^><]+|(?R)))*)\<))#se', "preg_replace(\$censors['match'], \$censors['replace'], '\\0')", '>' . $message . '<'), 1, -1)); $message = str_replace('\"', '"', substr(preg_replace('#(\>(((?>([^><]+|(?R)))*)\<))#se', "preg_replace(\$censors['match'], \$censors['replace'], '\\0')", '>' . $message . '<'), 1, -1));
} }
$message = nl2br($message); $message = nl2br($message);
// Editing information // Editing information
if (intval($row['post_edit_count'])) if (intval($row['post_edit_count']))
{ {
@@ -822,6 +838,8 @@ if ($row = $db->sql_fetchrow($result))
$l_edited_by = ''; $l_edited_by = '';
} }
// Signature // Signature
if (!isset($user_cache[$poster_id]['sig'])) if (!isset($user_cache[$poster_id]['sig']))
{ {
@@ -836,9 +854,9 @@ if ($row = $db->sql_fetchrow($result))
$user_cache[$poster_id]['sig'] = (empty($row['user_allowsmile']) || empty($config['enable_smilies'])) ? preg_replace('#<!\-\- s(.*?) \-\-><img src="\{SMILE_PATH\}\/.*? \/><!\-\- s\1 \-\->#', '\1', $user_cache[$poster_id]['sig']) : str_replace('<img src="{SMILE_PATH}', '<img src="' . $config['smilies_path'], $user_cache[$poster_id]['sig']); $user_cache[$poster_id]['sig'] = (empty($row['user_allowsmile']) || empty($config['enable_smilies'])) ? preg_replace('#<!\-\- s(.*?) \-\-><img src="\{SMILE_PATH\}\/.*? \/><!\-\- s\1 \-\->#', '\1', $user_cache[$poster_id]['sig']) : str_replace('<img src="{SMILE_PATH}', '<img src="' . $config['smilies_path'], $user_cache[$poster_id]['sig']);
if (count($orig_word)) if (count($censors))
{ {
$user_sig = str_replace('\"', '"', substr(preg_replace('#(\>(((?>([^><]+|(?R)))*)\<))#se', "preg_replace(\$orig_word, \$replacement_word, '\\0')", '>' . $user_sig . '<'), 1, -1)); $user_sig = str_replace('\"', '"', substr(preg_replace('#(\>(((?>([^><]+|(?R)))*)\<))#se', "preg_replace(\$censors['match'], \$censors['replace'], '\\0')", '>' . $user_sig . '<'), 1, -1));
} }
$user_cache[$poster_id]['sig'] = '<br />_________________<br />' . nl2br($user_cache[$poster_id]['sig']); $user_cache[$poster_id]['sig'] = '<br />_________________<br />' . nl2br($user_cache[$poster_id]['sig']);
@@ -849,6 +867,8 @@ if ($row = $db->sql_fetchrow($result))
} }
} }
// Define the little post icon // Define the little post icon
$mini_post_img = ($row['post_time'] > $user->data['user_lastvisit'] && $row['post_time'] > $topic_last_read) ? $user->img('goto_post_new', $user->lang['New_post']) : $user->img('goto_post', $user->lang['Post']); $mini_post_img = ($row['post_time'] > $user->data['user_lastvisit'] && $row['post_time'] > $topic_last_read) ? $user->img('goto_post_new', $user->lang['New_post']) : $user->img('goto_post', $user->lang['Post']);
@@ -856,6 +876,8 @@ if ($row = $db->sql_fetchrow($result))
$mini_post_url = 'viewtopic.' . $phpEx . $SID . '&amp;p=' . $row['post_id'] . '#' . $row['post_id']; $mini_post_url = 'viewtopic.' . $phpEx . $SID . '&amp;p=' . $row['post_id'] . '#' . $row['post_id'];
$u_post_id = (!empty($newest_post_id) && $newest_post_id == $row['post_id']) ? 'newest' : $row['post_id']; $u_post_id = (!empty($newest_post_id) && $newest_post_id == $row['post_id']) ? 'newest' : $row['post_id'];
// Dump vars into template // Dump vars into template
$template->assign_block_vars('postrow', array( $template->assign_block_vars('postrow', array(
'POSTER_NAME' => $poster, 'POSTER_NAME' => $poster,
@@ -904,6 +926,8 @@ if ($row = $db->sql_fetchrow($result))
'YIM_IMG' => $user_cache[$poster_id]['yim_img'], 'YIM_IMG' => $user_cache[$poster_id]['yim_img'],
'YIM' => $user_cache[$poster_id]['yim'], 'YIM' => $user_cache[$poster_id]['yim'],
'POST_ICON' => (!empty($row['icon_id']) ) ? '<img src="' . $config['icons_path'] . '/' . $icons[$row['icon_id']]['img'] . '" width="' . $icons[$row['icon_id']]['width'] . '" height="' . $icons[$row['icon_id']]['height'] . '" alt="" title="" />' : '',
'L_MINI_POST_ALT' => $mini_post_alt, 'L_MINI_POST_ALT' => $mini_post_alt,
'S_ROW_COUNT' => $i++, 'S_ROW_COUNT' => $i++,