[Phpgroupware-cvs] CVS: notes/inc class.so.inc.php,1.2.4.1,1.2.4.2

[Bettina Gille <address@hidden>]

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

Modified Files:
      Tag: Version-0_9_16-branch
        class.so.inc.php 
Log Message:
fixed some '

Index: class.so.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/notes/inc/class.so.inc.php,v
retrieving revision 1.2.4.1
retrieving revision 1.2.4.2
diff -C2 -r1.2.4.1 -r1.2.4.2
*** class.so.inc.php    30 Apr 2003 07:05:19 -0000      1.2.4.1
--- class.so.inc.php    17 May 2003 21:30:24 -0000      1.2.4.2
***************
*** 24,33 ****
                }
  
!               function read_notes($start, $search = '', $filter = '',$cat_id 
= '', $limit = true, $lastmod = -1)
                {
                        //cast/addslashes for security
!                       $start          = (int) $start;
!                       $cat_id         = (int) $cat_id;
!                       $lastmod        = (int) $lastmod;
                        $search         = $this->db->db_addslashes($search);
                        
--- 24,33 ----
                }
  
!               function read_notes($start, $search = '', $filter = '',$cat_id 
= '', $limit = True, $lastmod = -1)
                {
                        //cast/addslashes for security
!                       $start          = intval($start);
!                       $cat_id         = intval($cat_id);
!                       $lastmod        = intval($lastmod);
                        $search         = $this->db->db_addslashes($search);
                        
***************
*** 95,107 ****
                        while ($this->db->next_record())
                        {
!                               $notes[$i]['id']        = 
(int)$this->db->f('note_id');
!                               $notes[$i]['owner']     = 
$this->db->f('note_owner');
!                               $notes[$i]['owner_id']  = 
(int)$this->db->f('note_owner');
!                               $notes[$i]['access']    = 
$this->db->f('note_access');
!                               $notes[$i]['date']      = 
$this->db->f('note_date');
!                               $notes[$i]['category']  = 
(int)$this->db->f('note_category');
!                               $notes[$i]['content']   = 
$this->db->f('note_content');
!                               $notes[$i]['grants']    = 
(int)$this->grants[$this->db->f('note_owner')];
!                               $notes[$i]['lastmod']   = 
(int)$this->db->f('note_date');
                                $i++;
                        }
--- 95,107 ----
                        while ($this->db->next_record())
                        {
!                               $notes[$i]['id']                = 
intval($this->db->f('note_id'));
!                               $notes[$i]['owner']             = 
$this->db->f('note_owner');
!                               $notes[$i]['owner_id']  = 
intval($this->db->f('note_owner'));
!                               $notes[$i]['access']    = 
$this->db->f('note_access');
!                               $notes[$i]['date']              = 
$this->db->f('note_date');
!                               $notes[$i]['category']  = 
intval($this->db->f('note_category'));
!                               $notes[$i]['content']   = 
$this->db->f('note_content');
!                               $notes[$i]['grants']    = 
intval($this->grants[$this->db->f('note_owner')]);
!                               $notes[$i]['lastmod']   = 
intval($this->db->f('note_date'));
                                $i++;
                        }
***************
*** 115,124 ****
                        if ($this->db->next_record())
                        {
!                               $note['id']       = 
(int)$this->db->f('note_id');
!                               $note['owner']    = $this->db->f('note_owner');
!                               $note['content']  = 
$this->db->f('note_content');
!                               $note['access']   = $this->db->f('note_access');
!                               $note['date']     = $this->db->f('note_date');
!                               $note['category'] = 
(int)$this->db->f('note_category');
  
                                return $note;
--- 115,124 ----
                        if ($this->db->next_record())
                        {
!                               $note['id']                     = 
intval($this->db->f('note_id'));
!                               $note['owner']          = 
$this->db->f('note_owner');
!                               $note['content']        = 
$this->db->f('note_content');
!                               $note['access']         = 
$this->db->f('note_access');
!                               $note['date']           = 
$this->db->f('note_date');
!                               $note['category']       = 
intval($this->db->f('note_category'));
  
                                return $note;
***************
*** 131,138 ****
                        $note['access']  = 
$this->db->db_addslashes($note['access']);
                        $note['content'] = 
$this->db->db_addslashes($note['content']);
!                       $note['category']= (int)$note['category'];
                        
                        $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['category'] . 
")",__LINE__,__FILE__);
                        return 
$this->db->get_last_insert_id('phpgw_notes','note_id');
--- 131,138 ----
                        $note['access']  = 
$this->db->db_addslashes($note['access']);
                        $note['content'] = 
$this->db->db_addslashes($note['content']);
!                       $note['category']= intval($note['category']);
                        
                        $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['category'] . 
")",__LINE__,__FILE__);
                        return 
$this->db->get_last_insert_id('phpgw_notes','note_id');
***************
*** 142,152 ****
                {
                        //cast/addslashes for security
!                       $note['id']      = (int)$note['id'];
                        $note['access']  = 
$this->db->db_addslashes($note['access']);
                        $note['content'] = 
$this->db->db_addslashes($note['content']);
!                       $note['category']= (int)$note['category'];
  
!                       $this->db->query("UPDATE phpgw_notes set 
note_content='" . $note['content'] . "', note_date='" . time() . "', 
note_category=" . $note['category'] . ", "
!                               . "note_access='" . $note['access'] . "' WHERE 
note_id=" . $note['id'] ,__LINE__,__FILE__);
                }
  
--- 142,152 ----
                {
                        //cast/addslashes for security
!                       $note['id']      = intval($note['id']);
                        $note['access']  = 
$this->db->db_addslashes($note['access']);
                        $note['content'] = 
$this->db->db_addslashes($note['content']);
!                       $note['category']= intval($note['category']);
  
!                       $this->db->query("UPDATE phpgw_notes set 
note_content='" . $note['content'] . "', note_date=" . time() . ", 
note_category=" . $note['category'] . ", "
!                               . "note_access='" . $note['access'] . "' WHERE 
note_id=" . $note['id'],__LINE__,__FILE__);
                }
  
***************
*** 154,158 ****
                {
                        $note_id = (int) $note_id;
!                       $this->db->query("DELETE FROM phpgw_notes WHERE 
note_id='$note_id'",__LINE__,__FILE__);
                }
        }
--- 154,158 ----
                {
                        $note_id = (int) $note_id;
!                       $this->db->query('DELETE FROM phpgw_notes WHERE 
note_id=' . $note_id,__LINE__,__FILE__);
                }
        }