nodehierarchy & domain (domain_prefix)

Sorry, I thought this was stable when I committed. I can see now why you did what you did. I had changed this because I needed Domain Access to work properly on my site and the only thing I could figure out at the time was to take out the LEFTs in the JOINS.

I have created a prefixed table for each subdomain (ie: domain_3_nodehierarchy_menu_links). This is needed to provide a separate hierarchy for each site, without sacrificing and prefix the node table (mainly because of how our search works). This is a more proper way to add support for Domain Access and I believe I have found a solution:

/**
 * Return a list of menu items that are valid possible parents for the given node.
 */
function _nodehierarchy_parent_options($child_type, $exclude = NULL) {
  static $options = array();

  // If these options have already been generated, then return that saved version.
  if (isset($options[$child_type][$exclude])) {
    return $options[$child_type][$exclude];
  }

  // Get all the possible parents.
  $types = nodehierarchy_get_allowed_parent_types();
  foreach ($types as $i => $type) {
    $types[$i] = "'$type'";
  }

  // Get the items with menu links.
  $items = $mlids = array();
  if ($types) {
    
    // 2010/06/29
    // Added Domain Access support
    //
    if (module_exists('domain')){
      global $_domain;
      $domain = array();
      $domain['join'] = "LEFT JOIN {domain_access} da ON da.nid = n.nid";
      $domain['where'] = "da.gid = '" . $_domain['domain_id'] . "' AND ";
    }
    $result = db_query(
        "SELECT n.nid, n.type as type, n.title as title, n.uid as uid, ml.*,
                IF(depth IS NULL, 1, depth) as depth, IF(ml.mlid IS NULL, CONCAT('nid:', n.nid), ml.mlid) as mlid, ml.mlid as linkid
           FROM {node} n
      LEFT JOIN {nodehierarchy_menu_links} nh_parent
             ON nh_parent.nid = n.nid
      LEFT JOIN {menu_links} ml
             ON ml.mlid = nh_parent.mlid
      " . ($domain ? $domain['join'] : '') . "
          WHERE " . ($domain ? $domain['where'] : '') . "(ml.module = 'nodehierarchy' OR ml.module IS NULL)
            AND n.type IN (". implode(', ', $types) .")
          ORDER BY IF(p1 IS NULL, n.created, 0) ASC, p1 ASC, p2 ASC, p3 ASC, p4 ASC, p5 ASC, p6 ASC, p7 ASC, p8 ASC, p9 ASC"
    );
  }

  // Flatten tree to a list of options.
  $parent_types = nodehierarchy_get_allowed_parent_types($child_type);
  $out = nodehierarchy_tree_data($result, $exclude, $parent_types);

  // Static caching to prevent these options being built more than once.
  $options[$child_type][$exclude] = $out;
  return $out;
}

You need an "if" to provide support for those who have domain installed and enabled and those who don't. "if" it exists, then we restrict the nodes that are assigned to the current domain by including the domain specific SQL. If it doesn't, then we don't include the domain specific SQL and the query is untouched. This is pretty standard "support" in my opinion.

Could you maybe elaborate a little more of what you mean. I don't mind coming up with a better solution if I get the general idea, but for now this seems appropriate.

setting as dup of #921198: Rework administration and node create/edit with new features and clean design

A much simpler method has been implemented (less than 3 lines).