diff -rupN ../drupal6/modules/drupalnet/drupalnet.info modules/drupalnet/drupalnet.info
--- ../drupal6/modules/drupalnet/drupalnet.info	1969-12-31 19:00:00.000000000 -0500
+++ modules/drupalnet/drupalnet.info	2007-02-25 09:38:04.000000000 -0500
@@ -0,0 +1,6 @@
+; $Id: drupal.info,v 1.3 2006/11/21 20:55:34 dries Exp $
+name = Drupalnet
+description = Lets you register your site with a central server and improve ranking of Drupal projects by posting information on your installed modules and themes.
+package = Core - optional
+version = VERSION
+
diff -rupN ../drupal6/modules/drupalnet/drupalnet.install modules/drupalnet/drupalnet.install
--- ../drupal6/modules/drupalnet/drupalnet.install	1969-12-31 19:00:00.000000000 -0500
+++ modules/drupalnet/drupalnet.install	2007-02-25 09:37:14.000000000 -0500
@@ -0,0 +1,74 @@
+<?php
+// $Id: drupal.install,v 1.5 2006/09/01 07:40:08 drumm Exp $
+
+/**
+ * Implementation of hook_install().
+ */
+function drupalnet_install() {
+  switch ($GLOBALS['db_type']) {
+    case 'mysql':
+    case 'mysqli':
+      db_query("CREATE TABLE {client} (
+        cid int unsigned NOT NULL auto_increment,
+        link varchar(255) NOT NULL default '',
+        name varchar(128) NOT NULL default '',
+        mail varchar(128) NOT NULL default '',
+        slogan longtext NOT NULL,
+        mission longtext NOT NULL,
+        users int NOT NULL default '0',
+        nodes int NOT NULL default '0',
+        version varchar(35) NOT NULL default'',
+        created int NOT NULL default '0',
+        changed int NOT NULL default '0',
+        PRIMARY KEY (cid)
+      ) /*!40100 DEFAULT CHARACTER SET UTF8 */ ");
+
+      db_query("CREATE TABLE {client_system} (
+        cid int NOT NULL default '0',
+        name varchar(255) NOT NULL default '',
+        type varchar(255) NOT NULL default '',
+        PRIMARY KEY (cid,name)
+      ) /*!40100 DEFAULT CHARACTER SET UTF8 */ ");
+      break;
+    case 'pgsql':
+      db_query("CREATE TABLE {client} (
+        cid serial CHECK (cid >= 0),
+        link varchar(255) NOT NULL default '',
+        name varchar(128) NOT NULL default '',
+        mail varchar(128) NOT NULL default '',
+        slogan text NOT NULL,
+        mission text NOT NULL,
+        users int NOT NULL default '0',
+        nodes int NOT NULL default '0',
+        version varchar(35) NOT NULL default'',
+        created int NOT NULL default '0',
+        changed int NOT NULL default '0',
+        PRIMARY KEY (cid)
+      )");
+
+      db_query("CREATE TABLE {client_system} (
+        cid int NOT NULL default '0',
+        name varchar(255) NOT NULL default '',
+        type varchar(255) NOT NULL default '',
+        PRIMARY KEY (cid,name)
+      )");
+      break;
+  }
+}
+
+/**
+ * Implementation of hook_uninstall().
+ */
+function drupalnet_uninstall() {
+  db_query('DROP TABLE {client}');
+  db_query('DROP TABLE {client_system}');
+  variable_del('drupal_authentication_service');
+  variable_del('drupal_directory');
+  variable_del('drupal_register');
+  variable_del('drupal_server');
+  variable_del('drupal_system');
+  variable_del('drupal_statistics');
+  variable_del('drupal_client_service');
+  variable_del('drupal_default_da_server');
+  variable_del('drupal_default_da_server_only');
+}
diff -rupN ../drupal6/modules/drupalnet/drupalnet.module modules/drupalnet/drupalnet.module
--- ../drupal6/modules/drupalnet/drupalnet.module	1969-12-31 19:00:00.000000000 -0500
+++ modules/drupalnet/drupalnet.module	2007-02-24 21:41:29.000000000 -0500
@@ -0,0 +1,277 @@
+<?php
+// $Id: drupal.module,v 1.139 2007/01/24 14:48:36 dries Exp $
+
+/**
+ * @file
+ * Notify a central server about your site.
+ */
+
+/**
+ * Implementation of hook_help().
+ */
+function drupalnet_help($section) {
+  switch ($section) {
+    case 'admin/help#drupalnet':
+      $output = '<p>'. t('The Drupal module uses the XML-RPC network communication protocol to connect your site with a central server that maintains a directory of client sites.') .'</p>';
+      $output .= '<p>'. t('Enabling the Drupalnet module will allow you to register your site with a server, including (optionally) posting information on your installed modules and themes and summary statistics on your number of posts and users, information that can help rank Drupal modules and themes and optionally to enable other sites to register with your site.') .'</p>';
+      $output .= '<p>'. t('The Drupalnet module administration page allows you to set the xml-rpc server page and other related options.') .'</p>';
+      $output .= t('<p>If you maintain a directory of sites, you can list them on a page using the <code>drupal_client_page()</code> function. Sample instructions: </p>
+<ul>
+  <li>Ensure that you have the page content type enabled, and you can use PHP in an input format.</li>
+  <li>Select create content &gt;&gt; page.</li>
+  <li>For input format, select PHP code.</li>
+  <li>Give the page a title. For body, put:
+<pre>
+&lt;?php
+print drupalnet_client_page();
+?&gt;
+</pre>
+  <li>Save the page.</li>
+</ul>');
+
+      $output .= '<p>'. t('For more information please read the configuration and customization handbook <a href="@drupal">Drupalnet page</a>.', array('@drupal' => 'http://drupal.org/handbook/modules/drupal/')) .'</p>';
+      return $output;
+    case 'admin/settings/sites-registry':
+      return '<p>'. t('Using this your site can "call home" to another Drupal server. By calling home to drupal.org and sending a list of your installed modules and themes, you help rank projects on drupal.org and so assist all Drupal administrators to find the best components for meeting their needs. If you want to register with a different server, you can change the Drupal XML-RPC server setting -- but the server has to be able to handle Drupal XML. Some XML-RPC servers may present directories of all registered sites. To get all your site information listed, go to the <a href="@site-settings">site information settings page</a> and set the site name, the e-mail address, the slogan, and the mission statement.', array('@site-settings' => url('admin/settings/site-information'))) .'</p>';
+  }
+}
+
+function drupalnet_sites_registry_settings() {
+  // Check if all required fields are present
+  if ((variable_get('site_name', 'Drupal') == 'Drupal') || (variable_get('site_name', 'Drupal') == '')) {
+    form_set_error('drupal_directory', t('You must set the name of your site on the <a href="@url">administer &raquo; settings &raquo; site information</a> page.', array('@url' => url('admin/settings/site-information'))));
+  }
+  else if (variable_get('site_mail', ini_get('sendmail_from')) == '') {
+    form_set_error('drupal_directory', t('You must set an e-mail address for your site on the <a href="@url">site information settings page</a>.', array('@url' => url('admin/settings/site-information'))));
+  }
+  else if (variable_get('site_slogan', '') == '') {
+    form_set_error('drupal_directory', t('You must set your site slogan on the <a href="@url">site information settings page</a>.', array('@url' => url('admin/settings/site-information'))));
+  }
+  else if (variable_get('site_mission', '') == '') {
+    form_set_error('drupal_directory', t('You must set your site mission on the <a href="@url">site information settings page</a>.' , array('@url' => url('admin/settings/site-information'))));
+  }
+
+  $options = array('1' => t('Enabled'), '0' => t('Disabled'));
+
+  $form['drupal_register'] = array(
+    '#type' => 'radios',
+    '#title' => t('Register with a Drupal server'),
+    '#default_value' => variable_get('drupal_register', 0),
+    '#options' => $options,
+    '#description' => t("If enabled, your Drupal site will register itself with the specified Drupal XML-RPC server. For this to work properly, you must set your site's name, e-mail address, slogan and mission statement. When the Drupal XML-RPC server field is set to %drupal-xml-rpc, your web site will register itself with drupal.org. Requires the cron feature to be enabled.", array("%drupal-xml-rpc" => "http://drupal.org/xmlrpc.php"))
+  );
+
+  $form['drupal_server'] =  array(
+    '#type' => 'textfield',
+    '#title' => t('Drupal XML-RPC server'),
+    '#default_value' => variable_get('drupal_server', 'http://drupal.org/xmlrpc.php'),
+    '#description' => t('The URL of the Drupal XML-RPC server you wish to register with.')
+  );
+
+  $form['drupal_system'] = array(
+    '#type' => 'radios',
+    '#title' => t('Send system information'),
+    '#default_value' => variable_get('drupal_system', 0),
+    '#options' => $options,
+    '#description' => t("If enabled, your site will send information on its installed components (modules, themes, and theme engines). This information can help in compiling statistics on usage of Drupal projects.")
+  );
+
+  $form['drupal_statistics'] = array(
+    '#type' => 'radios',
+    '#title' => t('Send statistics'),
+    '#default_value' => variable_get('drupal_statistics', 0),
+    '#options' => $options,
+    '#description' => t("If enabled, your site will send summary statistics on the number of registered users and the total number of posts. No private information will be sent. These data help to improve the ranking statistics of Drupal projects.")
+  );
+;
+
+  $form['drupal_client_service'] = array(
+    '#type' => 'radios',
+    '#title' => t('Allow other Drupal sites to register'),
+    '#default_value' => variable_get('drupal_client_service', 0),
+    '#options' => $options,
+    '#description' => t('If enabled, your Drupal site will allow other sites to register with your site and send information to this site. This functionality can be used to maintain a list of related sites.')
+  );
+
+  return system_settings_form($form);
+}
+
+/**
+ * Implementation of hook_cron(); handles pings to and from the site.
+ */
+function drupalnet_cron() {
+  if (time() - variable_get('cron_last', 0) > 21600) {
+
+    // If this site acts as a Drupal XML-RPC server, delete the sites that
+    // stopped sending "ping" messages.
+    if (variable_get('drupal_client_service', 0)) {
+      $result = db_query("SELECT cid FROM {client} WHERE changed < %d", time() - 259200);
+      while ($client = db_fetch_object($result)) {
+        db_query("DELETE FROM {client_system} WHERE cid = %d", $client->cid);
+        db_query("DELETE FROM {client} WHERE cid = %d", $client->cid);
+      }
+    }
+
+    // If this site acts as a Drupal XML-RPC client, send a message to the
+    // Drupal XML-RPC server.
+    if (variable_get('drupal_register', 0) && variable_get('drupal_server', 0)) {
+      drupalnet_notify(variable_get('drupal_server', ''));
+    }
+  }
+}
+
+/**
+ * Callback function from drupal_xmlrpc() called when another site pings this one.
+ */
+function drupalnet_client_ping($client, $system) {
+  /*
+  ** Parse our parameters:
+  */
+
+  foreach (array('link', 'name', 'mail', 'slogan', 'mission') as $key) {
+    $client[$key] = strip_tags($client[$key]);
+  }
+
+  /*
+  ** Update the data in our database and send back a reply:
+  */
+
+  if ($client['link'] && $client['name'] && $client['mail'] && $client['slogan'] && $client['mission']) {
+    $result = db_query("SELECT cid FROM {client} WHERE link = '%s'", $client['link']);
+    if (db_num_rows($result)) {
+      $record = db_fetch_object($result);
+      $client['cid'] = $record->cid;
+      // We have an existing record.
+      db_query("UPDATE {client} SET link = '%s', name = '%s', mail = '%s', slogan = '%s', mission = '%s', users = %d, nodes = %d, version = '%s', changed = '%s' WHERE cid = %d", $client['uid'], $client['link'], $client['name'], $client['mail'], $client['slogan'], $client['mission'], $client['users'], $client['nodes'], $client['version'], time(), $client['cid']);
+    }
+    else {
+      $client['cid'] = db_next_id('{client}_cid');
+      db_query("INSERT INTO {client} (cid, link, name, mail, slogan, mission, users, nodes, version, created, changed) VALUES (%d, '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s')", $client['cid'], $client['link'], $client['name'], $client['mail'], $client['slogan'], $client['mission'], $client['users'], $client['nodes'], $client['version'], time(), time());
+    }
+    if (is_array($system)) {
+      db_query("DELETE FROM {client_system} WHERE cid = %d", $client['cid']);
+      foreach ($system as $item) {
+        db_query("INSERT INTO {client_system} (cid, name, type) VALUES (%d, '%s', '%s')", $client['cid'], $item['name'], $item['type']);
+      }
+    }
+    watchdog('client ping', t('Ping from %name (%link).', array('%name' => $client['name'], '%link' => $client['link'])), WATCHDOG_NOTICE, '<a href="'. check_url($client['link']) .'">view</a>');
+
+    return TRUE;
+  }
+  else {
+    return 0;
+  }
+
+}
+
+/**
+ * Formats a list of all clients.
+ *
+ * This function may be called from a custom page on sites that are
+ * Drupal directory servers.
+ */
+function drupalnet_client_page($sort = 'name') {
+  $result = db_query('SELECT * FROM {client} ORDER BY %s', $sort);
+
+  $clients = array();
+  while ($client = db_fetch_object($result)) {
+    $clients[] = $client;
+  }
+
+  return theme('client_list', $clients);
+}
+
+/**
+ * Theme a client list.
+ */
+function theme_client_list($clients) {
+  // Note: All fields except the mission are treated as plain-text.
+  // The mission is stripped of any HTML tags to keep the output simple and consistent.
+  $output = "\n<dl>\n";
+  foreach ($clients as $client) {
+    $output .= '  <dt><a href="' . check_url($client->link) . '">' . check_plain($client->name) . '</a> - ' . check_plain($client->slogan) . "</dt>\n";
+    $output .= '  <dd>' . strip_tags($client->mission) . "</dd>\n";
+  }
+  $output .= "</dl>\n";
+  return $output;
+}
+
+/**
+ * Implementation of hook_xmlrpc().
+ */
+function drupalnet_xmlrpc() {
+  $xmlrpc = array();
+  if (variable_get('drupal_client_service', 0)) {
+    $xmlrpc[] = array(
+      'drupal.client.ping',
+      'drupal_client_ping',
+      array('array', 'array', 'array'),
+      t('Handling ping request')
+    );
+  }
+  return $xmlrpc;
+}
+
+/**
+ * Sends a ping to the Drupal directory server.
+ */
+function drupalnet_notify($server) {
+  global $base_url;
+  $client = array(
+    'link' => $base_url,
+    'name' => variable_get('site_name', ''),
+    'mail' => variable_get('site_mail', ''),
+    'slogan' => variable_get('site_slogan', ''),
+    'mission' => variable_get('site_mission', ''),
+    'version' => VERSION
+  );
+  if (variable_get('drupal_system', 0)) {
+    $system = array();
+    $result = db_query("SELECT name, type FROM {system} WHERE status = 1");
+    while ($item = db_fetch_array($result)) {
+      $system[] = $item;
+    }
+  }
+  if (variable_get('drupal_statistics', 0)) {
+    $users = db_fetch_object(db_query("SELECT COUNT(uid) AS count FROM {users}"));
+    $client['users'] = $users->count;
+    $nodes = db_fetch_object(db_query("SELECT COUNT(nid) AS count FROM {node}"));
+    $client['nodes'] = $nodes->count;
+  }
+  $result = xmlrpc($server, 'drupal.client.ping', $client, $system);
+
+  if ($result === FALSE) {
+    watchdog('server ping', t('Failed to notify %server; error code: %errno; error message: %error_msg.', array('%server' => $server, '%errno' => xmlrpc_errno(), '%error_msg' => xmlrpc_error_msg())), WATCHDOG_WARNING);
+  }
+}
+
+/**
+ * Implementation of hook_info().
+ */
+function drupalnet_info($field = 0) {
+  $info['name'] = 'Drupal';
+  $info['protocol'] = 'XML-RPC';
+
+  if ($field) {
+    return $info[$field];
+  }
+  else {
+    return $info;
+  }
+}
+
+/**
+ * Implementation of hook_menu().
+ */
+function drupalnet_menu() {
+  $items['admin/settings/sites-registry'] = array(
+    'title' => t('Sites registry'),
+    'description' => t('Register with another Drupal site (drupal.org by default) for statistics sharing, or set up your server to be a central server for registrations.'),
+    'page callback' => 'drupal_get_form',
+    'page arguments' => array('drupalnet_sites_registry_settings'),
+    'access arguments' => array('administer site configuration'),
+  );
+
+  return $items;
+}
+
