| Zeile 40 | Zeile 40 |
|---|
if($mybb->user['uid'] == '/' || $mybb->user['uid'] == 0 || $mybb->usergroup['canusepms'] == 0)
{
error_no_permission();
|
if($mybb->user['uid'] == '/' || $mybb->user['uid'] == 0 || $mybb->usergroup['canusepms'] == 0)
{
error_no_permission();
|
}
$update = false;
if(!$mybb->user['pmfolders'])
{
$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(
"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);
|
}
$mybb->input['fid'] = $mybb->get_input('fid', MyBB::INPUT_INT);
|
$folder_id = $folder_name = '';
| $folder_id = $folder_name = $folderjump_folder = $folderoplist_folder = $foldersearch_folder ='';
|
$foldernames = array();
$foldersexploded = explode("$%%$", $mybb->user['pmfolders']);
|
$foldernames = array();
$foldersexploded = explode("$%%$", $mybb->user['pmfolders']);
|
| Zeile 79 | Zeile 56 |
|---|
$sel = ' selected="selected"';
}
else
|
$sel = ' selected="selected"';
}
else
|
{
| {
|
$sel = '';
}
$folderinfo[1] = get_pm_folder_name($folderinfo[0], $folderinfo[1]);
| $sel = '';
}
$folderinfo[1] = get_pm_folder_name($folderinfo[0], $folderinfo[1]);
|
| Zeile 89 | 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")."\";");
// Manipulate search folder selection to omit "Unread"
|
// Manipulate search folder selection & move selector to omit "Unread"
|
if($folder_id != 1)
{
if($folder_id == 0)
{
$folder_id = 1;
}
|
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")."\";");
|
eval("\$foldersearch_folder .= \"".$templates->get("private_jump_folders_folder")."\";");
|
}
}
$from_fid = $mybb->input['fid'];
| }
}
$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 125 | 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 134 | 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']))
{
|
if(!empty($mybb->input['preview']))
{
|
| Zeile 151 | Zeile 129 |
|---|
// Simulate coming from our advanced search form with some preset options
if($mybb->get_input('quick_search'))
|
// Simulate coming from our advanced search form with some preset options
if($mybb->get_input('quick_search'))
|
{
| {
|
$mybb->input['action'] = "do_search";
$mybb->input['subject'] = 1;
$mybb->input['message'] = 1;
| $mybb->input['action'] = "do_search";
$mybb->input['subject'] = 1;
$mybb->input['message'] = 1;
|
| Zeile 174 | Zeile 152 |
|---|
if($remaining_time == 1)
{
$lang->error_searchflooding = $lang->sprintf($lang->error_searchflooding_1, $mybb->settings['searchfloodtime']);
|
if($remaining_time == 1)
{
$lang->error_searchflooding = $lang->sprintf($lang->error_searchflooding_1, $mybb->settings['searchfloodtime']);
|
}
| }
|
else
{
$lang->error_searchflooding = $lang->sprintf($lang->error_searchflooding, $mybb->settings['searchfloodtime'], $remaining_time);
| else
{
$lang->error_searchflooding = $lang->sprintf($lang->error_searchflooding, $mybb->settings['searchfloodtime'], $remaining_time);
|
| Zeile 349 | 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 415 | 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 448 | Zeile 429 |
|---|
else
{
$tofromusername = $lang->not_sent;
|
else
{
$tofromusername = $lang->not_sent;
|
}
}
else
| }
}
else
|
{
$tofromusername = htmlspecialchars_uni($message['fromusername']);
$tofromuid = $message['fromid'];
| {
$tofromusername = htmlspecialchars_uni($message['fromusername']);
$tofromuid = $message['fromid'];
|
| Zeile 458 | Zeile 439 |
|---|
{
$tofromusername = $lang->mybb_engine;
}
|
{
$tofromusername = $lang->mybb_engine;
}
|
}
| }
|
$tofromusername = build_profile_link($tofromusername, $tofromuid);
$denyreceipt = '';
if($message['icon'] > 0 && $icon_cache[$message['icon']])
|
$tofromusername = build_profile_link($tofromusername, $tofromuid);
$denyreceipt = '';
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 473 | Zeile 454 |
|---|
eval("\$icon = \"".$templates->get("private_messagebit_icon")."\";");
}
else
|
eval("\$icon = \"".$templates->get("private_messagebit_icon")."\";");
}
else
|
{
| {
|
$icon = '	';
}
if(!trim($message['subject']))
{
$message['subject'] = $lang->pm_no_subject;
|
$icon = '	';
}
if(!trim($message['subject']))
{
$message['subject'] = $lang->pm_no_subject;
|
}
| }
|
$message['subject'] = $parser->parse_badwords($message['subject']);
|
$message['subject'] = $parser->parse_badwords($message['subject']);
|
| Zeile 540 | Zeile 521 |
|---|
if($mybb->input['action'] == "advanced_search")
{
$plugins->run_hooks("private_advanced_search");
|
if($mybb->input['action'] == "advanced_search")
{
$plugins->run_hooks("private_advanced_search");
|
|
|
eval("\$advanced_search = \"".$templates->get("private_advanced_search")."\";");
output_page($advanced_search);
| eval("\$advanced_search = \"".$templates->get("private_advanced_search")."\";");
output_page($advanced_search);
|
| Zeile 600 | 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 1120 | Zeile 1100 |
|---|
// 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 1196 | Zeile 1176 |
|---|
{
$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 1239 | Zeile 1219 |
|---|
eval("\$private_send_tracking = \"".$templates->get("private_send_tracking")."\";");
}
|
eval("\$private_send_tracking = \"".$templates->get("private_send_tracking")."\";");
}
|
$expaltext = (in_array("quickreply", $collapse)) ? "[+]" : "[-]";
|
$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 1566 | Zeile 1561 |
|---|
$folders .= "$%%$";
}
$folders .= "$fid**$foldername";
|
$folders .= "$%%$";
}
$folders .= "$fid**$foldername";
|
}
else
| }
else
|
{
error($lang->error_invalidpmfoldername);
}
| {
error($lang->error_invalidpmfoldername);
}
|
| Zeile 1598 | Zeile 1593 |
|---|
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']);
|
$folderlist = $unread = '';
| $folderlist = '';
|
foreach($foldersexploded as $key => $folders)
{
$folderinfo = explode("**", $folders, 2);
|
foreach($foldersexploded as $key => $folders)
{
$folderinfo = explode("**", $folders, 2);
|
| | $unread = '';
|
$fid = $folderinfo[0];
if($folderinfo[0] == "1")
|
$fid = $folderinfo[0];
if($folderinfo[0] == "1")
|
{
$fid = "1";
| {
$fid = "1";
|
$unread = " AND status='0'";
}
if($folderinfo[0] == "0")
{
$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")."\";");
}
|
$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")."\";");
}
|
|
|
$plugins->run_hooks("private_empty_end");
|
$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")
|
eval("\$folders = \"".$templates->get("private_empty")."\";");
output_page($folders);
}
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 1662 | Zeile 1658 |
|---|
if($emptyq != '')
{
$db->delete_query("privatemessages", "($emptyq) AND uid='".$mybb->user['uid']."'{$keepunreadq}");
|
if($emptyq != '')
{
$db->delete_query("privatemessages", "($emptyq) AND uid='".$mybb->user['uid']."'{$keepunreadq}");
|
}
}
| }
}
|
// Update PM count
update_pm_count();
| // Update PM count
update_pm_count();
|
| Zeile 1676 | Zeile 1672 |
|---|
{
// 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_stuff");
if(!empty($mybb->input['hop']))
|
$plugins->run_hooks("private_do_stuff");
if(!empty($mybb->input['hop']))
|
{
| {
|
header("Location: private.php?fid=".$mybb->get_input('jumpto'));
}
elseif(!empty($mybb->input['moveto']))
{
|
header("Location: private.php?fid=".$mybb->get_input('jumpto'));
}
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;
}
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);
|
}
}
|
}
}
|
// Update PM count
update_pm_count();
| |
if(!empty($mybb->input['fromfid']))
{
|
if(!empty($mybb->input['fromfid']))
{
|
| Zeile 2047 | Zeile 2048 |
|---|
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 2235 | Zeile 2237 |
|---|
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']);
}
| {
$get_users = array_merge($get_users, $recipients['to']);
}
|
| Zeile 2299 | Zeile 2301 |
|---|
if($db->num_rows($query) > 0)
{
|
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 2334 | Zeile 2337 |
|---|
{
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']);
$username = format_name($user['username'], $user['usergroup'], $user['displaygroup']);
if(!$user['username'])
|
$profilelink = get_profile_link($uid);
$user = $cached_users[$uid];
$user['username'] = htmlspecialchars_uni($user['username']);
$username = format_name($user['username'], $user['usergroup'], $user['displaygroup']);
if(!$user['username'])
|
{
| {
|
$username = $lang->na;
}
eval("\$to_users .= \"".$templates->get("private_multiple_recipients_user")."\";");
| $username = $lang->na;
}
eval("\$to_users .= \"".$templates->get("private_multiple_recipients_user")."\";");
|
| Zeile 2349 | Zeile 2356 |
|---|
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 2420 | Zeile 2431 |
|---|
$message['subject'] = htmlspecialchars_uni($parser->parse_badwords($message['subject']));
if($message['folder'] != "3")
|
$message['subject'] = htmlspecialchars_uni($parser->parse_badwords($message['subject']));
if($message['folder'] != "3")
|
{
| {
|
$senddate = my_date('relative', $message['dateline']);
}
else
| $senddate = my_date('relative', $message['dateline']);
}
else
|
| Zeile 2431 | Zeile 2442 |
|---|
$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 2473 | Zeile 2485 |
|---|
{
$spaceused_severity = "high";
}
|
{
$spaceused_severity = "high";
}
|
|
|
$overhalf = round($spaceused, 0)."%";
if((int)$overhalf > 100)
{
| $overhalf = round($spaceused, 0)."%";
if((int)$overhalf > 100)
{
|