diff options
| author | James Atkinson <thefinn@users.sourceforge.net> | 2002-11-21 15:40:21 +0000 |
|---|---|---|
| committer | James Atkinson <thefinn@users.sourceforge.net> | 2002-11-21 15:40:21 +0000 |
| commit | 25a3ef55be2122b7e6b8cea948fa27f34766b088 (patch) | |
| tree | 8c8599c151b7e5db5230089876592ae207f7003a /phpBB/includes | |
| parent | 68ee9ffb1fb21e734f2dde3461e991fcc65fed41 (diff) | |
| download | forums-25a3ef55be2122b7e6b8cea948fa27f34766b088.tar forums-25a3ef55be2122b7e6b8cea948fa27f34766b088.tar.gz forums-25a3ef55be2122b7e6b8cea948fa27f34766b088.tar.bz2 forums-25a3ef55be2122b7e6b8cea948fa27f34766b088.tar.xz forums-25a3ef55be2122b7e6b8cea948fa27f34766b088.zip | |
Moved profile.php to ucp.php. ucp is really really broken right now, don't even think about trying to use it.
git-svn-id: file:///svn/phpbb/trunk@3075 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/includes')
| -rw-r--r-- | phpBB/includes/functions.php | 2 | ||||
| -rw-r--r-- | phpBB/includes/functions_display.php | 2 | ||||
| -rw-r--r-- | phpBB/includes/page_header.php | 8 | ||||
| -rw-r--r-- | phpBB/includes/ucp/usercp_avatar.php | 2 | ||||
| -rw-r--r-- | phpBB/includes/ucp/usercp_email.php | 4 | ||||
| -rw-r--r-- | phpBB/includes/ucp/usercp_register.php | 6 | ||||
| -rw-r--r-- | phpBB/includes/ucp/usercp_viewprofile.php | 10 |
7 files changed, 17 insertions, 17 deletions
diff --git a/phpBB/includes/functions.php b/phpBB/includes/functions.php index 250fe067f0..2e022b8966 100644 --- a/phpBB/includes/functions.php +++ b/phpBB/includes/functions.php @@ -159,7 +159,7 @@ function get_moderators(&$forum_moderators, $forum_id = false) while ($row = $db->sql_fetchrow($result)) { - $forum_moderators[$row['forum_id']][] = (!empty($row['user_id'])) ? '<a href="profile.' . $phpEx . $SID . '&mode=viewprofile&u=' . $row['user_id'] . '">' . $row['username'] . '</a>' : '<a href="groupcp.' . $phpEx . $SID . '&g=' . $row['group_id'] . '">' . $row['groupname'] . '</a>'; + $forum_moderators[$row['forum_id']][] = (!empty($row['user_id'])) ? '<a href="ucp.' . $phpEx . $SID . '&mode=viewprofile&u=' . $row['user_id'] . '">' . $row['username'] . '</a>' : '<a href="groupcp.' . $phpEx . $SID . '&g=' . $row['group_id'] . '">' . $row['groupname'] . '</a>'; } $db->sql_freeresult($result); diff --git a/phpBB/includes/functions_display.php b/phpBB/includes/functions_display.php index 4a1830a703..54c1e72d8f 100644 --- a/phpBB/includes/functions_display.php +++ b/phpBB/includes/functions_display.php @@ -145,7 +145,7 @@ function display_forums($root_data=array(), $display_moderators=TRUE) { $last_post = $user->format_date($row['forum_last_post_time']) . '<br />'; - $last_post .= ($row['forum_last_poster_id'] == ANONYMOUS) ? (($row['forum_last_poster_name'] != '') ? $row['forum_last_poster_name'] . ' ' : $user->lang['Guest'] . ' ') : '<a href="profile.' . $phpEx . $SID . '&mode=viewprofile&u=' . $row['forum_last_poster_id'] . '">' . $row['forum_last_poster_name'] . '</a> '; + $last_post .= ($row['forum_last_poster_id'] == ANONYMOUS) ? (($row['forum_last_poster_name'] != '') ? $row['forum_last_poster_name'] . ' ' : $user->lang['Guest'] . ' ') : '<a href="ucp.' . $phpEx . $SID . '&mode=viewprofile&u=' . $row['forum_last_poster_id'] . '">' . $row['forum_last_poster_name'] . '</a> '; $last_post .= '<a href="viewtopic.' . $phpEx . $SID . '&f=' . $row['forum_id'] . '&p=' . $row['forum_last_post_id'] . '#' . $row['forum_last_post_id'] . '">' . $user->img('goto_post_latest', 'View_latest_post') . '</a>'; } diff --git a/phpBB/includes/page_header.php b/phpBB/includes/page_header.php index 8805456cd4..a7c72aa8bb 100644 --- a/phpBB/includes/page_header.php +++ b/phpBB/includes/page_header.php @@ -91,12 +91,12 @@ while ($row = $db->sql_fetchrow($result)) if ($row['user_allow_viewonline']) { - $user_online_link = '<a href="' . "profile.$phpEx$SID&mode=viewprofile&u=" . $row['user_id'] . '">' . $row['username'] . '</a>'; + $user_online_link = '<a href="' . "ucp.$phpEx$SID&mode=viewprofile&u=" . $row['user_id'] . '">' . $row['username'] . '</a>'; $logged_visible_online++; } else { - $user_online_link = '<a href="' . "profile.$phpEx$SID&mode=viewprofile&u=" . $row['user_id'] . '"><i>' . $row['username'] . '</i></a>'; + $user_online_link = '<a href="' . "ucp.$phpEx$SID&mode=viewprofile&u=" . $row['user_id'] . '"><i>' . $row['username'] . '</i></a>'; $logged_hidden_online++; } @@ -304,8 +304,8 @@ $template->assign_vars(array( 'U_LOGIN_LOGOUT'=> $u_login_logout, 'U_INDEX' => 'index.'.$phpEx.$SID, 'U_SEARCH' => 'search.'.$phpEx.$SID, - 'U_REGISTER' => 'profile.'.$phpEx.$SID.'&mode=register', - 'U_PROFILE' => 'profile.'.$phpEx.$SID.'&mode=editprofile', + 'U_REGISTER' => 'ucp.'.$phpEx.$SID.'&mode=register', + 'U_PROFILE' => 'ucp.'.$phpEx.$SID.'&mode=editprofile', 'U_MODCP' => 'modcp.'.$phpEx.$SID, 'U_FAQ' => 'faq.'.$phpEx.$SID, 'U_SEARCH_SELF' => 'search.'.$phpEx.$SID.'&search_id=egosearch', diff --git a/phpBB/includes/ucp/usercp_avatar.php b/phpBB/includes/ucp/usercp_avatar.php index c7321d758c..5db77a5f9b 100644 --- a/phpBB/includes/ucp/usercp_avatar.php +++ b/phpBB/includes/ucp/usercp_avatar.php @@ -326,7 +326,7 @@ function display_avatar_gallery($mode, &$category, &$user_id, &$email, &$current 'S_CATEGORY_SELECT' => $s_categories, 'S_COLSPAN' => $s_colspan, - 'S_PROFILE_ACTION' => append_sid("profile.$phpEx?mode=$mode"), + 'S_PROFILE_ACTION' => append_sid("ucp.$phpEx?mode=$mode"), 'S_HIDDEN_FIELDS' => $s_hidden_vars) ); diff --git a/phpBB/includes/ucp/usercp_email.php b/phpBB/includes/ucp/usercp_email.php index 64f750c09c..3afb3f9872 100644 --- a/phpBB/includes/ucp/usercp_email.php +++ b/phpBB/includes/ucp/usercp_email.php @@ -36,7 +36,7 @@ else if ( $userdata['user_id'] == ANONYMOUS ) { - header('Location: ' . "login.$phpEx$SID&redirect=profile.$phpEx&mode=email&u=$user_id"); + header('Location: ' . "login.$phpEx$SID&redirect=ucp.$phpEx&mode=email&u=$user_id"); exit; } @@ -149,7 +149,7 @@ if ( $row = $db->sql_fetchrow($result) ) $template->assign_vars(array( 'USERNAME' => $username, - 'S_POST_ACTION' => "profile.$phpEx$SID&mode=email&u=$user_id", + 'S_POST_ACTION' => "ucp.$phpEx$SID&mode=email&u=$user_id", 'L_SEND_EMAIL_MSG' => $lang['Send_email_msg'], 'L_RECIPIENT' => $lang['Recipient'], diff --git a/phpBB/includes/ucp/usercp_register.php b/phpBB/includes/ucp/usercp_register.php index 1d964ed4e0..ded5f2916f 100644 --- a/phpBB/includes/ucp/usercp_register.php +++ b/phpBB/includes/ucp/usercp_register.php @@ -46,8 +46,8 @@ function show_coppa() "AGREE_UNDER_13" => $user->lang['Agree_under_13'], 'DO_NOT_AGREE' => $user->lang['Agree_not'], - "U_AGREE_OVER13" => "profile.$phpEx$SID&mode=register&agreed=true", - "U_AGREE_UNDER13" => "profile.$phpEx$SID&mode=register&agreed=true&coppa=true") + "U_AGREE_OVER13" => "ucp.$phpEx$SID&mode=register&agreed=true", + "U_AGREE_UNDER13" => "ucp.$phpEx$SID&mode=register&agreed=true&coppa=true") ); } // @@ -751,7 +751,7 @@ if ($mode == 'editprofile') 'S_PROFILE_EDIT' => ($mode == 'editprofile') ? true : false, 'S_HIDDEN_FIELDS' => $s_hidden_fields, 'S_FORM_ENCTYPE' => $form_enctype, - 'S_PROFILE_ACTION' => "profile.$phpEx$SID") + 'S_PROFILE_ACTION' => "ucp.$phpEx$SID") ); // diff --git a/phpBB/includes/ucp/usercp_viewprofile.php b/phpBB/includes/ucp/usercp_viewprofile.php index 348ce42ed9..cb77f2246d 100644 --- a/phpBB/includes/ucp/usercp_viewprofile.php +++ b/phpBB/includes/ucp/usercp_viewprofile.php @@ -1,6 +1,6 @@ <?php /*************************************************************************** - * usercp_viewprofile.php + * usercp_viewucp.php * ------------------- * begin : Saturday, Feb 13, 2001 * copyright : (C) 2001 The phpBB Group @@ -121,7 +121,7 @@ else if ( $profiledata['user_viewemail'] || $auth->acl_get('a_') ) { - $email_uri = ( $config['board_email_form'] ) ? "profile.$phpEx$SID&mode=email&u=" . $profiledata['user_id'] : 'mailto:' . $profiledata['user_email']; + $email_uri = ( $config['board_email_form'] ) ? "ucp.$phpEx$SID&mode=email&u=" . $profiledata['user_id'] : 'mailto:' . $profiledata['user_email']; $email_img = '<a href="' . $email_uri . '">' . $user->img('icon_email', $user->lang['Send_email']) . '</a>'; $email = '<a href="' . $email_uri . '">' . $user->lang['Send_email'] . '</a>'; @@ -132,7 +132,7 @@ else $email = ' '; } -$temp_url = "profile.$phpEx$SID&mode=viewprofile&u=$user_id"; +$temp_url = "ucp.$phpEx$SID&mode=viewprofile&u=$user_id"; $profile_img = '<a href="' . $temp_url . '">' . $user->img('icon_profile', $user->lang['Read_profile']) . '</a>'; $profile = '<a href="' . $temp_url . '">' . $user->lang['Read_profile'] . '</a>'; @@ -159,7 +159,7 @@ else $aim_img = ( $profiledata['user_aim'] ) ? '<a href="aim:goim?screenname=' . $profiledata['user_aim'] . '&message=Hello+Are+you+there?">' . $user->img('icon_aim', $user->lang['AIM']) . '</a>' : ''; $aim = ( $profiledata['user_aim'] ) ? '<a href="aim:goim?screenname=' . $profiledata['user_aim'] . '&message=Hello+Are+you+there?">' . $user->lang['AIM'] . '</a>' : ''; -$temp_url = "profile.$phpEx$SID&mode=viewprofile&u=$user_id"; +$temp_url = "ucp.$phpEx$SID&mode=viewprofile&u=$user_id"; $msn_img = ( $profiledata['user_msnm'] ) ? '<a href="' . $temp_url . '">' . $user->img('icon_msnm', $user->lang['MSNM']) . '</a>' : ''; $msn = ( $profiledata['user_msnm'] ) ? '<a href="' . $temp_url . '">' . $user->lang['MSNM'] . '</a>' : ''; @@ -232,7 +232,7 @@ $template->assign_vars(array( 'U_SEARCH_USER' => "search.$phpEx$SID&search_author=" . urlencode($profiledata['username']), - 'S_PROFILE_ACTION' => "profile.$phpEx$SID") + 'S_PROFILE_ACTION' => "ucp.$phpEx$SID") ); include($phpbb_root_path . 'includes/page_tail.'.$phpEx); |
