Index: modules/atom/atom.module
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/atom/atom.module,v
retrieving revision 1.11
diff -u -r1.11 atom.module
--- modules/atom/atom.module	5 Dec 2004 14:06:12 -0000	1.11
+++ modules/atom/atom.module	16 Feb 2005 21:51:45 -0000
@@ -1,62 +1,92 @@
 <?php
 // $Id: atom.module,v 1.11 2004/12/05 14:06:12 ax Exp $
 
+/**
+ * Implementation of hook_help
+ */
 function atom_help($section) {
   $output = "";
-
+  
   switch ($section) {
     case "admin/modules#description":
-          $output = t("Provides an Atom 0.3 feed");
-          break;
+      $output = t("Provides an Atom 0.3 feed");
+      break;
   }
   return $output;
 }
 
-function atom_menu() {
+/**
+ * Implementation of hook_menu
+ */
+function atom_menu($may_cache) {
   $items = array();
   drupal_set_html_head("<link rel=\"alternate\" type=\"application/atom+xml\" title=\"Atom\" href=\"". url("atom/feed") ."\" />");
-  $items[] = array('path' => 'atom/feed', 'title' => t('atom feed'),
-                   'callback' => 'atom_feed',
-                   'access' => user_access('access content'),
-                   'type' => MENU_CALLBACK);
+  if ($may_cache) {
+    $items[] = array('path' => 'atom/feed', 'title' => t('atom feed'),
+                     'callback' => 'atom_feed',
+                     'access' => user_access('access content'),
+                     'type' => MENU_CALLBACK);
+  }
   return $items;
 }
 
+/**
+ * Produces an atom 0.3 feed for the front page content.
+ */
 function atom_feed() {
   global $base_url;
+
   $output = "";
   $last_mod = 0;
-    $nodes = db_query_range("SELECT n.nid, u.uid, u.name FROM {node} n, {users} u WHERE n.uid = u.uid AND n.promote = '1' AND n.status = '1' ORDER BY n.created DESC", 0, 15);
-
-    while ($node = db_fetch_object($nodes)) {
-      $item = node_load(array("nid" => $node->nid));
-      $link = url("node/$node->nid", NULL, NULL, true);
-      $output .= "  <entry>\n";
-      $output .= "    <title>". $item->title ."</title>\n";
-      $output .= "    <link rel=\"alternate\" type=\"text/html\" href=\"". $link ."\" />\n";
-      $output .= "    <id>$link</id>\n";
-      $output .= "    <issued>". _atom_timestamp2w3dtf($item->created) ."</issued>\n";
-      $output .= "    <modified>". _atom_timestamp2w3dtf($item->changed) ."</modified>\n";
-      $last_mod = $item->changed;
-      $output .= "    <author>\n";
-      if ($node->name) {
-        $output .= "      <name>". $node->name ."</name>\n";
-      }
-      else {
-        $output .= "      <name>". variable_get('anonymous', 'Anonymous') ."</name>\n";
+  $nodes = db_query_range("SELECT n.nid FROM {node} n WHERE n.promote = '1' AND n.status = '1' ORDER BY n.created DESC", 0, 15);
+  
+  while ($node = db_fetch_object($nodes)) {
+    $item = node_load(array("nid" => $node->nid));
+    $link = url("node/$node->nid", NULL, NULL, true);
+    $output .= "  <entry>\n";
+    $output .= '    <title>'. drupal_specialchars(strip_tags($item->title)) ."</title>\n";
+    $output .= '    <link rel="alternate" type="text/html" href="'. $link .'" />'. "\n";
+    $output .= '    <id>'. $link ."</id>\n";
+    $output .= '    <issued>'. _atom_timestamp2w3dtf($item->created) ."</issued>\n";
+    $output .= '    <modified>'. _atom_timestamp2w3dtf($item->changed) ."</modified>\n";
+    $last_mod = $item->changed;
+    $output .= "    <author>\n";
+    if ($item->name) {
+      $output .= '      <name>'. $item->name ."</name>\n";
+    }
+    else {
+      $output .= '      <name>'. variable_get('anonymous', 'Anonymous') ."</name>\n";
+    }
+    $output .= "    </author>\n";
+    if (module_exist('taxonomy')) {
+      $terms = taxonomy_node_get_terms($item->nid);
+      foreach ($terms as $term) {
+        $output .= '    <dc:subject>'. drupal_specialchars(strip_tags($term->name)) . "</dc:subject>\n";
       }
-      $output .= "    </author>\n";
-      $output .= "  </entry>\n";
     }
+    // Summary
+    $output .= '    <summary type="text/html" mode="escaped"><![CDATA[';
+    $output .= check_output($item->teaser);
+    $output .= "    ]]></summary>\n";
 
-    header("Content-Type: application/xml");
-    print "<?xml version=\"1.0\" encoding=\"utf-8\"?>\n";
-    print "<feed version=\"0.3\" xmlns=\"http://purl.org/atom/ns#\">\n";
-    print "  <title>". variable_get("site_name", "drupal") ." - ". variable_get("site_slogan", "") ."</title>\n";
-    print "  <link rel=\"alternate\" type=\"text/html\" href=\"". $base_url. "\"/>\n";
-    print "  <modified>". _atom_timestamp2w3dtf($last_mod) ."</modified>\n";
-    print $output;
-    print "</feed>\n";
+    // Body
+    $output .= '    <content type="text/html" mode="escaped"><![CDATA[';
+    $output .= check_output($item->body);
+    $output .= "    ]]></content>\n";
+    $output .= "  </entry>\n";
+  }
+  
+  header("Content-Type: application/xml");
+  print '<?xml version="1.0" encoding="utf-8"?>'. "\n";
+  print '<feed version="0.3"'."\n";
+  print '      xmlns="http://purl.org/atom/ns#"'. "\n";
+  print '      xmlns:dc="http://purl.org/dc/elements/1.1/">'. "\n";
+  print '  <title>'. variable_get("site_name", "drupal") ."</title>\n";
+  print '  <tagline>'. variable_get("site_slogan", "") . "</tagline>\n";
+  print '  <link rel="alternate" type="text/html" href="'. $base_url. '"/>'. "\n";
+  print '  <modified>'. _atom_timestamp2w3dtf($last_mod) ."</modified>\n";
+  print $output;
+  print "</feed>\n";
 }
 
 function _atom_timestamp2w3dtf($timestamp) {