Index: forward.module
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/forward/forward.module,v
--- forward.module	5 Nov 2007 17:10:57 -0000	1.30.2.33
+++ forward.module	1 Dec 2007 11:54:28 -0000
@@ -723,7 +723,6 @@
 function forward_views_tables() {
   $tables['forward_statistics'] = array(
     'name' => 'forward_statistics',
-    'provider' => 'internal',
     'join' => array(
       'left' => array(
         'table' => 'node',
@@ -735,40 +734,41 @@
     ),
     'fields' => array(
       'forward_count' => array(
-        'name' => t('forward: forward count'),
+        'name' => t('Forward: Forward Count'),
         'sortable' => true,
         'handler' => 'views_handler_field_int',
         'help' => t('This will display the forward count.'),
       ),
       'clickthrough_count' => array(
-        'name' => t('forward: clickthrough count'),
+        'name' => t('Forward: Clickthrough Count'),
         'sortable' => true,
         'handler' => 'views_handler_field_int',
         'help' => t('This will display the forward clickthrough count.'),
       ),
       'last_forward_timestamp' => array(
-        'name' => t('forward: last forward time'),
+        'name' => t('Forward: Last Forward Time'),
         'sortable' => true,
         'handler' => views_handler_field_dates(),
         'option' => 'string',
-        'help' => t('This will display the last forward time.'),
+        'help' => t('This will display the last forward time.').' '.
+                  t('The option field may be used to specify the custom date format as it\'s required by the date() function or if "as time ago" has been chosen to customize the granularity of the time interval.'),
       ),
     ),
     'filters' => array(
       'forward_count' => array(
-        'name' => t('forward: forward count'),
+        'name' => t('Forward: Forward Count'),
         'operator' => 'views_handler_operator_gtlt',
-        'option' => 'integer',
+        'value' => 'integer',
         'help' => t('This filter allows you to filter by the amount of forwards.'),
       ),
       'clickthrough_count' => array(
-        'name' => t('forward: clickthrough count'),
+        'name' => t('Forward: Clickthrough Count'),
         'operator' => 'views_handler_operator_gtlt',
-        'option' => 'integer',
+        'value' => 'integer',
         'help' => t('This filter allows you to filter by the amount of clickthroughs.'),
       ),
       'last_forward_timestamp' => array(
-        'name' => t('forward: last forward time'),
+        'name' => t('Forward: Last Forward Time'),
         'operator' => 'views_handler_operator_gtlt',
         'value' => views_handler_filter_date_value_form(),
         'handler' => 'views_handler_filter_timestamp',
@@ -778,49 +778,32 @@
     ),
     'sorts' => array(
       'forward_count' => array(
-        'name' => t('forward: forward count'),
+        'name' => t('Forward: Forward Count'),
         'help' => t('This filter allows you to sort by the number of forwards.'),
       ),
       'clickthrough_count' => array(
-        'name' => t('forward: clickthrough count'),
+        'name' => t('Forward: Clickthrough Count'),
         'help' => t('This filter allows you to sort by the number of forward clickthroughs.'),
       ),
       'last_forward_timestamp' => array(
-        'name' => t('forward: last forward date'),
+        'name' => t('Forward: Last Forward Date'),
         'handler' => 'views_handler_sort_date',
         'option' => views_handler_sort_date_options(),
         'help' => t('This will allow you to sort by the date of the most recent forward on a node.')
       ),
-    ),
-  );
-  $tables['node_comment_statistics'] = array(
-    'name' => 'node_comment_statistics',
-    'provider' => 'internal',
-    'join' => array(
-      'left' => array(
-        'table' => 'forward_statistics',
-        'field' => 'nid'
-      ),
-      'right' => array(
-        'field' => 'nid'
-      ),
-    ),
-    'sorts' => array(
-      'comment_count' => array(
-        'name' => t('Comment: Comment Count'),
-        'help' => t('This filter allows you to sort by the number of comments.'),
-      ),
-      'active' => array(
-        'name' => t('node: most active'),
+      // Doesn't work yet.
+      /*'active' => array(
+        'name' => t('Node: Most Active'),
         'handler' => 'forward_views_handler_sort_active',
         'help' => t('This filter allows you to sort by the combined number of forwards and comments.'),
-      ),
+      ),*/
     ),
   );
   
   return $tables;
 }
 
+// Doesn't work yet.
 function forward_views_handler_sort_active($action, &$query, $sortinfo, $sort) {
   $query->ensure_table('node_comment_statistics');
   $query->orderby[] = 'forward_statistics.forward_count + node_comment_statistics.comment_count ' . $sort['sortorder'];