[Phpgroupware-cvs] CVS: admin/inc class.uicategories.inc.php,1.19,1.20

[Bettina Gille <address@hidden>]

Update of /cvsroot/phpgroupware/admin/inc
In directory subversions:/tmp/cvs-serv26362/inc

Modified Files:
        class.uicategories.inc.php 
Log Message:
update cats

Index: class.uicategories.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/admin/inc/class.uicategories.inc.php,v
retrieving revision 1.19
retrieving revision 1.20
diff -C2 -r1.19 -r1.20
*** class.uicategories.inc.php  4 Sep 2002 01:58:34 -0000       1.19
--- class.uicategories.inc.php  8 Sep 2002 20:39:00 -0000       1.20
***************
*** 95,99 ****
                function index()
                {
!                       $global_cats = 
$GLOBALS['HTTP_POST_VARS']['global_cats'] ? 
$GLOBALS['HTTP_POST_VARS']['global_cats'] : 
$GLOBALS['HTTP_GET_VARS']['global_cats'];
  
                        $GLOBALS['phpgw']->common->phpgw_header();
--- 95,99 ----
                function index()
                {
!                       $global_cats  = 
get_var('global_cats',array('POST','GET'));
  
                        $GLOBALS['phpgw']->common->phpgw_header();
***************
*** 237,241 ****
                function add()
                {
!                       $global_cats = 
$GLOBALS['HTTP_POST_VARS']['global_cats'] ? 
$GLOBALS['HTTP_POST_VARS']['global_cats'] : 
$GLOBALS['HTTP_GET_VARS']['global_cats'];
  
                        $link_data = array
--- 237,241 ----
                function add()
                {
!                       $global_cats  = 
get_var('global_cats',array('POST','GET'));
  
                        $link_data = array
***************
*** 318,322 ****
                function edit()
                {
!                       $global_cats = 
$GLOBALS['HTTP_POST_VARS']['global_cats'] ? 
$GLOBALS['HTTP_POST_VARS']['global_cats'] : 
$GLOBALS['HTTP_GET_VARS']['global_cats'];
  
                        $link_data = array
--- 318,322 ----
                function edit()
                {
!                       $global_cats  = 
get_var('global_cats',array('POST','GET'));
  
                        $link_data = array
***************
*** 412,416 ****
                function delete()
                {
!                       $global_cats = 
$GLOBALS['HTTP_POST_VARS']['global_cats'] ? 
$GLOBALS['HTTP_POST_VARS']['global_cats'] : 
$GLOBALS['HTTP_GET_VARS']['global_cats'];
  
                        $link_data = array
--- 412,416 ----
                function delete()
                {
!                       $global_cats  = 
get_var('global_cats',array('POST','GET'));
  
                        $link_data = array
***************
*** 450,456 ****
                        $nolink = 
$GLOBALS['phpgw']->link('/index.php',$link_data);
  
                        $apps_cats = $this->bo->exists(array
                        (
!                               'type'     => 'noapp',
                                'cat_name' => '',
                                'cat_id'   => $this->cat_id
--- 450,465 ----
                        $nolink = 
$GLOBALS['phpgw']->link('/index.php',$link_data);
  
+                       if ($GLOBALS['appname'])
+                       {
+                               $type = 'noglobalapp';
+                       }
+                       else
+                       {
+                               $type = 'noglobal';
+                       }
+ 
                        $apps_cats = $this->bo->exists(array
                        (
!                               'type'     => $type,
                                'cat_name' => '',
                                'cat_id'   => $this->cat_id
***************
*** 462,467 ****
                        if ($apps_cats)
                        {
!                               
$GLOBALS['phpgw']->template->set_var('messages',lang('This category is 
currently being used by applications as a parent category') . '<br>'
!                                                                               
                                                . lang('You will need to remove 
the subcategories before you can delete this category'));
  
                                
$GLOBALS['phpgw']->template->set_var('lang_subs','');
--- 471,476 ----
                        if ($apps_cats)
                        {
!                               
$GLOBALS['phpgw']->template->set_var('delete_msg',lang('This category is 
currently being used by applications as a parent category') . '<br>'
!                                                                               
                                                . lang('You will need to 
reassign these subcategories before you can delete this category'));
  
                                
$GLOBALS['phpgw']->template->set_var('lang_subs','');
***************
*** 475,479 ****
                        else
                        {
!                               
$GLOBALS['phpgw']->template->set_var('messages',lang('Are you sure you want to 
delete this global category ?'));
  
                                $exists = $this->bo->exists(array
--- 484,488 ----
                        else
                        {
!                               
$GLOBALS['phpgw']->template->set_var('delete_msg',lang('Are you sure you want 
to delete this global category ?'));
  
                                $exists = $this->bo->exists(array