diff --git a/airtime_mvc/application/Bootstrap.php b/airtime_mvc/application/Bootstrap.php index 919b365bd..4a5157f1e 100644 --- a/airtime_mvc/application/Bootstrap.php +++ b/airtime_mvc/application/Bootstrap.php @@ -130,9 +130,11 @@ class Bootstrap extends Zend_Application_Bootstrap_Bootstrap protected function _initTasks() { /* We need to wrap this here so that we aren't checking when we're running the unit test suite */ + $taskManager = TaskManager::getInstance(); + $taskManager->runTask(AirtimeTask::UPGRADE); // Run the upgrade on each request (if it needs to be run) if (getenv("AIRTIME_UNIT_TEST") != 1) { //This will do the upgrade too if it's needed... - TaskManager::getInstance()->runTasks(); + $taskManager->runTasks(); } } diff --git a/airtime_mvc/application/common/FileDataHelper.php b/airtime_mvc/application/common/FileDataHelper.php index 5a600e419..2c5648f9f 100644 --- a/airtime_mvc/application/common/FileDataHelper.php +++ b/airtime_mvc/application/common/FileDataHelper.php @@ -2,6 +2,27 @@ class FileDataHelper { + public static function getAudioMimeTypeArray() { + return array( + "audio/ogg" => "ogg", + "application/ogg" => "ogg", + "audio/vorbis" => "ogg", + "audio/mp3" => "mp3", + "audio/mpeg" => "mp3", + "audio/mpeg3" => "mp3", + "audio/aac" => "aac", + "audio/aacp" => "aac", + "audio/mp4" => "mp4", + "audio/x-flac" => "flac", + "audio/wav" => "wav", + "audio/x-wav" => "wav", + "audio/mp2" => "mp2", + "audio/mp1" => "mp1", + "audio/x-ms-wma" => "wma", + "audio/basic" => "au", + ); + } + /** * We want to throw out invalid data and process the upload successfully * at all costs, so check the data and sanitize it if necessary @@ -24,4 +45,24 @@ class FileDataHelper { $data["bpm"] = intval($data["bpm"]); } } + + /** + * Return a suitable extension for the given file + * + * @param string $mime + * + * @return string file extension with(!) a dot (for convenience) + * + * @throws Exception + */ + public static function getFileExtensionFromMime($mime) + { + $mime = trim(strtolower($mime)); + try { + return ('.' . static::getAudioMimeTypeArray()[$mime]); + } catch (Exception $e) { + throw new Exception("Unknown file type: $mime"); + } + } + } \ No newline at end of file diff --git a/airtime_mvc/application/common/HTTPHelper.php b/airtime_mvc/application/common/HTTPHelper.php index 04a9e9cc5..c702da480 100644 --- a/airtime_mvc/application/common/HTTPHelper.php +++ b/airtime_mvc/application/common/HTTPHelper.php @@ -45,8 +45,6 @@ class Application_Common_HTTPHelper class ZendActionHttpException extends Exception { - private $_action; - /** * @param Zend_Controller_Action $action * @param int $statusCode @@ -58,8 +56,7 @@ class ZendActionHttpException extends Exception { */ public function __construct(Zend_Controller_Action $action, $statusCode, $message, $code = 0, Exception $previous = null) { - $this->_action = $action; - Logging::info("Error in action " . $action->getRequest()->getActionName() + Logging::error("Error in action " . $action->getRequest()->getActionName() . " with status code $statusCode: $message"); $action->getResponse() ->setHttpResponseCode($statusCode) @@ -67,8 +64,4 @@ class ZendActionHttpException extends Exception { parent::__construct($message, $code, $previous); } - public function getAction() { - return $this->_action; - } - } \ No newline at end of file diff --git a/airtime_mvc/application/common/TaskManager.php b/airtime_mvc/application/common/TaskManager.php index aa250f294..c1687defa 100644 --- a/airtime_mvc/application/common/TaskManager.php +++ b/airtime_mvc/application/common/TaskManager.php @@ -2,15 +2,19 @@ /** * Class TaskManager + * + * When adding a new task, the new AirtimeTask class will need to be added to the internal task list, + * as an ENUM value to the AirtimeTask interface, and as a case in the TaskFactory. */ final class TaskManager { /** - * @var array tasks to be run + * @var array tasks to be run. Maps task names to a boolean value denoting + * whether the task has been checked/run */ protected $_taskList = [ - AirtimeTask::UPGRADE, // Always run the upgrade first - AirtimeTask::CELERY + AirtimeTask::UPGRADE => false, + AirtimeTask::CELERY => false, ]; /** @@ -19,8 +23,7 @@ final class TaskManager { protected static $_instance; /** - * @var int TASK_INTERVAL_SECONDS how often, in seconds, to run the TaskManager tasks, - * if they need to be run + * @var int TASK_INTERVAL_SECONDS how often, in seconds, to run the TaskManager tasks */ const TASK_INTERVAL_SECONDS = 30; @@ -47,6 +50,22 @@ final class TaskManager { return self::$_instance; } + /** + * Run a single task. + * + * @param string $taskName the ENUM name of the task to be run + */ + public function runTask($taskName) { + $task = TaskFactory::getTask($taskName); + if ($task && $task->shouldBeRun()) { + $task->run(); + } + $this->_taskList[$taskName] = true; // Mark that the task has been checked/run. + // This is important for prioritized tasks that + // we need to run on every request (such as the + // schema check/upgrade) + } + /** * Run all tasks that need to be run. * @@ -81,10 +100,9 @@ final class TaskManager { // better to be silent here to avoid log bloat return; } - foreach ($this->_taskList as $task) { - $task = TaskFactory::getTask($task); - if ($task && $task->shouldBeRun()) { - $task->run(); + foreach ($this->_taskList as $task => $hasTaskRun) { + if (!$hasTaskRun) { + $this->runTask($task); } } } diff --git a/airtime_mvc/application/common/WidgetHelper.php b/airtime_mvc/application/common/WidgetHelper.php index f2a9ecda8..8be23e200 100644 --- a/airtime_mvc/application/common/WidgetHelper.php +++ b/airtime_mvc/application/common/WidgetHelper.php @@ -57,83 +57,93 @@ class WidgetHelper return $result; } - // Second version of this function. - // Removing "next" days and creating two weekly arrays - public static function getWeekInfoV2($timezone) + /** + * Returns a weeks worth of shows in UTC, and an info array of the current week's days. + * Returns an array of two arrays: + * + * The first array is 7 consecutive week days, starting with the current day. + * + * The second array contains shows scheduled during the 7 week days in the first array. + * The shows returned in this array are not in any order and are in UTC. + * + * We don't do any timezone conversion in this function on purpose. All timezone conversion + * and show time ordering should be done on the frontend. + * + * @return array + */ + public static function getWeekInfoV2() { - //weekStart is in station time. - //$weekStartDateTime = Application_Common_DateHelper::getWeekStartDateTime(); $weekStartDateTime = new DateTime("now", new DateTimeZone(Application_Model_Preference::GetTimezone())); - $maxNumOFWeeks = 2; - $result = array(); - // default to the station timezone - $timezone = Application_Model_Preference::GetDefaultTimezone(); - $userDefinedTimezone = strtolower($timezone); - // if the timezone defined by the user exists, use that - if (array_key_exists($userDefinedTimezone, timezone_abbreviations_list())) { - $timezone = $userDefinedTimezone; - } $utcTimezone = new DateTimeZone("UTC"); $weekStartDateTime->setTimezone($utcTimezone); - // When querying for shows we need the start and end date range to have - // a time of "00:00". $utcDayStart is used below when querying for shows. - $utcDayStartDT = clone $weekStartDateTime; - $utcDayStartDT->setTime(0, 0, 0); - $utcDayStart = $utcDayStartDT->format(DEFAULT_TIMESTAMP_FORMAT); - $weekCounter = 0; - while ($weekCounter < $maxNumOFWeeks) { - for ($dayOfWeekCounter = 0; $dayOfWeekCounter < DAYS_PER_WEEK; $dayOfWeekCounter++) { - $dateParse = date_parse($weekStartDateTime->format(DEFAULT_TIMESTAMP_FORMAT)); + // Use this variable as the start date/time range when querying + // for shows. We set it to 1 day prior to the beginning of the + // schedule widget data to account for show date changes when + // converting their start day/time to the client's local timezone. + $showQueryDateRangeStart = clone $weekStartDateTime; + $showQueryDateRangeStart->sub(new DateInterval("P1D")); + $showQueryDateRangeStart->setTime(0, 0, 0); - $result[$weekCounter][$dayOfWeekCounter]["dayOfMonth"] = $dateParse["day"]; - $result[$weekCounter][$dayOfWeekCounter]["dayOfWeek"] = strtoupper(date("D", $weekStartDateTime->getTimestamp())); + for ($dayOfWeekCounter = 0; $dayOfWeekCounter < DAYS_PER_WEEK; $dayOfWeekCounter++) { + $dateParse = date_parse($weekStartDateTime->format("Y-m-d H:i:s")); - //have to be in station timezone when adding 1 day for daylight savings. - $weekStartDateTime->setTimezone(new DateTimeZone($timezone)); - $weekStartDateTime->add(new DateInterval('P1D')); + // Associate data to its date so that when we convert this array + // to json the order remains the same - in chronological order. + // We also format the key to be for example: "2015-6-1" to match + // javascript date formats so it's easier to sort the shows by day. + $result["weekDays"][$weekStartDateTime->format("Y-n-j")] = array(); + $result["weekDays"][$weekStartDateTime->format("Y-n-j")]["dayOfMonth"] = $dateParse["day"]; + $result["weekDays"][$weekStartDateTime->format("Y-n-j")]["dayOfWeek"] = strtoupper(_(date("D", $weekStartDateTime->getTimestamp()))); - //convert back to UTC to get the actual timestamp used for search. - $weekStartDateTime->setTimezone($utcTimezone); + // Shows scheduled for this day will get added to this array when + // we convert the show times to the client's local timezone in weekly-program.phtml + $result["weekDays"][$weekStartDateTime->format("Y-n-j")]["shows"] = array(); - // When querying for shows we need the start and end date range to have - // a time of "00:00". - $utcDayEndDT = clone $weekStartDateTime; - $utcDayEndDT->setTime(0, 0, 0); - $utcDayEnd = $utcDayEndDT->format(DEFAULT_TIMESTAMP_FORMAT); - $shows = Application_Model_Show::getNextShows($utcDayStart, "ALL", $utcDayEnd); - $utcDayStart = $utcDayEnd; + // $weekStartDateTime has to be in station timezone when adding 1 day for daylight savings. + // TODO: is this necessary since we set the time to "00:00" ? + $stationTimezone = Application_Model_Preference::GetDefaultTimezone(); + $weekStartDateTime->setTimezone(new DateTimeZone($stationTimezone)); - // convert to user-defined timezone, or default to station - Application_Common_DateHelper::convertTimestampsToTimezone( - $shows, - array("starts", "ends", "start_timestamp", "end_timestamp"), - $timezone - ); + $weekStartDateTime->add(new DateInterval('P1D')); - - foreach($shows as &$show) { - $startParseDate = date_parse($show['starts']); - $show["show_start_hour"] = str_pad($startParseDate["hour"], 2, "0", STR_PAD_LEFT).":".str_pad($startParseDate["minute"], 2, 0, STR_PAD_LEFT); - - $endParseDate = date_parse($show['ends']); - $show["show_end_hour"] = str_pad($endParseDate["hour"], 2, 0, STR_PAD_LEFT).":".str_pad($endParseDate["minute"],2, 0, STR_PAD_LEFT); - } - $result[$weekCounter][$dayOfWeekCounter]["shows"] = $shows; - - } - $weekCounter += 1; + //convert back to UTC to get the actual timestamp used for search. + $weekStartDateTime->setTimezone($utcTimezone); } + // Use this variable as the end date/time range when querying + // for shows. We set it to 1 day after the end of the schedule + // widget data to account for show date changes when converting + // their start day/time to the client's local timezone. + $showQueryDateRangeEnd = clone $weekStartDateTime; + $showQueryDateRangeEnd->setTime(23, 59, 0); + + $shows = Application_Model_Show::getNextShows( + $showQueryDateRangeStart->format("Y-m-d H:i:s"), + "ALL", + $showQueryDateRangeEnd->format("Y-m-d H:i:s")); + + // Convert each start and end time string to DateTime objects + // so we can get a real timestamp. The timestamps will be used + // to convert into javascript Date objects. + foreach($shows as &$show) { + $dtStarts = new DateTime($show["starts"], new DateTimeZone("UTC")); + $show["starts_timestamp"] = $dtStarts->getTimestamp(); + + $dtEnds = new DateTime($show["ends"], new DateTimeZone("UTC")); + $show["ends_timestamp"] = $dtEnds->getTimestamp(); + } + $result["shows"] = $shows; // XSS exploit prevention SecurityHelper::htmlescape_recursive($result); // convert image paths to point to api endpoints + //TODO: do we need this here? self::findAndConvertPaths($result); return $result; diff --git a/airtime_mvc/application/configs/constants.php b/airtime_mvc/application/configs/constants.php index 4360cd9e7..aaed5d901 100644 --- a/airtime_mvc/application/configs/constants.php +++ b/airtime_mvc/application/configs/constants.php @@ -24,7 +24,8 @@ define('LICENSE_URL' , 'http://www.gnu.org/licenses/agpl-3.0-standalone.h define('AIRTIME_COPYRIGHT_DATE' , '2010-2015'); define('AIRTIME_REST_VERSION' , '1.1'); define('AIRTIME_API_VERSION' , '1.1'); -define('AIRTIME_CODE_VERSION' , '2.5.13'); +// XXX: it's important that we upgrade this every time we add an upgrade! +define('AIRTIME_CODE_VERSION' , '2.5.14'); // Defaults define('DEFAULT_LOGO_PLACEHOLDER', 1); diff --git a/airtime_mvc/application/controllers/AudiopreviewController.php b/airtime_mvc/application/controllers/AudiopreviewController.php index c5ad22a58..bff30e929 100644 --- a/airtime_mvc/application/controllers/AudiopreviewController.php +++ b/airtime_mvc/application/controllers/AudiopreviewController.php @@ -198,23 +198,10 @@ class AudiopreviewController extends Zend_Controller_Action $elementMap['type'] = $track['type']; if ($track['type'] == 0) { - $mime = $track['mime']; - //type is file - if (strtolower($mime) === 'audio/mp3') { - $elementMap['element_mp3'] = $track['item_id']; - } elseif (strtolower($mime) === 'audio/ogg') { - $elementMap['element_oga'] = $track['item_id']; - } elseif (strtolower($mime) === 'audio/vorbis') { - $elementMap['element_oga'] = $track['item_id']; - } elseif (strtolower($mime) === 'audio/mp4') { - $elementMap['element_m4a'] = $track['item_id']; - } elseif (strtolower($mime) === 'audio/wav') { - $elementMap['element_wav'] = $track['item_id']; - } elseif (strtolower($mime) === 'audio/x-wav') { - $elementMap['element_wav'] = $track['item_id']; - } elseif (strtolower($mime) === 'audio/x-flac') { - $elementMap['element_flac'] = $track['item_id']; - } else { + $mime = trim(strtolower($track['mime'])); + try { + $elementMap['element_' . FileDataHelper::getAudioMimeTypeArray()[$mime]] = $track['item_id']; + } catch (Exception $e) { throw new Exception("Unknown file type: $mime"); } @@ -288,22 +275,10 @@ class AudiopreviewController extends Zend_Controller_Action $elementMap['type'] = $track['type']; if ($track['type'] == 0) { - $mime = $track['mime']; - if (strtolower($mime) === 'audio/mp3') { - $elementMap['element_mp3'] = $track['item_id']; - } elseif (strtolower($mime) === 'audio/ogg') { - $elementMap['element_oga'] = $track['item_id']; - } elseif (strtolower($mime) === 'audio/vorbis') { - $elementMap['element_oga'] = $track['item_id']; - } elseif (strtolower($mime) === 'audio/mp4') { - $elementMap['element_m4a'] = $track['item_id']; - } elseif (strtolower($mime) === 'audio/wav') { - $elementMap['element_wav'] = $track['item_id']; - } elseif (strtolower($mime) === 'audio/x-wav') { - $elementMap['element_wav'] = $track['item_id']; - } elseif (strtolower($mime) === 'audio/x-flac') { - $elementMap['element_flac'] = $track['item_id']; - } else { + $mime = trim(strtolower($track['mime'])); + try { + $elementMap['element_' . FileDataHelper::getAudioMimeTypeArray()[$mime]] = $track['item_id']; + } catch (Exception $e) { throw new Exception("Unknown file type: $mime"); } diff --git a/airtime_mvc/application/controllers/EmbedController.php b/airtime_mvc/application/controllers/EmbedController.php index 88c5df3e6..8ba168dc3 100644 --- a/airtime_mvc/application/controllers/EmbedController.php +++ b/airtime_mvc/application/controllers/EmbedController.php @@ -84,7 +84,6 @@ class EmbedController extends Zend_Controller_Action $request = $this->getRequest(); - $widgetStyle = $request->getParam('style'); if ($widgetStyle == "premium") { $this->view->widgetStyle = "premium"; @@ -95,10 +94,9 @@ class EmbedController extends Zend_Controller_Action } $this->view->jquery = Application_Common_HTTPHelper::getStationUrl() . "widgets/js/jquery-1.6.1.min.js?".$CC_CONFIG['airtime_version']; - $weeklyScheduleData = WidgetHelper::getWeekInfoV2($this->getRequest()->getParam("timezone")); + $weeklyScheduleData = WidgetHelper::getWeekInfoV2(); - // Return only the current week's schedule data. In the future we may use the next week's data. - $this->view->weeklyScheduleData = ($weeklyScheduleData[0]); + $this->view->schedule_data = json_encode($weeklyScheduleData); $currentDay = new DateTime("now", new DateTimeZone(Application_Model_Preference::GetTimezone())); //day of the month without leading zeros (1 to 31) diff --git a/airtime_mvc/application/controllers/upgrade_sql/airtime_2.5.14/upgrade.sql b/airtime_mvc/application/controllers/upgrade_sql/airtime_2.5.14/upgrade.sql new file mode 100644 index 000000000..3a5362ca1 --- /dev/null +++ b/airtime_mvc/application/controllers/upgrade_sql/airtime_2.5.14/upgrade.sql @@ -0,0 +1,4 @@ +ALTER TABLE cc_pref ALTER COLUMN subjid SET NULL; +ALTER TABLE cc_pref ALTER COLUMN subjid SET DEFAULT NULL; +CREATE UNIQUE INDEX cc_pref_key_idx ON cc_pref (keystr) WHERE subjid IS NULL; +ANALYZE cc_pref; \ No newline at end of file diff --git a/airtime_mvc/application/forms/AddShowLiveStream.php b/airtime_mvc/application/forms/AddShowLiveStream.php index 923c6993d..57066db0b 100644 --- a/airtime_mvc/application/forms/AddShowLiveStream.php +++ b/airtime_mvc/application/forms/AddShowLiveStream.php @@ -8,14 +8,13 @@ class Application_Form_AddShowLiveStream extends Zend_Form_SubForm { $cb_airtime_auth = new Zend_Form_Element_Checkbox("cb_airtime_auth"); $cb_airtime_auth->setLabel(sprintf(_("Use %s Authentication:"), PRODUCT_NAME)) - ->setRequired(false) - ->setDecorators(array('ViewHelper')); + ->setChecked(true) + ->setRequired(false); $this->addElement($cb_airtime_auth); $cb_custom_auth = new Zend_Form_Element_Checkbox("cb_custom_auth"); $cb_custom_auth ->setLabel(_("Use Custom Authentication:")) - ->setRequired(false) - ->setDecorators(array('ViewHelper')); + ->setRequired(false); $this->addElement($cb_custom_auth); //custom username @@ -26,8 +25,7 @@ class Application_Form_AddShowLiveStream extends Zend_Form_SubForm ->setLabel(_('Custom Username')) ->setFilters(array('StringTrim')) ->setValidators(array( - new ConditionalNotEmpty(array("cb_custom_auth"=>"1")))) - ->setDecorators(array('ViewHelper')); + new ConditionalNotEmpty(array("cb_custom_auth"=>"1")))); $this->addElement($custom_username); //custom password @@ -39,18 +37,34 @@ class Application_Form_AddShowLiveStream extends Zend_Form_SubForm ->setLabel(_('Custom Password')) ->setFilters(array('StringTrim')) ->setValidators(array( - new ConditionalNotEmpty(array("cb_custom_auth"=>"1")))) - ->setDecorators(array('ViewHelper')); + new ConditionalNotEmpty(array("cb_custom_auth"=>"1")))); $this->addElement($custom_password); - $connection_url = Application_Model_Preference::GetLiveDJSourceConnectionURL(); - if (trim($connection_url) == "") { - $connection_url = "N/A"; - } + $showSourceParams = parse_url(Application_Model_Preference::GetLiveDJSourceConnectionURL()); - $this->setDecorators(array( - array('ViewScript', array('viewScript' => 'form/add-show-live-stream.phtml', "connection_url"=>$connection_url)) - )); + // Show source connection url parameters + $showSourceHost = new Zend_Form_Element_Text('show_source_host'); + $showSourceHost->setAttrib('readonly', true) + ->setLabel(_('Host:')) + ->setValue(isset($showSourceParams["host"])?$showSourceParams["host"]:""); + $this->addElement($showSourceHost); + + $showSourcePort = new Zend_Form_Element_Text('show_source_port'); + $showSourcePort->setAttrib('readonly', true) + ->setLabel(_('Port:')) + ->setValue(isset($showSourceParams["port"])?$showSourceParams["port"]:""); + $this->addElement($showSourcePort); + + $showSourceMount = new Zend_Form_Element_Text('show_source_mount'); + $showSourceMount->setAttrib('readonly', true) + ->setLabel(_('Mount:')) + ->setValue(isset($showSourceParams["path"])?$showSourceParams["path"]:""); + $this->addElement($showSourceMount); + + $this->setDecorators( + array( + array('ViewScript', array('viewScript' => 'form/add-show-live-stream.phtml')) + )); } public function isValid($data) diff --git a/airtime_mvc/application/forms/LiveStreamingPreferences.php b/airtime_mvc/application/forms/LiveStreamingPreferences.php index 0391b45dc..6701902f7 100644 --- a/airtime_mvc/application/forms/LiveStreamingPreferences.php +++ b/airtime_mvc/application/forms/LiveStreamingPreferences.php @@ -11,38 +11,38 @@ class Application_Form_LiveStreamingPreferences extends Zend_Form_SubForm $defaultFade = Application_Model_Preference::GetDefaultTransitionFade(); + $this->setDecorators(array( + array('ViewScript', array('viewScript' => 'form/preferences_livestream.phtml')), + )); + // automatic trasition on source disconnection $auto_transition = new Zend_Form_Element_Checkbox("auto_transition"); - $auto_transition->setLabel(_("Auto Switch Off")) - ->setValue(Application_Model_Preference::GetAutoTransition()) - ->setDecorators(array('ViewHelper')); + $auto_transition->setLabel(_("Auto Switch Off:")) + ->setValue(Application_Model_Preference::GetAutoTransition()); $this->addElement($auto_transition); // automatic switch on upon source connection $auto_switch = new Zend_Form_Element_Checkbox("auto_switch"); - $auto_switch->setLabel(_("Auto Switch On")) - ->setValue(Application_Model_Preference::GetAutoSwitch()) - ->setDecorators(array('ViewHelper')); + $auto_switch->setLabel(_("Auto Switch On:")) + ->setValue(Application_Model_Preference::GetAutoSwitch()); $this->addElement($auto_switch); // Default transition fade $transition_fade = new Zend_Form_Element_Text("transition_fade"); - $transition_fade->setLabel(_("Switch Transition Fade (s)")) + $transition_fade->setLabel(_("Switch Transition Fade (s):")) ->setFilters(array('StringTrim')) ->addValidator('regex', false, array('/^\d*(\.\d+)?$/', 'messages' => _('Please enter a time in seconds (eg. 0.5)'))) - ->setValue($defaultFade) - ->setDecorators(array('ViewHelper')); + ->setValue($defaultFade); $this->addElement($transition_fade); //Master username $master_username = new Zend_Form_Element_Text('master_username'); $master_username->setAttrib('autocomplete', 'off') ->setAllowEmpty(true) - ->setLabel(_('Master Username')) + ->setLabel(_('Username:')) ->setFilters(array('StringTrim')) - ->setValue(Application_Model_Preference::GetLiveStreamMasterUsername()) - ->setDecorators(array('ViewHelper')); + ->setValue(Application_Model_Preference::GetLiveStreamMasterUsername()); $this->addElement($master_username); //Master password @@ -56,26 +56,51 @@ class Application_Form_LiveStreamingPreferences extends Zend_Form_SubForm ->setAttrib('renderPassword','true') ->setAllowEmpty(true) ->setValue(Application_Model_Preference::GetLiveStreamMasterPassword()) - ->setLabel(_('Master Password')) - ->setFilters(array('StringTrim')) - ->setDecorators(array('ViewHelper')); + ->setLabel(_('Password:')) + ->setFilters(array('StringTrim')); $this->addElement($master_password); - //Master source connection url - $master_dj_connection_url = new Zend_Form_Element_Text('master_dj_connection_url'); - $master_dj_connection_url->setAttrib('readonly', true) - ->setLabel(_('Master Source Connection URL')) - ->setValue(Application_Model_Preference::GetMasterDJSourceConnectionURL()) - ->setDecorators(array('ViewHelper')); - $this->addElement($master_dj_connection_url); + $masterSourceParams = parse_url(Application_Model_Preference::GetMasterDJSourceConnectionURL()); - //Show source connection url - $live_dj_connection_url = new Zend_Form_Element_Text('live_dj_connection_url'); - $live_dj_connection_url->setAttrib('readonly', true) - ->setLabel(_('Show Source Connection URL')) - ->setValue(Application_Model_Preference::GetLiveDJSourceConnectionURL()) - ->setDecorators(array('ViewHelper')); - $this->addElement($live_dj_connection_url); + // Master source connection url parameters + $masterSourceHost = new Zend_Form_Element_Text('master_source_host'); + $masterSourceHost->setAttrib('readonly', true) + ->setLabel(_('Host:')) + ->setValue(isset($masterSourceParams["host"])?$masterSourceParams["host"]:""); + $this->addElement($masterSourceHost); + + $masterSourcePort = new Zend_Form_Element_Text('master_source_port'); + $masterSourcePort->setAttrib('readonly', true) + ->setLabel(_('Port:')) + ->setValue(isset($masterSourceParams["port"])?$masterSourceParams["port"]:""); + $this->addElement($masterSourcePort); + + $masterSourceMount = new Zend_Form_Element_Text('master_source_mount'); + $masterSourceMount->setAttrib('readonly', true) + ->setLabel(_('Mount:')) + ->setValue(isset($masterSourceParams["path"])?$masterSourceParams["path"]:""); + $this->addElement($masterSourceMount); + + $showSourceParams = parse_url(Application_Model_Preference::GetLiveDJSourceConnectionURL()); + + // Show source connection url parameters + $showSourceHost = new Zend_Form_Element_Text('show_source_host'); + $showSourceHost->setAttrib('readonly', true) + ->setLabel(_('Host:')) + ->setValue(isset($showSourceParams["host"])?$showSourceParams["host"]:""); + $this->addElement($showSourceHost); + + $showSourcePort = new Zend_Form_Element_Text('show_source_port'); + $showSourcePort->setAttrib('readonly', true) + ->setLabel(_('Port:')) + ->setValue(isset($showSourceParams["port"])?$showSourceParams["port"]:""); + $this->addElement($showSourcePort); + + $showSourceMount = new Zend_Form_Element_Text('show_source_mount'); + $showSourceMount->setAttrib('readonly', true) + ->setLabel(_('Mount:')) + ->setValue(isset($showSourceParams["path"])?$showSourceParams["path"]:""); + $this->addElement($showSourceMount); // demo only code if (!$isStreamConfigable) { @@ -93,19 +118,30 @@ class Application_Form_LiveStreamingPreferences extends Zend_Form_SubForm $CC_CONFIG = Config::getConfig(); $isDemo = isset($CC_CONFIG['demo']) && $CC_CONFIG['demo'] == 1; - $master_dj_connection_url = Application_Model_Preference::GetMasterDJSourceConnectionURL(); - $live_dj_connection_url = Application_Model_Preference::GetLiveDJSourceConnectionURL(); + $masterSourceParams = parse_url(Application_Model_Preference::GetMasterDJSourceConnectionURL()); + $showSourceParams = parse_url(Application_Model_Preference::GetLiveDJSourceConnectionURL()); - $this->setDecorators(array( - array('ViewScript', array('viewScript' => 'form/preferences_livestream.phtml', 'master_dj_connection_url'=>$master_dj_connection_url, 'live_dj_connection_url'=>$live_dj_connection_url, 'isDemo' => $isDemo)) - )); + $this->setDecorators( + array ( + array ('ViewScript', + array ( + 'viewScript' => 'form/preferences_livestream.phtml', + 'master_source_host' => isset($masterSourceParams["host"])?$masterSourceParams["host"]:"", + 'master_source_port' => isset($masterSourceParams["port"])?$masterSourceParams["port"]:"", + 'master_source_mount' => isset($masterSourceParams["path"])?$masterSourceParams["path"]:"", + 'show_source_host' => isset($showSourceParams["host"])?$showSourceParams["host"]:"", + 'show_source_port' => isset($showSourceParams["port"])?$showSourceParams["port"]:"", + 'show_source_mount' => isset($showSourceParams["path"])?$showSourceParams["path"]:"", + 'isDemo' => $isDemo, + ) + ) + ) + ); } public function isValid($data) { - $isValid = parent::isValid($data); - - return $isValid; + return parent::isValid($data); } } diff --git a/airtime_mvc/application/models/Preference.php b/airtime_mvc/application/models/Preference.php index 736dbef98..5c1e7c889 100644 --- a/airtime_mvc/application/models/Preference.php +++ b/airtime_mvc/application/models/Preference.php @@ -163,9 +163,9 @@ class Application_Model_Preference $sql .= " AND subjid = :id"; $paramMap[':id'] = $userId; } - + $result = Application_Common_Database::prepareAndExecute($sql, $paramMap, Application_Common_Database::COLUMN); - + //return an empty string if the result doesn't exist. if ($result == 0) { $res = ""; diff --git a/airtime_mvc/application/models/StoredFile.php b/airtime_mvc/application/models/StoredFile.php index 58fe8a703..e975ccd8c 100644 --- a/airtime_mvc/application/models/StoredFile.php +++ b/airtime_mvc/application/models/StoredFile.php @@ -17,6 +17,7 @@ class Application_Model_StoredFile { /** * @holds propel database object + * @var CcFiles */ private $_file; @@ -467,48 +468,6 @@ SQL; $this->_file->save(); } - - public function getRealFileExtension() { - $path = $this->_file->getDbFilepath(); - $path_elements = explode('.', $path); - if (count($path_elements) < 2) { - return ""; - } else { - return $path_elements[count($path_elements) - 1]; - } - } - - /** - * Return suitable extension. - * - * @return string - * file extension without a dot - */ - public function getFileExtension() - { - $possible_ext = $this->getRealFileExtension(); - if ($possible_ext !== "") { - return $possible_ext; - } - - // We fallback to guessing the extension from the mimetype if we - // cannot extract it from the file name - - $mime = $this->_file->getDbMime(); - - if ($mime == "audio/ogg" || $mime == "application/ogg" || $mime == "audio/vorbis") { - return "ogg"; - } elseif ($mime == "audio/mp3" || $mime == "audio/mpeg") { - return "mp3"; - } elseif ($mime == "audio/x-flac") { - return "flac"; - } elseif ($mime == "audio/mp4") { - return "mp4"; - } else { - throw new Exception("Unknown $mime"); - } - } - /** * Get the absolute filepath * @@ -568,7 +527,7 @@ SQL; */ public function getRelativeFileUrl($baseUrl) { - return $baseUrl."api/get-media/file/".$this->getId().".".$this->getFileExtension(); + return $baseUrl."api/get-media/file/".$this->getId(); } public function getResourceId() diff --git a/airtime_mvc/application/models/airtime/CcFiles.php b/airtime_mvc/application/models/airtime/CcFiles.php index 16fb99c67..c574c9d7c 100644 --- a/airtime_mvc/application/models/airtime/CcFiles.php +++ b/airtime_mvc/application/models/airtime/CcFiles.php @@ -205,11 +205,6 @@ class CcFiles extends BaseCcFiles { $cloudFile->save(); Application_Model_Preference::updateDiskUsage($fileSizeBytes); - - $now = new DateTime("now", new DateTimeZone("UTC")); - $file->setDbMtime($now); - $file->save(); - } else if ($file) { // Since we check for this value when deleting files, set it first @@ -238,14 +233,13 @@ class CcFiles extends BaseCcFiles { $file->setDbFilepath($filePathRelativeToStor); } } - - $now = new DateTime("now", new DateTimeZone("UTC")); - $file->setDbMtime($now); - $file->save(); - } else { throw new FileNotFoundException(); } + + $now = new DateTime("now", new DateTimeZone("UTC")); + $file->setDbMtime($now); + $file->save(); } catch (FileNotFoundException $e) { @@ -356,17 +350,27 @@ class CcFiles extends BaseCcFiles { /** * * Strips out the private fields we do not want to send back in API responses - * @param $file string a CcFiles object + * + * @param CcFiles $file a CcFiles object + * + * @return array */ //TODO: rename this function? - public static function sanitizeResponse($file) - { + public static function sanitizeResponse($file) { $response = $file->toArray(BasePeer::TYPE_FIELDNAME); - + foreach (self::$privateFields as $key) { unset($response[$key]); } - + + $mime = $file->getDbMime(); + if (!empty($mime)) { + // Get an extension based on the file's mime type and change the path to use this extension + $path = pathinfo($file->getDbFilepath()); + $ext = FileDataHelper::getFileExtensionFromMime($mime); + $response["filepath"] = ($path["dirname"] . '/' . $path["filename"] . $ext); + } + return $response; } diff --git a/airtime_mvc/application/upgrade/Upgrades.php b/airtime_mvc/application/upgrade/Upgrades.php index aa012eca6..bcd9c5093 100644 --- a/airtime_mvc/application/upgrade/Upgrades.php +++ b/airtime_mvc/application/upgrade/Upgrades.php @@ -455,3 +455,21 @@ class AirtimeUpgrader2513 extends AirtimeUpgrader return '2.5.13'; } } + +/** + * Class AirtimeUpgrader2514 + * + * SAAS-923 - Add a partial constraint to cc_pref so that keystrings must be unique + */ +class AirtimeUpgrader2514 extends AirtimeUpgrader +{ + protected function getSupportedSchemaVersions() { + return array ( + '2.5.13' + ); + } + + public function getNewVersion() { + return '2.5.14'; + } +} diff --git a/airtime_mvc/application/views/scripts/embed/weekly-program.phtml b/airtime_mvc/application/views/scripts/embed/weekly-program.phtml index 3420b7587..a7bb24e69 100644 --- a/airtime_mvc/application/views/scripts/embed/weekly-program.phtml +++ b/airtime_mvc/application/views/scripts/embed/weekly-program.phtml @@ -2,13 +2,20 @@ + - - +
- weeklyScheduleData as $day => $data) { - $activeClass = $this->currentDayOfMonth == $data["dayOfMonth"] ? "active" : ""; - - echo "
"; - if (count($data["shows"]) == 0) { - echo "
Looks like there are no shows scheduled on this day.
"; - } else { - foreach ($data["shows"] as $show => $showData) { - echo "
"; - echo "
" . $showData["show_start_hour"] . ' - ' . $showData["show_end_hour"] . "
"; - echo "
" . $showData["name"] . "
"; - echo "
"; - } - } - echo "
"; - }?> +
+
Looks like there are no shows scheduled on this day.
+
+
{{show.show_start_hour}} - {{show.show_end_hour}}
+
{{show.name}}
+
+
widgetStyle == "premium") echo "style='display:none'"; ?>> diff --git a/airtime_mvc/application/views/scripts/form/add-show-live-stream.phtml b/airtime_mvc/application/views/scripts/form/add-show-live-stream.phtml index bba877ff1..5707d9ed9 100644 --- a/airtime_mvc/application/views/scripts/form/add-show-live-stream.phtml +++ b/airtime_mvc/application/views/scripts/form/add-show-live-stream.phtml @@ -1,60 +1,20 @@
-
- -
-
- element->getElement('cb_airtime_auth') ?> -
-
- -
-
- element->getElement('cb_custom_auth') ?> -
+ element->getElement('cb_airtime_auth')->render(); ?> + element->getElement('cb_custom_auth')->render(); ?>
-
- -
-
- element->getElement('custom_username') ?> - element->getElement('custom_username')->hasErrors()) : ?> -
    - element->getElement('custom_username')->getMessages() as $error): ?> -
    • - -
- -
-
- -
-
- element->getElement('custom_password') ?> - element->getElement('custom_password')->hasErrors()) : ?> -
    - element->getElement('custom_password')->getMessages() as $error): ?> -
    • - -
- -
+ element->getElement('custom_username')->render(); ?> + element->getElement('custom_password')->render(); ?>
-
- -
-
- connection_url; ?> -
+
+ +

+ +

+ element->getElement("show_source_host")->render() ?> + element->getElement("show_source_port")->render() ?> + element->getElement("show_source_mount")->render() ?> +
diff --git a/airtime_mvc/application/views/scripts/form/preferences_livestream.phtml b/airtime_mvc/application/views/scripts/form/preferences_livestream.phtml index 4bfdbc87a..9bf28c0b8 100644 --- a/airtime_mvc/application/views/scripts/form/preferences_livestream.phtml +++ b/airtime_mvc/application/views/scripts/form/preferences_livestream.phtml @@ -1,102 +1,34 @@
-
- -
-
- element->getElement('auto_transition') ?> - element->getElement('auto_transition')->hasErrors()) : ?> -
    - element->getElement('auto_transition')->getMessages() as $error): ?> -
    • - -
- -
-
- -
-
- element->getElement('auto_switch') ?> - element->getElement('auto_switch')->hasErrors()) : ?> -
    - element->getElement('auto_switch')->getMessages() as $error): ?> -
    • - -
- -
-
- -
-
- element->getElement('transition_fade') ?> - element->getElement('transition_fade')->hasErrors()) : ?> -
    - element->getElement('transition_fade')->getMessages() as $error): ?> -
    • - -
- -
-
- -
-
- element->getElement('master_username') ?> - element->getElement('master_username')->hasErrors()) : ?> -
    - element->getElement('master_username')->getMessages() as $error): ?> -
    • - -
- -
-
- -
-
- element->getElement('master_password') ?> - element->getElement('master_password')->hasErrors()) : ?> -
    - element->getElement('master_password')->getMessages() as $error): ?> -
    • - -
- -
-
- -
-
- element->getElement('master_dj_connection_url')->setValue($this->master_dj_connection_url) ?> - -
-
- -
-
- element->getElement('live_dj_connection_url')->setValue($this->live_dj_connection_url) ?> - -
+ element->getElement('auto_transition')->render() ?> + + element->getElement('auto_switch')->render() ?> + + element->getElement('transition_fade')->render() ?> + +
+ +

+ +

+ element->getElement('master_username')->render() ?> + + element->getElement('master_password')->render() ?> + + element->getElement("master_source_host")->render() ?> + element->getElement("master_source_port")->render() ?> + element->getElement("master_source_mount")->render() ?> +
+ +
+ +

+ +

+ element->getElement("show_source_host")->render() ?> + element->getElement("show_source_port")->render() ?> + element->getElement("show_source_mount")->render() ?> +
diff --git a/airtime_mvc/build/sql/defaultdata.sql b/airtime_mvc/build/sql/defaultdata.sql index 49bf3ff29..30fd8d765 100644 --- a/airtime_mvc/build/sql/defaultdata.sql +++ b/airtime_mvc/build/sql/defaultdata.sql @@ -376,3 +376,11 @@ INSERT INTO cc_stream_setting ("keyname", "value", "type") VALUES ('s4_descripti INSERT INTO cc_stream_setting ("keyname", "value", "type") VALUES ('s4_genre', '', 'string'); INSERT INTO cc_stream_setting (keyname, value, type) VALUES ('s4_channels', 'stereo', 'string'); +-- added in 2.5.14 - this can't be set up in Propel's XML schema, so we need to do it here -- Duncan + +ALTER TABLE cc_pref ALTER COLUMN subjid SET NULL; +ALTER TABLE cc_pref ALTER COLUMN subjid SET DEFAULT NULL; +CREATE UNIQUE INDEX cc_pref_key_idx ON cc_pref (keystr) WHERE subjid IS NULL; +ANALYZE cc_pref; -- this validates the new partial index + +--end added in 2.5.14 diff --git a/airtime_mvc/public/css/embed/weekly-schedule-widget-basic.css b/airtime_mvc/public/css/embed/weekly-schedule-widget-basic.css index 2985fa6f7..a74d276a7 100644 --- a/airtime_mvc/public/css/embed/weekly-schedule-widget-basic.css +++ b/airtime_mvc/public/css/embed/weekly-schedule-widget-basic.css @@ -123,7 +123,7 @@ background: rgba(53, 53, 53, 1.0); .schedule_item div.time_grid { /*padding-right: 10px;*/ - width: 20%; + width: 30%; font-weight: 300; color: #AAAAAA; display: inline-block; @@ -133,7 +133,7 @@ background: rgba(53, 53, 53, 1.0); overflow: hidden; text-overflow: ellipsis; padding-left: 10px; - width: 77%; + width: 67%; display:inline-block; vertical-align: middle; } @@ -182,11 +182,11 @@ background: rgba(53, 53, 53, 1.0); @media (max-width: 630px) { .schedule_item div.time_grid { - width: 25%; + width: 37%; } .schedule_item div.name_grid { - width: 72%; + width: 58%; } } @@ -197,31 +197,31 @@ background: rgba(53, 53, 53, 1.0); } .schedule_item div.time_grid { - width: 30%; + width: 35%; } .schedule_item div.name_grid { - width: 67%; + width: 60%; } } @media (max-width: 500px) { .schedule_item div.time_grid { - width: 35%; + width: 40%; } .schedule_item div.name_grid { - width: 62%; + width: 55%; } } @media (max-width: 400px) { .schedule_item div.time_grid { - width: 40%; + width: 90%; } .schedule_item div.name_grid { - width: 50%; + width: 90%; } } diff --git a/airtime_mvc/public/css/embed/weekly-schedule-widget.css b/airtime_mvc/public/css/embed/weekly-schedule-widget.css index 2f731c7aa..59c460860 100644 --- a/airtime_mvc/public/css/embed/weekly-schedule-widget.css +++ b/airtime_mvc/public/css/embed/weekly-schedule-widget.css @@ -97,7 +97,7 @@ body { .schedule_item div.time_grid { /*padding-right: 10px;*/ - width: 20%; + width: 30%; font-weight: 300; color: #AAAAAA; display: inline-block; @@ -107,7 +107,7 @@ body { overflow: hidden; text-overflow: ellipsis; padding-left: 10px; - width: 77%; + width: 67%; display:inline-block; vertical-align: middle; } @@ -132,11 +132,11 @@ body { @media (max-width: 630px) { .schedule_item div.time_grid { - width: 25%; + width: 37%; } .schedule_item div.name_grid { - width: 72%; + width: 58%; } } @@ -147,31 +147,31 @@ body { } .schedule_item div.time_grid { - width: 30%; + width: 35%; } .schedule_item div.name_grid { - width: 67%; + width: 60%; } } @media (max-width: 500px) { .schedule_item div.time_grid { - width: 35%; + width: 40%; } .schedule_item div.name_grid { - width: 62%; + width: 55%; } } @media (max-width: 400px) { .schedule_item div.time_grid { - width: 40%; + width: 90%; } .schedule_item div.name_grid { - width: 50%; + width: 90%; } } diff --git a/airtime_mvc/public/css/styles.css b/airtime_mvc/public/css/styles.css index 0251bf2ff..d9031f095 100644 --- a/airtime_mvc/public/css/styles.css +++ b/airtime_mvc/public/css/styles.css @@ -47,6 +47,11 @@ select { border:1px solid #9d9d9d; } +/* Fix for Firefox */ +fieldset { + clear: both; +} + .logo { background: transparent url(images/airtime_logo.png) no-repeat 0 0; height: 35px; @@ -111,19 +116,38 @@ select { margin-left: 7px !important; } -.override_help_icon, .icecast_metadata_help_icon { - cursor: help; - position: relative; - - display:inline-block; zoom:1; display:inline; - width:14px; height:14px; - background:url(images/icon_info.png) 0 0 no-repeat; - float:right; position:relative; top:2px; right:7px; - line-height:16px !important; +.override_help_icon, .icecast_metadata_help_icon, .master_username_help_icon { + cursor: help; + position: relative; + + display: inline-block; + zoom:1; + width:14px; height:14px; + background:url(images/icon_info.png) 0 0 no-repeat; + float:right; + top:2px; + right:7px; + line-height:16px !important; +} + +#auto_switch_help, #auto_transition_help { + right: 200px; +} + +.master_username_help_icon { + margin-top: 6px; +} + +.input-settings-inline-p { + color: #4F4F4F; + font-size: 12px; + line-height: 140%; + margin-top: 0; + } .airtime_auth_help_icon, .custom_auth_help_icon, .stream_username_help_icon, -.playlist_type_help_icon, .master_username_help_icon, .repeat_tracks_help_icon, +.playlist_type_help_icon, .repeat_tracks_help_icon, .admin_username_help_icon, .stream_type_help_icon, .show_linking_help_icon, .show_timezone_help_icon{ cursor: help; @@ -1510,7 +1534,7 @@ h2#scheduled_playlist_name span { border-color:#343434; border-width: 1px 0 0 1px; } -/*---//////////////////// Advenced Search ////////////////////---*/ +/*---//////////////////// Advanced Search ////////////////////---*/ .search_control { padding:8px; diff --git a/airtime_mvc/public/index.php b/airtime_mvc/public/index.php index 81a3b1339..5ddad8bb4 100644 --- a/airtime_mvc/public/index.php +++ b/airtime_mvc/public/index.php @@ -63,6 +63,12 @@ if (file_exists($filename)) { } // Otherwise, we'll need to run our configuration setup else { + // Sometimes we can get into a weird NFS state where a station's airtime.conf has + // been neg-cached - redirect to a 404 instead until the NFS cache is updated + if (strpos($_SERVER['SERVER_NAME'], "airtime.pro") !== false) { + header($_SERVER['SERVER_PROTOCOL'] . ' 404 Page Not Found', true, 404); + exit; + } $airtimeSetup = true; require_once(SETUP_PATH . 'setup-config.php'); } diff --git a/airtime_mvc/public/js/airtime/audiopreview/preview_jplayer.js b/airtime_mvc/public/js/airtime/audiopreview/preview_jplayer.js index e01c2a2b3..5bbbb8993 100644 --- a/airtime_mvc/public/js/airtime/audiopreview/preview_jplayer.js +++ b/airtime_mvc/public/js/airtime/audiopreview/preview_jplayer.js @@ -1,13 +1,14 @@ var _playlist_jplayer; var _idToPostionLookUp; +var URL_BAR_HEIGHT = 32; /** - *When the page loads the ready function will get all the data it can from the hidden span elements - *and call one of three functions depending on weather the window was open to play an audio file, - *or a playlist or a show. - */ +*When the page loads the ready function will get all the data it can from the hidden span elements +*and call one of three functions depending on weather the window was open to play an audio file, +*or a playlist or a show. +*/ $(document).ready(function(){ - + $.jPlayer.timeFormat.showHour = true; var audioUri = $('.audioUri').text(); @@ -57,7 +58,7 @@ $(document).ready(function(){ $("#jp_container_1").on("mouseenter", "ul.jp-controls li", function(ev) { $(this).addClass("ui-state-hover"); }); - + $("#jp_container_1").on("mouseleave", "ul.jp-controls li", function(ev) { $(this).removeClass("ui-state-hover"); }); @@ -65,14 +66,14 @@ $(document).ready(function(){ }); /** - * Sets up the jPlayerPlaylist to play. - * - Get the playlist info based on the playlistID give. - * - Update the playlistIndex to the position in the pllist to start playing. - * - Select the element played from and start playing. If playlist is null then start at index 0. +* Sets up the jPlayerPlaylist to play. +* - Get the playlist info based on the playlistID give. +* - Update the playlistIndex to the position in the pllist to start playing. +* - Select the element played from and start playing. If playlist is null then start at index 0. **/ function playAllPlaylist(p_playlistID, p_playlistIndex) { var viewsPlaylistID = $('.playlistID').text(); - + if ( _idToPostionLookUp !== undefined && viewsPlaylistID == p_playlistID ) { play(p_playlistIndex); }else { @@ -83,7 +84,7 @@ function playAllPlaylist(p_playlistID, p_playlistIndex) { function playBlock(p_blockId, p_blockIndex) { var viewsBlockId = $('.blockId').text(); - + if ( _idToPostionLookUp !== undefined && viewsBlockId == p_blockId ) { play(p_blockIndex); } else { @@ -92,15 +93,15 @@ function playBlock(p_blockId, p_blockIndex) } /** - * Sets up the show to play. - * checks with the show id given to the show id on the page/view - * if the show id and the page or views show id are the same it means the user clicked another - * file in the same show, so don't refresh the show content tust play the track from the preloaded show. - * if the the ids are different they we'll need to get the show's context so create the uri - * and call the controller. +* Sets up the show to play. +* checks with the show id given to the show id on the page/view +* if the show id and the page or views show id are the same it means the user clicked another +* file in the same show, so don't refresh the show content tust play the track from the preloaded show. +* if the the ids are different they we'll need to get the show's context so create the uri +* and call the controller. **/ function playAllShow(p_showID, p_index) { - + var viewsShowID = $('.showID').text(); if ( _idToPostionLookUp !== undefined && viewsShowID == p_showID ) { play(p_index); @@ -110,12 +111,12 @@ function playAllShow(p_showID, p_index) { } /** - * This function will call the AudiopreviewController to get the contents of - * either a show or playlist Looping throught the returned contents and - * creating media for each track. - * - * Then trigger the jplayer to play the list. - */ +* This function will call the AudiopreviewController to get the contents of +* either a show or playlist Looping throught the returned contents and +* creating media for each track. +* +* Then trigger the jplayer to play the list. +*/ function buildplaylist(p_url, p_playIndex) { _idToPostionLookUp = Array(); $.getJSON(p_url, function(data){ // get the JSON array produced by my PHP @@ -126,7 +127,7 @@ function buildplaylist(p_url, p_playIndex) { var skipped = 0; for(index in data) { - if (data[index]['type'] == 0) { + if (data[index]['type'] == 0) { if (data[index]['element_mp3'] != undefined){ media = {title: data[index]['element_title'], artist: data[index]['element_artist'], @@ -152,7 +153,7 @@ function buildplaylist(p_url, p_playIndex) { console.log("continue"); skipped++; continue; - } + } } else if (data[index]['type'] == 1) { var mime = data[index]['mime']; if (mime.search(/mp3/i) > 0 || mime.search(/mpeg/i) > 0) { @@ -163,12 +164,12 @@ function buildplaylist(p_url, p_playIndex) { key = "m4a"; } else if (mime.search(/wav/i) > 0) { key = "wav"; - } + } if (key) { media = {title: data[index]['element_title'], artist: data[index]['element_artist'] - }; + }; media[key] = data[index]['uri'] } } @@ -186,26 +187,19 @@ function buildplaylist(p_url, p_playIndex) { _playlist_jplayer.setPlaylist(myPlaylist); _playlist_jplayer.option("autoPlay", true); play(p_playIndex); - - var height = Math.min(143 + (26 * total), 400); - var width = 505; - - if (height === 400) { - window.scrollbars = true; - } - else { - //there's no scrollbars so we don't need the window to be as wide. - width = 490; - } - - window.resizeTo(width, height); + + window.scrollbars = false; + + var container = $("#jp_container_1"); + // Add 2px to account for borders + window.resizeTo(container.width() + 2, container.height() + URL_BAR_HEIGHT + 2); }); } /** - *Function simply plays the given index, for playlists index can be different so need to look up the - *right index. - */ +*Function simply plays the given index, for playlists index can be different so need to look up the +*right index. +*/ function play(p_playlistIndex){ playlistIndex = _idToPostionLookUp[p_playlistIndex]; if(playlistIndex == undefined){ @@ -216,13 +210,13 @@ function play(p_playlistIndex){ } /** - * Playing one audio track occurs from the library. This function will create the media, setup - * jplayer and play the track. - */ +* Playing one audio track occurs from the library. This function will create the media, setup +* jplayer and play the track. +*/ function playOne(uri, mime) { var playlist = new Array(); - var media = null; + var media = null; var key = null; if (mime.search(/mp3/i) > 0 || mime.search(/mpeg/i) > 0) { key = "mp3"; @@ -232,12 +226,12 @@ function playOne(uri, mime) { key = "m4a"; } else if (mime.search(/wav/i) > 0) { key = "wav"; - } + } if (key) { media = {title: $('.audioFileTitle').text() != 'null' ?$('.audioFileTitle').text():"", artist: $('.audioFileArtist').text() != 'null' ?$('.audioFileArtist').text():"" - }; + }; media[key] = uri; } @@ -247,4 +241,8 @@ function playOne(uri, mime) { _playlist_jplayer.setPlaylist(playlist); _playlist_jplayer.play(0); } + + var container = $("#jp_container_1"); + // Add 2px to account for borders + window.resizeTo(container.width() + 2, container.height() + URL_BAR_HEIGHT + 2); } diff --git a/airtime_mvc/public/js/airtime/common/common.js b/airtime_mvc/public/js/airtime/common/common.js index 33e1fe300..cb1ba1a51 100644 --- a/airtime_mvc/public/js/airtime/common/common.js +++ b/airtime_mvc/public/js/airtime/common/common.js @@ -1,3 +1,6 @@ +var previewWidth = 482, + previewHeight = 110; + $(document).ready(function() { /* Removed as this is now (hopefully) unnecessary */ @@ -95,7 +98,7 @@ function open_audio_preview(type, id) { // The reason that we need to encode artist and title string is that // sometime they contain '/' or '\' and apache reject %2f or %5f // so the work around is to encode it twice. - openPreviewWindow(baseUrl+'audiopreview/audio-preview/audioFileID/'+id+'/type/'+type); + openPreviewWindow(baseUrl+'audiopreview/audio-preview/audioFileID/'+id+'/type/'+type, previewWidth, previewHeight); _preview_window.focus(); } @@ -113,7 +116,7 @@ function open_playlist_preview(p_playlistID, p_playlistIndex) { if (_preview_window != null && !_preview_window.closed) _preview_window.playAllPlaylist(p_playlistID, p_playlistIndex); else - openPreviewWindow(baseUrl+'audiopreview/playlist-preview/playlistIndex/'+p_playlistIndex+'/playlistID/'+p_playlistID); + openPreviewWindow(baseUrl+'audiopreview/playlist-preview/playlistIndex/'+p_playlistIndex+'/playlistID/'+p_playlistID, previewWidth, previewHeight); _preview_window.focus(); } @@ -124,7 +127,7 @@ function open_block_preview(p_blockId, p_blockIndex) { if (_preview_window != null && !_preview_window.closed) _preview_window.playBlock(p_blockId, p_blockIndex); else - openPreviewWindow(baseUrl+'audiopreview/block-preview/blockIndex/'+p_blockIndex+'/blockId/'+p_blockId); + openPreviewWindow(baseUrl+'audiopreview/block-preview/blockIndex/'+p_blockIndex+'/blockId/'+p_blockId, previewWidth, previewHeight); _preview_window.focus(); } @@ -138,13 +141,14 @@ function open_show_preview(p_showID, p_showIndex) { if (_preview_window != null && !_preview_window.closed) _preview_window.playAllShow(p_showID, p_showIndex); else - openPreviewWindow(baseUrl+'audiopreview/show-preview/showID/'+p_showID+'/showIndex/'+p_showIndex); + openPreviewWindow(baseUrl+'audiopreview/show-preview/showID/'+p_showID+'/showIndex/'+p_showIndex, previewWidth, previewHeight); _preview_window.focus(); } -function openPreviewWindow(url) { +function openPreviewWindow(url, w, h) { + var dim = (w && h) ? 'width=' + w + ',height=' + h + ',' : ''; // Hardcoding this here is kinda gross, but the alternatives aren't much better... - _preview_window = window.open(url, $.i18n._('Audio Player'), 'width=482,height=110,scrollbars=yes'); + _preview_window = window.open(url, $.i18n._('Audio Player'), dim + 'scrollbars=yes'); return false; } diff --git a/airtime_mvc/public/js/airtime/schedule/add-show.js b/airtime_mvc/public/js/airtime/schedule/add-show.js index df862e971..a5804dbc5 100644 --- a/airtime_mvc/public/js/airtime/schedule/add-show.js +++ b/airtime_mvc/public/js/airtime/schedule/add-show.js @@ -786,6 +786,11 @@ function setAddShowEvents(form) { scheduleRefetchEvents(json); $addShowForm.hide(); } + + /* CC-6062: Resize the window to avoid stretching the last column */ + windowResize(); + makeAddShowButton(); + } }); }); diff --git a/install b/install index 999501670..0a6598ca8 100755 --- a/install +++ b/install @@ -312,6 +312,17 @@ else checkCommandExists "psql" fi +# Check if composer exists and install if it doesn't +eval hash "composer" 2>/dev/null +commandFound=$? +if [[ ! ${commandFound} -eq 0 ]]; then + curl -sS https://getcomposer.org/installer | php + mv composer.phar /usr/local/bin/composer +fi + +# Run composer (install PHP dependencies) and create a VERSION file +loudCmd "./build.sh" + if [ -f /etc/airtime/airtime.conf ]; then OLD_CONF=$(grep "[media-monitor]" /etc/airtime/airtime.conf) @@ -472,19 +483,27 @@ verbose "\n * Installing airtime_analyzer..." loudCmd "python ${AIRTIMEROOT}/python_apps/airtime_analyzer/setup.py install --install-scripts=/usr/bin" verbose "...Done" -#for i in /etc/init/airtime*.template; do -# chmod 644 $i -# sed -i "s/WEB_USER/${web_user}/g" $i -# mv $i ${i%.template} -#done +for i in /etc/init/airtime*.template; do + chmod 644 $i + sed -i "s/WEB_USER/${web_user}/g" $i + mv $i ${i%.template} +done set +e loudCmd "initctl reload-configuration" -loudCmd "systemctl daemon-reload" #systemd hipsters -loudCmd "update-rc.d airtime-playout defaults" # Start at bootup, on Debian + +# airtime-celery only has an init.d startup script loudCmd "update-rc.d airtime-celery defaults" # Start at bootup, on Debian -loudCmd "update-rc.d airtime-liquidsoap defaults" # Start at bootup, on Debian -loudCmd "update-rc.d airtime_analyzer defaults" # Start at bootup, on Debian + +# On Ubuntu, we already have the upstart configs, so this is redundant +# and causes multiple processes to spawn on startup +if [ "$dist" != "ubuntu" ]; then + loudCmd "systemctl daemon-reload" #systemd hipsters + + loudCmd "update-rc.d airtime-playout defaults" # Start at bootup, on Debian + loudCmd "update-rc.d airtime-liquidsoap defaults" # Start at bootup, on Debian + loudCmd "update-rc.d airtime_analyzer defaults" # Start at bootup, on Debian +fi set -e if [ ! -d /var/log/airtime ]; then diff --git a/python_apps/airtime_analyzer/airtime_analyzer/status_reporter.py b/python_apps/airtime_analyzer/airtime_analyzer/status_reporter.py index 4f357c3db..bb1d03d34 100644 --- a/python_apps/airtime_analyzer/airtime_analyzer/status_reporter.py +++ b/python_apps/airtime_analyzer/airtime_analyzer/status_reporter.py @@ -9,7 +9,10 @@ import pickle import threading from urlparse import urlparse -requests.packages.urllib3.disable_warnings() +# Disable urllib3 warnings because these can cause a rare deadlock due to Python 2's crappy internal non-reentrant locking +# around POSIX stuff. See SAAS-714. The hasattr() is for compatibility with older versions of requests. +if hasattr(requests, 'packages'): + requests.packages.urllib3.disable_warnings() class PicklableHttpRequest: def __init__(self, method, url, data, api_key): diff --git a/python_apps/media-monitor/setup.py b/python_apps/media-monitor/setup.py index 910a9c325..3031b14aa 100644 --- a/python_apps/media-monitor/setup.py +++ b/python_apps/media-monitor/setup.py @@ -22,7 +22,7 @@ else: mm2_files.append(os.path.join(root, filename)) data_files = [ - # ('/etc/init', ['install/upstart/airtime-media-monitor.conf.template']), + ('/etc/init', ['install/upstart/airtime-media-monitor.conf.template']), ('/etc/init.d', ['install/sysvinit/airtime-media-monitor']), ('/etc/airtime', ['install/media_monitor_logging.cfg']), ('/var/log/airtime/media-monitor', []),