From 10dd5dfae6cf36e11b815eec09aa668791b5c52e Mon Sep 17 00:00:00 2001
From: e107steved <steved@e107.org>
Date: Sat, 5 May 2007 20:06:47 +0000
Subject: [PATCH] Bugtracker #3936 - don't let users block PMs from main admins

---
 e107_plugins/pm/languages/English.php |  1 +
 e107_plugins/pm/pm_class.php          | 13 +++++++++----
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/e107_plugins/pm/languages/English.php b/e107_plugins/pm/languages/English.php
index a7eafddc7..cffeae8d9 100755
--- a/e107_plugins/pm/languages/English.php
+++ b/e107_plugins/pm/languages/English.php
@@ -64,6 +64,7 @@ define('LAN_PM_60', "You are not permitted to view this message");
 define('LAN_PM_61', "No subject");
 define('LAN_PM_62', "File: [{FILENAME}] exceeds size limit - not attached");
 define('LAN_PM_63', "class:");
+define('LAN_PM_64', 'ERROR: You are not permitted to block messages from site administrators');
 
 define("LAN_PM_100", "New PM from ");
 define("LAN_PM_101", "You have received a new Private Message from ");
diff --git a/e107_plugins/pm/pm_class.php b/e107_plugins/pm/pm_class.php
index 1f135247d..210413da8 100755
--- a/e107_plugins/pm/pm_class.php
+++ b/e107_plugins/pm/pm_class.php
@@ -11,8 +11,8 @@
 |     GNU General Public License (http://gnu.org).
 |
 |     $Source: /cvs_backup/e107_0.8/e107_plugins/pm/pm_class.php,v $
-|     $Revision: 1.2 $
-|     $Date: 2007-02-26 20:29:19 $
+|     $Revision: 1.3 $
+|     $Date: 2007-05-05 20:06:47 $
 |     $Author: e107steved $
 +----------------------------------------------------------------------------+
 */
@@ -226,9 +226,14 @@ class private_message
 	function block_add($from, $to = USERID)
 	{
 		global $sql, $tp;
-		if($sql->db_Select("user", "user_name", "user_id = '".intval($from)."'"))
+		if($sql->db_Select("user", "user_name, user_perms", "user_id = '".intval($from)."'"))
 		{
-			$uinfo = $sql->db_Fetch();
+		  $uinfo = $sql->db_Fetch();
+		  if (($uinfo['user_perms'] == '0') || ($uinfo['user_perms'] == '0.'))
+		  {  // Don't allow block of main admin
+		    return LAN_PM_64;
+		  }
+		  
 			if(!$sql->db_Count("private_msg_block", "(*)", "WHERE pm_block_from = '".intval($from)."' AND pm_block_to = '".$tp -> toDB($to)."'"))
 			{
 				if($sql->db_Insert("private_msg_block", "0, '".intval($from)."', '".$tp -> toDB($to)."', '".time()."', '0'"))