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

Merge branch 'saas' into saas-media-refactor

Browse source 
Conflicts:
	airtime_mvc/application/Bootstrap.php
	airtime_mvc/application/modules/rest/controllers/MediaController.php
This commit is contained in:
Albert Santoni 2015-02-26 13:10:13 -05:00
commit ab6d83f49d
5 changed files with 22 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

2
airtime_mvc/application/models/StoredFile.php
View file

@ -392,7 +392,7 @@ SQL;
Logging::info("User ".$user->getLogin()." is deleting file: ".$this->_file->getDbTrackTitle()." - file id: ".$file_id);
$filesize = $this->_file->getFileSize();
if ($filesize <= 0) {
if ($filesize < 0) {
throw new Exception("Cannot delete file with filesize ".$filesize);
}

2
airtime_mvc/application/models/airtime/CcFiles.php
View file

@ -78,9 +78,11 @@ class CcFiles extends BaseCcFiles {
*/
public static function createFromUpload($fileArray)
{
/*temporarily disabling disk quota until all file sizes have ben set in the database.
if (Application_Model_Systemstatus::isDiskOverQuota()) {
throw new OverDiskQuotaException();
}
*/
/* If full_path is set, the post request came from ftp.
* Users are allowed to upload folders via ftp. If this is the case