Merge pull request 'Add multi-use group invite links with expiry and auto-approval on email confirmation' (#83) from feature/group-invite-links into main

Reviewed-on: #83

templates/admin/invites.php

@@ -66,6 +66,23 @@ if (! defined('ABSPATH')) {
         <?php submit_button(esc_html__('Generate Invitation Link', 'unsupervised-schedular')); ?>
     </form>
 
+    <h2><?php esc_html_e('Group Invite Link', 'unsupervised-schedular'); ?></h2>
+    <p class="description"><?php esc_html_e('Generate a shareable link (e.g. for a newsletter). Anyone with the link can register until it expires: they enter their own email and must confirm it, but no admin approval is needed afterwards.', 'unsupervised-schedular'); ?></p>
+    <form method="post">
+        <?php wp_nonce_field('usc_invite_action'); ?>
+        <input type="hidden" name="usc_action" value="group_invite">
+        <table class="form-table">
+            <tr>
+                <th><label for="expires_at"><?php esc_html_e('Expires on', 'unsupervised-schedular'); ?></label></th>
+                <td>
+                    <input type="date" name="expires_at" id="expires_at" required min="<?php echo esc_attr((string) current_time('Y-m-d')); ?>">
+                    <p class="description"><?php esc_html_e('The link stops working at the end of this day.', 'unsupervised-schedular'); ?></p>
+                </td>
+            </tr>
+        </table>
+        <?php submit_button(esc_html__('Generate Group Link', 'unsupervised-schedular')); ?>
+    </form>
+
     <h2><?php esc_html_e('Pending Invites', 'unsupervised-schedular'); ?></h2>
 
     <?php if (empty($pendingInvites)) : ?>
@@ -74,8 +91,9 @@ if (! defined('ABSPATH')) {
         <table class="wp-list-table widefat fixed striped">
             <thead>
                 <tr>
-                    <th><?php esc_html_e('Email', 'unsupervised-schedular'); ?></th>
-                    <th><?php esc_html_e('Invited', 'unsupervised-schedular'); ?></th>
+                    <th><?php esc_html_e('Invite', 'unsupervised-schedular'); ?></th>
+                    <th><?php esc_html_e('Created', 'unsupervised-schedular'); ?></th>
+                    <th><?php esc_html_e('Expires', 'unsupervised-schedular'); ?></th>
                     <th><?php esc_html_e('Actions', 'unsupervised-schedular'); ?></th>
                 </tr>
             </thead>
@@ -84,7 +102,7 @@ if (! defined('ABSPATH')) {
                 <?php foreach ($pendingInvites as $invite) : ?>
                     <tr>
                         <td>
-                            <?php echo esc_html($invite->email); ?>
+                            <?php echo $invite->isGroup() ? esc_html__('Group link', 'unsupervised-schedular') : esc_html($invite->email); ?>
                             <?php if ($invite->isExpired($now)) : ?>
                                 <span class="us-invite-expired" style="color:#b32d2e;">— <?php esc_html_e('expired', 'unsupervised-schedular'); ?></span>
                             <?php endif; ?>
@@ -92,6 +110,9 @@ if (! defined('ABSPATH')) {
                         <td>
                             <?php echo esc_html((string) $invite->createdAt); ?>
                         </td>
+                        <td>
+                            <?php echo esc_html($invite->expiresAt !== null ? (string) mysql2date('M j, Y', $invite->expiresAt) : '—'); ?>
+                        </td>
                         <td>
                             <form method="post" style="display:inline;">
                                 <?php wp_nonce_field('usc_invite_action'); ?>

templates/frontend/register-page.php

@@ -11,8 +11,8 @@ if (! defined('ABSPATH')) {
  * @var string $token Raw invite token from the request (only its hash is stored).
  * @var bool   $canRegister
  * @var bool   $open   Whether open (self-approval) registration is enabled.
- * @var string $successType '' | 'invite' (created + logged in) | 'confirm' (check email).
- * @var string $confirmResult '' | '1' (email confirmed) | 'expired'.
+ * @var string $successType '' | 'invite' (created + logged in) | 'confirm' (check email) | 'confirm_group' (check email; auto-approved on confirm).
+ * @var string $confirmResult '' | '1' (email confirmed, awaiting approval) | 'ready' (confirmed + auto-approved) | 'expired'.
  * @var string $loginUrl Where the post-confirmation sign-in link points.
  * @var string $error
  * @var list<array{policy: \Unsupervised\Schedular\Policy\Policy, version: \Unsupervised\Schedular\Policy\PolicyVersion}> $policyForms
@@ -23,6 +23,11 @@ if (! defined('ABSPATH')) {
         <p class="us-success"><?php esc_html_e('Your account has been created and you are now logged in.', 'unsupervised-schedular'); ?></p>
     <?php elseif ($successType === 'confirm') : ?>
         <p class="us-success"><?php esc_html_e('Your account has been created. Check your email for a link to confirm your address — once you do, a studio admin will review and approve your account.', 'unsupervised-schedular'); ?></p>
+    <?php elseif ($successType === 'confirm_group') : ?>
+        <p class="us-success"><?php esc_html_e('Your account has been created. Check your email for a link to confirm your address — once you do, your account is ready to use.', 'unsupervised-schedular'); ?></p>
+    <?php elseif ($confirmResult === 'ready') : ?>
+        <p class="us-success"><?php esc_html_e('Thanks — your email is confirmed and your account is ready to use.', 'unsupervised-schedular'); ?></p>
+        <p><a href="<?php echo esc_url($loginUrl); ?>"><?php esc_html_e('Sign in to your account', 'unsupervised-schedular'); ?></a></p>
     <?php elseif ($confirmResult === '1') : ?>
         <p class="us-success"><?php esc_html_e('Thanks — your email is confirmed. Your account is now awaiting studio approval; we will email you when it is ready.', 'unsupervised-schedular'); ?></p>
         <p><a href="<?php echo esc_url($loginUrl); ?>"><?php esc_html_e('Sign in to your account', 'unsupervised-schedular'); ?></a></p>
@@ -44,7 +49,7 @@ if (! defined('ABSPATH')) {
 
                 <p>
                     <label for="us-reg-email"><?php esc_html_e('Email', 'unsupervised-schedular'); ?></label>
-                    <?php if ($inviteValid && $invite !== null) : ?>
+                    <?php if ($inviteValid && $invite !== null && ! $invite->isGroup()) : ?>
                         <input type="email" id="us-reg-email" value="<?php echo esc_attr($invite->email); ?>" readonly>
                     <?php else : ?>
                         <input type="email" name="email" id="us-reg-email" autocomplete="email" required>