diff options
| author | Paul S. Owen <psotfx@users.sourceforge.net> | 2003-07-07 23:43:57 +0000 |
|---|---|---|
| committer | Paul S. Owen <psotfx@users.sourceforge.net> | 2003-07-07 23:43:57 +0000 |
| commit | ff58fc5e7c66ea43a292c48ffb58061b0d1c52a8 (patch) | |
| tree | 240bff2ffdcb13b25c811f073653e4cc18ee01e6 /phpBB/includes/ucp/ucp_main.php | |
| parent | 4cc4867c972efb5914059a53d6297ddd0eea4690 (diff) | |
| download | forums-ff58fc5e7c66ea43a292c48ffb58061b0d1c52a8.tar forums-ff58fc5e7c66ea43a292c48ffb58061b0d1c52a8.tar.gz forums-ff58fc5e7c66ea43a292c48ffb58061b0d1c52a8.tar.bz2 forums-ff58fc5e7c66ea43a292c48ffb58061b0d1c52a8.tar.xz forums-ff58fc5e7c66ea43a292c48ffb58061b0d1c52a8.zip | |
Move certain methods out of ucp class, move ucp class into ucp, break half a dozen other features, introduce x hundred new, exciting bugs
git-svn-id: file:///svn/phpbb/trunk@4213 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/includes/ucp/ucp_main.php')
| -rw-r--r-- | phpBB/includes/ucp/ucp_main.php | 29 |
1 files changed, 16 insertions, 13 deletions
diff --git a/phpBB/includes/ucp/ucp_main.php b/phpBB/includes/ucp/ucp_main.php index 4e5e5bbd58..13921c776d 100644 --- a/phpBB/includes/ucp/ucp_main.php +++ b/phpBB/includes/ucp/ucp_main.php @@ -31,7 +31,7 @@ class ucp_main extends ucp $submodules['FRONT'] = "i=$id&mode=front"; $submodules['WATCHED'] = "i=$id&mode=watched"; - $this->subsection($submodules, $submode); + $this->menu($id, $submodules, $submode); unset($submodules); switch ($submode) @@ -152,8 +152,8 @@ class ucp_main extends ucp 'TOPIC_FOLDER_IMG' => $user->img($folder_img, $folder_alt), 'ATTACH_ICON_IMG' => ($auth->acl_get('f_download', $forum_id) && $row['topic_attachment']) ? $user->img('icon_attach', '') : '', - 'S_ROW_COUNT' => $i, - 'S_USER_POSTED' => (!empty($row['mark_type'])) ? true : false, + 'S_ROW_COUNT' => $i, + 'S_USER_POSTED' => (!empty($row['mark_type'])) ? true : false, 'U_VIEW_TOPIC' => $view_topic_url) ); @@ -163,7 +163,6 @@ class ucp_main extends ucp $db->sql_freeresult($result); //TODO -/* $sql_and = ''; $sql = 'SELECT COUNT(post_id) AS total_posts FROM ' . POSTS_TABLE . ' @@ -184,7 +183,7 @@ class ucp_main extends ucp $post_count_sql"; $result = $db->sql_query($sql); - $num_real_posts = min($row['user_posts'], $db->sql_fetchfield('num_posts', 0, $result)); + $num_real_posts = min($user->data['user_posts'], $db->sql_fetchfield('num_posts', 0, $result)); $db->sql_freeresult($result); $sql = "SELECT f.forum_id, f.forum_name, COUNT(post_id) AS num_posts @@ -237,9 +236,15 @@ class ucp_main extends ucp } unset($active_t_row); - $template->assign_vars(show_profile($row)); +// $template->assign_vars(show_profile($row)); $template->assign_vars(array( + 'USER_COLOR' => (!empty($user->data['user_colour'])) ? $user->data['user_colour'] : '', + 'RANK_TITLE' => $rank_title, + 'KARMA' => (!empty($row['user_karma'])) ? $user->data['user_karma'] : 0, + 'JOINED' => $user->format_date($user->data['user_regdate'], $user->lang['DATE_FORMAT']), + 'VISITED' => (empty($last_visit)) ? ' - ' : $user->format_date($last_visit, $user->lang['DATE_FORMAT']), + 'POSTS' => ($data['user_posts']) ? $data['user_posts'] : 0, 'POSTS_DAY' => sprintf($user->lang['POST_DAY'], $posts_per_day), 'POSTS_PCT' => sprintf($user->lang['POST_PCT'], $percentage), 'ACTIVE_FORUM' => $active_f_name, @@ -252,13 +257,12 @@ class ucp_main extends ucp 'OCCUPATION' => (!empty($row['user_occ'])) ? $row['user_occ'] : '', 'INTERESTS' => (!empty($row['user_interests'])) ? $row['user_interests'] : '', - 'S_PROFILE_ACTION' => "groupcp.$phpEx$SID", 'S_GROUP_OPTIONS' => $group_options, 'U_ACTIVE_FORUM' => "viewforum.$phpEx$SID&f=$active_f_id", 'U_ACTIVE_TOPIC' => "viewtopic.$phpEx$SID&t=$active_t_id",) ); -*/ + break; case 'watched': @@ -385,15 +389,14 @@ class ucp_main extends ucp // Subscribed Topics - $sql_t_tracking = ($config['load_db_lastread'] || $config['load_db_track']) ? 'LEFT JOIN ' . TOPICS_TRACK_TABLE . ' tt ON (tt.topic_id = t.topic_id AND tt.user_id = ' . $user->data['user_id'] . ')' : ''; - $sql_f_tracking = ($config['load_db_lastread']) ? 'LEFT JOIN ' . FORUMS_TRACK_TABLE . ' ft ON (ft.forum_id = t.forum_id AND ft.user_id = ' . $user->data['user_id'] . ')' : ''; + $sql_from = ($config['load_db_lastread'] || $config['load_db_track']) ? '(' . TOPICS_TABLE . ' t LEFT JOIN ' . TOPICS_TRACK_TABLE . ' tt ON (tt.topic_id = t.topic_id AND tt.user_id = ' . $user->data['user_id'] . '))' : TOPICS_TABLE . ' t'; +// $sql_f_tracking = ($config['load_db_lastread']) ? 'LEFT JOIN ' . FORUMS_TRACK_TABLE . ' ft ON (ft.forum_id = t.forum_id AND ft.user_id = ' . $user->data['user_id'] . ')' : ''; $sql_t_select = ($config['load_db_lastread'] || $config['load_db_track']) ? ', tt.mark_type, tt.mark_time' : ''; - $sql_f_select = ($config['load_db_lastread']) ? ', ft.mark_time AS forum_mark_time' : ''; +// $sql_f_select = ($config['load_db_lastread']) ? ', ft.mark_time AS forum_mark_time' : ''; $sql = "SELECT t.* $sql_f_select $sql_t_select - FROM ((" . TOPICS_TABLE . " t - $sql_f_tracking) $sql_t_tracking), " . TOPICS_WATCH_TABLE . ' tw + FROM $sql_from, " . TOPICS_WATCH_TABLE . ' tw WHERE tw.user_id = ' . $user->data['user_id'] . ' AND t.topic_id = tw.topic_id ORDER BY t.topic_last_post_time DESC'; |