Kolab Groupware OBS

We truncated the diff of some files because they were too big. If you want to see the full diff for every file, click here.

Changes of Revision 2

php-pear-Net-LDAP2.spec Changed

@@ -1,4 +1,13 @@
-%{!?__pear:         %{expand: %%global __pear %{_bindir}/pear}}
+# remirepo/fedora spec file for php-pear-Net-LDAP2
+#
+# Copyright (c) 2015 Remi Collet
+# License: CC-BY-SA
+# http://creativecommons.org/licenses/by-sa/4.0/
+#
+# Please, preserve the changelog entries
+#
+%{!?__pear:       %global __pear       %{_bindir}/pear}
+%global pear_name Net_LDAP2
 
 # Needed for openSUSE
 %if 0%{?suse_version}
@@ -12,47 +21,63 @@
 %{!?pear_xmldir:    %global pear_xmldir %{_localstatedir}/lib/pear/pkgxml}
 %endif
 
-%global pear_name Net_LDAP2
+# Test suite requires a LDAP server, so are not run during build
 
 %if 0%{?suse_version}
 Name:               php5-pear-Net_LDAP2
 %else
 Name:               php-pear-Net-LDAP2
 %endif
-Version:            2.0.12
-Release:            1%{?dist}
-Summary:            Object oriented interface for searching and manipulating LDAP-entries
-Group:              Development/Libraries
-License:            LGPLv3
-URL:                http://pear.php.net/package/Net_LDAP2
-Source0:            http://pear.php.net/get/%{pear_name}-%{version}.tgz
-BuildRoot:          %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildArch:          noarch
+Version:        2.2.0
+Release:        2%{?dist}
+Summary:        Object oriented interface for searching and manipulating LDAP-entries
+
+# LGPL doesn't require license file, but ask for it
+# https://pear.php.net/bugs/bug.php?id=20504 - please include License file
+License:        LGPLv3
+URL:            http://pear.php.net/package/%{pear_name}
+Source0:        http://pear.php.net/get/%{pear_name}-%{version}.tgz
 
-BuildRequires:      php-pear
+Patch1: lower-min-required-pear-version.patch
 
-Requires(post):     %{__pear}
-Requires(postun):   %{__pear}
-Requires:           php-pear
+BuildArch:      noarch
+BuildRequires:  php-pear(PEAR) >= 1.9.4
+
+Requires(post): %{__pear}
+Requires(postun): %{__pear}
+# From package.xml
+Requires:       php(language)  >= 5.4
+Requires:       php-pear(PEAR) >= 1.9.4
+Requires:       php-ldap
+# From phpcompatinfo report
+Requires:       php-date
+Requires:       php-pcre
+Requires:       php-spl
+
+Provides:       php-pear(%{pear_name}) = %{version}
+Provides:       php-composer(pear/net_ldap2) = %{version}
 
-Provides:           php-pear(%{pear_name}) = %{version}-%{release}
 
 %description
-Net_LDAP2 is the successor of Net_LDAP which is a clone of Perls Net::LDAP
+Net_LDAP2 is the successor of Net_LDAP (which is a clone of Perls Net::LDAP)
 object interface to directory servers. It does contain most of Net::LDAPs
 features but has some own too.
+
 With Net_LDAP2 you have:
-* A simple object-oriented interface to connections, searches entries and filters.
-* Support for tls and ldap v3.
-* Simple modification, deletion and creation of ldap entries.
+* A simple object-oriented interface to connections,
+  searches entries and filters.
+* Support for TLS and LDAP v3.
+* Simple modification, deletion and creation of LDAP entries.
 * Support for schema handling.
 
 Net_LDAP2 layers itself on top of PHP's existing ldap extensions.
 
+
 %prep
 %setup -q -c
-
-mv package.xml %{pear_name}-%{version}/%{pear_name}.xml
+%patch1 -p1
+cd %{pear_name}-%{version}
+mv ../package.xml %{name}.xml
 
 
 %build
@@ -61,62 +86,51 @@
 
 
 %install
-rm -rf %{buildroot} docdir
-
-pushd %{pear_name}-%{version}
-%{__pear} install --nodeps --packagingroot %{buildroot} %{pear_name}.xml
+cd %{pear_name}-%{version}
+%{__pear} install --nodeps --packagingroot %{buildroot} %{name}.xml
 
 # Clean up unnecessary files
-rm -rf %{buildroot}%{pear_phpdir}/.??*
+rm -rf %{buildroot}%{pear_metadir}/.??*
 
 # Install XML package description
-%{__mkdir_p} %{buildroot}%{pear_xmldir}
-%{__install} -pm 644 %{pear_name}.xml %{buildroot}%{pear_xmldir}
+mkdir -p %{buildroot}%{pear_xmldir}
+install -pm 644 %{name}.xml %{buildroot}%{pear_xmldir}
 
-popd
-
-# For troubleshooting macros:
-
-echo "pear_metadir: '%{pear_metadir}'"
-
-%check
-# Sanity check
-lst=$(find %{buildroot}%{pear_phpdir} -exec grep -q %{buildroot} {} \; -print)
-[ ! -z "$lst" ] && echo "Reference to BUILDROOT in $lst" && exit 1;
-
-%clean
-rm -rf %{buildroot}
 
 %post
 %{__pear} install --nodeps --soft --force --register-only \
-    %{pear_xmldir}/%{pear_name}.xml >/dev/null || :
+    %{pear_xmldir}/%{name}.xml >/dev/null || :
 
 %postun
 if [ $1 -eq 0 ] ; then
     %{__pear} uninstall --nodeps --ignore-errors --register-only \
-        %{pear_name} >/dev/null || :
+        pear.php.net/%{pear_name} >/dev/null || :
 fi
 
+
 %files
-%defattr(-,root,root,-)
 %doc %{pear_docdir}/%{pear_name}
-%dir %{pear_phpdir}/Net
-%{pear_phpdir}/Net/LDAP2
-%{pear_phpdir}/Net/LDAP2.php
-%{pear_testdir}/%{pear_name}
 %if 0%{?suse_version}
 %dir %{pear_xmldir}
 %endif
-%{pear_xmldir}/%{pear_name}.xml
-%if 0%{?rhel} > 6 || 0%{?fedora} > 18
-%{pear_metadir}/.registry/net_ldap2.reg
-%exclude %{pear_metadir}
-%endif
+%{pear_xmldir}/%{name}.xml
+%{pear_phpdir}/Net
+%{pear_testdir}/%{pear_name}
+
 
 %changelog
-* Sat Jun 05 2010 Christoph Wickert <wickert@kolabsys.com> - 2.0.9-3
-- Adjust requirements for php-channel(pear.horde.org)
+* Sat Oct 05 2019 Christoph Erhardt <kolab@sicherha.de> - 2.2.0-2
+- Package for Kolab
+- Fix the build on CentOS/RHEL 7
+
+* Sat Oct 31 2015 Remi Collet <remi@fedoraproject.org> - 2.2.0-1
+- Update to 2.2.0
+- provide php-composer(pear/net_ldap2)
+- raise dependency on PEAR 1.10.1
 
-* Sun May  9 2010 Jeroen van Meeuwen <vanmeeuwen@kolabsys.com> - 2.0.9-2
-- Package for Fedora/EPEL
+* Thu Jun 18 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.1.0-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild
 
+* Sun Feb 22 2015 Remi Collet <remi@fedoraproject.org> - 2.1.0-1
+- Version 2.1.0 (stable), API 2.0.0 (stable)
+- Initial package

lower-min-required-pear-version.patch Added

Net_LDAP2-2.0.12.tgz/Net_LDAP2-2.0.12/Net/LDAP2.php Deleted

@@ -1,1799 +0,0 @@
-<?php
-/* vim: set expandtab tabstop=4 shiftwidth=4: */
-/**
-* File containing the Net_LDAP2 interface class.
-*
-* PHP version 5
-*
-* @category  Net
-* @package   Net_LDAP2
-* @author    Tarjej Huse <tarjei@bergfald.no>
-* @author    Jan Wagner <wagner@netsols.de>
-* @author    Del <del@babel.com.au>
-* @author    Benedikt Hallinger <beni@php.net>
-* @copyright 2003-2007 Tarjej Huse, Jan Wagner, Del Elson, Benedikt Hallinger
-* @license   http://www.gnu.org/licenses/lgpl-3.0.txt LGPLv3
-* @version   SVN: $Id: LDAP2.php 318473 2011-10-27 13:39:13Z beni $
-* @link      http://pear.php.net/package/Net_LDAP2/
-*/
-
-/**
-* Package includes.
-*/
-require_once 'PEAR.php';
-require_once 'Net/LDAP2/RootDSE.php';
-require_once 'Net/LDAP2/Schema.php';
-require_once 'Net/LDAP2/Entry.php';
-require_once 'Net/LDAP2/Search.php';
-require_once 'Net/LDAP2/Util.php';
-require_once 'Net/LDAP2/Filter.php';
-require_once 'Net/LDAP2/LDIF.php';
-require_once 'Net/LDAP2/SchemaCache.interface.php';
-require_once 'Net/LDAP2/SimpleFileSchemaCache.php';
-
-/**
-*  Error constants for errors that are not LDAP errors.
-*/
-define('NET_LDAP2_ERROR', 1000);
-
-/**
-* Net_LDAP2 Version
-*/
-define('NET_LDAP2_VERSION', '2.0.10');
-
-/**
-* Net_LDAP2 - manipulate LDAP servers the right way!
-*
-* @category  Net
-* @package   Net_LDAP2
-* @author    Tarjej Huse <tarjei@bergfald.no>
-* @author    Jan Wagner <wagner@netsols.de>
-* @author    Del <del@babel.com.au>
-* @author    Benedikt Hallinger <beni@php.net>
-* @copyright 2003-2007 Tarjej Huse, Jan Wagner, Del Elson, Benedikt Hallinger
-* @license   http://www.gnu.org/copyleft/lesser.html LGPL
-* @link      http://pear.php.net/package/Net_LDAP2/
-*/
-class Net_LDAP2 extends PEAR
-{
-    /**
-    * Class configuration array
-    *
-    * host     = the ldap host to connect to
-    *            (may be an array of several hosts to try)
-    * port     = the server port
-    * version  = ldap version (defaults to v 3)
-    * starttls = when set, ldap_start_tls() is run after connecting.
-    * bindpw   = no explanation needed
-    * binddn   = the DN to bind as.
-    * basedn   = ldap base
-    * options  = hash of ldap options to set (opt => val)
-    * filter   = default search filter
-    * scope    = default search scope
-    *
-    * Newly added in 2.0.0RC4, for auto-reconnect:
-    * auto_reconnect  = if set to true then the class will automatically
-    *                   attempt to reconnect to the LDAP server in certain
-    *                   failure conditionswhen attempting a search, or other
-    *                   LDAP operation.  Defaults to false.  Note that if you
-    *                   set this to true, calls to search() may block
-    *                   indefinitely if there is a catastrophic server failure.
-    * min_backoff     = minimum reconnection delay period (in seconds).
-    * current_backoff = initial reconnection delay period (in seconds).
-    * max_backoff     = maximum reconnection delay period (in seconds).
-    *
-    * @access protected
-    * @var array
-    */
-    protected $_config = array('host'            => 'localhost',
-                               'port'            => 389,
-                               'version'         => 3,
-                               'starttls'        => false,
-                               'binddn'          => '',
-                               'bindpw'          => '',
-                               'basedn'          => '',
-                               'options'         => array(),
-                               'filter'          => '(objectClass=*)',
-                               'scope'           => 'sub',
-                               'auto_reconnect'  => false,
-                               'min_backoff'     => 1,
-                               'current_backoff' => 1,
-                               'max_backoff'     => 32);
-
-    /**
-    * List of hosts we try to establish a connection to
-    *
-    * @access protected
-    * @var array
-    */
-    protected $_host_list = array();
-
-    /**
-    * List of hosts that are known to be down.
-    *
-    * @access protected
-    * @var array
-    */
-    protected $_down_host_list = array();
-
-    /**
-    * LDAP resource link.
-    *
-    * @access protected
-    * @var resource
-    */
-    protected $_link = false;
-
-    /**
-    * Net_LDAP2_Schema object
-    *
-    * This gets set and returned by {@link schema()}
-    *
-    * @access protected
-    * @var object Net_LDAP2_Schema
-    */
-    protected $_schema = null;
-
-    /**
-    * Schema cacher function callback
-    *
-    * @see registerSchemaCache()
-    * @var string
-    */
-    protected $_schema_cache = null;
-
-    /**
-    * Cache for attribute encoding checks
-    *
-    * @access protected
-    * @var array Hash with attribute names as key and boolean value
-    *            to determine whether they should be utf8 encoded or not.
-    */
-    protected $_schemaAttrs = array();
-
-    /**
-    * Cache for rootDSE objects
-    *
-    * Hash with requested rootDSE attr names as key and rootDSE object as value
-    *
-    * Since the RootDSE object itself may request a rootDSE object,
-    * {@link rootDse()} caches successful requests.
-    * Internally, Net_LDAP2 needs several lookups to this object, so
-    * caching increases performance significally.
-    *
-    * @access protected
-    * @var array
-    */
-    protected $_rootDSE_cache = array();
-
-    /**
-    * Returns the Net_LDAP2 Release version, may be called statically
-    *
-    * @static
-    * @return string Net_LDAP2 version
-    */
-    public static function getVersion()
-    {
-        return NET_LDAP2_VERSION;
-    }
-
-    /**
-    * Configure Net_LDAP2, connect and bind
-    *
-    * Use this method as starting point of using Net_LDAP2
-    * to establish a connection to your LDAP server.
-    *
-    * Static function that returns either an error object or the new Net_LDAP2
-    * object. Something like a factory. Takes a config array with the needed
-    * parameters.
-    *
-    * @param array $config Configuration array
-    *
-    * @access public
-    * @return Net_LDAP2_Error|Net_LDAP2   Net_LDAP2_Error or Net_LDAP2 object
-    */
-    public static function &connect($config = array())
-    {
-        $ldap_check = self::checkLDAPExtension();
-        if (self::iserror($ldap_check)) {
-            return $ldap_check;

Net_LDAP2-2.0.12.tgz/Net_LDAP2-2.0.12/Net/LDAP2/Entry.php Deleted

@@ -1,1069 +0,0 @@
-<?php
-/* vim: set expandtab tabstop=4 shiftwidth=4: */
-/**
-* File containing the Net_LDAP2_Entry interface class.
-*
-* PHP version 5
-*
-* @category  Net
-* @package   Net_LDAP2
-* @author    Jan Wagner <wagner@netsols.de>
-* @author    Tarjej Huse <tarjei@bergfald.no>
-* @author    Benedikt Hallinger <beni@php.net>
-* @copyright 2009 Tarjej Huse, Jan Wagner, Benedikt Hallinger
-* @license   http://www.gnu.org/licenses/lgpl-3.0.txt LGPLv3
-* @version   SVN: $Id: Entry.php 307580 2011-01-19 12:32:05Z beni $
-* @link      http://pear.php.net/package/Net_LDAP2/
-*/
-
-/**
-* Includes
-*/
-require_once 'PEAR.php';
-require_once 'Net/LDAP2/Util.php';
-
-/**
-* Object representation of a directory entry
-*
-* This class represents a directory entry. You can add, delete, replace
-* attributes and their values, rename the entry, delete the entry.
-*
-* @category Net
-* @package  Net_LDAP2
-* @author   Jan Wagner <wagner@netsols.de>
-* @author   Tarjej Huse <tarjei@bergfald.no>
-* @author   Benedikt Hallinger <beni@php.net>
-* @license  http://www.gnu.org/copyleft/lesser.html LGPL
-* @link     http://pear.php.net/package/Net_LDAP2/
-*/
-class Net_LDAP2_Entry extends PEAR
-{
-    /**
-    * Entry ressource identifier
-    *
-    * @access protected
-    * @var ressource
-    */
-    protected $_entry = null;
-
-    /**
-    * LDAP ressource identifier
-    *
-    * @access protected
-    * @var ressource
-    */
-    protected $_link = null;
-
-    /**
-    * Net_LDAP2 object
-    *
-    * This object will be used for updating and schema checking
-    *
-    * @access protected
-    * @var object Net_LDAP2
-    */
-    protected $_ldap = null;
-
-    /**
-    * Distinguished name of the entry
-    *
-    * @access protected
-    * @var string
-    */
-    protected $_dn = null;
-
-    /**
-    * Attributes
-    *
-    * @access protected
-    * @var array
-    */
-    protected $_attributes = array();
-
-    /**
-    * Original attributes before any modification
-    *
-    * @access protected
-    * @var array
-    */
-    protected $_original = array();
-
-
-    /**
-    * Map of attribute names
-    *
-    * @access protected
-    * @var array
-    */
-    protected $_map = array();
-
-
-    /**
-    * Is this a new entry?
-    *
-    * @access protected
-    * @var boolean
-    */
-    protected $_new = true;
-
-    /**
-    * New distinguished name
-    *
-    * @access protected
-    * @var string
-    */
-    protected $_newdn = null;
-
-    /**
-    * Shall the entry be deleted?
-    *
-    * @access protected
-    * @var boolean
-    */
-    protected $_delete = false;
-
-    /**
-    * Map with changes to the entry
-    *
-    * @access protected
-    * @var array
-    */
-    protected $_changes = array("add"     => array(),
-                                "delete"  => array(),
-                                "replace" => array()
-                               );
-    /**
-    * Internal Constructor
-    *
-    * Constructor of the entry. Sets up the distinguished name and the entries
-    * attributes.
-    * You should not call this method manually! Use {@link Net_LDAP2_Entry::createFresh()}
-    * or {@link Net_LDAP2_Entry::createConnected()} instead!
-    *
-    * @param Net_LDAP2|ressource|array &$ldap Net_LDAP2 object, ldap-link ressource or array of attributes
-    * @param string|ressource          $entry Either a DN or a LDAP-Entry ressource
-    *
-    * @access protected
-    * @return none
-    */
-    protected function __construct(&$ldap, $entry = null)
-    {
-        $this->PEAR('Net_LDAP2_Error');
-
-        // set up entry resource or DN
-        if (is_resource($entry)) {
-            $this->_entry = &$entry;
-        } else {
-            $this->_dn = $entry;
-        }
-
-        // set up LDAP link
-        if ($ldap instanceof Net_LDAP2) {
-            $this->_ldap = &$ldap;
-            $this->_link = $ldap->getLink();
-        } elseif (is_resource($ldap)) {
-            $this->_link = $ldap;
-        } elseif (is_array($ldap)) {
-            // Special case: here $ldap is an array of attributes,
-            // this means, we have no link. This is a "virtual" entry.
-            // We just set up the attributes so one can work with the object
-            // as expected, but an update() fails unless setLDAP() is called.
-            $this->setAttributes($ldap);
-        }
-
-        // if this is an entry existing in the directory,
-        // then set up as old and fetch attrs
-        if (is_resource($this->_entry) && is_resource($this->_link)) {
-            $this->_new = false;
-            $this->_dn  = @ldap_get_dn($this->_link, $this->_entry);
-            $this->setAttributes();  // fetch attributes from server
-        }
-    }
-
-    /**
-    * Creates a fresh entry that may be added to the directory later on
-    *
-    * Use this method, if you want to initialize a fresh entry.
-    *
-    * The method should be called statically: $entry = Net_LDAP2_Entry::createFresh();
-    * You should put a 'objectClass' attribute into the $attrs so the directory server
-    * knows which object you want to create. However, you may omit this in case you
-    * don't want to add this entry to a directory server.
-    *
-    * The attributes parameter is as following:
-    * <code>
-    * $attrs = array( 'attribute1' => array('value1', 'value2'),
-    *                 'attribute2' => 'single value'
-    *          );
-    * </code>
-    *

Net_LDAP2-2.0.12.tgz/Net_LDAP2-2.0.12/Net/LDAP2/Filter.php Deleted

@@ -1,547 +0,0 @@
-<?php
-/* vim: set expandtab tabstop=4 shiftwidth=4: */
-/**
-* File containing the Net_LDAP2_Filter interface class.
-*
-* PHP version 5
-*
-* @category  Net
-* @package   Net_LDAP2
-* @author    Benedikt Hallinger <beni@php.net>
-* @copyright 2009 Benedikt Hallinger
-* @license   http://www.gnu.org/licenses/lgpl-3.0.txt LGPLv3
-* @version   SVN: $Id: Filter.php 318470 2011-10-27 12:57:05Z beni $
-* @link      http://pear.php.net/package/Net_LDAP2/
-*/
-
-/**
-* Includes
-*/
-require_once 'PEAR.php';
-require_once 'Net/LDAP2/Util.php';
-
-/**
-* Object representation of a part of a LDAP filter.
-*
-* This Class is not completely compatible to the PERL interface!
-*
-* The purpose of this class is, that users can easily build LDAP filters
-* without having to worry about right escaping etc.
-* A Filter is built using several independent filter objects
-* which are combined afterwards. This object works in two
-* modes, depending how the object is created.
-* If the object is created using the {@link create()} method, then this is a leaf-object.
-* If the object is created using the {@link combine()} method, then this is a container object.
-*
-* LDAP filters are defined in RFC-2254 and can be found under
-* {@link http://www.ietf.org/rfc/rfc2254.txt}
-*
-* Here a quick copy&paste example:
-* <code>
-* $filter0 = Net_LDAP2_Filter::create('stars', 'equals', '***');
-* $filter_not0 = Net_LDAP2_Filter::combine('not', $filter0);
-*
-* $filter1 = Net_LDAP2_Filter::create('gn', 'begins', 'bar');
-* $filter2 = Net_LDAP2_Filter::create('gn', 'ends', 'baz');
-* $filter_comp = Net_LDAP2_Filter::combine('or',array($filter_not0, $filter1, $filter2));
-*
-* echo $filter_comp->asString();
-* // This will output: (|(!(stars=\0x5c0x2a\0x5c0x2a\0x5c0x2a))(gn=bar*)(gn=*baz))
-* // The stars in $filter0 are treaten as real stars unless you disable escaping.
-* </code>
-*
-* @category Net
-* @package  Net_LDAP2
-* @author   Benedikt Hallinger <beni@php.net>
-* @license  http://www.gnu.org/copyleft/lesser.html LGPL
-* @link     http://pear.php.net/package/Net_LDAP2/
-*/
-class Net_LDAP2_Filter extends PEAR
-{
-    /**
-    * Storage for combination of filters
-    *
-    * This variable holds a array of filter objects
-    * that should be combined by this filter object.
-    *
-    * @access protected
-    * @var array
-    */
-    protected $_subfilters = array();
-
-    /**
-    * Match of this filter
-    *
-    * If this is a leaf filter, then a matching rule is stored,
-    * if it is a container, then it is a logical operator
-    *
-    * @access protected
-    * @var string
-    */
-    protected $_match;
-
-    /**
-    * Single filter
-    *
-    * If we operate in leaf filter mode,
-    * then the constructing method stores
-    * the filter representation here
-    *
-    * @acces private
-    * @var string
-    */
-    protected $_filter;
-
-    /**
-    * Create a new Net_LDAP2_Filter object and parse $filter.
-    *
-    * This is for PERL Net::LDAP interface.
-    * Construction of Net_LDAP2_Filter objects should happen through either
-    * {@link create()} or {@link combine()} which give you more control.
-    * However, you may use the perl iterface if you already have generated filters.
-    *
-    * @param string $filter LDAP filter string
-    *
-    * @see parse()
-    */
-    public function __construct($filter = false)
-    {
-        // The optional parameter must remain here, because otherwise create() crashes
-        if (false !== $filter) {
-            $filter_o = self::parse($filter);
-            if (PEAR::isError($filter_o)) {
-                $this->_filter = $filter_o; // assign error, so asString() can report it
-            } else {
-                $this->_filter = $filter_o->asString();
-            }
-        }
-    }
-
-    /**
-    * Constructor of a new part of a LDAP filter.
-    *
-    * The following matching rules exists:
-    *    - equals:         One of the attributes values is exactly $value
-    *                      Please note that case sensitiviness is depends on the
-    *                      attributes syntax configured in the server.
-    *    - begins:         One of the attributes values must begin with $value
-    *    - ends:           One of the attributes values must end with $value
-    *    - contains:       One of the attributes values must contain $value
-    *    - present | any:  The attribute can contain any value but must be existent
-    *    - greater:        The attributes value is greater than $value
-    *    - less:           The attributes value is less than $value
-    *    - greaterOrEqual: The attributes value is greater or equal than $value
-    *    - lessOrEqual:    The attributes value is less or equal than $value
-    *    - approx:         One of the attributes values is similar to $value
-    *
-    * Negation ("not") can be done by prepending the above operators with the
-    * "not" or "!" keyword, see example below. 
-    *
-    * If $escape is set to true (default) then $value will be escaped
-    * properly. If it is set to false then $value will be treaten as raw filter value string.
-    * You should escape yourself using {@link Net_LDAP2_Util::escape_filter_value()}!
-    *
-    * Examples:
-    * <code>
-    *   // This will find entries that contain an attribute "sn" that ends with "foobar":
-    *   $filter = Net_LDAP2_Filter::create('sn', 'ends', 'foobar');
-    *
-    *   // This will find entries that contain an attribute "sn" that has any value set:
-    *   $filter = Net_LDAP2_Filter::create('sn', 'any');
-    *
-    *   // This will build a negated equals filter:
-    *   $filter = Net_LDAP2_Filter::create('sn', 'not equals', 'foobar');
-    * </code>
-    *
-    * @param string  $attr_name Name of the attribute the filter should apply to
-    * @param string  $match     Matching rule (equals, begins, ends, contains, greater, less, greaterOrEqual, lessOrEqual, approx, any)
-    * @param string  $value     (optional) if given, then this is used as a filter
-    * @param boolean $escape    Should $value be escaped? (default: yes, see {@link Net_LDAP2_Util::escape_filter_value()} for detailed information)
-    *
-    * @return Net_LDAP2_Filter|Net_LDAP2_Error
-    */
-    public static function &create($attr_name, $match, $value = '', $escape = true)
-    {
-        $leaf_filter = new Net_LDAP2_Filter();
-        if ($escape) {
-            $array = Net_LDAP2_Util::escape_filter_value(array($value));
-            $value = $array[0];
-        }
-
-        $match = strtolower($match);
-
-        // detect negation
-        $neg_matches   = array();
-        $negate_filter = false;
-        if (preg_match('/^(?:not|!)[\s_-](.+)/', $match, $neg_matches)) {
-            $negate_filter = true;
-            $match         = $neg_matches[1];
-        }
-
-        // build basic filter
-        switch ($match) {
-        case 'equals':
-        case '=':
-        case '==':
-            $leaf_filter->_filter = '(' . $attr_name . '=' . $value . ')';
-            break;
-        case 'begins':
-            $leaf_filter->_filter = '(' . $attr_name . '=' . $value . '*)';
-            break;
-        case 'ends':
-            $leaf_filter->_filter = '(' . $attr_name . '=*' . $value . ')';
-            break;
-        case 'contains':
-            $leaf_filter->_filter = '(' . $attr_name . '=*' . $value . '*)';
-            break;
-        case 'greater':
-        case '>':
-            $leaf_filter->_filter = '(' . $attr_name . '>' . $value . ')';

Net_LDAP2-2.0.12.tgz/Net_LDAP2-2.0.12/Net/LDAP2/LDIF.php Deleted

@@ -1,924 +0,0 @@
-<?php
-/* vim: set expandtab tabstop=4 shiftwidth=4: */
-/**
-* File containing the Net_LDAP2_LDIF interface class.
-*
-* PHP version 5
-*
-* @category  Net
-* @package   Net_LDAP2
-* @author    Benedikt Hallinger <beni@php.net>
-* @copyright 2009 Benedikt Hallinger
-* @license   http://www.gnu.org/licenses/lgpl-3.0.txt LGPLv3
-* @version   SVN: $Id: LDIF.php 302696 2010-08-23 12:48:07Z beni $
-* @link      http://pear.php.net/package/Net_LDAP2/
-*/
-
-/**
-* Includes
-*/
-require_once 'PEAR.php';
-require_once 'Net/LDAP2.php';
-require_once 'Net/LDAP2/Entry.php';
-require_once 'Net/LDAP2/Util.php';
-
-/**
-* LDIF capabilitys for Net_LDAP2, closely taken from PERLs Net::LDAP
-*
-* It provides a means to convert between Net_LDAP2_Entry objects and LDAP entries
-* represented in LDIF format files. Reading and writing are supported and may
-* manipulate single entries or lists of entries.
-*
-* Usage example:
-* <code>
-* // Read and parse an ldif-file into Net_LDAP2_Entry objects
-* // and print out the DNs. Store the entries for later use.
-* require 'Net/LDAP2/LDIF.php';
-* $options = array(
-*       'onerror' => 'die'
-* );
-* $entries = array();
-* $ldif = new Net_LDAP2_LDIF('test.ldif', 'r', $options);
-* do {
-*       $entry = $ldif->read_entry();
-*       $dn    = $entry->dn();
-*       echo " done building entry: $dn\n";
-*       array_push($entries, $entry);
-* } while (!$ldif->eof());
-* $ldif->done();
-*
-*
-* // write those entries to another file
-* $ldif = new Net_LDAP2_LDIF('test.out.ldif', 'w', $options);
-* $ldif->write_entry($entries);
-* $ldif->done();
-* </code>
-*
-* @category Net
-* @package  Net_LDAP2
-* @author   Benedikt Hallinger <beni@php.net>
-* @license  http://www.gnu.org/copyleft/lesser.html LGPL
-* @link     http://pear.php.net/package/Net_LDAP22/
-* @see      http://www.ietf.org/rfc/rfc2849.txt
-* @todo     Error handling should be PEARified
-* @todo     LDAPv3 controls are not implemented yet
-*/
-class Net_LDAP2_LDIF extends PEAR
-{
-    /**
-    * Options
-    *
-    * @access protected
-    * @var array
-    */
-    protected $_options = array('encode'    => 'base64',
-                                'onerror'   => null,
-                                'change'    => 0,
-                                'lowercase' => 0,
-                                'sort'      => 0,
-                                'version'   => null,
-                                'wrap'      => 78,
-                                'raw'       => ''
-                               );
-
-    /**
-    * Errorcache
-    *
-    * @access protected
-    * @var array
-    */
-    protected $_error = array('error' => null,
-                              'line'  => 0
-                             );
-
-    /**
-    * Filehandle for read/write
-    *
-    * @access protected
-    * @var array
-    */
-    protected $_FH = null;
-
-    /**
-    * Says, if we opened the filehandle ourselves
-    *
-    * @access protected
-    * @var array
-    */
-    protected $_FH_opened = false;
-
-    /**
-    * Linecounter for input file handle
-    *
-    * @access protected
-    * @var array
-    */
-    protected $_input_line = 0;
-
-    /**
-    * counter for processed entries
-    *
-    * @access protected
-    * @var int
-    */
-    protected $_entrynum = 0;
-
-    /**
-    * Mode we are working in
-    *
-    * Either 'r', 'a' or 'w'
-    *
-    * @access protected
-    * @var string
-    */
-    protected $_mode = false;
-
-    /**
-    * Tells, if the LDIF version string was already written
-    *
-    * @access protected
-    * @var boolean
-    */
-    protected $_version_written = false;
-
-    /**
-    * Cache for lines that have build the current entry
-    *
-    * @access protected
-    * @var boolean
-    */
-    protected $_lines_cur = array();
-
-    /**
-    * Cache for lines that will build the next entry
-    *
-    * @access protected
-    * @var boolean
-    */
-    protected $_lines_next = array();
-
-    /**
-    * Open LDIF file for reading or for writing
-    *
-    * new (FILE):
-    * Open the file read-only. FILE may be the name of a file
-    * or an already open filehandle.
-    * If the file doesn't exist, it will be created if in write mode.
-    *
-    * new (FILE, MODE, OPTIONS):
-    *     Open the file with the given MODE (see PHPs fopen()), eg "w" or "a".
-    *     FILE may be the name of a file or an already open filehandle.
-    *     PERLs Net_LDAP2 "FILE|" mode does not work curently.
-    *
-    *     OPTIONS is an associative array and may contain:
-    *       encode => 'none' | 'canonical' | 'base64'
-    *         Some DN values in LDIF cannot be written verbatim and have to be encoded in some way:
-    *         'none'       No encoding.
-    *         'canonical'  See "canonical_dn()" in Net::LDAP::Util.
-    *         'base64'     Use base64. (default, this differs from the Perl interface.
-    *                                   The perl default is "none"!)
-    *
-    *       onerror => 'die' | 'warn' | NULL
-    *         Specify what happens when an error is detected.
-    *         'die'  Net_LDAP2_LDIF will croak with an appropriate message.
-    *         'warn' Net_LDAP2_LDIF will warn (echo) with an appropriate message.
-    *         NULL   Net_LDAP2_LDIF will not warn (default), use error().
-    *
-    *       change => 1
-    *         Write entry changes to the LDIF file instead of the entries itself. I.e. write LDAP
-    *         operations acting on the entries to the file instead of the entries contents.
-    *         This writes the changes usually carried out by an update() to the LDIF file.
-    *
-    *       lowercase => 1
-    *         Convert attribute names to lowercase when writing.
-    *
-    *       sort => 1
-    *         Sort attribute names when writing entries according to the rule:
-    *         objectclass first then all other attributes alphabetically sorted by attribute name
-    *
-    *       version => '1'

Net_LDAP2-2.0.12.tgz/Net_LDAP2-2.0.12/Net/LDAP2/RootDSE.php Deleted

@@ -1,240 +0,0 @@
-<?php
-/* vim: set expandtab tabstop=4 shiftwidth=4: */
-/**
-* File containing the Net_LDAP2_RootDSE interface class.
-*
-* PHP version 5
-*
-* @category  Net
-* @package   Net_LDAP2
-* @author    Jan Wagner <wagner@netsols.de>
-* @copyright 2009 Jan Wagner
-* @license   http://www.gnu.org/licenses/lgpl-3.0.txt LGPLv3
-* @version   SVN: $Id: RootDSE.php 286718 2009-08-03 07:30:49Z beni $
-* @link      http://pear.php.net/package/Net_LDAP2/
-*/
-
-/**
-* Includes
-*/
-require_once 'PEAR.php';
-
-/**
-* Getting the rootDSE entry of a LDAP server
-*
-* @category Net
-* @package  Net_LDAP2
-* @author   Jan Wagner <wagner@netsols.de>
-* @license  http://www.gnu.org/copyleft/lesser.html LGPL
-* @link     http://pear.php.net/package/Net_LDAP22/
-*/
-class Net_LDAP2_RootDSE extends PEAR
-{
-    /**
-    * @access protected
-    * @var object Net_LDAP2_Entry
-    **/
-    protected $_entry;
-
-    /**
-    * Class constructor
-    *
-    * @param Net_LDAP2_Entry &$entry Net_LDAP2_Entry object of the RootDSE
-    */
-    protected function __construct(&$entry)
-    {
-        $this->_entry = $entry;
-    }
-
-    /**
-    * Fetches a RootDSE object from an LDAP connection
-    *
-    * @param Net_LDAP2 $ldap  Directory from which the RootDSE should be fetched
-    * @param array     $attrs Array of attributes to search for
-    *
-    * @access static
-    * @return Net_LDAP2_RootDSE|Net_LDAP2_Error
-    */
-    public static function fetch($ldap, $attrs = null)
-    {
-        if (!$ldap instanceof Net_LDAP2) {
-            return PEAR::raiseError("Unable to fetch Schema: Parameter \$ldap must be a Net_LDAP2 object!");
-        }
-
-        if (is_array($attrs) && count($attrs) > 0 ) {
-            $attributes = $attrs;
-        } else {
-            $attributes = array('vendorName',
-                                'vendorVersion',
-                                'namingContexts',
-                                'altServer',
-                                'supportedExtension',
-                                'supportedControl',
-                                'supportedSASLMechanisms',
-                                'supportedLDAPVersion',
-                                'subschemaSubentry' );
-        }
-        $result = $ldap->search('', '(objectClass=*)', array('attributes' => $attributes, 'scope' => 'base'));
-        if (self::isError($result)) {
-            return $result;
-        }
-        $entry = $result->shiftEntry();
-        if (false === $entry) {
-            return PEAR::raiseError('Could not fetch RootDSE entry');
-        }
-        $ret = new Net_LDAP2_RootDSE($entry);
-        return $ret;
-    }
-
-    /**
-    * Gets the requested attribute value
-    *
-    * Same usuage as {@link Net_LDAP2_Entry::getValue()}
-    *
-    * @param string $attr    Attribute name
-    * @param array  $options Array of options
-    *
-    * @access public
-    * @return mixed Net_LDAP2_Error object or attribute values
-    * @see Net_LDAP2_Entry::get_value()
-    */
-    public function getValue($attr = '', $options = '')
-    {
-        return $this->_entry->get_value($attr, $options);
-    }
-
-    /**
-    * Alias function of getValue() for perl-ldap interface
-    *
-    * @see getValue()
-    * @return mixed
-    */
-    public function get_value()
-    {
-        $args = func_get_args();
-        return call_user_func_array(array( &$this, 'getValue' ), $args);
-    }
-
-    /**
-    * Determines if the extension is supported
-    *
-    * @param array $oids Array of oids to check
-    *
-    * @access public
-    * @return boolean
-    */
-    public function supportedExtension($oids)
-    {
-        return $this->checkAttr($oids, 'supportedExtension');
-    }
-
-    /**
-    * Alias function of supportedExtension() for perl-ldap interface
-    *
-    * @see supportedExtension()
-    * @return boolean
-    */
-    public function supported_extension()
-    {
-        $args = func_get_args();
-        return call_user_func_array(array( &$this, 'supportedExtension'), $args);
-    }
-
-    /**
-    * Determines if the version is supported
-    *
-    * @param array $versions Versions to check
-    *
-    * @access public
-    * @return boolean
-    */
-    public function supportedVersion($versions)
-    {
-        return $this->checkAttr($versions, 'supportedLDAPVersion');
-    }
-
-    /**
-    * Alias function of supportedVersion() for perl-ldap interface
-    *
-    * @see supportedVersion()
-    * @return boolean
-    */
-    public function supported_version()
-    {
-        $args = func_get_args();
-        return call_user_func_array(array(&$this, 'supportedVersion'), $args);
-    }
-
-    /**
-    * Determines if the control is supported
-    *
-    * @param array $oids Control oids to check
-    *
-    * @access public
-    * @return boolean
-    */
-    public function supportedControl($oids)
-    {
-        return $this->checkAttr($oids, 'supportedControl');
-    }
-
-    /**
-    * Alias function of supportedControl() for perl-ldap interface
-    *
-    * @see supportedControl()
-    * @return boolean
-    */
-    public function supported_control()
-    {
-        $args = func_get_args();
-        return call_user_func_array(array(&$this, 'supportedControl' ), $args);
-    }
-
-    /**
-    * Determines if the sasl mechanism is supported
-    *
-    * @param array $mechlist SASL mechanisms to check
-    *
-    * @access public
-    * @return boolean

Net_LDAP2-2.0.12.tgz/Net_LDAP2-2.0.12/Net/LDAP2/Schema.php Deleted

@@ -1,622 +0,0 @@
-<?php
-/* vim: set expandtab tabstop=4 shiftwidth=4: */
-/**
-* File containing the Net_LDAP2_Schema interface class.
-*
-* PHP version 5
-*
-* @category  Net
-* @package   Net_LDAP2
-* @author    Jan Wagner <wagner@netsols.de>
-* @author    Benedikt Hallinger <beni@php.net>
-* @copyright 2009 Jan Wagner, Benedikt Hallinger
-* @license   http://www.gnu.org/licenses/lgpl-3.0.txt LGPLv3
-* @version   SVN: $Id: Schema.php 296515 2010-03-22 14:46:41Z beni $
-* @link      http://pear.php.net/package/Net_LDAP2/
-* @todo see the comment at the end of the file
-*/
-
-/**
-* Includes
-*/
-require_once 'PEAR.php';
-
-/**
-* Syntax definitions
-*
-* Please don't forget to add binary attributes to isBinary() below
-* to support proper value fetching from Net_LDAP2_Entry
-*/
-define('NET_LDAP2_SYNTAX_BOOLEAN',            '1.3.6.1.4.1.1466.115.121.1.7');
-define('NET_LDAP2_SYNTAX_DIRECTORY_STRING',   '1.3.6.1.4.1.1466.115.121.1.15');
-define('NET_LDAP2_SYNTAX_DISTINGUISHED_NAME', '1.3.6.1.4.1.1466.115.121.1.12');
-define('NET_LDAP2_SYNTAX_INTEGER',            '1.3.6.1.4.1.1466.115.121.1.27');
-define('NET_LDAP2_SYNTAX_JPEG',               '1.3.6.1.4.1.1466.115.121.1.28');
-define('NET_LDAP2_SYNTAX_NUMERIC_STRING',     '1.3.6.1.4.1.1466.115.121.1.36');
-define('NET_LDAP2_SYNTAX_OID',                '1.3.6.1.4.1.1466.115.121.1.38');
-define('NET_LDAP2_SYNTAX_OCTET_STRING',       '1.3.6.1.4.1.1466.115.121.1.40');
-
-/**
-* Load an LDAP Schema and provide information
-*
-* This class takes a Subschema entry, parses this information
-* and makes it available in an array. Most of the code has been
-* inspired by perl-ldap( http://perl-ldap.sourceforge.net).
-* You will find portions of their implementation in here.
-*
-* @category Net
-* @package  Net_LDAP2
-* @author   Jan Wagner <wagner@netsols.de>
-* @author   Benedikt Hallinger <beni@php.net>
-* @license  http://www.gnu.org/copyleft/lesser.html LGPL
-* @link     http://pear.php.net/package/Net_LDAP22/
-*/
-class Net_LDAP2_Schema extends PEAR
-{
-    /**
-    * Map of entry types to ldap attributes of subschema entry
-    *
-    * @access public
-    * @var array
-    */
-    public $types = array(
-            'attribute'        => 'attributeTypes',
-            'ditcontentrule'   => 'dITContentRules',
-            'ditstructurerule' => 'dITStructureRules',
-            'matchingrule'     => 'matchingRules',
-            'matchingruleuse'  => 'matchingRuleUse',
-            'nameform'         => 'nameForms',
-            'objectclass'      => 'objectClasses',
-            'syntax'           => 'ldapSyntaxes'
-        );
-
-    /**
-    * Array of entries belonging to this type
-    *
-    * @access protected
-    * @var array
-    */
-    protected $_attributeTypes    = array();
-    protected $_matchingRules     = array();
-    protected $_matchingRuleUse   = array();
-    protected $_ldapSyntaxes      = array();
-    protected $_objectClasses     = array();
-    protected $_dITContentRules   = array();
-    protected $_dITStructureRules = array();
-    protected $_nameForms         = array();
-
-
-    /**
-    * hash of all fetched oids
-    *
-    * @access protected
-    * @var array
-    */
-    protected $_oids = array();
-
-    /**
-    * Tells if the schema is initialized
-    *
-    * @access protected
-    * @var boolean
-    * @see parse(), get()
-    */
-    protected $_initialized = false;
-
-
-    /**
-    * Constructor of the class
-    *
-    * @access protected
-    */
-    protected function __construct()
-    {
-        $this->PEAR('Net_LDAP2_Error'); // default error class
-    }
-
-    /**
-    * Fetch the Schema from an LDAP connection
-    *
-    * @param Net_LDAP2 $ldap LDAP connection
-    * @param string    $dn   (optional) Subschema entry dn
-    *
-    * @access public
-    * @return Net_LDAP2_Schema|NET_LDAP2_Error
-    */
-    public function fetch($ldap, $dn = null)
-    {
-        if (!$ldap instanceof Net_LDAP2) {
-            return PEAR::raiseError("Unable to fetch Schema: Parameter \$ldap must be a Net_LDAP2 object!");
-        }
-
-        $schema_o = new Net_LDAP2_Schema();
-
-        if (is_null($dn)) {
-            // get the subschema entry via root dse
-            $dse = $ldap->rootDSE(array('subschemaSubentry'));
-            if (false == Net_LDAP2::isError($dse)) {
-                $base = $dse->getValue('subschemaSubentry', 'single');
-                if (!Net_LDAP2::isError($base)) {
-                    $dn = $base;
-                }
-            }
-        }
-
-        // Support for buggy LDAP servers (e.g. Siemens DirX 6.x) that incorrectly
-        // call this entry subSchemaSubentry instead of subschemaSubentry.
-        // Note the correct case/spelling as per RFC 2251.
-        if (is_null($dn)) {
-            // get the subschema entry via root dse
-            $dse = $ldap->rootDSE(array('subSchemaSubentry'));
-            if (false == Net_LDAP2::isError($dse)) {
-                $base = $dse->getValue('subSchemaSubentry', 'single');
-                if (!Net_LDAP2::isError($base)) {
-                    $dn = $base;
-                }
-            }
-        }
-
-        // Final fallback case where there is no subschemaSubentry attribute
-        // in the root DSE (this is a bug for an LDAP v3 server so report this
-        // to your LDAP vendor if you get this far).
-        if (is_null($dn)) {
-            $dn = 'cn=Subschema';
-        }
-
-        // fetch the subschema entry
-        $result = $ldap->search($dn, '(objectClass=*)',
-                                array('attributes' => array_values($schema_o->types),
-                                        'scope' => 'base'));
-        if (Net_LDAP2::isError($result)) {
-            return PEAR::raiseError('Could not fetch Subschema entry: '.$result->getMessage());
-        }
-
-        $entry = $result->shiftEntry();
-        if (!$entry instanceof Net_LDAP2_Entry) {
-            if ($entry instanceof Net_LDAP2_Error) {
-                return PEAR::raiseError('Could not fetch Subschema entry: '.$entry->getMessage());
-            } else {
-                return PEAR::raiseError('Could not fetch Subschema entry (search returned '.$result->count().' entries. Check parameter \'basedn\')');
-            }
-        }
-
-        $schema_o->parse($entry);
-        return $schema_o;
-    }
-
-    /**
-    * Return a hash of entries for the given type
-    *
-    * Returns a hash of entry for the givene type. Types may be:
-    * objectclasses, attributes, ditcontentrules, ditstructurerules, matchingrules,
-    * matchingruleuses, nameforms, syntaxes
-    *
-    * @param string $type Type to fetch
-    *
-    * @access public
-    * @return array|Net_LDAP2_Error Array or Net_LDAP2_Error
-    */
-    public function &getAll($type)

Net_LDAP2-2.0.12.tgz/Net_LDAP2-2.0.12/Net/LDAP2/SchemaCache.interface.php Deleted

@@ -1,59 +0,0 @@
-<?php
-/* vim: set expandtab tabstop=4 shiftwidth=4: */
-/**
-* File containing the Net_LDAP2_SchemaCache interface class.
-*
-* PHP version 5
-*
-* @category  Net
-* @package   Net_LDAP2
-* @author    Benedikt Hallinger <beni@php.net>
-* @copyright 2009 Benedikt Hallinger
-* @license   http://www.gnu.org/licenses/lgpl-3.0.txt LGPLv3
-* @version   SVN: $Id: SchemaCache.interface.php 286718 2009-08-03 07:30:49Z beni $
-* @link      http://pear.php.net/package/Net_LDAP2/
-*/
-
-/**
-* Interface describing a custom schema cache object
-*
-* To implement a custom schema cache, one must implement this interface and
-* pass the instanciated object to Net_LDAP2s registerSchemaCache() method.
-*/
-interface Net_LDAP2_SchemaCache
-{
-    /**
-    * Return the schema object from the cache
-    *
-    * Net_LDAP2 will consider anything returned invalid, except
-    * a valid Net_LDAP2_Schema object.
-    * In case you return a Net_LDAP2_Error, this error will be routed
-    * to the return of the $ldap->schema() call.
-    * If you return something else, Net_LDAP2 will
-    * fetch a fresh Schema object from the LDAP server.
-    *
-    * You may want to implement a cache aging mechanism here too.
-    *
-    * @return Net_LDAP2_Schema|Net_LDAP2_Error|false
-    */
-    public function loadSchema();
-
-    /**
-    * Store a schema object in the cache
-    *
-    * This method will be called, if Net_LDAP2 has fetched a fresh
-    * schema object from LDAP and wants to init or refresh the cache.
-    *
-    * In case of errors you may return a Net_LDAP2_Error which will
-    * be routet to the client.
-    * Note that doing this prevents, that the schema object fetched from LDAP
-    * will be given back to the client, so only return errors if storing
-    * of the cache is something crucial (e.g. for doing something else with it).
-    * Normaly you dont want to give back errors in which case Net_LDAP2 needs to
-    * fetch the schema once per script run and instead use the error
-    * returned from loadSchema().
-    *
-    * @return true|Net_LDAP2_Error
-    */
-    public function storeSchema($schema);
-}

Net_LDAP2-2.0.12.tgz/Net_LDAP2-2.0.12/Net/LDAP2/Search.php Deleted

@@ -1,624 +0,0 @@
-<?php
-/* vim: set expandtab tabstop=4 shiftwidth=4: */
-/**
-* File containing the Net_LDAP2_Search interface class.
-*
-* PHP version 5
-*
-* @category  Net
-* @package   Net_LDAP2
-* @author    Tarjej Huse <tarjei@bergfald.no>
-* @author    Benedikt Hallinger <beni@php.net>
-* @copyright 2009 Tarjej Huse, Benedikt Hallinger
-* @license   http://www.gnu.org/licenses/lgpl-3.0.txt LGPLv3
-* @version   SVN: $Id: Search.php 315417 2011-08-24 12:11:39Z beni $
-* @link      http://pear.php.net/package/Net_LDAP2/
-*/
-
-/**
-* Includes
-*/
-require_once 'PEAR.php';
-
-/**
-* Result set of an LDAP search
-*
-* @category Net
-* @package  Net_LDAP2
-* @author   Tarjej Huse <tarjei@bergfald.no>
-* @author   Benedikt Hallinger <beni@php.net>
-* @license  http://www.gnu.org/copyleft/lesser.html LGPL
-* @link     http://pear.php.net/package/Net_LDAP22/
-*/
-class Net_LDAP2_Search extends PEAR implements Iterator
-{
-    /**
-    * Search result identifier
-    *
-    * @access protected
-    * @var resource
-    */
-    protected $_search;
-
-    /**
-    * LDAP resource link
-    *
-    * @access protected
-    * @var resource
-    */
-    protected $_link;
-
-    /**
-    * Net_LDAP2 object
-    *
-    * A reference of the Net_LDAP2 object for passing to Net_LDAP2_Entry
-    *
-    * @access protected
-    * @var object Net_LDAP2
-    */
-    protected $_ldap;
-
-    /**
-    * Result entry identifier
-    *
-    * @access protected
-    * @var resource
-    */
-    protected $_entry = null;
-
-    /**
-    * The errorcode the search got
-    *
-    * Some errorcodes might be of interest, but might not be best handled as errors.
-    * examples: 4 - LDAP_SIZELIMIT_EXCEEDED - indicates a huge search.
-    *               Incomplete results are returned. If you just want to check if there's anything in the search.
-    *               than this is a point to handle.
-    *           32 - no such object - search here returns a count of 0.
-    *
-    * @access protected
-    * @var int
-    */
-    protected $_errorCode = 0; // if not set - sucess!
-
-    /**
-    * Cache for all entries already fetched from iterator interface
-    *
-    * @access protected
-    * @var array
-    */
-    protected $_iteratorCache = array();
-
-    /**
-    * What attributes we searched for
-    *
-    * The $attributes array contains the names of the searched attributes and gets
-    * passed from $Net_LDAP2->search() so the Net_LDAP2_Search object can tell
-    * what attributes was searched for ({@link searchedAttrs())
-    *
-    * This variable gets set from the constructor and returned
-    * from {@link searchedAttrs()}
-    *
-    * @access protected
-    * @var array
-    */
-    protected $_searchedAttrs = array();
-
-    /**
-    * Cache variable for storing entries fetched internally
-    *
-    * This currently is only used by {@link pop_entry()}
-    *
-    * @access protected
-    * @var array
-    */
-    protected $_entry_cache = false;
-
-    /**
-    * Cache variable for count()
-    *
-    * @see count()
-    * @access protected
-    * @var int
-    */
-    protected $_count_cache = null;
-
-    /**
-    * Constructor
-    *
-    * @param resource           &$search    Search result identifier
-    * @param Net_LDAP2|resource &$ldap      Net_LDAP2 object or just a LDAP-Link resource
-    * @param array              $attributes (optional) Array with searched attribute names. (see {@link $_searchedAttrs})
-    *
-    * @access public
-    */
-    public function __construct(&$search, &$ldap, $attributes = array())
-    {
-        $this->PEAR('Net_LDAP2_Error');
-
-        $this->setSearch($search);
-
-        if ($ldap instanceof Net_LDAP2) {
-            $this->_ldap =& $ldap;
-            $this->setLink($this->_ldap->getLink());
-        } else {
-            $this->setLink($ldap);
-        }
-
-        $this->_errorCode = @ldap_errno($this->_link);
-
-        if (is_array($attributes) && !empty($attributes)) {
-            $this->_searchedAttrs = $attributes;
-        }
-    }
-
-    /**
-    * Returns an array of entry objects
-    *
-    * @return array Array of entry objects.
-    */
-    public function entries()
-    {
-        $entries = array();
-
-        while ($entry = $this->shiftEntry()) {
-            $entries[] = $entry;
-        }
-
-        return $entries;
-    }
-
-    /**
-    * Get the next entry in the searchresult.
-    *
-    * This will return a valid Net_LDAP2_Entry object or false, so
-    * you can use this method to easily iterate over the entries inside
-    * a while loop.
-    *
-    * @return Net_LDAP2_Entry|false  Reference to Net_LDAP2_Entry object or false
-    */
-    public function &shiftEntry()
-    {
-        if (is_null($this->_entry)) {
-            $this->_entry = @ldap_first_entry($this->_link, $this->_search);
-            $entry = Net_LDAP2_Entry::createConnected($this->_ldap, $this->_entry);
-            if ($entry instanceof Net_LDAP2_Error) $entry = false;
-        } else {
-            if (!$this->_entry = @ldap_next_entry($this->_link, $this->_entry)) {
-                $false = false;
-                return $false;
-            }
-            $entry = Net_LDAP2_Entry::createConnected($this->_ldap, $this->_entry);
-            if ($entry instanceof Net_LDAP2_Error) $entry = false;
-        }
-        return $entry;
-    }
-
-    /**
-    * Alias function of shiftEntry() for perl-ldap interface
-    *
-    * @see shiftEntry()

Net_LDAP2-2.0.12.tgz/Net_LDAP2-2.0.12/Net/LDAP2/SimpleFileSchemaCache.php Deleted

@@ -1,97 +0,0 @@
-<?php
-/* vim: set expandtab tabstop=4 shiftwidth=4: */
-/**
-* File containing the example simple file based Schema Caching class.
-*
-* PHP version 5
-*
-* @category  Net
-* @package   Net_LDAP2
-* @author    Benedikt Hallinger <beni@php.net>
-* @copyright 2009 Benedikt Hallinger
-* @license   http://www.gnu.org/licenses/lgpl-3.0.txt LGPLv3
-* @version   SVN: $Id: SimpleFileSchemaCache.php 286718 2009-08-03 07:30:49Z beni $
-* @link      http://pear.php.net/package/Net_LDAP2/
-*/
-
-/**
-* A simple file based schema cacher with cache aging.
-*
-* Once the cache is too old, the loadSchema() method will return false, so
-* Net_LDAP2 will fetch a fresh object from the LDAP server that will
-* overwrite the current (outdated) old cache.
-*/
-class Net_LDAP2_SimpleFileSchemaCache implements Net_LDAP2_SchemaCache
-{
-    /**
-    * Internal config of this cache
-    *
-    * @see Net_LDAP2_SimpleFileSchemaCache()
-    * @var array
-    */
-    protected $config = array(
-        'path'    => '/tmp/Net_LDAP_Schema.cache',
-        'max_age' => 1200
-    );
-
-    /**
-    * Initialize the simple cache
-    *
-    * Config is as following:
-    *  path     Complete path to the cache file.
-    *  max_age  Maximum age of cache in seconds, 0 means "endlessly".
-    *
-    * @param array $cfg Config array
-    */
-    public function Net_LDAP2_SimpleFileSchemaCache($cfg)
-    {
-    	foreach ($cfg as $key => $value) {
-			if (array_key_exists($key, $this->config)) {
-				if (gettype($this->config[$key]) != gettype($value)) {
-					$this->getCore()->dropFatalError(__CLASS__.": Could not set config! Key $key does not match type ".gettype($this->config[$key])."!");
-				}
-				$this->config[$key] = $value;
-			} else {
-				$this->getCore()->dropFatalError(__CLASS__.": Could not set config! Key $key is not defined!");
-			}
-		}
-    }
-
-    /**
-    * Return the schema object from the cache
-    *
-    * If file is existent and cache has not expired yet,
-    * then the cache is deserialized and returned.
-    *
-    * @return Net_LDAP2_Schema|Net_LDAP2_Error|false
-    */
-    public function loadSchema()
-    {
-         $return = false; // Net_LDAP2 will load schema from LDAP
-         if (file_exists($this->config['path'])) {
-             $cache_maxage = filemtime($this->config['path']) + $this->config['max_age'];
-             if (time() <= $cache_maxage || $this->config['max_age'] == 0) {
-                 $return = unserialize(file_get_contents($this->config['path']));
-             }
-         }
-         return $return;
-    }
-
-    /**
-    * Store a schema object in the cache
-    *
-    * This method will be called, if Net_LDAP2 has fetched a fresh
-    * schema object from LDAP and wants to init or refresh the cache.
-    *
-    * To invalidate the cache and cause Net_LDAP2 to refresh the cache,
-    * you can call this method with null or false as value.
-    * The next call to $ldap->schema() will then refresh the caches object.
-    *
-    * @param mixed $schema The object that should be cached
-    * @return true|Net_LDAP2_Error|false
-    */
-    public function storeSchema($schema) {
-        file_put_contents($this->config['path'], serialize($schema));
-        return true;
-    }
-}

Net_LDAP2-2.0.12.tgz/Net_LDAP2-2.0.12/Net/LDAP2/Util.php Deleted

@@ -1,572 +0,0 @@
-<?php
-/* vim: set expandtab tabstop=4 shiftwidth=4: */
-/**
-* File containing the Net_LDAP2_Util interface class.
-*
-* PHP version 5
-*
-* @category  Net
-* @package   Net_LDAP2
-* @author    Benedikt Hallinger <beni@php.net>
-* @copyright 2009 Benedikt Hallinger
-* @license   http://www.gnu.org/licenses/lgpl-3.0.txt LGPLv3
-* @version   SVN: $Id: Util.php 286718 2009-08-03 07:30:49Z beni $
-* @link      http://pear.php.net/package/Net_LDAP2/
-*/
-
-/**
-* Includes
-*/
-require_once 'PEAR.php';
-
-/**
-* Utility Class for Net_LDAP2
-*
-* This class servers some functionality to the other classes of Net_LDAP2 but most of
-* the methods can be used separately as well.
-*
-* @category Net
-* @package  Net_LDAP2
-* @author   Benedikt Hallinger <beni@php.net>
-* @license  http://www.gnu.org/copyleft/lesser.html LGPL
-* @link     http://pear.php.net/package/Net_LDAP22/
-*/
-class Net_LDAP2_Util extends PEAR
-{
-    /**
-     * Constructor
-     *
-     * @access public
-     */
-    public function __construct()
-    {
-         // We do nothing here, since all methods can be called statically.
-         // In Net_LDAP <= 0.7, we needed a instance of Util, because
-         // it was possible to do utf8 encoding and decoding, but this
-         // has been moved to the LDAP class. The constructor remains only
-         // here to document the downward compatibility of creating an instance.
-    }
-
-    /**
-    * Explodes the given DN into its elements
-    *
-    * {@link http://www.ietf.org/rfc/rfc2253.txt RFC 2253} says, a Distinguished Name is a sequence
-    * of Relative Distinguished Names (RDNs), which themselves
-    * are sets of Attributes. For each RDN a array is constructed where the RDN part is stored.
-    *
-    * For example, the DN 'OU=Sales+CN=J. Smith,DC=example,DC=net' is exploded to:
-    * <kbd>array( [0] => array([0] => 'OU=Sales', [1] => 'CN=J. Smith'), [2] => 'DC=example', [3] => 'DC=net' )</kbd>
-    *
-    * [NOT IMPLEMENTED] DNs might also contain values, which are the bytes of the BER encoding of
-    * the X.500 AttributeValue rather than some LDAP string syntax. These values are hex-encoded
-    * and prefixed with a #. To distinguish such BER values, ldap_explode_dn uses references to
-    * the actual values, e.g. '1.3.6.1.4.1.1466.0=#04024869,DC=example,DC=com' is exploded to:
-    * [ { '1.3.6.1.4.1.1466.0' => "\004\002Hi" }, { 'DC' => 'example' }, { 'DC' => 'com' } ];
-    * See {@link http://www.vijaymukhi.com/vmis/berldap.htm} for more information on BER.
-    *
-    *  It also performs the following operations on the given DN:
-    *   - Unescape "\" followed by ",", "+", """, "\", "<", ">", ";", "#", "=", " ", or a hexpair
-    *     and strings beginning with "#".
-    *   - Removes the leading 'OID.' characters if the type is an OID instead of a name.
-    *   - If an RDN contains multiple parts, the parts are re-ordered so that the attribute type names are in alphabetical order.
-    *
-    * OPTIONS is a list of name/value pairs, valid options are:
-    *   casefold    Controls case folding of attribute types names.
-    *               Attribute values are not affected by this option.
-    *               The default is to uppercase. Valid values are:
-    *               lower        Lowercase attribute types names.
-    *               upper        Uppercase attribute type names. This is the default.
-    *               none         Do not change attribute type names.
-    *   reverse     If TRUE, the RDN sequence is reversed.
-    *   onlyvalues  If TRUE, then only attributes values are returned ('foo' instead of 'cn=foo')
-    *
-
-    * @param string $dn      The DN that should be exploded
-    * @param array  $options Options to use
-    *
-    * @static
-    * @return array   Parts of the exploded DN
-    * @todo implement BER
-    */
-    public static function ldap_explode_dn($dn, $options = array('casefold' => 'upper'))
-    {
-        if (!isset($options['onlyvalues'])) $options['onlyvalues']  = false;
-        if (!isset($options['reverse']))    $options['reverse']     = false;
-        if (!isset($options['casefold']))   $options['casefold']    = 'upper';
-
-        // Escaping of DN and stripping of "OID."
-        $dn = self::canonical_dn($dn, array('casefold' => $options['casefold']));
-
-        // splitting the DN
-        $dn_array = preg_split('/(?<=[^\\\\]),/', $dn);
-
-        // clear wrong splitting (possibly we have split too much)
-        // /!\ Not clear, if this is neccessary here
-        //$dn_array = self::correct_dn_splitting($dn_array, ',');
-
-        // construct subarrays for multivalued RDNs and unescape DN value
-        // also convert to output format and apply casefolding
-        foreach ($dn_array as $key => $value) {
-            $value_u = self::unescape_dn_value($value);
-            $rdns    = self::split_rdn_multival($value_u[0]);
-            if (count($rdns) > 1) {
-                // MV RDN!
-                foreach ($rdns as $subrdn_k => $subrdn_v) {
-                    // Casefolding
-                    if ($options['casefold'] == 'upper') $subrdn_v = preg_replace("/^(\w+=)/e", "''.strtoupper('\\1').''", $subrdn_v);
-                    if ($options['casefold'] == 'lower') $subrdn_v = preg_replace("/^(\w+=)/e", "''.strtolower('\\1').''", $subrdn_v);
-
-                    if ($options['onlyvalues']) {
-                        preg_match('/(.+?)(?<!\\\\)=(.+)/', $subrdn_v, $matches);
-                        $rdn_ocl         = $matches[1];
-                        $rdn_val         = $matches[2];
-                        $unescaped       = self::unescape_dn_value($rdn_val);
-                        $rdns[$subrdn_k] = $unescaped[0];
-                    } else {
-                        $unescaped = self::unescape_dn_value($subrdn_v);
-                        $rdns[$subrdn_k] = $unescaped[0];
-                    }
-                }
-
-                $dn_array[$key] = $rdns;
-            } else {
-                // normal RDN
-
-                // Casefolding
-                if ($options['casefold'] == 'upper') $value = preg_replace("/^(\w+=)/e", "''.strtoupper('\\1').''", $value);
-                if ($options['casefold'] == 'lower') $value = preg_replace("/^(\w+=)/e", "''.strtolower('\\1').''", $value);
-
-                if ($options['onlyvalues']) {
-                    preg_match('/(.+?)(?<!\\\\)=(.+)/', $value, $matches);
-                    $dn_ocl         = $matches[1];
-                    $dn_val         = $matches[2];
-                    $unescaped      = self::unescape_dn_value($dn_val);
-                    $dn_array[$key] = $unescaped[0];
-                } else {
-                    $unescaped = self::unescape_dn_value($value);
-                    $dn_array[$key] = $unescaped[0];
-                }
-            }
-        }
-
-        if ($options['reverse']) {
-            return array_reverse($dn_array);
-        } else {
-            return $dn_array;
-        }
-    }
-
-    /**
-    * Escapes a DN value according to RFC 2253
-    *
-    * Escapes the given VALUES according to RFC 2253 so that they can be safely used in LDAP DNs.
-    * The characters ",", "+", """, "\", "<", ">", ";", "#", "=" with a special meaning in RFC 2252
-    * are preceeded by ba backslash. Control characters with an ASCII code < 32 are represented as \hexpair.
-    * Finally all leading and trailing spaces are converted to sequences of \20.
-    *
-    * @param array $values An array containing the DN values that should be escaped
-    *
-    * @static
-    * @return array The array $values, but escaped
-    */
-    public static function escape_dn_value($values = array())
-    {
-        // Parameter validation
-        if (!is_array($values)) {
-            $values = array($values);
-        }
-
-        foreach ($values as $key => $val) {
-            // Escaping of filter meta characters
-            $val = str_replace('\\', '\\\\', $val);
-            $val = str_replace(',',    '\,', $val);
-            $val = str_replace('+',    '\+', $val);
-            $val = str_replace('"',    '\"', $val);
-            $val = str_replace('<',    '\<', $val);
-            $val = str_replace('>',    '\>', $val);
-            $val = str_replace(';',    '\;', $val);
-            $val = str_replace('#',    '\#', $val);
-            $val = str_replace('=',    '\=', $val);
-
-            // ASCII < 32 escaping
-            $val = self::asc2hex32($val);
-
-            // Convert all leading and trailing spaces to sequences of \20.
-            if (preg_match('/^(\s*)(.+?)(\s*)$/', $val, $matches)) {
-                $val = $matches[2];
-                for ($i = 0; $i < strlen($matches[1]); $i++) {
-                    $val = '\20'.$val;
-                }

Net_LDAP2-2.0.12.tgz/Net_LDAP2-2.0.12/doc/manual.html Deleted

@@ -1,248 +0,0 @@
-<html>
-<head>
-	<title>Net_LDAP2 Manual</title>
-	<style type="text/css">
-		pre { border: 1px solid #000000; background-color:#EBEBEB; padding:5px; }
-	</style>
-</head>
-<body>
-<h1>Net_LDAP2 Manual</h1>
-Welcome to the Net_LDAP2 user manual! here you have a quick introduction on
-how to use Net_LDAP2 to acces your directory server with php.
-<p><font color="red">Note that this manual is only a brief introduction and also may be outdated.
-The official manual is available at the <a href="http://pear.php.net/package/Net_LDAP2/docs">PEAR project website.</a>
-The reason this manual remains here is, that it may be useful in cases you don't have internet
-acces at the moment.</font></p>
-
-<h2>First step: Connect</h2>
-<p>
-To do this, use the Net_LDAP2::connect function like this:
-
-<p><pre>
-require_once('Net_LDAP22/LDAP2.php');
-
-$config = array (
-            'binddn'   => 'uid=tarjei,dc=php,dc=net',
-            'bindpw' => 'secret',
-            'basedn'   => dc=php,dc=net
-          );
-
-$ldap = Net_LDAP2::connect($config);
-</pre></p>
-</p>
-<p>
-But what are valid values in the config array?
-<ul>Here's a quick table: (defaults)
-     <li><b>binddn</b>   = the DN to bind as. (none)</li>
-     <li><b>bindpw</b>   = Password of the user specified by 'binddn' (none)</li>
-     <li><b>host</b>     = the ldap host to connect to (localhost)</li>
-     <li><b>base</b>     = ldap base, this is usually the Entry point of your directory (none)</li>
-     <li><b>port</b>     = the server port (389)</li>
-     <li><b>starttls</b> = when set, ldap_start_tls() is run after connecting. (false)</li>
-     <li><b>version</b>  = ldap version (defaults to v 3) </li>
-     <li><b>filter</b>   = default search filter (objectclass=*)</li>
-     <li><b>scope</b>    = default search scope (sub)</li>
-</ul>
-We'll get back to these later.
-</p>
-
-
-
-<h2>Errorhandling</h2>
-<p>
-Now you should have the base ldapobject stored in the variable "$ldap".
-But, what if it is an error? Net_LDAP2 returns a Net_LDAP2_error object (basicly a
-pear_error object) when an error occurs. So wherever you need to check an error, do like this:
-<p><pre>
-$ldap = Net_LDAP2::connect($config); // copied from above! 
-
-if (Net_LDAP2::isError($ldap)) {
-   print $ldap->getMessage(); // this will tell you what went wrong!
-}
-
-</pre></p>
-</p>
-<p>
-Two things to note:
-
-<br>1) The function is_a() might be faster:
-<p><pre>
-if (is_a($ldap,'net_ldap_error')) {
-// do the same as above
-}
-</pre></p>
-In PHP5 you must use the instanceof operator instead of is_a().
-
-<br>2) Net_LDAP2_Error can also return an errornumber. These numbers are standardized. A good description of what they mean is found there:
-http://www.directory-info.com/LDAP2/LDAPErrorCodes.html
-</p>
-
-
-
-<h2>Searching (basics)</h2>
-<p>
-Most of the work you do on an ldapserver is in searching,
-for example, you search for your boss's password or his wife's phonenumber.
-<br>Searching an ldapserver is a bit like doing SQL and a lot not like it at all.</br>
-Think of the directory as some sort of "telephone book".
-Basically, searches are performed by applying a "filter" to objects under a
-specific "base" in the directory. Additionally, there is a "scope" applied to the search,
-so you can specify the recursion level in the directory tree.
-</p>
-<p>
-<h3>Base:</h3>
-The "base" is the point under the directory where you want to search under.
-To search for all people under php.net, you may use: "ou=People,dc=php,dc=net".
-But if you want just to search the devs, you can use "ou=dev,ou=People,dc=php,dc=net".
-</p>
-<p>
-<h3>Filter:</h3> Filters define what you are looking for. They "filter out" unwanted entries.
-<br>Filters start with a ( and end with a ). There is a lot to be said about filters, most is better said by examples:
-
-<br><br><b>(&(objectclass=posixAccount)(uid=boss)) :</b> The object has to satisfy both filters.
-I.e. an object that is both boss and an posixAccount. If you had another object
-with uid=boss but that wasn't an postixaccount it would be excluded.
-<br><b>(|(uid=boss)(uid=secretary)) :</b> Either the boss or the secretary. 
-Note that both logical operators are placed before the filters not between the
-two conditions as you might used to from sql.
-<br><b>(&(objectclass=posixAccount)(|(uid=boss)(uid=secretary))) :</b>
-Here they must have the posixAccount objectclass as well.
-
-<b>(objectclass=*) :</b> All objects must have an objectclass, so this is the simplest way of saying everything.
-
-<b>(uid=t*) :</b> With the right indexes on the server, you may search the substring of an attriute. Here; all users with the first name beginning with a "T".
-
-<br>Please note, that Net_LDAP2 provides a filter class for simplier generation and combination of filters.
-You should use that class unless you know how filters work. This will save you a lot of trouble,
-since there are some encoding issues with ldap-filters. If you want to provide the filter yourself,
-you should also have a look to <a href="http://www.ietf.org/rfc/rfc1558.txt">RFC #1558</a> defining LDAP-Filters.
-</p>
-
-<p>
-<h3>Searchscope</h3>
-The scope of an search may be three things:
-<ul>
-	<li><b>'base'</b> = Just the entry in question.</li>
-	<li><b>'sub'</b> = All subentries.</li>
-	<li><b>'one'</b> = All entries just below the searchbase.</li>
-</ul>
-
-Searching with scope 'base' may be handy for getting just one entry. But then again, that's what the getEntry function does.
-</p>
-
-<p>
-<h3>Searching some entries</h3>
-We know now, how to search, so we will test out our new knowledge.
-We want to search all person entries whose second name starts with "Ha", but only developers.
-Later we want to know the name and the telephone number of the persons.
-<pre>
-$filter = '(&(objectclass=person)(sn=Ha*))';
-$searchbase = 'ou=dev,ou=People,dc=php,dc=net';
-$options = array(
-               'scope' => 'sub',        // all entries below the searchbase (recursive all subtrees from there)
-               'attributes' => array('sn','gn','telephonenumber')  // what attributes to select
-           );
-$search = $ldap->search($searchbase, $filter, $options);
-</pre>
-$search should now be an Net_LDAP2_Search object.
-<br>Okay, now we assume that everything was fine (in production, test for error!).
-We have several options now.
-We can fetch the found entries at once sorted ($search->sorted()) or unsorted ($search->entries()), or we can read
-the objects one by one inside a loop using $search->shiftEntry(). See the class documentation of Net_LDAP2_Search
-for more details.
-</p>
-
-<h2>Entries</h2>
-<p>
-This describes how to get an entry and modifying it.
-If we just want one single entry, it may be useful to directly fetch that entry instead
-of searching it manually. To do this you can use Net_LDAP2s "getEntry()" method:
-<pre>
-$dn = 'cn=Foo Bar,ou=dev,ou=People,dc=php,dc=net';
-$entry =& $ldap->getEntry($dn, array('sn','gn','telephonenumber'));
-</pre>
-</p>
-With this entry object you now can perform some actions like fetching the contents of attributes:
-<pre>
-$telephonenumber =    $entry->getValue('telephonenumber','single');
-</pre>
-Or you can modify a attribute:
-<pre>
-$entry->replace("telephonenumber" => "0123456789");   // replace the attributes values with the new number
-$entry->update();  // update temporarily modified entry on the server
-</pre>
-Of course there are much more other possibilitys. Please note that adding and deleting 
-whole entrys is performed through the Net_LDAP2 class and not with the Net_LDAP2_Entry class.
-
-<h2>Schemas</h2>
-You may also use Net_LDAP2 to find out what schemas your ldap-server supports. Here's an example of how:
-<pre>
-$schema = $ldap->schema();
-</pre>
-Now you got a schemaobject.
-To read from this schemaobject, you have several methods defined in the class Net_LDAP2_Schema.
-<br>For example, to find out which attributes are required for inetOrgPerson, you do this:
-<pre>
-$required = $schema->must( 'inetOrgUser' );
-
-print_r($required);
-/* The output of this will be:
-Array
-(
-     [0] => sn
-     [1] => cn
-)
-*/
-</pre>
-
-Ok, but what kind of attribute is sn? Let's check:
-<pre>

Net_LDAP2-2.0.12.tgz/Net_LDAP2-2.0.12/tests/AllTests.php Deleted

@@ -1,50 +0,0 @@
-<?php
-if (!defined('PHPUnit_MAIN_METHOD')) {
-    define('PHPUnit_MAIN_METHOD', 'Net_LDAP2_AllTests::main');
-}
-
-// PHPUnit inlcudes
-require_once 'PHPUnit/TextUI/TestRunner.php';
-
-// Net_LDAP2 test suites includes
-require_once 'Net_LDAP2_FilterTest.php';
-require_once 'Net_LDAP2_UtilTest.php';
-require_once 'Net_LDAP2Test.php';
-require_once 'Net_LDAP2_EntryTest.php';
-require_once 'Net_LDAP2_RootDSETest.php';
-require_once 'Net_LDAP2_SearchTest.php';
-require_once 'Net_LDAP2_LDIFTest.php';
-
-class Net_LDAP2_AllTests
-{
-    public static function main()
-    {
-
-        PHPUnit_TextUI_TestRunner::run(self::suite());
-    }
-
-    public static function suite()
-    {
-        $suite = new PHPUnit_Framework_TestSuite('Net_LDAP2 Tests');
-
-       // LDAP independent tests
-       $suite->addTestSuite('Net_LDAP2_FilterTest');
-       $suite->addTestSuite('Net_LDAP2_UtilTest');
-       $suite->addTestSuite('Net_LDAP2_LDIFTest');
-
-       // LDAP dependent tests (require a LDAP server)
-       $suite->addTestSuite('Net_LDAP2Test');
-       $suite->addTestSuite('Net_LDAP2_SearchTest');
-       $suite->addTestSuite('Net_LDAP2_EntryTest');
-       $suite->addTestSuite('Net_LDAP2_RootDSETest');
-
-        return $suite;
-    }
-}
-
-
-// exec test suite
-if (PHPUnit_MAIN_METHOD == 'Net_LDAP2_AllTests::main') {
-    Net_LDAP2_AllTests::main();
-}
-?>

Net_LDAP2-2.0.12.tgz/Net_LDAP2-2.0.12/tests/Net_LDAP2Test.php Deleted

@@ -1,921 +0,0 @@
-<?php
-// Call Net_LDAP2Test::main() if this source file is executed directly.
-if (!defined("PHPUnit_MAIN_METHOD")) {
-    define("PHPUnit_MAIN_METHOD", "Net_LDAP2Test::main");
-}
-
-require_once "PHPUnit/Framework/TestCase.php";
-require_once "PHPUnit/Framework/TestSuite.php";
-
-require_once 'Net/LDAP2.php';
-require_once 'Net/LDAP2/Entry.php';
-
-/**
- * Test class for Net_LDAP2.
- * Generated by PHPUnit_Util_Skeleton on 2007-10-09 at 10:32:36.
- */
-class Net_LDAP2Test extends PHPUnit_Framework_TestCase {
-    /**
-    * Stores the LDAP configuration
-    */
-    var $ldapcfg = false;
-
-    /**
-     * Runs the test methods of this class.
-     *
-     * @access public
-     * @static
-     */
-    public static function main() {
-        require_once "PHPUnit/TextUI/TestRunner.php";
-
-        $suite  = new PHPUnit_Framework_TestSuite("Net_LDAP2Test");
-        $result = PHPUnit_TextUI_TestRunner::run($suite);
-    }
-
-    /**
-     * Load ldap config and adjust appropriately
-     *
-     * @access protected
-     */
-    protected function setUp() {
-        $this->ldapcfg = $this->getTestConfig();
-    }
-
-    /**
-     * Tears down the fixture, for example, close a network connection.
-     * This method is called after a test is executed.
-     *
-     * @access protected
-     */
-    protected function tearDown() {
-    }
-
-    /**
-     * This checks if a valid LDAP testconfig is present and loads it.
-     *
-     * If so, it is loaded and returned as array. If not, false is returned.
-     *
-     * @return false|array
-     */
-    public function getTestConfig() {
-        $config = false;
-        $file = dirname(__FILE__).'/ldapconfig.ini';
-        if (file_exists($file) && is_readable($file)) {
-            $config = parse_ini_file($file, true);
-        } else {
-            return false;
-        }
-        // validate ini
-        $v_error = $file.' is probably invalid. Did you quoted values correctly?';
-        $this->assertTrue(array_key_exists('global', $config), $v_error);
-        $this->assertTrue(array_key_exists('test', $config), $v_error);
-        $this->assertEquals(7, count($config['global']), $v_error);
-        $this->assertEquals(7, count($config['test']), $v_error);
-
-        // reformat things a bit, for convinience
-        $config['global']['server_binddn'] =
-            $config['global']['server_binddn'].','.$config['global']['server_base_dn'];
-        $config['test']['existing_attrmv'] = explode('|', $config['test']['existing_attrmv']);
-        return $config;
-    }
-
-    /**
-    * Establishes a working connection
-    *
-    * @return Net_LDAP2
-    */
-    public function &connect() {
-        // Check extension
-        if (true !== Net_LDAP2::checkLDAPExtension()) {
-            $this->markTestSkipped('PHP LDAP extension not found or not loadable. Skipped Test.');
-        }
-
-        // Simple working connect and privilegued bind
-        $lcfg = array(
-                'host'   => $this->ldapcfg['global']['server_address'],
-                'port'   => $this->ldapcfg['global']['server_port'],
-                'basedn' => $this->ldapcfg['global']['server_base_dn'],
-                'binddn' => $this->ldapcfg['global']['server_binddn'],
-                'bindpw' => $this->ldapcfg['global']['server_bindpw'],
-                'filter' => '(ou=*)',
-            );
-        $ldap = Net_LDAP2::connect($lcfg);
-        $this->assertType('Net_LDAP2', $ldap, 'Connect failed but was supposed to work. Check credentials and host address. If those are correct, file a bug!');
-        return $ldap;
-    }
-
-/* ---------- TESTS ---------- */
-
-    /**
-     * testCheckLDAPExtension().
-     *
-     * @todo can we unload modules at runtime??
-     */
-    public function testCheckLDAPExtension() {
-        if (extension_loaded('ldap')) {
-            // If extension is already loaded, then we must get true.
-            $this->assertTrue(Net_LDAP2::checkLDAPExtension());
-        } else {
-            // If not, we should be able to load it - but may fail
-            $this->assertThat(Net_LDAP2::checkLDAPExtension(),
-                $this->logicalOr($this->isInstanceOf('Net_LDAP2_Error'), $this->equalTo(true)));
-        }
-    }
-
-    /**
-     * Tests if getVersion() works correctly
-     */
-    public function testGetVersion() {
-        $this->assertTrue(defined('NET_LDAP2_VERSION'));
-        $this->assertEquals(NET_LDAP2_VERSION, Net_LDAP2::getVersion());
-    }
-
-    /**
-     * Tests if the server can connect and bind correctly
-     */
-    public function testConnectAndPrivileguedBind() {
-        // Check extension
-        if (true !== Net_LDAP2::checkLDAPExtension()) {
-            $this->markTestSkipped('PHP LDAP extension not found or not loadable. Skipped Test.');
-        }
-
-        if (!$this->ldapcfg) {
-            $this->markTestSkipped('No ldapconfig.ini found. Skipping test!');
-        } else {
-            // This connect is supposed to fail
-            $lcfg = array(
-                    'host' => 'pear.net-ldap.test.hostunknown.cno',
-                );
-            $ldap = Net_LDAP2::connect($lcfg);
-            $this->assertType('Net_LDAP2_Error', $ldap, 'Connect succeeded but was supposed to fail!');
-
-            // Failing with multiple hosts
-            $lcfg = array(
-                    'host' => array('pear.net-ldap.test.hostunknown1.cno', 'pear.net-ldap.test.hostunknown2.cno'),
-                );
-            $ldap = Net_LDAP2::connect($lcfg);
-            $this->assertType('Net_LDAP2_Error', $ldap, 'Connect succeeded but was supposed to fail!');
-
-            // Simple working connect and privilegued bind
-            $ldap =& $this->connect();
-
-            // Working connect and privilegued bind with first host down
-            $lcfg = array(
-                    'host'   => array(
-                            'pear.net-ldap.test.hostunknown1.cno',
-                            $this->ldapcfg['global']['server_address']
-                        ),
-                    'port'   => $this->ldapcfg['global']['server_port'],
-                    'binddn' => $this->ldapcfg['global']['server_binddn'],
-                    'bindpw' => $this->ldapcfg['global']['server_bindpw'],
-                );
-            $ldap = Net_LDAP2::connect($lcfg);
-            $this->assertType('Net_LDAP2', $ldap, 'Connect failed but was supposed to work. Check credentials and host address. If those are correct, file a bug!');
-        }
-    }
-
-    /**
-     * Tests if the server can connect and bind anonymously, if supported (->cfg and ldap mode)
-     */
-    public function testConnectAndAnonymousBind() {
-        // Check extension
-        if (true !== Net_LDAP2::checkLDAPExtension()) {
-            $this->markTestSkipped('PHP LDAP extension not found or not loadable. Skipped Test.');
-        }
-
-        if (!$this->ldapcfg) {
-            $this->markTestSkipped('No ldapconfig.ini found. Skipping test!');
-        } elseif ($this->ldapcfg['global']['server_cap_anonymous'] == true) {
-            // Simple working connect and anonymous bind
-            $lcfg = array(
-                    'host'   => $this->ldapcfg['global']['server_address'],
-                    'port'   => $this->ldapcfg['global']['server_port'],
-                );
-            $ldap = Net_LDAP2::connect($lcfg);
-            $this->assertType('Net_LDAP2', $ldap, 'Connect failed but was supposed to work. Check address and if server supports anonymous bind. If those are correct, file a bug!');
-        } else {
-            $this->markTestSkipped('Server does not support anonymous bind (see ldapconfig.ini). Skipping test.');
-        }

Net_LDAP2-2.0.12.tgz/Net_LDAP2-2.0.12/tests/Net_LDAP2_EntryTest.php Deleted

@@ -1,296 +0,0 @@
-<?php
-// Call Net_LDAP2_EntryTest::main() if this source file is executed directly.
-if (!defined("PHPUnit_MAIN_METHOD")) {
-    define("PHPUnit_MAIN_METHOD", "Net_LDAP2_EntryTest::main");
-}
-
-require_once "PHPUnit/Framework/TestCase.php";
-require_once "PHPUnit/Framework/TestSuite.php";
-
-require_once 'Net_LDAP2Test.php'; // for config methods
-
-require_once 'Net/LDAP2/Entry.php';
-require_once 'Net/LDAP2/Entry.php';
-
-/**
- * Test class for Net_LDAP2_Entry.
- * Generated by PHPUnit_Util_Skeleton on 2007-10-09 at 10:33:12.
- */
-class Net_LDAP2_EntryTest extends PHPUnit_Framework_TestCase {
-   /**
-    * Stores the LDAP configuration
-    */
-    var $ldapcfg = false;
-
-    /**
-     * Runs the test methods of this class.
-     *
-     * @access public
-     * @static
-     */
-    public static function main() {
-        require_once "PHPUnit/TextUI/TestRunner.php";
-
-        $suite  = new PHPUnit_Framework_TestSuite("Net_LDAP2_EntryTest");
-        $result = PHPUnit_TextUI_TestRunner::run($suite);
-    }
-
-    /**
-     * Sets up the fixture, for example, open a network connection.
-     * This method is called before a test is executed.
-     *
-     * @access protected
-     */
-    protected function setUp() {
-        $this->ldapcfg = $this->getTestConfig();
-    }
-
-    /**
-     * Tears down the fixture, for example, close a network connection.
-     * This method is called after a test is executed.
-     *
-     * @access protected
-     */
-    protected function tearDown() {
-    }
-
-    /**
-     * This checks if a valid LDAP testconfig is present and loads it.
-     *
-     * If so, it is loaded and returned as array. If not, false is returned.
-     *
-     * @return false|array
-     */
-    public function getTestConfig() {
-        $config = false;
-        $file = dirname(__FILE__).'/ldapconfig.ini';
-        if (file_exists($file) && is_readable($file)) {
-            $config = parse_ini_file($file, true);
-        } else {
-            return false;
-        }
-        // validate ini
-        $v_error = $file.' is probably invalid. Did you quoted values correctly?';
-        $this->assertTrue(array_key_exists('global', $config), $v_error);
-        $this->assertTrue(array_key_exists('test', $config), $v_error);
-        $this->assertEquals(7, count($config['global']), $v_error);
-        $this->assertEquals(7, count($config['test']), $v_error);
-
-        // reformat things a bit, for convinience
-        $config['global']['server_binddn'] =
-            $config['global']['server_binddn'].','.$config['global']['server_base_dn'];
-        $config['test']['existing_attrmv'] = explode('|', $config['test']['existing_attrmv']);
-        return $config;
-    }
-
-    /**
-    * Establishes a working connection
-    *
-    * @return Net_LDAP2
-    */
-    public function &connect() {
-        // Check extension
-        if (true !== Net_LDAP2::checkLDAPExtension()) {
-            $this->markTestSkipped('PHP LDAP extension not found or not loadable. Skipped Test.');
-        }
-
-        // Simple working connect and privilegued bind
-        $lcfg = array(
-                'host'   => $this->ldapcfg['global']['server_address'],
-                'port'   => $this->ldapcfg['global']['server_port'],
-                'basedn' => $this->ldapcfg['global']['server_base_dn'],
-                'binddn' => $this->ldapcfg['global']['server_binddn'],
-                'bindpw' => $this->ldapcfg['global']['server_bindpw'],
-                'filter' => '(ou=*)',
-            );
-        $ldap = Net_LDAP2::connect($lcfg);
-        $this->assertType('Net_LDAP2', $ldap, 'Connect failed but was supposed to work. Check credentials and host address. If those are correct, file a bug!');
-        return $ldap;
-    }
-
-/* ---------- TESTS ---------- */
-
-    /**
-     * @todo Implement testCreateFresh().
-     */
-    public function testCreateFresh() {
-        // test failing creation
-        $t = Net_LDAP2_Entry::createFresh("cn=test", "I should be an array");
-        $this->assertTrue(Net_LDAP2::isError($t), 'Creating fresh entry succeeded but was supposed to fail!');
-
-        // test failing creation
-        $t = Net_LDAP2_Entry::createFresh("cn=test", 
-            array(
-                'attr1' => 'single',
-                'attr2' => array('mv1', 'mv2')
-                )
-        );
-        $this->assertType('Net_LDAP2_Entry', $t, 'Creating fresh entry failed but was supposed to succeed!');
-    }
-
-    /**
-     * @todo Implement testCreateExisting().
-     */
-    public function testCreateExisting() {
-        // Remove the following line when you implement this test.
-        $this->markTestIncomplete(
-          "This test has not been implemented yet."
-        );
-    }
-
-    /**
-     * @todo Implement testDn().
-     */
-    public function testDn() {
-        // Remove the following line when you implement this test.
-        $this->markTestIncomplete(
-          "This test has not been implemented yet."
-        );
-    }
-
-    /**
-     * @todo Implement test_setAttributes().
-     */
-    public function test_setAttributes() {
-        // Remove the following line when you implement this test.
-        $this->markTestIncomplete(
-          "This test has not been implemented yet."
-        );
-    }
-
-    /**
-     * @todo Implement testGetValues().
-     */
-    public function testGetValues() {
-        // Remove the following line when you implement this test.
-        $this->markTestIncomplete(
-          "This test has not been implemented yet."
-        );
-    }
-
-    /**
-     * @todo Implement testGetValue().
-     */
-    public function testGetValue() {
-        // Remove the following line when you implement this test.
-        $this->markTestIncomplete(
-          "This test has not been implemented yet."
-        );
-    }
-
-    /**
-     * @todo Implement testGet_value().
-     */
-    public function testGet_value() {
-        // Remove the following line when you implement this test.
-        $this->markTestIncomplete(
-          "This test has not been implemented yet."
-        );
-    }
-
-    /**
-     * @todo Implement testAttributes().
-     */
-    public function testAttributes() {
-        // Remove the following line when you implement this test.
-        $this->markTestIncomplete(
-          "This test has not been implemented yet."
-        );
-    }

Net_LDAP2-2.0.12.tgz/Net_LDAP2-2.0.12/tests/Net_LDAP2_FilterTest.php Deleted

@@ -1,331 +0,0 @@
-<?php
-// Call Net_LDAP2_FilterTest::main() if this source file is executed directly.
-if (!defined("PHPUnit_MAIN_METHOD")) {
-    define("PHPUnit_MAIN_METHOD", "Net_LDAP2_FilterTest::main");
-}
-
-require_once "PHPUnit/Framework/TestCase.php";
-require_once "PHPUnit/Framework/TestSuite.php";
-
-require_once 'Net/LDAP2/Filter.php';
-
-/**
- * Test class for Net_LDAP2_Filter.
- * Generated by PHPUnit_Util_Skeleton on 2007-10-09 at 10:34:23.
- */
-class Net_LDAP2_FilterTest extends PHPUnit_Framework_TestCase {
-    /**
-    * @var string   default filter string to test with
-    */
-    var $filter_str = '(&(cn=foo)(ou=bar))';
-
-    /**
-     * Runs the test methods of this class.
-     *
-     * @access public
-     * @static
-     */
-    public static function main() {
-        require_once "PHPUnit/TextUI/TestRunner.php";
-
-        $suite  = new PHPUnit_Framework_TestSuite("Net_LDAP2_FilterTest");
-        $result = PHPUnit_TextUI_TestRunner::run($suite);
-    }
-
-    /**
-     * Sets up the fixture, for example, open a network connection.
-     * This method is called before a test is executed.
-     *
-     * @access protected
-     */
-    protected function setUp() {
-    }
-
-    /**
-     * Tears down the fixture, for example, close a network connection.
-     * This method is called after a test is executed.
-     *
-     * @access protected
-     */
-    protected function tearDown() {
-    }
-
-    /**
-     * This tests the perl compatible creation of filters through parsing of an filter string
-     */
-    public function testCreatePerlCompatible() {
-        $filter_o = new Net_LDAP2_Filter($this->filter_str);
-        $this->assertType('Net_LDAP2_Filter', $filter_o);
-        $this->assertEquals($this->filter_str, $filter_o->asString());
-
-        $filter_o_err = new Net_LDAP2_Filter('some bad filter');
-        $this->assertType('PEAR_Error', $filter_o_err->asString());
-    }
-
-    /**
-     * Test correct parsing of filter strings through parse()
-     */
-    public function testParse() {
-       $parsed_dmg = Net_LDAP2_Filter::parse('some_damaged_filter_str');
-       $this->assertType('PEAR_Error', $parsed_dmg);
-
-       $parsed_dmg2 = Net_LDAP2_Filter::parse('(invalid=filter)(because=~no-surrounding brackets)');
-       $this->assertType('PEAR_Error', $parsed_dmg2);
-
-       $parsed_dmg3 = Net_LDAP2_Filter::parse('((invalid=filter)(because=log_op is missing))');
-       $this->assertType('PEAR_Error', $parsed_dmg3);
-
-       $parsed_dmg4 = Net_LDAP2_Filter::parse('(invalid-because-becauseinvalidoperator)');
-       $this->assertType('PEAR_Error', $parsed_dmg4);
-
-       $parsed_dmg5 = Net_LDAP2_Filter::parse('(&(filterpart>=ok)(part2=~ok)(filterpart3_notok---becauseinvalidoperator))');
-       $this->assertType('PEAR_Error', $parsed_dmg5);
-
-       $parsed1 = Net_LDAP2_Filter::parse($this->filter_str);
-       $this->assertType('Net_LDAP2_Filter', $parsed1);
-       $this->assertEquals($this->filter_str, $parsed1->asString());
-
-       // To verify bug #16738 is fixed.
-       // In 2.0.6 there was a problem with the splitting of the filter parts if the next part was also an combined filter
-       $parsed2_str = "(&(&(objectClass=posixgroup)(objectClass=foogroup))(uniquemember=uid=eeggs,ou=people,o=foo))";
-       $parsed2 = Net_LDAP2_Filter::parse($parsed2_str);
-       $this->assertType('Net_LDAP2_Filter', $parsed2);
-       $this->assertEquals($parsed2_str, $parsed2->asString());
-
-        // To verify bug #17057 is fixed
-        // In 2.0.7 there was a problem parsing certain not-combined filter strings.
-       $parsed3_str = "(!(jpegPhoto=*))";
-       $parsed3    = Net_LDAP2_Filter::parse($parsed3_str);
-       $this->assertType('Net_LDAP2_Filter', $parsed3);
-       $this->assertEquals($parsed3_str, $parsed3->asString());
-
-       $parsed3_complex_str = "(&(someAttr=someValue)(!(jpegPhoto=*)))";
-       $parsed3_complex     = Net_LDAP2_Filter::parse($parsed3_complex_str);
-       $this->assertType('Net_LDAP2_Filter', $parsed3_complex);
-       $this->assertEquals($parsed3_complex_str, $parsed3_complex->asString());
-
-    }
-
-
-    /**
-     * This tests the basic create() method of creating filters
-     */
-    public function testCreate() {
-        // Test values and an array containing the filter
-        // creating methods and an regex to test the resulting filter
-        $testattr = 'testattr';
-        $testval  = 'testval';
-        $combinations = array(
-            'equals'         => "/$$testattr=$testval$/",
-            'equals'         => "/$$testattr=$testval$/",
-            'begins'         => "/$$testattr=$testval\*$/",
-            'ends'           => "/$$testattr=\*$testval$/",
-            'contains'       => "/$$testattr=\*$testval\*$/",
-            'greater'        => "/$$testattr>$testval$/",
-            'less'           => "/$$testattr<$testval$/",
-            'greaterorequal' => "/$$testattr>=$testval$/",
-            'lessorequal'    => "/$$testattr<=$testval$/",
-            'approx'         => "/$$testattr~=$testval$/",
-            'any'            => "/$$testattr=\*$/"
-        );
-        // generate negating tests with supported operator combinations
-        foreach ($combinations as $match => $regex) {
-            $regex = preg_replace('#^/|/$#', '', $regex); // treat regex, so we can extend it easily
-            $combinations['not '.$match] = "/$!$regex$/";
-            $combinations['not_'.$match] = "/$!$regex$/";
-            $combinations['not-'.$match] = "/$!$regex$/";
-            $combinations['! '.$match]   = "/$!$regex$/";
-            $combinations['!_'.$match]   = "/$!$regex$/";
-            $combinations['!-'.$match]   = "/$!$regex$/";
-        }
-
-        // perform tests
-        foreach ($combinations as $match => $regex) {
-            // escaping is tested in util class
-            $filter = Net_LDAP2_Filter::create($testattr, $match, $testval, false);
-
-            $this->assertType('Net_LDAP2_Filter', $filter);
-            $this->assertRegExp($regex, $filter->asString(), "Filter generation failed for MatchType: $match");
-        }
-
-        // test creating failure
-        $filter = Net_LDAP2_Filter::create($testattr, 'test_undefined_matchingrule', $testval);
-        $this->assertType('PEAR_Error', $filter);
-    }
-
-    /**
-     * Tests, if asString() works
-     */
-    public function testAsString() {
-        $filter = Net_LDAP2_Filter::create('foo', 'equals', 'bar');
-        $this->assertType('Net_LDAP2_Filter', $filter);
-        $this->assertEquals('(foo=bar)', $filter->asString());
-        $this->assertEquals('(foo=bar)', $filter->as_string());
-    }
-
-    /**
-     * Tests, if printMe() works
-     */
-    public function testPrintMe() {
-        if (substr(strtolower(PHP_OS), 0,3) == 'win') {
-            $testfile = '/tmp/Net_LDAP2_Filter_printMe-Testfile';
-        } else {
-            $testfile = 'c:\Net_LDAP2_Filter_printMe-Testfile';
-        }
-        $filter = Net_LDAP2_Filter::create('testPrintMe', 'equals', 'ok');
-        $this->assertType('Net_LDAP2_Filter', $filter);
-
-        // print success:
-        ob_start();
-        $printresult = $filter->printMe();
-        ob_end_clean();
-        $this->assertTrue($printresult);
-
-        // PrintMe if Filehandle is an error (e.g. if some PEAR-File db is used):
-        $err = new PEAR_Error();
-        $this->assertType('PEAR_Error', $filter->printMe($err));
-
-        // PrintMe if filter is damaged,
-        // $filter_dmg is used below too, to test printing to a file with
-        // damaged filter
-        $filter_dmg = new Net_LDAP2_Filter('damaged_filter_string');
-
-        // write success:
-        $file = @fopen($testfile, 'w');
-        if (is_writable($testfile) && $file) {
-            $this->assertTrue($filter->printMe($file));
-            $this->assertType('PEAR_Error', $filter_dmg->printMe($file)); // dmg. filter
-            @fclose($file);
-        } else {

Net_LDAP2-2.0.12.tgz/Net_LDAP2-2.0.12/tests/Net_LDAP2_LDIFTest.php Deleted

@@ -1,689 +0,0 @@
-<?php
-//@encoding iso-8859-1
-
-// Call Net_LDAP2_LDIFTest::main() if this source file is executed directly.
-if (!defined("PHPUnit_MAIN_METHOD")) {
-    define("PHPUnit_MAIN_METHOD", "Net_LDAP2_LDIFTest::main");
-}
-
-require_once "PHPUnit/Framework/TestCase.php";
-require_once "PHPUnit/Framework/TestSuite.php";
-
-require_once 'Net/LDAP2/LDIF.php';
-
-/**
- * Test class for Net_LDAP2_LDIF.
- * Generated by PHPUnit_Util_Skeleton on 2007-12-20 at 10:11:52.
- */
-class Net_LDAP2_LDIFTest extends PHPUnit_Framework_TestCase {
-    /**
-    * Default config for tests.
-    *
-    * The config is bound to the ldif test file
-    * tests/ldif_data/unsorted_w50.ldif
-    * so don't change or tests will fail
-    *
-    * @var array
-    */
-    var $defaultConfig = array(
-        'onerror' => 'undef',
-        'encode'  => 'base64',
-        'wrap'    => 50,
-        'change'  => 0,
-        'sort'    => 0,
-        'version' => 1   // mimic pre 2.0.0RC5 behavior, so test files need no adjusting
-    );
-
-    /**
-    * Test entries data
-    *
-    * Please do not just modify these values, they
-    * are closely related to the LDIF test data.
-    *
-    * @var string
-    */
-    var $testentries_data = array(
-        'cn=test1,ou=example,dc=cno' => array(
-            'cn'    => 'test1',
-            'attr3' => array('foo', 'bar'),
-            'attr1' => 12345,
-            'attr4' => 'brrrzztt',
-            'objectclass' => 'oc1',
-            'attr2' => array('1234', 'baz')),
-
-        'cn=test blabla,ou=example,dc=cno' => array(
-            'cn'    => 'test blabla',
-            'attr3' => array('foo', 'bar'),
-            'attr1' => 12345,
-            'attr4' => 'blablaöäü',
-            'objectclass' => 'oc2',
-            'attr2' => array('1234', 'baz'),
-            'verylong' => 'fhu08rhvt7b478vt5hv78h45nfgt45h78t34hhhhhhhhhv5bg8h6ttttttttt3489t57nhvgh4788trhg8999vnhtgthgui65hgb5789thvngwr789cghm738'),
-
-        'cn=test öäü,ou=example,dc=cno' => array(
-            'cn'    => 'test öäü',
-            'attr3' => array('foo', 'bar'),
-            'attr1' => 12345,
-            'attr4' => 'blablaöäü',
-            'objectclass' => 'oc3',
-            'attr2' => array('1234', 'baz'),
-            'attr5' => 'endspace ',
-            'attr6' => ':badinitchar'),
-
-        ':cn=endspace,dc=cno ' => array(
-            'cn'    => 'endspace')
-    );
-
-    /**
-    * Test file written to
-    *
-    * @var string
-    */
-    var $outfile = 'test.out.ldif';
-
-    /**
-    * Test entries
-    *
-    * They will be created in main()
-    *
-    * @var array
-    */
-    var $testentries = array();
-
-    /**
-     * Runs the test methods of this class.
-     *
-     * @access public
-     * @static
-     */
-    public static function main() {
-        require_once "PHPUnit/TextUI/TestRunner.php";
-
-        $suite  = new PHPUnit_Framework_TestSuite("Net_LDAP2_LDIFTest");
-        $result = PHPUnit_TextUI_TestRunner::run($suite);
-    }
-
-    /**
-     * Open some outfile and ensure correct rights
-     *
-     * @access protected
-     */
-    protected function setUp() {
-        // initialize test entries
-        $this->testentries = array();
-        foreach ($this->testentries_data as $dn => $attrs) {
-            $entry = Net_LDAP2_Entry::createfresh($dn, $attrs);
-            $this->assertType('Net_LDAP2_Entry', $entry, 'ERROR inittializing test entries');
-            array_push($this->testentries, $entry);
-        }
-
-        // create outfile if not exists and enforce proper access rights
-        if (!file_exists($this->outfile)) {
-            if (!touch($this->outfile)) {
-                $this->markTestSkipped('Unable to create '.$this->outfile.', skipping test');
-            }
-        }
-        if (!chmod($this->outfile, 0644)) {
-            $this->markTestSkipped('Unable to chmod(0644) '.$this->outfile.', skipping test');
-        }
-    }
-
-    /**
-     * Remove the outfile
-     *
-     * @access protected
-     */
-    protected function tearDown() {
-       @unlink($this->outfile);
-    }
-
-    /**
-     * Construction tests
-     *
-     * Construct LDIF object and see if we can get a handle
-     */
-    public function testConstruction() {
-        $supported_modes = array('r', 'w', 'a');
-        $plus            = array('', '+');
-
-        // Test all open modes,
-        // all of them should return a correct handle
-        foreach ($supported_modes as $mode) {
-            foreach ($plus as $p) {
-                $ldif = new Net_LDAP2_LDIF($this->outfile, $mode, $this->defaultConfig);
-                $this->assertTrue(is_resource($ldif->handle()));
-            }
-        }
-
-        // Test illegal option passing
-        $ldif = new Net_LDAP2_LDIF($this->outfile, $mode, array('somebad' => 'option'));
-        $this->assertType('Net_LDAP2_Error', $ldif->error());
-
-        // Test passing custom handle
-        $handle = fopen($this->outfile, 'r');
-        $ldif = new Net_LDAP2_LDIF($handle, $mode, $this->defaultConfig);
-        $this->assertTrue(is_resource($ldif->handle()));
-
-        // Reading test with invalid file mode
-        $ldif = new Net_LDAP2_LDIF($this->outfile, 'y', $this->defaultConfig);
-        $this->assertNull($ldif->handle());
-        $this->assertType('Net_LDAP2_Error', $ldif->error());
-
-        // Reading test with nonexistent file
-        $ldif = new Net_LDAP2_LDIF('some/nonexistent/file_for_net_ldap_ldif', 'r', $this->defaultConfig);
-        $this->assertNull($ldif->handle());
-        $this->assertType('Net_LDAP2_Error', $ldif->error());
-
-        // writing to nonexistent file
-        $ldif = new Net_LDAP2_LDIF('testfile_for_net_ldap_ldif', 'w', $this->defaultConfig);
-        $this->assertTrue(is_resource($ldif->handle()));
-        @unlink('testfile_for_net_ldap_ldif');
-
-        // writing to nonexistent path
-        $ldif = new Net_LDAP2_LDIF('some/nonexistent/file_for_net_ldap_ldif', 'w', $this->defaultConfig);
-        $this->assertNull($ldif->handle());
-        $this->assertType('Net_LDAP2_Error', $ldif->error());
-
-        // writing to existing file but without permission
-        // note: chmod should succeed since we do that in setUp()
-        if (chmod($this->outfile, 0444)) {
-            $ldif = new Net_LDAP2_LDIF($this->outfile, 'w', $this->defaultConfig);
-            $this->assertNull($ldif->handle());
-            $this->assertType('Net_LDAP2_Error', $ldif->error());
-        } else {
-            $this->markTestSkipped("Could not chmod ".$this->outfile.", write test without permission skipped");
-        }
-    }
-
-    /**
-     * Tests if entries from an LDIF file are correctly constructed

Net_LDAP2-2.0.12.tgz/Net_LDAP2-2.0.12/tests/Net_LDAP2_RootDSETest.php Deleted

@@ -1,164 +0,0 @@
-<?php
-// Call Net_LDAP2_RootDSETest::main() if this source file is executed directly.
-if (!defined("PHPUnit_MAIN_METHOD")) {
-    define("PHPUnit_MAIN_METHOD", "Net_LDAP2_RootDSETest::main");
-}
-
-require_once "PHPUnit/Framework/TestCase.php";
-require_once "PHPUnit/Framework/TestSuite.php";
-
-require_once 'Net/LDAP2/RootDSE.php';
-
-/**
- * Test class for Net_LDAP2_RootDSE.
- * Generated by PHPUnit_Util_Skeleton on 2007-10-09 at 10:47:05.
- */
-class Net_LDAP2_RootDSETest extends PHPUnit_Framework_TestCase {
-    /**
-     * Runs the test methods of this class.
-     *
-     * @access public
-     * @static
-     */
-    public static function main() {
-        require_once "PHPUnit/TextUI/TestRunner.php";
-
-        $suite  = new PHPUnit_Framework_TestSuite("Net_LDAP2_RootDSETest");
-        $result = PHPUnit_TextUI_TestRunner::run($suite);
-    }
-
-    /**
-     * Sets up the fixture, for example, open a network connection.
-     * This method is called before a test is executed.
-     *
-     * @access protected
-     */
-    protected function setUp() {
-        $this->markTestSkipped('Test not implemented yet.');
-    }
-
-    /**
-     * Tears down the fixture, for example, close a network connection.
-     * This method is called after a test is executed.
-     *
-     * @access protected
-     */
-    protected function tearDown() {
-    }
-
-    /**
-     * @todo Implement testGetValue().
-     */
-    public function testGetValue() {
-        // Remove the following line when you implement this test.
-        $this->markTestIncomplete(
-          "This test has not been implemented yet."
-        );
-    }
-
-    /**
-     * @todo Implement testGet_value().
-     */
-    public function testGet_value() {
-        // Remove the following line when you implement this test.
-        $this->markTestIncomplete(
-          "This test has not been implemented yet."
-        );
-    }
-
-    /**
-     * @todo Implement testSupportedExtension().
-     */
-    public function testSupportedExtension() {
-        // Remove the following line when you implement this test.
-        $this->markTestIncomplete(
-          "This test has not been implemented yet."
-        );
-    }
-
-    /**
-     * @todo Implement testSupported_extension().
-     */
-    public function testSupported_extension() {
-        // Remove the following line when you implement this test.
-        $this->markTestIncomplete(
-          "This test has not been implemented yet."
-        );
-    }
-
-    /**
-     * @todo Implement testSupportedVersion().
-     */
-    public function testSupportedVersion() {
-        // Remove the following line when you implement this test.
-        $this->markTestIncomplete(
-          "This test has not been implemented yet."
-        );
-    }
-
-    /**
-     * @todo Implement testSupported_version().
-     */
-    public function testSupported_version() {
-        // Remove the following line when you implement this test.
-        $this->markTestIncomplete(
-          "This test has not been implemented yet."
-        );
-    }
-
-    /**
-     * @todo Implement testSupportedControl().
-     */
-    public function testSupportedControl() {
-        // Remove the following line when you implement this test.
-        $this->markTestIncomplete(
-          "This test has not been implemented yet."
-        );
-    }
-
-    /**
-     * @todo Implement testSupported_control().
-     */
-    public function testSupported_control() {
-        // Remove the following line when you implement this test.
-        $this->markTestIncomplete(
-          "This test has not been implemented yet."
-        );
-    }
-
-    /**
-     * @todo Implement testSupportedSASLMechanism().
-     */
-    public function testSupportedSASLMechanism() {
-        // Remove the following line when you implement this test.
-        $this->markTestIncomplete(
-          "This test has not been implemented yet."
-        );
-    }
-
-    /**
-     * @todo Implement testSupported_sasl_mechanism().
-     */
-    public function testSupported_sasl_mechanism() {
-        // Remove the following line when you implement this test.
-        $this->markTestIncomplete(
-          "This test has not been implemented yet."
-        );
-    }
-
-    /**
-     * @todo Implement test_checkAttr().
-     */
-    public function test_checkAttr() {
-        // Remove the following line when you implement this test.
-        $this->markTestIncomplete(
-          "This test has not been implemented yet."
-        );
-    }
-}
-
-// Call Net_LDAP2_RootDSETest::main() if this source file is executed directly.
-if (PHPUnit_MAIN_METHOD == "Net_LDAP2_RootDSETest::main") {
-    Net_LDAP2_RootDSETest::main();
-}
-?>

Net_LDAP2-2.0.12.tgz/Net_LDAP2-2.0.12/tests/Net_LDAP2_SearchTest.php Deleted

@@ -1,388 +0,0 @@
-<?php
-// Call Net_LDAP2_SearchTest::main() if this source file is executed directly.
-if (!defined("PHPUnit_MAIN_METHOD")) {
-    define("PHPUnit_MAIN_METHOD", "Net_LDAP2_SearchTest::main");
-}
-
-require_once "PHPUnit/Framework/TestCase.php";
-require_once "PHPUnit/Framework/TestSuite.php";
-
-require_once 'Net/LDAP2.php';
-require_once 'Net/LDAP2/Search.php';
-
-/**
- * Test class for Net_LDAP2_Search.
- * Generated by PHPUnit_Util_Skeleton on 2007-10-09 at 10:46:51.
- */
-class Net_LDAP2_SearchTest extends PHPUnit_Framework_TestCase {
-    /**
-    * Stores the LDAP configuration
-    */
-    var $ldapcfg = false;
-
-    /**
-     * Runs the test methods of this class.
-     *
-     * @access public
-     * @static
-     */
-    public static function main() {
-        require_once "PHPUnit/TextUI/TestRunner.php";
-
-        $suite  = new PHPUnit_Framework_TestSuite("Net_LDAP2_SearchTest");
-        $result = PHPUnit_TextUI_TestRunner::run($suite);
-    }
-
-    /**
-     * Sets up the fixture, for example, open a network connection.
-     * This method is called before a test is executed.
-     *
-     * @access protected
-     */
-    protected function setUp() {
-        $this->ldapcfg = $this->getTestConfig();
-    }
-
-    /**
-     * Tears down the fixture, for example, close a network connection.
-     * This method is called after a test is executed.
-     *
-     * @access protected
-     */
-    protected function tearDown() {
-    }
-
-    /**
-     * This checks if a valid LDAP testconfig is present and loads it.
-     *
-     * If so, it is loaded and returned as array. If not, false is returned.
-     *
-     * @return false|array
-     */
-    public function getTestConfig() {
-        $config = false;
-        $file = dirname(__FILE__).'/ldapconfig.ini';
-        if (file_exists($file) && is_readable($file)) {
-            $config = parse_ini_file($file, true);
-        } else {
-            return false;
-        }
-        // validate ini
-        $v_error = $file.' is probably invalid. Did you quoted values correctly?';
-        $this->assertTrue(array_key_exists('global', $config), $v_error);
-        $this->assertTrue(array_key_exists('test', $config), $v_error);
-        $this->assertEquals(7, count($config['global']), $v_error);
-        $this->assertEquals(7, count($config['test']), $v_error);
-
-        // reformat things a bit, for convinience
-        $config['global']['server_binddn'] =
-            $config['global']['server_binddn'].','.$config['global']['server_base_dn'];
-        $config['test']['existing_attrmv'] = explode('|', $config['test']['existing_attrmv']);
-        return $config;
-    }
-
-    /**
-    * Establishes a working connection
-    *
-    * @return Net_LDAP2
-    */
-    public function &connect() {
-        // Check extension
-        if (true !== Net_LDAP2::checkLDAPExtension()) {
-            $this->markTestSkipped('PHP LDAP extension not found or not loadable. Skipped Test.');
-        }
-
-        // Simple working connect and privilegued bind
-        $lcfg = array(
-                'host'   => $this->ldapcfg['global']['server_address'],
-                'port'   => $this->ldapcfg['global']['server_port'],
-                'basedn' => $this->ldapcfg['global']['server_base_dn'],
-                'binddn' => $this->ldapcfg['global']['server_binddn'],
-                'bindpw' => $this->ldapcfg['global']['server_bindpw'],
-                'filter' => '(ou=*)',
-            );
-        $ldap = Net_LDAP2::connect($lcfg);
-        $this->assertType('Net_LDAP2', $ldap, 'Connect failed but was supposed to work. Check credentials and host address. If those are correct, file a bug!');
-        return $ldap;
-    }
-
-    /**
-     * @todo Implement testEntries().
-     */
-    public function testEntries() {
-        // Remove the following line when you implement this test.
-        $this->markTestIncomplete(
-          "This test has not been implemented yet."
-        );
-    }
-
-    /**
-     * @todo Implement testShiftEntry().
-     */
-    public function testShiftEntry() {
-        // Remove the following line when you implement this test.
-        $this->markTestIncomplete(
-          "This test has not been implemented yet."
-        );
-    }
-
-    /**
-     * @todo Implement testShift_entry().
-     */
-    public function testShift_entry() {
-        // Remove the following line when you implement this test.
-        $this->markTestIncomplete(
-          "This test has not been implemented yet."
-        );
-    }
-
-    /**
-     * @todo Implement testPopEntry().
-     */
-    public function testPopEntry() {
-        // Remove the following line when you implement this test.
-        $this->markTestIncomplete(
-          "This test has not been implemented yet."
-        );
-    }
-
-    /**
-     * @todo Implement testPop_entry().
-     */
-    public function testPop_entry() {
-        // Remove the following line when you implement this test.
-        $this->markTestIncomplete(
-          "This test has not been implemented yet."
-        );
-    }
-
-    /**
-     * @todo Implement testSorted_as_struct().
-     */
-    public function testSorted_as_struct() {
-        // Remove the following line when you implement this test.
-        $this->markTestIncomplete(
-          "This test has not been implemented yet."
-        );
-    }
-
-    /**
-     * @todo Implement testSorted().
-     */
-    public function testSorted() {
-        // Remove the following line when you implement this test.
-        $this->markTestIncomplete(
-          "This test has not been implemented yet."
-        );
-    }
-
-    /**
-     * @todo Implement testAs_struct().
-     */
-    public function testAs_struct() {
-        // Remove the following line when you implement this test.
-        $this->markTestIncomplete(
-          "This test has not been implemented yet."
-        );
-    }
-
-    /**
-     * @todo Implement testSetSearch().
-     */
-    public function testSetSearch() {
-        // Remove the following line when you implement this test.
-        $this->markTestIncomplete(
-          "This test has not been implemented yet."
-        );
-    }
-
-    /**

Net_LDAP2-2.0.12.tgz/Net_LDAP2-2.0.12/tests/Net_LDAP2_UtilTest.php Deleted

@@ -1,354 +0,0 @@
-<?php
-// Call Net_LDAP2_UtilTest::main() if this source file is executed directly.
-if (!defined("PHPUnit_MAIN_METHOD")) {
-    define("PHPUnit_MAIN_METHOD", "Net_LDAP2_UtilTest::main");
-}
-
-require_once "PHPUnit/Framework/TestCase.php";
-require_once "PHPUnit/Framework/TestSuite.php";
-
-require_once 'Net/LDAP2/Util.php';
-
-/**
- * Test class for Net_LDAP2_Util.
- * Generated by PHPUnit_Util_Skeleton on 2007-10-09 at 10:33:22.
- */
-class Net_LDAP2_UtilTest extends PHPUnit_Framework_TestCase {
-    /**
-     * Runs the test methods of this class.
-     *
-     * @access public
-     * @static
-     */
-    public static function main() {
-        require_once "PHPUnit/TextUI/TestRunner.php";
-
-        $suite  = new PHPUnit_Framework_TestSuite("Net_LDAP2_UtilTest");
-        $result = PHPUnit_TextUI_TestRunner::run($suite);
-    }
-
-    /**
-     * Sets up the fixture, for example, open a network connection.
-     * This method is called before a test is executed.
-     *
-     * @access protected
-     */
-    protected function setUp() {
-    }
-
-    /**
-     * Tears down the fixture, for example, close a network connection.
-     * This method is called after a test is executed.
-     *
-     * @access protected
-     */
-    protected function tearDown() {
-    }
-
-    /**
-     * Test escape_dn_value()
-     */
-    public function testEscape_dn_value() {
-        $dnval    = '  '.chr(22).' t,e+s"t,\\v<a>l;u#e=!    ';
-        $expected = '\20\20\16 t\,e\+s\"t\,\\\\v\<a\>l\;u\#e\=!\20\20\20\20';
-
-        // string call
-        $this->assertEquals(array($expected), Net_LDAP2_Util::escape_dn_value($dnval));
-
-        // array call
-        $this->assertEquals(array($expected), Net_LDAP2_Util::escape_dn_value(array($dnval)));
-
-        // multiple arrays
-        $this->assertEquals(array($expected, $expected, $expected), Net_LDAP2_Util::escape_dn_value(array($dnval,$dnval,$dnval)));
-    }
-
-    /**
-     * Test unescape_dn_value()
-     */
-    public function testUnescape_dn_value() {
-        $dnval    = '\\20\\20\\16\\20t\\,e\\+s \\"t\\,\\\\v\\<a\\>l\\;u\\#e\\=!\\20\\20\\20\\20';
-        $expected = '  '.chr(22).' t,e+s "t,\\v<a>l;u#e=!    ';
-
-        // string call
-        $this->assertEquals(array($expected), Net_LDAP2_Util::unescape_dn_value($dnval));
-
-        // array call
-        $this->assertEquals(array($expected), Net_LDAP2_Util::unescape_dn_value(array($dnval)));
-
-        // multiple arrays
-        $this->assertEquals(array($expected, $expected, $expected), Net_LDAP2_Util::unescape_dn_value(array($dnval,$dnval,$dnval)));
-    }
-
-    /**
-     * Test escaping of filter values
-     */
-    public function testEscape_filter_value() {
-        $expected  = 't\28e,s\29t\2av\5cal\1eue';
-        $filterval = 't(e,s)t*v\\al'.chr(30).'ue';
-
-        // string call
-        $this->assertEquals(array($expected), Net_LDAP2_Util::escape_filter_value($filterval));
-
-        // array call
-        $this->assertEquals(array($expected), Net_LDAP2_Util::escape_filter_value(array($filterval)));
-
-        // multiple arrays
-        $this->assertEquals(array($expected, $expected, $expected), Net_LDAP2_Util::escape_filter_value(array($filterval,$filterval,$filterval)));
-    }
-
-    /**
-     * Test unescaping of filter values
-     */
-    public function testUnescape_filter_value() {
-        $expected  = 't(e,s)t*v\\al'.chr(30).'ue';
-        $filterval = 't\28e,s\29t\2av\5cal\1eue';
-
-        // string call
-        $this->assertEquals(array($expected), Net_LDAP2_Util::unescape_filter_value($filterval));
-
-        // array call
-        $this->assertEquals(array($expected), Net_LDAP2_Util::unescape_filter_value(array($filterval)));
-
-        // multiple arrays
-        $this->assertEquals(array($expected, $expected, $expected), Net_LDAP2_Util::unescape_filter_value(array($filterval,$filterval,$filterval)));
-    }
-
-    /**
-     * Test asc2hex32()
-     */
-    public function testAsc2hex32() {
-
-        $expected = '\00\01\02\03\04\05\06\07\08\09\0a\0b\0c\0d\0e\0f\10\11\12\13\14\15\16\17\18\19\1a\1b\1c\1d\1e\1f !"#$%&\'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\]^_`abcdefghijklmnopqrstuvwxyz{|}~';
-        $str = '';
-        for ($i = 0; $i < 127; $i++) {
-             $str .= chr($i);
-        }
-        $this->assertEquals($expected, Net_LDAP2_Util::asc2hex32($str));
-    }
-
-    /**
-     * Test HEX unescaping
-     */
-    public function testHex2asc() {
-        $expected = '';
-        for ($i = 0; $i < 127; $i++) {
-             $expected .= chr($i);
-        }
-
-        $str = '\00\01\02\03\04\05\06\07\08\09\0a\0b\0c\0d\0e\0f\10\11\12\13\14\15\16\17\18\19\1a\1b\1c\1d\1e\1f !"#$%&\'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\]^_`abcdefghijklmnopqrstuvwxyz{|}~';
-        $this->assertEquals($expected, Net_LDAP2_Util::hex2asc($str));
-    }
-
-    /**
-     * Tests split_rdn_multival()
-     *
-     * In addition to the above test of the basic split correction,
-     * we test here the functionality of mutlivalued RDNs
-     */
-    public function testSplit_rdn_multival() {
-        // One value
-        $rdn = 'CN=J. Smith';
-        $expected = array('CN=J. Smith');
-        $split = Net_LDAP2_Util::split_rdn_multival($rdn);
-        $this->assertEquals($expected,  $split);
-
-        // Two values
-        $rdn = 'OU=Sales+CN=J. Smith';
-        $expected = array('OU=Sales', 'CN=J. Smith');
-        $split = Net_LDAP2_Util::split_rdn_multival($rdn);
-        $this->assertEquals($expected,  $split);
-
-        // Several multivals
-        $rdn = 'OU=Sales+CN=J. Smith+L=London+C=England';
-        $expected = array('OU=Sales', 'CN=J. Smith', 'L=London', 'C=England');
-        $split = Net_LDAP2_Util::split_rdn_multival($rdn);
-        $this->assertEquals($expected,  $split);
-
-        // Unescaped "+" in value
-        $rdn = 'OU=Sa+les+CN=J. Smith';
-        $expected = array('OU=Sa+les', 'CN=J. Smith');
-        $split = Net_LDAP2_Util::split_rdn_multival($rdn);
-        $this->assertEquals($expected,  $split);
-
-        // Unescaped "+" in attr name
-        $rdn = 'O+U=Sales+CN=J. Smith';
-        $expected = array('O+U=Sales', 'CN=J. Smith');
-        $split = Net_LDAP2_Util::split_rdn_multival($rdn);
-        $this->assertEquals($expected,  $split);
-
-        // Unescaped "+" in attr name + value
-        $rdn = 'O+U=Sales+CN=J. Sm+ith';
-        $expected = array('O+U=Sales', 'CN=J. Sm+ith');
-        $split = Net_LDAP2_Util::split_rdn_multival($rdn);
-        $this->assertEquals($expected,  $split);
-
-        // Unescaped "+" in attr name, but not first attr
-        // this documents a known bug. However, unfortunately  we cant
-        // know wether the "C+" belongs to value "Sales" or attribute "C+N".
-        // To solve this, we must ask the schema which we do not right now.
-        // The problem is located in _correct_dn_splitting()
-        $rdn = 'OU=Sales+C+N=J. Smith';
-        $expected = array('OU=Sales+C', 'N=J. Smith');     // The "C+" is treaten as value of "OU"
-        $split = Net_LDAP2_Util::split_rdn_multival($rdn);
-        $this->assertEquals($expected,  $split);
-
-        // Escaped "+" in attr name and value
-        $rdn = 'O\+U=Sales+CN=J. Sm\+ith';
-        $expected = array('O\+U=Sales', 'CN=J. Sm\+ith');
-        $split = Net_LDAP2_Util::split_rdn_multival($rdn);
-        $this->assertEquals($expected,  $split);

Net_LDAP2-2.0.12.tgz/Net_LDAP2-2.0.12/tests/ldapconfig.ini.dist Deleted

@@ -1,51 +0,0 @@
-; +---------------------------------------------------------------------------+
-; | This is a configuration file for Net_LDAP2s tests.                        |
-; | To activate the tests, you need to adjust the configuration to            |
-; | your needs and copy it over to "ldapconfig.conf". Place the               |
-; | file inside the directory holding all the test programs.                  |
-; |                                                                           |
-; | Note, that this tests assume a working LDAP server.                       |
-; | If you don't have such a server, you may use the                          |
-; | LDIF based mock server. Head to 'ldapldifconfig.ini.dist'.                |
-; |                                                                           |
-; | The syntax of this file is really easy and similar to other .ini-files.   |
-; | Remember to quote strings containing non-alphanumeric characters.         |
-; +---------------------------------------------------------------------------+
-
-
-; Global section
-;   server_cap_tls:       is the server ssl capable?
-;   server_cap_anonymous: is the server allowing anonymous access?
-;   server_base_dn:       BaseDN at which your DIT starts. Ensure that the
-;                         binding user has all rights to add, delete and
-;                         modifying entries as well as creating and deleting
-;                         some subtree (ou=...) below the base.
-;   server_*:             I think those following are self-explanatory
-;   server_binddn:        Relative to base_dn below
-[global]
-server_cap_tls       = false
-server_cap_anonymous = true
-server_base_dn       = "ou=example,dc=cno"
-server_address       = localhost
-server_port          = 389
-server_binddn        = "cn=testuser"
-server_bindpw        = testpass
-
-
-; Definitions for the tests. Adjust to suit the needs of your test server.
-;   existing_entry:  RDN for an entry that must exist (relative to base).
-;                    The following attribute tests are performed on this entry.
-;   existing_attrs:  Name of an existing attribute (single valued)
-;   existing_attrsv: Value of this attribute
-;   existing_attrm:  Name of an existing attribute (multi valued)
-;   existing_attrmv: Values of this attribute, "|" delimited
-;   utf8_attr:       Name of attribute with UTF8 value
-;   noutf8_attr:     Name of attribute without UTF8 value
-[test]
-existing_entry  = "cn=existing"
-existing_attrs  = attr1
-existing_attrsv = 12345
-existing_attrm  = attr2
-existing_attrmv = "1234|baz"
-utf8_attr       = attr4
-noutf8_attr     = attr1

Net_LDAP2-2.0.12.tgz/Net_LDAP2-2.0.12/tests/ldif_data/changes.ldif Deleted

Net_LDAP2-2.0.12.tgz/Net_LDAP2-2.0.12/tests/ldif_data/malformed_encoding.ldif Deleted

Net_LDAP2-2.0.12.tgz/Net_LDAP2-2.0.12/tests/ldif_data/malformed_syntax.ldif Deleted

Net_LDAP2-2.0.12.tgz/Net_LDAP2-2.0.12/tests/ldif_data/malformed_wrapping.ldif Deleted

Net_LDAP2-2.0.12.tgz/Net_LDAP2-2.0.12/tests/ldif_data/sorted_w40.ldif Deleted

Net_LDAP2-2.0.12.tgz/Net_LDAP2-2.0.12/tests/ldif_data/sorted_w50.ldif Deleted

Net_LDAP2-2.0.12.tgz/Net_LDAP2-2.0.12/tests/ldif_data/unsorted_w30.ldif Deleted

Net_LDAP2-2.0.12.tgz/Net_LDAP2-2.0.12/tests/ldif_data/unsorted_w50.ldif Deleted

Net_LDAP2-2.0.12.tgz/Net_LDAP2-2.0.12/tests/ldif_data/unsorted_w50_WIN.ldif Deleted

Net_LDAP2-2.2.0.tgz/Net_LDAP2-2.2.0/Net/LDAP2.php Added

@@ -0,0 +1,1802 @@
+<?php
+/* vim: set expandtab tabstop=4 shiftwidth=4: */
+/**
+* File containing the Net_LDAP2 interface class.
+*
+* PHP version 5
+*
+* @category  Net
+* @package   Net_LDAP2
+* @author    Tarjej Huse <tarjei@bergfald.no>
+* @author    Jan Wagner <wagner@netsols.de>
+* @author    Del <del@babel.com.au>
+* @author    Benedikt Hallinger <beni@php.net>
+* @copyright 2003-2007 Tarjej Huse, Jan Wagner, Del Elson, Benedikt Hallinger
+* @license   http://www.gnu.org/licenses/lgpl-3.0.txt LGPLv3
+* @version   SVN: $Id$
+* @link      http://pear.php.net/package/Net_LDAP2/
+*/
+
+/**
+* Package includes.
+*/
+require_once 'PEAR.php';
+require_once 'Net/LDAP2/RootDSE.php';
+require_once 'Net/LDAP2/Schema.php';
+require_once 'Net/LDAP2/Entry.php';
+require_once 'Net/LDAP2/Search.php';
+require_once 'Net/LDAP2/Util.php';
+require_once 'Net/LDAP2/Filter.php';
+require_once 'Net/LDAP2/LDIF.php';
+require_once 'Net/LDAP2/SchemaCache.interface.php';
+require_once 'Net/LDAP2/SimpleFileSchemaCache.php';
+
+/**
+*  Error constants for errors that are not LDAP errors.
+*/
+define('NET_LDAP2_ERROR', 1000);
+
+/**
+* Net_LDAP2 Version
+*/
+define('NET_LDAP2_VERSION', '2.1.0');
+
+/**
+* Net_LDAP2 - manipulate LDAP servers the right way!
+*
+* @category  Net
+* @package   Net_LDAP2
+* @author    Tarjej Huse <tarjei@bergfald.no>
+* @author    Jan Wagner <wagner@netsols.de>
+* @author    Del <del@babel.com.au>
+* @author    Benedikt Hallinger <beni@php.net>
+* @copyright 2003-2007 Tarjej Huse, Jan Wagner, Del Elson, Benedikt Hallinger
+* @license   http://www.gnu.org/copyleft/lesser.html LGPL
+* @link      http://pear.php.net/package/Net_LDAP2/
+*/
+class Net_LDAP2 extends PEAR
+{
+    /**
+    * Class configuration array
+    *
+    * host     = the ldap host to connect to
+    *            (may be an array of several hosts to try)
+    * port     = the server port
+    * version  = ldap version (defaults to v 3)
+    * starttls = when set, ldap_start_tls() is run after connecting.
+    * bindpw   = no explanation needed
+    * binddn   = the DN to bind as.
+    * basedn   = ldap base
+    * options  = hash of ldap options to set (opt => val)
+    * filter   = default search filter
+    * scope    = default search scope
+    *
+    * Newly added in 2.0.0RC4, for auto-reconnect:
+    * auto_reconnect  = if set to true then the class will automatically
+    *                   attempt to reconnect to the LDAP server in certain
+    *                   failure conditionswhen attempting a search, or other
+    *                   LDAP operation.  Defaults to false.  Note that if you
+    *                   set this to true, calls to search() may block
+    *                   indefinitely if there is a catastrophic server failure.
+    * min_backoff     = minimum reconnection delay period (in seconds).
+    * current_backoff = initial reconnection delay period (in seconds).
+    * max_backoff     = maximum reconnection delay period (in seconds).
+    *
+    * @access protected
+    * @var array
+    */
+    protected $_config = array('host'            => 'localhost',
+                               'port'            => 389,
+                               'version'         => 3,
+                               'starttls'        => false,
+                               'binddn'          => '',
+                               'bindpw'          => '',
+                               'basedn'          => '',
+                               'options'         => array(),
+                               'filter'          => '(objectClass=*)',
+                               'scope'           => 'sub',
+                               'auto_reconnect'  => false,
+                               'min_backoff'     => 1,
+                               'current_backoff' => 1,
+                               'max_backoff'     => 32);
+
+    /**
+    * List of hosts we try to establish a connection to
+    *
+    * @access protected
+    * @var array
+    */
+    protected $_host_list = array();
+
+    /**
+    * List of hosts that are known to be down.
+    *
+    * @access protected
+    * @var array
+    */
+    protected $_down_host_list = array();
+
+    /**
+    * LDAP resource link.
+    *
+    * @access protected
+    * @var resource
+    */
+    protected $_link = false;
+
+    /**
+    * Net_LDAP2_Schema object
+    *
+    * This gets set and returned by {@link schema()}
+    *
+    * @access protected
+    * @var object Net_LDAP2_Schema
+    */
+    protected $_schema = null;
+
+    /**
+    * Schema cacher function callback
+    *
+    * @see registerSchemaCache()
+    * @var string
+    */
+    protected $_schema_cache = null;
+
+    /**
+    * Cache for attribute encoding checks
+    *
+    * @access protected
+    * @var array Hash with attribute names as key and boolean value
+    *            to determine whether they should be utf8 encoded or not.
+    */
+    protected $_schemaAttrs = array();
+
+    /**
+    * Cache for rootDSE objects
+    *
+    * Hash with requested rootDSE attr names as key and rootDSE object as value
+    *
+    * Since the RootDSE object itself may request a rootDSE object,
+    * {@link rootDse()} caches successful requests.
+    * Internally, Net_LDAP2 needs several lookups to this object, so
+    * caching increases performance significally.
+    *
+    * @access protected
+    * @var array
+    */
+    protected $_rootDSE_cache = array();
+
+    /**
+    * Returns the Net_LDAP2 Release version, may be called statically
+    *
+    * @static
+    * @return string Net_LDAP2 version
+    */
+    public static function getVersion()
+    {
+        return NET_LDAP2_VERSION;
+    }
+
+    /**
+    * Configure Net_LDAP2, connect and bind
+    *
+    * Use this method as starting point of using Net_LDAP2
+    * to establish a connection to your LDAP server.
+    *
+    * Static function that returns either an error object or the new Net_LDAP2
+    * object. Something like a factory. Takes a config array with the needed
+    * parameters.
+    *
+    * @param array $config Configuration array
+    *
+    * @access public
+    * @return Net_LDAP2_Error|Net_LDAP2   Net_LDAP2_Error or Net_LDAP2 object
+    */
+    public static function connect($config = array())
+    {
+        $ldap_check = self::checkLDAPExtension();
+        if (self::iserror($ldap_check)) {
+            return $ldap_check;

Net_LDAP2-2.2.0.tgz/Net_LDAP2-2.2.0/Net/LDAP2/Entry.php Added

@@ -0,0 +1,1096 @@
+<?php
+/* vim: set expandtab tabstop=4 shiftwidth=4: */
+/**
+* File containing the Net_LDAP2_Entry interface class.
+*
+* PHP version 5
+*
+* @category  Net
+* @package   Net_LDAP2
+* @author    Jan Wagner <wagner@netsols.de>
+* @author    Tarjej Huse <tarjei@bergfald.no>
+* @author    Benedikt Hallinger <beni@php.net>
+* @copyright 2009 Tarjej Huse, Jan Wagner, Benedikt Hallinger
+* @license   http://www.gnu.org/licenses/lgpl-3.0.txt LGPLv3
+* @version   SVN: $Id$
+* @link      http://pear.php.net/package/Net_LDAP2/
+*/
+
+/**
+* Includes
+*/
+require_once 'PEAR.php';
+require_once 'Net/LDAP2/Util.php';
+
+/**
+* Object representation of a directory entry
+*
+* This class represents a directory entry. You can add, delete, replace
+* attributes and their values, rename the entry, delete the entry.
+*
+* @category Net
+* @package  Net_LDAP2
+* @author   Jan Wagner <wagner@netsols.de>
+* @author   Tarjej Huse <tarjei@bergfald.no>
+* @author   Benedikt Hallinger <beni@php.net>
+* @license  http://www.gnu.org/copyleft/lesser.html LGPL
+* @link     http://pear.php.net/package/Net_LDAP2/
+*/
+class Net_LDAP2_Entry extends PEAR
+{
+    /**
+    * Entry ressource identifier
+    *
+    * @access protected
+    * @var ressource
+    */
+    protected $_entry = null;
+
+    /**
+    * LDAP ressource identifier
+    *
+    * @access protected
+    * @var ressource
+    */
+    protected $_link = null;
+
+    /**
+    * Net_LDAP2 object
+    *
+    * This object will be used for updating and schema checking
+    *
+    * @access protected
+    * @var object Net_LDAP2
+    */
+    protected $_ldap = null;
+
+    /**
+    * Distinguished name of the entry
+    *
+    * @access protected
+    * @var string
+    */
+    protected $_dn = null;
+
+    /**
+    * Attributes
+    *
+    * @access protected
+    * @var array
+    */
+    protected $_attributes = array();
+
+    /**
+    * Original attributes before any modification
+    *
+    * @access protected
+    * @var array
+    */
+    protected $_original = array();
+
+
+    /**
+    * Map of attribute names
+    *
+    * @access protected
+    * @var array
+    */
+    protected $_map = array();
+
+
+    /**
+    * Is this a new entry?
+    *
+    * @access protected
+    * @var boolean
+    */
+    protected $_new = true;
+
+    /**
+    * New distinguished name
+    *
+    * @access protected
+    * @var string
+    */
+    protected $_newdn = null;
+
+    /**
+    * Shall the entry be deleted?
+    *
+    * @access protected
+    * @var boolean
+    */
+    protected $_delete = false;
+
+    /**
+    * Map with changes to the entry
+    *
+    * @access protected
+    * @var array
+    */
+    protected $_changes = array("add"     => array(),
+                                "delete"  => array(),
+                                "replace" => array()
+                               );
+    /**
+    * Internal Constructor
+    *
+    * Constructor of the entry. Sets up the distinguished name and the entries
+    * attributes.
+    * You should not call this method manually! Use {@link Net_LDAP2_Entry::createFresh()}
+    * or {@link Net_LDAP2_Entry::createConnected()} instead!
+    *
+    * @param Net_LDAP2|ressource|array $ldap Net_LDAP2 object, ldap-link ressource or array of attributes
+    * @param string|ressource          $entry Either a DN or a LDAP-Entry ressource
+    *
+    * @access protected
+    * @return none
+    */
+    public function __construct($ldap, $entry = null)
+    {
+        parent::__construct('Net_LDAP2_Error');
+
+        // set up entry resource or DN
+        if (is_resource($entry)) {
+            $this->_entry = $entry;
+        } else {
+            $this->_dn = $entry;
+        }
+
+        // set up LDAP link
+        if ($ldap instanceof Net_LDAP2) {
+            $this->_ldap = $ldap;
+            $this->_link = $ldap->getLink();
+        } elseif (is_resource($ldap)) {
+            $this->_link = $ldap;
+        } elseif (is_array($ldap)) {
+            // Special case: here $ldap is an array of attributes,
+            // this means, we have no link. This is a "virtual" entry.
+            // We just set up the attributes so one can work with the object
+            // as expected, but an update() fails unless setLDAP() is called.
+            $this->setAttributes($ldap);
+        }
+
+        // if this is an entry existing in the directory,
+        // then set up as old and fetch attrs
+        if (is_resource($this->_entry) && is_resource($this->_link)) {
+            $this->_new = false;
+            $this->_dn  = @ldap_get_dn($this->_link, $this->_entry);
+            $this->setAttributes();  // fetch attributes from server
+        }
+    }
+
+    /**
+    * Creates a fresh entry that may be added to the directory later on
+    *
+    * Use this method, if you want to initialize a fresh entry.
+    *
+    * The method should be called statically: $entry = Net_LDAP2_Entry::createFresh();
+    * You should put a 'objectClass' attribute into the $attrs so the directory server
+    * knows which object you want to create. However, you may omit this in case you
+    * don't want to add this entry to a directory server.
+    *
+    * The attributes parameter is as following:
+    * <code>
+    * $attrs = array( 'attribute1' => array('value1', 'value2'),
+    *                 'attribute2' => 'single value'
+    *          );
+    * </code>
+    *

Net_LDAP2-2.2.0.tgz/Net_LDAP2-2.2.0/Net/LDAP2/Filter.php Added

@@ -0,0 +1,675 @@
+<?php
+/* vim: set expandtab tabstop=4 shiftwidth=4: */
+/**
+* File containing the Net_LDAP2_Filter interface class.
+*
+* PHP version 5
+*
+* @category  Net
+* @package   Net_LDAP2
+* @author    Benedikt Hallinger <beni@php.net>
+* @copyright 2009 Benedikt Hallinger
+* @license   http://www.gnu.org/licenses/lgpl-3.0.txt LGPLv3
+* @version   SVN: $Id$
+* @link      http://pear.php.net/package/Net_LDAP2/
+*/
+
+/**
+* Includes
+*/
+require_once 'PEAR.php';
+require_once 'Net/LDAP2/Util.php';
+require_once 'Net/LDAP2/Entry.php';
+
+/**
+* Object representation of a part of a LDAP filter.
+*
+* This Class is not completely compatible to the PERL interface!
+*
+* The purpose of this class is, that users can easily build LDAP filters
+* without having to worry about right escaping etc.
+* A Filter is built using several independent filter objects
+* which are combined afterwards. This object works in two
+* modes, depending how the object is created.
+* If the object is created using the {@link create()} method, then this is a leaf-object.
+* If the object is created using the {@link combine()} method, then this is a container object.
+*
+* LDAP filters are defined in RFC-2254 and can be found under
+* {@link http://www.ietf.org/rfc/rfc2254.txt}
+*
+* Here a quick copy&paste example:
+* <code>
+* $filter0 = Net_LDAP2_Filter::create('stars', 'equals', '***');
+* $filter_not0 = Net_LDAP2_Filter::combine('not', $filter0);
+*
+* $filter1 = Net_LDAP2_Filter::create('gn', 'begins', 'bar');
+* $filter2 = Net_LDAP2_Filter::create('gn', 'ends', 'baz');
+* $filter_comp = Net_LDAP2_Filter::combine('or',array($filter_not0, $filter1, $filter2));
+*
+* echo $filter_comp->asString();
+* // This will output: (|(!(stars=\0x5c0x2a\0x5c0x2a\0x5c0x2a))(gn=bar*)(gn=*baz))
+* // The stars in $filter0 are treaten as real stars unless you disable escaping.
+* </code>
+*
+* @category Net
+* @package  Net_LDAP2
+* @author   Benedikt Hallinger <beni@php.net>
+* @license  http://www.gnu.org/copyleft/lesser.html LGPL
+* @link     http://pear.php.net/package/Net_LDAP2/
+*/
+class Net_LDAP2_Filter extends PEAR
+{
+    /**
+    * Storage for combination of filters
+    *
+    * This variable holds a array of filter objects
+    * that should be combined by this filter object.
+    *
+    * @access protected
+    * @var array
+    */
+    protected $_subfilters = array();
+
+    /**
+    * Match of this filter
+    *
+    * If this is a leaf filter, then a matching rule is stored,
+    * if it is a container, then it is a logical operator
+    *
+    * @access protected
+    * @var string
+    */
+    protected $_match;
+
+    /**
+    * Single filter
+    *
+    * If we operate in leaf filter mode,
+    * then the constructing method stores
+    * the filter representation here
+    *
+    * @acces private
+    * @var string
+    */
+    protected $_filter;
+
+    /**
+    * Create a new Net_LDAP2_Filter object and parse $filter.
+    *
+    * This is for PERL Net::LDAP interface.
+    * Construction of Net_LDAP2_Filter objects should happen through either
+    * {@link create()} or {@link combine()} which give you more control.
+    * However, you may use the perl iterface if you already have generated filters.
+    *
+    * @param string $filter LDAP filter string
+    *
+    * @see parse()
+    */
+    public function __construct($filter = false)
+    {
+        // The optional parameter must remain here, because otherwise create() crashes
+        if (false !== $filter) {
+            $filter_o = self::parse($filter);
+            if (PEAR::isError($filter_o)) {
+                $this->_filter = $filter_o; // assign error, so asString() can report it
+            } else {
+                $this->_filter = $filter_o->asString();
+            }
+        }
+    }
+
+    /**
+    * Constructor of a new part of a LDAP filter.
+    *
+    * The following matching rules exists:
+    *    - equals:         One of the attributes values is exactly $value
+    *                      Please note that case sensitiviness is depends on the
+    *                      attributes syntax configured in the server.
+    *    - begins:         One of the attributes values must begin with $value
+    *    - ends:           One of the attributes values must end with $value
+    *    - contains:       One of the attributes values must contain $value
+    *    - present | any:  The attribute can contain any value but must be existent
+    *    - greater:        The attributes value is greater than $value
+    *    - less:           The attributes value is less than $value
+    *    - greaterOrEqual: The attributes value is greater or equal than $value
+    *    - lessOrEqual:    The attributes value is less or equal than $value
+    *    - approx:         One of the attributes values is similar to $value
+    *
+    * Negation ("not") can be done by prepending the above operators with the
+    * "not" or "!" keyword, see example below. 
+    *
+    * If $escape is set to true (default) then $value will be escaped
+    * properly. If it is set to false then $value will be treaten as raw filter value string.
+    * You should escape yourself using {@link Net_LDAP2_Util::escape_filter_value()}!
+    *
+    * Examples:
+    * <code>
+    *   // This will find entries that contain an attribute "sn" that ends with "foobar":
+    *   $filter = Net_LDAP2_Filter::create('sn', 'ends', 'foobar');
+    *
+    *   // This will find entries that contain an attribute "sn" that has any value set:
+    *   $filter = Net_LDAP2_Filter::create('sn', 'any');
+    *
+    *   // This will build a negated equals filter:
+    *   $filter = Net_LDAP2_Filter::create('sn', 'not equals', 'foobar');
+    * </code>
+    *
+    * @param string  $attr_name Name of the attribute the filter should apply to
+    * @param string  $match     Matching rule (equals, begins, ends, contains, greater, less, greaterOrEqual, lessOrEqual, approx, any)
+    * @param string  $value     (optional) if given, then this is used as a filter
+    * @param boolean $escape    Should $value be escaped? (default: yes, see {@link Net_LDAP2_Util::escape_filter_value()} for detailed information)
+    *
+    * @return Net_LDAP2_Filter|Net_LDAP2_Error
+    */
+    public static function create($attr_name, $match, $value = '', $escape = true)
+    {
+        $leaf_filter = new Net_LDAP2_Filter();
+        if ($escape) {
+            $array = Net_LDAP2_Util::escape_filter_value(array($value));
+            $value = $array[0];
+        }
+
+        $match = strtolower($match);
+
+        // detect negation
+        $neg_matches   = array();
+        $negate_filter = false;
+        if (preg_match('/^(?:not|!)[\s_-](.+)/', $match, $neg_matches)) {
+            $negate_filter = true;
+            $match         = $neg_matches[1];
+        }
+
+        // build basic filter
+        switch ($match) {
+        case 'equals':
+        case '=':
+        case '==':
+            $leaf_filter->_filter = '(' . $attr_name . '=' . $value . ')';
+            break;
+        case 'begins':
+            $leaf_filter->_filter = '(' . $attr_name . '=' . $value . '*)';
+            break;
+        case 'ends':
+            $leaf_filter->_filter = '(' . $attr_name . '=*' . $value . ')';
+            break;
+        case 'contains':
+            $leaf_filter->_filter = '(' . $attr_name . '=*' . $value . '*)';
+            break;
+        case 'greater':
+        case '>':

Net_LDAP2-2.2.0.tgz/Net_LDAP2-2.2.0/Net/LDAP2/LDIF.php Added

@@ -0,0 +1,925 @@
+<?php
+/* vim: set expandtab tabstop=4 shiftwidth=4: */
+/**
+* File containing the Net_LDAP2_LDIF interface class.
+*
+* PHP version 5
+*
+* @category  Net
+* @package   Net_LDAP2
+* @author    Benedikt Hallinger <beni@php.net>
+* @copyright 2009 Benedikt Hallinger
+* @license   http://www.gnu.org/licenses/lgpl-3.0.txt LGPLv3
+* @version   SVN: $Id$
+* @link      http://pear.php.net/package/Net_LDAP2/
+*/
+
+/**
+* Includes
+*/
+require_once 'PEAR.php';
+require_once 'Net/LDAP2.php';
+require_once 'Net/LDAP2/Entry.php';
+require_once 'Net/LDAP2/Util.php';
+
+/**
+* LDIF capabilitys for Net_LDAP2, closely taken from PERLs Net::LDAP
+*
+* It provides a means to convert between Net_LDAP2_Entry objects and LDAP entries
+* represented in LDIF format files. Reading and writing are supported and may
+* manipulate single entries or lists of entries.
+*
+* Usage example:
+* <code>
+* // Read and parse an ldif-file into Net_LDAP2_Entry objects
+* // and print out the DNs. Store the entries for later use.
+* require 'Net/LDAP2/LDIF.php';
+* $options = array(
+*       'onerror' => 'die'
+* );
+* $entries = array();
+* $ldif = new Net_LDAP2_LDIF('test.ldif', 'r', $options);
+* do {
+*       $entry = $ldif->read_entry();
+*       $dn    = $entry->dn();
+*       echo " done building entry: $dn\n";
+*       array_push($entries, $entry);
+* } while (!$ldif->eof());
+* $ldif->done();
+*
+*
+* // write those entries to another file
+* $ldif = new Net_LDAP2_LDIF('test.out.ldif', 'w', $options);
+* $ldif->write_entry($entries);
+* $ldif->done();
+* </code>
+*
+* @category Net
+* @package  Net_LDAP2
+* @author   Benedikt Hallinger <beni@php.net>
+* @license  http://www.gnu.org/copyleft/lesser.html LGPL
+* @link     http://pear.php.net/package/Net_LDAP22/
+* @see      http://www.ietf.org/rfc/rfc2849.txt
+* @todo     Error handling should be PEARified
+* @todo     LDAPv3 controls are not implemented yet
+*/
+class Net_LDAP2_LDIF extends PEAR
+{
+    /**
+    * Options
+    *
+    * @access protected
+    * @var array
+    */
+    protected $_options = array('encode'    => 'base64',
+                                'onerror'   => null,
+                                'change'    => 0,
+                                'lowercase' => 0,
+                                'sort'      => 0,
+                                'version'   => null,
+                                'wrap'      => 78,
+                                'raw'       => ''
+                               );
+
+    /**
+    * Errorcache
+    *
+    * @access protected
+    * @var array
+    */
+    protected $_error = array('error' => null,
+                              'line'  => 0
+                             );
+
+    /**
+    * Filehandle for read/write
+    *
+    * @access protected
+    * @var array
+    */
+    protected $_FH = null;
+
+    /**
+    * Says, if we opened the filehandle ourselves
+    *
+    * @access protected
+    * @var array
+    */
+    protected $_FH_opened = false;
+
+    /**
+    * Linecounter for input file handle
+    *
+    * @access protected
+    * @var array
+    */
+    protected $_input_line = 0;
+
+    /**
+    * counter for processed entries
+    *
+    * @access protected
+    * @var int
+    */
+    protected $_entrynum = 0;
+
+    /**
+    * Mode we are working in
+    *
+    * Either 'r', 'a' or 'w'
+    *
+    * @access protected
+    * @var string
+    */
+    protected $_mode = false;
+
+    /**
+    * Tells, if the LDIF version string was already written
+    *
+    * @access protected
+    * @var boolean
+    */
+    protected $_version_written = false;
+
+    /**
+    * Cache for lines that have build the current entry
+    *
+    * @access protected
+    * @var boolean
+    */
+    protected $_lines_cur = array();
+
+    /**
+    * Cache for lines that will build the next entry
+    *
+    * @access protected
+    * @var boolean
+    */
+    protected $_lines_next = array();
+
+    /**
+    * Open LDIF file for reading or for writing
+    *
+    * new (FILE):
+    * Open the file read-only. FILE may be the name of a file
+    * or an already open filehandle.
+    * If the file doesn't exist, it will be created if in write mode.
+    *
+    * new (FILE, MODE, OPTIONS):
+    *     Open the file with the given MODE (see PHPs fopen()), eg "w" or "a".
+    *     FILE may be the name of a file or an already open filehandle.
+    *     PERLs Net_LDAP2 "FILE|" mode does not work curently.
+    *
+    *     OPTIONS is an associative array and may contain:
+    *       encode => 'none' | 'canonical' | 'base64'
+    *         Some DN values in LDIF cannot be written verbatim and have to be encoded in some way:
+    *         'none'       No encoding.
+    *         'canonical'  See "canonical_dn()" in Net::LDAP::Util.
+    *         'base64'     Use base64. (default, this differs from the Perl interface.
+    *                                   The perl default is "none"!)
+    *
+    *       onerror => 'die' | 'warn' | NULL
+    *         Specify what happens when an error is detected.
+    *         'die'  Net_LDAP2_LDIF will croak with an appropriate message.
+    *         'warn' Net_LDAP2_LDIF will warn (echo) with an appropriate message.
+    *         NULL   Net_LDAP2_LDIF will not warn (default), use error().
+    *
+    *       change => 1
+    *         Write entry changes to the LDIF file instead of the entries itself. I.e. write LDAP
+    *         operations acting on the entries to the file instead of the entries contents.
+    *         This writes the changes usually carried out by an update() to the LDIF file.
+    *
+    *       lowercase => 1
+    *         Convert attribute names to lowercase when writing.
+    *
+    *       sort => 1
+    *         Sort attribute names when writing entries according to the rule:
+    *         objectclass first then all other attributes alphabetically sorted by attribute name
+    *
+    *       version => '1'

Net_LDAP2-2.2.0.tgz/Net_LDAP2-2.2.0/Net/LDAP2/RootDSE.php Added

@@ -0,0 +1,240 @@
+<?php
+/* vim: set expandtab tabstop=4 shiftwidth=4: */
+/**
+* File containing the Net_LDAP2_RootDSE interface class.
+*
+* PHP version 5
+*
+* @category  Net
+* @package   Net_LDAP2
+* @author    Jan Wagner <wagner@netsols.de>
+* @copyright 2009 Jan Wagner
+* @license   http://www.gnu.org/licenses/lgpl-3.0.txt LGPLv3
+* @version   SVN: $Id$
+* @link      http://pear.php.net/package/Net_LDAP2/
+*/
+
+/**
+* Includes
+*/
+require_once 'PEAR.php';
+
+/**
+* Getting the rootDSE entry of a LDAP server
+*
+* @category Net
+* @package  Net_LDAP2
+* @author   Jan Wagner <wagner@netsols.de>
+* @license  http://www.gnu.org/copyleft/lesser.html LGPL
+* @link     http://pear.php.net/package/Net_LDAP22/
+*/
+class Net_LDAP2_RootDSE extends PEAR
+{
+    /**
+    * @access protected
+    * @var object Net_LDAP2_Entry
+    **/
+    protected $_entry;
+
+    /**
+    * Class constructor
+    *
+    * @param Net_LDAP2_Entry &$entry Net_LDAP2_Entry object of the RootDSE
+    */
+    public function __construct(&$entry)
+    {
+        $this->_entry = $entry;
+    }
+
+    /**
+    * Fetches a RootDSE object from an LDAP connection
+    *
+    * @param Net_LDAP2 $ldap  Directory from which the RootDSE should be fetched
+    * @param array     $attrs Array of attributes to search for
+    *
+    * @access static
+    * @return Net_LDAP2_RootDSE|Net_LDAP2_Error
+    */
+    public static function fetch($ldap, $attrs = null)
+    {
+        if (!$ldap instanceof Net_LDAP2) {
+            return PEAR::raiseError("Unable to fetch Schema: Parameter \$ldap must be a Net_LDAP2 object!");
+        }
+
+        if (is_array($attrs) && count($attrs) > 0 ) {
+            $attributes = $attrs;
+        } else {
+            $attributes = array('vendorName',
+                                'vendorVersion',
+                                'namingContexts',
+                                'altServer',
+                                'supportedExtension',
+                                'supportedControl',
+                                'supportedSASLMechanisms',
+                                'supportedLDAPVersion',
+                                'subschemaSubentry' );
+        }
+        $result = $ldap->search('', '(objectClass=*)', array('attributes' => $attributes, 'scope' => 'base'));
+        if (self::isError($result)) {
+            return $result;
+        }
+        $entry = $result->shiftEntry();
+        if (false === $entry) {
+            return PEAR::raiseError('Could not fetch RootDSE entry');
+        }
+        $ret = new Net_LDAP2_RootDSE($entry);
+        return $ret;
+    }
+
+    /**
+    * Gets the requested attribute value
+    *
+    * Same usuage as {@link Net_LDAP2_Entry::getValue()}
+    *
+    * @param string $attr    Attribute name
+    * @param array  $options Array of options
+    *
+    * @access public
+    * @return mixed Net_LDAP2_Error object or attribute values
+    * @see Net_LDAP2_Entry::get_value()
+    */
+    public function getValue($attr = '', $options = '')
+    {
+        return $this->_entry->get_value($attr, $options);
+    }
+
+    /**
+    * Alias function of getValue() for perl-ldap interface
+    *
+    * @see getValue()
+    * @return mixed
+    */
+    public function get_value()
+    {
+        $args = func_get_args();
+        return call_user_func_array(array( &$this, 'getValue' ), $args);
+    }
+
+    /**
+    * Determines if the extension is supported
+    *
+    * @param array $oids Array of oids to check
+    *
+    * @access public
+    * @return boolean
+    */
+    public function supportedExtension($oids)
+    {
+        return $this->checkAttr($oids, 'supportedExtension');
+    }
+
+    /**
+    * Alias function of supportedExtension() for perl-ldap interface
+    *
+    * @see supportedExtension()
+    * @return boolean
+    */
+    public function supported_extension()
+    {
+        $args = func_get_args();
+        return call_user_func_array(array( &$this, 'supportedExtension'), $args);
+    }
+
+    /**
+    * Determines if the version is supported
+    *
+    * @param array $versions Versions to check
+    *
+    * @access public
+    * @return boolean
+    */
+    public function supportedVersion($versions)
+    {
+        return $this->checkAttr($versions, 'supportedLDAPVersion');
+    }
+
+    /**
+    * Alias function of supportedVersion() for perl-ldap interface
+    *
+    * @see supportedVersion()
+    * @return boolean
+    */
+    public function supported_version()
+    {
+        $args = func_get_args();
+        return call_user_func_array(array(&$this, 'supportedVersion'), $args);
+    }
+
+    /**
+    * Determines if the control is supported
+    *
+    * @param array $oids Control oids to check
+    *
+    * @access public
+    * @return boolean
+    */
+    public function supportedControl($oids)
+    {
+        return $this->checkAttr($oids, 'supportedControl');
+    }
+
+    /**
+    * Alias function of supportedControl() for perl-ldap interface
+    *
+    * @see supportedControl()
+    * @return boolean
+    */
+    public function supported_control()
+    {
+        $args = func_get_args();
+        return call_user_func_array(array(&$this, 'supportedControl' ), $args);
+    }
+
+    /**
+    * Determines if the sasl mechanism is supported
+    *
+    * @param array $mechlist SASL mechanisms to check
+    *
+    * @access public
+    * @return boolean

Net_LDAP2-2.2.0.tgz/Net_LDAP2-2.2.0/Net/LDAP2/Schema.php Added

@@ -0,0 +1,622 @@
+<?php
+/* vim: set expandtab tabstop=4 shiftwidth=4: */
+/**
+* File containing the Net_LDAP2_Schema interface class.
+*
+* PHP version 5
+*
+* @category  Net
+* @package   Net_LDAP2
+* @author    Jan Wagner <wagner@netsols.de>
+* @author    Benedikt Hallinger <beni@php.net>
+* @copyright 2009 Jan Wagner, Benedikt Hallinger
+* @license   http://www.gnu.org/licenses/lgpl-3.0.txt LGPLv3
+* @version   SVN: $Id$
+* @link      http://pear.php.net/package/Net_LDAP2/
+* @todo see the comment at the end of the file
+*/
+
+/**
+* Includes
+*/
+require_once 'PEAR.php';
+
+/**
+* Syntax definitions
+*
+* Please don't forget to add binary attributes to isBinary() below
+* to support proper value fetching from Net_LDAP2_Entry
+*/
+define('NET_LDAP2_SYNTAX_BOOLEAN',            '1.3.6.1.4.1.1466.115.121.1.7');
+define('NET_LDAP2_SYNTAX_DIRECTORY_STRING',   '1.3.6.1.4.1.1466.115.121.1.15');
+define('NET_LDAP2_SYNTAX_DISTINGUISHED_NAME', '1.3.6.1.4.1.1466.115.121.1.12');
+define('NET_LDAP2_SYNTAX_INTEGER',            '1.3.6.1.4.1.1466.115.121.1.27');
+define('NET_LDAP2_SYNTAX_JPEG',               '1.3.6.1.4.1.1466.115.121.1.28');
+define('NET_LDAP2_SYNTAX_NUMERIC_STRING',     '1.3.6.1.4.1.1466.115.121.1.36');
+define('NET_LDAP2_SYNTAX_OID',                '1.3.6.1.4.1.1466.115.121.1.38');
+define('NET_LDAP2_SYNTAX_OCTET_STRING',       '1.3.6.1.4.1.1466.115.121.1.40');
+
+/**
+* Load an LDAP Schema and provide information
+*
+* This class takes a Subschema entry, parses this information
+* and makes it available in an array. Most of the code has been
+* inspired by perl-ldap( http://perl-ldap.sourceforge.net).
+* You will find portions of their implementation in here.
+*
+* @category Net
+* @package  Net_LDAP2
+* @author   Jan Wagner <wagner@netsols.de>
+* @author   Benedikt Hallinger <beni@php.net>
+* @license  http://www.gnu.org/copyleft/lesser.html LGPL
+* @link     http://pear.php.net/package/Net_LDAP22/
+*/
+class Net_LDAP2_Schema extends PEAR
+{
+    /**
+    * Map of entry types to ldap attributes of subschema entry
+    *
+    * @access public
+    * @var array
+    */
+    public $types = array(
+            'attribute'        => 'attributeTypes',
+            'ditcontentrule'   => 'dITContentRules',
+            'ditstructurerule' => 'dITStructureRules',
+            'matchingrule'     => 'matchingRules',
+            'matchingruleuse'  => 'matchingRuleUse',
+            'nameform'         => 'nameForms',
+            'objectclass'      => 'objectClasses',
+            'syntax'           => 'ldapSyntaxes'
+        );
+
+    /**
+    * Array of entries belonging to this type
+    *
+    * @access protected
+    * @var array
+    */
+    protected $_attributeTypes    = array();
+    protected $_matchingRules     = array();
+    protected $_matchingRuleUse   = array();
+    protected $_ldapSyntaxes      = array();
+    protected $_objectClasses     = array();
+    protected $_dITContentRules   = array();
+    protected $_dITStructureRules = array();
+    protected $_nameForms         = array();
+
+
+    /**
+    * hash of all fetched oids
+    *
+    * @access protected
+    * @var array
+    */
+    protected $_oids = array();
+
+    /**
+    * Tells if the schema is initialized
+    *
+    * @access protected
+    * @var boolean
+    * @see parse(), get()
+    */
+    protected $_initialized = false;
+
+
+    /**
+    * Constructor of the class
+    *
+    * @access protected
+    */
+    public function __construct()
+    {
+        parent::__construct('Net_LDAP2_Error'); // default error class
+    }
+
+    /**
+    * Fetch the Schema from an LDAP connection
+    *
+    * @param Net_LDAP2 $ldap LDAP connection
+    * @param string    $dn   (optional) Subschema entry dn
+    *
+    * @access public
+    * @return Net_LDAP2_Schema|NET_LDAP2_Error
+    */
+    public static function fetch($ldap, $dn = null)
+    {
+        if (!$ldap instanceof Net_LDAP2) {
+            return PEAR::raiseError("Unable to fetch Schema: Parameter \$ldap must be a Net_LDAP2 object!");
+        }
+
+        $schema_o = new Net_LDAP2_Schema();
+
+        if (is_null($dn)) {
+            // get the subschema entry via root dse
+            $dse = $ldap->rootDSE(array('subschemaSubentry'));
+            if (false == Net_LDAP2::isError($dse)) {
+                $base = $dse->getValue('subschemaSubentry', 'single');
+                if (!Net_LDAP2::isError($base)) {
+                    $dn = $base;
+                }
+            }
+        }
+
+        // Support for buggy LDAP servers (e.g. Siemens DirX 6.x) that incorrectly
+        // call this entry subSchemaSubentry instead of subschemaSubentry.
+        // Note the correct case/spelling as per RFC 2251.
+        if (is_null($dn)) {
+            // get the subschema entry via root dse
+            $dse = $ldap->rootDSE(array('subSchemaSubentry'));
+            if (false == Net_LDAP2::isError($dse)) {
+                $base = $dse->getValue('subSchemaSubentry', 'single');
+                if (!Net_LDAP2::isError($base)) {
+                    $dn = $base;
+                }
+            }
+        }
+
+        // Final fallback case where there is no subschemaSubentry attribute
+        // in the root DSE (this is a bug for an LDAP v3 server so report this
+        // to your LDAP vendor if you get this far).
+        if (is_null($dn)) {
+            $dn = 'cn=Subschema';
+        }
+
+        // fetch the subschema entry
+        $result = $ldap->search($dn, '(objectClass=*)',
+                                array('attributes' => array_values($schema_o->types),
+                                        'scope' => 'base'));
+        if (Net_LDAP2::isError($result)) {
+            return PEAR::raiseError('Could not fetch Subschema entry: '.$result->getMessage());
+        }
+
+        $entry = $result->shiftEntry();
+        if (!$entry instanceof Net_LDAP2_Entry) {
+            if ($entry instanceof Net_LDAP2_Error) {
+                return PEAR::raiseError('Could not fetch Subschema entry: '.$entry->getMessage());
+            } else {
+                return PEAR::raiseError('Could not fetch Subschema entry (search returned '.$result->count().' entries. Check parameter \'basedn\')');
+            }
+        }
+
+        $schema_o->parse($entry);
+        return $schema_o;
+    }
+
+    /**
+    * Return a hash of entries for the given type
+    *
+    * Returns a hash of entry for the givene type. Types may be:
+    * objectclasses, attributes, ditcontentrules, ditstructurerules, matchingrules,
+    * matchingruleuses, nameforms, syntaxes
+    *
+    * @param string $type Type to fetch
+    *
+    * @access public
+    * @return array|Net_LDAP2_Error Array or Net_LDAP2_Error
+    */
+    public function &getAll($type)

Net_LDAP2-2.2.0.tgz/Net_LDAP2-2.2.0/Net/LDAP2/SchemaCache.interface.php Added

@@ -0,0 +1,59 @@
+<?php
+/* vim: set expandtab tabstop=4 shiftwidth=4: */
+/**
+* File containing the Net_LDAP2_SchemaCache interface class.
+*
+* PHP version 5
+*
+* @category  Net
+* @package   Net_LDAP2
+* @author    Benedikt Hallinger <beni@php.net>
+* @copyright 2009 Benedikt Hallinger
+* @license   http://www.gnu.org/licenses/lgpl-3.0.txt LGPLv3
+* @version   SVN: $Id$
+* @link      http://pear.php.net/package/Net_LDAP2/
+*/
+
+/**
+* Interface describing a custom schema cache object
+*
+* To implement a custom schema cache, one must implement this interface and
+* pass the instanciated object to Net_LDAP2s registerSchemaCache() method.
+*/
+interface Net_LDAP2_SchemaCache
+{
+    /**
+    * Return the schema object from the cache
+    *
+    * Net_LDAP2 will consider anything returned invalid, except
+    * a valid Net_LDAP2_Schema object.
+    * In case you return a Net_LDAP2_Error, this error will be routed
+    * to the return of the $ldap->schema() call.
+    * If you return something else, Net_LDAP2 will
+    * fetch a fresh Schema object from the LDAP server.
+    *
+    * You may want to implement a cache aging mechanism here too.
+    *
+    * @return Net_LDAP2_Schema|Net_LDAP2_Error|false
+    */
+    public function loadSchema();
+
+    /**
+    * Store a schema object in the cache
+    *
+    * This method will be called, if Net_LDAP2 has fetched a fresh
+    * schema object from LDAP and wants to init or refresh the cache.
+    *
+    * In case of errors you may return a Net_LDAP2_Error which will
+    * be routet to the client.
+    * Note that doing this prevents, that the schema object fetched from LDAP
+    * will be given back to the client, so only return errors if storing
+    * of the cache is something crucial (e.g. for doing something else with it).
+    * Normaly you dont want to give back errors in which case Net_LDAP2 needs to
+    * fetch the schema once per script run and instead use the error
+    * returned from loadSchema().
+    *
+    * @return true|Net_LDAP2_Error
+    */
+    public function storeSchema($schema);
+}

Net_LDAP2-2.2.0.tgz/Net_LDAP2-2.2.0/Net/LDAP2/Search.php Added

@@ -0,0 +1,631 @@
+<?php
+/* vim: set expandtab tabstop=4 shiftwidth=4: */
+/**
+* File containing the Net_LDAP2_Search interface class.
+*
+* PHP version 5
+*
+* @category  Net
+* @package   Net_LDAP2
+* @author    Tarjej Huse <tarjei@bergfald.no>
+* @author    Benedikt Hallinger <beni@php.net>
+* @copyright 2009 Tarjej Huse, Benedikt Hallinger
+* @license   http://www.gnu.org/licenses/lgpl-3.0.txt LGPLv3
+* @version   SVN: $Id$
+* @link      http://pear.php.net/package/Net_LDAP2/
+*/
+
+/**
+* Includes
+*/
+require_once 'PEAR.php';
+
+/**
+* Result set of an LDAP search
+*
+* @category Net
+* @package  Net_LDAP2
+* @author   Tarjej Huse <tarjei@bergfald.no>
+* @author   Benedikt Hallinger <beni@php.net>
+* @license  http://www.gnu.org/copyleft/lesser.html LGPL
+* @link     http://pear.php.net/package/Net_LDAP22/
+*/
+class Net_LDAP2_Search extends PEAR implements Iterator
+{
+    /**
+    * Search result identifier
+    *
+    * @access protected
+    * @var resource
+    */
+    protected $_search;
+
+    /**
+    * LDAP resource link
+    *
+    * @access protected
+    * @var resource
+    */
+    protected $_link;
+
+    /**
+    * Net_LDAP2 object
+    *
+    * A reference of the Net_LDAP2 object for passing to Net_LDAP2_Entry
+    *
+    * @access protected
+    * @var object Net_LDAP2
+    */
+    protected $_ldap;
+
+    /**
+    * Result entry identifier
+    *
+    * @access protected
+    * @var resource
+    */
+    protected $_entry = null;
+
+    /**
+    * The errorcode the search got
+    *
+    * Some errorcodes might be of interest, but might not be best handled as errors.
+    * examples: 4 - LDAP_SIZELIMIT_EXCEEDED - indicates a huge search.
+    *               Incomplete results are returned. If you just want to check if there's anything in the search.
+    *               than this is a point to handle.
+    *           32 - no such object - search here returns a count of 0.
+    *
+    * @access protected
+    * @var int
+    */
+    protected $_errorCode = 0; // if not set - sucess!
+
+    /**
+    * Cache for all entries already fetched from iterator interface
+    *
+    * @access protected
+    * @var array
+    */
+    protected $_iteratorCache = array();
+
+    /**
+    * What attributes we searched for
+    *
+    * The $attributes array contains the names of the searched attributes and gets
+    * passed from $Net_LDAP2->search() so the Net_LDAP2_Search object can tell
+    * what attributes was searched for ({@link searchedAttrs())
+    *
+    * This variable gets set from the constructor and returned
+    * from {@link searchedAttrs()}
+    *
+    * @access protected
+    * @var array
+    */
+    protected $_searchedAttrs = array();
+
+    /**
+    * Cache variable for storing entries fetched internally
+    *
+    * This currently is not used by all functions and need consolidation.
+    *
+    * @access protected
+    * @var array
+    */
+    protected $_entry_cache = false;
+
+    /**
+    * Cache variable for count()
+    *
+    * @see count()
+    * @access protected
+    * @var int
+    */
+    protected $_count_cache = null;
+
+    /**
+    * Constructor
+    *
+    * @param resource           $search    Search result identifier
+    * @param Net_LDAP2|resource $ldap      Net_LDAP2 object or just a LDAP-Link resource
+    * @param array              $attributes (optional) Array with searched attribute names. (see {@link $_searchedAttrs})
+    *
+    * @access public
+    */
+    public function __construct($search, $ldap, $attributes = array())
+    {
+        parent::__construct('Net_LDAP2_Error');
+
+        $this->setSearch($search);
+
+        if ($ldap instanceof Net_LDAP2) {
+            $this->_ldap = $ldap;
+            $this->setLink($this->_ldap->getLink());
+        } else {
+            $this->setLink($ldap);
+        }
+
+        $this->_errorCode = @ldap_errno($this->_link);
+
+        if (is_array($attributes) && !empty($attributes)) {
+            $this->_searchedAttrs = $attributes;
+        }
+    }
+
+    /**
+    * Returns an array of entry objects.
+    *
+    * @return array Array of entry objects.
+    */
+    public function entries()
+    {
+        $entries = array();
+
+        if (false === $this->_entry_cache) {
+            // cache is empty: fetch from LDAP
+            while ($entry = $this->shiftEntry()) {
+                $entries[] = $entry;
+            }
+            $this->_entry_cache = $entries; // store result in cache
+        }
+
+        return $this->_entry_cache;
+    }
+
+    /**
+    * Get the next entry in the searchresult from LDAP server.
+    *
+    * This will return a valid Net_LDAP2_Entry object or false, so
+    * you can use this method to easily iterate over the entries inside
+    * a while loop.
+    *
+    * @return Net_LDAP2_Entry|false  Reference to Net_LDAP2_Entry object or false
+    */
+    public function shiftEntry()
+    {
+        if (is_null($this->_entry)) {
+            if(!$this->_entry = @ldap_first_entry($this->_link, $this->_search)) {
+                $false = false;
+                return $false;
+            }
+            $entry = Net_LDAP2_Entry::createConnected($this->_ldap, $this->_entry);
+            if ($entry instanceof PEAR_Error) $entry = false;
+        } else {
+            if (!$this->_entry = @ldap_next_entry($this->_link, $this->_entry)) {
+                $false = false;
+                return $false;
+            }
+            $entry = Net_LDAP2_Entry::createConnected($this->_ldap, $this->_entry);
+            if ($entry instanceof PEAR_Error) $entry = false;
+        }

Net_LDAP2-2.2.0.tgz/Net_LDAP2-2.2.0/Net/LDAP2/SimpleFileSchemaCache.php Added

@@ -0,0 +1,97 @@
+<?php
+/* vim: set expandtab tabstop=4 shiftwidth=4: */
+/**
+* File containing the example simple file based Schema Caching class.
+*
+* PHP version 5
+*
+* @category  Net
+* @package   Net_LDAP2
+* @author    Benedikt Hallinger <beni@php.net>
+* @copyright 2009 Benedikt Hallinger
+* @license   http://www.gnu.org/licenses/lgpl-3.0.txt LGPLv3
+* @version   SVN: $Id$
+* @link      http://pear.php.net/package/Net_LDAP2/
+*/
+
+/**
+* A simple file based schema cacher with cache aging.
+*
+* Once the cache is too old, the loadSchema() method will return false, so
+* Net_LDAP2 will fetch a fresh object from the LDAP server that will
+* overwrite the current (outdated) old cache.
+*/
+class Net_LDAP2_SimpleFileSchemaCache implements Net_LDAP2_SchemaCache
+{
+    /**
+    * Internal config of this cache
+    *
+    * @see Net_LDAP2_SimpleFileSchemaCache()
+    * @var array
+    */
+    protected $config = array(
+        'path'    => '/tmp/Net_LDAP_Schema.cache',
+        'max_age' => 1200
+    );
+
+    /**
+    * Initialize the simple cache
+    *
+    * Config is as following:
+    *  path     Complete path to the cache file.
+    *  max_age  Maximum age of cache in seconds, 0 means "endlessly".
+    *
+    * @param array $cfg Config array
+    */
+    public function __construct($cfg)
+    {
+    	foreach ($cfg as $key => $value) {
+			if (array_key_exists($key, $this->config)) {
+				if (gettype($this->config[$key]) != gettype($value)) {
+					$this->getCore()->dropFatalError(__CLASS__.": Could not set config! Key $key does not match type ".gettype($this->config[$key])."!");
+				}
+				$this->config[$key] = $value;
+			} else {
+				$this->getCore()->dropFatalError(__CLASS__.": Could not set config! Key $key is not defined!");
+			}
+		}
+    }
+
+    /**
+    * Return the schema object from the cache
+    *
+    * If file is existent and cache has not expired yet,
+    * then the cache is deserialized and returned.
+    *
+    * @return Net_LDAP2_Schema|Net_LDAP2_Error|false
+    */
+    public function loadSchema()
+    {
+         $return = false; // Net_LDAP2 will load schema from LDAP
+         if (file_exists($this->config['path'])) {
+             $cache_maxage = filemtime($this->config['path']) + $this->config['max_age'];
+             if (time() <= $cache_maxage || $this->config['max_age'] == 0) {
+                 $return = unserialize(file_get_contents($this->config['path']));
+             }
+         }
+         return $return;
+    }
+
+    /**
+    * Store a schema object in the cache
+    *
+    * This method will be called, if Net_LDAP2 has fetched a fresh
+    * schema object from LDAP and wants to init or refresh the cache.
+    *
+    * To invalidate the cache and cause Net_LDAP2 to refresh the cache,
+    * you can call this method with null or false as value.
+    * The next call to $ldap->schema() will then refresh the caches object.
+    *
+    * @param mixed $schema The object that should be cached
+    * @return true|Net_LDAP2_Error|false
+    */
+    public function storeSchema($schema) {
+        file_put_contents($this->config['path'], serialize($schema));
+        return true;
+    }
+}

Net_LDAP2-2.2.0.tgz/Net_LDAP2-2.2.0/Net/LDAP2/Util.php Added

@@ -0,0 +1,620 @@
+<?php
+/* vim: set expandtab tabstop=4 shiftwidth=4: */
+/**
+* File containing the Net_LDAP2_Util interface class.
+*
+* PHP version 5
+*
+* @category  Net
+* @package   Net_LDAP2
+* @author    Benedikt Hallinger <beni@php.net>
+* @copyright 2009 Benedikt Hallinger
+* @license   http://www.gnu.org/licenses/lgpl-3.0.txt LGPLv3
+* @version   SVN: $Id$
+* @link      http://pear.php.net/package/Net_LDAP2/
+*/
+
+/**
+* Includes
+*/
+require_once 'PEAR.php';
+
+/**
+* Utility Class for Net_LDAP2
+*
+* This class servers some functionality to the other classes of Net_LDAP2 but most of
+* the methods can be used separately as well.
+*
+* @category Net
+* @package  Net_LDAP2
+* @author   Benedikt Hallinger <beni@php.net>
+* @license  http://www.gnu.org/copyleft/lesser.html LGPL
+* @link     http://pear.php.net/package/Net_LDAP22/
+*/
+class Net_LDAP2_Util extends PEAR
+{
+    /**
+     * Constructor
+     *
+     * @access public
+     */
+    public function __construct()
+    {
+         // We do nothing here, since all methods can be called statically.
+         // In Net_LDAP <= 0.7, we needed a instance of Util, because
+         // it was possible to do utf8 encoding and decoding, but this
+         // has been moved to the LDAP class. The constructor remains only
+         // here to document the downward compatibility of creating an instance.
+    }
+
+    /**
+    * Explodes the given DN into its elements
+    *
+    * {@link http://www.ietf.org/rfc/rfc2253.txt RFC 2253} says, a Distinguished Name is a sequence
+    * of Relative Distinguished Names (RDNs), which themselves
+    * are sets of Attributes. For each RDN a array is constructed where the RDN part is stored.
+    *
+    * For example, the DN 'OU=Sales+CN=J. Smith,DC=example,DC=net' is exploded to:
+    * <kbd>array( [0] => array([0] => 'OU=Sales', [1] => 'CN=J. Smith'), [2] => 'DC=example', [3] => 'DC=net' )</kbd>
+    *
+    * [NOT IMPLEMENTED] DNs might also contain values, which are the bytes of the BER encoding of
+    * the X.500 AttributeValue rather than some LDAP string syntax. These values are hex-encoded
+    * and prefixed with a #. To distinguish such BER values, ldap_explode_dn uses references to
+    * the actual values, e.g. '1.3.6.1.4.1.1466.0=#04024869,DC=example,DC=com' is exploded to:
+    * [ { '1.3.6.1.4.1.1466.0' => "\004\002Hi" }, { 'DC' => 'example' }, { 'DC' => 'com' } ];
+    * See {@link http://www.vijaymukhi.com/vmis/berldap.htm} for more information on BER.
+    *
+    *  It also performs the following operations on the given DN:
+    *   - Unescape "\" followed by ",", "+", """, "\", "<", ">", ";", "#", "=", " ", or a hexpair
+    *     and strings beginning with "#".
+    *   - Removes the leading 'OID.' characters if the type is an OID instead of a name.
+    *   - If an RDN contains multiple parts, the parts are re-ordered so that the attribute type names are in alphabetical order.
+    *
+    * OPTIONS is a list of name/value pairs, valid options are:
+    *   casefold    Controls case folding of attribute types names.
+    *               Attribute values are not affected by this option.
+    *               The default is to uppercase. Valid values are:
+    *               lower        Lowercase attribute types names.
+    *               upper        Uppercase attribute type names. This is the default.
+    *               none         Do not change attribute type names.
+    *   reverse     If TRUE, the RDN sequence is reversed.
+    *   onlyvalues  If TRUE, then only attributes values are returned ('foo' instead of 'cn=foo')
+    *
+
+    * @param string $dn      The DN that should be exploded
+    * @param array  $options Options to use
+    *
+    * @static
+    * @return array   Parts of the exploded DN
+    * @todo implement BER
+    */
+    public static function ldap_explode_dn($dn, $options = array('casefold' => 'upper'))
+    {
+        if (!isset($options['onlyvalues'])) $options['onlyvalues']  = false;
+        if (!isset($options['reverse']))    $options['reverse']     = false;
+        if (!isset($options['casefold']))   $options['casefold']    = 'upper';
+
+        // Escaping of DN and stripping of "OID."
+        $dn = self::canonical_dn($dn, array('casefold' => $options['casefold']));
+
+        // splitting the DN
+        $dn_array = preg_split('/(?<=[^\\\\]),/', $dn);
+
+        // clear wrong splitting (possibly we have split too much)
+        // /!\ Not clear, if this is neccessary here
+        //$dn_array = self::correct_dn_splitting($dn_array, ',');
+
+        // construct subarrays for multivalued RDNs and unescape DN value
+        // also convert to output format and apply casefolding
+        foreach ($dn_array as $key => $value) {
+            $value_u = self::unescape_dn_value($value);
+            $rdns    = self::split_rdn_multival($value_u[0]);
+            if (count($rdns) > 1) {
+                // MV RDN!
+                foreach ($rdns as $subrdn_k => $subrdn_v) {
+                    // Casefolding
+                    if ($options['casefold'] == 'upper') {
+                        $subrdn_v = preg_replace_callback(
+                            "/^\w+=/",
+                            function ($matches) {
+                                return strtoupper($matches[0]);
+                            },
+                            $subrdn_v
+                        );
+                    } else if ($options['casefold'] == 'lower') {
+                        $subrdn_v = preg_replace_callback(
+                            "/^\w+=/",
+                            function ($matches) {
+                                return strtolower($matches[0]);
+                            },
+                            $subrdn_v
+                        );
+                    }
+
+                    if ($options['onlyvalues']) {
+                        preg_match('/(.+?)(?<!\\\\)=(.+)/', $subrdn_v, $matches);
+                        $rdn_ocl         = $matches[1];
+                        $rdn_val         = $matches[2];
+                        $unescaped       = self::unescape_dn_value($rdn_val);
+                        $rdns[$subrdn_k] = $unescaped[0];
+                    } else {
+                        $unescaped = self::unescape_dn_value($subrdn_v);
+                        $rdns[$subrdn_k] = $unescaped[0];
+                    }
+                }
+
+                $dn_array[$key] = $rdns;
+            } else {
+                // normal RDN
+
+                // Casefolding
+                if ($options['casefold'] == 'upper') {
+                    $value = preg_replace_callback(
+                        "/^\w+=/",
+                        function ($matches) {
+                            return strtoupper($matches[0]);
+                        },
+                        $value
+                    );
+                } else if ($options['casefold'] == 'lower') {
+                    $value = preg_replace_callback(
+                        "/^\w+=/",
+                        function ($matches) {
+                            return strtolower($matches[0]);
+                        },
+                        $value
+                    );
+                }
+
+                if ($options['onlyvalues']) {
+                    preg_match('/(.+?)(?<!\\\\)=(.+)/', $value, $matches);
+                    $dn_ocl         = $matches[1];
+                    $dn_val         = $matches[2];
+                    $unescaped      = self::unescape_dn_value($dn_val);
+                    $dn_array[$key] = $unescaped[0];
+                } else {
+                    $unescaped = self::unescape_dn_value($value);
+                    $dn_array[$key] = $unescaped[0];
+                }
+            }
+        }
+
+        if ($options['reverse']) {
+            return array_reverse($dn_array);
+        } else {
+            return $dn_array;
+        }
+    }
+
+    /**
+    * Escapes a DN value according to RFC 2253
+    *
+    * Escapes the given VALUES according to RFC 2253 so that they can be safely used in LDAP DNs.
+    * The characters ",", "+", """, "\", "<", ">", ";", "#", "=" with a special meaning in RFC 2252
+    * are preceeded by ba backslash. Control characters with an ASCII code < 32 are represented as \hexpair.
+    * Finally all leading and trailing spaces are converted to sequences of \20.
+    *
+    * @param array $values An array containing the DN values that should be escaped
+    *
+    * @static

Net_LDAP2-2.2.0.tgz/Net_LDAP2-2.2.0/doc/README.txt Changed

Net_LDAP2-2.2.0.tgz/Net_LDAP2-2.2.0/doc/RootDSE.txt Changed

Net_LDAP2-2.2.0.tgz/Net_LDAP2-2.2.0/doc/Schema.txt Changed

Net_LDAP2-2.2.0.tgz/Net_LDAP2-2.2.0/doc/examples/add_entry.php Changed

Net_LDAP2-2.2.0.tgz/Net_LDAP2-2.2.0/doc/examples/connecting.php Changed

Net_LDAP2-2.2.0.tgz/Net_LDAP2-2.2.0/doc/examples/fetch_entry.php Changed

Net_LDAP2-2.2.0.tgz/Net_LDAP2-2.2.0/doc/examples/modify_entry.php Changed

Net_LDAP2-2.2.0.tgz/Net_LDAP2-2.2.0/doc/examples/modify_entry2.php Changed

Net_LDAP2-2.2.0.tgz/Net_LDAP2-2.2.0/doc/examples/schema_cache.php Changed

Net_LDAP2-2.2.0.tgz/Net_LDAP2-2.2.0/doc/examples/search_entries.php Changed

Net_LDAP2-2.2.0.tgz/Net_LDAP2-2.2.0/doc/manual.html Added

@@ -0,0 +1,248 @@
+<html>
+<head>
+	<title>Net_LDAP2 Manual</title>
+	<style type="text/css">
+		pre { border: 1px solid #000000; background-color:#EBEBEB; padding:5px; }
+	</style>
+</head>
+<body>
+<h1>Net_LDAP2 Manual</h1>
+Welcome to the Net_LDAP2 user manual! here you have a quick introduction on
+how to use Net_LDAP2 to acces your directory server with php.
+<p><font color="red">Note that this manual is only a brief introduction and also may be outdated.
+The official manual is available at the <a href="http://pear.php.net/package/Net_LDAP2/docs">PEAR project website.</a>
+The reason this manual remains here is, that it may be useful in cases you don't have internet
+acces at the moment.</font></p>
+
+<h2>First step: Connect</h2>
+<p>
+To do this, use the Net_LDAP2::connect function like this:
+
+<p><pre>
+require_once('Net_LDAP22/LDAP2.php');
+
+$config = array (
+            'binddn'   => 'uid=tarjei,dc=php,dc=net',
+            'bindpw' => 'secret',
+            'basedn'   => dc=php,dc=net
+          );
+
+$ldap = Net_LDAP2::connect($config);
+</pre></p>
+</p>
+<p>
+But what are valid values in the config array?
+<ul>Here's a quick table: (defaults)
+     <li><b>binddn</b>   = the DN to bind as. (none)</li>
+     <li><b>bindpw</b>   = Password of the user specified by 'binddn' (none)</li>
+     <li><b>host</b>     = the ldap host to connect to (localhost)</li>
+     <li><b>base</b>     = ldap base, this is usually the Entry point of your directory (none)</li>
+     <li><b>port</b>     = the server port (389)</li>
+     <li><b>starttls</b> = when set, ldap_start_tls() is run after connecting. (false)</li>
+     <li><b>version</b>  = ldap version (defaults to v 3) </li>
+     <li><b>filter</b>   = default search filter (objectclass=*)</li>
+     <li><b>scope</b>    = default search scope (sub)</li>
+</ul>
+We'll get back to these later.
+</p>
+
+
+
+<h2>Errorhandling</h2>
+<p>
+Now you should have the base ldapobject stored in the variable "$ldap".
+But, what if it is an error? Net_LDAP2 returns a Net_LDAP2_error object (basicly a
+pear_error object) when an error occurs. So wherever you need to check an error, do like this:
+<p><pre>
+$ldap = Net_LDAP2::connect($config); // copied from above! 
+
+if (Net_LDAP2::isError($ldap)) {
+   print $ldap->getMessage(); // this will tell you what went wrong!
+}
+
+</pre></p>
+</p>
+<p>
+Two things to note:
+
+<br>1) The function is_a() might be faster:
+<p><pre>
+if (is_a($ldap,'net_ldap_error')) {
+// do the same as above
+}
+</pre></p>
+In PHP5 you must use the instanceof operator instead of is_a().
+
+<br>2) Net_LDAP2_Error can also return an errornumber. These numbers are standardized. A good description of what they mean is found there:
+http://www.directory-info.com/LDAP2/LDAPErrorCodes.html
+</p>
+
+
+
+<h2>Searching (basics)</h2>
+<p>
+Most of the work you do on an ldapserver is in searching,
+for example, you search for your boss's password or his wife's phonenumber.
+<br>Searching an ldapserver is a bit like doing SQL and a lot not like it at all.</br>
+Think of the directory as some sort of "telephone book".
+Basically, searches are performed by applying a "filter" to objects under a
+specific "base" in the directory. Additionally, there is a "scope" applied to the search,
+so you can specify the recursion level in the directory tree.
+</p>
+<p>
+<h3>Base:</h3>
+The "base" is the point under the directory where you want to search under.
+To search for all people under php.net, you may use: "ou=People,dc=php,dc=net".
+But if you want just to search the devs, you can use "ou=dev,ou=People,dc=php,dc=net".
+</p>
+<p>
+<h3>Filter:</h3> Filters define what you are looking for. They "filter out" unwanted entries.
+<br>Filters start with a ( and end with a ). There is a lot to be said about filters, most is better said by examples:
+
+<br><br><b>(&(objectclass=posixAccount)(uid=boss)) :</b> The object has to satisfy both filters.
+I.e. an object that is both boss and an posixAccount. If you had another object
+with uid=boss but that wasn't an postixaccount it would be excluded.
+<br><b>(|(uid=boss)(uid=secretary)) :</b> Either the boss or the secretary. 
+Note that both logical operators are placed before the filters not between the
+two conditions as you might used to from sql.
+<br><b>(&(objectclass=posixAccount)(|(uid=boss)(uid=secretary))) :</b>
+Here they must have the posixAccount objectclass as well.
+
+<b>(objectclass=*) :</b> All objects must have an objectclass, so this is the simplest way of saying everything.
+
+<b>(uid=t*) :</b> With the right indexes on the server, you may search the substring of an attriute. Here; all users with the first name beginning with a "T".
+
+<br>Please note, that Net_LDAP2 provides a filter class for simplier generation and combination of filters.
+You should use that class unless you know how filters work. This will save you a lot of trouble,
+since there are some encoding issues with ldap-filters. If you want to provide the filter yourself,
+you should also have a look to <a href="http://www.ietf.org/rfc/rfc1558.txt">RFC #1558</a> defining LDAP-Filters.
+</p>
+
+<p>
+<h3>Searchscope</h3>
+The scope of an search may be three things:
+<ul>
+	<li><b>'base'</b> = Just the entry in question.</li>
+	<li><b>'sub'</b> = All subentries.</li>
+	<li><b>'one'</b> = All entries just below the searchbase.</li>
+</ul>
+
+Searching with scope 'base' may be handy for getting just one entry. But then again, that's what the getEntry function does.
+</p>
+
+<p>
+<h3>Searching some entries</h3>
+We know now, how to search, so we will test out our new knowledge.
+We want to search all person entries whose second name starts with "Ha", but only developers.
+Later we want to know the name and the telephone number of the persons.
+<pre>
+$filter = '(&(objectclass=person)(sn=Ha*))';
+$searchbase = 'ou=dev,ou=People,dc=php,dc=net';
+$options = array(
+               'scope' => 'sub',        // all entries below the searchbase (recursive all subtrees from there)
+               'attributes' => array('sn','gn','telephonenumber')  // what attributes to select
+           );
+$search = $ldap->search($searchbase, $filter, $options);
+</pre>
+$search should now be an Net_LDAP2_Search object.
+<br>Okay, now we assume that everything was fine (in production, test for error!).
+We have several options now.
+We can fetch the found entries at once sorted ($search->sorted()) or unsorted ($search->entries()), or we can read
+the objects one by one inside a loop using $search->shiftEntry(). See the class documentation of Net_LDAP2_Search
+for more details.
+</p>
+
+<h2>Entries</h2>
+<p>
+This describes how to get an entry and modifying it.
+If we just want one single entry, it may be useful to directly fetch that entry instead
+of searching it manually. To do this you can use Net_LDAP2s "getEntry()" method:
+<pre>
+$dn = 'cn=Foo Bar,ou=dev,ou=People,dc=php,dc=net';
+$entry = $ldap->getEntry($dn, array('sn','gn','telephonenumber'));
+</pre>
+</p>
+With this entry object you now can perform some actions like fetching the contents of attributes:
+<pre>
+$telephonenumber =    $entry->getValue('telephonenumber','single');
+</pre>
+Or you can modify a attribute:
+<pre>
+$entry->replace("telephonenumber" => "0123456789");   // replace the attributes values with the new number
+$entry->update();  // update temporarily modified entry on the server
+</pre>
+Of course there are much more other possibilitys. Please note that adding and deleting 
+whole entrys is performed through the Net_LDAP2 class and not with the Net_LDAP2_Entry class.
+
+<h2>Schemas</h2>
+You may also use Net_LDAP2 to find out what schemas your ldap-server supports. Here's an example of how:
+<pre>
+$schema = $ldap->schema();
+</pre>
+Now you got a schemaobject.
+To read from this schemaobject, you have several methods defined in the class Net_LDAP2_Schema.
+<br>For example, to find out which attributes are required for inetOrgPerson, you do this:
+<pre>
+$required = $schema->must( 'inetOrgUser' );
+
+print_r($required);
+/* The output of this will be:
+Array
+(
+     [0] => sn
+     [1] => cn
+)
+*/
+</pre>
+
+Ok, but what kind of attribute is sn? Let's check:
+<pre>

Net_LDAP2-2.2.0.tgz/Net_LDAP2-2.2.0/doc/utf8.txt Changed

Net_LDAP2-2.2.0.tgz/Net_LDAP2-2.2.0/tests/Net_LDAP2Test.php Added

@@ -0,0 +1,896 @@
+<?php
+require_once __DIR__ . '/Net_LDAP2_TestBase.php';
+require_once 'Net/LDAP2.php';
+require_once 'Net/LDAP2/Entry.php';
+
+/**
+ * Test class for Net_LDAP2.
+ * Generated by PHPUnit_Util_Skeleton on 2007-10-09 at 10:32:36.
+ */
+class Net_LDAP2Test extends Net_LDAP2_TestBase {
+    /**
+    * Stores the LDAP configuration
+    */
+    var $ldapcfg = false;
+
+    /**
+     * Load ldap config and adjust appropriately
+     *
+     * @access protected
+     */
+    protected function setUp() {
+        $this->ldapcfg = $this->getTestConfig();
+    }
+
+    /**
+     * Tears down the fixture, for example, close a network connection.
+     * This method is called after a test is executed.
+     *
+     * @access protected
+     */
+    protected function tearDown() {
+    }
+
+    /**
+     * This checks if a valid LDAP testconfig is present and loads it.
+     *
+     * If so, it is loaded and returned as array. If not, false is returned.
+     *
+     * @return false|array
+     */
+    public function getTestConfig() {
+        $config = false;
+        $file = dirname(__FILE__).'/ldapconfig.ini';
+        if (file_exists($file) && is_readable($file)) {
+            $config = parse_ini_file($file, true);
+        } else {
+            return false;
+        }
+        // validate ini
+        $v_error = $file.' is probably invalid. Did you quoted values correctly?';
+        $this->assertTrue(array_key_exists('global', $config), $v_error);
+        $this->assertTrue(array_key_exists('test', $config), $v_error);
+        $this->assertEquals(7, count($config['global']), $v_error);
+        $this->assertEquals(7, count($config['test']), $v_error);
+
+        // reformat things a bit, for convinience
+        $config['global']['server_binddn'] =
+            $config['global']['server_binddn'].','.$config['global']['server_base_dn'];
+        $config['test']['existing_attrmv'] = explode('|', $config['test']['existing_attrmv']);
+        return $config;
+    }
+
+    /**
+    * Establishes a working connection
+    *
+    * @return Net_LDAP2
+    */
+    public function &connect() {
+        // Check extension
+        if (true !== Net_LDAP2::checkLDAPExtension()) {
+            $this->markTestSkipped('PHP LDAP extension not found or not loadable. Skipped Test.');
+        }
+
+        // Simple working connect and privilegued bind
+        $lcfg = array(
+                'host'   => $this->ldapcfg['global']['server_address'],
+                'port'   => $this->ldapcfg['global']['server_port'],
+                'basedn' => $this->ldapcfg['global']['server_base_dn'],
+                'binddn' => $this->ldapcfg['global']['server_binddn'],
+                'bindpw' => $this->ldapcfg['global']['server_bindpw'],
+                'filter' => '(ou=*)',
+            );
+        $ldap = Net_LDAP2::connect($lcfg);
+        $this->assertInstanceOf('Net_LDAP2', $ldap, 'Connect failed but was supposed to work. Check credentials and host address. If those are correct, file a bug!');
+        return $ldap;
+    }
+
+/* ---------- TESTS ---------- */
+
+    /**
+     * testCheckLDAPExtension().
+     *
+     * @todo can we unload modules at runtime??
+     */
+    public function testCheckLDAPExtension() {
+        if (extension_loaded('ldap')) {
+            // If extension is already loaded, then we must get true.
+            $this->assertTrue(Net_LDAP2::checkLDAPExtension());
+        } else {
+            // If not, we should be able to load it - but may fail
+            $this->assertThat(Net_LDAP2::checkLDAPExtension(),
+                $this->logicalOr($this->isInstanceOf('Net_LDAP2_Error'), $this->equalTo(true)));
+        }
+    }
+
+    /**
+     * Tests if getVersion() works correctly
+     */
+    public function testGetVersion() {
+        $this->assertTrue(defined('NET_LDAP2_VERSION'));
+        $this->assertEquals(NET_LDAP2_VERSION, Net_LDAP2::getVersion());
+    }
+
+    /**
+     * Tests if the server can connect and bind correctly
+     */
+    public function testConnectAndPrivileguedBind() {
+        // Check extension
+        if (true !== Net_LDAP2::checkLDAPExtension()) {
+            $this->markTestSkipped('PHP LDAP extension not found or not loadable. Skipped Test.');
+        }
+
+        if (!$this->ldapcfg) {
+            $this->markTestSkipped('No ldapconfig.ini found. Skipping test!');
+        } else {
+            // This connect is supposed to fail
+            $lcfg = array(
+                    'host' => '0.0.0.1',
+                );
+            $ldap = Net_LDAP2::connect($lcfg);
+            $this->assertInstanceOf('Net_LDAP2_Error', $ldap, 'Connect succeeded but was supposed to fail!');
+
+            // Failing with multiple hosts
+            $lcfg = array(
+                    'host' => array('0.0.0.1', '0.0.0.2'),
+                );
+            $ldap = Net_LDAP2::connect($lcfg);
+            $this->assertInstanceOf('Net_LDAP2_Error', $ldap, 'Connect succeeded but was supposed to fail!');
+
+            // Simple working connect and privilegued bind
+            $ldap = $this->connect();
+
+            // Working connect and privilegued bind with first host down
+            $lcfg = array(
+                    'host'   => array(
+                            '0.0.0.1',
+                            $this->ldapcfg['global']['server_address']
+                        ),
+                    'port'   => $this->ldapcfg['global']['server_port'],
+                    'binddn' => $this->ldapcfg['global']['server_binddn'],
+                    'bindpw' => $this->ldapcfg['global']['server_bindpw'],
+                );
+            $ldap = Net_LDAP2::connect($lcfg);
+            $this->assertInstanceOf('Net_LDAP2', $ldap, 'Connect failed but was supposed to work. Check credentials and host address. If those are correct, file a bug!');
+        }
+    }
+
+    /**
+     * Tests if the server can connect and bind anonymously, if supported (->cfg and ldap mode)
+     */
+    public function testConnectAndAnonymousBind() {
+        // Check extension
+        if (true !== Net_LDAP2::checkLDAPExtension()) {
+            $this->markTestSkipped('PHP LDAP extension not found or not loadable. Skipped Test.');
+        }
+
+        if (!$this->ldapcfg) {
+            $this->markTestSkipped('No ldapconfig.ini found. Skipping test!');
+        } elseif ($this->ldapcfg['global']['server_cap_anonymous'] == true) {
+            // Simple working connect and anonymous bind
+            $lcfg = array(
+                    'host'   => $this->ldapcfg['global']['server_address'],
+                    'port'   => $this->ldapcfg['global']['server_port'],
+                );
+            $ldap = Net_LDAP2::connect($lcfg);
+            $this->assertInstanceOf('Net_LDAP2', $ldap, 'Connect failed but was supposed to work. Check address and if server supports anonymous bind. If those are correct, file a bug!');
+        } else {
+            $this->markTestSkipped('Server does not support anonymous bind (see ldapconfig.ini). Skipping test.');
+        }
+    }
+
+    /**
+     * testStartTLS() if server supports it
+     */
+    public function testStartTLS() {
+        // Check extension
+        if (true !== Net_LDAP2::checkLDAPExtension()) {
+            $this->markTestSkipped('PHP LDAP extension not found or not loadable. Skipped Test.');
+        }
+
+        if (!$this->ldapcfg) {
+            $this->markTestSkipped('No ldapconfig.ini found. Skipping test!');
+        } elseif ($this->ldapcfg['global']['server_cap_tls'] == true) {
+            // Simple working connect and privilegued bind
+            $lcfg = array(
+                    'host'     => $this->ldapcfg['global']['server_address'],
+                    'port'     => $this->ldapcfg['global']['server_port'],
+                    'binddn'   => $this->ldapcfg['global']['server_binddn'].','.$this->ldapcfg['global']['server_binddn'],
+                    'bindpw'   => $this->ldapcfg['global']['server_bindpw'],

Net_LDAP2-2.2.0.tgz/Net_LDAP2-2.2.0/tests/Net_LDAP2_EntryTest.php Added

@@ -0,0 +1,320 @@
+<?php
+require_once 'Net_LDAP2Test.php'; // for config methods
+require_once __DIR__ . '/Net_LDAP2_TestBase.php';
+
+require_once 'Net/LDAP2/Entry.php';
+require_once 'Net/LDAP2/Entry.php';
+
+/**
+ * Test class for Net_LDAP2_Entry.
+ * Generated by PHPUnit_Util_Skeleton on 2007-10-09 at 10:33:12.
+ */
+class Net_LDAP2_EntryTest extends Net_LDAP2_TestBase {
+   /**
+    * Stores the LDAP configuration
+    */
+    var $ldapcfg = false;
+
+    /**
+     * Runs the test methods of this class.
+     *
+     * @access public
+     * @static
+     */
+    public static function main() {
+        require_once "PHPUnit/TextUI/TestRunner.php";
+
+        $suite  = new PHPUnit_Framework_TestSuite("Net_LDAP2_EntryTest");
+        $result = PHPUnit_TextUI_TestRunner::run($suite);
+    }
+
+    /**
+     * Sets up the fixture, for example, open a network connection.
+     * This method is called before a test is executed.
+     *
+     * @access protected
+     */
+    protected function setUp() {
+        $this->ldapcfg = $this->getTestConfig();
+    }
+
+    /**
+     * Tears down the fixture, for example, close a network connection.
+     * This method is called after a test is executed.
+     *
+     * @access protected
+     */
+    protected function tearDown() {
+    }
+
+    /**
+     * This checks if a valid LDAP testconfig is present and loads it.
+     *
+     * If so, it is loaded and returned as array. If not, false is returned.
+     *
+     * @return false|array
+     */
+    public function getTestConfig() {
+        $config = false;
+        $file = dirname(__FILE__).'/ldapconfig.ini';
+        if (file_exists($file) && is_readable($file)) {
+            $config = parse_ini_file($file, true);
+        } else {
+            return false;
+        }
+        // validate ini
+        $v_error = $file.' is probably invalid. Did you quoted values correctly?';
+        $this->assertTrue(array_key_exists('global', $config), $v_error);
+        $this->assertTrue(array_key_exists('test', $config), $v_error);
+        $this->assertEquals(7, count($config['global']), $v_error);
+        $this->assertEquals(7, count($config['test']), $v_error);
+
+        // reformat things a bit, for convinience
+        $config['global']['server_binddn'] =
+            $config['global']['server_binddn'].','.$config['global']['server_base_dn'];
+        $config['test']['existing_attrmv'] = explode('|', $config['test']['existing_attrmv']);
+        return $config;
+    }
+
+    /**
+    * Establishes a working connection
+    *
+    * @return Net_LDAP2
+    */
+    public function &connect() {
+        // Check extension
+        if (true !== Net_LDAP2::checkLDAPExtension()) {
+            $this->markTestSkipped('PHP LDAP extension not found or not loadable. Skipped Test.');
+        }
+
+        // Simple working connect and privilegued bind
+        $lcfg = array(
+                'host'   => $this->ldapcfg['global']['server_address'],
+                'port'   => $this->ldapcfg['global']['server_port'],
+                'basedn' => $this->ldapcfg['global']['server_base_dn'],
+                'binddn' => $this->ldapcfg['global']['server_binddn'],
+                'bindpw' => $this->ldapcfg['global']['server_bindpw'],
+                'filter' => '(ou=*)',
+            );
+        $ldap = Net_LDAP2::connect($lcfg);
+        $this->assertInstanceOf('Net_LDAP2', $ldap, 'Connect failed but was supposed to work. Check credentials and host address. If those are correct, file a bug!');
+        return $ldap;
+    }
+
+/* ---------- TESTS ---------- */
+
+    /**
+     * @todo Implement testCreateFresh().
+     */
+    public function testCreateFresh() {
+        // test failing creation
+        $t = Net_LDAP2_Entry::createFresh("cn=test", "I should be an array");
+        $this->assertTrue(Net_LDAP2::isError($t), 'Creating fresh entry succeeded but was supposed to fail!');
+
+        // test failing creation
+        $t = Net_LDAP2_Entry::createFresh("cn=test", 
+            array(
+                'attr1' => 'single',
+                'attr2' => array('mv1', 'mv2')
+                )
+        );
+        $this->assertInstanceOf('Net_LDAP2_Entry', $t, 'Creating fresh entry failed but was supposed to succeed!');
+    }
+
+    /**
+     * @todo Implement testCreateExisting().
+     */
+    public function testCreateExisting() {
+        // Remove the following line when you implement this test.
+        $this->markTestIncomplete(
+          "This test has not been implemented yet."
+        );
+    }
+
+    /**
+    * Test currentDN and API of move
+    */
+    public function testCurrentDN() {
+        $entry = Net_LDAP2_Entry::createFresh('cn=footest,ou=example,dc=com', array('cn' => 'foo'));
+
+	// test initial state
+	$this->assertEquals($entry->dn(), $entry->currentDN()); // equal DNs
+        $this->assertFalse($entry->willBeMoved());
+
+	// prepare move
+	$entry->dn('cn=newDN,ou=example,dc=com');
+
+	// test again
+	$this->assertNotEquals($entry->dn(), $entry->currentDN()); // equal DNs
+        $this->assertTrue($entry->willBeMoved());
+    }
+
+    /**
+     * @todo Implement testDn().
+     */
+    public function testDn() {
+        // Remove the following line when you implement this test.
+        $this->markTestIncomplete(
+          "This test has not been implemented yet."
+        );
+    }
+
+    /**
+     * @todo Implement test_setAttributes().
+     */
+    public function test_setAttributes() {
+        // Remove the following line when you implement this test.
+        $this->markTestIncomplete(
+          "This test has not been implemented yet."
+        );
+    }
+
+    /**
+     * @todo Implement testGetValues().
+     */
+    public function testGetValues() {
+        // Remove the following line when you implement this test.
+        $this->markTestIncomplete(
+          "This test has not been implemented yet."
+        );
+    }
+
+    /**
+     * @todo Implement testGetValue().
+     */
+    public function testGetValue() {
+        // make up some local entry
+        $entry = Net_LDAP2_Entry::createFresh("cn=test",
+            array(
+                'attr1' => 'single',
+                'attr2' => array('mv1', 'mv2')
+                )
+        );
+    
+        // test default behavior
+        $this->assertEquals('single', $entry->getValue('attr1'));
+        $this->assertEquals(array('mv1', 'mv2'), $entry->getValue('attr2'));
+        $this->assertEquals(false, $entry->getValue('nonexistent'));
+
+        // test option "single"

Net_LDAP2-2.2.0.tgz/Net_LDAP2-2.2.0/tests/Net_LDAP2_FilterTest.php Added

@@ -0,0 +1,506 @@
+<?php
+require_once __DIR__ . '/Net_LDAP2_TestBase.php';
+require_once 'Net/LDAP2/Filter.php';
+
+/**
+ * Test class for Net_LDAP2_Filter.
+ * Generated by PHPUnit_Util_Skeleton on 2007-10-09 at 10:34:23.
+ */
+class Net_LDAP2_FilterTest extends Net_LDAP2_TestBase {
+    /**
+    * @var string   default filter string to test with
+    */
+    var $filter_str = '(&(cn=foo)(ou=bar))';
+
+    /**
+     * Runs the test methods of this class.
+     *
+     * @access public
+     * @static
+     */
+    public static function main() {
+        require_once "PHPUnit/TextUI/TestRunner.php";
+
+        $suite  = new PHPUnit_Framework_TestSuite("Net_LDAP2_FilterTest");
+        $result = PHPUnit_TextUI_TestRunner::run($suite);
+    }
+
+    /**
+     * Sets up the fixture, for example, open a network connection.
+     * This method is called before a test is executed.
+     *
+     * @access protected
+     */
+    protected function setUp() {
+    }
+
+    /**
+     * Tears down the fixture, for example, close a network connection.
+     * This method is called after a test is executed.
+     *
+     * @access protected
+     */
+    protected function tearDown() {
+    }
+
+    /**
+     * This tests the perl compatible creation of filters through parsing of an filter string
+     */
+    public function testCreatePerlCompatible() {
+        $filter_o = new Net_LDAP2_Filter($this->filter_str);
+        $this->assertInstanceOf('Net_LDAP2_Filter', $filter_o);
+        $this->assertEquals($this->filter_str, $filter_o->asString());
+
+        $filter_o_err = new Net_LDAP2_Filter('some bad filter');
+        $this->assertInstanceOf('PEAR_Error', $filter_o_err->asString());
+    }
+
+    /**
+     * Test correct parsing of filter strings through parse()
+     */
+    public function testParse() {
+       $parsed_dmg = Net_LDAP2_Filter::parse('some_damaged_filter_str');
+       $this->assertInstanceOf('PEAR_Error', $parsed_dmg);
+
+       $parsed_dmg2 = Net_LDAP2_Filter::parse('(invalid=filter)(because=~no-surrounding brackets)');
+       $this->assertInstanceOf('PEAR_Error', $parsed_dmg2);
+
+       $parsed_dmg3 = Net_LDAP2_Filter::parse('((invalid=filter)(because=log_op is missing))');
+       $this->assertInstanceOf('PEAR_Error', $parsed_dmg3);
+
+       $parsed_dmg4 = Net_LDAP2_Filter::parse('(invalid-because-becauseinvalidoperator)');
+       $this->assertInstanceOf('PEAR_Error', $parsed_dmg4);
+
+       $parsed_dmg5 = Net_LDAP2_Filter::parse('(&(filterpart>=ok)(part2=~ok)(filterpart3_notok---becauseinvalidoperator))');
+       $this->assertInstanceOf('PEAR_Error', $parsed_dmg5);
+
+       // To verify bug #19364 is fixed
+       $parsed_dmg6 = Net_LDAP2_Filter::parse('(|((invalid-because-too-many-open-parens=x)(a=c))');
+       $this->assertInstanceOf('PEAR_Error', $parsed_dmg6);
+       $parsed_dmg7 = Net_LDAP2_Filter::parse('(|(invalid-because-too-many-close-parens=x)(a=c)))');
+       $this->assertInstanceOf('PEAR_Error', $parsed_dmg7);
+
+       $parsed1 = Net_LDAP2_Filter::parse($this->filter_str);
+       $this->assertInstanceOf('Net_LDAP2_Filter', $parsed1);
+       $this->assertEquals($this->filter_str, $parsed1->asString());
+
+       // To verify bug #16738 is fixed.
+       // In 2.0.6 there was a problem with the splitting of the filter parts if the next part was also an combined filter
+       $parsed2_str = "(&(&(objectClass=posixgroup)(objectClass=foogroup))(uniquemember=uid=eeggs,ou=people,o=foo))";
+       $parsed2 = Net_LDAP2_Filter::parse($parsed2_str);
+       $this->assertInstanceOf('Net_LDAP2_Filter', $parsed2);
+       $this->assertEquals($parsed2_str, $parsed2->asString());
+
+        // To verify bug #17057 is fixed
+        // In 2.0.7 there was a problem parsing certain not-combined filter strings.
+       $parsed3_str = "(!(jpegPhoto=*))";
+       $parsed3    = Net_LDAP2_Filter::parse($parsed3_str);
+       $this->assertInstanceOf('Net_LDAP2_Filter', $parsed3);
+       $this->assertEquals($parsed3_str, $parsed3->asString());
+
+       $parsed3_complex_str = "(&(someAttr=someValue)(!(jpegPhoto=*)))";
+       $parsed3_complex     = Net_LDAP2_Filter::parse($parsed3_complex_str);
+       $this->assertInstanceOf('Net_LDAP2_Filter', $parsed3_complex);
+       $this->assertEquals($parsed3_complex_str, $parsed3_complex->asString());
+
+    }
+
+
+    /**
+     * This tests the basic create() method of creating filters
+     */
+    public function testCreate() {
+        // Test values and an array containing the filter
+        // creating methods and an regex to test the resulting filter
+        $testattr = 'testattr';
+        $testval  = 'testval';
+        $combinations = array(
+            'equals'         => "/$$testattr=$testval$/",
+            'equals'         => "/$$testattr=$testval$/",
+            'begins'         => "/$$testattr=$testval\*$/",
+            'ends'           => "/$$testattr=\*$testval$/",
+            'contains'       => "/$$testattr=\*$testval\*$/",
+            'greater'        => "/$$testattr>$testval$/",
+            'less'           => "/$$testattr<$testval$/",
+            'greaterorequal' => "/$$testattr>=$testval$/",
+            'lessorequal'    => "/$$testattr<=$testval$/",
+            'approx'         => "/$$testattr~=$testval$/",
+            'any'            => "/$$testattr=\*$/"
+        );
+        // generate negating tests with supported operator combinations
+        foreach ($combinations as $match => $regex) {
+            $regex = preg_replace('#^/|/$#', '', $regex); // treat regex, so we can extend it easily
+            $combinations['not '.$match] = "/$!$regex$/";
+            $combinations['not_'.$match] = "/$!$regex$/";
+            $combinations['not-'.$match] = "/$!$regex$/";
+            $combinations['! '.$match]   = "/$!$regex$/";
+            $combinations['!_'.$match]   = "/$!$regex$/";
+            $combinations['!-'.$match]   = "/$!$regex$/";
+        }
+
+        // perform tests
+        foreach ($combinations as $match => $regex) {
+            // escaping is tested in util class
+            $filter = Net_LDAP2_Filter::create($testattr, $match, $testval, false);
+
+            $this->assertInstanceOf('Net_LDAP2_Filter', $filter);
+            $this->assertRegExp($regex, $filter->asString(), "Filter generation failed for MatchType: $match");
+        }
+
+        // test creating failure
+        $filter = Net_LDAP2_Filter::create($testattr, 'test_undefined_matchingrule', $testval);
+        $this->assertInstanceOf('PEAR_Error', $filter);
+    }
+
+    /**
+     * Tests, if asString() works
+     */
+    public function testAsString() {
+        $filter = Net_LDAP2_Filter::create('foo', 'equals', 'bar');
+        $this->assertInstanceOf('Net_LDAP2_Filter', $filter);
+        $this->assertEquals('(foo=bar)', $filter->asString());
+        $this->assertEquals('(foo=bar)', $filter->as_string());
+    }
+
+    /**
+     * Tests, if printMe() works
+     */
+    public function testPrintMe() {
+        if (substr(strtolower(PHP_OS), 0,3) == 'win') {
+            $testfile = '/tmp/Net_LDAP2_Filter_printMe-Testfile';
+        } else {
+            $testfile = 'c:\Net_LDAP2_Filter_printMe-Testfile';
+        }
+        $filter = Net_LDAP2_Filter::create('testPrintMe', 'equals', 'ok');
+        $this->assertInstanceOf('Net_LDAP2_Filter', $filter);
+
+        // print success:
+        ob_start();
+        $printresult = $filter->printMe();
+        ob_end_clean();
+        $this->assertTrue($printresult);
+
+        // PrintMe if Filehandle is an error (e.g. if some PEAR-File db is used):
+        $err = new PEAR_Error();
+        $this->assertInstanceOf('PEAR_Error', $filter->printMe($err));
+
+        // PrintMe if filter is damaged,
+        // $filter_dmg is used below too, to test printing to a file with
+        // damaged filter
+        $filter_dmg = new Net_LDAP2_Filter('damaged_filter_string');
+
+        // write success:
+        $file = @fopen($testfile, 'w');
+        if (is_writable($testfile) && $file) {
+            $this->assertTrue($filter->printMe($file));
+            $this->assertInstanceOf('PEAR_Error', $filter_dmg->printMe($file)); // dmg. filter
+            @fclose($file);
+        } else {
+            $this->markTestSkipped("$testfile could not be opened in write mode, skipping write test");

Net_LDAP2-2.2.0.tgz/Net_LDAP2-2.2.0/tests/Net_LDAP2_LDIFTest.php Added

@@ -0,0 +1,689 @@
+<?php
+//@encoding iso-8859-1
+require_once __DIR__ . '/Net_LDAP2_TestBase.php';
+require_once 'Net/LDAP2/LDIF.php';
+
+/**
+ * Test class for Net_LDAP2_LDIF.
+ * Generated by PHPUnit_Util_Skeleton on 2007-12-20 at 10:11:52.
+ */
+class Net_LDAP2_LDIFTest extends Net_LDAP2_TestBase {
+    /**
+    * Default config for tests.
+    *
+    * The config is bound to the ldif test file
+    * tests/ldif_data/unsorted_w50.ldif
+    * so don't change or tests will fail
+    *
+    * @var array
+    */
+    var $defaultConfig = array(
+        'onerror' => 'undef',
+        'encode'  => 'base64',
+        'wrap'    => 50,
+        'change'  => 0,
+        'sort'    => 0,
+        'version' => 1   // mimic pre 2.0.0RC5 behavior, so test files need no adjusting
+    );
+
+    /**
+    * Test entries data
+    *
+    * Please do not just modify these values, they
+    * are closely related to the LDIF test data.
+    *
+    * @var string
+    */
+    var $testentries_data = array(
+        'cn=test1,ou=example,dc=com' => array(
+            'cn'    => 'test1',
+            'attr3' => array('foo', 'bar'),
+            'attr1' => 12345,
+            'attr4' => 'brrrzztt',
+            'objectclass' => 'oc1',
+            'attr2' => array('1234', 'baz')),
+
+        'cn=test blabla,ou=example,dc=com' => array(
+            'cn'    => 'test blabla',
+            'attr3' => array('foo', 'bar'),
+            'attr1' => 12345,
+            'attr4' => 'blablaöäü',
+            'objectclass' => 'oc2',
+            'attr2' => array('1234', 'baz'),
+            'verylong' => 'fhu08rhvt7b478vt5hv78h45nfgt45h78t34hhhhhhhhhv5bg8h6ttttttttt3489t57nhvgh4788trhg8999vnhtgthgui65hgb5789thvngwr789cghm738'),
+
+        'cn=test öäü,ou=example,dc=com' => array(
+            'cn'    => 'test öäü',
+            'attr3' => array('foo', 'bar'),
+            'attr1' => 12345,
+            'attr4' => 'blablaöäü',
+            'objectclass' => 'oc3',
+            'attr2' => array('1234', 'baz'),
+            'attr5' => 'endspace ',
+            'attr6' => ':badinitchar'),
+
+        ':cn=endspace,dc=com ' => array(
+            'cn'    => 'endspace')
+    );
+
+    /**
+    * Test file written to
+    *
+    * @var string
+    */
+    var $outfile = 'test.out.ldif';
+
+    /**
+    * Test entries
+    *
+    * They will be created in main()
+    *
+    * @var array
+    */
+    var $testentries = array();
+
+    /**
+     * Runs the test methods of this class.
+     *
+     * @access public
+     * @static
+     */
+    public static function main() {
+        require_once "PHPUnit/TextUI/TestRunner.php";
+
+        $suite  = new PHPUnit_Framework_TestSuite("Net_LDAP2_LDIFTest");
+        $result = PHPUnit_TextUI_TestRunner::run($suite);
+    }
+
+    /**
+     * Open some outfile and ensure correct rights
+     *
+     * @access protected
+     */
+    protected function setUp() {
+        // initialize test entries
+        $this->testentries = array();
+        foreach ($this->testentries_data as $dn => $attrs) {
+            $entry = Net_LDAP2_Entry::createfresh($dn, $attrs);
+            $this->assertInstanceOf('Net_LDAP2_Entry', $entry, 'ERROR inittializing test entries');
+            array_push($this->testentries, $entry);
+        }
+
+        // create outfile if not exists and enforce proper access rights
+	if (file_exists($this->outfile)) @unlink($this->outfile);
+        $this->assertTrue(touch($this->outfile), 'Init error: Unable to create '.$this->outfile);
+        $this->assertTrue(chmod($this->outfile, 0644), 'Init error: Unable to chmod(0644) '.$this->outfile);
+    }
+
+    /**
+     * Remove the outfile
+     *
+     * @access protected
+     */
+    protected function tearDown() {
+	// uncomment this if you debug the test cases so you will have output available
+	if (file_exists($this->outfile)) @unlink($this->outfile);
+    }
+
+    /**
+     * Construction tests
+     *
+     * Construct LDIF object and see if we can get a handle
+     */
+    public function testConstruction() {
+        $supported_modes = array('r', 'w', 'a');
+        $plus            = array('', '+');
+
+        // Test all open modes,
+        // all of them should return a correct handle
+        foreach ($supported_modes as $mode) {
+            foreach ($plus as $p) {
+                $ldif = new Net_LDAP2_LDIF($this->outfile, $mode, $this->defaultConfig);
+                $this->assertTrue(is_resource($ldif->handle()));
+            }
+        }
+
+        // Test illegal option passing
+        $ldif = new Net_LDAP2_LDIF($this->outfile, $mode, array('somebad' => 'option'));
+        $this->assertInstanceOf('Net_LDAP2_Error', $ldif->error());
+
+        // Test passing custom handle
+        $handle = fopen($this->outfile, 'r');
+        $ldif = new Net_LDAP2_LDIF($handle, $mode, $this->defaultConfig);
+        $this->assertTrue(is_resource($ldif->handle()));
+
+        // Reading test with invalid file mode
+        $ldif = new Net_LDAP2_LDIF($this->outfile, 'y', $this->defaultConfig);
+        $this->assertNull($ldif->handle());
+        $this->assertInstanceOf('Net_LDAP2_Error', $ldif->error());
+
+        // Reading test with nonexistent file
+        $ldif = new Net_LDAP2_LDIF('some/nonexistent/file_for_net_ldap_ldif', 'r', $this->defaultConfig);
+        $this->assertNull($ldif->handle());
+        $this->assertInstanceOf('Net_LDAP2_Error', $ldif->error());
+
+        // writing to nonexistent file
+        $ldif = new Net_LDAP2_LDIF('testfile_for_net_ldap_ldif', 'w', $this->defaultConfig);
+        $this->assertTrue(is_resource($ldif->handle()));
+        @unlink('testfile_for_net_ldap_ldif');
+
+        // writing to nonexistent path
+        $ldif = new Net_LDAP2_LDIF('some/nonexistent/file_for_net_ldap_ldif', 'w', $this->defaultConfig);
+        $this->assertNull($ldif->handle());
+        $this->assertInstanceOf('Net_LDAP2_Error', $ldif->error());
+
+        // writing to existing file but without permission
+        // note: chmod should succeed since we do that in setUp()
+        if (chmod($this->outfile, 0444)) {
+            $ldif = new Net_LDAP2_LDIF($this->outfile, 'w', $this->defaultConfig);
+            $this->assertNull($ldif->handle());
+            $this->assertInstanceOf('Net_LDAP2_Error', $ldif->error());
+        } else {
+            $this->markTestSkipped("Could not chmod ".$this->outfile.", write test without permission skipped");
+        }
+    }
+
+    /**
+     * Tests if entries from an LDIF file are correctly constructed
+     */
+    public function testRead_entry() {
+        /*
+        * UNIX line endings
+        */
+        $ldif = new Net_LDAP2_LDIF(dirname(__FILE__).'/ldif_data/unsorted_w50.ldif', 'r', $this->defaultConfig);
+        $this->assertTrue(is_resource($ldif->handle()));
+
+        $entries = array();
+        do {
+            $entry = $ldif->read_entry();
+            $this->assertFalse((boolean)$ldif->error(), 'failed building entry from LDIF: '.$ldif->error(true));

Net_LDAP2-2.2.0.tgz/Net_LDAP2-2.2.0/tests/Net_LDAP2_RootDSETest.php Added

@@ -0,0 +1,152 @@
+<?php
+require_once __DIR__ . '/Net_LDAP2_TestBase.php';
+require_once 'Net/LDAP2/RootDSE.php';
+
+/**
+ * Test class for Net_LDAP2_RootDSE.
+ * Generated by PHPUnit_Util_Skeleton on 2007-10-09 at 10:47:05.
+ */
+class Net_LDAP2_RootDSETest extends Net_LDAP2_TestBase {
+    /**
+     * Runs the test methods of this class.
+     *
+     * @access public
+     * @static
+     */
+    public static function main() {
+        require_once "PHPUnit/TextUI/TestRunner.php";
+
+        $suite  = new PHPUnit_Framework_TestSuite("Net_LDAP2_RootDSETest");
+        $result = PHPUnit_TextUI_TestRunner::run($suite);
+    }
+
+    /**
+     * Sets up the fixture, for example, open a network connection.
+     * This method is called before a test is executed.
+     *
+     * @access protected
+     */
+    protected function setUp() {
+        $this->markTestIncomplete('Test not implemented yet.');
+    }
+
+    /**
+     * Tears down the fixture, for example, close a network connection.
+     * This method is called after a test is executed.
+     *
+     * @access protected
+     */
+    protected function tearDown() {
+    }
+
+    /**
+     * @todo Implement testGetValue().
+     */
+    public function testGetValue() {
+        // Remove the following line when you implement this test.
+        $this->markTestIncomplete(
+          "This test has not been implemented yet."
+        );
+    }
+
+    /**
+     * @todo Implement testGet_value().
+     */
+    public function testGet_value() {
+        // Remove the following line when you implement this test.
+        $this->markTestIncomplete(
+          "This test has not been implemented yet."
+        );
+    }
+
+    /**
+     * @todo Implement testSupportedExtension().
+     */
+    public function testSupportedExtension() {
+        // Remove the following line when you implement this test.
+        $this->markTestIncomplete(
+          "This test has not been implemented yet."
+        );
+    }
+
+    /**
+     * @todo Implement testSupported_extension().
+     */
+    public function testSupported_extension() {
+        // Remove the following line when you implement this test.
+        $this->markTestIncomplete(
+          "This test has not been implemented yet."
+        );
+    }
+
+    /**
+     * @todo Implement testSupportedVersion().
+     */
+    public function testSupportedVersion() {
+        // Remove the following line when you implement this test.
+        $this->markTestIncomplete(
+          "This test has not been implemented yet."
+        );
+    }
+
+    /**
+     * @todo Implement testSupported_version().
+     */
+    public function testSupported_version() {
+        // Remove the following line when you implement this test.
+        $this->markTestIncomplete(
+          "This test has not been implemented yet."
+        );
+    }
+
+    /**
+     * @todo Implement testSupportedControl().
+     */
+    public function testSupportedControl() {
+        // Remove the following line when you implement this test.
+        $this->markTestIncomplete(
+          "This test has not been implemented yet."
+        );
+    }
+
+    /**
+     * @todo Implement testSupported_control().
+     */
+    public function testSupported_control() {
+        // Remove the following line when you implement this test.
+        $this->markTestIncomplete(
+          "This test has not been implemented yet."
+        );
+    }
+
+    /**
+     * @todo Implement testSupportedSASLMechanism().
+     */
+    public function testSupportedSASLMechanism() {
+        // Remove the following line when you implement this test.
+        $this->markTestIncomplete(
+          "This test has not been implemented yet."
+        );
+    }
+
+    /**
+     * @todo Implement testSupported_sasl_mechanism().
+     */
+    public function testSupported_sasl_mechanism() {
+        // Remove the following line when you implement this test.
+        $this->markTestIncomplete(
+          "This test has not been implemented yet."
+        );
+    }
+
+    /**
+     * @todo Implement test_checkAttr().
+     */
+    public function test_checkAttr() {
+        // Remove the following line when you implement this test.
+        $this->markTestIncomplete(
+          "This test has not been implemented yet."
+        );
+    }
+}
+?>

Net_LDAP2-2.2.0.tgz/Net_LDAP2-2.2.0/tests/Net_LDAP2_SearchTest.php Added

@@ -0,0 +1,363 @@
+<?php
+require_once __DIR__ . '/Net_LDAP2_TestBase.php';
+require_once 'Net/LDAP2.php';
+require_once 'Net/LDAP2/Search.php';
+
+/**
+ * Test class for Net_LDAP2_Search.
+ * Generated by PHPUnit_Util_Skeleton on 2007-10-09 at 10:46:51.
+ */
+class Net_LDAP2_SearchTest extends Net_LDAP2_TestBase {
+    /**
+    * Stores the LDAP configuration
+    */
+    var $ldapcfg = false;
+
+    /**
+     * Sets up the fixture, for example, open a network connection.
+     * This method is called before a test is executed.
+     *
+     * @access protected
+     */
+    protected function setUp() {
+        $this->ldapcfg = $this->getTestConfig();
+    }
+
+    /**
+     * Tears down the fixture, for example, close a network connection.
+     * This method is called after a test is executed.
+     *
+     * @access protected
+     */
+    protected function tearDown() {
+    }
+
+    /**
+     * This checks if a valid LDAP testconfig is present and loads it.
+     *
+     * If so, it is loaded and returned as array. If not, false is returned.
+     *
+     * @return false|array
+     */
+    public function getTestConfig() {
+        $config = false;
+        $file = dirname(__FILE__).'/ldapconfig.ini';
+        if (file_exists($file) && is_readable($file)) {
+            $config = parse_ini_file($file, true);
+        } else {
+            return false;
+        }
+        // validate ini
+        $v_error = $file.' is probably invalid. Did you quoted values correctly?';
+        $this->assertTrue(array_key_exists('global', $config), $v_error);
+        $this->assertTrue(array_key_exists('test', $config), $v_error);
+        $this->assertEquals(7, count($config['global']), $v_error);
+        $this->assertEquals(7, count($config['test']), $v_error);
+
+        // reformat things a bit, for convinience
+        $config['global']['server_binddn'] =
+            $config['global']['server_binddn'].','.$config['global']['server_base_dn'];
+        $config['test']['existing_attrmv'] = explode('|', $config['test']['existing_attrmv']);
+        return $config;
+    }
+
+    /**
+    * Establishes a working connection
+    *
+    * @return Net_LDAP2
+    */
+    public function &connect() {
+        // Check extension
+        if (true !== Net_LDAP2::checkLDAPExtension()) {
+            $this->markTestSkipped('PHP LDAP extension not found or not loadable. Skipped Test.');
+        }
+
+        // Simple working connect and privilegued bind
+        $lcfg = array(
+                'host'   => $this->ldapcfg['global']['server_address'],
+                'port'   => $this->ldapcfg['global']['server_port'],
+                'basedn' => $this->ldapcfg['global']['server_base_dn'],
+                'binddn' => $this->ldapcfg['global']['server_binddn'],
+                'bindpw' => $this->ldapcfg['global']['server_bindpw'],
+                'filter' => '(ou=*)',
+            );
+        $ldap = Net_LDAP2::connect($lcfg);
+        $this->assertInstanceOf('Net_LDAP2', $ldap, 'Connect failed but was supposed to work. Check credentials and host address. If those are correct, file a bug!');
+        return $ldap;
+    }
+
+    /**
+     * @todo Implement testEntries().
+     */
+    public function testEntries() {
+        // Remove the following line when you implement this test.
+        $this->markTestIncomplete(
+          "This test has not been implemented yet."
+        );
+    }
+
+    /**
+     * @todo Implement testShiftEntry().
+     */
+    public function testShiftEntry() {
+        // Remove the following line when you implement this test.
+        $this->markTestIncomplete(
+          "This test has not been implemented yet."
+        );
+    }
+
+    /**
+     * @todo Implement testShift_entry().
+     */
+    public function testShift_entry() {
+        // Remove the following line when you implement this test.
+        $this->markTestIncomplete(
+          "This test has not been implemented yet."
+        );
+    }
+
+    /**
+     * @todo Implement testPopEntry().
+     */
+    public function testPopEntry() {
+        // Remove the following line when you implement this test.
+        $this->markTestIncomplete(
+          "This test has not been implemented yet."
+        );
+    }
+
+    /**
+     * @todo Implement testPop_entry().
+     */
+    public function testPop_entry() {
+        // Remove the following line when you implement this test.
+        $this->markTestIncomplete(
+          "This test has not been implemented yet."
+        );
+    }
+
+    /**
+     * @todo Implement testSorted_as_struct().
+     */
+    public function testSorted_as_struct() {
+        // Remove the following line when you implement this test.
+        $this->markTestIncomplete(
+          "This test has not been implemented yet."
+        );
+    }
+
+    /**
+     * @todo Implement testSorted().
+     */
+    public function testSorted() {
+        // Remove the following line when you implement this test.
+        $this->markTestIncomplete(
+          "This test has not been implemented yet."
+        );
+    }
+
+    /**
+     * @todo Implement testAs_struct().
+     */
+    public function testAs_struct() {
+        // Remove the following line when you implement this test.
+        $this->markTestIncomplete(
+          "This test has not been implemented yet."
+        );
+    }
+
+    /**
+     * @todo Implement testSetSearch().
+     */
+    public function testSetSearch() {
+        // Remove the following line when you implement this test.
+        $this->markTestIncomplete(
+          "This test has not been implemented yet."
+        );
+    }
+
+    /**
+     * @todo Implement testSetLink().
+     */
+    public function testSetLink() {
+        // Remove the following line when you implement this test.
+        $this->markTestIncomplete(
+          "This test has not been implemented yet."
+        );
+    }
+
+    /**
+     * @todo Implement testCount().
+     */
+    public function testCount() {
+        // Remove the following line when you implement this test.
+        $this->markTestIncomplete(
+          "This test has not been implemented yet."
+        );
+    }
+
+    /**

Net_LDAP2-2.2.0.tgz/Net_LDAP2-2.2.0/tests/Net_LDAP2_TestBase.php Added

Net_LDAP2-2.2.0.tgz/Net_LDAP2-2.2.0/tests/Net_LDAP2_UtilTest.php Added

@@ -0,0 +1,385 @@
+<?php
+require_once __DIR__ . '/Net_LDAP2_TestBase.php';
+require_once 'Net/LDAP2/Util.php';
+
+/**
+ * Test class for Net_LDAP2_Util.
+ * Generated by PHPUnit_Util_Skeleton on 2007-10-09 at 10:33:22.
+ */
+class Net_LDAP2_UtilTest extends Net_LDAP2_TestBase {
+    /**
+     * Runs the test methods of this class.
+     *
+     * @access public
+     * @static
+     */
+    public static function main() {
+        require_once "PHPUnit/TextUI/TestRunner.php";
+
+        $suite  = new PHPUnit_Framework_TestSuite("Net_LDAP2_UtilTest");
+        $result = PHPUnit_TextUI_TestRunner::run($suite);
+    }
+
+    /**
+     * Sets up the fixture, for example, open a network connection.
+     * This method is called before a test is executed.
+     *
+     * @access protected
+     */
+    protected function setUp() {
+    }
+
+    /**
+     * Tears down the fixture, for example, close a network connection.
+     * This method is called after a test is executed.
+     *
+     * @access protected
+     */
+    protected function tearDown() {
+    }
+
+    /**
+     * Test escape_dn_value()
+     */
+    public function testEscape_dn_value() {
+        $dnval    = '  '.chr(22).' t,e+s"t,\\v<a>l;u#e=!    ';
+        $expected = '\20\20\16 t\,e\+s\"t\,\\\\v\<a\>l\;u\#e\=!\20\20\20\20';
+
+        // string call
+        $this->assertEquals(array($expected), Net_LDAP2_Util::escape_dn_value($dnval));
+
+        // array call
+        $this->assertEquals(array($expected), Net_LDAP2_Util::escape_dn_value(array($dnval)));
+
+        // multiple arrays
+        $this->assertEquals(array($expected, $expected, $expected), Net_LDAP2_Util::escape_dn_value(array($dnval,$dnval,$dnval)));
+    }
+
+    /**
+     * Test unescape_dn_value()
+     */
+    public function testUnescape_dn_value() {
+        $dnval    = '\\20\\20\\16\\20t\\,e\\+s \\"t\\,\\\\v\\<a\\>l\\;u\\#e\\=!\\20\\20\\20\\20';
+        $expected = '  '.chr(22).' t,e+s "t,\\v<a>l;u#e=!    ';
+
+        // string call
+        $this->assertEquals(array($expected), Net_LDAP2_Util::unescape_dn_value($dnval));
+
+        // array call
+        $this->assertEquals(array($expected), Net_LDAP2_Util::unescape_dn_value(array($dnval)));
+
+        // multiple arrays
+        $this->assertEquals(array($expected, $expected, $expected), Net_LDAP2_Util::unescape_dn_value(array($dnval,$dnval,$dnval)));
+    }
+
+    /**
+     * Test escaping of filter values
+     */
+    public function testEscape_filter_value() {
+        $expected  = 't\28e,s\29t\2av\5cal\1eue';
+        $filterval = 't(e,s)t*v\\al'.chr(30).'ue';
+
+        // string call
+        $this->assertEquals(array($expected), Net_LDAP2_Util::escape_filter_value($filterval));
+
+        // array call
+        $this->assertEquals(array($expected), Net_LDAP2_Util::escape_filter_value(array($filterval)));
+
+        // multiple arrays
+        $this->assertEquals(array($expected, $expected, $expected), Net_LDAP2_Util::escape_filter_value(array($filterval,$filterval,$filterval)));
+    }
+
+    /**
+     * Test unescaping of filter values
+     */
+    public function testUnescape_filter_value() {
+        $expected  = 't(e,s)t*v\\al'.chr(30).'ue';
+        $filterval = 't\28e,s\29t\2av\5cal\1eue';
+
+        // string call
+        $this->assertEquals(array($expected), Net_LDAP2_Util::unescape_filter_value($filterval));
+
+        // array call
+        $this->assertEquals(array($expected), Net_LDAP2_Util::unescape_filter_value(array($filterval)));
+
+        // multiple arrays
+        $this->assertEquals(array($expected, $expected, $expected), Net_LDAP2_Util::unescape_filter_value(array($filterval,$filterval,$filterval)));
+    }
+
+    /**
+     * Test asc2hex32()
+     */
+    public function testAsc2hex32() {
+
+        $expected = '\00\01\02\03\04\05\06\07\08\09\0a\0b\0c\0d\0e\0f\10\11\12\13\14\15\16\17\18\19\1a\1b\1c\1d\1e\1f !"#$%&\'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\]^_`abcdefghijklmnopqrstuvwxyz{|}~';
+        $str = '';
+        for ($i = 0; $i < 127; $i++) {
+             $str .= chr($i);
+        }
+        $this->assertEquals($expected, Net_LDAP2_Util::asc2hex32($str));
+    }
+
+    /**
+     * Test HEX unescaping
+     */
+    public function testHex2asc() {
+        $expected = '';
+        for ($i = 0; $i < 127; $i++) {
+             $expected .= chr($i);
+        }
+
+        $str = '\00\01\02\03\04\05\06\07\08\09\0a\0b\0c\0d\0e\0f\10\11\12\13\14\15\16\17\18\19\1a\1b\1c\1d\1e\1f !"#$%&\'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\]^_`abcdefghijklmnopqrstuvwxyz{|}~';
+        $this->assertEquals($expected, Net_LDAP2_Util::hex2asc($str));
+    }
+
+    /**
+     * Tests split_rdn_multival()
+     *
+     * In addition to the above test of the basic split correction,
+     * we test here the functionality of mutlivalued RDNs
+     */
+    public function testSplit_rdn_multival() {
+        // One value
+        $rdn = 'CN=J. Smith';
+        $expected = array('CN=J. Smith');
+        $split = Net_LDAP2_Util::split_rdn_multival($rdn);
+        $this->assertEquals($expected,  $split);
+
+        // Two values
+        $rdn = 'OU=Sales+CN=J. Smith';
+        $expected = array('OU=Sales', 'CN=J. Smith');
+        $split = Net_LDAP2_Util::split_rdn_multival($rdn);
+        $this->assertEquals($expected,  $split);
+
+        // Several multivals
+        $rdn = 'OU=Sales+CN=J. Smith+L=London+C=England';
+        $expected = array('OU=Sales', 'CN=J. Smith', 'L=London', 'C=England');
+        $split = Net_LDAP2_Util::split_rdn_multival($rdn);
+        $this->assertEquals($expected,  $split);
+
+        // Unescaped "+" in value
+        $rdn = 'OU=Sa+les+CN=J. Smith';
+        $expected = array('OU=Sa+les', 'CN=J. Smith');
+        $split = Net_LDAP2_Util::split_rdn_multival($rdn);
+        $this->assertEquals($expected,  $split);
+
+        // Unescaped "+" in attr name
+        $rdn = 'O+U=Sales+CN=J. Smith';
+        $expected = array('O+U=Sales', 'CN=J. Smith');
+        $split = Net_LDAP2_Util::split_rdn_multival($rdn);
+        $this->assertEquals($expected,  $split);
+
+        // Unescaped "+" in attr name + value
+        $rdn = 'O+U=Sales+CN=J. Sm+ith';
+        $expected = array('O+U=Sales', 'CN=J. Sm+ith');
+        $split = Net_LDAP2_Util::split_rdn_multival($rdn);
+        $this->assertEquals($expected,  $split);
+
+        // Unescaped "+" in attr name, but not first attr
+        // this documents a known bug. However, unfortunately  we cant
+        // know wether the "C+" belongs to value "Sales" or attribute "C+N".
+        // To solve this, we must ask the schema which we do not right now.
+        // The problem is located in _correct_dn_splitting()
+        $rdn = 'OU=Sales+C+N=J. Smith';
+        $expected = array('OU=Sales+C', 'N=J. Smith');     // The "C+" is treaten as value of "OU"
+        $split = Net_LDAP2_Util::split_rdn_multival($rdn);
+        $this->assertEquals($expected,  $split);
+
+        // Escaped "+" in attr name and value
+        $rdn = 'O\+U=Sales+CN=J. Sm\+ith';
+        $expected = array('O\+U=Sales', 'CN=J. Sm\+ith');
+        $split = Net_LDAP2_Util::split_rdn_multival($rdn);
+        $this->assertEquals($expected,  $split);
+    }
+
+    /**
+     * Tests attribute splitting ('foo=bar' => array('foo', 'bar'))
+     */
+    public function testSplit_attribute_string() {
+        $attr_str = "foo=bar";

Net_LDAP2-2.2.0.tgz/Net_LDAP2-2.2.0/tests/ldapconfig.ini.dist Added

@@ -0,0 +1,51 @@
+; +---------------------------------------------------------------------------+
+; | This is a configuration file for Net_LDAP2s tests.                        |
+; | To activate the tests, you need to adjust the configuration to            |
+; | your needs and copy it over to "ldapconfig.conf". Place the               |
+; | file inside the directory holding all the test programs.                  |
+; |                                                                           |
+; | Note, that this tests assume a working LDAP server.                       |
+; | If you don't have such a server, you may use the                          |
+; | LDIF based mock server. Head to 'ldapldifconfig.ini.dist'.                |
+; |                                                                           |
+; | The syntax of this file is really easy and similar to other .ini-files.   |
+; | Remember to quote strings containing non-alphanumeric characters.         |
+; +---------------------------------------------------------------------------+
+
+
+; Global section
+;   server_cap_tls:       is the server ssl capable?
+;   server_cap_anonymous: is the server allowing anonymous access?
+;   server_base_dn:       BaseDN at which your DIT starts. Ensure that the
+;                         binding user has all rights to add, delete and
+;                         modifying entries as well as creating and deleting
+;                         some subtree (ou=...) below the base.
+;   server_*:             I think those following are self-explanatory
+;   server_binddn:        Relative to base_dn below
+[global]
+server_cap_tls       = false
+server_cap_anonymous = true
+server_base_dn       = "dc=example,dc=com"
+server_address       = localhost
+server_port          = 389
+server_binddn        = "cn=admin"
+server_bindpw        = test
+
+
+; Definitions for the tests. Adjust to suit the needs of your test server.
+;   existing_entry:  RDN for an entry that must exist (relative to base).
+;                    The following attribute tests are performed on this entry.
+;   existing_attrs:  Name of an existing attribute (single valued)
+;   existing_attrsv: Value of this attribute
+;   existing_attrm:  Name of an existing attribute (multi valued)
+;   existing_attrmv: Values of this attribute, "|" delimited
+;   utf8_attr:       Name of attribute with UTF8 value
+;   noutf8_attr:     Name of attribute without UTF8 value
+[test]
+existing_entry  = "cn=existing"
+existing_attrs  = sn
+existing_attrsv = testentry
+existing_attrm  = mail
+existing_attrmv = "test.entry@example.com|te@example.com"
+utf8_attr       = ou
+noutf8_attr     = givenName

Net_LDAP2-2.2.0.tgz/Net_LDAP2-2.2.0/tests/ldapldifconfig.ini.dist Changed

Net_LDAP2-2.2.0.tgz/Net_LDAP2-2.2.0/tests/ldif_data/base.ldif Added

Net_LDAP2-2.2.0.tgz/Net_LDAP2-2.2.0/tests/ldif_data/changes.ldif Added

Net_LDAP2-2.2.0.tgz/Net_LDAP2-2.2.0/tests/ldif_data/malformed_syntax.ldif Added

Net_LDAP2-2.2.0.tgz/Net_LDAP2-2.2.0/tests/ldif_data/malformed_wrapping.ldif Added

Net_LDAP2-2.2.0.tgz/Net_LDAP2-2.2.0/tests/ldif_data/slapd.conf Added

Net_LDAP2-2.2.0.tgz/Net_LDAP2-2.2.0/tests/ldif_data/sorted_w40.ldif Added

Net_LDAP2-2.2.0.tgz/Net_LDAP2-2.2.0/tests/ldif_data/sorted_w50.ldif Added

Net_LDAP2-2.2.0.tgz/Net_LDAP2-2.2.0/tests/ldif_data/unsorted_w30.ldif Added

Net_LDAP2-2.2.0.tgz/Net_LDAP2-2.2.0/tests/ldif_data/unsorted_w50.ldif Added

Net_LDAP2-2.2.0.tgz/Net_LDAP2-2.2.0/tests/ldif_data/unsorted_w50_WIN.ldif Added

Net_LDAP2-2.2.0.tgz/Net_LDAP2-2.2.0/tests/phpunit.xml Added

Net_LDAP2-2.0.12.tgz/package.xml -> Net_LDAP2-2.2.0.tgz/package.xml Changed

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<package packagerversion="1.9.1" version="2.0" xmlns="http://pear.php.net/dtd/package-2.0" xmlns:tasks="http://pear.php.net/dtd/tasks-1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://pear.php.net/dtd/tasks-1.0 http://pear.php.net/dtd/tasks-1.0.xsd http://pear.php.net/dtd/package-2.0 http://pear.php.net/dtd/package-2.0.xsd">
+<package packagerversion="1.10.1" version="2.0" xmlns="http://pear.php.net/dtd/package-2.0" xmlns:tasks="http://pear.php.net/dtd/tasks-1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://pear.php.net/dtd/tasks-1.0 http://pear.php.net/dtd/tasks-1.0.xsd http://pear.php.net/dtd/package-2.0 http://pear.php.net/dtd/package-2.0.xsd">
  <name>Net_LDAP2</name>
  <channel>pear.php.net</channel>
  <extends>Net_LDAP</extends>
@@ -20,11 +20,11 @@
   <email>beni@php.net</email>
   <active>yes</active>
  </lead>
- <date>2011-10-27</date>
- <time>15:47:11</time>
+ <date>2015-10-30</date>
+ <time>20:33:00</time>
  <version>
-  <release>2.0.12</release>
-  <api>2.0.0</api>
+  <release>2.2.0</release>
+  <api>2.2.0</api>
  </version>
  <stability>
   <release>stable</release>
@@ -32,23 +32,23 @@
  </stability>
  <license>LGPLv3 License</license>
  <notes>
-* inmproved performance with large search results
-* Fixed some minor issues with Net_LDAP2_Filter and Net_LDAP2-&gt;dnExists()
-* Added NOT filter to Net_LDAP2_Filter::create() so negating is more easily now
+* Fix bug #20969: Fatal error with PEAR 1.10.0 / constructor visiblity
+* Add support for PHP 7
+* Improve unit tests
  </notes>
  <contents>
   <dir name="/">
-   <file md5sum="05fd3f6b48d8fd9b051b3fdf65bf70ce" name="Net/LDAP2/Entry.php" role="php" />
-   <file md5sum="8f7ef7c2e521fc3d0918b214e90bb074" name="Net/LDAP2/Filter.php" role="php" />
-   <file md5sum="516f12c6c29882ebeb4e4468dc15b8b2" name="Net/LDAP2/RootDSE.php" role="php" />
-   <file md5sum="d4828f4ce70510df89efb0af2a00684b" name="Net/LDAP2/Schema.php" role="php" />
-   <file md5sum="2c4e16599a43fce59ad3c6ae9824435c" name="Net/LDAP2/Search.php" role="php" />
-   <file md5sum="7beac3e06fdebeb66201734ad864aaaf" name="Net/LDAP2/Util.php" role="php" />
-   <file md5sum="ce2774b05682bb0c1140eb61fe571f81" name="Net/LDAP2/LDIF.php" role="php" />
-   <file md5sum="632316377b1b5d6951a5ee56d0762495" name="Net/LDAP2/SchemaCache.interface.php" role="php" />
-   <file md5sum="b936c0b601331086414fd31d6c0ac58a" name="Net/LDAP2/SimpleFileSchemaCache.php" role="php" />
-   <file md5sum="fb530249a570df1e86dfc4216af2ed5b" name="Net/LDAP2.php" role="php" />
-   <file md5sum="b476ac5b669241a6c98f1e561a04f231" name="doc/manual.html" role="doc" />
+   <file md5sum="14692880bc39519e25661bb496d7c8d5" name="Net/LDAP2/Entry.php" role="php" />
+   <file md5sum="d5ec0fa3cba28e11cf0cc0c50d6f8404" name="Net/LDAP2/Filter.php" role="php" />
+   <file md5sum="f480bb4793e0cc99d2f4bcf678ce7e5a" name="Net/LDAP2/RootDSE.php" role="php" />
+   <file md5sum="986a0127145e29b20f871d297671a872" name="Net/LDAP2/Schema.php" role="php" />
+   <file md5sum="6f769daa0a4a1ff1fd8b50ef4b2b7c95" name="Net/LDAP2/Search.php" role="php" />
+   <file md5sum="f85fa566011849eb40943253f41d2d57" name="Net/LDAP2/Util.php" role="php" />
+   <file md5sum="c4191615fc3df8ee4e33972747cbadff" name="Net/LDAP2/LDIF.php" role="php" />
+   <file md5sum="c1b7d28801b57e66de6c8410221138bc" name="Net/LDAP2/SchemaCache.interface.php" role="php" />
+   <file md5sum="1fc951713c57a779e77a592092f0f4dd" name="Net/LDAP2/SimpleFileSchemaCache.php" role="php" />
+   <file md5sum="656074820c5eac6464baa43b5b4a0022" name="Net/LDAP2.php" role="php" />
+   <file md5sum="0a3edb58e5abb2d2a4a71fb299f371ef" name="doc/manual.html" role="doc" />
    <file md5sum="f7a30a3acb682c23879c15f33c5ea165" name="doc/README.txt" role="doc" />
    <file md5sum="542c5f79a0c65a6145dc46b91109ed47" name="doc/RootDSE.txt" role="doc" />
    <file md5sum="5c1910ade9e547f171320575d7114819" name="doc/Schema.txt" role="doc" />
@@ -60,34 +60,37 @@
    <file md5sum="75bdbca18104a6da0d88dc28d37b405f" name="doc/examples/modify_entry.php" role="doc" />
    <file md5sum="1d5e00f2f7dae4e960eaba1ad73a00ef" name="doc/examples/modify_entry2.php" role="doc" />
    <file md5sum="9279cfaa392f216c745879bef5958862" name="doc/examples/schema_cache.php" role="doc" />
-   <file md5sum="a3435a100a7188bb00160a911fcf5e32" name="tests/AllTests.php" role="test" />
-   <file md5sum="b685685ba3de34cb4ca1beb00d8d273f" name="tests/Net_LDAP2_EntryTest.php" role="test" />
-   <file md5sum="0471d27234452e52b7e2f33b4222857b" name="tests/Net_LDAP2_FilterTest.php" role="test" />
-   <file md5sum="cccb2dc78f8c512e2a94265460d7566d" name="tests/Net_LDAP2_RootDSETest.php" role="test" />
-   <file md5sum="69304a41c367ce060086fb194eb7940b" name="tests/Net_LDAP2_SearchTest.php" role="test" />
-   <file md5sum="b8d20add35acf8d0db0b1f5a2e89d2e4" name="tests/Net_LDAP2Test.php" role="test" />
-   <file md5sum="bcdfb54c3f9924f59eb3d9378d79f537" name="tests/Net_LDAP2_UtilTest.php" role="test" />
-   <file md5sum="611bc5c89e2eb706ddcb36a6d3a96e85" name="tests/Net_LDAP2_LDIFTest.php" role="test" />
-   <file md5sum="68c022feb6d6d7bc94f0694cce502954" name="tests/ldapconfig.ini.dist" role="test" />
+   <file md5sum="67f90e554fcc6cab77641608f2268c97" name="tests/phpunit.xml" role="test" />
+   <file md5sum="710ec68f4b125326e5f82ec215c5ea97" name="tests/Net_LDAP2_TestBase.php" role="test" />
+   <file md5sum="24b6ac543953a3fa821100b605365553" name="tests/Net_LDAP2_EntryTest.php" role="test" />
+   <file md5sum="8bef3249d6dd36d46ee455d71ec786d2" name="tests/Net_LDAP2_FilterTest.php" role="test" />
+   <file md5sum="07c1c3eb551852eb8ea586c69575427b" name="tests/Net_LDAP2_RootDSETest.php" role="test" />
+   <file md5sum="7ec4e53a71232d8da2ab1d5073195326" name="tests/Net_LDAP2_SearchTest.php" role="test" />
+   <file md5sum="470398974f906e994ecf35ef2a74b679" name="tests/Net_LDAP2Test.php" role="test" />
+   <file md5sum="733f64df757387fd6b4ae573569240f7" name="tests/Net_LDAP2_UtilTest.php" role="test" />
+   <file md5sum="67e68908a944033be32f5f7ca5ab9caf" name="tests/Net_LDAP2_LDIFTest.php" role="test" />
+   <file md5sum="af7ef40a1d3701e295b332210d3d8288" name="tests/ldapconfig.ini.dist" role="test" />
    <file md5sum="ccb1f94444301641296a93696d5c4684" name="tests/ldapldifconfig.ini.dist" role="test" />
-   <file md5sum="8f42e7d12f63d39beffa3dcc99f845da" name="tests/ldif_data/malformed_encoding.ldif" role="test" />
-   <file md5sum="19b1f781a2481e8e1bc3b08021543072" name="tests/ldif_data/malformed_syntax.ldif" role="test" />
-   <file md5sum="f7f38547dacd8902d6ced1feee615346" name="tests/ldif_data/malformed_wrapping.ldif" role="test" />
-   <file md5sum="9a9f94ba1987e52dac22ff8cfda2c239" name="tests/ldif_data/sorted_w40.ldif" role="test" />
-   <file md5sum="09a03f2bf4c90324242a826963e9a652" name="tests/ldif_data/sorted_w50.ldif" role="test" />
-   <file md5sum="d2d0a78648fe564c48f80f86b25651ec" name="tests/ldif_data/unsorted_w30.ldif" role="test" />
-   <file md5sum="ffcff308d0389e55a5b24f2b01de5d79" name="tests/ldif_data/unsorted_w50.ldif" role="test" />
-   <file md5sum="c44b4314f3173d7d1d08ff67168c1369" name="tests/ldif_data/unsorted_w50_WIN.ldif" role="test" />
-   <file md5sum="7bfbc8507681d867e01bccc7ba62e459" name="tests/ldif_data/changes.ldif" role="test" />
+   <file md5sum="2e8d78fdfb445088a9501429d37f250e" name="tests/ldif_data/base.ldif" role="test" />
+   <file md5sum="943abc2b2a56e75fb40cb8c540f81654" name="tests/ldif_data/malformed_syntax.ldif" role="test" />
+   <file md5sum="943abc2b2a56e75fb40cb8c540f81654" name="tests/ldif_data/malformed_syntax.ldif" role="test" />
+   <file md5sum="5ad541535eaf5aa53ba7acac6b031aa2" name="tests/ldif_data/malformed_wrapping.ldif" role="test" />
+   <file md5sum="ce78c73f224573cc8dbfbe9d58d1886a" name="tests/ldif_data/slapd.conf" role="test" />
+   <file md5sum="3bba5bc3056b59c5a085d04ae9c84bf9" name="tests/ldif_data/sorted_w40.ldif" role="test" />
+   <file md5sum="e56033dfba0cdd53f86dbf8b0c92ce31" name="tests/ldif_data/sorted_w50.ldif" role="test" />
+   <file md5sum="6b15381edca12019aaa5603b175ab128" name="tests/ldif_data/unsorted_w30.ldif" role="test" />
+   <file md5sum="659dbbb2fe28ccb1b786dd2a39d26a2a" name="tests/ldif_data/unsorted_w50.ldif" role="test" />
+   <file md5sum="f999e45facc87052eecabe349a1748ae" name="tests/ldif_data/unsorted_w50_WIN.ldif" role="test" />
+   <file md5sum="0c67fab862688f53aaf1fae64b86e21a" name="tests/ldif_data/changes.ldif" role="test" />
   </dir>
  </contents>
  <dependencies>
   <required>
    <php>
-    <min>5.0</min>
+    <min>5.4</min>
    </php>
    <pearinstaller>
-    <min>1.5.0</min>
+    <min>1.10.1</min>
    </pearinstaller>
    <extension>
     <name>ldap</name>
@@ -802,5 +805,57 @@
 * Fix for #18202: Adding attributes to a Fresh Entry saving and laterly updating fails
    </notes>
   </release>
+  <release>
+   <date>2011-10-27</date>
+   <version>
+    <release>2.0.12</release>
+    <api>2.0.0</api>
+   </version>
+   <stability>
+    <release>stable</release>
+    <api>stable</api>
+   </stability>
+   <license>LGPLv3 License</license>
+   <notes>
+* inmproved performance with large search results
+* Fixed some minor issues with Net_LDAP2_Filter and Net_LDAP2-&gt;dnExists()
+* Added NOT filter to Net_LDAP2_Filter::create() so negating is more easily now
+   </notes>
+  </release>
+  <release>
+   <date>2013-12-09</date>
+   <version>
+    <release>2.1.0</release>
+    <api>2.0.0</api>
+   </version>
+   <stability>
+    <release>stable</release>
+    <api>stable</api>
+   </stability>
+   <license>LGPLv3 License</license>
+   <notes>
+* New feature: Filter::matches() can do simple filtering on entry sets (supported: equals, contain, begin, end, any; NOT, AND, OR. Filtering is simple based on regexp, no schema checks and matchRules yet!)
+* Fixed minor bugs in Filter, LDAP and Entry class
+* Util::split_attribute_string(): Added support for extended match operators from filters
+* Util::split_attribute_string(): Added support for delimeter retrieval
+   </notes>
+  </release>
+  <release>
+   <date>2015-10-30</date>
+   <version>
+    <release>2.2.0</release>
+    <api>2.2.0</api>
+   </version>
+   <stability>
+    <release>stable</release>
+    <api>stable</api>
+   </stability>
+   <license>LGPLv3 License</license>
+   <notes>
+* Fix bug #20969: Fatal error with PEAR 1.10.0 / constructor visiblity
+* Add support for PHP 7
+* Improve unit tests
+   </notes>
+  </release>
  </changelog>
 </package>

debian.changelog Added

@@ -0,0 +1,91 @@
+php-net-ldap2 (2.2.0-3~kolab1) unstable; urgency=medium
+
+  * Package for Kolab
+  * Disable failing tests
+
+ -- Christoph Erhardt <kolab@sicherha.de>  Sat, 05 Oct 2019 12:01:05 +0200
+
+php-net-ldap2 (2.2.0-3) unstable; urgency=medium
+
+  [ Nishanth Aravamudan ]
+  * Add missing dependency on php-pear (Closes: #827496)
+
+  [ Prach Pongpanich ]
+  * Update Standards-Version to 3.9.8
+
+ -- Prach Pongpanich <prach@debian.org>  Fri, 24 Jun 2016 13:41:21 +0700
+
+php-net-ldap2 (2.2.0-2) unstable; urgency=medium
+
+  * Add Build-Depends on php-pear (>= 1.10.1) (Closes: #809771)
+  * Bump standards version to 3.9.7
+  * Update Build-depends on pkg-php-tools (>= 1.32) for PHP 7
+
+ -- Prach Pongpanich <prach@debian.org>  Fri, 04 Mar 2016 19:25:40 +0700
+
+php-net-ldap2 (2.2.0-1) unstable; urgency=medium
+
+  * Imported Upstream version 2.2.0
+    - Fix bug #20969: Fatal error with PEAR 1.10.0
+
+ -- Prach Pongpanich <prach@debian.org>  Sun, 15 Nov 2015 22:23:48 +0700
+
+php-net-ldap2 (2.1.0-2) unstable; urgency=medium
+
+  * Team upload, to unstable since Jessie has been released
+
+ -- David Prévot <taffit@debian.org>  Tue, 02 Jun 2015 19:13:53 -0400
+
+php-net-ldap2 (2.1.0-1) experimental; urgency=medium
+
+  * Team upload, to experimental to respect the freeze
+  * Imported Upstream version 2.1.0
+  * Let pkg-php-tools take care of description
+  * Run test during package build
+  * Add DEP-8 tests
+  * Bump standards version to 3.9.6
+
+ -- David Prévot <taffit@debian.org>  Mon, 23 Mar 2015 13:37:20 -0400
+
+php-net-ldap2 (2.0.12-1) unstable; urgency=low
+
+  [ Prach Pongpanich ]
+  * New upstream release (Closes: #635827)
+  * Switch to pkg-php-tools and dh-sequencer
+  * Change section to php
+  * Switch VCS to Git
+  * Convert copyright to format 1.0
+  * Update long description (Closes: #599540)
+  * Add myself as uploader
+  * Switch to dpkg-source 3.0 (quilt) format
+  * Bump debhelper compat to 9
+  * Bump Standards-Version to 3.9.4
+
+  [ Benoit Mortier ]
+  * Update maintainer to pkg-php-pear (Closes: #656992)
+
+ -- Prach Pongpanich <prachpub@gmail.com>  Thu, 18 Jul 2013 22:07:32 +0700
+
+php-net-ldap2 (2.0.9-1) unstable; urgency=low
+
+  * New upstream release.
+
+ -- Benoit Mortier <benoit.mortier@opensides.be>  Tue, 23 Mar 2010 00:19:36 +0100
+
+php-net-ldap2 (2.0.7-1) unstable; urgency=low
+
+  * New Upstream Version
+
+ -- Benoit Mortier <benoit.mortier@opensides.be>  Sat, 21 Nov 2009 15:01:17 +0100
+
+php-net-ldap2 (2.0.6-2) unstable; urgency=low
+
+  * unsatisfiable Depends: pear (>= 5.2.0-8) (Closes: #551127)
+
+ -- Benoit Mortier <benoit.mortier@opensides.be>  Sun, 18 Oct 2009 23:47:36 +0200
+
+php-net-ldap2 (2.0.6-1) unstable; urgency=low
+
+  * Initial Release (Closes: #539916).
+
+ -- Benoit Mortier <benoit.mortier@opensides.be>  Wed, 07 Oct 2009 09:15:24 +0200

debian.control Added

debian.rules Added

debian.tar.gz Added

php-net-ldap2.dsc Added