formatting, globals

This commit is contained in:
Miles Lott 2001-12-18 06:00:48 +00:00
parent b78953097a
commit e6eb32d36f
3 changed files with 35 additions and 37 deletions

View File

@ -9,11 +9,11 @@
* Free Software Foundation; either version 2 of the License, or (at your * * Free Software Foundation; either version 2 of the License, or (at your *
* option) any later version. * * option) any later version. *
\***************************************************************************/ \***************************************************************************/
/* $Id$ */ /* $Id$ */
class bolog class bolog
{ {
var $public_functions = array var $public_functions = array
( (
'read_log' => True 'read_log' => True
@ -21,7 +21,6 @@
function bolog($session=False) function bolog($session=False)
{ {
global $phpgw;
$this->so = CreateObject('admin.solog'); $this->so = CreateObject('admin.solog');
} }

View File

@ -29,8 +29,7 @@
function solog() function solog()
{ {
global $phpgw; $this->db = $GLOBALS['phpgw']->db;
$this->db = $phpgw->db;
} }
function get_error_cols() function get_error_cols()
@ -108,14 +107,16 @@
} }
function get_no_errors() function get_no_errors()
{ /* Get max ErrorId */ {
/* Get max ErrorId */
$this->db->query("select count(*) as max_id from phpgw_log, phpgw_log_msg WHERE phpgw_log.log_id = phpgw_log_msg.log_msg_log_id",__LINE__,__FILE__); $this->db->query("select count(*) as max_id from phpgw_log, phpgw_log_msg WHERE phpgw_log.log_id = phpgw_log_msg.log_msg_log_id",__LINE__,__FILE__);
$this->db->next_record(); $this->db->next_record();
return $this->db->f('max_id'); return $this->db->f('max_id');
} }
function get_error($parms) function get_error($parms)
{ /* Get parameter values */ {
/* Get parameter values */
$from = $parms['from']; $from = $parms['from'];
$where = $parms['where']; $where = $parms['where'];
$orderby = $parms['orderby']; $orderby = $parms['orderby'];

View File

@ -15,8 +15,6 @@
{ {
function uimenuclass() function uimenuclass()
{ {
global $phpgw, $phpgw_info;
$this->t = CreateObject('phpgwapi.Template',$phpgw->common->get_tpl_dir('admin')); $this->t = CreateObject('phpgwapi.Template',$phpgw->common->get_tpl_dir('admin'));
$this->t->set_file(array('menurow' => 'menurow.tpl')); $this->t->set_file(array('menurow' => 'menurow.tpl'));
@ -29,7 +27,7 @@
function section_item($pref_link='',$pref_text='', $bgcolor) function section_item($pref_link='',$pref_text='', $bgcolor)
{ {
global $phpgw, $phpgw_info, $t; global $t;
$this->t->set_var('row_link',$pref_link); $this->t->set_var('row_link',$pref_link);
$this->t->set_var('row_text',$pref_text); $this->t->set_var('row_text',$pref_text);
@ -44,7 +42,7 @@
// This allows extra data to be sent along // This allows extra data to be sent along
function display_section($_menuData) function display_section($_menuData)
{ {
global $phpgw, $phpgw_info, $account_id; global $account_id;
$i=0; $i=0;