[Phpgroupware-cvs] CVS: notes/inc class.so.inc.php,1.8,1.9 class.ui.inc.php,1.27,1.28

[Bettina Gille <address@hidden>]

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

Modified Files:
        class.so.inc.php class.ui.inc.php 
Log Message:
update xsl functions

Index: class.so.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/notes/inc/class.so.inc.php,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -r1.8 -r1.9
*** class.so.inc.php    26 Sep 2002 01:49:45 -0000      1.8
--- class.so.inc.php    27 Sep 2002 00:15:39 -0000      1.9
***************
*** 18,25 ****
                function so()
                {
!                       $this->db     = $GLOBALS['phpgw']->db;
!                       $this->db2    = $this->db;
!                       $this->grants = 
$GLOBALS['phpgw']->acl->get_grants('notes');
!                       $this->owner  = 
$GLOBALS['phpgw_info']['user']['account_id'];
                }
  
--- 18,25 ----
                function so()
                {
!                       $this->db               = $GLOBALS['phpgw']->db;
!                       $this->db2              = $this->db;
!                       $this->grants   = 
$GLOBALS['phpgw']->acl->get_grants('notes');
!                       $this->account  = 
$GLOBALS['phpgw_info']['user']['account_id'];
                }
  
***************
*** 29,33 ****
                        {
                                $start  = 
(isset($data['start'])?$data['start']:0);
!                               $filter = 
(isset($data['filter'])?$data['filter']:'all');
                                $query = 
(isset($data['query'])?$data['query']:'');
                                $sort = 
(isset($data['sort'])?$data['sort']:'DESC');
--- 29,33 ----
                        {
                                $start  = 
(isset($data['start'])?$data['start']:0);
!                               $filter = 
(isset($data['filter'])?$data['filter']:'none');
                                $query = 
(isset($data['query'])?$data['query']:'');
                                $sort = 
(isset($data['sort'])?$data['sort']:'DESC');
***************
*** 45,51 ****
                        }
  
!                       if ($filter == 'all')
                        {
!                               $filtermethod = " ( note_owner=" . $this->owner;
                                if (is_array($this->grants))
                                {
--- 45,51 ----
                        }
  
!                       if ($filter == 'none')
                        {
!                               $filtermethod = ' ( note_owner=' . 
$this->account;
                                if (is_array($this->grants))
                                {
***************
*** 63,73 ****
                                }
                        }
!                       elseif ($filter == 'public')
                        {
!                               $filtermethod = " note_owner='" . $this->owner 
. "'";
                        }
                        else
                        {
!                               $filtermethod = " note_owner='" . $this->owner 
. "' AND note_access='private'";
                        }
  
--- 63,73 ----
                                }
                        }
!                       elseif ($filter == 'yours')
                        {
!                               $filtermethod = " note_owner='" . 
$this->account . "'";
                        }
                        else
                        {
!                               $filtermethod = " note_owner='" . 
$this->account . "' AND note_access='private'";
                        }
  
***************
*** 131,135 ****
  
                        $this->db->query("INSERT INTO phpgw_notes 
(note_owner,note_access,note_date,note_content,note_category) "
!                               . "VALUES ('" . $this->owner . "','" . 
$note['access'] . "','" . time() . "','" . $note['content']
                                . "','" . $note['cat'] . 
"')",__LINE__,__FILE__);
                        return 
$this->db->get_last_insert_id('phpgw_notes','note_id');
--- 131,135 ----
  
                        $this->db->query("INSERT INTO phpgw_notes 
(note_owner,note_access,note_date,note_content,note_category) "
!                               . "VALUES ('" . $this->account . "','" . 
$note['access'] . "','" . time() . "','" . $note['content']
                                . "','" . $note['cat'] . 
"')",__LINE__,__FILE__);
                        return 
$this->db->get_last_insert_id('phpgw_notes','note_id');

Index: class.ui.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/notes/inc/class.ui.inc.php,v
retrieving revision 1.27
retrieving revision 1.28
diff -C2 -r1.27 -r1.28
*** class.ui.inc.php    26 Sep 2002 03:56:23 -0000      1.27
--- class.ui.inc.php    27 Sep 2002 00:15:39 -0000      1.28
***************
*** 238,242 ****
                        
$this->tpl->add_file(array('list',$GLOBALS['phpgw']->common->get_tpl_dir('phpgwapi','default')
 . SEP . 'app_header',
                                                                                
$GLOBALS['phpgw']->common->get_tpl_dir('phpgwapi','default') . SEP . 
'cat_select',
!                                                                               
$GLOBALS['phpgw']->common->get_tpl_dir('phpgwapi','default') . SEP . 
'filter_select'));
  
                        $notes_list = $this->bo->read();
--- 238,243 ----
                        
$this->tpl->add_file(array('list',$GLOBALS['phpgw']->common->get_tpl_dir('phpgwapi','default')
 . SEP . 'app_header',
                                                                                
$GLOBALS['phpgw']->common->get_tpl_dir('phpgwapi','default') . SEP . 
'cat_select',
!                                                                               
$GLOBALS['phpgw']->common->get_tpl_dir('phpgwapi','default') . SEP . 
'filter_select',
!                                                                               
$GLOBALS['phpgw']->common->get_tpl_dir('phpgwapi','default') . SEP . 
'search_field'));
  
                        $notes_list = $this->bo->read();
***************
*** 288,291 ****
--- 289,294 ----
                                'select_action'                 => 
$GLOBALS['phpgw']->link('/index.php','menuaction=notes.ui.index'),
                                'filter_list'                   => 
$this->nextmatchs->xslt_filter(array('filter' => $this->filter,'yours' => 
'yes')),
+                               'query'                                 => 
$this->query,
+                               'lang_submit'                   => 
lang('submit'),
                                'table_header'                  => 
$table_header,
                                'values'                                => 
$content,
***************
*** 298,301 ****
--- 301,305 ----
  
                        $this->tpl->pparse();
+                       $this->save_sessiondata();
                }