From 1f73156daeef47cf8a7214936383fbc496255fd7 Mon Sep 17 00:00:00 2001
From: Craig Andrews <candrews@integralblue.com>
Date: Tue, 23 Mar 2010 21:57:47 -0400
Subject: [PATCH] Move the bundled Net/LDAP2 library to the LdapCommon
 directory

---
 plugins/LdapCommon/LdapCommon.php                              | 3 +++
 {extlib => plugins/LdapCommon/extlib}/Net/LDAP2.php            | 0
 {extlib => plugins/LdapCommon/extlib}/Net/LDAP2/Entry.php      | 0
 {extlib => plugins/LdapCommon/extlib}/Net/LDAP2/Filter.php     | 0
 {extlib => plugins/LdapCommon/extlib}/Net/LDAP2/LDIF.php       | 0
 {extlib => plugins/LdapCommon/extlib}/Net/LDAP2/RootDSE.php    | 0
 {extlib => plugins/LdapCommon/extlib}/Net/LDAP2/Schema.php     | 0
 .../LdapCommon/extlib}/Net/LDAP2/SchemaCache.interface.php     | 0
 {extlib => plugins/LdapCommon/extlib}/Net/LDAP2/Search.php     | 0
 .../LdapCommon/extlib}/Net/LDAP2/SimpleFileSchemaCache.php     | 0
 {extlib => plugins/LdapCommon/extlib}/Net/LDAP2/Util.php       | 0
 11 files changed, 3 insertions(+)
 rename {extlib => plugins/LdapCommon/extlib}/Net/LDAP2.php (100%)
 rename {extlib => plugins/LdapCommon/extlib}/Net/LDAP2/Entry.php (100%)
 rename {extlib => plugins/LdapCommon/extlib}/Net/LDAP2/Filter.php (100%)
 rename {extlib => plugins/LdapCommon/extlib}/Net/LDAP2/LDIF.php (100%)
 rename {extlib => plugins/LdapCommon/extlib}/Net/LDAP2/RootDSE.php (100%)
 rename {extlib => plugins/LdapCommon/extlib}/Net/LDAP2/Schema.php (100%)
 rename {extlib => plugins/LdapCommon/extlib}/Net/LDAP2/SchemaCache.interface.php (100%)
 rename {extlib => plugins/LdapCommon/extlib}/Net/LDAP2/Search.php (100%)
 rename {extlib => plugins/LdapCommon/extlib}/Net/LDAP2/SimpleFileSchemaCache.php (100%)
 rename {extlib => plugins/LdapCommon/extlib}/Net/LDAP2/Util.php (100%)

diff --git a/plugins/LdapCommon/LdapCommon.php b/plugins/LdapCommon/LdapCommon.php
index e2ca569f39..ee436d8243 100644
--- a/plugins/LdapCommon/LdapCommon.php
+++ b/plugins/LdapCommon/LdapCommon.php
@@ -31,6 +31,9 @@ if (!defined('STATUSNET') && !defined('LACONICA')) {
     exit(1);
 }
 
+// We bundle the Net/LDAP2 library...
+set_include_path(get_include_path() . PATH_SEPARATOR . dirname(__FILE__) . '/extlib');
+
 class LdapCommon
 {
     protected static $ldap_connections = array();
diff --git a/extlib/Net/LDAP2.php b/plugins/LdapCommon/extlib/Net/LDAP2.php
similarity index 100%
rename from extlib/Net/LDAP2.php
rename to plugins/LdapCommon/extlib/Net/LDAP2.php
diff --git a/extlib/Net/LDAP2/Entry.php b/plugins/LdapCommon/extlib/Net/LDAP2/Entry.php
similarity index 100%
rename from extlib/Net/LDAP2/Entry.php
rename to plugins/LdapCommon/extlib/Net/LDAP2/Entry.php
diff --git a/extlib/Net/LDAP2/Filter.php b/plugins/LdapCommon/extlib/Net/LDAP2/Filter.php
similarity index 100%
rename from extlib/Net/LDAP2/Filter.php
rename to plugins/LdapCommon/extlib/Net/LDAP2/Filter.php
diff --git a/extlib/Net/LDAP2/LDIF.php b/plugins/LdapCommon/extlib/Net/LDAP2/LDIF.php
similarity index 100%
rename from extlib/Net/LDAP2/LDIF.php
rename to plugins/LdapCommon/extlib/Net/LDAP2/LDIF.php
diff --git a/extlib/Net/LDAP2/RootDSE.php b/plugins/LdapCommon/extlib/Net/LDAP2/RootDSE.php
similarity index 100%
rename from extlib/Net/LDAP2/RootDSE.php
rename to plugins/LdapCommon/extlib/Net/LDAP2/RootDSE.php
diff --git a/extlib/Net/LDAP2/Schema.php b/plugins/LdapCommon/extlib/Net/LDAP2/Schema.php
similarity index 100%
rename from extlib/Net/LDAP2/Schema.php
rename to plugins/LdapCommon/extlib/Net/LDAP2/Schema.php
diff --git a/extlib/Net/LDAP2/SchemaCache.interface.php b/plugins/LdapCommon/extlib/Net/LDAP2/SchemaCache.interface.php
similarity index 100%
rename from extlib/Net/LDAP2/SchemaCache.interface.php
rename to plugins/LdapCommon/extlib/Net/LDAP2/SchemaCache.interface.php
diff --git a/extlib/Net/LDAP2/Search.php b/plugins/LdapCommon/extlib/Net/LDAP2/Search.php
similarity index 100%
rename from extlib/Net/LDAP2/Search.php
rename to plugins/LdapCommon/extlib/Net/LDAP2/Search.php
diff --git a/extlib/Net/LDAP2/SimpleFileSchemaCache.php b/plugins/LdapCommon/extlib/Net/LDAP2/SimpleFileSchemaCache.php
similarity index 100%
rename from extlib/Net/LDAP2/SimpleFileSchemaCache.php
rename to plugins/LdapCommon/extlib/Net/LDAP2/SimpleFileSchemaCache.php
diff --git a/extlib/Net/LDAP2/Util.php b/plugins/LdapCommon/extlib/Net/LDAP2/Util.php
similarity index 100%
rename from extlib/Net/LDAP2/Util.php
rename to plugins/LdapCommon/extlib/Net/LDAP2/Util.php