Changeset 34 for trunk/phpgwapi/inc/adodb/drivers/adodb-ldap.inc.php

Timestamp:

06/29/07 15:17:46 (17 years ago)

Author:

niltonneto

Message:

Versão nova do ADODB (4.5 para 4.95)

File:

• trunk/phpgwapi/inc/adodb/drivers/adodb-ldap.inc.php (modified) (8 diffs)

trunk/phpgwapi/inc/adodb/drivers/adodb-ldap.inc.php

@@ -1 +1 @@
 <?php
 /*
-  V4.51 29 July 2004  (c) 2000-2004 John Lim (jlim#natsoft.com.my). All rights reserved.
+  V4.94 23 Jan 2007  (c) 2000-2007 John Lim (jlim#natsoft.com.my). All rights reserved.
    Released under both BSD license and Lesser GPL library license. 
   Whenever there is any discrepancy between the two licenses, 
@@ -7 +7 @@
   Set tabs to 8.
   
+  Revision 1: (02/25/2005) Updated codebase to include the _inject_bind_options function. This allows
+  users to access the options in the ldap_set_option function appropriately. Most importantly
+  LDAP Version 3 is now supported. See the examples for more information. Also fixed some minor
+  bugs that surfaced when PHP error levels were set high.
   
   Joshua Eldridge (joshuae74#hotmail.com)
@@ -13 +17 @@
 // security - hide paths
 if (!defined('ADODB_DIR')) die();
+
+if (!defined('LDAP_ASSOC')) {
+         define('LDAP_ASSOC',ADODB_FETCH_ASSOC);
+         define('LDAP_NUM',ADODB_FETCH_NUM);
+         define('LDAP_BOTH',ADODB_FETCH_BOTH);
+}
 
 class ADODB_ldap extends ADOConnection {
@@ -25 +35 @@
     var $filter;
     var $dn;
-
+        var $version;
+        var $port = 389;
+
+        # Options configuration information
+        var $LDAP_CONNECT_OPTIONS;
 
         function ADODB_ldap() 
         {               
-
         }
                 
         // returns true or false
         
-        function _connect( $host, $username, $password, $ldapbase )
-        {
-
-           if ( !function_exists( 'ldap_connect' ) ) return null;
-           
-           $conn_info = array( $host );
-           
-           if ( strstr( $host, ':' ) ) {
-               $conn_info = split( ':', $host );
-           } 
-
-           $this->_connectionID = ldap_connect( $conn_info[0], $conn_info[1] ) 
-               or die( 'Could not connect to ' . $this->_connectionID );
-           if ($username && $password) {
-               $bind = ldap_bind( $this->_connectionID, $username, $password ) 
-                   or die( 'Could not bind to ' . $this->_connectionID . ' with $username & $password');
-           } else {
-               $bind = ldap_bind( $this->_connectionID ) 
-                   or die( 'Could not bind anonymously to ' . $this->_connectionID );
-           }
-           return $this->_connectionID;
-    }
+        function _connect( $host, $username, $password, $ldapbase)
+        {
+        global $LDAP_CONNECT_OPTIONS;
+                
+                if ( !function_exists( 'ldap_connect' ) ) return null;
+                
+                $conn_info = array( $host,$this->port);
+                
+                if ( strstr( $host, ':' ) ) {
+                    $conn_info = split( ':', $host );
+                } 
+                
+                $this->_connectionID = ldap_connect( $conn_info[0], $conn_info[1] );
+                if (!$this->_connectionID) {
+                        $e = 'Could not connect to ' . $conn_info[0];
+                        $this->_errorMsg = $e;
+                        if ($this->debug) ADOConnection::outp($e);
+                        return false;
+                }
+                if( count( $LDAP_CONNECT_OPTIONS ) > 0 ) {
+                        $this->_inject_bind_options( $LDAP_CONNECT_OPTIONS );
+                }
+                
+                if ($username) {
+                    $bind = ldap_bind( $this->_connectionID, $username, $password );
+                } else {
+                        $username = 'anonymous';
+                    $bind = ldap_bind( $this->_connectionID );          
+                }
+                
+                if (!$bind) {
+                        $e = 'Could not bind to ' . $conn_info[0] . " as ".$username;
+                        $this->_errorMsg = $e;
+                        if ($this->debug) ADOConnection::outp($e);
+                        return false;
+                }
+                $this->_errorMsg = '';
+                $this->database = $ldapbase;
+                return $this->_connectionID;
+        }
     
+/*
+        Valid Domain Values for LDAP Options:
+
+        LDAP_OPT_DEREF (integer)
+        LDAP_OPT_SIZELIMIT (integer)
+        LDAP_OPT_TIMELIMIT (integer)
+        LDAP_OPT_PROTOCOL_VERSION (integer)
+        LDAP_OPT_ERROR_NUMBER (integer)
+        LDAP_OPT_REFERRALS (boolean)
+        LDAP_OPT_RESTART (boolean)
+        LDAP_OPT_HOST_NAME (string)
+        LDAP_OPT_ERROR_STRING (string)
+        LDAP_OPT_MATCHED_DN (string)
+        LDAP_OPT_SERVER_CONTROLS (array)
+        LDAP_OPT_CLIENT_CONTROLS (array)
+
+        Make sure to set this BEFORE calling Connect()
+
+        Example:
+
+        $LDAP_CONNECT_OPTIONS = Array(
+                Array (
+                        "OPTION_NAME"=>LDAP_OPT_DEREF,
+                        "OPTION_VALUE"=>2
+                ),
+                Array (
+                        "OPTION_NAME"=>LDAP_OPT_SIZELIMIT,
+                        "OPTION_VALUE"=>100
+                ),
+                Array (
+                        "OPTION_NAME"=>LDAP_OPT_TIMELIMIT,
+                        "OPTION_VALUE"=>30
+                ),
+                Array (
+                        "OPTION_NAME"=>LDAP_OPT_PROTOCOL_VERSION,
+                        "OPTION_VALUE"=>3
+                ),
+                Array (
+                        "OPTION_NAME"=>LDAP_OPT_ERROR_NUMBER,
+                        "OPTION_VALUE"=>13
+                ),
+                Array (
+                        "OPTION_NAME"=>LDAP_OPT_REFERRALS,
+                        "OPTION_VALUE"=>FALSE
+                ),
+                Array (
+                        "OPTION_NAME"=>LDAP_OPT_RESTART,
+                        "OPTION_VALUE"=>FALSE
+                )
+        );
+*/
+
+        function _inject_bind_options( $options ) {
+                foreach( $options as $option ) {
+                        ldap_set_option( $this->_connectionID, $option["OPTION_NAME"], $option["OPTION_VALUE"] )
+                                or die( "Unable to set server option: " . $option["OPTION_NAME"] );
+                }
+        }
         
         /* returns _queryID or false */
         function _query($sql,$inputarr)
         {
-           $rs = ldap_search( $this->_connectionID, $this->database, $sql );
-       return $rs; 
-                
+                $rs = ldap_search( $this->_connectionID, $this->database, $sql );
+                $this->_errorMsg = ($rs) ? '' : 'Search error on '.$sql;
+                return $rs; 
         }
 
@@ -73 +162 @@
         }
     
+        function SelectDB($db) {
+                $this->database = $db;
+                return true;
+        } // SelectDB
+
     function ServerInfo()
     {
-        if( is_array( $this->version ) ) return $this->version;
+        if( !empty( $this->version ) ) return $this->version;
         $version = array();
         /*
@@ -161 +255 @@
         /* The host name (or list of hosts) for the primary LDAP server. */
         ldap_get_option( $this->_connectionID, LDAP_OPT_HOST_NAME, $version['LDAP_OPT_HOST_NAME'] ); 
-        ldap_get_option( $this->_connectionID, OPT_ERROR_NUMBER, $version['OPT_ERROR_NUMBER'] ); 
-        ldap_get_option( $this->_connectionID, OPT_ERROR_STRING, $version['OPT_ERROR_STRING'] ); 
+        ldap_get_option( $this->_connectionID, LDAP_OPT_ERROR_NUMBER, $version['LDAP_OPT_ERROR_NUMBER'] ); 
+        ldap_get_option( $this->_connectionID, LDAP_OPT_ERROR_STRING, $version['LDAP_OPT_ERROR_STRING'] ); 
         ldap_get_option( $this->_connectionID, LDAP_OPT_MATCHED_DN, $version['LDAP_OPT_MATCHED_DN'] ); 
         
@@ -194 +288 @@
                   $this->fetchMode = LDAP_ASSOC; 
                 break;
-                default:
                 case ADODB_FETCH_DEFAULT:
                 case ADODB_FETCH_BOTH: 
+                default:
                   $this->fetchMode = LDAP_BOTH; 
                 break;
@@ -293 +387 @@
             
             case LDAP_NUM:
-            $this->fields = $this->GetRowNums();
+                        $this->fields = array_merge($this->GetRowNums(),$this->GetRowAssoc());
             break;
             
             case LDAP_BOTH:
             default:
+                        $this->fields = $this->GetRowNums();
             break;
         }