Changeset 108

Timestamp:

11/12/07 07:17:50 (16 years ago)

Author:

niltonneto

Message:

* empty log message *

Location:

trunk

Files:

• expressoAdmin1_2/templates/default/accounts_form.tpl (modified) (1 diff)
• expressoAdmin1_2/templates/default/managers_form.tpl (modified) (1 diff)
• expressoMail1_2/inc/class.ldap_functions.inc.php (modified) (7 diffs)
• expressoMail1_2/setup/phpgw_pt-br.lang (modified) (previous)

trunk/expressoAdmin1_2/templates/default/accounts_form.tpl

@@ -88 +88 @@
                         <td width="35%"><input type="text" name="telephonenumber" id="telephonenumber" value="{telephonenumber}" autocomplete="off" {disabled} size=20 onkeyUp="FormataValor(event, this);"></input>&nbsp;</td>
                         <td>&nbsp;</td>
-                        <td rowspan="4" width="35%">
+                        <td rowspan="4" width="35%" style="display:{display_picture}">
                                 <img align="center" src="{photo_bin}" id="ea_img_photo" border="0">
                                 <input type="file" id="ea_input_photo" name="photo" {disabled} size=20><br>

trunk/expressoAdmin1_2/templates/default/managers_form.tpl

@@ -84 +84 @@
                                                         <td><input type="checkbox" name="acl_manipulate_corporative_information" value="268435456" {acl_manipulate_corporative_information}></td>
                                                 </tr>
-                                                <tr bgcolor="{color_font1}" align='right'>
+                                                <tr bgcolor="{color_font2}" align='right'>
                                                         <td>{lang_view_user}:</td>
                                                         <td><input type="checkbox" name="acl_view_users" value="33554432" {acl_view_users}></td>
+                                                </tr>
+                                                <tr bgcolor="{color_font1}" align='right'>
+                                                        <td>{lang_edit_users_picture}:</td>
+                                                        <td><input type="checkbox" name="acl_edit_users_picture" value="536870912" {acl_edit_users_picture}></td>
                                                 </tr>
                                                 <tr bgcolor="{color_font2}" align='right'>

trunk/expressoMail1_2/inc/class.ldap_functions.inc.php

@@ -8 +8 @@
         var $imap;
         
+        // usa o host e context do contact center.
         function ldapConnect($refer = false){
                 $this->ldap_host        = $_SESSION['phpgw_info']['expressomail']['ldap_server']['host'];
@@ -17 +18 @@
         }
 
+        // usa o host e context do setup.
         function ldapRootConnect($refer = false){
                 $this->ldap_host        = $_SESSION['phpgw_info']['expressomail']['server']['ldap_host'];
@@ -31 +33 @@
                 include_once("class.functions.inc.php");
                 $functions = new functions;                                             
-                
+
                 $search_for     = $params['search_for'];
                 $field          = $params['field'];
@@ -42 +44 @@
                 // follow the referral
                 $this->ldapConnect(true);
+                
                 if ($this->ds)
                 {
@@ -60 +63 @@
                         if ($count_entries > 200)
                         {
+                                // Close old ldap conection
+                                ldap_close($this->ds);
+                                
+                                // Reopen a local ldap connection, following referral
+                                $this->ldapRootConnect(true);
+                                
                                 $user_dn = $_SESSION['phpgw_info']['expressomail']['user']['account_dn'];
                                 $user_sector_dn = ldap_explode_dn ( $user_dn, false );
@@ -68 +77 @@
                                 // New search only on user sector
                                 $sr=ldap_search($this->ds, $user_sector_dn, $filter, $justthese);
-                        $count_entries = ldap_count_entries($this->ds,$sr);
-                        if ($count_entries > 200){
-                                $return = array();
-                                $return['status'] = false;
-                                $return['error'] = "many results";
-                                return $return;
-                        }
+                                $count_entries = ldap_count_entries($this->ds,$sr);
+                                
+                                if ($count_entries > 200){
+                                        $return = array();
+                                        $return['status'] = false;
+                                        $return['error'] = "many results";
+                                        return $return;
+                                }
                                 else
                                 {
@@ -158 +168 @@
                                                 '</tr>';
                                         $contacts_result = $head_option . $contacts_result;
-                        }
-                }
+                                }
+                        }
                 }
                 ldap_close($this->ds);