diff options
author | Bernhard Posselt <nukeawhale@gmail.com> | 2013-09-02 16:05:17 +0200 |
---|---|---|
committer | Bernhard Posselt <nukeawhale@gmail.com> | 2013-09-02 16:05:17 +0200 |
commit | d9c499994467a19b816d2ba4c9e332fe9a756d93 (patch) | |
tree | ca7928009f4d7f5471a3a0e1647fde490d658361 | |
parent | 6ec58b14a7edc9093479305be2e40c74607d5fbc (diff) |
fixing cors again
-rw-r--r-- | external/newsapi.php | 2 | ||||
-rw-r--r-- | middleware/corsmiddleware.php | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/external/newsapi.php b/external/newsapi.php index 2ecd7e974..067334008 100644 --- a/external/newsapi.php +++ b/external/newsapi.php @@ -79,7 +79,7 @@ class NewsAPI extends Controller { */ public function cors() { // needed for webapps access due to cross origin request policy - if(array_key_exists('Origin', $this->request->server)) { + if(isset($this->request->server['Origin'])) { $origin = $this->request->server['Origin']; } else { $origin = '*'; diff --git a/middleware/corsmiddleware.php b/middleware/corsmiddleware.php index e0d3e23ad..187696de6 100644 --- a/middleware/corsmiddleware.php +++ b/middleware/corsmiddleware.php @@ -53,13 +53,13 @@ class CORSMiddleware extends Middleware { $annotationReader = new MethodAnnotationReader($controller, $methodName); // only react if its an API request and if the request sends origin - if(array_key_exists('Origin', $this->request->server) && + if(isset($this->request->server['Origin']) && $annotationReader->hasAnnotation('API')) { $origin = $this->request->server['Origin']; $response->addHeader('Access-Control-Allow-Origin', $origin); $response->addHeader('Access-Control-Allow-Credentials', 'true'); - + } return $response; } |