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

PM Plugin - $emessage to $mes and minor LAN updates (#90, #6)

Browse Source
This commit is contained in:
Tijn Kuyper
2013-02-10 17:57:37 +01:00
parent ba199e08fd
commit 57dfccc37e
2 changed files with 25 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
e107_plugins/pm/languages/English_admin_pm.php
View File

@@ -68,7 +68,7 @@ define('ADLAN_PM_72', 'No PM timeouts set');
define('ADLAN_PM_73', '--COUNT-- time-expired PMs deleted'); define('ADLAN_PM_73', '--COUNT-- time-expired PMs deleted');
define('ADLAN_PM_74', 'Removed --COUNT-- messages sent by deleted users'); define('ADLAN_PM_74', 'Removed --COUNT-- messages sent by deleted users');
define('ADLAN_PM_75', 'Removed --COUNT-- messages received by deleted users'); define('ADLAN_PM_75', 'Removed --COUNT-- messages received by deleted users');
define('ADLAN_PM_76', 'No changes made - nothing logged'); //define('ADLAN_PM_76', 'No changes made - nothing logged');
define('ADLAN_PM_77', '(Empty all fields and Update to delete a limit)'); define('ADLAN_PM_77', '(Empty all fields and Update to delete a limit)');
define('ADLAN_PM_78', 'Check attachments'); define('ADLAN_PM_78', 'Check attachments');
define('ADLAN_PM_79', '--ORPHANS-- unused attachments deleted. --MISSING-- missing attachments noted'); define('ADLAN_PM_79', '--ORPHANS-- unused attachments deleted. --MISSING-- missing attachments noted');

37
e107_plugins/pm/pm_conf.php
View File

@@ -50,7 +50,8 @@ require_once(e_PLUGIN.'pm/pm_class.php');
//require_once(e_HANDLER.'userclass_class.php'); Should already be loaded //require_once(e_HANDLER.'userclass_class.php'); Should already be loaded
require_once(e_HANDLER.'form_handler.php'); require_once(e_HANDLER.'form_handler.php');
require_once (e_HANDLER.'message_handler.php'); require_once (e_HANDLER.'message_handler.php');
$emessage = &eMessage :: getInstance(); //$emessage = &eMessage :: getInstance();
$mes = e107::getMessage();
$action = e_QUERY; $action = e_QUERY;
@@ -137,7 +138,8 @@ if (isset($_POST['update_prefs']))
} }
else else
{ {
$emessage->add(ADLAN_PM_76, E_MESSAGE_INFO); //$emessage->add(ADLAN_PM_76, E_MESSAGE_INFO);
$mes->addInfo(LAN_NO_CHANGE);
} }
} }
@@ -174,7 +176,7 @@ if (isset($_POST['pm_maint_execute']))
{ {
foreach ($ma as $m) foreach ($ma as $m)
{ {
$emessage->add($m, $k); $mes->add($m, $k);
} }
} }
} }
@@ -187,7 +189,8 @@ if(isset($_POST['addlimit']))
$id = intval($_POST['newlimit_class']); $id = intval($_POST['newlimit_class']);
if($sql->db_Select('generic','gen_id',"gen_type = 'pm_limit' AND gen_datestamp = ".$id)) if($sql->db_Select('generic','gen_id',"gen_type = 'pm_limit' AND gen_datestamp = ".$id))
{ {
$emessage->add(ADLAN_PM_5, E_MESSAGE_INFO); // 'Limit for selected user class already exists' //$emessage->add(ADLAN_PM_5, E_MESSAGE_INFO); // 'Limit for selected user class already exists'
$mes->addInfo(ADLAN_PM_5); // 'Limit for selected user class already exists'
} }
else else
{ {
@@ -202,12 +205,14 @@ if(isset($_POST['addlimit']))
if($sql->db_Insert('generic', $limArray)) if($sql->db_Insert('generic', $limArray))
{ {
$e107->admin_log->logArrayAll('PM_ADM_05', $limArray); $e107->admin_log->logArrayAll('PM_ADM_05', $limArray);
$emessage->add(ADLAN_PM_6, E_MESSAGE_SUCCESS); //$emessage->add(ADLAN_PM_6, E_MESSAGE_SUCCESS);
$mes->addSuccess(ADLAN_PM_6);
} }
else else
{ {
$e107->admin_log->log_event('PM_ADM_08', ''); $e107->admin_log->log_event('PM_ADM_08', '');
$emessage->add(ADLAN_PM_7, E_MESSAGE_ERROR); //$emessage->add(ADLAN_PM_7, E_MESSAGE_ERROR);
$mes->addError(ADLAN_PM_7);
} }
} }
} }
@@ -219,7 +224,8 @@ if(isset($_POST['updatelimits']))
{ {
$pm_prefs['pm_limits'] = $limitVal; $pm_prefs['pm_limits'] = $limitVal;
//$sysprefs->setArray('pm_prefs'); //$sysprefs->setArray('pm_prefs');
$emessage->add(ADLAN_PM_8, E_MESSAGE_SUCCESS); //$emessage->add(ADLAN_PM_8, E_MESSAGE_SUCCESS);
$mes->addSuccess(ADLAN_PM_8);
} }
foreach(array_keys($_POST['inbox_count']) as $id) foreach(array_keys($_POST['inbox_count']) as $id)
{ {
@@ -230,12 +236,14 @@ if(isset($_POST['updatelimits']))
if($sql->db_Delete('generic','gen_id = '.$id)) if($sql->db_Delete('generic','gen_id = '.$id))
{ {
$e107->admin_log->log_event('PM_ADM_07', 'ID: '.$id); $e107->admin_log->log_event('PM_ADM_07', 'ID: '.$id);
$emessage->add($id.ADLAN_PM_9, E_MESSAGE_SUCCESS); //$emessage->add($id.ADLAN_PM_9, E_MESSAGE_SUCCESS);
$mes->addSuccess($id.ADLAN_PM_9);
} }
else else
{ {
$e107->admin_log->log_event('PM_ADM_10', ''); $e107->admin_log->log_event('PM_ADM_10', '');
$emessage->add($id.ADLAN_PM_10, E_MESSAGE_ERROR); //$emessage->add($id.ADLAN_PM_10, E_MESSAGE_ERROR);
$mes->addError($id.ADLAN_PM_10);
} }
} }
else else
@@ -249,24 +257,27 @@ if(isset($_POST['updatelimits']))
if ($sql->db_Update('generic',array('data' => $limArray, 'WHERE' => 'gen_id = '.$id))) if ($sql->db_Update('generic',array('data' => $limArray, 'WHERE' => 'gen_id = '.$id)))
{ {
$e107->admin_log->logArrayAll('PM_ADM_06', $limArray); $e107->admin_log->logArrayAll('PM_ADM_06', $limArray);
$emessage->add($id.ADLAN_PM_11, E_MESSAGE_SUCCESS); //$emessage->add($id.ADLAN_PM_11, E_MESSAGE_SUCCESS);
$mes->addSuccess($id.ADLAN_PM_11);
} }
else else
{ {
$e107->admin_log->log_event('PM_ADM_09', ''); $e107->admin_log->log_event('PM_ADM_09', '');
$emessage->add($id.ADLAN_PM_7, E_MESSAGE_ERROR); //$emessage->add($id.ADLAN_PM_7, E_MESSAGE_ERROR);
$mes->addError($id.ADLAN_PM_7);
} }
} }
} }
} }
/*
if ($emessage->hasMessage()) if ($emessage->hasMessage())
{ {
$e107->ns->tablerender(ADLAN_PM_58, $emessage->render()); $e107->ns->tablerender(ADLAN_PM_58, $emessage->render());
} }
*/
$ns->tablerender($caption, $mes->render() . $text);
switch ($action) switch ($action)