Index: dayhour.inc =================================================================== RCS file: /cvs/drupal-contrib/contributions/modules/station/dayhour.inc,v retrieving revision 1.19 diff -u -p -r1.19 dayhour.inc --- dayhour.inc 10 Jun 2009 05:07:12 -0000 1.19 +++ dayhour.inc 29 Aug 2009 06:17:57 -0000 @@ -22,7 +22,7 @@ function station_valid_hour($hour) { if ($hour == t('midnight')) { return 0; } - else if ($hour == t('noon')) { + elseif ($hour == t('noon')) { return 12; } @@ -60,15 +60,15 @@ function station_valid_day($day) { if ($day < 0) { return ((integer) $day % 7) + 7; } - else if ($day > 6) { + elseif ($day > 6) { return ((integer) $day % 7); } return (integer) $day; } else { $dayname = station_day_name(); - $ret = array_search(ucfirst($day), $dayname, false); - return ($ret === false) ? 0 : $ret; + $ret = array_search(ucfirst($day), $dayname, FALSE); + return ($ret === FALSE) ? 0 : $ret; } } Index: station.module =================================================================== RCS file: /cvs/drupal-contrib/contributions/modules/station/station.module,v retrieving revision 1.54 diff -u -p -r1.54 station.module --- station.module 10 Jun 2009 05:07:12 -0000 1.54 +++ station.module 29 Aug 2009 06:17:57 -0000 @@ -136,7 +136,7 @@ function station_get_archive_url() { if (module_exists('station_archive')) { return 'station/archives/'; } - else if ($url = variable_get('station_remote_archive_url', FALSE)) { + elseif ($url = variable_get('station_remote_archive_url', FALSE)) { return $url .'station/archives/'; } return FALSE; @@ -258,9 +258,9 @@ function station_get_program_at($timesta $minutes = $parts['minutes']; if ($minutes < 15) $minutes = 0; - else if ($minutes < 30) + elseif ($minutes < 30) $minutes = 15; - else if ($minutes < 45) + elseif ($minutes < 45) $minutes = 30; else $minutes = 45; Index: archive/station_archive.info =================================================================== RCS file: /cvs/drupal-contrib/contributions/modules/station/archive/station_archive.info,v retrieving revision 1.5 diff -u -p -r1.5 station_archive.info --- archive/station_archive.info 19 Apr 2009 23:01:59 -0000 1.5 +++ archive/station_archive.info 29 Aug 2009 06:17:57 -0000 @@ -4,6 +4,6 @@ description = Provides an archive of the core = 6.x package = Station dependencies[] = station -dependencies[] = audio +dependencies[] = audio dependencies[] = taxonomy dependencies[] = views Index: archive/station_archive.module =================================================================== RCS file: /cvs/drupal-contrib/contributions/modules/station/archive/station_archive.module,v retrieving revision 1.43 diff -u -p -r1.43 station_archive.module --- archive/station_archive.module 4 Jun 2009 16:05:03 -0000 1.43 +++ archive/station_archive.module 29 Aug 2009 06:17:57 -0000 @@ -71,7 +71,7 @@ function station_archive_block($op = 'li switch ($op) { case 'view': if (user_access('access content')) { - switch($delta) { + switch ($delta) { case 1: $block['subject'] = t('Browse by day'); $block['content'] = _station_archive_browse_block(); @@ -107,7 +107,7 @@ function _station_archive_browse_block() * Implementation of hook_nodeapi(). */ function station_archive_nodeapi(&$node, $op, $teaser, $page) { - if ($node->type == 'audio'){ + if ($node->type == 'audio') { switch ($op) { case 'update': if (isset($node->station_archive) && user_access('administer station archive')) { @@ -136,7 +136,7 @@ function station_archive_nodeapi(&$node, case 'load': // Sneak the '1 AS archived' in so we've got a value to indicate that - // this node is in the archive. + // this node is in the archive. $row = db_fetch_array(db_query("SELECT 1 AS archived, sa.program_nid, sa.aired, sap.title AS program_title, sa.imported, sa.permanent FROM {station_archive_item} sa LEFT OUTER JOIN {station_archive_program} sap ON sa.program_nid = sap.program_nid WHERE sa.audio_nid = %d", $node->nid)); if ($row) { return array('station_archive' => $row); @@ -298,7 +298,7 @@ function station_archive_node_form_valid /** * Create form elements to display the station archive information for an audio * node. - * + * * @param $node * Audio node object. * @return @@ -417,7 +417,7 @@ function _station_archive_import_files() * Update the entries in the {station_archive_program} table. * * Views uses the {station_archive_program} to group audio nodes to what may be - * remote programs. This function keeps it up to date. + * remote programs. This function keeps it up to date. */ function _station_archive_update_program_list() { // Use the local schedule if one is available. @@ -437,7 +437,7 @@ function _station_archive_update_program } } - // Insert a program for unschedule times. + // Insert a program for unschedule times. $programs[0] = array( 'program_nid' => 0, 'title' => variable_get('station_archive_unscheduled_title', t('DJ Auto mix')), @@ -611,7 +611,7 @@ function _station_archive_get_vid() { /** * Implementation of hook_taxonomy(). - * + * * Delete our vocabulary variable if the vocabulary is deleted. */ function station_archive_taxonomy($op, $type, $object = NULL) { @@ -695,4 +695,4 @@ function station_archive_views_api() { return array( 'api' => 2.0, ); -} \ No newline at end of file +} Index: archive/station_archive.views.inc =================================================================== RCS file: /cvs/drupal-contrib/contributions/modules/station/archive/station_archive.views.inc,v retrieving revision 1.2 diff -u -p -r1.2 station_archive.views.inc --- archive/station_archive.views.inc 29 Jul 2009 15:34:53 -0000 1.2 +++ archive/station_archive.views.inc 29 Aug 2009 06:17:57 -0000 @@ -84,7 +84,7 @@ function station_archive_views_arguments * Handle the program node id argument. */ function station_archive_arg_program_nid_handler($op, &$query, $argtype, $arg = '') { - switch($op) { + switch ($op) { case 'summary': // add these up front to avoid a wacky bug with rewriting $query->ensure_table('node'); Index: archive/station_archive.views_defaults.inc =================================================================== RCS file: /cvs/drupal-contrib/contributions/modules/station/archive/station_archive.views_defaults.inc,v retrieving revision 1.1 diff -u -p -r1.1 station_archive.views_defaults.inc --- archive/station_archive.views_defaults.inc 19 Apr 2009 23:01:59 -0000 1.1 +++ archive/station_archive.views_defaults.inc 29 Aug 2009 06:17:57 -0000 @@ -9,7 +9,7 @@ function station_archive_views_default_v $view = new stdClass(); $view->name = 'station_archive_audio'; $view->description = 'Archived audio'; - $view->access = array ( + $view->access = array( ); $view->view_args_php = ''; $view->page = TRUE; @@ -33,16 +33,16 @@ function station_archive_views_default_v $view->menu_tab_default_parent_type = 'tab'; $view->menu_parent_tab_weight = '0'; $view->menu_parent_title = ''; - $view->sort = array ( - array ( + $view->sort = array( + array( 'tablename' => 'node', 'field' => 'created', 'sortorder' => 'DESC', 'options' => 'normal', ), ); - $view->argument = array ( - array ( + $view->argument = array( + array( 'type' => 'station_archive_program_nid', 'argdefault' => '4', 'title' => 'Archive of %1', @@ -50,7 +50,7 @@ function station_archive_views_default_v 'wildcard' => 'all', 'wildcard_substitution' => 'all programs', ), - array ( + array( 'type' => 'rss_feed', 'argdefault' => '2', 'title' => '', @@ -59,20 +59,20 @@ function station_archive_views_default_v 'wildcard_substitution' => '', ), ); - $view->field = array ( + $view->field = array( ); - $view->filter = array ( - array ( + $view->filter = array( + array( 'tablename' => 'node', 'field' => 'type', 'operator' => 'OR', 'options' => '', - 'value' => array ( + 'value' => array( 0 => 'audio', ), ), ); - $view->exposed_filter = array ( + $view->exposed_filter = array( ); $view->requires = array(node); $views[$view->name] = $view; @@ -84,7 +84,7 @@ function station_archive_views_default_v $view = new stdClass(); $view->name = 'station_archive_audio_rss'; $view->description = 'Station Archive'; - $view->access = array ( + $view->access = array( ); $view->view_args_php = ''; $view->page = TRUE; @@ -99,16 +99,16 @@ function station_archive_views_default_v $view->url = 'station/archives/rss'; $view->use_pager = TRUE; $view->nodes_per_page = '20'; - $view->sort = array ( - array ( + $view->sort = array( + array( 'tablename' => 'node', 'field' => 'created', 'sortorder' => 'DESC', 'options' => 'normal', ), ); - $view->argument = array ( - array ( + $view->argument = array( + array( 'type' => 'station_archive_program_nid', 'argdefault' => '2', 'title' => 'Archive of %1', @@ -117,20 +117,20 @@ function station_archive_views_default_v 'wildcard_substitution' => 'all programs', ), ); - $view->field = array ( + $view->field = array( ); - $view->filter = array ( - array ( + $view->filter = array( + array( 'tablename' => 'node', 'field' => 'type', 'operator' => 'OR', 'options' => '', - 'value' => array ( + 'value' => array( 0 => 'audio', ), ), ); - $view->exposed_filter = array ( + $view->exposed_filter = array( ); $view->requires = array(node); $views[$view->name] = $view; Index: archive/scripts/ripper.inc =================================================================== RCS file: /cvs/drupal-contrib/contributions/modules/station/archive/scripts/ripper.inc,v retrieving revision 1.5 diff -u -p -r1.5 ripper.inc --- archive/scripts/ripper.inc 26 Oct 2007 21:35:44 -0000 1.5 +++ archive/scripts/ripper.inc 29 Aug 2009 06:17:57 -0000 @@ -17,5 +17,5 @@ import_path = "/usr/local/www/drupal/sit ; recording, with one minute before the hour and an extra minute at the end. overlap_seconds = 60 -; The file type of the stream; "mp3" and "ogg" are supported. +; The file type of the stream; "mp3" and "ogg" are supported. file_format = "mp3" Index: catalog/station_catalog.info =================================================================== RCS file: /cvs/drupal-contrib/contributions/modules/station/catalog/station_catalog.info,v retrieving revision 1.6 diff -u -p -r1.6 station_catalog.info --- catalog/station_catalog.info 27 Nov 2008 06:48:17 -0000 1.6 +++ catalog/station_catalog.info 29 Aug 2009 06:17:57 -0000 @@ -1,6 +1,6 @@ ; $Id: station_catalog.info,v 1.6 2008/11/27 06:48:17 drewish Exp $ name = Station Catalog -description = Module to track albums in a radio station's library. +description = Module to track albums in a radio station's library. package = Station core = 6.x dependencies[] = views \ No newline at end of file Index: catalog/station_catalog.module =================================================================== RCS file: /cvs/drupal-contrib/contributions/modules/station/catalog/station_catalog.module,v retrieving revision 1.35 diff -u -p -r1.35 station_catalog.module --- catalog/station_catalog.module 22 Jun 2009 20:22:50 -0000 1.35 +++ catalog/station_catalog.module 29 Aug 2009 06:17:57 -0000 @@ -190,7 +190,7 @@ function station_catalog_album_validate( if (!is_numeric($node->album['number'])) { form_set_error('album][number', t('Album number must be a numeric value.')); } - else if ($node->album['number']) { + elseif ($node->album['number']) { // look for duplicate numbers if ($node->nid) { $query = db_query('SELECT sc.nid, n.title FROM {station_catalog} sc INNER JOIN {node} n ON sc.nid = n.nid WHERE sc.number = %d AND sc.nid <> %d', $node->album['number'], $node->nid); Index: catalog/station_catalog.views.inc =================================================================== RCS file: /cvs/drupal-contrib/contributions/modules/station/catalog/station_catalog.views.inc,v retrieving revision 1.2 diff -u -p -r1.2 station_catalog.views.inc --- catalog/station_catalog.views.inc 11 Mar 2009 07:21:49 -0000 1.2 +++ catalog/station_catalog.views.inc 29 Aug 2009 06:17:57 -0000 @@ -17,7 +17,7 @@ function station_catalog_views_data() { 'node' => array( 'handler' => 'views_join', // this is actually optional 'arguments' => array('station_catalog', 'node', 'nid', 'nid'), - ), + ), ); // ---------------------------------------------------------------- @@ -28,11 +28,11 @@ function station_catalog_views_data() { 'field' => array( 'handler' => 'views_handler_field_numeric', 'click sortable' => TRUE, - ), + ), 'filter' => array( 'handler' => 'views_handler_filter_numeric', 'label' => t('Number'), - ), + ), 'sort' => array( 'handler' => 'views_handler_sort', ), @@ -43,11 +43,11 @@ function station_catalog_views_data() { 'field' => array( 'handler' => 'views_handler_field', 'click sortable' => TRUE, - ), + ), 'filter' => array( 'handler' => 'views_handler_filter_string', 'label' => t('Artist'), - ), + ), 'sort' => array( 'handler' => 'views_handler_sort', ), @@ -58,11 +58,11 @@ function station_catalog_views_data() { 'field' => array( 'handler' => 'views_handler_field', 'click sortable' => TRUE, - ), + ), 'filter' => array( 'handler' => 'views_handler_filter_string', 'label' => t('Album'), - ), + ), 'sort' => array( 'handler' => 'views_handler_sort', ), @@ -73,11 +73,11 @@ function station_catalog_views_data() { 'field' => array( 'handler' => 'views_handler_field', 'click sortable' => TRUE, - ), + ), 'filter' => array( 'handler' => 'views_handler_filter_numeric', 'label' => t('Year'), - ), + ), 'sort' => array( 'handler' => 'views_handler_sort', ), @@ -88,11 +88,11 @@ function station_catalog_views_data() { 'field' => array( 'handler' => 'views_handler_field', 'click sortable' => TRUE, - ), + ), 'filter' => array( 'handler' => 'views_handler_filter_string', 'label' => t('Label'), - ), + ), 'sort' => array( 'handler' => 'views_handler_sort', ), @@ -103,11 +103,11 @@ function station_catalog_views_data() { 'field' => array( 'handler' => 'views_handler_field', 'click sortable' => TRUE, - ), + ), 'filter' => array( 'handler' => 'views_handler_filter_string', 'label' => t('Music Brainz ID'), - ), + ), 'sort' => array( 'handler' => 'views_handler_sort', ), @@ -118,11 +118,11 @@ function station_catalog_views_data() { 'field' => array( 'handler' => 'views_handler_field', 'click sortable' => TRUE, - ), + ), 'filter' => array( 'handler' => 'views_handler_filter_string', 'label' => t('Active'), - ), + ), 'sort' => array( 'handler' => 'views_handler_sort', ), Index: playlist/station_playlist.install =================================================================== RCS file: /cvs/drupal-contrib/contributions/modules/station/playlist/station_playlist.install,v retrieving revision 1.12 diff -u -p -r1.12 station_playlist.install --- playlist/station_playlist.install 2 Jun 2009 16:56:52 -0000 1.12 +++ playlist/station_playlist.install 29 Aug 2009 06:17:57 -0000 @@ -14,44 +14,44 @@ function station_playlist_install() { module_enable(array('content', 'nodereference', 'date')); # var_export(content_fields('field_station_program', 'station_playlist')); - $program_field = array ( + $program_field = array( 'field_name' => 'field_station_program', 'type_name' => 'station_playlist', 'display_settings' => - array ( + array( 'weight' => '-2', 'parent' => '', 'label' => - array ( + array( 'format' => 'hidden', ), 'teaser' => - array ( + array( 'format' => 'hidden', 'exclude' => 0, ), 'full' => - array ( + array( 'format' => 'hidden', 'exclude' => 0, ), 4 => - array ( + array( 'format' => 'default', 'exclude' => 0, ), 2 => - array ( + array( 'format' => 'default', 'exclude' => 0, ), 3 => - array ( + array( 'format' => 'default', 'exclude' => 0, ), 'token' => - array ( + array( 'format' => 'default', 'exclude' => 0, ), @@ -65,27 +65,27 @@ function station_playlist_install() { 'active' => '1', 'locked' => '1', 'columns' => - array ( + array( 'nid' => - array ( + array( 'type' => 'int', - 'unsigned' => true, - 'not null' => false, + 'unsigned' => TRUE, + 'not null' => FALSE, ), ), 'referenceable_types' => - array ( + array( 'station_program' => 'station_program', ), 'advanced_view' => '--', 'advanced_view_args' => '', 'widget' => - array ( + array( 'autocomplete_match' => 'contains', 'default_value' => - array ( + array( 0 => - array ( + array( 'nid' => NULL, '_error_element' => 'default_value_widget][field_station_playlist_program][0][nid][nid', ), @@ -100,44 +100,44 @@ function station_playlist_install() { ); # var_export(content_fields('field_station_playlist_date', 'station_playlist')); - $date_field = array ( + $date_field = array( 'field_name' => 'field_station_playlist_date', 'type_name' => 'station_playlist', 'display_settings' => - array ( + array( 'weight' => '-1', 'parent' => '', 'label' => - array ( + array( 'format' => 'hidden', ), 'teaser' => - array ( + array( 'format' => 'hidden', 'exclude' => 0, ), 'full' => - array ( + array( 'format' => 'hidden', 'exclude' => 0, ), 4 => - array ( + array( 'format' => 'default', 'exclude' => 0, ), 2 => - array ( + array( 'format' => 'default', 'exclude' => 0, ), 3 => - array ( + array( 'format' => 'default', 'exclude' => 0, ), 'token' => - array ( + array( 'format' => 'default', 'exclude' => 0, ), @@ -151,16 +151,16 @@ function station_playlist_install() { 'active' => '1', 'locked' => '1', 'columns' => - array ( + array( 'value' => - array ( + array( 'type' => 'int', - 'not null' => false, - 'sortable' => true, + 'not null' => FALSE, + 'sortable' => TRUE, ), ), 'granularity' => - array ( + array( 'year' => 'year', 'month' => 'month', 'day' => 'day', @@ -179,7 +179,7 @@ function station_playlist_install() { 'output_format_date_short' => 'm/d/Y - H:i', 'output_format_custom_short' => '', 'widget' => - array ( + array( 'default_value' => 'now', 'default_value_code' => '', 'default_value2' => 'same', @@ -188,7 +188,7 @@ function station_playlist_install() { 'input_format_custom' => '', 'increment' => '1', 'text_parts' => - array ( + array( ), 'year_range' => '-3:+3', 'label_position' => 'within', @@ -345,44 +345,44 @@ function station_playlist_update_6000() } # var_export(content_fields('field_station_program', 'station_playlist')); - $program_field = array ( + $program_field = array( 'field_name' => 'field_station_program', 'type_name' => 'station_playlist', 'display_settings' => - array ( + array( 'weight' => '-2', 'parent' => '', 'label' => - array ( + array( 'format' => 'hidden', ), 'teaser' => - array ( + array( 'format' => 'hidden', 'exclude' => 0, ), 'full' => - array ( + array( 'format' => 'hidden', 'exclude' => 0, ), 4 => - array ( + array( 'format' => 'default', 'exclude' => 0, ), 2 => - array ( + array( 'format' => 'default', 'exclude' => 0, ), 3 => - array ( + array( 'format' => 'default', 'exclude' => 0, ), 'token' => - array ( + array( 'format' => 'default', 'exclude' => 0, ), @@ -396,27 +396,27 @@ function station_playlist_update_6000() 'active' => '1', 'locked' => '1', 'columns' => - array ( + array( 'nid' => - array ( + array( 'type' => 'int', - 'unsigned' => true, - 'not null' => false, + 'unsigned' => TRUE, + 'not null' => FALSE, ), ), 'referenceable_types' => - array ( + array( 'station_program' => 'station_program', ), 'advanced_view' => '--', 'advanced_view_args' => '', 'widget' => - array ( + array( 'autocomplete_match' => 'contains', 'default_value' => - array ( + array( 0 => - array ( + array( 'nid' => NULL, '_error_element' => 'default_value_widget][field_station_playlist_program][0][nid][nid', ), @@ -431,44 +431,44 @@ function station_playlist_update_6000() ); # var_export(content_fields('field_station_playlist_date', 'station_playlist')); - $date_field = array ( + $date_field = array( 'field_name' => 'field_station_playlist_date', 'type_name' => 'station_playlist', 'display_settings' => - array ( + array( 'weight' => '-1', 'parent' => '', 'label' => - array ( + array( 'format' => 'hidden', ), 'teaser' => - array ( + array( 'format' => 'hidden', 'exclude' => 0, ), 'full' => - array ( + array( 'format' => 'hidden', 'exclude' => 0, ), 4 => - array ( + array( 'format' => 'default', 'exclude' => 0, ), 2 => - array ( + array( 'format' => 'default', 'exclude' => 0, ), 3 => - array ( + array( 'format' => 'default', 'exclude' => 0, ), 'token' => - array ( + array( 'format' => 'default', 'exclude' => 0, ), @@ -482,16 +482,16 @@ function station_playlist_update_6000() 'active' => '1', 'locked' => '1', 'columns' => - array ( + array( 'value' => - array ( + array( 'type' => 'int', - 'not null' => false, - 'sortable' => true, + 'not null' => FALSE, + 'sortable' => TRUE, ), ), 'granularity' => - array ( + array( 'year' => 'year', 'month' => 'month', 'day' => 'day', @@ -510,7 +510,7 @@ function station_playlist_update_6000() 'output_format_date_short' => 'm/d/Y - H:i', 'output_format_custom_short' => '', 'widget' => - array ( + array( 'default_value' => 'now', 'default_value_code' => '', 'default_value2' => 'same', @@ -519,7 +519,7 @@ function station_playlist_update_6000() 'input_format_custom' => '', 'increment' => '1', 'text_parts' => - array ( + array( ), 'year_range' => '-3:+3', 'label_position' => 'within', Index: playlist/station_playlist.module =================================================================== RCS file: /cvs/drupal-contrib/contributions/modules/station/playlist/station_playlist.module,v retrieving revision 1.22 diff -u -p -r1.22 station_playlist.module --- playlist/station_playlist.module 28 Jun 2009 21:09:16 -0000 1.22 +++ playlist/station_playlist.module 29 Aug 2009 06:17:57 -0000 @@ -62,7 +62,7 @@ function station_playlist_node_info() { } /** - * Implementation of hook_perm(). + * Implementation of hook_perm(). */ function station_playlist_perm() { return array( @@ -357,7 +357,7 @@ function station_playlist_update($node) /** * Get a playlist ready for viewing. */ -function station_playlist_view(&$node, $teaser = false, $page = false) { +function station_playlist_view(&$node, $teaser = FALSE, $page = FALSE) { $node = node_prepare($node, $teaser); if ($page) { @@ -417,7 +417,7 @@ function station_playlist_nodeapi(&$node function station_playlist_autocomplete($field = '', $string = '') { $matches = array(); if (in_array($field, array('artist', 'title', 'album', 'label'))) { - $result = db_query_range('SELECT DISTINCT %s AS val FROM {station_playlist_track} WHERE LOWER(%s) LIKE LOWER("%s%%") ORDER BY val', $field, $field, $string, 0, 10); + $result = db_query_range("SELECT DISTINCT '%s' AS val FROM {station_playlist_track} WHERE LOWER('%s') LIKE LOWER('%s%%') ORDER BY val", $field, $field, $string, 0, 10); while ($item = db_fetch_object($result)) { $matches[$item->val] = check_plain($item->val); } @@ -427,7 +427,7 @@ function station_playlist_autocomplete($ } /** - * Implementation of hook_content_extra_fields. + * Implementation of hook_content_extra_fields(). * * Let CCK know about the playlist stuff we're putting on nodes. */ Index: playlist/station_playlist.views.inc =================================================================== RCS file: /cvs/drupal-contrib/contributions/modules/station/playlist/station_playlist.views.inc,v retrieving revision 1.2 diff -u -p -r1.2 station_playlist.views.inc --- playlist/station_playlist.views.inc 11 Jun 2009 15:52:11 -0000 1.2 +++ playlist/station_playlist.views.inc 29 Aug 2009 06:17:57 -0000 @@ -21,7 +21,7 @@ function station_playlist_views_data() { 'node' => array( 'handler' => 'views_join', // this is actually optional 'arguments' => array('station_playlist_track', 'node', 'nid', 'nid'), - ), + ), ); // ---------------------------------------------------------------- @@ -58,11 +58,11 @@ function station_playlist_views_data() { 'field' => array( 'handler' => 'views_handler_field', 'click sortable' => TRUE, - ), + ), 'filter' => array( 'handler' => 'views_handler_filter_string', 'label' => t('Artist'), - ), + ), 'sort' => array( 'handler' => 'views_handler_sort', ), @@ -73,11 +73,11 @@ function station_playlist_views_data() { 'field' => array( 'handler' => 'views_handler_field', 'click sortable' => TRUE, - ), + ), 'filter' => array( 'handler' => 'views_handler_filter_string', 'label' => t('Album'), - ), + ), 'sort' => array( 'handler' => 'views_handler_sort', ), @@ -88,11 +88,11 @@ function station_playlist_views_data() { 'field' => array( 'handler' => 'views_handler_field', 'click sortable' => TRUE, - ), + ), 'filter' => array( 'handler' => 'views_handler_filter_string', 'label' => t('Title'), - ), + ), 'sort' => array( 'handler' => 'views_handler_sort', ), Index: program/station_program.install =================================================================== RCS file: /cvs/drupal-contrib/contributions/modules/station/program/station_program.install,v retrieving revision 1.12 diff -u -p -r1.12 station_program.install --- program/station_program.install 2 Jun 2009 16:56:52 -0000 1.12 +++ program/station_program.install 29 Aug 2009 06:17:57 -0000 @@ -11,43 +11,43 @@ function station_program_install() { module_enable(array('content', 'text', 'link')); # var_export(content_fields('field_station_program_genre', 'station_program')); - $genre_field = array ( + $genre_field = array( 'field_name' => 'field_station_program_genre', 'type_name' => 'station_program', 'display_settings' => - array ( + array( 'label' => - array ( + array( 'format' => 'above', 'exclude' => 0, ), 'teaser' => - array ( + array( 'format' => 'default', 'exclude' => 0, ), 'full' => - array ( + array( 'format' => 'default', 'exclude' => 0, ), 4 => - array ( + array( 'format' => 'default', 'exclude' => 0, ), 2 => - array ( + array( 'format' => 'default', 'exclude' => 0, ), 3 => - array ( + array( 'format' => 'default', 'exclude' => 0, ), 'token' => - array ( + array( 'format' => 'default', 'exclude' => 0, ), @@ -61,13 +61,13 @@ function station_program_install() { 'active' => '1', 'locked' => '0', 'columns' => - array ( + array( 'value' => - array ( + array( 'type' => 'text', 'size' => 'big', - 'not null' => false, - 'sortable' => true, + 'not null' => FALSE, + 'sortable' => TRUE, ), ), 'text_processing' => '0', @@ -75,13 +75,13 @@ function station_program_install() { 'allowed_values' => '', 'allowed_values_php' => '', 'widget' => - array ( + array( 'rows' => 5, 'size' => '60', 'default_value' => - array ( + array( 0 => - array ( + array( 'value' => '', '_error_element' => 'default_value_widget][field_station_program_genre][0][value', ), @@ -97,44 +97,44 @@ function station_program_install() { # var_export(content_fields('field_station_program_link', 'station_program')); - $link_field = array ( + $link_field = array( 'field_name' => 'field_station_program_link', 'type_name' => 'station_program', 'display_settings' => - array ( + array( 'weight' => '-2', 'parent' => '', 'label' => - array ( + array( 'format' => 'above', ), 'teaser' => - array ( + array( 'format' => 'hidden', 'exclude' => 0, ), 'full' => - array ( + array( 'format' => 'default', 'exclude' => 0, ), 4 => - array ( + array( 'format' => 'default', 'exclude' => 0, ), 2 => - array ( + array( 'format' => 'default', 'exclude' => 0, ), 3 => - array ( + array( 'format' => 'default', 'exclude' => 0, ), 'token' => - array ( + array( 'format' => 'default', 'exclude' => 0, ), @@ -148,36 +148,36 @@ function station_program_install() { 'active' => '1', 'locked' => '0', 'columns' => - array ( + array( 'url' => - array ( + array( 'type' => 'varchar', 'length' => 255, - 'not null' => false, - 'sortable' => true, + 'not null' => FALSE, + 'sortable' => TRUE, ), 'title' => - array ( + array( 'type' => 'varchar', 'length' => 255, - 'not null' => false, - 'sortable' => true, + 'not null' => FALSE, + 'sortable' => TRUE, ), 'attributes' => - array ( + array( 'type' => 'text', 'size' => 'medium', - 'not null' => false, + 'not null' => FALSE, ), ), 'attributes' => - array ( + array( 'target' => 'default', 'rel' => '', 'class' => '', ), 'display' => - array ( + array( 'url_cutoff' => '80', ), 'url' => 0, @@ -185,11 +185,11 @@ function station_program_install() { 'title_value' => '', 'enable_tokens' => 0, 'widget' => - array ( + array( 'default_value' => - array ( + array( 0 => - array ( + array( 'title' => '', 'url' => '', ), @@ -268,43 +268,43 @@ function station_program_update_6000() { } # var_export(content_fields('field_station_program_genre', 'station_program')); - $genre_field = array ( + $genre_field = array( 'field_name' => 'field_station_program_genre', 'type_name' => 'station_program', 'display_settings' => - array ( + array( 'label' => - array ( + array( 'format' => 'above', 'exclude' => 0, ), 'teaser' => - array ( + array( 'format' => 'default', 'exclude' => 0, ), 'full' => - array ( + array( 'format' => 'default', 'exclude' => 0, ), 4 => - array ( + array( 'format' => 'default', 'exclude' => 0, ), 2 => - array ( + array( 'format' => 'default', 'exclude' => 0, ), 3 => - array ( + array( 'format' => 'default', 'exclude' => 0, ), 'token' => - array ( + array( 'format' => 'default', 'exclude' => 0, ), @@ -318,13 +318,13 @@ function station_program_update_6000() { 'active' => '1', 'locked' => '0', 'columns' => - array ( + array( 'value' => - array ( + array( 'type' => 'text', 'size' => 'big', - 'not null' => false, - 'sortable' => true, + 'not null' => FALSE, + 'sortable' => TRUE, ), ), 'text_processing' => '0', @@ -332,13 +332,13 @@ function station_program_update_6000() { 'allowed_values' => '', 'allowed_values_php' => '', 'widget' => - array ( + array( 'rows' => 5, 'size' => '60', 'default_value' => - array ( + array( 0 => - array ( + array( 'value' => '', '_error_element' => 'default_value_widget][field_station_program_genre][0][value', ), @@ -354,44 +354,44 @@ function station_program_update_6000() { # var_export(content_fields('field_station_program_link', 'station_program')); - $link_field = array ( + $link_field = array( 'field_name' => 'field_station_program_link', 'type_name' => 'station_program', 'display_settings' => - array ( + array( 'weight' => '-2', 'parent' => '', 'label' => - array ( + array( 'format' => 'above', ), 'teaser' => - array ( + array( 'format' => 'hidden', 'exclude' => 0, ), 'full' => - array ( + array( 'format' => 'default', 'exclude' => 0, ), 4 => - array ( + array( 'format' => 'default', 'exclude' => 0, ), 2 => - array ( + array( 'format' => 'default', 'exclude' => 0, ), 3 => - array ( + array( 'format' => 'default', 'exclude' => 0, ), 'token' => - array ( + array( 'format' => 'default', 'exclude' => 0, ), @@ -405,36 +405,36 @@ function station_program_update_6000() { 'active' => '1', 'locked' => '0', 'columns' => - array ( + array( 'url' => - array ( + array( 'type' => 'varchar', 'length' => 255, - 'not null' => false, - 'sortable' => true, + 'not null' => FALSE, + 'sortable' => TRUE, ), 'title' => - array ( + array( 'type' => 'varchar', 'length' => 255, - 'not null' => false, - 'sortable' => true, + 'not null' => FALSE, + 'sortable' => TRUE, ), 'attributes' => - array ( + array( 'type' => 'text', 'size' => 'medium', - 'not null' => false, + 'not null' => FALSE, ), ), 'attributes' => - array ( + array( 'target' => 'default', 'rel' => '', 'class' => '', ), 'display' => - array ( + array( 'url_cutoff' => '80', ), 'url' => 0, @@ -442,11 +442,11 @@ function station_program_update_6000() { 'title_value' => '', 'enable_tokens' => 0, 'widget' => - array ( + array( 'default_value' => - array ( + array( 0 => - array ( + array( 'title' => '', 'url' => '', ), Index: schedule/station_schedule.css =================================================================== RCS file: /cvs/drupal-contrib/contributions/modules/station/schedule/station_schedule.css,v retrieving revision 1.5 diff -u -p -r1.5 station_schedule.css --- schedule/station_schedule.css 10 Aug 2007 17:13:22 -0000 1.5 +++ schedule/station_schedule.css 29 Aug 2009 06:17:57 -0000 @@ -53,7 +53,7 @@ display: block; } /* on hover force underlining (but not the DJ names) and colour the whole block */ -.station-sch-scheduled a:hover, .station-sch-unscheduled a:hover { +.station-sch-scheduled a:hover, .station-sch-unscheduled a:hover { background-color: #eee; text-decoration: none; } Index: schedule/station_schedule.edit.inc =================================================================== RCS file: /cvs/drupal-contrib/contributions/modules/station/schedule/station_schedule.edit.inc,v retrieving revision 1.2 diff -u -p -r1.2 station_schedule.edit.inc --- schedule/station_schedule.edit.inc 22 Dec 2008 18:39:48 -0000 1.2 +++ schedule/station_schedule.edit.inc 29 Aug 2009 06:17:57 -0000 @@ -165,7 +165,7 @@ function station_schedule_item_edit_form if ($overlap->count == 1) { form_set_error('', t("The program overlaps another scheduled item at %time.", array('%time' => theme('station_dayhour_range', $overlap->start, $overlap->finish)))); } - else if ($overlap->count > 1) { + elseif ($overlap->count > 1) { form_set_error('', t("The program overlaps %number scheduled items from %time.", array('%time' => theme('station_dayhour_range', $overlap->start, $overlap->finish), '%number' => $overlap->count))); } } Index: schedule/station_schedule.install =================================================================== RCS file: /cvs/drupal-contrib/contributions/modules/station/schedule/station_schedule.install,v retrieving revision 1.25 diff -u -p -r1.25 station_schedule.install --- schedule/station_schedule.install 2 Jun 2009 16:56:52 -0000 1.25 +++ schedule/station_schedule.install 29 Aug 2009 06:17:57 -0000 @@ -18,29 +18,29 @@ function station_schedule_install() { $dj_title = variable_get('station_schedule_dj_title', 'DJs'); # var_export(content_fields('field_station_program_dj', 'station_program')); - $dj_field = array ( + $dj_field = array( 'field_name' => 'field_station_program_dj', 'type_name' => 'station_program', 'display_settings' => - array ( + array( 'label' => - array ( + array( 'format' => 'above', ), 'teaser' => - array ( + array( 'format' => 'default', ), 'full' => - array ( + array( 'format' => 'default', ), 0 => - array ( + array( 'format' => 'above', ), 'token' => - array ( + array( 'format' => 'default', ), ), @@ -53,32 +53,32 @@ function station_schedule_install() { 'active' => '1', 'locked' => '1', 'columns' => - array ( + array( 'uid' => - array ( + array( 'type' => 'int', - 'unsigned' => true, - 'not null' => false, + 'unsigned' => TRUE, + 'not null' => FALSE, ), ), 'referenceable_roles' => - array ( + array( $dj_role => $dj_role, ), 'referenceable_status' => - array ( + array( 1 => 1, 0 => 0, ), 'advanced_view' => '', 'advanced_view_args' => '', 'widget' => - array ( + array( 'reverse_link' => 0, 'default_value' => - array ( + array( 0 => - array ( + array( 'uid' => NULL, '_error_element' => 'default_value_widget][field_station_program_dj][0][uid][uid', ), @@ -283,7 +283,7 @@ function station_schedule_update_5200() $node->uid = 1; $node->title = t('Default'); db_query("INSERT INTO {node} (nid, vid, title, type, uid, status, created, changed, comment, promote, sticky) - VALUES (%d, %d, '%s', 'station_schedule', 1, %d, %d, %d, 0, 0, 0)", + VALUES (%d, %d, '%s', 'station_schedule', 1, %d, %d, %d, 0, 0, 0)", $node->nid, $node->vid, $node->title, $node->uid, $node->created, $node->changed ); db_query("INSERT INTO {node_revisions} (nid, vid, title, body, teaser, timestamp, uid, format, log) @@ -410,29 +410,29 @@ function station_schedule_update_6001() $dj_title = variable_get('station_schedule_dj_title', 'DJs'); # var_export(content_fields('field_station_program_dj', 'station_program')); - $dj_field = array ( + $dj_field = array( 'field_name' => 'field_station_program_dj', 'type_name' => 'station_program', 'display_settings' => - array ( + array( 'label' => - array ( + array( 'format' => 'above', ), 'teaser' => - array ( + array( 'format' => 'default', ), 'full' => - array ( + array( 'format' => 'default', ), 0 => - array ( + array( 'format' => 'above', ), 'token' => - array ( + array( 'format' => 'default', ), ), @@ -445,32 +445,32 @@ function station_schedule_update_6001() 'active' => '1', 'locked' => '1', 'columns' => - array ( + array( 'uid' => - array ( + array( 'type' => 'int', - 'unsigned' => true, - 'not null' => false, + 'unsigned' => TRUE, + 'not null' => FALSE, ), ), 'referenceable_roles' => - array ( + array( $dj_role => $dj_role, ), 'referenceable_status' => - array ( + array( 1 => 1, 0 => 0, ), 'advanced_view' => '', 'advanced_view_args' => '', 'widget' => - array ( + array( 'reverse_link' => 0, 'default_value' => - array ( + array( 0 => - array ( + array( 'uid' => NULL, '_error_element' => 'default_value_widget][field_station_program_dj][0][uid][uid', ), Index: schedule/station_schedule.module =================================================================== RCS file: /cvs/drupal-contrib/contributions/modules/station/schedule/station_schedule.module,v retrieving revision 1.89 diff -u -p -r1.89 station_schedule.module --- schedule/station_schedule.module 4 Jun 2009 16:34:05 -0000 1.89 +++ schedule/station_schedule.module 29 Aug 2009 06:17:57 -0000 @@ -86,7 +86,7 @@ function station_schedule_menu() { 'type' => MENU_LOCAL_TASK, ); $items["node/%node/schedule/list"] = array( - 'title' =>'View', + 'title' => 'View', 'type' => MENU_DEFAULT_LOCAL_TASK, 'weight' => -10, ); @@ -650,7 +650,7 @@ function station_schedule_nodeapi(&$node /** - * implementation of hook_form_alter() + * Implementation of hook_form_alter(). */ function station_schedule_form_alter(&$form, $form_state, $form_id) { // We only alter station_program node edit forms @@ -1041,7 +1041,7 @@ function expand_station_schedule_daytime $value = array( 'day' => station_day_from_minute($element['#value']), 'minute' => $element['#value'] % MINUTES_IN_DAY, - ); + ); } } @@ -1110,7 +1110,7 @@ function theme_station_schedule_daytime( /** - * Implementation of hook_content_extra_fields. + * Implementation of hook_content_extra_fields(). * * Let CCK know about the playlist stuff we're putting on nodes. */ Index: schedule/views.inc =================================================================== RCS file: /cvs/drupal-contrib/contributions/modules/station/schedule/views.inc,v retrieving revision 1.19 diff -u -p -r1.19 views.inc --- schedule/views.inc 25 Mar 2008 07:11:28 -0000 1.19 +++ schedule/views.inc 29 Aug 2009 06:17:57 -0000 @@ -89,11 +89,11 @@ function station_schedule_views_tables() 'sortable' => TRUE, 'handler' => 'station_handler_field_program_schedule_title', 'option' => array( - '#type' => 'select', - '#options' => array( - 'link' => 'As link to schedule', - 'nolink' => 'Without link' - ), + '#type' => 'select', + '#options' => array( + 'link' => 'As link to schedule', + 'nolink' => 'Without link' + ), ), 'addlfields' => array('nid'), 'help' => t('Title of the schedule.'), @@ -245,7 +245,7 @@ function station_schedule_views_argument function station_schedule_argument_schedule_item_day($op, &$query, $a1, $a2 = NULL) { $min_in_day = MINUTES_IN_DAY; - switch($op) { + switch ($op) { case 'summary': $query->ensure_table('station_schedule_item'); // Need to do the modulus by week to avoid having Sunday listed twice as 0 and 7. @@ -286,7 +286,7 @@ function station_schedule_argument_sched } function station_schedule_argument_schedule_nid($op, &$query, $a1, $a2 = NULL) { - switch($op) { + switch ($op) { case 'summary': $query->ensure_table('station_schedule_item'); $query->ensure_table('station_program_schedule_node'); @@ -369,7 +369,7 @@ function station_handler_field_schedule_ function station_handler_field_listen_links($fieldinfo, $fielddata, $value, $data) { $output = ''; if ($fielddata['options'] == 'icon') { - foreach(station_schedule_archive_links($data->nid, TRUE) as $link) { + foreach (station_schedule_archive_links($data->nid, TRUE) as $link) { $output .= l($link['title'], $link['href'], NULL, NULL, NULL, TRUE, TRUE) .' '; } } @@ -398,11 +398,11 @@ function station_handler_field_program_s function _station_schedule_item_start_sort($fieldname) { $start_offset = (int) MINUTES_IN_DAY * (7 - variable_get('date_first_day', 0)); $divisor = (int) MINUTES_IN_WEEK; - return "(({$fieldname} + {$start_offset}) %% {$divisor})"; + return "(({$fieldname} + {$start_offset}) %% {$divisor})"; } function station_handler_field_sort_schedule_item_start($fielddata, $fieldinfo) { - return _station_schedule_item_start_sort($fielddata['fullname']); + return _station_schedule_item_start_sort($fielddata['fullname']); } function station_handler_sort_schedule_item_start($op, &$query, $sortinfo, $sortdata) { Index: schedule/views/station_schedule.views.inc =================================================================== RCS file: /cvs/drupal-contrib/contributions/modules/station/schedule/views/station_schedule.views.inc,v retrieving revision 1.5 diff -u -p -r1.5 station_schedule.views.inc --- schedule/views/station_schedule.views.inc 11 Mar 2009 07:23:20 -0000 1.5 +++ schedule/views/station_schedule.views.inc 29 Aug 2009 06:17:57 -0000 @@ -96,11 +96,11 @@ function station_schedule_views_data() { 'field' => array( 'handler' => 'views_handler_field_numeric', 'click sortable' => TRUE, - ), + ), 'filter' => array( 'handler' => 'views_handler_filter_numeric', 'label' => t('Number'), - ), + ), 'sort' => array( 'handler' => 'views_handler_sort', ), @@ -111,11 +111,11 @@ function station_schedule_views_data() { 'field' => array( 'handler' => 'views_handler_field', 'click sortable' => TRUE, - ), + ), 'filter' => array( 'handler' => 'views_handler_filter_string', 'label' => t('Artist'), - ), + ), 'sort' => array( 'handler' => 'views_handler_sort', ), @@ -148,7 +148,7 @@ function station_schedule_views_data() { 'help' => t("The schedule item's id."), 'field' => array( 'handler' => 'views_handler_field_numeric', - ), + ), ); $data['station_schedule_item']['link_iid'] = array( 'field' => array( @@ -218,7 +218,7 @@ function station_schedule_views_data() { 'field' => array( 'handler' => 'station_schedule_handler_field_finish_time', 'click sortable' => TRUE, - ), + ), // 'filter' => array( // 'handler' => 'station_schedule_handler_filter_time', // 'label' => t('Finish'), @@ -233,11 +233,11 @@ function station_schedule_views_data() { 'field' => array( 'handler' => 'views_handler_field_boolean', 'click sortable' => TRUE, - ), + ), 'filter' => array( 'handler' => 'views_handler_filter_boolean_operator', 'label' => t('Active'), - ), + ), 'sort' => array( 'handler' => 'views_handler_sort', ),