[sysconfig] Remove fixNumeric option; now mandatory, handled transparently

11 files changed, 8 insertions, 54 deletions

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'));
 		}
diff --git a/modules-available/sysconfig/addmodule_ldapauth.inc.php b/modules-available/sysconfig/addmodule_ldapauth.inc.php
index 98f98c6d..606ce381 100644
--- a/modules-available/sysconfig/addmodule_ldapauth.inc.php
+++ b/modules-available/sysconfig/addmodule_ldapauth.inc.php
@@ -9,15 +9,12 @@ class LdapAuth_Start extends AddModule_Base
 
 	protected function renderInternal()
 	{
-		$LDAPAUTH_COMMON_FIELDS = array('title', 'server', 'searchbase', 'binddn', 'bindpw', 'home', 'homeattr', 'ssl', 'fixnumeric', 'genuid', 'certificate', 'mapping', 'nohomewarn');
+		$LDAPAUTH_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, $LDAPAUTH_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;
 		}
@@ -82,7 +79,6 @@ class LdapAuth_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'],
@@ -154,7 +150,6 @@ class LdapAuth_CheckCredentials 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', ''),
@@ -195,7 +190,6 @@ class LdapAuth_HomeDir 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', ''),
@@ -254,7 +248,7 @@ class LdapAuth_Finish extends AddModule_Base
 		else
 			$module = $this->edit;
 		$ssl = Request::post('ssl', 'off') === 'on';
-		foreach (['searchbase', 'binddn', 'server', 'bindpw', 'home', 'nohomewarn', 'certificate', 'fixnumeric', 'genuid',
+		foreach (['searchbase', 'binddn', 'server', 'bindpw', 'home', 'nohomewarn', 'certificate', 'genuid',
 						'ldapAttrMountOpts', 'shareHomeMountOpts'] as $key) {
 			$module->setData($key, Request::post($key, '', 'string'));
 		}
diff --git a/modules-available/sysconfig/inc/configmodulebaseldap.inc.php b/modules-available/sysconfig/inc/configmodulebaseldap.inc.php
index 39f4f68e..6a15c7ce 100644
--- a/modules-available/sysconfig/inc/configmodulebaseldap.inc.php
+++ b/modules-available/sysconfig/inc/configmodulebaseldap.inc.php
@@ -6,7 +6,7 @@ abstract class ConfigModuleBaseLdap extends ConfigModule
 	const VERSION = 3;
 
 	private static $REQUIRED_FIELDS = array('server', 'searchbase');
-	private static $OPTIONAL_FIELDS = array('binddn', 'bindpw', 'home', 'ssl', 'fixnumeric', 'fingerprint', 'certificate', 'homeattr',
+	private static $OPTIONAL_FIELDS = array('binddn', 'bindpw', 'home', 'ssl', 'fingerprint', 'certificate', 'homeattr',
 		'shareRemapMode', 'shareRemapCreate', 'shareDocuments', 'shareDownloads', 'shareDesktop', 'shareMedia',
 		'shareOther', 'shareHomeDrive', 'shareDomain', 'credentialPassthrough', 'mapping', 'genuid',
 		'ldapAttrMountOpts', 'shareHomeMountOpts', 'nohomewarn');
@@ -95,15 +95,14 @@ abstract class ConfigModuleBaseLdap extends ConfigModule
 		if (!isset($config['shareHomeDrive'])) {
 			$config['shareHomeDrive'] = 'H:';
 		}
-		if (!isset($config['fixnumeric'])) {
-			$config['fixnumeric'] = 's';
-		}
+		// This is now always on, as we mask it transparently in our lightdm greeter
+		$config['fixnumeric'] = 'yes';
 		$config['genuid'] = isset($config['genuid']) && !empty($config['genuid']);
 		$config['nohomewarn'] = isset($config['nohomewarn']) ? (int)$config['nohomewarn'] : 0;
 		$this->preTaskmanagerHook($config);
 		$task = Taskmanager::submit('CreateLdapConfig', $config);
 		if (is_array($task) && isset($task['id'])) {
-			self::ldadp('restart', $this->id(), $task['id']); // TODO: Use --restart for this one only
+			self::ldadp('restart', $this->id(), $task['id']);
 		}
 		return $task;
 	}
diff --git a/modules-available/sysconfig/lang/de/template-tags.json b/modules-available/sysconfig/lang/de/template-tags.json
index ba41fce2..16b2c672 100644
--- a/modules-available/sysconfig/lang/de/template-tags.json
+++ b/modules-available/sysconfig/lang/de/template-tags.json
@@ -42,8 +42,6 @@
     "lang_driveLetterNote": "WICHTIG: Bitte w\u00e4hlen Sie einen Laufwerksbuchstaben, der in den eingesetzten VMs verf\u00fcgbar ist, da ansonsten auf einen anderen Buchstaben ausgewichen werden muss.",
     "lang_editLong": "Modul oder Konfiguration bearbeiten.",
     "lang_editingLocationInfo": "Sie setzen die Konfiguration eines bestimmten Raums\/Orts, nicht die globale Konfiguration",
-    "lang_fixNumeric": "Numerischen Account-Namen muss ein 's' vorangestellt werden",
-    "lang_fixNumericDescription": "Wenn Sie diese Option aktivieren, m\u00fcssen Benutzer, deren Account-Name nur aus Ziffern besteht, diesem ein 's' voranstellen beim Login. Diese Option ist beim alten Login-Manager (KDM) zwingend erforderlich, da sonst der Loginvorgang fehlschl\u00e4gt. Mit dem neuen lightdm-basierten Login-Screen lassen sich numerische Account-Namen jedoch direkt verwenden. Wenn Sie an Ihrer Einrichtung keine numerischen Account-Namen verwenden, hat diese Option keine Auswirkung.",
     "lang_folderRedirection": "Folder Redirection",
     "lang_forceRootOwner": "Besitzrechte des Inhalts auf root:root setzen",
     "lang_genUid": "uid-Nummern generieren",
diff --git a/modules-available/sysconfig/lang/en/template-tags.json b/modules-available/sysconfig/lang/en/template-tags.json
index ffdbdaaf..eddd03d4 100644
--- a/modules-available/sysconfig/lang/en/template-tags.json
+++ b/modules-available/sysconfig/lang/en/template-tags.json
@@ -42,8 +42,6 @@
     "lang_driveLetterNote": "IMPORTANT: Pick a drive letter for the home directory that will be free in the Virtual Machines. Otherwise, a random letter will be assigned.",
     "lang_editLong": "Edit module or configuration.",
     "lang_editingLocationInfo": "You're setting the configuration for a specific location, not the global one",
-    "lang_fixNumeric": "Numeric account names have to be prefixed by 's'",
-    "lang_fixNumericDescription": "If enabled, users with account names that consist entirely of digits have to prefix their user id by 's' when logging in. This is required with the old login manager (KDM) to prevent crashes. The new lightdm-based login manager will accept numeric account names, so you can leave this option disabled. If your organization doesn't have any numeric account names, this option will have no effect.",
     "lang_folderRedirection": "Folder Redirection",
     "lang_forceRootOwner": "Change ownership of archive content to root:root",
     "lang_genUid": "Generate uid numbers",
diff --git a/modules-available/sysconfig/templates/ad-selfsearch.html b/modules-available/sysconfig/templates/ad-selfsearch.html
index e6a19468..0eefc372 100644
--- a/modules-available/sysconfig/templates/ad-selfsearch.html
+++ b/modules-available/sysconfig/templates/ad-selfsearch.html
@@ -42,7 +42,6 @@
 		{{#mapping}}
 			<input type="hidden" name="mapping[{{field}}]" value="{{value}}">
 		{{/mapping}}
-		<input name="fixnumeric" value="{{fixnumeric}}" type="hidden">
 		<input name="genuid" value="{{genuid}}" type="hidden">
 		<button type="submit" class="btn btn-primary">&laquo; {{lang_back}}</button>
 	</form>
@@ -67,7 +66,6 @@
 		{{#mapping}}
 			<input type="hidden" name="mapping[{{field}}]" value="{{value}}">
 		{{/mapping}}
-		<input name="fixnumeric" value="{{fixnumeric}}" type="hidden">
 		<input name="genuid" value="{{genuid}}" type="hidden">
 		<input name="fingerprint" value="{{fingerprint}}" type="hidden">
 		<button id="nextbutton" type="submit" class="btn btn-primary" style="display:none">{{lang_skip}} &raquo;</button>
diff --git a/modules-available/sysconfig/templates/ad-start.html b/modules-available/sysconfig/templates/ad-start.html
index 933859fd..3cca080f 100644
--- a/modules-available/sysconfig/templates/ad-start.html
+++ b/modules-available/sysconfig/templates/ad-start.html
@@ -77,16 +77,6 @@
 	<br>
 	<div>
 		<div class="checkbox">
-			<input id="num-cb" type="checkbox" name="fixnumeric" {{#fixnumeric}}checked{{/fixnumeric}}>
-			<label for="num-cb"><b>{{lang_fixNumeric}}</b></label>
-		</div>
-		<div>
-			<i>{{lang_fixNumericDescription}}</i>
-		</div>
-	</div>
-	<br>
-	<div>
-		<div class="checkbox">
 			<input id="ssl-cb" type="checkbox" name="ssl" onchange="$('#cert-box').css('display', this.checked ? '' : 'none')" {{#ssl}}checked{{/ssl}}>
 			<label for="ssl-cb"><b>{{lang_ssl}}</b></label>
 		</div>
diff --git a/modules-available/sysconfig/templates/ad_ldap-checkconnection.html b/modules-available/sysconfig/templates/ad_ldap-checkconnection.html
index e686c29f..ced65650 100644
--- a/modules-available/sysconfig/templates/ad_ldap-checkconnection.html
+++ b/modules-available/sysconfig/templates/ad_ldap-checkconnection.html
@@ -30,7 +30,6 @@
 			<input type="hidden" name="mapping[{{field}}]" value="{{value}}">
 		{{/mapping}}
 
-		<input name="fixnumeric" value="{{fixnumeric}}" type="hidden">
 		<input name="genuid" value="{{genuid}}" type="hidden">
 		<button type="submit" class="btn btn-primary">&laquo; {{lang_back}}</button>
 	</form>
@@ -55,7 +54,6 @@
 		{{#mapping}}
 			<input type="hidden" name="mapping[{{field}}]" value="{{value}}">
 		{{/mapping}}
-		<input name="fixnumeric" value="{{fixnumeric}}" type="hidden">
 		<input name="genuid" value="{{genuid}}" type="hidden">
 		<input name="originalbinddn" value="{{binddn}}" type="hidden">
 		<button id="nextbutton" type="submit" class="btn btn-primary" style="display:none">{{lang_next}} &raquo;</button>
diff --git a/modules-available/sysconfig/templates/ad_ldap-checkcredentials.html b/modules-available/sysconfig/templates/ad_ldap-checkcredentials.html
index d698d994..71df4428 100644
--- a/modules-available/sysconfig/templates/ad_ldap-checkcredentials.html
+++ b/modules-available/sysconfig/templates/ad_ldap-checkcredentials.html
@@ -25,7 +25,6 @@
 		{{#mapping}}
 			<input type="hidden" name="mapping[{{field}}]" value="{{value}}">
 		{{/mapping}}
-		<input name="fixnumeric" value="{{fixnumeric}}" type="hidden">
 		<input name="genuid" value="{{genuid}}" type="hidden">
 		<button type="submit" class="btn btn-primary">&laquo; {{lang_back}}</button>
 	</form>
@@ -49,7 +48,6 @@
 		{{#mapping}}
 			<input type="hidden" name="mapping[{{field}}]" value="{{value}}">
 		{{/mapping}}
-		<input name="fixnumeric" value="{{fixnumeric}}" type="hidden">
 		<input name="genuid" value="{{genuid}}" type="hidden">
 		<input name="fingerprint" value="{{fingerprint}}" type="hidden">
 		<input name="originalbinddn" value="{{binddn}}" type="hidden">
diff --git a/modules-available/sysconfig/templates/ad_ldap-homedir.html b/modules-available/sysconfig/templates/ad_ldap-homedir.html
index 8a6c10de..33f55c16 100644
--- a/modules-available/sysconfig/templates/ad_ldap-homedir.html
+++ b/modules-available/sysconfig/templates/ad_ldap-homedir.html
@@ -17,7 +17,6 @@
 	{{#mapping}}
 		<input type="hidden" name="mapping[{{field}}]" value="{{value}}">
 	{{/mapping}}
-	<input name="fixnumeric" value="{{fixnumeric}}" type="hidden">
 	<input name="genuid" value="{{genuid}}" type="hidden">
 	<input name="fingerprint" value="{{fingerprint}}" type="hidden">
 
diff --git a/modules-available/sysconfig/templates/ldap-start.html b/modules-available/sysconfig/templates/ldap-start.html
index 28019d9e..059d54f5 100644
--- a/modules-available/sysconfig/templates/ldap-start.html
+++ b/modules-available/sysconfig/templates/ldap-start.html
@@ -78,16 +78,6 @@
 	<br>
 	<div>
 		<div class="checkbox">
-			<input id="num-cb" type="checkbox" name="fixnumeric" {{#fixnumeric}}checked{{/fixnumeric}}>
-			<label for="num-cb"><b>{{lang_fixNumeric}}</b></label>
-		</div>
-		<div>
-			<i>{{lang_fixNumericDescription}}</i>
-		</div>
-	</div>
-	<br>
-	<div>
-		<div class="checkbox">
 			<input id="ssl-cb" type="checkbox" name="ssl" onchange="$('#cert-box').css('display', this.checked ? '' : 'none')" {{#ssl}}checked{{/ssl}}>
 			<label for="ssl-cb"><b>{{lang_ssl}}</b></label>
 		</div>