[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Phpgroupware-cvs] CVS: phpgwapi/inc class.categories.inc.php,1.74.2.20
|
From: |
Bettina Gille <address@hidden> |
|
Subject: |
[Phpgroupware-cvs] CVS: phpgwapi/inc class.categories.inc.php,1.74.2.20.2.5,1.74.2.20.2.6 |
|
Date: |
Tue, 17 Jun 2003 09:24:09 -0400 |
Update of /cvsroot/phpgroupware/phpgwapi/inc
In directory subversions:/tmp/cvs-serv5372
Modified Files:
Tag: Version-0_9_16-branch
class.categories.inc.php
Log Message:
fix
Index: class.categories.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/phpgwapi/inc/class.categories.inc.php,v
retrieving revision 1.74.2.20.2.5
retrieving revision 1.74.2.20.2.6
diff -C2 -r1.74.2.20.2.5 -r1.74.2.20.2.6
*** class.categories.inc.php 21 May 2003 22:26:47 -0000 1.74.2.20.2.5
--- class.categories.inc.php 17 Jun 2003 13:24:07 -0000 1.74.2.20.2.6
***************
*** 505,518 ****
@param $cat_data category data defaults to ''
*/
! function add($cat_values)
{
!
! $cat_values['parent'] = (int) $cat_values['parent'];
! $cat_values['level'] = 0;
! $cat_values['main'] = (int) $cat_values['parent'];
!
! if ($cat_values['parent'] && $cat_values['parent'] != 0)
{
! $cat_values['level'] =
$this->id2name($cat_values['parent'],'level')+1;
}
--- 505,516 ----
@param $cat_data category data defaults to ''
*/
! function add($values)
{
! $values['id'] = intval($values['id']);
! $values['parent'] = intval($values['parent']);
!
! if ($values['parent'] > 0)
{
! $values['level'] =
$this->id2name($values['parent'],'level')+1;
}
***************
*** 520,539 ****
$cat_values['name'] =
$this->db->db_addslashes($cat_values['name']);
! if (isset($cat_values['id']))
{
$id_col = 'cat_id,';
! $id_val = (int) $cat_values['id'].',';
}
! $cat_values['data'] = (int) $cat_values['data'];
!
! $this->db->query("INSERT INTO phpgw_categories ($id_col
cat_parent,cat_owner,cat_access,cat_appname,cat_name,cat_description,cat_data,"
! . "cat_main,cat_level, last_mod) VALUES
($id_val " . $cat_values['parent'] . ", $this->account_id,'" .
$cat_values['access']
! . "','" . $this->app_name . "','" .
$cat_values['name'] . "','" . $cat_values['descr'] . "'," . $cat_values['data']
! . "," . $cat_values['main'] . "," .
$cat_values['level'] . "," . time() . ")",__LINE__,__FILE__);
! if (isset($cat_values['id']))
{
! $max = $cat_values['id'];
}
else
--- 518,535 ----
$cat_values['name'] =
$this->db->db_addslashes($cat_values['name']);
! if ($values['id'] > 0)
{
$id_col = 'cat_id,';
! $id_val = $values['id'] . ',';
}
! $this->db->query('INSERT INTO phpgw_categories (' .
$id_col .
'cat_parent,cat_owner,cat_access,cat_appname,cat_name,cat_description,cat_data,'
! . 'cat_main,cat_level, last_mod) VALUES (' .
$id_val . intval($values['parent']) . ',' . $this->account_id . ",'" .
$values['access']
! . "','" . $this->app_name . "','" .
$values['name'] . "','" . $cat_values['descr'] . "','" . $values['data']
! . "'," . intval($cat_values['main']) . ',' .
intval($values['level']) . ',' . time() . ')',__LINE__,__FILE__);
! if ($values['id'] > 0)
{
! $max = $values['id'];
}
else
***************
*** 542,546 ****
}
! if (!$cat_values['parent'] || $cat_values['parent'] ==
0)
{
$this->db->query('UPDATE phpgw_categories SET
cat_main=' . $max . ' WHERE cat_id=' . $max,__LINE__,__FILE__);
--- 538,543 ----
}
! $max = intval($max);
! if ($values['parent'] == 0)
{
$this->db->query('UPDATE phpgw_categories SET
cat_main=' . $max . ' WHERE cat_id=' . $max,__LINE__,__FILE__);
***************
*** 556,566 ****
/*function delete($cat_id,$subs = False)
{
! $cat_id = (int) $cat_id;
if ($subs)
{
! $subdelete = ' OR cat_parent=' . $cat_id . ' OR
cat_main=' . $cat_id . ' ';
}
! $this->db->query("DELETE FROM phpgw_categories WHERE
cat_id=$cat_id $subdelete AND cat_appname='"
. $this->app_name .
"'",__LINE__,__FILE__);
} */
--- 553,563 ----
/*function delete($cat_id,$subs = False)
{
! $cat_id = intval($cat_id);
if ($subs)
{
! $subdelete = ' OR cat_parent=' . $cat_id . ' OR
cat_main=' . $cat_id;
}
! $this->db->query('DELETE FROM phpgw_categories WHERE
cat_id=' . $cat_id . $subdelete . " AND cat_appname='"
. $this->app_name .
"'",__LINE__,__FILE__);
} */
***************
*** 568,572 ****
function delete($cat_id, $drop_subs = False, $modify_subs =
False)
{
! $cat_id = (int) $cat_id;
if ($drop_subs)
{
--- 565,569 ----
function delete($cat_id, $drop_subs = False, $modify_subs =
False)
{
! $cat_id = intval($cat_id);
if ($drop_subs)
{
***************
*** 618,624 ****
@param $cat_data category data defaults to ''
*/
! function edit($cat_values)
{
! if (isset($cat_values['old_parent']) &&
intval($cat_values['old_parent']) != $cat_values['parent'])
{
$this->delete($cat_values['id'],False,True);
--- 615,624 ----
@param $cat_data category data defaults to ''
*/
! function edit($values)
{
! $values['id'] = intval($values['id']);
! $values['parent'] = intval($values['parent']);
!
! if (isset($values['old_parent']) &&
intval($values['old_parent']) != $values['parent'])
{
$this->delete($cat_values['id'],False,True);
***************
*** 627,639 ****
else
{
! if ($cat_values['parent'] &&
($cat_values['parent'] != 0))
{
! $cat_values['main'] =
intval($this->id2name($cat_values['parent'],'main'));
! $cat_values['level'] =
intval($this->id2name($cat_values['parent'],'level')+1);
}
else
{
! $cat_values['main'] =
intval($cat_values['id']);
! $cat_values['level'] = 0;
}
}
--- 627,639 ----
else
{
! if ($values['parent'] > 0)
{
! $values['main'] =
intval($this->id2name($values['parent'],'main'));
! $values['level'] =
intval($this->id2name($values['parent'],'level')+1);
}
else
{
! $values['main'] = $values['id'];
! $values['level'] = 0;
}
}
***************
*** 642,653 ****
$cat_values['name'] =
$this->db->db_addslashes($cat_values['name']);
! $sql = "UPDATE phpgw_categories SET cat_name='" .
$cat_values['name'] . "', cat_description='" . $cat_values['descr']
! . "', cat_data='" . $cat_values['data'] . "',
cat_parent='" . $cat_values['parent'] . "', cat_access='"
! . $cat_values['access'] . "', cat_main=" .
$cat_values['main'] . ", cat_level=" . $cat_values['level'] .', '
! . 'last_mod = ' . time()
! . " WHERE cat_appname='" . $this->app_name . "'
AND cat_id=" . intval($cat_values['id']);
$this->db->query($sql,__LINE__,__FILE__);
! return intval($cat_values['id']);
}
--- 642,652 ----
$cat_values['name'] =
$this->db->db_addslashes($cat_values['name']);
! $sql = "UPDATE phpgw_categories SET cat_name='" .
$values['name'] . "', cat_description='" . $values['descr']
! . "', cat_data='" . $values['data'] .
"', cat_parent=" . $values['parent'] . ", cat_access='"
! . $values['access'] . "', cat_main=" .
$values['main'] . ', cat_level=' . $values['level'] . ',last_mod=' . time()
! . " WHERE cat_appname='" .
$this->app_name . "' AND cat_id=" . $values['id'];
$this->db->query($sql,__LINE__,__FILE__);
! return $values['id'];
}
***************
*** 655,659 ****
{
$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())
--- 654,658 ----
{
$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())
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Phpgroupware-cvs] CVS: phpgwapi/inc class.categories.inc.php,1.74.2.20.2.5,1.74.2.20.2.6,
Bettina Gille <address@hidden> <=
- Prev by Date:
[Phpgroupware-cvs] CVS: phpgroupware login.php,1.96,1.97
- Next by Date:
[Phpgroupware-cvs] CVS: projects/setup phpgw_en.lang,1.32,1.33 phpgw_fr.lang,1.8,1.9
- Previous by thread:
[Phpgroupware-cvs] CVS: phpgroupware login.php,1.96,1.97
- Next by thread:
[Phpgroupware-cvs] CVS: projects/setup phpgw_en.lang,1.32,1.33 phpgw_fr.lang,1.8,1.9
- Index(es):