Changeset 1394

Timestamp:

09/09/09 12:14:56 (15 years ago)

Author:

rodsouza

Message:

Ticket #478 - Alterada o valor do atributo de consulta do LDAP para o coringa

Location:

trunk/expressoAdmin1_2/inc

Files:

• class.sosectors.inc.php (modified) (1 diff)
• class.uisectors.inc.php (modified) (1 diff)
• load_lang.php (modified) (1 diff)

trunk/expressoAdmin1_2/inc/class.sosectors.inc.php

@@ -92 +92 @@
                 {
                         //searching for sub entries
-                        $search=ldap_list($connection,$dn,"ObjectClass=organizationalUnit",array(""));
+                        $search=ldap_list($connection,$dn,"ObjectClass=*",array(""));
                         $info = ldap_get_entries($connection, $search);
                         

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

@@ -150 +150 @@
                         $manager_contexts = $acl['contexts'];
                         $combo_manager_org = '';
-                        foreach ($manager_contexts as $index=>$context)
-                                $combo_manager_org .= $this->functions->get_organizations( $context );
-
-                        $context = $_GET['context'];
-                        
+
+                        if ( array_key_exists( 'context', $_GET ) )
+                        {
+                                $context = $_GET['context'];
+                                $combo_manager_org = $this->functions->get_organizations( $context, '', true, true, true );
+                        }
+                        else
+                        {
+                                foreach ($manager_contexts as $index=>$context)
+                                        $combo_manager_org .= $this->functions->get_organizations( $context );
+                        }
+
                         // Verifica se tem acesso a este modulo
                         if (!$this->functions->check_acl($manager_lid,'create_sectors'))

trunk/expressoAdmin1_2/inc/load_lang.php

@@ -1 @@
-<?
+<?php
         $lang = array();
         if (!empty($_SESSION['phpgw_info']['expressoAdmin']['lang']))