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

Another attack on globals and notices

Browse Source
This commit is contained in:
e107steved
2009-12-17 22:47:20 +00:00
parent 585a8e3d61
commit 17b98ac017
14 changed files with 522 additions and 264 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
e107_plugins/pm/pm_conf.php
View File

@@ -9,12 +9,21 @@
* PM Plugin - administration
*
* $Source: /cvs_backup/e107_0.8/e107_plugins/pm/pm_conf.php,v $
* $Revision: 1.10 $
* $Date: 2009-12-16 20:23:35 $
* $Revision: 1.11 $
* $Date: 2009-12-17 22:47:20 $
* $Author: e107steved $
*/
/**
* e107 Private messenger plugin
*
* @package e107_plugins
* @subpackage pm
* @version $Id: pm_conf.php,v 1.11 2009-12-17 22:47:20 e107steved Exp $;
*/
/*
TODO:
1. Limits page needs some lines round the table
@@ -253,6 +262,7 @@ if ($emessage->hasMessage())
}
switch ($action)
{
case 'main' :
@@ -374,7 +384,7 @@ function show_options($pm_prefs)
function show_limits($pm_prefs)
{
global $sql;
$sql = e107::getDb();
if (!isset($pm_prefs['pm_limits'])) { $pm_prefs['pm_limits'] = 0; }
@@ -469,7 +479,7 @@ function show_limits($pm_prefs)
function add_limit($pm_prefs)
{
global $sql;
$sql = e107::getDb();
if($sql->db_Select('generic', "gen_id as limit_id, gen_datestamp as limit_classnum, gen_user_id as inbox_count, gen_ip as outbox_count, gen_intdata as inbox_size, gen_chardata as outbox_size", "gen_type = 'pm_limit'"))
{
while($row = $sql->db_Fetch())
@@ -621,7 +631,7 @@ function doMaint($opts, $pmPrefs)
$logResults = array();
$e107 = e107::getInstance();
$e107->admin_log->log_event('PM_ADM_04', implode(', ',array_keys($opts)));
$pmHandler = new private_message();
$pmHandler = new private_message($pmPrefs);
$db2 = new db(); // Will usually need a second DB object to avoid over load
$start = 0; // Use to ensure we get different log times
@@ -799,8 +809,10 @@ function doMaint($opts, $pmPrefs)
function show_menu($action)
function pm_conf_adminmenu()
{
global $action;
if ($action == '') { $action = 'main'; }
$var['main']['text'] = ADLAN_PM_54;
@@ -815,11 +827,4 @@ function show_menu($action)
show_admin_menu(ADLAN_PM_12, $action, $var);
}
function pm_conf_adminmenu()
{
global $action;
show_menu($action);
}
?>