From ec884a2c5b3a9e786fdc5ef3988fab1b5cdb9e8c Mon Sep 17 00:00:00 2001 From: "Paul S. Owen" Date: Sat, 29 Mar 2003 18:28:45 +0000 Subject: [PATCH] icon name change git-svn-id: file:///svn/phpbb/trunk@3747 89ea8834-ac86-4346-8a33-228a782c2dd0 --- phpBB/includes/functions_display.php | 15 ++++--- phpBB/mcp.php | 2 +- phpBB/viewforum.php | 42 +++++++++-------- phpBB/viewtopic.php | 67 +++++++++++++++------------- 4 files changed, 65 insertions(+), 61 deletions(-) diff --git a/phpBB/includes/functions_display.php b/phpBB/includes/functions_display.php index 448ff87583..debc51f9f8 100644 --- a/phpBB/includes/functions_display.php +++ b/phpBB/includes/functions_display.php @@ -52,11 +52,11 @@ function display_forums($root_data = '', $display_moderators = TRUE) $lastread_sql = ''; // } - $sql = 'SELECT f.* ' . $lastread_select . ' - FROM ' . FORUMS_TABLE . " f " . - $lastread_sql . - $where_sql . ' - ORDER BY left_id'; + $sql = "SELECT f.* $lastread_select + FROM " . FORUMS_TABLE . " f + $lastread_sql + $where_sql + ORDER BY left_id"; $result = $db->sql_query($sql); $branch_root_id = $root_data['forum_id']; @@ -73,13 +73,14 @@ function display_forums($root_data = '', $display_moderators = TRUE) } unset($right_id); } + if (!$row['forum_postable'] && ($row['left_id'] + 1 == $row['right_id'])) { // Non-postable forum with no subforums: don't display continue; } - if (!$auth->acl_gets('f_list', 'm_', 'a_', intval($row['forum_id']))) + if (!$auth->acl_get('f_list', $row['forum_id'])) { // if the user does not have permissions to list this forum, skip everything until next branch @@ -178,7 +179,7 @@ function display_forums($root_data = '', $display_moderators = TRUE) $last_post .= ($row['forum_last_poster_id'] == ANONYMOUS) ? (($row['forum_last_poster_name'] != '') ? $row['forum_last_poster_name'] . ' ' : $user->lang['GUEST'] . ' ') : "' . $row['forum_last_poster_name'] . ' '; - $last_post .= '' . $user->img('goto_post_latest', 'VIEW_LATEST_POST') . ''; + $last_post .= '' . $user->img('icon_post_latest', 'VIEW_LATEST_POST') . ''; } else { diff --git a/phpBB/mcp.php b/phpBB/mcp.php index d80623bca0..9272f8107e 100644 --- a/phpBB/mcp.php +++ b/phpBB/mcp.php @@ -977,7 +977,7 @@ switch ($mode) 'SPLIT_SUBJECT' => $subject, 'POSTS_PER_PAGE' => $posts_per_page, - 'UNAPPROVED_IMG' => $user->img('item_unapproved', 'POST_NOT_BEEN_APPROVED', FALSE, TRUE), + 'UNAPPROVED_IMG' => $user->img('icon_unapproved', 'POST_NOT_BEEN_APPROVED', FALSE, TRUE), 'S_FORM_ACTION' => "mcp.$phpEx$SID&mode=$mode&t=$topic_id&start=$start", 'S_FORUM_SELECT' => '', diff --git a/phpBB/viewforum.php b/phpBB/viewforum.php index 9f036d85bf..545584b475 100644 --- a/phpBB/viewforum.php +++ b/phpBB/viewforum.php @@ -72,10 +72,10 @@ else WHERE f.forum_id = ' . $forum_id; */ $sql = 'SELECT f.*, fw.notify_status - FROM (' . FORUMS_TABLE . ' f - LEFT JOIN ' . FORUMS_WATCH_TABLE . ' fw ON fw.forum_id = f.forum_id - AND fw.user_id = ' . $user->data['user_id'] . ') - WHERE f.forum_id = ' . $forum_id; + FROM (' . FORUMS_TABLE . ' f + LEFT JOIN ' . FORUMS_WATCH_TABLE . ' fw ON fw.forum_id = f.forum_id + AND fw.user_id = ' . $user->data['user_id'] . ') + WHERE f.forum_id = ' . $forum_id; // UNION if necessary? /* $sql = "SELECT * FROM " . FORUMS_TABLE . " @@ -101,7 +101,7 @@ $auth->acl($user->data, $forum_id); // Permissions check -if (!$auth->acl_gets('f_read', 'm_', 'a_', $forum_id)) +if (!$auth->acl_gets('f_read', $forum_id)) { if ($user->data['user_id'] != ANONYMOUS) { @@ -228,7 +228,7 @@ if ($forum_data['forum_postable']) 'MOD_CP' => ($auth->acl_gets('m_', $forum_id)) ? sprintf($user->lang['MCP'], '', '') : '', 'MODERATORS' => (!empty($moderators[$forum_id])) ? implode(', ', $moderators[$forum_id]) : $user->lang['NONE'], - 'POST_IMG' => (intval($forum_data['forum_status']) == ITEM_LOCKED) ? $user->img('post_locked', $post_alt) : $user->img('post_new', $post_alt), + 'POST_IMG' => (intval($forum_data['forum_status']) == ITEM_LOCKED) ? $user->img('btn_locked', $post_alt) : $user->img('btn_post', $post_alt), 'FOLDER_IMG' => $user->img('folder', 'NO_NEW_POSTS'), 'FOLDER_NEW_IMG' => $user->img('folder_new', 'NEW_POSTS'), 'FOLDER_HOT_IMG' => $user->img('folder_hot', 'NO_NEW_POSTS_HOT'), @@ -240,8 +240,8 @@ if ($forum_data['forum_postable']) 'FOLDER_ANNOUNCE_IMG' => $user->img('folder_announce', 'POST_ANNOUNCEMENT'), 'FOLDER_ANNOUNCE_NEW_IMG'=> $user->img('folder_announce_new', 'POST_ANNOUNCEMENT'), - 'REPORTED_IMG' => $user->img('item_reported', 'TOPIC_BEEN_REPORTED'), - 'UNAPPROVED_IMG' => $user->img('item_unapproved', 'TOPIC_NOT_BEEN_APPROVED'), + 'REPORTED_IMG' => $user->img('icon_reported', 'TOPIC_BEEN_REPORTED'), + 'UNAPPROVED_IMG' => $user->img('icon_unapproved', 'TOPIC_NOT_BEEN_APPROVED'), 'L_NO_TOPICS' => ($forum_data['forum_status'] == ITEM_LOCKED) ? $user->lang['POST_FORUM_LOCKED'] : $user->lang['NO_TOPICS'], @@ -279,7 +279,6 @@ if ($forum_data['forum_postable']) OR t.forum_id = 0) AND t.topic_type = " . POST_ANNOUNCE . " ORDER BY $sort_order_sql"; - $result = $db->sql_query_limit($sql, $config['topics_per_page']); while($row = $db->sql_fetchrow($result)) @@ -294,7 +293,7 @@ if ($forum_data['forum_postable']) LEFT JOIN ' . LASTREAD_TABLE . ' lr ON lr.topic_id = t.topic_id AND lr.user_id = ' . $user->data['user_id'] . ") WHERE t.forum_id = $forum_id - " . (($auth->acl_gets('m_approve', 'a_', $forum_id)) ? '' : 'AND t.topic_approved = 1') . " + " . (($auth->acl_gets('m_approve', $forum_id)) ? '' : 'AND t.topic_approved = 1') . " AND t.topic_type <> " . POST_ANNOUNCE . " $limit_topics_time ORDER BY t.topic_type DESC, $sort_order_sql"; @@ -322,7 +321,7 @@ if ($forum_data['forum_postable']) $topic_type = $user->lang['TOPIC_MOVED'] . ' '; $topic_id = $row['topic_moved_id']; - $folder_image = 'folder'; + $folder_image = 'folder'; $folder_alt = 'Topic_Moved'; $newest_post_img = ''; } @@ -342,11 +341,6 @@ if ($forum_data['forum_postable']) $folder_new = 'folder_sticky_new'; break; - case ITEM_LOCKED: - $folder = 'folder_locked'; - $folder_new = 'folder_locked_new'; - break; - default: if ($replies >= intval($config['hot_threshold'])) { @@ -361,6 +355,13 @@ if ($forum_data['forum_postable']) break; } + if ($row['topic_status'] == ITEM_LOCKED) + { + $topic_type = $user->lang['TOPIC_LOCKED'] . ' '; + $folder = 'folder_locked'; + $folder_new = 'folder_locked_new'; + } + $unread_topic = true; if ($user->data['user_id'] != ANONYMOUS && @@ -372,7 +373,7 @@ if ($forum_data['forum_postable']) } - $newest_post_img = ($unread_topic) ? '' . $user->img('goto_post_newest', 'VIEW_NEWEST_POST') . ' ' : ''; + $newest_post_img = ($unread_topic) ? '' . $user->img('icon_post_newest', 'VIEW_NEWEST_POST') . ' ' : ''; $folder_img = ($unread_topic) ? $folder_new : $folder; $folder_alt = ($unread_topic) ? 'NEW_POSTS' : (($row['topic_status'] == ITEM_LOCKED) ? 'TOPIC_LOCKED' : 'NO_NEW_POSTS'); @@ -396,7 +397,7 @@ if ($forum_data['forum_postable']) if (($replies + 1) > intval($config['posts_per_page'])) { $total_pages = ceil(($replies + 1) / intval($config['posts_per_page'])); - $goto_page = ' [ ' . $user->img('goto_post', 'GOTO_PAGE') . $user->lang['GOTO_PAGE'] . ': '; + $goto_page = ' [ ' . $user->img('icon_post', 'GOTO_PAGE') . $user->lang['GOTO_PAGE'] . ': '; $times = 1; for($j = 0; $j < $replies + 1; $j += intval($config['posts_per_page'])) @@ -425,7 +426,7 @@ if ($forum_data['forum_postable']) // Generate all the URIs ... $view_topic_url = 'viewtopic.' . $phpEx . $SID . '&f=' . $forum_id . '&t=' . $topic_id; - $last_post_img = '' . $user->img('goto_post_latest', 'VIEW_LATEST_POST') . ''; + $last_post_img = '' . $user->img('icon_post_latest', 'VIEW_LATEST_POST') . ''; $topic_author = ($row['topic_poster'] != ANONYMOUS) ? "' : ''; $topic_author .= ($row['topic_poster'] != ANONYMOUS) ? $row['topic_first_poster_name'] : (($row['topic_first_poster_name'] != '') ? $row['topic_first_poster_name'] : $user->lang['GUEST']); @@ -437,13 +438,11 @@ if ($forum_data['forum_postable']) $last_post_time = $user->format_date($row['topic_last_post_time']); - // This will allow the style designer to output a different header // or even seperate the list of announcements from sticky and normal // topics $s_type_switch_test = ($row['topic_type'] == POST_ANNOUNCE) ? 1 : 0; - // Send vars to template $template->assign_block_vars('topicrow', array( 'FORUM_ID' => $forum_id, @@ -474,7 +473,6 @@ if ($forum_data['forum_postable']) 'U_VIEW_TOPIC' => $view_topic_url) ); - $s_type_switch = ($row['topic_type'] == POST_ANNOUNCE) ? 1 : 0; $i++; } diff --git a/phpBB/viewtopic.php b/phpBB/viewtopic.php index 38f60b6b22..d7ac785b00 100644 --- a/phpBB/viewtopic.php +++ b/phpBB/viewtopic.php @@ -301,8 +301,8 @@ $view_next_topic_url = 'viewtopic.' . $phpEx . $SID . '&f=' . $forum_id . '& // Post/reply images -$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']); +$reply_img = ($forum_status == ITEM_LOCKED || $topic_status == ITEM_LOCKED) ? $user->img('btn_locked', $user->lang['TOPIC_LOCKED']) : $user->img('btn_reply', $user->lang['REPLY_TO_TOPIC']); +$post_img = ($forum_status == ITEM_LOCKED) ? $user->img('post_locked', $user->lang['FORUM_LOCKED']) : $user->img('btn_post', $user->lang['POST_NEW_TOPIC']); // Set a cookie for this topic @@ -336,7 +336,7 @@ get_moderators($forum_moderators, $forum_id); // This is only used for print view so ... -$server_path = (($config['cookie_secure']) ? 'https://' : 'http://') . trim($config['server_name']) . (($config['server_port'] <> 80) ? ':' . trim($config['server_port']) . '/' : '/') . trim($config['script_path']) . '/'; +$server_path = (!isset($_GET['view'])) ? '' : (($config['cookie_secure']) ? 'https://' : 'http://') . trim($config['server_name']) . (($config['server_port'] <> 80) ? ':' . trim($config['server_port']) . '/' : '/') . trim($config['script_path']) . '/'; // Send vars to template $template->assign_vars(array( @@ -348,15 +348,15 @@ $template->assign_vars(array( 'PAGINATION' => (isset($_GET['view']) && $_GET['view'] == 'print') ? '' : $pagination, 'PAGE_NUMBER' => (isset($_GET['view']) && $_GET['view'] == 'print') ? '' : 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), - 'MCP' => ($auth->acl_get('m_', $forum_id)) ? sprintf($user->lang['MCP'], "session_id . "&t=$topic_id&start=$start&sort_days=$sort_days&sort_key=$sort_key&sort_dir=$sort_dir&posts_per_page=" . $config['posts_per_page'] . '">', '') : '', + 'MCP' => ($auth->acl_get('m_', $forum_id)) ? sprintf($user->lang['MCP'], "session_id . "&t=$topic_id&start=$start&st=$sort_days&sk=$sort_key&sd=$sort_dir&posts_per_page=" . $config['posts_per_page'] . '">', '') : '', 'MODERATORS' => (sizeof($forum_moderators[$forum_id])) ? implode(', ', $forum_moderators[$forum_id]) : $user->lang['NONE'], 'POST_IMG' => $post_img, 'REPLY_IMG' => $reply_img, - 'REPORT_IMG' => $user->img('icon_report', $user->lang['REPORT_TO_ADMIN']), + 'REPORT_IMG' => $user->img('btn_report', $user->lang['REPORT_TO_ADMIN']), - 'REPORTED_IMG' => $user->img('item_reported', 'POST_BEEN_REPORTED'), - 'UNAPPROVED_IMG' => $user->img('item_unapproved', 'POST_NOT_BEEN_APPROVED'), + 'REPORTED_IMG' => $user->img('icon_reported', 'POST_BEEN_REPORTED'), + 'UNAPPROVED_IMG' => $user->img('icon_unapproved', 'POST_NOT_BEEN_APPROVED'), 'S_TOPIC_LINK' => 't', 'S_SELECT_SORT_DIR' => $s_sort_dir, @@ -367,17 +367,19 @@ $template->assign_vars(array( 'S_MOD_ACTION' => "mcp.$phpEx?sid=" . $user->session_id . "&t=$topic_id&quickmod=1", 'S_WATCH_TOPIC' => $s_watching_topic, - 'S_SHOW_SEARCHBOX' => ($auth->acl_get('f_search', 'a_', $forum_id)) ? true : false, + 'S_SHOW_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 . '?t=' . $topic_id, 'U_FORUM' => $server_path, - 'U_VIEW_TOPIC' => "viewtopic.$phpEx$SID&t=$topic_id&start=$start&sort_days=$sort_days&sort_key=$sort_key&sort_dir=$sort_dir&highlight=$highlight", + 'U_VIEW_TOPIC' => "viewtopic.$phpEx$SID&t=$topic_id&start=$start&st=$sort_days&sk=$sort_key&sd=$sort_dir&hilit=$highlight", 'U_VIEW_FORUM' => $view_forum_url, 'U_VIEW_OLDER_TOPIC' => $view_prev_topic_url, 'U_VIEW_NEWER_TOPIC' => $view_next_topic_url, - 'U_PRINT_TOPIC' => "viewtopic.$phpEx$SID&t=$topic_id&start=$start&sort_days=$sort_days&sort_key=$sort_key&sort_dir=$sort_dir&highlight=$highlight&view=print", + 'U_PRINT_TOPIC' => "viewtopic.$phpEx$SID&t=$topic_id&st=$sort_days&sk=$sort_key&sd=$sort_dir&view=print", + 'U_EMAIL_TOPIC' => "viewtopic.$phpEx$SID&t=$topic_id&view=email", + 'U_POST_NEW_TOPIC' => $new_topic_url, 'U_POST_REPLY_TOPIC' => $reply_topic_url) ); @@ -440,13 +442,13 @@ if (!empty($poll_start)) 'S_HAS_POLL_OPTIONS'=> !$display_results, 'S_HAS_POLL_DISPLAY'=> $display_results, - 'S_POLL_ACTION' => "viewtopic.$phpEx$SID&t=$topic_id&postdays=$post_days&postorder=$poster_order", + 'S_POLL_ACTION' => "viewtopic.$phpEx$SID&t=$topic_id&sk=$sort_key&sd=$sort_dir", 'L_SUBMIT_VOTE' => $user->lang['Submit_vote'], 'L_VIEW_RESULTS'=> $user->lang['View_results'], 'L_TOTAL_VOTES' => $user->lang['Total_votes'], - 'U_VIEW_RESULTS' => "viewtopic.$phpEx$SID&t=$topic_id&sort_days=$sort_days&sort_key=$sort_key&sort_dir=$sort_dir&vote=viewresult") + 'U_VIEW_RESULTS' => "viewtopic.$phpEx$SID&t=$topic_id&st=$sort_days&sk=$sort_key&sd=$sort_dir&vote=viewresult") ); } @@ -585,18 +587,18 @@ if ($row = $db->sql_fetchrow($result)) if (!isset($user_cache[$poster_id]['profile']) && $poster_id != ANONYMOUS) { $temp_url = "memberlist.$phpEx$SID&mode=viewprofile&u=$poster_id"; - $user_cache[$poster_id]['profile_img'] = '' . $user->img('icon_profile', $user->lang['READ_PROFILE']) . ''; + $user_cache[$poster_id]['profile_img'] = '' . $user->img('btn_profile', $user->lang['READ_PROFILE']) . ''; $user_cache[$poster_id]['profile'] = '' . $user->lang['READ_PROFILE'] . ''; $temp_url = "ucp.$phpEx$SID&mode=message&action=send&u=$poster_id"; - $user_cache[$poster_id]['pm_img'] = '' . $user->img('icon_pm', $user->lang['SEND_PRIVATE_MESSAGE']) . ''; + $user_cache[$poster_id]['pm_img'] = '' . $user->img('btn_pm', $user->lang['SEND_PRIVATE_MESSAGE']) . ''; $user_cache[$poster_id]['pm'] = '' . $user->lang['SEND_PRIVATE_MESSAGE'] . ''; if (!empty($row['user_viewemail']) || $auth->acl_gets('m_', 'a_', $forum_id)) { $email_uri = ($config['board_email_form'] && $config['email_enable']) ? "ucp.$phpEx$SID&mode=email&u=" . $poster_id : 'mailto:' . $row['user_email']; - $user_cache[$poster_id]['email_img'] = '' . $user->img('icon_email', $user->lang['SEND_EMAIL']) . ''; + $user_cache[$poster_id]['email_img'] = '' . $user->img('btn_email', $user->lang['SEND_EMAIL']) . ''; $user_cache[$poster_id]['email'] = '' . $user->lang['SEND_EMAIL'] . ''; } else @@ -605,14 +607,15 @@ if ($row = $db->sql_fetchrow($result)) $user_cache[$poster_id]['email'] = ''; } - $user_cache[$poster_id]['www_img'] = ($row['user_website']) ? '' . $user->img('icon_www', $user->lang['VISIT_WEBSITE']) . '' : ''; + $user_cache[$poster_id]['www_img'] = ($row['user_website']) ? '' . $user->img('btn_www', $user->lang['VISIT_WEBSITE']) . '' : ''; $user_cache[$poster_id]['www'] = ($row['user_website']) ? '' . $user->lang['VISIT_WEBSITE'] . '' : ''; if (!empty($row['user_icq'])) { - $user_cache[$poster_id]['icq_status_img'] = ''; - $user_cache[$poster_id]['icq_img'] = '' . $user->img('icon_icq', $user->lang['ICQ']) . ''; - $user_cache[$poster_id]['icq'] = '' . $user->lang['ICQ'] . ''; + $temp_url = "memberlist.$phpEx$SID&mode=contact&action=icq&u=$poster_id"; + $user_cache[$poster_id]['icq_status_img'] = ''; + $user_cache[$poster_id]['icq_img'] = '' . $user->img('btn_icq', $user->lang['ICQ']) . ''; + $user_cache[$poster_id]['icq'] = '' . $user->lang['ICQ'] . ''; } else { @@ -621,20 +624,22 @@ if ($row = $db->sql_fetchrow($result)) $user_cache[$poster_id]['icq'] = ''; } - $user_cache[$poster_id]['aim_img'] = ($row['user_aim']) ? '' . $user->img('icon_aim', $user->lang['AIM']) . '' : ''; - $user_cache[$poster_id]['aim'] = ($row['user_aim']) ? '' . $user->lang['AIM'] . '' : ''; + $temp_url = "memberlist.$phpEx$SID&mode=contact&action=aim&u=$poster_id"; + $user_cache[$poster_id]['aim_img'] = ($row['user_aim']) ? '' . $user->img('btn_aim', $user->lang['AIM']) . '' : ''; + $user_cache[$poster_id]['aim'] = ($row['user_aim']) ? '' . $user->lang['AIM'] . '' : ''; - $temp_url = "memberlist.$phpEx$SID&mode=viewprofile&u=$poster_id"; - $user_cache[$poster_id]['msn_img'] = ($row['user_msnm']) ? '' . $user->img('icon_msnm', $user->lang['MSNM']) . '' : ''; + $temp_url = "memberlist.$phpEx$SID&mode=contact&action=msnm&u=$poster_id"; + $user_cache[$poster_id]['msn_img'] = ($row['user_msnm']) ? '' . $user->img('btn_msnm', $user->lang['MSNM']) . '' : ''; $user_cache[$poster_id]['msn'] = ($row['user_msnm']) ? '' . $user->lang['MSNM'] . '' : ''; - $user_cache[$poster_id]['yim_img'] = ($row['user_yim']) ? '' . $user->img('icon_yim', $user->lang['YIM']) . '' : ''; - $user_cache[$poster_id]['yim'] = ($row['user_yim']) ? '' . $user->lang['YIM'] . '' : ''; + $temp_url = 'http://edit.yahoo.com/config/send_webmesg?.target=' . $row['user_yim'] . '&.src=pg'; + $user_cache[$poster_id]['yim_img'] = ($row['user_yim']) ? '' . $user->img('btn_yim', $user->lang['YIM']) . '' : ''; + $user_cache[$poster_id]['yim'] = ($row['user_yim']) ? '' . $user->lang['YIM'] . '' : ''; if ($auth->acl_get('f_search', $forum_id)) { $temp_url = 'search.' . $phpEx . $SID . '&search_author=' . urlencode($row['username']) .'"&showresults=posts'; - $search_img = '' . $user->img('icon_search', $user->lang['SEARCH_USER_POSTS']) . ''; + $search_img = '' . $user->img('btn_search', $user->lang['SEARCH_USER_POSTS']) . ''; $search ='' . $user->lang['SEARCH_USER_POSTS'] . ''; } else @@ -668,13 +673,13 @@ if ($row = $db->sql_fetchrow($result)) // Non-user specific images/text $temp_url = 'posting.' . $phpEx . $SID . '&mode=quote&p=' . $row['post_id']; - $quote_img = '' . $user->img('icon_quote', $user->lang['REPLY_WITH_QUOTE']) . ''; + $quote_img = '' . $user->img('btn_quote', $user->lang['REPLY_WITH_QUOTE']) . ''; $quote = '' . $user->lang['REPLY_WITH_QUOTE'] . ''; if (($user->data['user_id'] == $poster_id && $auth->acl_get('f_edit', $forum_id)) || $auth->acl_get('m_edit', $forum_id)) { $temp_url = "posting.$phpEx$SID&mode=edit&f=" . $row['forum_id'] . "&p=" . $row['post_id']; - $edit_img = '' . $user->img('icon_edit', $user->lang['EDIT_DELETE_POST']) . ''; + $edit_img = '' . $user->img('btn_edit', $user->lang['EDIT_DELETE_POST']) . ''; $edit = '' . $user->lang['EDIT_DELETE_POST'] . ''; } else @@ -686,7 +691,7 @@ if ($row = $db->sql_fetchrow($result)) if ($auth->acl_get('m_ip', $forum_id)) { $temp_url = "mcp.$phpEx?sid=" . $user->session_id . "&mode=ip&p=" . $row['post_id'] . "&t=" . $topic_id; - $ip_img = '' . $user->img('icon_ip', $user->lang['VIEW_IP']) . ''; + $ip_img = '' . $user->img('btn_ip', $user->lang['VIEW_IP']) . ''; $ip = '' . $user->lang['VIEW_IP'] . ''; } else @@ -698,7 +703,7 @@ if ($row = $db->sql_fetchrow($result)) if (($user->data['user_id'] == $poster_id && $auth->acl_get('f_delete', $forum_id) && $forum_topic_data['topic_last_post_id'] == $row['post_id']) || $auth->acl_get('m_delete', $forum_id)) { $temp_url = "posting.$phpEx$SID&mode=delete&p=" . $row['post_id']; - $delpost_img = '' . $user->img('icon_delete', $user->lang['DELETE_POST']) . ''; + $delpost_img = '' . $user->img('btn_delete', $user->lang['DELETE_POST']) . ''; $delpost = '' . $user->lang['DELETE_POST'] . ''; } else @@ -803,7 +808,7 @@ if ($row = $db->sql_fetchrow($result)) // 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('icon_post', $user->lang['Post']); // Little post link and anchor name $mini_post_url = 'viewtopic.' . $phpEx . $SID . '&p=' . $row['post_id'] . '#' . $row['post_id'];