Simplify the metadata sanitization and bugfix it

* SAAS-376 and CC-5868
This commit is contained in:
Albert Santoni 2015-02-18 16:29:08 -05:00
parent 2ae921e9d7
commit 17f1d0e96d
3 changed files with 17 additions and 32 deletions

View file

@ -443,24 +443,11 @@ class LibraryController extends Zend_Controller_Action
$serialized[$j["name"]] = $j["value"];
}
// Sanitize any wildly incorrect metadata before it goes to be validated.
FileDataHelper::sanitizeData($serialized);
if ($form->isValid($serialized)) {
// Sanitize any incorrect metadata that slipped past validation
FileDataHelper::sanitizeData($serialized["track_number"]);
$formValues = $this->_getParam('data', null);
$formdata = array();
foreach ($formValues as $val) {
$formdata[$val["name"]] = $val["value"];
}
$file->setDbColMetadata($formdata);
$data = $file->getMetadata();
// set MDATA_KEY_FILEPATH
$data['MDATA_KEY_FILEPATH'] = $file->getFilePath();
Logging::info($data['MDATA_KEY_FILEPATH']);
Application_Model_RabbitMq::SendMessageToMediaMonitor("md_update", $data);
$file->setDbColMetadata($serialized);
$this->_redirect('Library');
}
}