From 2218a4a1c5bb100ec920638d1f0c0ee973900c4f Mon Sep 17 00:00:00 2001
From: Simon Rettberg
Date: Tue, 15 Dec 2020 13:52:36 +0100
Subject: [sysconfig] Remove fixNumeric option; now mandatory, handled
 transparently

---
 modules-available/sysconfig/addmodule_adauth.inc.php | 12 ++----------
 1 file changed, 2 insertions(+), 10 deletions(-)

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

diff --git a/modules-available/sysconfig/addmodule_adauth.inc.php b/modules-available/sysconfig/addmodule_adauth.inc.php
index 583844d0..f2ac206e 100644
--- a/modules-available/sysconfig/addmodule_adauth.inc.php
+++ b/modules-available/sysconfig/addmodule_adauth.inc.php
@@ -13,15 +13,12 @@ class AdAuth_Start extends AddModule_Base
 
 	protected function renderInternal()
 	{
-		$ADAUTH_COMMON_FIELDS = array('title', 'server', 'searchbase', 'binddn', 'bindpw', 'home', 'homeattr', 'ssl', 'fixnumeric', 'genuid', 'certificate', 'mapping', 'nohomewarn');
+		$ADAUTH_COMMON_FIELDS = array('title', 'server', 'searchbase', 'binddn', 'bindpw', 'home', 'homeattr', 'ssl', 'genuid', 'certificate', 'mapping', 'nohomewarn');
 		$data = array();
 		if ($this->edit !== false) {
 			moduleToArray($this->edit, $data, $ADAUTH_COMMON_FIELDS);
 			$data['title'] = $this->edit->title();
 			$data['edit'] = $this->edit->id();
-			if (!isset($data['fixnumeric']) || $data['fixnumeric'] === false) {
-				$data['fixnumeric'] = 's';
-			}
 		} else {
 			$data['ssl'] = true;
 		}
@@ -108,7 +105,6 @@ class AdAuth_CheckConnection extends AddModule_Base
 			'bindpw' => Request::post('bindpw'),
 			'home' => Request::post('home'),
 			'ssl' => Request::post('ssl'),
-			'fixnumeric' => Request::post('fixnumeric'),
 			'genuid' => Request::post('genuid'),
 			'certificate' => Request::post('certificate', ''),
 			'taskid' => $this->scanTask['id'],
@@ -210,7 +206,6 @@ class AdAuth_SelfSearch extends AddModule_Base
 			'bindpw' => Request::post('bindpw'),
 			'home' => Request::post('home'),
 			'ssl' => Request::post('ssl') === 'on',
-			'fixnumeric' => Request::post('fixnumeric'),
 			'genuid' => Request::post('genuid'),
 			'fingerprint' => Request::post('fingerprint'),
 			'certificate' => Request::post('certificate', ''),
@@ -288,7 +283,6 @@ class AdAuth_HomeAttrCheck extends AddModule_Base
 				'bindpw' => Request::post('bindpw'),
 				'home' => Request::post('home'),
 				'ssl' => Request::post('ssl') === 'on',
-				'fixnumeric' => Request::post('fixnumeric'),
 				'genuid' => Request::post('genuid'),
 				'fingerprint' => Request::post('fingerprint'),
 				'certificate' => Request::post('certificate', ''),
@@ -361,7 +355,6 @@ class AdAuth_CheckCredentials extends AddModule_Base
 				'home' => Request::post('home'),
 				'homeattr' => Request::post('homeattr'),
 				'ssl' => Request::post('ssl') === 'on',
-				'fixnumeric' => Request::post('fixnumeric'),
 				'genuid' => Request::post('genuid'),
 				'fingerprint' => Request::post('fingerprint'),
 				'certificate' => Request::post('certificate', ''),
@@ -426,7 +419,6 @@ class AdAuth_HomeDir extends AddModule_Base
 			'home' => Request::post('home'),
 			'homeattr' => Request::post('homeattr'),
 			'ssl' => Request::post('ssl') === 'on',
-			'fixnumeric' => Request::post('fixnumeric'),
 			'genuid' => Request::post('genuid'),
 			'fingerprint' => Request::post('fingerprint'),
 			'certificate' => Request::post('certificate', ''),
@@ -485,7 +477,7 @@ class AdAuth_Finish extends AddModule_Base
 		else
 			$module = $this->edit;
 		$ssl = Request::post('ssl', 'off') === 'on';
-		foreach (['searchbase', 'binddn', 'server', 'bindpw', 'home', 'nohomewarn', 'homeattr', 'certificate', 'fixnumeric', 'genuid',
+		foreach (['searchbase', 'binddn', 'server', 'bindpw', 'home', 'nohomewarn', 'homeattr', 'certificate', 'genuid',
 					'ldapAttrMountOpts', 'shareHomeMountOpts'] as $key) {
 			$module->setData($key, Request::post($key, '', 'string'));
 		}
-- 
cgit v1.2.3-55-g7522