[Phpgroupware-cvs] phpgwapi/inc class.categories.inc.php, 1.116, 1.117 class.nextmatchs.inc.php, 1.65, 1.66

[Bettina Gille <address@hidden>]

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

Modified Files:
        class.categories.inc.php class.nextmatchs.inc.php 
Log Message:
update categories

Index: class.nextmatchs.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/phpgwapi/inc/class.nextmatchs.inc.php,v
retrieving revision 1.65
retrieving revision 1.66
diff -C2 -d -r1.65 -r1.66
*** class.nextmatchs.inc.php    12 Nov 2003 16:29:28 -0000      1.65
--- class.nextmatchs.inc.php    13 Nov 2003 13:51:36 -0000      1.66
***************
*** 759,763 ****
                                'title_next'            => lang('next page'),
                                'title_last'            => lang('last page'),
!                               'title_all'                     => lang('all 
records')
                        );
                        return $nm_data;
--- 759,764 ----
                                'title_next'            => lang('next page'),
                                'title_last'            => lang('last page'),
!                               'title_all'                     => lang('show 
all'),
!                               'lang_showing'          => 
$this->show_hits(intval($values['all_records']),intval($values['start']))
                        );
                        return $nm_data;

Index: class.categories.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/phpgwapi/inc/class.categories.inc.php,v
retrieving revision 1.116
retrieving revision 1.117
diff -C2 -d -r1.116 -r1.117
*** class.categories.inc.php    27 Aug 2003 00:23:00 -0000      1.116
--- class.categories.inc.php    13 Nov 2003 13:51:35 -0000      1.117
***************
*** 5,13 ****
        *                  and Bettina Gille address@hidden                *
        * Category manager                                                      
   *
!       * Copyright (C) 2000, 2001 Joseph Engo, Bettina Gille                   
   *
!       * Copyright (C) 2002, 2003 Bettina Gille                                
   *
!       * 
------------------------------------------------------------------------ *
        * This library is part of the phpGroupWare API                          
   *
        * http://www.phpgroupware.org                                           
   * 
        * 
------------------------------------------------------------------------ *
        * This library is free software; you can redistribute it and/or modify 
it  *
--- 5,13 ----
        *                  and Bettina Gille address@hidden                *
        * Category manager                                                      
   *
!       * Copyright 2000 - 2003 Free Software Foundation, Inc                   
   *
!       * 
-------------------------------------------------------------------------*
        * This library is part of the phpGroupWare API                          
   *
        * http://www.phpgroupware.org                                           
   * 
+       * This program is part of the GNU project, see http://www.gnu.org/      
   *
        * 
------------------------------------------------------------------------ *
        * This library is free software; you can redistribute it and/or modify 
it  *
***************
*** 504,508 ****
                }
  
!               function formatted_xslt_list($data)
                {
                        if(is_array($data))
--- 504,508 ----
                }
  
!               function formatted_xslt_list($data=0)
                {
                        if(is_array($data))
***************
*** 513,516 ****
--- 513,522 ----
                                $self                   = 
(isset($data['self'])?$data['self']:'');
                                $globals                = 
(isset($data['globals'])?$data['globals']:True);
+                               $link_data              = 
(isset($data['link_data'])?$data['link_data']:0);
+                               $select_name    = 
(isset($data['select_name'])?$data['select_name']:'cat_id');
+                       }
+                       else
+                       {
+                               return False;
                        }
  
***************
*** 529,541 ****
                        }
  
!                       switch($format)
!                       {
!                               case 'select':
!                                       
$GLOBALS['phpgw']->xslttpl->add_file($GLOBALS['phpgw']->common->get_tpl_dir('phpgwapi','default')
 . SEP . 'cat_select');
!                                       break;
!                               case 'filter':
!                                       
$GLOBALS['phpgw']->xslttpl->add_file($GLOBALS['phpgw']->common->get_tpl_dir('phpgwapi','default')
 . SEP . 'cat_filter');
!                                       break;
!                       }
  
                        if($self)
--- 535,539 ----
                        }
  
!                       
$GLOBALS['phpgw']->xslttpl->add_file($GLOBALS['phpgw']->common->get_tpl_dir('phpgwapi','default')
 . SEP . 'categories');
  
                        if($self)
***************
*** 548,551 ****
--- 546,550 ----
                                        }
                                }
+                               reset($cats);
                        }
  
***************
*** 581,585 ****
                                );
                        }
!                       return $cat_list;
                }
  
--- 580,594 ----
                                );
                        }
! 
!                       $cat_data = array
!                       (
!                               'cat_list'                              => 
$cat_list,
!                               'lang_no_cat'                   => lang('no 
category'),
!                               'lang_cat_statustext'   => lang('Select the 
category the entry belongs to. To do not use a category select NO CATEGORY'),
!                               'select_url'                    => 
$GLOBALS['phpgw']->link('/index.php',$link_data),
!                               'select_name'                   => $select_name,
!                               'lang_submit'                   => 
lang('submit')
!                       );
!                       return $cat_data;
                }