[Phpgroupware-cvs] CVS: preferences/inc class.bocategories.inc.php,1.3,1.4 class.uicategories.inc.php,1.3,1.4

[Bettina gille <address@hidden>]

Update of /cvsroot/phpgroupware/preferences/inc
In directory subversions:/tmp/cvs-serv20770/inc

Modified Files:
        class.bocategories.inc.php class.uicategories.inc.php 
Log Message:
added data fields to cats setup

Index: class.bocategories.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/preferences/inc/class.bocategories.inc.php,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** class.bocategories.inc.php  13 Jan 2002 22:35:54 -0000      1.3
--- class.bocategories.inc.php  13 Jan 2002 23:31:03 -0000      1.4
***************
*** 125,129 ****
                        else
                        {
!                               if (!$values['cat_parent'])
                                {
                                        $exists = $this->exists(array
--- 125,129 ----
                        else
                        {
!                               if (!$values['parent'])
                                {
                                        $exists = $this->exists(array
***************
*** 146,150 ****
                                if ($exists == True)
                                {
!                                       $error[] = lang('That name has been 
used already');
                                }
                        }
--- 146,150 ----
                                if ($exists == True)
                                {
!                                       $error[] = lang('This name has been 
used already');
                                }
                        }

Index: class.uicategories.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/preferences/inc/class.uicategories.inc.php,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** class.uicategories.inc.php  13 Jan 2002 22:35:54 -0000      1.3
--- class.uicategories.inc.php  13 Jan 2002 23:31:03 -0000      1.4
***************
*** 77,80 ****
--- 77,90 ----
                }
  
+ 
+               function cat_data($edata,$data)
+               {
+                       for ($j=0;$j<count($edata);$j++)
+                       {
+                               $td_data .= '<td>' . $data[$edata[$j]] . 
'</td>' . "\n";
+                       }
+                       return $td_data;
+               }
+ 
                function index()
                {
***************
*** 190,198 ****
                                        else
                                        {
!                                               for ($j=0;$j<count($edata);$j++)
!                                               {
!                                                       $td_data .= '<td>' . 
$data[$edata[$j]] . '</td>' . "\n";
!                                               }
!                                               
$this->t->set_var('td_data',$td_data);
                                        }
                                }
--- 200,204 ----
                                        else
                                        {
!                                               
$this->t->set_var('td_data',$this->cat_data($edata,$data));
                                        }
                                }
***************
*** 275,279 ****
                        $cat_name                       = 
$GLOBALS['HTTP_POST_VARS']['cat_name'];
                        $cat_description        = 
$GLOBALS['HTTP_POST_VARS']['cat_description'];
! //                    $cat_data                       = 
$GLOBALS['HTTP_POST_VARS']['cat_data'];
                        $cat_access                     = 
$GLOBALS['HTTP_POST_VARS']['cat_access'];
  
--- 281,285 ----
                        $cat_name                       = 
$GLOBALS['HTTP_POST_VARS']['cat_name'];
                        $cat_description        = 
$GLOBALS['HTTP_POST_VARS']['cat_description'];
!                       $cat_data                       = 
$GLOBALS['HTTP_POST_VARS']['cat_data'];
                        $cat_access                     = 
$GLOBALS['HTTP_POST_VARS']['cat_access'];
  
***************
*** 298,302 ****
                                $values = array
                                (
-                                       'id'            => '',
                                        'parent'        => $cat_parent,
                                        'descr'         => $cat_description,
--- 304,307 ----
***************
*** 355,359 ****
                        {
                                $edata = explode(',',$extra);
-                               $cat_data = array();
                                for($i=0;$i<count($edata);$i++)
                                {
--- 360,363 ----