[Phpgroupware-cvs] CVS: notes/inc class.bo.inc.php,1.12,1.13 class.ui.inc.php,1.46,1.47

[Bettina Gille <address@hidden>]

Update of /cvsroot/phpgroupware/notes/inc
In directory subversions:/tmp/cvs-serv14593/inc

Modified Files:
        class.bo.inc.php class.ui.inc.php 
Log Message:
update xslt tpls

Index: class.bo.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/notes/inc/class.bo.inc.php,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -r1.12 -r1.13
*** class.bo.inc.php    20 Oct 2002 22:00:52 -0000      1.12
--- class.bo.inc.php    20 Apr 2003 22:30:39 -0000      1.13
***************
*** 85,91 ****
                                $this->order = $order;
                        }
!                       if(isset($cat_id))
                        {
                                $this->cat_id = $cat_id;
                        }
                }
--- 85,95 ----
                                $this->order = $order;
                        }
!                       if(isset($cat_id) && !empty($cat_id))
                        {
                                $this->cat_id = $cat_id;
+                       }
+                       else
+                       {
+                               unset($this->cat_id);
                        }
                }

Index: class.ui.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/notes/inc/class.ui.inc.php,v
retrieving revision 1.46
retrieving revision 1.47
diff -C2 -r1.46 -r1.47
*** class.ui.inc.php    20 Apr 2003 14:15:17 -0000      1.46
--- class.ui.inc.php    20 Apr 2003 22:30:39 -0000      1.47
***************
*** 70,74 ****
                                                                                
$GLOBALS['phpgw']->common->get_tpl_dir('phpgwapi','default') . SEP . 
'nextmatchs'));
  
!                       $GLOBALS['phpgw_info']['flags']['notes']['app_header'] 
= lang('notes') . ': ' . lang('list notes');
  
                        $notes_list = $this->bo->read();
--- 70,74 ----
                                                                                
$GLOBALS['phpgw']->common->get_tpl_dir('phpgwapi','default') . SEP . 
'nextmatchs'));
  
!                       $GLOBALS['phpgw_info']['flags']['app_header'] = 
lang('notes') . ': ' . lang('list notes');
  
                        $notes_list = $this->bo->read();
***************
*** 97,101 ****
                        }
  
!                       $table_header[] = array
                        (
                                'sort_time_created'     => 
$this->nextmatchs->show_sort_order(array
--- 97,101 ----
                        }
  
!                       $table_header = array
                        (
                                'sort_time_created'     => 
$this->nextmatchs->show_sort_order(array
***************
*** 124,128 ****
                        );
  
!                       $table_add[] = array
                        (
                                'lang_add'                              => 
lang('add'),
--- 124,128 ----
                        );
  
!                       $table_add = array
                        (
                                'lang_add'                              => 
lang('add'),
***************
*** 153,157 ****
                                'select_name'                                   
=> 'cat_id',
                                'cat_list'                                      
        => $this->cats->formatted_xslt_list(array('selected' => 
$this->cat_id,'globals' => True)),
!                               'search_url'                                    
=> $GLOBALS['phpgw']->link('/index.php','menuaction=notes.ui.index'),
                                'filter_list'                                   
=> $this->nextmatchs->xslt_filter(array('filter' => $this->filter,'yours' => 
'yes')),
                                'lang_filter_statustext'                => 
lang('Select the filter. To show all entries select SHOW ALL'),
--- 153,157 ----
                                'select_name'                                   
=> 'cat_id',
                                'cat_list'                                      
        => $this->cats->formatted_xslt_list(array('selected' => 
$this->cat_id,'globals' => True)),
!                               'select_url'                                    
=> $GLOBALS['phpgw']->link('/index.php','menuaction=notes.ui.index'),
                                'filter_list'                                   
=> $this->nextmatchs->xslt_filter(array('filter' => $this->filter,'yours' => 
'yes')),
                                'lang_filter_statustext'                => 
lang('Select the filter. To show all entries select SHOW ALL'),
***************
*** 188,196 ****
                        {
                                $note = $this->bo->read_single($note_id);
!                               
$GLOBALS['phpgw_info']['flags']['notes']['app_header'] = lang('notes') . ': ' . 
lang('edit note');
                        }
                        else
                        {
!                               
$GLOBALS['phpgw_info']['flags']['notes']['app_header'] = lang('notes') . ': ' . 
lang('add note');
                        }
  
--- 188,196 ----
                        {
                                $note = $this->bo->read_single($note_id);
!                               $GLOBALS['phpgw_info']['flags']['app_header'] = 
lang('notes') . ': ' . lang('edit note');
                        }
                        else
                        {
!                               $GLOBALS['phpgw_info']['flags']['app_header'] = 
lang('notes') . ': ' . lang('add note');
                        }
  
***************
*** 238,242 ****
                        $confirm        = get_var('confirm',array('POST'));
  
!                       $GLOBALS['phpgw_info']['flags']['notes']['app_header'] 
= lang('notes') . ': ' . lang('delete note');
  
                        $link_data = array
--- 238,242 ----
                        $confirm        = get_var('confirm',array('POST'));
  
!                       $GLOBALS['phpgw_info']['flags']['app_header'] = 
lang('notes') . ': ' . lang('delete note');
  
                        $link_data = array
***************
*** 271,275 ****
                        $note_id = get_var('note_id',array('GET'));
  
!                       $GLOBALS['phpgw_info']['flags']['notes']['app_header'] 
= lang('notes') . ': ' . lang('view note');
  
                        $GLOBALS['phpgw']->xslttpl->add_file('app_data');
--- 271,275 ----
                        $note_id = get_var('note_id',array('GET'));
  
!                       $GLOBALS['phpgw_info']['flags']['app_header'] = 
lang('notes') . ': ' . lang('view note');
  
                        $GLOBALS['phpgw']->xslttpl->add_file('app_data');