[Phpgroupware-cvs] CVS: filemanager/inc db.inc.php, 1.3, 1.3.4.1 html.inc.php, 1.12.2.2.2.1, 1.12.2.2.2.2 main.inc.php, 1.14.2.2, 1.14.2.2.2.1

[Dave Hall <address@hidden>]

Update of /cvsroot/phpgroupware/filemanager/inc
In directory subversions:/tmp/cvs-serv31654/inc

Modified Files:
      Tag: Version-0_9_16-branch
        db.inc.php html.inc.php main.inc.php 
Log Message:
GLOBALS and some bugs

Index: db.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/filemanager/inc/Attic/db.inc.php,v
retrieving revision 1.3
retrieving revision 1.3.4.1
diff -C2 -r1.3 -r1.3.4.1
*** db.inc.php  25 Jun 2001 07:28:50 -0000      1.3
--- db.inc.php  9 Sep 2003 06:42:08 -0000       1.3.4.1
***************
*** 1,3 ****
--- 1,4 ----
  <?php
+ //can we get rid of this ???
  
  error_reporting (8);
***************
*** 6,13 ****
  function db_init ()
  {
!       global $phpgw;
!       global $phpgw_info;
! 
!       $phpgw->db->Auto_Free = 0;
  }
  
--- 7,11 ----
  function db_init ()
  {
!       $GLOBALS['phpgw']->db->Auto_Free = 0;
  }
  
***************
*** 15,22 ****
  function db_query ($query)
  {
!       global $phpgw;
!       global $phpgw_info;
! 
!       return $phpgw->db->query ($query);
  }
  
--- 13,17 ----
  function db_query ($query)
  {
!       return $GLOBALS['phpgw']->db->query ($query);
  }
  
***************
*** 24,33 ****
  function db_fetch_array ($query_id)
  {
-       global $phpgw;
-       global $phpgw_info;
- 
  //    $phpgw->db->Query_ID = $query_id;
!       $phpgw->db->next_record ();
!       return $phpgw->db->Record;
  }
  
--- 19,25 ----
  function db_fetch_array ($query_id)
  {
  //    $phpgw->db->Query_ID = $query_id;
!       $GLOBALS['phpgw']->db->next_record ();
!       return $GLOBALS['phpgw']->db->Record;
  }
  
***************
*** 38,46 ****
  function db_call ($function, $query_id)
  {
-       global $phpgw;
-       global $phpgw_info;
- 
  //    $phpgw->db->Query_ID = $query_id;
!       return $phpgw->db->$function ();
  }
  
--- 30,35 ----
  function db_call ($function, $query_id)
  {
  //    $phpgw->db->Query_ID = $query_id;
!       return $GLOBALS['phpgw']->db->$function ();
  }
  

Index: html.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/filemanager/inc/Attic/html.inc.php,v
retrieving revision 1.12.2.2.2.1
retrieving revision 1.12.2.2.2.2
diff -C2 -r1.12.2.2.2.1 -r1.12.2.2.2.2
*** html.inc.php        26 Jun 2003 03:32:32 -0000      1.12.2.2.2.1
--- html.inc.php        9 Sep 2003 06:42:08 -0000       1.12.2.2.2.2
***************
*** 229,232 ****
--- 229,233 ----
        $GLOBALS['phpgw']->common->phpgw_footer ();
        $GLOBALS['phpgw']->common->phpgw_exit ();
+       exit;
  }
  function html_text_bold ($text = NULL, $return = 0, $lang = 0)

Index: main.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/filemanager/inc/Attic/main.inc.php,v
retrieving revision 1.14.2.2
retrieving revision 1.14.2.2.2.1
diff -C2 -r1.14.2.2 -r1.14.2.2.2.1
*** main.inc.php        18 Jun 2002 05:16:08 -0000      1.14.2.2
--- main.inc.php        9 Sep 2003 06:42:08 -0000       1.14.2.2.2.1
***************
*** 229,233 ****
  function translate ($text)
  {
!       return ($GLOBALS['phpgw']->lang($text));
  }
  
--- 229,233 ----
  function translate ($text)
  {
!       return lang($text);
  }