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

Notice removal

Browse Source
This commit is contained in:
e107steved
2007-05-28 11:18:19 +00:00
parent 9de2ce60eb
commit f4fc7edcdb
3 changed files with 31 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
e107_plugins/pm/pm.php
View File

@@ -11,8 +11,8 @@
| GNU General Public License (http://gnu.org). | GNU General Public License (http://gnu.org).
| |
| $Source: /cvs_backup/e107_0.8/e107_plugins/pm/pm.php,v $ | $Source: /cvs_backup/e107_0.8/e107_plugins/pm/pm.php,v $
| $Revision: 1.2 $ | $Revision: 1.3 $
| $Date: 2006-12-30 12:41:46 $ | $Date: 2007-05-28 11:18:18 $
| $Author: e107steved $ | $Author: e107steved $
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
*/ */
@@ -27,8 +27,11 @@ include_once(is_readable($lan_file) ? $lan_file : e_PLUGIN."pm/languages/English
define("ATTACHMENT_ICON", "<img src='".e_PLUGIN."pm/images/attach.png' alt='' />"); define("ATTACHMENT_ICON", "<img src='".e_PLUGIN."pm/images/attach.png' alt='' />");
$qs = explode(".", e_QUERY); $qs = explode(".", e_QUERY);
$action = $qs[0]; $action = varset($qs[0],'inbox');
if($action == "") { $action = 'inbox'; } if (!$action) $action = 'inbox';
$pm_proc_id = intval(varset($qs[1],0));
$pm_prefs = $sysprefs->getArray("pm_prefs"); $pm_prefs = $sysprefs->getArray("pm_prefs");
if(!isset($pm_prefs['pm_class']) || !check_class($pm_prefs['pm_class'])) if(!isset($pm_prefs['pm_class']) || !check_class($pm_prefs['pm_class']))
@@ -85,7 +88,7 @@ if("del" == $action || isset($_POST['pm_delete_selected']))
} }
if('del' == $action) if('del' == $action)
{ {
$message = $pm->del(intval($qs[1])); $message = $pm->del($pm_proc_id);
} }
if($qs[2] != "") if($qs[2] != "")
{ {
@@ -107,19 +110,19 @@ if("del" == $action || isset($_POST['pm_delete_selected']))
if('block' == $action) if('block' == $action)
{ {
$message = $pm->block_add(intval($qs[1])); $message = $pm->block_add($pm_proc_id);
$action = 'inbox'; $action = 'inbox';
} }
if('unblock' == $action) if('unblock' == $action)
{ {
$message = $pm->block_del(intval($qs[1])); $message = $pm->block_del($pm_proc_id);
$action = 'inbox'; $action = 'inbox';
} }
if("get" == $action) if("get" == $action)
{ {
$pm->send_file(intval($qs[1]), intval($qs[2])); $pm->send_file($pm_proc_id, intval($qs[2]));
exit; exit;
} }
@@ -138,12 +141,12 @@ if($message != "")
if("send" == $action) if("send" == $action)
{ {
$ns->tablerender(LAN_PM, show_send(intval($qs[1]))); $ns->tablerender(LAN_PM, show_send($pm_proc_id));
} }
if("reply" == $action) if("reply" == $action)
{ {
$pmid = intval($qs[1]); $pmid = $pm_proc_id;
if($pm_info = $pm->pm_get($pmid)) if($pm_info = $pm->pm_get($pmid))
{ {
if($pm_info['pm_to'] != USERID) if($pm_info['pm_to'] != USERID)
@@ -163,17 +166,17 @@ if("reply" == $action)
if("inbox" == $action) if("inbox" == $action)
{ {
$ns->tablerender(LAN_PM." - ".LAN_PM_25, show_inbox(intval($qs[1])), "PM"); $ns->tablerender(LAN_PM." - ".LAN_PM_25, show_inbox($pm_proc_id), "PM");
} }
if("outbox" == $action) if("outbox" == $action)
{ {
$ns->tablerender(LAN_PM." - ".LAN_PM_26, show_outbox(intval($qs[1])), "PM"); $ns->tablerender(LAN_PM." - ".LAN_PM_26, show_outbox($pm_proc_id), "PM");
} }
if("show" == $action) if("show" == $action)
{ {
show_pm(intval($qs[1])); show_pm($pm_proc_id);
} }
require_once(FOOTERF); require_once(FOOTERF);
@@ -287,11 +290,11 @@ function show_pm($pmid)
$txt .= $tp->parseTemplate($PM_SHOW, true, $pm_shortcodes); $txt .= $tp->parseTemplate($PM_SHOW, true, $pm_shortcodes);
$ns -> tablerender(LAN_PM, $txt); $ns -> tablerender(LAN_PM, $txt);
if($pm_info['pm_from'] == USERID) { if($pm_info['pm_from'] == USERID) {
$ns->tablerender(LAN_PM." - ".LAN_PM_26, show_outbox(intval($qs[1])), "PM"); $ns->tablerender(LAN_PM." - ".LAN_PM_26, show_outbox($pm_proc_id), "PM");
} }
else else
{ {
$ns->tablerender(LAN_PM." - ".LAN_PM_25, show_inbox(intval($qs[1])), "PM"); $ns->tablerender(LAN_PM." - ".LAN_PM_25, show_inbox($pm_proc_id), "PM");
} }
} }

14
e107_plugins/pm/pm_func.php
View File

@@ -11,9 +11,9 @@
| GNU General Public License (http://gnu.org). | GNU General Public License (http://gnu.org).
| |
| $Source: /cvs_backup/e107_0.8/e107_plugins/pm/pm_func.php,v $ | $Source: /cvs_backup/e107_0.8/e107_plugins/pm/pm_func.php,v $
| $Revision: 1.1.1.1 $ | $Revision: 1.2 $
| $Date: 2006-12-02 04:35:38 $ | $Date: 2007-05-28 11:18:18 $
| $Author: mcfly_e107 $ | $Author: e107steved $
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
*/ */
if (!defined('e107_INIT')) { exit; } if (!defined('e107_INIT')) { exit; }
@@ -45,6 +45,10 @@ function pm_getInfo($which = "inbox")
{ {
$pm_info['inbox']['new'] = $new; $pm_info['inbox']['new'] = $new;
} }
else
{
$pm_info['inbox']['new'] = 0;
}
} }
} }
if(!isset($pm_info[$which]['limit'])) if(!isset($pm_info[$which]['limit']))
@@ -65,7 +69,7 @@ function pm_getInfo($which = "inbox")
$pm_info['inbox']['limit'] = $row['inbox_limit']; $pm_info['inbox']['limit'] = $row['inbox_limit'];
$pm_info['outbox']['limit'] = $row['outbox_limit']; $pm_info['outbox']['limit'] = $row['outbox_limit'];
} }
$pm_info['inbox']['limit_val'] = ($pref['pm_limits'] == 1 ? $pm_info['inbox']['total'] : $pm_info['inbox']['size']); $pm_info['inbox']['limit_val'] = ($pref['pm_limits'] == 1 ? varset($pm_info['inbox']['total'],'') : varset($pm_info['inbox']['size'],''));
if(!$pm_info['inbox']['limit'] || !$pm_info['inbox']['limit_val']) if(!$pm_info['inbox']['limit'] || !$pm_info['inbox']['limit_val'])
{ {
$pm_info['inbox']['filled'] = 0; $pm_info['inbox']['filled'] = 0;
@@ -74,7 +78,7 @@ function pm_getInfo($which = "inbox")
{ {
$pm_info['inbox']['filled'] = number_format($pm_info['inbox']['limit_val']/$pm_info['inbox']['limit'] * 100, 2); $pm_info['inbox']['filled'] = number_format($pm_info['inbox']['limit_val']/$pm_info['inbox']['limit'] * 100, 2);
} }
$pm_info['outbox']['limit_val'] = ($pref['pm_limits'] == 1 ? $pm_info['outbox']['total'] : $pm_info['outbox']['size']); $pm_info['outbox']['limit_val'] = ($pref['pm_limits'] == 1 ? varset($pm_info['outbox']['total'],'') : varset($pm_info['outbox']['size'],''));
if(!$pm_info['outbox']['limit'] || !$pm_info['outbox']['limit_val']) if(!$pm_info['outbox']['limit'] || !$pm_info['outbox']['limit_val'])
{ {
$pm_info['outbox']['filled'] = 0; $pm_info['outbox']['filled'] = 0;

8
e107_plugins/pm/private_msg_menu.php
View File

@@ -11,9 +11,9 @@
| GNU General Public License (http://gnu.org). | GNU General Public License (http://gnu.org).
| |
| $Source: /cvs_backup/e107_0.8/e107_plugins/pm/private_msg_menu.php,v $ | $Source: /cvs_backup/e107_0.8/e107_plugins/pm/private_msg_menu.php,v $
| $Revision: 1.1.1.1 $ | $Revision: 1.2 $
| $Date: 2006-12-02 04:35:39 $ | $Date: 2007-05-28 11:18:19 $
| $Author: mcfly_e107 $ | $Author: e107steved $
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
*/ */
if (!defined('e107_INIT')) { exit; } if (!defined('e107_INIT')) { exit; }
@@ -44,7 +44,7 @@ $sc_style['NEWPM_ANIMATE']['pre'] = "<a href='".e_PLUGIN_ABS."pm/pm.php?inbox'>"
$sc_style['NEWPM_ANIMATE']['post'] = "</a>"; $sc_style['NEWPM_ANIMATE']['post'] = "</a>";
if(!defined($pm_menu_template)) if(!isset($pm_menu_template))
{ {
$pm_menu_template = " $pm_menu_template = "
<a href='".e_PLUGIN_ABS."pm/pm.php?inbox'>".PM_INBOX_ICON."</a> <a href='".e_PLUGIN_ABS."pm/pm.php?inbox'>".PM_INBOX_ICON."</a>