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

SAAS-596: Store file size and hash in database 

Fixing bad merge ?(not really sure what happened here)
This commit is contained in:
drigato 2015-02-17 16:28:33 -05:00
parent c1086842d3
commit fe7071b5e3
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
airtime_mvc/application/modules/rest/controllers/MediaController.php
View File

@ -120,7 +120,7 @@ class Rest_MediaController extends Zend_Rest_Controller
return;
} else {
// Sanitize any incorrect metadata that slipped past validation
FileDataHelper::sanitizeData($whiteList["track_number"]);
FileDataHelper::sanitizeData($whiteList);
/* If full_path is set, the post request came from ftp.
* Users are allowed to upload folders via ftp. If this is the case
@ -176,7 +176,7 @@ class Rest_MediaController extends Zend_Rest_Controller
return;
} else if ($file && isset($requestData["resource_id"])) {
// Sanitize any incorrect metadata that slipped past validation
FileDataHelper::sanitizeData($whiteList["track_number"]);
FileDataHelper::sanitizeData($whiteList);
$file->fromArray($whiteList, BasePeer::TYPE_FIELDNAME);
@ -207,7 +207,7 @@ class Rest_MediaController extends Zend_Rest_Controller
->appendBody(json_encode(CcFiles::sanitizeResponse($file)));
} else if ($file) {
// Sanitize any incorrect metadata that slipped past validation
$this->sanitizeData($file, $whiteList);
FileDataHelper::sanitizeData($whiteList);
//local file storage
$file->setDbDirectory(self::MUSIC_DIRS_STOR_PK);