From 69805f65c34633569d1df24224e040af4f8ffac6 Mon Sep 17 00:00:00 2001
From: Moc <tijnkuyper@gmail.com>
Date: Sat, 2 Aug 2014 13:26:21 +0200
Subject: [PATCH] Fixes #720 - PM's are now actually removed from the outbox
 when marked as deleted. PM is no longer deleted from sender's outbox when
 receiver deletes the PM from inbox.

---
 e107_plugins/pm/pm_class.php | 20 +++++++++-----------
 e107_plugins/pm/pm_func.php  |  2 +-
 2 files changed, 10 insertions(+), 12 deletions(-)

diff --git a/e107_plugins/pm/pm_class.php b/e107_plugins/pm/pm_class.php
index d58d383ca..eb05ab6a7 100755
--- a/e107_plugins/pm/pm_class.php
+++ b/e107_plugins/pm/pm_class.php
@@ -2,7 +2,7 @@
 /*
  * e107 website system
  *
- * Copyright (C) 2008-2013 e107 Inc (e107.org)
+ * Copyright (C) 2008-2014 e107 Inc (e107.org)
  * Released under the terms and conditions of the
  * GNU General Public License (http://www.gnu.org/licenses/gpl.txt)
  *
@@ -11,12 +11,6 @@
  */
 
 
-/**
- *	e107 Private messenger plugin
- *
- *	@package	e107_plugins
- *	@subpackage	pm
- */
 
 if (!defined('e107_INIT')) { exit; }
 
@@ -162,7 +156,7 @@ class private_message
 				'pm_read' => 0,							/* Date read */
 				'pm_subject' => $pm_subject,
 				'pm_text' => $pm_message,
-				'pm_sent_del' => 1,						/* Set when can delete */
+				'pm_sent_del' => 0,						/* Set when can delete */
 				'pm_read_del' => 0,						/* set when can delete */
 				'pm_attachments' => $attachlist,
 				'pm_option' => $pm_options,				/* Options associated with PM - '+rr' for read receipt */
@@ -279,18 +273,22 @@ class private_message
 		if($sql->select('private_msg', '*', 'pm_id = '.$pmid.' AND (pm_from = '.USERID.' OR pm_to = '.USERID.')'))
 		{
 			$row = $sql->fetch();
+
+			// if user is the receiver of the PM
 			if (!$force && ($row['pm_to'] == USERID))
 			{
 				$newvals = 'pm_read_del = 1';
 				$ret .= LAN_PM_42.'<br />';
-				if($row['pm_sent_del'] == 1) { $force = TRUE; }
+				if($row['pm_sent_del'] == 1) { $force = TRUE; } // sender has deleted as well, set force to true so the DB record can be deleted
 			}
+
+			// if user is the sender of the PM
 			if (!$force && ($row['pm_from'] == USERID))
 			{
 				if($newvals != '') { $force = TRUE; }
 				$newvals = 'pm_sent_del = 1';
 				$ret .= LAN_PM_43."<br />";
-				if($row['pm_read_del'] == 1) { $force = TRUE; }
+				if($row['pm_read_del'] == 1) { $force = TRUE; } // receiver has deleted as well, set force to true so the DB record can be deleted
 			}
 
 			if($force == TRUE)
@@ -620,7 +618,7 @@ class private_message
 		$qry = "
 		SELECT SQL_CALC_FOUND_ROWS pm.*, u.user_image, u.user_name FROM #private_msg AS pm
 		LEFT JOIN #user AS u ON u.user_id = pm.pm_to
-		WHERE pm.pm_from='{$uid}' AND pm.pm_read_del=0
+		WHERE pm.pm_from='{$uid}' AND pm.pm_sent_del = '0'
 		ORDER BY pm.pm_sent DESC
 		LIMIT ".$from.', '.$limit;
 		
diff --git a/e107_plugins/pm/pm_func.php b/e107_plugins/pm/pm_func.php
index 0ba74e35e..faf701569 100755
--- a/e107_plugins/pm/pm_func.php
+++ b/e107_plugins/pm/pm_func.php
@@ -67,7 +67,7 @@ class pmbox_manager
 		}
 		else
 		{
-			$qry = "SELECT count(pm.pm_from) AS total, SUM(pm.pm_size)/1024 size, SUM(pm.pm_read = 0) as unread FROM `#private_msg` as pm WHERE pm.pm_from = ".USERID." AND pm.pm_read_del = 0";
+			$qry = "SELECT count(pm.pm_from) AS total, SUM(pm.pm_size)/1024 size, SUM(pm.pm_read = 0) as unread FROM `#private_msg` as pm WHERE pm.pm_from = ".USERID." AND pm.pm_sent_del = 0";
 		}
 
 		if(!isset($pm_info[$which]['total']))