SAAS-772: Send metadata to Tunein
Added form validation by making a test request to the TuneIn API with the user-entered values
This commit is contained in:
parent
cf24c141fd
commit
b023f191e3
|
@ -10,35 +10,71 @@ class Application_Form_TuneInPreferences extends Zend_Form_SubForm
|
|||
));
|
||||
|
||||
$enableTunein = new Zend_Form_Element_Checkbox("enable_tunein");
|
||||
$enableTunein->setDecorators(array(
|
||||
'ViewHelper',
|
||||
'Errors',
|
||||
'Label'
|
||||
));
|
||||
$enableTunein->addDecorator('Label', array('class' => 'enable-tunein'));
|
||||
$enableTunein->setLabel(_("Push metadata to your station on TuneIn?"));
|
||||
$enableTunein->setValue(Application_Model_Preference::getTuneinEnabled());
|
||||
$enableTunein->setAttrib("class", "block-display");
|
||||
$this->addElement($enableTunein);
|
||||
|
||||
// TODO: figure out how to make this validator work
|
||||
$validator = new ConditionalNotEmpty(array(
|
||||
'enable_tunein' => 1
|
||||
));
|
||||
|
||||
$tuneinStationId = new Zend_Form_Element_Text("tunein_station_id");
|
||||
$tuneinStationId->setLabel(_("Station ID:"));
|
||||
$tuneinStationId->setValue(Application_Model_Preference::getTuneinStationId());
|
||||
$tuneinStationId->setAttrib("class", "input_text");
|
||||
$tuneinStationId->addValidator($validator);
|
||||
$this->addElement($tuneinStationId);
|
||||
|
||||
$tuneinPartnerKey = new Zend_Form_Element_Text("tunein_partner_key");
|
||||
$tuneinPartnerKey->setLabel(_("Partner Key:"));
|
||||
$tuneinPartnerKey->setValue(Application_Model_Preference::getTuneinPartnerKey());
|
||||
$tuneinPartnerKey->setAttrib("class", "input_text");
|
||||
$tuneinPartnerKey->addValidator($validator);
|
||||
$this->addElement($tuneinPartnerKey);
|
||||
|
||||
$tuneinPartnerId = new Zend_Form_Element_Text("tunein_partner_id");
|
||||
$tuneinPartnerId->setLabel(_("Partner Id:"));
|
||||
$tuneinPartnerId->setValue(Application_Model_Preference::getTuneinPartnerId());
|
||||
$tuneinPartnerId->setAttrib("class", "input_text");
|
||||
$tuneinPartnerId->addValidator($validator);
|
||||
$this->addElement($tuneinPartnerId);
|
||||
}
|
||||
}
|
||||
|
||||
public function isValid($data)
|
||||
{
|
||||
// Make request to TuneIn API to test the settings are valid
|
||||
if ($data["enable_tunein"]) {
|
||||
$qry_str = "?partnerId=".$data["tunein_partner_id"]."&partnerKey=".$data["tunein_partner_key"]."&id=".$data["tunein_station_id"]
|
||||
."&title=&artist=";
|
||||
|
||||
$ch = curl_init();
|
||||
curl_setopt($ch, CURLOPT_URL, TUNEIN_API_URL . $qry_str);
|
||||
curl_setopt($ch, CURLOPT_FAILONERROR, 1);
|
||||
curl_setopt($ch, CURLOPT_RETURNTRANSFER, 1);
|
||||
curl_setopt($ch, CURLOPT_TIMEOUT, 30);
|
||||
|
||||
$jsonData = curl_exec($ch);
|
||||
if (curl_error($ch)) {
|
||||
Logging::error("Failed to reach TuneIn: ". curl_errno($ch)." - ". curl_error($ch) . " - " . curl_getinfo($ch, CURLINFO_EFFECTIVE_URL));
|
||||
if (curl_error($ch) == "The requested URL returned error: 403 Forbidden") {
|
||||
$this->getElement("enable_tunein")->setErrors(array(_("Invalid TuneIn Settings. Please ensure your TuneIn settings are correct and try again.")));
|
||||
|
||||
// Set values to what the user entered since the form is invalid so they
|
||||
// don't have to enter in the values again and can see what they entered.
|
||||
$this->getElement("enable_tunein")->setValue($data["enable_tunein"]);
|
||||
$this->getElement("tunein_partner_key")->setValue($data["tunein_partner_key"]);
|
||||
$this->getElement("tunein_partner_id")->setValue($data["tunein_partner_id"]);
|
||||
$this->getElement("tunein_station_id")->setValue($data["tunein_station_id"]);
|
||||
|
||||
return false;
|
||||
}
|
||||
}
|
||||
curl_close($ch);
|
||||
|
||||
$arr = json_decode($jsonData, true);
|
||||
Logging::info($arr);
|
||||
} else {
|
||||
return true;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
@ -1,6 +1,12 @@
|
|||
<fieldset class="padded">
|
||||
<dl class="zend_form">
|
||||
<?php echo $this->element->getElement('enable_tunein')->render() ?>
|
||||
|
||||
<?php if($this->element->getElement("enable_tunein")->hasErrors()) {
|
||||
echo $this->element->getElement('enable_tunein')->renderErrors();
|
||||
}
|
||||
?>
|
||||
<?php echo $this->element->getElement('enable_tunein')->renderViewHelper() ?>
|
||||
<?php echo $this->element->getElement('enable_tunein')->renderLabel() ?>
|
||||
|
||||
<?php echo $this->element->getElement('tunein_station_id')->render() ?>
|
||||
|
||||
|
|
|
@ -3248,3 +3248,7 @@ dd .stream-status {
|
|||
padding-bottom: 0px;
|
||||
padding-top: 13px;
|
||||
}
|
||||
|
||||
.enable-tunein {
|
||||
font-weight:bold;
|
||||
}
|
|
@ -152,6 +152,10 @@ $(document).ready(function() {
|
|||
return false;
|
||||
}).next().hide();
|
||||
|
||||
if ($("#tunein-settings").find(".errors").length > 0) {
|
||||
$(".collapsible-content#tunein-settings").show();
|
||||
}
|
||||
|
||||
/* No longer using AJAX for this form. Zend + our code makes it needlessly hard to deal with. -- Albert
|
||||
$('#pref_save').live('click', function() {
|
||||
var data = $('#pref_form').serialize();
|
||||
|
|
Loading…
Reference in New Issue