@@ -1,10 +1,10 @@ |
||
| 1 | 1 | <?php |
| 2 | 2 | |
| 3 | 3 | $projectRoot = dirname(__DIR__); |
| 4 | -require_once($projectRoot . '/vendor/autoload.php'); |
|
| 4 | +require_once($projectRoot.'/vendor/autoload.php'); |
|
| 5 | 5 | |
| 6 | 6 | // Symlink module into ssp vendor lib so that templates and urls can resolve correctly |
| 7 | -$linkPath = $projectRoot . '/vendor/simplesamlphp/simplesamlphp/modules/negotiate'; |
|
| 7 | +$linkPath = $projectRoot.'/vendor/simplesamlphp/simplesamlphp/modules/negotiate'; |
|
| 8 | 8 | if (file_exists($linkPath) === false) { |
| 9 | 9 | echo "Linking '$linkPath' to '$projectRoot'\n"; |
| 10 | 10 | symlink($projectRoot, $linkPath); |
@@ -29,7 +29,7 @@ |
||
| 29 | 29 | } |
| 30 | 30 | |
| 31 | 31 | if (isset($attributes['sn']) && isset($attributes['givenName'])) { |
| 32 | - return $attributes['givenName'][0] . ' ' . $attributes['sn'][0]; |
|
| 32 | + return $attributes['givenName'][0].' '.$attributes['sn'][0]; |
|
| 33 | 33 | } |
| 34 | 34 | |
| 35 | 35 | if (isset($attributes['cn'])) { |
@@ -110,10 +110,10 @@ discard block |
||
| 110 | 110 | foreach ($this->candidates as $idCandidate) { |
| 111 | 111 | if (isset($attributes[$idCandidate][0])) { |
| 112 | 112 | if (($this->add_authority) && (isset($state['saml:AuthenticatingAuthority'][0]))) { |
| 113 | - return ($this->add_candidate ? $idCandidate . ':' : '') . $attributes[$idCandidate][0] . '!' . |
|
| 113 | + return ($this->add_candidate ? $idCandidate.':' : '').$attributes[$idCandidate][0].'!'. |
|
| 114 | 114 | $state['saml:AuthenticatingAuthority'][0]; |
| 115 | 115 | } else { |
| 116 | - return ($this->add_candidate ? $idCandidate . ':' : '') . $attributes[$idCandidate][0]; |
|
| 116 | + return ($this->add_candidate ? $idCandidate.':' : '').$attributes[$idCandidate][0]; |
|
| 117 | 117 | } |
| 118 | 118 | } |
| 119 | 119 | } |
@@ -122,9 +122,9 @@ discard block |
||
| 122 | 122 | * At this stage no usable id_candidate has been detected. |
| 123 | 123 | */ |
| 124 | 124 | if ($this->fail_if_empty) { |
| 125 | - throw new \SimpleSAML\Error\Exception('This service needs at least one of the following ' . |
|
| 126 | - 'attributes to identity users: ' . implode(', ', $this->candidates) . '. Unfortunately not ' . |
|
| 127 | - 'one of them was detected. Please ask your institution administrator to release one of ' . |
|
| 125 | + throw new \SimpleSAML\Error\Exception('This service needs at least one of the following '. |
|
| 126 | + 'attributes to identity users: '.implode(', ', $this->candidates).'. Unfortunately not '. |
|
| 127 | + 'one of them was detected. Please ask your institution administrator to release one of '. |
|
| 128 | 128 | 'them, or try using another identity provider.'); |
| 129 | 129 | } else { |
| 130 | 130 | /** |