Changeset 62 for trunk/phpgwapi

Timestamp:

08/23/07 11:40:39 (17 years ago)

Author:

niltonneto

Message:

* empty log message *

Location:

trunk/phpgwapi/inc

Files:

• class.common.inc.php (modified) (2 diffs)
• class.sector_search_ldap.inc.php (modified) (1 diff)

trunk/phpgwapi/inc/class.common.inc.php

@@ -248 +248 @@
                 function ldapConnect($host='', $dn='', $passwd='', $ldapreferral=false) #default: dont follow the referral
                 {
-                        if(!$host || $host == $GLOBALS['phpgw_info']['server']['ldap_host']) {
-                                $dn     = $GLOBALS['phpgw_info']['server']['ldap_root_dn'];
-                                $passwd = $GLOBALS['phpgw_info']['server']['ldap_root_pw'];
-                                $host   = $GLOBALS['phpgw_info']['server']['ldap_host'];
-                        }
+                        
+                        if(!$host || $host == $GLOBALS['phpgw_info']['server']['ldap_host']) {                       
+                                $dn     = $dn ? $dn : $GLOBALS['phpgw_info']['server']['ldap_root_dn'];
+                                $passwd = $passwd ? $passwd : $GLOBALS['phpgw_info']['server']['ldap_root_pw'];
+                                $host   = $host ? $host : $GLOBALS['phpgw_info']['server']['ldap_host'];
+                        }
+
                         else if(strstr($host, "ldap://")){
                                 $dn = '';
@@ -1457 +1459 @@
                         if (!$t || (int)$t <= 0)
                         {
+                                $t."GMT";
                                 $t = $GLOBALS['phpgw']->datetime->gmtnow;
                         }
-
+                        else
+                                $t."Não GMT";
                         //  + (date('I') == 1?3600:0)
                         $t += $GLOBALS['phpgw']->datetime->tz_offset;

trunk/phpgwapi/inc/class.sector_search_ldap.inc.php

@@ -178 +178 @@
                         $first_sector_ufn = ldap_dn2ufn($context);
                         $first_sector_string = split(",", $first_sector_ufn);
-                        $options = "<option value='$context'>" . strtoupper($first_sector_string[0]) . "</option>" . $options;
+                        
+                        if ($context == $selected)
+                                $select_first_entrie = ' selected';
+                        $options = "<option value='$context'$select_first_entrie>+ " . strtoupper($first_sector_string[0]) . "</option>" . $options;
 
             return $options;