[Phpgroupware-cvs] CVS: cart/inc footer.inc.php,1.3,1.4 functions.inc.php,1.2,1.3 header.inc.php,1.3,1.4

[Miles Lott <address@hidden>]

Update of /cvsroot/phpgroupware/cart/inc
In directory subversions:/tmp/cvs-serv21233/inc

Modified Files:
        footer.inc.php functions.inc.php header.inc.php 
Log Message:
Make current with use of GLOBALS, formatting



Index: footer.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/cart/inc/footer.inc.php,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** footer.inc.php      2 Jun 2001 00:59:12 -0000       1.3
--- footer.inc.php      11 Mar 2002 11:04:57 -0000      1.4
***************
*** 10,29 ****
        * option) any later version.                                            
   *
        
\**************************************************************************/
        /* $Id$ */
  
!       $t = CreateObject('phpgwapi.Template',PHPGW_APP_TPL);
!       $t->set_file(array('cart_footer' => 'footer.tpl'));
!       $t->set_var('info',lang('Shopping cart'));
!       $t->set_var('bg_color',$phpgw_info['theme']['th_bg']);
  
!       $t->set_var('link_catalog',$phpgw->link('/cart/list_products.php'));
!       $t->set_var('lang_catalog',lang('Our catalog'));
!       $t->set_var('link_cart',$phpgw->link('/cart/cart.php'));
!       $t->set_var('lang_cart',lang('Shopping cart'));
!       $t->set_var('link_service',$phpgw->link('/cart/service.php')); 
!       $t->set_var('lang_service',lang('Customer service'));
!       $t->set_var('link_order',$phpgw->link('/cart/order.php'));
!       $t->set_var('lang_order',lang('Order'));
  
!       $t->pparse('out','cart_footer');
  ?>
--- 10,29 ----
        * option) any later version.                                            
   *
        
\**************************************************************************/
+ 
        /* $Id$ */
  
!       $GLOBALS['phpgw']->template->set_file(array('cart_footer' => 
'footer.tpl'));
!       $GLOBALS['phpgw']->template->set_var('info',lang('Shopping cart'));
!       
$GLOBALS['phpgw']->template->set_var('bg_color',$GLOBALS['phpgw_info']['theme']['th_bg']);
  
!       
$GLOBALS['phpgw']->template->set_var('link_catalog',$GLOBALS['phpgw']->link('/cart/list_products.php'));
!       $GLOBALS['phpgw']->template->set_var('lang_catalog',lang('Our 
catalog'));
!       
$GLOBALS['phpgw']->template->set_var('link_cart',$GLOBALS['phpgw']->link('/cart/cart.php'));
!       $GLOBALS['phpgw']->template->set_var('lang_cart',lang('Shopping cart'));
!       
$GLOBALS['phpgw']->template->set_var('link_service',$GLOBALS['phpgw']->link('/cart/service.php'));
 
!       $GLOBALS['phpgw']->template->set_var('lang_service',lang('Customer 
service'));
!       
$GLOBALS['phpgw']->template->set_var('link_order',$GLOBALS['phpgw']->link('/cart/order.php'));
!       $GLOBALS['phpgw']->template->set_var('lang_order',lang('Order'));
  
!       $GLOBALS['phpgw']->template->pparse('out','cart_footer');
  ?>

Index: functions.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/cart/inc/functions.inc.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** functions.inc.php   2 Jun 2001 00:59:12 -0000       1.2
--- functions.inc.php   11 Mar 2002 11:04:57 -0000      1.3
***************
*** 11,29 ****
        
\**************************************************************************/
        /* $Id$ */
-   
- // selects the tax from products category
  
!       function select_tax($cat_id) 
        {
!               global $phpgw; 
! 
!               $phpgw->db->query("select cat_data from phpgw_categories where 
cat_id='$cat_id'");
!               $phpgw->db->next_record();
!               $data = unserialize($phpgw->db->f('cat_data'));
                $tax = $data['tax'];
                $taxpercent = ($tax/100);
  
!               return $taxpercent;                                             
                                                                                
                                  
        }
- 
  ?>
--- 11,25 ----
        
\**************************************************************************/
        /* $Id$ */
  
!       // selects the tax from products category
!       function select_tax($cat_id)
        {
!               $GLOBALS['phpgw']->db->query("select cat_data from 
phpgw_categories where cat_id='$cat_id'");
!               $GLOBALS['phpgw']->db->next_record();
!               $data = unserialize($GLOBALS['phpgw']->db->f('cat_data'));
                $tax = $data['tax'];
                $taxpercent = ($tax/100);
  
!               return $taxpercent;
        }
  ?>

Index: header.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/cart/inc/header.inc.php,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** header.inc.php      2 Jun 2001 00:59:12 -0000       1.3
--- header.inc.php      11 Mar 2002 11:04:57 -0000      1.4
***************
*** 12,20 ****
        /* $Id$ */
  
!       $t = CreateObject('phpgwapi.Template',PHPGW_APP_TPL);
!       $t->set_file(array('cart_header' => 'header.tpl'));
!       $t->set_var('lang_cart',lang('Shopping cart'));
!       $t->set_var('bg_color',$phpgw_info['theme']['th_bg']);
  
!       $t->pparse('out','cart_header');
  ?>
--- 12,19 ----
        /* $Id$ */
  
!       $GLOBALS['phpgw']->template->set_file(array('cart_header' => 
'header.tpl'));
!       $GLOBALS['phpgw']->template->set_var('lang_cart',lang('Shopping cart'));
!       
$GLOBALS['phpgw']->template->set_var('bg_color',$phpgw_info['theme']['th_bg']);
  
!       $GLOBALS['phpgw']->template->pparse('out','cart_header');
  ?>