Changeset 1559
- Timestamp:
- 10/29/09 16:42:39 (14 years ago)
- Location:
- trunk/phpgwapi
- Files:
-
- 5 edited
-
setup/phpgw_pt-br.lang (modified) (previous)
-
templates/classic/listUsers.php (modified) (6 diffs)
-
templates/classic/listUsers.tpl (modified) (1 diff)
-
templates/default/listUsers.php (modified) (6 diffs)
-
templates/default/listUsers.tpl (modified) (1 diff)
Legend:
- Unmodified
- Added
- Removed
-
trunk/phpgwapi/templates/classic/listUsers.php
r1151 r1559 26 26 $t = &$GLOBALS['phpgw']->template; 27 27 // seta o Template 28 $t->set_file(array('addUser_t' => '../../../phpgwapi/templates/ celepar/listUsers.tpl'));28 $t->set_file(array('addUser_t' => '../../../phpgwapi/templates/default/listUsers.tpl')); 29 29 30 30 $obj_account = CreateObject('phpgwapi.accounts',$owner); … … 33 33 $post_select_sector = $_POST['select_sector']; 34 34 $change_organization = $_POST['change_organization']; 35 $search_users = $_POST['search_users']; 35 36 36 37 $obj_org_sector = CreateObject('phpgwapi.sector_search_ldap'); 37 if ((!$post_select_organization) && (!$post_select_sector)) //primeira vez 38 $cn='*'; 39 if ((!$post_select_organization) && (!$post_select_sector) && (!$search_users)) //primeira vez 38 40 { 39 41 $user_org = $obj_account->get_organization($GLOBALS['phpgw_info']['user']['account_dn']); … … 46 48 $sectors_info = $obj_org_sector->sector_search('ou='.$user_org.','.$GLOBALS['phpgw_info']['server']['ldap_context']); 47 49 } 48 else //mudou uma das combos50 else if(($post_select_organization) && ($post_select_sector) && (!$search_users))//mudou uma das combos 49 51 { 50 52 $user_org = $post_select_organization; … … 59 61 $sectors_info = $obj_org_sector->sector_search('ou='.$user_org.','.$GLOBALS['phpgw_info']['server']['ldap_context']); 60 62 } 61 63 else if ($search_users)//foi preenchida a caixa de busca independente 64 { 65 $user_context = $GLOBALS['phpgw_info']['server']['ldap_context']; 66 system('echo "CONTEXT: '.$user_context.'" >/tmp/controle'); 67 $organizations_info = $obj_org_sector->organization_search($GLOBALS['phpgw_info']['server']['ldap_context']); 68 @asort($organizations_info); 69 @reset($organizations_info); 70 $sectors_info = $obj_org_sector->sector_search('ou='.$post_select_organization.','.$GLOBALS['phpgw_info']['server']['ldap_context']); 71 @reset($sector_info); 72 $cn='*'.$search_users.'*'; 73 } 74 62 75 foreach($organizations_info as $organization) 63 76 { … … 102 115 $users = Array(); 103 116 $groups = Array(); 117 $justthese = array("phpgwaccountvisible","uidNumber","cn"); 104 118 105 119 $typeAccount = 'u'; … … 112 126 if ($ds) 113 127 { 114 $sr=ldap_ list($ds, $user_context, ("(&(cn=*)(phpgwaccounttype=".$typeAccount."))"));128 $sr=ldap_search($ds, $user_context, ("(&(cn=$cn)(phpgwaccounttype=".$typeAccount."))"),$justthese); 115 129 $info = ldap_get_entries($ds, $sr); 116 130 -
trunk/phpgwapi/templates/classic/listUsers.tpl
r1151 r1559 13 13 <div id="divAppboxHeader">{lang_Add_Participants}</div> 14 14 <div id="divAppbox"> 15 16 <tr><td>{lang_Organization}:</td>< /tr>17 <tr><td><select name="select_organization" onchange="formAddUser.change_organization.value='True';formAddUser.submit()">.{combo_organization}.</select></td> </tr>18 <t r><td>{lang_Sector}:</td></tr>19 <tr><td ><select name="select_sector" onchange="formAddUser.submit()">.{combo_sector}.</select></td></tr>20 < input type="hidden" name="change_organization" value="False">15 <table border=0> 16 <tr><td>{lang_Organization}:</td><td>{lang_Sector}:</td></tr> 17 <tr><td><select name="select_organization" onchange="formAddUser.change_organization.value='True';formAddUser.submit()">.{combo_organization}.</select></td> 18 <td><select name="select_sector" onchange="formAddUser.submit()">.{combo_sector}.</select></td></tr> 19 <tr><td colspan="2"><input type="hidden" name="change_organization" value="False"></td></tr> 20 <tr><td colspan="2"><center>{lang_to_Search}: <input type="text" name="search_users"></center></td></tr> 21 21 <tr> 22 <td >22 <td colspan="2"> 23 23 <select name="user_values" multiple style="width:250px" size="18" id="user_list_in"> 24 24 {options} -
trunk/phpgwapi/templates/default/listUsers.php
r1151 r1559 26 26 $t = &$GLOBALS['phpgw']->template; 27 27 // seta o Template 28 $t->set_file(array('addUser_t' => '../../../phpgwapi/templates/ celepar/listUsers.tpl'));28 $t->set_file(array('addUser_t' => '../../../phpgwapi/templates/default/listUsers.tpl')); 29 29 30 30 $obj_account = CreateObject('phpgwapi.accounts',$owner); … … 33 33 $post_select_sector = $_POST['select_sector']; 34 34 $change_organization = $_POST['change_organization']; 35 $search_users = $_POST['search_users']; 35 36 36 37 $obj_org_sector = CreateObject('phpgwapi.sector_search_ldap'); 37 if ((!$post_select_organization) && (!$post_select_sector)) //primeira vez 38 $cn='*'; 39 if ((!$post_select_organization) && (!$post_select_sector) && (!$search_users)) //primeira vez 38 40 { 39 41 $user_org = $obj_account->get_organization($GLOBALS['phpgw_info']['user']['account_dn']); … … 46 48 $sectors_info = $obj_org_sector->sector_search('ou='.$user_org.','.$GLOBALS['phpgw_info']['server']['ldap_context']); 47 49 } 48 else //mudou uma das combos50 else if(($post_select_organization) && ($post_select_sector) && (!$search_users))//mudou uma das combos 49 51 { 50 52 $user_org = $post_select_organization; … … 59 61 $sectors_info = $obj_org_sector->sector_search('ou='.$user_org.','.$GLOBALS['phpgw_info']['server']['ldap_context']); 60 62 } 61 63 else if ($search_users)//foi preenchida a caixa de busca independente 64 { 65 $user_context = $GLOBALS['phpgw_info']['server']['ldap_context']; 66 system('echo "CONTEXT: '.$user_context.'" >/tmp/controle'); 67 $organizations_info = $obj_org_sector->organization_search($GLOBALS['phpgw_info']['server']['ldap_context']); 68 @asort($organizations_info); 69 @reset($organizations_info); 70 $sectors_info = $obj_org_sector->sector_search('ou='.$post_select_organization.','.$GLOBALS['phpgw_info']['server']['ldap_context']); 71 @reset($sector_info); 72 $cn='*'.$search_users.'*'; 73 } 74 62 75 foreach($organizations_info as $organization) 63 76 { … … 102 115 $users = Array(); 103 116 $groups = Array(); 117 $justthese = array("phpgwaccountvisible","uidNumber","cn"); 104 118 105 119 $typeAccount = 'u'; … … 112 126 if ($ds) 113 127 { 114 $sr=ldap_ list($ds, $user_context, ("(&(cn=*)(phpgwaccounttype=".$typeAccount."))"));128 $sr=ldap_search($ds, $user_context, ("(&(cn=$cn)(phpgwaccounttype=".$typeAccount."))"),$justthese); 115 129 $info = ldap_get_entries($ds, $sr); 116 130 -
trunk/phpgwapi/templates/default/listUsers.tpl
r1151 r1559 13 13 <div id="divAppboxHeader">{lang_Add_Participants}</div> 14 14 <div id="divAppbox"> 15 16 <tr><td>{lang_Organization}:</td>< /tr>17 <tr><td><select name="select_organization" onchange="formAddUser.change_organization.value='True';formAddUser.submit()">.{combo_organization}.</select></td> </tr>18 <t r><td>{lang_Sector}:</td></tr>19 <tr><td ><select name="select_sector" onchange="formAddUser.submit()">.{combo_sector}.</select></td></tr>20 < input type="hidden" name="change_organization" value="False">15 <table border=0> 16 <tr><td>{lang_Organization}:</td><td>{lang_Sector}:</td></tr> 17 <tr><td><select name="select_organization" onchange="formAddUser.change_organization.value='True';formAddUser.submit()">.{combo_organization}.</select></td> 18 <td><select name="select_sector" onchange="formAddUser.submit()">.{combo_sector}.</select></td></tr> 19 <tr><td colspan="2"><input type="hidden" name="change_organization" value="False"></td></tr> 20 <tr><td colspan="2"><center>{lang_to_Search}: <input type="text" name="search_users"></center></td></tr> 21 21 <tr> 22 <td >22 <td colspan="2"> 23 23 <select name="user_values" multiple style="width:250px" size="18" id="user_list_in"> 24 24 {options}
Note: See TracChangeset
for help on using the changeset viewer.
