Congegni/sintonia
7
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge branch '2.2.x' into 2.2.x-saas

Browse source 
Conflicts:
	airtime_mvc/application/Bootstrap.php
This commit is contained in:
Martin Konecny 2012-10-23 16:09:55 -04:00
commit 3c61b39daa
28 changed files with 329 additions and 139 deletions
Download patch file Download diff file Expand all files Collapse all files

5
airtime_mvc/application/controllers/ApiController.php
View file

@ -490,6 +490,10 @@ class ApiController extends Zend_Controller_Action
$file->setFileExistsFlag(true);
$file->setMetadata($md);
}
if ($md['is_record'] != 0) {
$this->uploadRecordedActionParam($md['MDATA_KEY_TRACKNUMBER'], $file->getId());
}
} elseif ($mode == "modify") {
$filepath = $md['MDATA_KEY_FILEPATH'];
$file = Application_Model_StoredFile::RecallByFilepath($filepath);
@ -562,7 +566,6 @@ class ApiController extends Zend_Controller_Action
// least 1 digit
if ( !preg_match('/^md\d+$/', $k) ) { continue; }
$info_json = json_decode($raw_json, $assoc = true);
unset( $info_json["is_record"] );
// Log invalid requests
if ( !array_key_exists('mode', $info_json) ) {
Logging::info("Received bad request(key=$k), no 'mode' parameter. Bad request is:");