From b4245126d64b378a4cb90821718983e27e943ebc Mon Sep 17 00:00:00 2001
From: Jan Schumann <js@schumann-it.com>
Date: Tue, 3 Jan 2012 02:46:36 +0100
Subject: Load auth types from plugins in settings_authtype class

---
 lib/plugins/config/settings/extra.class.php | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

(limited to 'lib/plugins/config/settings')

diff --git a/lib/plugins/config/settings/extra.class.php b/lib/plugins/config/settings/extra.class.php
index b4e35b1cc..72b9755be 100644
--- a/lib/plugins/config/settings/extra.class.php
+++ b/lib/plugins/config/settings/extra.class.php
@@ -43,12 +43,19 @@ if (!class_exists('setting_authtype')) {
   class setting_authtype extends setting_multichoice {
 
     function initialize($default,$local,$protected) {
+	  global $plugin_controller;
 
       // populate $this->_choices with a list of available auth mechanisms
       $authtypes = glob(DOKU_INC.'inc/auth/*.class.php');
       $authtypes = preg_replace('#^.*/([^/]*)\.class\.php$#i','$1', $authtypes);
       $authtypes = array_diff($authtypes, array('basic'));
-      sort($authtypes);
+
+      // retrive auth types provided by plugins
+      foreach ($plugin_controller->getList('auth') as $plugin) {
+      	$authtypes = $plugin;
+      }
+
+      $authtypes = array_unique($authtypes);
 
       $this->_choices = $authtypes;
 
-- 
cgit v1.2.3


From 396b87bebcb14765849b43a259a2b6cf2aff98f3 Mon Sep 17 00:00:00 2001
From: Jan Schumann <js@schumann-it.com>
Date: Tue, 3 Jan 2012 03:31:54 +0100
Subject: Bugfix: auth types are now correcty added

---
 lib/plugins/config/settings/extra.class.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'lib/plugins/config/settings')

diff --git a/lib/plugins/config/settings/extra.class.php b/lib/plugins/config/settings/extra.class.php
index 72b9755be..cee3c6b20 100644
--- a/lib/plugins/config/settings/extra.class.php
+++ b/lib/plugins/config/settings/extra.class.php
@@ -52,7 +52,7 @@ if (!class_exists('setting_authtype')) {
 
       // retrive auth types provided by plugins
       foreach ($plugin_controller->getList('auth') as $plugin) {
-      	$authtypes = $plugin;
+      	$authtypes[] = $plugin;
       }
 
       $authtypes = array_unique($authtypes);
-- 
cgit v1.2.3


From f4476bd9b5badd36cd0617d76538e47d9649986b Mon Sep 17 00:00:00 2001
From: Jan Schumann <js@schumann-it.com>
Date: Mon, 20 Feb 2012 19:51:26 +0100
Subject: Refactored auth system: All auth methods are now introduced as
 plugins.

---
 lib/plugins/config/settings/extra.class.php | 50 +++++++++++++++++++++++------
 1 file changed, 40 insertions(+), 10 deletions(-)

(limited to 'lib/plugins/config/settings')

diff --git a/lib/plugins/config/settings/extra.class.php b/lib/plugins/config/settings/extra.class.php
index cee3c6b20..f6adf1c18 100644
--- a/lib/plugins/config/settings/extra.class.php
+++ b/lib/plugins/config/settings/extra.class.php
@@ -45,22 +45,52 @@ if (!class_exists('setting_authtype')) {
     function initialize($default,$local,$protected) {
 	  global $plugin_controller;
 
-      // populate $this->_choices with a list of available auth mechanisms
-      $authtypes = glob(DOKU_INC.'inc/auth/*.class.php');
-      $authtypes = preg_replace('#^.*/([^/]*)\.class\.php$#i','$1', $authtypes);
-      $authtypes = array_diff($authtypes, array('basic'));
-
       // retrive auth types provided by plugins
       foreach ($plugin_controller->getList('auth') as $plugin) {
-      	$authtypes[] = $plugin;
+      	$this->_choices[] = $plugin;
       }
 
-      $authtypes = array_unique($authtypes);
-
-      $this->_choices = $authtypes;
-
       parent::initialize($default,$local,$protected);
     }
+
+    function update($input) {
+    	global $plugin_controller;
+
+		// is an update posible?
+    	$mayUpdate = parent::update($input);
+
+    	// is it an auth plugin?
+    	if (in_array($input, $plugin_controller->getList('auth'))) {
+    		// reject disabled plugins
+    		if ($plugin_controller->isdisabled($input)) {
+	    		$this->_error = true;
+	    		msg('Auth type ' . $input . ' is disabled.');
+	    		return false;
+    		}
+
+    		// load the plugin
+	    	$auth_plugin = $plugin_controller->load('auth', $input);
+
+	    	// @TODO: throw an error in plugin controller instead of returning null
+	    	if (is_null($auth_plugin)) {
+	    		$this->_error = true;
+	    		msg('Cannot load Auth Plugin "' . $input . '"');
+	    		return false;
+	    	}
+
+	    	// verify proper instanciation (is this really a plugin?) @TODO use instanceof? impement interface?
+	    	if (is_object($auth_plugin) && !method_exists($auth_plugin, 'getPluginName')) {
+	    		$this->_error = true;
+				msg('Cannot create Auth Plugin "' . $input . '"');
+	    		return false;
+	    	}
+    	}
+
+    	msg('Successfully changed auth system. Please re-login.');
+    	auth_logoff();
+
+    	return true;
+    }
   }
 }
 
-- 
cgit v1.2.3