Merge pull request MISP#10028 from brlogan/patch-1

Slight improvements to user profile notification emails

Author: JakubOnderka

app/Model/UserLoginProfile.php

@@ -282,7 +282,7 @@ public function emailNewLogin(array $user)
             $body->set('misp_org', Configure::read('MISP.org'));
             $body->set('date_time', $datetime);
             // Fetch user that contains also PGP or S/MIME keys for e-mail encryption
-            $this->User->sendEmail($user, $body, false, "[" . Configure::read('MISP.org') . " MISP] New sign in.");
+            $this->User->sendEmail($user, $body, false, "[" . Configure::read('MISP.org') . " MISP] New sign-in");
         }
     }
 
@@ -301,7 +301,7 @@ public function emailReportMalicious(array $user, array $userLoginProfile)
         $admins = array_keys($this->User->getSiteAdmins());
         $allAdmins = array_unique(array_merge($orgAdmins, $admins));
 
-        $subject = __("[%s MISP] Suspicious login reported.", Configure::read('MISP.org'));
+        $subject = __("[%s MISP] Suspicious login reported", Configure::read('MISP.org'));
         foreach ($allAdmins as $adminUserId) {
             $admin = $this->User->find('first', array(
                 'recursive' => -1,
@@ -324,7 +324,7 @@ public function email_suspicious(array $user, $suspiciousness_reason)
             $body->set('date_time', $date_time);
             $body->set('suspiciousness_reason', $suspiciousness_reason);
             // inform the user
-            $this->User->sendEmail($user, $body, false, "[" . Configure::read('MISP.org') . " MISP] Suspicious login with your account.");
+            $this->User->sendEmail($user, $body, false, "[" . Configure::read('MISP.org') . " MISP] Suspicious login with your account");
 
             // inform the org admin
             $body = new SendEmailTemplate('userloginprofile_suspicious_orgadmin');
@@ -341,7 +341,7 @@ public function email_suspicious(array $user, $suspiciousness_reason)
                     'recursive' => -1,
                     'conditions' => ['User.id' => $orgAdminID]
                 ));
-                $this->User->sendEmail($org_admin, $body, false, "[" . Configure::read('MISP.org') . " MISP] Suspicious login detected.");
+                $this->User->sendEmail($org_admin, $body, false, "[" . Configure::read('MISP.org') . " MISP] Suspicious login detected");
             }            
         }
     }

app/View/Emails/text/userloginprofile_newlogin.ctp

@@ -1,6 +1,6 @@
 Hello,
 
-Your account on MISP <?= $misp_org; ?> was just signed into from a new device or location.
+Your account on <?= $misp_org; ?> MISP was just accessed from a new device or location.
 
 - When: <?= $date_time; ?>
 
@@ -13,7 +13,7 @@ Your account on MISP <?= $misp_org; ?> was just signed into from a new device or
 - IP: <?= $userLoginProfile['ip']; ?>
 
 
-Follow this link to confirm if was you: <?php echo $baseurl . '/users/view_login_history/'; ?>
+Follow this link to confirm it was you or report as malicious: <?php echo $baseurl . '/users/view_login_history/'; ?>
 
-I you don't recognize this activity, please markt the login as suspicious and IMMEDIATELY to reset your password. 
+If you don't recognize this activity, please mark the login as malicious and IMMEDIATELY reset your password.