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

Timestamp:

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

Author:

niltonneto

Message:

 

File:

• trunk/expressoAdmin1_2/inc/class.user.inc.php (modified) (2 diffs)

trunk/expressoAdmin1_2/inc/class.user.inc.php

@@ -469 +469 @@
                         // ADD or REMOVE some attributes
                         ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+
+                        ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+                        // PHOTO
+                        if ($this->functions->check_acl($_SESSION['phpgw_session']['session_lid'], 'edit_users_picture'))
+                        {
+                                if ($new_values['delete_photo'])
+                                {
+                                        $this->ldap_functions->ldap_remove_photo($dn);
+                                        $this->db_functions->write_log("removido jpegphoto do usuario",'',$dn,'','');
+                                }
+                                elseif ($_FILES['photo']['name'] != '')
+                                {
+                                        if ($new_values['photo_exist'])
+                                        {
+                                                $photo_exist = true;
+                                                $this->db_functions->write_log("substituido jpegphoto do usuario",'',$dn,'','');
+                                        }
+                                        else
+                                        {
+                                                $photo_exist = false;
+                                                $this->db_functions->write_log("adicionado jpegphoto ao usuario",'',$dn,'','');
+                                        }
+                                        $this->ldap_functions->ldap_save_photo($dn, $_FILES['photo']['tmp_name'], $new_values['photo_exist'], $photo_exist);
+                                }       
+                        }
                         
                         // Verifica o acesso ára adicionar ou remover tais atributos
@@ -532 +557 @@
                                         $ldap_remove['phpgwaccountvisible'] = array();
                                         $this->db_functions->write_log("removido phpgwaccountvisible ao usuario",'',$dn,'','');
-                                }
-                                ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-                                // PHOTO
-                                if ( ($new_values['delete_photo']) && ($this->functions->check_acl($_SESSION['phpgw_session']['session_lid'], 'edit_users_picture')) )
-                                {
-                                        $this->ldap_functions->ldap_remove_photo($dn);
-                                        $this->db_functions->write_log("removido jpegphoto do usuario",'',$dn,'','');
-                                }
-                                elseif ( ($_FILES['photo']['name'] != '') && ($this->functions->check_acl($_SESSION['phpgw_session']['session_lid'], 'edit_users_picture')) )
-                                {
-                                        if ($new_values['photo_exist'])
-                                                $photo_exist = true;
-                                        else
-                                                $photo_exist = false;
-                                        $this->ldap_functions->ldap_save_photo($dn, $_FILES['photo']['tmp_name'], $new_values['photo_exist'], $photo_exist);
-                                        $this->db_functions->write_log("adicionado jpegphoto ao usuario",'',$dn,'','');
                                 }
                                 ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////