now using GLOBALS

This commit is contained in:
Miles Lott 2001-09-02 00:26:16 +00:00
parent d2a5441ed8
commit 341fd023b8

View File

@ -145,17 +145,15 @@
function limit($start) function limit($start)
{ {
global $phpgw_info;
echo '<b>Warning: limit() is no longer used, use limit_query()</b>'; echo '<b>Warning: limit() is no longer used, use limit_query()</b>';
if ($start == 0) if ($start == 0)
{ {
$s = 'limit ' . $phpgw_info['user']['preferences']['common']['maxmatchs']; $s = 'limit ' . $GLOBALS['phpgw_info']['user']['preferences']['common']['maxmatchs'];
} }
else else
{ {
$s = 'limit ' . $phpgw_info['user']['preferences']['common']['maxmatchs'] . ',' . $start; $s = 'limit ' . $GLOBALS['phpgw_info']['user']['preferences']['common']['maxmatchs'] . ',' . $start;
} }
return $s; return $s;
} }
@ -199,11 +197,9 @@
/* public: perform a query with limited result set */ /* public: perform a query with limited result set */
function limit_query($Query_String, $offset, $line = '', $file = '', $num_rows = '') function limit_query($Query_String, $offset, $line = '', $file = '', $num_rows = '')
{ {
global $phpgw_info;
if (! $num_rows) if (! $num_rows)
{ {
$num_rows = $phpgw_info['user']['preferences']['common']['maxmatchs']; $num_rows = $GLOBALS['phpgw_info']['user']['preferences']['common']['maxmatchs'];
} }
if ($offset == 0) if ($offset == 0)
@ -449,8 +445,6 @@
function halt($msg, $line = "", $file = "") function halt($msg, $line = "", $file = "")
{ {
global $phpgw;
if($this->Halt_On_Error == "no") if($this->Halt_On_Error == "no")
{ {
return; return;
@ -474,7 +468,7 @@
if ($this->Halt_On_Error == 'yes') if ($this->Halt_On_Error == 'yes')
{ {
echo '<p><b>Session halted.</b>'; echo '<p><b>Session halted.</b>';
$phpgw->common->phpgw_exit(True); $GLOBALS['phpgw']->common->phpgw_exit(True);
} }
} }