' . t('Thousands of sites (particularly news sites and blogs) publish their latest headlines and posts in feeds, using a number of standardized XML-based formats. Formats supported by the aggregator include RSS, RDF, and Atom.', array('@rss' => 'http://cyber.law.harvard.edu/rss/', '@rdf' => 'http://www.w3.org/RDF/', '@atom' => 'http://www.atomenabled.org')) . '
'; - $output .= '' . t('Current feeds are listed below, and new feeds may be added. For each feed or feed category, the latest items block may be enabled at the blocks administration page.', array('@addfeed' => url('admin/content/aggregator/add/feed'), '@block' => url('admin/build/block'))) . '
'; + $output .= '' . t('Current feeds are listed below, and new feeds may be added. For each feed or feed category, the latest items block may be enabled at the blocks administration page.', array('@addfeed' => url('node/add'), '@block' => url('admin/build/block'))) . '
'; return $output; case 'admin/content/aggregator/add/feed': return '' . t('Add a feed in RSS, RDF or Atom format. A feed may only have one entry.') . '
'; @@ -43,8 +43,13 @@ 'arguments' => array('form' => NULL), 'file' => 'aggregator.pages.inc', ), + 'aggregator_feed_info' => array( + 'arguments' => array('feed_node' => NULL), + 'file' => 'aggregator.pages.inc', + 'template' => 'aggregator-feed-info', + ), 'aggregator_feed_source' => array( - 'arguments' => array('feed' => NULL), + 'arguments' => array('feed_node' => NULL), 'file' => 'aggregator.pages.inc', 'template' => 'aggregator-feed-source', ), @@ -81,20 +86,30 @@ * Implementation of hook_menu(). */ function aggregator_menu() { + $items['node/%aggregator_feed/update'] = array( + 'title' => 'Update items', + 'description' => 'Check feed for new items', + 'page callback' => 'aggregator_admin_refresh_feed', + 'page arguments' => array(1), + 'access callback' => 'aggregator_access_feed_options', + 'access arguments' => array(1), + 'type' => MENU_LOCAL_TASK, + ); + $items['node/%aggregator_feed/remove-items'] = array( + 'title' => 'Remove items', + 'description' => 'Remove all items', + 'page callback' => 'drupal_get_form', + 'page arguments' => array('aggregator_admin_remove_feed', 1), + 'access callback' => 'aggregator_access_feed_options', + 'access arguments' => array(1), + 'type' => MENU_LOCAL_TASK, + ); $items['admin/content/aggregator'] = array( 'title' => 'Feed aggregator', 'description' => "Configure which content your site aggregates from other sites, how often it polls them, and how they're categorized.", 'page callback' => 'aggregator_admin_overview', 'access arguments' => array('administer news feeds'), ); - $items['admin/content/aggregator/add/feed'] = array( - 'title' => 'Add feed', - 'page callback' => 'drupal_get_form', - 'page arguments' => array('aggregator_form_feed'), - 'access arguments' => array('administer news feeds'), - 'type' => MENU_LOCAL_TASK, - 'parent' => 'admin/content/aggregator', - ); $items['admin/content/aggregator/add/category'] = array( 'title' => 'Add category', 'page callback' => 'drupal_get_form', @@ -111,33 +126,11 @@ 'type' => MENU_LOCAL_TASK, 'parent' => 'admin/content/aggregator', ); - $items['admin/content/aggregator/remove/%aggregator_feed'] = array( - 'title' => 'Remove items', - 'page callback' => 'drupal_get_form', - 'page arguments' => array('aggregator_admin_remove_feed', 4), - 'access arguments' => array('administer news feeds'), - 'type' => MENU_CALLBACK, - ); - $items['admin/content/aggregator/update/%aggregator_feed'] = array( - 'title' => 'Update items', - 'page callback' => 'aggregator_admin_refresh_feed', - 'page arguments' => array(4), - 'access arguments' => array('administer news feeds'), - 'type' => MENU_CALLBACK, - ); $items['admin/content/aggregator/list'] = array( 'title' => 'List', 'type' => MENU_DEFAULT_LOCAL_TASK, 'weight' => -10, ); - $items['admin/content/aggregator/settings'] = array( - 'title' => 'Settings', - 'page callback' => 'drupal_get_form', - 'page arguments' => array('aggregator_admin_form'), - 'type' => MENU_LOCAL_TASK, - 'weight' => 10, - 'access arguments' => array('administer news feeds'), - ); $items['aggregator'] = array( 'title' => 'Feed aggregator', 'page callback' => 'aggregator_page_last', @@ -194,32 +187,24 @@ 'type' => MENU_LOCAL_TASK, 'weight' => 1, ); - $items['aggregator/sources/%aggregator_feed'] = array( + $items['aggregator/sources/%node'] = array( 'page callback' => 'aggregator_page_source', 'page arguments' => array(2), 'access arguments' => array('access news feeds'), 'type' => MENU_CALLBACK, ); - $items['aggregator/sources/%aggregator_feed/view'] = array( + $items['aggregator/sources/%node/view'] = array( 'title' => 'View', 'type' => MENU_DEFAULT_LOCAL_TASK, 'weight' => -10, ); - $items['aggregator/sources/%aggregator_feed/categorize'] = array( + $items['aggregator/sources/%node/categorize'] = array( 'title' => 'Categorize', 'page callback' => 'drupal_get_form', 'page arguments' => array('aggregator_page_source', 2), 'access arguments' => array('administer news feeds'), 'type' => MENU_LOCAL_TASK, ); - $items['aggregator/sources/%aggregator_feed/configure'] = array( - 'title' => 'Configure', - 'page callback' => 'drupal_get_form', - 'page arguments' => array('aggregator_form_feed', 2), - 'access arguments' => array('administer news feeds'), - 'type' => MENU_LOCAL_TASK, - 'weight' => 1, - ); $items['admin/content/aggregator/edit/feed/%aggregator_feed'] = array( 'title' => 'Edit feed', 'page callback' => 'drupal_get_form', @@ -287,13 +272,206 @@ * Checks news feeds for updates once their refresh interval has elapsed. */ function aggregator_cron() { - $result = db_query('SELECT * FROM {aggregator_feed} WHERE checked + refresh < :time', array(':time' => REQUEST_TIME)); + $result = db_query('SELECT n.title, n.type, f.* FROM {node} n INNER JOIN {aggregator_feed} f ON f.nid = n.nid WHERE f.checked + f.refresh < :time', array(':time' => REQUEST_TIME)); foreach ($result as $feed) { aggregator_refresh($feed); } } /** + * Implementation of hook_form_alter(). + * + * Add aggregator related options to node forms of feed-enabled content types. + */ +function aggregator_form_alter(&$form, $form_state, $form_id) { + if ($form['#id'] == 'node-form') { + if (variable_get('aggregator_enabled_' . $form['type']['#value'], FALSE)) { + $form['feed'] = array( + '#type' => 'fieldset', + '#title' => t('Feed'), + '#collapsible' => TRUE, + '#collapsed' => FALSE, + '#tree' => TRUE, + '#weight' => -2, + ); + $form['feed']['url'] = array( + '#type' => 'textfield', + '#title' => t('URL'), + '#description' => t('Enter the full URL of the feed you would like to add.'), + '#default_value' => empty($form['#node']->feed->url) ? '' : $form['#node']->feed->url, + ); + // Update interval and news items in blocks only configurable by administrators. + if (user_access('administer news feeds')) { + $period = drupal_map_assoc(array(900, 1800, 3600, 7200, 10800, 21600, 32400, 43200, 64800, 86400, 172800, 259200, 604800, 1209600, 2419200), 'format_interval'); + $form['feed']['refresh'] = array( + '#type' => 'select', + '#title' => t('Update interval'), + '#default_value' => empty($form['#node']->feed->refresh) ? 1800 : $form['#node']->feed->refresh, + '#options' => $period, + '#description' => t('The length of time between feed updates. Requires a correctly configured cron maintenance task.', array('@cron' => url('admin/reports/status'))), + ); + } + else { + $form['feed']['refresh'] = array( + '#type' => 'value', + '#value' => empty($form['#node']->feed->refresh) ? 1800 : $form['#node']->feed->refresh, + ); + } + $processors = variable_get('aggregator_processors_' . $form['type']['#value'], array('aggregator')); + // If aggregator-native processor is enabled, add processor specific form elements. + if (in_array('aggregator', $processors)) { + if (drupal_function_exists('aggregator_processor_node_form')) { + aggregator_processor_node_form(&$form, $form_state, $form_id); + } + } + } + } +} + +/** + * Implementation of hook_nodeapi_load(). + */ +function aggregator_nodeapi_load($nodes, $types) { + $nids = array(); + foreach ($nodes as $node) { + if (variable_get('aggregator_enabled_' . $node->type, FALSE)) { + $nids[$node->nid] = $node->nid; + } + } + if (count($nids)) { + $result = db_query('SELECT * FROM {aggregator_feed} WHERE nid IN (:nids)', array(':nids' => $nids)); + foreach ($result as $record) { + $nodes[$record->nid]->feed = $record; + } + } +} + +/** + * Implementation of hook_nodeapi_validate(). + */ +function aggregator_nodeapi_validate($node) { + if (isset($node->feed['url'])) { + if (!valid_url($node->feed['url'], TRUE)) { + form_set_error('feed][url', t('The URL %url is invalid. Please enter a fully-qualified URL, such as http://www.example.com/feed.xml.', array('%url' => $node->feed['url']))); + } + // Check for duplicate titles. + if (empty($node->nid)) { + $result = db_query("SELECT n.title, f.url FROM {node} n INNER JOIN {aggregator_feed} f ON f.nid = n.nid WHERE n.title = :title OR f.url = :url", array(':title' => $node->title, ':url' => $node->feed['url'])); + } + else { + $result = db_query("SELECT n.title, f.url FROM {node} n INNER JOIN {aggregator_feed} f ON f.nid = n.nid WHERE (n.title = :title OR f.url = :url) AND f.nid <> :nid", array(':title' => $node->title, ':url' => $node->feed['url'], ':nid' => $node->nid)); + } + foreach ($result as $feed) { + if (strcasecmp($feed->title, $node->title) == 0) { + form_set_error('title', t('A feed named %feed already exists. Please enter a unique title.', array('%feed' => $node->title))); + } + if (strcasecmp($feed->url, $node->feed['url']) == 0) { + form_set_error('url', t('A feed with this URL %url already exists. Please enter a unique URL.', array('%url' => $node->feed['url']))); + } + } + } +} + +/** + * Implementation of hook_nodeapi_insert(). + */ +function aggregator_nodeapi_insert($node) { + if (variable_get('aggregator_enabled_' . $node->type, FALSE)) { + db_insert('aggregator_feed') + ->fields(array( + 'nid' => $node->nid, + 'url' => $node->feed['url'], + 'refresh' => $node->feed['refresh'], + 'block' => empty($node->feed['block']) ? 0 : $node->feed['block'], + 'image' => '', + )) + ->execute(); + if (isset($node->feed['category'])) { + if (drupal_function_exists('aggregator_processor_save_feed_category')) { + aggregator_processor_save_feed_category($node); + } + } + } +} + +/** + * Implementation of hook_nodeapi_update(). + */ +function aggregator_nodeapi_update($node) { + if (variable_get('aggregator_enabled_' . $node->type, FALSE)) { + db_update('aggregator_feed') + ->condition('nid', $node->nid) + ->fields(array( + 'url' => $node->feed['url'], + 'refresh' => $node->feed['refresh'], + 'block' => empty($node->feed['block']) ? 0 : $node->feed['block'], + )) + ->execute(); + if (isset($node->feed['category'])) { + if (drupal_function_exists('aggregator_processor_save_feed_category')) { + aggregator_processor_save_feed_category($node); + } + } + } +} + +/** + * Implementation of hook_nodeapi_delete(). + */ +function aggregator_nodeapi_delete($node) { + if (variable_get('aggregator_enabled_' . $node->type, FALSE)) { + $iids = db_query('SELECT iid FROM {aggregator_item} WHERE nid = :nid', array(':nid' => $node->nid))->fetchCol(); + if ($iids) { + db_delete('aggregator_category_item') + ->condition('iid', $iids, 'IN') + ->execute(); + } + db_delete('aggregator_feed')-> + condition('nid', $node->nid) + ->execute(); + db_delete('aggregator_category_feed') + ->condition('nid', $node->nid) + ->execute(); + db_delete('aggregator_item') + ->condition('nid', $node->nid) + ->execute(); + // Make sure there is no active block for this feed. + db_delete('block') + ->condition('module', 'aggregator') + ->condition('delta', 'feed-' . $node->nid) + ->execute(); + } +} + +/** + * An implementation of hook_nodeapi_view(). + */ +function aggregator_nodeapi_view($node, $teaser) { + if (variable_get('aggregator_enabled_' . $node->type, FALSE)) { + $processors = variable_get('aggregator_processors_' . $node->type, array('aggregator')); + if (in_array('aggregator', $processors)) { + $links = array(); + $links['aggregator_items'] = array( + 'title' => t('Feed items'), + 'href' => 'aggregator/sources/' . $node->nid, + ); + $node->content['links']['aggregator'] = array( + '#type' => 'node_links', + '#value' => $links, + ); + } + // On a full node view, add aggregator feed info. + if (!$teaser) { + $items = array(); + $node->content['aggregator_feed_info'] = array( + '#weight' => -1, + '#markup' => theme('aggregator_feed_info', $node), + ); + } + } +} + +/** * Implementation of hook_block_list(). */ function aggregator_block_list() { @@ -302,9 +480,9 @@ foreach ($result as $category) { $block['category-' . $category->cid]['info'] = t('!title category latest items', array('!title' => $category->title)); } - $result = db_query('SELECT fid, title FROM {aggregator_feed} WHERE block <> 0 ORDER BY fid'); + $result = db_query('SELECT n.nid, n.title FROM {node} n JOIN {aggregator_feed} f ON f.nid = n.nid WHERE f.block <> 0 ORDER BY nid'); foreach ($result as $feed) { - $block['feed-' . $feed->fid]['info'] = t('!title feed latest items', array('!title' => $feed->title)); + $block['feed-' . $feed->nid]['info'] = t('!title feed latest items', array('!title' => $feed->title)); } return $block; } @@ -350,10 +528,10 @@ list($type, $id) = explode('-', $delta); switch ($type) { case 'feed': - if ($feed = db_query('SELECT fid, title, block FROM {aggregator_feed} WHERE block <> 0 AND fid = :fid', array(':fid' => $id))->fetchObject()) { + if ($feed = db_query('SELECT n.nid, n.title, f.block FROM {node} n INNER JOIN {aggregator_feed} f ON f.nid = n.nid WHERE f.block <> 0 AND f.nid = :nid', array(':nid' => $id))->fetchObject()) { $block['subject'] = check_plain($feed->title); - $result = db_query_range("SELECT * FROM {aggregator_item} WHERE fid = :fid ORDER BY timestamp DESC, iid DESC", array(':fid' => $id), 0, $feed->block); - $read_more = theme('more_link', url('aggregator/sources/' . $feed->fid), t("View this feed's recent news.")); + $result = db_query_range("SELECT * FROM {aggregator_item} WHERE nid = :nid ORDER BY timestamp DESC, iid DESC", array(':nid' => $id), 0, $feed->block); + $read_more = theme('more_link', url('aggregator/sources/' . $feed->nid), t("View this feed's recent news.")); } break; @@ -428,79 +606,6 @@ } /** - * Add/edit/delete an aggregator feed. - * - * @param $edit - * An associative array describing the feed to be added/edited/deleted. - */ -function aggregator_save_feed($edit) { - if (!empty($edit['fid'])) { - // An existing feed is being modified, delete the category listings. - db_delete('aggregator_category_feed') - ->condition('fid', $edit['fid']) - ->execute(); - } - if (!empty($edit['fid']) && !empty($edit['title'])) { - db_update('aggregator_feed') - ->condition('fid', $edit['fid']) - ->fields(array( - 'title' => $edit['title'], - 'url' => $edit['url'], - 'refresh' => $edit['refresh'], - 'block' => $edit['block'], - )) - ->execute(); - } - elseif (!empty($edit['fid'])) { - $iids = db_query('SELECT iid FROM {aggregator_item} WHERE fid = :fid', array(':fid' => $edit['fid']))->fetchCol(); - if ($iids) { - db_delete('aggregator_category_item') - ->condition('iid', $iids, 'IN') - ->execute(); - } - db_delete('aggregator_feed')-> - condition('fid', $edit['fid']) - ->execute(); - db_delete('aggregator_item') - ->condition('fid', $edit['fid']) - ->execute(); - // Make sure there is no active block for this feed. - db_delete('block') - ->condition('module', 'aggregator') - ->condition('delta', 'feed-' . $edit['fid']) - ->execute(); - } - elseif (!empty($edit['title'])) { - $edit['fid'] = db_insert('aggregator_feed') - ->fields(array( - 'title' => $edit['title'], - 'url' => $edit['url'], - 'refresh' => $edit['refresh'], - 'block' => $edit['block'], - 'description' => '', - 'image' => '', - )) - ->execute(); - - } - if (!empty($edit['title'])) { - // The feed is being saved, save the categories as well. - if (!empty($edit['category'])) { - foreach ($edit['category'] as $cid => $value) { - if ($value) { - db_merge('aggregator_category_feed') - ->key(array('fid' => $edit['fid'])) - ->fields(array( - 'cid' => $cid, - )) - ->execute(); - } - } - } - } -} - -/** * Removes all items from a feed. * * @param $feed @@ -510,13 +615,13 @@ // Call hook_aggregator_remove() on all modules. module_invoke_all('aggregator_remove', $feed); // Reset feed. - db_merge('aggregator_feed') - ->key(array('fid' => $feed->fid)) + db_update('aggregator_feed') + ->condition('nid', $feed->nid) ->fields(array( 'checked' => 0, 'hash' => '', + 'etag' => '', 'modified' => 0, - 'description' => $feed->description, 'image' => $feed->image, )) ->execute(); @@ -530,17 +635,17 @@ */ function aggregator_refresh($feed) { // Fetch the feed. - $fetcher = variable_get('aggregator_fetcher', 'aggregator'); + $fetcher = variable_get('aggregator_fetcher_' . $feed->type, 'aggregator'); module_invoke($fetcher, 'aggregator_fetch', $feed); if ($feed->source_string !== FALSE) { // Parse the feed. - $parser = variable_get('aggregator_parser', 'aggregator'); + $parser = variable_get('aggregator_parser_' . $feed->type, 'aggregator'); module_invoke($parser, 'aggregator_parse', $feed); // If there are items on the feed, let all enabled processors do their work on it. if (@count($feed->items)) { - $processors = variable_get('aggregator_processors', array('aggregator')); + $processors = variable_get('aggregator_processors_' . $feed->type, array('aggregator')); foreach ($processors as $processor) { module_invoke($processor, 'aggregator_process', $feed); } @@ -555,18 +660,18 @@ /** * Load an aggregator feed. * - * @param $fid + * @param $nid * The feed id. * @return * An object describing the feed. */ -function aggregator_feed_load($fid) { +function aggregator_feed_load($nid) { static $feeds; - if (!isset($feeds[$fid])) { - $feeds[$fid] = db_query('SELECT * FROM {aggregator_feed} WHERE fid = :fid', array(':fid' => $fid))->fetchObject(); + if (!isset($feeds[$nid])) { + $feeds[$nid] = db_query('SELECT n.title, n.type, f.* FROM {node} n INNER JOIN {aggregator_feed} f ON f.nid = n.nid WHERE n.nid = :nid', array(':nid' => $nid))->fetchObject(); } - return $feeds[$fid]; + return $feeds[$nid]; } /** @@ -587,6 +692,22 @@ } /** + * Access callback for aggregator_menu(). + * + * @param $feed + * Feed object. + * @return + * TRUE, if given feed is an object and user has administer news feeds + * permissions. FALSE otherwise. + */ +function aggregator_access_feed_options($feed) { + if (is_object($feed) && user_access('administer news feeds')) { + return TRUE; + } + return FALSE; +} + +/** * Format an individual feed item for display in the block. * * @param $item @@ -652,6 +773,20 @@ } /** + * Get all aggregator enabled content types. + */ +function aggregator_get_enabled_content_types() { + $types = node_get_types('types'); + $type_names = array(); + foreach ($types as $type_name => $type) { + if (variable_get('aggregator_enabled_' . $type_name, FALSE)) { + $type_names[$type_name] = $type->name; + } + } + return $type_names; +} + +/** * Helper function for drupal_map_assoc. * * @param $count @@ -661,4 +796,4 @@ */ function _aggregator_items($count) { return format_plural($count, '1 item', '@count items'); -} +} \ No newline at end of file Index: modules/aggregator/aggregator.pages.inc =================================================================== RCS file: /cvs/drupal/drupal/modules/aggregator/aggregator.pages.inc,v retrieving revision 1.23 diff -u -r1.23 aggregator.pages.inc --- modules/aggregator/aggregator.pages.inc 22 Dec 2008 19:38:31 -0000 1.23 +++ modules/aggregator/aggregator.pages.inc 29 Jan 2009 01:02:14 -0000 @@ -35,13 +35,13 @@ function aggregator_page_source($arg1, $arg2 = NULL) { // If there are two arguments then this function is the categorize form, and // $arg1 is $form_state and $arg2 is $feed. Otherwise, $arg1 is $feed. - $feed = is_object($arg2) ? $arg2 : $arg1; - drupal_set_title($feed->title); - $feed_source = theme('aggregator_feed_source', $feed); + $feed_node = is_object($arg2) ? $arg2 : $arg1; + drupal_set_title($feed_node->title); + $feed_source = theme('aggregator_feed_source', $feed_node); // It is safe to include the fid in the query because it's loaded from the // database by aggregator_feed_load. - $items = aggregator_feed_items_load('source', $feed); + $items = aggregator_feed_items_load('source', $feed_node->feed); return _aggregator_page_list($items, arg(3), $feed_source); } @@ -87,13 +87,13 @@ $range_limit = 20; switch ($type) { case 'sum': - $result = db_query_range('SELECT i.*, f.title AS ftitle, f.link AS flink FROM {aggregator_item} i INNER JOIN {aggregator_feed} f ON i.fid = f.fid ORDER BY i.timestamp DESC, i.iid DESC', 0, $range_limit); + $result = db_query_range('SELECT i.*, n.title AS ftitle, f.link AS flink FROM {aggregator_item} i INNER JOIN {aggregator_feed} f ON i.nid = f.nid INNER JOIN {node} n ON n.nid = f.nid ORDER BY i.timestamp DESC, i.iid DESC', 0, $range_limit); break; case 'source': - $result = db_query_range('SELECT * FROM {aggregator_item} WHERE fid = :fid ORDER BY timestamp DESC, iid DESC', array(':fid' => $data->fid), 0, $range_limit); + $result = db_query_range('SELECT * FROM {aggregator_item} WHERE nid = :nid ORDER BY timestamp DESC, iid DESC', array(':nid' => $data->nid), 0, $range_limit); break; case 'category': - $result = db_query_range('SELECT i.*, f.title AS ftitle, f.link AS flink FROM {aggregator_category_item} c LEFT JOIN {aggregator_item} i ON c.iid = i.iid LEFT JOIN {aggregator_feed} f ON i.fid = f.fid WHERE cid = :cid ORDER BY timestamp DESC, i.iid DESC', array(':cid' => $data['cid']), 0, $range_limit); + $result = db_query_range('SELECT i.*, n.title AS ftitle, f.link AS flink FROM {aggregator_category_item} c LEFT JOIN {aggregator_item} i ON c.iid = i.iid LEFT JOIN {aggregator_feed} f ON i.nid = f.nid LEFT JOIN {node} n ON n.nid = f.nid WHERE cid = :cid ORDER BY timestamp DESC, i.iid DESC', array(':cid' => $data['cid']), 0, $range_limit); break; } @@ -299,24 +299,21 @@ * Menu callback; displays all the feeds used by the aggregator. */ function aggregator_page_sources() { - $result = db_query('SELECT f.fid, f.title, f.description, f.image, MAX(i.timestamp) AS last FROM {aggregator_feed} f LEFT JOIN {aggregator_item} i ON f.fid = i.fid GROUP BY f.fid, f.title, f.description, f.image ORDER BY last DESC, f.title'); - - $output = ''; - foreach ($result as $feed) { - // Most recent items: - $summary_items = array(); - if (variable_get('aggregator_summary_items', 3)) { - $items = db_query_range('SELECT i.title, i.timestamp, i.link FROM {aggregator_item} i WHERE i.fid = :fid ORDER BY i.timestamp DESC', array(':fid' => $feed->fid), 0, variable_get('aggregator_summary_items', 3)); - foreach ($items as $item) { - $summary_items[] = theme('aggregator_summary_item', $item); - } - } - $feed->url = url('aggregator/sources/' . $feed->fid); - $output .= theme('aggregator_summary_items', $summary_items, $feed); + $nids = pager_query(db_rewrite_sql('SELECT n.nid FROM {node} n INNER JOIN {aggregator_feed} f ON f.nid = n.nid WHERE n.status = 1 ORDER BY n.sticky DESC, n.created DESC'), variable_get('default_nodes_main', 10))->fetchCol(); + $build = array(); + if (!empty($nids)) { + $nodes = node_load_multiple($nids); + $build = node_build_multiple($nodes); + $build['pager'] = array( + '#markup' => theme('pager', NULL, variable_get('default_nodes_main', 10)), + '#weight' => 5, + ); } - $output .= theme('feed_icon', url('aggregator/opml'), t('OPML feed')); - - return theme('aggregator_wrapper', $output); + $build['opml'] = array( + '#markup' => theme('feed_icon', url('aggregator/opml'), t('OPML feed')), + '#weight' => 6, + ); + return theme('aggregator_wrapper', drupal_render($build)); } /** @@ -329,7 +326,7 @@ foreach ($result as $category) { if (variable_get('aggregator_summary_items', 3)) { $summary_items = array(); - $items = db_query_range('SELECT i.title, i.timestamp, i.link, f.title as feed_title, f.link as feed_link FROM {aggregator_category_item} ci LEFT JOIN {aggregator_item} i ON i.iid = ci.iid LEFT JOIN {aggregator_feed} f ON i.fid = f.fid WHERE ci.cid = :cid ORDER BY i.timestamp DESC', array(':cid' => $category->cid), 0, variable_get('aggregator_summary_items', 3)); + $items = db_query_range('SELECT i.title, i.timestamp, i.link, n.title as feed_title, f.link as feed_link FROM {aggregator_category_item} ci LEFT JOIN {aggregator_item} i ON i.iid = ci.iid LEFT JOIN {aggregator_feed} f ON i.nid = f.nid LEFT JOIN {node} n ON n.nid = f.nid WHERE ci.cid = :cid ORDER BY i.timestamp DESC', array(':cid' => $category->cid), 0, variable_get('aggregator_summary_items', 3)); foreach ($items as $item) { $summary_items[] = theme('aggregator_summary_item', $item); } @@ -486,21 +483,34 @@ * @see aggregator-feed-source.tpl.php */ function template_preprocess_aggregator_feed_source(&$variables) { - $feed = $variables['feed']; - - $variables['source_icon'] = theme('feed_icon', $feed->url, t('!title feed', array('!title' => $feed->title))); - $variables['source_image'] = $feed->image; - $variables['source_description'] = aggregator_filter_xss($feed->description); - $variables['source_url'] = check_url(url($feed->link, array('absolute' => TRUE))); + $feed_node = $variables['feed_node']; + $variables['feed_node_title'] = $feed_node->title; + $variables['feed_node_url'] = url('node/' . $feed_node->nid); + $variables['source_icon'] = theme('feed_icon', $feed_node->feed->url, t('!title feed', array('!title' => $feed_node->title))); +} - if ($feed->checked) { - $variables['last_checked'] = t('@time ago', array('@time' => format_interval(REQUEST_TIME - $feed->checked))); +/** + * Process variables for aggregator-feed-info.tpl.php + * + * @see aggregator-feed-info.tpl.php + */ +function template_preprocess_aggregator_feed_info(&$variables) { + $feed_node = $variables['feed_node']; + $variables['source_icon'] = theme('feed_icon', $feed_node->feed->url, t('!title feed', array('!title' => $feed_node->title))); + if (!empty($feed_node->feed->image)) { + $variables['source_image'] = theme('image', $feed_node->feed->image, $feed_node->title, $feed_node->title, NULL, FALSE); + } + $variables['source_url'] = $feed_node->feed->link; + if (!empty($feed_node->feed->checked)) { + $last_checked = t('@time ago', array('@time' => format_interval(REQUEST_TIME - $feed_node->feed->checked))); } else { - $variables['last_checked'] = t('never'); + $last_checked = t('never'); } - if (user_access('administer news feeds')) { - $variables['last_checked'] = l($variables['last_checked'], 'admin/content/aggregator'); + $last_checked = l($last_checked, 'admin/content/aggregator'); } -} + if (!empty($last_checked)) { + $variables['last_checked'] = $last_checked; + } +} \ No newline at end of file Index: modules/aggregator/aggregator.parser.inc =================================================================== RCS file: /cvs/drupal/drupal/modules/aggregator/aggregator.parser.inc,v retrieving revision 1.1 diff -u -r1.1 aggregator.parser.inc --- modules/aggregator/aggregator.parser.inc 22 Dec 2008 19:38:31 -0000 1.1 +++ modules/aggregator/aggregator.parser.inc 29 Jan 2009 01:02:14 -0000 @@ -46,12 +46,11 @@ $etag = empty($feed->http_headers['ETag']) ? '' : $feed->http_headers['ETag']; // Update the feed data. db_merge('aggregator_feed') - ->key(array('fid' => $feed->fid)) + ->key(array('nid' => $feed->nid)) ->fields(array( 'url' => $feed->url, 'checked' => REQUEST_TIME, 'link' => !empty($channel['LINK']) ? $channel['LINK'] : '', - 'description' => !empty($channel['DESCRIPTION']) ? $channel['DESCRIPTION'] : '', 'image' => $image, 'hash' => md5($feed->source_string), 'etag' => $etag, Index: modules/aggregator/aggregator.processor.inc =================================================================== RCS file: /cvs/drupal/drupal/modules/aggregator/aggregator.processor.inc,v retrieving revision 1.3 diff -u -r1.3 aggregator.processor.inc --- modules/aggregator/aggregator.processor.inc 26 Jan 2009 14:08:42 -0000 1.3 +++ modules/aggregator/aggregator.processor.inc 29 Jan 2009 01:02:14 -0000 @@ -27,18 +27,18 @@ // we find a duplicate entry, we resolve it and pass along its ID is such // that we can update it if needed. if (!empty($item['GUID'])) { - $entry = db_query("SELECT iid, timestamp FROM {aggregator_item} WHERE fid = :fid AND guid = :guid", array(':fid' => $feed->fid, ':guid' => $item['GUID']))->fetchObject(); + $entry = db_query("SELECT iid, timestamp FROM {aggregator_item} WHERE nid = :nid AND guid = :guid", array(':nid' => $feed->nid, ':guid' => $item['GUID']))->fetchObject(); } elseif ($item['LINK'] && $item['LINK'] != $feed->link && $item['LINK'] != $feed->url) { - $entry = db_query("SELECT iid, timestamp FROM {aggregator_item} WHERE fid = :fid AND link = :link", array(':fid' => $feed->fid, ':link' => $item['LINK']))->fetchObject(); + $entry = db_query("SELECT iid, timestamp FROM {aggregator_item} WHERE nid = :nid AND link = :link", array(':nid' => $feed->nid, ':link' => $item['LINK']))->fetchObject(); } else { - $entry = db_query("SELECT iid, timestamp FROM {aggregator_item} WHERE fid = :fid AND title = :title", array(':fid' => $feed->fid, ':title' => $item['TITLE']))->fetchObject(); + $entry = db_query("SELECT iid, timestamp FROM {aggregator_item} WHERE nid = :nid AND title = :title", array(':nid' => $feed->nid, ':title' => $item['TITLE']))->fetchObject(); } if (!$item['TIMESTAMP']) { $item['TIMESTAMP'] = isset($entry->timestamp) ? $entry->timestamp : REQUEST_TIME; } - aggregator_save_item(array('iid' => (isset($entry->iid) ? $entry->iid : ''), 'fid' => $feed->fid, 'timestamp' => $item['TIMESTAMP'], 'title' => $item['TITLE'], 'link' => $item['LINK'], 'author' => $item['AUTHOR'], 'description' => $item['DESCRIPTION'], 'guid' => $item['GUID'])); + aggregator_save_item(array('iid' => (isset($entry->iid) ? $entry->iid : ''), 'nid' => $feed->nid, 'timestamp' => $item['TIMESTAMP'], 'title' => $item['TITLE'], 'link' => $item['LINK'], 'author' => $item['AUTHOR'], 'description' => $item['DESCRIPTION'], 'guid' => $item['GUID'])); } } } @@ -48,66 +48,68 @@ * Implementation of hook_aggregator_remove(). */ function aggregator_aggregator_remove($feed) { - $iids = db_query('SELECT iid FROM {aggregator_item} WHERE fid = :fid', array(':fid' => $feed->fid))->fetchCol(); + $iids = db_query('SELECT iid FROM {aggregator_item} WHERE nid = :nid', array(':nid' => $feed->nid))->fetchCol(); if ($iids) { db_delete('aggregator_category_item') ->condition('iid', $iids, 'IN') ->execute(); } db_delete('aggregator_item') - ->condition('fid', $feed->fid) + ->condition('nid', $feed->nid) ->execute(); drupal_set_message(t('The news items from %site have been removed.', array('%site' => $feed->title))); } /** - * Implementation of hook_form_aggregator_admin_form_alter(). - * - * Form alter aggregator module's own form to keep processor functionality - * separate from aggregator API functionality. + * Add processor specific elements to the node type form. + * + * Called from aggregator_form_node_type_form_alter(). We keep this functionality + * in aggregator.processor.inc because it is processor related. */ -function aggregator_form_aggregator_admin_form_alter(&$form, $form_state) { +function aggregator_processor_node_type_form(&$form) { + $node_type = empty($form['#node_type']->type) ? '' : $form['#node_type']->type; + if (in_array('aggregator', variable_get('aggregator_processors', array('aggregator')))) { $info = module_invoke('aggregator', 'aggregator_process', 'info'); $items = array(0 => t('none')) + drupal_map_assoc(array(3, 5, 10, 15, 20, 25), '_aggregator_items'); $period = drupal_map_assoc(array(3600, 10800, 21600, 32400, 43200, 86400, 172800, 259200, 604800, 1209600, 2419200, 4838400, 9676800), 'format_interval'); // Only wrap into a collapsible fieldset if there is a basic configuration. - if (isset($form['basic_conf'])) { - $form['modules']['aggregator'] = array( + if (isset($form['aggregator']['basic_conf'])) { + $form['aggregator']['modules']['aggregator'] = array( '#type' => 'fieldset', '#title' => t('Default processor settings'), '#description' => $info['description'], '#collapsible' => TRUE, - '#collapsed' => !in_array('aggregator', variable_get('aggregator_processors', array('aggregator'))), + '#collapsed' => !in_array('aggregator', variable_get('aggregator_processors_' . $node_type, array('aggregator'))), ); } else { - $form['modules']['aggregator'] = array(); + $form['aggregator']['modules']['aggregator'] = array(); } - $form['modules']['aggregator']['aggregator_summary_items'] = array( + $form['aggregator']['modules']['aggregator']['aggregator_summary_items'] = array( '#type' => 'select', '#title' => t('Items shown in sources and categories pages') , - '#default_value' => variable_get('aggregator_summary_items', 3), + '#default_value' => variable_get('aggregator_summary_items_' . $node_type, 3), '#options' => $items, '#description' => t('Number of feed items displayed in feed and category summary pages.'), ); - $form['modules']['aggregator']['aggregator_clear'] = array( - '#type' => 'select', + $form['aggregator']['modules']['aggregator']['aggregator_clear'] = array( + '#type' => 'select', '#title' => t('Discard items older than'), - '#default_value' => variable_get('aggregator_clear', 9676800), + '#default_value' => variable_get('aggregator_clear_' . $node_type, 9676800), '#options' => $period, '#description' => t('The length of time to retain feed items before discarding. (Requires a correctly configured cron maintenance task.)', array('@cron' => url('admin/reports/status'))), ); - $form['modules']['aggregator']['aggregator_category_selector'] = array( - '#type' => 'radios', - '#title' => t('Category selection type'), - '#default_value' => variable_get('aggregator_category_selector', 'checkboxes'), - '#options' => array('checkboxes' => t('checkboxes'), + $form['aggregator']['modules']['aggregator']['aggregator_category_selector'] = array( + '#type' => 'radios', + '#title' => t('Category selection type'), + '#default_value' => variable_get('aggregator_category_selector_' . $node_type, 'checkboxes'), + '#options' => array('checkboxes' => t('checkboxes'), 'select' => t('multiple selector')), '#description' => t('The type of category selection widget displayed on categorization pages. (For a small number of categories, checkboxes are easier to use, while a multiple selector works well with large numbers of categories.)'), ); @@ -115,6 +117,49 @@ } /** + * Add processor specific elements to the node form. + * + * Called from aggregator_form_alter(). Keep this functionality in + * aggregator.processor.inc because it is processor related. + */ +function aggregator_processor_node_form(&$form, $form_state, $form_id) { + // Handling of categories. + $options = array(); + $values = array(); + $categories = db_query('SELECT c.cid, c.title, f.nid FROM {aggregator_category} c LEFT JOIN {aggregator_category_feed} f ON c.cid = f.cid AND f.nid = :nid ORDER BY title', array(':nid' => empty($form['#node']->nid) ? NULL : $form['#node']->nid)); + foreach ($categories as $category) { + $options[$category->cid] = check_plain($category->title); + if ($category->nid) $values[] = $category->cid; + } + if ($options) { + $form['feed']['category'] = array( + '#type' => 'checkboxes', + '#title' => t('Categorize news items'), + '#default_value' => $values, + '#options' => $options, + '#description' => t('New feed items are automatically filed in the checked categories.'), + ); + } + // Update interval and news items in blocks only configurable by administrators. + if (user_access('administer news feeds')) { + $period = drupal_map_assoc(array(900, 1800, 3600, 7200, 10800, 21600, 32400, 43200, 64800, 86400, 172800, 259200, 604800, 1209600, 2419200), 'format_interval'); + $form['feed']['refresh'] = array( + '#type' => 'select', + '#title' => t('Update interval'), + '#default_value' => empty($form['#node']->feed->refresh) ? 1800 : $form['#node']->feed->refresh, + '#options' => $period, + '#description' => t('The length of time between feed updates. Requires a correctly configured cron maintenance task.', array('@cron' => url('admin/reports/status'))), + ); + $form['feed']['block'] = array( + '#type' => 'select', + '#title' => t('News items in block'), + '#default_value' => empty($form['#node']->feed->block) ? 5 : $form['#node']->feed->block, + '#options' => drupal_map_assoc(array(0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20)), + '#description' => t("Drupal can make a block with the most recent news items of this feed. You can configure blocks to be displayed in the sidebar of your page. This setting lets you configure the number of news items to show in this feed's block. If you choose '0' this feed's block will be disabled.", array('@block-admin' => url('admin/build/block'))), + ); + } +} +/** * Add/edit/delete an aggregator item. * * @param $edit @@ -130,7 +175,7 @@ 'description' => $edit['description'], 'guid' => $edit['guid'], 'timestamp' => $edit['timestamp'], - 'fid' => $edit['fid'], + 'nid' => $edit['nid'], )) ->execute(); } @@ -144,7 +189,7 @@ } elseif ($edit['title'] && $edit['link']) { // file the items in the categories indicated by the feed - $result = db_query('SELECT cid FROM {aggregator_category_feed} WHERE fid = :fid', array(':fid' => $edit['fid'])); + $result = db_query('SELECT cid FROM {aggregator_category_feed} WHERE nid = :nid', array(':nid' => $edit['nid'])); foreach ($result as $category) { db_merge('aggregator_category_item') ->key(array('iid' => $edit['iid'])) @@ -157,6 +202,27 @@ } /** + * Saves a feed node's category associations. + */ +function aggregator_processor_save_feed_category($node) { + db_delete('aggregator_category_feed') + ->condition('nid', $node->nid) + ->execute(); + if (@is_array($node->feed['category'])) { + foreach ($node->feed['category'] as $key => $value) { + if (!empty($value)) { + db_insert('aggregator_category_feed') + ->fields(array( + 'nid' => $node->nid, + 'cid' => $value, + )) + ->execute(); + } + } + } +} + +/** * Expire feed items on $feed that are older than aggregator_clear. * * @param $feed @@ -165,7 +231,7 @@ function aggregator_expire($feed) { // Remove all items that are older than flush item timer. $age = REQUEST_TIME - variable_get('aggregator_clear', 9676800); - $iids = db_query('SELECT iid FROM {aggregator_item} WHERE fid = :fid AND timestamp < :timestamp', array(':fid' => $feed->fid, ':timestamp' => $age))->fetchCol(); + $iids = db_query('SELECT iid FROM {aggregator_item} WHERE nid = :nid AND timestamp < :timestamp', array(':nid' => $feed->nid, ':timestamp' => $age))->fetchCol(); if ($iids) { db_delete('aggregator_category_item') ->condition('iid', $iids, 'IN') Index: modules/aggregator/aggregator.test =================================================================== RCS file: /cvs/drupal/drupal/modules/aggregator/aggregator.test,v retrieving revision 1.18 diff -u -r1.18 aggregator.test --- modules/aggregator/aggregator.test 22 Jan 2009 12:59:32 -0000 1.18 +++ modules/aggregator/aggregator.test 29 Jan 2009 01:02:14 -0000 @@ -6,7 +6,7 @@ function setUp() { parent::setUp('aggregator'); - $web_user = $this->drupalCreateUser(array('administer news feeds', 'access news feeds', 'create article content')); + $web_user = $this->drupalCreateUser(array('administer news feeds', 'access news feeds', 'create article content', 'create feed content', 'edit any feed content', 'delete any feed content')); $this->drupalLogin($web_user); } @@ -17,10 +17,10 @@ */ function createFeed() { $edit = $this->getFeedEditArray(); - $this->drupalPost('admin/content/aggregator/add/feed', $edit, t('Save')); - $this->assertRaw(t('The feed %name has been added.', array('%name' => $edit['title'])), t('The feed !name has been added.', array('!name' => $edit['title']))); + $this->drupalPost('node/add/feed', $edit, t('Save')); + $this->assertRaw(t('Feed %name has been created.', array('%name' => $edit['title'])), t('The feed !name has been added.', array('!name' => $edit['title']))); - $feed = db_query("SELECT * FROM {aggregator_feed} WHERE title = :title AND url = :url", array(':title' => $edit['title'], ':url' => $edit['url']))->fetch(); + $feed = db_query("SELECT * FROM {aggregator_feed} f INNER JOIN {node} n ON n.nid = f.nid WHERE n.title = :title AND f.url = :url", array(':title' => $edit['title'], ':url' => $edit['feed[url]']))->fetch(); $this->assertTrue(!empty($feed), t('The feed found in database.')); return $feed; } @@ -31,8 +31,8 @@ * @param object $feed Feed object representing the feed. */ function deleteFeed($feed) { - $this->drupalPost('admin/content/aggregator/edit/feed/' . $feed->fid, array(), t('Delete')); - $this->assertRaw(t('The feed %title has been deleted.', array('%title' => $feed->title)), t('Feed deleted successfully.')); + $this->drupalPost('node/' . $feed->nid . '/delete', array(), t('Delete')); + $this->assertRaw(t('Feed %title has been deleted.', array('%title' => $feed->title)), t('Feed deleted successfully.')); } /** @@ -45,14 +45,14 @@ $feed_url = url(NULL, array('absolute' => TRUE)) . 'rss.xml?feed=' . $feed_name; $edit = array( 'title' => $feed_name, - 'url' => $feed_url, - 'refresh' => '900', + 'feed[url]' => $feed_url, + 'feed[refresh]' => '900', ); return $edit; } /** - * Update feed items (simulate click to admin/content/aggregator/update/$fid). + * Update feed items (simulate click to node/$nid/update). * * @param object $feed Feed object representing the feed. */ @@ -67,10 +67,10 @@ $feed_count = $feed_count > 10 ? 10 : $feed_count; // Refresh the feed (simulated link click). - $this->drupalGet('admin/content/aggregator/update/' . $feed->fid); + $this->drupalGet('node/' . $feed->nid . '/update'); // Ensure we have the right number of items. - $result = db_query('SELECT iid FROM {aggregator_item} WHERE fid = :fid', array(':fid' => $feed->fid)); + $result = db_query('SELECT iid FROM {aggregator_item} WHERE nid = :nid', array(':nid' => $feed->nid)); $items = array(); $feed->items = array(); foreach ($result as $item) { @@ -86,7 +86,7 @@ * @param object $feed Feed object representing the feed. */ function removeFeedItems($feed) { - $this->drupalPost('admin/content/aggregator/remove/' . $feed->fid, array(), t('Remove items')); + $this->drupalPost('node/' . $feed->nid . '/remove-items', array(), t('Remove items')); $this->assertRaw(t('The news items from %title have been removed.', array('%title' => $feed->title)), t('Feed items removed.')); } @@ -97,7 +97,7 @@ */ function getFeedCategories($feed) { // add the categories to the feed so we can use them - $result = db_query('SELECT cid FROM {aggregator_category_feed} WHERE fid = :fid', array(':fid' => $feed->fid)); + $result = db_query('SELECT cid FROM {aggregator_category_feed} WHERE nid = :nid', array(':nid' => $feed->nid)); foreach ($result as $category) { $feed->categories[] = $category->cid; } @@ -111,7 +111,7 @@ * @return boolean Feed is unique. */ function uniqueFeed($feed_name, $feed_url) { - $result = db_query("SELECT COUNT(*) FROM {aggregator_feed} WHERE title = :title AND url = :url", array(':title' => $feed_name, ':url' => $feed_url))->fetchField(); + $result = db_query("SELECT COUNT(*) FROM {aggregator_feed} f INNER JOIN {node} n ON n.nid = f.nid WHERE n.title = :title AND f.url = :url", array(':title' => $feed_name, ':url' => $feed_url))->fetchField(); return (1 == $result); } @@ -132,18 +132,18 @@ -