Commit 6e14878d authored by Robert Lyon's avatar Robert Lyon
Browse files

Bug 1579285: fix metadata URLs

behatnotneeded

Change-Id: I72ebcdab078f7febf7254999513c836f97cebeeb
parent 8637c117
......@@ -12,7 +12,7 @@
defined('INTERNAL') || die();
$string['certificate'] = 'SAML SP Signing and Encryption Certificate';
$string['manage_certificate'] = 'This is the certificate generated as part of the SAML SP <a href="%s">Metadata</a>.';
$string['manage_certificate'] = 'This is the certificate generated as part of the SAML SP <a href="%s">Metadata</a>.';
$string['nullprivatecert'] = "Could not generate or save the private key";
$string['nullpubliccert'] = "Could not generate or save the public certificate";
$string['defaultinstitution'] = 'Default institution';
......
......@@ -427,7 +427,7 @@ class PluginAuthSaml extends PluginAuth {
'elements' => array(
'protos_help' => array(
'type' => 'html',
'value' => '<div><p>' . get_string('manage_certificate', 'auth.saml', get_config('wwwroot') . 'auth/saml/sp/metadata.php') . '</p></div>',
'value' => '<div><p>' . get_string('manage_certificate', 'auth.saml', get_config('wwwroot') . 'auth/saml/sp/metadata.php?output=xhtml') . '</p></div>',
),
'pubkey' => array(
......
......@@ -301,7 +301,7 @@ if (array_key_exists('output', $_REQUEST) && $_REQUEST['output'] == 'xhtml') {
$t->data['header'] = 'saml20-sp';
$t->data['metadata'] = htmlspecialchars($xml);
$t->data['metadataflat'] = '$metadata[' . var_export($entityId, true) . '] = ' . var_export($metaArray20, true) . ';';
$t->data['metaurl'] = $source->getMetadataURL();
$t->data['metaurl'] = get_config('wwwroot') . "auth/saml/sp/metadata.php";
$t->show();
}
else {
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment