phpgroupware-cvs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Phpgroupware-cvs] inv addcategory.php, 1.52.2.1, 1.52.2.1.2.1 adddist.p


From: Bettina Gille <address@hidden>
Subject: [Phpgroupware-cvs] inv addcategory.php, 1.52.2.1, 1.52.2.1.2.1 adddist.php, 1.14, 1.14.4.1 addorder.php, 1.24.2.1, 1.24.2.1.2.1 addproduct.php, 1.60.2.1, 1.60.2.1.2.1 deletecategory.php, 1.22, 1.22.4.1 editcategory.php, 1.46.2.1, 1.46.2.1.2.1 editdist.php, 1.14, 1.14.4.1 editorder.php, 1.28.2.1, 1.28.2.1.2.1 index.php, 1.52, 1.52.4.1
Date: Fri, 14 Nov 2003 15:00:13 +0000

Update of /cvsroot/phpgroupware/inv
In directory subversions:/tmp/cvs-serv14642

Modified Files:
      Tag: Version-0_9_16-branch
        addcategory.php adddist.php addorder.php addproduct.php 
        deletecategory.php editcategory.php editdist.php editorder.php 
        index.php 
Log Message:
fixes for reg_globals off etc

Index: editcategory.php
===================================================================
RCS file: /cvsroot/phpgroupware/inv/Attic/editcategory.php,v
retrieving revision 1.46.2.1
retrieving revision 1.46.2.1.2.1
diff -C2 -d -r1.46.2.1 -r1.46.2.1.2.1
*** editcategory.php    3 Mar 2003 22:27:10 -0000       1.46.2.1
--- editcategory.php    14 Nov 2003 15:00:07 -0000      1.46.2.1.2.1
***************
*** 12,34 ****
        /* $Id$ */
  
        if (! $cat_id)
        {
!               Header('Location: ' . $phpgw->link('/inv/index.php','sort=' . 
$sort . '&order=' . $order . '&query=' . $query
                                                                                
        . '&start=' . $start . '&filter=' . $filter));
        }
  
!       $phpgw_info['flags']['currentapp'] = 'inv';
        include('../header.inc.php');
  
        $inventory = CreateObject('inv.inventory');
  
!       $t = CreateObject('phpgwapi.Template',PHPGW_APP_TPL);
!       $t->set_file(array('form' => 'category_form.tpl'));
!       $t->set_block('form','add','addhandle');
!       $t->set_block('form','edit','edithandle');
  
        $c = CreateObject('phpgwapi.categories');
!       $grants = $phpgw->acl->get_grants('inv');
!       $grants[$phpgw_info['user']['account_id']] = PHPGW_ACL_READ + 
PHPGW_ACL_ADD + PHPGW_ACL_EDIT + PHPGW_ACL_DELETE;
  
        $hidden_vars = '<input type="hidden" name="sort" value="' . $sort . 
'">' . "\n"
--- 12,43 ----
        /* $Id$ */
  
+       $new_parent                     = $_POST['new_parent'];
+       $cat_parent                     = $_POST['cat_parent'];
+       $tax                            = $_POST['tax'];
+       $number                         = $_POST['number'];
+       $cat_name                       = $_POST['cat_name'];
+       $cat_description        = $_POST['cat_description'];
+       $cat_access                     = $_POST['cat_access'];
+ 
+       $cat_id = get_var('cat_id',array('GET','POST'));
+ 
        if (! $cat_id)
        {
!               Header('Location: ' . 
$GLOBALS['phpgw']->link('/inv/index.php','sort=' . $sort . '&order=' . $order . 
'&query=' . $query
                                                                                
        . '&start=' . $start . '&filter=' . $filter));
        }
  
!       $GLOBALS['phpgw_info']['flags']['currentapp'] = 'inv';
        include('../header.inc.php');
  
        $inventory = CreateObject('inv.inventory');
  
!       $GLOBALS['phpgw']->template->set_file(array('form' => 
'category_form.tpl'));
!       $GLOBALS['phpgw']->template->set_block('form','add','addhandle');
!       $GLOBALS['phpgw']->template->set_block('form','edit','edithandle');
  
        $c = CreateObject('phpgwapi.categories');
!       $grants = $GLOBALS['phpgw']->acl->get_grants('inv');
!       $grants[$GLOBALS['phpgw_info']['user']['account_id']] = PHPGW_ACL_READ 
+ PHPGW_ACL_ADD + PHPGW_ACL_EDIT + PHPGW_ACL_DELETE;
  
        $hidden_vars = '<input type="hidden" name="sort" value="' . $sort . 
'">' . "\n"
***************
*** 44,48 ****
        }
  
!       if ($submit)
        {
                $errorcount = 0;
--- 53,57 ----
        }
  
!       if ($_POST['save'])
        {
                $errorcount = 0;
***************
*** 77,83 ****
        }
  
!       if ($errorcount) { 
$t->set_var('message',$phpgw->common->error_list($error)); }
!       if (($submit) && (! $error) && (! $errorcount)) { 
$t->set_var('message',lang('Category %1 has been updated !',$cat_name)); }
!       if ((! $submit) && (! $error) && (! $errorcount)) { 
$t->set_var('message',''); }
  
        $cats = $c->return_single($cat_id);
--- 86,92 ----
        }
  
!       if ($errorcount) { 
$GLOBALS['phpgw']->template->set_var('message',$GLOBALS['phpgw']->common->error_list($error));
 }
!       if (($_POST['save']) && (! $error) && (! $errorcount)) { 
$GLOBALS['phpgw']->template->set_var('message',lang('Category %1 has been 
updated !',$cat_name)); }
!       if ((!$_POST['save']) && (! $error) && (! $errorcount)) { 
$GLOBALS['phpgw']->template->set_var('message',''); }
  
        $cats = $c->return_single($cat_id);
***************
*** 86,130 ****
        $number = $data['number'];
  
!       $t->set_var('lang_procent',lang('%'));
!       $t->set_var('lang_action',lang('Edit category'));
!       $t->set_var('actionurl',$phpgw->link('/inv/editcategory.php'));
!       $t->set_var('doneurl',$phpgw->link('/inv/index.php'));
!       $t->set_var('hidden_vars',$hidden_vars);
!       $t->set_var('lang_number',lang('Category ID'));
!       $t->set_var('lang_name',lang('Name'));
!       $t->set_var('lang_descr',lang('Description'));
!       $t->set_var('lang_tax',lang('tax'));
!       $t->set_var('lang_par_cat',lang('Parent category'));
!       $t->set_var('lang_none',lang('None'));
!       $t->set_var('lang_choose',lang('Choose the parent category'));
!       $t->set_var('lang_access',lang('Private'));
  
!       
$t->set_var('par_cat_list',$c->formated_list('select','all',$cats[0]['parent'],False));
!       $t->set_var('number',$number);
!       $t->set_var('cat_name',$phpgw->strip_html($cats[0]['name']));
!       $cat_description = $phpgw->strip_html($cats[0]['description']);
!       $t->set_var('cat_description',$cat_description);
        $cat_id = $cats[0]['id'];
!       $t->set_var('tax',sprintf("%1.2f",$tax));
  
!       if ($cats[0]['access']=='private') { $t->set_var('access', '<input 
type="checkbox" name="access" value="True" checked>'); }
!       else { $t->set_var('access', '<input type="checkbox" name="access" 
value="True">'); }
  
!       $t->set_var('lang_editbutton',lang('Edit'));
!       $t->set_var('lang_done',lang('Done'));
  
!       if 
($inventory->check_perms($grants[$cats[0]['owner']],PHPGW_ACL_DELETE) || 
$cats[0]['owner'] == $phpgw_info['user']['account_id'])
        {
!               $t->set_var('delete','<form method="POST" action="' . 
$phpgw->link('/inv/deletecategory.php','cat_id=' . $cat_id . '&start=' . $start 
. '&query=' . $query
                                                        . '&sort=' . $sort . 
'&order=' . $order . '&filter=' . $filter) . '"><input type="submit" value="' . 
lang('Delete') .'"></form>');
        }
!       else { $t->set_var('delete','&nbsp;'); }
  
!       $t->set_var('edithandle','');
!       $t->set_var('addhandle','');
  
!       $t->pparse('out','form');
!       $t->pparse('edithandle','edit');
  
!       $phpgw->common->phpgw_footer();
  ?>
--- 95,139 ----
        $number = $data['number'];
  
!       $GLOBALS['phpgw']->template->set_var('lang_procent',lang('%'));
!       $GLOBALS['phpgw']->template->set_var('lang_action',lang('Edit 
category'));
!       
$GLOBALS['phpgw']->template->set_var('actionurl',$GLOBALS['phpgw']->link('/inv/editcategory.php'));
!       
$GLOBALS['phpgw']->template->set_var('doneurl',$GLOBALS['phpgw']->link('/inv/index.php'));
!       $GLOBALS['phpgw']->template->set_var('hidden_vars',$hidden_vars);
!       $GLOBALS['phpgw']->template->set_var('lang_number',lang('Category ID'));
!       $GLOBALS['phpgw']->template->set_var('lang_name',lang('Name'));
!       $GLOBALS['phpgw']->template->set_var('lang_descr',lang('Description'));
!       $GLOBALS['phpgw']->template->set_var('lang_tax',lang('tax'));
!       $GLOBALS['phpgw']->template->set_var('lang_par_cat',lang('Parent 
category'));
!       $GLOBALS['phpgw']->template->set_var('lang_none',lang('None'));
!       $GLOBALS['phpgw']->template->set_var('lang_choose',lang('Choose the 
parent category'));
!       $GLOBALS['phpgw']->template->set_var('lang_access',lang('Private'));
  
!       
$GLOBALS['phpgw']->template->set_var('par_cat_list',$c->formated_list('select','all',$cats[0]['parent'],False));
!       $GLOBALS['phpgw']->template->set_var('number',$number);
!       
$GLOBALS['phpgw']->template->set_var('cat_name',$GLOBALS['phpgw']->strip_html($cats[0]['name']));
!       $cat_description = 
$GLOBALS['phpgw']->strip_html($cats[0]['description']);
!       
$GLOBALS['phpgw']->template->set_var('cat_description',$cat_description);
        $cat_id = $cats[0]['id'];
!       $GLOBALS['phpgw']->template->set_var('tax',sprintf("%1.2f",$tax));
  
!       if ($cats[0]['access']=='private') { 
$GLOBALS['phpgw']->template->set_var('access', '<input type="checkbox" 
name="access" value="True" checked>'); }
!       else { $GLOBALS['phpgw']->template->set_var('access', '<input 
type="checkbox" name="access" value="True">'); }
  
!       $GLOBALS['phpgw']->template->set_var('lang_editbutton',lang('Edit'));
!       $GLOBALS['phpgw']->template->set_var('lang_done',lang('Done'));
  
!       if 
($inventory->check_perms($grants[$cats[0]['owner']],PHPGW_ACL_DELETE) || 
$cats[0]['owner'] == $GLOBALS['phpgw_info']['user']['account_id'])
        {
!               $GLOBALS['phpgw']->template->set_var('delete','<form 
method="POST" action="' . 
$GLOBALS['phpgw']->link('/inv/deletecategory.php','cat_id=' . $cat_id . 
'&start=' . $start . '&query=' . $query
                                                        . '&sort=' . $sort . 
'&order=' . $order . '&filter=' . $filter) . '"><input type="submit" value="' . 
lang('Delete') .'"></form>');
        }
!       else { $GLOBALS['phpgw']->template->set_var('delete','&nbsp;'); }
  
!       $GLOBALS['phpgw']->template->set_var('edithandle','');
!       $GLOBALS['phpgw']->template->set_var('addhandle','');
  
!       $GLOBALS['phpgw']->template->pparse('out','form');
!       $GLOBALS['phpgw']->template->pparse('edithandle','edit');
  
!       $GLOBALS['phpgw']->common->phpgw_footer();
  ?>

Index: addorder.php
===================================================================
RCS file: /cvsroot/phpgroupware/inv/addorder.php,v
retrieving revision 1.24.2.1
retrieving revision 1.24.2.1.2.1
diff -C2 -d -r1.24.2.1 -r1.24.2.1.2.1
*** addorder.php        2 Mar 2003 22:35:16 -0000       1.24.2.1
--- addorder.php        14 Nov 2003 15:00:07 -0000      1.24.2.1.2.1
***************
*** 12,26 ****
        /* $Id$ */
  
!       $phpgw_info['flags']['currentapp'] = 'inv';
        include('../header.inc.php');
  
!       $t = CreateObject('phpgwapi.Template',PHPGW_APP_TPL);
!       $t->set_file(array( 'order_add' => 'order_form.tpl'));
!       $t->set_block('order_add','add', 'addhandle');
!       $t->set_block('order_add','edit','edithandle');
  
!       if ($submit)
        {
!               if ($choose)
                {
                        $num = create_orderid($year);
--- 12,33 ----
        /* $Id$ */
  
!       $GLOBALS['phpgw_info']['flags']['currentapp'] = 'inv';
        include('../header.inc.php');
  
!       $num    = $_POST['num'];
!       $month  = $_POST['month'];
!       $day    = $_POST['day'];
!       $year   = $_POST['year'];
!       $descr  = $_POST['descr'];
!       $access = $_POST['access'];
!       $abid   = $_POST['abid'];
  
!       $GLOBALS['phpgw']->template->set_file(array( 'order_add' => 
'order_form.tpl'));
!       $GLOBALS['phpgw']->template->set_block('order_add','add', 'addhandle');
!       $GLOBALS['phpgw']->template->set_block('order_add','edit','edithandle');
! 
!       if ($_POST['save'])
        {
!               if ($_POST['choose'])
                {
                        $num = create_orderid($year);
***************
*** 36,42 ****
                        $error[$errorcount++] = lang('Please enter an ID !');
                }
!               $phpgw->db->query("select count(*) from phpgw_inv_orders WHERE 
num='$num'");
!               $phpgw->db->next_record();
!               if ($phpgw->db->f(0) != 0)
                {
                        $error[$errorcount++] = lang('That ID has been used 
already !');
--- 43,49 ----
                        $error[$errorcount++] = lang('Please enter an ID !');
                }
!               $GLOBALS['phpgw']->db->query("select count(*) from 
phpgw_inv_orders WHERE num='$num'");
!               $GLOBALS['phpgw']->db->next_record();
!               if ($GLOBALS['phpgw']->db->f(0) != 0)
                {
                        $error[$errorcount++] = lang('That ID has been used 
already !');
***************
*** 57,61 ****
                if (! $error)
                {
!                       $owner = $phpgw_info['user']['account_id'];
                        $descr = addslashes($descr);
                        if ($access)
--- 64,68 ----
                if (! $error)
                {
!                       $owner = $GLOBALS['phpgw_info']['user']['account_id'];
                        $descr = addslashes($descr);
                        if ($access)
***************
*** 68,73 ****
                        }
  
!                       $phpgw->db->query("INSERT into phpgw_inv_orders 
(owner,num,date,customer,descr,status,access) "
!                                                       . "values 
('$owner','$num','$date','$abid','$descr','$status','$access')");
                }
        }
--- 75,80 ----
                        }
  
!                       $GLOBALS['phpgw']->db->query('INSERT into 
phpgw_inv_orders (owner,num,date,customer,descr,status,access) '
!                                                                       . 
'values (' . $owner . ",'$num'," . intval($date) . ',' . intval($abid) . 
",'$descr','$status','$access')");
                }
        }
***************
*** 75,89 ****
        if ($errorcount)
        {
!               $t->set_var('message',$phpgw->common->error_list($error));
        }
  
!       if (($submit) && (! $error) && (! $errorcount))
        {
!               $t->set_var('message',lang('Order %1 has been added !',$num));
        }
  
!       if ((! $submit) && (! $error) && (! $errorcount))
        {
!               $t->set_var('message','');
        }
  
--- 82,96 ----
        if ($errorcount)
        {
!               
$GLOBALS['phpgw']->template->set_var('message',$GLOBALS['phpgw']->common->error_list($error));
        }
  
!       if (($_POST['save']) && (! $error) && (! $errorcount))
        {
!               $GLOBALS['phpgw']->template->set_var('message',lang('Order %1 
has been added !',$num));
        }
  
!       if ((!$_POST['save']) && (! $error) && (! $errorcount))
        {
!               $GLOBALS['phpgw']->template->set_var('message','');
        }
  
***************
*** 95,125 ****
                                . '<input type="hidden" name="filter" value="' 
. $filter . '">' . "\n";
  
!       $t->set_var('actionurl',$phpgw->link('/inv/addorder.php'));
!       
$t->set_var('addressbook_link',$phpgw->link('/inv/addressbook.php','query='));
!       $t->set_var('lang_action',lang('Add order'));
!       $t->set_var('hidden_vars',$hidden_vars);
!       $t->set_var('lang_num',lang('Order ID'));
!       $t->set_var('num',$num);
  
!       if (! $submit)
        {
!               $t->set_var('lang_choose',lang('Generate Order ID ?'));
!               $t->set_var('choose','<input type="checkbox" name="choose" 
value="True">');
        }
        else
        {
!               $t->set_var('lang_choose','');
!               $t->set_var('choose','');
        }
  
!       $t->set_var('lang_descr',lang('Description'));
!       $t->set_var('descr',$descr);
!       $t->set_var('lang_customer',lang('Customer'));
!       $t->set_var('lang_select',lang('Select per button !'));
!       $t->set_var('abid',$abid);
  
!       if (! $submit)
        {
!               $t->set_var('name',$name);
        }
        else
--- 102,132 ----
                                . '<input type="hidden" name="filter" value="' 
. $filter . '">' . "\n";
  
!       
$GLOBALS['phpgw']->template->set_var('actionurl',$GLOBALS['phpgw']->link('/inv/addorder.php'));
!       
$GLOBALS['phpgw']->template->set_var('addressbook_link',$GLOBALS['phpgw']->link('/inv/addressbook.php','query='));
!       $GLOBALS['phpgw']->template->set_var('lang_action',lang('Add order'));
!       $GLOBALS['phpgw']->template->set_var('hidden_vars',$hidden_vars);
!       $GLOBALS['phpgw']->template->set_var('lang_num',lang('Order ID'));
!       $GLOBALS['phpgw']->template->set_var('num',$num);
  
!       if (!$_POST['save'])
        {
!               
$GLOBALS['phpgw']->template->set_var('lang_choose',lang('Generate Order ID ?'));
!               $GLOBALS['phpgw']->template->set_var('choose','<input 
type="checkbox" name="choose" value="True">');
        }
        else
        {
!               $GLOBALS['phpgw']->template->set_var('lang_choose','');
!               $GLOBALS['phpgw']->template->set_var('choose','');
        }
  
!       $GLOBALS['phpgw']->template->set_var('lang_descr',lang('Description'));
!       $GLOBALS['phpgw']->template->set_var('descr',$descr);
!       $GLOBALS['phpgw']->template->set_var('lang_customer',lang('Customer'));
!       $GLOBALS['phpgw']->template->set_var('lang_select',lang('Select per 
button !'));
!       $GLOBALS['phpgw']->template->set_var('abid',$abid);
  
!       if (!$_POST['save'])
        {
!               $GLOBALS['phpgw']->template->set_var('name',$name);
        }
        else
***************
*** 134,146 ****
                if ($customer[0]['org_name'] == '')
                {
!                       $t->set_var('name',$customer[0]['n_given'] . ' ' . 
$customer[0]['n_family']);
                }
                else
                {
!                       $t->set_var('name',$customer[0]['org_name'] . ' [ ' . 
$customer[0]['n_given'] . ' ' . $customer[0]['n_family'] . ' ]');
                }
        }
  
!       $t->set_var('lang_status',lang('Status'));
  
        if ($status == 'open'):
--- 141,153 ----
                if ($customer[0]['org_name'] == '')
                {
!                       
$GLOBALS['phpgw']->template->set_var('name',$customer[0]['n_given'] . ' ' . 
$customer[0]['n_family']);
                }
                else
                {
!                       
$GLOBALS['phpgw']->template->set_var('name',$customer[0]['org_name'] . ' [ ' . 
$customer[0]['n_given'] . ' ' . $customer[0]['n_family'] . ' ]');
                }
        }
  
!       $GLOBALS['phpgw']->template->set_var('lang_status',lang('Status'));
  
        if ($status == 'open'):
***************
*** 156,161 ****
                                . '<option value="archive"' . $stat_sel[2] . 
'>' . lang('Archive') . '</option>' . "\n";
  
!       $t->set_var('status_list',$status_list);
!       $t->set_var('lang_date',lang('Date'));
  
        if ($date)
--- 163,168 ----
                                . '<option value="archive"' . $stat_sel[2] . 
'>' . lang('Archive') . '</option>' . "\n";
  
!       $GLOBALS['phpgw']->template->set_var('status_list',$status_list);
!       $GLOBALS['phpgw']->template->set_var('lang_date',lang('Date'));
  
        if ($date)
***************
*** 173,197 ****
  
        $sm = CreateObject('phpgwapi.sbox');
!       
$t->set_var('date_select',$phpgw->common->dateformatorder($sm->getYears('year',$year),$sm->getMonthText('month',$month),$sm->getDays('day',$day)));
  
!       $t->set_var('lang_access',lang('Private'));
  
        if ($access)
        {
!               $t->set_var('access','<input type="checkbox" name="access" 
value="True" checked>');
        }
        else
        {
!               $t->set_var('access','<input type="checkbox" name="access" 
value="True">');
        }
  
!       $t->set_var('lang_add',lang('Add'));
!       $t->set_var('lang_reset',lang('Clear Form'));
!       $t->set_var('lang_done',lang('Done'));
!       $t->set_var('done_action',$phpgw->link('/inv/listorders.php'));
!       $t->set_var('edithandle','');
!       $t->set_var('addhandle','');
!       $t->pparse('out','order_add');
!       $t->pparse('addhandle','add');
!       $phpgw->common->phpgw_footer();
  ?>
--- 180,204 ----
  
        $sm = CreateObject('phpgwapi.sbox');
!       
$GLOBALS['phpgw']->template->set_var('date_select',$GLOBALS['phpgw']->common->dateformatorder($sm->getYears('year',$year),$sm->getMonthText('month',$month),$sm->getDays('day',$day)));
  
!       $GLOBALS['phpgw']->template->set_var('lang_access',lang('Private'));
  
        if ($access)
        {
!               $GLOBALS['phpgw']->template->set_var('access','<input 
type="checkbox" name="access" value="True" checked>');
        }
        else
        {
!               $GLOBALS['phpgw']->template->set_var('access','<input 
type="checkbox" name="access" value="True">');
        }
  
!       $GLOBALS['phpgw']->template->set_var('lang_save',lang('save'));
!       $GLOBALS['phpgw']->template->set_var('lang_reset',lang('Clear Form'));
!       $GLOBALS['phpgw']->template->set_var('lang_done',lang('Done'));
!       
$GLOBALS['phpgw']->template->set_var('done_action',$GLOBALS['phpgw']->link('/inv/listorders.php'));
!       $GLOBALS['phpgw']->template->set_var('edithandle','');
!       $GLOBALS['phpgw']->template->set_var('addhandle','');
!       $GLOBALS['phpgw']->template->pparse('out','order_add');
!       $GLOBALS['phpgw']->template->pparse('addhandle','add');
!       $GLOBALS['phpgw']->common->phpgw_footer();
  ?>

Index: adddist.php
===================================================================
RCS file: /cvsroot/phpgroupware/inv/Attic/adddist.php,v
retrieving revision 1.14
retrieving revision 1.14.4.1
diff -C2 -d -r1.14 -r1.14.4.1
*** adddist.php 22 May 2001 01:55:01 -0000      1.14
--- adddist.php 14 Nov 2003 15:00:07 -0000      1.14.4.1
***************
*** 12,32 ****
        /* $Id$ */
  
!       if ($submit)
!       { 
!               $phpgw_info['flags'] = array('noheader' => True,
!                                                                       
'nonavbar' => True);
!       }
! 
!       $phpgw_info['flags']['currentapp'] = 'inv';
!       include('../header.inc.php');
! 
!       $t = CreateObject('phpgwapi.Template',PHPGW_APP_TPL);
!       $t->set_file(array('form' => 'dist_form.tpl'));
!       $t->set_block('form','add','addhandle');
!       $t->set_block('form','edit','edithandle');
!       $d = CreateObject('phpgwapi.contacts');
!     
!       if ($submit)
        {
                $fields = Array();
                $fields['org_name']                     = $company;
--- 12,21 ----
        /* $Id$ */
  
!       if ($_POST['save'])
        {
+               $GLOBALS['phpgw_info']['flags'] = array('currentapp' => 'inv',
+                                                                               
                'noheader' => True,
+                                                                               
                'nonavbar' => True);
+ 
                $fields = Array();
                $fields['org_name']                     = $company;
***************
*** 53,62 ****
                else { $access = 'public'; }
  
!               
$d->add($phpgw_info['user']['account_id'],$fields,$access,$cat_id,$tid='n');
  
!               Header('Location: ' . 
$phpgw->link('/inv/listdist.php','cat_id=' . $cat_id . '&order=' . $order . 
'&sort=' . $sort . '&filter=' . $filter
!                                                                               
        . '&start=' . $start));
        }
  
        $hidden_vars = '<input type="hidden" name="sort" value="' . $sort . 
'">' . "\n"
                                . '<input type="hidden" name="order" value="' . 
$order . '">' . "\n"
--- 42,59 ----
                else { $access = 'public'; }
  
!               $d = CreateObject('phpgwapi.contacts');
!               
$d->add($GLOBALS['phpgw_info']['user']['account_id'],$fields,$access,$cat_id,$tid='n');
  
!               $GLOBALS['phpgw']->redirect_link('/inv/listdist.php','cat_id=' 
. $cat_id . '&order=' . $order . '&sort=' . $sort . '&filter=' . $filter
!                                                                               
        . '&start=' . $start);
        }
  
+       $GLOBALS['phpgw_info']['flags']['currentapp'] = 'inv';
+       include('../header.inc.php');
+ 
+       $GLOBALS['phpgw']->template->set_file(array('form' => 'dist_form.tpl'));
+       $GLOBALS['phpgw']->template->set_block('form','add','addhandle');
+       $GLOBALS['phpgw']->template->set_block('form','edit','edithandle');
+       $d = CreateObject('phpgwapi.contacts');
        $hidden_vars = '<input type="hidden" name="sort" value="' . $sort . 
'">' . "\n"
                                . '<input type="hidden" name="order" value="' . 
$order . '">' . "\n"
***************
*** 66,124 ****
                                . '<input type="hidden" name="filter" value="' 
. $filter . '">' . "\n";
  
!       $t->set_var('lang_action',lang('Add distributor'));
!       $t->set_var('actionurl',$phpgw->link('/inv/adddist.php'));
!       $t->set_var('lang_company',lang('Company name'));
!       $t->set_var('lang_department',lang('Department'));
!       $t->set_var('lang_software',lang('Software'));
!       $t->set_var('lang_url',lang('WWW'));
!       $t->set_var('lang_url_mirror',lang('WWW mirror'));
!       $t->set_var('lang_industry_type',lang('Industry type'));
!       $t->set_var('lang_firstname',lang('Firstname'));
!       $t->set_var('lang_lastname',lang('Lastname'));
!       $t->set_var('lang_notes',lang('Notes'));
!       $t->set_var('lang_pager',lang('Pager'));
!       $t->set_var('lang_ftp',lang('FTP'));
!       $t->set_var('lang_ftp_mirror',lang('FTP mirror'));
!       $t->set_var('lang_email',lang('Email'));
!       $t->set_var('lang_phone',lang('Phone'));
!       $t->set_var('lang_fax',lang('Fax'));
!       $t->set_var('lang_contact',lang('Contact'));
!       $t->set_var('lang_select_cats',lang('Select category'));
!       $t->set_var('lang_cats',lang('Category'));
!       $t->set_var('hidden_vars',$hidden_vars);
  
        $c = CreateObject('phpgwapi.categories');
        $c->app_name = 'addressbook';
!       
$t->set_var('cats_list',$c->formated_list('select','all',$cat_id,'True'));
!       $t->set_var('company',$company);
!       $t->set_var('department',$department);
!       $t->set_var('firstname',$firstname);
!       $t->set_var('lastname',$lastname);
!       $t->set_var('industry_type',$industry_type);
!       $t->set_var('software',$software);
!       $t->set_var('email',$email);
!       $t->set_var('wphone',$wphone);
!       $t->set_var('fax',$fax);
!       $t->set_var('pager',$pager);
        if (! ereg('http://',$url)) { $url = 'http://'. $url; }
!       $t->set_var('url',$url);
        if (! ereg('http://',$url_mirror)) { $url_mirror = 'http://'. 
$url_mirror; }
!       $t->set_var('url_mirror',$url_mirror);
        if (! ereg('ftp://',$ftp)) { $ftp = 'ftp://'. $ftp; }
!       $t->set_var('ftp',$ftp);
        if (! ereg('ftp://',$ftp_mirror)) { $ftp_mirror = 'ftp://'. 
$ftp_mirror; }
!       $t->set_var('ftp_mirror',$ftp_mirror);
!       $t->set_var('notes',$notes);
!       $t->set_var('lang_access',lang('Private'));
!       if ($access) { $t->set_var('access', '<input type="checkbox" 
name="access" value="True" checked>'); }
!       else { $t->set_var('access', '<input type="checkbox" name="access" 
value="True">'); }
!       $t->set_var('lang_add',lang('Add'));
!       $t->set_var('lang_reset',lang('Clear Form'));
!       $t->set_var('edithandle','');
!       $t->set_var('addhandle','');
  
!       $t->pparse('out','form');
!       $t->pparse('addhandle','add');
  
!       $phpgw->common->phpgw_footer();
  ?>
--- 63,121 ----
                                . '<input type="hidden" name="filter" value="' 
. $filter . '">' . "\n";
  
!       $GLOBALS['phpgw']->template->set_var('lang_action',lang('Add 
distributor'));
!       
$GLOBALS['phpgw']->template->set_var('actionurl',$GLOBALS['phpgw']->link('/inv/adddist.php'));
!       $GLOBALS['phpgw']->template->set_var('lang_company',lang('Company 
name'));
!       
$GLOBALS['phpgw']->template->set_var('lang_department',lang('Department'));
!       $GLOBALS['phpgw']->template->set_var('lang_software',lang('Software'));
!       $GLOBALS['phpgw']->template->set_var('lang_url',lang('WWW'));
!       $GLOBALS['phpgw']->template->set_var('lang_url_mirror',lang('WWW 
mirror'));
!       
$GLOBALS['phpgw']->template->set_var('lang_industry_type',lang('Industry 
type'));
!       
$GLOBALS['phpgw']->template->set_var('lang_firstname',lang('Firstname'));
!       $GLOBALS['phpgw']->template->set_var('lang_lastname',lang('Lastname'));
!       $GLOBALS['phpgw']->template->set_var('lang_notes',lang('Notes'));
!       $GLOBALS['phpgw']->template->set_var('lang_pager',lang('Pager'));
!       $GLOBALS['phpgw']->template->set_var('lang_ftp',lang('FTP'));
!       $GLOBALS['phpgw']->template->set_var('lang_ftp_mirror',lang('FTP 
mirror'));
!       $GLOBALS['phpgw']->template->set_var('lang_email',lang('Email'));
!       $GLOBALS['phpgw']->template->set_var('lang_phone',lang('Phone'));
!       $GLOBALS['phpgw']->template->set_var('lang_fax',lang('Fax'));
!       $GLOBALS['phpgw']->template->set_var('lang_contact',lang('Contact'));
!       $GLOBALS['phpgw']->template->set_var('lang_select_cats',lang('Select 
category'));
!       $GLOBALS['phpgw']->template->set_var('lang_cats',lang('Category'));
!       $GLOBALS['phpgw']->template->set_var('hidden_vars',$hidden_vars);
  
        $c = CreateObject('phpgwapi.categories');
        $c->app_name = 'addressbook';
!       
$GLOBALS['phpgw']->template->set_var('cats_list',$c->formated_list('select','all',$cat_id,'True'));
!       $GLOBALS['phpgw']->template->set_var('company',$company);
!       $GLOBALS['phpgw']->template->set_var('department',$department);
!       $GLOBALS['phpgw']->template->set_var('firstname',$firstname);
!       $GLOBALS['phpgw']->template->set_var('lastname',$lastname);
!       $GLOBALS['phpgw']->template->set_var('industry_type',$industry_type);
!       $GLOBALS['phpgw']->template->set_var('software',$software);
!       $GLOBALS['phpgw']->template->set_var('email',$email);
!       $GLOBALS['phpgw']->template->set_var('wphone',$wphone);
!       $GLOBALS['phpgw']->template->set_var('fax',$fax);
!       $GLOBALS['phpgw']->template->set_var('pager',$pager);
        if (! ereg('http://',$url)) { $url = 'http://'. $url; }
!       $GLOBALS['phpgw']->template->set_var('url',$url);
        if (! ereg('http://',$url_mirror)) { $url_mirror = 'http://'. 
$url_mirror; }
!       $GLOBALS['phpgw']->template->set_var('url_mirror',$url_mirror);
        if (! ereg('ftp://',$ftp)) { $ftp = 'ftp://'. $ftp; }
!       $GLOBALS['phpgw']->template->set_var('ftp',$ftp);
        if (! ereg('ftp://',$ftp_mirror)) { $ftp_mirror = 'ftp://'. 
$ftp_mirror; }
!       $GLOBALS['phpgw']->template->set_var('ftp_mirror',$ftp_mirror);
!       $GLOBALS['phpgw']->template->set_var('notes',$notes);
!       $GLOBALS['phpgw']->template->set_var('lang_access',lang('Private'));
!       if ($access) { $GLOBALS['phpgw']->template->set_var('access', '<input 
type="checkbox" name="access" value="True" checked>'); }
!       else { $GLOBALS['phpgw']->template->set_var('access', '<input 
type="checkbox" name="access" value="True">'); }
!       $GLOBALS['phpgw']->template->set_var('lang_save',lang('save'));
!       $GLOBALS['phpgw']->template->set_var('lang_reset',lang('Clear Form'));
!       $GLOBALS['phpgw']->template->set_var('edithandle','');
!       $GLOBALS['phpgw']->template->set_var('addhandle','');
  
!       $GLOBALS['phpgw']->template->pparse('out','form');
!       $GLOBALS['phpgw']->template->pparse('addhandle','add');
  
!       $GLOBALS['phpgw']->common->phpgw_footer();
  ?>

Index: editdist.php
===================================================================
RCS file: /cvsroot/phpgroupware/inv/Attic/editdist.php,v
retrieving revision 1.14
retrieving revision 1.14.4.1
diff -C2 -d -r1.14 -r1.14.4.1
*** editdist.php        24 May 2001 03:00:16 -0000      1.14
--- editdist.php        14 Nov 2003 15:00:08 -0000      1.14.4.1
***************
*** 12,18 ****
        /* $Id$ */
  
!       if ($submit || !$id)
        {
!               $phpgw_info['flags'] = array('noheader' => True,
                                                                        
'nonavbar' => True);
        }
--- 12,20 ----
        /* $Id$ */
  
!       $id     = get_var('id',array('GET','POST'));
! 
!       if ($_POST['save'] || !$id)
        {
!               $GLOBALS['phpgw_info']['flags'] = array('noheader' => True,
                                                                        
'nonavbar' => True);
        }
***************
*** 20,33 ****
        if (! $id)
        {
!               Header('Location: ' . $phpgw->link('/inv/listdist.php','sort=' 
. $sort . '&order=' . $order . '&query=' . $query . '&start=' . $start
!                                                                               
. '&filter=' . $filter . '&cat_id=' . $cat_id));
!               $phpgw->common->phpgw_exit();
        }
  
!       $phpgw_info['flags']['currentapp'] = 'inv';
        include('../header.inc.php');
        $d = CreateObject('phpgwapi.contacts');
  
!       if ($submit)
        {
                $fields = Array();
--- 22,35 ----
        if (! $id)
        {
!               $GLOBALS['phpgw']->redirect_link('/inv/listdist.php','sort=' . 
$sort . '&order=' . $order . '&query=' . $query . '&start=' . $start
!                                                                               
. '&filter=' . $filter . '&cat_id=' . $cat_id);
!               $GLOBALS['phpgw']->common->phpgw_exit();
        }
  
!       $GLOBALS['phpgw_info']['flags']['currentapp'] = 'inv';
        include('../header.inc.php');
        $d = CreateObject('phpgwapi.contacts');
  
!       if ($_POST['save'])
        {
                $fields = Array();
***************
*** 55,68 ****
                else { $access = 'public'; }
  
!               
$d->update($id,$phpgw_info['user']['account_id'],$fields,$access,$cat_id,$tid='n');
!               Header('Location: ' . 
$phpgw->link('/inv/listdist.php','cat_id=' . $cat_id . '&order=' . $order . 
'&sort=' . $sort . '&filter=' . $filter
!                                                                               
        . '&start=' . $start));
!               $phpgw->common->phpgw_exit();
        }
  
!     $t = CreateObject('phpgwapi.Template',PHPGW_APP_TPL);
!       $t->set_file(array('form' => 'dist_form.tpl'));
!       $t->set_block('form','add','addhandle');
!       $t->set_block('form','edit','edithandle');
  
        $hidden_vars = '<input type="hidden" name="sort" value="' . $sort . 
'">' . "\n"
--- 57,69 ----
                else { $access = 'public'; }
  
!               
$d->update($id,$GLOBALS['phpgw_info']['user']['account_id'],$fields,$access,$cat_id,$tid='n');
!               $GLOBALS['phpgw']->redirect_link('/inv/listdist.php','cat_id=' 
. $cat_id . '&order=' . $order . '&sort=' . $sort . '&filter=' . $filter
!                                                                               
        . '&start=' . $start);
!               $GLOBALS['phpgw']->common->phpgw_exit();
        }
  
!       $GLOBALS['phpgw']->template->set_file(array('form' => 'dist_form.tpl'));
!       $GLOBALS['phpgw']->template->set_block('form','add','addhandle');
!       $GLOBALS['phpgw']->template->set_block('form','edit','edithandle');
  
        $hidden_vars = '<input type="hidden" name="sort" value="' . $sort . 
'">' . "\n"
***************
*** 74,78 ****
                                . '<input type="hidden" name="filter" value="' 
. $filter . '">' . "\n";
  
!       $t->set_var('hidden_vars',$hidden_vars);
  
        $fields =  array('org_name' => 'org_name',
--- 75,79 ----
                                . '<input type="hidden" name="filter" value="' 
. $filter . '">' . "\n";
  
!       $GLOBALS['phpgw']->template->set_var('hidden_vars',$hidden_vars);
  
        $fields =  array('org_name' => 'org_name',
***************
*** 94,119 ****
        $fields = $d->read_single_entry($id,$fields,$access,$cat_id,$tid='n');
  
!       $t->set_var('lang_action',lang('Edit distributor'));
!       $t->set_var('actionurl',$phpgw->link('/inv/editdist.php','id=' . $id));
!       $t->set_var('deleteurl',$phpgw->link('/inv/deletedist.php','id=' . 
$id));
!       $t->set_var('lang_company',lang('Company name'));
!       $t->set_var('lang_department',lang('Department'));
!       $t->set_var('lang_software',lang('Software'));
!       $t->set_var('lang_url',lang('WWW'));
!       $t->set_var('lang_url_mirror',lang('WWW mirror'));                      
                                                                                
                                             
!       $t->set_var('lang_industry_type',lang('Industry type')); 
!       $t->set_var('lang_firstname',lang('Firstname')); 
!       $t->set_var('lang_lastname',lang('Lastname'));
!       $t->set_var('lang_notes',lang('Notes')); 
!       $t->set_var('lang_pager',lang('Pager'));                                
                                                                                
               
!       $t->set_var('lang_ftp',lang('FTP'));
!       $t->set_var('lang_ftp_mirror',lang('FTP mirror'));
!       $t->set_var('lang_email',lang('Email'));
!       $t->set_var('lang_phone',lang('Phone'));
!       $t->set_var('lang_fax',lang('Fax'));
!       $t->set_var('lang_contact',lang('Contact'));
!       $t->set_var('lang_access',lang('Private'));
!       $t->set_var('lang_cats',lang('Category'));
!       $t->set_var('lang_select_cats',lang('Select category'));
  
        $id = $fields[0]['id'];
--- 95,120 ----
        $fields = $d->read_single_entry($id,$fields,$access,$cat_id,$tid='n');
  
!       $GLOBALS['phpgw']->template->set_var('lang_action',lang('Edit 
distributor'));
!       
$GLOBALS['phpgw']->template->set_var('actionurl',$GLOBALS['phpgw']->link('/inv/editdist.php','id='
 . $id));
!       
$GLOBALS['phpgw']->template->set_var('deleteurl',$GLOBALS['phpgw']->link('/inv/deletedist.php','id='
 . $id));
!       $GLOBALS['phpgw']->template->set_var('lang_company',lang('Company 
name'));
!       
$GLOBALS['phpgw']->template->set_var('lang_department',lang('Department'));
!       $GLOBALS['phpgw']->template->set_var('lang_software',lang('Software'));
!       $GLOBALS['phpgw']->template->set_var('lang_url',lang('WWW'));
!       $GLOBALS['phpgw']->template->set_var('lang_url_mirror',lang('WWW 
mirror'));                                                                      
                                                                             
!       
$GLOBALS['phpgw']->template->set_var('lang_industry_type',lang('Industry 
type')); 
!       
$GLOBALS['phpgw']->template->set_var('lang_firstname',lang('Firstname')); 
!       $GLOBALS['phpgw']->template->set_var('lang_lastname',lang('Lastname'));
!       $GLOBALS['phpgw']->template->set_var('lang_notes',lang('Notes')); 
!       $GLOBALS['phpgw']->template->set_var('lang_pager',lang('Pager'));       
                                                                                
                                        
!       $GLOBALS['phpgw']->template->set_var('lang_ftp',lang('FTP'));
!       $GLOBALS['phpgw']->template->set_var('lang_ftp_mirror',lang('FTP 
mirror'));
!       $GLOBALS['phpgw']->template->set_var('lang_email',lang('Email'));
!       $GLOBALS['phpgw']->template->set_var('lang_phone',lang('Phone'));
!       $GLOBALS['phpgw']->template->set_var('lang_fax',lang('Fax'));
!       $GLOBALS['phpgw']->template->set_var('lang_contact',lang('Contact'));
!       $GLOBALS['phpgw']->template->set_var('lang_access',lang('Private'));
!       $GLOBALS['phpgw']->template->set_var('lang_cats',lang('Category'));
!       $GLOBALS['phpgw']->template->set_var('lang_select_cats',lang('Select 
category'));
  
        $id = $fields[0]['id'];
***************
*** 137,172 ****
        $c = CreateObject('phpgwapi.categories');
        $c->app_name = 'addressbook';
!       
$t->set_var('cats_list',$c->formated_list('select','all',$cat_id,'True'));
!       $t->set_var('company',$company);
!       $t->set_var('department',$department);
!       $t->set_var('firstname',$firstname);
!       $t->set_var('lastname',$lastname);
!       $t->set_var('industry_type',$industry_type);
!       $t->set_var('software',$software);
!       $t->set_var('email',$email);
!       $t->set_var('wphone',$wphone);     
!       $t->set_var('fax',$fax);
!       $t->set_var('pager',$pager);
        if (! ereg('http://',$url)) { $url = 'http://'. $url; }
!       $t->set_var('url',$url);
        if (! ereg('http://',$url_mirror)) { $url_mirror = 'http://'. 
$url_mirror; }
!       $t->set_var('url_mirror',$url_mirror);
        if (! ereg('ftp://',$ftp)) { $ftp = 'ftp://'. $ftp; }
!       $t->set_var('ftp',$ftp);
        if (! ereg('ftp://',$ftp_mirror)) { $ftp_mirror = 'ftp://'. 
$ftp_mirror; }
!       $t->set_var('ftp_mirror',$ftp_mirror);
!       $t->set_var('notes',$notes);
  
!       if ($access=='private') { $t->set_var('access', '<input type="checkbox" 
name="access" value="True" checked>'); }
!       else { $t->set_var('access', '<input type="checkbox" name="access" 
value="True">'); }
  
!       $t->set_var('lang_edit',lang('Edit'));
!       $t->set_var('lang_delete',lang('Delete'));
!       $t->set_var('edithandle','');
!       $t->set_var('addhandle','');
  
!       $t->pparse('out','form');
!       $t->pparse('edithandle','edit');
  
!       $phpgw->common->phpgw_footer();
  ?>
--- 138,173 ----
        $c = CreateObject('phpgwapi.categories');
        $c->app_name = 'addressbook';
!       
$GLOBALS['phpgw']->template->set_var('cats_list',$c->formated_list('select','all',$cat_id,'True'));
!       $GLOBALS['phpgw']->template->set_var('company',$company);
!       $GLOBALS['phpgw']->template->set_var('department',$department);
!       $GLOBALS['phpgw']->template->set_var('firstname',$firstname);
!       $GLOBALS['phpgw']->template->set_var('lastname',$lastname);
!       $GLOBALS['phpgw']->template->set_var('industry_type',$industry_type);
!       $GLOBALS['phpgw']->template->set_var('software',$software);
!       $GLOBALS['phpgw']->template->set_var('email',$email);
!       $GLOBALS['phpgw']->template->set_var('wphone',$wphone);     
!       $GLOBALS['phpgw']->template->set_var('fax',$fax);
!       $GLOBALS['phpgw']->template->set_var('pager',$pager);
        if (! ereg('http://',$url)) { $url = 'http://'. $url; }
!       $GLOBALS['phpgw']->template->set_var('url',$url);
        if (! ereg('http://',$url_mirror)) { $url_mirror = 'http://'. 
$url_mirror; }
!       $GLOBALS['phpgw']->template->set_var('url_mirror',$url_mirror);
        if (! ereg('ftp://',$ftp)) { $ftp = 'ftp://'. $ftp; }
!       $GLOBALS['phpgw']->template->set_var('ftp',$ftp);
        if (! ereg('ftp://',$ftp_mirror)) { $ftp_mirror = 'ftp://'. 
$ftp_mirror; }
!       $GLOBALS['phpgw']->template->set_var('ftp_mirror',$ftp_mirror);
!       $GLOBALS['phpgw']->template->set_var('notes',$notes);
  
!       if ($access=='private') { 
$GLOBALS['phpgw']->template->set_var('access', '<input type="checkbox" 
name="access" value="True" checked>'); }
!       else { $GLOBALS['phpgw']->template->set_var('access', '<input 
type="checkbox" name="access" value="True">'); }
  
!       $GLOBALS['phpgw']->template->set_var('lang_save',lang('save'));
!       $GLOBALS['phpgw']->template->set_var('lang_delete',lang('Delete'));
!       $GLOBALS['phpgw']->template->set_var('edithandle','');
!       $GLOBALS['phpgw']->template->set_var('addhandle','');
  
!       $GLOBALS['phpgw']->template->pparse('out','form');
!       $GLOBALS['phpgw']->template->pparse('edithandle','edit');
  
!       $GLOBALS['phpgw']->common->phpgw_footer();
  ?>

Index: addproduct.php
===================================================================
RCS file: /cvsroot/phpgroupware/inv/Attic/addproduct.php,v
retrieving revision 1.60.2.1
retrieving revision 1.60.2.1.2.1
diff -C2 -d -r1.60.2.1 -r1.60.2.1.2.1
*** addproduct.php      2 Mar 2003 22:35:16 -0000       1.60.2.1
--- addproduct.php      14 Nov 2003 15:00:07 -0000      1.60.2.1.2.1
***************
*** 13,22 ****
        /* $Id$ */
  
!       $phpgw_info['flags'] = array('currentapp' => 'inv',
                                                        
'enable_categories_class' => True);
  
        include('../header.inc.php');
  
!       if (!$submit)
        {
                $referer = $HTTP_REFERER;
--- 13,22 ----
        /* $Id$ */
  
!       $GLOBALS['phpgw_info']['flags'] = array('currentapp' => 'inv',
                                                        
'enable_categories_class' => True);
  
        include('../header.inc.php');
  
!       if (!$_POST['save'])
        {
                $referer = $HTTP_REFERER;
***************
*** 30,40 ****
                                . '<input type="hidden" name="referer" value="' 
. $referer . '">' . "\n";
  
!       $t = CreateObject('phpgwapi.Template',PHPGW_APP_TPL);
!       $t->set_file(array('form' => 'product_form.tpl'));
!       $t->set_block('form','add','addhandle');
!       $t->set_block('form','edit','edithandle');
      $inventory = CreateObject('inv.inventory');
  
!       if ($submit)
        {
                $errorcount = 0;
--- 30,39 ----
                                . '<input type="hidden" name="referer" value="' 
. $referer . '">' . "\n";
  
!       $GLOBALS['phpgw']->template->set_file(array('form' => 
'product_form.tpl'));
!       $GLOBALS['phpgw']->template->set_block('form','add','addhandle');
!       $GLOBALS['phpgw']->template->set_block('form','edit','edithandle');
      $inventory = CreateObject('inv.inventory');
  
!       if ($_POST['save'])
        {
                $errorcount = 0;
***************
*** 64,71 ****
                                if ($short_name)
                                {
!                                       $phpgw->db->query("select count(*) from 
phpgw_inv_products where name='$short_name' AND category='$category'");         
                                                                                
       
!                                       $phpgw->db->next_record();
  
!                                       if ($phpgw->db->f(0) != 0)
                                        {
                                                $error[$errorcount++] = 
lang('That name has been used already !');
--- 63,70 ----
                                if ($short_name)
                                {
!                                       $GLOBALS['phpgw']->db->query("select 
count(*) from phpgw_inv_products where name='$short_name' AND 
category='$category'");                                                         
                                       
!                                       $GLOBALS['phpgw']->db->next_record();
  
!                                       if ($GLOBALS['phpgw']->db->f(0) != 0)
                                        {
                                                $error[$errorcount++] = 
lang('That name has been used already !');
***************
*** 75,82 ****
                                if ($id)
                                {
!                                       $phpgw->db->query("select count(*) from 
phpgw_inv_products where id='$id' AND category='$category'");
!                                       $phpgw->db->next_record();
  
!                                       if ($phpgw->db->f(0) != 0)
                                        {
                                                $error[$errorcount++] = 
lang('That ID has been used already !');
--- 74,81 ----
                                if ($id)
                                {
!                                       $GLOBALS['phpgw']->db->query("select 
count(*) from phpgw_inv_products where id='$id' AND category='$category'");
!                                       $GLOBALS['phpgw']->db->next_record();
  
!                                       if ($GLOBALS['phpgw']->db->f(0) != 0)
                                        {
                                                $error[$errorcount++] = 
lang('That ID has been used already !');
***************
*** 132,136 ****
                                $retail = round($price*(1+$taxpercent),2);
  
!                               $phpgw->db->query("insert into 
phpgw_inv_products (id,serial,name,descr,category,status,cost,price,"
                                                        . 
"retail,stock,mstock,url,ftp,dist,pdate,sdate,bin,product_note) values 
('$id','$serial','$short_name','$descr','$category','$status','"
                                                        . 
"$cost','$price','$retail','$stock','$mstock','$url','$ftp','$dist','$pdate','$sdate','$bin','$product_note')");
--- 131,135 ----
                                $retail = round($price*(1+$taxpercent),2);
  
!                               $GLOBALS['phpgw']->db->query("insert into 
phpgw_inv_products (id,serial,name,descr,category,status,cost,price,"
                                                        . 
"retail,stock,mstock,url,ftp,dist,pdate,sdate,bin,product_note) values 
('$id','$serial','$short_name','$descr','$category','$status','"
                                                        . 
"$cost','$price','$retail','$stock','$mstock','$url','$ftp','$dist','$pdate','$sdate','$bin','$product_note')");
***************
*** 140,165 ****
        if ($errorcount)
        {
!               $t->set_var('message',$phpgw->common->error_list($error));
        }
!       if (($submit) && (! $error) && (! $errorcount))
        {
!               $t->set_var('message',lang('Product %1 %2 has been added 
!',$id,$short_name));
        }
!       if ((! $submit) && (! $error) && (! $errorcount))
        {
!               $t->set_var('message','');
        }
  
!       $t->set_var('lang_x',lang('#'));
!       $t->set_var('lang_choose',lang('Generate Product ID ?'));
!       $t->set_var('choose','<input type="checkbox" name="choose" 
value="True">');
  
!       $t->set_var('id',$id);
!       $t->set_var('short_name',$short_name);
!       $t->set_var('product_note',$product_note);
!       $t->set_var('serial',$serial);
!       $t->set_var('descr',$descr);
!       $t->set_var('pdate',$pdate);
!       $t->set_var('sdate',$sdate);
  
        if (! ereg('http://',$url))
--- 139,164 ----
        if ($errorcount)
        {
!               
$GLOBALS['phpgw']->template->set_var('message',$GLOBALS['phpgw']->common->error_list($error));
        }
!       if (($_POST['save']) && (! $error) && (! $errorcount))
        {
!               $GLOBALS['phpgw']->template->set_var('message',lang('Product %1 
%2 has been added !',$id,$short_name));
        }
!       if ((!$_POST['save']) && (! $error) && (! $errorcount))
        {
!               $GLOBALS['phpgw']->template->set_var('message','');
        }
  
!       $GLOBALS['phpgw']->template->set_var('lang_x',lang('#'));
!       $GLOBALS['phpgw']->template->set_var('lang_choose',lang('Generate 
Product ID ?'));
!       $GLOBALS['phpgw']->template->set_var('choose','<input type="checkbox" 
name="choose" value="True">');
  
!       $GLOBALS['phpgw']->template->set_var('id',$id);
!       $GLOBALS['phpgw']->template->set_var('short_name',$short_name);
!       $GLOBALS['phpgw']->template->set_var('product_note',$product_note);
!       $GLOBALS['phpgw']->template->set_var('serial',$serial);
!       $GLOBALS['phpgw']->template->set_var('descr',$descr);
!       $GLOBALS['phpgw']->template->set_var('pdate',$pdate);
!       $GLOBALS['phpgw']->template->set_var('sdate',$sdate);
  
        if (! ereg('http://',$url))
***************
*** 167,171 ****
                $url = 'http://'. $url;
        }
!       $t->set_var('url',$url);
  
        if (! ereg('ftp://',$ftp))
--- 166,170 ----
                $url = 'http://'. $url;
        }
!       $GLOBALS['phpgw']->template->set_var('url',$url);
  
        if (! ereg('ftp://',$ftp))
***************
*** 173,240 ****
                $ftp = 'ftp://'. $ftp;
        }
!       $t->set_var('ftp',$ftp);
  
!       $t->set_var('cost',$cost);
!       $t->set_var('price',$price);
!       $t->set_var('retail',$retail);
!       $t->set_var('stock',$stock);
!       $t->set_var('mstock',$mstock);
  
!       if (isset($phpgw_info['user']['preferences']['common']['currency']))
        {
!               $currency = 
$phpgw_info['user']['preferences']['common']['currency'];
!               $t->set_var('error','');
        }
        else
        {
!               $t->set_var('error',lang('Please set your preferences for this 
application !'));
        }
  
!       $t->set_var('hidden_vars',$hidden_vars);
!       $t->set_var('lang_action',lang('Add product'));
!       $t->set_var('actionurl',$phpgw->link('/inv/addproduct.php'));
!       $t->set_var('lang_id',lang('Product ID'));
!       $t->set_var('lang_short_name',lang('Short Name'));
!       $t->set_var('lang_url',lang('WWW'));
!       $t->set_var('lang_ftp',lang('FTP'));
!       $t->set_var('lang_purchase_date',lang('Purchase date'));
!       $t->set_var('lang_selling_date',lang('Selling date'));
!       $t->set_var('lang_description',lang('Description'));
!       $t->set_var('lang_category',lang('Category'));
!       $t->set_var('lang_in_stock',lang('in Stock'));
!       $t->set_var('lang_min_stock',lang('min Stock'));
!       $t->set_var('lang_cost',lang('Purchase price'));
!       $t->set_var('lang_price',lang('Selling price'));
!       $t->set_var('lang_retail',lang('Retail'));
!       $t->set_var('lang_status',lang('Status'));
!       $t->set_var('lang_serial',lang('Serial number'));
!       $t->set_var('lang_select_dist',lang('Select distributor'));
!       $t->set_var('lang_select_room',lang('Select Stock room'));
!       $t->set_var('lang_select_cat',lang('Select category'));
!       $t->set_var('lang_distributor',lang('Distributor'));
!       $t->set_var('lang_note',lang('Note'));
!       $t->set_var('lang_room',lang('Stock room'));
  
!       $t->set_var('status_list',select_status_list($status));
  
        $d = CreateObject('phpgwapi.contacts');
!       $t->set_var('dist_list',select_dist_list($dist));
  
!       $t->set_var('room_list',$inventory->select_room_list($bin));
  
!       $t->set_var('currency',$currency);
  
! /*    $c = CreateObject('phpgwapi.categories');
!       if ($cat_id)
        { */
!               
$t->set_var('category_list',$phpgw->categories->formated_list('select','all',$cat_id,False));
  /*    }
        else
        {
!               
$t->set_var('category_list',$c->formated_list('select','all',$category,False));
        } */
  
!       $undefined = $t->get_undefined('form');
!       while ($undef = each($undefined)) {     $t->set_var($undef[0],''); }
  
        $sm = CreateObject('phpgwapi.sbox');
--- 172,239 ----
                $ftp = 'ftp://'. $ftp;
        }
!       $GLOBALS['phpgw']->template->set_var('ftp',$ftp);
  
!       $GLOBALS['phpgw']->template->set_var('cost',$cost);
!       $GLOBALS['phpgw']->template->set_var('price',$price);
!       $GLOBALS['phpgw']->template->set_var('retail',$retail);
!       $GLOBALS['phpgw']->template->set_var('stock',$stock);
!       $GLOBALS['phpgw']->template->set_var('mstock',$mstock);
  
!       if 
(isset($GLOBALS['phpgw_info']['user']['preferences']['common']['currency']))
        {
!               $currency = 
$GLOBALS['phpgw_info']['user']['preferences']['common']['currency'];
!               $GLOBALS['phpgw']->template->set_var('error','');
        }
        else
        {
!               $GLOBALS['phpgw']->template->set_var('error',lang('Please set 
your preferences for this application !'));
        }
  
!       $GLOBALS['phpgw']->template->set_var('hidden_vars',$hidden_vars);
!       $GLOBALS['phpgw']->template->set_var('lang_action',lang('Add product'));
!       
$GLOBALS['phpgw']->template->set_var('actionurl',$GLOBALS['phpgw']->link('/inv/addproduct.php'));
!       $GLOBALS['phpgw']->template->set_var('lang_id',lang('Product ID'));
!       $GLOBALS['phpgw']->template->set_var('lang_short_name',lang('Short 
Name'));
!       $GLOBALS['phpgw']->template->set_var('lang_url',lang('WWW'));
!       $GLOBALS['phpgw']->template->set_var('lang_ftp',lang('FTP'));
!       
$GLOBALS['phpgw']->template->set_var('lang_purchase_date',lang('Purchase 
date'));
!       $GLOBALS['phpgw']->template->set_var('lang_selling_date',lang('Selling 
date'));
!       
$GLOBALS['phpgw']->template->set_var('lang_description',lang('Description'));
!       $GLOBALS['phpgw']->template->set_var('lang_category',lang('Category'));
!       $GLOBALS['phpgw']->template->set_var('lang_in_stock',lang('in Stock'));
!       $GLOBALS['phpgw']->template->set_var('lang_min_stock',lang('min 
Stock'));
!       $GLOBALS['phpgw']->template->set_var('lang_cost',lang('Purchase 
price'));
!       $GLOBALS['phpgw']->template->set_var('lang_price',lang('Selling 
price'));
!       $GLOBALS['phpgw']->template->set_var('lang_retail',lang('Retail'));
!       $GLOBALS['phpgw']->template->set_var('lang_status',lang('Status'));
!       $GLOBALS['phpgw']->template->set_var('lang_serial',lang('Serial 
number'));
!       $GLOBALS['phpgw']->template->set_var('lang_select_dist',lang('Select 
distributor'));
!       $GLOBALS['phpgw']->template->set_var('lang_select_room',lang('Select 
Stock room'));
!       $GLOBALS['phpgw']->template->set_var('lang_select_cat',lang('Select 
category'));
!       
$GLOBALS['phpgw']->template->set_var('lang_distributor',lang('Distributor'));
!       $GLOBALS['phpgw']->template->set_var('lang_note',lang('Note'));
!       $GLOBALS['phpgw']->template->set_var('lang_room',lang('Stock room'));
  
!       
$GLOBALS['phpgw']->template->set_var('status_list',select_status_list($status));
  
        $d = CreateObject('phpgwapi.contacts');
!       
$GLOBALS['phpgw']->template->set_var('dist_list',select_dist_list($dist));
  
!       
$GLOBALS['phpgw']->template->set_var('room_list',$inventory->select_room_list($bin));
  
!       $GLOBALS['phpgw']->template->set_var('currency',$currency);
  
!       $c = CreateObject('phpgwapi.categories');
! /*    if ($cat_id)
        { */
!               
$GLOBALS['phpgw']->template->set_var('category_list',$c->formated_list('select','all',$cat_id,False));
  /*    }
        else
        {
!               
$GLOBALS['phpgw']->template->set_var('category_list',$c->formated_list('select','all',$category,False));
        } */
  
!       $undefined = $GLOBALS['phpgw']->template->get_undefined('form');
!       while ($undef = each($undefined)) {     
$GLOBALS['phpgw']->template->set_var($undef[0],''); }
  
        $sm = CreateObject('phpgwapi.sbox');
***************
*** 253,257 ****
        }
  
!       
$t->set_var('purchase_date_select',$phpgw->common->dateformatorder($sm->getYears('pyear',$pyear),$sm->getMonthText('pmonth',$pmonth),$sm->getDays('pday',$pday)));
  
        if (!$sdate)
--- 252,256 ----
        }
  
!       
$GLOBALS['phpgw']->template->set_var('purchase_date_select',$GLOBALS['phpgw']->common->dateformatorder($sm->getYears('pyear',$pyear),$sm->getMonthText('pmonth',$pmonth),$sm->getDays('pday',$pday)));
  
        if (!$sdate)
***************
*** 268,284 ****
        }
  
!       
$t->set_var('selling_date_select',$phpgw->common->dateformatorder($sm->getYears('syear',$syear),$sm->getMonthText('smonth',$smonth),$sm->getDays('sday',$sday)));
  
!       $t->set_var('lang_add',lang('Add'));
!       $t->set_var('lang_reset',lang('Clear Form'));
!       $t->set_var('done_action',$referer);
!       $t->set_var('lang_done',lang('Done'));
  
!       $t->set_var('edithandle','');
!       $t->set_var('addhandle','');
  
!       $t->pparse('out','form');
!       $t->pparse('addhandle','add');
  
!       $phpgw->common->phpgw_footer();
  ?>
--- 267,283 ----
        }
  
!       
$GLOBALS['phpgw']->template->set_var('selling_date_select',$GLOBALS['phpgw']->common->dateformatorder($sm->getYears('syear',$syear),$sm->getMonthText('smonth',$smonth),$sm->getDays('sday',$sday)));
  
!       $GLOBALS['phpgw']->template->set_var('lang_save',lang('save'));
!       $GLOBALS['phpgw']->template->set_var('lang_reset',lang('Clear Form'));
!       $GLOBALS['phpgw']->template->set_var('done_action',$referer);
!       $GLOBALS['phpgw']->template->set_var('lang_done',lang('Done'));
  
!       $GLOBALS['phpgw']->template->set_var('edithandle','');
!       $GLOBALS['phpgw']->template->set_var('addhandle','');
  
!       $GLOBALS['phpgw']->template->pparse('out','form');
!       $GLOBALS['phpgw']->template->pparse('addhandle','add');
  
!       $GLOBALS['phpgw']->common->phpgw_footer();
  ?>

Index: index.php
===================================================================
RCS file: /cvsroot/phpgroupware/inv/index.php,v
retrieving revision 1.52
retrieving revision 1.52.4.1
diff -C2 -d -r1.52 -r1.52.4.1
*** index.php   19 Jul 2001 00:13:57 -0000      1.52
--- index.php   14 Nov 2003 15:00:08 -0000      1.52.4.1
***************
*** 12,16 ****
        /* $Id$ */
  
!       $phpgw_info['flags'] = array('currentapp' => 'inv',
                                        'enable_nextmatchs_class' => True);
  
--- 12,16 ----
        /* $Id$ */
  
!       $GLOBALS['phpgw_info']['flags'] = array('currentapp' => 'inv',
                                        'enable_nextmatchs_class' => True);
  
***************
*** 19,29 ****
        $inventory = CreateObject('inv.inventory');
  
!       $t = CreateObject('phpgwapi.Template',PHPGW_APP_TPL);
!       $t->set_file(array('cat_list_t' => 'listcategorys.tpl'));
!       $t->set_block('cat_list_t','cat_list','list');
  
        $c = CreateObject('phpgwapi.categories');
!       $grants = $phpgw->acl->get_grants('inv');
!       $grants[$phpgw_info['user']['account_id']] = PHPGW_ACL_READ + 
PHPGW_ACL_ADD + PHPGW_ACL_EDIT + PHPGW_ACL_DELETE;
  
        $hidden_vars = '<input type="hidden" name="sort" value="' . $sort . 
'">' . "\n"
--- 19,29 ----
        $inventory = CreateObject('inv.inventory');
  
!       //$t = CreateObject('phpgwapi.Template',PHPGW_APP_TPL);
!       $GLOBALS['phpgw']->template->set_file(array('cat_list_t' => 
'listcategorys.tpl'));
!       $GLOBALS['phpgw']->template->set_block('cat_list_t','cat_list','list');
  
        $c = CreateObject('phpgwapi.categories');
!       $grants = $GLOBALS['phpgw']->acl->get_grants('inv');
!       $grants[$GLOBALS['phpgw_info']['user']['account_id']] = PHPGW_ACL_READ 
+ PHPGW_ACL_ADD + PHPGW_ACL_EDIT + PHPGW_ACL_DELETE;
  
        $hidden_vars = '<input type="hidden" name="sort" value="' . $sort . 
'">' . "\n"
***************
*** 33,41 ****
                                . '<input type="hidden" name="filter" value="' 
. $filter . '">' . "\n";
  
!       $t->set_var('lang_action',lang('Category list'));
!       $t->set_var('add_action',$phpgw->link('/inv/addcategory.php'));
!       $t->set_var('lang_add',lang('Add'));
!       $t->set_var('lang_search',lang('Search'));
!       $t->set_var('actionurl',$phpgw->link('/inv/index.php'));
  
        if (! $start) { $start = 0; }
--- 33,41 ----
                                . '<input type="hidden" name="filter" value="' 
. $filter . '">' . "\n";
  
!       $GLOBALS['phpgw']->template->set_var('lang_action',lang('Category 
list'));
!       
$GLOBALS['phpgw']->template->set_var('add_action',$GLOBALS['phpgw']->link('/inv/addcategory.php'));
!       $GLOBALS['phpgw']->template->set_var('lang_add',lang('Add'));
!       $GLOBALS['phpgw']->template->set_var('lang_search',lang('Search'));
!       
$GLOBALS['phpgw']->template->set_var('actionurl',$GLOBALS['phpgw']->link('/inv/index.php'));
  
        if (! $start) { $start = 0; }
***************
*** 45,54 ****
  //--------------------------------- nextmatch 
--------------------------------------------
  
!       $left = 
$phpgw->nextmatchs->left('/inv/index.php',$start,$c->total_records);
!       $right = 
$phpgw->nextmatchs->right('/inv/index.php',$start,$c->total_records);
!       $t->set_var('left',$left);
!       $t->set_var('right',$right);
  
!       
$t->set_var('lang_showing',$phpgw->nextmatchs->show_hits($c->total_records,$start));
  
  // ------------------------------ end nextmatch 
------------------------------------------
--- 45,54 ----
  //--------------------------------- nextmatch 
--------------------------------------------
  
!       $left = 
$GLOBALS['phpgw']->nextmatchs->left('/inv/index.php',$start,$c->total_records);
!       $right = 
$GLOBALS['phpgw']->nextmatchs->right('/inv/index.php',$start,$c->total_records);
!       $GLOBALS['phpgw']->template->set_var('left',$left);
!       $GLOBALS['phpgw']->template->set_var('right',$right);
  
!       
$GLOBALS['phpgw']->template->set_var('lang_showing',$GLOBALS['phpgw']->nextmatchs->show_hits($c->total_records,$start));
  
  // ------------------------------ end nextmatch 
------------------------------------------
***************
*** 56,69 ****
  //------------------- list header variable template-declarations 
-------------------------
  
!       $t->set_var('th_bg',$phpgw_info['theme']['th_bg']);
!       
$t->set_var('sort_name',$phpgw->nextmatchs->show_sort_order($sort,'cat_name',$order,'/inv/index.php',lang('Name')));
!       
$t->set_var('sort_number',$phpgw->nextmatchs->show_sort_order($sort,'cat_data',$order,'/inv/index.php',lang('Category
 ID')));
!       
$t->set_var('sort_description',$phpgw->nextmatchs->show_sort_order($sort,'cat_description',$order,'/inv/index.php',lang('Description')));
!       
$t->set_var('sort_tax',$phpgw->nextmatchs->show_sort_order($sort,'cat_data',order,'/inv/index.php',lang('tax')));
!       $t->set_var('lang_products',lang('Products'));
!       $t->set_var('lang_procent',lang('%'));
!       $t->set_var('lang_sub',lang('Add sub'));
!       $t->set_var('lang_edit',lang('Edit'));
!       $t->set_var('lang_delete',lang('Delete'));
  
  // -------------------------- end header declaration 
--------------------------------------
--- 56,69 ----
  //------------------- list header variable template-declarations 
-------------------------
  
!       
$GLOBALS['phpgw']->template->set_var('th_bg',$GLOBALS['phpgw_info']['theme']['th_bg']);
!       
$GLOBALS['phpgw']->template->set_var('sort_name',$GLOBALS['phpgw']->nextmatchs->show_sort_order($sort,'cat_name',$order,'/inv/index.php',lang('Name')));
!       
$GLOBALS['phpgw']->template->set_var('sort_number',$GLOBALS['phpgw']->nextmatchs->show_sort_order($sort,'cat_data',$order,'/inv/index.php',lang('Category
 ID')));
!       
$GLOBALS['phpgw']->template->set_var('sort_description',$GLOBALS['phpgw']->nextmatchs->show_sort_order($sort,'cat_description',$order,'/inv/index.php',lang('Description')));
!       
$GLOBALS['phpgw']->template->set_var('sort_tax',$GLOBALS['phpgw']->nextmatchs->show_sort_order($sort,'cat_data',order,'/inv/index.php',lang('tax')));
!       $GLOBALS['phpgw']->template->set_var('lang_products',lang('Products'));
!       $GLOBALS['phpgw']->template->set_var('lang_procent',lang('%'));
!       $GLOBALS['phpgw']->template->set_var('lang_sub',lang('Add sub'));
!       $GLOBALS['phpgw']->template->set_var('lang_edit',lang('Edit'));
!       $GLOBALS['phpgw']->template->set_var('lang_delete',lang('Delete'));
  
  // -------------------------- end header declaration 
--------------------------------------
***************
*** 71,79 ****
        for ($i=0;$i<count($cats);$i++)
        {
!               $tr_color = $phpgw->nextmatchs->alternate_row_color($tr_color);
!               $t->set_var('tr_color',$tr_color);
  
                $data = unserialize($cats[$i]['data']);
!               $number = $phpgw->strip_html($data['number']);
                if (! $number) { $number  = '&nbsp;'; }
                $tax = sprintf("%01.2f",(float)$data['tax']);
--- 71,79 ----
        for ($i=0;$i<count($cats);$i++)
        {
!               $tr_color = 
$GLOBALS['phpgw']->nextmatchs->alternate_row_color($tr_color);
!               $GLOBALS['phpgw']->template->set_var('tr_color',$tr_color);
  
                $data = unserialize($cats[$i]['data']);
!               $number = $GLOBALS['phpgw']->strip_html($data['number']);
                if (! $number) { $number  = '&nbsp;'; }
                $tax = sprintf("%01.2f",(float)$data['tax']);
***************
*** 87,99 ****
                        $space = '&nbsp;&nbsp;';
                        $spaceset = str_repeat($space,$level);
!                       $name = $spaceset . 
$phpgw->strip_html($cats[$i]['name']);
                }
  
!               $descr = $phpgw->strip_html($cats[$i]['description']);
                if (! $descr) { $descr  = '&nbsp;'; }
  
                if ($level == 0)
                {
!                       $name = '<font color=FF0000><b>' . 
$phpgw->strip_html($cats[$i]['name']) . '</b></font>';
                        $number = '<font color=FF0000><b>' . $number . 
'</b></font>';
                        $descr = '<font color=FF0000><b>' . $descr . 
'</b></font>'; 
--- 87,99 ----
                        $space = '&nbsp;&nbsp;';
                        $spaceset = str_repeat($space,$level);
!                       $name = $spaceset . 
$GLOBALS['phpgw']->strip_html($cats[$i]['name']);
                }
  
!               $descr = 
$GLOBALS['phpgw']->strip_html($cats[$i]['description']);
                if (! $descr) { $descr  = '&nbsp;'; }
  
                if ($level == 0)
                {
!                       $name = '<font color=FF0000><b>' . 
$GLOBALS['phpgw']->strip_html($cats[$i]['name']) . '</b></font>';
                        $number = '<font color=FF0000><b>' . $number . 
'</b></font>';
                        $descr = '<font color=FF0000><b>' . $descr . 
'</b></font>'; 
***************
*** 103,152 ****
  //-------------------------- template declaration for list records 
---------------------------                                                     
                                                          
                                                                                
                                                                              
!               $t->set_var(array('name' => $name,                              
                                                                                
          
                                                'number' => $number,
                                                'descr' => $descr,              
                                                                                
             
                                                        'tax' => $tax));        
                                                                                
                        
  
!               
$t->set_var('products',$phpgw->link('/inv/listproducts.php','filter=' . $cat_id 
. '&subproduct=True'));
  
!               if ($inventory->check_perms($grants[$owner],PHPGW_ACL_ADD) || 
$owner == $phpgw_info['user']['account_id'])
                {
!                       
$t->set_var('add_sub',$phpgw->link('/inv/addcategory.php','cat_parent=' . 
$cat_id));
!                       $t->set_var('lang_sub_entry',lang('Add sub'));
                }
                else
                {
!                       $t->set_var('add_sub','');
!                       $t->set_var('lang_sub_entry','&nbsp;');
                }
  
!               if ($inventory->check_perms($grants[$owner],PHPGW_ACL_EDIT) || 
$owner == $phpgw_info['user']['account_id'])
                {
!                       
$t->set_var('edit',$phpgw->link('/inv/editcategory.php','cat_id=' . $cat_id));
!                       $t->set_var('lang_edit_entry',lang('Edit'));
                }
                else
                {
!                       $t->set_var('edit','');
!                       $t->set_var('lang_edit_entry','&nbsp;');
                }
!               if ($inventory->check_perms($grants[$owner],PHPGW_ACL_DELETE) 
|| $owner == $phpgw_info['user']['account_id'])
                {
!                       
$t->set_var('delete',$phpgw->link('/inv/deletecategory.php','cat_id=' . 
$cat_id));
!                       $t->set_var('lang_delete_entry',lang('Delete'));
                }
                else
                {
!                       $t->set_var('delete','');
!                       $t->set_var('lang_delete_entry','&nbsp;');
                }
  
!               $t->parse('list','cat_list',True);
        }
  // ---------------------------- end record declaration 
-----------------------------------------
  
!       $t->parse('out','cat_list_t',True);
!       $t->p('out');
  
!       $phpgw->common->phpgw_footer();
  ?>
--- 103,152 ----
  //-------------------------- template declaration for list records 
---------------------------                                                     
                                                          
                                                                                
                                                                              
!               $GLOBALS['phpgw']->template->set_var(array('name' => $name,     
                                                                                
                                   
                                                'number' => $number,
                                                'descr' => $descr,              
                                                                                
             
                                                        'tax' => $tax));        
                                                                                
                        
  
!               
$GLOBALS['phpgw']->template->set_var('products',$GLOBALS['phpgw']->link('/inv/listproducts.php','filter='
 . $cat_id . '&subproduct=True'));
  
!               if ($inventory->check_perms($grants[$owner],PHPGW_ACL_ADD) || 
$owner == $GLOBALS['phpgw_info']['user']['account_id'])
                {
!                       
$GLOBALS['phpgw']->template->set_var('add_sub',$GLOBALS['phpgw']->link('/inv/addcategory.php','cat_parent='
 . $cat_id));
!                       
$GLOBALS['phpgw']->template->set_var('lang_sub_entry',lang('Add sub'));
                }
                else
                {
!                       $GLOBALS['phpgw']->template->set_var('add_sub','');
!                       
$GLOBALS['phpgw']->template->set_var('lang_sub_entry','&nbsp;');
                }
  
!               if ($inventory->check_perms($grants[$owner],PHPGW_ACL_EDIT) || 
$owner == $GLOBALS['phpgw_info']['user']['account_id'])
                {
!                       
$GLOBALS['phpgw']->template->set_var('edit',$GLOBALS['phpgw']->link('/inv/editcategory.php','cat_id='
 . $cat_id));
!                       
$GLOBALS['phpgw']->template->set_var('lang_edit_entry',lang('Edit'));
                }
                else
                {
!                       $GLOBALS['phpgw']->template->set_var('edit','');
!                       
$GLOBALS['phpgw']->template->set_var('lang_edit_entry','&nbsp;');
                }
!               if ($inventory->check_perms($grants[$owner],PHPGW_ACL_DELETE) 
|| $owner == $GLOBALS['phpgw_info']['user']['account_id'])
                {
!                       
$GLOBALS['phpgw']->template->set_var('delete',$GLOBALS['phpgw']->link('/inv/deletecategory.php','cat_id='
 . $cat_id));
!                       
$GLOBALS['phpgw']->template->set_var('lang_delete_entry',lang('Delete'));
                }
                else
                {
!                       $GLOBALS['phpgw']->template->set_var('delete','');
!                       
$GLOBALS['phpgw']->template->set_var('lang_delete_entry','&nbsp;');
                }
  
!               $GLOBALS['phpgw']->template->parse('list','cat_list',True);
        }
  // ---------------------------- end record declaration 
-----------------------------------------
  
!       $GLOBALS['phpgw']->template->parse('out','cat_list_t',True);
!       $GLOBALS['phpgw']->template->p('out');
  
!       $GLOBALS['phpgw']->common->phpgw_footer();
  ?>

Index: addcategory.php
===================================================================
RCS file: /cvsroot/phpgroupware/inv/Attic/addcategory.php,v
retrieving revision 1.52.2.1
retrieving revision 1.52.2.1.2.1
diff -C2 -d -r1.52.2.1 -r1.52.2.1.2.1
*** addcategory.php     3 Mar 2003 22:27:10 -0000       1.52.2.1
--- addcategory.php     14 Nov 2003 15:00:06 -0000      1.52.2.1.2.1
***************
*** 13,26 ****
        /* $Id$ */
  
!       $phpgw_info['flags']['currentapp'] = 'inv';
        include('../header.inc.php');
  
!       $t = CreateObject('phpgwapi.Template',PHPGW_APP_TPL);
!       $t->set_file(array('form' => 'category_form.tpl'));
!       $t->set_block('form','add','addhandle');
!       $t->set_block('form','edit','edithandle');
  
        $c = CreateObject('phpgwapi.categories');
  
        if ($new_parent)
        {
--- 13,34 ----
        /* $Id$ */
  
!       $GLOBALS['phpgw_info']['flags']['currentapp'] = 'inv';
        include('../header.inc.php');
  
!       $GLOBALS['phpgw']->template->set_file(array('form' => 
'category_form.tpl'));
!       $GLOBALS['phpgw']->template->set_block('form','add','addhandle');
!       $GLOBALS['phpgw']->template->set_block('form','edit','edithandle');
  
        $c = CreateObject('phpgwapi.categories');
  
+       $new_parent                     = $_POST['new_parent'];
+       $tax                            = $_POST['tax'];
+       $number                         = $_POST['number'];
+       $cat_name                       = $_POST['cat_name'];
+       $cat_description        = $_POST['cat_description'];
+       $cat_access                     = $_POST['cat_access'];
+ 
+       $cat_parent = get_var('cat_parent',array('GET','POST'));
+ 
        if ($new_parent)
        {
***************
*** 28,32 ****
        }
  
!       if ($submit)
        {
                $errorcount = 0;
--- 36,40 ----
        }
  
!       if ($_POST['save'])
        {
                $errorcount = 0;
***************
*** 78,88 ****
        }
  
!       if ($errorcount) { 
$t->set_var('message',$phpgw->common->error_list($error)); }
!       if (($submit) && (! $error) && (! $errorcount)) { 
$t->set_var('message',lang('Category %1 has been added !',$cat_name)); }
!       if ((! $submit) && (! $error) && (! $errorcount)) { 
$t->set_var('message',''); }
  
!       $t->set_var('lang_action',lang('Add category'));
!       $t->set_var('actionurl',$phpgw->link('/inv/addcategory.php'));
!       $t->set_var('doneurl',$phpgw->link('/inv/index.php')); 
  
        $hidden_vars = '<input type="hidden" name="sort" value="' . $sort . 
'">' . "\n"
--- 86,96 ----
        }
  
!       if ($errorcount) { 
$GLOBALS['phpgw']->template->set_var('message',$GLOBALS['phpgw']->common->error_list($error));
 }
!       if (($submit) && (! $error) && (! $errorcount)) { 
$GLOBALS['phpgw']->template->set_var('message',lang('Category %1 has been added 
!',$cat_name)); }
!       if ((! $submit) && (! $error) && (! $errorcount)) { 
$GLOBALS['phpgw']->template->set_var('message',''); }
  
!       $GLOBALS['phpgw']->template->set_var('lang_action',lang('Add 
category'));
!       
$GLOBALS['phpgw']->template->set_var('actionurl',$GLOBALS['phpgw']->link('/inv/addcategory.php'));
!       
$GLOBALS['phpgw']->template->set_var('doneurl',$GLOBALS['phpgw']->link('/inv/index.php'));
 
  
        $hidden_vars = '<input type="hidden" name="sort" value="' . $sort . 
'">' . "\n"
***************
*** 92,121 ****
                                . '<input type="hidden" name="filter" value="' 
. $filter . '">' . "\n";
  
!       $t->set_var('hidden_vars',$hidden_vars);
  
!       $t->set_var('lang_procent',lang('%'));
!       $t->set_var('lang_none',lang('None'));
!       $t->set_var('lang_par_cat',lang('Parent category'));
!       
$t->set_var('par_cat_list',$c->formated_list('select','all',$cat_parent,False));
  
!       $t->set_var('lang_number',lang('Category ID'));
!       $t->set_var('lang_name',lang('Name'));
!       $t->set_var('lang_descr',lang('Description'));
!       $t->set_var('lang_tax',lang('tax'));
!       $t->set_var('number',$number);
!       $t->set_var('cat_name',$cat_name);
!       $t->set_var('cat_description',$cat_description);
!       $t->set_var('tax',$tax);
!       $t->set_var('lang_access',lang('Private'));
!       if ($access) { $t->set_var('access', '<input type="checkbox" 
name="access" value="True" checked>'); }
!       else { $t->set_var('access', '<input type="checkbox" name="access" 
value="True"'); }
!       $t->set_var('lang_addbutton',lang('Add'));
!       $t->set_var('lang_reset',lang('Clear Form'));
!       $t->set_var('lang_done',lang('Done'));
!       $t->set_var('edithandle','');
!       $t->set_var('addhandle','');
!       $t->pparse('out','form');
!       $t->pparse('addhandle','add');
  
!       $phpgw->common->phpgw_footer();
  ?>
--- 100,129 ----
                                . '<input type="hidden" name="filter" value="' 
. $filter . '">' . "\n";
  
!       $GLOBALS['phpgw']->template->set_var('hidden_vars',$hidden_vars);
  
!       $GLOBALS['phpgw']->template->set_var('lang_procent',lang('%'));
!       $GLOBALS['phpgw']->template->set_var('lang_none',lang('None'));
!       $GLOBALS['phpgw']->template->set_var('lang_par_cat',lang('Parent 
category'));
!       
$GLOBALS['phpgw']->template->set_var('par_cat_list',$c->formated_list('select','all',$cat_parent,False));
  
!       $GLOBALS['phpgw']->template->set_var('lang_number',lang('Category ID'));
!       $GLOBALS['phpgw']->template->set_var('lang_name',lang('Name'));
!       $GLOBALS['phpgw']->template->set_var('lang_descr',lang('Description'));
!       $GLOBALS['phpgw']->template->set_var('lang_tax',lang('tax'));
!       $GLOBALS['phpgw']->template->set_var('number',$number);
!       $GLOBALS['phpgw']->template->set_var('cat_name',$cat_name);
!       
$GLOBALS['phpgw']->template->set_var('cat_description',$cat_description);
!       $GLOBALS['phpgw']->template->set_var('tax',$tax);
!       $GLOBALS['phpgw']->template->set_var('lang_access',lang('Private'));
!       if ($access) { $GLOBALS['phpgw']->template->set_var('access', '<input 
type="checkbox" name="access" value="True" checked>'); }
!       else { $GLOBALS['phpgw']->template->set_var('access', '<input 
type="checkbox" name="access" value="True"'); }
!       $GLOBALS['phpgw']->template->set_var('lang_save',lang('save'));
!       $GLOBALS['phpgw']->template->set_var('lang_reset',lang('Clear Form'));
!       $GLOBALS['phpgw']->template->set_var('lang_done',lang('Done'));
!       $GLOBALS['phpgw']->template->set_var('edithandle','');
!       $GLOBALS['phpgw']->template->set_var('addhandle','');
!       $GLOBALS['phpgw']->template->pparse('out','form');
!       $GLOBALS['phpgw']->template->pparse('addhandle','add');
  
!       $GLOBALS['phpgw']->common->phpgw_footer();
  ?>

Index: editorder.php
===================================================================
RCS file: /cvsroot/phpgroupware/inv/editorder.php,v
retrieving revision 1.28.2.1
retrieving revision 1.28.2.1.2.1
diff -C2 -d -r1.28.2.1 -r1.28.2.1.2.1
*** editorder.php       2 Mar 2003 22:35:16 -0000       1.28.2.1
--- editorder.php       14 Nov 2003 15:00:08 -0000      1.28.2.1.2.1
***************
*** 12,33 ****
        /* $Id$ */
  
        if (!$id)
        {
!               Header('Location: ' . 
$phpgw->link('/inv/listorders.php','sort=' . $sort . '&order=' . $order . 
'&query=' . $query
!                                                                               
. '&start=' . $start . '&filter=' . $filter));
        }
  
!       $phpgw_info['flags']['currentapp'] = 'inv';
  
        include('../header.inc.php');
  
!       $t = CreateObject('phpgwapi.Template',PHPGW_APP_TPL);
!       $t->set_file(array('order_edit' => 'order_form.tpl'));
!       $t->set_block('order_edit','add','addhandle');
!       $t->set_block('order_edit','edit','edithandle');
  
        $inventory = CreateObject('inv.inventory');
!       $grants = $phpgw->acl->get_grants('inv');
!       $grants[$phpgw_info['user']['account_id']] = PHPGW_ACL_READ + 
PHPGW_ACL_ADD + PHPGW_ACL_EDIT + PHPGW_ACL_DELETE;
  
        $hidden_vars = '<input type="hidden" name="sort" value="' . $sort . 
'">' . "\n"
--- 12,35 ----
        /* $Id$ */
  
+       $id     = get_var('id',array('GET','POST'));
+       $id = intval($id);
+ 
        if (!$id)
        {
!               $GLOBALS['phpgw']->redirect_link('/inv/listorders.php','sort=' 
. $sort . '&order=' . $order . '&query=' . $query
!                                                                               
. '&start=' . $start . '&filter=' . $filter);
        }
  
!       $GLOBALS['phpgw_info']['flags']['currentapp'] = 'inv';
  
        include('../header.inc.php');
  
!       $GLOBALS['phpgw']->template->set_file(array('order_edit' => 
'order_form.tpl'));
!       $GLOBALS['phpgw']->template->set_block('order_edit','add','addhandle');
!       
$GLOBALS['phpgw']->template->set_block('order_edit','edit','edithandle');
  
        $inventory = CreateObject('inv.inventory');
!       $grants = $GLOBALS['phpgw']->acl->get_grants('inv');
!       $grants[$GLOBALS['phpgw_info']['user']['account_id']] = PHPGW_ACL_READ 
+ PHPGW_ACL_ADD + PHPGW_ACL_EDIT + PHPGW_ACL_DELETE;
  
        $hidden_vars = '<input type="hidden" name="sort" value="' . $sort . 
'">' . "\n"
***************
*** 38,42 ****
                                . '<input type="hidden" name="filter" value="' 
. $filter . '">' . "\n";
  
!       if ($submit)
        {
                $num = addslashes($num);
--- 40,44 ----
                                . '<input type="hidden" name="filter" value="' 
. $filter . '">' . "\n";
  
!       if ($_POST['save'])
        {
                $num = addslashes($num);
***************
*** 47,53 ****
                }
  
!               $phpgw->db->query("select count(*) from phpgw_inv_orders WHERE 
num='$num' AND id != '$id'");
!               $phpgw->db->next_record();
!               if ($phpgw->db->f(0) != 0)
                {
                        $error[$errorcount++] = lang('That ID has been used 
already !');
--- 49,55 ----
                }
  
!               $GLOBALS['phpgw']->db->query("select count(*) from 
phpgw_inv_orders WHERE num='$num' AND id !=" . $id);
!               $GLOBALS['phpgw']->db->next_record();
!               if ($GLOBALS['phpgw']->db->f(0) != 0)
                {
                        $error[$errorcount++] = lang('That ID has been used 
already !');
***************
*** 78,83 ****
                        }
  
!                       $phpgw->db->query("UPDATE phpgw_inv_orders set 
num='$num',customer='$abid',descr='$descr',date='$date',status='$status',"
!                                                       . "access='$access' 
WHERE id='$id'");
                }
        }
--- 80,85 ----
                        }
  
!                       $GLOBALS['phpgw']->db->query("UPDATE phpgw_inv_orders 
set num='$num',customer=" . intval($abid) . ",descr='$descr',date="
!                                                                               
. intval($date) . ",status='$status',access='$access' WHERE id=" . $id);
                }
        }
***************
*** 85,121 ****
        if ($errorcount)
        {
!               $t->set_var('message',$phpgw->common->error_list($error));
        }
  
!       if (($submit) && (! $error) && (! $errorcount))
        {
!               $t->set_var('message',lang('Order %1 has been updated !',$num));
        }
  
!       if ((! $submit) && (! $error) && (! $errorcount))
        {
!               $t->set_var('message','');
        }
  
!       
$t->set_var('addressbook_link',$phpgw->link('/inv/addressbook.php','query='));
!       $t->set_var('actionurl',$phpgw->link('/inv/editorder.php','id=' . $id));
!       $t->set_var('done_action',$phpgw->link('/inv/listorders.php'));
!       $t->set_var('lang_action',lang('Edit order'));
!       $t->set_var('lang_select',lang('Select per button !'));
!       $t->set_var('lang_done',lang('Done'));
!       $t->set_var('hidden_vars',$hidden_vars);
!       $t->set_var('lang_num',lang('Order ID'));
!       $t->set_var('lang_choose','');
!       $t->set_var('choose','');
  
!       $phpgw->db->query("SELECT * from phpgw_inv_orders WHERE id='$id'");
!       $phpgw->db->next_record();
  
!       $owner = $phpgw->db->f('owner');
!       $t->set_var('num', $phpgw->strip_html($phpgw->db->f('num')));
!       $t->set_var('descr', $phpgw->strip_html($phpgw->db->f('descr')));
  
  // customer 
!       $t->set_var('lang_customer',lang('Customer'));
  
        $d = CreateObject('phpgwapi.contacts');
--- 87,123 ----
        if ($errorcount)
        {
!               
$GLOBALS['phpgw']->template->set_var('message',$GLOBALS['phpgw']->common->error_list($error));
        }
  
!       if (($_POST['save']) && (! $error) && (! $errorcount))
        {
!               $GLOBALS['phpgw']->template->set_var('message',lang('Order %1 
has been updated !',$num));
        }
  
!       if ((!$_POST['save']) && (! $error) && (! $errorcount))
        {
!               $GLOBALS['phpgw']->template->set_var('message','');
        }
  
!       
$GLOBALS['phpgw']->template->set_var('addressbook_link',$GLOBALS['phpgw']->link('/inv/addressbook.php','query='));
!       
$GLOBALS['phpgw']->template->set_var('actionurl',$GLOBALS['phpgw']->link('/inv/editorder.php','id='
 . $id));
!       
$GLOBALS['phpgw']->template->set_var('done_action',$GLOBALS['phpgw']->link('/inv/listorders.php'));
!       $GLOBALS['phpgw']->template->set_var('lang_action',lang('Edit order'));
!       $GLOBALS['phpgw']->template->set_var('lang_select',lang('Select per 
button !'));
!       $GLOBALS['phpgw']->template->set_var('lang_done',lang('Done'));
!       $GLOBALS['phpgw']->template->set_var('hidden_vars',$hidden_vars);
!       $GLOBALS['phpgw']->template->set_var('lang_num',lang('Order ID'));
!       $GLOBALS['phpgw']->template->set_var('lang_choose','');
!       $GLOBALS['phpgw']->template->set_var('choose','');
  
!       $GLOBALS['phpgw']->db->query("SELECT * from phpgw_inv_orders WHERE 
id='$id'");
!       $GLOBALS['phpgw']->db->next_record();
  
!       $owner = $GLOBALS['phpgw']->db->f('owner');
!       $GLOBALS['phpgw']->template->set_var('num', 
$GLOBALS['phpgw']->strip_html($GLOBALS['phpgw']->db->f('num')));
!       $GLOBALS['phpgw']->template->set_var('descr', 
$GLOBALS['phpgw']->strip_html($GLOBALS['phpgw']->db->f('descr')));
  
  // customer 
!       $GLOBALS['phpgw']->template->set_var('lang_customer',lang('Customer'));
  
        $d = CreateObject('phpgwapi.contacts');
***************
*** 124,144 ****
                                'org_name' => 'org_name');
  
!       $customer = $d->read_single_entry($phpgw->db->f('customer'),$cols);
  
        if ($customer[0]['org_name'] == '')
        {
!               $t->set_var('name',$customer[0]['n_given'] . ' ' . 
$customer[0]['n_family']);
        }
        else
        {
!               $t->set_var('name',$customer[0]['org_name'] . ' [ ' . 
$customer[0]['n_given'] . ' ' . $customer[0]['n_family'] . ' ]');
        }
  
!       $t->set_var('lang_descr',lang('Description'));
!       $t->set_var('lang_date',lang('Date'));
  
        $sm = CreateObject('phpgwapi.sbox');
  
!       $date = $phpgw->db->f('date');
        if ($date != 0)
        {
--- 126,146 ----
                                'org_name' => 'org_name');
  
!       $customer = 
$d->read_single_entry($GLOBALS['phpgw']->db->f('customer'),$cols);
  
        if ($customer[0]['org_name'] == '')
        {
!               
$GLOBALS['phpgw']->template->set_var('name',$customer[0]['n_given'] . ' ' . 
$customer[0]['n_family']);
        }
        else
        {
!               
$GLOBALS['phpgw']->template->set_var('name',$customer[0]['org_name'] . ' [ ' . 
$customer[0]['n_given'] . ' ' . $customer[0]['n_family'] . ' ]');
        }
  
!       $GLOBALS['phpgw']->template->set_var('lang_descr',lang('Description'));
!       $GLOBALS['phpgw']->template->set_var('lang_date',lang('Date'));
  
        $sm = CreateObject('phpgwapi.sbox');
  
!       $date = $GLOBALS['phpgw']->db->f('date');
        if ($date != 0)
        {
***************
*** 154,165 ****
        }
  
!       
$t->set_var('date_select',$phpgw->common->dateformatorder($sm->getYears('year',$year),$sm->getMonthText('month',$month),$sm->getDays('day',$day)));
  
!       $t->set_var('lang_status',lang('Status'));
!       if ($phpgw->db->f('status')=='open'):
                $stat_sel[0]=' selected';
!       elseif ($phpgw->db->f('status')=='closed'):
                $stat_sel[1]=' selected';
!       elseif ($phpgw->db->f('status')=='archive'):
                $stat_sel[2]=' selected';
        endif;
--- 156,167 ----
        }
  
!       
$GLOBALS['phpgw']->template->set_var('date_select',$GLOBALS['phpgw']->common->dateformatorder($sm->getYears('year',$year),$sm->getMonthText('month',$month),$sm->getDays('day',$day)));
  
!       $GLOBALS['phpgw']->template->set_var('lang_status',lang('Status'));
!       if ($GLOBALS['phpgw']->db->f('status')=='open'):
                $stat_sel[0]=' selected';
!       elseif ($GLOBALS['phpgw']->db->f('status')=='closed'):
                $stat_sel[1]=' selected';
!       elseif ($GLOBALS['phpgw']->db->f('status')=='archive'):
                $stat_sel[2]=' selected';
        endif;
***************
*** 169,201 ****
                                . '<option value="archive"' . $stat_sel[2] . 
'>' . lang('Archive') . '</option>' . "\n";
  
!       $t->set_var('status_list',$status_list);
  
!       $t->set_var('lang_access',lang('Private'));
!       if ($phpgw->db->f('access')=='private')
        {
!               $t->set_var('access', '<input type="checkbox" name="access" 
value="True" checked>');
        }
        else
        {
!               $t->set_var('access', '<input type="checkbox" name="access" 
value="True">');
        }
  
!       $t->set_var('lang_edit',lang('Edit'));
  
!       if ($inventory->check_perms($grants[$owner],PHPGW_ACL_DELETE) || $owner 
== $phpgw_info['user']['account_id'])
        {
!               $t->set_var('delete','<form method="POST" action="' . 
$phpgw->link('/inv/deleteorder.php','id=' . $id . '&start=' . $start . 
'&query=' . $query
                                                        . '&sort=' . $sort . 
'&order=' . $order . '&filter=' . $filter) . '"><input type="submit" value="' . 
lang('Delete') .'"></form>');          
        }
        else
        {
!               $t->set_var('delete','');
        }
  
!       $t->set_var('edithandle','');
!       $t->set_var('addhandle','');
!       $t->pparse('out','order_edit');
!       $t->pparse('edithandle','edit');
  
!       $phpgw->common->phpgw_footer();
  ?>
--- 171,203 ----
                                . '<option value="archive"' . $stat_sel[2] . 
'>' . lang('Archive') . '</option>' . "\n";
  
!       $GLOBALS['phpgw']->template->set_var('status_list',$status_list);
  
!       $GLOBALS['phpgw']->template->set_var('lang_access',lang('Private'));
!       if ($GLOBALS['phpgw']->db->f('access')=='private')
        {
!               $GLOBALS['phpgw']->template->set_var('access','<input 
type="checkbox" name="access" value="True" checked>');
        }
        else
        {
!               $GLOBALS['phpgw']->template->set_var('access','<input 
type="checkbox" name="access" value="True">');
        }
  
!       $GLOBALS['phpgw']->template->set_var('lang_save',lang('save'));
  
!       if ($inventory->check_perms($grants[$owner],PHPGW_ACL_DELETE) || $owner 
== $GLOBALS['phpgw_info']['user']['account_id'])
        {
!               $GLOBALS['phpgw']->template->set_var('delete','<form 
method="POST" action="' . $GLOBALS['phpgw']->link('/inv/deleteorder.php','id=' 
. $id . '&start=' . $start . '&query=' . $query
                                                        . '&sort=' . $sort . 
'&order=' . $order . '&filter=' . $filter) . '"><input type="submit" value="' . 
lang('Delete') .'"></form>');          
        }
        else
        {
!               $GLOBALS['phpgw']->template->set_var('delete','');
        }
  
!       $GLOBALS['phpgw']->template->set_var('edithandle','');
!       $GLOBALS['phpgw']->template->set_var('addhandle','');
!       $GLOBALS['phpgw']->template->pparse('out','order_edit');
!       $GLOBALS['phpgw']->template->pparse('edithandle','edit');
  
!       $GLOBALS['phpgw']->common->phpgw_footer();
  ?>

Index: deletecategory.php
===================================================================
RCS file: /cvsroot/phpgroupware/inv/Attic/deletecategory.php,v
retrieving revision 1.22
retrieving revision 1.22.4.1
diff -C2 -d -r1.22 -r1.22.4.1
*** deletecategory.php  20 Jul 2001 01:04:23 -0000      1.22
--- deletecategory.php  14 Nov 2003 15:00:07 -0000      1.22.4.1
***************
*** 12,43 ****
        /* $Id$ */
  
!       if (! $cat_id)
        {
!               Header('Location: ' . $phpgw->link('/inv/index.php','sort=' . 
$sort . '&order=' . $order . '&query=' . $query
                                                                                
        . '&start=' . $start . '&filter=' . $filter));
        }
  
!       if ($confirm)
        {
!               $phpgw_info['flags'] = array('noheader' => True, 
                                                                        
'nonavbar' => True);
-       }
  
-       $phpgw_info['flags']['currentapp'] = 'inv';
-       include('../header.inc.php');
- 
-       $c = CreateObject('phpgwapi.categories');
- 
-       if ($confirm)
-       {
                if ($subs) { $c->delete($cat_id,True); }
                else { $c->delete($cat_id); }
!               Header('Location: ' . $phpgw->link('/inv/index.php','sort=' . 
$sort . '&order=' . $order . '&query=' . $query
!                                                                               
. '&start=' . $start . '&filter=' . $filter));
        }
-       else
-       {
  
!               $hidden_vars = '<input type="hidden" name="sort" value="' . 
$sort . '">' . "\n"
                                        . '<input type="hidden" name="order" 
value="' . $order . '">' . "\n"
                                        . '<input type="hidden" name="query" 
value="' . $query . '">' . "\n"
--- 12,40 ----
        /* $Id$ */
  
!       $cat_id = get_var('cat_parent',array('GET','POST'));
!       $subs   = $_POST['subs'];
! 
!       if (!$cat_id)
        {
!               Header('Location: ' . 
$GLOBALS['phpgw']->link('/inv/index.php','sort=' . $sort . '&order=' . $order . 
'&query=' . $query
                                                                                
        . '&start=' . $start . '&filter=' . $filter));
        }
  
!       $c = CreateObject('phpgwapi.categories');
!       if ($_POST['confirm'])
        {
!               $GLOBALS['phpgw_info']['flags'] = array('noheader' => True, 
                                                                        
'nonavbar' => True);
  
                if ($subs) { $c->delete($cat_id,True); }
                else { $c->delete($cat_id); }
!               $GLOBALS['phpgw']->redirect_link('/inv/index.php','sort=' . 
$sort . '&order=' . $order . '&query=' . $query
!                                                                               
. '&start=' . $start . '&filter=' . $filter);
        }
  
!       $GLOBALS['phpgw_info']['flags']['currentapp'] = 'inv';
!       include('../header.inc.php');
! 
!       $hidden_vars = '<input type="hidden" name="sort" value="' . $sort . 
'">' . "\n"
                                        . '<input type="hidden" name="order" 
value="' . $order . '">' . "\n"
                                        . '<input type="hidden" name="query" 
value="' . $query . '">' . "\n"
***************
*** 46,74 ****
                                        . '<input type="hidden" name="filter" 
value="' . $filter . '">' . "\n";
  
!               $t = CreateObject('phpgwapi.Template',PHPGW_APP_TPL);
!               $t->set_file(array('category_delete' => 'delete.tpl'));
!               $t->set_var('deleteheader',lang('Are you sure you want to 
delete this category ?'));
!               $t->set_var('hidden_vars',$hidden_vars);
                $exists = $c->exists('subs',$cat_name='',$cat_id);
  
                if ($exists)
                {
!                       $t->set_var('lang_subs',lang('Do you also want to 
delete all subcategories ?'));
!                       $t->set_var('subs','<input type="checkbox" name="subs" 
value="True">');
                }
                else
                {
!                       $t->set_var('lang_subs','');
!                       $t->set_var('subs', '');
                }
  
!               $t->set_var('nolink',$HTTP_REFERER);
!               $t->set_var('lang_no',lang('No'));
  
!               
$t->set_var('action_url',$phpgw->link('/inv/deletecategory.php','cat_id=' . 
$cat_id));
!               $t->set_var('lang_yes',lang('Yes'));
!               $t->pparse('out','category_delete');
        }
  
!       $phpgw->common->phpgw_footer();
  ?>
--- 43,70 ----
                                        . '<input type="hidden" name="filter" 
value="' . $filter . '">' . "\n";
  
!               $GLOBALS['phpgw']->template->set_file(array('category_delete' 
=> 'delete.tpl'));
!               $GLOBALS['phpgw']->template->set_var('deleteheader',lang('Are 
you sure you want to delete this category ?'));
!               
$GLOBALS['phpgw']->template->set_var('hidden_vars',$hidden_vars);
                $exists = $c->exists('subs',$cat_name='',$cat_id);
  
                if ($exists)
                {
!                       
$GLOBALS['phpgw']->template->set_var('lang_subs',lang('Do you also want to 
delete all subcategories ?'));
!                       $GLOBALS['phpgw']->template->set_var('subs','<input 
type="checkbox" name="subs" value="True">');
                }
                else
                {
!                       $GLOBALS['phpgw']->template->set_var('lang_subs','');
!                       $GLOBALS['phpgw']->template->set_var('subs', '');
                }
  
!               $GLOBALS['phpgw']->template->set_var('nolink',$HTTP_REFERER);
!               $GLOBALS['phpgw']->template->set_var('lang_no',lang('No'));
  
!               
$GLOBALS['phpgw']->template->set_var('action_url',$GLOBALS['phpgw']->link('/inv/deletecategory.php','cat_id='
 . $cat_id));
!               $GLOBALS['phpgw']->template->set_var('lang_yes',lang('Yes'));
!               $GLOBALS['phpgw']->template->pparse('out','category_delete');
        }
  
!       $GLOBALS['phpgw']->common->phpgw_footer();
  ?>





reply via email to

[Prev in Thread] Current Thread [Next in Thread]