| Zeile 19 | Zeile 19 |
|---|
$templatelist .= ",postbit_delete_pm,postbit,private_tracking_nomessage,private_nomessages,postbit_author_guest,private_multiple_recipients_user,private_multiple_recipients_bcc,private_multiple_recipients,usercp_nav_messenger_folder";
$templatelist .= ",private_search_messagebit,private_search_results_nomessages,private_search_results,private_advanced_search,previewpost,private_send_tracking,private_send_signature,private_read_bcc,private_composelink";
$templatelist .= ",private_archive,private_quickreply,private_pmspace,private_limitwarning,postbit_groupimage,postbit_offline,postbit_www,postbit_replyall_pm,postbit_signature,postbit_classic,postbit_reputation_formatted_link";
|
$templatelist .= ",postbit_delete_pm,postbit,private_tracking_nomessage,private_nomessages,postbit_author_guest,private_multiple_recipients_user,private_multiple_recipients_bcc,private_multiple_recipients,usercp_nav_messenger_folder";
$templatelist .= ",private_search_messagebit,private_search_results_nomessages,private_search_results,private_advanced_search,previewpost,private_send_tracking,private_send_signature,private_read_bcc,private_composelink";
$templatelist .= ",private_archive,private_quickreply,private_pmspace,private_limitwarning,postbit_groupimage,postbit_offline,postbit_www,postbit_replyall_pm,postbit_signature,postbit_classic,postbit_reputation_formatted_link";
|
$templatelist .= ",private_archive_folders_folder,private_archive_folders,postbit_warninglevel,postbit_author_user,postbit_forward_pm,private_messagebit_icon,private_jump_folders_folder,private_advanced_search_folders";
| $templatelist .= ",private_archive_folders_folder,private_archive_folders,postbit_warninglevel,postbit_author_user,postbit_forward_pm,private_messagebit_icon,private_jump_folders_folder,private_advanced_search_folders,usercp_nav_home";
|
$templatelist .= ",private_jump_folders,postbit_avatar,postbit_warn,postbit_rep_button,postbit_email,postbit_reputation,private_move,private_read_action,postbit_away,postbit_pm,usercp_nav_messenger_tracking,postbit_find";
$templatelist .= ",usercp_nav_editsignature,posticons_icon,postbit_icon,postbit_iplogged_hiden,usercp_nav_profile,usercp_nav_misc,postbit_userstar,private_read_to,postbit_online,private_empty,private_orderarrow,postbit_reply_pm";
| $templatelist .= ",private_jump_folders,postbit_avatar,postbit_warn,postbit_rep_button,postbit_email,postbit_reputation,private_move,private_read_action,postbit_away,postbit_pm,usercp_nav_messenger_tracking,postbit_find";
$templatelist .= ",usercp_nav_editsignature,posticons_icon,postbit_icon,postbit_iplogged_hiden,usercp_nav_profile,usercp_nav_misc,postbit_userstar,private_read_to,postbit_online,private_empty,private_orderarrow,postbit_reply_pm";
|
| Zeile 42 | Zeile 42 |
|---|
error_no_permission();
}
|
error_no_permission();
}
|
if(!$mybb->user['pmfolders'])
{
$mybb->user['pmfolders'] = "1**$%%$2**$%%$3**$%%$4**";
$sql_array = array(
"pmfolders" => $mybb->user['pmfolders']
);
$db->update_query("users", $sql_array, "uid = ".$mybb->user['uid']);
}
$mybb->input['fid'] = $mybb->get_input('fid', MyBB::INPUT_INT);
$folder_id = $folder_name = '';
| $mybb->input['fid'] = $mybb->get_input('fid', MyBB::INPUT_INT);
$folder_id = $folder_name = $folderjump_folder = $folderoplist_folder = $foldersearch_folder ='';
|
$foldernames = array();
$foldersexploded = explode("$%%$", $mybb->user['pmfolders']);
foreach($foldersexploded as $key => $folders)
| $foldernames = array();
$foldersexploded = explode("$%%$", $mybb->user['pmfolders']);
foreach($foldersexploded as $key => $folders)
|
| Zeile 64 | Zeile 54 |
|---|
if($mybb->input['fid'] == $folderinfo[0])
{
$sel = ' selected="selected"';
|
if($mybb->input['fid'] == $folderinfo[0])
{
$sel = ' selected="selected"';
|
}
| }
|
else
{
$sel = '';
| else
{
$sel = '';
|
| Zeile 76 | Zeile 66 |
|---|
$folder_name = $folderinfo[1];
eval("\$folderjump_folder .= \"".$templates->get("private_jump_folders_folder")."\";");
|
$folder_name = $folderinfo[1];
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 & move selector to omit "Unread"
if($folder_id != 1)
{
if($folder_id == 0)
{
$folder_id = 1;
}
eval("\$folderoplist_folder .= \"".$templates->get("private_jump_folders_folder")."\";");
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")."\";");
usercp_menu();
|
eval("\$folderjump = \"".$templates->get("private_jump_folders")."\";");
eval("\$folderoplist = \"".$templates->get("private_move")."\";");
eval("\$foldersearch = \"".$templates->get("private_advanced_search_folders")."\";");
usercp_menu();
|
|
|
$plugins->run_hooks("private_start");
// Make navigation
| $plugins->run_hooks("private_start");
// Make navigation
|
| Zeile 93 | Zeile 94 |
|---|
$mybb->input['action'] = $mybb->get_input('action');
switch($mybb->input['action'])
|
$mybb->input['action'] = $mybb->get_input('action');
switch($mybb->input['action'])
|
{
| {
|
case "send":
add_breadcrumb($lang->nav_send);
break;
| case "send":
add_breadcrumb($lang->nav_send);
break;
|
| Zeile 102 | Zeile 103 |
|---|
break;
case "folders":
add_breadcrumb($lang->nav_folders);
|
break;
case "folders":
add_breadcrumb($lang->nav_folders);
|
break;
| break;
|
case "empty":
add_breadcrumb($lang->nav_empty);
break;
| case "empty":
add_breadcrumb($lang->nav_empty);
break;
|
| Zeile 111 | Zeile 112 |
|---|
break;
case "advanced_search":
add_breadcrumb($lang->nav_search);
|
break;
case "advanced_search":
add_breadcrumb($lang->nav_search);
|
break;
| break;
|
case "results":
add_breadcrumb($lang->nav_results);
break;
|
case "results":
add_breadcrumb($lang->nav_results);
break;
|
}
| }
|
if(!empty($mybb->input['preview']))
{
$mybb->input['action'] = "send";
|
if(!empty($mybb->input['preview']))
{
$mybb->input['action'] = "send";
|
}
| }
|
if(($mybb->input['action'] == "do_search" || $mybb->input['action'] == "do_stuff" && ($mybb->get_input('quick_search') || !$mybb->get_input('hop') && !$mybb->get_input('moveto') && !$mybb->get_input('delete'))) && $mybb->request_method == "post")
{
$plugins->run_hooks("private_do_search_start");
| if(($mybb->input['action'] == "do_search" || $mybb->input['action'] == "do_stuff" && ($mybb->get_input('quick_search') || !$mybb->get_input('hop') && !$mybb->get_input('moveto') && !$mybb->get_input('delete'))) && $mybb->request_method == "post")
{
$plugins->run_hooks("private_do_search_start");
|
| Zeile 157 | Zeile 158 |
|---|
$lang->error_searchflooding = $lang->sprintf($lang->error_searchflooding, $mybb->settings['searchfloodtime'], $remaining_time);
}
error($lang->error_searchflooding);
|
$lang->error_searchflooding = $lang->sprintf($lang->error_searchflooding, $mybb->settings['searchfloodtime'], $remaining_time);
}
error($lang->error_searchflooding);
|
}
| }
|
}
if($mybb->get_input('subject', MyBB::INPUT_INT) != 1 && $mybb->get_input('message', MyBB::INPUT_INT) != 1)
| }
if($mybb->get_input('subject', MyBB::INPUT_INT) != 1 && $mybb->get_input('message', MyBB::INPUT_INT) != 1)
|
| Zeile 265 | Zeile 266 |
|---|
else
{
$sortby = $query_sortby = "dateline";
|
else
{
$sortby = $query_sortby = "dateline";
|
}
| }
|
if($order != "asc")
{
$order = "desc";
}
if(!$mybb->settings['threadsperpage'] || (int)$mybb->settings['threadsperpage'] < 1)
|
if($order != "asc")
{
$order = "desc";
}
if(!$mybb->settings['threadsperpage'] || (int)$mybb->settings['threadsperpage'] < 1)
|
{
| {
|
$mybb->settings['threadsperpage'] = 20;
}
|
$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'];
$page = $mybb->get_input('page', MyBB::INPUT_INT);
if($page > 0)
|
// Work out pagination, which page we're at, as well as the limits.
$perpage = $mybb->settings['threadsperpage'];
$page = $mybb->get_input('page', MyBB::INPUT_INT);
if($page > 0)
|
{
| {
|
$start = ($page-1) * $perpage;
|
$start = ($page-1) * $perpage;
|
| | $pages = ceil($pmscount / $perpage);
if($page > $pages)
{
$start = 0;
$page = 1;
}
|
}
else
|
}
else
|
{
| {
|
$start = 0;
$page = 1;
}
| $start = 0;
$page = 1;
}
|
| Zeile 298 | Zeile 308 |
|---|
if($search['keywords'])
{
$highlight = "&highlight=".urlencode($search['keywords']);
|
if($search['keywords'])
{
$highlight = "&highlight=".urlencode($search['keywords']);
|
}
| }
|
// 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 320 | Zeile 327 |
|---|
while($row = $db->fetch_array($users_query))
{
$recipients = my_unserialize($row['recipients']);
|
while($row = $db->fetch_array($users_query))
{
$recipients = my_unserialize($row['recipients']);
|
if(is_array($recipients['to']) && count($recipients['to']))
{
| if(isset($recipients['to']) && is_array($recipients['to']) && count($recipients['to']))
{
|
$get_users = array_merge($get_users, $recipients['to']);
}
if(isset($recipients['bcc']) && is_array($recipients['bcc']) && count($recipients['bcc']))
|
$get_users = array_merge($get_users, $recipients['to']);
}
if(isset($recipients['bcc']) && is_array($recipients['bcc']) && count($recipients['bcc']))
|
{
| {
|
$get_users = array_merge($get_users, $recipients['bcc']);
|
$get_users = array_merge($get_users, $recipients['bcc']);
|
}
}
| }
}
|
$get_users = implode(',', array_unique($get_users));
// Grab info
| $get_users = implode(',', array_unique($get_users));
// Grab info
|
| Zeile 340 | Zeile 347 |
|---|
while($user = $db->fetch_array($users_query))
{
$cached_users[$user['uid']] = $user;
|
while($user = $db->fetch_array($users_query))
{
$cached_users[$user['uid']] = $user;
|
}
}
| }
}
|
$query = $db->query("
SELECT pm.*, fu.username AS fromusername, tu.username as tousername
FROM ".TABLE_PREFIX."privatemessages pm
| $query = $db->query("
SELECT pm.*, fu.username AS fromusername, tu.username as tousername
FROM ".TABLE_PREFIX."privatemessages pm
|
| Zeile 386 | Zeile 393 |
|---|
// 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 || (count($recipients['to']) == 1 && isset($recipients['bcc']) && count($recipients['bcc']) > 0))
)
|
{
foreach($recipients['to'] as $uid)
{
| {
foreach($recipients['to'] as $uid)
{
|
| Zeile 451 | Zeile 461 |
|---|
if(!trim($message['subject']))
{
$message['subject'] = $lang->pm_no_subject;
|
if(!trim($message['subject']))
{
$message['subject'] = $lang->pm_no_subject;
|
}
$message['subject'] = $parser->parse_badwords($message['subject']);
| }
$message['subject'] = $parser->parse_badwords($message['subject']);
|
if(my_strlen($message['subject']) > 50)
|
if(my_strlen($message['subject']) > 50)
|
{
| {
|
$message['subject'] = htmlspecialchars_uni(my_substr($message['subject'], 0, 50)."...");
|
$message['subject'] = htmlspecialchars_uni(my_substr($message['subject'], 0, 50)."...");
|
}
| }
|
else
{
$message['subject'] = htmlspecialchars_uni($message['subject']);
|
else
{
$message['subject'] = htmlspecialchars_uni($message['subject']);
|
}
| }
|
if($message['folder'] != "3")
|
if($message['folder'] != "3")
|
{
| {
|
$senddate = my_date('relative', $message['dateline']);
}
else
| $senddate = my_date('relative', $message['dateline']);
}
else
|
| Zeile 473 | Zeile 483 |
|---|
$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 537 | Zeile 552 |
|---|
{
header("Location: index.php");
exit;
|
{
header("Location: index.php");
exit;
|
}
| }
|
}
$send_errors = '';
|
}
$send_errors = '';
|
|
|
if($mybb->input['action'] == "do_send" && $mybb->request_method == "post")
{
if($mybb->usergroup['cansendpms'] == 0)
{
error_no_permission();
}
|
if($mybb->input['action'] == "do_send" && $mybb->request_method == "post")
{
if($mybb->usergroup['cansendpms'] == 0)
{
error_no_permission();
}
|
|
|
// 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
$to = array_map("trim", explode(",", $mybb->get_input('to')));
|
$plugins->run_hooks("private_send_do_send");
// 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 565 | Zeile 581 |
|---|
WHERE LOWER(u.username) IN ('{$to_escaped}') AND pm.dateline > {$time_cutoff} AND pm.fromid='{$mybb->user['uid']}' AND pm.subject='".$db->escape_string($mybb->get_input('subject'))."' AND pm.message='".$db->escape_string($mybb->get_input('message'))."' AND pm.folder!='3'
LIMIT 0, 1
");
|
WHERE LOWER(u.username) IN ('{$to_escaped}') AND pm.dateline > {$time_cutoff} AND pm.fromid='{$mybb->user['uid']}' AND pm.subject='".$db->escape_string($mybb->get_input('subject'))."' AND pm.message='".$db->escape_string($mybb->get_input('message'))."' AND pm.folder!='3'
LIMIT 0, 1
");
|
$duplicate_check = $db->fetch_field($query, "pmid");
if($duplicate_check)
| if($db->num_rows($query) > 0)
|
{
error($lang->error_pm_already_submitted);
}
| {
error($lang->error_pm_already_submitted);
}
|
| Zeile 702 | Zeile 717 |
|---|
{
$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 937 |
|---|
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 995 | Zeile 1010 |
|---|
'namestyle' => 'namestyle'
);
|
'namestyle' => 'namestyle'
);
|
foreach($data_key as $field => $key)
| if(isset($groupscache[$pm['usergroup']]))
|
{
|
{
|
$pm[$key] = $groupscache[$pm['usergroup']][$field];
| foreach($data_key as $field => $key)
{
$pm[$key] = $groupscache[$pm['usergroup']][$field];
}
|
}
if($pm['receipt'] == 1)
| }
if($pm['receipt'] == 1)
|
| Zeile 1085 | Zeile 1103 |
|---|
// Fetch the recipients for this message
$pm['recipients'] = my_unserialize($pm['recipients']);
|
// Fetch the recipients for this message
$pm['recipients'] = my_unserialize($pm['recipients']);
|
if(is_array($pm['recipients']['to']))
| if(isset($pm['recipients']['to']) && is_array($pm['recipients']['to']))
|
{
$uid_sql = implode(',', $pm['recipients']['to']);
}
| {
$uid_sql = implode(',', $pm['recipients']['to']);
}
|
| Zeile 1125 | Zeile 1143 |
|---|
$bcc = '';
if(count($bcc_recipients) > 0)
|
$bcc = '';
if(count($bcc_recipients) > 0)
|
{
| {
|
$bcc_recipients = implode(', ', $bcc_recipients);
$bcc_form_val = implode(',', $bcc_form_val);
eval("\$bcc = \"".$templates->get("private_read_bcc")."\";");
|
$bcc_recipients = implode(', ', $bcc_recipients);
$bcc_form_val = implode(',', $bcc_form_val);
eval("\$bcc = \"".$templates->get("private_read_bcc")."\";");
|
}
| }
|
else
{
$bcc_form_val = '';
| else
{
$bcc_form_val = '';
|
| Zeile 1142 | Zeile 1160 |
|---|
}
if(count($to_recipients) > 0)
|
}
if(count($to_recipients) > 0)
|
{
| {
|
$to_recipients = implode($lang->comma, $to_recipients);
}
else
| $to_recipients = implode($lang->comma, $to_recipients);
}
else
|
| Zeile 1151 | Zeile 1169 |
|---|
}
eval("\$pm['subject_extra'] = \"".$templates->get("private_read_to")."\";");
|
}
eval("\$pm['subject_extra'] = \"".$templates->get("private_read_to")."\";");
|
|
|
add_breadcrumb($pm['subject']);
$message = build_postbit($pm, 2);
| add_breadcrumb($pm['subject']);
$message = build_postbit($pm, 2);
|
| Zeile 1161 | Zeile 1179 |
|---|
{
$trow = alt_trow();
|
{
$trow = alt_trow();
|
$optionschecked = array('savecopy' => 'checked="checked"');
| $optionschecked = array('savecopy' => 'checked="checked"', 'signature' => '', 'disablesmilies' => '');
|
if(!empty($mybb->user['signature']))
{
$optionschecked['signature'] = 'checked="checked"';
| if(!empty($mybb->user['signature']))
{
$optionschecked['signature'] = 'checked="checked"';
|
| Zeile 1205 | Zeile 1223 |
|---|
eval("\$private_send_tracking = \"".$templates->get("private_send_tracking")."\";");
}
|
eval("\$private_send_tracking = \"".$templates->get("private_send_tracking")."\";");
}
|
| | $postoptionschecked = $optionschecked; // Backwards compatability instead of correcting variable used in template
if(!isset($collapsedthead['quickreply']))
{
$collapsedthead['quickreply'] = '';
}
if(!isset($collapsedimg['quickreply']))
{
$collapsedimg['quickreply'] = '';
}
if(!isset($collapsed['quickreply_e']))
{
$collapsed['quickreply_e'] = '';
}
$expaltext = (in_array("quickreply", $collapse)) ? $lang->expcol_expand : $lang->expcol_collapse;
|
eval("\$quickreply = \"".$templates->get("private_quickreply")."\";");
}
| eval("\$quickreply = \"".$templates->get("private_quickreply")."\";");
}
|
| Zeile 1451 | Zeile 1485 |
|---|
$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 1540 |
|---|
$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)
{
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;
}
}
| if($val == get_pm_folder_name($fid) || trim($val) == '')
{
$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));
|
|
|
if(my_strpos($foldername, "$%%$") === false)
{
if($folders != '')
| if(my_strpos($foldername, "$%%$") === false)
{
if($folders != '')
|
| Zeile 1571 | Zeile 1582 |
|---|
"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();
$plugins->run_hooks("private_do_folders_end");
| update_pm_count();
$plugins->run_hooks("private_do_folders_end");
|
| Zeile 1585 | Zeile 1596 |
|---|
if($mybb->user['totalpms'] == 0)
{
error($lang->error_nopms);
|
if($mybb->user['totalpms'] == 0)
{
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']);
|
| Zeile 1594 | Zeile 1605 |
|---|
foreach($foldersexploded as $key => $folders)
{
$folderinfo = explode("**", $folders, 2);
|
foreach($foldersexploded as $key => $folders)
{
$folderinfo = explode("**", $folders, 2);
|
| | $unread = '';
|
$fid = $folderinfo[0];
|
$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")."\";");
| $plugins->run_hooks("private_empty_end");
eval("\$folders = \"".$templates->get("private_empty")."\";");
|
| Zeile 1609 | Zeile 1630 |
|---|
}
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 incoming POST request
|
verify_post_check($mybb->get_input('my_post_key'));
$plugins->run_hooks("private_do_empty_start");
| verify_post_check($mybb->get_input('my_post_key'));
$plugins->run_hooks("private_do_empty_start");
|
| Zeile 1663 | Zeile 1684 |
|---|
}
elseif(!empty($mybb->input['moveto']))
{
|
}
elseif(!empty($mybb->input['moveto']))
{
|
$mybb->input['check'] = $mybb->get_input('check', MyBB::INPUT_ARRAY);
if(!empty($mybb->input['check']))
| $pms = array_map('intval', array_keys($mybb->get_input('check', MyBB::INPUT_ARRAY)));
if(!empty($pms))
|
{
|
{
|
foreach($mybb->input['check'] as $key => $val)
| if(!$mybb->input['fid'])
|
{
|
{
|
$sql_array = array(
"folder" => $mybb->input['fid']
);
$db->update_query("privatemessages", $sql_array, "pmid='".(int)$key."' AND uid='".$mybb->user['uid']."'");
| $mybb->input['fid'] = 1;
|
}
|
}
|
}
// Update PM count
update_pm_count();
|
if(array_key_exists($mybb->input['fid'], $foldernames))
{
$db->update_query("privatemessages", array("folder" => $mybb->input['fid']), "pmid IN (".implode(",", $pms).") AND uid='".$mybb->user['uid']."'");
update_pm_count();
}
else
{
error($lang->error_invalidmovefid);
}
}
|
if(!empty($mybb->input['fromfid']))
{
|
if(!empty($mybb->input['fromfid']))
{
|
| Zeile 1684 | Zeile 1710 |
|---|
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 1758 | Zeile 1784 |
|---|
"deletetime" => TIME_NOW
);
$db->update_query("privatemessages", $sql_array, "pmid='".$mybb->get_input('pmid', MyBB::INPUT_INT)."' AND uid='".$mybb->user['uid']."'");
|
"deletetime" => TIME_NOW
);
$db->update_query("privatemessages", $sql_array, "pmid='".$mybb->get_input('pmid', MyBB::INPUT_INT)."' AND uid='".$mybb->user['uid']."'");
|
}
| }
|
// Update PM count
update_pm_count();
|
// Update PM count
update_pm_count();
|
| Zeile 1777 | Zeile 1803 |
|---|
$plugins->run_hooks("private_export_start");
$foldersexploded = explode("$%%$", $mybb->user['pmfolders']);
|
$plugins->run_hooks("private_export_start");
$foldersexploded = explode("$%%$", $mybb->user['pmfolders']);
|
$folder_name = $folder_id = '';
| $folderlist_folder = '';
|
foreach($foldersexploded as $key => $folders)
{
$folderinfo = explode("**", $folders, 2);
| foreach($foldersexploded as $key => $folders)
{
$folderinfo = explode("**", $folders, 2);
|
| Zeile 1830 | Zeile 1856 |
|---|
if($mybb->get_input('dayway') == "older")
{
$wsql .= "<=";
|
if($mybb->get_input('dayway') == "older")
{
$wsql .= "<=";
|
}
else
| }
else
|
{
$wsql .= ">=";
}
$wsql .= "'$datecut'";
|
{
$wsql .= ">=";
}
$wsql .= "'$datecut'";
|
}
| }
|
else
{
$wsql = "1=1";
| else
{
$wsql = "1=1";
|
| Zeile 1867 | Zeile 1893 |
|---|
}
}
if($folderlst)
|
}
}
if($folderlst)
|
{
| {
|
$folderlst .= ")";
}
$wsql .= "$folderlst";
| $folderlst .= ")";
}
$wsql .= "$folderlst";
|
| Zeile 1938 | Zeile 1964 |
|---|
$tofromusername = $lang->mybb_engine;
}
$tofrom = $lang->from;
|
$tofromusername = $lang->mybb_engine;
}
$tofrom = $lang->from;
|
}
| }
|
if($tofromuid == 0)
{
$message['fromusername'] = $lang->mybb_engine;
|
if($tofromuid == 0)
{
$message['fromusername'] = $lang->mybb_engine;
|
}
| }
|
if(!$message['toid'] && $message['folder'] == 3)
{
$message['tousername'] = $lang->not_sent;
|
if(!$message['toid'] && $message['folder'] == 3)
{
$message['tousername'] = $lang->not_sent;
|
}
| }
|
$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 1976 | Zeile 2002 |
|---|
$message['message'] = $parser->parse_message($message['message'], $parser_options);
$message['subject'] = htmlspecialchars_uni($message['subject']);
|
$message['message'] = $parser->parse_message($message['message'], $parser_options);
$message['subject'] = htmlspecialchars_uni($message['subject']);
|
}
| }
|
if($mybb->input['exporttype'] == "txt" || $mybb->input['exporttype'] == "csv")
{
$message['message'] = str_replace("\r\n", "\n", $message['message']);
| if($mybb->input['exporttype'] == "txt" || $mybb->input['exporttype'] == "csv")
{
$message['message'] = str_replace("\r\n", "\n", $message['message']);
|
| Zeile 1986 | Zeile 2012 |
|---|
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 2037 |
|---|
}
else
{
|
}
else
{
|
$foldername = addslashes($folderinfo[1]);
| $foldername = my_escape_csv($folderinfo[1]);
|
}
$donefolder[$message['folder']] = 1;
}
| }
$donefolder[$message['folder']] = 1;
}
|
| Zeile 2025 | Zeile 2051 |
|---|
if($mybb->input['exporttype'] == "html")
{
// Gather global stylesheet for HTML
|
if($mybb->input['exporttype'] == "html")
{
// Gather global stylesheet for HTML
|
$query = $db->simple_select("themestylesheets", "stylesheet", "sid = '1'", array('limit' => 1));
| $css_tid = empty($theme['tid']) ? '' : "'". (int)$theme['tid'] ."',";
$query = $db->simple_select("themestylesheets", "stylesheet", "tid in ({$css_tid}'2','1') AND name = 'global.css'", array('order_by' => 'tid', 'order_dir' => 'DESC', 'limit' => 1));
|
$css = $db->fetch_field($query, "stylesheet");
}
| $css = $db->fetch_field($query, "stylesheet");
}
|
| Zeile 2076 | Zeile 2103 |
|---|
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 2094 | Zeile 2122 |
|---|
$mybb->input['order'] = htmlspecialchars_uni($mybb->get_input('order'));
$ordersel = array('asc' => '', 'desc');
switch(my_strtolower($mybb->input['order']))
|
$mybb->input['order'] = htmlspecialchars_uni($mybb->get_input('order'));
$ordersel = array('asc' => '', 'desc');
switch(my_strtolower($mybb->input['order']))
|
{
| {
|
case "asc":
$sortordernow = "asc";
$ordersel['asc'] = "selected=\"selected\"";
| case "asc":
$sortordernow = "asc";
$ordersel['asc'] = "selected=\"selected\"";
|
| Zeile 2106 | Zeile 2134 |
|---|
$ordersel['desc'] = "selected=\"selected\"";
$oppsort = $lang->asc;
$oppsortnext = "asc";
|
$ordersel['desc'] = "selected=\"selected\"";
$oppsort = $lang->asc;
$oppsortnext = "asc";
|
break;
}
| break;
}
|
// Sort by which field?
$sortby = htmlspecialchars_uni($mybb->get_input('sortby'));
switch($mybb->get_input('sortby'))
|
// Sort by which field?
$sortby = htmlspecialchars_uni($mybb->get_input('sortby'));
switch($mybb->get_input('sortby'))
|
{
| {
|
case "subject":
$sortfield = "subject";
break;
| case "subject":
$sortfield = "subject";
break;
|
| Zeile 2131 | Zeile 2159 |
|---|
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 2179 |
|---|
if($page > 0)
{
$start = ($page-1) *$perpage;
|
if($page > 0)
{
$start = ($page-1) *$perpage;
|
}
else
{
| $pages = ceil($pmscount / $perpage);
if($page > $pages)
{
$start = 0;
$page = 1;
}
}
else
{
|
$start = 0;
$page = 1;
|
$start = 0;
$page = 1;
|
}
| }
|
$end = $start + $perpage;
$lower = $start+1;
$upper = $end;
|
$end = $start + $perpage;
$lower = $start+1;
$upper = $end;
|
|
|
if($upper > $pmscount)
{
$upper = $pmscount;
|
if($upper > $pmscount)
{
$upper = $pmscount;
|
}
| }
|
if($mybb->input['order'] || ($sortby && $sortby != "dateline"))
{
|
if($mybb->input['order'] || ($sortby && $sortby != "dateline"))
{
|
$page_url = "private.php?fid={$folder}&sortby={$sortby}&order={$mybb->input['order']}";
}
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['total'], $perpage, $page, $page_url);
$messagelist = '';
| $multipage = multipage($pmscount, $perpage, $page, $page_url);
$selective = $messagelist = '';
|
$icon_cache = $cache->read("posticons");
|
$icon_cache = $cache->read("posticons");
|
| Zeile 2181 | Zeile 2221 |
|---|
if($sortfield == "username")
{
$u = "u.";
|
if($sortfield == "username")
{
$u = "u.";
|
}
else
| }
else
|
{
$u = "pm.";
}
| {
$u = "pm.";
}
|
| Zeile 2194 | Zeile 2234 |
|---|
FROM ".TABLE_PREFIX."privatemessages pm
LEFT JOIN ".TABLE_PREFIX."users u ON (u.uid=pm.toid)
WHERE pm.folder='{$folder}' AND pm.uid='{$mybb->user['uid']}'
|
FROM ".TABLE_PREFIX."privatemessages pm
LEFT JOIN ".TABLE_PREFIX."users u ON (u.uid=pm.toid)
WHERE pm.folder='{$folder}' AND pm.uid='{$mybb->user['uid']}'
|
ORDER BY {$u}{$sortfield} {$mybb->input['order']}
| ORDER BY {$u}{$sortfield} {$sortordernow}
|
LIMIT {$start}, {$perpage}
");
while($row = $db->fetch_array($users_query))
{
$recipients = my_unserialize($row['recipients']);
|
LIMIT {$start}, {$perpage}
");
while($row = $db->fetch_array($users_query))
{
$recipients = my_unserialize($row['recipients']);
|
if(is_array($recipients['to']) && count($recipients['to']))
| if(isset($recipients['to']) && is_array($recipients['to']) && count($recipients['to']))
|
{
$get_users = array_merge($get_users, $recipients['to']);
}
| {
$get_users = array_merge($get_users, $recipients['to']);
}
|
| Zeile 2237 | Zeile 2277 |
|---|
}
else
{
|
}
else
{
|
| | if($fid == 1)
{
$selective = " AND pm.status='0'";
}
|
if($sortfield == "username")
{
$pm = "fu.";
| if($sortfield == "username")
{
$pm = "fu.";
|
| Zeile 2252 | Zeile 2297 |
|---|
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
");
if($db->num_rows($query) > 0)
{
|
ORDER BY {$pm}{$sortfield} {$sortordernow}
LIMIT $start, $perpage
");
if($db->num_rows($query) > 0)
{
|
| | $bgcolor = alt_trow(true);
|
while($message = $db->fetch_array($query))
{
$msgalt = $msgstatus = '';
| while($message = $db->fetch_array($query))
{
$msgalt = $msgstatus = '';
|
| Zeile 2290 | Zeile 2336 |
|---|
{ // 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)
{
|
| | if(!isset($cached_users[$uid]))
{
continue;
}
|
$profilelink = get_profile_link($uid);
$user = $cached_users[$uid];
$user['username'] = htmlspecialchars_uni($user['username']);
| $profilelink = get_profile_link($uid);
$user = $cached_users[$uid];
$user['username'] = htmlspecialchars_uni($user['username']);
|
| Zeile 2309 | Zeile 2359 |
|---|
eval("\$bcc_users = \"".$templates->get("private_multiple_recipients_bcc")."\";");
foreach($recipients['bcc'] as $uid)
{
|
eval("\$bcc_users = \"".$templates->get("private_multiple_recipients_bcc")."\";");
foreach($recipients['bcc'] as $uid)
{
|
| | if(!isset($cached_users[$uid]))
{
continue;
}
|
$profilelink = get_profile_link($uid);
$user = $cached_users[$uid];
$user['username'] = htmlspecialchars_uni($user['username']);
| $profilelink = get_profile_link($uid);
$user = $cached_users[$uid];
$user['username'] = htmlspecialchars_uni($user['username']);
|
| Zeile 2361 | Zeile 2415 |
|---|
}
if($message['icon'] > 0 && $icon_cache[$message['icon']])
|
}
if($message['icon'] > 0 && $icon_cache[$message['icon']])
|
{
| {
|
$icon = $icon_cache[$message['icon']];
$icon['path'] = str_replace("{theme}", $theme['imgdir'], $icon['path']);
$icon['path'] = htmlspecialchars_uni($icon['path']);
| $icon = $icon_cache[$message['icon']];
$icon['path'] = str_replace("{theme}", $theme['imgdir'], $icon['path']);
$icon['path'] = htmlspecialchars_uni($icon['path']);
|
| Zeile 2391 | Zeile 2445 |
|---|
$plugins->run_hooks("private_message");
eval("\$messagelist .= \"".$templates->get("private_messagebit")."\";");
|
$plugins->run_hooks("private_message");
eval("\$messagelist .= \"".$templates->get("private_messagebit")."\";");
|
| | $bgcolor = alt_trow();
|
}
}
else
| }
}
else
|
| Zeile 2399 | Zeile 2454 |
|---|
}
$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 2433 | Zeile 2488 |
|---|
{
$spaceused_severity = "high";
}
|
{
$spaceused_severity = "high";
}
|
|
|
$overhalf = round($spaceused, 0)."%";
if((int)$overhalf > 100)
{
| $overhalf = round($spaceused, 0)."%";
if((int)$overhalf > 100)
{
|
| Zeile 2463 | Zeile 2518 |
|---|
}
$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")."\";");
}
|