Changeset 6917
- Timestamp:
- 07/31/12 14:48:40 (12 years ago)
- Location:
- trunk/expressoAdmin1_2
- Files:
-
- 6 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/expressoAdmin1_2/inc/class.bosectors.inc.php
r6697 r6917 53 53 $sector_info['diskQuota'] = isset($_POST['disk_quota']) ? (int)$_POST['disk_quota'] : 0; 54 54 $sector_info['usersQuota'] = isset($_POST['users_quota']) ? (int)$_POST['users_quota'] : 0; 55 56 if( isset($_POST['associated_domain']) ) 57 { 58 if ( $_POST['associated_domain'] != "") { 59 $sector_info['objectClass'][] = 'domainRelatedObject'; 60 $sector_info['associatedDomain'] = trim($_POST['associated_domain']); 61 } 62 } 55 63 56 64 $systemName = $GLOBALS['phpgw_info']['server']['system_name']; -
trunk/expressoAdmin1_2/inc/class.ldap_functions.inc.php
r6865 r6917 2913 2913 2914 2914 return $return; 2915 } 2916 2917 2915 } 2918 2916 2919 2917 } -
trunk/expressoAdmin1_2/inc/class.uisectors.inc.php
r6697 r6917 192 192 'context' => $context == '' ? $GLOBALS['phpgw_info']['server']['ldap_context'] : $context, 193 193 'sector' => $_POST['sector'], 194 'associated_domain' => $_POST['associated_domain'], 194 195 'disk_quota' => $_POST['disk_quota'], 195 196 'users_quota' => $_POST['users_quota'], 196 197 'manager_org' => $combo_manager_org, 197 198 'sector_visible_checked'=> $_POST['sector_visible'] ? 'checked' : '', … … 256 257 { 257 258 $sector_info = $this->so->get_info($_GET['context']); 258 $sector_disk_quota = $sector_info[0]['diskquota'][0]; 259 $sector_users_quota = $sector_info[0]['usersquota'][0]; 259 $sector_disk_quota = $sector_info[0]['diskquota'][0]; 260 $sector_users_quota = $sector_info[0]['usersquota'][0]; 261 $sector_associated_domain = $sector_info[0]['associateddomain'][0]; 260 262 $_POST['sector_visible'] = $sector_info[0]['phpgwaccountvisible'][0]; 261 263 } … … 270 272 'manager_org' => $combo_manager_org, 271 273 'sector_visible_checked'=> $_POST['sector_visible'] ? 'checked' : '', 272 273 274 274 'disk_quota' => $_POST['disk_quota'] == '' ? $sector_disk_quota : $_POST['disk_quota'], 275 'users_quota' => $_POST['users_quota'] == '' ? $sector_users_quota : $_POST['users_quota'], 276 'associated_domain' => $_POST['associated_domain'] == '' ? $sector_associated_domain : $_POST['associated_domain'], 275 277 'lang_add' => lang('Add'), 276 278 'disable' => 'disabled', -
trunk/expressoAdmin1_2/templates/default/accounts_form.tpl
r5133 r6917 15 15 <input type="hidden" name="photo_exist" value="{photo_exist}"> 16 16 <input type="hidden" name="user_context" value="{user_context}"> 17 <input type="hidden" name="departmentnumber" 17 <input type="hidden" name="departmentnumber" value="{departmentnumber}"> 18 18 <input type="hidden" name="userSamba" value="{userSamba}"> 19 <input type="hidden" name="defaultLogonScript" 19 <input type="hidden" name="defaultLogonScript" value="{defaultLogonScript}"> 20 20 <input type="hidden" name="imapDelimiter" value="{imapDelimiter}"> 21 <input type="hidden" name="minimumSizeLogin" 21 <input type="hidden" name="minimumSizeLogin" value="{minimumSizeLogin}"> 22 22 <input type="hidden" name="defaultDomain" value="{defaultDomain}"> 23 23 <input type="hidden" name="ldap_context" value="{ldap_context}"> 24 <input type="hidden" name="associated_domain" value="{associated_domain}"> 24 25 25 26 <br> … … 42 43 <tr bgcolor={row_on}> 43 44 <td>{lang_search_organization}:</td> 44 <td><input type="text" id="organization_search" {disabled} autocomplete="off" size=20 onKeyUp="javascript:search_organization(this.value, 'ea_combo_org_info');" onBlur="javascript:sinc_combos_org(context.value); get_a vailable_sambadomains(context.value, '{type}')"></td>45 <td><input type="text" id="organization_search" {disabled} autocomplete="off" size=20 onKeyUp="javascript:search_organization(this.value, 'ea_combo_org_info');" onBlur="javascript:sinc_combos_org(context.value); get_associated_domain(context.value); get_available_groups(context.value); get_available_maillists(context.value); get_available_sambadomains(context.value, '{type}')"></td> 45 46 </tr> 46 47 47 48 <tr bgcolor={row_off}> 48 49 <td>{lang_organizations}:</td> 49 <td><select {disabled} id="ea_combo_org_info" name="context" onchange="javascript:sinc_combos_org(this.value); get_a vailable_groups(this.value); get_available_maillists(this.value); get_available_sambadomains(this.value, '{type}')">{sectors}</select></td>50 <td><select {disabled} id="ea_combo_org_info" name="context" onchange="javascript:sinc_combos_org(this.value); get_associated_domain(this.value); get_available_groups(this.value); get_available_maillists(this.value); get_available_sambadomains(this.value, '{type}')">{sectors}</select></td> 50 51 </tr> 51 52 -
trunk/expressoAdmin1_2/templates/default/institutional_accounts_modal.tpl
r6157 r6917 17 17 <br /> 18 18 {lang_organization}:<br /> 19 <select id="ea_combo_org" name="context" onchange="javascript:sinc_combos_org(this.value); ">{manager_organizations}</select><br />19 <select id="ea_combo_org" name="context" onchange="javascript:sinc_combos_org(this.value);javascript:get_associated_domain(this.value);">{manager_organizations}</select><br /> 20 20 21 <input type="hidden" id="associated_domain" name="associated_domain" /> 22 21 23 {lang_full_name}: <font color="blue">{lang_eg}: Setor Diser</font><br /> 22 24 <input id="cn" name="cn" size="35" autocomplete="off" /><br /> -
trunk/expressoAdmin1_2/templates/default/sectors_form.tpl
r6553 r6917 20 20 </td> 21 21 <td> 22 <input type="text" {disable} autocomplete="off" name="sector" value={sector}> 22 <input type="text" {disable} autocomplete="off" name="sector" value={sector}> 23 </td> 24 </tr> 25 <tr> 26 <td> 27 {lang_Associated_domain}: 28 </td> 29 <td> 30 <input type="text" {disable} autocomplete="off" name="associated_domain" value={associated_domain}> 23 31 </td> 24 32 </tr>
Note: See TracChangeset
for help on using the changeset viewer.