From 2989709a23908fbd9baccfde3fb38ab273d823f2 Mon Sep 17 00:00:00 2001 From: Mcat12 Date: Sun, 20 Nov 2016 18:11:02 -0500 Subject: [PATCH] Re-arrange check_cors if statements for codacy --- php/auth.php | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/php/auth.php b/php/auth.php index fe484824..e835f7b7 100644 --- a/php/auth.php +++ b/php/auth.php @@ -28,12 +28,10 @@ function check_cors($strict=false) { array_push($AUTHORIZED_HOSTNAMES, 'http://' . $virtual_host); if(isset($_SERVER['HTTP_HOST'])) { - if(in_array('http://'.$_SERVER['HTTP_HOST'], $AUTHORIZED_HOSTNAMES)) { - header("Access-Control-Allow-Origin: ${_SERVER['HTTP_HOST']}"); - } - else { - log_and_die("Failed CORS: http://" . $_SERVER['HTTP_HOST'] .' vs '. join(',', $AUTHORIZED_HOSTNAMES)); + if(!in_array('http://'.$_SERVER['HTTP_HOST'], $AUTHORIZED_HOSTNAMES)) { + log_and_die("Failed CORS: http://" . $_SERVER['HTTP_HOST'] . ' vs ' . join(',', $AUTHORIZED_HOSTNAMES)); } + header("Access-Control-Allow-Origin: ${_SERVER['HTTP_HOST']}"); } else if($strict) { log_and_die("Failed CORS: Unknown HTTP_HOST (Strict flag enabled)"); @@ -43,11 +41,11 @@ function check_cors($strict=false) { } if(isset($_SERVER['HTTP_ORIGIN'])) { - if(in_array($_SERVER['HTTP_ORIGIN'], $AUTHORIZED_HOSTNAMES)) { - header("Access-Control-Allow-Origin: ${_SERVER['HTTP_ORIGIN']}"); - } else { + if(!in_array($_SERVER['HTTP_ORIGIN'], $AUTHORIZED_HOSTNAMES)) { log_and_die("Failed CORS: " . $_SERVER['HTTP_ORIGIN'] .' vs '. join(',', $AUTHORIZED_HOSTNAMES)); + } + header("Access-Control-Allow-Origin: ${_SERVER['HTTP_ORIGIN']}"); } else if($strict) { log_and_die("Failed CORS: Unknown HTTP_ORIGIN (Strict flag enabled)");