[Phpgroupware-cvs] CVS: phpgwapi/inc class.categories.inc.php,1.74.2.19,1.74.2.20

[Ralf Becker <address@hidden>]

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

Modified Files:
      Tag: Version-0_9_14-branch
        class.categories.inc.php 
Log Message:
dave's fix to:
- id2name return system-global cats too
- return_array use strlen now to differ between not set and 0 parent_cat_id


Index: class.categories.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/phpgwapi/inc/class.categories.inc.php,v
retrieving revision 1.74.2.19
retrieving revision 1.74.2.20
diff -C2 -r1.74.2.19 -r1.74.2.20
*** class.categories.inc.php    16 Mar 2003 22:12:02 -0000      1.74.2.19
--- class.categories.inc.php    22 Mar 2003 09:33:11 -0000      1.74.2.20
***************
*** 118,122 ****
                @result $cats array
                */
!               function return_array($type,$start,$limit = True,$query = 
'',$sort = '',$order = '',$globals = False, $parent_id = '## undef ##')
                {
                        if ($globals)
--- 118,122 ----
                @result $cats array
                */
!               function return_array($type,$start,$limit = True,$query = 
'',$sort = '',$order = '',$globals = False, $parent_id = '')
                {
                        if ($globals)
***************
*** 163,167 ****
                        }
  
!                       if ($parent_id != '## undef ##')
                        {
                                $parent_filter = " AND cat_parent='$parent_id'";
--- 163,167 ----
                        }
  
!                       if (strlen($parent_id) != 0)
                        {
                                $parent_filter = " AND cat_parent='$parent_id'";
***************
*** 634,638 ****
                {
                        $this->db->query("SELECT cat_id FROM phpgw_categories 
WHERE cat_name='" . $this->db->db_addslashes($cat_name) . "' "
!                                                       ."AND cat_appname='" . 
$this->app_name . "' AND cat_owner=" . $this->account_id,__LINE__,__FILE__);
  
                        if(!$this->db->num_rows())
--- 634,638 ----
                {
                        $this->db->query("SELECT cat_id FROM phpgw_categories 
WHERE cat_name='" . $this->db->db_addslashes($cat_name) . "' "
!                                                       ."AND cat_appname='" . 
$this->app_name . "' AND (cat_owner=" . $this->account_id ." OR 
cat_owner=-1)",__LINE__,__FILE__);
  
                        if(!$this->db->num_rows())