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

Merge branch '2.2.x' into devel

Browse source 
Conflicts:
	airtime_mvc/application/controllers/LibraryController.php
	airtime_mvc/application/views/scripts/library/library.phtml
	airtime_mvc/public/js/airtime/showbuilder/builder.js
	airtime_mvc/public/js/airtime/showbuilder/main_builder.js
This commit is contained in:
denise 2012-11-02 12:28:21 -04:00
commit 135aadf16b
56 changed files with 5240 additions and 4806 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -344,6 +344,13 @@ SQL;
throw new DeleteScheduledFileException();
}
$userInfo = Zend_Auth::getInstance()->getStorage()->read();
$user = new Application_Model_User($userInfo->id);
$isAdminOrPM = $user->isUserType(array(UTYPE_ADMIN, UTYPE_PROGRAM_MANAGER));
if (!$isAdminOrPM && $this->getFileOwnerId() != $user->getId()) {
throw new FileNoPermissionException();
}
$music_dir = Application_Model_MusicDir::getDirByPK($this->_file->getDbDirectory());
$type = $music_dir->getType();
@ -1163,6 +1170,10 @@ SQL;
return $this->_file->getDbFileExists();
}
public function getFileOwnerId()
{
return $this->_file->getDbOwnerId();
}
// note: never call this method from controllers because it does a sleep
public function uploadToSoundCloud()
@ -1211,3 +1222,4 @@ SQL;
class DeleteScheduledFileException extends Exception {}
class FileDoesNotExistException extends Exception {}
class FileNoPermissionException extends Exception {}