From 9d0f564190fe6c8cda0a08c7969d3586efbed615 Mon Sep 17 00:00:00 2001 From: drigato Date: Fri, 11 Jul 2014 16:17:13 -0400 Subject: [PATCH] Prevent analyzer from crashing if it is reporting a failure to Airtime --- .../modules/rest/controllers/MediaController.php | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/airtime_mvc/application/modules/rest/controllers/MediaController.php b/airtime_mvc/application/modules/rest/controllers/MediaController.php index 294677909..fb77c91c7 100644 --- a/airtime_mvc/application/modules/rest/controllers/MediaController.php +++ b/airtime_mvc/application/modules/rest/controllers/MediaController.php @@ -222,6 +222,12 @@ class Rest_MediaController extends Zend_Rest_Controller $requestData = json_decode($this->getRequest()->getRawBody(), true); $whiteList = $this->removeBlacklistedFieldsFromRequestData($requestData); $whiteList = $this->stripTimeStampFromYearTag($whiteList); + + if ($requestData["import_status"] == 2) { + $file->setDbImportStatus(2)->save(); + $this->importFailedResponse(); + return; + } if (!$this->validateRequestData($file, $whiteList)) { $file->save(); @@ -384,6 +390,13 @@ class Rest_MediaController extends Zend_Rest_Controller $resp->setHttpResponseCode(404); $resp->appendBody("ERROR: Media not found."); } + + private function importFailedResponse() + { + $resp = $this->getResponse(); + $resp->setHttpResponseCode(200); + $resp->appendBody("ERROR: Import Failed."); + } private function invalidDataResponse() {