Vergleich private.php - 1.8.3 - 1.8.4

  Keine Änderungen   Hinzugefügt   Modifiziert   Entfernt
Zeile 15Zeile 15
$templatelist = "private_send,private_send_buddyselect,private_read,private_tracking,private_tracking_readmessage,private_tracking_unreadmessage,private_orderarrow,usercp_nav_attachments,usercp_nav_messenger_compose,private_tracking_readmessage_stop";
$templatelist .= ",private_folders,private_folders_folder,private_folders_folder_unremovable,private,usercp_nav,private_empty_folder,private_empty,private_archive_txt,private_archive_csv,private_archive_html,private_tracking_unreadmessage_stop";
$templatelist .= ",usercp_nav_messenger,usercp_nav_changename,usercp_nav_profile,usercp_nav_misc,multipage,multipage_end,multipage_jump_page,multipage_nextpage,multipage_page,multipage_page_current,multipage_page_link_current,multipage_prevpage,multipage_start,usercp_nav_editsignature,posticons_icon";

$templatelist = "private_send,private_send_buddyselect,private_read,private_tracking,private_tracking_readmessage,private_tracking_unreadmessage,private_orderarrow,usercp_nav_attachments,usercp_nav_messenger_compose,private_tracking_readmessage_stop";
$templatelist .= ",private_folders,private_folders_folder,private_folders_folder_unremovable,private,usercp_nav,private_empty_folder,private_empty,private_archive_txt,private_archive_csv,private_archive_html,private_tracking_unreadmessage_stop";
$templatelist .= ",usercp_nav_messenger,usercp_nav_changename,usercp_nav_profile,usercp_nav_misc,multipage,multipage_end,multipage_jump_page,multipage_nextpage,multipage_page,multipage_page_current,multipage_page_link_current,multipage_prevpage,multipage_start,usercp_nav_editsignature,posticons_icon";

$templatelist .= ",private_messagebit,codebuttons,smilieinsert,smilieinsert_getmore,smilieinsert_smilie,smilieinsert_smilie_empty,posticons,private_send_autocomplete,private_messagebit_denyreceipt,private_read_to,postbit_online";

$templatelist .= ",private_messagebit,codebuttons,smilieinsert,smilieinsert_getmore,smilieinsert_smilie,smilieinsert_smilie_empty,posticons,private_send_autocomplete,private_messagebit_denyreceipt,private_read_to,postbit_online,postbit_warninglevel_formatted,postbit_iplogged_hiden";

$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,postbit_purgespammer";

$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,postbit_purgespammer";

$templatelist .= ",private_archive,private_quickreply,private_pmspace,private_limitwarning,postbit_groupimage,postbit_offline,postbit_www,postbit_replyall_pm,postbit_signature,postbit_classic,postbit_gotopost";

$templatelist .= ",private_archive,private_quickreply,private_pmspace,private_limitwarning,postbit_groupimage,postbit_offline,postbit_www,postbit_replyall_pm,postbit_signature,postbit_classic,postbit_gotopost,postbit_userstar,postbit_reputation_formatted_link,postbit_icon";

$templatelist .= ",private_archive_folders_folder,private_archive_folders,postbit_warninglevel,postbit_author_user,postbit_reply_pm,postbit_forward_pm,private_messagebit_icon,private_jump_folders_folder,private_advanced_search_folders";
$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,private_emptyexportlink";


$templatelist .= ",private_archive_folders_folder,private_archive_folders,postbit_warninglevel,postbit_author_user,postbit_reply_pm,postbit_forward_pm,private_messagebit_icon,private_jump_folders_folder,private_advanced_search_folders";
$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,private_emptyexportlink";


Zeile 58Zeile 58
	update_pm_count();
}


	update_pm_count();
}


$mybb->input['fid'] = $mybb->get_input('fid', 1);

$mybb->input['fid'] = $mybb->get_input('fid', MyBB::INPUT_INT);


$folder_id = $folder_name = '';



$folder_id = $folder_name = '';


Zeile 166Zeile 166
		}
}


		}
}


	if($mybb->get_input('subject', 1) != 1 && $mybb->get_input('message', 1) != 1)

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

	{
error($lang->error_nosearchresults);
}


	{
error($lang->error_nosearchresults);
}


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

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

	{
$resulttype = "pmmessages";
}

	{
$resulttype = "pmmessages";
}

Zeile 182Zeile 182

$search_data = array(
"keywords" => $mybb->get_input('keywords'),


$search_data = array(
"keywords" => $mybb->get_input('keywords'),

		"subject" => $mybb->get_input('subject', 1),
"message" => $mybb->get_input('message', 1),

		"subject" => $mybb->get_input('subject', MyBB::INPUT_INT),
"message" => $mybb->get_input('message', MyBB::INPUT_INT),

		"sender" => $mybb->get_input('sender'),

		"sender" => $mybb->get_input('sender'),

		"status" => $mybb->get_input('status', 2),
"folder" => $mybb->get_input('folder', 2)

		"status" => $mybb->get_input('status', MyBB::INPUT_ARRAY),
"folder" => $mybb->get_input('folder', MyBB::INPUT_ARRAY)

	);

if($db->can_search == true)

	);

if($db->can_search == true)

Zeile 285Zeile 285

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

	$page = $mybb->get_input('page', 1);

	$page = $mybb->get_input('page', MyBB::INPUT_INT);

	if($page > 0)
{
$start = ($page-1) * $perpage;

	if($page > 0)
{
$start = ($page-1) * $perpage;

Zeile 580Zeile 580
	$pm = array(
"subject" => $mybb->get_input('subject'),
"message" => $mybb->get_input('message'),

	$pm = array(
"subject" => $mybb->get_input('subject'),
"message" => $mybb->get_input('message'),

		"icon" => $mybb->get_input('icon', 1),

		"icon" => $mybb->get_input('icon', MyBB::INPUT_INT),

		"fromid" => $mybb->user['uid'],
"do" => $mybb->get_input('do'),

		"fromid" => $mybb->user['uid'],
"do" => $mybb->get_input('do'),

		"pmid" => $mybb->get_input('pmid', 1),

		"pmid" => $mybb->get_input('pmid', MyBB::INPUT_INT),

		"ipaddress" => $session->packedip
);


		"ipaddress" => $session->packedip
);


Zeile 596Zeile 596
		$pm['bcc'] = array_map("trim", $pm['bcc']);
}


		$pm['bcc'] = array_map("trim", $pm['bcc']);
}


	$mybb->input['options'] = $mybb->get_input('options', 2);

	$mybb->input['options'] = $mybb->get_input('options', MyBB::INPUT_ARRAY);


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


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

Zeile 689Zeile 689

if(!empty($mybb->input['preview']) || $send_errors)
{


if(!empty($mybb->input['preview']) || $send_errors)
{

		$options = $mybb->get_input('options', 2);

		$options = $mybb->get_input('options', MyBB::INPUT_ARRAY);

		if(isset($options['signature']) && $options['signature'] == 1)
{
$optionschecked['signature'] = 'checked="checked"';

		if(isset($options['signature']) && $options['signature'] == 1)
{
$optionschecked['signature'] = 'checked="checked"';

Zeile 714Zeile 714
	// Preview
if(!empty($mybb->input['preview']))
{

	// Preview
if(!empty($mybb->input['preview']))
{

		$options = $mybb->get_input('options', 2);

		$options = $mybb->get_input('options', MyBB::INPUT_ARRAY);

		$query = $db->query("
SELECT u.username AS userusername, u.*, f.*
FROM ".TABLE_PREFIX."users u

		$query = $db->query("
SELECT u.username AS userusername, u.*, f.*
FROM ".TABLE_PREFIX."users u

Zeile 728Zeile 728
		$post['postusername'] = $mybb->user['username'];
$post['message'] = $mybb->get_input('message');
$post['subject'] = htmlspecialchars_uni($mybb->get_input('subject'));

		$post['postusername'] = $mybb->user['username'];
$post['message'] = $mybb->get_input('message');
$post['subject'] = htmlspecialchars_uni($mybb->get_input('subject'));

		$post['icon'] = $mybb->get_input('icon', 1);

		$post['icon'] = $mybb->get_input('icon', MyBB::INPUT_INT);

		if(!isset($options['disablesmilies']))
{
$options['disablesmilies'] = 0;

		if(!isset($options['disablesmilies']))
{
$options['disablesmilies'] = 0;

Zeile 785Zeile 785
			SELECT pm.*, u.username AS quotename
FROM ".TABLE_PREFIX."privatemessages pm
LEFT JOIN ".TABLE_PREFIX."users u ON (u.uid=pm.fromid)

			SELECT pm.*, u.username AS quotename
FROM ".TABLE_PREFIX."privatemessages pm
LEFT JOIN ".TABLE_PREFIX."users u ON (u.uid=pm.fromid)

			WHERE pm.pmid='".$mybb->get_input('pmid', 1)."' AND pm.uid='{$mybb->user['uid']}'

			WHERE pm.pmid='".$mybb->get_input('pmid', MyBB::INPUT_INT)."' AND pm.uid='{$mybb->user['uid']}'

		");

$pm = $db->fetch_array($query);

		");

$pm = $db->fetch_array($query);

Zeile 912Zeile 912
	}

// New PM with recipient preset

	}

// New PM with recipient preset

	if($mybb->get_input('uid', 1) && empty($mybb->input['preview']))

	if($mybb->get_input('uid', MyBB::INPUT_INT) && empty($mybb->input['preview']))

	{

	{

		$query = $db->simple_select('users', 'username', "uid='".$mybb->get_input('uid', 1)."'");

		$query = $db->simple_select('users', 'username', "uid='".$mybb->get_input('uid', MyBB::INPUT_INT)."'");

		$to = htmlspecialchars_uni($db->fetch_field($query, 'username')).', ';
}


		$to = htmlspecialchars_uni($db->fetch_field($query, 'username')).', ';
}


Zeile 933Zeile 933
	// Load the auto complete javascript if it is enabled.
eval("\$autocompletejs = \"".$templates->get("private_send_autocomplete")."\";");


	// Load the auto complete javascript if it is enabled.
eval("\$autocompletejs = \"".$templates->get("private_send_autocomplete")."\";");


	$pmid = $mybb->get_input('pmid', 1);

	$pmid = $mybb->get_input('pmid', MyBB::INPUT_INT);

	$do = $mybb->get_input('do');
if($do != "forward" && $do != "reply" && $do != "replyall")
{

	$do = $mybb->get_input('do');
if($do != "forward" && $do != "reply" && $do != "replyall")
{

Zeile 967Zeile 967
{
$plugins->run_hooks("private_read");


{
$plugins->run_hooks("private_read");


	$pmid = $mybb->get_input('pmid', 1);

	$pmid = $mybb->get_input('pmid', MyBB::INPUT_INT);


$query = $db->query("
SELECT pm.*, u.*, f.*


$query = $db->query("
SELECT pm.*, u.*, f.*

Zeile 1006Zeile 1006

if($pm['receipt'] == 1)
{


if($pm['receipt'] == 1)
{

		if($mybb->usergroup['candenypmreceipts'] == 1 && $mybb->get_input('denyreceipt', 1) == 1)

		if($mybb->usergroup['candenypmreceipts'] == 1 && $mybb->get_input('denyreceipt', MyBB::INPUT_INT) == 1)

		{
$receiptadd = 0;
}

		{
$receiptadd = 0;
}

Zeile 1233Zeile 1233
	$query = $db->simple_select("privatemessages", "COUNT(pmid) as readpms", "receipt='2' AND folder!='3' AND status!='0' AND fromid='".$mybb->user['uid']."'");
$postcount = $db->fetch_field($query, "readpms");


	$query = $db->simple_select("privatemessages", "COUNT(pmid) as readpms", "receipt='2' AND folder!='3' AND status!='0' AND fromid='".$mybb->user['uid']."'");
$postcount = $db->fetch_field($query, "readpms");


	$page = $mybb->get_input('read_page', 1);

	$page = $mybb->get_input('read_page', MyBB::INPUT_INT);

	$pages = $postcount / $perpage;
$pages = ceil($pages);


	$pages = $postcount / $perpage;
$pages = ceil($pages);


Zeile 1289Zeile 1289
	$query = $db->simple_select("privatemessages", "COUNT(pmid) as unreadpms", "receipt='1' AND folder!='3' AND status='0' AND fromid='".$mybb->user['uid']."'");
$postcount = $db->fetch_field($query, "unreadpms");


	$query = $db->simple_select("privatemessages", "COUNT(pmid) as unreadpms", "receipt='1' AND folder!='3' AND status='0' AND fromid='".$mybb->user['uid']."'");
$postcount = $db->fetch_field($query, "unreadpms");


	$page = $mybb->get_input('unread_page', 1);

	$page = $mybb->get_input('unread_page', MyBB::INPUT_INT);

	$pages = $postcount / $perpage;
$pages = ceil($pages);


	$pages = $postcount / $perpage;
$pages = ceil($pages);


Zeile 1358Zeile 1358

if(!empty($mybb->input['stoptracking']))
{


if(!empty($mybb->input['stoptracking']))
{

		$mybb->input['readcheck'] = $mybb->get_input('readcheck', 2);

		$mybb->input['readcheck'] = $mybb->get_input('readcheck', MyBB::INPUT_ARRAY);

		if(!empty($mybb->input['readcheck']))
{
foreach($mybb->input['readcheck'] as $key => $val)

		if(!empty($mybb->input['readcheck']))
{
foreach($mybb->input['readcheck'] as $key => $val)

Zeile 1374Zeile 1374
	}
elseif(!empty($mybb->input['stoptrackingunread']))
{

	}
elseif(!empty($mybb->input['stoptrackingunread']))
{

		$mybb->input['unreadcheck'] = $mybb->get_input('unreadcheck', 2);

		$mybb->input['unreadcheck'] = $mybb->get_input('unreadcheck', MyBB::INPUT_ARRAY);

		if(!empty($mybb->input['unreadcheck']))
{
foreach($mybb->input['unreadcheck'] as $key => $val)

		if(!empty($mybb->input['unreadcheck']))
{
foreach($mybb->input['unreadcheck'] as $key => $val)

Zeile 1390Zeile 1390
	}
elseif(!empty($mybb->input['cancel']))
{

	}
elseif(!empty($mybb->input['cancel']))
{

		$mybb->input['unreadcheck'] = $mybb->get_input('unreadcheck', 2);

		$mybb->input['unreadcheck'] = $mybb->get_input('unreadcheck', MyBB::INPUT_ARRAY);

		if(!empty($mybb->input['unreadcheck']))
{
foreach($mybb->input['unreadcheck'] as $pmid => $val)

		if(!empty($mybb->input['unreadcheck']))
{
foreach($mybb->input['unreadcheck'] as $pmid => $val)

Zeile 1482Zeile 1482
	$highestid = 2;
$folders = '';
$donefolders = array();

	$highestid = 2;
$folders = '';
$donefolders = array();

	$mybb->input['folder'] = $mybb->get_input('folder', 2);

	$mybb->input['folder'] = $mybb->get_input('folder', MyBB::INPUT_ARRAY);

	foreach($mybb->input['folder'] as $key => $val)
{
if(empty($donefolders[$val]) )// Probably was a check for duplicate folder names, but doesn't seem to be used now

	foreach($mybb->input['folder'] as $key => $val)
{
if(empty($donefolders[$val]) )// Probably was a check for duplicate folder names, but doesn't seem to be used now

Zeile 1611Zeile 1611
	$plugins->run_hooks("private_do_empty_start");

$emptyq = '';

	$plugins->run_hooks("private_do_empty_start");

$emptyq = '';

	$mybb->input['empty'] = $mybb->get_input('empty', 2);

	$mybb->input['empty'] = $mybb->get_input('empty', MyBB::INPUT_ARRAY);

	$keepunreadq = '';

	$keepunreadq = '';

	if($mybb->get_input('keepunread', 1) == 1)

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

	{
$keepunreadq = " AND status!='0'";
}

	{
$keepunreadq = " AND status!='0'";
}

Zeile 1658Zeile 1658
	}
elseif(!empty($mybb->input['moveto']))
{

	}
elseif(!empty($mybb->input['moveto']))
{

		$mybb->input['check'] = $mybb->get_input('check', 2);

		$mybb->input['check'] = $mybb->get_input('check', MyBB::INPUT_ARRAY);

		if(!empty($mybb->input['check']))
{
foreach($mybb->input['check'] as $key => $val)

		if(!empty($mybb->input['check']))
{
foreach($mybb->input['check'] as $key => $val)

Zeile 1674Zeile 1674

if(!empty($mybb->input['fromfid']))
{


if(!empty($mybb->input['fromfid']))
{

			redirect("private.php?fid=".$mybb->get_input('fromfid', 1), $lang->redirect_pmsmoved);

			redirect("private.php?fid=".$mybb->get_input('fromfid', MyBB::INPUT_INT), $lang->redirect_pmsmoved);

		}
else
{

		}
else
{

Zeile 1683Zeile 1683
	}
elseif(!empty($mybb->input['delete']))
{

	}
elseif(!empty($mybb->input['delete']))
{

		$mybb->input['check'] = $mybb->get_input('check', 2);

		$mybb->input['check'] = $mybb->get_input('check', MyBB::INPUT_ARRAY);

		if(!empty($mybb->input['check']))
{
$pmssql = '';

		if(!empty($mybb->input['check']))
{
$pmssql = '';

Zeile 1725Zeile 1725

if(!empty($mybb->input['fromfid']))
{


if(!empty($mybb->input['fromfid']))
{

			redirect("private.php?fid=".$mybb->get_input('fromfid', 1), $lang->redirect_pmsdeleted);

			redirect("private.php?fid=".$mybb->get_input('fromfid', MyBB::INPUT_INT), $lang->redirect_pmsdeleted);

		}
else
{

		}
else
{

Zeile 1741Zeile 1741

$plugins->run_hooks("private_delete_start");



$plugins->run_hooks("private_delete_start");


	$query = $db->simple_select("privatemessages", "*", "pmid='".$mybb->get_input('pmid', 1)."' AND uid='".$mybb->user['uid']."' AND folder='4'", array('order_by' => 'pmid'));

	$query = $db->simple_select("privatemessages", "*", "pmid='".$mybb->get_input('pmid', MyBB::INPUT_INT)."' AND uid='".$mybb->user['uid']."' AND folder='4'", array('order_by' => 'pmid'));

	if($db->num_rows($query) == 1)
{

	if($db->num_rows($query) == 1)
{

		$db->delete_query("privatemessages", "pmid='".$mybb->get_input('pmid', 1)."'");

		$db->delete_query("privatemessages", "pmid='".$mybb->get_input('pmid', MyBB::INPUT_INT)."'");

	}
else
{

	}
else
{

Zeile 1752Zeile 1752
			"folder" => 4,
"deletetime" => TIME_NOW
);

			"folder" => 4,
"deletetime" => TIME_NOW
);

		$db->update_query("privatemessages", $sql_array, "pmid='".$mybb->get_input('pmid', 1)."' AND uid='".$mybb->user['uid']."'");

		$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

Zeile 1812Zeile 1812
		$foldersexploded[$key] = implode("**", $folderinfo);
}


		$foldersexploded[$key] = implode("**", $folderinfo);
}


	if($mybb->get_input('pmid', 1))

	if($mybb->get_input('pmid', MyBB::INPUT_INT))

	{

	{

		$wsql = "pmid='".$mybb->get_input('pmid', 1)."' AND uid='".$mybb->user['uid']."'";

		$wsql = "pmid='".$mybb->get_input('pmid', MyBB::INPUT_INT)."' AND uid='".$mybb->user['uid']."'";

	}
else
{

	}
else
{

		if($mybb->get_input('daycut', 1) && ($mybb->get_input('dayway') != "disregard"))

		if($mybb->get_input('daycut', MyBB::INPUT_INT) && ($mybb->get_input('dayway') != "disregard"))

		{

		{

			$datecut = TIME_NOW-($mybb->get_input('daycut', 1) * 86400);

			$datecut = TIME_NOW-($mybb->get_input('daycut', MyBB::INPUT_INT) * 86400);

			$wsql = "pm.dateline";
if($mybb->get_input('dayway') == "older")
{

			$wsql = "pm.dateline";
if($mybb->get_input('dayway') == "older")
{

Zeile 1837Zeile 1837
			$wsql = "1=1";
}


			$wsql = "1=1";
}


		$mybb->input['exportfolders'] = $mybb->get_input('exportfolders', 2);

		$mybb->input['exportfolders'] = $mybb->get_input('exportfolders', MyBB::INPUT_ARRAY);

		if(!empty($mybb->input['exportfolders']))
{
$folderlst = '';

		if(!empty($mybb->input['exportfolders']))
{
$folderlst = '';

Zeile 1872Zeile 1872
			error($lang->error_pmnoarchivefolders);
}


			error($lang->error_pmnoarchivefolders);
}


		if($mybb->get_input('exportunread', 1) != 1)

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

		{
$wsql .= " AND pm.status!='0'";
}

		{
$wsql .= " AND pm.status!='0'";
}

Zeile 2027Zeile 2027
	$plugins->run_hooks("private_do_export_end");

eval("\$archived = \"".$templates->get("private_archive_".$mybb->input['exporttype'], 1, 0)."\";");

	$plugins->run_hooks("private_do_export_end");

eval("\$archived = \"".$templates->get("private_archive_".$mybb->input['exporttype'], 1, 0)."\";");

	if($mybb->get_input('deletepms', 1) == 1)

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

	{ // delete the archived pms
$db->delete_query("privatemessages", "pmid IN ('0'$ids)");
// Update PM count

	{ // delete the archived pms
$db->delete_query("privatemessages", "pmid IN ('0'$ids)");
// Update PM count

Zeile 2134Zeile 2134
	}

$perpage = $mybb->settings['threadsperpage'];

	}

$perpage = $mybb->settings['threadsperpage'];

	$page = $mybb->get_input('page', 1);

	$page = $mybb->get_input('page', MyBB::INPUT_INT);


if($page > 0)
{


if($page > 0)
{