Index: /trunk/expressoAdmin1_2/inc/class.bosectors.inc.php
===================================================================
--- /trunk/expressoAdmin1_2/inc/class.bosectors.inc.php (revision 1850)
+++ /trunk/expressoAdmin1_2/inc/class.bosectors.inc.php (revision 1991)
@@ -47,5 +47,13 @@
$sector_info['objectClass'][0] = 'top';
$sector_info['objectClass'][1] = 'organizationalUnit';
-
+
+ if( isset($_POST['associated_domain']) )
+ {
+ if ( $_POST['associated_domain'] != "") {
+ $sector_info['objectClass'][2] = 'domainRelatedObject';
+ $sector_info['associatedDomain'] = trim($_POST['associated_domain']);
+ }
+ }
+
/*
Insere as informações sobre quota total por usuários e por gigabytes de espaço em disco
Index: /trunk/expressoAdmin1_2/inc/class.uisectors.inc.php
===================================================================
--- /trunk/expressoAdmin1_2/inc/class.uisectors.inc.php (revision 1684)
+++ /trunk/expressoAdmin1_2/inc/class.uisectors.inc.php (revision 1991)
@@ -185,4 +185,5 @@
'context' => $context == '' ? $GLOBALS['phpgw_info']['server']['ldap_context'] : $context,
'sector' => $_POST['sector'],
+ 'associated_domain' => $_POST['associated_domain'],
'disk_quota' => $_POST['disk_quota'],
'users_quota' => $_POST['users_quota'],
@@ -242,4 +243,5 @@
$sector_disk_quota = $sector_info[0]['diskquota'][0];
$sector_users_quota = $sector_info[0]['usersquota'][0];
+ $sector_associated_domain = $sector_info[0]['associateddomain'][0];
$_POST['sector_visible'] = $sector_info[0]['phpgwaccountvisible'][0];
}
@@ -254,7 +256,7 @@
'manager_org' => $combo_manager_org,
'sector_visible_checked'=> $_POST['sector_visible'] ? 'checked' : '',
+ 'associated_domain' => $_POST['associated_domain'] == '' ? $sector_associated_domain : $_POST['associated_domain'],
'disk_quota' => $_POST['disk_quota'] == '' ? $sector_disk_quota : $_POST['disk_quota'],
'users_quota' => $_POST['users_quota'] == '' ? $sector_users_quota : $_POST['users_quota'],
-
'lang_add' => lang('Add'),
'disable' => 'disabled',
Index: /trunk/expressoAdmin1_2/inc/class.ldap_functions.inc.php
===================================================================
--- /trunk/expressoAdmin1_2/inc/class.ldap_functions.inc.php (revision 1975)
+++ /trunk/expressoAdmin1_2/inc/class.ldap_functions.inc.php (revision 1991)
@@ -1532,4 +1532,13 @@
}
+ function get_associated_domain($params)
+ {
+ $justthese = array("associatedDomain");
+ $filter="(objectClass=domainRelatedObject)";;
+ $context = $params['context'];
+ $search = ldap_search($this->ldap,$context, $filter, $justthese);
+ $entry = ldap_get_entries($this->ldap, $search);
+ return $entry[0]['associateddomain'][0];
+ }
function change_user_context($dn, $newrdn, $newparent)
Index: /trunk/expressoAdmin1_2/js/jscode/expressoadmin.js
===================================================================
--- /trunk/expressoAdmin1_2/js/jscode/expressoadmin.js (revision 1916)
+++ /trunk/expressoAdmin1_2/js/jscode/expressoadmin.js (revision 1991)
@@ -33,4 +33,20 @@
}
+function get_associated_domain(context)
+{
+ var handler_associated_domain = function(data)
+ {
+ if (data != null)
+ {
+ document.forms[0].associated_domain.value = data;
+ }
+ else
+ {
+ document.forms[0].associated_domain.value = '';
+ }
+ }
+ cExecute ('$this.ldap_functions.get_associated_domain&context='+context, handler_associated_domain);
+}
+
function emailSugestion_expressoadmin2(email) {
if ( email.value.indexOf('@', 0) < 0 ) emailSugestion = 1;
@@ -39,5 +55,5 @@
var context = "";
- organization_context = Element('ea_combo_org').value;
+ organization_context = Element('ea_combo_org').value.toLowerCase();
// Transformar os DN em User Friendly Naming format
organization_name = organization_context.split(",");
@@ -46,7 +62,14 @@
context += tmp[1];
if( i < (organization_name.length - 1) ) context += '.';
- }
- email.value = email.value + context;
- emailSugestion = 0;
+ }
+ if (document.forms[0].associated_domain.value != '')
+ {
+ associatedDomain_name = document.forms[0].associated_domain.value;
+ email.value = email.value + associatedDomain_name;
+ emailSugestion = 0;
+ } else{
+ email.value = email.value + context;
+ emailSugestion = 0;
+ }
}
}
@@ -91,7 +114,17 @@
org_name = org_name_par.split('.');
org_name = org_name[org_name.length-1];
-
+
if (org_name != '')
- document.forms[0].mail1.value = document.forms[0].uid.value + '@' + org_name + '.' + domain_name;
+ {
+ if (document.forms[0].associated_domain.value != '')
+ {
+ associatedDomain_name = document.forms[0].associated_domain.value;
+ document.forms[0].mail1.value = document.forms[0].uid.value + '@' + associatedDomain_name;
+ }
+ else
+ {
+ document.forms[0].mail1.value = document.forms[0].uid.value + '@' + org_name + '.' + domain_name;
+ }
+ }
else
document.forms[0].mail1.value = document.forms[0].uid.value;
Index: /trunk/expressoAdmin1_2/templates/default/accounts_form.tpl
===================================================================
--- /trunk/expressoAdmin1_2/templates/default/accounts_form.tpl (revision 1329)
+++ /trunk/expressoAdmin1_2/templates/default/accounts_form.tpl (revision 1991)
@@ -15,11 +15,12 @@
-
+
-
+
-
+
+
@@ -42,10 +43,10 @@