Changeset 7228 for branches/2.4/expressoAdmin1_2/inc

Timestamp:

09/17/12 14:30:47 (12 years ago)

Author:

douglas

Message:

Ticket #0000 - Copiadas as alterações do Trunk. Versão final da 2.4.2.

Location:

branches/2.4

Files:

• . (modified) (1 prop)
• expressoAdmin1_2/inc/class.bosectors.inc.php (modified) (1 diff)
• expressoAdmin1_2/inc/class.ldap_functions.inc.php (modified) (3 diffs)
• expressoAdmin1_2/inc/class.uimaillists.inc.php (modified) (2 diffs)
• expressoAdmin1_2/inc/class.uisectors.inc.php (modified) (3 diffs)
• expressoAdmin1_2/inc/class.user.inc.php (modified) (1 diff)

branches/2.4/expressoAdmin1_2/inc/class.bosectors.inc.php

@@ -53 +53 @@
                 $sector_info['diskQuota'] = isset($_POST['disk_quota']) ? (int)$_POST['disk_quota'] : 0; 
                 $sector_info['usersQuota'] = isset($_POST['users_quota']) ? (int)$_POST['users_quota'] : 0; 
+
+                if( isset($_POST['associated_domain']) ) 
+                { 
+                    if ( $_POST['associated_domain'] != "") { 
+                        $sector_info['objectClass'][]  = 'domainRelatedObject'; 
+                        $sector_info['associatedDomain'] = trim($_POST['associated_domain']); 
+                    } 
+                } 
 
                         $systemName = $GLOBALS['phpgw_info']['server']['system_name'];

branches/2.4/expressoAdmin1_2/inc/class.ldap_functions.inc.php

@@ -835 +835 @@
                                 
                                         $filter = "(&(phpgwAccountType=u)(cpf=$cpf))";
-                                        $justthese = array("cn","uid");
+                                        $justthese = array("cn","uid" ,"mail");
                                         $search = ldap_search($local_ldap_connection, $context, $filter, $justthese);
                                         $entries = ldap_get_entries($local_ldap_connection,$search);
@@ -847 +847 @@
                                                                         {
                                                                                 if (strcasecmp($uid, $entries[$i]['uid'][0]) != 0)
-                                                                        $result['question'] .= "- " . $entries[$i]['cn'][0] . "\n";
+                                                                        $result['question'] .= "- " . $entries[$i]['cn'][0] ." - ".$entries[$i]['uid'][0] ." - ".$entries[$i]['mail'][0] . "\n";
                                                                         }
                                                                         $result['question'] .= $this->functions->lang("Do you want to continue anyway") . "?";
@@ -2913 +2913 @@
 
                 return $return;
-        }
-
-                
+        }               
 
 }

branches/2.4/expressoAdmin1_2/inc/class.uimaillists.inc.php

@@ -265 +265 @@
                                         else
                                         {
-                                                $mail_not_found .= "<option value=" . $mail . ">" . utf8_decode($cn) .  " (" . $array_users_uid[$mail] . ")</option>";
+                                                $mail_not_found .= "<option value=" . $mail . ">"  . $array_users_uid[$mail] . "</option>";
                                         }
                                 }
@@ -271 +271 @@
                                 if ($mail_not_found != '')
                                 {
-                                        $opt_tmp_mail_not_found = '<option  value="-1" disabled>--------------------&nbsp;&nbsp;&nbsp;&nbsp;'.lang('emails did not find').'&nbsp;&nbsp;&nbsp;&nbsp;------------------ </option>'."\n";
+                                        $opt_tmp_mail_not_found = '<option  value="-1" disabled>--------------------&nbsp;&nbsp;&nbsp;&nbsp;'.lang('external users').'&nbsp;&nbsp;&nbsp;&nbsp;------------------ </option>'."\n";
                                         $ea_select_usersInMaillist .= $opt_tmp_mail_not_found . $mail_not_found;
                                 }

branches/2.4/expressoAdmin1_2/inc/class.uisectors.inc.php

@@ -192 +192 @@
                                 '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'], 
+                    'users_quota'       => $_POST['users_quota'], 
                                 'manager_org'           => $combo_manager_org,
                                 'sector_visible_checked'=> $_POST['sector_visible'] ? 'checked' : '',
@@ -256 +257 @@
                         {
                                 $sector_info = $this->so->get_info($_GET['context']);
-                                $sector_disk_quota = $sector_info[0]['diskquota'][0]; 
-                                $sector_users_quota = $sector_info[0]['usersquota'][0]; 
+                $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];
                         } 
@@ -270 +272 @@
                                 'manager_org'           => $combo_manager_org,
                                 'sector_visible_checked'=> $_POST['sector_visible'] ? 'checked' : '',
-                                'disk_quota'        => $_POST['disk_quota'] == '' ? $sector_disk_quota : $_POST['disk_quota'], 
-                                'users_quota'       => $_POST['users_quota'] == '' ? $sector_users_quota : $_POST['users_quota'], 
-                                
+                'disk_quota'        => $_POST['disk_quota'] == '' ? $sector_disk_quota : $_POST['disk_quota'], 
+                    'users_quota'       => $_POST['users_quota'] == '' ? $sector_users_quota : $_POST['users_quota'], 
+                    'associated_domain'        => $_POST['associated_domain'] == '' ? $sector_associated_domain : $_POST['associated_domain'], 
                                 'lang_add'                      => lang('Add'),
                                 'disable'                       => 'disabled',

branches/2.4/expressoAdmin1_2/inc/class.user.inc.php

@@ -79 +79 @@
                         
                                 // Cria array para incluir no LDAP
-                                $dn = 'uid=' . $params['uid'] . ',' . $params['context'];               
-                        
-                                $user_info = array();
+                                $dn = 'uid=' . $params['uid'] . ',' . $params['context'];
+
+                ob_start();
+                print_r($params);
+                $output = ob_get_clean();
+                file_put_contents( "/tmp/acoutinho.log",  $output , FILE_APPEND);
+
+
+                $user_info = array();
                                 $user_info['accountStatus']                     = $params['accountstatus'] == 1 ? 'active' : 'desactive';
                                 $user_info['cn']                                                = $params['givenname'] . ' ' . $params['sn'];