From 76ce1169a0c8cbb18423b1581800b9aa1050ccd5 Mon Sep 17 00:00:00 2001
From: Andreas Gohr <andi@splitbrain.org>
Date: Fri, 9 Nov 2012 14:13:32 +0100
Subject: [PATCH] moved adLDAP to authad plugin and fixed includes
---
inc/load.php | 1 -
{inc => lib/plugins/authad}/adLDAP/adLDAP.php | 0
.../plugins/authad}/adLDAP/classes/adLDAPComputers.php | 0
{inc => lib/plugins/authad}/adLDAP/classes/adLDAPContacts.php | 0
{inc => lib/plugins/authad}/adLDAP/classes/adLDAPExchange.php | 0
{inc => lib/plugins/authad}/adLDAP/classes/adLDAPFolders.php | 0
{inc => lib/plugins/authad}/adLDAP/classes/adLDAPGroups.php | 0
{inc => lib/plugins/authad}/adLDAP/classes/adLDAPUsers.php | 0
{inc => lib/plugins/authad}/adLDAP/classes/adLDAPUtils.php | 0
.../plugins/authad}/adLDAP/collections/adLDAPCollection.php | 0
.../authad}/adLDAP/collections/adLDAPComputerCollection.php | 0
.../authad}/adLDAP/collections/adLDAPContactCollection.php | 0
.../authad}/adLDAP/collections/adLDAPGroupCollection.php | 0
.../authad}/adLDAP/collections/adLDAPUserCollection.php | 0
lib/plugins/authad/auth.php | 4 +---
15 files changed, 1 insertion(+), 4 deletions(-)
rename {inc => lib/plugins/authad}/adLDAP/adLDAP.php (100%)
rename {inc => lib/plugins/authad}/adLDAP/classes/adLDAPComputers.php (100%)
rename {inc => lib/plugins/authad}/adLDAP/classes/adLDAPContacts.php (100%)
rename {inc => lib/plugins/authad}/adLDAP/classes/adLDAPExchange.php (100%)
rename {inc => lib/plugins/authad}/adLDAP/classes/adLDAPFolders.php (100%)
rename {inc => lib/plugins/authad}/adLDAP/classes/adLDAPGroups.php (100%)
rename {inc => lib/plugins/authad}/adLDAP/classes/adLDAPUsers.php (100%)
rename {inc => lib/plugins/authad}/adLDAP/classes/adLDAPUtils.php (100%)
rename {inc => lib/plugins/authad}/adLDAP/collections/adLDAPCollection.php (100%)
rename {inc => lib/plugins/authad}/adLDAP/collections/adLDAPComputerCollection.php (100%)
rename {inc => lib/plugins/authad}/adLDAP/collections/adLDAPContactCollection.php (100%)
rename {inc => lib/plugins/authad}/adLDAP/collections/adLDAPGroupCollection.php (100%)
rename {inc => lib/plugins/authad}/adLDAP/collections/adLDAPUserCollection.php (100%)
diff --git a/inc/load.php b/inc/load.php
index fbbf020fd..008613b2a 100644
--- a/inc/load.php
+++ b/inc/load.php
@@ -51,7 +51,6 @@ function load_autoload($name){
'DokuHTTPClient' => DOKU_INC.'inc/HTTPClient.php',
'HTTPClient' => DOKU_INC.'inc/HTTPClient.php',
'JSON' => DOKU_INC.'inc/JSON.php',
- 'adLDAP' => DOKU_INC.'inc/adLDAP.php',
'Diff' => DOKU_INC.'inc/DifferenceEngine.php',
'UnifiedDiffFormatter' => DOKU_INC.'inc/DifferenceEngine.php',
'TableDiffFormatter' => DOKU_INC.'inc/DifferenceEngine.php',
diff --git a/inc/adLDAP/adLDAP.php b/lib/plugins/authad/adLDAP/adLDAP.php
similarity index 100%
rename from inc/adLDAP/adLDAP.php
rename to lib/plugins/authad/adLDAP/adLDAP.php
diff --git a/inc/adLDAP/classes/adLDAPComputers.php b/lib/plugins/authad/adLDAP/classes/adLDAPComputers.php
similarity index 100%
rename from inc/adLDAP/classes/adLDAPComputers.php
rename to lib/plugins/authad/adLDAP/classes/adLDAPComputers.php
diff --git a/inc/adLDAP/classes/adLDAPContacts.php b/lib/plugins/authad/adLDAP/classes/adLDAPContacts.php
similarity index 100%
rename from inc/adLDAP/classes/adLDAPContacts.php
rename to lib/plugins/authad/adLDAP/classes/adLDAPContacts.php
diff --git a/inc/adLDAP/classes/adLDAPExchange.php b/lib/plugins/authad/adLDAP/classes/adLDAPExchange.php
similarity index 100%
rename from inc/adLDAP/classes/adLDAPExchange.php
rename to lib/plugins/authad/adLDAP/classes/adLDAPExchange.php
diff --git a/inc/adLDAP/classes/adLDAPFolders.php b/lib/plugins/authad/adLDAP/classes/adLDAPFolders.php
similarity index 100%
rename from inc/adLDAP/classes/adLDAPFolders.php
rename to lib/plugins/authad/adLDAP/classes/adLDAPFolders.php
diff --git a/inc/adLDAP/classes/adLDAPGroups.php b/lib/plugins/authad/adLDAP/classes/adLDAPGroups.php
similarity index 100%
rename from inc/adLDAP/classes/adLDAPGroups.php
rename to lib/plugins/authad/adLDAP/classes/adLDAPGroups.php
diff --git a/inc/adLDAP/classes/adLDAPUsers.php b/lib/plugins/authad/adLDAP/classes/adLDAPUsers.php
similarity index 100%
rename from inc/adLDAP/classes/adLDAPUsers.php
rename to lib/plugins/authad/adLDAP/classes/adLDAPUsers.php
diff --git a/inc/adLDAP/classes/adLDAPUtils.php b/lib/plugins/authad/adLDAP/classes/adLDAPUtils.php
similarity index 100%
rename from inc/adLDAP/classes/adLDAPUtils.php
rename to lib/plugins/authad/adLDAP/classes/adLDAPUtils.php
diff --git a/inc/adLDAP/collections/adLDAPCollection.php b/lib/plugins/authad/adLDAP/collections/adLDAPCollection.php
similarity index 100%
rename from inc/adLDAP/collections/adLDAPCollection.php
rename to lib/plugins/authad/adLDAP/collections/adLDAPCollection.php
diff --git a/inc/adLDAP/collections/adLDAPComputerCollection.php b/lib/plugins/authad/adLDAP/collections/adLDAPComputerCollection.php
similarity index 100%
rename from inc/adLDAP/collections/adLDAPComputerCollection.php
rename to lib/plugins/authad/adLDAP/collections/adLDAPComputerCollection.php
diff --git a/inc/adLDAP/collections/adLDAPContactCollection.php b/lib/plugins/authad/adLDAP/collections/adLDAPContactCollection.php
similarity index 100%
rename from inc/adLDAP/collections/adLDAPContactCollection.php
rename to lib/plugins/authad/adLDAP/collections/adLDAPContactCollection.php
diff --git a/inc/adLDAP/collections/adLDAPGroupCollection.php b/lib/plugins/authad/adLDAP/collections/adLDAPGroupCollection.php
similarity index 100%
rename from inc/adLDAP/collections/adLDAPGroupCollection.php
rename to lib/plugins/authad/adLDAP/collections/adLDAPGroupCollection.php
diff --git a/inc/adLDAP/collections/adLDAPUserCollection.php b/lib/plugins/authad/adLDAP/collections/adLDAPUserCollection.php
similarity index 100%
rename from inc/adLDAP/collections/adLDAPUserCollection.php
rename to lib/plugins/authad/adLDAP/collections/adLDAPUserCollection.php
diff --git a/lib/plugins/authad/auth.php b/lib/plugins/authad/auth.php
index e82610327..5c566195e 100644
--- a/lib/plugins/authad/auth.php
+++ b/lib/plugins/authad/auth.php
@@ -2,8 +2,6 @@
// must be run within Dokuwiki
if(!defined('DOKU_INC')) die();
-require_once(DOKU_INC.'inc/adLDAP.php');
-
/**
* Active Directory authentication backend for DokuWiki
*
@@ -41,7 +39,7 @@ require_once(DOKU_INC.'inc/adLDAP.php');
* @author Jan Schumann <js@schumann-it.com>
*/
-require_once(DOKU_INC.'inc/adLDAP/adLDAP.php');
+require_once(DOKU_PLUGIN.'authad/adLDAP/adLDAP.php');
class auth_plugin_authad extends DokuWiki_Auth_Plugin {
/**
--
GitLab