GLOBALS; remove uneeded class vars in common (I hope)

This commit is contained in:
Miles Lott 2001-11-23 19:19:04 +00:00
parent 2ab805ebe6
commit db074c4dd7
2 changed files with 2 additions and 8 deletions

View File

@ -41,9 +41,6 @@
*/ */
class common class common
{ {
var $phpgw;
var $iv = '';
var $key = '';
var $crypto; var $crypto;
var $debug_info; // An array with debugging info from the API var $debug_info; // An array with debugging info from the API
@ -1022,7 +1019,6 @@
// Note: $no_permission_check should *ONLY* be used when it *HAS* to be. (jengo) // Note: $no_permission_check should *ONLY* be used when it *HAS* to be. (jengo)
function hook($location, $order = '', $no_permission_check = False) function hook($location, $order = '', $no_permission_check = False)
{ {
global $phpgw, $phpgw_info;
if ($order == '') if ($order == '')
{ {
settype($order,'array'); settype($order,'array');
@ -1088,7 +1084,6 @@
// Note: $no_permission_check should *ONLY* be used when it *HAS* to be. (jengo) // Note: $no_permission_check should *ONLY* be used when it *HAS* to be. (jengo)
function hook_single($location, $appname = '', $no_permission_check = False) function hook_single($location, $appname = '', $no_permission_check = False)
{ {
global $phpgw, $phpgw_info, $PHP_VERSION;
if (! $appname) if (! $appname)
{ {
$appname = $GLOBALS['phpgw_info']['flags']['currentapp']; $appname = $GLOBALS['phpgw_info']['flags']['currentapp'];

View File

@ -30,13 +30,12 @@
function config($appname = '') function config($appname = '')
{ {
global $phpgw, $phpgw_info;
if (! $appname) if (! $appname)
{ {
$appname = $phpgw_info['flags']['currentapp']; $appname = $GLOBALS['phpgw_info']['flags']['currentapp'];
} }
$this->db = $phpgw->db; $this->db = $GLOBALS['phpgw']->db;
$this->appname = $appname; $this->appname = $appname;
} }