Merge pull request #369 from LDAPAccountManager/feature/339_rejection…

…_reason

Feature/339 rejection reason

lam/HISTORY

@@ -1,6 +1,8 @@
 December 2024 9.0
  - Group of (unique) names, organisational roles: added member/owner count to PDF fields
  - Usability improvements (350)
+ - LAM Pro:
+  -> Request access: added comment field for owners/approvers (339)
  - Fixed bugs:
   -> Windows: show more than 1000 LDAP entries when paged results is activated in server profile
 

lam/docs/manual-sources/chapter-selfService.xml

@@ -1937,6 +1937,9 @@
       optional notes. This is available for the mails to the group
       owners/managers.</para>
 
+      <para>Use $$request_comment$$ to inject the owner's or approver's
+      comment. This can be used in mails to approvers and requesters.</para>
+
       <para>The wildcards $$approveLink$$ and $$rejectLink$$ resolve to an URL
       that allows to approve/deny all requests listed in $$requested_groups$$.
       This is available for the mails to the group owners/managers and
@@ -1975,6 +1978,8 @@
 
   $$requested_groups$$
 
+  Comment: $$request_comment$$
+
   Approve all: $$approveLink$$
   Deny all: $$rejectLink$$
 
@@ -1989,8 +1994,9 @@
       email:</emphasis><literallayout>
   Dear $$cn$$,
 
-  your access request was approved.
+  your access request was approved/denied.
   Requested groups: $$requested_groups$$
+  Comment: $$request_comment$$
 
   Best regards,
   IT team

lam/lib/persistence.inc

@@ -405,6 +405,9 @@ class ConfigDataImporter {
 						if (isset($value['historicRequests'])) {
 							$mainStep->addSubStep(new ImporterStep(_('Request history'), 'requestAccess_historicRequests', $value['historicRequests']));
 						}
+						if (isset($value['expirations'])) {
+							$mainStep->addSubStep(new ImporterStep(_('Revocation information'), 'requestAccess_expirations', $value['expirations']));
+						}
 						$steps[] = $mainStep;
 					}
 					break;
@@ -752,6 +755,9 @@ class ConfigDataImporter {
 				case 'historicRequests':
 					$database->importRequestHistory($data);
 					break;
+				case 'expirations':
+					$database->importExpirations($data);
+					break;
 			}
 		}
 	}