Mnet: Show that a key has expired.

diff --git a/admin/mnet/mnet_review.html b/admin/mnet/mnet_review.html
index 4ec6f8af29faaf97231867413a405741f9eb69d9..f017df6153d591ad2b4f4370d8d0114591c26dde 100644 (file)
--- a/admin/mnet/mnet_review.html
+++ b/admin/mnet/mnet_review.html
@@ -60,6 +60,18 @@ if (isset($mnet_peer->deleted) && $mnet_peer->deleted > 0) {
         <textarea rows="17" cols="65" name="public_key" style="font-size: 8px;"><?php echo $mnet_peer->public_key; ?></textarea>
     </td>
 </tr>
+<tr>
+    <td align="right" valign="top"><?php print_string('expires', 'mnet'); ?>:</td>
+    <td valign="top">
+<?php
+    if($mnet_peer->public_key_expires < time()) {
+        print_string('expired', 'mnet');
+        echo ' ';
+    }
+    echo userdate($mnet_peer->public_key_expires);
+?>
+    </td>
+</tr>
 <?php
 
 if(!empty($currentkey)):

diff --git a/lang/en_utf8/mnet.php b/lang/en_utf8/mnet.php
index c02fe73eab7984833533ddd6e3a720b901729a73..676394c93d6c23c6a66574a712e212b13f720bc0 100644 (file)
--- a/lang/en_utf8/mnet.php
+++ b/lang/en_utf8/mnet.php
@@ -157,6 +157,7 @@ $string['https_self_signed_help']       = 'Permit connections using a self-signe
 $string['hostexists']                   = 'A record already exists for that host and Moodle deployment with ID $a.<br />Click on <em>Continue</em> to edit that record.';
 $string['publickey']                    = 'Public key';
 $string['expires']                      = 'Valid until';
+$string['expired']                      = 'This key expired on';
 $string['publickey_help']               = 'The public key is automatically obtained from the remote server.';
 $string['couldnotgetcert']              = 'No certificate found at <br />$a. <br />The host may be down or incorrectly configured.';
 $string['ipaddress']                    = 'IP address';