Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
mahara
mahara
Commits
428f26bb
Commit
428f26bb
authored
Oct 25, 2017
by
Robert Lyon
Committed by
Gerrit Code Review
Oct 25, 2017
Browse files
Merge "Bug 1715544: hide metadata link when SSPHP is not configured"
parents
adae9c58
9c406781
Changes
2
Hide whitespace changes
Inline
Side-by-side
htdocs/auth/saml/lang/en.utf8/auth.saml.php
View file @
428f26bb
...
...
@@ -14,7 +14,10 @@ defined('INTERNAL') || die();
$string
[
'attributemapfilenotamap'
]
=
'The attribute map file "%s" didn\'t define an attribute map.'
;
$string
[
'attributemapfilenotfound'
]
=
'Could not find attribute map file or it is not writable: %s'
;
$string
[
'certificate1'
]
=
'SAML Service Provider signing and encryption certificate'
;
$string
[
'manage_certificate1'
]
=
'This is the certificate generated as part of the SAML Service Provider <a href="%s">Metadata</a>.'
;
$string
[
'spmetadata'
]
=
'Service Provider metadata'
;
$string
[
'metadatavewlink'
]
=
'<a href="%s">View metadata</a>'
;
$string
[
'ssphpnotconfigured'
]
=
'SimpleSAMLPHP is not configured'
;
$string
[
'manage_certificate2'
]
=
'This is the certificate generated as part of the SAML Service Provider'
;
$string
[
'nullprivatecert'
]
=
"Could not generate or save the private key"
;
$string
[
'nullpubliccert'
]
=
"Could not generate or save the public certificate"
;
$string
[
'defaultinstitution'
]
=
'Default institution'
;
...
...
htdocs/auth/saml/lib.php
View file @
428f26bb
...
...
@@ -514,6 +514,12 @@ class PluginAuthSaml extends PluginAuth {
'defaultvalue'
=>
$spentityid
,
'help'
=>
true
,
),
'metadata'
=>
array
(
'type'
=>
'html'
,
'class'
=>
'htmldescription'
,
'title'
=>
get_string
(
'spmetadata'
,
'auth.saml'
),
'value'
=>
self
::
is_usable
()
?
get_string
(
'metadatavewlink'
,
'auth.saml'
,
get_config
(
'wwwroot'
)
.
'auth/saml/sp/metadata.php?output=xhtml'
)
:
get_string
(
'ssphpnotconfigured'
,
'auth.saml'
),
),
'sigalgo'
=>
array
(
'type'
=>
'select'
,
'title'
=>
get_string
(
'sigalgo'
,
'auth.saml'
),
...
...
@@ -533,7 +539,7 @@ class PluginAuthSaml extends PluginAuth {
'elements'
=>
array
(
'protos_help'
=>
array
(
'type'
=>
'html'
,
'value'
=>
'<div><p>'
.
get_string
(
'manage_certificate
1
'
,
'auth.saml'
,
get_config
(
'wwwroot'
)
.
'auth/saml/sp/metadata.php?output=xhtml'
)
.
'</p></div>'
,
'value'
=>
'<div><p>'
.
get_string
(
'manage_certificate
2
'
,
'auth.saml'
)
.
'</p></div>'
,
),
'pubkey'
=>
array
(
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment