phpgroupware-cvs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Phpgroupware-cvs] notes/inc class.bonotes.inc.php, 1.22, 1.23 class.uin


From: Bettina Gille <address@hidden>
Subject: [Phpgroupware-cvs] notes/inc class.bonotes.inc.php, 1.22, 1.23 class.uinotes.inc.php, 1.30, 1.31
Date: Wed, 12 Nov 2003 16:47:28 +0000

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

Modified Files:
        class.bonotes.inc.php class.uinotes.inc.php 
Log Message:
update

Index: class.bonotes.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/notes/inc/class.bonotes.inc.php,v
retrieving revision 1.22
retrieving revision 1.23
diff -C2 -d -r1.22 -r1.23
*** class.bonotes.inc.php       11 Nov 2003 12:45:30 -0000      1.22
--- class.bonotes.inc.php       12 Nov 2003 16:45:41 -0000      1.23
***************
*** 63,72 ****
                        }
  
!                       $start  = get_var('start',array('POST','GET'));
!                       $query  = get_var('query',array('POST','GET'));
!                       $sort   = get_var('sort',array('POST','GET'));
!                       $order  = get_var('order',array('POST','GET'));
!                       $filter = get_var('filter',array('POST','GET'));
!                       $cat_id = get_var('cat_id',array('POST','GET'));
  
                        $this->start = (isset($start)?$start:0);
--- 63,72 ----
                        }
  
!                       $start          = get_var('start',array('POST','GET'));
!                       $query          = get_var('query',array('POST','GET'));
!                       $sort           = get_var('sort',array('POST','GET'));
!                       $order          = get_var('order',array('POST','GET'));
!                       $filter         = get_var('filter',array('POST','GET'));
!                       $_cat_id        = get_var('cat_id',array('POST','GET'));
  
                        $this->start = (isset($start)?$start:0);
***************
*** 88,98 ****
                                $this->order = $order;
                        }
!                       if(isset($cat_id) && !empty($cat_id))
!                       {
!                               $this->cat_id = $cat_id;
!                       }
!                       else
                        {
!                               unset($this->cat_id);
                        }
                }
--- 88,94 ----
                                $this->order = $order;
                        }
!                       if(isset($_cat_id) && !empty($_cat_id))
                        {
!                               $this->cat_id = $_cat_id;
                        }
                }

Index: class.uinotes.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/notes/inc/class.uinotes.inc.php,v
retrieving revision 1.30
retrieving revision 1.31
diff -C2 -d -r1.30 -r1.31
*** class.uinotes.inc.php       11 Nov 2003 12:45:30 -0000      1.30
--- class.uinotes.inc.php       12 Nov 2003 16:45:41 -0000      1.31
***************
*** 69,80 ****
                function index()
                {
!                       $GLOBALS['phpgw']->xslttpl->add_file(array('app_data',
!                                                                               
$GLOBALS['phpgw']->common->get_tpl_dir('phpgwapi','default') . SEP . 
'filter_select',
!                                                                               
$GLOBALS['phpgw']->common->get_tpl_dir('phpgwapi','default') . SEP . 
'search_field'));
! 
                        $GLOBALS['phpgw_info']['flags']['app_header'] = 
lang('notes') . ': ' . lang('list notes');
  
                        $notes_list = $this->bonotes->read();
  
                        while (is_array($notes_list) && list(,$note) = 
each($notes_list))
                        {
--- 69,82 ----
                function index()
                {
!                       //$GLOBALS['phpgw']->xslttpl->add_file('app_data');
                        $GLOBALS['phpgw_info']['flags']['app_header'] = 
lang('notes') . ': ' . lang('list notes');
  
                        $notes_list = $this->bonotes->read();
  
+                       $link_data = array
+                       (
+                               'menuaction' => 'notes.uinotes.index'
+                       );
+ 
                        while (is_array($notes_list) && list(,$note) = 
each($notes_list))
                        {
***************
*** 105,112 ****
                                                                                
(
                                                                                
        'sort'  => $this->sort,
!                                                                               
        'var'   =>      'note_date',
!                                                                               
        'order' =>      $this->order,
!                                                                               
        'extra'         => array('menuaction'   => 'notes.uinotes.index',
!                                                                               
                                                        'cat_id'        
=>$this->cat_id)
                                                                                
)),
                                'lang_content'          => lang('content'),
--- 107,113 ----
                                                                                
(
                                                                                
        'sort'  => $this->sort,
!                                                                               
        'var'   => 'note_date',
!                                                                               
        'order' => $this->order,
!                                                                               
        'extra' => $link_data
                                                                                
)),
                                'lang_content'          => lang('content'),
***************
*** 121,126 ****
                                                                                
        'var'   => 'note_id',
                                                                                
        'order' => $this->order,
!                                                                               
        'extra'         => array('menuaction'   => 'notes.uinotes.index',
!                                                                               
                                                        'cat_id'        => 
$this->cat_id)
                                                                                
)),
                                'lang_owner'            => lang('owner')
--- 122,126 ----
                                                                                
        'var'   => 'note_id',
                                                                                
        'order' => $this->order,
!                                                                               
        'extra' => $link_data
                                                                                
)),
                                'lang_owner'            => lang('owner')
***************
*** 136,163 ****
                        $nm = array
                        (
!                               'start_record'                                  
=> $this->start,
!                               'num_records'                                   
=> count($notes_list),
!                               'all_records'                                   
=> $this->bonotes->total_records,
!                               'nextmatchs_url'                                
=> $GLOBALS['phpgw']->link('/index.php','menuaction=notes.uinotes.index')
                        );
  
                        $data = array
                        (
!                               'nm_data'                                       
        => $this->nextmatchs->xslt_tpl($nm),
!                               'lang_no_cat'                                   
=> lang('no category'),
!                               'lang_cat_statustext'                   => 
lang('Select the category the notes belongs to. To do not use a category select 
NO CATEGORY'),
!                               '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.uinotes.index'),
!                               'filter_list'                                   
=> $this->nextmatchs->xslt_filter(array('filter' => $this->filter)),
!                               'lang_filter_statustext'                => 
lang('Select the filter. To show all entries select SHOW ALL'),
!                               'lang_searchfield_statustext'   => lang('Enter 
the search string. To show all entries, empty this field and press the SUBMIT 
button again'),
!                               'lang_searchbutton_statustext'  => lang('Submit 
the search string'),
!                               'query'                                         
        => $this->query,
!                               'lang_search'                                   
=> lang('search'),
!                               'table_header'                                  
=> $table_header,
!                               'values'                                        
        => $content,
!                               'table_add'                                     
        => $table_add 
                        );
                        $this->save_sessiondata();
                        
$GLOBALS['phpgw']->xslttpl->set_var('phpgw',array('list' => $data));
--- 136,160 ----
                        $nm = array
                        (
!                               'start_record'  => $this->start,
!                               'num_records'   => count($notes_list),
!                               'all_records'   => 
$this->bonotes->total_records,
!                               'link_data'             => $link_data
                        );
  
                        $data = array
                        (
!                               'nm_data'                               => 
$this->nextmatchs->xslt_nm($nm),
!                               'lang_no_cat'                   => lang('no 
category'),
!                               'lang_cat_statustext'   => lang('Select the 
category the notes belongs to. To do not use a category select NO CATEGORY'),
!                               '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.uinotes.index'),
!                               'filter_data'                   => 
$this->nextmatchs->xslt_filter(array('filter' => $this->filter,'link_data' => 
$link_data)),
!                               'search_data'                   => 
$this->nextmatchs->xslt_search(array('query' => $this->query,'link_data' => 
$link_data)),
!                               'table_header'                  => 
$table_header,
!                               'values'                                => 
$content,
!                               'table_add'                             => 
$table_add 
                        );
+ 
                        $this->save_sessiondata();
                        
$GLOBALS['phpgw']->xslttpl->set_var('phpgw',array('list' => $data));





reply via email to

[Prev in Thread] Current Thread [Next in Thread]