Vergleich private.php - 1.4.0 - 1.4.3

  Keine Änderungen   Hinzugefügt   Modifiziert   Entfernt
Zeile 6Zeile 6
 * Website: http://www.mybboard.net
* License: http://www.mybboard.net/about/license
*

 * Website: http://www.mybboard.net
* License: http://www.mybboard.net/about/license
*

 * $Id: private.php 4031 2008-07-20 20:56:39Z Tikitiki $

 * $Id: private.php 4188 2008-09-14 05:05:26Z Tikitiki $

 */

define("IN_MYBB", 1);

 */

define("IN_MYBB", 1);

 
define('THIS_SCRIPT', 'private.php');


$templatelist = "private_send,private_send_buddyselect,private_read,private_tracking,private_tracking_readmessage,private_tracking_unreadmessage";
$templatelist .= ",private_folders,private_folders_folder,private_folders_folder_unremovable,private,usercp_nav_changename,usercp_nav,private_empty_folder,private_empty,posticons";


$templatelist = "private_send,private_send_buddyselect,private_read,private_tracking,private_tracking_readmessage,private_tracking_unreadmessage";
$templatelist .= ",private_folders,private_folders_folder,private_folders_folder_unremovable,private,usercp_nav_changename,usercp_nav,private_empty_folder,private_empty,posticons";

Zeile 60Zeile 61
foreach($foldersexploded as $key => $folders)
{
$folderinfo = explode("**", $folders, 2);

foreach($foldersexploded as $key => $folders)
{
$folderinfo = explode("**", $folders, 2);

	if($fid == $folderinfo[0])

	if($mybb->input['fid'] == $folderinfo[0])

	{
$sel = ' selected="selected"';
}

	{
$sel = ' selected="selected"';
}

Zeile 386Zeile 387
			$postdate = my_date($mybb->settings['dateformat'], $pm['dateline']);
$posttime = my_date($mybb->settings['timeformat'], $pm['dateline']);
$message = "[quote={$pm['quotename']}]\n$message\n[/quote]";

			$postdate = my_date($mybb->settings['dateformat'], $pm['dateline']);
$posttime = my_date($mybb->settings['timeformat'], $pm['dateline']);
$message = "[quote={$pm['quotename']}]\n$message\n[/quote]";

			$quoted['message'] = preg_replace('#^/me (.*)$#im', "* ".$pm['quotename']." \\1", $quoted['message']);

			$pm['message'] = preg_replace('#^/me (.*)$#im', "* ".$pm['quotename']." \\1", $pm['message']);


if($mybb->input['do'] == 'forward')
{


if($mybb->input['do'] == 'forward')
{

Zeile 552Zeile 553
		
if($reply_date == $lang->today || $reply_date == $lang->yesterday)
{

		
if($reply_date == $lang->today || $reply_date == $lang->yesterday)
{

			$reply_data .= ', '.my_date($mybb->settings['timeformat'], $pm['statustime']);

			$reply_date .= ', '.my_date($mybb->settings['timeformat'], $pm['statustime']);

			$actioned_on = $lang->sprintf($lang->you_replied, $reply_date);
}
else
{

			$actioned_on = $lang->sprintf($lang->you_replied, $reply_date);
}
else
{

			$reply_data .= ', '.my_date($mybb->settings['timeformat'], $pm['statustime']);

			$reply_date .= ', '.my_date($mybb->settings['timeformat'], $pm['statustime']);

			$actioned_on = $lang->sprintf($lang->you_replied_on, $reply_date);
}


			$actioned_on = $lang->sprintf($lang->you_replied_on, $reply_date);
}


Zeile 567Zeile 568
	{
$forward_date = my_date($mybb->settings['dateformat'], $pm['statustime']);


	{
$forward_date = my_date($mybb->settings['dateformat'], $pm['statustime']);


		if(strpos($forward_date, $lang->today) !== false || strpos($forward_date, $lang->yesturday) !== false)

		if(strpos($forward_date, $lang->today) !== false || strpos($forward_date, $lang->yesterday) !== false)

		{
$forward_date .= ', '.my_date($mybb->settings['timeformat'], $pm['statustime']);
$actioned_on = $lang->sprintf($lang->you_forwarded, $forward_date);

		{
$forward_date .= ', '.my_date($mybb->settings['timeformat'], $pm['statustime']);
$actioned_on = $lang->sprintf($lang->you_forwarded, $forward_date);

Zeile 763Zeile 764
				$pmuids[$pm['uid']] = $pm['uid'];
}


				$pmuids[$pm['uid']] = $pm['uid'];
}


			$db->delete_query("privatemessages", "pmid IN ($pmids) AND fromid='".$mybb->user['uid']."'");

			$db->delete_query("privatemessages", "pmid IN ($pmids) AND receipt='1' AND status='0' AND fromid='".$mybb->user['uid']."'");

			foreach($pmuids as $uid)
{
// Message is canceled, update PM count for this user

			foreach($pmuids as $uid)
{
// Message is canceled, update PM count for this user

				update_pm_count($pm['uid']);

				update_pm_count($uid);

			}
}
$plugins->run_hooks("private_do_tracking_end");

			}
}
$plugins->run_hooks("private_do_tracking_end");

Zeile 1133Zeile 1134
			{
$wsql .= "<=";
}

			{
$wsql .= "<=";
}

			elseif($mybb->input['dayway'] == "newer")

			else

			{
$wsql .= ">=";
}

			{
$wsql .= ">=";
}

Zeile 1236Zeile 1237
			if($tofromuid == 0)
{
$tofromusername = "MyBB Engine";

			if($tofromuid == 0)
{
$tofromusername = "MyBB Engine";

			}

			}

			$tofrom = $lang->from;
}


			$tofrom = $lang->from;
}


Zeile 1274Zeile 1275
			);

$message['message'] = $parser->parse_message($message['message'], $parser_options);

			);

$message['message'] = $parser->parse_message($message['message'], $parser_options);

 
			$message['subject'] = htmlspecialchars_uni($message['subject']);

		}

if($mybb->input['exporttype'] == "txt" || $mybb->input['exporttype'] == "csv")

		}

if($mybb->input['exporttype'] == "txt" || $mybb->input['exporttype'] == "csv")

Zeile 1302Zeile 1304
					$foldername = $folderinfo[1];
if($mybb->input['exporttype'] != "csv")
{

					$foldername = $folderinfo[1];
if($mybb->input['exporttype'] != "csv")
{

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





						if($mybb->input['exporttype'] != "html")
{
$mybb->input['exporttype'] == "txt";
}
eval("\$pmsdownload .= \"".$templates->get("private_archive_".$mybb->input['exporttype']."_folderhead", 1, 0)."\";");

					}
else
{

					}
else
{

Zeile 1332Zeile 1338
	{
$filename = "pm-archive.html";
$contenttype = "text/html";

	{
$filename = "pm-archive.html";
$contenttype = "text/html";

	}

	}

	elseif($mybb->input['exporttype'] == "csv")

	elseif($mybb->input['exporttype'] == "csv")

	{

	{

		$filename = "pm-archive.csv";
$contenttype = "application/octet-stream";

		$filename = "pm-archive.csv";
$contenttype = "application/octet-stream";

	}
else
{

	}
else
{

		$filename = "pm-archive.txt";
$contenttype = "text/plain";
}

		$filename = "pm-archive.txt";
$contenttype = "text/plain";
}

Zeile 1430Zeile 1436
	{		
// Get all recipients into an array
$cached_users = $get_users = array();

	{		
// Get all recipients into an array
$cached_users = $get_users = array();

		$users_query = $db->simple_select("privatemessages", "recipients", "folder='$folder' AND uid='{$mybb->user['uid']}'", array('limit_start' => $start, 'limit' => $per_page));

		$users_query = $db->simple_select("privatemessages", "recipients", "folder='$folder' AND uid='{$mybb->user['uid']}'", array('limit_start' => $start, 'limit' => $perpage));

		while($row = $db->fetch_array($users_query))
{
$recipients = unserialize($row['recipients']);

		while($row = $db->fetch_array($users_query))
{
$recipients = unserialize($row['recipients']);

Zeile 1442Zeile 1448
			if(is_array($recipients['bcc']) && count($recipients['bcc']))
{
$get_users = array_merge($get_users, $recipients['bcc']);

			if(is_array($recipients['bcc']) && count($recipients['bcc']))
{
$get_users = array_merge($get_users, $recipients['bcc']);

			}
}

			}
}

		
$get_users = implode(',', array_unique($get_users));


		
$get_users = implode(',', array_unique($get_users));


Zeile 1544Zeile 1550
				}
}


				}
}


			if($tofromuid != 0)
{
$tofromusername = build_profile_link($tofromusername, $tofromuid);
}

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




			
if($mybb->usergroup['cantrackpms'] == 1 && $mybb->usergroup['candenypmreceipts'] == 1 && $message['receipt'] == '1' && $message['folder'] != '3' && $message['folder'] != 2)
{

			
if($mybb->usergroup['cantrackpms'] == 1 && $mybb->usergroup['candenypmreceipts'] == 1 && $message['receipt'] == '1' && $message['folder'] != '3' && $message['folder'] != 2)
{