From 1ff2bc4f3c694b7c76df8e57056c51ca39a23a34 Mon Sep 17 00:00:00 2001
From: Simon Rettberg
Date: Tue, 20 Jan 2015 18:07:24 +0100
Subject: config module structure completed. Many other fixes. Hidden pw field
 support.

---
 modules/sysconfig/addmodule_adauth.inc.php | 19 ++++++++++++++-----
 1 file changed, 14 insertions(+), 5 deletions(-)

(limited to 'modules/sysconfig/addmodule_adauth.inc.php')

diff --git a/modules/sysconfig/addmodule_adauth.inc.php b/modules/sysconfig/addmodule_adauth.inc.php
index 4873d505..baa705b2 100644
--- a/modules/sysconfig/addmodule_adauth.inc.php
+++ b/modules/sysconfig/addmodule_adauth.inc.php
@@ -125,15 +125,24 @@ class AdAuth_Finish extends AddModule_Base
 		$title = Request::post('title');
 		if (empty($title))
 			$title = 'AD: ' . Request::post('server');
-		$config = ConfigModule_AdAuth::insert($title, Request::post('server'), $searchbase, $binddn, Request::post('bindpw', ''), Request::post('home', ''));
-		$config['proxyip'] = Property::getServerIp();
-		$tgz = Taskmanager::submit('CreateAdConfig', $config);
-		if (!isset($tgz['id'])) {
+		$module = ConfigModule::getInstance('AdAuth');
+		$module->setData('server', Request::post('server'));
+		$module->setData('searchbase', $searchbase);
+		$module->setData('binddn', $binddn);
+		$module->setData('bindpw', Request::post('bindpw'));
+		$module->setData('home', Request::post('home'));
+		if (!$module->insert($title)) {
+			Message::addError('value-invalid', 'any', 'any');
+			$tgz = false;
+		} else {
+			$tgz = $module->generate(true);
+		}
+		if ($tgz === false) {
 			AddModule_Base::setStep('AdAuth_Start'); // Continues with AdAuth_Start for render()
 			return;
 		}
 		$this->taskIds = array(
-			'tm-config' => $tgz['id'],
+			'tm-config' => $tgz,
 		);
 	}
 
-- 
cgit v1.2.3-55-g7522