holm/egroupware
1
1
Fork 0
forked from extern/egroupware
Code Issues Pull Requests Packages Projects Releases Wiki Activity

skwashd's patch to:

Browse Source 
- name2id return system-global cats too
- return_array use strlen now to differ between not set and 0 parent_cat_id
This commit is contained in:
Ralf Becker 2003-03-22 09:37:40 +00:00
parent 254ba69217
commit b83af98a7f
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
phpgwapi/inc/class.categories.inc.php
View File

@ -22,7 +22,6 @@
* Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * * Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA *
\**************************************************************************/ \**************************************************************************/
/* $Id$ */ /* $Id$ */
/* $Source$ */
/*! /*!
@class categories @class categories
@ -138,7 +137,7 @@
@param $globals True or False, includes the global phpgroupware categories or not @param $globals True or False, includes the global phpgroupware categories or not
@result $cats array @result $cats array
*/ */
function return_array($type,$start,$limit = True,$query = '',$sort = '',$order = '',$globals = False, $parent_id = '## undef ##') function return_array($type,$start,$limit = True,$query = '',$sort = '',$order = '',$globals = False, $parent_id = '')
{ {
if ($globals) if ($globals)
{ {
@ -183,7 +182,7 @@
} }
} }
if ($parent_id != '## undef ##') if (strlen($parent_id) != 0)
{ {
$parent_filter = " AND cat_parent='$parent_id'"; $parent_filter = " AND cat_parent='$parent_id'";
} }
@ -731,7 +730,7 @@
function name2id($cat_name) function name2id($cat_name)
{ {
$this->db->query("SELECT cat_id FROM phpgw_categories WHERE cat_name='" . $this->db->db_addslashes($cat_name) . "' " $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__); ."AND cat_appname='" . $this->app_name . "' AND (cat_owner=" . $this->account_id ." OR cat_owner=-1)",__LINE__,__FILE__);
if(!$this->db->num_rows()) if(!$this->db->num_rows())
{ {