aggregator.module 55.1 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
    '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',
94
    'access callback' => '_aggregator_has_categories',
95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113
  );
  $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',
114
      'access callback' => 'user_access',
115 116 117 118
      '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
function aggregator_init() {
  drupal_add_css(drupal_get_path('module', 'aggregator') .'/aggregator.css');
}
183 184 185 186

function _aggregator_has_categories() {
  return user_access('access news feeds') && db_result(db_query('SELECT COUNT(*) FROM {aggregator_category}'));
}
187

Dries's avatar
Dries committed
188
function aggregator_admin_settings() {
189
  $items = array(0 => t('none')) + drupal_map_assoc(array(3, 5, 10, 15, 20, 25), '_aggregator_items');
190
  $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
191

192
  $form['aggregator_allowed_html_tags'] = array(
193 194 195
    '#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.')
196 197 198
  );

  $form['aggregator_summary_items'] = array(
199 200 201
    '#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.')
202 203 204
  );

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

210
  $form['aggregator_category_selector'] = array(
211
    '#type' => 'radios', '#title' => t('Category selection type'), '#default_value' => variable_get('aggregator_category_selector', 'checkboxes'),
212
    '#options' => array('checkboxes' => t('checkboxes'), 'select' => t('multiple selector')),
213
    '#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.')
214
  );
Dries's avatar
Dries committed
215

216
  return system_settings_form($form);
Dries's avatar
 
Dries committed
217 218
}

Dries's avatar
 
Dries committed
219 220 221
/**
 * Implementation of hook_perm().
 */
Kjartan's avatar
Kjartan committed
222
function aggregator_perm() {
Dries's avatar
 
Dries committed
223
  return array('administer news feeds', 'access news feeds');
Dries's avatar
 
Dries committed
224 225
}

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

Dries's avatar
 
Dries committed
238 239 240 241 242
/**
 * Implementation of hook_block().
 *
 * Generates blocks for the latest news items in each category and feed.
 */
243
function aggregator_block($op = 'list', $delta = 0, $edit = array()) {
Dries's avatar
 
Dries committed
244
  if (user_access('access news feeds')) {
Dries's avatar
 
Dries committed
245
    if ($op == 'list') {
Dries's avatar
Dries committed
246
      $result = db_query('SELECT cid, title FROM {aggregator_category} ORDER BY title');
Dries's avatar
 
Dries committed
247
      while ($category = db_fetch_object($result)) {
248
        $block['category-'. $category->cid]['info'] = t('!title category latest items', array('!title' => $category->title));
Kjartan's avatar
Kjartan committed
249
      }
Dries's avatar
Dries committed
250
      $result = db_query('SELECT fid, title FROM {aggregator_feed} ORDER BY fid');
Kjartan's avatar
Kjartan committed
251
      while ($feed = db_fetch_object($result)) {
252
        $block['feed-'. $feed->fid]['info'] = t('!title feed latest items', array('!title' => $feed->title));
Kjartan's avatar
Kjartan committed
253
      }
Dries's avatar
 
Dries committed
254
    }
Dries's avatar
Dries committed
255
    else if ($op == 'configure') {
256
      list($type, $id) = explode('-', $delta);
Dries's avatar
Dries committed
257 258 259 260 261 262
      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));
      }
263
      $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)));
264
      return $form;
Dries's avatar
Dries committed
265 266
    }
    else if ($op == 'save') {
267
      list($type, $id) = explode('-', $delta);
Dries's avatar
Dries committed
268 269 270 271 272 273 274
      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);
      }
    }
275
    else if ($op == 'view') {
276
      list($type, $id) = explode('-', $delta);
Kjartan's avatar
Kjartan committed
277
      switch ($type) {
Dries's avatar
 
Dries committed
278
        case 'feed':
279
          if ($feed = db_fetch_object(db_query('SELECT fid, title, block FROM {aggregator_feed} WHERE fid = %d', $id))) {
280
            $block['subject'] = check_plain($feed->title);
281
            $result = db_query_range('SELECT * FROM {aggregator_item} WHERE fid = %d ORDER BY timestamp DESC, iid DESC', $feed->fid, 0, $feed->block);
282
            $read_more = '<div class="more-link">'. l(t('more'), 'aggregator/sources/'. $feed->fid, array('title' => t("View this feed's recent news."))) .'</div>';
283
          }
Kjartan's avatar
Kjartan committed
284
          break;
285

Dries's avatar
 
Dries committed
286
        case 'category':
287
          if ($category = db_fetch_object(db_query('SELECT cid, title, block FROM {aggregator_category} WHERE cid = %d', $id))) {
288
            $block['subject'] = check_plain($category->title);
289
            $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);
290
            $read_more = '<div class="more-link">'. l(t('more'), 'aggregator/categories/'. $category->cid, array('title' => t("View this category's recent news."))) .'</div>';
291
          }
Kjartan's avatar
Kjartan committed
292 293
          break;
      }
Dries's avatar
 
Dries committed
294 295
      $items = array();
      while ($item = db_fetch_object($result)) {
Dries's avatar
 
Dries committed
296
        $items[] = theme('aggregator_block_item', $item);
Dries's avatar
 
Dries committed
297
      }
298 299 300 301 302

      // 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
303
    }
304 305 306
    if (isset($block)) {
      return $block;
    }
Dries's avatar
 
Dries committed
307
  }
Dries's avatar
 
Dries committed
308 309
}

310 311 312 313 314 315 316 317 318 319 320 321 322 323
/**
 * 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'],
  );
324
  $form['submit'] = array('#type' => 'submit', '#value' => t('Submit'));
325 326

  if ($edit['cid']) {
327
    $form['delete'] = array('#type' => 'submit', '#value' => t('Delete'));
328 329 330
    $form['cid'] = array('#type' => 'hidden', '#value' => $edit['cid']);
  }

331
  return $form;
332 333 334 335 336 337
}

/**
 * Validate aggregator_form_feed form submissions.
 */
function aggregator_form_category_validate($form_id, $form_values) {
338
  if ($form_values['op'] == t('Submit')) {
339 340 341 342 343 344 345 346
    // 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) {
347
      form_set_error('title', t('A category named %category already exists. Please enter a unique title.', array('%category' => $form_values['title'])));
348 349 350 351 352 353 354 355 356
    }
  }
}

/**
 * Process aggregator_form_category form submissions.
 * @todo Add delete confirmation dialog.
 */
function aggregator_form_category_submit($form_id, $form_values) {
357
  if ($form_values['op'] == t('Delete')) {
358 359 360 361 362 363 364 365
    $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'])) {
366
      drupal_set_message(t('The category %category has been updated.', array('%category' => $form_values['title'])));
367
      if (arg(0) == 'admin') {
368
        return 'admin/content/aggregator/';
369 370 371 372 373 374
      }
      else {
        return 'aggregator/categories/'. $form_values['cid'];
      }
    }
    else {
375 376
      watchdog('aggregator', t('Category %category deleted.', array('%category' => $title)));
      drupal_set_message(t('The category %category has been deleted.', array('%category' => $title)));
377
      if (arg(0) == 'admin') {
378
        return 'admin/content/aggregator/';
379 380 381 382 383 384 385
      }
      else {
        return 'aggregator/categories/';
      }
    }
  }
  else {
386 387
    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'])));
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 417 418 419 420
  }
}

/**
 * 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'],
421
    '#maxlength' => 255,
422
    '#description' => t('The name of the feed; typically the name of the website you syndicate content from.'),
423 424 425 426 427 428 429 430 431 432 433 434 435 436 437 438 439 440 441 442 443
    '#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)) {
444 445
    $options[$category->cid] = check_plain($category->title);
    if ($category->fid) $values[] = $category->cid;
446 447 448 449 450 451 452 453 454
  }
  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.'),
    );
  }
455
  $form['submit'] = array('#type' => 'submit', '#value' => t('Submit'));
456 457

  if ($edit['fid']) {
458
    $form['delete'] = array('#type' => 'submit', '#value' => t('Delete'));
459 460 461
    $form['fid'] = array('#type' => 'hidden', '#value' => $edit['fid']);
  }

462
  return $form;
463 464 465 466 467 468
}

/**
 * Validate aggregator_form_feed form submissions.
 */
function aggregator_form_feed_validate($form_id, $form_values) {
469
  if ($form_values['op'] == t('Submit')) {
470 471 472 473 474 475 476 477 478
    // 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) {
479
        form_set_error('title', t('A feed named %feed already exists. Please enter a unique title.', array('%feed' => $form_values['title'])));
480
      }
481 482 483
      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'])));
      }
484 485 486 487 488 489 490 491 492
    }
  }
}

/**
 * Process aggregator_form_feed form submissions.
 * @todo Add delete confirmation dialog.
 */
function aggregator_form_feed_submit($form_id, $form_values) {
493
  if ($form_values['op'] == t('Delete')) {
494 495 496 497 498 499 500 501
    $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'])) {
502
      drupal_set_message(t('The feed %feed has been updated.', array('%feed' => $form_values['title'])));
503
      if (arg(0) == 'admin') {
504
        return 'admin/content/aggregator/';
505 506 507 508 509 510
      }
      else {
        return 'aggregator/sources/'. $form_values['fid'];
      }
    }
    else {
511 512
      watchdog('aggregator', t('Feed %feed deleted.', array('%feed' => $title)));
      drupal_set_message(t('The feed %feed has been deleted.', array('%feed' => $title)));
513
      if (arg(0) == 'admin') {
514
        return 'admin/content/aggregator/';
515 516 517 518 519 520 521
      }
      else {
        return 'aggregator/sources/';
      }
    }
  }
  else {
522 523
    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'])));
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 562 563 564 565
  }
}

/**
 * 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
566 567 568 569
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
570
  }
Dries's avatar
 
Dries committed
571 572
  if ($items) {
    db_query('DELETE FROM {aggregator_category_item} WHERE '. implode(' OR ', $items));
Dries's avatar
 
Dries committed
573
  }
Dries's avatar
 
Dries committed
574
  db_query('DELETE FROM {aggregator_item} WHERE fid = %d', $feed['fid']);
Kjartan's avatar
Kjartan committed
575
  db_query("UPDATE {aggregator_feed} SET checked = 0, etag = '', modified = 0 WHERE fid = %d", $feed['fid']);
576
  drupal_set_message(t('The news items from %site have been removed.', array('%site' => $feed['title'])));
Dries's avatar
 
Dries committed
577 578
}

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

  switch ($name) {
Dries's avatar
 
Dries committed
586 587
    case 'IMAGE':
    case 'TEXTINPUT':
588 589 590 591 592 593
    case 'CONTENT':
    case 'SUMMARY':
    case 'TAGLINE':
    case 'SUBTITLE':
    case 'LOGO':
    case 'INFO':
Dries's avatar
 
Dries committed
594 595
      $element = $name;
      break;
596 597 598 599
    case 'ID':
      if ($element != 'ITEM') {
        $element = $name;
      }
600 601 602 603 604 605 606 607 608 609
    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
610
    case 'ITEM':
Dries's avatar
 
Dries committed
611 612
      $element = $name;
      $item += 1;
613 614 615 616 617
      break;
    case 'ENTRY':
      $element = 'ITEM';
      $item += 1;
      break;
618 619 620 621 622
  }

  $tag = $name;
}

Dries's avatar
 
Dries committed
623 624 625
/**
 * Call-back function used by the XML parser.
 */
Kjartan's avatar
Kjartan committed
626
function aggregator_element_end($parser, $name) {
Dries's avatar
 
Dries committed
627 628
  global $element;

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

Dries's avatar
 
Dries committed
645 646 647
/**
 * Call-back function used by the XML parser.
 */
Kjartan's avatar
Kjartan committed
648
function aggregator_element_data($parser, $data) {
Dries's avatar
 
Dries committed
649
  global $channel, $element, $items, $item, $image, $tag;
Dries's avatar
 
Dries committed
650
  switch ($element) {
Dries's avatar
 
Dries committed
651
    case 'ITEM':
Dries's avatar
 
Dries committed
652 653
      $items[$item][$tag] .= $data;
      break;
Dries's avatar
 
Dries committed
654
    case 'IMAGE':
655
    case 'LOGO':
Dries's avatar
 
Dries committed
656 657
      $image[$tag] .= $data;
      break;
658 659 660 661 662 663
    case 'LINK':
      if ($data) {
        $items[$item][$tag] .= $data;
      }
      break;
    case 'CONTENT':
664
      $items[$item]['CONTENT'] .= $data;
665 666
      break;
    case 'SUMMARY':
667
      $items[$item]['SUMMARY'] .= $data;
668 669 670 671 672 673 674
      break;
    case 'TAGLINE':
    case 'SUBTITLE':
      $channel['DESCRIPTION'] .= $data;
      break;
    case 'INFO':
    case 'ID':
Dries's avatar
 
Dries committed
675 676 677
    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
678 679 680
      break;
    default:
      $channel[$tag] .= $data;
681 682 683
  }
}

Dries's avatar
 
Dries committed
684 685 686
/**
 * Checks a news feed for new items.
 */
Kjartan's avatar
Kjartan committed
687
function aggregator_refresh($feed) {
Dries's avatar
 
Dries committed
688 689
  global $channel, $image;

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

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

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

Dries's avatar
 
Dries committed
712 713 714 715
    case 200:
    case 302:
    case 307:
      // Filter the input data:
716
     if (aggregator_parse_feed($result->data, $feed)) {
717

Dries's avatar
 
Dries committed
718 719 720
        if ($result->headers['Last-Modified']) {
          $modified = strtotime($result->headers['Last-Modified']);
        }
Dries's avatar
Dries committed
721

722 723 724 725 726
        /*
        ** Prepare the channel data:
        */

        foreach ($channel as $key => $value) {
727
          $channel[$key] = trim($value);
728 729
        }

Dries's avatar
 
Dries committed
730 731 732
        /*
        ** Prepare the image data (if any):
        */
Dries's avatar
 
Dries committed
733

Dries's avatar
 
Dries committed
734 735 736
        foreach ($image as $key => $value) {
          $image[$key] = trim($value);
        }
Dries's avatar
 
Dries committed
737

Dries's avatar
 
Dries committed
738
        if ($image['LINK'] && $image['URL'] && $image['TITLE']) {
739 740
          // 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
741
        }
Dries's avatar
 
Dries committed
742 743 744
        else {
          $image = NULL;
        }
Dries's avatar
 
Dries committed
745

Dries's avatar
 
Dries committed
746 747 748
        /*
        ** Update the feed data:
        */
Dries's avatar
 
Dries committed
749

750
        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
751

Dries's avatar
 
Dries committed
752 753 754
        /*
        ** Clear the cache:
        */
Dries's avatar
 
Dries committed
755

Dries's avatar
 
Dries committed
756
        cache_clear_all();
Dries's avatar
 
Dries committed
757

758 759
        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
760 761
      }
      break;
Dries's avatar
 
Dries committed
762
    default:
763 764
      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
765
  }
Dries's avatar
 
Dries committed
766
}
Dries's avatar
 
Dries committed
767

Dries's avatar
 
Dries committed
768 769 770 771
/**
 * 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.
772
 * Originally from MagpieRSS (http://magpierss.sourceforge.net/).
Dries's avatar
 
Dries committed
773 774
 *
 * @param $date_str A string with a potentially W3C DTF date.
775
 * @return A timestamp if parsed successfully or -1 if not.
Dries's avatar
 
Dries committed
776 777 778 779 780 781 782 783 784 785 786 787 788 789 790 791 792 793 794 795 796 797 798 799 800
 */
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 {
801
    return FALSE;
Dries's avatar
 
Dries committed
802 803 804
  }
}

Dries's avatar
 
Dries committed
805
function aggregator_parse_feed(&$data, $feed) {
Dries's avatar
 
Dries committed
806
  global $items, $image, $channel;
Dries's avatar
 
Dries committed
807

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

Dries's avatar
 
Dries committed
814 815
  // parse the data:
  $xml_parser = drupal_xml_parser_create($data);
Dries's avatar
 
Dries committed
816 817
  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
818

Dries's avatar
 
Dries committed
819
  if (!xml_parse($xml_parser, $data, 1)) {
820 821
    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
822
    return 0;
Dries's avatar
 
Dries committed
823 824
  }
  xml_parser_free($xml_parser);
Dries's avatar
 
Dries committed
825

Dries's avatar
 
Dries committed
826 827
  /*
  ** We reverse the array such that we store the first item last,
828
  ** and the last item first. In the database, the newest item
Dries's avatar
 
Dries committed
829 830
  ** should be at the top.
  */
Dries's avatar
 
Dries committed
831

Dries's avatar
 
Dries committed
832
  $items = array_reverse($items);
Dries's avatar
 
Dries committed
833

834 835
  // Initialize variables
  $title = $link = $author = $description = $guid = NULL;
Dries's avatar
 
Dries committed
836
  foreach ($items as $item) {
837
    unset($title, $link, $author, $description, $guid);
838

Dries's avatar
 
Dries committed
839 840
    // Prepare the item:
    foreach ($item as $key => $value) {
841
      $item[$key] = trim($value);
Dries's avatar
 
Dries committed
842
    }
Dries's avatar
Dries committed
843

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

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

Dries's avatar
 
Dries committed
857 858 859 860
    /*
    ** Resolve the items link.
    */

Dries's avatar
 
Dries committed
861 862
    if ($item['LINK']) {
      $link = $item['LINK'];
Dries's avatar
 
Dries committed
863 864
    }
    else {
Dries's avatar
 
Dries committed
865
      $link = $feed['link'];
Dries's avatar
 
Dries committed
866
    }
867 868 869
    if ($item['GUID']) {
      $guid = $item['GUID'];
    }
870

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

Dries's avatar
 
Dries committed
884
    /*
885
    ** Try to resolve and parse the item's publication date. If no
Dries's avatar
 
Dries committed
886 887 888 889 890 891 892 893
    ** 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
894 895 896
    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
897 898
    else if ($item['PUBLISHED']) $date = $item['PUBLISHED'];               // Atom XML
    else if ($item['UPDATED']) $date = $item['UPDATED'];                   // Atom XML
Dries's avatar
 
Dries committed
899
    else $date = 'now';
Dries's avatar
 
Dries committed
900

901 902 903 904
    $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
905 906
        $timestamp = time(); // better than nothing
      }
907
    }
Dries's avatar
 
Dries committed
908 909

    /*
910 911
    ** 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
912
    ** pass along it's ID such that we can update it if needed.
Dries's avatar
 
Dries committed
913 914
    */

915 916 917 918
    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
919
      $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
920 921
    }
    else {
Dries's avatar
 
Dries committed
922
      $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
923
    }
Dries's avatar
 
Dries committed
924

925
    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
926
  }
Dries's avatar
 
Dries committed
927

Dries's avatar
 
Dries committed
928
  /*
929
  ** Remove all items that are older than flush item timer:
Dries's avatar
 
Dries committed
930
  */
Dries's avatar
 
Dries committed
931

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

935 936 937 938 939 940 941
  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
942
  }
Dries's avatar
 
Dries committed
943 944

  return 1;
945 946
}

Kjartan's avatar
Kjartan committed
947
function aggregator_save_item($edit) {
Dries's avatar
 
Dries committed
948
  if ($edit['iid'] && $edit['title']) {
949
    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']);
950
  }
Dries's avatar
 
Dries committed
951 952 953
  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']);
954
  }
Dries's avatar