@@ -178,14 +178,14 @@ |
||
| 178 | 178 | $template = $source['template']; |
| 179 | 179 | } |
| 180 | 180 | |
| 181 | - if (array_key_exists('regex-template', $source)) { |
|
| 182 | - foreach($source['regex-template'] as $e => $t) { |
|
| 183 | - if(preg_match($e, $entity->getEntityID())) { |
|
| 184 | - if(is_array($template)) $template = array_merge($template,$t); |
|
| 185 | - else $template = $t; |
|
| 186 | - } |
|
| 187 | - } |
|
| 188 | - } |
|
| 181 | + if (array_key_exists('regex-template', $source)) { |
|
| 182 | + foreach($source['regex-template'] as $e => $t) { |
|
| 183 | + if(preg_match($e, $entity->getEntityID())) { |
|
| 184 | + if(is_array($template)) $template = array_merge($template,$t); |
|
| 185 | + else $template = $t; |
|
| 186 | + } |
|
| 187 | + } |
|
| 188 | + } |
|
| 189 | 189 | |
| 190 | 190 | if (in_array('saml20-sp-remote', $this->types, true)) { |
| 191 | 191 | $this->addMetadata($source['src'], $entity->getMetadata20SP(), 'saml20-sp-remote', $template); |
@@ -181,8 +181,11 @@ |
||
| 181 | 181 | if (array_key_exists('regex-template', $source)) { |
| 182 | 182 | foreach($source['regex-template'] as $e => $t) { |
| 183 | 183 | if(preg_match($e, $entity->getEntityID())) { |
| 184 | - if(is_array($template)) $template = array_merge($template,$t); |
|
| 185 | - else $template = $t; |
|
| 184 | + if(is_array($template)) { |
|
| 185 | + $template = array_merge($template,$t); |
|
| 186 | + } else { |
|
| 187 | + $template = $t; |
|
| 188 | + } |
|
| 186 | 189 | } |
| 187 | 190 | } |
| 188 | 191 | } |
@@ -52,11 +52,11 @@ |
||
| 52 | 52 | ], |
| 53 | 53 | ], |
| 54 | 54 | |
| 55 | - 'regex-template' => [ |
|
| 56 | - "/^https:\/\/www\.example\.com\/sp$/" => [ |
|
| 57 | - 'assertion.encryption' => false, |
|
| 58 | - ], |
|
| 59 | - ], |
|
| 55 | + 'regex-template' => [ |
|
| 56 | + "/^https:\/\/www\.example\.com\/sp$/" => [ |
|
| 57 | + 'assertion.encryption' => false, |
|
| 58 | + ], |
|
| 59 | + ], |
|
| 60 | 60 | |
| 61 | 61 | /* |
| 62 | 62 | * The sets of entities to load, any combination of: |