Changeset 127

Timestamp:

01/02/09 17:24:11 (20 months ago)

Author:

kester

Message:

og module upgrade to DRUPAL-5--8-0-RC1

Location:

external/current/sites/all/modules/og

Files:

• CVS (added)
• CVS/Entries (added)
• CVS/Entries.Log (added)
• CVS/Repository (added)
• CVS/Root (added)
• CVS/Tag (added)
• CVS/Template (added)
• LICENSE.txt (deleted)
• README.txt (modified) (1 diff)
• includes/CVS (added)
• includes/CVS/Entries (added)
• includes/CVS/Repository (added)
• includes/CVS/Root (added)
• includes/CVS/Tag (added)
• includes/CVS/Template (added)
• includes/groupcontent.inc (modified) (2 diffs)
• includes/groupcontext.inc (modified) (2 diffs)
• og.info (modified) (1 diff)
• og.install (modified) (14 diffs)
• og.module (modified) (74 diffs)
• og_access.info (modified) (1 diff)
• og_access.module (modified) (6 diffs)
• og_notifications (added)
• og_notifications/CVS (added)
• og_notifications/CVS/Entries (added)
• og_notifications/CVS/Entries.Log (added)
• og_notifications/CVS/Repository (added)
• og_notifications/CVS/Root (added)
• og_notifications/CVS/Tag (added)
• og_notifications/CVS/Template (added)
• og_notifications/README.txt (added)
• og_notifications/og_notifications.info (added)
• og_notifications/og_notifications.install (added)
• og_notifications/og_notifications.module (added)
• og_notifications/po (added)
• og_notifications/po/CVS (added)
• og_notifications/po/CVS/Entries (added)
• og_notifications/po/CVS/Repository (added)
• og_notifications/po/CVS/Root (added)
• og_notifications/po/CVS/Tag (added)
• og_notifications/po/CVS/Template (added)
• og_notifications/po/og_notifications-module.po (added)
• og_notifications/po/og_notifications-module.pot (added)
• og_panels.info (modified) (1 diff)
• og_panels.install (modified) (2 diffs)
• og_panels.module (modified) (10 diffs)
• og_views.inc (modified) (49 diffs)
• og_workflow_ng.inc (modified) (5 diffs)
• og_xmlrpc.inc (modified) (2 diffs)
• po/CVS (added)
• po/CVS/Entries (added)
• po/CVS/Repository (added)
• po/CVS/Root (added)
• po/CVS/Tag (added)
• po/CVS/Template (added)
• po/de.po (modified) (2 diffs)
• po/og.pot (added)
• tests/CVS (added)
• tests/CVS/Entries (added)
• tests/CVS/Repository (added)
• tests/CVS/Root (added)
• tests/CVS/Tag (added)
• tests/CVS/Template (added)

external/current/sites/all/modules/og/README.txt

@@ -42 +42 @@
 INTEGRATION
 ---------------------
-- I recommend enabling the job_queue.module. When you do, group email notifications are sent during cron runs, instead of immediately after a post is submitted. This speeds up posting a lot, for big groups. The delay also helps authors fix typos in their posts before the mail is sent.
 - This module exposes an API for retrieving and managing membership via direct PHP functions [og_save_subscription()] and via XMLRPC.
+- Enabling og_notifications provides subscription support for groups and group
+posts. The README in the og_notifications directory provides more information.
 
 UNIT TESTING

external/current/sites/all/modules/og/includes/groupcontent.inc

@@ -6 +6 @@
     'icon' => 'user-multiple.png',
     'path' => drupal_get_path('module', 'og_panels'). '/',
-    'description' => t('The welcome message for the group. Specified on group edit form'),
+    'description' => t('The welcome message for the group. Specified on group edit form.'),
     'required context' => new panels_required_context(t('Group'), 'group'),
     'category' => array(t('Organic groups'), -10),
@@ -184 +184 @@
     '#type' => 'textfield',
     '#title' => t('Number of members'),
-    '#description' => t('Maximum number of members that should appear on the list'),
+    '#description' => t('Maximum number of members that should appear on the list.'),
     '#default_value' => isset($conf['num_items']) ? $conf['num_items'] : 10,
     '#size' => 5,

external/current/sites/all/modules/og/includes/groupcontext.inc

@@ -1 +1 @@
 <?php
-// $Id: groupcontext.inc,v 1.1.2.3 2008/03/22 21:50:52 weitzman Exp $
+// $Id: groupcontext.inc,v 1.1.2.4 2008/05/26 14:03:35 weitzman Exp $
 /**
  * @file contexts/group.inc
@@ -35 +35 @@
       '#type' => 'checkbox',
       '#default_value' => $conf['external'],
-      '#title' => t('Require this context from an external source (such as containing panel page)'),
+      '#title' => t('Require this context from an external source (such as containing panel page).'),
       '#description' => t('If selected, group selection (below) will be ignored'),
     );

external/current/sites/all/modules/og/og.info

@@ -3 +3 @@
 package = "Organic groups"
 dependencies = views views_rss
-; Information added by drupal.org packaging script on 2008-05-12
-version = "5.x-7.2"
-project = "og"
-datestamp = "1210629035"
-

external/current/sites/all/modules/og/og.install

@@ -1 +1 @@
 <?php
-// $Id: og.install,v 1.21.2.31 2008/05/05 21:27:57 weitzman Exp $
+// $Id: og.install,v 1.21.2.32.2.8 2008/10/09 15:06:14 weitzman Exp $
 
 function og_install() {
@@ -13 +13 @@
         register int(1) NOT NULL default 0,
         directory int(1) NOT NULL default 0,
-        notification int(1) NOT NULL default 0,
         language varchar(12) NOT NULL default '',
         private int(1) NOT NULL default 0,
@@ -25 +24 @@
         is_admin int(1) NOT NULL DEFAULT 0,
         uid int(11) NOT NULL,
-        mail_type int(11) NULL,
-        created int(11) NULL DEFAULT 0,
-        changed int(11) NULL DEFAULT 0,
+        created int(11) NULL DEFAULT 0,
+        changed int(11) NULL DEFAULT 0,
         PRIMARY KEY  (nid, uid)
       ) /*!40100 DEFAULT CHARACTER SET utf8 */;");
       
-      db_query("CREATE TABLE {og_uid_global} (
-        uid int(11) NOT NULL,
-        og_email int(11) NOT NULL DEFAULT 2,
-        PRIMARY KEY  (uid)
-      ) /*!40100 DEFAULT CHARACTER SET utf8 */;");
       db_query("CREATE TABLE {og_ancestry} (
         nid int(11) NOT NULL,
@@ -53 +46 @@
         register smallint NOT NULL default 0,
         directory smallint NOT NULL default 0,
-        notification smallint NOT NULL default 0,
         language varchar(12) NOT NULL default '',
         private smallint NOT NULL default 0,  
@@ -65 +57 @@
         is_admin smallint NOT NULL DEFAULT 0,
         uid int NOT NULL,
-        mail_type int NULL,
-            created int NULL DEFAULT 0,
-            changed int NULL DEFAULT 0,
+        created int NULL DEFAULT 0,
+        changed int NULL DEFAULT 0,
         PRIMARY KEY  (nid, uid)
       );");
       
-      db_query("CREATE TABLE {og_uid_global} (
-        uid int NOT NULL,
-        og_email int NOT NULL DEFAULT 2,
-        PRIMARY KEY (uid)
-      );");
-      
-      db_query("
-      CREATE TABLE {og_ancestry} (
+      db_query("CREATE TABLE {og_ancestry} (
        nid int NOT NULL,
        group_nid int NOT NULL,
@@ -89 +73 @@
   
   // enable standard og blocks. for custom profiles, block may not be included yet.
-  if (function_exists('block_rehash')) {
+  if (function_exists('_block_rehash')) {
     _block_rehash();
   }
@@ -312 +296 @@
 }
 
-// populate the og_uid_global table. we have to choose selective here for backward compatibility. 
-// to set everyone up for 'always' notifications, run this after the update: UPDATE og_uid_global SET og_email=1
+// populate the og_uid_global table. we have to choose selective here for 
+// backward compatibility. To set everyone up for 'always' notifications, run
+// this after the update: UPDATE og_uid_global SET og_email=1
+// og_uid_global is later moved into og_notifications. This update is only
+// around to retain schema consistency - the population script has been removed.
 function og_update_13() {
   switch ($GLOBALS['db_type']) { 
@@ -332 +319 @@
       break;
   }
-  
-  // works for mysql and postgres
-  $sql = 'SELECT uid FROM {users} WHERE uid > 0';
-  $result = db_query($sql);
-  while ($row = db_fetch_object($result)) {
-    $sql = "INSERT INTO {og_uid_global} (uid, og_email) VALUES (%d, %d)";
-    db_query($sql, $row->uid, OG_NOTIFICATION_SELECTIVE);
-  }
+
   return array();
 }
@@ -424 +404 @@
 }
 
+// Formerly contained og_uid_global code which is no longer required.
 function og_update_19() {
-  og_populate_uid_global_table();
-  return array('Populated og_uid_global table');
+  return array();
 }
 
@@ -464 +444 @@
   $ret = array();
   if (variable_get('og_enabled', FALSE) && !module_exists('og_access')) {
-    module_enable('og_access');
+    drupal_install_modules(array('og_access'));
   }
   // variable_del('og_enabled'); is harmless to leave around, and will help if someone reruns the update.
@@ -497 +477 @@
    return $ret;
  }
-
-// end updates //
-
-function og_enable() {
-  og_populate_uid_global_table();
-}
-
-// need to populate og_uid_global for existing users on enable
-// this is called from update 13 & 19 & og_enable. 
-// TODO: conditionally use subquery
-function og_populate_uid_global_table() {
-  $sql = 'SELECT u.uid FROM {users} u LEFT JOIN {og_uid_global} oug ON u.uid=oug.uid WHERE u.uid > 0 AND oug.og_email IS NULL';
-  $result = db_query($sql);
-  while ($row = db_fetch_object($result)) {
-    $sql = "INSERT INTO {og_uid_global} (uid, og_email) VALUES (%d, %d)";
-    db_query($sql, $row->uid, OG_NOTIFICATION_SELECTIVE);
-  }
-}
+ 
+ /**
+  * Force menu rebuild since subscribe/unsubscribe paths are better protected now.
+  */ 
+ function og_update_5702() {
+   $ret[] = array('success' => TRUE, 'query' => 'Menu has been rebuilt.');
+   menu_rebuild();
+   return $ret;
+ }
+ 
+/**
+ * Notifications upgrade: Set flag to indicate that this is an upgraded 
+ * installation.
+ */ 
+function og_update_5703() {
+  // Remove mail / no mail options from OG group types and move preferences to
+  // og_notifications.
+  $types = og_get_types('group_post');
+  $mail_types = array();
+  foreach ($types as $type) {
+    $variable = 'og_content_type_usage_'. $type;
+    $usage = variable_get($variable, '');
+    switch ($usage) {
+      case 'group_post_standard_mail':
+        $mail_types[$type] = $type;
+      case 'group_post_standard_nomail':
+        variable_set($variable, 'group_post_standard');
+        break;
+      case 'group_post_wiki_mail':
+        $mail_types[$type] = $type;
+      case 'group_post_wiki_nomail':
+        variable_set($variable, 'group_post_wiki');
+        break;
+    }
+  }
+  // Set variable for og_notifications. If it is never enabled, this variable
+  // is also deleted in og_uninstall.
+  variable_set('og_notifications_content_types', $mail_types);
+
+  // Vestigial variable.
+  variable_del('og_omitted_email_node_types');
+
+  // Set update flag for og_notifications.
+  variable_set('og_notifications_update_required', 1);
+
+  return array();
+}
+
+ // end updates //
 
 function og_uninstall() {
@@ -520 +531 @@
   db_query('DROP TABLE {og}');
   db_query('DROP TABLE {og_uid}');
-  db_query('DROP TABLE {og_uid_global}');
   db_query('DROP TABLE {og_ancestry}');
+
+  // In case og_notifications has never been enabled, the vestigial 
+  // og_uid_global table will still be around. 
+  if (variable_get('og_notifications_update_required', FALSE)) {
+    db_query('DROP TABLE {og_uid_global}');
+  }
 
   // Delete variables
@@ -527 +543 @@
     'og_member_pics', 'og_help', 'og_block_cnt_2', 'og_block_cnt_3',
     'og_audience_checkboxes', 'og_omitted', 'og_content_type_usage',
-    'og_audience_required', 'og_omitted_email_node_types',
+    'og_audience_required',
     'og_visibility_directory', 'og_visibility_registration',
     'og_home_page_view', 'og_email_max', 'og_node_types',
@@ -536 +552 @@
     'og_new_admin_body', 'og_new_admin_subject',
     'og_new_node_body', 'og_new_node_subject',
-    'og_notification', 'og_request_user_body', 'og_request_user_subject',
+    'og_request_user_body', 'og_request_user_subject',
+    'og_notifications_update_required', 'og_notifications_content_types'
   );
   foreach ($variables as $variable) {

external/current/sites/all/modules/og/og.module

@@ -1 +1 @@
 <?php
-// $Id: og.module,v 1.298.2.185 2008/05/08 19:49:26 weitzman Exp $
+// $Id: og.module,v 1.298.2.197.2.15 2008/11/02 20:30:45 weitzman Exp $
 
 // Selective groups states. chosen by the group admin
@@ -19 +19 @@
 define('OG_DIRECTORY_CHOOSE_TRUE', 2);
 define('OG_DIRECTORY_CHOOSE_FALSE', 3);
-
-// site admin chooses in og_admin_settings() whether new registrants receive group email notifications by default
-define('OG_NOTIFICATION_NEVER', 0);
-define('OG_NOTIFICATION_ALWAYS', 1);
-define('OG_NOTIFICATION_SELECTIVE', 2);
 
 function og_help($section) {
@@ -41 +36 @@
   if ($may_cache) {
     // anon users should be able to get to the join page
-    $items[] = array('path' => 'og/subscribe', 'type' => MENU_CALLBACK, 'callback' => 'og_subscribe', 'access' => TRUE, 'title' => t('Join group'));
+    $items[] = array('path' => 'og/subscribe', 'type' => MENU_CALLBACK, 'callback' => 'og_menu_check_node_view', 'access' => TRUE, 'callback arguments' => array('og_subscribe'), 'title' => t('Join group'));
     
     $items[] = array('path' => 'og/opml', 'type' => MENU_CALLBACK, 'callback' => 'og_opml', 'access' => $access, 'title' => t('OPML'));
-    $items[] = array('path' => 'og/unsubscribe', 'type' => MENU_CALLBACK, 'callback' => 'og_unsubscribe', 'access' => $access, 'title' => t('Leave group'));
+    $items[] = array('path' => 'og/unsubscribe', 'type' => MENU_CALLBACK, 'callback' => 'og_menu_check_node_view', 'callback arguments' => array('og_unsubscribe'), 'access' => $access, 'title' => t('Leave group'));
     $items[] = array('path' => 'og/approve', 'type' => MENU_CALLBACK, 'callback' => 'og_approve', 'access' => $access, 'title' => t('Approve membership request'));
     $items[] = array('path' => 'og/deny', 'type' => MENU_CALLBACK, 'callback' => 'og_deny', 'access' => $access, 'title' => t('Deny membership request'));
@@ -66 +61 @@
       'path' => 'admin/og', 
       'title' => t('Organic groups'),
-      'description' => t('Administer the suite of Organic groups modules.'),
+      'description' => t('Administer the suite of organic groups modules.'),
       'position' => 'right',
       'weight' => -5,
@@ -78 +73 @@
     
     // we get a NOTICE if doing this from within og_theme() so I do it here for now.
-    $_SESSION['og_last'] = og_get_group_context();
+    if ($group_node = og_get_group_context()) {
+      if ($user->uid || variable_get('cache', CACHE_DISABLED) == CACHE_DISABLED) {
+        $_SESSION['og_last'] = og_get_group_context();
+      }
+    }
 
     //membership page and its 'add members' tab
@@ -92 +91 @@
       $items[] = array('path' => "og/users/$gid/add_user", 'callback' => 'drupal_get_form', 'title' => t('Add members'), 'callback arguments' => array('og_add_users', $gid), 'type' => MENU_LOCAL_TASK, 'weight' => 5, 'access' => og_is_node_admin($node));
     }
-    
-    // email tab on group node
+
+    // Broadcast tab on group node.
     if (arg(0) == 'node' && is_numeric(arg(1))) {
       $node = node_load(arg(1));
       if (og_is_group_type($node->type)) {
-        $items[] = array('path' => 'node/'. arg(1). '/email', 'title' => t('E-mail'), 'callback' => 'drupal_get_form', 'callback arguments' => array('og_email_form', arg(1)), 'access' => og_is_node_admin($node), 'type' => MENU_LOCAL_TASK, 'weight' => 7);
+        $items[] = array(
+          'path' => 'node/'. arg(1) .'/broadcast',
+          'title' => t('Broadcast'),
+          'callback' => 'drupal_get_form',
+          'callback arguments' => array('og_broadcast_form', arg(1)),
+          'access' => og_broadcast_access($node),
+          'type' => MENU_LOCAL_TASK,
+          'weight' => 7
+        );
       }
     }
@@ -119 +126 @@
     drupal_access_denied();
   }
+}
+
+// check for node access 'view' and then pass along to the real menu callback
+// arguments must be in this order: function, $gid, <extra params required by function>
+function og_menu_check_node_view() {
+  global $user;
+
+  $args = func_get_args();
+  $function = array_shift($args);
+  $gid = $args[0];
+  $node = node_load((int)$gid);
+  if (node_access('view', $node)) {
+    return call_user_func_array($function, $args);
+  }
+  else {
+    drupal_access_denied();
+  }
+  
 }
 
@@ -280 +305 @@
 
 /**
- * Admins may broadcast email to all their members
+ * Admins may broadcast messages to all their members.
  *
  * @param $gid
  *   the nid of a group.
  */
- function og_email_form($gid) {
+ function og_broadcast_form($gid) {
   $node = node_load($gid);
-  drupal_set_title(t('Send email to %group', array('%group' => $node->title)));
+  drupal_set_title(t('Send message to %group', array('%group' => $node->title)));
   
   $result = db_query(og_list_users_sql(1), $gid);
   $txt = format_plural(db_num_rows($result), 'the sole member', 'all @count members');
   if (!$_POST) {
-    drupal_set_message(t('Your email will be sent to !count in this group. Please use this feature sparingly.', array('!count' => l($txt, "og/users/$gid"))));
-  }
-
-  $form['subject'] = array('#type' => 'textfield', '#title' => t('Subject'), '#size' => 70, '#maxlength' => 250, '#description' => t("Enter a subject for your email."), '#required' => true);
-  $form['body'] = array('#type' => 'textarea', '#title' => t('Body'), '#rows' => 5, '#cols' => 90, '#description' => t('Enter a body for your email.'), '#required' => true);
-  $form['send'] = array('#type' => 'submit', '#value' => t('Send email'));
+    drupal_set_message(t('Your message will be sent to !count in this group.', array('!count' => l($txt, "og/users/$gid"))));
+  }
+
+  $form['subject'] = array('#type' => 'textfield', '#title' => t('Subject'), '#size' => 70, '#maxlength' => 250, '#description' => t("Enter a subject for your message."), '#required' => true);
+  $form['body'] = array('#type' => 'textarea', '#title' => t('Body'), '#rows' => 5, '#cols' => 90, '#description' => t('Enter the body of your message.'), '#required' => true);
+  $form['send'] = array('#type' => 'submit', '#value' => t('Send message'));
   $form['gid'] = array('#type' => 'value', '#value' => $gid);
   return $form;
 }
 
-function og_email_form_submit($form_id, $form_values) {
+function og_broadcast_form_submit($form_id, $form_values) {
+  global $user;
+
+  $sql = og_list_users_sql(1);
+  $result = db_query($sql, $form_values['gid']);
+  $recipients = array();
+  while ($row = db_fetch_object($result)) {
+    $recipients[] = $row->uid;
+  }
+
   $node = node_load($form_values[gid]);
-
   $variables = array(
     '@group' => $node->title,
@@ -312 +345 @@
     '!url_unsubscribe' => url("og/unsubscribe/$node->nid", NULL, NULL, TRUE)
   );
-  
-  global $user;
-  $from = $user->mail;
-  $sql = og_list_users_sql(1);
-  $result = db_query($sql, $form_values['gid']);
-  while ($row = db_fetch_object($result)) {
-     $emails[] = $row->mail;
-  }
-  foreach ($emails as $mail) {
-    drupal_mail('og_mail', trim($mail), $form_values['subject'], _og_user_mail_text('og_admin_email_body', $variables), $from);
-  }
-  drupal_set_message(format_plural(count($emails), '1 email sent.', '@count emails sent'));
+  $message = array(
+    'from' => $user,
+    'subject' => $form_values['subject'],
+    'body' => _og_user_mail_text('og_admin_email_body', $variables)
+  );
+
+  // Send notifications to each member; Sending an array of recipients implies
+  // that this is a bulk message.
+  module_invoke_all('og', 'user broadcast', $gid, $recipients, $message);
+  drupal_set_message(format_plural(count($recipients), '1 message queued for delivery.', '@count messages queued for delivery.'));
+
   drupal_goto("node/{$form_values[gid]}");
 }
@@ -330 +362 @@
   global $user;
 
-  // warn users who can't receive mail anyway
-  if ($txt = user_validate_mail($user->mail)) {
-    drupal_set_message($txt, 'error');
-    return '';
-  }
-  
   $group = node_load($gid);
   $bc[] = array('path' => "og", 'title' => t('Groups'));
@@ -362 +388 @@
   }
 
-  switch ($user->og_email) {
-    // og_email can be NULL when you enable og on an existing site.
-    case NULL:
-    case OG_NOTIFICATION_SELECTIVE:
-      $form['mail_type'] = array('#type' => 'radios', '#title' => t('Email notification'), '#default_value' => $user->og_groups[$group->nid]['mail_type'], '#options' => array(1 => t('enabled'), 0 => t('disabled')), '#description' => t('Do you want to receive an email each time a message is posted to this group?'));
-      $submit = TRUE;
-      break;
-    case OG_NOTIFICATION_ALWAYS:
-      $form['mail_type'] = array('#type' => 'item', '#title' => t('Email notification'), '#value' => t('Your <a href="!prof">personal profile</a> is configured to: <em>Always receive email notifications</em>.', array('!prof' => url("user/$user->uid/edit")))); 
-      break;
-    case OG_NOTIFICATION_NEVER:
-      $form['mail_type'] = array('#type' => 'item', '#title' => t('Email notification'), '#value' => t('Your <a href="!prof">personal profile</a> is configured to: <em>Never receive email notifications</em>.', array('!prof' => url("user/$user->uid/edit")))); 
-      break;
-  }
-  if ($submit) {
-    $form['op'] = array('#type' => 'submit', '#value' => t('Submit'));
-  }
   $form['gid'] = array('#type' => 'value', '#value' => $group->nid);
   return $form;
@@ -397 +406 @@
  * @param $uid user ID of user
  * @param $args an array with details of this membership. Possible array keys are:
-     is_active, is_admin, mail_type, created
+     is_active, is_admin, created
  */
 function og_save_subscription($gid, $uid, $args = array()) {
@@ -403 +412 @@
   $cnt = db_result(db_query($sql, $gid, $uid));
   $time = time();
+  
+  // Allow other modules to pass their data inside the $args.
+  $og_allowed_args = array('is_active', 'is_admin', 'created');
+  $return_args = $args;
+  foreach ($args as $key => $value) {
+    if (!in_array($key, $og_allowed_args)) {
+      unset($args[$key]);
+    }
+  }
   if ($cnt == 0) {
     // this pattern borrowed from user_save()
@@ -411 +429 @@
       $fields[] = db_escape_string($key);
       $values[] = $value;
-      $s[] = "'%s'";
+      $s[] = "'%s'";        
     }
     db_query('INSERT INTO {og_uid} ('. implode(', ', $fields). ') VALUES (%d, %d, %d, %d, '. implode(', ', $s). ')', $values);
-    module_invoke_all('og', 'user insert', $gid, $uid, $args);
+    module_invoke_all('og', 'user insert', $gid, $uid, $return_args);
   }
   else {
@@ -423 +441 @@
     $cond = implode(', ', $cond);
     db_query("UPDATE {og_uid} SET $cond WHERE nid = %d AND uid = %d", $gid, $uid);
-    module_invoke_all('og', 'user update', $gid, $uid, $args);
-  }
-}
-
-function og_delete_subscription($gid, $uid){
+    module_invoke_all('og', 'user update', $gid, $uid, $return_args);
+  }
+}
+
+function og_delete_subscription($gid, $uid, $args = array()){
   $sql = "DELETE FROM {og_uid} WHERE nid = %d AND uid = %d";
   db_query($sql, $gid, $uid);
-  module_invoke_all('og', 'user delete', $gid, $uid, array());
+  // Allow other modules to pass their data inside the $args.
+  module_invoke_all('og', 'user delete', $gid, $uid, $args);
 }
 
@@ -442 +461 @@
     }
     if (in_array($gid, array_keys($account->og_groups))) {
-      drupal_set_message(t("!name already approved to group %group", array('!name' => theme('username', $account), '%group' => $node->title)), 'error');
+      drupal_set_message(t("!name already approved to group %group.", array('!name' => theme('username', $account), '%group' => $node->title)), 'error');
       return '';
     }
@@ -450 +469 @@
            
       $variables = array(
-         '@title' => $node->title,
-         '!group_url'=> url("node/$node->nid", NULL, NULL, TRUE)
-      );     
-      
-      $from = variable_get('site_mail', ini_get('sendmail_from'));
-      $account = user_load(array('uid' => $uid));
-      drupal_mail('og_approve', $account->mail, _og_user_mail_text('og_approve_user_subject', $variables), _og_user_mail_text('og_approve_user_body', $variables), $from);
+        '@title' => $node->title,
+        '!group_url'=> url("node/$node->nid", NULL, NULL, TRUE)
+      );
+      $message = array(
+        'subject' => _og_user_mail_text('og_approve_user_subject', $variables),
+        'body' => _og_user_mail_text('og_approve_user_body', $variables)
+      );
+
+      module_invoke_all('og', 'user approve', $gid, $uid, $message);
       drupal_goto("node/$gid");
     }
@@ -473 +494 @@
     $variables = array(
       '@title' => $node->title,
-      '!group_url' => url("node/$node->nid", NULL, NULL, TRUE)
+      '!group_url'=> url("node/$node->nid", NULL, NULL, TRUE)
     );
-    
-    $from = variable_get('site_mail', ini_get('sendmail_from'));
-    $account = user_load(array('uid' => $uid));
-    drupal_mail('og_deny', $account->mail, _og_user_mail_text('og_deny_user_subject', $variables), _og_user_mail_text('og_deny_user_body', $variables), $from);
+    $message = array(
+      'subject' => _og_user_mail_text('og_deny_user_subject', $variables),
+      'body' => _og_user_mail_text('og_deny_user_body', $variables)
+    );
+
+    module_invoke_all('og', 'user deny', $gid, $uid, $message);
     drupal_goto("node/$gid");
   }
@@ -519 +542 @@
   
   og_save_subscription($node->nid, $account->uid, array('is_admin' => 1));
-  drupal_set_message(t('%name was promoted to %ga', array('%name' => $account->name, '%ga' => t('group administrator'))));
+  drupal_set_message(t('%name was promoted to %ga.', array('%name' => $account->name, '%ga' => t('group administrator'))));
   
   $variables = array(
@@ -526 +549 @@
     '@username' => $account->name
   );
-  
-  $from = variable_get('site_mail', ini_get('sendmail_from'));
-  drupal_mail('og_new_admin', $account->mail, _og_user_mail_text('og_new_admin_subject', $variables), _og_user_mail_text('og_new_admin_body', $variables), $from);
+  $message = array(
+    'subject' => _og_user_mail_text('og_new_admin_subject', $variables),
+    'body' => _og_user_mail_text('og_new_admin_body', $variables)
+  );
+
+  module_invoke_all('og', 'admin create', $node->nid, $account->uid, $message);
   return "og/users/$node->nid";
 }
@@ -564 +590 @@
   $gid = $form_values['gid'];
   og_save_subscription($gid, $account->uid, array('is_admin' => 0));
-  drupal_set_message(t('%name is no longer a %ga', array('%name' => $account->name, '%ga' => t('group administrator'))));
+  drupal_set_message(t('%name is no longer a %ga.', array('%name' => $account->name, '%ga' => t('group administrator'))));
   return "og/users/$gid";
 }
@@ -599 +625 @@
   $emails = explode(',', $mails);
   if (count($emails) > $max) {
-    form_set_error('mails', t("You may not specify more than %max email addresses or usernames.", array('%max' => $max)));
+    form_set_error('mails', t('You may not specify more than %max email addresses or usernames.', array('%max' => $max)));
   }
   elseif (in_array($user->mail, $emails)) {
-    form_set_error('mails', t("You may not invite yourself - @self", array('@self' => $user->mail)));
+    form_set_error('mails', t('You may not invite yourself - @self', array('@self' => $user->mail)));
   }
   else {
@@ -626 +652 @@
     }
     if (count($bad)) {
-      form_set_error('mails', t('invalid email address or username: '). implode(' ', $bad));
+      form_set_error('mails', t('Invalid email address or username:') .' '. implode(' ', $bad));
     }
     else {
@@ -670 +696 @@
   }
   $node = node_load($gid);
-  if ($node->og_selective >= OG_INVITE_ONLY || $node->status == 0) {
+  if ($node->og_selective >= OG_INVITE_ONLY || $node->status == 0 || !og_is_group_type($node->type)) {
     drupal_access_denied();
     exit();
@@ -718 +744 @@
 
 /**
- * Create a new membership for a given user to given group and send proper email. Edits to membership should 
+ * Create a new membership for a given user to given group. Edits to membership should 
  * go through og_save_subscription(). No access control since this is an API function.
  *
@@ -729 +755 @@
     case OG_MODERATED:
       og_save_subscription($gid, $account->uid, array('is_active' => 0));
+
       $sql = og_list_users_sql(1, 1);
       $res = db_query($sql, $node->nid);
+      $admins = array();
       while ($row = db_fetch_object($res)) {
-        if ($row->mail) {
-          $admins[] = $row->mail;
+        $admins[] = $row->uid;
+      }
+
+      if (!empty($admins)) {
+        // Prepend user's request text with standard cruft. Should be a
+        // variable but that's a bit annoying.
+        if ($request) {
+          $request = t("\n\nPersonal message from @name:\n------------------\n\n@request", array('@name' => $account->name, '@request' => $request));
         }
-      }
-      if ($admins) {        
         $variables = array(
           '@group' => $node->title,
@@ -743 +775 @@
           '!group_url' => url("og/users/$node->nid", NULL, NULL, TRUE)
         );
-        
-        $from = variable_get('site_mail', ini_get('sendmail_from'));
-        // prepend user's request text with standard cruft. should be a mail variable but thats a bit annoying
-        if ($request) {
-          $request = t("\n\nPersonal message from @name:\n------------------\n\n@request", array('@name' => $account->name, '@request' => $request));
-        }
-        drupal_mail('og_subscription_request', implode(', ', $admins), _og_user_mail_text('og_request_user_subject', $variables), _og_user_mail_text('og_request_user_body', $variables). $request, $from);
-      }
+        $message = array(
+          'subject' => _og_user_mail_text('og_request_user_subject', $variables),
+          'body' => _og_user_mail_text('og_request_user_body', $variables) . $request
+        );
+
+        // Send notifications to each admin; Sending an array of recipients
+        // implies that this is a bulk message.
+        module_invoke_all('og', 'user request', $gid, $admins, $message);
+      }
+
       $return_value = array('type' => 'approval',
                             'message' => t('Membership request to the %group group awaits approval by an administrator.', array('%group' => $node->title)));
@@ -758 +792 @@
       og_save_subscription($gid, $account->uid, array('is_active' => 1));
       $return_value = array('type' => 'subscribed',
-                            'message' => t('You are now a member of the %group', array('%group' => $node->title)));
+                            'message' => t('You are now a member of the %group.', array('%group' => $node->title)));
       break;
     case OG_CLOSED:
@@ -780 +814 @@
   }
   $node = node_load($gid);
-  if ($uid != $user->uid && !og_is_node_admin($node)) {
-    // only admins can remove another member
+  $account = user_load(array('uid' => $uid));
+  if (!in_array($gid, array_keys(og_get_subscriptions($account->uid, 0))) || ($uid != $user->uid && !og_is_node_admin($node))) {
+    // Ubsubscribee must be a member or awaiting approval
+    // Only admins can remove another member.
     drupal_access_denied();
     exit();
   }
-  if (($node->og_selective == OG_CLOSED && !og_is_node_admin($node)) || $node->uid == $uid){
+  if (!og_is_group_type($node->type) || ($node->og_selective == OG_CLOSED && !og_is_node_admin($node)) || $node->uid == $uid){
     // Regular users may not leave from a closed group
     // Group manager may never leave (TODO: fix), such a link should never be generated
@@ -880 +916 @@
     }
     else {
-      $bad[] = $name;
+      $bad[] = check_plain($name);
       $err = TRUE;
     }
   }
   if ($err) {
-    form_set_error('og_names', t('Unrecognized %names: ', array('%names' => format_plural(count($bad), 'name', 'names'))). implode(', ', $bad));
+    form_set_error('og_names', t('Unrecognized %names:', array('%names' => format_plural(count($bad), 'name', 'names'))) .' '. implode(', ', $bad));
   }
 }
@@ -901 +937 @@
     og_save_subscription($form_values['gid'], $account->uid, array('is_active' => 1));
   }
-  drupal_set_message(format_plural(count($accounts), '1 user added to the group', '@count users added to the group'));
+  drupal_set_message(format_plural(count($accounts), '1 user added to the group.', '@count users added to the group.'));
 }
 
@@ -912 +948 @@
   // prepend the group manager
   $i=0;
-  $rows[$i][] = array('data' => theme('username', $node). '&nbsp;<em>'. t('manager'). '</em>', 'colspan' => 3);
+  $rows[$i][] = array('data' => theme('username', $node). '&nbsp;<em>'. t('Manager'). '</em>', 'colspan' => 3);
   $i++;
 
@@ -921 +957 @@
       if ($account->uid != $node->uid) {
         $username = theme('username', $account);
-        if  (!$account->is_active)  { $username .= '&nbsp;<em>'.t('(approval needed)'). '</em>'; }
-        elseif ($account->is_admin) { $username .= '&nbsp;<em>'.t('administrator'). '</em>'; }
+        if  (!$account->is_active)  { $username .= '&nbsp;<em>'. t('(approval needed)'). '</em>'; }
+        elseif ($account->is_admin) { $username .= '&nbsp;<em>'. t('Administrator'). '</em>'; }
         $rows[$i][] = $username;
         if ($access) {
           if ($account->is_active) {
-            $rows[$i][] = l(t('remove'), "og/unsubscribe/$gid/$account->uid", array(), "destination=og/users/$gid");
+            $rows[$i][] = l(t('Remove'), "og/unsubscribe/$gid/$account->uid", array(), "destination=og/users/$gid");
             if ($account->is_admin) {
-              $rows[$i][] = l(t('admin: remove'), "og/delete_admin/$gid/$account->uid", array(), 'destination='. $_GET['q']);
+              $rows[$i][] = l(t('Admin: Remove'), "og/delete_admin/$gid/$account->uid", array(), 'destination='. $_GET['q']);
             }
             else {
-              $rows[$i][] = l(t('admin: create'), "og/create_admin/$gid/$account->uid", array(), 'destination='. $_GET['q']);
+              $rows[$i][] = l(t('Admin: Create'), "og/create_admin/$gid/$account->uid", array(), 'destination='. $_GET['q']);
             }
           }
           else {
-            $rows[$i][] = l(t('approve'), "og/approve/$gid/$account->uid", array(), "destination=og/users/$gid");
-            $rows[$i][] = l(t('deny'), "og/deny/$gid/$account->uid", array(), "destination=og/users/$gid");
+            $rows[$i][] = l(t('Approve'), "og/approve/$gid/$account->uid", array(), "destination=og/users/$gid");
+            $rows[$i][] = l(t('Deny'), "og/deny/$gid/$account->uid", array(), "destination=og/users/$gid");
           }
         }
@@ -956 +992 @@
 function og_list_users_faces_page($gid, $column_count = 5, $row_count = 10, $pager_id = 0) {
   $max_per_page = $row_count * $column_count;
-  $sql = og_list_users_sql(0, 0, 'ou.is_admin DESC, u.picture DESC, u.name ASC');
+  $sql = og_list_users_sql(1, 0, 'ou.is_admin DESC, u.picture DESC, u.name ASC');
   /* list group admins first, members with pics second, regular members last.  Alphabetize within each of these categories */
   $result = pager_query($sql, $max_per_page, $pager_id, NULL, $gid);
@@ -1073 +1109 @@
     unset($node->content['body']);
     $node->content['og_mission'] = array(
-      '#value' => check_markup($node->body, $node->format, FALSE), 
+      '#value' => $node->body, // node_prepare() already ran check_markup() 
       '#node' => $node,
       '#weight' => -3,
@@ -1101 +1137 @@
         og_home_empty($node);
       }
-      drupal_set_title(filter_xss_admin(views_get_title($view, 'page')));
+      drupal_set_title(check_plain(views_get_title($view, 'page')));
     } 
   }
@@ -1270 +1306 @@
 
 function og_load_group(&$node) {
-  $sql = 'SELECT selective AS og_selective, description AS og_description, theme AS og_theme, register AS og_register, directory AS og_directory, notification AS og_notification, language AS og_language, private AS og_private FROM {og} WHERE nid = %d';
+  $sql = 'SELECT selective AS og_selective, description AS og_description, theme AS og_theme, register AS og_register, directory AS og_directory, language AS og_language, private AS og_private FROM {og} WHERE nid = %d';
   $result = db_query($sql, $node->nid);
   $node = (object) array_merge((array)$node, (array)db_fetch_array($result));
@@ -1277 +1313 @@
 
 function og_insert_group($node) {
-  $sql = "INSERT INTO {og} (nid, theme, selective, description, register, directory, notification, language, private) VALUES (%d, '%s', %d, '%s', %d, %d, %d, '%s', %d)";
-  db_query($sql, $node->nid, $node->og_theme, $node->og_selective, $node->og_description, $node->og_register, $node->og_directory, $node->og_notification, $node->og_language, $node->og_private);
+  $sql = "INSERT INTO {og} (nid, theme, selective, description, register, directory, language, private) VALUES (%d, '%s', %d, '%s', %d, %d, '%s', %d)";
+  db_query($sql, $node->nid, $node->og_theme, $node->og_selective, $node->og_description, $node->og_register, $node->og_directory, $node->og_language, $node->og_private);
 }
 
 function og_update_group($node) {
-  $sql = "UPDATE {og} SET theme = '%s', selective = %d, register = %d, description = '%s', directory = %d, notification = %d, language = '%s', private = %d WHERE nid = %d";
-  db_query($sql, $node->og_theme, $node->og_selective, $node->og_register, $node->og_description, $node->og_directory, $node->og_notification, $node->og_language, $node->og_private, $node->nid);
+  $sql = "UPDATE {og} SET theme = '%s', selective = %d, register = %d, description = '%s', directory = %d, language = '%s', private = %d WHERE nid = %d";
+  db_query($sql, $node->og_theme, $node->og_selective, $node->og_register, $node->og_description, $node->og_directory, $node->og_language, $node->og_private, $node->nid);
   if (!db_affected_rows()) {
     og_insert_group($node);  
@@ -1326 +1362 @@
       break;
     case 'validate':
-      if (og_is_group_type($node->type)) {
-        // Email address is required for contacting the Manager
-        $account = user_load(array('uid' => $node->uid));
-        if ($account->uid > 0 && empty($account->mail)) {
-          form_set_error('name', t('The group manager, %name, must have an email address in his <a href="!profile">profile</a>.', array('%name' => $account->name, '!profile' => url("user/$node->uid/edit"))));
+      // Ensure that a group is selected if groups are required. needed when author has no groups. In other cases, fapi does the validation
+      if (og_is_group_post_type($node->type) && variable_get('og_audience_required', FALSE) && !user_access('administer nodes')) {
+        if (!isset($node->og_groups)) {
+          form_set_error('title', t('You must !join before posting on this web site.', array('!join' => l(t('join a group'), 'og'))));
         }
-        
-        // Must be authored in the default input format or else admins might not get their admin perms
-        // If Body field is omitted, there may not yet be a $node->format
-        if (isset($node->format) && $node->format != filter_resolve_format(FILTER_FORMAT_DEFAULT)) {
-          form_set_error('body', t("You must use the default input format when authoring a group node."));
-        }
-      }
-      else {
-        // Ensure that a group is selected if groups are required. needed when author has no groups. In other cases, fapi does the validation
-        if (og_is_group_post_type($node->type) && variable_get('og_audience_required', FALSE) && !user_access('administer nodes')) {
-          if (!isset($node->og_groups)) {
-            form_set_error('title', t('You must !join before posting on this web site.', array('!join' => l(t('join a group'), 'og'))));
-          }
-        }
-        
       }
       break;
@@ -1383 +1403 @@
           '!invite_url' => url("og/invite/$node->nid", NULL, NULL, TRUE)
         );
-
-        // alert the user that they are now the admin of the group  
-        $from = variable_get('site_mail', ini_get('sendmail_from'));
-        drupal_mail('og_new_admin', $account->mail, _og_user_mail_text('og_new_admin_subject', $variables), _og_user_mail_text('og_new_admin_body', $variables), $from);      
+        $message = array(
+          'subject' => _og_user_mail_text('og_new_admin_subject', $variables),
+          'body' => _og_user_mail_text('og_new_admin_body', $variables)
+        );
+
+        // Alert the user that they are now the admin of the group.
+        module_invoke_all('og', 'admin new', $gid, $account->uid, $message);
       }
       else {
         og_save_ancestry($node);
-      }
-      
-      $skip_notification = FALSE; 
-      // Any module that returns TRUE from its hook_og_notify($node) will prevent sending notifications.
-      // og2list and og_subscriptions use this to send own notifications.
-      foreach(module_implements('og_notify') as $module) {
-        if (module_invoke($module,'og_notify',$node)) {
-          $skip_notification = TRUE;
-          break;
-        }
-      }
-      if (!$skip_notification && $node->status && og_is_mail_type($node->type) && $node->og_groups) {
-        if (module_exists('job_queue')) {
-          $description = t('OG: notify group members about node %nid - !link', array('%nid' => $node->nid, '!link' => l($node->title, "node/$node->nid")));
-          job_queue_add('og_mail', $description, array('node', $node->nid));
-        }
-        else {
-          og_mail('node', $node);
-        }
       }
       break;
@@ -1435 +1439 @@
           $ret[] = array('key'   => 'group',
                          'value' => check_plain($title),
-                         'attributes' => array('domain' => url("node/$gid", NULL, NULL, TRUE)));
+                         'attributes' => array(
+                           'domain' => url("node/$gid", NULL, NULL, TRUE),
+                           'xmlns' => 'http://drupal.org/project/og',
+                          ),
+          );
         }
         // to get these modifications to work on 4.7, one needs to patch as per http://drupal.org/node/41703
@@ -1500 +1508 @@
 
   if ($form_id == 'views_edit_view') {
-    $form['page-info']['url']['#description'] .= t("<p>To display a View as a tab on your Organic Groups group home pages, set the url to 'node/\$group/custom' (where <em>custom</em> is whatever you wish). Then open Page >> Menu and check <em>Provide Menu</em> and <em>Provide Menu as Tab</em>; also make the first argument in the View be the <em>OG: Group nid(s)</em> argument. The <em>\$group</em> path element is a placeholder for the group nid and it ensures that the tab <strong>only</strong> appears on OG group nodes.</p>");
+    $form['page-info']['url']['#description'] .= '<p>'. t("To display a View as a tab on your Organic Groups group home pages, set the url to 'node/\$group/custom' (where <em>custom</em> is whatever you wish). Then open Page >> Menu and check <em>Provide Menu</em> and <em>Provide Menu as Tab</em>; also make the first argument in the View be the <em>OG: Group nid(s)</em> argument. The <em>\$group</em> path element is a placeholder for the group nid and it ensures that the tab <strong>only</strong> appears on OG group nodes.") .'</p>';
   }
   
@@ -1561 +1569 @@
 function og_node_delete_group_form(&$form) {
   $options[] = t('Do nothing.');
-  $options[] = t('Delete all group posts which don\'t also belong to another group.');
+  $options[] = t("Delete all group posts which don't also belong to another group.");
   if (user_access('administer nodes')) {
     $options[] = t('Move all group posts to the group listed below.');
@@ -1570 +1578 @@
     unset($options[$form['nid']['#value']]);
     $form['target'] = array('#type' => 'select', '#title' => t('Target group'), '#default_value' => 0, '#options' => $options, '#weight' => 0, '#description' => t('If you chose <b>Move all group posts</b> above, specify a destination group.'));
-    // register a submit handler
-    $form['#submit']['og_node_delete_confirm_submit'] = array();
-  }
+  }
+  // register a submit handler
+  $form['#submit']['og_node_delete_confirm_submit'] = array();
   $form['actions']['submit']['#value'] = t('Delete group');
 }
@@ -1596 +1604 @@
 }
 
-// submit handler for node delete form. handles deletes to group nodes
+// Submit handler for node delete form. handles deletes to group nodes.
 function og_node_delete_confirm_submit($form_id, $form_values) {
   $deleted_group_nid = $form_values['nid'];
@@ -1606 +1614 @@
     unset($node->og_groups[$deleted_group_nid]);
     if ($move_children) {
-      // there is an array_unique() in og_save_ancestry which giards against duplicates so don't worry here.
-      $node->og_groups[] = $target_group_nid;
+      // There is an array_unique() in og_save_ancestry() which guards against duplicates so don't worry here.
+      $node->og_groups[$target_group_nid] = $target_group_nid;
     }
     if ($delete_orphans && count($node->og_groups) == 0) {
@@ -1738 +1746 @@
   }
   
-  // show read only item if we are non-admin, and in simple mode (i.e. non-checkboxes) and at least one group is in querystring
+  // Show read only item if we are non-admin, and in simple mode (i.e. non-checkboxes) and at least one group is in querystring
   $simple = !user_access('administer organic groups') && !variable_get('og_audience_checkboxes', TRUE) && count($gids);
   
@@ -1775 +1783 @@
     if (count($groups)) {
       foreach ($groups as $gid) {
-        $titles[] = $options[$gid];
+        $titles[] = check_plain($options[$gid]);
         $item_value = implode(', ', $titles);
       }
@@ -1809 +1817 @@
 }
 
-function og_comment($comment, $op) {
-  switch ($op) {
-    case 'publish':
-      $comment = (array) $comment;
-      // fall through
-    case 'insert':
-      $skip_notification = FALSE; 
-      // Any module that returns true from its hook_og_notify($node) will prevent sending notifications.
-      // og2list uses this to send its own notifications instead for mailing list content.
-      $node = node_load($comment['nid']);
-
-      foreach(module_implements('og_notify') as $module) {
-        if (module_invoke($module, 'og_notify', $node)) {
-          $skip_notification = TRUE;
-          break;
-        }
-      }
-      // remove the perm check after 5.3 is released.
-      if ($comment['status'] == COMMENT_PUBLISHED && !$skip_notification && og_is_mail_type($node->type) && isset($node->og_groups) && !empty($node->og_groups)) {
-        if (module_exists('job_queue')) {
-          $description = t('OG: notify group members about comment %id on !link', array('%id' => $comment['cid'], '!link' => l($node->title, "node/$node->nid", NULL, NULL, 'comment-'. $comment['cid'])));
-          job_queue_add('og_mail', $description, array('comment', $comment['cid']));
-        }
-        else {
-          og_mail('comment', (object)$comment);
-        }
-      }
-      break;
-  }  
-}
-
-
-/**
- * Send this node/comment via email to all email members. Called from og_nodeapi() and og_comment().
- * Sometimes called from during cron if job_queue.module is enabled (recommended).
- * TODO: this function is a bit messy. rethink.
- *
- * @param $type
- *   the object type: node or comment
- * @param $id
- *   a node or comment object. if a non object is supplied, a load() operation is performed.
- * @return
- *   none
- */
-function og_mail($type, $obj) {
-  if ($type == 'comment') {
-    if (!is_object($obj)) {
-      $obj = _comment_load($obj);
-    }
-    // registered user
-    if ($obj->uid) {
-      $account = user_load(array('uid' => $obj->uid));
-      $obj->name = $account->name;
-    }
-    else {
-      $obj->name = variable_get('anonymous', 'Anonymous');
-    }
-    $rendered = check_markup($obj->comment, $obj->format, FALSE);
-    
-    $obj->body = $rendered;
-    $obj->teaser = $rendered;
-    $originalurl = url("node/$obj->nid", NULL, "comment-$obj->cid", TRUE);
-    $replyurl = url("comment/reply/$obj->nid/$obj->cid", NULL, NULL, TRUE);
-    $node = node_load($obj->nid);
-    $obj->og_groups = $node->og_groups;
-    $obj->title = $node->title;
-    $obj->msgid = $obj->nid. '-'. $obj->cid. og_msgid_server();
-    $reply = $obj->nid. '-';
-    if ($obj->pid) {
-      $reply .= $obj->pid;
-    }
-    else {
-      $reply .= '0';
-    }
-    $obj->in_reply_to .= $reply. og_msgid_server();
-    $type_friendly = 'comment';
-  }
-  else {
-    if (!is_object($obj)) {
-      $obj = node_load($obj);
-    }
-    $account = user_load(array('uid' => $obj->uid));
-    $obj->name = $account->name;
-    $obj->subject = $obj->title;
-    // These calls to og_node_view() setup the node body and teaser, apply the
-    // appropriate input filters, and handle CCK fields, event fields, etc.
-    $obj->body = og_node_view($obj, FALSE);
-    $obj->teaser = og_node_view($obj, TRUE);
-    $obj->msgid = $obj->nid. '-0'. og_msgid_server();
-    $originalurl = url("node/$obj->nid", NULL, NULL, TRUE);
-    $replyurl = url("comment/reply/$obj->nid", NULL, 'comment-form', TRUE);
-    $type_friendly = node_get_types('name', $obj);
-  }
-  
-  // set email from variables
-  $variables = array(
-    '@user_mail' => $account->mail ? $account->mail : variable_get("site_mail", ini_get("sendmail_from")),
-    '@user_name' => mime_header_encode($obj->name),
-    '@site_mail' => variable_get("site_mail", ini_get("sendmail_from")),
-    '@site_name' => mime_header_encode(variable_get("site_name", 'Drupal')),
-  );
-  $from_mail = strtr(variable_get("og_email_notification_pattern", '@user_name  <@site_mail>'), $variables); 
-
-  $headers = array('X-Mailer' => 'Drupal - og_mail', 'Precedence' => 'list', 'Message-Id' => "<$obj->msgid>");
-  if ($obj->in_reply_to) {
-    $headers['In-Reply-To'] =  "<$obj->in_reply_to>";
-  }
-
-  // set email body variables
-  $variables = array(
-    '@site' => variable_get('site_name', 'drupal'), 
-    '!read_more' => $obj->readmore ? t('Read more') : t('View original'),
-    '!content_url' => $originalurl,
-    '!reply_url' => $replyurl,
-    '@title' => trim($obj->title),
-    '@subject' => trim($obj->subject),
-    '@node_full' => trim(og_mail_output($obj->body)),
-    '@node_teaser' => trim(og_mail_output($obj->teaser)),
-    '@username' => $obj->name
-  );
-  
-  // Send email to selective subscribers and global subscribers.
-  // We use if() here in case node/comment no longer has any groups (i.e. this function can be called from cron).
-  if (is_array($obj->og_groups) && !empty($obj->og_groups)) {
-    $groups = implode(', ', $obj->og_groups);
-    // tricky query here. mysql returns NULL in the case of NULL != 0 so i rework this for 2 positive statements about og_email field
-    // ORDER BY favors newer groups to help them get ramped up. Thus, they are perceived as active.
-    $sql = "SELECT u.mail, ou.nid AS gid, n.title AS group_name, n.uid AS group_uid, u.name AS group_owner, oug.og_email 
-            FROM {og_uid} ou INNER JOIN {users} u ON ou.uid=u.uid 
-            INNER JOIN {og_uid_global} oug ON ou.uid=oug.uid 
-            INNER JOIN {node} n ON ou.nid=n.nid 
-            WHERE ou.nid IN ($groups) AND (
-              (oug.og_email = %d AND ou.mail_type=1) OR
-              (oug.og_email = %d)
-              ) AND u.status = 1 AND u.mail != '' AND ou.is_active = 1 
-              ORDER by u.mail DESC, n.created DESC
-              ";
-    $result = db_query($sql, OG_NOTIFICATION_SELECTIVE, OG_NOTIFICATION_ALWAYS);
-    $last_mail = '';
-    while ($row = db_fetch_object($result)) {
-      // only notify each user once. we used to do this with GROUP BY but got very hard to assure that all the selected fields came from same record.
-      if ($row->mail == $last_mail) {
-        continue;
-      }
-      $last_mail = $row->mail;
-      
-      // TODO: add node_access('view') call here in case node is moderated or other.
-      // Hopefully D6 will avert need to impersonate.
-      // Append these group specific variables.
-      $variables['@group'] = $row->group_name;
-      $variables['!group_url'] = url("og/manage/$row->gid", NULL, NULL, TRUE);
-      $variables['@type'] = $type_friendly;
-
-      $unsubscribe = url("og/manage/$row->gid", NULL, NULL, TRUE);
-      $ownerurl = url("user/$row->group_uid", NULL, NULL, TRUE);
-      $group_home = url("node/$row->gid", NULL, NULL, TRUE);
-      $groupheaders = $headers + array(
-        'List-Id' => mime_header_encode($row->group_name). " <$group_home>", 
-        'List-Unsubscribe' => "<$unsubscribe>", 
-        'List-Owner' => mime_header_encode($row->group_owner). " <$ownerurl>", 
-        "List-Archive" => "<$group_home>"
-      );
-      drupal_mail('og_mail', $row->mail, _og_user_mail_text('og_new_node_subject', $variables), _og_user_mail_text('og_new_node_body', $variables), $from_mail, $groupheaders);
-    }
-  }
-}
-
 /**
  * Similar to node_view() but without calling theme('node').
  *
  * This is needed to get the proper body or teaser for nodes (e.g. Event,
- * Location, CCK node types) and to clean up the body for use in email
- * notifications.
+ * Location, CCK node types) and to clean up the body for use in notifications.
  *
  * @param $node
@@ -2013 +1853 @@
 }
 
-// 2 functions ripped from mail.inc in project.module package
-function og_mail_urls($url = 0) {
-  static $urls = array();
-  if ($url) {
-    $urls[] = strpos($url, '://') ? $url : url($url, NULL, NULL, 1);
-    return count($urls);
-  }
-  return $urls;
-}
-
-// takes filtered HTML as input and transforms for email
-// modified from project.module 
-function og_mail_output($body, $html = TRUE) {
-  static $i = 0;
-
-  if ($html) {
-    $pattern = '@<a +([^ >]+ )*?href *= *"([^>"]+?)"[^>]*>([^<]+?)</a>@ei';
-    $body = preg_replace($pattern, "'\\3 ['. og_mail_urls('\\2') .']'", $body);
-    $urls = og_mail_urls();
-    if (count($urls)) {
-      $body .= "\n";
-      for ($max = count($urls); $i < $max; $i++) {
-        $body .= '['. ($i + 1) .'] '. $urls[$i] ."\n";
-      }
-    }
-
-    $body = preg_replace('!</?blockquote>!i', '"', $body);
-    $body = preg_replace('!</?(em|i)>!i', '/', $body);
-    $body = preg_replace('!</?(b|strong)>!i', '*', $body);
-    $body = preg_replace("@<br />(?!\n)@i", "\n", $body);
-    $body = preg_replace("@</p.*>(?!\n\n)@i", "\n\n", $body);
-    $body = preg_replace("@</h1>(?!\n\n)@i", " #\n", $body);
-    $body = preg_replace("@</h2>(?!\n\n)@i", " ##\n", $body);
-    $body = preg_replace("@</h3>(?!\n\n)@i", " ###\n", $body);
-    $body = preg_replace("@</h4>(?!\n\n)@i", " ####\n", $body);
-    $body = preg_replace("@</(li|dd)>\n?@i", "\n", $body);
-    $body = preg_replace("@<h1.*>@i", "\n\n# ", $body);
-    $body = preg_replace("@<h2.*>@i", "\n\n## ", $body);
-    $body = preg_replace("@<h3.*>@i", "\n\n### ", $body);
-    $body = preg_replace("@<h4.*>@i", "\n\n#### ", $body);
-    $body = preg_replace("@<li.*>@i", "* ", $body);
-    $body = strip_tags($body);
-    $body = decode_entities($body);
-    $body = wordwrap($body, 72);
-  }
-  else {
-    $body = decode_entities($body);
-  }
-  return $body;
-}
-
-/**
- * Define all OG emails
+/**
+ * Define all OG message strings.
  * Modelled after Drupal's user.module
  */
@@ -2079 +1868 @@
         return t("@group: '@title' at @site", $variables);
       case 'og_new_node_body':
-        return t("@type '@subject' by @username\n\n@node_teaser\n\n!read_more: !content_url\nPost reply: !reply_url\n\n--\nYou are subscribed from the group '@group' at @site.\nTo manage your subscription, visit !group_url", $variables);    
+        return t("@type '@subject' by @username\n\n@node_teaser\n\n!read_more: !content_url\nPost reply: !reply_url\n\n--\nYou are subscribed from the group '@group' at @site.\nTo manage your subscription, visit !group_url.", $variables);    
       case 'og_admin_email_body':
-        return t("@body\n\n--\nThis message was sent by an administrator in the '@group' group at @site. To visit this group, browse to !url_group. To unsubscribe from this group, visit !url_unsubscribe", $variables);
+        return t("@body\n\n--\nThis message was sent by an administrator in the '@group' group at @site. To visit this group, browse to !url_group. To unsubscribe from this group, visit !url_unsubscribe.", $variables);
       case 'og_approve_user_subject':
         return t("Membership request approved for '@title'", $variables);
       case 'og_approve_user_body':
-        return t("You may now post messages in this group located at !group_url", $variables);
+        return t("You may now post messages in this group located at !group_url.", $variables);
       case 'og_deny_user_subject':
-        return t("Membership request denied for '@title'", $variables);
+        return t("Membership request denied for '@title'.", $variables);
       case 'og_deny_user_body':
         return t("Sorry, your membership request was denied.", $variables);
       case 'og_invite_user_subject':
-        return t("Invitation to join the group '@group' at @site", $variables);
+        return t("Invitation to join the group '@group' at @site.", $variables);
       case 'og_invite_user_body':
         return t("Hi. I'm a member of '@group' and I welcome you to join this group as well. Please see the link and message below.\n\n@group\n@description\nJoin: !group_url\n@body", $variables);
       case 'og_request_user_subject':
-        return t("Membership request for '@group' from '@username'", $variables);        
+        return t("Membership request for '@group' from '@username'.", $variables);        
       case 'og_request_user_body':
         return t("To instantly approve this request, visit !approve_url.\nYou may deny this request or manage members at !group_url.", $variables);       
       case 'og_new_admin_subject':
-        return t("You are now an administrator for the group '@group'", $variables);        
+        return t("You are now an administrator for the group '@group'.", $variables);        
       case 'og_new_admin_body':
         return t("@username, you are now an administrator for the group '@group'.\n\nYou can administer this group by logging in here:\n !group_url", $variables);       
@@ -2122 +1911 @@
  */
 function og_is_node_admin($node) {
-  return node_access('update', $node);
+  global $user;
+  return og_is_group_type($node->type) && (user_access('administer nodes') || !empty($user->og_groups[$node->nid]['is_admin']));
 }
 
@@ -2161 +1951 @@
       }
       return $form;
-    case 'form':
-      if ($category == 'account' && !empty($account->og_groups)) {
-        $form['og_settings'] = array(
-          '#type' => 'fieldset',
-          '#title' => t('Organic groups settings'),
-          '#collapsible' => TRUE,
-          '#weight' => 4);
-        $options = array(OG_NOTIFICATION_NEVER => t('Never send email notifications. Useful when tracking activity via RSS feed instead.'),
-                         OG_NOTIFICATION_ALWAYS =>  t('Always send email notifications'),
-                         OG_NOTIFICATION_SELECTIVE =>   t('Selectively send email notification based on the checkbox for each of my group\'s <em>My Membership</em> page'),
-                          );
-                         
-        $form['og_settings']['og_email'] = array('#type' => 'radios', 
-                                            '#title' => t('Email notifications'), 
-                                            '#options' => $options, 
-                                            '#default_value' => isset($account->og_email) ? $account->og_email : variable_get('og_notification', 2),
-                                            '#description' => t('When posts are submitted into your groups, you may be notified via email.'),
-                                            );
-        return $form;
-      }
-      break;
     case 'insert':
       if (is_array($edit['og_register'])) {
@@ -2192 +1961 @@
       }
       
-      $sql = 'INSERT INTO {og_uid_global} (uid, og_email) VALUES (%d, %d)';
-      db_query($sql, $account->uid, variable_get('og_notification', OG_NOTIFICATION_ALWAYS));
-      $account->og_email = NULL;
-      break;
-    case 'update':
-      if (isset($edit['og_email'])) {
-        $sql = 'UPDATE {og_uid_global} SET og_email=%d WHERE uid=%d';
-        db_query($sql, $edit['og_email'], $account->uid);
-        $account->og_email = NULL;
-      }
       break;
     case 'delete':
-      // user delete doesn't exist, but it should and will one day.
-      $sql = 'DELETE FROM {og_uid_global} WHERE uid=%d';
-      db_query($sql, $account->uid);
-
       $sql = 'DELETE FROM {og_uid} WHERE uid=%d';
       db_query($sql, $account->uid);
@@ -2213 +1968 @@
     case 'load':
       $account->og_groups = og_get_subscriptions($account->uid);
-
-      $result = db_query("SELECT og_email FROM {og_uid_global} WHERE uid = %d", $account->uid);
-      if (db_num_rows($result)) {
-        $account->og_email = db_result($result);
-      }
       break;
     case 'view':
@@ -2251 +2001 @@
  */
 function og_node_type($op, $info) {
-  $values = variable_get($variable, array());
   switch ($op) {
     case 'delete':
@@ -2267 +2016 @@
     'group' => t('Group node'),
     'omitted' => t('May not be posted into a group.'),
-    'group_post_standard_mail' => t('Standard group post (typically only author may edit). Sends email notifications.'),
-    'group_post_standard_nomail' => t('Standard group post (typically only author may edit). No email notification.'),
+    'group_post_standard' => t('Standard group post (typically only author may edit).')
   );
   
   if (module_exists('og_access')) {
-    $usages['group_post_wiki_mail'] = t('Wiki group post (any group member may edit). Sends email notifications.');
-    $usages['group_post_wiki_nomail'] = t('Wiki group post (any group member may edit). No email notification.');
+    $usages['group_post_wiki'] = t('Wiki group post (any group member may edit).');
   }
   
@@ -2296 +2043 @@
 }
 
-// returns TRUE if node type should generate email notifications when posted to a group.
-function og_is_mail_type($type) {
-  $usage = variable_get('og_content_type_usage_'. $type, 'omitted');
-  return strpos($usage, 'mail') && !strpos($usage, 'nomail') ? TRUE : FALSE;
-}
-
 // returns TRUE if node type lets all subscribers edit the node.
 function og_is_wiki_type($type) {
@@ -2336 +2077 @@
   header("HTTP/1.1 301 Moved Permanently");
   header('Location: '. url("node/$gid/feed", NULL, NULL, TRUE));
+}
+
+/**
+ * Check a user's membership in a group. Site admins always return TRUE.
+ */
+function og_is_group_member($gid, $user) {
+  $groups = array_keys($user->og_groups);
+  return user_access('administer nodes') || in_array($gid, $groups) ? TRUE : FALSE;
 }
 
@@ -2422 +2171 @@
     // only members can see this block
     if (in_array($groupnode->nid, array_keys($user->og_groups))) {
-      $content = t('This group offers a !groupfeed and an !email.', array('!groupfeed' => l(t('RSS feed'), "node/$groupnode->nid/feed"), '!email' => l(t('email subscription'), 'og/manage/'. $groupnode->nid)));
+      $content = t('This group offers a !groupfeed and a !subscription.', array('!groupfeed' => l(t('RSS feed'), "node/$groupnode->nid/feed"), '!subscription' => l(t('subscription option'), 'og/manage/'. $groupnode->nid)));
       if (module_exists('views') && module_exists('views_rss')) {
         // NOTE: See og.css for styling specific to these lists
-        $content .= t(' Or subscribe to these personalized, sitewide feeds:');
+        $content .= ' '. t('Or subscribe to these personalized, sitewide feeds:');
         $inline = array('class' => 'links inline');      
-        $l1[] = array('title' => t('feed'), 'href' => 'group/myunread/feed');
-        $l1[] = array('title' => t('page'), 'href' => 'group/myunread');
-        $links['my_unread'] = t('my unread: '). theme('links', $l1, $inline);
+        $l1[] = array('title' => t('Feed'), 'href' => 'group/myunread/feed');
+        $l1[] = array('title' => t('Page'), 'href' => 'group/myunread');
+        $links['my_unread'] = t('My unread:') .' '. theme('links', $l1, $inline);
       
-        $l2[] = array('title' => t('feed'), 'href' => 'group/mytracker/feed');
-        $l2[] = array('title' => t('page'), 'href' => 'group/mytracker');
-        $links['my_group'] = t('my group: '). theme('links', $l2, $inline);
+        $l2[] = array('title' => t('Feed'), 'href' => 'group/mytracker/feed');
+        $l2[] = array('title' => t('Page'), 'href' => 'group/mytracker');
+        $links['my_group'] = t('My group:') .' '. theme('links', $l2, $inline);
       
-        $l3[] = array('title' => t('feed'), 'href' => 'group/tracker/feed');
-        $l3[] = array('title' => t('page'), 'href' => 'group/tracker');
-        $links['all_posts'] = array('data' => t('all posts: '). theme('links', $l3, $inline));
+        $l3[] = array('title' => t('Feed'), 'href' => 'group/tracker/feed');
+        $l3[] = array('title' => t('Page'), 'href' => 'group/tracker');
+        $links['all_posts'] = array('data' => t('All posts:') .' '. theme('links', $l3, $inline));
         $content .= theme('item_list', $links);
       }
@@ -2511 +2260 @@
  *   An HTML list.
  **/
-function og_block_subscribers_list($gid, $max = 10, $is_admin = array('members', 'admin'), $show_more = TRUE, $show_picture = NULL) {
+function og_block_subscribers_list($gid, $max = 10, $is_admin = array('members', 'admins'), $show_more = TRUE, $show_picture = NULL) {
   $placeholders = array_fill(0, count(array_filter($is_admin)), '%d');
   $placeholders = implode(', ', $placeholders);
@@ -2585 +2334 @@
     }
     $links['subscribers'] = $txt;
-    $links['manager'] =  t('Manager: '). theme('username', $node);
+    $links['manager'] =  t('Manager:') .' '. theme('username', $node);
     $subscribe = isset($subscription) ? l(t('My membership'), "og/manage/$node->nid") : og_subscribe_link($node);
     if(isset($subscribe)) {
@@ -2696 +2445 @@
   return $form;
 }
+
 function og_admin_settings() {
   drupal_set_title(t('Organic groups configuration'));
@@ -2722 +2472 @@
   $form['og_settings']['group_details'] = array('#type' => 'fieldset', '#title' => t('Group details'), '#collapsible' => TRUE, '#collapsed' => TRUE);
   // groups directory visibility
-  $options = array(t('New groups don\'t appear in the groups directory. Administrators control the directory exclusively.'),
+  $options = array(t("New groups don't appear in the groups directory. Administrators control the directory exclusively."),
               t('New groups always appear in the groups directory.'),
               t('Group creator chooses whether her group appears in the directory. Defaults to %in.', array('%in' => t('in directory'))),
@@ -2730 +2480 @@
   
   // groups registration visibility
-  $options = array(t('New groups don\'t appear on the registration form. Administrators control the form exclusively.'),
+  $options = array(t("New groups don't appear on the registration form. Administrators control the form exclusively."),
               t('New groups always appear on the registration form.'),
               t('Group creator chooses whether her group appears on the registration form. Defaults to %in.', array('%in' => t('on form'))),
@@ -2737 +2487 @@
   $form['og_settings']['group_details']['og_visibility_registration'] = array('#type' => 'radios', '#title' => t('Registration form control'), '#default_value' => variable_get('og_visibility_registration', OG_REGISTRATION_CHOOSE_FALSE), '#description' =>t('OG admins always see the checkbox for adding a group to the %dir. Note that changing this setting has no effect on existing posts. Re-save those posts to acquire this new setting.', array('%dir' => t('registration form'))), '#options' => $options);
 
-  // email notifications default
-  $options = array(OG_NOTIFICATION_SELECTIVE => t('New members are not subscribed to group email notifications by default. A member may choose to enable this from her profile page or her My membership page.'),
-              OG_NOTIFICATION_ALWAYS => t('New members are subscribed to group email notifications by default. A member may choose to disable this from her profile page.'),
-              );
-  $form['og_settings']['group_details']['og_notification'] = array('#type' => 'radios', '#title' => t('Group email notifications'), '#default_value' => variable_get('og_notification', OG_NOTIFICATION_ALWAYS), '#description' =>t('Should new members automatically be notified via email when new content is posted to their group? Note that changing this setting has no effect on existing members.'), '#options' => $options);
-  
   // audience checkboxes
   $form['og_settings']['group_details']['og_audience_checkboxes'] = array('#type' => 'checkbox', '#title' => t('Audience checkboxes'), '#default_value' => variable_get('og_audience_checkboxes', TRUE), '#description' => t('Show each group that the user is a member of as a checkbox in the Audience section. This enables the member to place her post into multiple groups. If unchecked, simplify the user interface by omitting the checkboxes and assuming user wants to post into the current group. This simplification only applies to new nodes, and not to edits of existing nodes. Group administrators always see checkboxes.'));
@@ -2758 +2502 @@
   $form['og_settings']['group_details']['og_member_pics'] = array('#type' => 'checkbox', '#title' => t('Member pictures'), '#default_value' => variable_get('og_member_pics', TRUE), '#description' => t('Should member pictures be shown on the members page, the group members block, and group details block? You must also enable pictures in !user.', array('!user' => l(t('User configuration'), 'admin/user/settings'))));
 
-  $form['og_settings']['email'] = array('#type' => 'fieldset', '#title' => t('Email settings'), '#collapsible' => TRUE, '#collapsed' => TRUE);
-
-  $form['og_settings']['email']['og_email_notification_pattern'] = array(
+  // Messages fieldset.
+  $form['og_settings']['notifications'] = array(
+    '#type' => 'fieldset',
+    '#title' => t('Messaging & Notifications'),
+    '#collapsible' => TRUE,
+    '#collapsed' => TRUE
+  );
+  $form['og_settings']['notifications']['og_email_notification_pattern'] = array(
     '#type' => 'textfield',
     '#title' => t('Format of From: field'),
@@ -2766 +2515 @@
     '#description' => t('Specify the format of the "From:" field on outgoing notifications. Available variables: @user_mail, @user_name, @site_mail, @site_name. Note that the @user_mail token reveals the author\'s email address. If the admin email examples above appear blank, you need to set your site email in the Site Configuration panel.'),
   );
-  $form['og_settings']['email']['og_new_node_subject'] = array('#type' => 'textfield', '#title' => t('New content subject'), '#description' => 'Subject of email for new content. Available variables: @group, !group_url, @type, @site, !content_url, !reply_url, @title, @subject, @node_full, @node_teaser, @username. %subject contains the comment title in the case of a comment but the node title in the case of a new post. @title is always the node title.', '#default_value' => _og_user_mail_text('og_new_node_subject'));
-  $form['og_settings']['email']['og_new_node_body'] = array('#type' => 'textarea', '#title' => t('New content body'), '#rows' => 10, '#description' => 'Body of email for new content. Available variables: @group, !group_url, @type, @site, !content_url, !reply_url, @title, @subject, @node_full, @node_teaser, @username. @subject contains the comment title in the case of a comment but the node title in the case of a new post. %title is always the node title.', '#default_value' => _og_user_mail_text('og_new_node_body'));
-  $form['og_settings']['email']['og_admin_email_body'] = array('#type' => 'textarea', '#title' => t('Group admin email body'), '#rows' => 10, '#description' => 'The body of the email sent to users from the group admin. Available variables: @group, @body, @site, !url_group, !url_unsubscribe', '#default_value' => _og_user_mail_text('og_admin_email_body'));
-  $form['og_settings']['email']['og_approve_user_subject'] = array('#type' => 'textfield', '#title' => t('User approved email subject'), '#description' => 'The subject of the email sent to new approved members. Available variables: !group_url, @title', '#default_value' => _og_user_mail_text('og_approve_user_subject'));
-  $form['og_settings']['email']['og_approve_user_body'] = array('#type' => 'textarea', '#title' => t('User approved email body'), '#rows' => 10, '#description' => 'The body of the email sent to new approved members. Available variables: !group_url, @title', '#default_value' => _og_user_mail_text('og_approve_user_body'));   
-  $form['og_settings']['email']['og_deny_user_subject'] = array('#type' => 'textfield', '#title' => t('User denied email subject'), '#description' => 'The subject of the email sent to denied users. Available variables: !group_url, @title', '#default_value' => _og_user_mail_text('og_deny_user_subject'));
-  $form['og_settings']['email']['og_deny_user_body'] = array('#type' => 'textarea', '#title' => t('User denied email body'), '#rows' => 10, '#description' => 'The body of the email sent to denied users. Available variables: !group_url, @title', '#default_value' => _og_user_mail_text('og_deny_user_body'));   
-  $form['og_settings']['email']['og_invite_user_subject'] = array('#type' => 'textfield', '#title' => t('Invite user email subject'), '#description' => 'The subject of the email sent to users invited to join a group. Available variables: @group, @site, @description, !group_url, @body', '#default_value' => _og_user_mail_text('og_invite_user_subject'));
-  $form['og_settings']['email']['og_invite_user_body'] = array('#type' => 'textarea', '#title' => t('Invite user email body'), '#rows' => 10, '#description' => 'The body of the email sent to users invited to join a group. Available variables: @group, @site, @description, !group_url, @body', '#default_value' => _og_user_mail_text('og_invite_user_body'));   
-  $form['og_settings']['email']['og_request_user_subject'] = array('#type' => 'textfield', '#title' => t('Request user email subject'), '#description' => 'The subject of the email sent to a user\'s request to join a group. Available variables: @group, @username, !approve_url, !group_url', '#default_value' => _og_user_mail_text('og_request_user_subject'));
-  $form['og_settings']['email']['og_request_user_body'] = array('#type' => 'textarea', '#title' => t('Request user email body'), '#rows' => 10, '#description' => 'The body of the email sent to a user\'s request to join a group. Available variables: @group, @username, !approve_url, !group_url', '#default_value' => _og_user_mail_text('og_request_user_body'));
-  $form['og_settings']['email']['og_new_admin_subject'] = array('#type' => 'textfield', '#title' => t('New admin user email subject'), '#description' => 'The subject of the email sent to a new admin for a group. Available variables: @group, @username, !group_url', '#default_value' => _og_user_mail_text('og_new_admin_subject'));
-  $form['og_settings']['email']['og_new_admin_body'] = array('#type' => 'textarea', '#title' => t('New admin user email body'), '#rows' => 10, '#description' => 'The body of the email sent to a new admin for a group. Available variables: @group, @username, !group_url, !invite_url', '#default_value' => _og_user_mail_text('og_new_admin_body'));
+  $form['og_settings']['notifications']['og_new_node_subject'] = array(
+    '#type' => 'textfield',
+    '#title' => t('New content subject'),
+    '#description' => t('Subject of notification message for new content. Available variables: @group, !group_url, @type, @site, !content_url, !reply_url, @title, @subject, @node_full, @node_teaser, @username. %subject contains the comment title in the case of a comment but the node title in the case of a new post. @title is always the node title.'),
+    '#default_value' => _og_user_mail_text('og_new_node_subject')
+  );
+  $form['og_settings']['notifications']['og_new_node_body'] = array(
+    '#type' => 'textarea',
+    '#title' => t('New content body'),
+    '#rows' => 10,
+    '#description' => t('Body of the notification for new content. Available variables: @group, !group_url, @type, @site, !content_url, !reply_url, @title, @subject, @node_full, @node_teaser, @username. @subject contains the comment title in the case of a comment but the node title in the case of a new post. %title is always the node title.'),
+    '#default_value' => _og_user_mail_text('og_new_node_body')
+  );
+  $form['og_settings']['notifications']['og_admin_email_body'] = array(
+    '#type' => 'textarea',
+    '#title' => t('Group admin notification body'),
+    '#rows' => 10,
+    '#description' => t('The body of the message sent to users from the group admin. Available variables: @group, @body, @site, !url_group, !url_unsubscribe'),
+    '#default_value' => _og_user_mail_text('og_admin_email_body')
+  );
+  $form['og_settings']['notifications']['og_approve_user_subject'] = array(
+    '#type' => 'textfield',
+    '#title' => t('User approved notification subject'),
+    '#description' => t('The subject of the message sent to new approved members. Available variables: !group_url, @title'),
+    '#default_value' => _og_user_mail_text('og_approve_user_subject')
+  );
+  $form['og_settings']['notifications']['og_approve_user_body'] = array(
+    '#type' => 'textarea',
+    '#title' => t('User approved notification body'),
+    '#rows' => 10,
+    '#description' => t('The body of the message sent to new approved members. Available variables: !group_url, @title'),
+    '#default_value' => _og_user_mail_text('og_approve_user_body')
+  );   
+  $form['og_settings']['notifications']['og_deny_user_subject'] = array(
+    '#type' => 'textfield',
+    '#title' => t('User denied notification subject'),
+    '#description' => t('The subject of the message sent to denied users. Available variables: !group_url, @title'),
+    '#default_value' => _og_user_mail_text('og_deny_user_subject')
+  );
+  $form['og_settings']['notifications']['og_deny_user_body'] = array(
+    '#type' => 'textarea',
+    '#title' => t('User denied notification body'),
+    '#rows' => 10,
+    '#description' => t('The body of the message sent to denied users. Available variables: !group_url, @title'),
+    '#default_value' => _og_user_mail_text('og_deny_user_body')
+  );   
+  $form['og_settings']['notifications']['og_invite_user_subject'] = array(
+    '#type' => 'textfield',
+    '#title' => t('Invite user notification subject'),
+    '#description' => t('The subject of the message sent to users invited to join a group. Available variables: @group, @site, @description, !group_url, @body'),
+    '#default_value' => _og_user_mail_text('og_invite_user_subject')
+  );
+  $form['og_settings']['notifications']['og_invite_user_body'] = array(
+    '#type' => 'textarea',
+    '#title' => t('Invite user notification body'),
+    '#rows' => 10,
+    '#description' => t('The body of the message sent to users invited to join a group. Available variables: @group, @site, @description, !group_url, @body'),
+    '#default_value' => _og_user_mail_text('og_invite_user_body')
+  );   
+  $form['og_settings']['notifications']['og_request_user_subject'] = array(
+    '#type' => 'textfield',
+    '#title' => t('Request user notification subject'),
+    '#description' => t("The subject of the message sent to a user's request to join a group. Available variables: @group, @username, !approve_url, !group_url"),
+    '#default_value' => _og_user_mail_text('og_request_user_subject')
+  );
+  $form['og_settings']['notifications']['og_request_user_body'] = array(
+    '#type' => 'textarea',
+    '#title' => t('Request user notification body'),
+    '#rows' => 10,
+    '#description' => t("The body of the message sent to a user's request to join a group. Available variables: @group, @username, !approve_url, !group_url"),
+    '#default_value' => _og_user_mail_text('og_request_user_body')
+  );
+  $form['og_settings']['notifications']['og_new_admin_subject'] = array(
+    '#type' => 'textfield',
+    '#title' => t('New admin user notification subject'),
+    '#description' => t('The subject of the message sent to a new admin for a group. Available variables: @group, @username, !group_url'),
+    '#default_value' => _og_user_mail_text('og_new_admin_subject')
+  );
+  $form['og_settings']['notifications']['og_new_admin_body'] = array(
+    '#type' => 'textarea',
+    '#title' => t('New admin user notification body'),
+    '#rows' => 10,
+    '#description' => t('The body of the message sent to a new admin for a group. Available variables: @group, @username, !group_url, !invite_url'),
+    '#default_value' => _og_user_mail_text('og_new_admin_body')
+  );
 
   return system_settings_form($form);
@@ -2828 +2649 @@
       'og_xmlrpc_subscribe_user',
       array('struct', 'string', 'string', 'int', 'int'),
-      t('Add a user to a group')),
+      t('Add a user to a group.')),
     array(
       'og.getAllSubscribers',
@@ -2886 +2707 @@
   switch ($type) {
     case 'node':
+      // Set some defaults.
+      $values['ogname'] = '';
+      $values['ogname-raw'] = '';
+      $values['og-id'] = '';
+
       if (is_array($object->og_groups)) {
         $gids = array_filter($object->og_groups);
@@ -2895 +2721 @@
           break;
         }
-        return $values;
-      }
-      break;    
-  }
-  
-  // No group info found. Return defaults.
-  $values['ogname'] = '';
-  $values['ogname-raw'] = '';
-  $values['og-id'] = '';
-  return $values;
+      }
+      return $values;
+  }
+
+  return;
 }
 
@@ -2919 +2740 @@
     $query['where'] =  'oga.group_nid = '. $args['og_nid'];
     return $query;
-  }
-}
-
-// A hook from replies.module. Return TRUE if og is handling the notification to a given recipient on a given reply
-function og_replies_mine($comment, $recipient) {
-  $node = node_load($comment->nid);
-  // check each group that this node is in
-  foreach ((array)$node->og_groups as $gid) {
-    // check if recipient is an active member
-    if (isset($recipient->og_groups[$gid]) && $recipient->og_groups[$gid]['is_active']) {
-      // check if user is already getting this group notification
-      if ($recipient->og_email || $recipient->og_groups[$gid]['mail_type']) {
-        return TRUE;
-      }
-    }
   }
 }
@@ -2952 +2758 @@
         }
     
-    if (!module_exists('job_queue')) {
-      $requirements['og_modules']  = array(
-        'title' => $t('Organic groups modules'),
-        'value' => $t('Organic groups works best when !job_queue.module is enabled. See the Integration section of the !readme.', array('!job_queue' => l('job_queue.module', 'http://drupal.org/project/job_queue'), '!readme' => og_readme())),
-        'severity' => REQUIREMENT_INFO
-      );
-    }
-    
     if (!module_exists('og_access')) {
       $requirements['og_access'] = array(
@@ -2994 +2792 @@
   return FALSE;
 }
+
+/**
+ * Access callback: og_notifications (or similar) is required for the broadcast
+ * tab. Override menu item to amend.
+ */
+function og_broadcast_access($node) {
+  return og_is_node_admin($node) && module_exists('og_notifications');
+}

external/current/sites/all/modules/og/og_access.info

@@ -3 +3 @@
 package = "Organic groups"
 dependencies = og
-; Information added by drupal.org packaging script on 2008-05-12
-version = "5.x-7.2"
-project = "og"
-datestamp = "1210629035"
-

external/current/sites/all/modules/og/og_access.module

@@ -1 +1 @@
 <?php
-// $Id: og_access.module,v 1.1.2.10 2008/05/08 19:49:26 weitzman Exp $
+// $Id: og_access.module,v 1.1.2.11 2008/05/26 14:03:35 weitzman Exp $
 
 // visibility states for private groups. site admin chooses in og_access_settings()
@@ -18 +18 @@
     $items[] = array(
       'path' => 'admin/og/og_access',
-      'title' => t('Organic Groups Access configuration'),
+      'title' => t('Organic groups access configuration'),
       'description' => t('Choose whether new groups should be private or public'),
       'callback' => 'drupal_get_form',
@@ -31 +31 @@
   drupal_add_js(drupal_get_path('module', 'og_access'). '/og_access.js'); // load the form javascript to handle private groups / node visibility conflicts in the og access settings form.
   
-  $options = array(t('Visible only within the targeted groups'), t('Visible within the targeted groups and on other pages'), t('Visibility chosen by author/editor using a checkbox on the posting form. '). t('Checkbox defaults to @pub.', array('@pub' => t('Public'))), t('Visibility chosen by author/editor using a checkbox on the posting form. '). t('Checkbox defaults to @pri.', array('@pri' => t('Private'))));
-  $form['og_visibility'] = array('#type' => 'radios', '#title' => t('Visibility of posts'), '#default_value' => variable_get('og_visibility', 0), '#description' =>t('Determine how broadly available a given post should be when it is affiliated with a group. OG admins always see the checkbox for making a post @pub. Note that changing this setting has no effect on existing posts. Re-save those posts to acquire this new setting.  If the setting you want is disabled here, check the settings under <em>Private Groups</em> setting below.  You cannot set node visibility to always be public if private groups are set to always on and vice versa.', array('@pub' => t('Public'))), '#options' => $options);
+  $options = array(t('Visible only within the targeted groups.'), t('Visible within the targeted groups and on other pages.'), t('Visibility chosen by author/editor using a checkbox on the posting form.') .' '. t('Checkbox defaults to @pub.', array('@pub' => t('Public'))), t('Visibility chosen by author/editor using a checkbox on the posting form. '). t('Checkbox defaults to @pri.', array('@pri' => t('Private'))));
+  $form['og_visibility'] = array('#type' => 'radios', '#title' => t('Visibility of posts'), '#default_value' => variable_get('og_visibility', 0), '#description' =>t('Determine how broadly available a given post should be when it is affiliated with a group. OG admins always see the checkbox for making a post @pub. Note that changing this setting has no effect on existing posts. Re-save those posts to acquire this new setting. If the setting you want is disabled here, check the settings under <em>Private Groups</em> setting below. You cannot set node visibility to always be public if private groups are set to always on and vice versa.', array('@pub' => t('Public'))), '#options' => $options);
   
   // private groups control
@@ -45 +45 @@
     '#options' => $options, 
     '#default_value' => variable_get('og_private_groups', OG_PRIVATE_GROUPS_CHOOSE_FALSE),    
-    '#description' =>t("<p>A private group's group home page cannot be seen by non-members, and new posts created in the group will default to being private.  This setting controls what private groups options can be used when creating a new group or editing an existing group.  If you select one of the <em>group administrator chooses</em> options then it will be up to group admins whether their new groups are private or not, with the default you specify here.<p><p>Note that the privacy of all <em>content</em> in the group is determined as each node is created or edited, according to the <em>Node authoring form / Visibility of Posts</em> setting on this page.  Note also that changing this setting only affects the default for new groups being created, not the privacy of any existing groups!  To change those you must edit the groups and their individual content nodes directly.  If the setting you want is disabled here, check <em>Visibility of Posts</em> above.  You cannot choose to only have private groups if node visibility is set to be always public, and vice versa.</p>"),                              
+    '#description' => '<p>'. t("A private group's group home page cannot be seen by non-members, and new posts created in the group will default to being private. This setting controls what private groups options can be used when creating a new group or editing an existing group. If you select one of the <em>group administrator chooses</em> options then it will be up to group admins whether their new groups are private or not, with the default you specify here.") .'<p><p>'. t('Note that the privacy of all <em>content</em> in the group is determined as each node is created or edited, according to the <em>Node authoring form / Visibility of Posts</em> setting on this page. Note also that changing this setting only affects the default for new groups being created, not the privacy of any existing groups! To change those you must edit the groups and their individual content nodes directly. If the setting you want is disabled here, check <em>Visibility of Posts</em> above. You cannot choose to only have private groups if node visibility is set to be always public, and vice versa.') .'</p>',                              
   );
   return system_settings_form($form);
@@ -82 +82 @@
       $form['og_private'] = array (
         '#type' => 'checkbox',
-        '#title' => t('private group'), 
+        '#title' => t('Private group'), 
         '#default_value' => $node->nid ? $node->og_private : $default, 
-        '#description' => t('Should this group be visible only to its members?  Disabled if the group is set to <em>List in Directory</em> or <em>Membership requests: open</em>'));
+        '#description' => t('Should this group be visible only to its members? Disabled if the group is set to <em>List in Directory</em> or <em>Membership requests: open</em>.'));
         break;
   }
@@ -258 +258 @@
 function og_access_node_access_explain($row) {
   if ($row->realm == 'og_public') {
-    return t('All users may view this node.', array('@op' => $op));
+    return t('All users may view this node.');
   }
   elseif ($row->realm == 'og_subscriber') {
     $node = node_load((int)$row->gid);
-    return t('Members of !group_n may view this node.', array('@op' => $op, '!group_n' => l($node->title, "node/$row->gid")));
-  }
-}
+    return t('Members of !group_n may view this node.', array('!group_n' => l($node->title, "node/$row->gid")));
+  }
+}

external/current/sites/all/modules/og/og_panels.info

@@ -4 +4 @@
 package = "Organic groups"
 dependencies = og panels panels_views
-; Information added by drupal.org packaging script on 2008-05-12
-version = "5.x-7.2"
-project = "og"
-datestamp = "1210629035"
-

external/current/sites/all/modules/og/og_panels.install

@@ -1 +1 @@
 <?php
-// $Id: og_panels.install,v 1.1.2.4 2008/03/17 15:04:28 weitzman Exp $
+// $Id: og_panels.install,v 1.1.2.4.2.1 2008/10/31 12:16:14 weitzman Exp $
 
 function og_panels_install() {
@@ -27 +27 @@
         default_page integer NULL,
         show_blocks integer NULL,
-        weight integer(4) NOT NULL DEFAULT 0,
+        weight smallint NOT NULL DEFAULT 0,
         PRIMARY KEY  (did)
       );");

external/current/sites/all/modules/og/og_panels.module

@@ -1 +1 @@
 <?php
-// $Id: og_panels.module,v 1.1.2.30 2008/04/20 17:51:10 weitzman Exp $
+// $Id: og_panels.module,v 1.1.2.32.2.1 2008/10/31 12:12:27 weitzman Exp $
 
 function og_panels_help($section) {
@@ -7 +7 @@
       return t('After enabling this module, visit the new Pages tab on any group. There, group admins may create as many pages as desired for their group. The pages may contain any layout that the site offers and admins may arrange many different types of content as desired. Site admins can restrict the types of content that may be added on the <a href="!settings">og_panels settings</a> page. You might want to make some Views available using <a href="!apv">admin/panels/views</a>. Group admins may designate one page as their group home page.', array('!settings' => url('admin/og/og_panels'), '!apv' => url('admin/panels/views')));
       case (arg(0) == 'node' && arg(2) == 'og_panels' && !arg(3)):
-        return t(
-          '<p>Create custom pages for your group. Use custom pages to organize your content in a pretty and informative manner. Your group can group to be a whole website within a web site. Each custom page becomes a tab when viewing your group. One of your custom pages should be designated as your <em>group home page</em>. That page will then display when visitors first arrive at your group.</p>
-          <p>Start by clicking the <a href="!url">Add new page</a> tab. Then you will choose a custom layout for your page. Then you will want to <em>edit content</em> for your custom page.</p>', array('!url' => url('node/'. arg(1). '/og_panels/form')));
+        return '<p>'. t('Create custom pages for your group. Use custom pages to organize your content in a pretty and informative manner. Your group can group to be a whole website within a web site. Each custom page becomes a tab when viewing your group. One of your custom pages should be designated as your <em>group home page</em>. That page will then display when visitors first arrive at your group.') .'</p><p>'. t('Start by clicking the <a href="!url">Add new page</a> tab. Then you will choose a custom layout for your page. Then you will want to <em>edit content</em> for your custom page.', array('!url' => url('node/'. arg(1). '/og_panels/form'))) .'</p>';
   }
 }
@@ -17 +15 @@
     $items[] = array(
       'path' => 'admin/og/og_panels',
-      'title' => 'Organic groups panels',
-      'description' => 'Configure the content that is available to group admins when creating group pages.',
+      'title' => t('Organic groups panels'),
+      'description' => t('Configure the content that is available to group admins when creating group pages.'),
       'callback' => 'og_panels_admin_content',
       'access' => user_access('administer organic groups'),
@@ -152 +150 @@
 function og_panels_delete_confirm_submit($form_id, $form_values) {
   og_panels_delete($form_values['did']);
-  drupal_set_message(t('%title has been deleted', array('%title' => $form_values['page_title'])));
+  drupal_set_message(t('%title has been deleted.', array('%title' => $form_values['page_title'])));
 }
 
@@ -184 +182 @@
     $item['page_title'] = array('#value' => l($display->page_title, "node/$nid/$display->path"));
     $item['weight'] = array('#type' => 'weight', '#default_value' => $display->weight);
-    $item['edit content'] = array('#value' => l(t('edit content'), "node/$nid/og_panels/$display->did/panel_content", array(), drupal_get_destination()));
-    $item['change layout'] = array('#value' => l(t('change layout'), "node/$nid/og_panels/$display->did/panel_layout"));
-    $item['edit layout settings'] = array('#value' => l(t('edit layout settings'), "node/$nid/og_panels/$display->did/panel_settings"));
-    $item['edit page'] = array('#value' => l(t('edit page'), "node/$nid/og_panels/form/$display->did", array(), drupal_get_destination()));
-    $item['delete page'] =  array('#value' => l(t('delete page'), "node/$nid/og_panels/$display->did/delete", array(), drupal_get_destination()));
+    $item['edit content'] = array('#value' => l(t('Edit content'), "node/$nid/og_panels/$display->did/panel_content", array(), drupal_get_destination()));
+    $item['change layout'] = array('#value' => l(t('Change layout'), "node/$nid/og_panels/$display->did/panel_layout"));
+    $item['edit layout settings'] = array('#value' => l(t('Edit layout settings'), "node/$nid/og_panels/$display->did/panel_settings"));
+    $item['edit page'] = array('#value' => l(t('Edit page'), "node/$nid/og_panels/form/$display->did", array(), drupal_get_destination()));
+    $item['delete page'] =  array('#value' => l(t('Delete page'), "node/$nid/og_panels/$display->did/delete", array(), drupal_get_destination()));
      
     $form['displays'][$display->did] = $item;
@@ -207 +205 @@
   $form['submit'] = array(
     '#type' => 'submit', 
-    '#value' => t('Save Settings'),
+    '#value' => t('Save settings'),
   );
 
@@ -273 +271 @@
   drupal_set_breadcrumb($bc);
   // Mark node as read and show feed icon for any group panel page (how to do this better?)
-  drupal_add_feed(url("node/$nid/feed"), t('@name at @site', array('@name' => $node->title, '@site' => variable_get('site_name', 'drupal'))));
-  node_tag_new($node->nid);
+  drupal_add_feed(url("node/$group_node->nid/feed"), t('@name at @site', array('@name' => $group_node->title, '@site' => variable_get('site_name', 'drupal'))));
+  node_tag_new($group_node->nid);
   
   
@@ -581 +579 @@
   
     $items['og_subscribers'] = array(
-      'title' => t('OG Members'),
+      'title' => t('OG members'),
       'content_types' => 'og_panels_ct_list_subscribers',
       'single' => TRUE, // only provides a single content type
@@ -604 +602 @@
     if (og_is_picture()) {
       $items['og_faces'] = array(
-        'title' => t('OG Faces'),
+        'title' => t('OG faces'),
         'content_types' => 'og_panels_ct_list_faces',
         'single' => TRUE, // only provides a single content type
@@ -636 +634 @@
   switch ($delta) {
     case 2:
-      // Provide alternate versions as content items
+      // Provide alternate versions of these content items
       unset($info);
       break;
-    case 'default':
+    default:
       $info['icon'] = 'user-multiple.png';
       $info['required context'] = new panels_required_context(t('Group'), 'group');

external/current/sites/all/modules/og/og_views.inc

@@ -1 +1 @@
 <?php
-// $Id: og_views.inc,v 1.12.2.54 2008/05/08 19:49:26 weitzman Exp $
+// $Id: og_views.inc,v 1.12.2.55.2.4 2008/10/06 07:56:45 karthik Exp $
 /**
  * Implementation of the hook_views_tables()
@@ -32 +32 @@
         ),
         'count' => array(
-          'name' => t('OG: Group: Members Count'),
+          'name' => t('OG: Group: Members count'),
           'handler' => 'og_handler_field_count',
           'help' => t('Number of members for a group. Excludes memberships which are pending approval.'),
@@ -39 +39 @@
         ),
         'post_count' => array(
-          'name' => t('OG: Group: Post Count'),
+          'name' => t('OG: Group: Post count'),
           'handler' => 'og_handler_post_count',
           'sortable' => FALSE,
@@ -53 +53 @@
         ),
         'post_count_new' => array(
-          'name' => t('OG: Group: Post Count *New*'),
+          'name' => t('OG: Group: Post count *new*'),
           'handler' => 'og_handler_post_count_new',
           'sortable' => FALSE,
@@ -61 +61 @@
              '#type' => 'select',
              '#options' => array(
-               'normal' => 'Normal',
-               'withmark' => 'With new mark'
+               'normal' => t('Normal'),
+               'withmark' => t('With new mark')
               ),
           ),
@@ -71 +71 @@
         'private' => array(
           'name' => t('OG: Group: Private'),
+          'handler' => 'og_handler_field_private',
+          'sortable' => TRUE,
+          'help' => t('Displays whether a group is private or public with respect to groups.'),
         ),
         'subscribe' => array(
@@ -79 +82 @@
           'notafield' => TRUE,
           'help' => t('Displays a links for joining a group when a user is not already a member.'),
-        ),
-        'notification' => array(
-          'name' => t('OG: Group: Notification'),
-          'handler' => 'og_handler_field_yesempty',
-          'help' => t('Displays <em>yes</em> if group automatically sends email notifications to members'),
         ),
         'language' => array(
@@ -226 +224 @@
       ),
       'fields' => array(
-        'mail_type' => array(
-          'name' => t('OG: Subscription email'),
-          'handler' => 'og_handler_field_yesempty',
-          'sortable' => false,
-          'help' => t('Does member receive email notifications for a group.'),
-        ),
         'managelink' => array(
           'name' => t('OG: Manage membership link'),
@@ -247 +239 @@
         'currentuidsimple' => array(
           'field' => 'uid',
-          'name' => t('OG: Group in User\'s Groups'),
+          'name' => t("OG: Group in user's groups"),
           'operator' => 'views_handler_operator_eqneq',
           'list' => 'views_handler_filter_usercurrent',
@@ -332 +324 @@
       ),
       'help' => t('Filter for the one or more organic groups. Groups should be specified by name, or part of a name. Use the <em>Option</em> field to specify how to match the supplied name.'),
-      )
+      ),
+    'og_uid' => array(
+      'name' => t('OG: User is subscribed to group'), 
+      'handler' => 'og_views_handler_argument_uid',
+      'help' => t("Filter for groups that user is subscribed to.  User is specified by user ID (integer).  This argument exposes a user's group subscriptions to other users. Depending on your site, this may be a violation of their privacy. Use it thoughfully."),
+    ),
     );
   return $args;
@@ -363 +360 @@
     case 'title':
       return db_result(db_query_range('SELECT title FROM {node} WHERE nid = %d', $query, 0, 1));;
+  }
+}
+
+/**
+ * Custom argument for filtering by groups that a user is subscribed to
+ */
+function og_views_handler_argument_uid($op, &$query, $a1, $a2 = null) {
+  switch ($op) {
+    case 'filter':
+      $query->ensure_table('og_uid');
+      $query->add_where("og_uid.uid = %d", $a2);
+      break;
+    case 'title':
+      // This returns the title for this node in the title, breadcrumb, etc.
+      return db_result(db_query('SELECT name FROM {users} WHERE uid = %d', $a2));
   }
 }
@@ -425 +437 @@
   $view = new stdClass();
   $view->name = 'og_mytracker';
-  $view->description = 'Shows all activity in subscribed groups.';
+  $view->description = t('Shows all activity in subscribed groups.');
   $view->access = array (
   0 => '2',
@@ -431 +443 @@
   $view->view_args_php = '';
   $view->page = TRUE;
-  $view->page_title = 'Recent posts in my groups';
+  $view->page_title = t('Recent posts in my groups');
   $view->page_header = '';
   $view->page_header_format = '1';
   $view->page_footer = '';
   $view->page_footer_format = '1';
-  $view->page_empty = 'There are no posts in your subscribed groups.';
+  $view->page_empty = t('There are no posts in your subscribed groups.');
   $view->page_empty_format = '1';
   $view->page_type = 'table';
@@ -443 +455 @@
   $view->nodes_per_page = '25';
   $view->menu = TRUE;
-  $view->menu_title = 'My recent';
+  $view->menu_title = t('My recent');
   $view->menu_tab = TRUE;
   $view->menu_tab_weight = '0';
@@ -478 +490 @@
       'tablename' => 'node',
       'field' => 'title',
-      'label' => 'Title',
+      'label' => t('Title'),
       'handler' => 'views_handler_field_nodelink_with_mark',
       'sortable' => '1',
@@ -486 +498 @@
       'tablename' => 'users',
       'field' => 'name',
-      'label' => 'Author',
+      'label' => t('Author'),
       'sortable' => '1',
     ),
@@ -492 +504 @@
       'tablename' => 'node_comment_statistics',
       'field' => 'comment_count',
-      'label' => 'Replies',
+      'label' => t('Replies'),
       'handler' => 'views_handler_comments_with_new',
       'sortable' => '1',
@@ -499 +511 @@
       'tablename' => 'node_comment_statistics',
       'field' => 'last_comment_timestamp',
-      'label' => 'Last Post',
+      'label' => t('Last post'),
       'handler' => 'views_handler_field_since',
       'sortable' => '1',
@@ -529 +541 @@
   $view = new stdClass();
   $view->name = 'og_unread';
-  $view->description = 'Shows unread posts in subscribed groups.';
+  $view->description = t('Shows unread posts in subscribed groups.');
   $view->access = array (
   0 => '2',
@@ -535 +547 @@
   $view->view_args_php = '';
   $view->page = TRUE;
-  $view->page_title = 'Unread posts in my groups';
+  $view->page_title = t('Unread posts in my groups');
   $view->page_header = '';
   $view->page_header_format = '1';
   $view->page_footer = '';
   $view->page_footer_format = '1';
-  $view->page_empty = 'There are no new posts in your subscribed groups.';
+  $view->page_empty = t('There are no new posts in your subscribed groups.');
   $view->page_empty_format = '1';
   $view->page_type = 'table';
@@ -547 +559 @@
   $view->nodes_per_page = '25';
   $view->menu = TRUE;
-  $view->menu_title = 'My unread';
+  $view->menu_title = t('My unread');
   $view->menu_tab = TRUE;
   $view->menu_tab_weight = '-5';
@@ -571 +583 @@
       'tablename' => 'og_node_data',
       'field' => 'title',
-      'label' => 'Group',
+      'label' => t('Group'),
     ),
     array (
       'tablename' => 'node',
       'field' => 'type',
-      'label' => 'Type',
+      'label' => t('Type'),
       'sortable' => '1',
     ),
@@ -582 +594 @@
       'tablename' => 'node',
       'field' => 'title',
-      'label' => 'Title',
+      'label' => t('Title'),
       'handler' => 'views_handler_field_nodelink_with_mark',
       'sortable' => '1',
@@ -590 +602 @@
       'tablename' => 'users',
       'field' => 'name',
-      'label' => 'Author',
+      'label' => t('Author'),
       'sortable' => '1',
     ),
@@ -596 +608 @@
       'tablename' => 'node_comment_statistics',
       'field' => 'comment_count',
-      'label' => 'Replies',
+      'label' => t('Replies'),
       'handler' => 'views_handler_comments_with_new',
       'sortable' => '1',
@@ -603 +615 @@
       'tablename' => 'node_comment_statistics',
       'field' => 'last_comment_timestamp',
-      'label' => 'Last Post',
+      'label' => t('Last post'),
       'handler' => 'views_handler_field_since',
       'sortable' => '1',
@@ -644 +656 @@
   $view = new stdClass();
   $view->name = 'og_ghp_ron';
-  $view->description = 'OG: Group home page - River of news. Default';
+  $view->description = t('OG: Group home page - River of news. Default');
   $view->page = TRUE;
   $view->page_type = 'teaser';
@@ -699 +711 @@
   $view = new stdClass();
   $view->name = 'og_my';
-  $view->description = 'List user\'s subscribed groups and provide link to manage subscription';
+  $view->description = t("List user's subscribed groups and provide link to manage subscription");
   $view->access = array (
   0 => '2',
@@ -705 +717 @@
   $view->view_args_php = '';
   $view->page = TRUE;
-  $view->page_title = 'My groups';
-  $view->page_header = strtr('You may edit all your email subscriptions using this convenient page. Also, you might be interested in an <a href="!url" rel="nofollow">OPML feed containing feeds from all your subscribed groups</a>.', array('!url' => url('og/opml')));
+  $view->page_title = t('My groups');
+  $view->page_header = t('You might be interested in an <a href="!url" rel="nofollow">OPML feed containing feeds from all your subscribed groups</a>.', array('!url' => url('og/opml')));
   $view->page_header_format = '1';
   $view->page_footer = '<?php
@@ -715 +727 @@
 ?>';
   $view->page_footer_format = '2';
-  $view->page_empty = 'No subscribed groups';
+  $view->page_empty = t('No subscribed groups');
   $view->page_empty_format = '1';
   $view->page_type = 'table';
@@ -752 +764 @@
       'tablename' => 'node',
       'field' => 'title',
-      'label' => 'Group',
+      'label' => t('Group'),
       'handler' => 'views_handler_field_nodelink',
       'options' => 'link',
@@ -759 +771 @@
       'tablename' => 'users',
       'field' => 'name',
-      'label' => 'Manager',
+      'label' => t('Manager'),
     ),
     array (
       'tablename' => 'og',
       'field' => 'count',
-      'label' => 'Members',
-    ),
-    array (
-      'tablename' => 'og_uid',
-      'field' => 'mail_type',
-      'label' => 'Email',
+      'label' => t('Members'),
     ),
     array (
       'tablename' => 'og_uid',
       'field' => 'managelink',
-      'label' => 'Manage',
+      'label' => t('Manage'),
     ),
   );
@@ -814 +821 @@
   $view->view_args_php = '';
   $view->page = TRUE;
-  $view->page_title = 'Groups directory';
+  $view->page_title = t('Groups directory');
   $view->page_header = '';
   $view->page_header_format = '2';
   $view->page_footer = '';
   $view->page_footer_format = '1';
-  $view->page_empty = 'No groups';
+  $view->page_empty = t('No groups');
   $view->page_empty_format = '1';
   $view->page_type = 'table';
@@ -826 +833 @@
   $view->nodes_per_page = '90';
   $view->menu = TRUE;
-  $view->menu_title = 'Groups';
+  $view->menu_title = t('Groups');
   $view->menu_tab = TRUE;
   $view->menu_tab_weight = '-5';
@@ -850 +857 @@
       'tablename' => 'node',
       'field' => 'title',
-      'label' => 'Group',
+      'label' => t('Group'),
       'handler' => 'views_handler_field_nodelink',
       'sortable' => '1',
@@ -858 +865 @@
       'tablename' => 'users',
       'field' => 'name',
-      'label' => 'Manager',
+      'label' => t('Manager'),
     ),
     array (
       'tablename' => 'og',
       'field' => 'count',
-      'label' => 'Members',
+      'label' => t('Members'),
     ),
     array (
       'tablename' => 'og',
       'field' => 'description',
-      'label' => 'Description',
+      'label' => t('Description'),
     ),
     array (
       'tablename' => 'og',
       'field' => 'subscribe',
-      'label' => 'Join',
+      'label' => t('Join'),
     ),
   );
@@ -910 +917 @@
       'tablename' => 'node',
       'field' => 'title',
-      'label' => 'Search for a group by name',
+      'label' => t('Search for a group by name'),
       'optional' => '1',
       'is_default' => '0',
@@ -924 +931 @@
   $view = new stdClass();
   $view->name = 'og_tracker';
-  $view->description = 'Shows active posts across the whole site';
+  $view->description = t('Shows active posts across the whole site');
   $view->access = array (
 );
   $view->view_args_php = '';
   $view->page = TRUE;
-  $view->page_title = 'Recent posts across whole site';
+  $view->page_title = t('Recent posts across whole site');
   $view->page_header = '';
   $view->page_header_format = '1';
@@ -941 +948 @@
   $view->nodes_per_page = '25';
   $view->menu = TRUE;
-  $view->menu_title = 'Recent posts';
+  $view->menu_title = t('Recent posts');
   $view->menu_tab = TRUE;
   $view->menu_tab_weight = '5';
@@ -961 +968 @@
       'type' => 'uid',
       'argdefault' => '2',
-      'title' => 'Recent posts for %1',
+      'title' => t('Recent posts for %1'),
       'options' => '',
       'wildcard' => '',
@@ -984 +991 @@
       'tablename' => 'node',
       'field' => 'title',
-      'label' => 'Title',
+      'label' => t('Title'),
       'handler' => 'views_handler_field_nodelink_with_mark',
       'options' => 'link',
@@ -991 +998 @@
       'tablename' => 'users',
       'field' => 'name',
-      'label' => 'Author',
+      'label' => t('Author'),
     ),
     array (
       'tablename' => 'node_comment_statistics',
       'field' => 'comment_count',
-      'label' => 'Replies',
+      'label' => t('Replies'),
       'handler' => 'views_handler_comments_with_new',
     ),
@@ -1002 +1009 @@
       'tablename' => 'og_node_data',
       'field' => 'title',
-      'label' => 'Groups',
+      'label' => t('Groups'),
     ),
     array (
       'tablename' => 'node_comment_statistics',
       'field' => 'last_comment_timestamp',
-      'label' => 'Last Post',
+      'label' => t('Last post'),
       'handler' => 'views_handler_field_since',
     ),
@@ -1029 +1036 @@
   $view = new stdClass();
   $view->name = 'og_search';
-  $view->description = 'Search within a particular group';
+  $view->description = t('Search within a particular group');
   $view->access = array (
 );
   $view->view_args_php = '';
   $view->page = TRUE;
-  $view->page_title = 'Search';
+  $view->page_title = t('Search');
   $view->page_header = '';
   $view->page_header_format = '1';
   $view->page_footer = '';
   $view->page_footer_format = '1';
-  $view->page_empty = 'No posts found.';
+  $view->page_empty = t('No posts found.');
   $view->page_empty_format = '1';
   $view->page_type = 'teaser';
@@ -1057 +1064 @@
       'type' => 'gid',
       'argdefault' => '1',
-      'title' => 'Search results for %1',
+      'title' => t('Search results for %1'),
       'options' => '',
       'wildcard' => '',
@@ -1085 +1092 @@
       'tablename' => 'temp_search_results',
       'field' => 'word',
-      'label' => 'Enter keyword',
+      'label' => t('Enter keyword'),
       'optional' => '1',
       'is_default' => '0',
@@ -1098 +1105 @@
   $view = new stdClass();
   $view->name = 'og_comments_recent';
-  $view->description = 'Display recent comments block in a group';
+  $view->description = t('Display recent comments block in a group');
   $view->access = array (
 );
   $view->view_args_php = '';
   $view->block = TRUE;
-  $view->block_title = 'Recent comments';
+  $view->block_title = t('Recent comments');
   $view->block_header = '';
   $view->block_header_format = '1';
@@ -1171 +1178 @@
   $view = new stdClass();
   $view->name = 'og_recent_type_term';
-  $view->description = 'Recent posts for current term filtered by node type and/or taxonomy term';
+  $view->description = t('Recent posts for current term filtered by node type and/or taxonomy term');
   $view->access = array (
 );
@@ -1263 +1270 @@
 }
 
+function og_handler_field_private($fieldinfo, $fielddata, $value, $data) {
+  return $value ? t('Private') : t('Public');
+}
+
+
 function og_handler_field_language($fieldinfo, $fielddata, $value, $data) {
   global $locale;

external/current/sites/all/modules/og/og_workflow_ng.inc

@@ -1 +1 @@
 <?php
-// $Id: og_workflow_ng.inc,v 1.1.2.2 2008/04/14 14:02:14 weitzman Exp $
+// $Id: og_workflow_ng.inc,v 1.1.2.4 2008/07/31 20:08:16 weitzman Exp $
 
 /**
  * @file
- * workflow_ng integration for og module
+ * workflow_ng integration for og module.
  */
 
 /**
- * Implementation of hook_event_info()
+ * Implementation of hook_event_info().
  */
 function og_event_info() {
@@ -17 +17 @@
       '#arguments' => og_workflow_ng_events_hook_og_arguments(),
     ),
+    'og_user_approved' => array(
+      '#label' => t('User approved to group by admin'),
+      '#module' => t('OG'),
+      '#description' => t('A pending member is approved by a group administrator.'),
+      '#arguments' => og_workflow_ng_events_hook_og_arguments(),
+    ),
     'og_user_delete' => array(
       '#label' => t('User leaves group'),
       '#module' => t('OG'),
       '#arguments' => og_workflow_ng_events_hook_og_arguments(),
-    ),
-  );
+   ),
+ );    
 }
 
 /**
- * Describes the arguments available for the og hook
+ * Describes the arguments available for the og hook.
  * 
  * We pass uid and gid to workflow-ng so that the argument handlers can load the full entities.
@@ -41 +47 @@
 
 /**
- * handler to get user
+ * handler to get user.
  */
 function og_workflow_ng_events_argument_og_user($uid, $gid) {
@@ -48 +54 @@
 
 /**
- * handler to get node
+ * handler to get node.
  */
 function og_workflow_ng_events_argument_og_node($uid, $gid) {