Merge branch 'main' of github.com:in2code-de/femanager

Author: sbusemann

Classes/Controller/AbstractController.php

@@ -344,6 +344,8 @@ public function finalCreate(
 
         // send notify email to admin
         if ($createAdminNotify) {
+            $variables['adminHash'] = HashUtility::createHashForUser($user, 'admin');
+
             $this->sendMailService->send(
                 'createNotify',
                 StringUtility::makeEmailArray(

Classes/Controller/NewController.php

@@ -226,7 +226,7 @@ public function confirmCreateRequestAction(int $user, string $hash, string $stat
             'userConfirmation', 'confirmUser' => $this->statusUserConfirmation($user, $hash, $status),
             'userConfirmationRefused', 'confirmDeletion' => $this->statusUserConfirmationRefused($user, $hash),
             'adminConfirmation', 'confirmAdmin' => $this->statusAdminConfirmation($user, $hash, $status, $backend),
-            'adminConfirmationRefused', 'adminConfirmationRefusedSilent', 'confirmAdminDeletion', 'confirmAdminDeletionSilent' =>
+            'adminConfirmationRefused', 'adminConfirmationRefusedSilent', 'confirmAdminDeletion', 'confirmAdminRefused', 'confirmAdminDeletionSilent' =>
             $this->statusAdminConfirmationRefused($user, $hash, $status),
             default => false,
         };
@@ -480,7 +480,7 @@ protected function createAdminConfirmationRequest(User $user)
                     $this->settings['new']['confirmByAdmin'] ?? '',
                     $this->settings['new']['email']['createAdminConfirmation']['receiver']['name']['value'] ?? ''
                 ),
-                StringUtility::makeEmailArray($user->getEmail(), $user->getUsername()),
+                ['sender@femanager.org' => 'Sender Name'],
                 'New Registration request',
                 [
                     'user' => $user,

Classes/Controller/UserBackendController.php

@@ -127,7 +127,7 @@ public function confirmUserAction(int $userIdentifier): ResponseInterface
 
         $this->eventDispatcher->dispatch(new AdminConfirmationUserEvent($user));
 
-        $jsonResult = $this->getFrontendRequestResult('adminConfirmation', $userIdentifier, $user);
+        $jsonResult = $this->getFrontendRequestResult('confirmAdmin', $userIdentifier, $user);
 
         if ($jsonResult['status'] ?? false) {
             $this->addFlashMessage(
@@ -186,7 +186,7 @@ public function refuseUserAction(int $userIdentifier): ResponseInterface
 
         $this->eventDispatcher->dispatch(new RefuseUserEvent($user));
 
-        $jsonResult = $this->getFrontendRequestResult('adminConfirmationRefused', $userIdentifier, $user);
+        $jsonResult = $this->getFrontendRequestResult('confirmAdminRefused', $userIdentifier, $user);
 
         if ($jsonResult['status'] ?? false) {
             $this->addFlashMessage(

Resources/Private/Templates/Email/CreateNotify.html

@@ -27,15 +27,15 @@
 	<p>
 		<f:translate key="LLL:EXT:femanager/Resources/Private/Language/locallang.xlf:emailCreateAdminConfirmationText2" />
 		<br>
-		<f:link.action action="confirmCreateRequest" controller="New" absolute="1" arguments="{user:user, hash:hash, status:'adminConfirmationRefused'}">
+		<f:link.action action="confirmCreateRequest" controller="New" absolute="1" arguments="{user:user, hash:hash, adminHash:adminHash, status:'adminConfirmationRefused'}">
 			<f:translate key="LLL:EXT:femanager/Resources/Private/Language/locallang.xlf:emailCreateAdminConfirmationLinkConfirmRefused" />
 		</f:link.action>
 	</p>
 
 	<p>
 		<f:translate key="LLL:EXT:femanager/Resources/Private/Language/locallang.xlf:emailCreateAdminConfirmationText3" />
 		<br>
-		<f:link.action action="confirmCreateRequest" controller="New" absolute="1" arguments="{user:user, hash:hash, status:'adminConfirmationRefusedSilent'}">
+		<f:link.action action="confirmCreateRequest" controller="New" absolute="1" arguments="{user:user, hash:hash, adminHash:adminHash, status:'adminConfirmationRefusedSilent'}">
 			<f:translate key="LLL:EXT:femanager/Resources/Private/Language/locallang.xlf:emailCreateAdminConfirmationLinkConfirmRefusedSilent" />
 		</f:link.action>
 	</p>