Changeset 1991 for trunk/expressoAdmin1_2/inc

Timestamp:

02/10/10 09:58:44 (14 years ago)

Author:

valmir.sena

Message:

Ticket #902 - Permitir que seja definido um dominio diferente por organizacao

Location:

trunk/expressoAdmin1_2/inc

Files:

• class.bosectors.inc.php (modified) (1 diff)
• class.ldap_functions.inc.php (modified) (1 diff)
• class.uisectors.inc.php (modified) (3 diffs)

trunk/expressoAdmin1_2/inc/class.bosectors.inc.php

@@ -47 +47 @@
                         $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 

trunk/expressoAdmin1_2/inc/class.ldap_functions.inc.php

@@ -1532 +1532 @@
         }
 
+        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)

trunk/expressoAdmin1_2/inc/class.uisectors.inc.php

@@ -185 +185 @@
                                 '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 +243 @@
                                 $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 +256 @@
                                 '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',