[Phpgroupware-cvs] CVS: phpgwapi/inc class.categories.inc.php,1.88,1.89

[Bettina Gille <address@hidden>]

Update of /cvsroot/phpgroupware/phpgwapi/inc
In directory subversions:/tmp/cvs-serv26427

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

Index: class.categories.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/phpgwapi/inc/class.categories.inc.php,v
retrieving revision 1.88
retrieving revision 1.89
diff -C2 -r1.88 -r1.89
*** class.categories.inc.php    4 Sep 2002 01:58:10 -0000       1.88
--- class.categories.inc.php    8 Sep 2002 20:39:51 -0000       1.89
***************
*** 58,62 ****
                        $this->db         = $GLOBALS['phpgw']->db;
                        $this->grants     = 
$GLOBALS['phpgw']->acl->get_grants($app_name);
!                       $this->cats       = 
$this->return_array($type,$start,$limit,$query,$sort,$order,$public);
                }
  
--- 58,62 ----
                        $this->db         = $GLOBALS['phpgw']->db;
                        $this->grants     = 
$GLOBALS['phpgw']->acl->get_grants($app_name);
!                       $this->cats       = 
$this->return_array($type,$start,$limit,$query,$sort,$order,$globals,$parent_id);
                }
  
***************
*** 75,79 ****
                                case 'appandmains':     $s = " AND 
cat_appname='" . $this->app_name . "' AND cat_parent ='0'"; break;
                                case 'appandsubs':      $s = " AND 
cat_appname='" . $this->app_name . "' AND cat_parent !='0'"; break;
!                               case 'noapp':           $s = " AND cat_appname 
!= '" . $this->app_name . "'"; break;
                                default:            return False;
                        }
--- 75,80 ----
                                case 'appandmains':     $s = " AND 
cat_appname='" . $this->app_name . "' AND cat_parent ='0'"; break;
                                case 'appandsubs':      $s = " AND 
cat_appname='" . $this->app_name . "' AND cat_parent !='0'"; break;
!                               case 'noglobal':        $s = " AND cat_appname 
!= '" . $this->app_name . "'"; break;
!                               case 'noglobalapp':     $s = " AND cat_appname 
= '" . $this->app_name . "' AND cat_owner != '" . $this->account_id . "'"; 
break;
                                default:            return False;
                        }