| Zeile 42 | Zeile 42 |
|---|
error_no_permission();
}
|
error_no_permission();
}
|
| | $update = false;
|
if(!$mybb->user['pmfolders'])
{
|
if(!$mybb->user['pmfolders'])
{
|
$mybb->user['pmfolders'] = "1**$%%$2**$%%$3**$%%$4**";
| $update = true;
$mybb->user['pmfolders'] = "0**$%%$1**$%%$2**$%%$3**$%%$4**";
}
elseif ((int)my_substr($mybb->user['pmfolders'], 0, 1) != 0)
{
// Old folder structure. Need to update
// Since MyBB 1.8.20 fid[0] represents 'Inbox' and fid[1] represents 'Unread'
$update = true;
$mybb->user['pmfolders'] = '0'. ltrim(str_replace("$%%$2**", "$%%$1**$%%$2**", $mybb->user['pmfolders']), '1');
}
|
|
|
| | // Folder structure update required?
if($update)
{
|
$sql_array = array(
|
$sql_array = array(
|
"pmfolders" => $mybb->user['pmfolders']
| "pmfolders" => $db->escape_string($mybb->user['pmfolders']),
|
);
$db->update_query("users", $sql_array, "uid = ".$mybb->user['uid']);
}
| );
$db->update_query("users", $sql_array, "uid = ".$mybb->user['uid']);
}
|
| Zeile 77 | Zeile 90 |
|---|
eval("\$folderjump_folder .= \"".$templates->get("private_jump_folders_folder")."\";");
eval("\$folderoplist_folder .= \"".$templates->get("private_jump_folders_folder")."\";");
|
eval("\$folderjump_folder .= \"".$templates->get("private_jump_folders_folder")."\";");
eval("\$folderoplist_folder .= \"".$templates->get("private_jump_folders_folder")."\";");
|
eval("\$foldersearch_folder .= \"".$templates->get("private_jump_folders_folder")."\";");
}
$from_fid = $mybb->input['fid'];
| // Manipulate search folder selection to omit "Unread"
if($folder_id != 1)
{
if($folder_id == 0)
{
$folder_id = 1;
}
eval("\$foldersearch_folder .= \"".$templates->get("private_jump_folders_folder")."\";");
}
}
$from_fid = $mybb->input['fid'];
|
eval("\$folderjump = \"".$templates->get("private_jump_folders")."\";");
eval("\$folderoplist = \"".$templates->get("private_move")."\";");
eval("\$foldersearch = \"".$templates->get("private_advanced_search_folders")."\";");
| eval("\$folderjump = \"".$templates->get("private_jump_folders")."\";");
eval("\$folderoplist = \"".$templates->get("private_move")."\";");
eval("\$foldersearch = \"".$templates->get("private_advanced_search_folders")."\";");
|
| Zeile 183 | Zeile 204 |
|---|
"sender" => $mybb->get_input('sender'),
"status" => $mybb->get_input('status', MyBB::INPUT_ARRAY),
"folder" => $mybb->get_input('folder', MyBB::INPUT_ARRAY)
|
"sender" => $mybb->get_input('sender'),
"status" => $mybb->get_input('status', MyBB::INPUT_ARRAY),
"folder" => $mybb->get_input('folder', MyBB::INPUT_ARRAY)
|
);
| );
|
if($db->can_search == true)
{
require_once MYBB_ROOT."inc/functions_search.php";
|
if($db->can_search == true)
{
require_once MYBB_ROOT."inc/functions_search.php";
|
|
|
$search_results = privatemessage_perform_search_mysql($search_data);
}
else
|
$search_results = privatemessage_perform_search_mysql($search_data);
}
else
|
{
| {
|
error($lang->error_no_search_support);
}
$sid = md5(uniqid(microtime(), true));
| error($lang->error_no_search_support);
}
$sid = md5(uniqid(microtime(), true));
|
| Zeile 217 | Zeile 238 |
|---|
if(in_array($mybb->get_input('sort'), $sortby))
{
$sortby = $mybb->get_input('sort');
|
if(in_array($mybb->get_input('sort'), $sortby))
{
$sortby = $mybb->get_input('sort');
|
}
| }
|
else
{
$sortby = "dateline";
| else
{
$sortby = "dateline";
|
| Zeile 319 | Zeile 340 |
|---|
$multipage = multipage($pmscount, $perpage, $page, "private.php?action=results&sid=".htmlspecialchars_uni($mybb->get_input('sid'))."&sortby={$sortby}&order={$order}");
$messagelist = '';
|
$multipage = multipage($pmscount, $perpage, $page, "private.php?action=results&sid=".htmlspecialchars_uni($mybb->get_input('sid'))."&sortby={$sortby}&order={$order}");
$messagelist = '';
|
$icon_cache = $cache->read("posticons");
| $icon_cache = $cache->read("posticons");
|
// Cache users in multiple recipients for sent & drafts folder
// Get all recipients into an array
$cached_users = $get_users = array();
| // Cache users in multiple recipients for sent & drafts folder
// Get all recipients into an array
$cached_users = $get_users = array();
|
| Zeile 481 | Zeile 502 |
|---|
$senddate = $lang->not_sent;
}
|
$senddate = $lang->not_sent;
}
|
$foldername = $foldernames[$message['folder']];
| $fid = "0";
if((int)$message['folder'] > 1)
{
$fid = $message['folder'];
}
$foldername = $foldernames[$fid];
|
// What we do here is parse the post using our post parser, then strip the tags from it
$parser_options = array(
|
// What we do here is parse the post using our post parser, then strip the tags from it
$parser_options = array(
|
| Zeile 524 | Zeile 550 |
|---|
if($mybb->input['action'] == "dismiss_notice")
{
if($mybb->user['pmnotice'] != 2)
|
if($mybb->input['action'] == "dismiss_notice")
{
if($mybb->user['pmnotice'] != 2)
|
{
exit;
}
// Verify incoming POST request
verify_post_check($mybb->get_input('my_post_key'));
| {
exit;
}
// Verify incoming POST request
verify_post_check($mybb->get_input('my_post_key'));
|
$updated_user = array(
"pmnotice" => 1
);
| $updated_user = array(
"pmnotice" => 1
);
|
| Zeile 542 | Zeile 568 |
|---|
exit;
}
else
|
exit;
}
else
|
{
| {
|
header("Location: index.php");
exit;
}
}
|
header("Location: index.php");
exit;
}
}
|
|
|
$send_errors = '';
if($mybb->input['action'] == "do_send" && $mybb->request_method == "post")
| $send_errors = '';
if($mybb->input['action'] == "do_send" && $mybb->request_method == "post")
|
| Zeile 559 | Zeile 585 |
|---|
// Verify incoming POST request
verify_post_check($mybb->get_input('my_post_key'));
|
// Verify incoming POST request
verify_post_check($mybb->get_input('my_post_key'));
|
|
|
$plugins->run_hooks("private_send_do_send");
// Attempt to see if this PM is a duplicate or not
| $plugins->run_hooks("private_send_do_send");
// Attempt to see if this PM is a duplicate or not
|
| Zeile 582 | Zeile 608 |
|---|
require_once MYBB_ROOT."inc/datahandlers/pm.php";
$pmhandler = new PMDataHandler();
|
require_once MYBB_ROOT."inc/datahandlers/pm.php";
$pmhandler = new PMDataHandler();
|
|
|
$pm = array(
"subject" => $mybb->get_input('subject'),
"message" => $mybb->get_input('message'),
| $pm = array(
"subject" => $mybb->get_input('subject'),
"message" => $mybb->get_input('message'),
|
| Zeile 591 | Zeile 617 |
|---|
"do" => $mybb->get_input('do'),
"pmid" => $mybb->get_input('pmid', MyBB::INPUT_INT),
"ipaddress" => $session->packedip
|
"do" => $mybb->get_input('do'),
"pmid" => $mybb->get_input('pmid', MyBB::INPUT_INT),
"ipaddress" => $session->packedip
|
);
| );
|
// Split up any recipients we have
$pm['to'] = $to;
if(!empty($mybb->input['bcc']))
{
$pm['bcc'] = explode(",", $mybb->get_input('bcc'));
$pm['bcc'] = array_map("trim", $pm['bcc']);
|
// Split up any recipients we have
$pm['to'] = $to;
if(!empty($mybb->input['bcc']))
{
$pm['bcc'] = explode(",", $mybb->get_input('bcc'));
$pm['bcc'] = array_map("trim", $pm['bcc']);
|
}
| }
|
$mybb->input['options'] = $mybb->get_input('options', MyBB::INPUT_ARRAY);
|
$mybb->input['options'] = $mybb->get_input('options', MyBB::INPUT_ARRAY);
|
| Zeile 624 | Zeile 650 |
|---|
if(isset($mybb->input['options']['savecopy']) && $mybb->input['options']['savecopy'] == 1)
{
$pm['options']['savecopy'] = 1;
|
if(isset($mybb->input['options']['savecopy']) && $mybb->input['options']['savecopy'] == 1)
{
$pm['options']['savecopy'] = 1;
|
}
else
{
| }
else
{
|
$pm['options']['savecopy'] = 0;
}
if(isset($mybb->input['options']['readreceipt']))
| $pm['options']['savecopy'] = 0;
}
if(isset($mybb->input['options']['readreceipt']))
|
| Zeile 635 | Zeile 661 |
|---|
}
if(!empty($mybb->input['saveasdraft']))
|
}
if(!empty($mybb->input['saveasdraft']))
|
{
| {
|
$pm['saveasdraft'] = 1;
}
$pmhandler->set_data($pm);
|
$pm['saveasdraft'] = 1;
}
$pmhandler->set_data($pm);
|
|
|
// Now let the pm handler do all the hard work.
if(!$pmhandler->validate_pm())
{
| // Now let the pm handler do all the hard work.
if(!$pmhandler->validate_pm())
{
|
| Zeile 659 | Zeile 685 |
|---|
else
{
redirect("private.php", $lang->redirect_pmsent);
|
else
{
redirect("private.php", $lang->redirect_pmsent);
|
}
}
| }
}
|
}
if($mybb->input['action'] == "send")
| }
if($mybb->input['action'] == "send")
|
| Zeile 668 | Zeile 694 |
|---|
if($mybb->usergroup['cansendpms'] == 0)
{
error_no_permission();
|
if($mybb->usergroup['cansendpms'] == 0)
{
error_no_permission();
|
}
| }
|
$plugins->run_hooks("private_send_start");
$smilieinserter = $codebuttons = '';
|
$plugins->run_hooks("private_send_start");
$smilieinserter = $codebuttons = '';
|
|
|
if($mybb->settings['bbcodeinserter'] != 0 && $mybb->settings['pmsallowmycode'] != 0 && $mybb->user['showcodebuttons'] != 0)
{
$codebuttons = build_mycode_inserter("message", $mybb->settings['pmsallowsmilies']);
| if($mybb->settings['bbcodeinserter'] != 0 && $mybb->settings['pmsallowmycode'] != 0 && $mybb->user['showcodebuttons'] != 0)
{
$codebuttons = build_mycode_inserter("message", $mybb->settings['pmsallowsmilies']);
|
| Zeile 682 | Zeile 708 |
|---|
$smilieinserter = build_clickable_smilies();
}
}
|
$smilieinserter = build_clickable_smilies();
}
}
|
|
|
$lang->post_icon = $lang->message_icon;
$posticons = get_post_icons();
| $lang->post_icon = $lang->message_icon;
$posticons = get_post_icons();
|
| Zeile 693 | Zeile 719 |
|---|
$to = $bcc = '';
if(!empty($mybb->input['preview']) || $send_errors)
|
$to = $bcc = '';
if(!empty($mybb->input['preview']) || $send_errors)
|
{
$options = $mybb->get_input('options', MyBB::INPUT_ARRAY);
| {
$options = $mybb->get_input('options', MyBB::INPUT_ARRAY);
|
if(isset($options['signature']) && $options['signature'] == 1)
|
if(isset($options['signature']) && $options['signature'] == 1)
|
{
| {
|
$optionschecked['signature'] = 'checked="checked"';
}
if(isset($options['disablesmilies']) && $options['disablesmilies'] == 1)
|
$optionschecked['signature'] = 'checked="checked"';
}
if(isset($options['disablesmilies']) && $options['disablesmilies'] == 1)
|
{
| {
|
$optionschecked['disablesmilies'] = 'checked="checked"';
}
if(isset($options['savecopy']) && $options['savecopy'] != 0)
|
$optionschecked['disablesmilies'] = 'checked="checked"';
}
if(isset($options['savecopy']) && $options['savecopy'] != 0)
|
{
| {
|
$optionschecked['savecopy'] = 'checked="checked"';
}
if(isset($options['readreceipt']) && $options['readreceipt'] != 0)
| $optionschecked['savecopy'] = 'checked="checked"';
}
if(isset($options['readreceipt']) && $options['readreceipt'] != 0)
|
| Zeile 725 | Zeile 751 |
|---|
FROM ".TABLE_PREFIX."users u
LEFT JOIN ".TABLE_PREFIX."userfields f ON (f.ufid=u.uid)
WHERE u.uid='".$mybb->user['uid']."'
|
FROM ".TABLE_PREFIX."users u
LEFT JOIN ".TABLE_PREFIX."userfields f ON (f.ufid=u.uid)
WHERE u.uid='".$mybb->user['uid']."'
|
");
$post = $db->fetch_array($query);
| ");
$post = $db->fetch_array($query);
|
$post['userusername'] = $mybb->user['username'];
$post['postusername'] = $mybb->user['username'];
$post['message'] = $mybb->get_input('message');
| $post['userusername'] = $mybb->user['username'];
$post['postusername'] = $mybb->user['username'];
$post['message'] = $mybb->get_input('message');
|
| Zeile 737 | Zeile 763 |
|---|
if(!isset($options['disablesmilies']))
{
$options['disablesmilies'] = 0;
|
if(!isset($options['disablesmilies']))
{
$options['disablesmilies'] = 0;
|
}
| }
|
$post['smilieoff'] = $options['disablesmilies'];
$post['dateline'] = TIME_NOW;
| $post['smilieoff'] = $options['disablesmilies'];
$post['dateline'] = TIME_NOW;
|
| Zeile 762 | Zeile 788 |
|---|
);
foreach($data_key as $field => $key)
|
);
foreach($data_key as $field => $key)
|
{
| {
|
$post[$key] = $groupscache[$post['usergroup']][$field];
}
| $post[$key] = $groupscache[$post['usergroup']][$field];
}
|
| Zeile 775 | Zeile 801 |
|---|
if($mybb->user['signature'] != '')
{
$optionschecked['signature'] = 'checked="checked"';
|
if($mybb->user['signature'] != '')
{
$optionschecked['signature'] = 'checked="checked"';
|
}
| }
|
if($mybb->usergroup['cantrackpms'] == 1)
{
$optionschecked['readreceipt'] = 'checked="checked"';
| if($mybb->usergroup['cantrackpms'] == 1)
{
$optionschecked['readreceipt'] = 'checked="checked"';
|
| Zeile 796 | Zeile 822 |
|---|
$pm = $db->fetch_array($query);
$message = htmlspecialchars_uni($parser->parse_badwords($pm['message']));
$subject = htmlspecialchars_uni($parser->parse_badwords($pm['subject']));
|
$pm = $db->fetch_array($query);
$message = htmlspecialchars_uni($parser->parse_badwords($pm['message']));
$subject = htmlspecialchars_uni($parser->parse_badwords($pm['subject']));
|
|
|
if($pm['folder'] == "3")
{
// message saved in drafts
| if($pm['folder'] == "3")
{
// message saved in drafts
|
| Zeile 864 | Zeile 890 |
|---|
require_once MYBB_ROOT."inc/functions_posting.php";
if($mybb->settings['maxpmquotedepth'] != '0')
|
require_once MYBB_ROOT."inc/functions_posting.php";
if($mybb->settings['maxpmquotedepth'] != '0')
|
{
| {
|
$message = remove_message_quotes($message, $mybb->settings['maxpmquotedepth']);
}
| $message = remove_message_quotes($message, $mybb->settings['maxpmquotedepth']);
}
|
| Zeile 1461 | Zeile 1487 |
|---|
$fid = $folderinfo[0];
$foldername = get_pm_folder_name($fid, $foldername);
|
$fid = $folderinfo[0];
$foldername = get_pm_folder_name($fid, $foldername);
|
if($folderinfo[0] == "1" || $folderinfo[0] == "2" || $folderinfo[0] == "3" || $folderinfo[0] == "4")
| if((int)$folderinfo[0] < 5)
|
{
$foldername2 = get_pm_folder_name($fid);
eval("\$folderlist .= \"".$templates->get("private_folders_folder_unremovable")."\";");
| {
$foldername2 = get_pm_folder_name($fid);
eval("\$folderlist .= \"".$templates->get("private_folders_folder_unremovable")."\";");
|
| Zeile 1516 | Zeile 1542 |
|---|
$fid = (int)$key;
// Use default language strings if empty or value is language string
|
$fid = (int)$key;
// Use default language strings if empty or value is language string
|
switch($fid)
| if($val == get_pm_folder_name($fid) || trim($val) == '')
|
{
|
{
|
case 1:
if($val == $lang->folder_inbox || trim($val) == '')
{
$val = '';
}
break;
case 2:
if($val == $lang->folder_sent_items || trim($val) == '')
{
$val = '';
}
break;
case 3:
if($val == $lang->folder_drafts || trim($val) == '')
{
$val = '';
}
break;
case 4:
if($val == $lang->folder_trash || trim($val) == '')
{
$val = '';
}
break;
| $val = '';
|
}
|
}
|
}
if($val != '' && trim($val) == '' && !($key >= 1 && $key <= 4))
| }
if($val != '' && trim($val) == '' && !(is_numeric($key) && $key <= 4))
|
{
// If the name only contains whitespace and it's not a default folder, print an error
error($lang->error_emptypmfoldername);
}
|
{
// If the name only contains whitespace and it's not a default folder, print an error
error($lang->error_emptypmfoldername);
}
|
if($val != '' || ($key >= 1 && $key <= 4))
|
if($val != '' || (is_numeric($key) && $key <= 4))
|
{
// If there is a name or if this is a default folder, save it
$foldername = $db->escape_string(htmlspecialchars_uni($val));
| {
// If there is a name or if this is a default folder, save it
$foldername = $db->escape_string(htmlspecialchars_uni($val));
|
| Zeile 1563 | Zeile 1566 |
|---|
$folders .= "$%%$";
}
$folders .= "$fid**$foldername";
|
$folders .= "$%%$";
}
$folders .= "$fid**$foldername";
|
}
| }
|
else
{
error($lang->error_invalidpmfoldername);
| else
{
error($lang->error_invalidpmfoldername);
|
| Zeile 1576 | Zeile 1579 |
|---|
}
}
}
|
}
}
}
|
|
|
$sql_array = array(
"pmfolders" => $folders
);
$db->update_query("users", $sql_array, "uid='".$mybb->user['uid']."'");
|
$sql_array = array(
"pmfolders" => $folders
);
$db->update_query("users", $sql_array, "uid='".$mybb->user['uid']."'");
|
// Update PM count
update_pm_count();
$plugins->run_hooks("private_do_folders_end");
| // Update PM count
update_pm_count();
$plugins->run_hooks("private_do_folders_end");
|
redirect("private.php", $lang->redirect_pmfoldersupdated);
}
|
redirect("private.php", $lang->redirect_pmfoldersupdated);
}
|
| Zeile 1596 | Zeile 1599 |
|---|
{
error($lang->error_nopms);
}
|
{
error($lang->error_nopms);
}
|
|
|
$plugins->run_hooks("private_empty_start");
$foldersexploded = explode("$%%$", $mybb->user['pmfolders']);
|
$plugins->run_hooks("private_empty_start");
$foldersexploded = explode("$%%$", $mybb->user['pmfolders']);
|
$folderlist = '';
| $folderlist = $unread = '';
|
foreach($foldersexploded as $key => $folders)
{
$folderinfo = explode("**", $folders, 2);
$fid = $folderinfo[0];
|
foreach($foldersexploded as $key => $folders)
{
$folderinfo = explode("**", $folders, 2);
$fid = $folderinfo[0];
|
$foldername = get_pm_folder_name($fid, $folderinfo[1]);
$query = $db->simple_select("privatemessages", "COUNT(*) AS pmsinfolder", " folder='$fid' AND uid='".$mybb->user['uid']."'");
| if($folderinfo[0] == "1")
{
$fid = "1";
$unread = " AND status='0'";
}
if($folderinfo[0] == "0")
{
$fid = "1";
}
$foldername = get_pm_folder_name($folderinfo[0], $folderinfo[1]);
$query = $db->simple_select("privatemessages", "COUNT(*) AS pmsinfolder", " folder='$fid'$unread AND uid='".$mybb->user['uid']."'");
|
$thing = $db->fetch_array($query);
$foldercount = my_number_format($thing['pmsinfolder']);
eval("\$folderlist .= \"".$templates->get("private_empty_folder")."\";");
}
|
$thing = $db->fetch_array($query);
$foldercount = my_number_format($thing['pmsinfolder']);
eval("\$folderlist .= \"".$templates->get("private_empty_folder")."\";");
}
|
|
|
$plugins->run_hooks("private_empty_end");
eval("\$folders = \"".$templates->get("private_empty")."\";");
output_page($folders);
}
|
$plugins->run_hooks("private_empty_end");
eval("\$folders = \"".$templates->get("private_empty")."\";");
output_page($folders);
}
|
|
|
if($mybb->input['action'] == "do_empty" && $mybb->request_method == "post")
|
if($mybb->input['action'] == "do_empty" && $mybb->request_method == "post")
|
{
// Verify incoming POST request
verify_post_check($mybb->get_input('my_post_key'));
| {
// Verify incoming POST request
verify_post_check($mybb->get_input('my_post_key'));
|
$plugins->run_hooks("private_do_empty_start");
$emptyq = '';
| $plugins->run_hooks("private_do_empty_start");
$emptyq = '';
|
| Zeile 1702 | Zeile 1714 |
|---|
if(!empty($mybb->input['check']))
{
$pmssql = '';
|
if(!empty($mybb->input['check']))
{
$pmssql = '';
|
foreach($mybb->input['check'] as $key => $val)
| foreach($mybb->input['check'] as $key => $val)
|
{
if($pmssql)
{
| {
if($pmssql)
{
|
| Zeile 2086 | Zeile 2098 |
|---|
if(!$mybb->input['fid'] || !array_key_exists($mybb->input['fid'], $foldernames))
{
|
if(!$mybb->input['fid'] || !array_key_exists($mybb->input['fid'], $foldernames))
{
|
$mybb->input['fid'] = 1;
| $mybb->input['fid'] = 0;
|
}
|
}
|
$folder = $mybb->input['fid'];
$foldername = $foldernames[$folder];
| $fid = (int)$mybb->input['fid'];
$folder = !$fid ? 1 : $fid;
$foldername = $foldernames[$fid];
|
if($folder == 2 || $folder == 3)
{ // Sent Items Folder
|
if($folder == 2 || $folder == 3)
{ // Sent Items Folder
|
| Zeile 2141 | Zeile 2154 |
|---|
eval("\$orderarrow['$sortby'] = \"".$templates->get("private_orderarrow")."\";");
// Do Multi Pages
|
eval("\$orderarrow['$sortby'] = \"".$templates->get("private_orderarrow")."\";");
// Do Multi Pages
|
$query = $db->simple_select("privatemessages", "COUNT(*) AS total", "uid='".$mybb->user['uid']."' AND folder='$folder'");
| $selective = "";
if($fid == 1)
{
$selective = " AND status='0'";
}
$query = $db->simple_select("privatemessages", "COUNT(*) AS total", "uid='".$mybb->user['uid']."' AND folder='$folder'$selective");
|
$pmscount = $db->fetch_field($query, "total");
if(!$mybb->settings['threadsperpage'] || (int)$mybb->settings['threadsperpage'] < 1)
| $pmscount = $db->fetch_field($query, "total");
if(!$mybb->settings['threadsperpage'] || (int)$mybb->settings['threadsperpage'] < 1)
|
| Zeile 2178 | Zeile 2197 |
|---|
}
if($mybb->input['order'] || ($sortby && $sortby != "dateline"))
|
}
if($mybb->input['order'] || ($sortby && $sortby != "dateline"))
|
{
$page_url = "private.php?fid={$folder}&sortby={$sortby}&order={$sortordernow}";
}
else
{
$page_url = "private.php?fid={$folder}";
}
| {
$page_url = "private.php?fid={$fid}&sortby={$sortby}&order={$sortordernow}";
}
else
{
$page_url = "private.php?fid={$fid}";
}
|
$multipage = multipage($pmscount, $perpage, $page, $page_url);
|
$multipage = multipage($pmscount, $perpage, $page, $page_url);
|
$messagelist = '';
| $selective = $messagelist = '';
|
$icon_cache = $cache->read("posticons");
// Cache users in multiple recipients for sent & drafts folder
| $icon_cache = $cache->read("posticons");
// Cache users in multiple recipients for sent & drafts folder
|
| Zeile 2197 | Zeile 2216 |
|---|
if($sortfield == "username")
{
$u = "u.";
|
if($sortfield == "username")
{
$u = "u.";
|
}
else
| }
else
|
{
$u = "pm.";
}
| {
$u = "pm.";
}
|
| Zeile 2224 | Zeile 2243 |
|---|
if(isset($recipients['bcc']) && is_array($recipients['bcc']) && count($recipients['bcc']))
{
$get_users = array_merge($get_users, $recipients['bcc']);
|
if(isset($recipients['bcc']) && is_array($recipients['bcc']) && count($recipients['bcc']))
{
$get_users = array_merge($get_users, $recipients['bcc']);
|
}
}
$get_users = implode(',', array_unique($get_users));
| }
}
$get_users = implode(',', array_unique($get_users));
|
// Grab info
if($get_users)
|
// Grab info
if($get_users)
|
| Zeile 2237 | Zeile 2256 |
|---|
{
$cached_users[$user['uid']] = $user;
}
|
{
$cached_users[$user['uid']] = $user;
}
|
}
}
| }
}
|
if($folder == 2 || $folder == 3)
|
if($folder == 2 || $folder == 3)
|
{
| {
|
if($sortfield == "username")
|
if($sortfield == "username")
|
{
| {
|
$pm = "tu.";
}
else
{
$pm = "pm.";
|
$pm = "tu.";
}
else
{
$pm = "pm.";
|
}
| }
|
}
else
{
|
}
else
{
|
| | if($fid == 1)
{
$selective = " AND pm.status='0'";
}
|
if($sortfield == "username")
{
$pm = "fu.";
| if($sortfield == "username")
{
$pm = "fu.";
|
| Zeile 2268 | Zeile 2292 |
|---|
FROM ".TABLE_PREFIX."privatemessages pm
LEFT JOIN ".TABLE_PREFIX."users fu ON (fu.uid=pm.fromid)
LEFT JOIN ".TABLE_PREFIX."users tu ON (tu.uid=pm.toid)
|
FROM ".TABLE_PREFIX."privatemessages pm
LEFT JOIN ".TABLE_PREFIX."users fu ON (fu.uid=pm.fromid)
LEFT JOIN ".TABLE_PREFIX."users tu ON (tu.uid=pm.toid)
|
WHERE pm.folder='$folder' AND pm.uid='".$mybb->user['uid']."'
| WHERE pm.folder='$folder' AND pm.uid='".$mybb->user['uid']."'{$selective}
|
ORDER BY {$pm}{$sortfield} {$sortordernow}
LIMIT $start, $perpage
");
| ORDER BY {$pm}{$sortfield} {$sortordernow}
LIMIT $start, $perpage
");
|