[login] Improve request account email

modules/login/php/signup.class.inc

@@ -143,19 +143,18 @@ class Signup extends \NDB_Page implements ETagCalculator
         }
 
         // Check email address' uniqueness
-        $result = $DB->pselectOne(
+        $result   = $DB->pselectOne(
             "SELECT COUNT(*) FROM users WHERE Email=:VEmail OR UserID=:VEmail",
             ['VEmail' => $from]
         );
-
+        $siteList = \Utility::getSiteList();
         if ($result == 0) {
             // insert into DB only if email address doesn't exist
             $DB->insert('users', $vals);
             // Get the ID of the new user and insert into user_psc_rel
             $user_id = $DB->getLastInsertId();
 
             // verify site exists
-            $siteList = \Utility::getSiteList();
             if (!is_null($site) && array_key_exists($site, $siteList)) {
                 $DB->insert(
                     'user_psc_rel',
@@ -248,15 +247,17 @@ class Signup extends \NDB_Page implements ETagCalculator
                 // Send email to users with User Management permissions.
                 $config    = \NDB_Factory::singleton()->config();
                 $studyName = $config->getSetting('title');
-
+                $baseURL   = \NDB_Factory::singleton()->settings()->getBaseURL();
                 \Email::send(
                     $row['Email'],
                     'request_account.tpl',
                     [
                         'Study'     => $studyName,
-                        'UserID'    => $from,
+                        'Site'      => $siteList[$site],
                         'Real_name' => $fullname,
                         'Email'     => $from,
+                        'URL'       => $baseURL
+                                       . "/user_accounts/?pendingApproval=Y",
                     ]
                 );
             }

smarty/templates/email/request_account.tpl

@@ -1,12 +1,11 @@
-Subject: Account Requested for {$Study}
+Subject: {$Real_name} Requested Account for {$Study}
+Hi,
 
-A user is requesting an account for the LORIS instance managed by this email.
+{$Real_name} has requested an account for the LORIS instance managed by this email.
 
-Details:
-
-Username - {$UserID}
 Name - {$Real_name}
 Email - {$Email}
+Site - {$Site}
 
-
-This is an automated message.
+In order to accept the user account request, you may go to {$URL}
+This is an automated message.