***************
*** 45,203 ****
    return $output;
  }
  
- /**
-  * Form builder; Generate a form to add/edit feed sources.
-  *
-  * @ingroup forms
-  * @see aggregator_form_feed_validate()
-  * @see aggregator_form_feed_submit()
-  */
- function aggregator_form_feed(&$form_state, stdClass $feed = NULL) {
-   $period = drupal_map_assoc(array(900, 1800, 3600, 7200, 10800, 21600, 32400, 43200, 64800, 86400, 172800, 259200, 604800, 1209600, 2419200), 'format_interval');
- 
-   if (!isset($feed)) {
-     $feed = new stdClass();
-   }
- 
-   if (empty($feed->refresh)) {
-     $feed->refresh = 3600;
-   }
- 
-   $form['title'] = array('#type' => 'textfield',
-     '#title' => t('Title'),
-     '#default_value' => isset($feed->title) ? $feed->title : '',
-     '#maxlength' => 255,
-     '#description' => t('The name of the feed (or the name of the website providing the feed).'),
-     '#required' => TRUE,
-   );
-   $form['url'] = array('#type' => 'textfield',
-     '#title' => t('URL'),
-     '#default_value' => isset($feed->url) ? $feed->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' => isset($feed->refresh) ? $feed->refresh : 900,
-     '#options' => $period,
-     '#description' => t('The length of time between feed updates. Requires a correctly configured <a href="@cron">cron maintenance task</a>.', array('@cron' => url('admin/reports/status'))),
-   );
-   $form['block'] = array('#type' => 'select',
-     '#title' => t('News items in block'),
-     '#default_value' => isset($feed->block) ? $feed->block : 5,
-     '#options' => drupal_map_assoc(array(0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20)),
-     '#description' => t("Drupal can make a block with the most recent news items of this feed. You can <a href=\"@block-admin\">configure blocks</a> to be displayed in the sidebar of your page. This setting lets you configure the number of news items to show in this feed's block. If you choose '0' this feed's block will be disabled.", array('@block-admin' => url('admin/build/block'))),
-   );
- 
-   // 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 = :fid ORDER BY title', array(':fid' => isset($feed->fid) ? $feed->fid : NULL));
-   foreach ($categories as $category) {
-     $options[$category->cid] = check_plain($category->title);
-     if ($category->fid) $values[] = $category->cid;
-   }
- 
-   if ($options) {
-     $form['category'] = array(
-       '#type' => 'checkboxes',
-       '#title' => t('Categorize news items'),
-       '#default_value' => $values,
-       '#options' => $options,
-       '#description' => t('New feed items are automatically filed in the checked categories.'),
-     );
-   }
-   $form['submit'] = array(
-     '#type' => 'submit',
-     '#value' => t('Save'),
-   );
- 
-   if (!empty($feed->fid)) {
-     $form['delete'] = array(
-       '#type' => 'submit',
-       '#value' => t('Delete'),
-     );
-     $form['fid'] = array(
-       '#type' => 'hidden',
-       '#value' => $feed->fid,
-     );
-   }
- 
-   return $form;
- }
- 
- /**
-  * Validate aggregator_form_feed() form submissions.
-  */
- function aggregator_form_feed_validate($form, &$form_state) {
-   if ($form_state['values']['op'] == t('Save')) {
-     // Ensure URL is valid.
-     if (!valid_url($form_state['values']['url'], TRUE)) {
-       form_set_error('url', t('The URL %url is invalid. Please enter a fully-qualified URL, such as http://www.example.com/feed.xml.', array('%url' => $form_state['values']['url'])));
-     }
-     // Check for duplicate titles.
-     if (isset($form_state['values']['fid'])) {
-       $result = db_query("SELECT title, url FROM {aggregator_feed} WHERE (title = :title OR url = :url) AND fid <> :fid", array(':title' => $form_state['values']['title'], ':url' => $form_state['values']['url'], ':fid' => $form_state['values']['fid']));
-     }
-     else {
-       $result = db_query("SELECT title, url FROM {aggregator_feed} WHERE title = :title OR url = :url", array(':title' => $form_state['values']['title'], ':url' => $form_state['values']['url']));
-     }
-     foreach ($result as $feed) {
-       if (strcasecmp($feed->title, $form_state['values']['title']) == 0) {
-         form_set_error('title', t('A feed named %feed already exists. Please enter a unique title.', array('%feed' => $form_state['values']['title'])));
-       }
-       if (strcasecmp($feed->url, $form_state['values']['url']) == 0) {
-         form_set_error('url', t('A feed with this URL %url already exists. Please enter a unique URL.', array('%url' => $form_state['values']['url'])));
-       }
-     }
-   }
- }
- 
- /**
-  * Process aggregator_form_feed() form submissions.
-  *
-  * @todo Add delete confirmation dialog.
-  */
- function aggregator_form_feed_submit($form, &$form_state) {
-   if ($form_state['values']['op'] == t('Delete')) {
-     $title = $form_state['values']['title'];
-     // Unset the title.
-     unset($form_state['values']['title']);
-   }
-   aggregator_save_feed($form_state['values']);
-   if (isset($form_state['values']['fid'])) {
-     if (isset($form_state['values']['title'])) {
-       drupal_set_message(t('The feed %feed has been updated.', array('%feed' => $form_state['values']['title'])));
-       if (arg(0) == 'admin') {
-         $form_state['redirect'] = 'admin/content/aggregator/';
-         return;
-       }
-       else {
-         $form_state['redirect'] = 'aggregator/sources/' . $form_state['values']['fid'];
-         return;
-       }
-     }
-     else {
-       watchdog('aggregator', 'Feed %feed deleted.', array('%feed' => $title));
-       drupal_set_message(t('The feed %feed has been deleted.', array('%feed' => $title)));
-       if (arg(0) == 'admin') {
-         $form_state['redirect'] = 'admin/content/aggregator/';
-         return;
-       }
-       else {
-         $form_state['redirect'] = 'aggregator/sources/';
-         return;
-       }
-     }
-   }
-   else {
-     watchdog('aggregator', 'Feed %feed added.', array('%feed' => $form_state['values']['title']), WATCHDOG_NOTICE, l(t('view'), 'admin/content/aggregator'));
-     drupal_set_message(t('The feed %feed has been added.', array('%feed' => $form_state['values']['title'])));
-   }
- }
- 
  function aggregator_admin_remove_feed($form_state, $feed) {
    return confirm_form(
      array(
        'feed' => array(
--- 45,52 ----
    return $output;
  }
  
  function aggregator_admin_remove_feed($form_state, $feed) {
+   $feed_node = node_load($feed->nid);
    return confirm_form(
      array(
        'feed' => array(