mirror of
https://github.com/phpbb/phpbb.git
synced 2025-07-30 21:40:43 +02:00
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
This commit is contained in:
@@ -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);
|
||||
|
||||
|
@@ -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>';
|
||||
}
|
||||
|
@@ -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',
|
||||
|
@@ -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)
|
||||
);
|
||||
|
||||
|
@@ -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'],
|
||||
|
@@ -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")
|
||||
);
|
||||
|
||||
//
|
||||
|
@@ -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);
|
||||
|
Reference in New Issue
Block a user