|
From: Paul S. O. <ps...@us...> - 2002-02-12 15:44:35
|
Update of /cvsroot/phpbb/phpBB2/admin
In directory usw-pr-cvs1:/tmp/cvs-serv4688/admin
Modified Files:
admin_users.php
Log Message:
Fix missing bbcode status link to FAQ
Index: admin_users.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/admin/admin_users.php,v
retrieving revision 1.42
retrieving revision 1.43
diff -C2 -r1.42 -r1.43
*** admin_users.php 9 Feb 2002 16:55:19 -0000 1.42
--- admin_users.php 12 Feb 2002 15:44:30 -0000 1.43
***************
*** 138,142 ****
$user_id = intval($HTTP_POST_VARS['id']);
! $this_userdata = get_userdata_from_id($user_id);
if( !$this_userdata )
{
--- 138,142 ----
$user_id = intval($HTTP_POST_VARS['id']);
! $this_userdata = get_userdata($user_id);
if( !$this_userdata )
{
***************
*** 697,701 ****
}
! $message .= "<br /><br />" . sprintf($lang['Click_return_useradmin'], "<a href=\"" . append_sid("admin_users.$phpEx") . "\">", "</a>") . "<br /><br />" . sprintf($lang['Click_return_admin_index'], "<a href=\"" . append_sid("index.$phpEx?pane=right") . "\">", "</a>");
message_die(GENERAL_MESSAGE, $message);
--- 697,701 ----
}
! $message .= '<br /><br />' . sprintf($lang['Click_return_useradmin'], '<a href="' . append_sid("admin_users.$phpEx") . '">', '</a>') . '<br /><br />' . sprintf($lang['Click_return_admin_index'], '<a href="' . append_sid("index.$phpEx?pane=right") . '">', '</a>');
message_die(GENERAL_MESSAGE, $message);
***************
*** 736,740 ****
{
$user_id = ( isset($HTTP_POST_VARS[POST_USERS_URL]) ) ? $HTTP_POST_VARS[POST_USERS_URL] : $HTTP_GET_VARS[POST_USERS_URL];
! $this_userdata = get_userdata_from_id($user_id);
if( !$this_userdata )
{
--- 736,740 ----
{
$user_id = ( isset($HTTP_POST_VARS[POST_USERS_URL]) ) ? $HTTP_POST_VARS[POST_USERS_URL] : $HTTP_GET_VARS[POST_USERS_URL];
! $this_userdata = get_userdata($user_id);
if( !$this_userdata )
{
***************
*** 946,956 ****
{
case USER_AVATAR_UPLOAD:
! $avatar = "<img src=\"../" . $board_config['avatar_path'] . "/" . $user_avatar . "\" alt=\"\" />";
break;
case USER_AVATAR_REMOTE:
! $avatar = "<img src=\"$user_avatar\" alt=\"\" />";
break;
case USER_AVATAR_GALLERY:
! $avatar = "<img src=\"../" . $board_config['avatar_gallery_path'] . "/" . $user_avatar . "\" alt=\"\" />";
break;
}
--- 946,956 ----
{
case USER_AVATAR_UPLOAD:
! $avatar = '<img src="../' . $board_config['avatar_path'] . '/' . $user_avatar . '" alt="" />';
break;
case USER_AVATAR_REMOTE:
! $avatar = '<img src="' . $user_avatar . '" alt="" />';
break;
case USER_AVATAR_GALLERY:
! $avatar = '<img src="../' . $board_config['avatar_gallery_path'] . '/' . $user_avatar . '" alt="" />';
break;
}
***************
*** 964,984 ****
WHERE rank_special = 1
ORDER BY rank_title";
! if( !$result = $db->sql_query($sql) )
{
message_die(GENERAL_ERROR, "Couldn't obtain ranks data", "", __LINE__, __FILE__, $sql);
}
- $rank_count = $db->sql_numrows($result);
! $rank_rows = $db->sql_fetchrowset($result);
!
! $rank_select_box = "<option value=\"0\">" . $lang['No_assigned_rank'] . "</option>";
!
! for($i = 0; $i < $rank_count; $i++)
{
! $rank = $rank_rows[$i]['rank_title'];
! $rank_id = $rank_rows[$i]['rank_id'];
! $selected = ( $this_userdata['user_rank'] == $rank_id ) ? "selected=\"selected\"" : "";
! $rank_select_box .= "<option value=\"" . $rank_id . "\" " . $selected . ">" . $rank . "</option>";
}
--- 964,980 ----
WHERE rank_special = 1
ORDER BY rank_title";
! if ( !($result = $db->sql_query($sql)) )
{
message_die(GENERAL_ERROR, "Couldn't obtain ranks data", "", __LINE__, __FILE__, $sql);
}
! $rank_select_box = '<option value="0">' . $lang['No_assigned_rank'] . '</option>';
! while( $row = $db->sql_fetchrow($result) )
{
! $rank = $row['rank_title'];
! $rank_id = $row['rank_id'];
! $selected = ( $this_userdata['user_rank'] == $rank_id ) ? ' selected="selected"' : '';
! $rank_select_box .= '<option value="' . $rank_id . '"' . $selected . '>' . $rank . '</option>';
}
***************
*** 1001,1022 ****
"WEBSITE" => $website,
"SIGNATURE" => str_replace("<br />", "\n", $signature),
! "VIEW_EMAIL_YES" => ($viewemail) ? "checked=\"checked\"" : "",
! "VIEW_EMAIL_NO" => (!$viewemail) ? "checked=\"checked\"" : "",
! "HIDE_USER_YES" => (!$allowviewonline) ? "checked=\"checked\"" : "",
! "HIDE_USER_NO" => ($allowviewonline) ? "checked=\"checked\"" : "",
! "NOTIFY_PM_YES" => ($notifypm) ? "checked=\"checked\"" : "",
! "NOTIFY_PM_NO" => (!$notifypm) ? "checked=\"checked\"" : "",
! "POPUP_PM_YES" => ($popuppm) ? "checked=\"checked\"" : "",
! "POPUP_PM_NO" => (!$popuppm) ? "checked=\"checked\"" : "",
! "ALWAYS_ADD_SIGNATURE_YES" => ($attachsig) ? "checked=\"checked\"" : "",
! "ALWAYS_ADD_SIGNATURE_NO" => (!$attachsig) ? "checked=\"checked\"" : "",
! "NOTIFY_REPLY_YES" => ($notifyreply) ? "checked=\"checked\"" : "",
! "NOTIFY_REPLY_NO" => (!$notifyreply) ? "checked=\"checked\"" : "",
! "ALWAYS_ALLOW_BBCODE_YES" => ($allowbbcode) ? "checked=\"checked\"" : "",
! "ALWAYS_ALLOW_BBCODE_NO" => (!$allowbbcode) ? "checked=\"checked\"" : "",
! "ALWAYS_ALLOW_HTML_YES" => ($allowhtml) ? "checked=\"checked\"" : "",
! "ALWAYS_ALLOW_HTML_NO" => (!$allowhtml) ? "checked=\"checked\"" : "",
! "ALWAYS_ALLOW_SMILIES_YES" => ($allowsmilies) ? "checked=\"checked\"" : "",
! "ALWAYS_ALLOW_SMILIES_NO" => (!$allowsmilies) ? "checked=\"checked\"" : "",
"AVATAR" => $avatar,
"LANGUAGE_SELECT" => language_select($user_lang, 'language', '../language'),
--- 997,1018 ----
"WEBSITE" => $website,
"SIGNATURE" => str_replace("<br />", "\n", $signature),
! "VIEW_EMAIL_YES" => ($viewemail) ? 'checked="checked"' : '',
! "VIEW_EMAIL_NO" => (!$viewemail) ? 'checked="checked"' : '',
! "HIDE_USER_YES" => (!$allowviewonline) ? 'checked="checked"' : '',
! "HIDE_USER_NO" => ($allowviewonline) ? 'checked="checked"' : '',
! "NOTIFY_PM_YES" => ($notifypm) ? 'checked="checked"' : '',
! "NOTIFY_PM_NO" => (!$notifypm) ? 'checked="checked"' : '',
! "POPUP_PM_YES" => ($popuppm) ? 'checked="checked"' : '',
! "POPUP_PM_NO" => (!$popuppm) ? 'checked="checked"' : '',
! "ALWAYS_ADD_SIGNATURE_YES" => ($attachsig) ? 'checked="checked"' : '',
! "ALWAYS_ADD_SIGNATURE_NO" => (!$attachsig) ? 'checked="checked"' : '',
! "NOTIFY_REPLY_YES" => ($notifyreply) ? 'checked="checked"' : '',
! "NOTIFY_REPLY_NO" => (!$notifyreply) ? 'checked="checked"' : '',
! "ALWAYS_ALLOW_BBCODE_YES" => ($allowbbcode) ? 'checked="checked"' : '',
! "ALWAYS_ALLOW_BBCODE_NO" => (!$allowbbcode) ? 'checked="checked"' : '',
! "ALWAYS_ALLOW_HTML_YES" => ($allowhtml) ? 'checked="checked"' : '',
! "ALWAYS_ALLOW_HTML_NO" => (!$allowhtml) ? 'checked="checked"' : '',
! "ALWAYS_ALLOW_SMILIES_YES" => ($allowsmilies) ? 'checked="checked"' : '',
! "ALWAYS_ALLOW_SMILIES_NO" => (!$allowsmilies) ? 'checked="checked"' : '',
"AVATAR" => $avatar,
"LANGUAGE_SELECT" => language_select($user_lang, 'language', '../language'),
***************
*** 1024,1033 ****
"STYLE_SELECT" => style_select($user_style, 'style'),
"DATE_FORMAT" => $user_dateformat,
! "ALLOW_PM_YES" => ($user_allowpm) ? "checked=\"checked\"" : "",
! "ALLOW_PM_NO" => (!$user_allowpm) ? "checked=\"checked\"" : "",
! "ALLOW_AVATAR_YES" => ($user_allowavatar) ? "checked=\"checked\"" : "",
! "ALLOW_AVATAR_NO" => (!$user_allowavatar) ? "checked=\"checked\"" : "",
! "USER_ACTIVE_YES" => ($user_status) ? "checked=\"checked\"" : "",
! "USER_ACTIVE_NO" => (!$user_status) ? "checked=\"checked\"" : "",
"RANK_SELECT_BOX" => $rank_select_box,
--- 1020,1029 ----
"STYLE_SELECT" => style_select($user_style, 'style'),
"DATE_FORMAT" => $user_dateformat,
! "ALLOW_PM_YES" => ($user_allowpm) ? 'checked="checked"' : '',
! "ALLOW_PM_NO" => (!$user_allowpm) ? 'checked="checked"' : '',
! "ALLOW_AVATAR_YES" => ($user_allowavatar) ? 'checked="checked"' : '',
! "ALLOW_AVATAR_NO" => (!$user_allowavatar) ? 'checked="checked"' : '',
! "USER_ACTIVE_YES" => ($user_status) ? 'checked="checked"' : '',
! "USER_ACTIVE_NO" => (!$user_status) ? 'checked="checked"' : '',
"RANK_SELECT_BOX" => $rank_select_box,
***************
*** 1090,1094 ****
"HTML_STATUS" => $html_status,
! "BBCODE_STATUS" => $bbcode_status,
"SMILIES_STATUS" => $smilies_status,
--- 1086,1090 ----
"HTML_STATUS" => $html_status,
! "BBCODE_STATUS" => sprintf($bbcode_status, '<a href="../' . append_sid("faq.$phpEx?mode=bbcode") . '" target="_phpbbcode">', '</a>'),
"SMILIES_STATUS" => $smilies_status,
***************
*** 1124,1136 ****
WHERE user_id <> " . ANONYMOUS ."
ORDER BY username";
! $u_result = $db->sql_query($sql);
! $user_list = $db->sql_fetchrowset($u_result);
! $select_list = "<select name=\"" . POST_USERS_URL . "\">";
! for($i = 0; $i < count($user_list); $i++)
{
! $select_list .= "<option value=\"" . $user_list[$i]['user_id'] . "\">" . $user_list[$i]['username'] . "</option>";
}
! $select_list .= "</select>";
$template->set_filenames(array(
--- 1120,1131 ----
WHERE user_id <> " . ANONYMOUS ."
ORDER BY username";
! $result = $db->sql_query($sql);
! $select_list = '<select name="' . POST_USERS_URL . '">';
! while( $row = $db->sql_fetchrow($result) )
{
! $select_list .= '<option value="' . $row['user_id'] . '">' . $row['username'] . '</option>';
}
! $select_list .= '</select>';
$template->set_filenames(array(
***************
*** 1156,1158 ****
include('page_footer_admin.'.$phpEx);
! ?>
--- 1151,1153 ----
include('page_footer_admin.'.$phpEx);
! ?>
\ No newline at end of file
|