Changeset 5133 for trunk/expressoAdmin1_2/inc/class.uimaillists.inc.php

Timestamp:

11/03/11 13:24:14 (12 years ago)

Author:

wmerlotto

Message:

Ticket #2305 - Enviando alteracoes, desenvolvidas internamente na Prognus, do modulo ExpressoAdmin.

File:

• trunk/expressoAdmin1_2/inc/class.uimaillists.inc.php (modified) (7 diffs)

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

@@ -39 +39 @@
                         }
                         $GLOBALS['phpgw']->js->validate_file('jscode','connector','expressoAdmin1_2');#diretorio, arquivo.js, aplicacao
+                        $GLOBALS['phpgw']->js->validate_file('jscode','finder','expressoAdmin1_2');
                         $GLOBALS['phpgw']->js->validate_file('jscode','expressoadmin','expressoAdmin1_2');
                         $GLOBALS['phpgw']->js->validate_file('jscode','maillists','expressoAdmin1_2');
@@ -166 +167 @@
                 function add_maillists()
                 {
-                        if($this->current_config['users_auto_search'] == "true"){
                                 $GLOBALS['phpgw']->js->set_onload('get_available_users(document.forms[0].org_context.value, document.forms[0].ea_check_allUsers.checked);');
-                        }
+
                         $manager_lid = $GLOBALS['phpgw']->accounts->data['account_lid'];
                         $manager_acl = $this->functions->read_acl($manager_lid);
@@ -206 +206 @@
                                 'combo_manager_org'                     => $combo_manager_org,
                                 'combo_all_orgs'                        => $combo_all_orgs,
-                                'defaultDomain'                         => $this->current_config['expressoAdmin_defaultDomain'],
-                                'autosearch'                            => ($this->current_config['users_auto_search'] == "") ? 0:$this->current_config['users_auto_search'],
-                                'minNum'                                        => ($this->current_config['min_num_characters'] == "") ? 0:$this->current_config['min_num_characters']
+                                'defaultDomain'                         => $this->current_config['expressoAdmin_defaultDomain']
                         );
                         $p->set_var($var);
@@ -263 +261 @@
                                         if ($array_users_type[$mail] == 'u')
                                         {
-                                                $users .= "<option value=" . $mail . ">" . $cn .  " [" . $array_users_uid[$mail] . "]</option>";
+                                                $users .= "<option value=" . $mail . ">" . utf8_decode($cn) .  " (" . $array_users_uid[$mail] . ")</option>";
                                         }
                                         elseif ($array_users_type[$mail] == 'l')
                                         {
-                                                $lists .= "<option value=" . $mail . ">" . $cn .  " [" . $array_users_uid[$mail] . "]</option>";
+                                                $lists .= "<option value=" . $mail . ">" . utf8_decode($cn) .  " (" . $array_users_uid[$mail] . ")</option>";
                                         }
                                         else
                                         {
-                                                $mail_not_found .= "<option value=" . $mail . ">" . $cn .  " [" . $array_users_uid[$mail] . "]</option>";
+                                                $mail_not_found .= "<option value=" . $mail . ">" . utf8_decode($cn) .  " (" . $array_users_uid[$mail] . ")</option>";
                                         }
                                 }
@@ -307 +305 @@
                                 'phpgwAccountVisible_checked'   => $maillist_info['phpgwAccountVisible'] == '-1' ? 'CHECKED' : '',
                                 'ea_select_usersInMaillist'             => $ea_select_usersInMaillist,
-                                'defaultDomain'                                 => $this->current_config['expressoAdmin_defaultDomain'],
-                                'autosearch'                            => $this->current_config['users_auto_search'],
-                                'minNum'                                        => ($this->current_config['min_num_characters'] == "") ? 0:$this->current_config['min_num_characters']
+                                'defaultDomain'                                 => $this->current_config['expressoAdmin_defaultDomain']
                         );
                         $p->set_var($var);
@@ -345 +341 @@
 
                         // Pega combo das organizações e seleciona a org da lista.                      
-                        $sectors = $this->functions->get_organizations($GLOBALS['phpgw_info']['server']['ldap_context']);
+                        // $org = $this->functions->get_organizations($manager_context, trim(strtolower($maillist_info['context'])));
+                        foreach ($manager_contexts as $index=>$context)
+                                $sectors .= $this->functions->get_organizations($context, trim(strtolower($maillist_info['context'])) );
 
                         // Usuarios de senders.
@@ -376 +374 @@
                                 'accountRestrictive_checked'    => $maillist_info['accountRestrictive'] == 'mailListRestriction' ? 'CHECKED' : '',
                                 'participantCanSendMail_checked'=> $maillist_info['participantCanSendMail'] == 'TRUE' ? 'CHECKED' : '',
-                                'ea_select_users_SCL_Maillist'  => $ea_select_users_SCL_Maillist,
-                                'autosearch'                            => $this->current_config['users_auto_search'],
-                                'minNum'                                        => ($this->current_config['min_num_characters'] == "") ? 0:$this->current_config['min_num_characters']
+                                'ea_select_users_SCL_Maillist'  => $ea_select_users_SCL_Maillist
                         );
                         $p->set_var($var);