Index: trunk/cleanup.php
===================================================================
--- trunk/cleanup.php	(revision 39)
+++ trunk/cleanup.php	(revision 40)
@@ -32,4 +32,5 @@
    global $editXMLFilename;
    global $submittime;
+   global $endtime;
    global $status;
    global $stderr;
@@ -73,7 +74,7 @@
    list( $personID ) = mysqli_fetch_array( $result );
 
-   $query  = "SELECT clusterName, submitTime, queueStatus, analType "              .
-             "FROM HPCAnalysisRequest h, HPCAnalysisResult r "                   .
-             "WHERE h.HPCAnalysisRequestID=$requestID "                          .
+   $query  = "SELECT clusterName, submitTime, queueStatus, analType " .
+             "FROM HPCAnalysisRequest h, HPCAnalysisResult r "        .
+             "WHERE h.HPCAnalysisRequestID=$requestID "               .
              "AND h.HPCAnalysisRequestID=r.HPCAnalysisRequestID";
 
@@ -95,5 +96,5 @@
 
    // Get the GFAC ID
-   $query = "SELECT HPCAnalysisResultID, gfacID FROM HPCAnalysisResult " .
+   $query = "SELECT HPCAnalysisResultID, gfacID, endTime FROM HPCAnalysisResult " .
             "WHERE HPCAnalysisRequestID=$requestID";
 
@@ -107,5 +108,5 @@
    }
 
-   list( $HPCAnalysisResultID, $gfacID ) = mysqli_fetch_array( $result ); 
+   list( $HPCAnalysisResultID, $gfacID, $endtime ) = mysqli_fetch_array( $result ); 
 
    // Get data from global GFAC DB then insert it into US3 DB
@@ -664,4 +665,5 @@
    global $email_address;
    global $submittime;
+   global $endtime;
    global $queuestatus;
    global $status;
@@ -742,5 +744,6 @@
 
    // Try to avoid spam filters
-   $now = time();
+   $now      = time();
+   $tnow     = date( 'Y-m-d H:i:s' );
    $headers .= "Message-ID: <" . $now . "cleanup@$dbhost>\n";
    $headers .= "X-Mailer: PHP v" . phpversion()         . "\n";
@@ -753,4 +756,6 @@
 
    Submission Time : $submittime
+   Job End Time    : $endtime
+   Mail Time       : $tnow
    LIMS Host       : $limshost
    Analysis ID     : $gfacID
Index: trunk/cleanup_gfac.php
===================================================================
--- trunk/cleanup_gfac.php	(revision 39)
+++ trunk/cleanup_gfac.php	(revision 40)
@@ -33,4 +33,5 @@
    global $editXMLFilename;
    global $submittime;
+   global $endtime;
    global $status;
    global $stdout;
@@ -76,5 +77,5 @@
              "WHERE h.HPCAnalysisRequestID=$requestID";
    */
-   $query  = "SELECT clusterName, submitTime, queueStatus, method "              .
+   $query  = "SELECT clusterName, submitTime, queueStatus, analType "            .
              "FROM HPCAnalysisRequest h, HPCAnalysisResult r "                   .
              "WHERE h.HPCAnalysisRequestID=$requestID "                          .
@@ -98,5 +99,5 @@
 
    // Get the GFAC ID
-   $query = "SELECT HPCAnalysisResultID, gfacID FROM HPCAnalysisResult " .
+   $query = "SELECT HPCAnalysisResultID, gfacID, endTime FROM HPCAnalysisResult " .
             "WHERE HPCAnalysisRequestID=$requestID";
 
@@ -110,5 +111,5 @@
    }
 
-   list( $HPCAnalysisResultID, $gfacID ) = mysqli_fetch_array( $result ); 
+   list( $HPCAnalysisResultID, $gfacID, $endtime ) = mysqli_fetch_array( $result ); 
 
    ////////
Index: trunk/gridctl.php
===================================================================
--- trunk/gridctl.php	(revision 39)
+++ trunk/gridctl.php	(revision 40)
@@ -1001,4 +1001,5 @@
    // Try to avoid spam filters
    $now = time();
+   $tnow = date( 'Y-m-d H:i:s' );
    $headers .= "Message-ID: <" . $now . "gridctl@$dbhost>$requestID\n";
    $headers .= "X-Mailer: PHP v" . phpversion()         . "\n";
@@ -1010,5 +1011,5 @@
    UltraScan job error notification from gridctl.php:
 
-   Update Time    :  $updateTime  [ now=$now ]
+   Update Time    :  $updateTime  [ now=$tnow ]
    GFAC Status    :  $status
    Cluster        :  $cluster