1 files changed, 55 insertions, 4 deletions

diff --git a/kolab.org/www/drupal-7.15/sites/all/modules/views/plugins/views_plugin_cache_time.inc b/kolab.org/www/drupal-7.15/sites/all/modules/views/plugins/views_plugin_cache_time.inc
index ac84b1c..25245ea 100644
--- a/kolab.org/www/drupal-7.15/sites/all/modules/views/plugins/views_plugin_cache_time.inc
+++ b/kolab.org/www/drupal-7.15/sites/all/modules/views/plugins/views_plugin_cache_time.inc
@@ -1,13 +1,22 @@
 <?php
 
 /**
+ * @file
+ * Definition of views_plugin_cache_time.
+ */
+
+/**
  * Simple caching of query results for Views displays.
+ *
+ * @ingroup views_cache_plugins
  */
 class views_plugin_cache_time extends views_plugin_cache {
   function option_definition() {
     $options = parent::option_definition();
     $options['results_lifespan'] = array('default' => 3600);
+    $options['results_lifespan_custom'] = array('default' => 0);
     $options['output_lifespan'] = array('default' => 3600);
+    $options['output_lifespan_custom'] = array('default' => 0);
 
     return $options;
   }
@@ -16,7 +25,7 @@ class views_plugin_cache_time extends views_plugin_cache {
     parent::options_form($form, $form_state);
     $options = array(60, 300, 1800, 3600, 21600, 518400);
     $options = drupal_map_assoc($options, 'format_interval');
-    $options = array(-1 => t('Never cache')) + $options;
+    $options = array(-1 => t('Never cache')) + $options + array('custom' => t('Custom'));
 
     $form['results_lifespan'] = array(
       '#type' => 'select',
@@ -25,6 +34,18 @@ class views_plugin_cache_time extends views_plugin_cache {
       '#options' => $options,
       '#default_value' => $this->options['results_lifespan'],
     );
+    $form['results_lifespan_custom'] = array(
+      '#type' => 'textfield',
+      '#title' => t('Seconds'),
+      '#size' => '25',
+      '#maxlength' => '30',
+      '#description' => t('Length of time in seconds raw query results should be cached.'),
+      '#default_value' => $this->options['results_lifespan_custom'],
+      '#process' => array('form_process_select','ctools_dependent_process'),
+      '#dependency' => array(
+        'edit-cache-options-results-lifespan' => array('custom'),
+      ),
+    );
     $form['output_lifespan'] = array(
       '#type' => 'select',
       '#title' => t('Rendered output'),
@@ -32,14 +53,43 @@ class views_plugin_cache_time extends views_plugin_cache {
       '#options' => $options,
       '#default_value' => $this->options['output_lifespan'],
     );
+    $form['output_lifespan_custom'] = array(
+      '#type' => 'textfield',
+      '#title' => t('Seconds'),
+      '#size' => '25',
+      '#maxlength' => '30',
+      '#description' => t('Length of time in seconds rendered HTML output should be cached.'),
+      '#default_value' => $this->options['output_lifespan_custom'],
+      '#process' => array('form_process_select','ctools_dependent_process'),
+      '#dependency' => array(
+        'edit-cache-options-output-lifespan' => array('custom'),
+      ),
+    );
+  }
+
+  function options_validate(&$form, &$form_state) {
+    $custom_fields = array('output_lifespan', 'results_lifespan');
+    foreach ($custom_fields as $field) {
+      if ($form_state['values']['cache_options'][$field] == 'custom' && !is_numeric($form_state['values']['cache_options'][$field . '_custom'])) {
+        form_error($form[$field .'_custom'], t('Custom time values must be numeric.'));
+      }
+    }
   }
 
   function summary_title() {
-    return format_interval($this->options['results_lifespan'], 1) . '/' . format_interval($this->options['output_lifespan'], 1);
+    $results_lifespan = $this->get_lifespan('results');
+    $output_lifespan = $this->get_lifespan('output');
+    return format_interval($results_lifespan, 1) . '/' . format_interval($output_lifespan, 1);
+  }
+
+  function get_lifespan($type) {
+    $lifespan = $this->options[$type . '_lifespan'] == 'custom' ? $this->options[$type . '_lifespan_custom'] : $this->options[$type . '_lifespan'];
+    return $lifespan;
   }
 
   function cache_expire($type) {
-    if ($lifespan = $this->options[$type . '_lifespan']) {
+    $lifespan = $this->get_lifespan($type);
+    if ($lifespan) {
       $cutoff = REQUEST_TIME - $lifespan;
       return $cutoff;
     }
@@ -49,7 +99,8 @@ class views_plugin_cache_time extends views_plugin_cache {
   }
 
   function cache_set_expire($type) {
-    if ($lifespan = $this->options[$type . '_lifespan']) {
+    $lifespan = $this->get_lifespan($type);
+    if ($lifespan) {
       return time() + $lifespan;
     }
     else {