Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
7
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Open sidebar
mahara
mahara
Commits
daf41aad
Commit
daf41aad
authored
Oct 09, 2019
by
Robert Lyon
Committed by
Gerrit Code Review
Oct 09, 2019
Browse files
Options
Browse Files
Download
Plain Diff
Merge "Bug 1847345: Only mention we need to update simplesamlphp if installed"
parents
734491bc
2db711ad
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
4 additions
and
3 deletions
+4
-3
htdocs/auth/saml/lib.php
htdocs/auth/saml/lib.php
+4
-3
No files found.
htdocs/auth/saml/lib.php
View file @
daf41aad
...
...
@@ -1484,11 +1484,12 @@ function auth_saml_openssl_x509_fingerprint($cert, $hash) {
$bin
=
base64_decode
(
$cert
);
return
hash
(
$hash
,
$bin
);
}
$discofileexists
=
false
;
if
(
file_exists
(
get_config
(
'docroot'
)
.
'auth/saml/extlib/simplesamlphp/lib/SimpleSAML/XHTML/IdPDisco.php'
))
{
require_once
(
get_config
(
'docroot'
)
.
'auth/saml/extlib/simplesamlphp/lib/SimpleSAML/XHTML/IdPDisco.php'
);
$discofileexists
=
true
;
}
if
(
class_exists
(
'SimpleSAML\XHTML\IdPDisco'
))
{
if
(
$discofileexists
&&
class_exists
(
'SimpleSAML\XHTML\IdPDisco'
))
{
class
PluginAuthSaml_IdPDisco
extends
SimpleSAML\XHTML\IdPDisco
{
...
...
@@ -1521,7 +1522,7 @@ if (class_exists('SimpleSAML\XHTML\IdPDisco')) {
}
}
}
else
{
else
if
(
$discofileexists
)
{
global
$SESSION
;
$SESSION
->
add_msg_once
(
get_string
(
'errorupdatelib'
,
'auth.saml'
),
'error'
,
false
);
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a 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