Skip to content
Snippets Groups Projects
Commit 10bfb9d7 authored by Demian Katz's avatar Demian Katz
Browse files

Adjusted CAS/LDAP to match recent Shib improvement.

- Don't require non-empty catalog password (some ILS systems don't need a password).
parent c543d8d6
No related merge requests found
...@@ -140,6 +140,7 @@ class CAS extends AbstractBase ...@@ -140,6 +140,7 @@ class CAS extends AbstractBase
"cat_username", "cat_password", "email", "lastname", "firstname", "cat_username", "cat_password", "email", "lastname", "firstname",
"college", "major", "home_library" "college", "major", "home_library"
]; ];
$catPassword = null;
foreach ($attribsToCheck as $attribute) { foreach ($attribsToCheck as $attribute) {
if (isset($cas->$attribute)) { if (isset($cas->$attribute)) {
$value = $casauth->getAttribute($cas->$attribute); $value = $casauth->getAttribute($cas->$attribute);
...@@ -152,7 +153,7 @@ class CAS extends AbstractBase ...@@ -152,7 +153,7 @@ class CAS extends AbstractBase
} }
// Save credentials if applicable: // Save credentials if applicable:
if (!empty($catPassword) && !empty($user->cat_username)) { if (!empty($user->cat_username)) {
$user->saveCredentials($user->cat_username, $catPassword); $user->saveCredentials($user->cat_username, $catPassword);
} }
......
...@@ -290,7 +290,7 @@ class LDAP extends AbstractBase ...@@ -290,7 +290,7 @@ class LDAP extends AbstractBase
} }
// Save credentials if applicable: // Save credentials if applicable:
if (!empty($catPassword) && !empty($user->cat_username)) { if (!empty($user->cat_username)) {
$user->saveCredentials($user->cat_username, $catPassword); $user->saveCredentials($user->cat_username, $catPassword);
} }
......
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