[Phpgroupware-cvs] api/class.prefs.php, 1.1.1.1.2.12

[nomail]

Update of /api
Modified Files:
        Branch: proposal-branch
          class.prefs.php

date: 2004/04/16 20:59:48;  author: seek3r;  state: Exp;  lines: +86 -55

Log Message:
bringing savannah cvs back up to date with what we were doing on our private 
cvs server. We will not be doing dev from this cvs tree
=====================================================================
No syntax errors detected in -
=====================================================================
Index: api/class.prefs.php
diff -u api/class.prefs.php:1.1.1.1.2.11 api/class.prefs.php:1.1.1.1.2.12
--- api/class.prefs.php:1.1.1.1.2.11    Sat Feb 28 06:34:10 2004
+++ api/class.prefs.php Fri Apr 16 20:59:48 2004
@@ -28,38 +28,37 @@
        {
                var $data = Array();
                var $account_id;
-               var $loaded_api = False;
+               var $loaded_api = false;
 
                function api_prefs()
                {
                        $args = new safe_args();
                        $args->set('account_id', 
$GLOBALS['phpgw_data']['user']['id'], 'any');
-                       $args = $args->get(func_get_args(),__LINE__,__FILE__);
+                       $args = $args->get(func_get_args());
 
                        $this->account_id = $args['account_id'];
                        
                        /* all required defaults can be set here */
-                       $this->data['phpgw_default']['api.skin'] = 'default';   
        
-                       $this->data['phpgw_default']['api.lang'] = 'en';        
        
+                       $this->data['phpgw_default']['api.skin'] = 'default';
+                       $this->data['phpgw_default']['api.lang'] = 'en';
                }
 
-               function pre_serialize()
+               function __sleep()
                {
                        // stub so its gets cache'd. No cleanup needed.
                }
 
-               function post_serialize()
+               function __wakeup()
                {
-                       $this->db = $GLOBALS['phpgw']->db;
                }
 
                function set()
                {
                        $args = new safe_args();
-                       $args->set('pref', '##REQUIRED##', 'string');
+                       $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__);
+                       $args = $args->get(func_get_args());
                        $tmp = explode('.', $args['pref']);
                        $args['app'] = $tmp[0];
                        $args['name'] = $tmp[1];
@@ -67,7 +66,8 @@
                        {
                                return $this->save($args);
                        }
-                       elseif($args['value'] == '##UNSET##')
+                       
+                       if($args['value'] == '##UNSET##')
                        {
                                
unset($this->data[$args['account_id']][$args['name']]);
                        }
@@ -76,73 +76,99 @@
                                
$this->data[$args['account_id']][$args['app'].'.'.$args['name']] = 
$args['value'];
                        }
                        $GLOBALS['phpgw_data']['prefs'] = $this->merge_prefs();
-                       return True;
+                       return true;
                }
 
                function save()
                {
                        $args = new safe_args();
-                       $args->set('pref', '##REQUIRED##', 'string');
+                       $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__);
+                       $args = $args->get(func_get_args());
                        $tmp = explode('.', $args['pref']);
                        $args['app'] = $tmp[0];
                        $args['name'] = $tmp[1];
 
+                       $where = ' WHERE 
pref_app='.$GLOBALS['phpgw']->db->qstr($args['app'])
+                                  . ' AND 
pref_name='.$GLOBALS['phpgw']->db->qstr($args['name'])
+                                  . ' AND 
pref_account='.$GLOBALS['phpgw']->db->qstr($args['account_id']);
+
                        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__);
+                               $sql = 'DELETE FROM phpgw_prefs'
+                                        . $where;
+                               if (!is_object($rs = 
$GLOBALS['phpgw']->db->query($sql)))
+                               {
+                                       return false;
+                               }
                                
unset($this->data[$args['account_id']][$args['name']]);
                        }
                        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'];
+                               $sql = 'SELECT * FROM phpgw_prefs'
+                                        . $where;
+                               if (!is_object($rs = 
$GLOBALS['phpgw']->db->query($sql)))
+                               {
+                                       return false;
+                               }
+
+                               $values = array(
+                                       'pref_app'     => $args['app'],
+                                       'pref_name'    => $args['name'],
+                                       'pref_value'   => $args['value'],
+                                       'pref_account' => $args['account_id']
+                               );
+
+                               if ($rs->EOF)
+                               {
+                                       $sql = 
$GLOBALS['phpgw']->db->GetInsertSQL($rs,$values);
                                }
                                else
                                {
-                                       $sql = "insert into phpgw_prefs 
(pref_app, pref_name, pref_value, pref_account)";
-                                       $sql .= " values 
('".$args['app']."','".$args['name']."', '".$args['value']."', 
'".$args['account_id']."')";
-                                       
$this->db->query($sql,__LINE__,__FILE__);
-                                       
$this->data[$args['account_id']][$args['app'].'.'.$args['name']] = 
$args['value'];
+                                       $sql = 
$GLOBALS['phpgw']->db->GetUpdateSQL($rs,$values);
+                               }
+
+                               if (!is_object($rs = 
$GLOBALS['phpgw']->db->query($sql)))
+                               {
+                                       return false;
                                }
+                               
$this->data[$args['account_id']][$args['app'].'.'.$args['name']] = 
$args['value'];
                        }
                        $GLOBALS['phpgw_data']['prefs'] = $this->merge_prefs();
-                       return True;
+                       return true;
                }
 
-               function get ()
+               function get()
                {
                        $args = new safe_args();
-                       $args->set('name', '##REQUIRED##', 'any');
+                       $args->set('name', REQUIRED, 'any');
                        $args->set('account_id', $this->account_id, 'string');
-                       $args->set('app', '##NOTSET##', 'any');
-                       $args = $args->get(func_get_args(),__LINE__,__FILE__);
-                       
if(isset($this->data[$args['account_id']][$args['app'].'.'.$args['name']]))
+                       $args->set('app', NOTSET, 'any');
+                       $args = $args->get(func_get_args());
+
+                       if (!isset($args['app']))
+                       {
+                               list($args['app']) = 
explode('.',$GLOBALS['phpgw_data']['api']['op'],2);
+                       }
+
+                       if 
(isset($this->data[$args['account_id']][$args['app'].'.'.$args['name']]))
                        {
                                return 
$this->data[$args['account_id']][$args['app'].'.'.$args['name']];
                        }
 
-                       if(!isset($args['app']))
+                       $sql = 'SELECT * FROM phpgw_prefs'
+                                . ' WHERE 
pref_app='.$GLOBALS['phpgw']->db->qstr($args['app'])
+                                . ' AND 
pref_name='.$GLOBALS['phpgw']->db->qstr($args['name'])
+                                . ' AND 
pref_account='.$GLOBALS['phpgw']->db->qstr($args['account_id']);
+                       if (!is_object($rs = 
$GLOBALS['phpgw']->db->query($sql)))
                        {
-                               list($args['app']) = 
explode('.',$GLOBALS['phpgw_data']['api']['op']);
+                               return false;
                        }
-                       
-                       $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(!$this->db->num_rows())
-                       {       
-                               
$this->data[$args['account_id']][$args['app'].'.'.$args['name']] = 
$this->db->f('pref_value');
+                       if (!$rs->EOF)
+                       {
+                               
$this->data[$args['account_id']][$args['app'].'.'.$args['name']] = 
$GLOBALS['phpgw']->db->f('pref_value');
                        }
                        return 
$this->data[$args['account_id']][$args['app'].'.'.$args['name']];
                }
@@ -151,24 +177,30 @@
                {
                        $args = new safe_args();
                        $args->set('account_id', $this->account_id, 'any');
-                       $args->set('app', '##NOTSET##', 'any');
-                       $args = $args->get(func_get_args(),__LINE__,__FILE__);
+                       $args->set('app', NOTSET, 'any');
+                       $args = $args->get(func_get_args());
                        if(!isset($args['app']) || empty($args['app']) || 
$args['app'] == 'api')
                        {
                                $args['app'] = 'api';
-                               $this->loaded_api = True;
+                               $this->loaded_api = true;
                        }
 
                        //if($this->account_id == $args['account_id'])
                        //{
-                               $sql = "SELECT * FROM phpgw_prefs WHERE 
pref_app = '".$args['app']."' and pref_account 
in('".$args['account_id']."','phpgw_default','phpgw_forced')";
-                               $dbh = 
$GLOBALS['phpgw']->db->execute($sql,__LINE__,__FILE__);
+                               $sql = 'SELECT * FROM phpgw_prefs'
+                                        . ' WHERE pref_app = 
'.$GLOBALS['phpgw']->db->qstr($args['app'])
+                                        . ' AND pref_account 
IN('.$GLOBALS['phpgw']->db->qstr($args['account_id']).',\'phpgw_default\',\'phpgw_forced\')';
+                               if(!is_object($rs = 
$GLOBALS['phpgw']->db->Execute($sql)))
+                               {
+                                       return false;
+                               }
                        //}
                        
-                       while ($rs = $dbh->fetchnextobject(False))
+                       while ($row = $rs->FetchRow())
                        {
-                               $this->data[$rs->pref_account][$rs->pref_app . 
'.' . $rs->pref_name] = $rs->pref_value;
+                               
$this->data[$row['pref_account']][$row['pref_app'].'.'.$row['pref_account']] = 
$row['pref_value'];
                        }
+                       return true;
                }
 
                function merge_prefs()
@@ -179,11 +211,11 @@
                function fill_phpgw_data()
                {
                        $args = new safe_args();
-                       $args->set('app', '##NOTSET##', 'any');
-                       $args = $args->get(func_get_args(),__LINE__,__FILE__);
+                       $args->set('app', NOTSET, 'any');
+                       $args = $args->get(func_get_args());
                        if(!isset($args['app']))
                        {
-                               list($args['app']) = 
explode('.',$GLOBALS['phpgw_data']['api']['op']);
+                               list($args['app']) = 
explode('.',$GLOBALS['phpgw_data']['api']['op'],2);
                        }
                        
                        if(!$this->loaded_api)
@@ -193,5 +225,4 @@
                        $this->load(array('app'=>$args['app']));
                        $GLOBALS['phpgw_data']['prefs'] = $this->merge_prefs();
                }
-
        }