[Phpgroupware-cvs] property/class.uiadmin.php, 1.1.1.12

[nomail]

Update of /property
Modified Files:
        Branch: 
          class.uiadmin.php

date: 2004/04/30 17:35:57;  author: sigurdne;  state: Exp;  lines: +18 -17

Log Message:
no message
=====================================================================
Index: property/class.uiadmin.php
diff -u property/class.uiadmin.php:1.1.1.11 property/class.uiadmin.php:1.1.1.12
--- property/class.uiadmin.php:1.1.1.11 Thu Apr 29 19:56:34 2004
+++ property/class.uiadmin.php  Fri Apr 30 17:35:57 2004
@@ -231,7 +231,7 @@
                                'links'                                         
        => $links,
                                'allow_allrows'                                 
=> false,
                                'start_record'                                  
=> $this->start,
-                               'record_limit'                                  
=> 15, //$GLOBALS['phpgw_info']['user']['preferences']['common']['maxmatchs'],
+                               'record_limit'                                  
=> 15, //$GLOBALS['phpgw_data']['user']['preferences']['common']['maxmatchs'],
                                'num_records'                                   
=> count($user_list)+count($group_list),
                                'all_records'                                   
=> $this->bo->total_records,
                                'link_url'                                      
        => 
$this->bocommon->link('/index.php','sid=cookie&op='.$this->currentapp.'.uiadmin.aclprefs'),
@@ -260,7 +260,7 @@
                                'select_name_location'                  => 
'module',
                                'location_list'                                 
=> $this->bo->select_location('filter',$this->location,True),
 
-                               'is_admin'                                      
        => 
$this->acl2->check('.'.$this->currentapp,32),//$GLOBALS['phpgw_info']['user']['apps']['admin'],
+                               'is_admin'                                      
        => 
$this->acl2->check('.'.$this->currentapp,32),//$GLOBALS['phpgw_data']['user']['apps']['admin'],
                                'lang_group_statustext'                 => 
lang('Select the granting group. To do not use a granting group select NO 
GRANTING GROUP'),
                                'select_group_name'                             
=> 'granting_group',
                                'lang_no_group'                                 
=> lang('No granting group'),
@@ -486,7 +486,7 @@
                                'links'                                         
        => $links,
                                'allow_allrows'                                 
=> false,
                                'start_record'                                  
=> $this->start,
-                               'record_limit'                                  
=> 15, //$GLOBALS['phpgw_info']['user']['preferences']['common']['maxmatchs'],
+                               'record_limit'                                  
=> 15, //$GLOBALS['phpgw_data']['user']['preferences']['common']['maxmatchs'],
                                'num_records'                                   
=> count($user_list),
                                'all_records'                                   
=> $this->bo->total_records,
                                'link_url'                                      
        => 
$this->bocommon->link('/index.php','sid=cookie&op='.$this->currentapp.'.uiadmin.list_acl2'),
@@ -596,30 +596,31 @@
 
                        if ($values['save'])
                        {
-                               
$GLOBALS['phpgw']->preferences->account_id=$this->filter;
-                               
$GLOBALS['phpgw']->preferences->read_repository();
-
                                if ($values['old_email'] != $values['email'])
                                {
-                                       
$GLOBALS['phpgw']->preferences->add($this->currentapp,"email",$values['email'],'user');
+                                       
$GLOBALS['phpgw']->prefs->set($this->currentapp . 
'.email',(string)$values['email'],$this->filter);
                                        $receipt['message'][] = array('msg' => 
lang('Users email is updated'));
                                }
                                if ($values['old_phone'] != $values['phone'])
                                {
-                                       
$GLOBALS['phpgw']->preferences->add($this->currentapp,"cellphone",$values['phone'],'user');
+                                       
$GLOBALS['phpgw']->prefs->set($this->currentapp . 
'.cellphone',(string)$values['phone'],$this->filter);
                                        $receipt['message'][] = array('msg' => 
lang('Users phone is updated'));
                                }
                                if ($values['old_approval_from'] != 
$values['approval_from'])
                                {
-                                       
$GLOBALS['phpgw']->preferences->add($this->currentapp,"approval_from",$values['approval_from'],'user');
+                                       
$GLOBALS['phpgw']->prefs->set($this->currentapp . 
'.approval_from',(string)$values['approval_from'],$this->filter);
                                        $receipt['message'][] = array('msg' => 
lang('Approval from is updated'));
                                }
-                               
$GLOBALS['phpgw']->preferences->save_repository();
                        }
 
                        if($this->filter)
                        {
-                               $prefs = 
$this->bocommon->create_preferences($this->currentapp,$this->filter);
+                               $value_old_email                = 
$GLOBALS['phpgw']->prefs->get('email',$this->filter,$this->currentapp);
+                               $value_email                    = 
$GLOBALS['phpgw']->prefs->get('email',$this->filter,$this->currentapp);
+                               $value_old_phone                = 
$GLOBALS['phpgw']->prefs->get('cellphone',$this->filter,$this->currentapp);
+                               $value_phone                    = 
$GLOBALS['phpgw']->prefs->get('cellphone',$this->filter,$this->currentapp);
+                               $value_old_approval_from = 
$GLOBALS['phpgw']->prefs->get('approval_from',$this->filter,$this->currentapp);
+
                        }
 
                        $msgbox_data = $this->bocommon->msgbox_data($receipt);
@@ -639,16 +640,16 @@
 
                                'lang_user'                             => 
lang('User'),
                                'lang_email'                    => 
lang('Email'),
-                               'value_old_email'               => 
$prefs['email'],
-                               'value_email'                   => 
$prefs['email'],
+                               'value_old_email'               => 
$value_old_email,
+                               'value_email'                   => $value_email,
 
                                'lang_phone'                    => 
lang('Phone'),
-                               'value_old_phone'               => 
$prefs['cellphone'],
-                               'value_phone'                   => 
$prefs['cellphone'],
+                               'value_old_phone'               => 
$value_old_phone,
+                               'value_phone'                   => $value_phone,
 
                                'lang_approval_from'            => 
lang('Approval from'),
-                               'value_old_approval_from'       => 
$prefs['approval_from'],
-                               'approval_from'                         => 
$this->bocommon->get_user_list('select',$prefs['approval_from']),
+                               'value_old_approval_from'       => 
$value_old_approval_from,
+                               'approval_from'                         => 
$this->bocommon->get_user_list('select',$value_old_approval_from),
                                'select_user_name'                      => 
'approval_from',
                                'lang_approval_from_statustext' => lang('Select 
the users supervisor'),