diff options
| author | Meik Sievertsen <acydburn@phpbb.com> | 2004-07-08 22:41:04 +0000 |
|---|---|---|
| committer | Meik Sievertsen <acydburn@phpbb.com> | 2004-07-08 22:41:04 +0000 |
| commit | 05f1315ebb96b46ea384df73d387aeb05602d2b5 (patch) | |
| tree | 97ba594f068532d15df4e64f27fa5c271b1f7f30 /phpBB/includes/ucp/ucp_main.php | |
| parent | 48eeecb25893839ef9c9290d616083a6f1351b19 (diff) | |
| download | forums-05f1315ebb96b46ea384df73d387aeb05602d2b5.tar forums-05f1315ebb96b46ea384df73d387aeb05602d2b5.tar.gz forums-05f1315ebb96b46ea384df73d387aeb05602d2b5.tar.bz2 forums-05f1315ebb96b46ea384df73d387aeb05602d2b5.tar.xz forums-05f1315ebb96b46ea384df73d387aeb05602d2b5.zip | |
- remove output buffering options from download.php (not needed anymore)
- optimized viewtopic.php a little bit
- removed the create_function (was consuming too much memory) from viewtopic
- check for manually added convert[.exe] program name to imagemagick path in admin_attachments
- reduced filesize checking for imagemagick program (some installations require less than 20k)
- added checked="checked" for "not selected" topic icon
- moved parse_text_display function from functions_posting.php to functions.php (see comment above function)
- check for user_id != ANONYMOUS in page_footer for displaying the administration link (there seems to be a problem checking for global options)
- rewrote attachment thumbnail functions - utilize GD2 functions if available, more uptodate checks...
- changed final thumbnail size calculation
- define S_ROW_COUNT within template class itself
- added SID to template vars in page_header
- added ability to view topic/forum within admin_viewlogs
- added optional acl checking to make_jumpbox, no need to duplicate the function for this small need
- added custom body file for confirm_box
git-svn-id: file:///svn/phpbb/trunk@4920 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/includes/ucp/ucp_main.php')
| -rw-r--r-- | phpBB/includes/ucp/ucp_main.php | 18 |
1 files changed, 3 insertions, 15 deletions
diff --git a/phpBB/includes/ucp/ucp_main.php b/phpBB/includes/ucp/ucp_main.php index b1a72f19a9..33e72eab86 100644 --- a/phpBB/includes/ucp/ucp_main.php +++ b/phpBB/includes/ucp/ucp_main.php @@ -57,7 +57,6 @@ class ucp_main extends module $tracking_topics = (isset($_COOKIE[$config['cookie_name'] . '_track'])) ? unserialize(stripslashes($_COOKIE[$config['cookie_name'] . '_track'])) : array(); - $i = 0; $topic_type = $user->lang['VIEW_TOPIC_ANNOUNCEMENT']; $folder = 'folder_announce'; $folder_new = $folder . '_new'; @@ -137,13 +136,10 @@ class ucp_main extends module 'TOPIC_FOLDER_IMG' => $user->img($folder_img, $folder_alt), 'ATTACH_ICON_IMG' => ($auth->acl_gets('f_download', 'u_download', $forum_id) && $row['topic_attachment']) ? $user->img('icon_attach', '') : '', - 'S_ROW_COUNT' => $i, 'S_USER_POSTED' => (!empty($row['mark_type'])) ? true : false, 'U_VIEW_TOPIC' => $view_topic_url) ); - - $i++; } $db->sql_freeresult($result); @@ -328,7 +324,6 @@ class ucp_main extends module ORDER BY left_id'; $result = $db->sql_query($sql); - $i = 0; while ($row = $db->sql_fetchrow($result)) { $forum_id = $row['forum_id']; @@ -378,9 +373,7 @@ class ucp_main extends module 'U_LAST_POST_AUTHOR'=> $last_poster_url, 'U_LAST_POST' => $last_post_url, - 'U_VIEWFORUM' => "viewforum.$phpEx$SID&f=" . $row['forum_id'], - - 'S_ROW_COUNT' => $i++) + 'U_VIEWFORUM' => "viewforum.$phpEx$SID&f=" . $row['forum_id']) ); } $db->sql_freeresult($result); @@ -400,7 +393,6 @@ class ucp_main extends module ORDER BY t.topic_last_post_time DESC'; $result = $db->sql_query_limit($sql, $config['topics_per_page']); - $i = 0; while ($row = $db->sql_fetchrow($result)) { $forum_id = $row['forum_id']; @@ -515,7 +507,6 @@ class ucp_main extends module 'TOPIC_FOLDER_IMG' => $user->img($folder_img, $folder_alt), 'ATTACH_ICON_IMG' => ($auth->acl_gets('f_download', 'u_download', $forum_id) && $row['topic_attachment']) ? $user->img('icon_attach', '') : '', - 'S_ROW_COUNT' => $i++, 'S_USER_POSTED' => (!empty($row['mark_type'])) ? true : false, 'U_VIEW_TOPIC' => $view_topic_url) @@ -620,7 +611,6 @@ class ucp_main extends module ORDER BY b.order_id ASC'; $result = $db->sql_query($sql); - $i = 0; while ($row = $db->sql_fetchrow($result)) { $forum_id = $row['forum_id']; @@ -678,9 +668,7 @@ class ucp_main extends module 'U_VIEW_TOPIC' => $view_topic_url, 'U_VIEW_FORUM' => "{$phpbb_root_path}viewforum.$phpEx$SID&f={$row['forum_id']}", 'U_MOVE_UP' => ($row['order_id'] != 1) ? "{$phpbb_root_path}ucp.$phpEx$SID&i=main&mode=bookmarks&move_up={$row['order_id']}" : '', - 'U_MOVE_DOWN' => ($row['order_id'] != $max_order_id) ? "{$phpbb_root_path}ucp.$phpEx$SID&i=main&mode=bookmarks&move_down={$row['order_id']}" : '', - - 'S_ROW_COUNT' => $i++) + 'U_MOVE_DOWN' => ($row['order_id'] != $max_order_id) ? "{$phpbb_root_path}ucp.$phpEx$SID&i=main&mode=bookmarks&move_down={$row['order_id']}" : '') ); } @@ -839,12 +827,12 @@ class ucp_main extends module 'U_VIEW_EDIT' => "ucp.$phpEx$SID&i=$id&mode=$mode&edit=" . $draft['draft_id'], 'U_INSERT' => $insert_url, - 'S_ROW_COUNT' => $row_count++, 'S_LINK_TOPIC' => $link_topic, 'S_LINK_FORUM' => $link_forum, 'S_LINK_PM' => $link_pm, 'S_HIDDEN_FIELDS' => $s_hidden_fields ); + $row_count++; ($edit) ? $template->assign_vars($template_row) : $template->assign_block_vars('draftrow', $template_row); } |