mirror/php-e107
1
0
Fork 0
mirror of https://github.com/e107inc/e107.git synced 2025-08-21 21:57:34 +02:00
Code Issues Releases Wiki Activity

Notice removal, small bug fixes

Browse Source
This commit is contained in:
e107steved
2010-01-04 21:35:38 +00:00
parent ab856f4f7d
commit 74f2c27c18
8 changed files with 124 additions and 71 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
e107_plugins/pm/pm_class.php
View File

@@ -9,8 +9,8 @@
* PM plugin - base class API
*
* $Source: /cvs_backup/e107_0.8/e107_plugins/pm/pm_class.php,v $
* $Revision: 1.12 $
* $Date: 2009-12-18 20:49:55 $
* $Revision: 1.13 $
* $Date: 2010-01-04 21:35:38 $
* $Author: e107steved $
*/
@@ -20,7 +20,7 @@
*
* @package e107_plugins
* @subpackage pm
* @version $Id: pm_class.php,v 1.12 2009-12-18 20:49:55 e107steved Exp $;
* @version $Id: pm_class.php,v 1.13 2010-01-04 21:35:38 e107steved Exp $;
*/
if (!defined('e107_INIT')) { exit; }
@@ -213,7 +213,7 @@ class private_message
$newvals = '';
if($this->e107->sql->db_Select('private_msg', '*', 'pm_id = '.$pmid.' AND (pm_from = '.USERID.' OR pm_to = '.USERID.')'))
{
$row = $sql->db_Fetch();
$row = $this->e107->sql->db_Fetch();
if($row['pm_to'] == USERID)
{
$newvals = 'pm_read_del = 1';
@@ -259,7 +259,7 @@ class private_message
/*
/**
* Send an email to notify of a PM
*
* @param int $uid - not used
@@ -286,7 +286,7 @@ class private_message
}
/*
/**
* Send PM read receipt
*
* @param array $pmInfo - PM details
@@ -357,8 +357,6 @@ class private_message
* @param int $to - user doing the blocking
*
* @return string result message
*
* @todo change db access to use arrays
*/
function block_add($from, $to = USERID)
{
@@ -373,7 +371,11 @@ class private_message
if(!$this->e107->sql->db_Count('private_msg_block', '(*)', 'WHERE pm_block_from = '.$from." AND pm_block_to = '".$this->e107->tp->toDB($to)."'"))
{
if($this->e107->sql->db_Insert('private_msg_block', "0, '".$from."', '".$this->e107->tp -> toDB($to)."', '".time()."', '0'"))
if($this->e107->sql->db_Insert('private_msg_block', array(
'pm_block_from' => $from,
'pm_block_to' => $to,
'pm_block_datestamp' => time()
)))
{
return str_replace('{UNAME}', $uinfo['user_name'], LAN_PM_47);
}

14
e107_plugins/pm/pm_conf.php
View File

@@ -9,8 +9,8 @@
* PM Plugin - administration
*
* $Source: /cvs_backup/e107_0.8/e107_plugins/pm/pm_conf.php,v $
* $Revision: 1.11 $
* $Date: 2009-12-17 22:47:20 $
* $Revision: 1.12 $
* $Date: 2010-01-04 21:35:38 $
* $Author: e107steved $
*/
@@ -20,20 +20,19 @@
*
* @package e107_plugins
* @subpackage pm
* @version $Id: pm_conf.php,v 1.11 2009-12-17 22:47:20 e107steved Exp $;
* @version $Id: pm_conf.php,v 1.12 2010-01-04 21:35:38 e107steved Exp $;
*/
/*
TODO:
1. Limits page needs some lines round the table
2. Limits page - test
2. Prefs - use new get method
3. Maintenance page - to be tested
4. Check operation of user dropdown/popup bit
4. Put prefs into plugin.xml
5. User option to enable/disable email notification of PMs
6. Cron-triggered bulk send.
7. What are implications of 'anyone but' userclasses?
8. Put prefs into plugin.xml
*/
@@ -110,8 +109,7 @@ if ($savePMP)
}
//$lan_file = e_PLUGIN.'pm/languages/admin/'.e_LANGUAGE.'.php';
// include_once(is_readable($lan_file) ? $lan_file : e_PLUGIN."pm/languages/admin/English.php");
//include_lan(e_PLUGIN.'pm/languages/admin/'.e_LANGUAGE.'.php');
if (isset($_POST['update_prefs']))
{