From ad062fb49abfe63d4c05dd93b9a19a533c78acb7 Mon Sep 17 00:00:00 2001
From: Roland Gruber <post@rolandgruber.de>
Date: Wed, 27 Jul 2022 08:08:48 +0200
Subject: [PATCH] move list labels to modules

---
 lam/lib/baseType.inc                   |  2 +-
 lam/lib/modules/courierMailAccount.inc | 19 ++++++++++++++++---
 lam/lib/modules/courierMailAlias.inc   | 14 ++++++++++++--
 3 files changed, 29 insertions(+), 6 deletions(-)

diff --git a/lam/lib/baseType.inc b/lam/lib/baseType.inc
index e04cf699e..7933b782a 100644
--- a/lam/lib/baseType.inc
+++ b/lam/lib/baseType.inc
@@ -106,7 +106,7 @@ class baseType {
 			$module = moduleCache::getModule($moduleName, $this->getScope());
 			$descriptions = array_merge($descriptions, $module->getListAttributeDescriptions());
 		}
-		return array_unique($descriptions);
+		return $descriptions;
 	}
 
 	/**
diff --git a/lam/lib/modules/courierMailAccount.inc b/lam/lib/modules/courierMailAccount.inc
index dc8b5cb31..0b09f0b4b 100644
--- a/lam/lib/modules/courierMailAccount.inc
+++ b/lam/lib/modules/courierMailAccount.inc
@@ -3,7 +3,7 @@ use \LAM\TYPES\TypeManager;
 /*
  * This code is part of LDAP Account Manager (http://www.ldap-account-manager.org/)
  * Copyright (C) 2017 Lars Althof
- *               2017 - 2021 Roland Gruber
+ *               2017 - 2022 Roland Gruber
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -590,6 +590,19 @@ class courierMailAccount extends baseModule {
 		return !in_array('posixAccount', $modules);
 	}
 
-}
+	/**
+	 * @inheritDoc
+	 */
+	public function getListAttributeDescriptions(): array {
+		return array(
+			'mailbox' => _('Mailbox'),
+			'mailhost' => _('Mailbox home server'),
+			'quota' => _('Mailbox quota'),
+			'disableimap' => _('Disable IMAP access'),
+			'disablepop3' => _('Disable POP3 access'),
+			'disablewebmail' => _('Disable webmail access'),
+			'disableshared' => _('Disable shared folder access')
+		);
+	}
 
-?>
\ No newline at end of file
+}
diff --git a/lam/lib/modules/courierMailAlias.inc b/lam/lib/modules/courierMailAlias.inc
index 6f314abbd..18ca96b96 100644
--- a/lam/lib/modules/courierMailAlias.inc
+++ b/lam/lib/modules/courierMailAlias.inc
@@ -220,6 +220,16 @@ class courierMailAlias extends baseModule {
 		return $messages;
 	}
 
-}
+	/**
+	 * @inheritDoc
+	 */
+	public function getListAttributeDescriptions(): array {
+		return array(
+			'mail' => _('Email address'),
+			'maildrop' => _('Recipient address'),
+			'mailsource' => _('Mail source'),
+			'description' => _('Description')
+		);
+	}
 
-?>
\ No newline at end of file
+}