Merge HEAD into Drupal 6.1 branch.

diff --git a/views/views_plugin_style_rss_fields.inc b/views/views_plugin_style_rss_fields.inc
index c7b7ffc..5d6a155 100644 (file)
--- a/views/views_plugin_style_rss_fields.inc
+++ b/views/views_plugin_style_rss_fields.inc
@@ -7,168 +7,140 @@
  */
 
 class views_plugin_style_rss_fields extends views_plugin_style {
+
+  /**
+   * Initialize plugin.
+   *
+   * Set feed image for shared rendering later.
+   */
+  function init(&$view, &$display, $options = NULL) {
+    parent::init($view, $display, $options = NULL);
+    $this->feed_image = drupal_get_path('module', 'views_kml') . '/images/kml.png';
+  }
   
-    /**
-     * Initialize plugin.
-     *
-     * Set feed image for shared rendering later.
-     */
-    function init(&$view, &$display, $options = NULL) {
-      parent::init($view, $display, $options = NULL);
-      $this->feed_image = drupal_get_path('module', 'views_kml') . '/images/kml.png';
-    }
-    
-    /**
-     * Attach this view to another display as a feed.
-     *
-     * Provide basic functionality for all export style views like attaching a
-     * feed image link.
-     */
-    function attach_to($display_id, $path, $title) {
-      $url_options = array('html' => true);
-      $image = theme('image', $this->feed_image);
-      $this->view->feed_icon .= l($image, $path, $url_options);
+  /**
+   * Attach this view to another display as a feed.
+   *
+   * Provide basic functionality for all export style views like attaching a
+   * feed image link.
+   */
+  function attach_to($display_id, $path, $title) {
+    $url_options = array('html' => true);
+    $image = theme('image', $this->feed_image);
+    $this->view->feed_icon .= l($image, $path, $url_options);
+  }
+  
+  /**
+   * Provide a form for setting options.
+   *
+   * @param array $form
+   * @param array $form_state
+   */
+  function options_form(&$form, &$form_state) { 
+    parent::options_form($form, $form_state);                  
+    $options = parent::option_definition();
+                           
+    $handlers = $this->display->handler->get_handlers('field');
+    if (empty($handlers)) {
+      $form['error_markup'] = array(
+        '#value' => t('You need at least one field before you can configure your field settings'),
+        '#prefix' => '<div class="error form-item description">',
+        '#suffix' => '</div>',
+      );
     }
-    
-    /**
-     * Provide a form for setting options.
-     *
-     * @param array $form
-     * @param array $form_state
-     */
-    function options_form(&$form, &$form_state) { 
-      parent::options_form($form, $form_state);                  
-      $options = parent::option_definition();
-                             
-      $handlers = $this->display->handler->get_handlers('field');
-      if (empty($handlers)) {
-        $form['error_markup'] = array(
-          '#value' => t('You need at least one field before you can configure your field settings'),
-          '#prefix' => '<div class="error form-item description">',
-          '#suffix' => '</div>',
-        );
-      }
-      else {
-        // Feed Description
-        $form['description'] = array(
-          '#type' => 'fieldset',
-          '#title' => t('Feed Description'), 
-          '#collapsible' => TRUE,
-          '#collapsed' => TRUE,
-          '#weight' => -5,
-        );
-        $form['description']['feed_description'] = array(
-          '#type' => 'textarea',
-          '#default_value' => $this->options['description']['feed_description'],
-          '#description' => t('Description for this feed.  If left blank, the default site mission will be used'),
-        );
-        // Field Chooser
-        $field_names[$field] = array('' => '--');
-        foreach ($handlers as $field => $handler) {
-          if ($label = $handler->label()) {
-            $field_names[$field] = $label;
-          }
-          else {
-            $field_names[$field] = $handler->ui_name();
-          }
+    else {
+      // Feed Description
+      $form['description'] = array(
+        '#type' => 'fieldset',
+        '#title' => t('Feed Description'), 
+        '#collapsible' => TRUE,
+        '#collapsed' => TRUE,
+        '#weight' => -5,
+      );
+      $form['description']['feed_description'] = array(
+        '#type' => 'textarea',
+        '#default_value' => $this->options['description']['feed_description'],
+        '#description' => t('Description for this feed.  If left blank, the default site mission will be used'),
+      );
+      // Field Chooser
+      $field_names[$field] = array('' => '--');
+      foreach ($handlers as $field => $handler) {
+        if ($label = $handler->label()) {
+          $field_names[$field] = $label;
         }
-        $field_options = array(
-          'title' => t('Title'),
-          'description' => t('Description'),
-          'link' => t('Link'),
-          'author' => t('Author'),
-          'category' => t('category'),
-          'guid' => t('guid'),
-          'pubDate' => t('pubDate'),
-        );
-        $form['fields'] = array(
-          '#type' => 'fieldset',
-          '#title' => 'Field usage',
-          '#description' => t('Select the fields that relevant data for each element of the feed'),
-          '#collapsible' => TRUE,
-          '#collapsed' => TRUE,
-          '#weight' => 0,
-        );
-        foreach ($field_options as $k => $v) {
-          $form['fields'][$k] = array(
-            '#type' => 'select',
-            '#title' => $v,
-            '#options' => $field_names,
-            '#default_value' => $this->options['fields'][$k],
-          );
+        else {
+          $field_names[$field] = $handler->ui_name();
         }
-        // GeoRSS
-        $form['georss'] = array(
-          '#type' => 'fieldset',
-          '#title' => t('GeoRSS'), 
-          '#collapsible' => TRUE,
-          '#collapsed' => TRUE,
-          '#weight' => 5,
-        );
-        $form['georss']['text'] = array(
-          '#value' => t('Select fields that provide the latitude and longitude values'),
-        );
-        $form['georss']['lat'] = array(
-          '#type' => 'select',
-          '#title' => t('Latitude'),
-          '#options' => $field_names,
-          '#default_value' => $this->options['georss']['lat'],
-        ); 
-        $form['georss']['lon'] = array(
+      }
+      $field_options = array(
+        'title' => t('Title'),
+        'description' => t('Description'),
+        'link' => t('Link'),
+        'author' => t('Author'),
+        'category' => t('category'),
+        'guid' => t('guid'),
+        'pubDate' => t('pubDate'),
+      );
+      $form['fields'] = array(
+        '#type' => 'fieldset',
+        '#title' => 'Field usage',
+        '#description' => t('Select the fields that relevant data for each element of the feed'),
+        '#collapsible' => TRUE,
+        '#collapsed' => TRUE,
+        '#weight' => 0,
+      );
+      foreach ($field_options as $k => $v) {
+        $form['fields'][$k] = array(
           '#type' => 'select',
-          '#title' => t('Longitude'),
+          '#title' => $v,
           '#options' => $field_names,
-          '#default_value' => $this->options['georss']['lon'],
+          '#default_value' => $this->options['fields'][$k],
         );
       }
+      // GeoRSS
+      $form['georss'] = array(
+        '#type' => 'fieldset',
+        '#title' => t('GeoRSS'), 
+        '#description' => t('Select fields that provide the latitude and longitude values'),
+        '#collapsible' => TRUE,
+        '#collapsed' => TRUE,
+        '#weight' => 5,
+      );
+      $form['georss']['lat'] = array(
+        '#type' => 'select',
+        '#title' => t('Latitude'),
+        '#options' => $field_names,
+        '#default_value' => $this->options['georss']['lat'],
+      ); 
+      $form['georss']['lon'] = array(
+        '#type' => 'select',
+        '#title' => t('Longitude'),
+        '#options' => $field_names,
+        '#default_value' => $this->options['georss']['lon'],
+      );
     }
-    
-    function map_rows($rows) {
-      // Fields must be rendered in order as of Views 2.3, so we will pre-render everything.
-      $renders = array();
-      $keys = array_keys($this->view->field);
+  }
+  
+  function map_rows($rows) {
+    // Fields must be rendered in order as of Views 2.3, so we will pre-render everything.
+    $renders = array();
+    $keys = array_keys($this->view->field);
 
-      foreach ($rows as $count => $row) {
-        foreach ($keys as $id) {
-          $renders[$count][$id] = $this->view->field[$id]->theme($row);
-        }
-      }  
-      
-      // @TODO: The following seems ridiculous and should probably be improved.
-      $items = array();
-      foreach ($renders as $id => $row) {
-        $item = array();
-        foreach ($this->view->field as $key => $field) {
-          if ($key == $this->options['fields']['title']) {
-            $item['title'] = $row[$key];
-          }
-          elseif ($key == $this->options['fields']['description']) {
-            $item['description'] = $row[$key];
-          }
-          elseif ($key == $this->options['fields']['link']) {
-            $item['link'] = $row[$key];
-          }
-          elseif ($key == $this->options['fields']['author']) {
-            $item['author'] = $row[$key];
-          }
-          elseif ($key == $this->options['fields']['category']) {
-            $item['category'] = $row[$key];
-          }
-          elseif ($key == $this->options['fields']['guid']) {
-            $item['guid'] = $row[$key];
-          }
-          elseif ($key == $this->options['fields']['pubDate']) {
-            $item['pubDate'] = $row[$key];
-          }
-          elseif ($key == $this->options['georss']['lat']) {
-            $item['lat'] = $row[$key];
-          }
-          elseif ($key == $this->options['georss']['lon']) {
-            $item['lon'] = $row[$key];
-          }
-        }
-        $items[] = $item;
+    foreach ($rows as $count => $row) {
+      foreach ($keys as $id) {
+        $renders[$count][$id] = $this->view->field[$id]->theme($row);
+      }
+    }  
+
+    $items = array();
+    foreach ($renders as $id => $row) {
+      $item = array();
+      foreach (array_merge($this->options['fields'], $this->options['georss']) as $key => $val) {
+        if (!isset($this->view->field[$val])) continue;
+        $item[$key] = htmlentities($row[$val], ENT_QUOTES, '', FALSE);
       }
-      return $items;
+      $items[] = $item;
     }
+    return $items;
   }
+}

diff --git a/views/views_rss_views_fields.theme.inc b/views/views_rss_views_fields.theme.inc
index 71b1e7b..e74457e 100644 (file)
--- a/views/views_rss_views_fields.theme.inc
+++ b/views/views_rss_views_fields.theme.inc
@@ -30,6 +30,9 @@ function template_preprocess_views_view_views_rss_fields(&$vars) {
   if ($view->style_options['georss']['lat'] && $view->style_options['georss']['lon']) {
    $vars['georss'] = TRUE;
   }
+  
+  // Set Headers
+  drupal_set_header('Content-Type: application/rss+xml; charset=utf-8');
 }
 
 /**