? ../subscriptions/subscriptions-newhook.patch
Index: ../subscriptions/subscriptions.admin.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/subscriptions/Attic/subscriptions.admin.inc,v
retrieving revision 1.1.2.14
diff -u -p -r1.1.2.14 subscriptions.admin.inc
--- ../subscriptions/subscriptions.admin.inc	2 Feb 2008 01:47:35 -0000	1.1.2.14
+++ ../subscriptions/subscriptions.admin.inc	15 Feb 2008 22:39:09 -0000
@@ -200,6 +200,9 @@ function subscriptions_page_user_overvie
   // blog is a subtype of 'type' -- must do it separately
   $count['blog']['author_uid'] = db_result(db_query("SELECT count(*) FROM {subscriptions} WHERE module = 'node' AND field = 'type' AND value = 'blog' AND recipient_uid = %d", $uid));
   
+  // develCuy: Organic groups may have many subtypes of 'types' -- must do it separately
+  $count = module_invoke_all('count_user_subscriptions', $count, $uid);
+  
   $tr = 't';
   $header = array(array('data' => $tr('Type'), 'width' => '20%'), t('Number'));
   $types = subscriptions_types();
Index: ../subscriptions/subscriptions.module
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/subscriptions/subscriptions.module,v
retrieving revision 1.62.2.45.2.37
diff -u -p -r1.62.2.45.2.37 subscriptions.module
--- ../subscriptions/subscriptions.module	18 Jan 2008 21:47:25 -0000	1.62.2.45.2.37
+++ ../subscriptions/subscriptions.module	15 Feb 2008 22:39:10 -0000
@@ -230,6 +230,20 @@ function subscriptions_get_subscription(
 }
 
 /**
+ * Return all subscription fields for given parameters
+ */
+function subscriptions_get_full_subscription($uid, $module, $field, $value, $author_uid = -1) {
+  static $subscriptions;
+
+  if (!isset($subscriptions[$uid][$module][$field][$value][$author_uid])) {
+    $sql = "SELECT * FROM {subscriptions} WHERE module = '%s' AND field = '%s' AND value = '%s' AND author_uid = %d AND recipient_uid = %d";
+    $subscriptions[$uid][$module][$field][$value][$author_uid] = db_fetch_object(db_query($sql, $module, $field, $value, $author_uid, $uid));
+  }
+
+  return $subscriptions[$uid][$module][$field][$value][$author_uid];
+}
+
+/**
  * Create a subscription
  */
 function subscriptions_write_subscription($module, $field, $value, $author_uid, $recipient_uid, $send_interval = 1, $send_updates = 0, $send_comments = 0) {