? 332523_do_not_change_timestamp.1.patch
Index: draggableviews.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/draggableviews/draggableviews.inc,v
retrieving revision 1.7.2.3
diff -u -p -r1.7.2.3 draggableviews.inc
--- draggableviews.inc	24 Sep 2008 23:52:40 -0000	1.7.2.3
+++ draggableviews.inc	12 Nov 2008 19:17:53 -0000
@@ -1,4 +1,4 @@
-<?php
+<?php
 // $Id: draggableviews.inc,v 1.7.2.3 2008/09/24 23:52:40 sevi Exp $
 
 /**
@@ -7,71 +7,71 @@
  */
 
 include_once('draggableviews_theme.inc');
-
-/**
- * Build the form
- */
-function draggableviews_view_draggabletable_form($form_state, $view) {
-  $form['submit'] = array(
-    '#type' => 'submit',
-    '#value' => t('Save'),
-  );
-
-  return $form;
-}
-
-
-/**
- * Implementing hook_submit
- */
-function draggableviews_view_draggabletable_form_submit($vars) {
-  // check permissions
-  if (!user_access('Allow Reordering')) {
-    drupal_set_message(t('You are not allowed to reorder nodes.'), 'error');
-    return;
-  }
 
-  // gather all needed information
-  $view = $vars['#parameters'][2]->view;
+/**
+ * Build the form
+ */
+function draggableviews_view_draggabletable_form($form_state, $view) {
+  $form['submit'] = array(
+    '#type' => 'submit',
+    '#value' => t('Save'),
+  );
+
+  return $form;
+}
+
+
+/**
+ * Implementing hook_submit
+ */
+function draggableviews_view_draggabletable_form_submit($vars) {
+  // check permissions
+  if (!user_access('Allow Reordering')) {
+    drupal_set_message(t('You are not allowed to reorder nodes.'), 'error');
+    return;
+  }
+
+  // gather all needed information
+  $view = $vars['#parameters'][2]->view;
   $results = $view->result;
   // get input
   $input = $vars['submit']['#post'];
-  
+
   $info = _draggableviews_info($view);
-  
+
   if (!isset($info['order'])) return;
-  
-  
+
+
   // loop through all resulting nodes
   foreach ($results as $row) {
-    
+
     if (isset($info['order']['fields'])) {
       $info['input'][$row->nid][$info['order']['fields'][0]['field_name']] = $input[$info['order']['fields'][0]['field_name'] .'_'. $row->nid];
     }
-    
+
     if (isset($info['hierarchy'])) {
       $info['input'][$row->nid][$info['hierarchy']['field']['field_name']] = $input[$info['hierarchy']['field']['field_name'] .'_'. $row->nid];
     }
   }
-  
+
   // build hierarchy
   _draggableviews_build_hierarchy($info);
-  
+
   // save structure
   _draggableviews_save_hierarchy($info);
-  
+
   if (isset($info['hierarchy'])) {
-    
+
     // save expanded/collapsed state
     global $user;
-    
+
     foreach ($vars['submit']['#post'] AS $key => $val) {
       if (ereg('draggableviews_collapsed_', $key)) {
         $parent_nid = substr($key, 25);
         db_query("DELETE FROM {draggableviews_collapsed}
-                  WHERE uid=". $user->uid ." AND 
+                  WHERE uid=". $user->uid ." AND
                   parent_nid=". $parent_nid);
-      
+
         db_query("INSERT INTO {draggableviews_collapsed}
                   (uid, parent_nid, collapsed) VALUES (%d, %d, %d)",
                   $user->uid, $parent_nid, $val);
@@ -82,10 +82,10 @@ function draggableviews_view_draggableta
 
 /**
  * Collect all known information in a handy array
- * 
+ *
  * @param $view
  *   The views object
- * 
+ *
  * @return
  *   An structured array containt the extracted draggableviews settings
  *   and additional field information.
@@ -127,7 +127,7 @@ function _draggableviews_info(&$view, $p
   $options = $view->display['default']->display_options['style_options'];
   $fields  = $view->field;
   $results = $view->result;
-  
+
   // build information array
   $info = array();
   if (isset($options['tabledrag_order'])) {
@@ -142,7 +142,7 @@ function _draggableviews_info(&$view, $p
     }
     $info['order']['visible'] = strcmp($options['tabledrag_order_visible']['visible'], 'visible') == 0 ? TRUE : FALSE;
     $info['order']['minimum_value'] = _draggableviews_field_get_minimum_value($fields[$field['field']]->content_field);
-  
+
     if (count($info['order']['fields']) >= 2 && $options['tabledrag_hierarchy']['parent_field'] != 'none') {
       $info['hierarchy'] = array(
         'field' => array(
@@ -171,11 +171,11 @@ function _draggableviews_info(&$view, $p
       'default_collapsed' => strcmp($options['tabledrag_expand']['collapsed'], 'collapsed') == 0 ? TRUE : FALSE,
     );
   }
-  
+
   $info['nodes'] = array();
-  
+
   if ($prepare_results) {
-  
+
     // loop through all resulting nodes
     foreach ($results as $row) {
       if (isset($info['order']['fields'])) {
@@ -193,15 +193,15 @@ function _draggableviews_info(&$view, $p
       }
     }
   }
-  
+
   return $info;
 }
 
 /**
  * Build hierarchy
- * 
+ *
  * This function also handles broken structures
- * 
+ *
  * @param info
  *   The structured information array
  */
@@ -209,9 +209,9 @@ function _draggableviews_build_hierarchy
 
   $nodes = &$info['nodes'];
   $input = &$info['input'];
-  
+
   foreach ($nodes as $nid => $prop) {
-    
+
     // get depth
     if (($depth = _draggableviews_get_hierarchy_depth($nid, $input, $info)) === FALSE) {
       // Error! The hierarchy structure is broken and could
@@ -223,15 +223,15 @@ function _draggableviews_build_hierarchy
       // The next steps:
       //  1) bring it down to the root level
       //  2) Set order fields to the minimum
-      
+
       $nodes[$nid][$info['hierarchy']['field']['field_name']] = 0;
-      
+
       // We gracefully sidestep the order-loop
       $depth = -1;
-      
+
       drupal_set_message("Draggableviews: An error was detected. The structure has been repaired.");
     }
-    
+
     // Let's take a look at the following expample, to understand
     // what is beeing done.
     //
@@ -243,27 +243,27 @@ function _draggableviews_build_hierarchy
     // E
     // Imagine we're currently processing X:
     //
-    // We know that X is in depth=3, so we save the received 
+    // We know that X is in depth=3, so we save the received
     // weight value in the 3rd order field of node X.
     //
-    // The 2nd order field must inherit the received weight of 
+    // The 2nd order field must inherit the received weight of
     // node C (the next parent). And the 1st order field must
     // inherit the received weight of node A (the parent of C).
     //
     // When we finally order the view by weight1, weight2, weight3 then
     // weight1 and weight2 from node X will always equal with
     // those from node A and B, and weight3 defines the order of the 3rd level.
-    
+
     $temp_nid = $nid;
-    
+
     for ($i = $depth; $i >= 0; $i--) {
       // we're operating top-down, so we determine the parents nid by the way
-      
+
       $depth_field_name = $info['order']['fields'][$i]['field_name'];
       $first_field_name = $info['order']['fields'][0]['field_name'];
-      
+
       $nodes[$nid][$depth_field_name] = $input[$temp_nid][$first_field_name];
-      
+
       if (isset($info['hierarchy']) && $i > 0) {
         if (!($temp_nid = $input[$temp_nid][$info['hierarchy']['field']['field_name']])) {
           // this line should never be reached assumed the depth
@@ -273,15 +273,15 @@ function _draggableviews_build_hierarchy
         }
       }
     }
-    
+
     if (isset($info['hierarchy']) && $depth > -1) {
       // Simply set the parent value
-      
+
       $parent_field_name = $info['hierarchy']['field']['field_name'];
-      
+
       $nodes[$nid][$parent_field_name] = $input[$nid][$parent_field_name];
     }
-    
+
     // Now set all unused weights to a minimum value. Otherwise
     // it could happen that a child appears above its parent.
     // The ? can be anything, unfortunately also > 5
@@ -293,13 +293,13 @@ function _draggableviews_build_hierarchy
     // the minimum.
     // Due to this it's recommended that all order fields have
     // the same minimum value!
-    
+
     $depth = ($depth == -1) ? 0 : $depth;
-    
+
     for ($i = $depth + 1; $i < count($info['order']['fields']); $i++) {
-      
+
       $field_info = $info['order']['fields'][$i];
-      
+
       $info['nodes'][$nid][$field_info['field_name']] = $field_info['minimum_value'];
     }
   }
@@ -307,45 +307,45 @@ function _draggableviews_build_hierarchy
 
 /**
  * Rebuild hierarchy
- * 
+ *
  * This function is called when the structure is broken
- * 
+ *
  * @param info
  *   The structures information array
  */
 function _draggableviews_rebuild_hierarchy(&$info) {
 
   drupal_set_message("Draggableviews: Rebuilding structure..");
-  
+
   $nodes         = &$info['nodes'];
   $info['input'] = array();
   $input         = &$info['input'];
-  
+
   // Build an input-array to simulate the form data we would receive on submit
-  
+
   // loop through all nodes
   foreach ($nodes as $nid => $prop) {
-    
+
 
     $depth = $prop['depth'] ? $prop['depth'] : 0;
-    
+
     // use order weight of the hierarchy level the field is situated in
     $input[$nid][$info['order']['fields'][0]['field_name']] = $prop[$info['order']['fields'][$depth]['field_name']];
-    
+
     if (isset($info['hierarchy'])) {
-    
+
       // set parent
       $field_name = $info['hierarchy']['field']['field_name'];
       $input[$nid][$field_name] = $prop[$field_name];
     }
   }
-  
+
   // build hierarchy
   _draggableviews_build_hierarchy($info);
-  
+
   // save hierarchy
   _draggableviews_save_hierarchy($info);
-  
+
   // redirect here
   // @todo
   drupal_set_message(t('Draggableviews: Refresh required (..will redirect automatically after testing)'), 'error');
@@ -353,16 +353,16 @@ function _draggableviews_rebuild_hierarc
 
 /**
  * Detect and repair order collisions
- * 
+ *
  * @return
  *   TRUE if no collision detected
  */
 function _draggableviews_detect_order_collisions(&$info) {
 
   $nodes = &$info['nodes'];
-  
+
   $collision = FALSE;
-  
+
   // Detect order collisions
   // Check for the following:
   //  1) The minimum value should not be used as it
@@ -370,60 +370,60 @@ function _draggableviews_detect_order_co
   //     without order collisions
   //  2) @todo The last value should not be used...
   //  3) An order value should only be used once per depth/parent
-  
+
   // array(
   //   parent => array(order1, ..),
   //   ..
   // )
   $order = array();
-  
+
   $min_value = $info['order']['minimum_value'];
-  
+
   // loop through all nodes
   foreach ($nodes as $nid => $prop) {
-    
+
     $parent = $info['hierarchy'] ? $prop[$info['hierarchy']['field']['field_name']] : 0;
-    
+
     $order_field_value = &$nodes[$nid][$info['order']['fields'][$prop['depth']]['field_name']];
-    
+
     $begin_search = TRUE;
-    
+
     // make sure that the minimum value cannot be used
     if (!is_array($order[$parent])) $order[$parent] = array($min_value);
-    
+
     // first try to keep current value
     $tmp_order = $order_field_value;
-    
+
     while (is_numeric(array_search($tmp_order, $order[$parent]))) {
       // if there already exists an order value for this depth/parent
       // we have to find another one.
       // Try to find a free order:
-      
+
       if ($begin_search == TRUE) {
-      
+
         $tmp_order = $min_value + 1;
-        
+
         $begin_search = FALSE;
       }
       else {
-        
+
         $tmp_order++;
       }
-      
+
       $collision = TRUE;
     }
-    
+
     $order[$parent] = array_merge(array($tmp_order), $order[$parent]);
-    
+
     $order_field_value = $tmp_order;
   }
-  
+
   return !$collision;
 }
 
 /**
  * Set values and save nodes
- * 
+ *
  * @param $info
  *   The structured information array
  */
@@ -431,51 +431,47 @@ function _draggableviews_save_hierarchy(
 
   // loop through all nodes
   foreach ($info['nodes'] as $nid => $prop) {
-  
+
     $node = node_load(array('nid' => $nid));
-  
+
     if (isset($info['hierarchy'])) {
-    
+
       $field_info = $info['hierarchy']['field'];
       $value      = $prop[$field_info['field_name']];
-      
+
       _draggableviews_node_set_value($node, $field_info['real_field_name'], $field_info['field_type'], $value);
     }
-    
+
     foreach ($info['order']['fields'] as $field_info) {
       // loop through all order fields
-      
+
       $value      = $prop[$field_info['field_name']];
-    
+
       _draggableviews_node_set_value($node, $field_info['real_field_name'], $field_info['field_type'], $value);
     }
-    
-    // finally save the node
-    if ($node = node_submit($node)) {
-      node_save($node); // CAUTION, BUG: node_save destroys og_groups array
-    }
+
   }
 }
 
 /**
  * Check order settings
- * 
+ *
  */
 function _draggableviews_check_order($nid, &$info) {
-  
+
   $nodes = &$info['nodes'];
 
   $temp_nid = $nid;
-    
+
   for ($i = $nodes[$nid]['depth']; $i >= 0; $i--) {
     // we're operating top-down, so we determine the parents nid by the way
-      
+
     $depth_field_name = $info['order']['fields'][$i]['field_name'];
-    
+
     if ($nodes[$nid][$depth_field_name] != $nodes[$temp_nid][$depth_field_name]) {
       return FALSE;
     }
-    
+
     if (isset($info['hierarchy']) && $i > 0) {
       if (!($temp_nid = $nodes[$temp_nid][$info['hierarchy']['field']['field_name']])) {
         // this line should never be reached assumed the depth
@@ -485,39 +481,39 @@ function _draggableviews_check_order($ni
       }
     }
   }
-  
+
   return TRUE;
 }
 
 /**
  * Calculate depth of all nodes
- * 
+ *
  * @param $info
  *   The structured information array
  */
 function _draggableviews_calculate_depths(&$info) {
 
   $error = FALSE;
-  
+
   // loop through all rows the view returns
   foreach ($info['nodes'] as $nid => $prop) {
 
     // determine hierarchy depth of current row
     $info['nodes'][$nid]['depth'] = _draggableviews_get_hierarchy_depth($nid, $info['nodes'], $info);
-    
+
     if ($info['nodes'][$nid]['depth'] === FALSE) $error = TRUE;
   }
-  
+
   return !$error;
 }
 
 /**
  * Get Hierarchy depth
- * 
+ *
  * This function detects cycles,
  * broken hierarchy structures
  * and wrong weight settings
- * 
+ *
  * @param $node
  *   The node from wich we want to know the depth
  * @param $info
@@ -529,41 +525,41 @@ function _draggableviews_calculate_depth
 function _draggableviews_get_hierarchy_depth($nid, &$nodes, &$info) {
 
   if (!isset($info['hierarchy'])) return 0;
-  
+
   $depth = 0;
   $error = FALSE;
   $temp_nid = $nid;
   $field_name = $info['hierarchy']['field']['field_name'];
   $used_nids = array();
   $used_nids[] = $temp_nid;
-  
+
   while (!($error = !isset($nodes[$temp_nid])) && ($temp_nid = $nodes[$temp_nid][$field_name]) > 0) {
-    
+
     // In order to detect cycles we use an array,
     // where all used node ids are saved in. If any node id
     // occurs twice -> return FALSE
     $cycle_found = array_search($temp_nid, $used_nids);
-    
+
     if (isset($cycle_found) && $cycle_found !== FALSE) {
       drupal_set_message(t("Draggableviews: A cycle was found."));
       return FALSE;
     }
-    
+
     $used_nids[] = $temp_nid;
     $depth++;
   }
-  
+
   if ($error) {
     // If loop breaked caused by an error
     return FALSE;
   }
-  
+
   return $depth;
 }
 
 /*
  * Get accurate form element
- * 
+ *
  * @param $nid
  * @param $field_name
  * @param $value
@@ -582,9 +578,9 @@ function _draggableviews_get_form_elemen
   $widget_type = $widget_types[$field['widget']['type']];
 */
   switch ($field['widget']['type']) {
-  
+
     case 'optionwidgets_select':
-    
+
       return array(
         '#type'  => 'select',
         '#name'  => $attributes['field_name'],
@@ -594,11 +590,11 @@ function _draggableviews_get_form_elemen
         '#options' => array_slice(content_allowed_values($field), 1, -1, TRUE),
         '#attributes' => array('class' => $attributes['class']),
       );
-      
+
       break;
-      
+
     case '__nodereference_select':
-    
+
       return array(
         '#type' => 'select',
         '#name' => $specific_field_name != NULL ? $specific_field_name: $field_name .'_'. $nid,
@@ -606,15 +602,15 @@ function _draggableviews_get_form_elemen
         '#options' => content_allowed_values($field),
         '#attributes' => array('class' => $field_name),
       );
-      
+
       break;
-      
+
     return array
         (
             '#theme' => 'content_multiple_values',
             '#title' => 'parent',
             '#required' => 0,
-            '#description' => NULL, 
+            '#description' => NULL,
             0 => array
                 (
                     '#type' => 'nodereference_autocomplete',
@@ -645,9 +641,9 @@ function _draggableviews_get_form_elemen
             '#access' => 1,
             '#count' => 5,
         );
-        
+
       break;
-      
+
     case 'hidden':
     default:
      return array(
@@ -657,22 +653,22 @@ function _draggableviews_get_form_elemen
         '#attributes' => array('class' => $attributes['class']),
       );
   }
-}
-
-/*
- * Set cck fields in a node with a specific field-type
- * 
- * @param $node
- *   The node which contains the cck fields
- * @param $field_name
- *   The cck_field_name that should be set
- * @param $field_type
- *   The field-type of the cck field
- * @param $value
- */
+}
+
+/*
+ * Set cck fields in a node with a specific field-type
+ *
+ * @param $node
+ *   The node which contains the cck fields
+ * @param $field_name
+ *   The cck_field_name that should be set
+ * @param $field_type
+ *   The field-type of the cck field
+ * @param $value
+ */
 function _draggableviews_node_set_value(&$node, $field_name, $field_type, $value) {
-
-  // get field
+
+  // get field
   if (isset($node->$field_name)) {
     $field = &$node->$field_name;
   }
@@ -680,43 +676,58 @@ function _draggableviews_node_set_value(
     // return if field does not exist
     return;
   }
-  
+
   if (!isset($value)) {
     // sometimes there is no value available (e.g. a root without a parent)
-    
+
     // set empty array
     $value = 0;
-  }
-  
-  //differ between certain field types
-  switch ($field_type) {
-    case 'nodereference':
-      $field[0]['nid'] = $value;
+  }
+
+  //differ between certain field types
+  switch ($field_type) {
+    case 'nodereference':
+      $field[0]['nid'] = $value;
+      break;
+
+    default:
+    case 'number_integer':
+      $field[0]['value'] = $value;
       break;
-    
-    default:
-    case 'number_integer':
-      $field[0]['value'] = $value;
-      break;
-  }
+  }
+
+  $type = content_types($node->type);
+  $tables = $type['tables'];
+  $target = $node->$field_name;
+  foreach($target[0] as $k => $v) {
+    if($v == $value) {
+      $db_field =  $field_name ."_". $k;
+    }
+  }
+  foreach ($type['tables'] as $table) {
+    $sql = "UPDATE {$table} set $db_field = %d WHERE nid = %d AND vid = %d";
+    db_query($sql, $value, $node->nid, $node->vid);
+
+  }
+
 }
 
 /*
- * get the minimum allowed value of a cck-field  
- * 
+ * get the minimum allowed value of a cck-field
+ *
  * @param $field
  *   the cck fields
  */
 function _draggableviews_field_get_minimum_value($field) {
   // get allowed values and return first element found
   $allowed_values = each(content_allowed_values($field));
-  
+
   return $allowed_values['key'];
 }
 
 /*
- * filter handlers by type  
- * 
+ * filter handlers by type
+ *
  * @param $type
  *   the field type
  * @param $fields
@@ -727,7 +738,7 @@ function _draggableviews_field_get_minim
 function _draggableviews_filter_fields($types = array(), $handlers) {
 
   $available_fields = array();
-  
+
   foreach ($handlers as $field => $handler) {
     $available = FALSE;
     // search given type in content-field-type
@@ -738,7 +749,7 @@ function _draggableviews_filter_fields($
           break;
         }
       }
-    
+
       if ($available) {
         if ($label = $handler->label()) {
           $available_fields[$field] = $label;