[Phpgroupware-cvs] api class.prefs.php,1.1.1.1.2.2,1.1.1.1.2.3

[Joseph Engo <address@hidden>]

Update of /cvsroot/phpgroupware/api
In directory subversions:/tmp/cvs-serv27805

Modified Files:
      Tag: proposal-branch
        class.prefs.php 
Log Message:
- Fixed set() complaining about value type when you pass it a string like m/d/Y
- Fixed the query in set(), it was never returning results since it was missing 
db->next_record()
- Note: set() needs to be re-written to take advantage of transactions


Index: class.prefs.php
===================================================================
RCS file: /cvsroot/phpgroupware/api/class.prefs.php,v
retrieving revision 1.1.1.1.2.2
retrieving revision 1.1.1.1.2.3
diff -C2 -d -r1.1.1.1.2.2 -r1.1.1.1.2.3
*** class.prefs.php     28 Oct 2003 05:26:34 -0000      1.1.1.1.2.2
--- class.prefs.php     29 Oct 2003 06:33:49 -0000      1.1.1.1.2.3
***************
*** 23,26 ****
--- 23,27 ----
  
        /* $Id$ */
+       /* $Source$ */
  
        class api_prefs
***************
*** 45,53 ****
                }
  
!               function set ()
                {
                        $args = new safe_args();
                        $args->set('pref', '##REQUIRED##', 'string');
!                       $args->set('value', '##UNSET##', 'string');
                        $args->set('account_id', $this->account_id, 'any');
                        $args = $args->get(func_get_args(),__LINE__,__FILE__);
--- 46,54 ----
                }
  
!               function set()
                {
                        $args = new safe_args();
                        $args->set('pref', '##REQUIRED##', 'string');
!                       $args->set('value', '##UNSET##', 'any');
                        $args->set('account_id', $this->account_id, 'any');
                        $args = $args->get(func_get_args(),__LINE__,__FILE__);
***************
*** 55,65 ****
                        $args['app'] = $tmp[0];
                        $args['name'] = $tmp[1];
!                       
!                       $sql = "SELECT * FROM phpgw_prefs WHERE 
pref_app='".$args['app']."' and pref_name='".$args['name']."' and 
pref_account='".$args['account_id']."'";
!                       $this->db->query($sql,__LINE__,__FILE__);
!                       
                        if($args['value'] == '##UNSET##')
                        {
!                               $sql = "delete from phpgw_prefs WHERE 
pref_app='".$args['app']."' and pref_name='".$args['name']."' and 
pref_account='".$args['pref_account']."'";
                                $this->db->query($sql,__LINE__,__FILE__);
                                
unset($this->data[$args['account_id']][$args['name']]);
--- 56,63 ----
                        $args['app'] = $tmp[0];
                        $args['name'] = $tmp[1];
! 
                        if($args['value'] == '##UNSET##')
                        {
!                               $sql = "delete from phpgw_prefs WHERE 
pref_app='".$args['app']."' and pref_name='".$args['name']."' and 
pref_account='".$args['account_id']."'";
                                $this->db->query($sql,__LINE__,__FILE__);
                                
unset($this->data[$args['account_id']][$args['name']]);
***************
*** 67,73 ****
                        else
                        {
!                               if($this->db->num_rows())
                                {       
!                                       $sql = "update phpgw_prefs set 
pref_value='".$args['value']."' WHERE pref_app='".$args['app']."' and 
pref_name='".$args['name']."' and pref_account='".$args['pref_account']."'";
                                        
$this->db->query($sql,__LINE__,__FILE__);
                                        
$this->data[$args['account_id']][$args['app'].'.'.$args['name']] = 
$args['value'];
--- 65,75 ----
                        else
                        {
!                               $sql = "SELECT * FROM phpgw_prefs WHERE 
pref_app='".$args['app']."' and pref_name='".$args['name']."' and 
pref_account='".$args['account_id']."'";
!                               $this->db->query($sql,__LINE__,__FILE__);
!                               $this->db->next_record();
! 
!                               if ($this->db->num_rows())
                                {       
!                                       $sql = "update phpgw_prefs set 
pref_value='".$args['value']."' WHERE pref_app='".$args['app']."' and 
pref_name='".$args['name']."' and pref_account='".$args['account_id']."'";
                                        
$this->db->query($sql,__LINE__,__FILE__);
                                        
$this->data[$args['account_id']][$args['app'].'.'.$args['name']] = 
$args['value'];