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

Merge branch 'saas' into cc-5709-airtime-analyzer-cloud-storage-saas

Browse source 
Conflicts:
	CREDITS
	airtime_mvc/application/modules/rest/controllers/MediaController.php
	airtime_mvc/application/views/scripts/form/support-setting.phtml
This commit is contained in:
drigato 2015-01-23 16:36:31 -05:00
commit ac8fadfc80
36 changed files with 121 additions and 146 deletions
Download patch file Download diff file Expand all files Collapse all files

24
airtime_mvc/application/modules/rest/controllers/MediaController.php
View file

@ -27,8 +27,8 @@ class Rest_MediaController extends Zend_Rest_Controller
{
$this->view->layout()->disableLayout();
// Remove reliance on .phtml files to render requests
$this->_helper->viewRenderer->setNoRender(true);
// Remove reliance on .phtml files to render requests
$this->_helper->viewRenderer->setNoRender(true);
}
public function indexAction()
@ -381,7 +381,7 @@ class Rest_MediaController extends Zend_Rest_Controller
return $service_user->getCurrentUser()->getDbId();
} else {
$defaultOwner = CcSubjsQuery::create()
->filterByDbType('A')
->filterByDbType(array('A', 'S'), Criteria::IN)
->orderByDbId()
->findOne();
if (!$defaultOwner) {
@ -397,23 +397,21 @@ class Rest_MediaController extends Zend_Rest_Controller
}
/**
*
*
* Strips out fields from incoming request data that should never be modified
* from outside of Airtime
* @param array $data
*
* @param array $data
*/
private static function removeBlacklistedFieldsFromRequestData($data)
{
private static function removeBlacklistedFieldsFromRequestData($data) {
foreach (self::$blackList as $key) {
unset($data[$key]);
}
return $data;
}
return $data;
}
private function removeEmptySubFolders($path)
{
private function removeEmptySubFolders($path) {
exec("find $path -empty -type d -delete");
}