Email subject for pending orders expiring.

Merged from stable.

diff --git a/enrol/authorize/enrol.php b/enrol/authorize/enrol.php
index 065f0f747cc449b7ac1d7b304baf54d2c50c3912..ba7dd9fed5576f5c07c4219ae0d52804cea3f2e3 100755 (executable)
--- a/enrol/authorize/enrol.php
+++ b/enrol/authorize/enrol.php
@@ -653,6 +653,10 @@ class enrolment_plugin_authorize
                 $timediffem = $timenowsettle - ((30 - intval($CFG->an_emailexpired)) * $oneday);
                 $select = "(status='". AN_STATUS_AUTH ."') AND (timecreated<'$timediffem') AND (timecreated>'$timediff30')";
                 if ($count = count_records_select('enrol_authorize', $select)) {
+                    $a = new stdClass;
+                    $a->pending = $count;
+                    $a->days = $CFG->an_emailexpired;
+                    $subject = get_string('pendingorderssubject', 'enrol_authorize', $a);
                     $a = new stdClass;
                     $a->pending = $count;
                     $a->days = $CFG->an_emailexpired;
@@ -660,12 +664,13 @@ class enrolment_plugin_authorize
                     $a->url = $CFG->wwwroot."/enrol/authorize/index.php?status=".AN_STATUS_AUTH;
                     $message = get_string('pendingordersemail', 'enrol_authorize', $a);
                     $adminuser = get_admin();
-                    email_to_user($adminuser, $adminuser, "WARNING: PENDING PAYMENTS", $message);
+                    email_to_user($adminuser, $adminuser, $subject, $message);
                     if (!empty($CFG->an_teachermanagepay) and !empty($CFG->an_emailexpiredteacher)) {
                         $sql = "SELECT DISTINCT E.courseid, COUNT(E.courseid) AS count " .
                                "FROM {$CFG->prefix}enrol_authorize E " .
                                "WHERE $select GROUP BY E.courseid";
-                        $message = ''; $lastcourse = 0; $lastcount = 0;
+                        $message = ''; $subject = '';
+                        $lastcourse = 0; $lastcount = 0;
                         $courseidandcounts = get_records_sql($sql);
                         foreach($courseidandcounts as $courseidandcount) {
                             if ($lastcourse != $courseidandcount->courseid) {
@@ -674,6 +679,10 @@ class enrolment_plugin_authorize
                                 $a = new stdClass;
                                 $a->pending = $lastcount;
                                 $a->days = $CFG->an_emailexpired;
+                                $subject = get_string('pendingorderssubject', 'enrol_authorize', $a);
+                                $a = new stdClass;
+                                $a->pending = $lastcount;
+                                $a->days = $CFG->an_emailexpired;
                                 $a->enrolurl = "$CFG->wwwroot/$CFG->admin/users.php";
                                 $a->url = $CFG->wwwroot.'/enrol/authorize/index.php?course='.
                                           $lastcourse.'&amp;status='.AN_STATUS_AUTH;
@@ -681,7 +690,7 @@ class enrolment_plugin_authorize
                             }
                             if ($teachers = get_course_teachers($lastcourse)) {
                                 foreach ($teachers as $teacher) {
-                                    email_to_user($teacher, $adminuser, "WARNING: PENDING PAYMENTS", $message);
+                                    email_to_user($teacher, $adminuser, $subject, $message);
                                 }
                             }
                         }