Changeset 422 for trunk/expressoAdmin1_2/inc

Timestamp:

09/12/08 16:53:08 (16 years ago)

Author:

niltonneto

Message:

Alterações feitas por João Alfredo.
Email: jakjr@…

Location:

trunk/expressoAdmin1_2/inc

Files:

• class.ldap_functions.inc.php (modified) (5 diffs)
• class.maillist.inc.php (modified) (2 diffs)
• class.uimaillists.inc.php (modified) (1 diff)

trunk/expressoAdmin1_2/inc/class.ldap_functions.inc.php

@@ -1137 +1137 @@
         function get_maillist_info($uidnumber)
         {
-                
                 /* folling referral connection */
                 $ldap_conn_following_ref = ldap_connect($_SESSION['phpgw_info']['expresso']['cc_ldap_server']['host']);
@@ -1170 +1169 @@
                                 $result['cn']                                   = $entry[0]['cn'][0];
                                 $result['mail']                                 = $entry[0]['mail'][0];
+                                $result['description']                  = utf8_decode($entry[0]['description'][0]);
                                 $result['accountStatus']                = $entry[0]['accountstatus'][0];
                                 $result['phpgwAccountVisible']  = $entry[0]['phpgwaccountvisible'][0];
@@ -1987 +1987 @@
                 $info['uid']                            = $uid;
                 $info['mail']                           = $params['mail'];
+                $info['description']            = utf8_encode($params['description']);
                 
                 if ($params['accountStatus'] == 'on')
@@ -2070 +2071 @@
                 
                 $uid = $params['uid'];
-                $justthese = array("accountStatus", "phpgwAccountVisible", "cn", "mail", "mailForwardingAddress");
-                                
-        $institutional_accounts = ldap_search($this->ldap, $GLOBALS['phpgw_info']['server']['ldap_context'], ("(&(phpgwAccountType=i)(uid=$uid))"), $justthese);
+                //$justthese = array("accountStatus", "phpgwAccountVisible", "cn", "mail", "mailForwardingAddress", "description");
+                                
+        $institutional_accounts = ldap_search($this->ldap, $GLOBALS['phpgw_info']['server']['ldap_context'], ("(&(phpgwAccountType=i)(uid=$uid))"));
         $entrie = ldap_get_entries($this->ldap, $institutional_accounts);
                 
@@ -2092 +2093 @@
                         $return['cn']                                   = $entrie[0]['cn'][0];
                         $return['mail']                                 = $entrie[0]['mail'][0];
+                        $return['description']                  = utf8_decode($entrie[0]['description'][0]);
 
                         if ($entrie[0]['mailforwardingaddress']['count'] > 0)

trunk/expressoAdmin1_2/inc/class.maillist.inc.php

@@ -80 +80 @@
                         $maillist_info['loginShell']                            = '/bin/false';
                         $maillist_info['mail']                                          = $params['mail'];
+                        $maillist_info['description']                           = $params['description'];
                         $maillist_info['objectClass'][0]                        = 'posixAccount';
                         $maillist_info['objectClass'][1]                        = 'inetOrgPerson';
@@ -180 +181 @@
                         }
                         
+                        /* Always replace description */
+                        $ldap_mod_replace['description'] = utf8_encode($new_values['description']);
+                        
                         if (count($ldap_mod_replace))
                         {

trunk/expressoAdmin1_2/inc/class.uimaillists.inc.php

@@ -298 +298 @@
                                 'uid'                                                   => $maillist_info['uid'],
                                 'mail'                                                  => $maillist_info['mail'],
+                                'description'                                   => $maillist_info['description'],
                                 'cn'                                                    => $maillist_info['cn'],
                                 'user_count'                                    => $user_count,