Vergleich private.php - 1.4.1 - 1.4.2

  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 4117 2008-08-15 15:38:41Z Tikitiki $

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

 */

define("IN_MYBB", 1);

 */

define("IN_MYBB", 1);

Zeile 764Zeile 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 1134Zeile 1134
			{
$wsql .= "<=";
}

			{
$wsql .= "<=";
}

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

			else

			{
$wsql .= ">=";
}

			{
$wsql .= ">=";
}

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

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

			}

			}

			$tofrom = $lang->from;
}

if($tofromuid == 0)
{
$message['fromusername'] = "MyBB Engine";

			$tofrom = $lang->from;
}

if($tofromuid == 0)
{
$message['fromusername'] = "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")
{
$senddate = my_date($mybb->settings['dateformat'], $message['dateline']);
$sendtime = my_date($mybb->settings['timeformat'], $message['dateline']);
$senddate .= " $lang->at $sendtime";

		$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 .= " $lang->at $sendtime";

		}

		}

		else
{
$senddate = $lang->not_sent;

		else
{
$senddate = $lang->not_sent;

Zeile 1275Zeile 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")
{
$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 1289Zeile 1290
			$message['subject'] = addslashes($message['subject']);
$message['tousername'] = addslashes($message['tousername']);
$message['fromusername'] = addslashes($message['fromusername']);

			$message['subject'] = addslashes($message['subject']);
$message['tousername'] = addslashes($message['tousername']);
$message['fromusername'] = addslashes($message['fromusername']);

		}

		}

		

if(!$donefolder[$message['folder']])

		

if(!$donefolder[$message['folder']])

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

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

					{





					{
if($mybb->input['exporttype'] != "html")
{
$mybb->input['exporttype'] == "txt";
}

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

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

Zeile 1338Zeile 1343
	{
$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 1443Zeile 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 1545Zeile 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)
{