Merge branch 'develop' of https://github.com/twilio/OpenVBX into develop

CHANGELOG.markdown

@@ -1,5 +1,10 @@
 # OpenVBX Change Log
 
+## OpenVBX 1.2.12
+
+- Send proper JSON header during install steps.
+
+
 ## OpenVBX 1.2.12
 
 - Fix cache table `value` field to be `mediumblob` instead of `text`. Fixes an issue where large lists of phone numbers (300+) would overflow the value field and corrupt the cached data.

OpenVBX/controllers/install.php

@@ -286,7 +286,7 @@ public function setup()
 			$json['step'] = $e->getCode();
 		}
 
-		echo json_encode($json);
+        $this->json_return($json);
 	}
 
 	private function setup_connect_app($settings) 
@@ -568,8 +568,7 @@ function validate()
 
 		if($step == 1) 
 		{
-			echo json_encode($json);
-			return;
+            $this->json_return($json);
 		}
 
 		$tplvars = $this->input_args();
@@ -591,7 +590,7 @@ function validate()
 		}
 
 		$json['tplvars'] = $tplvars;
-		echo json_encode($json);
+        $this->json_return($json);
 	}
 
 	function validate_step2()
@@ -819,4 +818,10 @@ protected function pre_test_htaccess()
 			log_message($message);
 		}
 	}
+
+    protected function json_return($data) {
+        header('Content-type: application/json');
+        echo json_encode($data);
+        exit;
+    }
 }