From b0f5b722db41dcc6bd679475bdceab38cd2fb3ca Mon Sep 17 00:00:00 2001 From: Rudi Grinberg Date: Tue, 17 Jul 2012 12:01:50 -0400 Subject: [PATCH] cc-4105: fixed typo.\nadded some error checking in case bad parameters are given to dispatchMetadataAction --- airtime_mvc/application/controllers/ApiController.php | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/airtime_mvc/application/controllers/ApiController.php b/airtime_mvc/application/controllers/ApiController.php index 555738af9..3eda956e2 100644 --- a/airtime_mvc/application/controllers/ApiController.php +++ b/airtime_mvc/application/controllers/ApiController.php @@ -447,7 +447,7 @@ class ApiController extends Zend_Controller_Action $this->view->watched_dirs = $watchedDirsPath; } - public function dispatchMetaDataAction($md, $mode, $dryrun=false) + public function dispatchMetadataAction($md, $mode, $dry_run=false) { // Replace this compound result in a hash with proper error handling later on $return_hash = array(); @@ -540,13 +540,18 @@ class ApiController extends Zend_Controller_Action // The value is a json encoded hash that has all the information related to this action // The key does not have any meaning as of yet but it could potentially correspond // to some unique id. + Logging::log("Entering controller, mang"); $responses = array(); foreach ($request->getParams() as $k => $raw_json) { $info_json = json_decode($raw_json, $assoc=true); + if( !array_key_exists('mode', $info_json) ) { + Logging::log("Received bad request, no 'mode' parameter"); + Logging::log( $info_json ); + continue; + } $mode = $info_json['mode']; unset( $info_json['mode'] ); - // TODO : uncomment the following line to actually do something - $response = $this->dispatchMetaDataAction($info_json, $info_json['mode']); + $response = $this->dispatchMetadataAction($info_json, $info_json['mode'], $dry_run=true); array_push($responses, $response); // Like wise, remove the following line when done // On recorded show requests we do some extra work here. Not sure what it actually is and it