mirror of
https://github.com/phpbb/phpbb.git
synced 2025-06-28 06:08:52 +00:00
Modified username selection
git-svn-id: file:///svn/phpbb/trunk@527 89ea8834-ac86-4346-8a33-228a782c2dd0
This commit is contained in:
parent
44031d08d7
commit
7cd3c42c63
2 changed files with 26 additions and 27 deletions
|
@ -391,47 +391,46 @@ else if($mode == "post" || $mode == "reply" || $mode == "edit")
|
||||||
$to_username = stripslashes($to_username);
|
$to_username = stripslashes($to_username);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
else if(!empty($HTTP_POST_VARS['to_username']))
|
|
||||||
{
|
|
||||||
$to_username = stripslashes($HTTP_POST_VARS['to_username']);
|
|
||||||
}
|
|
||||||
else if( !empty($HTTP_POST_VARS['to_username_list']) && empty($HTTP_POST_VARS['usersubmit']) )
|
|
||||||
{
|
|
||||||
$to_username = stripslashes($HTTP_POST_VARS['to_username_list']);
|
|
||||||
}
|
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
$to_username = "";
|
if(!empty($HTTP_POST_VARS['username_list']))
|
||||||
|
{
|
||||||
|
$to_username = $HTTP_POST_VARS['username_list'];
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
$to_username = "";
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
//
|
//
|
||||||
|
// Process the username list operations
|
||||||
//
|
//
|
||||||
//
|
if( !empty($HTTP_POST_VARS['usersubmit']))
|
||||||
if( !empty($HTTP_POST_VARS['usersubmit']) || $preview)
|
|
||||||
{
|
{
|
||||||
if(!empty($HTTP_POST_VARS['to_username']) && !$preview)
|
if(!empty($HTTP_POST_VARS['username_search']) && !$preview)
|
||||||
{
|
{
|
||||||
$to_username_partial = stripslashes(str_replace("*", "%", $HTTP_POST_VARS['to_username']));
|
$username_search = stripslashes(str_replace("*", "%", $HTTP_POST_VARS['username_search']));
|
||||||
$to_username = "";
|
|
||||||
$first_letter = 65;
|
$first_letter = 65;
|
||||||
|
|
||||||
$sql = "SELECT username
|
$sql = "SELECT username
|
||||||
FROM " . USERS_TABLE . "
|
FROM " . USERS_TABLE . "
|
||||||
WHERE ( username LIKE '%$to_username_partial'
|
WHERE ( username LIKE '%$username_search'
|
||||||
OR username LIKE '$to_username_partial%'
|
OR username LIKE '$username_search%'
|
||||||
OR username LIKE '%$to_username_partial%'
|
OR username LIKE '%$username_search%'
|
||||||
OR username LIKE '$to_username_partial' )
|
OR username LIKE '$username_search' )
|
||||||
AND user_id <> " . ANONYMOUS;
|
AND user_id <> " . ANONYMOUS;
|
||||||
|
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
$first_letter = ($preview) ? 65 : $HTTP_POST_VARS['user_alpha'];
|
$first_letter = $HTTP_POST_VARS['user_alpha'];
|
||||||
|
|
||||||
$sql = "SELECT username
|
$sql = "SELECT username
|
||||||
FROM " . USERS_TABLE . "
|
FROM " . USERS_TABLE . "
|
||||||
WHERE ( username LIKE '" . chr($first_letter) . "%'
|
WHERE ( username LIKE '" . chr($first_letter) . "%'
|
||||||
OR username LIKE '$first_letter' )
|
OR username LIKE '" . chr($first_letter) . "' )
|
||||||
AND user_id <> " . ANONYMOUS;
|
AND user_id <> " . ANONYMOUS;
|
||||||
|
|
||||||
}
|
}
|
||||||
|
@ -439,24 +438,24 @@ else if($mode == "post" || $mode == "reply" || $mode == "edit")
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
$first_letter = 65;
|
$first_letter = (!empty($to_username)) ? ord(ucfirst($to_username)) : 65;
|
||||||
|
|
||||||
$sql = "SELECT username
|
$sql = "SELECT username
|
||||||
FROM " . USERS_TABLE . "
|
FROM " . USERS_TABLE . "
|
||||||
WHERE ( username LIKE '" . chr($first_letter) . "%'
|
WHERE ( username LIKE '" . chr($first_letter) . "%'
|
||||||
OR username LIKE '$first_letter' )
|
OR username LIKE '" . chr($first_letter) . "' )
|
||||||
AND user_id <> " . ANONYMOUS;
|
AND user_id <> " . ANONYMOUS;
|
||||||
}
|
}
|
||||||
|
|
||||||
$result = $db->sql_query($sql);
|
$result = $db->sql_query($sql);
|
||||||
$name_set = $db->sql_fetchrowset($result);
|
$name_set = $db->sql_fetchrowset($result);
|
||||||
|
|
||||||
$user_names_select = "<select name=\"to_username_list\">";
|
$user_names_select = "<select name=\"username_list\">";
|
||||||
if($db->sql_numrows($result))
|
if($db->sql_numrows($result))
|
||||||
{
|
{
|
||||||
for($i = 0; $i < count($name_set); $i++)
|
for($i = 0; $i < count($name_set); $i++)
|
||||||
{
|
{
|
||||||
$name_selected = ($HTTP_POST_VARS['to_username_list'] == $name_set[$i]['username']) ? " selected" : "";
|
$name_selected = ($to_username == $name_set[$i]['username']) ? " selected" : "";
|
||||||
$user_names_select .= "<option value=\"" . $name_set[$i]['username'] . "\"$name_selected>" . $name_set[$i]['username'] . "</option>\n";
|
$user_names_select .= "<option value=\"" . $name_set[$i]['username'] . "\"$name_selected>" . $name_set[$i]['username'] . "</option>\n";
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -851,8 +850,8 @@ else if($mode == "post" || $mode == "reply" || $mode == "edit")
|
||||||
$post_a = $lang['Edit_message'];
|
$post_a = $lang['Edit_message'];
|
||||||
}
|
}
|
||||||
|
|
||||||
$username_input = '<input type="text" name="to_username" value="'.$to_username.'">';
|
$username_input = '<input type="text" name="username_search" value="' . $username_search . '">';
|
||||||
$subject_input = '<input type="text" name="subject" value="'.$subject.'" size="50" maxlength="255">';
|
$subject_input = '<input type="text" name="subject" value="' . $subject . '" size="50" maxlength="255">';
|
||||||
$message_input = '<textarea name="message" rows="10" cols="40" wrap="virtual">' . $message . '</textarea>';
|
$message_input = '<textarea name="message" rows="10" cols="40" wrap="virtual">' . $message . '</textarea>';
|
||||||
|
|
||||||
$s_hidden_fields = "<input type=\"hidden\" name=\"folder\" value=\"$folder\">";
|
$s_hidden_fields = "<input type=\"hidden\" name=\"folder\" value=\"$folder\">";
|
||||||
|
|
|
@ -21,7 +21,7 @@ function insertCode(formObj, selectObj){
|
||||||
</tr>
|
</tr>
|
||||||
<tr>
|
<tr>
|
||||||
<td bgcolor="{T_TD_COLOR1}"><font face="{T_FONTFACE1}" size="{T_FONTSIZE2}"><b>{L_USERNAME}</b></font></td>
|
<td bgcolor="{T_TD_COLOR1}"><font face="{T_FONTFACE1}" size="{T_FONTSIZE2}"><b>{L_USERNAME}</b></font></td>
|
||||||
<td bgcolor="{T_TD_COLOR2}"><font face="{T_FONTFACE3}" size="{T_FONTSIZE2}">{S_USERNAME_INPUT}</font> <span class="gensmall">{L_FIND_USERNAME} {S_ALPHA_SELECT} {S_NAMES_SELECT} <input type="submit" name="usersubmit" value="{L_FIND}"></td>
|
<td bgcolor="{T_TD_COLOR2}">{S_NAMES_SELECT} {S_ALPHA_SELECT} <span class="gensmall">{L_FIND_USERNAME}:</span> <font face="{T_FONTFACE3}" size="{T_FONTSIZE2}">{S_USERNAME_INPUT}</font> <input type="submit" name="usersubmit" value="{L_SEARCH}"></td>
|
||||||
</tr>
|
</tr>
|
||||||
<tr>
|
<tr>
|
||||||
<td bgcolor="{T_TD_COLOR1}"><font face="{T_FONTFACE1}" size="{T_FONTSIZE2}"><b>{L_SUBJECT}</b></font></td>
|
<td bgcolor="{T_TD_COLOR1}"><font face="{T_FONTFACE1}" size="{T_FONTSIZE2}"><b>{L_SUBJECT}</b></font></td>
|
||||||
|
|
Loading…
Add table
Reference in a new issue