| 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']);
}
$mybb->input['fid'] = $mybb->get_input('fid', MyBB::INPUT_INT);
|
);
$db->update_query("users", $sql_array, "uid = ".$mybb->user['uid']);
}
$mybb->input['fid'] = $mybb->get_input('fid', MyBB::INPUT_INT);
|
|
|
$folder_id = $folder_name = '';
$foldernames = array();
| $folder_id = $folder_name = '';
$foldernames = array();
|
| 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")."\";");
}
| // 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("\$folderjump = \"".$templates->get("private_jump_folders")."\";");
eval("\$folderoplist = \"".$templates->get("private_move")."\";");
|
| Zeile 206 | Zeile 229 |
|---|
"keywords" => $db->escape_string($mybb->get_input('keywords')),
);
$plugins->run_hooks("private_do_search_process");
|
"keywords" => $db->escape_string($mybb->get_input('keywords')),
);
$plugins->run_hooks("private_do_search_process");
|
|
|
$db->insert_query("searchlog", $searcharray);
// Sender sort won't work yet
| $db->insert_query("searchlog", $searcharray);
// Sender sort won't work yet
|
| Zeile 265 | Zeile 288 |
|---|
else
{
$sortby = $query_sortby = "dateline";
|
else
{
$sortby = $query_sortby = "dateline";
|
}
if($order != "asc")
{
$order = "desc";
}
| }
if($order != "asc")
{
$order = "desc";
}
|
if(!$mybb->settings['threadsperpage'] || (int)$mybb->settings['threadsperpage'] < 1)
{
$mybb->settings['threadsperpage'] = 20;
}
|
if(!$mybb->settings['threadsperpage'] || (int)$mybb->settings['threadsperpage'] < 1)
{
$mybb->settings['threadsperpage'] = 20;
}
|
| |
$query = $db->simple_select("privatemessages", "COUNT(*) AS total", "pmid IN(".$db->escape_string($search['querycache']).")");
$pmscount = $db->fetch_field($query, "total");
|
// Work out pagination, which page we're at, as well as the limits.
$perpage = $mybb->settings['threadsperpage'];
|
// Work out pagination, which page we're at, as well as the limits.
$perpage = $mybb->settings['threadsperpage'];
|
| Zeile 283 | Zeile 309 |
|---|
if($page > 0)
{
$start = ($page-1) * $perpage;
|
if($page > 0)
{
$start = ($page-1) * $perpage;
|
| | $pages = ceil($pmscount / $perpage);
if($page > $pages)
{
$start = 0;
$page = 1;
}
|
}
else
{
| }
else
{
|
| Zeile 301 | Zeile 333 |
|---|
}
// Do Multi Pages
|
}
// Do Multi Pages
|
$query = $db->simple_select("privatemessages", "COUNT(*) AS total", "pmid IN(".$db->escape_string($search['querycache']).")");
$pmscount = $db->fetch_array($query);
| |
if($upper > $pmscount)
{
$upper = $pmscount;
}
|
if($upper > $pmscount)
{
$upper = $pmscount;
}
|
$multipage = multipage($pmscount['total'], $perpage, $page, "private.php?action=results&sid=".htmlspecialchars_uni($mybb->get_input('sid'))."&sortby={$sortby}&order={$order}");
| $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");
| $messagelist = '';
$icon_cache = $cache->read("posticons");
|
| Zeile 473 | 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 556 | Zeile 590 |
|---|
// Attempt to see if this PM is a duplicate or not
$to = array_map("trim", explode(",", $mybb->get_input('to')));
|
// Attempt to see if this PM is a duplicate or not
$to = array_map("trim", explode(",", $mybb->get_input('to')));
|
| | $to = array_unique($to); // Filter out any duplicates
|
$to_escaped = implode("','", array_map(array($db, 'escape_string'), array_map('my_strtolower', $to)));
$time_cutoff = TIME_NOW - (5 * 60 * 60);
$query = $db->query("
| $to_escaped = implode("','", array_map(array($db, 'escape_string'), array_map('my_strtolower', $to)));
$time_cutoff = TIME_NOW - (5 * 60 * 60);
$query = $db->query("
|
| Zeile 702 | Zeile 737 |
|---|
{
$optionschecked['readreceipt'] = 'checked="checked"';
}
|
{
$optionschecked['readreceipt'] = 'checked="checked"';
}
|
$to = htmlspecialchars_uni($mybb->get_input('to'));
$bcc = htmlspecialchars_uni($mybb->get_input('bcc'));
| $to = htmlspecialchars_uni(implode(', ', array_unique(array_map('trim', explode(',', $mybb->get_input('to'))))));
$bcc = htmlspecialchars_uni(implode(', ', array_unique(array_map('trim', explode(',', $mybb->get_input('bcc'))))));
|
}
$preview = '';
| }
$preview = '';
|
| Zeile 922 | Zeile 957 |
|---|
if($send_errors)
{
|
if($send_errors)
{
|
$to = htmlspecialchars_uni($mybb->get_input('to'));
$bcc = htmlspecialchars_uni($mybb->get_input('bcc'));
| $to = htmlspecialchars_uni(implode(', ', array_unique(array_map('trim', explode(',', $mybb->get_input('to'))))));
$bcc = htmlspecialchars_uni(implode(', ', array_unique(array_map('trim', explode(',', $mybb->get_input('bcc'))))));
|
}
// Load the auto complete javascript if it is enabled.
| }
// Load the auto complete javascript if it is enabled.
|
| Zeile 1204 | Zeile 1239 |
|---|
eval("\$private_send_tracking = \"".$templates->get("private_send_tracking")."\";");
}
|
eval("\$private_send_tracking = \"".$templates->get("private_send_tracking")."\";");
}
|
|
$expaltext = (in_array("quickreply", $collapse)) ? "[+]" : "[-]";
|
eval("\$quickreply = \"".$templates->get("private_quickreply")."\";");
}
| eval("\$quickreply = \"".$templates->get("private_quickreply")."\";");
}
|
| Zeile 1451 | 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 1506 | 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 1571 | Zeile 1584 |
|---|
"pmfolders" => $folders
);
$db->update_query("users", $sql_array, "uid='".$mybb->user['uid']."'");
|
"pmfolders" => $folders
);
$db->update_query("users", $sql_array, "uid='".$mybb->user['uid']."'");
|
|
|
// Update PM count
update_pm_count();
|
// Update PM count
update_pm_count();
|
|
|
$plugins->run_hooks("private_do_folders_end");
|
$plugins->run_hooks("private_do_folders_end");
|
|
|
redirect("private.php", $lang->redirect_pmfoldersupdated);
}
| redirect("private.php", $lang->redirect_pmfoldersupdated);
}
|
| Zeile 1590 | Zeile 1603 |
|---|
$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")."\";");
|
| Zeile 1627 | Zeile 1649 |
|---|
foreach($mybb->input['empty'] as $key => $val)
{
if($val == 1)
|
foreach($mybb->input['empty'] as $key => $val)
{
if($val == 1)
|
{
| {
|
$key = (int)$key;
if($emptyq)
{
| $key = (int)$key;
if($emptyq)
{
|
| Zeile 1665 | Zeile 1687 |
|---|
{
$mybb->input['check'] = $mybb->get_input('check', MyBB::INPUT_ARRAY);
if(!empty($mybb->input['check']))
|
{
$mybb->input['check'] = $mybb->get_input('check', MyBB::INPUT_ARRAY);
if(!empty($mybb->input['check']))
|
{
| {
|
foreach($mybb->input['check'] as $key => $val)
{
$sql_array = array(
| foreach($mybb->input['check'] as $key => $val)
{
$sql_array = array(
|
| Zeile 1684 | Zeile 1706 |
|---|
else
{
redirect("private.php", $lang->redirect_pmsmoved);
|
else
{
redirect("private.php", $lang->redirect_pmsmoved);
|
}
}
| }
}
|
elseif(!empty($mybb->input['delete']))
{
$mybb->input['check'] = $mybb->get_input('check', MyBB::INPUT_ARRAY);
| elseif(!empty($mybb->input['delete']))
{
$mybb->input['check'] = $mybb->get_input('check', MyBB::INPUT_ARRAY);
|
| Zeile 1953 | Zeile 1975 |
|---|
$message['subject'] = $parser->parse_badwords($message['subject']);
if($message['folder'] != "3")
{
|
$message['subject'] = $parser->parse_badwords($message['subject']);
if($message['folder'] != "3")
{
|
$senddate = my_date($mybb->settings['dateformat'], $message['dateline']);
$sendtime = my_date($mybb->settings['timeformat'], $message['dateline']);
| $senddate = my_date($mybb->settings['dateformat'], $message['dateline'], "", false);
$sendtime = my_date($mybb->settings['timeformat'], $message['dateline'], "", false);
|
$senddate .= " $lang->at $sendtime";
}
else
| $senddate .= " $lang->at $sendtime";
}
else
|
| Zeile 1986 | Zeile 2008 |
|---|
if($mybb->input['exporttype'] == "csv")
{
|
if($mybb->input['exporttype'] == "csv")
{
|
$message['message'] = addslashes($message['message']);
$message['subject'] = addslashes($message['subject']);
$message['tousername'] = addslashes($message['tousername']);
$message['fromusername'] = addslashes($message['fromusername']);
| $message['message'] = my_escape_csv($message['message']);
$message['subject'] = my_escape_csv($message['subject']);
$message['tousername'] = my_escape_csv($message['tousername']);
$message['fromusername'] = my_escape_csv($message['fromusername']);
|
}
if(empty($donefolder[$message['folder']]))
| }
if(empty($donefolder[$message['folder']]))
|
| Zeile 2011 | Zeile 2033 |
|---|
}
else
{
|
}
else
{
|
$foldername = addslashes($folderinfo[1]);
| $foldername = my_escape_csv($folderinfo[1]);
|
}
$donefolder[$message['folder']] = 1;
}
| }
$donefolder[$message['folder']] = 1;
}
|
| Zeile 2076 | 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 2131 | 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'");
$pmscount = $db->fetch_array($query);
| $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)
{
|
if(!$mybb->settings['threadsperpage'] || (int)$mybb->settings['threadsperpage'] < 1)
{
|
| Zeile 2145 | Zeile 2174 |
|---|
if($page > 0)
{
$start = ($page-1) *$perpage;
|
if($page > 0)
{
$start = ($page-1) *$perpage;
|
}
| $pages = ceil($pmscount / $perpage);
if($page > $pages)
{
$start = 0;
$page = 1;
}
}
|
else
{
$start = 0;
| else
{
$start = 0;
|
| Zeile 2162 | 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}";
}
$multipage = multipage($pmscount['total'], $perpage, $page, $page_url);
$messagelist = '';
$icon_cache = $cache->read("posticons");
| {
$page_url = "private.php?fid={$fid}&sortby={$sortby}&order={$sortordernow}";
}
else
{
$page_url = "private.php?fid={$fid}";
}
$multipage = multipage($pmscount, $perpage, $page, $page_url);
$selective = $messagelist = '';
$icon_cache = $cache->read("posticons");
|
// Cache users in multiple recipients for sent & drafts folder
if($folder == 2 || $folder == 3)
|
// Cache users in multiple recipients for sent & drafts folder
if($folder == 2 || $folder == 3)
|
| Zeile 2185 | Zeile 2220 |
|---|
else
{
$u = "pm.";
|
else
{
$u = "pm.";
|
}
| }
|
// Get all recipients into an array
$cached_users = $get_users = array();
$users_query = $db->query("
| // Get all recipients into an array
$cached_users = $get_users = array();
$users_query = $db->query("
|
| Zeile 2208 | 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 2272 |
|---|
}
else
{
|
}
else
{
|
| | if($fid == 1)
{
$selective = " AND pm.status='0'";
}
|
if($sortfield == "username")
{
$pm = "fu.";
| if($sortfield == "username")
{
$pm = "fu.";
|
| Zeile 2252 | 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
");
|
| Zeile 2290 | Zeile 2330 |
|---|
{ // Sent Items or Drafts Folder Check
$recipients = my_unserialize($message['recipients']);
$to_users = $bcc_users = '';
|
{ // Sent Items or Drafts Folder Check
$recipients = my_unserialize($message['recipients']);
$to_users = $bcc_users = '';
|
if(count($recipients['to']) > 1 || (count($recipients['to']) == 1 && isset($recipients['bcc']) && count($recipients['bcc']) > 0))
| if(isset($recipients['to']) && count($recipients['to']) > 1 || (isset($recipients['to']) && count($recipients['to']) == 1 && isset($recipients['bcc']) && count($recipients['bcc']) > 0))
|
{
foreach($recipients['to'] as $uid)
{
| {
foreach($recipients['to'] as $uid)
{
|
| Zeile 2399 | Zeile 2439 |
|---|
}
$pmspacebar = '';
|
}
$pmspacebar = '';
|
if($mybb->usergroup['pmquota'] != '0' && $mybb->usergroup['cancp'] != 1)
| if($mybb->usergroup['pmquota'] != 0)
|
{
$query = $db->simple_select("privatemessages", "COUNT(*) AS total", "uid='".$mybb->user['uid']."'");
$pmscount = $db->fetch_array($query);
| {
$query = $db->simple_select("privatemessages", "COUNT(*) AS total", "uid='".$mybb->user['uid']."'");
$pmscount = $db->fetch_array($query);
|
| Zeile 2463 | Zeile 2503 |
|---|
}
$limitwarning = '';
|
}
$limitwarning = '';
|
if($mybb->usergroup['pmquota'] != "0" && $pmscount['total'] >= $mybb->usergroup['pmquota'] && $mybb->usergroup['cancp'] != 1)
| if($mybb->usergroup['pmquota'] != 0 && $pmscount['total'] >= $mybb->usergroup['pmquota'])
|
{
eval("\$limitwarning = \"".$templates->get("private_limitwarning")."\";");
}
| {
eval("\$limitwarning = \"".$templates->get("private_limitwarning")."\";");
}
|