Include subject in mail templates

cosmocode · Nov 24, 2022 · d0dae64 · d0dae64
1 parent 9121cb0
commit d0dae64
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 7 deletions.
diff --git a/action.php b/action.php
@@ -148,15 +148,17 @@ protected function getForm()
             $form->addTextInput('s_email', $this->getLang('youremailaddress'))->addClass('edit');
         }
 
-        $recipientEmails = $template['user'] ?? '';
-        $message = $template['message'] ?? '';
-        $form->addTextInput('r_email', $this->getLang('recipients'))->addClass('edit')->val($recipientEmails);
-        $form->addTextInput('subject', $this->getLang('subject'))->addClass('edit');
+        $form->addTextInput('r_email', $this->getLang('recipients'))
+            ->addClass('edit')
+            ->val($template['user'] ?? '');
+        $form->addTextInput('subject', $this->getLang('subject'))
+            ->addClass('edit')
+            ->val($template['subject'] ?? '');
         $form->addTextarea('comment', $this->getLang('message'))
             ->attr('rows', '8')
             ->attr('cols', '40')
             ->addClass('edit')
-            ->val($message);
+            ->val($template['message'] ?? '');
 
         /** @var helper_plugin_captcha $captcha */
         $captcha = plugin_load('helper', 'captcha');

diff --git a/admin.php b/admin.php
@@ -63,11 +63,9 @@ public function html() {
 
         if (!$this->logs) {
             echo 'No recommendations.';
-            return;
         }
         if (!$this->entries) {
             echo 'No recommendations were made in ' . $this->month . '.';
-            return;
         }
 
         echo '<h2>' . $this->getLang('headline_snippets') . '</h2>';
@@ -99,6 +97,7 @@ protected function getForm()
         $form .= '<tr>';
         $form .= '<th>' . $this->getLang('assign_pattern') . '</th>';
         $form .= '<th>' . $this->getLang('assign_user') . '</th>';
+        $form .= '<th>' . $this->getLang('assign_subject') . '</th>';
         $form .= '<th>' . $this->getLang('assign_message') . '</th>';
         $form .= '<th></th>';
         $form .= '</tr>';
@@ -107,6 +106,7 @@ protected function getForm()
         foreach ($assignments as $assignment) {
             $pattern = $assignment['pattern'];
             $user = $assignment['user'];
+            $subject = $assignment['subject'];
             $message = $assignment['message'];
 
             $link = wl(
@@ -118,13 +118,15 @@ protected function getForm()
                     'sectok' => getSecurityToken(),
                     'assignment[pattern]' => $pattern,
                     'assignment[user]' => $user,
+                    'assignment[subject]' => $subject,
                     'assignment[message]' => $message,
                 ]
             );
 
             $form .= '<tr>';
             $form .= '<td>' . hsc($pattern) . '</td>';
             $form .= '<td>' . hsc($user) . '</td>';
+            $form .= '<td>' . hsc($subject) . '</td>';
             $form .= '<td>' . nl2br($message) . '</td>';
             $form .= '<td><a class="deletePattern" href="' . $link . '">' . $this->getLang('assign_del') . '</a></td>';
             $form .= '</tr>';
@@ -134,6 +136,7 @@ protected function getForm()
         $form .= '<tr>';
         $form .= '<td><input type="text" name="assignment[pattern]" /></td>';
         $form .= '<td><input type="text" name="assignment[user]" /></td>';
+        $form .= '<td><input type="text" name="assignment[subject]" /></td>';
         $form .= '<td><textarea cols="30" rows="4" name="assignment[message]"></textarea></td>';
         $form .= '<td><button type="submit" name="action" value="add">' . $this->getLang('assign_add') . '</button></td>';
         $form .= '</tr>';

diff --git a/helper/assignment.php b/helper/assignment.php
@@ -27,6 +27,7 @@ public function removeAssignment($assignment)
             return !(
                 $assignment['pattern'] === $data['pattern']
                 && $assignment['user'] === $data['user']
+                && $assignment['subject'] === $data['subject']
                 && $assignment['message'] === $data['message']
             );
         });

diff --git a/lang/en/lang.php b/lang/en/lang.php
@@ -28,4 +28,5 @@
 $lang['assign_del'] = 'Delete';
 $lang['assign_pattern'] = 'Namespace';
 $lang['assign_user'] = 'Recipient(s)';
+$lang['assign_subject'] = 'Subject';
 $lang['assign_message'] = 'Message';