Skip to content
This repository was archived by the owner on Sep 22, 2022. It is now read-only.

Commit a587575

Browse files
committed
Adjusted the Peoplefinder integration to work with the JSON driver and handle exceptions.
1 parent 411b3f0 commit a587575

File tree

1 file changed

+9
-7
lines changed

1 file changed

+9
-7
lines changed

app/controllers/AuthController.php

+9-7
Original file line numberDiff line numberDiff line change
@@ -92,19 +92,21 @@ public function casAction()
9292
}
9393
} elseif (!Default_Model_Setting::get('lockout_cas')) {
9494
$userModel = new Default_Model_User();
95-
$pf = new UNL_Peoplefinder();
96-
/* @var $pf UNL_Peoplefinder_Driver_WebService */
97-
$pfResult = $pf->getUID($user);
95+
$pf = new UNL_Peoplefinder(new UNL_Peoplefinder_Driver_WebService_JSON());
96+
/* @var $pf UNL_Peoplefinder_Driver_WebService_JSON */
9897
$info = $email = '';
99-
if ($pfResult) {
100-
$info = (!empty($pfResult->eduPersonNickname)) ? $pfResult->eduPersonNickname . $pfResult->sn : $pfResult->displayName;
98+
try {
99+
$pfResult = $pf->getUID($user);
100+
$info = (!empty($pfResult->eduPersonNickname)) ? $pfResult->eduPersonNickname->{0} . $pfResult->sn->{0} : $pfResult->displayName->{0};
101101
if (isset($pfResult->mail)) {
102102
if (isset($pfResult->unlEmailAlias)) {
103-
$email = $pfResult->unlEmailAlias . '@unl.edu';
103+
$email = $pfResult->unlEmailAlias->{0} . '@unl.edu';
104104
} else {
105-
$email = $pfResult->mail;
105+
$email = $pfResult->mail->{0};
106106
}
107107
}
108+
} catch (Exception $e) {
109+
//ignore peoplefinder exceptions
108110
}
109111

110112
$userModel->setData(array(

0 commit comments

Comments
 (0)