Changeset 180 for trunk/expressoAdmin1_2/inc/class.uiaccounts.inc.php

Timestamp:

02/26/08 17:04:07 (16 years ago)

Author:

niltonneto

Message:

 

File:

• trunk/expressoAdmin1_2/inc/class.uiaccounts.inc.php (modified) (4 diffs)

trunk/expressoAdmin1_2/inc/class.uiaccounts.inc.php

@@ -281 +281 @@
                                 'photo_bin'                                             => $GLOBALS['phpgw_info']['server']['webserver_url'].'/expressoAdmin1_2/templates/default/images/photo_celepar.png',
                                 'display_picture'                               => $this->functions->check_acl($manager_lid,'edit_users_picture') ? '' : 'none', 
-                                'disabled_delete_photo'                 => 'disabled',
                                 'display_tr_default_password'   => 'none',
                                 'minimumSizeLogin'                              => $this->current_config['expressoAdmin_minimumSizeLogin'],
@@ -363 +362 @@
                         $disabled_password = 'disabled';
                         $disabled_samba = 'disabled';
+                        $disabled_edit_photo = 'disabled';
+                        $display_picture = 'none';
                         if ((!$this->functions->check_acl($manager_account_lid,'edit_users')) &&
                                 (!$this->functions->check_acl($manager_account_lid,'change_users_password')) &&
@@ -402 +403 @@
                                 $disabled_quote = 'readonly';
                         
+                        if ($this->functions->check_acl($manager_account_lid,'edit_users_picture'))
+                        {
+                                $disabled_edit_photo = '';
+                                $display_picture = '';
+                        }
                         // GET all infomations about the user.
                         $user_info = $this->user->get_user_info($_GET['account_id']);
@@ -625 +631 @@
                                 'telephonenumber'                               => $user_info['telephonenumber'],
                                 'photo_bin'                                             => $photo_bin,
-                                'disabled_delete_photo'                 => $disabled_delete_photo,
-                                'display_picture'                               => $this->functions->check_acl($manager_account_lid,'edit_users_picture') ? '' : 'none',
+                                'disabled_edit_photo'                   => $disabled_edit_photo,
+                                //'display_picture'                             => $this->functions->check_acl($manager_account_lid,'edit_users_picture') ? '' : 'none',
+                                'display_picture'                               => $display_picture,
                                 
                                 'display_tr_default_password'   => $this->functions->check_acl($manager_account_lid,'set_user_default_password') ? '' : 'none',