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

Merge branch 'saas-dev-publishing' of github.com:sourcefabric/Airtime into saas-dev-publishing

Browse source
This commit is contained in:
Albert Santoni 2015-11-18 12:38:22 -05:00
commit ba832ffe3a
10 changed files with 52 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

6
airtime_mvc/application/controllers/ApiController.php
View file

@ -536,13 +536,13 @@ class ApiController extends Zend_Controller_Action
$mime_type = finfo_buffer($f, $blob, FILEINFO_MIME_TYPE);
finfo_close($f);
header("Content-type: " . $mime_type);
header("Content-Type: " . $mime_type);
echo $blob;
} else {
header('HTTP/1.0 401 Unauthorized');
print _('You are not allowed to access this resource. ');
print _('You are not allowed to access this resource.');
exit;
}
}
}
public function scheduleAction()

6
airtime_mvc/application/controllers/PreferenceController.php
View file

@ -66,8 +66,10 @@ class PreferenceController extends Zend_Controller_Action
Application_Model_Preference::setTuneinPartnerId($values["tunein_partner_id"]);
// SoundCloud Preferences
Application_Model_Preference::setDefaultSoundCloudLicenseType($values["SoundCloudLicense"]);
Application_Model_Preference::setDefaultSoundCloudSharingType($values["SoundCloudSharing"]);
if (Billing::isStationPodcastAllowed()) {
Application_Model_Preference::setDefaultSoundCloudLicenseType($values["SoundCloudLicense"]);
Application_Model_Preference::setDefaultSoundCloudSharingType($values["SoundCloudSharing"]);
}
$this->view->statusMsg = "<div class='success'>". _("Preferences updated.")."</div>";
$form = new Application_Form_Preferences();