Index: /trunk/expressoAdmin1_2/inc/class.uigroups.inc.php =================================================================== --- /trunk/expressoAdmin1_2/inc/class.uigroups.inc.php (revision 64) +++ /trunk/expressoAdmin1_2/inc/class.uigroups.inc.php (revision 73) @@ -234,4 +234,6 @@ 'lang_back' => lang('Back'), 'lang_save' => lang('save'), + 'lang_group_organization' => lang('Group Organization'), + 'lang_search_organization' => lang('Search Organiztion'), 'lang_org' => lang('Organizations'), 'lang_group_name' => lang('group name'), @@ -318,5 +320,5 @@ $opt_tmp_users = ''."\n"; - $opt_tmp_unknow = ''."\n"; + $opt_tmp_unknow = ''."\n"; $ea_select_usersInGroup = $unknow != '' ? $opt_tmp_unknow . $unknow . $opt_tmp_users . $users : $opt_tmp_users . $users; } @@ -350,4 +352,6 @@ 'lang_back' => lang('Back'), 'lang_save' => lang('save'), + 'lang_group_organization' => lang('Group Organization'), + 'lang_search_organization' => lang('Search Organiztion'), 'lang_org' => lang('Organizations'), 'lang_group_name' => lang('group name'), Index: /trunk/expressoAdmin1_2/inc/class.uicomputers.inc.php =================================================================== --- /trunk/expressoAdmin1_2/inc/class.uicomputers.inc.php (revision 64) +++ /trunk/expressoAdmin1_2/inc/class.uicomputers.inc.php (revision 73) @@ -40,4 +40,10 @@ $c->read_repository(); $this->current_config = $c->config_data; + + if(!@is_object($GLOBALS['phpgw']->js)) + { + $GLOBALS['phpgw']->js = CreateObject('phpgwapi.javascript'); + } + $GLOBALS['phpgw']->js->validate_file('jscode','computers','expressoAdmin1_2');#diretorio, arquivo.js, aplicacao } @@ -220,4 +226,6 @@ 'lang_back' => lang('Back'), 'lang_save' => lang('save'), + 'lang_search_organization' => lang('Search Organiztion'), + 'lang_organizations' => lang('Organizations'), 'lang_sectors' => lang('Sectors'), 'lang_sambadomain' => lang('Domain'), @@ -358,4 +366,84 @@ 'old_computer_context' => $computer_data['context'], 'old_sambasid' => $computer_data['sambasid'], + + 'row_on' => "#DDDDDD", + 'row_off' => "#EEEEEE", + 'color_bg1' => "#E8F0F0", + 'lang_back' => lang('Back'), + 'lang_save' => lang('save'), + 'lang_search_organization' => lang('Search Organiztion'), + 'lang_organizations' => lang('Organizations'), + 'lang_sectors' => lang('Sectors'), + 'lang_sambadomain' => lang('Domain'), + 'lang_computer_cn' => lang('Computer UID'), + 'lang_computer_description' => lang('Description'), + 'lang_computer_type' => lang('Computer Type'), + 'lang_active_workstation' => lang('WorkStation Active'), + 'lang_desactive_workstation' => lang('WorkStation Desactive'), + 'lang_trust_account' => lang('Trust Account'), + 'lang_server' => lang('Server'), + 'lang_computer_password' => lang('Computer password'), + + 'display_tr_computer_password' => $computer_data['sambaAcctFlags'] == '[I ]' ? '' : 'display:none', + + 'computer_cn' => $computer_data['computer_cn'], + 'computer_dn' => $computer_data['dn'], + 'computer_description' => $computer_data['computer_description'], + 'combo_sectors' => $sectors, + 'sambadomainname_options' => $sambadomainname_options, + + // LINKS + 'back_url' => $GLOBALS['phpgw']->link('/index.php','menuaction=expressoAdmin1_2.uicomputers.list_computers'), + 'form_action' => $GLOBALS['phpgw']->link('/index.php','menuaction=expressoAdmin1_2.uicomputers.validade_computers_data_edit') + ); + $p->set_var($var); + + if ($computer_data['sambaAcctFlags'] != '') + { + switch($computer_data['sambaAcctFlags']) + { + case '[W ]': + $p->set_var('active_workstation_selected', 'selected'); + break; + case '[DW ]': + $p->set_var('desactive_workstation_selected', 'selected'); + break; + case '[I ]': + $p->set_var('trust_account_selected', 'selected'); + break; + case '[S ]': + $p->set_var('server_selected', 'selected'); + break; + } + } + } + else // DEMAIS VEZES + { + // Pega combo das organizações e seleciona um dos setores em caso de um erro na validaçao dos dados. + foreach ($manager_contexts as $index=>$context) + $sectors .= $this->functions->get_organizations($context, trim(strtolower($_POST['sector_context']))); + //$sectors = $this->functions->get_organizations($manager_contexts); + + // Cria combo de dominios do samba + if ($this->current_config['expressoAdmin_samba_support'] == 'true') + { + $a_sambadomains = $this->db_functions->get_sambadomains_list(); + $sambadomainname_options = ''; + if (count($a_sambadomains)) + { + foreach ($a_sambadomains as $a_sambadomain) + { + if ($a_sambadomain['samba_domain_sid'] == $_POST['sambasid']) + $sambadomainname_options .= ""; + else + $sambadomainname_options .= ""; + } + } + } + + $var = Array( + // LINKS + 'back_url' => $GLOBALS['phpgw']->link('/index.php','menuaction=expressoAdmin1_2.uicomputers.list_computers'), + 'form_action' => $GLOBALS['phpgw']->link('/index.php','menuaction=expressoAdmin1_2.uicomputers.validade_computers_data_edit'), 'row_on' => "#DDDDDD", @@ -374,82 +462,4 @@ 'lang_server' => lang('Server'), 'lang_computer_password' => lang('Computer password'), - - 'display_tr_computer_password' => $computer_data['sambaAcctFlags'] == '[I ]' ? '' : 'display:none', - - 'computer_cn' => $computer_data['computer_cn'], - 'computer_dn' => $computer_data['dn'], - 'computer_description' => $computer_data['computer_description'], - 'combo_sectors' => $sectors, - 'sambadomainname_options' => $sambadomainname_options, - - // LINKS - 'back_url' => $GLOBALS['phpgw']->link('/index.php','menuaction=expressoAdmin1_2.uicomputers.list_computers'), - 'form_action' => $GLOBALS['phpgw']->link('/index.php','menuaction=expressoAdmin1_2.uicomputers.validade_computers_data_edit') - ); - $p->set_var($var); - - if ($computer_data['sambaAcctFlags'] != '') - { - switch($computer_data['sambaAcctFlags']) - { - case '[W ]': - $p->set_var('active_workstation_selected', 'selected'); - break; - case '[DW ]': - $p->set_var('desactive_workstation_selected', 'selected'); - break; - case '[I ]': - $p->set_var('trust_account_selected', 'selected'); - break; - case '[S ]': - $p->set_var('server_selected', 'selected'); - break; - } - } - } - else // DEMAIS VEZES - { - // Pega combo das organizações e seleciona um dos setores em caso de um erro na validaçao dos dados. - foreach ($manager_contexts as $index=>$context) - $sectors .= $this->functions->get_organizations($context, trim(strtolower($_POST['sector_context']))); - //$sectors = $this->functions->get_organizations($manager_contexts); - - // Cria combo de dominios do samba - if ($this->current_config['expressoAdmin_samba_support'] == 'true') - { - $a_sambadomains = $this->db_functions->get_sambadomains_list(); - $sambadomainname_options = ''; - if (count($a_sambadomains)) - { - foreach ($a_sambadomains as $a_sambadomain) - { - if ($a_sambadomain['samba_domain_sid'] == $_POST['sambasid']) - $sambadomainname_options .= ""; - else - $sambadomainname_options .= ""; - } - } - } - - $var = Array( - // LINKS - 'back_url' => $GLOBALS['phpgw']->link('/index.php','menuaction=expressoAdmin1_2.uicomputers.list_computers'), - 'form_action' => $GLOBALS['phpgw']->link('/index.php','menuaction=expressoAdmin1_2.uicomputers.validade_computers_data_edit'), - - 'row_on' => "#DDDDDD", - 'row_off' => "#EEEEEE", - 'color_bg1' => "#E8F0F0", - 'lang_back' => lang('Back'), - 'lang_save' => lang('save'), - 'lang_sectors' => lang('Sectors'), - 'lang_sambadomain' => lang('Domain'), - 'lang_computer_cn' => lang('Computer UID'), - 'lang_computer_description' => lang('Description'), - 'lang_computer_type' => lang('Computer Type'), - 'lang_active_workstation' => lang('WorkStation Active'), - 'lang_desactive_workstation' => lang('WorkStation Desactive'), - 'lang_trust_account' => lang('Trust Account'), - 'lang_server' => lang('Server'), - 'lang_computer_password' => lang('Computer password'), // Retorna os valores, quando da um erro na validação. Index: /trunk/expressoAdmin1_2/inc/class.uimaillists.inc.php =================================================================== --- /trunk/expressoAdmin1_2/inc/class.uimaillists.inc.php (revision 64) +++ /trunk/expressoAdmin1_2/inc/class.uimaillists.inc.php (revision 73) @@ -201,4 +201,6 @@ 'lang_back' => lang('Back'), 'lang_save' => lang('save'), + 'lang_maillist_organization'=> lang('Maillist Organization'), + 'lang_search_organization' => lang('Search Organiztion'), 'lang_org' => lang('Organizations'), 'lang_maillist_uid' => lang('Maillist login'), @@ -248,4 +250,5 @@ // Usuarios da lista. + $user_count = 0; if (count($maillist_info['members_info']) > 0) { @@ -259,4 +262,5 @@ foreach ($array_users as $uidnumber=>$cn) { + $user_count++; if ($array_users_type[$uidnumber] == 'u') { @@ -295,4 +299,6 @@ 'lang_back' => lang('Back'), 'lang_save' => lang('save'), + 'lang_maillist_organization'=> lang('Maillist Organization'), + 'lang_search_organization' => lang('Search Organiztion'), 'lang_org' => lang('Organizations'), 'lang_maillist_uid' => lang('Maillist login'), @@ -309,4 +315,5 @@ 'mail' => $maillist_info['mail'], 'cn' => $maillist_info['cn'], + 'user_count' => $user_count, 'accountStatus_checked' => $maillist_info['accountStatus'] == 'active' ? 'CHECKED' : '', 'phpgwAccountVisible_checked' => $maillist_info['phpgwAccountVisible'] == '-1' ? 'CHECKED' : '', Index: /trunk/expressoAdmin1_2/js/jscode/groups.js =================================================================== --- /trunk/expressoAdmin1_2/js/jscode/groups.js (revision 47) +++ /trunk/expressoAdmin1_2/js/jscode/groups.js (revision 73) @@ -367,2 +367,17 @@ } } + +function search_organization(key) +{ + var organizations = document.getElementById('ea_combo_org_info'); + var RegExp_org = new RegExp("\\b"+key, "i"); + + for(i = 0; i < organizations.length; i++) + { + if (RegExp_org.test(organizations[i].text)) + { + organizations[i].selected = true; + return; + } + } +} Index: /trunk/expressoAdmin1_2/js/jscode/computers.js =================================================================== --- /trunk/expressoAdmin1_2/js/jscode/computers.js (revision 73) +++ /trunk/expressoAdmin1_2/js/jscode/computers.js (revision 73) @@ -0,0 +1,14 @@ +function search_organization(key) +{ + var organizations = document.getElementById('ea_combo_org_info'); + var RegExp_org = new RegExp("\\b"+key, "i"); + + for(i = 0; i < organizations.length; i++) + { + if (RegExp_org.test(organizations[i].text)) + { + organizations[i].selected = true; + return; + } + } +} Index: /trunk/expressoAdmin1_2/js/jscode/maillists.js =================================================================== --- /trunk/expressoAdmin1_2/js/jscode/maillists.js (revision 23) +++ /trunk/expressoAdmin1_2/js/jscode/maillists.js (revision 73) @@ -366,2 +366,17 @@ } } + +function search_organization(key) +{ + var organizations = document.getElementById('ea_combo_org_info'); + var RegExp_org = new RegExp("\\b"+key, "i"); + + for(i = 0; i < organizations.length; i++) + { + if (RegExp_org.test(organizations[i].text)) + { + organizations[i].selected = true; + return; + } + } +} Index: /trunk/expressoAdmin1_2/templates/default/maillists_form.tpl =================================================================== --- /trunk/expressoAdmin1_2/templates/default/maillists_form.tpl (revision 23) +++ /trunk/expressoAdmin1_2/templates/default/maillists_form.tpl (revision 73) @@ -22,6 +22,9 @@
{lang_search_organization}: | ++ |
- {lang_sectors}: + {lang_organizations}: | - |