mirror/php-e107
1
0
Fork 0
mirror of https://github.com/e107inc/e107.git synced 2025-04-20 04:32:01 +02:00
Code Issues Releases Wiki Activity

Bugtracker #4068 - PM display after message delete

Browse Source
This commit is contained in:
e107steved 2007-09-22 17:41:29 +00:00
parent a638c2348e
commit 7e00c71835
2 changed files with 17 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
e107_plugins/pm/pm.php
View File

@ -11,9 +11,9 @@
| GNU General Public License (http://gnu.org).
|
| $Source: /cvs_backup/e107_0.8/e107_plugins/pm/pm.php,v $
| $Revision: 1.5 $
| $Date: 2007-07-14 20:38:11 $
| $Author: mcfly_e107 $
| $Revision: 1.6 $
| $Date: 2007-09-22 17:41:20 $
| $Author: e107steved $
+----------------------------------------------------------------------------+
*/
@ -283,18 +283,19 @@ function show_pm($pmid)
exit;
}
if($pm_info['pm_read'] == 0 && $pm_info['pm_to'] == USERID)
{
{ // Inbox
$now = time();
$pm_info['pm_read'] = $now;
$pm->pm_mark_read($pmid, $pm_info);
}
$txt .= $tp->parseTemplate($PM_SHOW, true, $pm_shortcodes);
$ns -> tablerender(LAN_PM, $txt);
if($pm_info['pm_from'] == USERID) {
if($pm_info['pm_from'] == USERID)
{ // Show Outbox
$ns->tablerender(LAN_PM." - ".LAN_PM_26, show_outbox($pm_proc_id), "PM");
}
else
{
{ // Show Inbox
$ns->tablerender(LAN_PM." - ".LAN_PM_25, show_inbox($pm_proc_id), "PM");
}
}

13
e107_plugins/pm/pm_shortcodes.php
View File

@ -11,8 +11,8 @@
| GNU General Public License (http://gnu.org).
|
| $Source: /cvs_backup/e107_0.8/e107_plugins/pm/pm_shortcodes.php,v $
| $Revision: 1.4 $
| $Date: 2007-03-14 20:08:04 $
| $Revision: 1.5 $
| $Date: 2007-09-22 17:41:20 $
| $Author: e107steved $
+----------------------------------------------------------------------------+
*/
@ -296,7 +296,14 @@ SC_END
SC_BEGIN PM_DELETE
global $pm_info;
$extra = $parm != "" ? ".{$parm}" : "";
if($parm != "")
{
$extra = '.'.$parm;
}
else
{
$extra = '.'.($pm_info['pm_from'] == USERID ? 'outbox' : 'inbox');
}
return "<a href='".e_PLUGIN_ABS."pm/pm.php?del.{$pm_info['pm_id']}{$extra}'><img src='".e_PLUGIN_ABS."pm/images/mail_delete.png' title='".LAN_PM_52."' alt='".LAN_PM_52."' style='width: 16px; height: 16px; border: 0px' /></a>";
SC_END