Changeset 5246 for branches/2.3/expressoMail1_2/inc/class.ldap_functions.inc.php

Timestamp:

12/13/11 13:05:05 (12 years ago)

Author:

brunocosta

Message:

Ticket #2377 - Alteração das pesquisas para adaptação ao LDAP para nuvem.

File:

• branches/2.3/expressoMail1_2/inc/class.ldap_functions.inc.php (modified) (7 diffs)

branches/2.3/expressoMail1_2/inc/class.ldap_functions.inc.php

@@ -171 +171 @@
 
                         // New search only on user sector
-                        if ($count_entries > $this->max_result)
+                        if ($_SESSION['phpgw_info']['user']['preferences']['expressoMail']['cloud_ldap'] || $count_entries > $this->max_result)
                         {
                                 // Close old ldap conection
@@ -190 +190 @@
                                         return $return;
                                 }
-                                else
-                                {
-                                        $quickSearch_only_in_userSector = true;
+                                elseif($count_entries < 1){
+                                    $return = array();
+                                    return $return;
+
+                                }else
+                                {
+                                        if($_SESSION['phpgw_info']['user']['preferences']['expressoMail']['cloud_ldap'])
+                                            $quickSearch_cloud = true;
+                                        else
+                                            $quickSearch_only_in_userSector = true;
                                 }
                         }
@@ -226 +233 @@
                         for ($i=0; $i<$info["count"]; $i++)
                         {
-                                if ($quickSearch_only_in_userSector)
+                                if ($quickSearch_only_in_userSector || $quickSearch_cloud)
                                 {
                                         $tmp[$info[$i]["mail"][0] . '%' . $info[$i]["telephonenumber"][0] . '%'. $info[$i]["mobile"][0] . '%' . $info[$i]["uid"][0] . '%' . $info[$i]["jpegphoto"]['count'] . '%' . $info[$i]["employeenumber"][0] . '%' . $info[$i]["ou"][0]] = utf8_decode($info[$i]["cn"][0]);
@@ -260 +267 @@
                                 }
                                 $contacts_result['quickSearch_only_in_userSector'] = $quickSearch_only_in_userSector;
+                                $contacts_result['quickSearch_cloud'] = $quickSearch_cloud;
                         }
                         else
@@ -303 +311 @@
                                                 return $return;
                                         }
+                                }
+                                if ($quickSearch_cloud)
+                                {
+                                                $head_option =
+                                                        '<tr class="quicksearchcontacts_unselected">' .
+                                                                '<td colspan="2" width="100%" align="center">' .
+                                                                        $this->functions->getLang('Showing only the results found in your organization') . '.'.
+                                                                        '<input id="QuickSearchUser_button_search" type="button" onclick="QuickSearchUser.close_window();openListUsers(\'1\');" value="busca avançada">'.
+                                                                '</td>' .
+                                                        '</tr>';
+
+
+
+                                                $contacts_result = $head_option . $options_users_from_user_org . $options;
+
                                 }
                                 else
@@ -414 +437 @@
                 $organizations = array();
                 $params['referral']?$referral = $params['referral']:$referral = false;
+                $params['organization']?$org = "ou=".$params['organization'].",":$org = "";
                 $cat = $params['catalog'];
-
-                $this->ldapConnect($referral,$cat);
-
-                        if($this->branch != '') {
-                                $filter="(&(".$this->branch."=*)(!(phpgwAccountVisible=-1)))";
-                                $justthese = array("$this->branch");
-                        $sr = ldap_list($this->ds, $this->ldap_context, $filter, $justthese);
-                        $info = ldap_get_entries($this->ds, $sr);
-
-                        if($info["count"] == 0)
-                        {
-                            $organizations[0]['ou'] = $this->ldap_context;
-                        }
-
-                        for ($i=0; $i<$info["count"]; $i++)
-                                $organizations[$i] = $info[$i]["ou"][0];
-
-                        ldap_close($this->ds);
-                        sort($organizations);
-                return $organizations;
-                        }else{
+                // primeiro nível de ou
+                $this->ldapConnect($referral,$cat);
+                if($_SESSION['phpgw_info']['user']['preferences']['expressoMail']['cloud_ldap'] && $cat == 0)
+                {
+                    $fistOu = substr($_SESSION['phpgw_info']['expressomail']['user']['account_dn'],strripos($_SESSION['phpgw_info']['expressomail']['user']['account_dn'], "ou="));
+                }
+                else
+                {
+                    $fistOu = $this->ldap_context;
+                }
+                if($this->branch != '') {
+                    $filter="(&(".$this->branch."=*)(!(phpgwAccountVisible=-1)))";
+                    $justthese = array("$this->branch");
+                    $sr = ldap_list($this->ds, $org.$fistOu, $filter, $justthese);
+                    $info = ldap_get_entries($this->ds, $sr);
+                    if($info["count"] == 0)
+                    {
+                        return null;
+                    }
+                    for ($i=0; $i<$info["count"]; $i++)
+                        $organizations[$i] = $info[$i]["ou"][0];
+                    ldap_close($this->ds);
+                    sort($organizations);
+                    return $organizations;
+                }else{
                         return null;
-        }
+            }
         }
         function get_organizations2($params){
@@ -540 +568 @@
                 $this->ldapConnect(true,$catalog);
 
-                $params['organization'] == 'all' ? $user_context = $this->ldap_context :$user_context = $this->branch."=".$params['organization'].",".$this->ldap_context;
-
+                if($_SESSION['phpgw_info']['user']['preferences']['expressoMail']['cloud_ldap'] && $catalog == 0)
+                    $fistOu = substr($_SESSION['phpgw_info']['expressomail']['user']['account_dn'],strripos($_SESSION['phpgw_info']['expressomail']['user']['account_dn'], "ou="));
+                else
+                    $fistOu = $this->ldap_context;
+                
+                if($params['organization_sub'] =="")
+                    $params['organization_sub'] =="all";
+                
+                $params['organization'] == 'all' ? $user_context = $fistOu :$user_context = $this->branch."=".$params['organization'].",".$fistOu;
+                $params['organization_sub'] == 'all' ? $user_context = $user_context :$user_context = $this->branch."=".$params['organization_sub'].",".$user_context;
                 if ($this->ds) {
                         if ($catalog == 0){