mirror/php-e107
1
0
Fork 0
mirror of https://github.com/e107inc/e107.git synced 2025-07-29 02:40:25 +02:00
Code Issues Releases Wiki Activity

Bugtracker #3936 - don't let users block PMs from main admins

Browse Source
This commit is contained in:
e107steved
2007-05-05 20:06:47 +00:00
parent 6ceffbf2bd
commit 10dd5dfae6
2 changed files with 10 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
e107_plugins/pm/languages/English.php
View File

@@ -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 ");

13
e107_plugins/pm/pm_class.php
View File

@@ -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'"))