|
@@ -119,10 +119,10 @@ discard block |
|
|
block discarded – undo |
|
119
|
119
|
if (isset($attributes[$idCandidate][0])) { |
|
120
|
120
|
if ($this->add_authority && count($state['saml:AuthenticatingAuthority']) > 0) { |
|
121
|
121
|
$authority = end($state['saml:AuthenticatingAuthority']); |
|
122
|
|
- return ($this->add_candidate ? $idCandidate . ':' : '') . $attributes[$idCandidate][0] . '!' . |
|
|
122
|
+ return ($this->add_candidate ? $idCandidate.':' : '').$attributes[$idCandidate][0].'!'. |
|
123
|
123
|
$authority; |
|
124
|
124
|
} else { |
|
125
|
|
- return ($this->add_candidate ? $idCandidate . ':' : '') . $attributes[$idCandidate][0]; |
|
|
125
|
+ return ($this->add_candidate ? $idCandidate.':' : '').$attributes[$idCandidate][0]; |
|
126
|
126
|
} |
|
127
|
127
|
} |
|
128
|
128
|
} |
|
@@ -131,9 +131,9 @@ discard block |
|
|
block discarded – undo |
|
131
|
131
|
* At this stage no usable id_candidate has been detected. |
|
132
|
132
|
*/ |
|
133
|
133
|
if ($this->fail_if_empty) { |
|
134
|
|
- throw new Error\Exception('This service needs at least one of the following ' . |
|
135
|
|
- 'attributes to identity users: ' . implode(', ', $this->candidates) . '. Unfortunately not ' . |
|
136
|
|
- 'one of them was detected. Please ask your institution administrator to release one of ' . |
|
|
134
|
+ throw new Error\Exception('This service needs at least one of the following '. |
|
|
135
|
+ 'attributes to identity users: '.implode(', ', $this->candidates).'. Unfortunately not '. |
|
|
136
|
+ 'one of them was detected. Please ask your institution administrator to release one of '. |
|
137
|
137
|
'them, or try using another identity provider.'); |
|
138
|
138
|
} else { |
|
139
|
139
|
/** |
Please login to merge, or discard this patch.