aggregator.module 54.8 KB
Newer Older
1
<?php
Dries's avatar
Dries committed
2
// $Id$
Dries's avatar
 
Dries committed
3

Dries's avatar
 
Dries committed
4 5
/**
 * @file
6
 * Used to aggregate syndicated content (RSS, RDF, and Atom).
Dries's avatar
 
Dries committed
7 8
 */

Dries's avatar
 
Dries committed
9 10 11
/**
 * Implementation of hook_help().
 */
Dries's avatar
 
Dries committed
12
function aggregator_help($section) {
Dries's avatar
 
Dries committed
13
  switch ($section) {
Kjartan's avatar
Kjartan committed
14
    case 'admin/help#aggregator':
15
      $output = '<p>'. t('The news aggregator is a powerful on-site RSS syndicator/news reader that can gather fresh content from news sites and weblogs around the web.') .'</p>';
16 17
      $output .= '<p>'. t('Users can view the latest news chronologically in the <a href="@aggregator">main news aggregator display</a> or by <a href="@aggregator-sources">source</a>. Administrators can add, edit and delete feeds and choose how often to check for newly updated news for each individual feed. Administrators can also tag individual feeds with categories, offering selective grouping of some feeds into separate displays. Listings of the latest news for individual sources or categorized sources can be enabled as blocks for display in the sidebar through the <a href="@admin-block">block administration page</a>. The news aggregator requires cron to check for the latest news from the sites to which you have subscribed. Drupal also provides a <a href="@aggregator-opml">machine-readable OPML file</a> of all of your subscribed feeds.', array('@aggregator' => url('aggregator'), '@aggregator-sources' => url('aggregator/sources'), '@admin-block' => url('admin/build/block'), '@aggregator-opml' => url('aggregator/opml'))) .'</p>';
      $output .= '<p>'. t('For more information please read the configuration and customization handbook <a href="@aggregator">Aggregator page</a>.', array('@aggregator' => 'http://drupal.org/handbook/modules/aggregator/')) .'</p>';
18
      return $output;
19
    case 'admin/content/aggregator':
20
      return '<p>'. t('Thousands of sites (particularly news sites and weblogs) publish their latest headlines and/or stories in a machine-readable format so that other sites can easily link to them. This content is usually in the form of an <a href="http://blogs.law.harvard.edu/tech/rss">RSS</a> feed (which is an XML-based syndication standard). To display the feed or category in a block you must decide how many items to show by editing the feed or block and turning on the <a href="@block">feed\'s block</a>.', array('@block' => url('admin/build/block'))) .'</p>';
21
    case 'admin/content/aggregator/add/feed':
22
      return '<p>'. t('Add a site that has an RSS/RDF/Atom feed. The URL is the full path to the feed file. For the feed to update automatically you must run "cron.php" on a regular basis. If you already have a feed with the URL you are planning to use, the system will not accept another feed with the same URL.') .'</p>';
23
    case 'admin/content/aggregator/add/category':
24
      return '<p>'. t('Categories provide a way to group items from different news feeds together. Each news category has its own feed page and block. For example, you could tag various sport-related feeds as belonging to a category called <em>Sports</em>. News items can be added to a category automatically by setting a feed to automatically place its item into that category, or by using the categorize items link in any listing of news items.') .'</p>';
Dries's avatar
 
Dries committed
25
  }
26 27
}

28 29 30
/**
 * Implementation of hook_menu().
 */
31 32 33 34 35 36 37 38 39 40 41 42 43
function aggregator_menu() {
  $items['admin/content/aggregator'] = array(
    'title' => t('News aggregator'),
    'description' => t("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' => t('Add feed'),
    'page callback' => 'drupal_get_form',
    'page arguments' => array('aggregator_form_feed'),
    'access arguments' => array('administer news feeds'),
    'type' => MENU_LOCAL_TASK,
44
    'parent' => 'admin/content/aggregator',
45 46 47 48 49 50 51
  );
  $items['admin/content/aggregator/add/category'] = array(
    'title' => t('Add category'),
    'page callback' => 'drupal_get_form',
    'page arguments' => array('aggregator_form_category'),
    'access arguments' => array('administer news feeds'),
    'type' => MENU_LOCAL_TASK,
52
    'parent' => 'admin/content/aggregator',
53
  );
54
  $items['admin/content/aggregator/remove/%aggregator_feed'] = array(
55 56 57 58 59 60
    'title' => t('Remove items'),
    'page callback' => 'aggregator_admin_remove_feed',
    'page arguments' => array(4),
    'access arguments' => array('administer news feeds'),
    'type' => MENU_CALLBACK,
  );
61
  $items['admin/content/aggregator/update/%aggregator_feed'] = array(
62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118
    'title' => t('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' => t('List'),
    'type' => MENU_DEFAULT_LOCAL_TASK,
    'weight' => -10,
  );
  $items['admin/content/aggregator/settings'] = array(
    'title' => t('Settings'),
    'page callback' => 'drupal_get_form',
    'page arguments' => array('aggregator_admin_settings'),
    'type' => MENU_LOCAL_TASK,
    'weight' => 10,
    'access arguments' => array('administer news feeds'),
  );
  $items['aggregator'] = array(
    'title' => t('News aggregator'),
    'page callback' => 'aggregator_page_last',
    'access arguments' => array('access news feeds'),
    'weight' => 5,
  );
  $items['aggregator/sources'] = array(
    'title' => t('Sources'),
    'page callback' => 'aggregator_page_sources',
    'access arguments' => array('access news feeds'));
  $items['aggregator/categories'] = array(
    'title' => t('Categories'),
    'page callback' => 'aggregator_page_categories',
    'access arguments' => array('access news feeds'),
    'type' => MENU_ITEM_GROUPING,
  );
  $items['aggregator/rss'] = array(
    'title' => t('RSS feed'),
    'page callback' => 'aggregator_page_rss',
    'access arguments' => array('access news feeds'),
    'type' => MENU_CALLBACK,
  );
  $items['aggregator/opml'] = array(
    'title' => t('OPML feed'),
    'page callback' => 'aggregator_page_opml',
    'access arguments' => array('access news feeds'),
    'type' => MENU_CALLBACK,
  );
  $result = db_query('SELECT title, cid FROM {aggregator_category} ORDER BY title');
  while ($category = db_fetch_array($result)) {
    $path = 'aggregator/categories/'. $category['cid'];
    $items[$path] = array(
      'title' => $category['title'],
      'page callback' => 'aggregator_page_category',
      'access arguments' => array('access news feeds'),
    );
    $items[$path .'/view'] = array(
      'title' => t('View'),
119
      'type' => MENU_DEFAULT_LOCAL_TASK,
120 121 122 123 124 125 126
      'weight' => -10,
    );
    $items[$path .'/categorize'] = array(
      'title' => t('Categorize'),
      'page callback' => 'drupal_get_form',
      'page arguments' => array('aggregator_page_category'),
      'access arguments' => array('administer news feeds', 2),
127
      'type' => MENU_LOCAL_TASK,
128 129 130 131 132 133 134 135 136
    );
    $items[$path .'/configure'] = array(
      'title' => t('Configure'),
      'page callback' => 'drupal_get_form',
      'page arguments' => array('aggregator_form_category', 2),
      'access arguments' => array('administer news feeds', 2),
      'type' => MENU_LOCAL_TASK,
      'weight' => 1,
    );
137
  }
138
  $items['aggregator/sources/%aggregator_feed'] = array(
139 140 141
    'page callback' => 'aggregator_page_source',
    'type' => MENU_CALLBACK,
  );
142
  $items['aggregator/sources/%aggregator_feed/view'] = array(
143 144 145 146
    'title' => t('View'),
    'type' => MENU_DEFAULT_LOCAL_TASK,
    'weight' => -10,
  );
147
  $items['aggregator/sources/%aggregator_feed/categorize'] = array(
148 149 150 151 152 153
    'title' => t('Categorize'),
    'page callback' => 'drupal_get_form',
    'page arguments' => array('aggregator_page_source'),
    'access arguments' => array('administer news feeds'),
    'type' => MENU_LOCAL_TASK,
  );
154
  $items['aggregator/sources/%aggregator_feed/configure'] = array(
155 156 157 158 159 160 161
    'title' => t('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,
  );
162
  $items['admin/content/aggregator/edit/feed/%aggregator_feed'] = array(
163 164 165 166 167 168
    'title' => t('Edit feed'),
    'page callback' => 'drupal_get_form',
    'page arguments' => array('aggregator_form_feed', 5),
    'access arguments' => array('administer news feeds'),
    'type' => MENU_CALLBACK,
  );
169
  $items['admin/content/aggregator/edit/category/%aggregator_category'] = array(
170 171 172 173 174 175
    'title' => t('Edit category'),
    'page callback' => 'drupal_get_form',
    'page arguments' => array('aggregator_form_category', 5),
    'access arguments' => array('administer news feeds'),
    'type' => MENU_CALLBACK,
  );
176 177 178 179

  return $items;
}

180 181 182 183
function aggregator_init() {
  drupal_add_css(drupal_get_path('module', 'aggregator') .'/aggregator.css');
}

Dries's avatar
Dries committed
184
function aggregator_admin_settings() {
185
  $items = array(0 => t('none')) + drupal_map_assoc(array(3, 5, 10, 15, 20, 25), '_aggregator_items');
186
  $period = drupal_map_assoc(array(3600, 10800, 21600, 32400, 43200, 86400, 172800, 259200, 604800, 1209600, 2419200, 4838400, 9676800), 'format_interval');
Dries's avatar
 
Dries committed
187

188
  $form['aggregator_allowed_html_tags'] = array(
189 190 191
    '#type' => 'textfield', '#title' => t('Allowed HTML tags'), '#size' => 80, '#maxlength' => 255,
    '#default_value' => variable_get('aggregator_allowed_html_tags', '<a> <b> <br> <dd> <dl> <dt> <em> <i> <li> <ol> <p> <strong> <u> <ul>'),
    '#description' => t('The list of tags which are allowed in feeds, i.e., which will not be removed by Drupal.')
192 193 194
  );

  $form['aggregator_summary_items'] = array(
195 196 197
    '#type' => 'select', '#title' => t('Items shown in sources and categories pages') ,
    '#default_value' => variable_get('aggregator_summary_items', 3), '#options' => $items,
    '#description' =>  t('The number of items which will be shown with each feed or category in the feed and category summary pages.')
198 199 200
  );

  $form['aggregator_clear'] = array(
201 202
    '#type' => 'select', '#title' => t('Discard news items older than'),
    '#default_value' => variable_get('aggregator_clear', 9676800), '#options' => $period,
203
    '#description' => t('Older news items will be automatically discarded. Requires crontab.')
204
  );
205

206
  $form['aggregator_category_selector'] = array(
207
    '#type' => 'radios', '#title' => t('Category selection type'), '#default_value' => variable_get('aggregator_category_selector', 'checkboxes'),
208
    '#options' => array('checkboxes' => t('checkboxes'), 'select' => t('multiple selector')),
209
    '#description' => t('The type of category selection widget which is shown on categorization pages. Checkboxes are easier to use; a multiple selector is good for working with large numbers of categories.')
210
  );
Dries's avatar
Dries committed
211

212
  return system_settings_form($form);
Dries's avatar
 
Dries committed
213 214
}

Dries's avatar
 
Dries committed
215 216 217
/**
 * Implementation of hook_perm().
 */
Kjartan's avatar
Kjartan committed
218
function aggregator_perm() {
Dries's avatar
 
Dries committed
219
  return array('administer news feeds', 'access news feeds');
Dries's avatar
 
Dries committed
220 221
}

Dries's avatar
 
Dries committed
222 223 224 225 226
/**
 * Implementation of hook_cron().
 *
 * Checks news feeds for updates once their refresh interval has elapsed.
 */
Dries's avatar
 
Dries committed
227
function aggregator_cron() {
Dries's avatar
 
Dries committed
228
  $result = db_query('SELECT * FROM {aggregator_feed} WHERE checked + refresh < %d', time());
Dries's avatar
 
Dries committed
229 230
  while ($feed = db_fetch_array($result)) {
    aggregator_refresh($feed);
Dries's avatar
 
Dries committed
231 232 233
  }
}

Dries's avatar
 
Dries committed
234 235 236 237 238
/**
 * Implementation of hook_block().
 *
 * Generates blocks for the latest news items in each category and feed.
 */
239
function aggregator_block($op = 'list', $delta = 0, $edit = array()) {
Dries's avatar
 
Dries committed
240
  if (user_access('access news feeds')) {
Dries's avatar
 
Dries committed
241
    if ($op == 'list') {
Dries's avatar
Dries committed
242
      $result = db_query('SELECT cid, title FROM {aggregator_category} ORDER BY title');
Dries's avatar
 
Dries committed
243
      while ($category = db_fetch_object($result)) {
244
        $block['category-'. $category->cid]['info'] = t('!title category latest items', array('!title' => $category->title));
Kjartan's avatar
Kjartan committed
245
      }
Dries's avatar
Dries committed
246
      $result = db_query('SELECT fid, title FROM {aggregator_feed} ORDER BY fid');
Kjartan's avatar
Kjartan committed
247
      while ($feed = db_fetch_object($result)) {
248
        $block['feed-'. $feed->fid]['info'] = t('!title feed latest items', array('!title' => $feed->title));
Kjartan's avatar
Kjartan committed
249
      }
Dries's avatar
 
Dries committed
250
    }
Dries's avatar
Dries committed
251
    else if ($op == 'configure') {
252
      list($type, $id) = explode('-', $delta);
Dries's avatar
Dries committed
253 254 255 256 257 258
      if ($type == 'category') {
        $value = db_result(db_query('SELECT block FROM {aggregator_category} WHERE cid = %d', $id));
      }
      else {
        $value = db_result(db_query('SELECT block FROM {aggregator_feed} WHERE fid = %d', $id));
      }
259
      $form['block'] = array('#type' => 'select', '#title' => t('Number of news items in block'), '#default_value' => $value, '#options' => drupal_map_assoc(array(2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20)));
260
      return $form;
Dries's avatar
Dries committed
261 262
    }
    else if ($op == 'save') {
263
      list($type, $id) = explode('-', $delta);
Dries's avatar
Dries committed
264 265 266 267 268 269 270
      if ($type == 'category') {
        $value = db_query('UPDATE {aggregator_category} SET block = %d WHERE cid = %d', $edit['block'], $id);
      }
      else {
        $value = db_query('UPDATE {aggregator_feed} SET block = %d WHERE fid = %d', $edit['block'], $id);
      }
    }
271
    else if ($op == 'view') {
272
      list($type, $id) = explode('-', $delta);
Kjartan's avatar
Kjartan committed
273
      switch ($type) {
Dries's avatar
 
Dries committed
274
        case 'feed':
275
          if ($feed = db_fetch_object(db_query('SELECT fid, title, block FROM {aggregator_feed} WHERE fid = %d', $id))) {
276
            $block['subject'] = check_plain($feed->title);
277
            $result = db_query_range('SELECT * FROM {aggregator_item} WHERE fid = %d ORDER BY timestamp DESC, iid DESC', $feed->fid, 0, $feed->block);
278
            $read_more = '<div class="more-link">'. l(t('more'), 'aggregator/sources/'. $feed->fid, array('title' => t("View this feed's recent news."))) .'</div>';
279
          }
Kjartan's avatar
Kjartan committed
280
          break;
281

Dries's avatar
 
Dries committed
282
        case 'category':
283
          if ($category = db_fetch_object(db_query('SELECT cid, title, block FROM {aggregator_category} WHERE cid = %d', $id))) {
284
            $block['subject'] = check_plain($category->title);
285
            $result = db_query_range('SELECT i.* FROM {aggregator_category_item} ci LEFT JOIN {aggregator_item} i ON ci.iid = i.iid WHERE ci.cid = %d ORDER BY i.timestamp DESC, i.iid DESC', $category->cid, 0, $category->block);
286
            $read_more = '<div class="more-link">'. l(t('more'), 'aggregator/categories/'. $category->cid, array('title' => t("View this category's recent news."))) .'</div>';
287
          }
Kjartan's avatar
Kjartan committed
288 289
          break;
      }
Dries's avatar
 
Dries committed
290 291
      $items = array();
      while ($item = db_fetch_object($result)) {
Dries's avatar
 
Dries committed
292
        $items[] = theme('aggregator_block_item', $item);
Dries's avatar
 
Dries committed
293
      }
294 295 296 297 298

      // Only display the block if there are items to show.
      if (count($items) > 0) {
        $block['content'] = theme('item_list', $items) . $read_more;
      }
Dries's avatar
 
Dries committed
299
    }
300 301 302
    if (isset($block)) {
      return $block;
    }
Dries's avatar
 
Dries committed
303
  }
Dries's avatar
 
Dries committed
304 305
}

306 307 308 309 310 311 312 313 314 315 316 317 318 319
/**
 * Generate a form to add/edit/delete aggregator categories.
 */
 function aggregator_form_category($edit = array()) {
  $form['title'] = array('#type' => 'textfield',
    '#title' => t('Title'),
    '#default_value' => $edit['title'],
    '#maxlength' => 64,
    '#required' => TRUE,
  );
  $form['description'] = array('#type' => 'textarea',
    '#title' => t('Description'),
    '#default_value' => $edit['description'],
  );
320
  $form['submit'] = array('#type' => 'submit', '#value' => t('Submit'));
321 322

  if ($edit['cid']) {
323
    $form['delete'] = array('#type' => 'submit', '#value' => t('Delete'));
324 325 326
    $form['cid'] = array('#type' => 'hidden', '#value' => $edit['cid']);
  }

327
  return $form;
328 329 330 331 332 333
}

/**
 * Validate aggregator_form_feed form submissions.
 */
function aggregator_form_category_validate($form_id, $form_values) {
334
  if ($form_values['op'] == t('Submit')) {
335 336 337 338 339 340 341 342
    // Check for duplicate titles
    if (isset($form_values['cid'])) {
      $category = db_fetch_object(db_query("SELECT cid FROM {aggregator_category} WHERE title = '%s' AND cid != %d", $form_values['title'], $form_values['cid']));
    }
    else {
      $category = db_fetch_object(db_query("SELECT cid FROM {aggregator_category} WHERE title = '%s'", $form_values['title']));
    }
    if ($category) {
343
      form_set_error('title', t('A category named %category already exists. Please enter a unique title.', array('%category' => $form_values['title'])));
344 345 346 347 348 349 350 351 352
    }
  }
}

/**
 * Process aggregator_form_category form submissions.
 * @todo Add delete confirmation dialog.
 */
function aggregator_form_category_submit($form_id, $form_values) {
353
  if ($form_values['op'] == t('Delete')) {
354 355 356 357 358 359 360 361
    $title = $form_values['title'];
    // Unset the title:
    unset($form_values['title']);
  }
  aggregator_save_category($form_values);
  menu_rebuild();
  if (isset($form_values['cid'])) {
    if (isset($form_values['title'])) {
362
      drupal_set_message(t('The category %category has been updated.', array('%category' => $form_values['title'])));
363
      if (arg(0) == 'admin') {
364
        return 'admin/content/aggregator/';
365 366 367 368 369 370
      }
      else {
        return 'aggregator/categories/'. $form_values['cid'];
      }
    }
    else {
371 372
      watchdog('aggregator', t('Category %category deleted.', array('%category' => $title)));
      drupal_set_message(t('The category %category has been deleted.', array('%category' => $title)));
373
      if (arg(0) == 'admin') {
374
        return 'admin/content/aggregator/';
375 376 377 378 379 380 381
      }
      else {
        return 'aggregator/categories/';
      }
    }
  }
  else {
382 383
    watchdog('aggregator', t('Category %category added.', array('%category' => $form_values['title'])), WATCHDOG_NOTICE, l(t('view'), 'admin/content/aggregator'));
    drupal_set_message(t('The category %category has been added.', array('%category' => $form_values['title'])));
384 385 386 387 388 389 390 391 392 393 394 395 396 397 398 399 400 401 402 403 404 405 406 407 408 409 410 411 412 413 414 415 416
  }
}

/**
 * Add/edit/delete aggregator categories.
 */
function aggregator_save_category($edit) {
  if ($edit['cid'] && $edit['title']) {
    db_query("UPDATE {aggregator_category} SET title = '%s', description = '%s' WHERE cid = %d", $edit['title'], $edit['description'], $edit['cid']);
  }
  else if ($edit['cid']) {
    db_query('DELETE FROM {aggregator_category} WHERE cid = %d', $edit['cid']);
  }
  else if ($edit['title']) {
    // A single unique id for bundles and feeds, to use in blocks
    $next_id = db_next_id('{aggregator_category}_cid');
    db_query("INSERT INTO {aggregator_category} (cid, title, description, block) VALUES (%d, '%s', '%s', 5)", $next_id, $edit['title'], $edit['description']);
  }
}

/**
 * Generate a form to add/edit feed sources.
 */
function aggregator_form_feed($edit = array()) {
  $period = drupal_map_assoc(array(900, 1800, 3600, 7200, 10800, 21600, 32400, 43200, 64800, 86400, 172800, 259200, 604800, 1209600, 2419200), 'format_interval');

  if ($edit['refresh'] == '') {
    $edit['refresh'] = 3600;
  }

  $form['title'] = array('#type' => 'textfield',
    '#title' => t('Title'),
    '#default_value' => $edit['title'],
417
    '#maxlength' => 255,
418
    '#description' => t('The name of the feed; typically the name of the website you syndicate content from.'),
419 420 421 422 423 424 425 426 427 428 429 430 431 432 433 434 435 436 437 438 439
    '#required' => TRUE,
  );
  $form['url'] = array('#type' => 'textfield',
    '#title' => t('URL'),
    '#default_value' => $edit['url'],
    '#maxlength' => 255,
    '#description' => t('The fully-qualified URL of the feed.'),
    '#required' => TRUE,
  );
  $form['refresh'] = array('#type' => 'select',
    '#title' => t('Update interval'),
    '#default_value' => $edit['refresh'],
    '#options' => $period,
    '#description' => t('The refresh interval indicating how often you want to update this feed. Requires crontab.'),
  );

  // Handling of categories:
  $options = array();
  $values = array();
  $categories = db_query('SELECT c.cid, c.title, f.fid FROM {aggregator_category} c LEFT JOIN {aggregator_category_feed} f ON c.cid = f.cid AND f.fid = %d ORDER BY title', $edit['fid']);
  while ($category = db_fetch_object($categories)) {
440 441
    $options[$category->cid] = check_plain($category->title);
    if ($category->fid) $values[] = $category->cid;
442 443 444 445 446 447 448 449 450
  }
  if ($options) {
    $form['category'] = array('#type' => 'checkboxes',
      '#title' => t('Categorize news items'),
      '#default_value' => $values,
      '#options' => $options,
      '#description' => t('New items in this feed will be automatically filed in the checked categories as they are received.'),
    );
  }
451
  $form['submit'] = array('#type' => 'submit', '#value' => t('Submit'));
452 453

  if ($edit['fid']) {
454
    $form['delete'] = array('#type' => 'submit', '#value' => t('Delete'));
455 456 457
    $form['fid'] = array('#type' => 'hidden', '#value' => $edit['fid']);
  }

458
  return $form;
459 460 461 462 463 464
}

/**
 * Validate aggregator_form_feed form submissions.
 */
function aggregator_form_feed_validate($form_id, $form_values) {
465
  if ($form_values['op'] == t('Submit')) {
466 467 468 469 470 471 472 473 474
    // Check for duplicate titles
    if (isset($form_values['fid'])) {
      $result = db_query("SELECT title, url FROM {aggregator_feed} WHERE (title = '%s' OR url='%s') AND fid != %d", $form_values['title'], $form_values['url'], $form_values['fid']);
    }
    else {
      $result = db_query("SELECT title, url FROM {aggregator_feed} WHERE title = '%s' OR url='%s'", $form_values['title'], $form_values['url']);
    }
    while ($feed = db_fetch_object($result)) {
      if (strcasecmp($feed->title, $form_values['title']) == 0) {
475
        form_set_error('title', t('A feed named %feed already exists. Please enter a unique title.', array('%feed' => $form_values['title'])));
476
      }
477 478 479
      if (strcasecmp($feed->url, $form_values['url']) == 0) {
        form_set_error('url', t('A feed with this URL %url already exists. Please enter a unique URL.', array('%url' => $form_values['url'])));
      }
480 481 482 483 484 485 486 487 488
    }
  }
}

/**
 * Process aggregator_form_feed form submissions.
 * @todo Add delete confirmation dialog.
 */
function aggregator_form_feed_submit($form_id, $form_values) {
489
  if ($form_values['op'] == t('Delete')) {
490 491 492 493 494 495 496 497
    $title = $form_values['title'];
    // Unset the title:
    unset($form_values['title']);
  }
  aggregator_save_feed($form_values);
  menu_rebuild();
  if (isset($form_values['fid'])) {
    if (isset($form_values['title'])) {
498
      drupal_set_message(t('The feed %feed has been updated.', array('%feed' => $form_values['title'])));
499
      if (arg(0) == 'admin') {
500
        return 'admin/content/aggregator/';
501 502 503 504 505 506
      }
      else {
        return 'aggregator/sources/'. $form_values['fid'];
      }
    }
    else {
507 508
      watchdog('aggregator', t('Feed %feed deleted.', array('%feed' => $title)));
      drupal_set_message(t('The feed %feed has been deleted.', array('%feed' => $title)));
509
      if (arg(0) == 'admin') {
510
        return 'admin/content/aggregator/';
511 512 513 514 515 516 517
      }
      else {
        return 'aggregator/sources/';
      }
    }
  }
  else {
518 519
    watchdog('aggregator', t('Feed %feed added.', array('%feed' => $form_values['title'])), WATCHDOG_NOTICE, l(t('view'), 'admin/content/aggregator'));
    drupal_set_message(t('The feed %feed has been added.', array('%feed' => $form_values['title'])));
520 521 522 523 524 525 526 527 528 529 530 531 532 533 534 535 536 537 538 539 540 541 542 543 544 545 546 547 548 549 550 551 552 553 554 555 556 557 558 559 560 561
  }
}

/**
 * Add/edit/delete an aggregator feed.
 */
function aggregator_save_feed($edit) {
  if ($edit['fid']) {
    // An existing feed is being modified, delete the category listings.
    db_query('DELETE FROM {aggregator_category_feed} WHERE fid = %d', $edit['fid']);
  }
  if ($edit['fid'] && $edit['title']) {
    db_query("UPDATE {aggregator_feed} SET title = '%s', url = '%s', refresh = %d WHERE fid = %d", $edit['title'], $edit['url'], $edit['refresh'], $edit['fid']);
  }
  else if ($edit['fid']) {
    $result = db_query('SELECT iid FROM {aggregator_item} WHERE fid = %d', $edit['fid']);
    while ($item = db_fetch_object($result)) {
      $items[] = "iid = $item->iid";
    }
    if ($items) {
      db_query('DELETE FROM {aggregator_category_item} WHERE '. implode(' OR ', $items));
    }
    db_query('DELETE FROM {aggregator_feed} WHERE fid = %d', $edit['fid']);
    db_query('DELETE FROM {aggregator_item} WHERE fid = %d', $edit['fid']);
  }
  else if ($edit['title']) {
    // A single unique id for bundles and feeds, to use in blocks.
    $edit['fid'] = db_next_id('{aggregator_feed}_fid');
    db_query("INSERT INTO {aggregator_feed} (fid, title, url, refresh, block) VALUES (%d, '%s', '%s', %d, 5)", $edit['fid'], $edit['title'], $edit['url'], $edit['refresh']);
  }
  if ($edit['title']) {
    // The feed is being saved, save the categories as well.
    if ($edit['category']) {
      foreach ($edit['category'] as $cid => $value) {
        if ($value) {
          db_query('INSERT INTO {aggregator_category_feed} (fid, cid) VALUES (%d, %d)', $edit['fid'], $cid);
        }
      }
    }
  }
}

Dries's avatar
 
Dries committed
562 563 564 565
function aggregator_remove($feed) {
  $result = db_query('SELECT iid FROM {aggregator_item} WHERE fid = %d', $feed['fid']);
  while ($item = db_fetch_object($result)) {
    $items[] = "iid = $item->iid";
Dries's avatar
 
Dries committed
566
  }
Dries's avatar
 
Dries committed
567 568
  if ($items) {
    db_query('DELETE FROM {aggregator_category_item} WHERE '. implode(' OR ', $items));
Dries's avatar
 
Dries committed
569
  }
Dries's avatar
 
Dries committed
570
  db_query('DELETE FROM {aggregator_item} WHERE fid = %d', $feed['fid']);
Kjartan's avatar
Kjartan committed
571
  db_query("UPDATE {aggregator_feed} SET checked = 0, etag = '', modified = 0 WHERE fid = %d", $feed['fid']);
572
  drupal_set_message(t('The news items from %site have been removed.', array('%site' => $feed['title'])));
Dries's avatar
 
Dries committed
573 574
}

Dries's avatar
 
Dries committed
575 576 577
/**
 * Call-back function used by the XML parser.
 */
Kjartan's avatar
Kjartan committed
578
function aggregator_element_start($parser, $name, $attributes) {
579
  global $item, $element, $tag, $items, $channel;
Dries's avatar
 
Dries committed
580 581

  switch ($name) {
Dries's avatar
 
Dries committed
582 583
    case 'IMAGE':
    case 'TEXTINPUT':
584 585 586 587 588 589
    case 'CONTENT':
    case 'SUMMARY':
    case 'TAGLINE':
    case 'SUBTITLE':
    case 'LOGO':
    case 'INFO':
Dries's avatar
 
Dries committed
590 591
      $element = $name;
      break;
592 593 594 595
    case 'ID':
      if ($element != 'ITEM') {
        $element = $name;
      }
596 597 598 599 600 601 602 603 604 605
    case 'LINK':
      if ($attributes['REL'] == 'alternate') {
        if ($element == 'ITEM') {
          $items[$item]['LINK'] = $attributes['HREF'];
        }
        else {
          $channel['LINK'] = $attributes['HREF'];
        }
      }
      break;
Dries's avatar
 
Dries committed
606
    case 'ITEM':
Dries's avatar
 
Dries committed
607 608
      $element = $name;
      $item += 1;
609 610 611 612 613
      break;
    case 'ENTRY':
      $element = 'ITEM';
      $item += 1;
      break;
614 615 616 617 618
  }

  $tag = $name;
}

Dries's avatar
 
Dries committed
619 620 621
/**
 * Call-back function used by the XML parser.
 */
Kjartan's avatar
Kjartan committed
622
function aggregator_element_end($parser, $name) {
Dries's avatar
 
Dries committed
623 624
  global $element;

Dries's avatar
 
Dries committed
625
  switch ($name) {
Dries's avatar
 
Dries committed
626 627 628
    case 'IMAGE':
    case 'TEXTINPUT':
    case 'ITEM':
629 630 631
    case 'ENTRY':
    case 'CONTENT':
    case 'INFO':
632 633
      $element = '';
      break;
634
    case 'ID':
635
      if ($element == 'ID') {
636 637
        $element = '';
      }
Dries's avatar
 
Dries committed
638
  }
639 640
}

Dries's avatar
 
Dries committed
641 642 643
/**
 * Call-back function used by the XML parser.
 */
Kjartan's avatar
Kjartan committed
644
function aggregator_element_data($parser, $data) {
Dries's avatar
 
Dries committed
645
  global $channel, $element, $items, $item, $image, $tag;
Dries's avatar
 
Dries committed
646
  switch ($element) {
Dries's avatar
 
Dries committed
647
    case 'ITEM':
Dries's avatar
 
Dries committed
648 649
      $items[$item][$tag] .= $data;
      break;
Dries's avatar
 
Dries committed
650
    case 'IMAGE':
651
    case 'LOGO':
Dries's avatar
 
Dries committed
652 653
      $image[$tag] .= $data;
      break;
654 655 656 657 658 659
    case 'LINK':
      if ($data) {
        $items[$item][$tag] .= $data;
      }
      break;
    case 'CONTENT':
660
      $items[$item]['CONTENT'] .= $data;
661 662
      break;
    case 'SUMMARY':
663
      $items[$item]['SUMMARY'] .= $data;
664 665 666 667 668 669 670
      break;
    case 'TAGLINE':
    case 'SUBTITLE':
      $channel['DESCRIPTION'] .= $data;
      break;
    case 'INFO':
    case 'ID':
Dries's avatar
 
Dries committed
671 672 673
    case 'TEXTINPUT':
      // The sub-element is not supported. However, we must recognize
      // it or its contents will end up in the item array.
Dries's avatar
 
Dries committed
674 675 676
      break;
    default:
      $channel[$tag] .= $data;
677 678 679
  }
}

Dries's avatar
 
Dries committed
680 681 682
/**
 * Checks a news feed for new items.
 */
Kjartan's avatar
Kjartan committed
683
function aggregator_refresh($feed) {
Dries's avatar
 
Dries committed
684 685
  global $channel, $image;

Dries's avatar
 
Dries committed
686 687 688 689 690 691
  // Generate conditional GET headers.
  $headers = array();
  if ($feed['etag']) {
    $headers['If-None-Match'] = $feed['etag'];
  }
  if ($feed['modified']) {
Dries's avatar
 
Dries committed
692
    $headers['If-Modified-Since'] = gmdate('D, d M Y H:i:s', $feed['modified']) .' GMT';
Dries's avatar
 
Dries committed
693 694 695 696 697
  }

  // Request feed.
  $result = drupal_http_request($feed['url'], $headers);

698
  // Process HTTP response code.
Dries's avatar
 
Dries committed
699 700
  switch ($result->code) {
    case 304:
Dries's avatar
 
Dries committed
701
      db_query('UPDATE {aggregator_feed} SET checked = %d WHERE fid = %d', time(), $feed['fid']);
702
      drupal_set_message(t('There is no new syndicated content from %site.', array('%site' => $feed['title'])));
Dries's avatar
 
Dries committed
703
      break;
Dries's avatar
 
Dries committed
704 705
    case 301:
      $feed['url'] = $result->redirect_url;
706
      watchdog('aggregator', t('Updated URL for feed %title to %url.', array('%title' => $feed['title'], '%url' => $feed['url'])));
707

Dries's avatar
 
Dries committed
708 709 710 711
    case 200:
    case 302:
    case 307:
      // Filter the input data:
712
     if (aggregator_parse_feed($result->data, $feed)) {
713

Dries's avatar
 
Dries committed
714 715 716
        if ($result->headers['Last-Modified']) {
          $modified = strtotime($result->headers['Last-Modified']);
        }
Dries's avatar
Dries committed
717

718 719 720 721 722
        /*
        ** Prepare the channel data:
        */

        foreach ($channel as $key => $value) {
723
          $channel[$key] = trim($value);
724 725
        }

Dries's avatar
 
Dries committed
726 727 728
        /*
        ** Prepare the image data (if any):
        */
Dries's avatar
 
Dries committed
729

Dries's avatar
 
Dries committed
730 731 732
        foreach ($image as $key => $value) {
          $image[$key] = trim($value);
        }
Dries's avatar
 
Dries committed
733

Dries's avatar
 
Dries committed
734
        if ($image['LINK'] && $image['URL'] && $image['TITLE']) {
735 736
          // Note, we should really use theme_image() here but that only works with local images it won't work with images fetched with a URL unless PHP version > 5
          $image = '<a href="'. check_url($image['LINK']) .'" class="feed-image"><img src="'. check_url($image['URL']) .'" alt="'. check_plain($image['TITLE']) .'" /></a>';
Dries's avatar
 
Dries committed
737
        }
Dries's avatar
 
Dries committed
738 739 740
        else {
          $image = NULL;
        }
Dries's avatar
 
Dries committed
741

Dries's avatar
 
Dries committed
742 743 744
        /*
        ** Update the feed data:
        */
Dries's avatar
 
Dries committed
745

746
        db_query("UPDATE {aggregator_feed} SET url = '%s', checked = %d, link = '%s', description = '%s', image = '%s', etag = '%s', modified = %d WHERE fid = %d", $feed['url'], time(), $channel['LINK'], $channel['DESCRIPTION'], $image, $result->headers['ETag'], $modified, $feed['fid']);
Dries's avatar
 
Dries committed
747

Dries's avatar
 
Dries committed
748 749 750
        /*
        ** Clear the cache:
        */
Dries's avatar
 
Dries committed
751

Dries's avatar
 
Dries committed
752
        cache_clear_all();
Dries's avatar
 
Dries committed
753

754 755
        watchdog('aggregator', t('There is new syndicated content from %site.', array('%site' => $feed['title'])));
        drupal_set_message(t('There is new syndicated content from %site.', array('%site' => $feed['title'])));
Dries's avatar
 
Dries committed
756 757
      }
      break;
Dries's avatar
 
Dries committed
758
    default:
759 760
      watchdog('aggregator', t('The feed from %site seems to be broken, due to "%error".', array('%site' => $feed['title'], '%error' => $result->code .' '. $result->error)), WATCHDOG_WARNING);
      drupal_set_message(t('The feed from %site seems to be broken, because of error "%error".', array('%site' => $feed['title'], '%error' => $result->code .' '. $result->error)));
Dries's avatar
 
Dries committed
761
  }
Dries's avatar
 
Dries committed
762
}
Dries's avatar
 
Dries committed
763

Dries's avatar
 
Dries committed
764 765 766 767
/**
 * Parse the W3C date/time format, a subset of ISO 8601. PHP date parsing
 * functions do not handle this format.
 * See http://www.w3.org/TR/NOTE-datetime for more information.
768
 * Originally from MagpieRSS (http://magpierss.sourceforge.net/).
Dries's avatar
 
Dries committed
769 770
 *
 * @param $date_str A string with a potentially W3C DTF date.
771
 * @return A timestamp if parsed successfully or -1 if not.
Dries's avatar
 
Dries committed
772 773 774 775 776 777 778 779 780 781 782 783 784 785 786 787 788 789 790 791 792 793 794 795 796
 */
function aggregator_parse_w3cdtf($date_str) {
  if (preg_match('/(\d{4})-(\d{2})-(\d{2})T(\d{2}):(\d{2})(:(\d{2}))?(?:([-+])(\d{2}):?(\d{2})|(Z))?/', $date_str, $match)) {
    list($year, $month, $day, $hours, $minutes, $seconds) = array($match[1], $match[2], $match[3], $match[4], $match[5], $match[6]);
    // calc epoch for current date assuming GMT
    $epoch = gmmktime($hours, $minutes, $seconds, $month, $day, $year);
    if ($match[10] != 'Z') { // Z is zulu time, aka GMT
      list($tz_mod, $tz_hour, $tz_min) = array($match[8], $match[9], $match[10]);
      // zero out the variables
      if (!$tz_hour) {
        $tz_hour = 0;
      }
      if (!$tz_min) {
        $tz_min = 0;
      }
      $offset_secs = (($tz_hour * 60) + $tz_min) * 60;
      // is timezone ahead of GMT?  then subtract offset
      if ($tz_mod == '+') {
        $offset_secs *= -1;
      }
      $epoch += $offset_secs;
    }
    return $epoch;
  }
  else {
797
    return FALSE;
Dries's avatar
 
Dries committed
798 799 800
  }
}

Dries's avatar
 
Dries committed
801
function aggregator_parse_feed(&$data, $feed) {
Dries's avatar
 
Dries committed
802
  global $items, $image, $channel;
Dries's avatar
 
Dries committed
803

Dries's avatar
 
Dries committed
804
  // Unset the global variables before we use them:
Dries's avatar
 
Dries committed
805
  unset($GLOBALS['element'], $GLOBALS['item'], $GLOBALS['tag']);
Dries's avatar
 
Dries committed
806
  $items = array();
Dries's avatar
 
Dries committed
807
  $image = array();
Dries's avatar
 
Dries committed
808
  $channel = array();
809

Dries's avatar
 
Dries committed
810 811
  // parse the data:
  $xml_parser = drupal_xml_parser_create($data);
Dries's avatar
 
Dries committed
812 813
  xml_set_element_handler($xml_parser, 'aggregator_element_start', 'aggregator_element_end');
  xml_set_character_data_handler($xml_parser, 'aggregator_element_data');
Dries's avatar
 
Dries committed
814

Dries's avatar
 
Dries committed
815
  if (!xml_parse($xml_parser, $data, 1)) {
816 817
    watchdog('aggregator', t('The feed from %site seems to be broken, due to an error "%error" on line %line.', array('%site' => $feed['title'], '%error' => xml_error_string(xml_get_error_code($xml_parser)), '%line' => xml_get_current_line_number($xml_parser))), WATCHDOG_WARNING);
    drupal_set_message(t('The feed from %site seems to be broken, because of error "%error" on line %line.', array('%site' => $feed['title'], '%error' => xml_error_string(xml_get_error_code($xml_parser)), '%line' => xml_get_current_line_number($xml_parser))), 'error');
Dries's avatar
 
Dries committed
818
    return 0;
Dries's avatar
 
Dries committed
819 820
  }
  xml_parser_free($xml_parser);
Dries's avatar
 
Dries committed
821

Dries's avatar
 
Dries committed
822 823
  /*
  ** We reverse the array such that we store the first item last,
824
  ** and the last item first. In the database, the newest item
Dries's avatar
 
Dries committed
825 826
  ** should be at the top.
  */
Dries's avatar
 
Dries committed
827

Dries's avatar
 
Dries committed
828
  $items = array_reverse($items);
Dries's avatar
 
Dries committed
829

830 831
  // Initialize variables
  $title = $link = $author = $description = $guid = NULL;
Dries's avatar
 
Dries committed
832
  foreach ($items as $item) {
833
    unset($title, $link, $author, $description, $guid);
834

Dries's avatar
 
Dries committed
835 836
    // Prepare the item:
    foreach ($item as $key => $value) {
837
      $item[$key] = trim($value);
Dries's avatar
 
Dries committed
838
    }
Dries's avatar
Dries committed
839

Dries's avatar
 
Dries committed
840
    /*
841
    ** Resolve the item's title. If no title is found, we use
Dries's avatar
 
Dries committed
842 843 844 845
    ** up to 40 characters of the description ending at a word
    ** boundary but not splitting potential entities.
    */

Dries's avatar
 
Dries committed
846 847
    if ($item['TITLE']) {
      $title = $item['TITLE'];
Dries's avatar
 
Dries committed
848 849
    }
    else {
Dries's avatar
 
Dries committed
850
      $title = preg_replace('/^(.*)[^\w;&].*?$/', "\\1", truncate_utf8($item['DESCRIPTION'], 40));
Dries's avatar
 
Dries committed
851
    }
Dries's avatar
 
Dries committed
852

Dries's avatar
 
Dries committed
853 854 855 856
    /*
    ** Resolve the items link.
    */

Dries's avatar
 
Dries committed
857 858
    if ($item['LINK']) {
      $link = $item['LINK'];
Dries's avatar
 
Dries committed
859 860
    }
    else {
Dries's avatar
 
Dries committed
861
      $link = $feed['link'];
Dries's avatar
 
Dries committed
862
    }
863 864 865
    if ($item['GUID']) {
      $guid = $item['GUID'];
    }
866

867 868 869
    /**
     * Atom feeds have a CONTENT and/or SUMMARY tag instead of a DESCRIPTION tag
     */
870 871
    if ($item['CONTENT:ENCODED']) {
      $item['DESCRIPTION'] = $item['CONTENT:ENCODED'];
872 873 874 875
    }
    else if ($item['SUMMARY']) {
      $item['DESCRIPTION'] = $item['SUMMARY'];
    }
876 877 878
    else if ($item['CONTENT']) {
      $item['DESCRIPTION'] = $item['CONTENT'];
    }
879

Dries's avatar
 
Dries committed
880
    /*
881
    ** Try to resolve and parse the item's publication date. If no
Dries's avatar
 
Dries committed
882 883 884 885 886 887 888 889
    ** date is found, we use the current date instead.
    */

    if ($item['PUBDATE']) $date = $item['PUBDATE'];                        // RSS 2.0
    else if ($item['DC:DATE']) $date = $item['DC:DATE'];                   // Dublin core
    else if ($item['DCTERMS:ISSUED']) $date = $item['DCTERMS:ISSUED'];     // Dublin core
    else if ($item['DCTERMS:CREATED']) $date = $item['DCTERMS:CREATED'];   // Dublin core
    else if ($item['DCTERMS:MODIFIED']) $date = $item['DCTERMS:MODIFIED']; // Dublin core
890 891 892
    else if ($item['ISSUED']) $date = $item['ISSUED'];                     // Atom XML
    else if ($item['CREATED']) $date = $item['CREATED'];                   // Atom XML
    else if ($item['MODIFIED']) $date = $item['MODIFIED'];                 // Atom XML
893 894
    else if ($item['PUBLISHED']) $date = $item['PUBLISHED'];               // Atom XML
    else if ($item['UPDATED']) $date = $item['UPDATED'];                   // Atom XML
Dries's avatar
 
Dries committed
895
    else $date = 'now';
Dries's avatar
 
Dries committed
896

897 898 899 900
    $timestamp = strtotime($date); // As of PHP 5.1.0, strtotime returns FALSE on failure instead of -1.
    if ($timestamp <= 0) {
      $timestamp = aggregator_parse_w3cdtf($date); // Returns FALSE on failure
      if (!$timestamp) {
Dries's avatar
 
Dries committed
901 902
        $timestamp = time(); // better than nothing
      }
903
    }
Dries's avatar
 
Dries committed
904 905

    /*
906 907
    ** Save this item. Try to avoid duplicate entries as much as
    ** possible. If we find a duplicate entry, we resolve it and
Dries's avatar
 
Dries committed
908
    ** pass along it's ID such that we can update it if needed.
Dries's avatar
 
Dries committed
909 910
    */

911 912 913 914
    if ($guid) {
      $entry = db_fetch_object(db_query("SELECT iid FROM {aggregator_item} WHERE fid = %d AND guid = '%s'", $feed['fid'], $guid));
    }
    else if ($link && $link != $feed['link'] && $link != $feed['url']) {
Dries's avatar
 
Dries committed
915
      $entry = db_fetch_object(db_query("SELECT iid FROM {aggregator_item} WHERE fid = %d AND link = '%s'", $feed['fid'], $link));
Dries's avatar
 
Dries committed
916 917
    }
    else {
Dries's avatar
 
Dries committed
918
      $entry = db_fetch_object(db_query("SELECT iid FROM {aggregator_item} WHERE fid = %d AND title = '%s'", $feed['fid'], $title));
Dries's avatar
 
Dries committed
919
    }
Dries's avatar
 
Dries committed
920

921
    aggregator_save_item(array('iid' => $entry->iid, 'fid' => $feed['fid'], 'timestamp' => $timestamp, 'title' => $title, 'link' => $link, 'author' => $item['AUTHOR'], 'description' => $item['DESCRIPTION'], 'guid' => $guid));
Dries's avatar
 
Dries committed
922
  }
Dries's avatar
 
Dries committed
923

Dries's avatar
 
Dries committed
924
  /*
925
  ** Remove all items that are older than flush item timer:
Dries's avatar
 
Dries committed
926
  */
Dries's avatar
 
Dries committed
927

928
  $age = time() - variable_get('aggregator_clear', 9676800);
Dries's avatar
 
Dries committed
929
  $result = db_query('SELECT iid FROM {aggregator_item} WHERE fid = %d AND timestamp < %d', $feed['fid'], $age);
Dries's avatar
 
Dries committed
930

931 932 933 934 935 936 937
  if (db_num_rows($result)) {
    $items = array();
    while ($item = db_fetch_object($result)) {
      $items[] = $item->iid;
    }
    db_query('DELETE FROM {aggregator_category_item} WHERE iid IN ('. implode(', ', $items) .')');
    db_query('DELETE FROM {aggregator_item} WHERE fid = %d AND timestamp < %d', $feed['fid'], $age);
Dries's avatar
 
Dries committed
938
  }
Dries's avatar
 
Dries committed
939 940

  return 1;
941 942
}

Kjartan's avatar
Kjartan committed
943
function aggregator_save_item($edit) {
Dries's avatar
 
Dries committed
944
  if ($edit['iid'] && $edit['title']) {
945
    db_query("UPDATE {aggregator_item} SET title = '%s', link = '%s', author = '%s', description = '%s', guid = '%s', timestamp = %d WHERE iid = %d", $edit['title'], $edit['link'], $edit['author'], $edit['description'], $edit['iid'], $edit['timestamp'], $edit['gid']);
946
  }
Dries's avatar
 
Dries committed
947 948 949
  else if ($edit['iid']) {
    db_query('DELETE FROM {aggregator_item} WHERE iid = %d', $edit['iid']);
    db_query('DELETE FROM {aggregator_category_item} WHERE iid = %d', $edit['iid']);
950
  }
Dries's avatar
 
Dries committed
951
  else if ($edit['title'] && $edit['link']) {
Dries's avatar
 
Dries committed
952
    $edit['iid'] = db_next_id('{aggregator_item}_iid');
953
    db_query("INSERT INTO {aggregator_item} (iid, fid, title, link, author, description, timestamp, guid) VALUES (%d, %d, '%s', '%s', '%s', '%s', %d, '%s')", $edit['iid'], $edit['fid'], $edit['title'], $edit['link'], $edit['author'], $edit['description'], $edit['timestamp'], $edit['guid']);
Dries's avatar
 
Dries committed
954 955 956
    // file the items in the categories indicated by the feed
    $categories = db_query('SELECT cid FROM {aggregator_category_feed} WHERE fid = %d', $edit['fid']);
    while ($category = db_fetch_object($categories)) {
Dries's avatar