[Phpgroupware-cvs] CVS: property/inc class.boadmin.inc.php,1.6,1.7 class.soadmin.inc.php,1.6,1.7 class.uiadmin.inc.php,1.11,1.12

[Sigurd Nes <address@hidden>]

Update of /cvsroot/phpgroupware/property/inc
In directory subversions:/tmp/cvs-serv32262/inc

Modified Files:
        class.boadmin.inc.php class.soadmin.inc.php 
        class.uiadmin.inc.php 
Log Message:
no message

Index: class.boadmin.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.boadmin.inc.php,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -r1.6 -r1.7
*** class.boadmin.inc.php       23 May 2003 08:40:19 -0000      1.6
--- class.boadmin.inc.php       1 Jul 2003 09:01:50 -0000       1.7
***************
*** 143,149 ****
                }
  
! 
!               function set_permission($values,$r_processed)
                {
                        $r_processed=explode("_",$r_processed);
  
--- 143,150 ----
                }
  
!               function set_permission($values,$r_processed,$initials)
                {
+                       $this->so->set_initials($initials);
+ 
                        $r_processed=explode("_",$r_processed);
  
***************
*** 223,231 ****
                                while (list($null,$account) = each($allusers))
                                {
!                                       $user_list[$j]['counter'] = $j;
!                                       $user_list[$j]['account_id'] = 
$account['account_id'];
!                                       $user_list[$j]['account_lid'] = 
$account['account_lid'];
                                        $user_list[$j]['account_firstname'] = 
$account['account_firstname'];
!                                       $user_list[$j]['account_lastname'] = 
$account['account_lastname'];
  
                                        for ($i=0;$i<count($right);$i++)
--- 224,234 ----
                                while (list($null,$account) = each($allusers))
                                {
! //                                    $user_list[$j]['counter']               
        = $j;
!                                       $user_list[$j]['type']                  
        = 'accounts';
!                                       $user_list[$j]['account_id']            
= $account['account_id'];
!                                       $user_list[$j]['account_lid']           
= $account['account_lid'];
                                        $user_list[$j]['account_firstname'] = 
$account['account_firstname'];
!                                       $user_list[$j]['account_lastname']      
= $account['account_lastname'];
!                                       $user_list[$j]['initials']              
        = $this->so->get_initials($account['account_id']);
  
                                        for ($i=0;$i<count($right);$i++)
***************
*** 240,243 ****
--- 243,248 ----
                                }
                        }
+ 
+ //_debug_array($user_list);
  
  //    echo 'rights_cache:<pre>'; print_r($this->acl2->rights_cache); echo 
'</pre>';

Index: class.soadmin.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.soadmin.inc.php,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -r1.6 -r1.7
*** class.soadmin.inc.php       29 Jun 2003 10:12:52 -0000      1.6
--- class.soadmin.inc.php       1 Jul 2003 09:01:50 -0000       1.7
***************
*** 24,27 ****
--- 24,50 ----
  
  
+               function get_initials($id)
+               {
+                       $this->db->query("SELECT initials FROM fm_ecouser WHERE 
id=$id ");
+                       $this->db->next_record();
+                       return $this->db->f('initials');
+               }
+ 
+               function set_initials($initials)
+               {
+                       while (is_array($initials) && list($account_id,$value) 
= each($initials))
+                       {
+                               $this->db->query("UPDATE fm_ecouser set 
initials= '$value' WHERE id=$account_id ",__LINE__,__FILE__);
+                               if($value)
+                               {
+                                       if(!$this->get_initials($account_id))
+                                       {
+                                               $account_lid    = 
strtoupper($GLOBALS['phpgw']->accounts->id2name($account_id));
+                                               $this->db->query("INSERT INTO 
fm_ecouser (id,lid,initials) VALUES ($account_id,'$account_lid','$value' 
)",__LINE__,__FILE__);
+                                       }
+                               }
+                       }
+               }
+ 
                function select_location()
                {

Index: class.uiadmin.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.uiadmin.inc.php,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -r1.11 -r1.12
*** class.uiadmin.inc.php       23 May 2003 08:40:19 -0000      1.11
--- class.uiadmin.inc.php       1 Jul 2003 09:01:50 -0000       1.12
***************
*** 71,81 ****
                                                                                
'search_field'));
  
!                       $values         = get_var('values',array('POST'));
                        $r_processed    = get_var('processed',array('POST'));
                        $submit         = get_var('submit',array('POST'));
  
                        if($submit)
                        {
!                               $receipt        = 
$this->bo->set_permission($values,$r_processed);
                        }
  
--- 71,83 ----
                                                                                
'search_field'));
  
!                       $values                 = 
get_var('values',array('POST'));
                        $r_processed    = get_var('processed',array('POST'));
+                       $initials               = 
get_var('initials',array('POST'));
+ 
                        $submit         = get_var('submit',array('POST'));
  
                        if($submit)
                        {
!                               $receipt        = 
$this->bo->set_permission($values,$r_processed,$initials);
                        }
  
***************
*** 100,104 ****
                                                'janitor'                       
        => $user['right'][32],
                                                'supervisor'                    
=> $user['right'][64],
!                                               'budget_responsible'    => 
$user['right'][128]
                                        );
                                }
--- 102,108 ----
                                                'janitor'                       
        => $user['right'][32],
                                                'supervisor'                    
=> $user['right'][64],
!                                               'budget_responsible'    => 
$user['right'][128],
!                                               'initials'                      
        => $user['initials'],
!                                               'type'                          
        => $user['type']
                                        );
                                }
***************
*** 149,153 ****
                                'lang_janitor'                          => 
lang('Janitor'),                             //32
                                'lang_supervisor'                       => 
lang('Supervisor'),                  //64
!                               'lang_budget_responsible'       => lang('Budget 
Responsible')   //128
                        );
  
--- 153,158 ----
                                'lang_janitor'                          => 
lang('Janitor'),                             //32
                                'lang_supervisor'                       => 
lang('Supervisor'),                  //64
!                               'lang_budget_responsible'       => lang('Budget 
Responsible'),  //128
!                               'lang_initials'                         => 
lang('Initials')
                        );