MNet: Display expiry date of local certificate

diff --git a/admin/mnet/index.php b/admin/mnet/index.php
index 563b60db0ff484f1177d28cc05f0d7df97bcec0d..cad87c35a7e46eb40f3e9abd0852eb0e2dabc744 100644 (file)
--- a/admin/mnet/index.php
+++ b/admin/mnet/index.php
@@ -105,6 +105,10 @@
                     <td align="right"><?php print_string('publickey', 'mnet'); ?>:</td>
                     <td><pre><?php echo $MNET->public_key; ?></pre></td>
                 </tr>
+                <tr valign="top">
+                    <td align="right"><?php print_string('expires', 'mnet'); ?>:</td>
+                    <td><?php echo userdate($MNET->public_key_expires); ?></td>
+                </tr>
                 <tr valign="top">
                     <td align="right"><?php print_string('net', 'mnet'); ?>:</td>
                     <td><input type="hidden" name="sesskey" value="<?php echo $USER->sesskey ?>" />

diff --git a/lang/en_utf8/mnet.php b/lang/en_utf8/mnet.php
index 4ad26272405836f4ef438a9817f28c2ef77815bd..c02fe73eab7984833533ddd6e3a720b901729a73 100644 (file)
--- a/lang/en_utf8/mnet.php
+++ b/lang/en_utf8/mnet.php
@@ -156,6 +156,7 @@ $string['http_verified_help']           = 'Permit connections using a verified S
 $string['https_self_signed_help']       = 'Permit connections using a self-signed DIY SSL in PHP on the remote host over http.';
 $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['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';