Index: modules/aggregator/aggregator.admin.inc
===================================================================
RCS file: /cvs/drupal/drupal/modules/aggregator/aggregator.admin.inc,v
retrieving revision 1.10
diff -u -p -r1.10 aggregator.admin.inc
--- modules/aggregator/aggregator.admin.inc	15 May 2008 21:27:32 -0000	1.10
+++ modules/aggregator/aggregator.admin.inc	27 Jun 2008 12:30:55 -0000
@@ -214,6 +214,164 @@ function aggregator_admin_remove_feed_su
 }
 
 /**
+ * Form builder; Generate a form to import feeds from OPML.
+ *
+ * @ingroup forms
+ * @see aggregator_form_opml_submit()
+ */
+function aggregator_form_opml(&$form_state) {
+  $period = drupal_map_assoc(array(900, 1800, 3600, 7200, 10800, 21600, 32400, 43200, 64800, 86400, 172800, 259200, 604800, 1209600, 2419200), 'format_interval');
+
+  $form['#attributes'] = array('enctype' => "multipart/form-data");
+
+  $form['upload'] = array(
+    '#type' => 'file',
+    '#title' => t('OPML File'),
+    '#description' => t('Upload an OPML file containing a list of newsfeeds to be imported.'),
+  );
+
+  $form['or'] = array(
+    '#type' => 'item',
+    '#value' => t('<strong>or</strong>'),
+  );
+
+  $form['remote'] = array(
+    '#type' => 'textfield',
+    '#title' => t('OPML Remote URL'),
+    '#description' => t('Enter the URL of an OPML file on the web. This file will be downloaded only once.'),
+  );
+
+  $form['refresh'] = array(
+    '#type' => 'select',
+    '#title' => t('Update interval'),
+    '#default_value' => 3600,
+    '#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'))),
+  );
+
+  // Handling of categories:
+  $options = array();
+  $categories = db_query('SELECT cid, title FROM {aggregator_category} ORDER BY title');
+  while ($category = db_fetch_object($categories)) {
+    $options[$category->cid] = check_plain($category->title);
+  }
+  if ($options) {
+    $form['category'] = array(
+      '#type' => 'checkboxes',
+      '#title' => t('Categorize news items'),
+      '#options' => $options,
+      '#description' => t('New feed items are automatically filed in the checked categories.'),
+    );
+  }
+  else {
+    $form['category'] = array(
+      '#type' => 'item',
+      '#value' => t('If you had created any <a href="@category">categories</a>, you could choose to assign all imported feeds to one of them.', array('@category' => url('admin/content/aggregator/add/category'))),
+    );
+  }
+  $form['submit'] = array('#type' => 'submit', '#value' => t('Import'));
+
+  return $form;
+}
+
+/**
+ * Validate aggregator_form_opml form submissions.
+ */
+function aggregator_form_opml_validate($form, &$form_state) {
+  if (empty($form_state['values']['remote']) && empty($_FILES['files']['name']['upload'])) {
+    form_set_error('remote', t('You must upload a file or enter a URL.'));
+  }
+  if (!empty($form_state['values']['remote']) && !valid_url($form_state['values']['remote'], TRUE)) {
+    form_set_error('remote', t('This URL is not valid.'));
+  }
+}
+
+/**
+ * Process aggregator_form_opml form submissions.
+ */
+function aggregator_form_opml_submit($form, &$form_state) {
+  if ($file = file_save_upload('upload')) {
+    $data = file_get_contents($file->filepath);
+  }
+  else {
+    $response = drupal_http_request($form_state['values']['remote']);
+    $data = $response->data;
+  }
+
+  $feeds = _aggregator_parse_opml_feeds($data);
+
+  if (!empty($feeds)) {
+    drupal_set_message(t('This OPML outline contains %num feeds.', array('%num' => count($feeds))), 'status');
+  }
+  else if (is_array($feeds)) {
+    drupal_set_message(t('The OPML outline is valid, but does not contain any feeds.'), 'error');
+    return;
+  }
+  else {
+    drupal_set_message(t('The OPML outline is invalid and could not be parsed.'), 'error');
+    return;
+  }
+
+  $form_state['values']['op'] = t('Save');
+
+  foreach ($feeds as $feed) {
+    $duplicate = FALSE;
+    $result = db_query("SELECT title, url FROM {aggregator_feed} WHERE title = '%s' OR url='%s'", $feed['title'], $feed['url']);
+    while (!$duplicate && $old = db_fetch_object($result)) {
+      if (strcasecmp($old->title, $feed['title']) == 0) {
+        drupal_set_message(t('A feed named %feed already exists and was not added.', array('%feed' => $old->title)), 'warning');
+        $duplicate = TRUE;
+      }
+      if (strcasecmp($old->url, $feed['url']) == 0) {
+        drupal_set_message(t('A feed with the URL %url already exists and was not added.', array('%url' => $old->url)), 'warning');
+        $duplicate = TRUE;
+      }
+    }
+    if (!$duplicate) {
+      $form_state['values']['title'] = $feed['title'];
+      $form_state['values']['url'] = $feed['url'];
+      drupal_execute('aggregator_form_feed', $form_state);
+    }
+  }
+}
+
+/**
+ * Parses an OPML file
+ *
+ * @param $opml
+ *   The complete contents of an OPML document.
+ *
+ * @return
+ *   An array of feeds, each an associative array with a title and 
+ *   a url element, or NULL if the OPML document failed to be parsed. 
+ *   An empty array will be returned if the document is valid but 
+ *   contains no feeds, as some OPML documents do.
+ */
+function _aggregator_parse_opml_feeds($opml) {
+  $items = array();
+  $feeds = array();
+
+  $parser = drupal_xml_parser_create($opml);
+
+  if (xml_parse_into_struct($parser, $opml, $vals, $index)) {
+    foreach ($vals as $entry) {
+      if ($entry['tag'] == 'OUTLINE' && isset($entry['attributes'])) {
+        $items[] = $entry['attributes'];
+      }
+    }
+    foreach ($items as $n => $item) {
+      if (!empty($item['XMLURL'])) {
+        $feed = array('title' => $item['TEXT'], 'url' => $item['XMLURL']);
+        $feeds[] = $feed;
+      }
+    }
+  }
+  else return NULL;
+
+  return $feeds;
+}
+
+/**
  * Menu callback; refreshes a feed, then redirects to the overview page.
  *
  * @param $feed
Index: modules/aggregator/aggregator.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/aggregator/aggregator.module,v
retrieving revision 1.381
diff -u -p -r1.381 aggregator.module
--- modules/aggregator/aggregator.module	18 Jun 2008 03:36:23 -0000	1.381
+++ modules/aggregator/aggregator.module	27 Jun 2008 12:30:55 -0000
@@ -24,6 +24,8 @@ function aggregator_help($path, $arg) {
       return '<p>' . t('Add a feed in RSS, RDF or Atom format. A feed may only have one entry.') . '</p>';
     case 'admin/content/aggregator/add/category':
       return '<p>' . t('Categories allow feed items from different feeds to be grouped together. For example, several sport-related feeds may belong to a category named <em>Sports</em>. Feed items may be grouped automatically (by selecting a category when creating or editing a feed) or manually (via the <em>Categorize</em> page available from feed item listings). Each category provides its own feed page and block.') . '</p>';
+    case 'admin/content/aggregator/add/opml':
+      return '<p>' . t('<acronym title="Outline Processor Markup Language">OPML</acronym> is an XML format used to to exchange multiple newsfeeds between aggregators. A single OPML document may contain a collection of many feeds. Drupal can parse such a file and import all feeds at once, saving you the effort of adding them manually. You may either upload a local file from your computer or enter a URL where Drupal can download it.') . '</p>';
   }
 }
 
@@ -101,6 +103,15 @@ function aggregator_menu() {
     'type' => MENU_LOCAL_TASK,
     'parent' => 'admin/content/aggregator',
   );
+  $items['admin/content/aggregator/add/opml'] = array(
+    'title' => 'Import OPML',
+    'page callback' => 'drupal_get_form',
+    'page arguments' => array('aggregator_form_opml'),
+    'access arguments' => array('administer news feeds'),
+    'type' => MENU_LOCAL_TASK,
+    'parent' => 'admin/content/aggregator',
+    'file' => 'aggregator.admin.inc',
+  );
   $items['admin/content/aggregator/remove/%aggregator_feed'] = array(
     'title' => 'Remove items',
     'page callback' => 'drupal_get_form',