[Phpgroupware-cvs] CVS: phpgwapi/inc class.categories.inc.php,1.103,1.104

[Ralf Becker <address@hidden>]

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

Modified Files:
        class.categories.inc.php 
Log Message:
skwashd's patch to:
- name2id 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.103
retrieving revision 1.104
diff -C2 -r1.103 -r1.104
*** class.categories.inc.php    16 Mar 2003 22:16:33 -0000      1.103
--- class.categories.inc.php    22 Mar 2003 09:37:40 -0000      1.104
***************
*** 23,27 ****
        
\**************************************************************************/
        /* $Id$ */
-       /* $Source$ */
  
        /*!
--- 23,26 ----
***************
*** 139,143 ****
                @result $cats array
                */
!               function return_array($type,$start,$limit = True,$query = 
'',$sort = '',$order = '',$globals = False, $parent_id = '## undef ##')
                {
                        if ($globals)
--- 138,142 ----
                @result $cats array
                */
!               function return_array($type,$start,$limit = True,$query = 
'',$sort = '',$order = '',$globals = False, $parent_id = '')
                {
                        if ($globals)
***************
*** 184,188 ****
                        }
  
!                       if ($parent_id != '## undef ##')
                        {
                                $parent_filter = " AND cat_parent='$parent_id'";
--- 183,187 ----
                        }
  
!                       if (strlen($parent_id) != 0)
                        {
                                $parent_filter = " AND cat_parent='$parent_id'";
***************
*** 732,736 ****
                {
                        $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())
--- 731,735 ----
                {
                        $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())