Vergleich private.php - 1.8.9 - 1.8.16

  Keine Änderungen   Hinzugefügt   Modifiziert   Entfernt
Zeile 79Zeile 79
	eval("\$folderoplist_folder .= \"".$templates->get("private_jump_folders_folder")."\";");
eval("\$foldersearch_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'];


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")."\";");


usercp_menu();

$plugins->run_hooks("private_start");

usercp_menu();

$plugins->run_hooks("private_start");


// Make navigation
add_breadcrumb($lang->nav_pms, "private.php");


// Make navigation
add_breadcrumb($lang->nav_pms, "private.php");

Zeile 96Zeile 98
{
case "send":
add_breadcrumb($lang->nav_send);

{
case "send":
add_breadcrumb($lang->nav_send);

		break;

		break;

	case "tracking":
add_breadcrumb($lang->nav_tracking);
break;

	case "tracking":
add_breadcrumb($lang->nav_tracking);
break;

Zeile 166Zeile 168
	}

if($mybb->get_input('message', MyBB::INPUT_INT) == 1)

	}

if($mybb->get_input('message', MyBB::INPUT_INT) == 1)

	{

	{

		$resulttype = "pmmessages";
}
else

		$resulttype = "pmmessages";
}
else

Zeile 219Zeile 221
	else
{
$sortby = "dateline";

	else
{
$sortby = "dateline";

	}


	}


	if(my_strtolower($mybb->get_input('sortordr')) == "asc")
{
$sortorder = "asc";

	if(my_strtolower($mybb->get_input('sortordr')) == "asc")
{
$sortorder = "asc";

Zeile 256Zeile 258
	if(in_array($sortby, $sortby_accepted))
{
$query_sortby = $sortby;

	if(in_array($sortby, $sortby_accepted))
{
$query_sortby = $sortby;





		if($query_sortby == "username")
{
$query_sortby = "fromusername";
}

		if($query_sortby == "username")
{
$query_sortby = "fromusername";
}

	}

	}

	else

	else

	{

	{

		$sortby = $query_sortby = "dateline";

		$sortby = $query_sortby = "dateline";

	}

	}


if($order != "asc")
{


if($order != "asc")
{

Zeile 273Zeile 275
	}

if(!$mybb->settings['threadsperpage'] || (int)$mybb->settings['threadsperpage'] < 1)

	}

if(!$mybb->settings['threadsperpage'] || (int)$mybb->settings['threadsperpage'] < 1)

	{

	{

		$mybb->settings['threadsperpage'] = 20;
}


		$mybb->settings['threadsperpage'] = 20;
}


Zeile 326Zeile 328
		}

if(isset($recipients['bcc']) && is_array($recipients['bcc']) && count($recipients['bcc']))

		}

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']);
}
}

Zeile 361Zeile 363
		{
$msgstatus = 'new_pm';
$msgalt = $lang->new_pm;

		{
$msgstatus = 'new_pm';
$msgalt = $lang->new_pm;

		}

		}

		else if($message['status'] == 1)
{
$msgstatus = 'old_pm';
$msgalt = $lang->old_pm;

		else if($message['status'] == 1)
{
$msgstatus = 'old_pm';
$msgalt = $lang->old_pm;

		}

		}

		else if($message['status'] == 3)

		else if($message['status'] == 3)

		{

		{

			$msgstatus = 're_pm';
$msgalt = $lang->reply_pm;
}

			$msgstatus = 're_pm';
$msgalt = $lang->reply_pm;
}

Zeile 376Zeile 378
		{
$msgstatus = 'fw_pm';
$msgalt = $lang->fwd_pm;

		{
$msgstatus = 'fw_pm';
$msgalt = $lang->fwd_pm;

		}

$folder = $message['folder'];


		}

$folder = $message['folder'];


		$tofromuid = 0;
if($folder == 2 || $folder == 3)
{

		$tofromuid = 0;
if($folder == 2 || $folder == 3)
{

Zeile 429Zeile 431
			{
$tofromusername = $lang->mybb_engine;
}

			{
$tofromusername = $lang->mybb_engine;
}

		}

$tofromusername = build_profile_link($tofromusername, $tofromuid);

		}

$tofromusername = build_profile_link($tofromusername, $tofromuid);


$denyreceipt = '';


$denyreceipt = '';





		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 449Zeile 451
		}

if(!trim($message['subject']))

		}

if(!trim($message['subject']))

		{

		{

			$message['subject'] = $lang->pm_no_subject;
}


			$message['subject'] = $lang->pm_no_subject;
}


Zeile 501Zeile 503

eval("\$results = \"".$templates->get("private_search_results")."\";");
output_page($results);


eval("\$results = \"".$templates->get("private_search_results")."\";");
output_page($results);

}


}


if($mybb->input['action'] == "advanced_search")

if($mybb->input['action'] == "advanced_search")

{

{

	$plugins->run_hooks("private_advanced_search");

	$plugins->run_hooks("private_advanced_search");





	eval("\$advanced_search = \"".$templates->get("private_advanced_search")."\";");

	eval("\$advanced_search = \"".$templates->get("private_advanced_search")."\";");





	output_page($advanced_search);
}


	output_page($advanced_search);
}


Zeile 516Zeile 518
if($mybb->input['action'] == "dismiss_notice")
{
if($mybb->user['pmnotice'] != 2)

if($mybb->input['action'] == "dismiss_notice")
{
if($mybb->user['pmnotice'] != 2)

	{
exit;
}


	{
exit;
}


	// 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'));





	$updated_user = array(
"pmnotice" => 1
);

	$updated_user = array(
"pmnotice" => 1
);

Zeile 531Zeile 533
	if(!empty($mybb->input['ajax']))
{
echo 1;

	if(!empty($mybb->input['ajax']))
{
echo 1;

		exit;

		exit;

	}
else
{
header("Location: index.php");
exit;

	}
else
{
header("Location: index.php");
exit;

	}

	}

}

$send_errors = '';

}

$send_errors = '';

Zeile 590Zeile 592
	{
$pm['bcc'] = explode(",", $mybb->get_input('bcc'));
$pm['bcc'] = array_map("trim", $pm['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);





	if(!$mybb->usergroup['cantrackpms'])

	if(!$mybb->usergroup['cantrackpms'])

	{

	{

		$mybb->input['options']['readreceipt'] = false;

		$mybb->input['options']['readreceipt'] = false;

	}

	}


$pm['options'] = array();
if(isset($mybb->input['options']['signature']) && $mybb->input['options']['signature'] == 1)


$pm['options'] = array();
if(isset($mybb->input['options']['signature']) && $mybb->input['options']['signature'] == 1)

	{

	{

		$pm['options']['signature'] = 1;
}
else
{
$pm['options']['signature'] = 0;

		$pm['options']['signature'] = 1;
}
else
{
$pm['options']['signature'] = 0;

	}

	}

	if(isset($mybb->input['options']['disablesmilies']))
{
$pm['options']['disablesmilies'] = $mybb->input['options']['disablesmilies'];

	if(isset($mybb->input['options']['disablesmilies']))
{
$pm['options']['disablesmilies'] = $mybb->input['options']['disablesmilies'];

Zeile 642Zeile 644
	{
$pminfo = $pmhandler->insert_pm();
$plugins->run_hooks("private_do_send_end");

	{
$pminfo = $pmhandler->insert_pm();
$plugins->run_hooks("private_do_send_end");





		if(isset($pminfo['draftsaved']))

		if(isset($pminfo['draftsaved']))

		{

		{

			redirect("private.php", $lang->redirect_pmsaved);

			redirect("private.php", $lang->redirect_pmsaved);

		}

		}

		else
{
redirect("private.php", $lang->redirect_pmsent);

		else
{
redirect("private.php", $lang->redirect_pmsent);

Zeile 659Zeile 661
	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 = '';

Zeile 695Zeile 697
			$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 731Zeile 733
		}
$post['smilieoff'] = $options['disablesmilies'];
$post['dateline'] = TIME_NOW;

		}
$post['smilieoff'] = $options['disablesmilies'];
$post['dateline'] = TIME_NOW;





		if(!isset($options['signature']))
{
$post['includesig'] = 0;

		if(!isset($options['signature']))
{
$post['includesig'] = 0;

Zeile 766Zeile 768
		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 783Zeile 785
			LEFT JOIN ".TABLE_PREFIX."users u ON (u.uid=pm.fromid)
WHERE pm.pmid='".$mybb->get_input('pmid', MyBB::INPUT_INT)."' AND pm.uid='{$mybb->user['uid']}'
");

			LEFT JOIN ".TABLE_PREFIX."users u ON (u.uid=pm.fromid)
WHERE pm.pmid='".$mybb->get_input('pmid', MyBB::INPUT_INT)."' AND pm.uid='{$mybb->user['uid']}'
");





		$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']));

Zeile 1063Zeile 1065
		if((TIME_NOW - $pm['statustime']) < 3600)
{
$forward_string = $lang->you_forwarded;

		if((TIME_NOW - $pm['statustime']) < 3600)
{
$forward_string = $lang->you_forwarded;

		}


		}


		$actioned_on = $lang->sprintf($forward_string, $forward_date);
eval("\$action_time = \"".$templates->get("private_read_action")."\";");
}

		$actioned_on = $lang->sprintf($forward_string, $forward_date);
eval("\$action_time = \"".$templates->get("private_read_action")."\";");
}

Zeile 1099Zeile 1101

// If we have any BCC recipients and this user is an Administrator, add them on to the query
if(isset($pm['recipients']['bcc']) && count($pm['recipients']['bcc']) > 0 && $mybb->usergroup['cancp'] == 1)


// If we have any BCC recipients and this user is an Administrator, add them on to the query
if(isset($pm['recipients']['bcc']) && count($pm['recipients']['bcc']) > 0 && $mybb->usergroup['cancp'] == 1)

	{

	{

		$show_bcc = 1;
$uid_sql .= ','.implode(',', $pm['recipients']['bcc']);
}

		$show_bcc = 1;
$uid_sql .= ','.implode(',', $pm['recipients']['bcc']);
}

Zeile 1133Zeile 1135
	else
{
$bcc_form_val = '';

	else
{
$bcc_form_val = '';

	}


	}


	$replyall = false;
if(count($to_recipients) > 1)
{

	$replyall = false;
if(count($to_recipients) > 1)
{

Zeile 1169Zeile 1171
		if($mybb->usergroup['cantrackpms'] == 1)
{
$optionschecked['readreceipt'] = 'checked="checked"';

		if($mybb->usergroup['cantrackpms'] == 1)
{
$optionschecked['readreceipt'] = 'checked="checked"';

		}

		}


require_once MYBB_ROOT.'inc/functions_posting.php';



require_once MYBB_ROOT.'inc/functions_posting.php';


Zeile 1204Zeile 1206

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 1953Zeile 1956
		$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 1986Zeile 1989

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 2011Zeile 2014
					}
else
{

					}
else
{

						$foldername = addslashes($folderinfo[1]);

						$foldername = my_escape_csv($folderinfo[1]);

					}
$donefolder[$message['folder']] = 1;
}

					}
$donefolder[$message['folder']] = 1;
}

Zeile 2290Zeile 2293
			{ // 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 2399Zeile 2402
	}

$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 2463Zeile 2466
	}

$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")."\";");
}