From a37c1a9a42f9ab7312722f9bf32d1cad3d8cfa54 Mon Sep 17 00:00:00 2001
From: Roland Gruber <post@rolandgruber.de>
Date: Fri, 13 Dec 2024 07:51:01 +0100
Subject: [PATCH] refactoring

---
 lam/lib/modules/courierMailAccount.inc |  2 +-
 lam/lib/modules/courierMailAlias.inc   | 12 ++++++------
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/lam/lib/modules/courierMailAccount.inc b/lam/lib/modules/courierMailAccount.inc
index 95eee1805..3db3a26d2 100644
--- a/lam/lib/modules/courierMailAccount.inc
+++ b/lam/lib/modules/courierMailAccount.inc
@@ -508,7 +508,7 @@ class courierMailAccount extends baseModule {
 	 */
 	public function build_uploadAccounts($rawAccounts, $ids, &$partialAccounts, $selectedModules, &$type) {
 		$messages = [];
-		for ($i = 0; $i < sizeof($rawAccounts); $i++) {
+		for ($i = 0; $i < count($rawAccounts); $i++) {
 			// add object class
 			if (!in_array("courierMailAccount", $partialAccounts[$i]['objectClass'])) {
 				$partialAccounts[$i]['objectClass'][] = "courierMailAccount";
diff --git a/lam/lib/modules/courierMailAlias.inc b/lam/lib/modules/courierMailAlias.inc
index 097a993d9..f7753e48d 100644
--- a/lam/lib/modules/courierMailAlias.inc
+++ b/lam/lib/modules/courierMailAlias.inc
@@ -44,7 +44,7 @@ class courierMailAlias extends baseModule {
 	 * {@inheritdoc}
 	 */
 	public function can_manage() {
-		return in_array($this->get_scope(), ['mailAlias']);
+		return $this->get_scope() === 'mailAlias';
 	}
 
 	/**
@@ -151,9 +151,9 @@ class courierMailAlias extends baseModule {
 		$this->addSimpleInputTextField($return, 'mail', _('Email address'), true);
 		$this->addMultiValueInputTextField($return, 'maildrop', _('Recipient address'), true);
 		$return->addVerticalSpacer('0.5rem');
-		$selectedSource = (!empty($this->attributes['mailsource'][0])) ? $this->attributes['mailsource'][0] : "-";
+		$selectedSource = (empty($this->attributes['mailsource'][0])) ? "-" : $this->attributes['mailsource'][0];
 		$return->add(new htmlResponsiveSelect('mailsource', ['-', 'esmtp', 'local'], [$selectedSource], _('Mail source'), 'mailsource'), 12);
-		$description = (!empty($this->attributes['description'][0])) ? $this->attributes['description'][0] : '';
+		$description = (empty($this->attributes['description'][0])) ? '' : $this->attributes['description'][0];
 		$boxInput = new htmlResponsiveInputField(_('Description'), 'description', $description, 'description');
 		$boxInput->setFieldMaxLength(100);
 		$return->add($boxInput, 12);
@@ -202,7 +202,7 @@ class courierMailAlias extends baseModule {
 	function build_uploadAccounts($rawAccounts, $ids, &$partialAccounts, $selectedModules, &$type) {
 		$messages = [];
 		$possibleSources = ['esmtp', 'local'];
-		for ($i = 0; $i < sizeof($rawAccounts); $i++) {
+		for ($i = 0; $i < count($rawAccounts); $i++) {
 			if (!in_array("courierMailAlias", $partialAccounts[$i]['objectClass'])) {
 				$partialAccounts[$i]['objectClass'][] = "courierMailAlias";
 			}
@@ -215,7 +215,7 @@ class courierMailAlias extends baseModule {
 				}
 				else {
 					$error = $this->messages['mailsource'][0];
-					array_push($error, [$i]);
+					$error[] = [$i];
 					$messages[] = $error;
 				}
 			}
@@ -243,7 +243,7 @@ class courierMailAlias extends baseModule {
 			return function(array $entry, string $attribute): ?htmlElement {
 				$group = new htmlGroup();
 				if (isset($entry[$attribute][0]) && ($entry[$attribute][0] != '')) {
-					for ($i = 0; $i < sizeof($entry[$attribute]); $i++) {
+					for ($i = 0; $i < count($entry[$attribute]); $i++) {
 						if ($i > 0) {
 							$group->addElement(new htmlOutputText(", "));
 						}