Single more concise string for login error notification emails

diff --git a/lang/en/moodle.php b/lang/en/moodle.php
index f3fb09c5f765ee74394ecdd1ed0a21278d3f3c9f..19c4d49bc49d1b4d3f23521b3bd7901bd48f4a45 100644 (file)
--- a/lang/en/moodle.php
+++ b/lang/en/moodle.php
@@ -716,8 +716,7 @@ $string['notenrolled'] = '$a is not enrolled in this course.';
 $string['noteuserschangednonetocourse'] = 'Note: course users need to be restored when restoring user data. This setting has been changed for you.';
 $string['notifyloginfailuressubject'] = '$a :: Failed logins notification';
 $string['notifyloginfailuresmessagestart'] = 'Here is a list of failed login attempts at $a since you were last notified ';
-$string['notifyloginfailuresmessagefromip'] = ' from IP address ';
-$string['notifyloginfailuresmessagewithuser'] = ' with username ';
+$string['notifyloginfailuresmessage'] = '$a->time, IP: $a->ip, User: $a->info';
 $string['notifyloginfailuresmessageend'] = 'You can view these logs at $a/course/log.php?id=1&chooselog=1&modid=site_errors.';
 $string['numattempts'] = '$a failed login attempt(s) ';
 $string['nothingnew'] = 'Nothing new since your last login';

diff --git a/lib/moodlelib.php b/lib/moodlelib.php
index 0775a70746983dc1b19f193bf0c568b5153ec4ba..270aceffdbc012fb3386846218ecd53f21da5856 100644 (file)
--- a/lib/moodlelib.php
+++ b/lib/moodlelib.php
@@ -2550,8 +2550,8 @@ function notify_login_failures() {
             $message .= get_string('notifyloginfailuresmessagestart','',$CFG->wwwroot)
                  .(($CFG->lastnotifyfailure != 0) ? '('.userdate($CFG->lastnotifyfailure).')' : '')."\n\n";
             foreach ($logs as $log) {
-                $message .= userdate($log->time) .get_string('notifyloginfailuresmessagefromip').$log->ip 
-                 .get_string('notifyloginfailuresmessagewithuser').$log->info."\n";
+                $log->time = userdate($log->time);
+                $message .= get_string('notifyloginfailuresmessage','',$log)."\n";
             }
             $message .= "\n\n".get_string('notifyloginfailuresmessageend','',$CFG->wwwroot)."\n\n";
             foreach ($recip as $admin) {