This commit was manufactured as part of Drupal's Great Git Migration to

create tag 'DRUPAL-4-7-0-RC-1'.

Sprout from master 2006-03-31 06:43:46 UTC Gerhard Killesreiter <killes_www_drop_org@227.no-reply.drupal.org> '#28625, Forum vocabulary does not handle standard vocabulary features correctly, removed these features by means of formapi, patch by profix898, with some love by dopry and chx'
Delete:
    modules/aggregator/aggregator.module
    modules/archive/archive.module
    modules/block/block.module
    modules/blog/blog.module
    modules/blogapi/blogapi.module
    modules/book/book.module
    modules/comment/comment.module
    modules/contact/contact.module
    modules/drupal/drupal.module
    modules/filter/filter.module
    modules/forum/forum.module
    modules/help/help.module
    modules/legacy/legacy.module
    modules/locale/locale.module
    modules/menu/menu.module
    modules/node/node.module
    modules/page/page.module
    modules/path/path.module
    modules/ping/ping.module
    modules/poll/poll.module
    modules/profile/profile.module
    modules/search/search.module
    modules/statistics/statistics.module
    modules/story/story.module
    modules/system/system.module
    modules/taxonomy/taxonomy.module
    modules/throttle/throttle.module
    modules/tracker/tracker.module
    modules/upload/upload.module
    modules/user/user.module
    modules/watchdog/watchdog.module

modules/aggregator/aggregator.module

-<?php
-// $Id$
-
-/**
- * @file
- * Used to aggregate syndicated content (RSS and RDF).
- */
-
-/**
- * Implementation of hook_help().
- */
-function aggregator_help($section) {
-  switch ($section) {
-    case 'admin/help#aggregator':
-      $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>';
-      $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/block'), '%aggregator-opml' => url('aggregator/opml'))) .'</p>';
-      $output .= t('<p>You can</p>
-<ul>
-<li>administer your list of news feeds <a href="%admin-aggregator">administer &gt;&gt;  aggregator</a>.</li>
-<li>add a new feed <a href="%admin-aggregator-add-feed">administer &gt;&gt; aggregator &gt;&gt; add feed</a>.</li>
-<li>add a new category <a href="%admin-aggregator-add-category">administer &gt;&gt; aggregator &gt;&gt; add category</a>.</li>
-<li>configure global settings for the news aggregator <a href="%admin-settings-aggregator">administer &gt;&gt; settings &gt;&gt; aggregator</a>.</li>
-<li>control access to the aggregator module through access permissions <a href="%admin-access">administer &gt;&gt; access control &gt;&gt; permissions</a>.</li>
-<li>set permissions to access new feeds for user roles such as anonymous users at <a href="%admin-access">administer &gt;&gt; access control</a>.</li>
-<li>view the <a href="%aggregator">aggregator page</a>.</li>
-</ul>
-', array('%admin-aggregator' => url('admin/aggregator'), '%admin-aggregator-add-feed' => url('admin/aggregator/add/feed'), '%admin-aggregator-add-category' => url('admin/aggregator/add/category'), '%admin-settings-aggregator' => url('admin/settings/aggregator'), '%admin-access' => url('admin/access'), '%aggregator' => url('aggregator')));
-      $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>';
-      return $output;
-    case 'admin/modules#description':
-      return t('Aggregates syndicated content (RSS and RDF feeds).');
-    case 'admin/aggregator':
-      return t('<p>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>.</p>', array('%block' => url('admin/block')));
-    case 'admin/aggregator/add/feed':
-      return t('<p>Add a site that has an RSS/RDF feed. The URL is the full path to the RSS 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>');
-    case 'admin/aggregator/add/category':
-      return t('<p>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>');
-  }
-}
-
-/**
- * Implementation of hook_menu().
- */
-function aggregator_menu($may_cache) {
-  $items = array();
-  $edit = user_access('administer news feeds');
-  $view = user_access('access news feeds');
-
-  if ($may_cache) {
-    $items[] = array('path' => 'admin/aggregator',
-      'title' => t('aggregator'),
-      'callback' => 'aggregator_admin_overview',
-      'access' => $edit);
-    $items[] = array('path' => 'admin/aggregator/add/feed',
-      'title' => t('add feed'),
-      'callback' => 'aggregator_form_feed',
-      'access' => $edit,
-      'type' => MENU_LOCAL_TASK);
-    $items[] = array('path' => 'admin/aggregator/add/category',
-      'title' => t('add category'),
-      'callback' => 'aggregator_form_category',
-      'access' => $edit,
-      'type' => MENU_LOCAL_TASK);
-    $items[] = array('path' => 'admin/aggregator/remove',
-      'title' => t('remove items'),
-      'callback' => 'aggregator_admin_remove_feed',
-      'access' => $edit,
-      'type' => MENU_CALLBACK);
-    $items[] = array('path' => 'admin/aggregator/update',
-      'title' => t('update items'),
-      'callback' => 'aggregator_admin_refresh_feed',
-      'access' => $edit,
-      'type' => MENU_CALLBACK);
-    $items[] = array('path' => 'admin/aggregator/list',
-      'title' => t('list'),
-      'type' => MENU_DEFAULT_LOCAL_TASK,
-      'weight' => -10);
-    $items[] = array('path' => 'aggregator',
-      'title' => t('news aggregator'),
-      'callback' => 'aggregator_page_last',
-      'access' => $view,
-      'weight' => 5);
-    $items[] = array('path' => 'aggregator/sources',
-      'title' => t('sources'),
-      'callback' => 'aggregator_page_sources',
-      'access' => $view);
-    $items[] = array('path' => 'aggregator/categories',
-      'title' => t('categories'),
-      'callback' => 'aggregator_page_categories',
-      'access' => $view,
-      'type' => MENU_ITEM_GROUPING);
-    $items[] = array('path' => 'aggregator/rss',
-      'title' => t('RSS feed'),
-      'callback' => 'aggregator_page_rss',
-      'access' => $view,
-      'type' => MENU_CALLBACK);
-    $items[] = array('path' => 'aggregator/opml',
-      'title' => t('OPML feed'),
-      'callback' => 'aggregator_page_opml',
-      'access' => $view,
-      'type' => MENU_CALLBACK);
-  }
-  else {
-    if (arg(0) == 'aggregator' && is_numeric(arg(2))) {
-      if (arg(1) == 'sources') {
-        $feed = aggregator_get_feed(arg(2));
-        if ($feed) {
-          $items[] = array('path' => 'aggregator/sources/'. $feed['fid'],
-            'title' => $feed->title,
-            'callback' => 'aggregator_page_source',
-            'access' => $view);
-          $items[] = array('path' => 'aggregator/sources/'. $feed['fid'] .'/view',
-            'title' => t('view'),
-            'type' => MENU_DEFAULT_LOCAL_TASK,
-            'weight' => -10);
-          $items[] = array('path' => 'aggregator/sources/'. $feed['fid'] .'/categorize',
-            'title' => t('categorize'),
-            'callback' => 'aggregator_page_source',
-            'access' => $edit,
-            'type' => MENU_LOCAL_TASK);
-          $items[] = array('path' => 'aggregator/sources/'. $feed['fid'] .'/configure',
-            'title' => t('configure'),
-            'callback' => 'aggregator_form_feed',
-            'callback arguments' => array($feed),
-            'access' => $edit,
-            'type' => MENU_LOCAL_TASK,
-            'weight' => 1);
-        }
-      }
-      else if (arg(1) == 'categories') {
-        $category = aggregator_get_category(arg(2));
-        if ($category) {
-          $items[] = array('path' => 'aggregator/categories/'. $category['cid'],
-            'title' => $category->title,
-            'callback' => 'aggregator_page_category',
-            'access' => $view);
-          $items[] = array('path' => 'aggregator/categories/'. $category['cid'] .'/view',
-            'title' => t('view'),
-            'type' => MENU_DEFAULT_LOCAL_TASK,
-            'weight' => -10);
-          $items[] = array('path' => 'aggregator/categories/'. $category['cid'] .'/categorize',
-            'title' => t('categorize'),
-            'callback' => 'aggregator_page_category',
-            'access' => $edit,
-            'type' => MENU_LOCAL_TASK);
-          $items[] = array('path' => 'aggregator/categories/'. $category['cid'] .'/configure',
-            'title' => t('configure'),
-            'callback' => 'aggregator_form_category',
-            'callback arguments' => array($category),
-            'access' => $edit,
-            'type' => MENU_LOCAL_TASK,
-            'weight' => 1);
-        }
-      }
-    }
-    else if (arg(1) == 'aggregator' && is_numeric(arg(4))) {
-      if (arg(3) == 'feed') {
-        $feed = aggregator_get_feed(arg(4));
-        if ($feed) {
-          $items[] = array('path' => 'admin/aggregator/edit/feed/'. $feed['fid'],
-            'title' => t('edit feed'),
-            'callback' => 'aggregator_form_feed',
-            'callback arguments' => array($feed),
-            'access' => $edit,
-            'type' => MENU_CALLBACK);
-        }
-      }
-      else {
-        $category = aggregator_get_category(arg(4));
-        if ($category) {
-          $items[] = array('path' => 'admin/aggregator/edit/category/'. $category['cid'],
-            'title' => t('edit category'),
-            'callback' => 'aggregator_form_category',
-            'callback arguments' => array($category),
-            'access' => $edit,
-            'type' => MENU_CALLBACK);
-        }
-      }
-    }
-  }
-
-  return $items;
-}
-
-/**
- * Implementation of hook_settings().
- */
-function aggregator_settings() {
-  $items = array(0 => t('none')) + drupal_map_assoc(array(3, 5, 10, 15, 20, 25), '_aggregator_items');
-  $period = drupal_map_assoc(array(3600, 10800, 21600, 32400, 43200, 86400, 172800, 259200, 604800, 1209600, 2419200, 4838400, 9676800), 'format_interval');
-
-  $form['aggregator_allowed_html_tags'] = array(
-    '#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.')
-  );
-
-  $form['aggregator_summary_items'] = array(
-    '#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.')
-  );
-
-  $form['aggregator_clear'] = array(
-    '#type' => 'select', '#title' => t('Discard news items older than'),
-    '#default_value' => variable_get('aggregator_clear', 9676800), '#options' => $period,
-    '#description' => t('Older news items will be automatically discarded.  Requires crontab.')
-  );
-
-  $form['aggregator_category_selector'] = array(
-    '#type' => 'radios', '#title' => t('Category selection type'), '#default_value' => variable_get('aggregator_category_selector', 'check'),
-    '#options' => array('checkboxes' => t('checkboxes'), 'select' => t('multiple selector')),
-    '#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.')
-  );
-  return $form;
-}
-
-/**
- * Implementation of hook_perm().
- */
-function aggregator_perm() {
-  return array('administer news feeds', 'access news feeds');
-}
-
-/**
- * Implementation of hook_cron().
- *
- * Checks news feeds for updates once their refresh interval has elapsed.
- */
-function aggregator_cron() {
-  $result = db_query('SELECT * FROM {aggregator_feed} WHERE checked + refresh < %d', time());
-  while ($feed = db_fetch_array($result)) {
-    aggregator_refresh($feed);
-  }
-}
-
-/**
- * Implementation of hook_block().
- *
- * Generates blocks for the latest news items in each category and feed.
- */
-function aggregator_block($op, $delta = 0, $edit = array()) {
-  if (user_access('access news feeds')) {
-    if ($op == 'list') {
-      $result = db_query('SELECT cid, title FROM {aggregator_category} ORDER BY title');
-      while ($category = db_fetch_object($result)) {
-        $block['category-'. $category->cid]['info'] = t('%title category latest items', array('%title' => theme('placeholder', $category->title)));
-      }
-      $result = db_query('SELECT fid, title FROM {aggregator_feed} ORDER BY fid');
-      while ($feed = db_fetch_object($result)) {
-        $block['feed-'. $feed->fid]['info'] = t('%title feed latest items', array('%title' => theme('placeholder', $feed->title)));
-      }
-    }
-    else if ($op == 'configure') {
-      list($type, $id) = explode('-', $delta);
-      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));
-      }
-      $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)));
-      return $form;
-    }
-    else if ($op == 'save') {
-      list($type, $id) = explode('-', $delta);
-      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);
-      }
-    }
-    else if ($op == 'view') {
-      list($type, $id) = explode('-', $delta);
-      switch ($type) {
-        case 'feed':
-          if ($feed = db_fetch_object(db_query('SELECT fid, title, block FROM {aggregator_feed} WHERE fid = %d', $id))) {
-            $block['subject'] = check_plain($feed->title);
-            $result = db_query_range('SELECT * FROM {aggregator_item} WHERE fid = %d ORDER BY timestamp DESC, iid DESC', $feed->fid, 0, $feed->block);
-            $block['content'] = '<div class="more-link">'. l(t('more'), 'aggregator/sources/'. $feed->fid, array('title' => t('View this feed\'s recent news.'))) .'</div>';
-          }
-          break;
-
-        case 'category':
-          if ($category = db_fetch_object(db_query('SELECT cid, title, block FROM {aggregator_category} WHERE cid = %d', $id))) {
-            $block['subject'] = check_plain($category->title);
-            $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);
-            $block['content'] = '<div class="more-link">'. l(t('more'), 'aggregator/categories/'. $category->cid, array('title' => t('View this category\'s recent news.'))) .'</div>';
-          }
-          break;
-      }
-      $items = array();
-      while ($item = db_fetch_object($result)) {
-        $items[] = theme('aggregator_block_item', $item);
-      }
-      $block['content'] = theme('item_list', $items) . $block['content'];
-    }
-    return $block;
-  }
-}
-
-/**
- * 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'],
-  );
-  $form['submit'] = array('#type' => 'submit', '#value' =>t('Submit'));
-
-  if ($edit['cid']) {
-    $form['delete'] = array('#type' => 'submit', '#value' =>t('Delete'));
-    $form['cid'] = array('#type' => 'hidden', '#value' => $edit['cid']);
-  }
-
-  return drupal_get_form('aggregator_form_category', $form);
-}
-
-/**
- * Validate aggregator_form_feed form submissions.
- */
-function aggregator_form_category_validate($form_id, $form_values) {
-  if ($_POST['op'] == t('Submit')) {
-    // 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) {
-      form_set_error('title', t('A category named %category already exists. Please enter a unique title.', array('%category' => theme('placeholder', $form_values['title']))));
-    }
-  }
-}
-
-/**
- * Process aggregator_form_category form submissions.
- * @todo Add delete confirmation dialog.
- */
-function aggregator_form_category_submit($form_id, $form_values) {
-  if ($_POST['op'] == t('Delete')) {
-    $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'])) {
-      drupal_set_message(t('The category %category has been updated.', array('%category' => theme('placeholder', $form_values['title']))));
-      if (arg(0) == 'admin') {
-        return 'admin/aggregator/';
-      }
-      else {
-        return 'aggregator/categories/'. $form_values['cid'];
-      }
-    }
-    else {
-      watchdog('aggregator', t('Category %category deleted.', array('%category' => theme('placeholder', $title))));
-      drupal_set_message(t('The category %category has been deleted.', array('%category' => theme('placeholder', $title))));
-      if (arg(0) == 'admin') {
-        return 'admin/aggregator/';
-      }
-      else {
-        return 'aggregator/categories/';
-      }
-    }
-  }
-  else {
-    watchdog('aggregator', t('Category %category added.', array('%category' => theme('placeholder', $form_values['title']))), WATCHDOG_NOTICE, l(t('view'), 'admin/aggregator'));
-    drupal_set_message(t('The category %category has been added.', array('%category' => theme('placeholder', $form_values['title']))));
-  }
-}
-
-/**
- * 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'],
-    '#maxlength' => 64,
-    '#description' => t('The name of the feed; typically the name of the web site you syndicate content from.'),
-    '#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)) {
-    $options[$category->cid] = $category->title;
-    if ($category->fid) $values[] = check_plain($category->cid);
-  }
-  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.'),
-    );
-  }
-  $form['submit'] = array('#type' => 'submit', '#value' =>t('Submit'));
-
-  if ($edit['fid']) {
-    $form['delete'] = array('#type' => 'submit', '#value' =>t('Delete'));
-    $form['fid'] = array('#type' => 'hidden', '#value' => $edit['fid']);
-  }
-
-  return drupal_get_form('aggregator_form_feed', $form);
-}
-
-/**
- * Validate aggregator_form_feed form submissions.
- */
-function aggregator_form_feed_validate($form_id, $form_values) {
-  if ($_POST['op'] == t('Submit')) {
-    // 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) {
-        form_set_error('title', t('A feed named %feed already exists. Please enter a unique title.', array('%feed' => theme('placeholder', $form_values['title']))));
-      }
-    }
-  }
-}
-
-/**
- * Process aggregator_form_feed form submissions.
- * @todo Add delete confirmation dialog.
- */
-function aggregator_form_feed_submit($form_id, $form_values) {
-  if ($_POST['op'] == t('Delete')) {
-    $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'])) {
-      drupal_set_message(t('The feed %feed has been updated.', array('%feed' => theme('placeholder', $form_values['title']))));
-      if (arg(0) == 'admin') {
-        return 'admin/aggregator/';
-      }
-      else {
-        return 'aggregator/sources/'. $form_values['fid'];
-      }
-    }
-    else {
-      watchdog('aggregator', t('Feed %feed deleted.', array('%feed' => theme('placeholder', $title))));
-      drupal_set_message(t('The feed %feed has been deleted.', array('%feed' => theme('placeholder', $title))));
-      if (arg(0) == 'admin') {
-        return 'admin/aggregator/';
-      }
-      else {
-        return 'aggregator/sources/';
-      }
-    }
-  }
-  else {
-    watchdog('aggregator', t('Feed %feed added.', array('%feed' => theme('placeholder', $form_values['title']))), WATCHDOG_NOTICE, l(t('view'), 'admin/aggregator'));
-    drupal_set_message(t('The feed %feed has been added.', array('%feed' => theme('placeholder', $form_values['title']))));
-  }
-}
-
-/**
- * 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);
-        }
-      }
-    }
-  }
-}
-
-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";
-  }
-  if ($items) {
-    db_query('DELETE FROM {aggregator_category_item} WHERE '. implode(' OR ', $items));
-  }
-  db_query('DELETE FROM {aggregator_item} WHERE fid = %d', $feed['fid']);
-  db_query("UPDATE {aggregator_feed} SET checked = 0, etag = '', modified = 0 WHERE fid = %d", $feed['fid']);
-  drupal_set_message(t('The news items from %site have been removed.', array('%site' => theme('placeholder', $feed['title']))));
-}
-
-/**
- * Call-back function used by the XML parser.
- */
-function aggregator_element_start($parser, $name, $attributes) {
-  global $item, $element, $tag, $items, $channel;
-
-  switch ($name) {
-    case 'IMAGE':
-    case 'TEXTINPUT':
-    case 'CONTENT':
-    case 'SUMMARY':
-    case 'TAGLINE':
-    case 'SUBTITLE':
-    case 'LOGO':
-    case 'INFO':
-      $element = $name;
-      break;
-    case 'ID':
-      if ($element != 'ITEM') {
-        $element = $name;
-      }
-    case 'LINK':
-      if ($attributes['REL'] == 'alternate') {
-        if ($element == 'ITEM') {
-          $items[$item]['LINK'] = $attributes['HREF'];
-        }
-        else {
-          $channel['LINK'] = $attributes['HREF'];
-        }
-      }
-      break;
-    case 'ITEM':
-      $element = $name;
-      $item += 1;
-      break;
-    case 'ENTRY':
-      $element = 'ITEM';
-      $item += 1;
-      break;
-  }
-
-  $tag = $name;
-}
-
-/**
- * Call-back function used by the XML parser.
- */
-function aggregator_element_end($parser, $name) {
-  global $element;
-
-  switch ($name) {
-    case 'IMAGE':
-    case 'TEXTINPUT':
-    case 'ITEM':
-    case 'ENTRY':
-    case 'CONTENT':
-    case 'INFO':
-      $element = '';
-      break;
-    case 'ID':
-      if ($element == 'ID') {
-        $element = '';
-      }
-  }
-}
-
-/**
- * Call-back function used by the XML parser.
- */
-function aggregator_element_data($parser, $data) {
-  global $channel, $element, $items, $item, $image, $tag;
-
-  switch ($element) {
-    case 'ITEM':
-      $items[$item][$tag] .= $data;
-      break;
-    case 'IMAGE':
-    case 'LOGO':
-      $image[$tag] .= $data;
-      break;
-    case 'LINK':
-      if ($data) {
-        $items[$item][$tag] .= $data;
-      }
-      break;
-    case 'CONTENT':
-      $items[$item]['CONTENT'] .= $data;
-      break;
-    case 'SUMMARY':
-      $items[$item]['SUMMARY'] .= $data;
-      break;
-    case 'TAGLINE':
-    case 'SUBTITLE':
-      $channel['DESCRIPTION'] .= $data;
-      break;
-    case 'INFO':
-    case 'ID':
-    case 'TEXTINPUT':
-      // The sub-element is not supported. However, we must recognize
-      // it or its contents will end up in the item array.
-      break;
-    default:
-      $channel[$tag] .= $data;
-  }
-}
-
-/**
- * Checks a news feed for new items.
- */
-function aggregator_refresh($feed) {
-  global $channel, $image;
-
-  // Generate conditional GET headers.
-  $headers = array();
-  if ($feed['etag']) {
-    $headers['If-None-Match'] = $feed['etag'];
-  }
-  if ($feed['modified']) {
-    $headers['If-Modified-Since'] = gmdate('D, d M Y H:i:s', $feed['modified']) .' GMT';
-  }
-
-  // Request feed.
-  $result = drupal_http_request($feed['url'], $headers);
-
-  // Process HTTP response code.
-  switch ($result->code) {
-    case 304:
-      db_query('UPDATE {aggregator_feed} SET checked = %d WHERE fid = %d', time(), $feed['fid']);
-      drupal_set_message(t('There is no new syndicated content from %site.', array('%site' => theme('placeholder', $feed['title']))));
-      break;
-    case 301:
-      $feed['url'] = $result->redirect_url;
-      watchdog('aggregator', t('Updated URL for feed %title to %url.', array('%title' => theme('placeholder', $feed['title']), '%url' => theme('placeholder', $feed['url']))));
-      break;
-
-    case 200:
-    case 302:
-    case 307:
-      // Filter the input data:
-     if (aggregator_parse_feed($result->data, $feed)) {
-
-        if ($result->headers['Last-Modified']) {
-          $modified = strtotime($result->headers['Last-Modified']);
-        }
-
-        /*
-        ** Prepare the channel data:
-        */
-
-        foreach ($channel as $key => $value) {
-          $channel[$key] = trim($value);
-        }
-
-        /*
-        ** Prepare the image data (if any):
-        */
-
-        foreach ($image as $key => $value) {
-          $image[$key] = trim($value);
-        }
-
-        if ($image['LINK'] && $image['URL'] && $image['TITLE']) {
-          // 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>';
-        }
-        else {
-          $image = NULL;
-        }
-
-        /*
-        ** Update the feed data:
-        */
-
-        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']);
-
-        /*
-        ** Clear the cache:
-        */
-
-        cache_clear_all();
-
-        watchdog('aggregator', t('There is new syndicated content from %site.', array('%site' => theme('placeholder', $feed['title']))));
-        drupal_set_message(t('There is new syndicated content from %site.', array('%site' => theme('placeholder', $feed['title']))));
-      }
-      break;
-    default:
-      watchdog('aggregator', t('The RSS-feed from %site seems to be broken, due to "%error".', array('%site' => theme('placeholder', $feed['title']), '%error' => theme('placeholder', $result->code .' '. $result->error))), WATCHDOG_WARNING);
-      drupal_set_message(t('The RSS-feed from %site seems to be broken, because of error "%error".', array('%site' => theme('placeholder', $feed['title']), '%error' => theme('placeholder', $result->code .' '. $result->error))));
-  }
-}
-
-/**
- * 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.
- * Originally from MagpieRSS (http://magpierss.sourceforge.net/).
- *
- * @param $date_str A string with a potentially W3C DTF date.
- * @return A timestamp if parsed successfully or -1 if not.
- */
-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 {
-    return FALSE;
-  }
-}
-
-function aggregator_parse_feed(&$data, $feed) {
-  global $items, $image, $channel;
-
-  // Unset the global variables before we use them:
-  unset($GLOBALS['element'], $GLOBALS['item'], $GLOBALS['tag']);
-  $items = array();
-  $image = array();
-  $channel = array();
-
-  // parse the data:
-  $xml_parser = drupal_xml_parser_create($data);
-  xml_set_element_handler($xml_parser, 'aggregator_element_start', 'aggregator_element_end');
-  xml_set_character_data_handler($xml_parser, 'aggregator_element_data');
-
-  if (!xml_parse($xml_parser, $data, 1)) {
-    watchdog('aggregator', t('The RSS-feed from %site seems to be broken, due to an error "%error" on line %line.', array('%site' => theme('placeholder', $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 RSS-feed from %site seems to be broken, because of error "%error" on line %line.', array('%site' => theme('placeholder', $feed['title']), '%error' => xml_error_string(xml_get_error_code($xml_parser)), '%line' => xml_get_current_line_number($xml_parser))), 'error');
-    return 0;
-  }
-  xml_parser_free($xml_parser);
-
-  /*
-  ** We reverse the array such that we store the first item last,
-  ** and the last item first.  In the database, the newest item
-  ** should be at the top.
-  */
-
-  $items = array_reverse($items);
-
-  foreach ($items as $item) {
-    unset($title, $link, $author, $description);
-
-    // Prepare the item:
-    foreach ($item as $key => $value) {
-      $item[$key] = trim($value);
-    }
-
-    /*
-    ** Resolve the item's title.  If no title is found, we use
-    ** up to 40 characters of the description ending at a word
-    ** boundary but not splitting potential entities.
-    */
-
-    if ($item['TITLE']) {
-      $title = $item['TITLE'];
-    }
-    else {
-      $title = preg_replace('/^(.*)[^\w;&].*?$/', "\\1", truncate_utf8($item['DESCRIPTION'], 40));
-    }
-
-    /*
-    ** Resolve the items link.
-    */
-
-    if ($item['LINK']) {
-      $link = $item['LINK'];
-    }
-    elseif ($item['GUID'] && (strncmp($item['GUID'], 'http://', 7) == 0)) {
-      $link = $item['GUID'];
-    }
-    else {
-      $link = $feed['link'];
-    }
-
-    /**
-     * Atom feeds have a CONTENT and/or SUMMARY tag instead of a DESCRIPTION tag
-     */
-    if ($item['CONTENT']) {
-      $item['DESCRIPTION'] = $item['CONTENT'];
-    }
-    else if ($item['SUMMARY']) {
-      $item['DESCRIPTION'] = $item['SUMMARY'];
-    }
-
-    /*
-    ** Try to resolve and parse the item's publication date.  If no
-    ** 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
-    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
-    else $date = 'now';
-
-    $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) {
-        $timestamp = time(); // better than nothing
-      }
-    }
-
-    /*
-    ** Save this item.  Try to avoid duplicate entries as much as
-    ** possible.  If we find a duplicate entry, we resolve it and
-    ** pass along it's ID such that we can update it if needed.
-    */
-
-    if ($link && $link != $feed['link'] && $link != $feed['url']) {
-      $entry = db_fetch_object(db_query("SELECT iid FROM {aggregator_item} WHERE fid = %d AND link = '%s'", $feed['fid'], $link));
-    }
-    else {
-      $entry = db_fetch_object(db_query("SELECT iid FROM {aggregator_item} WHERE fid = %d AND title = '%s'", $feed['fid'], $title));
-    }
-
-    aggregator_save_item(array('iid' => $entry->iid, 'fid' => $feed['fid'], 'timestamp' => $timestamp, 'title' => $title, 'link' => $link, 'author' => $item['AUTHOR'], 'description' => $item['DESCRIPTION']));
-  }
-
-  /*
-  ** Remove all items that are older than flush item timer:
-  */
-
-  $age = time() - variable_get('aggregator_clear', 9676800);
-  $result = db_query('SELECT iid FROM {aggregator_item} WHERE fid = %d AND timestamp < %d', $feed['fid'], $age);
-
-  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);
-  }
-
-  return 1;
-}
-
-function aggregator_save_item($edit) {
-  if ($edit['iid'] && $edit['title']) {
-    db_query("UPDATE {aggregator_item} SET title = '%s', link = '%s', author = '%s', description = '%s' WHERE iid = %d", $edit['title'], $edit['link'], $edit['author'], $edit['description'], $edit['iid']);
-  }
-  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']);
-  }
-  else if ($edit['title'] && $edit['link']) {
-    $edit['iid'] = db_next_id('{aggregator_item}_iid');
-    db_query("INSERT INTO {aggregator_item} (iid, fid, title, link, author, description, timestamp) VALUES (%d, %d, '%s', '%s', '%s', '%s', %d)", $edit['iid'], $edit['fid'], $edit['title'], $edit['link'], $edit['author'], $edit['description'], $edit['timestamp']);
-    // 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)) {
-      db_query('INSERT INTO {aggregator_category_item} (cid, iid) VALUES (%d, %d)', $category->cid, $edit['iid']);
-    }
-  }
-}
-
-function aggregator_get_feed($fid) {
-  return db_fetch_array(db_query('SELECT * FROM {aggregator_feed} WHERE fid = %d', $fid));
-}
-
-function aggregator_get_category($cid) {
-  return db_fetch_array(db_query('SELECT * FROM {aggregator_category} WHERE cid = %d', $cid));
-}
-
-function aggregator_view() {
-  $result = db_query('SELECT f.*, COUNT(i.iid) AS items FROM {aggregator_feed} f LEFT JOIN {aggregator_item} i ON f.fid = i.fid GROUP BY f.fid, f.title, f.url, f.refresh, f.checked, f.link, f.description, f.etag, f.modified, f.image, f.block ORDER BY f.title');
-
-  $output .= '<h3>'. t('Feed overview') .'</h3>';
-
-  $header = array(t('Title'), t('Items'), t('Last update'), t('Next update'), array('data' => t('Operations'), 'colspan' => '3'));
-  $rows = array();
-  while ($feed = db_fetch_object($result)) {
-    $rows[] = array(l($feed->title, "aggregator/sources/$feed->fid"), format_plural($feed->items, '1 item', '%count items'), ($feed->checked ? t('%time ago', array('%time' => format_interval(time() - $feed->checked))) : t('never')), ($feed->checked ? t('%time left', array('%time' => format_interval($feed->checked + $feed->refresh - time()))) : t('never')), l(t('edit'), "admin/aggregator/edit/feed/$feed->fid"), l(t('remove items'), "admin/aggregator/remove/$feed->fid"), l(t('update items'), "admin/aggregator/update/$feed->fid"));
-  }
-  $output .= theme('table', $header, $rows);
-
-  $result = db_query('SELECT c.cid, c.title, count(ci.iid) as items FROM {aggregator_category} c LEFT JOIN {aggregator_category_item} ci ON c.cid = ci.cid GROUP BY c.cid, c.title ORDER BY title');
-
-  $output .= '<h3>'. t('Category overview') .'</h3>';
-
-  $header = array(t('Title'), t('Items'), t('Operations'));
-  $rows = array();
-  while ($category = db_fetch_object($result)) {
-    $rows[] = array(l($category->title, "aggregator/categories/$category->cid"), format_plural($category->items, '1 item', '%count items'), l(t('edit'), "admin/aggregator/edit/category/$category->cid"));
-  }
-  $output .= theme('table', $header, $rows);
-
-  return $output;
-}
-
-/**
- * Menu callback; removes all items from a feed, then redirects to the overview page.
- */
-function aggregator_admin_remove_feed($feed) {
-  aggregator_remove(aggregator_get_feed($feed));
-  drupal_goto('admin/aggregator');
-}
-
-/**
- * Menu callback; refreshes a feed, then redirects to the overview page.
- */
-function aggregator_admin_refresh_feed($feed) {
-  aggregator_refresh(aggregator_get_feed($feed));
-  drupal_goto('admin/aggregator');
-}
-
-/**
- * Menu callback; displays the aggregator administration page.
- */
-function aggregator_admin_overview() {
-  return aggregator_view();
-}
-
-/**
- * Menu callback; displays the most recent items gathered from any feed.
- */
-function aggregator_page_last() {
-  return _aggregator_page_list('SELECT i.*, f.title AS ftitle, f.link AS flink FROM {aggregator_item} i INNER JOIN {aggregator_feed} f ON i.fid = f.fid ORDER BY i.timestamp DESC, i.iid DESC', arg(1));
-}
-
-/**
- * Menu callback; displays all the items captured from a particular feed.
- */
-function aggregator_page_source() {
-  $feed = db_fetch_object(db_query('SELECT * FROM {aggregator_feed} WHERE fid = %d', arg(2)));
-  $info = theme('aggregator_feed', $feed);
-
-  return _aggregator_page_list('SELECT * FROM {aggregator_item} WHERE fid = '. $feed->fid .' ORDER BY timestamp DESC, iid DESC', arg(3), $info);
-}
-
-/**
- * Menu callback; displays all the items aggregated in a particular category.
- */
-function aggregator_page_category() {
-  $category = db_fetch_object(db_query('SELECT cid, title FROM {aggregator_category} WHERE cid = %d', arg(2)));
-
-  return _aggregator_page_list('SELECT i.*, f.title AS ftitle, f.link AS flink FROM {aggregator_category_item} c LEFT JOIN {aggregator_item} i ON c.iid = i.iid LEFT JOIN {aggregator_feed} f ON i.fid = f.fid WHERE cid = '. $category->cid .' ORDER BY timestamp DESC, iid DESC', arg(3));
-}
-
-/**
- * Prints an aggregator page listing a number of feed items. Various
- * menu callbacks use this function to print their feeds.
- */
-function _aggregator_page_list($sql, $op, $header = '') {
-  $categorize = (user_access('administer news feeds') && ($op == 'categorize'));
-
-  $output = '<div id="aggregator">';
-
-  $form['header'] = array('#value' => $header);
-  $output .= $form['header']['#value'];
-
-  $result = pager_query($sql, 20);
-  $categories = array();
-  while ($item = db_fetch_object($result)) {
-    $form['items'][$item->iid] = array('#value' => theme('aggregator_page_item', $item));
-    $output .= $form['items'][$item->iid]['#value'];
-    $form['categories'][$item->iid] = array();
-
-    if ($categorize) {
-
-      $categories_result = db_query('SELECT c.cid, c.title, ci.iid FROM {aggregator_category} c LEFT JOIN {aggregator_category_item} ci ON c.cid = ci.cid AND ci.iid = %d', $item->iid);
-      $selected = array();
-      while ($category = db_fetch_object($categories_result)) {
-        if (!$done) {
-          $categories[$category->cid] = check_plain($category->title);
-        }
-        if ($category->iid) {
-          $selected[] = $category->cid;
-        }
-      }
-      $done = true;
-      $form['categories'][$item->iid] = array(
-        '#type' => variable_get('aggregator_category_selector', 'checkboxes'),
-        '#default_value' => $selected, '#options' => $categories,
-        '#size' => 10, '#multiple' => true
-      );
-    }
-  }
-  $output .= '</div>';
-  $form['submit'] = array('#type' => 'submit', '#value' => t('Save categories'));
-  $form['pager'] = array('#value' => theme('pager', NULL, 20, 0));
-  $output .= $form['pager']['#value'];
-
-  // arg(1) is undefined if we are at the top aggregator URL
-  // is there a better way to do this?
-  if (!arg(1)) {
-    $form['feed_icon'] = array('#value' => theme('feed_icon', url('aggregator/rss')));
-  }
-  elseif (arg(1) == 'categories' && arg(2) && !arg(3)) {
-    $form['feed_icon'] = array('#value' => theme('feed_icon', url('aggregator/rss/' . arg(2))));
-  }
-  $output .= $form['feed_icon']['#value'];
-
-  return ($categorize) ? drupal_get_form('aggregator_page_list', $form) : $output;
-}
-
-function theme_aggregator_page_list($form) {
-  $output = '<div id="aggregator">';
-  $output .= form_render($form['header']);
-  $rows = array();
-  if ($form['items']) {
-    foreach (element_children($form['items']) as $key) {
-      if (is_array($form['items'][$key])) {
-        $rows[] = array(form_render($form['items'][$key]), array('data' => form_render($form['categories'][$key]), 'class' => 'categorize-item'));
-      }
-    }
-  }
-  $output .= theme('table', array('', t('Categorize')), $rows);
-  $output .= form_render($form['submit']);
-  $output .= '</div>';
-  $output .= form_render($form);
-  return $output;
-}
-
-function aggregator_page_list_validate($form_id, &$form) {
-  if (!user_access('administer news feeds')) {
-    form_error($form, t('You are not allowed to categorize this feed item.'));
-  }
-}
-
-function aggregator_page_list_submit($form_id, $form_values) {
-  foreach ($form_values as $iid => $selection) {
-    db_query('DELETE FROM {aggregator_category_item} WHERE iid = %d', $iid);
-    foreach ($selection as $cid) {
-      if ($cid) {
-        db_query('INSERT INTO {aggregator_category_item} (cid, iid) VALUES (%d, %d)', $cid, $iid);
-      }
-    }
-  }
-  drupal_set_message(t('The categories have been saved.'));
-}
-
-/**
- * Menu callback; displays all the feeds used by the aggregator.
- */
-function aggregator_page_sources() {
-  $result = db_query('SELECT f.fid, f.title, f.description, f.image, MAX(i.timestamp) AS last FROM {aggregator_feed} f LEFT JOIN {aggregator_item} i ON f.fid = i.fid GROUP BY f.fid, f.title, f.description, f.image ORDER BY last DESC, f.title');
-  $output = "<div id=\"aggregator\">\n";
-  while ($feed = db_fetch_object($result)) {
-    $output .= '<h2>'. check_plain($feed->title) ."</h2>\n";
-
-    // Most recent items:
-    $list = array();
-    if (variable_get('aggregator_summary_items', 3)) {
-      $items = db_query_range('SELECT i.title, i.timestamp, i.link FROM {aggregator_item} i WHERE i.fid = %d ORDER BY i.timestamp DESC', $feed->fid, 0, variable_get('aggregator_summary_items', 3));
-      while ($item = db_fetch_object($items)) {
-        $list[] = theme('aggregator_summary_item', $item);
-      }
-    }
-    $output .= theme('item_list', $list);
-    $output .= '<div class="links">'. theme('links', array(l(t('more'), 'aggregator/sources/'. $feed->fid))) ."</div>\n";
-  }
-  $output .= theme('xml_icon', url('aggregator/opml'));
-  $output .= '</div>';
-  return $output;
-}
-
-/**
- * Menu callback; generate an RSS 0.92 feed of aggregator items or categories.
- */
-function aggregator_page_rss() {
-  global $base_url;
-
-  // arg(2) is the passed cid, only select for that category
-  $result = NULL;
-  if (arg(2)) {
-    $category = db_fetch_object(db_query('SELECT cid, title FROM {aggregator_category} WHERE cid = %d', arg(2)));
-    $url = '/categories/' . $category->cid;
-    $title = ' ' . t('in category') . ' ' . $category->title;
-    $sql = 'SELECT i.*, f.title AS ftitle, f.link AS flink FROM {aggregator_category_item} c LEFT JOIN {aggregator_item} i ON c.iid = i.iid LEFT JOIN {aggregator_feed} f ON i.fid = f.fid WHERE cid = %d ORDER BY timestamp DESC, iid DESC';
-    $result = db_query_range($sql, $category->cid, 0, variable_get('feed_default_items', 10));
-  }
-  // or, get the default aggregator items
-  else {
-    $sql = 'SELECT i.*, f.title AS ftitle, f.link AS flink FROM {aggregator_item} i INNER JOIN {aggregator_feed} f ON i.fid = f.fid ORDER BY i.timestamp DESC, i.iid DESC';
-    $result = db_query_range($sql, 0, variable_get('feed_default_items', 10));
-  }
-
-  while ($item = db_fetch_object($result)) {
-    switch (variable_get('feed_item_length', 'teaser')) {
-      case 'teaser':
-        $teaser = node_teaser($item->description);
-        if ($teaser != $item_description) {
-          $teaser .= '<p><a href="'. check_url($item->link) .'">'. t('read more') ."</a></p>\n";
-        }
-        $item->description = $teaser;
-        break;
-      case 'title':
-        $item->description = '';
-        break;
-    }
-    $items .= format_rss_item($item->ftitle . ': ' . $item->title, $item->link, $item->description, array('pubDate' => date('r', $item->timestamp)));
-  }
-
-  $output .= "<?xml version=\"1.0\" encoding=\"utf-8\"?>\n";
-  $output .= "<rss version=\"2.0\">\n";
-  $output .= format_rss_channel(variable_get('site_name', t('Drupal')) . ' ' . t('aggregator'), $base_url . '/' . url('aggregator' . $url), variable_get('site_name', t('Drupal')) . ' - ' . t('aggregated feeds') . $title, $items, 'en');
-  $output .= "</rss>\n";
-
-  drupal_set_header('Content-Type: text/xml; charset=utf-8');
-  print $output;
-}
-
-/**
- * Menu callback; generates an OPML representation of all feeds.
- */
-function aggregator_page_opml($cid = NULL) {
-  if ($cid) {
-    $result = db_query('SELECT f.title, f.url FROM {aggregator_feed} f LEFT JOIN {aggregator_category_feed} c on f.fid = c.fid WHERE c.cid = %d ORDER BY title', $cid);
-  }
-  else {
-    $result = db_query('SELECT * FROM {aggregator_feed} ORDER BY title');
-  }
-
-  $output = "<?xml version=\"1.0\" encoding=\"utf-8\"?>\n";
-  $output .= "<opml version=\"1.1\">\n";
-  $output .= "<head>\n";
-  $output .= '<title>'. check_plain(variable_get('site_name', 'Drupal')) ."</title>\n";
-  $output .= '<dateModified>'. gmdate('r') ."</dateModified>\n";
-  $output .= "</head>\n";
-  $output .= "<body>\n";
-
-  while ($feed = db_fetch_object($result)) {
-    $output .= '<outline text="'. check_plain($feed->title) .'" xmlUrl="'. check_url($feed->url) ."\" />\n";
-  }
-
-  $output .= "</body>\n";
-  $output .= "</opml>\n";
-
-  drupal_set_header('Content-Type: text/xml; charset=utf-8');
-  print $output;
-}
-
-/**
- * Menu callback; displays all the categories used by the aggregator.
- */
-function aggregator_page_categories() {
-  $result = db_query('SELECT c.cid, c.title, c.description FROM {aggregator_category} c LEFT JOIN {aggregator_category_item} ci ON c.cid = ci.cid LEFT JOIN {aggregator_item} i ON ci.iid = i.iid GROUP BY c.cid, c.title, c.description');
-  $output = "<div id=\"aggregator\">\n";
-
-  while ($category = db_fetch_object($result)) {
-    $output .= '<h2>'. check_plain($category->title) ."</h2>\n";
-    if (variable_get('aggregator_summary_items', 3)) {
-      $list = array();
-      $items = db_query_range('SELECT i.title, i.timestamp, i.link, f.title as feed_title, f.link as feed_link FROM {aggregator_category_item} ci LEFT JOIN {aggregator_item} i ON i.iid = ci.iid LEFT JOIN {aggregator_feed} f ON i.fid = f.fid WHERE ci.cid = %d ORDER BY i.timestamp DESC', $category->cid, 0, variable_get('aggregator_summary_items', 3));
-      while ($item = db_fetch_object($items)) {
-        $list[] = theme('aggregator_summary_item', $item);
-      }
-      $output .= theme('item_list', $list);
-    }
-    $output .= '<div class="links">'. theme('links', array(l(t('more'), 'aggregator/categories/'. $category->cid))) ."</div>\n";
-  }
-  $output .= '</div>';
-
-  return $output;
-}
-
-/**
- * Format a news feed.
- *
- * @ingroup themeable
- */
-function theme_aggregator_feed($feed) {
-  $output  = '<div class="feed-source">';
-  $output .= theme('feed_icon', $feed->url) ."\n";
-  $output .= $feed->image . ' <h3 class="feed-title"><a href="'. check_url($feed->link) .'">'. check_plain($feed->title) ."</a></h3>\n";
-  $output .= '<div class="feed-description"><em>'. t('Description:') .'</em> '. aggregator_filter_xss($feed->description) ."</div>\n";
-
-  $updated = t('%time ago', array('%time' => format_interval(time() - $feed->checked)));
-  if (user_access('administer news feeds')) {
-    $updated = l($updated, 'admin/aggregator');
-  }
-
-  $output .= '<div class="feed-updated"><em>'. t('Updated:') . "</em> $updated</div>";
-  $output .= "</div>\n";
-
-  return $output;
-}
-
-/**
- * Format an individual feed item for display in the block.
- *
- * @ingroup themeable
- */
-function theme_aggregator_block_item($item, $feed = 0) {
-  global $user;
-
-  if ($user->uid && module_exist('blog') && user_access('edit own blog')) {
-    if ($image = theme('image', 'misc/blog.png', t('blog it'), t('blog it'))) {
-      $output .= '<div class="icon">'. l($image, 'node/add/blog', array('title' => t('Comment on this news item in your personal blog.'), 'class' => 'blog-it'), "iid=$item->iid", NULL, FALSE, TRUE) .'</div>';
-    }
-  }
-
-  // Display the external link to the item.
-  $output .= '<a href="'. check_url($item->link) .'">'. check_plain($item->title) ."</a>\n";
-
-  return $output;
-}
-
-/**
- * Return a themed item heading for summary pages located at "aggregator/sources"
- * and "aggregator/categories".
- *
- * @param $item The item object from the aggregator module.
- * @return A string containing the output.
- *
- * @ingroup themeable
- */
-function theme_aggregator_summary_item($item) {
-  $output = '<a href="'. check_url($item->link) .'">'. check_plain($item->title) .'</a> <span class="age">'. t('%age old', array('%age' => format_interval(time() - $item->timestamp))) .'</span>';
-  if ($item->feed_link) {
-    $output .= ', <span class="source"><a href="'. check_url($item->feed_link) .'">'. check_plain($item->feed_title) .'</a></span>';
-  }
-  return $output ."\n";
-}
-
-/**
- * Format an individual feed item for display on the aggregator page.
- *
- * @ingroup themeable
- */
-function theme_aggregator_page_item($item) {
-
-  $source = '';
-  if ($item->ftitle && $item->fid) {
-    $source = l($item->ftitle, "aggregator/sources/$item->fid", array('class' => 'feed-item-source')) . ' -';
-  }
-
-  if (date('Ymd', $item->timestamp) == date('Ymd')) {
-    $source_date = t('%ago ago', array('%ago' => format_interval(time() - $item->timestamp)));
-  }
-  else {
-    $source_date = format_date($item->timestamp, 'custom', variable_get('date_format_medium', 'D, Y-m-d H:i'));
-  }
-
-  $output .= "<div class=\"feed-item\">\n";
-  $output .= '<h3 class="feed-item-title"><a href="'. check_url($item->link) .'">'. check_plain($item->title) ."</a></h3>\n";
-  $output .= "<div class=\"feed-item-meta\">$source <span class=\"feed-item-date\">$source_date</span></div>\n";
-
-  if ($item->description) {
-    $output .= '<div class="feed-item-body">'. aggregator_filter_xss($item->description) ."</div>\n";
-  }
-
-  $result = db_query('SELECT c.title, c.cid FROM {aggregator_category_item} ci LEFT JOIN {aggregator_category} c ON ci.cid = c.cid WHERE ci.iid = %d ORDER BY c.title', $item->iid);
-  $categories = array();
-  while ($category = db_fetch_object($result)) {
-    $categories[] = l($category->title, 'aggregator/categories/'. $category->cid);
-  }
-  if ($categories) {
-    $output .= '<div class="feed-item-categories">'. t('Categories') .': '. implode(', ', $categories) ."</div>\n";
-  }
-
-  $output .= "</div>\n";
-
-  return $output;
-}
-
-/**
- * Safely render HTML content, as allowed.
- */
-function aggregator_filter_xss($value) {
-  return filter_xss($value, preg_split('/\s+|<|>/', variable_get("aggregator_allowed_html_tags", '<a> <b> <br> <dd> <dl> <dt> <em> <i> <li> <ol> <p> <strong> <u> <ul>'), -1, PREG_SPLIT_NO_EMPTY));
-}
-
-/**
- * Helper function for drupal_map_assoc.
- */
-function _aggregator_items($count) {
-  return format_plural($count, '1 item', '%count items');
-}

modules/archive/archive.module

-<?php
-// $Id$
-
-/**
- * @file
- * Displays a calendar to navigate old content.
- */
-
-/**
- * Implementation of hook_help().
- */
-function archive_help($section) {
-  switch ($section) {
-    case 'admin/help#archive':
-      $output = '<p>'. t('The archive page allows content to be viewed by date.  It also provides a monthly calendar view that users can use to navigate through content.') .'</p>';
-      $output .= '<p>'. t('To view the archive by date, select the date in the calendar.  Administrators can enable the <em>browse archives</em> block in block administration to allow users to browse by calendar.  Clicking on a date in the monthly calendar view shows the content for that date.  Users can navigate to different months using arrows beside the month\'s name in the calendar display.   The current date will be highlighted in the calendar.') .'</p>';
-      $output .= t('<p>You can</p>
-<ul>
-<li>view your <a href="%archive">archive by day</a>.</li>
-<li>enable the <em>browse archives</em> block at <a href="%admin-block">administer &gt;&gt; block</a>.</li>
-</ul>
-', array('%archive' => url('archive'), '%admin-block' => url('admin/block')));
-      $output .= '<p>'. t('For more information please read the configuration and customization handbook <a href="%archive">Archive page</a>.', array('%archive' => 'http://drupal.org/handbook/modules/archive/')) .'</p>';
-      return $output;
-    case 'admin/modules#description':
-      return t('Displays a calendar for navigating older content.');
-  }
-}
-
-/**
- * Implementation of hook_menu().
- */
-function archive_menu($may_cache) {
-  $items = array();
-
-  if ($may_cache) {
-    $items[] = array('path' => 'archive',
-      'title' => t('archives'),
-      'access' => user_access('access content'),
-      'callback' => 'archive_page',
-      'type' => MENU_SUGGESTED_ITEM);
-  }
-  return $items;
-}
-
-/**
- * Implementation of hook_block().
- *
- * Generates a calendar for the current month, with links to the archives
- * for each day.
- */
-function archive_block($op = 'list', $delta = 0) {
-  if ($op == 'list') {
-    $blocks[0]['info'] = t('Calendar to browse archives');
-    return $blocks;
-  }
-  else if ($op == 'view' && user_access('access content')) {
-    $block['subject'] = t('Browse archives');
-    $block['content'] = archive_calendar();
-    return $block;
-  }
-}
-
-/**
- * Generates a monthly calendar, for display in the archive block.
- */
-function archive_calendar() {
-  global $user;
-
-  // Extract today's date:
-  $start_of_today = mktime(0, 0, 0, date('n', time()), date('d', time()), date('Y', time())) + $user->timezone;
-  $end_of_today = mktime(23, 59, 59, date('n', time()), date('d', time()), date('Y', time())) + $user->timezone;
-
-  // Extract the requested date:
-  if (arg(0) == 'archive' && arg(3)) {
-    $year = arg(1);
-    $month = arg(2);
-    $day = arg(3);
-
-    $requested = mktime(0, 0, 0, $month, $day, $year) + $user->timezone;
-  }
-  else {
-    $year = date('Y', time());
-    $month  = date('n', time());
-    $day = date('d', time());
-
-    $requested = $end_of_today + $user->timezone;
-  }
-
-  $start_of_month = mktime(0, 0, 0, $month, 1, $year);
-
-  // Extract first day of the month:
-  $first = date('w', $start_of_month);
-
-  // Extract last day of the month:
-  $last = date('t', $start_of_month);
-
-  $end_of_month = mktime(23, 59, 59, $month, $last, $year);
-
-  $cache = cache_get("archive:calendar:$day-$month-$year");
-
-  if (!empty($cache)) {
-    return $cache->data;
-  }
-
-  // Calculate previous and next months dates and check for shorter months (28/30 days)
-  $prevmonth = mktime(23, 59, 59, $month - 1, 1, $year);
-  $prev = mktime(23, 59, 59, $month - 1, min(date('t', $prevmonth), $day), $year);
-  $nextmonth = mktime(23, 59, 59, $month + 1, 1, $year);
-  $next = mktime(23, 59, 59, $month + 1, min(date('t', $nextmonth), $day), $year);
-
-  $sql = 'SELECT n.nid, n.created FROM {node} n WHERE n.status = 1 AND n.created > %d AND n.created < %d ORDER BY n.created';
-  $sql = db_rewrite_sql($sql);
-  $result = db_query($sql, $start_of_month, $end_of_month);
-
-  $days_with_posts = array();
-  while ($day_with_post = db_fetch_object($result)) {
-    $daynum = date('j', $day_with_post->created + $user->timezone);
-    if (isset($days_with_posts[$daynum])) {
-      $days_with_posts[$daynum]++;
-    }
-    else {
-      $days_with_posts[$daynum] = 1;
-    }
-  }
-
-  // Generate calendar header:
-  $output .= "\n<!-- calendar -->\n";
-  $output .= '<div class="calendar">';
-  $output .= '<table summary="'. t('A calendar to browse the archives') .".\">\n";
-  $output .= ' <caption>'. l('«', 'archive/'. date('Y/m/d', $prev), array('title' => t('Previous month'))) .' '. format_date($requested, 'custom', 'F') . date(' Y', $requested) .' '. ($nextmonth <= time() ? l('»', 'archive/'. date('Y/m/d', $next), array('title' => t('Next month'))) : ' ') ."</caption>\n";
-
-  // First day of week (0 => Sunday, 1 => Monday, ...)
-  $weekstart = variable_get('date_first_day', 0);
-
-  // Last day of week
-  ($weekstart - 1 == -1) ? $lastday = 6 : $lastday = $weekstart - 1;
-
-  // Generate the days of the week:
-  $firstcolumn = mktime(0, 0, 0, 3, 20 + $weekstart, 1994);
-
-  $output .= " <tr class=\"header-week\">\n";
-  $days = array(t('Sunday') => t('Su'), t('Monday') => t('Mo'), t('Tuesday') => t('Tu'), t('Wednesday') => t('We'), t('Thursday') => t('Th'), t('Friday') => t('Fr'), t('Saturday') => t('Sa'));
-  if ($weekstart) {
-    $days = array_merge(array_slice($days, $weekstart), array_slice($days, 0, $weekstart));
-  }
-
-  foreach ($days as $fullname => $name) {
-    $output .= ' <th abbr="'. $fullname .'">'. $name . "</th>\n";
-  }
-  $output .= "</tr>\n";
-
-  // Initialize temporary variables:
-  $nday = 1;
-  $sday = $first;
-
-  // Loop through all the days of the month:
-  while ($nday <= $last) {
-    // Set up blank days for first week of the month (allowing individual blank day styling):
-    if ($first != $weekstart) {
-      $blankdays = ($first - $weekstart + 7) % 7;
-      $output .= " <tr class=\"row-week\">" . str_repeat("<td class=\"day-blank\">&nbsp;</td>\n", $blankdays);
-      $first = $weekstart;
-    }
-    // Start every week on a new line:
-    if ($sday == $weekstart) {
-      $output .= " <tr class=\"row-week\">\n";
-    }
-
-    // Print one cell:
-    $date = mktime(0, 0, 0, $month, $nday, $year) + $user->timezone;
-    if (isset($days_with_posts[$nday])) {
-      $daytext = l($nday, "archive/$year/$month/$nday", array("title" => format_plural($days_with_posts[$nday], "1 post", "%count posts")));
-      $dayclass = 'day-link';
-    }
-    else {
-      $daytext = $nday;
-      $dayclass = 'day-normal';
-    }
-    if ($date == $requested) {
-      $output .= "  <td class=\"day-selected\">$daytext</td>\n";
-    }
-    else if ($date == $start_of_today) {
-      $output .= "  <td class=\"day-today\">$daytext</td>\n";
-    }
-    else if ($date > $end_of_today) {
-      $output .= "  <td class=\"day-future\">$daytext</td>\n";
-    }
-    else {
-      $output .= "  <td class=\"$dayclass\">$daytext</td>\n";
-    }
-
-    // Start every week on a new line:
-    if ($sday == $lastday) {
-      $output .=  " </tr>\n";
-    }
-
-    // Update temporary variables:
-    $sday++;
-    $sday = $sday % 7;
-    $nday++;
-  }
-
-  // Complete the calendar (allowing individual blank day styling):
-  if ($sday != $weekstart) {
-    $end = (7 - $sday + $weekstart) % 7;
-    $output .= str_repeat("<td class=\"day-blank\">&nbsp;</td>\n", $end) . "</tr>\n";
-  }
-
-  $output .= "</table></div>\n\n";
-
-  cache_set("archive:calendar:$day-$month-$year", $output, CACHE_TEMPORARY);
-
-  return $output;
-}
-
-/**
- * Menu callback; lists all nodes posted on a given date.
- */
-function archive_page($year = 0, $month = 0, $day = 0) {
-  global $user;
-
-  $date = mktime(0, 0, 0, $month, $day, $year) - $user->timezone;
-  $date_end = mktime(0, 0, 0, $month, $day + 1, $year) - $user->timezone;
-
-  // Display form.
-  $output = archive_browse_form($year, $month, $day);
-
-  if ($year && $month && $day) {
-    // Fetch nodes for the selected date, if one was specified.
-    $sql = 'SELECT n.nid, n.created FROM {node} n WHERE n.status = 1 AND n.created > %d AND n.created < %d ORDER BY n.created';
-    $sql = db_rewrite_sql($sql);
-    $result = db_query_range($sql, $date, $date_end, 0, 20);
-    if (db_num_rows($result) > 0) {
-      while ($nid = db_fetch_object($result)) {
-        $output .= node_view(node_load($nid->nid), 1);
-      }
-    }
-    else {
-      $output .= theme('box', t('No posts found.'), '');
-    }
-  }
-  else {
-    $output .= theme('box', t('No posts found.'), '');
-  }
-
-  return $output;
-}
-
-/**
- * Generate a form that retrieves archives for a certain date.
- */
-function archive_browse_form($year, $month, $day) {
-  // Prepare the values of the form fields.
-  $years = drupal_map_assoc(range(2000, 2010));
-  $months = array(1 => t('January'), 2 => t('February'), 3 => t('March'), 4 => t('April'), 5 => t('May'), 6 => t('June'), 7 => t('July'), 8 => t('August'), 9 => t('September'), 10 => t('October'), 11 => t('November'), 12 => t('December'));
-  $days = drupal_map_assoc(range(1, 31));
-
-  $form['year']  = array('#type' => 'select',
-    '#default_value' => ($year ? $year : date('Y')),
-    '#options' => $years,
-  );
-  $form['month'] = array('#type' => 'select',
-    '#default_value' => ($month ? $month : date('m')),
-    '#options' => $months,
-  );
-  $form['day']   = array('#type' => 'select',
-    '#default_value' => ($day ? $day : date('d')),
-    '#options' => $days,
-  );
-  $form['show']  = array('#type' => 'submit',
-    '#value' => t('Show'),
-  );
-
-  return drupal_get_form('archive_browse_form', $form);
-}
-
-/**
- * Process archive browse form submission.
- */
-function archive_browse_form_submit($form_id, $form_values) {
-  return('archive/'. $form_values['year'] .'/'. $form_values['month'] .'/'. $form_values['day']);
-}
-
-/**
- * Form theme function; displays the archive date navigation form inline.
- */
-function theme_archive_browse_form($form) {
-  $output = '<div class="container-inline archive">' . form_render($form) . '</div>';
-  return $output;
-}

modules/blog/blog.module

-<?php
-// $Id$
-
-/**
- * @file
- * Enables keeping an easily and regularly updated web page or a blog.
- */
-
-/**
- * Implementation of hook_node_info().
- */
-function blog_node_info() {
-  return array('blog' => array('name' => t('blog entry'), 'base' => 'blog'));
-}
-
-/**
- * Implementation of hook_perm().
- */
-function blog_perm() {
-  return array('edit own blog');
-}
-
-/**
- * Implementation of hook_access().
- */
-function blog_access($op, $node) {
-  global $user;
-
-  if ($op == 'create') {
-    return user_access('edit own blog') && $user->uid;
-  }
-
-  if ($op == 'update' || $op == 'delete') {
-    if (user_access('edit own blog') && ($user->uid == $node->uid)) {
-      return TRUE;
-    }
-  }
-}
-
-/**
- * Implementation of hook_user().
- */
-function blog_user($type, &$edit, &$user) {
-  if ($type == 'view' && user_access('edit own blog', $user)) {
-    $items[] = array('title' => t('Blog'),
-      'value' => l(t('view recent blog entries'), "blog/$user->uid", array('title' => t("Read %username's latest blog entries.", array('%username' => $user->name)))),
-      'class' => 'blog',
-    );
-    return array(t('History') => $items);
-  }
-}
-
-/**
- * Implementation of hook_help().
- */
-function blog_help($section) {
-  switch ($section) {
-    case 'admin/help#blog':
-      $output = '<p>'. t('The blog module allows registered users to maintain an online weblog (commonly known as a blog), often referred to as an online journal or diary.  Blogs are made up of individual posts that are time stamped and are typically viewed by date as you would a diary. Blogs often contain links to webpages users have read and/or agree/disagree with.') .'</p>';
-      $output .= '<p>'. t('The blog module adds a <em>user blogs</em> navigation link to the site, which takes any visitor to a page that displays the most recent blog entries from all the users on the site. The navigation menu has a <em>create a blog entry</em> link (which takes you to a submission form) and a <em>view personal blog</em> link (which displays your blog entries as other people will see them).  The blog module also creates a <em>recent blog posts</em> block that can be enabled.') .'</p>';
-      $output .= '<p>'. t('If a user has the ability to post blogs, then the import module (news aggregator) will display a blog-it link next to each news item in its lists. Clicking on this takes the user to the blog submission form, with the title, a link to the item, and a link to the source into the body text already in the text box, ready for the user to add a comment or explanation. This actively encourages people to add blog entries about things they see and hear elsewhere in the website and from your syndicated partner sites.') .'</p>';
-      $output .= t('<p>You can</p>
-<ul>
-<li>read your blog via your user profile at <a href="%user">my account</a>.</li>
-<li>post a blog at <a href="%node-add-blog">create content &gt;&gt; personal blog entry</a>.</li>
-<li>administer blog at <a href="%admin-node-configure-types-blog">administer &gt;&gt; content &gt;&gt; configure &gt;&gt; content types &gt;&gt; personal blog entry</a>.</li>
-<li>administer blog api at <a href="%admin-settings-blogapi">administer &gt;&gt; settings &gt;&gt; blogapi</a>.</li>
-<li>enable the "recent blog posts" block at <a href="%admin-block">administer &gt;&gt; blocks</a> to show the 10 most recent blog posts.</li>
-</ul>
-', array('%user' => url('user'), '%node-add-blog' => url('node/add/blog'), '%admin-node-configure-types-blog' => url('admin/node/configure/types/blog'), '%admin-settings-blogapi' => url('admin/settings/blogapi'), '%admin-block' => url('admin/block')));
-      $output .= '<p>'. t('For more information please read the configuration and customization handbook <a href="%blog">Blog page</a>.', array('%blog' => 'http://drupal.org/handbook/modules/blog/')) .'</p>';
-      return $output;
-    case 'admin/modules#description':
-      return t('Enables keeping an easily and regularly updated web page or a blog.');
-    case 'node/add#blog':
-      return t("A blog is a regularly updated journal or diary made up of individual posts shown in reversed chronological order.  A blog is tightly coupled to the author so each user will have his 'own' blog.");
-  }
-}
-
-/**
- * Displays an RSS feed containing recent blog entries of a given user.
- */
-function blog_feed_user($uid = 0) {
-  global $user;
-
-  if ($uid) {
-    $account = user_load(array('uid' => $uid, 'status' => 1));
-  }
-  else {
-    $account = $user;
-  }
-
-  $result = db_query_range(db_rewrite_sql("SELECT n.nid, n.title, r.teaser, n.created, u.name, u.uid FROM {node} n INNER JOIN {node_revisions} r ON n.vid = r.vid INNER JOIN {users} u ON n.uid = u.uid WHERE n.type = 'blog' AND u.uid = %d AND n.status = 1 ORDER BY n.created DESC"), $uid, 0, variable_get('feed_default_items', 10));
-  $channel['title'] = $account->name ."'s blog";
-  $channel['link'] = url("blog/$uid", NULL, NULL, TRUE);
-  $channel['description'] = $term->description;
-  node_feed($result, $channel);
-}
-
-/**
- * Displays an RSS feed containing recent blog entries of all users.
- */
-function blog_feed_last() {
-  $result = db_query_range(db_rewrite_sql("SELECT n.nid, n.title, r.teaser, n.created, u.name, u.uid FROM {node} n INNER JOIN {node_revisions} r ON n.vid = r.vid INNER JOIN {users} u ON n.uid = u.uid WHERE n.type = 'blog' AND n.status = 1 ORDER BY n.created DESC"), 0, variable_get('feed_default_items', 10));
-  $channel['title'] = variable_get('site_name', 'drupal') .' blogs';
-  $channel['link'] = url('blog', NULL, NULL, TRUE);
-  $channel['description'] = $term->description;
-  node_feed($result, $channel);
-}
-
-/**
- * Menu callback; displays a Drupal page containing recent blog entries.
- */
-function blog_page($a = NULL, $b = NULL) {
-
-  if (is_numeric($a)) { // $a is a user ID
-    if ($b == 'feed') {
-      return blog_feed_user($a);
-    }
-    else {
-      return blog_page_user($a);
-    }
-  }
-  else if ($a == 'feed') {
-    return blog_feed_last();
-  }
-  else {
-    return blog_page_last();
-  }
-}
-
-/**
- * Displays a Drupal page containing recent blog entries of a given user.
- */
-function blog_page_user($uid) {
-  global $user;
-
-  $account = user_load(array((is_numeric($uid) ? 'uid' : 'name') => $uid, 'status' => 1));
-
-  if ($account->uid) {
-    drupal_set_title($title = t("%name's blog", array('%name' => $account->name)));
-
-    if (($account->uid == $user->uid) && user_access('edit own blog')) {
-      $output = '<li>'. l(t('Post new blog entry.'), "node/add/blog") .'</li>';
-    }
-    else if ($account->uid == $user->uid) {
-      $output = '<li>'. t('You are not allowed to post a new blog entry.') .'</li>';
-    }
-
-    if ($output) {
-      $output = '<ul>'. $output .'</ul>';
-    }
-    else {
-      $output = '';
-    }
-
-    $result = pager_query(db_rewrite_sql("SELECT n.nid, n.sticky, n.created FROM {node} n WHERE type = 'blog' AND n.uid = %d AND n.status = 1 ORDER BY n.sticky DESC, n.created DESC"), variable_get('default_nodes_main', 10), 0, NULL, $account->uid);
-    while ($node = db_fetch_object($result)) {
-      $output .= node_view(node_load($node->nid), 1);
-    }
-    $output .= theme('pager', NULL, variable_get('default_nodes_main', 10));
-    $output .= theme('feed_icon', url("blog/$account->uid/feed"));
-
-    drupal_add_link(array('rel' => 'alternate',
-                          'type' => 'application/rss+xml',
-                          'title' => t('RSS - %title', array('%title' => $title)),
-                          'href' => url("blog/$account->uid/feed")));
-    return $output;
-  }
-  else {
-    drupal_not_found();
-  }
-}
-
-/**
- * Displays a Drupal page containing recent blog entries of all users.
- */
-function blog_page_last() {
-  global $user;
-
-  $output = '';
-
-  $result = pager_query(db_rewrite_sql("SELECT n.nid, n.created FROM {node} n WHERE n.type = 'blog' AND n.status = 1 ORDER BY n.created DESC"), variable_get('default_nodes_main', 10));
-
-  while ($node = db_fetch_object($result)) {
-    $output .= node_view(node_load($node->nid), 1);
-  }
-  $output .= theme('pager', NULL, variable_get('default_nodes_main', 10));
-  $output .= theme('feed_icon', url('blog/feed'));
-
-  drupal_add_link(array('rel' => 'alternate',
-                        'type' => 'application/rss+xml',
-                        'title' => t('RSS - blogs'),
-                        'href' => url("blog/feed")));
-  return $output;
-}
-
-/**
- * Implementation of hook_form().
- */
-function blog_form(&$node) {
-  global $nid;
-  $iid = $_GET['iid'];
-
-
-  if (empty($node->body)) {
-    /*
-    ** If the user clicked a "blog it" link, we load the data from the
-    ** database and quote it in the blog:
-    */
-
-    if ($nid && $blog = node_load($nid)) {
-      $node->body = '<em>'. $blog->body .'</em> ['. l($blog->name, "node/$nid") .']';
-    }
-
-    if ($iid && $item = db_fetch_object(db_query('SELECT i.*, f.title as ftitle, f.link as flink FROM {aggregator_item} i, {aggregator_feed} f WHERE i.iid = %d AND i.fid = f.fid', $iid))) {
-      $node->title = $item->title;
-      // Note: $item->description has been validated on aggregation.
-      $node->body = '<a href="'. check_url($item->link) .'">'. check_plain($item->title) .'</a> - <em>'. $item->description .'</em> [<a href="'. check_url($item->flink) .'">'. check_plain($item->ftitle) ."</a>]\n";
-    }
-
-  }
-
-  $form['title'] = array('#type' => 'textfield', '#title' => t('Title'), '#required' => TRUE, '#default_value' => $node->title, '#weight' => -5);
-  $form['body_filter']['body'] = array('#type' => 'textarea', '#title' => t('Body'), '#default_value' => $node->body, '#rows' => 20, '#required' => TRUE);
-  $form['body_filter']['filter'] = filter_form($node->format);
-  return $form;
-}
-
-/**
- * Implementation of hook_view().
- */
-function blog_view(&$node, $teaser = FALSE, $page = FALSE) {
-  if ($page) {
-    // Breadcrumb navigation
-    $breadcrumb[] = array('path' => 'blog', 'title' => t('blogs'));
-    $breadcrumb[] = array('path' => 'blog/'. $node->uid, 'title' => t("%name's blog", array('%name' => $node->name)));
-    $breadcrumb[] = array('path' => 'node/'. $node->nid);
-    menu_set_location($breadcrumb);
-  }
-  $node = node_prepare($node, $teaser);;
-}
-
-/**
- * Implementation of hook_link().
- */
-function blog_link($type, $node = 0, $main = 0) {
-  $links = array();
-
-  if ($type == 'node' && $node->type == 'blog') {
-    if (arg(0) != 'blog' || arg(1) != $node->uid) {
-      $links[] = l(t("%username's blog", array('%username' => $node->name)), "blog/$node->uid", array('title' => t("Read %username's latest blog entries.", array('%username' => $node->name))));
-    }
-  }
-
-  return $links;
-}
-
-/**
- * Implementation of hook_menu().
- */
-function blog_menu($may_cache) {
-  global $user;
-  $items = array();
-
-  if ($may_cache) {
-    $items[] = array('path' => 'node/add/blog', 'title' => t('blog entry'),
-      'access' => user_access('edit own blog'));
-    $items[] = array('path' => 'blog', 'title' => t('blogs'),
-      'callback' => 'blog_page',
-      'access' => user_access('access content'),
-      'type' => MENU_SUGGESTED_ITEM);
-    $items[] = array('path' => 'blog/'. $user->uid, 'title' => t('my blog'),
-      'access' => user_access('edit own blog'),
-      'type' => MENU_DYNAMIC_ITEM);
-  }
-
-  return $items;
-}
-
-/**
- * Implementation of hook_block().
- *
- * Displays the most recent 10 blog titles.
- */
-function blog_block($op = 'list', $delta = 0) {
-  global $user;
-  if ($op == 'list') {
-    $block[0]['info'] = t('Recent blog posts');
-    return $block;
-  }
-  else if ($op == 'view') {
-    if (user_access('access content')) {
-      $result = db_query_range(db_rewrite_sql("SELECT n.nid, n.title, n.created FROM {node} n WHERE n.type = 'blog' AND n.status = 1 ORDER BY n.created DESC"), 0, 10);
-      if (db_num_rows($result)) {
-        $block['content'] = node_title_list($result);
-        $block['content'] .= '<div class="more-link">'. l(t('more'), 'blog', array('title' => t('Read the latest blog entries.'))) .'</div>';
-        $block['subject'] = t('Recent blog posts');
-        return $block;
-      }
-    }
-  }
-}
-
-

modules/ping/ping.module

-<?php
-// $Id$
-
-/**
- * @file
- * Alerts other sites that your site has been updated.
- */
-
-/**
- * Implementation of hook_help().
- */
-function ping_help($section) {
-  switch ($section) {
-    case 'admin/help#ping':
-      $output = '<p>'. t('The ping module is useful for notifying interested sites that your site has changed.  It automatically sends notifications (called "pings") to the <a href="%external-http-pingomatic-com">pingomatic</a> service to tell it that your site has changed. In turn pingomatic will ping other services such as weblogs.com, Technorati, blo.gs, BlogRolling, Feedster.com, Moreover, etc.', array('%external-http-pingomatic-com' => 'http://pingomatic.com/')) .'</p>';
-      $output .= '<p>'. t('The ping module requires <code>cron</code> or a similar periodic job scheduler to be enabled.') .'</p>';
-      $output .= t('<p>You can:</p>
-<ul>
-<li> enable or disable the ping module at <a href="%admin-modules">administer &gt;&gt; modules</a>.</li>
-<li>run your cron job at your sites <a href="%file-cron">cron page</a>.</li>
-<li>read about <a href="%external-http-drupal-org-node-23714">configuring cron jobs</a>.</li>
-</ul></p>
-', array('%admin-modules' => url('admin/modules'), '%file-cron' => 'cron.php', '%external-http-drupal-org-node-23714' => 'http://drupal.org/node/23714'));
-      $output .= '<p>'. t('For more information please read the configuration and customization handbook <a href="%ping">Ping page</a>.', array('%ping' => 'http://drupal.org/handbook/modules/ping/')) .'</p>';
-      return $output;
-    case 'admin/modules#description':
-      return('Alerts other sites when your site has been updated.');
-  }
-}
-
-/**
- * Implementation of hook_cron().
- *
- * Fire off notifications of updates to remote sites.
- */
-function ping_cron() {
-  global $base_url;
-
-  if (variable_get('site_name', 0) && variable_get('site_slogan', 0)) {
-    if (db_num_rows(db_query("SELECT nid FROM {node} WHERE status = 1 AND moderate = 0 AND (created > '". variable_get('cron_last', time()) ."' OR changed > '". variable_get('cron_last', time()) ."')"), 1)) {
-      _ping_notify(variable_get('site_name', '') .' - '. variable_get('site_slogan', ''), $base_url);
-    }
-  }
-}
-
-/**
- * Call hook_ping() in all modules to notify remote sites that there is
- * new content at this one.
- */
-function _ping_notify($name, $url) {
-  module_invoke_all('ping', $name, $url);
-}
-
-/**
- * Implementation of hook_ping().
- *
- * Notifies pingomatic.com, blo.gs, and technorati.com of changes at this site.
- */
-function ping_ping($name = '', $url = '') {
-
-  $result = xmlrpc('http://rpc.pingomatic.com', 'weblogUpdates.ping', $name, $url);
-
-  if ($result === FALSE) {
-    watchdog('directory ping', t('Failed to notify pingomatic.com (site).'), WATCHDOG_WARNING);
-  }
-}
-
-