? archive/Thumbs.db
? archive/scripts/1193091785.mp3
? catalog/The Database.mdb
? catalog/fixit.php
? catalog/import.php
? schedule/images/Thumbs.db
Index: station.install
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/station/station.install,v
retrieving revision 1.9
diff -u -p -u -p -r1.9 station.install
--- station.install 10 Aug 2007 17:13:15 -0000 1.9
+++ station.install 31 Oct 2007 18:23:08 -0000
@@ -10,8 +10,6 @@ function station_uninstall() {
variable_del('station_block_unschedule');
variable_del('station_remote_archive_url');
variable_del('station_remote_schedule_url');
- variable_del('station_stream_high_url');
- variable_del('station_stream_low_url');
}
Index: station.module
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/station/station.module,v
retrieving revision 1.32
diff -u -p -u -p -r1.32 station.module
--- station.module 27 Aug 2007 22:53:05 -0000 1.32
+++ station.module 31 Oct 2007 18:23:08 -0000
@@ -331,56 +331,6 @@ function station_get_program_at($timesta
return NULL;
}
-/**
- * Return HTML body of the block listing the current program.
- *
- * @return string
- */
-function station_block_current_program() {
- // current program
- $program = station_get_program_at(time(), 0);
- $unschedule_message = check_plain(variable_get('station_block_unschedule', t("We're on autopilot.")));
- $high = check_url(variable_get('station_stream_high_url', ''));
- $low = check_url(variable_get('station_stream_low_url', ''));
-
- return theme('station_block_current_program', $program, $unschedule_message, $high, $low);
-}
-
-/**
- * Theme the current program block.
- *
- * @param $program
- * Program node object.
- * @param $unscheduled_message
- * message to display if no program is scheduled, i.e. when $program is null
- * @param $high_url
- * optional, high-bandwidth webstream URL
- * @param $low_url
- * optional, low-bandwith webstream URL
- * @return string
- */
-function theme_station_block_current_program($program = NULL, $unscheduled_message ='', $high_url = NULL, $low_url = NULL) {
- // program or unscheduled...
- if ($program) {
- $output = l($program->title, $program->node_url) .'
';
- }
- else {
- $output = $unscheduled_message .'
';
- }
-
- // webstream links
- if ($high_url || $low_url) {
- $output .= t('Tune in: ');
- if ($high_url) {
- $output .= ' '. l(t('High'), $high_url);
- }
- if ($low_url) {
- $output .= ' '. l(t('Low'), $low_url);
- }
- }
-
- return $output;
-}
/**
* Convert an array to a comma separates list with an add between the last terms.
Index: schedule/station_schedule.install
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/station/schedule/station_schedule.install,v
retrieving revision 1.14
diff -u -p -u -p -r1.14 station_schedule.install
--- schedule/station_schedule.install 10 Aug 2007 17:13:22 -0000 1.14
+++ schedule/station_schedule.install 31 Oct 2007 18:23:08 -0000
@@ -13,6 +13,7 @@ function station_schedule_install() {
CREATE TABLE {station_schedule} (
`nid` int unsigned NOT NULL default '0',
`increment` int unsigned NOT NULL default '0',
+ `streams` longtext,
PRIMARY KEY(`nid`)
) /*!40100 DEFAULT CHARACTER SET utf8 */;
");
@@ -318,4 +319,40 @@ function station_schedule_update_5200()
function station_schedule_update_5201() {
variable_set('station_schedule_redirect_old_urls', 1);
return array();
-}
\ No newline at end of file
+}
+
+/**
+ * Move the streams from variables into the schedule table.
+ */
+function station_schedule_update_5202() {
+ $ret = array();
+ switch ($GLOBALS['db_type']) {
+ case 'mysql':
+ case 'mysqli':
+ $ret[] = update_sql("ALTER TABLE {station_schedule} ADD COLUMN `streams` longtext AFTER `increment`");
+
+ $streams = array();
+ if ($high = variable_get('station_stream_high_url', '')) {
+ $streams['high'] = array(
+ 'name' => t('High'),
+ 'description' => t('High bandwidth stream'),
+ 'urls' => $high,
+ );
+ }
+ if ($low = variable_get('station_stream_low_url', '')) {
+ $streams['low'] = array(
+ 'name' => t('Low'),
+ 'description' => t('Low bandwidth stream'),
+ 'urls' => $low,
+ );
+ }
+ if (count($streams)) {
+ db_query("UPDATE {station_schedule} SET streams = '%s', unscheduled_message = '%s", serialize($streams), $unscheduled_message);
+ }
+ variable_del('station_stream_high_url');
+ variable_del('station_stream_low_url');
+
+ break;
+ }
+ return $ret;
+}
Index: schedule/views.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/station/schedule/views.inc,v
retrieving revision 1.13
diff -u -p -u -p -r1.13 views.inc
--- schedule/views.inc 31 Oct 2007 18:14:02 -0000 1.13
+++ schedule/views.inc 31 Oct 2007 18:25:09 -0000
@@ -27,6 +27,26 @@ function station_schedule_views_tables()
),
),
);
+ $tables['station_schedule'] = array(
+ 'name' => 'station_schedule',
+ 'join' => array(
+ 'left' => array(
+ 'table' => 'node',
+ 'field' => 'nid'
+ ),
+ 'right' => array(
+ 'field' => 'nid'
+ )
+ ),
+ 'fields' => array(
+ 'streams' => array(
+ 'name' => t('Station Schedule: Web streams'),
+ 'help' => t("Web stream links"),
+ 'sortable' => FALSE,
+ 'handler' => 'station_handler_field_schedule_streams',
+ ),
+ ),
+ );
$tables['station_schedule_item_current'] = array(
'name' => 'station_schedule_item',
'join' => array(
@@ -146,6 +166,13 @@ function station_handler_field_schedule_
}
}
+function station_handler_field_schedule_streams($fieldinfo, $fielddata, $value, $data) {
+ if ($streams = unserialize($data->station_schedule_streams)) {
+ $data->settings['streams'] = $streams;
+ return theme('station_schedule_streams', $data);
+ }
+}
+
function station_handler_field_schedule_times($fieldinfo, $fielddata, $value, $data) {
if ($program = node_load($data->nid)) {
$scheduled = array();
Index: schedule/views_defaults.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/station/schedule/views_defaults.inc,v
retrieving revision 1.12
diff -u -p -u -p -r1.12 views_defaults.inc
--- schedule/views_defaults.inc 22 Aug 2007 17:23:30 -0000 1.12
+++ schedule/views_defaults.inc 31 Oct 2007 18:24:54 -0000
@@ -7,6 +7,79 @@
*/
function station_schedule_views_default_views() {
$view = new stdClass();
+ $view->name = 'station_schedule_now_playing';
+ $view->description = 'What\'s currently on the schedule(s)';
+ $view->access = array (
+);
+ $view->view_args_php = '';
+ $view->page = FALSE;
+ $view->page_title = 'On Air';
+ $view->page_header = '';
+ $view->page_header_format = '1';
+ $view->page_footer = '';
+ $view->page_footer_format = '1';
+ $view->page_empty = '';
+ $view->page_empty_format = '1';
+ $view->page_type = 'list';
+ $view->url = '';
+ $view->use_pager = TRUE;
+ $view->nodes_per_page = '10';
+ $view->block = TRUE;
+ $view->block_title = 'On Air';
+ $view->block_header = '';
+ $view->block_header_format = '1';
+ $view->block_footer = '';
+ $view->block_footer_format = '1';
+ $view->block_empty = '';
+ $view->block_empty_format = '1';
+ $view->block_type = 'teaser';
+ $view->nodes_per_block = '10';
+ $view->block_more = FALSE;
+ $view->block_use_page_header = FALSE;
+ $view->block_use_page_footer = FALSE;
+ $view->block_use_page_empty = FALSE;
+ $view->sort = array (
+ );
+ $view->argument = array (
+ );
+ $view->field = array (
+ array (
+ 'tablename' => 'node',
+ 'field' => 'title',
+ 'label' => '',
+ 'handler' => 'views_handler_field_nodelink',
+ 'options' => 'link',
+ ),
+ array (
+ 'tablename' => 'station_schedule_item_current',
+ 'field' => 'program_nid',
+ 'label' => '',
+ ),
+ array (
+ 'tablename' => 'station_schedule',
+ 'field' => 'streams',
+ 'label' => '',
+ ),
+ );
+ $view->filter = array (
+ array (
+ 'tablename' => 'node',
+ 'field' => 'type',
+ 'operator' => 'OR',
+ 'options' => '',
+ 'value' => array (
+ 0 => 'station_schedule',
+),
+ ),
+ );
+ $view->exposed_filter = array (
+ );
+ $view->requires = array(node, station_schedule_item_current, station_schedule);
+ $views[$view->name] = $view;
+
+
+
+ $view = new stdClass();
$view->name = 'station_scheduled_programs';
$view->description = 'Scheduled programs';
$view->access = array (