[Phpgroupware-cvs] CVS: phpgwapi/inc class.categories.inc.php,1.94,1.95

[Bettina Gille <address@hidden>]

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

Modified Files:
        class.categories.inc.php 
Log Message:
update edit_cats to move the subtree with the cat if the parent changes

Index: class.categories.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/phpgwapi/inc/class.categories.inc.php,v
retrieving revision 1.94
retrieving revision 1.95
diff -C2 -r1.94 -r1.95
*** class.categories.inc.php    12 Oct 2002 17:23:35 -0000      1.94
--- class.categories.inc.php    12 Oct 2002 18:01:39 -0000      1.95
***************
*** 396,401 ****
                                for ($i=0;$i<count($cats);$i++)
                                {
!                                       $s .= '<option value="' . 
$cats[$i]['id'] . '"';
!                                       if (in_array($cats[$i]['id'],$selected))
                                        {
                                                $s .= ' selected';
--- 396,401 ----
                                for ($i=0;$i<count($cats);$i++)
                                {
!                                       $s .= '<option value="' . 
$cats[$i]['cat_id'] . '"';
!                                       if 
(in_array($cats[$i]['cat_id'],$selected))
                                        {
                                                $s .= ' selected';
***************
*** 433,442 ****
                                                $image_set = '&nbsp;';
  
!                                               if 
(in_array($cats[$i]['id'],$selected))
                                                {
                                                        $image_set = '<img 
src="' . $GLOBALS['phpgw']->common->image('phpgwapi','roter_pfeil') . '">';
                                                }
  
!                                               if (($cats[$i]['level'] == 0) 
&& !in_array($cats[$i]['id'],$selected))
                                                {
                                                        $image_set = '<img 
src="' . $GLOBALS['phpgw']->common->image('phpgwapi','grauer_pfeil') . '">';
--- 433,442 ----
                                                $image_set = '&nbsp;';
  
!                                               if 
(in_array($cats[$i]['cat_id'],$selected))
                                                {
                                                        $image_set = '<img 
src="' . $GLOBALS['phpgw']->common->image('phpgwapi','roter_pfeil') . '">';
                                                }
  
!                                               if (($cats[$i]['level'] == 0) 
&& !in_array($cats[$i]['cat_id'],$selected))
                                                {
                                                        $image_set = '<img 
src="' . $GLOBALS['phpgw']->common->image('phpgwapi','grauer_pfeil') . '">';
***************
*** 447,451 ****
                                                $s .= '<tr>' . "\n";
                                                $s .= '<td width="8">' . 
$image_set . '</td>' . "\n";
!                                               $s .= '<td>' . $space_set . '<a 
href="' . $GLOBALS['phpgw']->link($site_link,'cat_id=' . $cats[$i]['id']) . '">'
                                                        . 
$GLOBALS['phpgw']->strip_html($cats[$i]['name'])
                                                        . '</a></td>' . "\n"
--- 447,451 ----
                                                $s .= '<tr>' . "\n";
                                                $s .= '<td width="8">' . 
$image_set . '</td>' . "\n";
!                                               $s .= '<td>' . $space_set . '<a 
href="' . $GLOBALS['phpgw']->link($site_link,'cat_id=' . $cats[$i]['cat_id']) . 
'">'
                                                        . 
$GLOBALS['phpgw']->strip_html($cats[$i]['name'])
                                                        . '</a></td>' . "\n"
***************
*** 488,492 ****
                                {
                                        $sel_cat = '';
!                                       if (in_array($cat['id'],$selected))
                                        {
                                                $sel_cat = 'selected';
--- 488,492 ----
                                {
                                        $sel_cat = '';
!                                       if (in_array($cat['cat_id'],$selected))
                                        {
                                                $sel_cat = 'selected';
***************
*** 511,515 ****
                                        $cat_list[] = array
                                        (
!                                               'id'            => $cat['id'],
                                                'name'          => $name,
                                                'selected'      => $sel_cat
--- 511,515 ----
                                        $cat_list[] = array
                                        (
!                                               'cat_id'        => 
$cat['cat_id'],
                                                'name'          => $name,
                                                'selected'      => $sel_cat
***************
*** 547,551 ****
                        $values['name']         = 
$this->db->db_addslashes($values['name']);
  
!                       if (isset($values['id']))
                        {
                                $id_col = 'cat_id,';
--- 547,551 ----
                        $values['name']         = 
$this->db->db_addslashes($values['name']);
  
!                       if (isset($values['cat_id']))
                        {
                                $id_col = 'cat_id,';