MDL-15476

Can now override the public key lifetime by specificying value
for $CFG->mnetkeylifetime in config.php

Merged from STABLE_19

diff --git a/mnet/lib.php b/mnet/lib.php
index e50355802ad6000cb8ae84413444f8f943dc0b7c..05e955965140f6ff308cdbb389012d50ca556670 100644 (file)
--- a/mnet/lib.php
+++ b/mnet/lib.php
@@ -339,6 +339,12 @@ function mnet_get_keypair() {
  */
 function mnet_generate_keypair($dn = null, $days=28) {
     global $CFG, $USER, $DB;
+
+    // check if lifetime has been overriden
+    if (!empty($CFG->mnetkeylifetime)) {
+        $days = $CFG->mnetkeylifetime;
+    }
+
     $host = strtolower($CFG->wwwroot);
     $host = ereg_replace("^http(s)?://",'',$host);
     $break = strpos($host.'/' , '/');