@@ -260,23 +260,23 @@ |
||
| 260 | 260 | $result = $this->trySRVRecord(); |
| 261 | 261 | } |
| 262 | 262 | |
| 263 | - if ($result === false and is_array($this->redirect) && array_key_exists('redirectAddr', $this->redirect)) { |
|
| 264 | - // redirect was found. Try again with the new address |
|
| 265 | - $this->email = $this->redirect['redirectAddr']; |
|
| 266 | - $this->username = $this->redirect['redirectAddr']; |
|
| 267 | - $this->setTLD(); |
|
| 268 | - $result = $this->discover(); |
|
| 269 | - } |
|
| 270 | - |
|
| 271 | - if ($result === false and is_array($this->redirect) && array_key_exists('redirectUrl', $this->redirect)) { |
|
| 272 | - // redirect was found. Try again with the new URL |
|
| 273 | - // https://stackoverflow.com/questions/27745/getting-parts-of-a-url-regex |
|
| 274 | - $regExp = "/^(.*:)//([A-Za-z0-9\-\.]+)(:[0-9]+)?(.*)$/"; |
|
| 275 | - if (preg_match($regExp, $this->redirect['redirectUrl'], $matches)) { |
|
| 276 | - $this->tld = $matches[2]; |
|
| 277 | - $result = $this->discover(); |
|
| 278 | - } |
|
| 279 | - } |
|
| 263 | + if ($result === false and is_array($this->redirect) && array_key_exists('redirectAddr', $this->redirect)) { |
|
| 264 | + // redirect was found. Try again with the new address |
|
| 265 | + $this->email = $this->redirect['redirectAddr']; |
|
| 266 | + $this->username = $this->redirect['redirectAddr']; |
|
| 267 | + $this->setTLD(); |
|
| 268 | + $result = $this->discover(); |
|
| 269 | + } |
|
| 270 | + |
|
| 271 | + if ($result === false and is_array($this->redirect) && array_key_exists('redirectUrl', $this->redirect)) { |
|
| 272 | + // redirect was found. Try again with the new URL |
|
| 273 | + // https://stackoverflow.com/questions/27745/getting-parts-of-a-url-regex |
|
| 274 | + $regExp = "/^(.*:)//([A-Za-z0-9\-\.]+)(:[0-9]+)?(.*)$/"; |
|
| 275 | + if (preg_match($regExp, $this->redirect['redirectUrl'], $matches)) { |
|
| 276 | + $this->tld = $matches[2]; |
|
| 277 | + $result = $this->discover(); |
|
| 278 | + } |
|
| 279 | + } |
|
| 280 | 280 | |
| 281 | 281 | if ($result === false) { |
| 282 | 282 | throw new \RuntimeException('Autodiscovery failed.'); |