Index: leech.module
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/leech/leech.module,v
retrieving revision 1.3.2.4
diff -u -r1.3.2.4 leech.module
--- leech.module	4 Jan 2007 21:08:49 -0000	1.3.2.4
+++ leech.module	4 Jan 2007 22:34:22 -0000
@@ -1,5 +1,5 @@
 <?php
-/* $Id: leech.module,v 1.3.2.4 2007/01/04 21:08:49 alexb Exp $ */
+/* $Id: leech.module,v 1.3.2.1 2006/12/15 18:26:55 alexb Exp $ */
 
 /**
  * @file
@@ -518,7 +518,7 @@
     $form['leech']['refresh'] = array (
       '#type' => 'select',
       '#title' => t('Frequency'),
-      '#default_value' => 10800, // hack- todo: check, wether what happens on node edit. $node->leech->refresh,
+      '#default_value' => (isset($node->leech->refresh) ? $node->leech->refresh : 10800),
       '#options' => $period,
       '#description' => t('Frequency at which new data will be downloaded.'),
       '#weight' => -97
@@ -741,38 +741,38 @@
     $form['leech']['addons']['news']['logo'] = array(
       '#type' => 'textfield',
       '#title' => t('URL of logo image'),
-      '#default_value' => ($node->leech_news->logo ? $node->leech_news->logo : $feed->logo)
+      '#default_value' => (isset($node->leech_news->logo) ? $node->leech_news->logo : $feed->logo)
     );
     $form['leech']['addons']['news']['link'] = array(
       '#type' => 'textfield',
       '#title' => t('URL of site'),
-      '#default_value' => ($node->leech_news->link ? $node->leech_news->link : $feed->link)
+      '#default_value' => (isset($node->leech_news->link) ? $node->leech_news->link : $feed->link)
     );
     $form['leech']['addons']['news']['author'] = array(
       '#type' => 'textfield',
       '#title' => t('Author of feed'),
-      '#default_value' => ($node->leech_news->author ? $node->leech_news->author : $feed->author)
+      '#default_value' => (isset($node->leech_news->author) ? $node->leech_news->author : $feed->author)
     );
     $form['leech']['addons']['news']['title'] = array(
       '#type' => 'textfield',
-      '#default_value' => (!$node->title ? $feed->channel[TITLE][0][VALUE] : $node->title),
+      '#default_value' => (!isset($node->title) ? $feed->channel[TITLE][0][VALUE] : $node->title),
       '#attributes' => array('style' => 'display:none')
     );
     if (user_access('administer nodes')) {
       $form['leech']['addons']['news']['items_guid'] = array(
         '#type' => 'checkbox',
         '#title' => t('Generate GUIDs'),
-        '#default_value' => ($node->leech_news->items_guid ? $node->leech_news->items_guid : (($feed->has_guids || $feed->has_unique_links) ? FALSE : variable_get('leech_news_items_guid_for#'.$form['type']['#value'], 0)))
+        '#default_value' => (isset($node->leech_news->items_guid) ? $node->leech_news->items_guid : (($feed->has_guids || $feed->has_unique_links) ? FALSE : variable_get('leech_news_items_guid_for#'.$form['type']['#value'], 0)))
       );
       $form['leech']['addons']['news']['items_status'] = array(
         '#type' => 'checkbox',
         '#title' => t('Publish news items'),
-        '#default_value' => ($node->leech_news->items_status ? $node->leech_news->items_status : variable_get('leech_news_items_status_for#' . $form['type']['#value'], 1))
+        '#default_value' => (isset($node->leech_news->items_status) ? $node->leech_news->items_status : variable_get('leech_news_items_status_for#' . $form['type']['#value'], 1))
       );
       $form['leech']['addons']['news']['items_update'] = array(
         '#type' => 'checkbox',
         '#title' => t('Update already existing news items'),
-        '#default_value' => ($node->leech_news->items_update ? $node->leech_news->items_update : variable_get('leech_news_items_update_for#'.$form['type']['#value'], 0)),
+        '#default_value' => (isset($node->leech_news->items_update) ? $node->leech_news->items_update : variable_get('leech_news_items_update_for#'.$form['type']['#value'], 0)),
       );
       $period = drupal_map_assoc(array(3600, 10800, 21600, 32400, 43200, 86400, 172800, 259200, 604800, 1209600, 2419200, 3628800, 4838400, 7257600, 15724800, 31536000), 'format_interval');
       $period['1000000000'] = t('Never');
@@ -780,7 +780,7 @@
         '#type' => 'select',
         '#title' => t('Delete news items older than'),
         '#options' => $period,
-        '#default_value' => ($node->leech_news->items_delete ? $node->leech_news->items_delete : variable_get('leech_news_items_delete_for#'.$form['type']['#value'], 15724800))
+        '#default_value' => (isset($node->leech_news->items_delete) ? $node->leech_news->items_delete : variable_get('leech_news_items_delete_for#'.$form['type']['#value'], 15724800))
       );
       $promote = drupal_map_assoc(array(1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 15, 20, 25, 30));
       $promote['0'] = t('None');
@@ -789,12 +789,12 @@
         '#type' => 'select',
         '#title' => t('Promote items'),
         '#options' => $promote,
-        '#default_value' => ($node->leech_news->items_promote ? $node->leech_news->items_promote : variable_get('leech_news_items_promote_for#'.$form['type']['#value'], 3))
+        '#default_value' => (isset($node->leech_news->items_promote) ? $node->leech_news->items_promote : variable_get('leech_news_items_promote_for#'.$form['type']['#value'], 3))
       );
       $form['leech']['addons']['news']['items_date'] = array(
         '#type' => 'checkbox',
         '#title' => t('Use dates found in feed if available'),
-        '#default_value' => ($node->leech_news->items_date ? $node->leech_news->items_date : ($feed->has_dates && variable_get('leech_news_items_date_for#'.$form['type']['#value'], 0) ? TRUE : FALSE))
+        '#default_value' => (isset($node->leech_news->items_date) ? $node->leech_news->items_date : ($feed->has_dates && variable_get('leech_news_items_date_for#'.$form['type']['#value'], 0) ? TRUE : FALSE))
       );
       $form['leech']['addons']['news']['links_display_mode'] = array (
         '#type' => 'select',
@@ -2458,50 +2458,43 @@
  * @param unknown_type $node
  */
 function _leech_news_pass_on_groups(&$node) {
-  
   if (!module_exist('og')) {
     return;
   }
 
-  if (!variable_get('og_enabled', FALSE)) {
+  if (!is_array($node->og_groups)) {
     return;
   }
-  
-  if (!isset($node->nid)) {
-    return;
-  } 
 
   timer_start("ogpass");
-  
+
+  // 1) get feed nodes group configuration
+  $realm = $node->og_public ? "og_all" : "og_subscriber";
+
+  $result = db_query("SELECT DISTINCT * FROM {node_access} WHERE nid IN (%s) AND nid = gid", implode(", ", $node->og_groups));
+  $groups = array();
+  while ($group = db_fetch_object($result)) {
+    $groups[] = array("gid" => $group->gid,
+    "view" => $group->grant_view,
+    "update" => $group->grant_update,
+    "delete" => $group->grant_update);
+  }
+
+  // 2) get all child items of this feed ($node) and pass on group settings to them
   $r = db_query("SELECT DISTINCT nid FROM {leech_news_item} WHERE fid = %d", $node->nid);
   $updated = 0; $total = 0;
   while ($n = db_fetch_object($r)) {
 
-    db_query("DELETE FROM {node_access} WHERE nid = %d AND realm LIKE '%s'", $n->nid, 'og_%');
-    
-    if (is_array($node->og_groups)) {
-      foreach ($node->og_groups as $gid) {
-        if ($gid != 0) {
-          $sql = "INSERT INTO {node_access} (nid, gid, realm, grant_view, grant_update, grant_delete) 
-                  VALUES (%d, %d, 'og_subscriber', 1, 1, 1)";
-          db_query($sql, $n->nid, $gid);
-          
-          if ($node->og_public) {
-            $sql = "INSERT INTO {node_access} (nid, gid, realm, grant_view) VALUES (%d, 0, 'og_public', %d)";
-            db_query($sql, $n->nid, $gid);
-          }
-        }
-      }
-    }
-  
-    // if the public checkbox was selected, give a universal grant for this node
-    if ($node->og_public) {
-      $sql = "INSERT INTO {node_access} (nid, gid, realm, grant_view) VALUES (%d, 0, 'og_all', 1)";
-      db_query($sql, $n->nid);
+    db_query("DELETE FROM {node_access} WHERE nid = %d", $n->nid);
+
+    foreach ($groups as $group) {
+      db_query("INSERT INTO
+                {node_access} (nid, gid, realm, grant_view, grant_update, grant_delete)
+                        VALUES (%d, %d, '%s', %d, %d, %d)",
+      $n->nid, $group['gid'], $realm, $group['view'], $group['update'], $group['delete']);
+      $updated++;
     }
-    $updated++;
   }
-  
   if ($updated > 0) {
     drupal_set_message("Group settings of ".$updated." child feed item(s) updated in ".timer_read("ogpass")." ms", "status");
   }
@@ -2594,4 +2587,4 @@
 
   drupal_set_message("Taxonomy of ".count($updated)." child feed item(s) updated in ".timer_read("taxpass")." ms", "status");
   timer_stop("taxpass");
-}
\ No newline at end of file
+}
