--- menu_breadcrumb.module.HEAD	2009-10-09 11:26:07.000000000 +1300
+++ menu_breadcrumb.module	2009-10-09 22:28:25.000000000 +1300
@@ -15,6 +15,9 @@
  * Maintained by: Geoffrey de Vlugt <gdevlugt@gmail.com>
  */
 
+define('MENU_BREADCRUMB_REGEX_DEFAULT', '/^book-toc-\d+$/Books/');
+define('MENU_BREADCRUMB_REGEX_MATCH', '%^(/.+/)([^/]+)/$%');
+
 /**
  * Implementation of hook_help().
  */
@@ -28,7 +31,7 @@ function menu_breadcrumb_help($path, $ar
       $output = t('<p>By default, Drupal 6 will use the Navigation menu for the breadcrumb. This module allows you to use the menu the current page belongs to for the breadcrumb.</p><p>As an added bonus, it also allows you to append the page title to the breadcrumb (either as a clickable url or not) and hide the breadcrumb if it only contains the link to the front page.</p>');
       break;
   }
-  
+
   return $output;
 }
 
@@ -51,27 +54,191 @@ function menu_breadcrumb_menu() {
 }
 
 /**
+ * The default selections, if we have yet to configure the module.
+ */
+function _menu_breadcrumb_default_menus($menu_names = NULL, $disabled_by_default = array()) {
+  if (!isset($menu_names)) {
+    $menu_names = menu_get_names();
+  }
+  $default_menus = array();
+
+  if ( is_null(variable_get('menu_breadcrumb_menus', NULL)) ) {
+    // consider hook here allowing modules to disable their menu
+    // by default
+
+    // Ensure initial weights are unique. Do not use zero.
+    $disabled_weight = count($disabled_by_default);
+    $enabled_weight = -count($menu_names) + $disabled_weight;
+    foreach ($menu_names as $menu_name) {
+      if ( in_array( $menu_name, $disabled_by_default, TRUE ) ) {
+        $default_menus[$menu_name] = array(
+          'selected' => 0,
+          'weight'   => $disabled_weight--,
+          'type'     => 'menu',
+        ) ;
+      }
+      else {
+        $default_menus[$menu_name] = array(
+          'selected' => 1,
+          'weight'   => $enabled_weight++,
+          'type'     => 'menu',
+        ) ;
+      }
+      $default_menus['zero_row'] = array(
+        'selected' => 1,
+        'weight'   => 0,
+        'type'     => 'zero_row',
+      ) ;
+    }
+  }
+
+  return $default_menus;
+}
+
+/**
+ * Get the menu selection configuration.
+ *
+ * @return
+ *   Array of menu selections and weights.
+ */
+function _menu_breadcrumb_get_menus() {
+  static $menus;
+  if (!isset($menus)) {
+    $drupal_menu_names = menu_get_names();
+    $disabled_by_default = array(
+      'devel',
+      'admin_menu',
+    ) ;
+
+    // Fetch stored settings, and merge in any previously-unknown menus.
+    $menus = variable_get(
+      'menu_breadcrumb_menus',
+      _menu_breadcrumb_default_menus($drupal_menu_names, $disabled_by_default)
+    );
+    foreach ($drupal_menu_names as $menu_name) {
+      if (!array_key_exists($menu_name, $menus)) {
+        $selected = in_array($menu_name, $disabled_by_default, TRUE) ? FALSE : $menus['zero_row']['selected'];
+        $menus[$menu_name] = array(
+          'selected' => $selected,
+          'weight'   => 0,
+          'type'     => 'menu',
+        );
+      }
+    }
+
+    // Aggregate menus matching the specified patterns.
+    if ($patterns = variable_get('menu_breadcrumb_menu_patterns', MENU_BREADCRUMB_REGEX_DEFAULT)) {
+      // One pattern per line
+      foreach (explode("\n", $patterns) as $pattern) {
+        $part = array();
+        preg_match(MENU_BREADCRUMB_REGEX_MATCH, $pattern, $part);
+        $regex = $part[1];
+        $title = $part[2];
+
+        foreach ($menus as $menu_name => $menu) {
+          if (preg_match($regex, $menu_name)) {
+            if (!array_key_exists($regex, $menus)) {
+              // Use existing weight and selection status
+              $menus[$regex] = $menus[$menu_name];
+              $menus[$regex]['type'] = 'pattern';
+            }
+            unset($menus[$menu_name]);
+          }
+        }
+        // We don't store the pattern titles in 'menu_breadcrumb_menus',
+        // so add it now for the settings form.
+        if (array_key_exists($regex, $menus)) {
+          $menus[$regex]['title'] = $title;
+        }
+      }
+    }
+    uasort($menus, '_menu_breadcrumb_sort'); // sort by weight
+  }
+
+  return $menus;
+}
+
+/**
+ * Sort-by-weight comparison.
+ */
+function _menu_breadcrumb_sort($menu1, $menu2) {
+  $menu1_weight = !empty($menu1['weight']) ? $menu1['weight'] : 0;
+  $menu2_weight = !empty($menu2['weight']) ? $menu2['weight'] : 0;
+  if ($menu1_weight == $menu2_weight) {
+    return 0;
+  }
+  return ($menu1_weight < $menu2_weight) ? -1 : 1;
+}
+
+/**
+ * Get the menu/selection list.
+ *
+ * @return
+ *   An array indicating the selection status of each menu.
+ */
+function menu_breadcrumb_menu_list() {
+  static $list;
+
+  if (!isset($list)) {
+    $menus = _menu_breadcrumb_get_menus();
+    if (array_key_exists('zero_row', $menus)) {
+      unset($menus['zero_row']);
+    }
+
+    $list = array();
+    foreach ($menus as $name => $menu) {
+      $list[$name] = (bool) $menu['selected'];
+    }
+
+    // Enable other modules to dynamically modify the menu list
+    // (for example, to make the order depend upon the current
+    // user's language preference)
+    if ($hook = module_invoke_all('menu_breadcrumb_menu_list', $list)) {
+      $list = $hook;
+    }
+  }
+
+  return $list;
+}
+
+/**
  * Implementation of hook_init().
+ *
+ * Set the active menu according to the current path.
  */
 function menu_breadcrumb_init() {
   if (variable_get('menu_breadcrumb_determine_menu', 1)) {
-    $menu_list = variable_get('menu_breadcrumb_menus', array('admin_menu', 'devel'));
-    $filter = variable_get('menu_breadcrumb_menus_filter', 'blacklist');
+    // Find the set of menus containing a link for the current page.
     $menu_item = menu_get_item();
     $result = db_query("SELECT mlid, menu_name FROM {menu_links} WHERE link_path = '%s'", $menu_item['href']);
+    $menu_link_menus = array();
     while ($menu_link = db_fetch_array($result)) {
-      // @see http://www.php.net/manual/en/function.in-array.php#86695
-      $menu_in_list = in_array($menu_link['menu_name'], $menu_list, TRUE);
-      if ( ( $filter == 'whitelist' && $menu_in_list ) ||
-           ( $filter == 'blacklist' && !$menu_in_list ) ) {
-        menu_set_active_menu_name($menu_link['menu_name']);
-        break;
+      $menu_link_menus[$menu_link['menu_name']] = TRUE;
+    }
+
+    // Choose the highest-priority 'Enabled' menu from that set.
+    $menu_list = array_filter(menu_breadcrumb_menu_list()); // selected menus
+    foreach (array_keys($menu_list) as $menu_name) {
+      $is_pattern = (substr($menu_name, 0, 1) == '/' && substr($menu_name, -1, 1) == '/');
+      if ($is_pattern) {
+        foreach (array_keys($menu_link_menus) as $menu_link_menu_name) {
+          if (preg_match($menu_name, $menu_link_menu_name)) {
+            menu_set_active_menu_name($menu_link_menu_name);
+            break 2;
+          }
+        }
+      }
+      else {
+        if (array_key_exists($menu_name, $menu_link_menus)) {
+          menu_set_active_menu_name($menu_name);
+          break;
+        }
       }
     }
   }
 
   $breadcrumb = drupal_get_breadcrumb();
-  
+
   if (variable_get('menu_breadcrumb_append_node_title', 0) == 1) {
     if (variable_get('menu_breadcrumb_append_node_url', 0) == 1) {
       $breadcrumb[] = l(drupal_get_title(), $_GET['q'], array('html' => TRUE,));
@@ -80,11 +247,11 @@ function menu_breadcrumb_init() {
       $breadcrumb[] = drupal_get_title();
     }
   }
-    
+
   if (count($breadcrumb) == 1 && variable_get('menu_breadcrumb_hide_on_single_item', 0)) {
     $breadcrumb = array();
   }
-    
+
   drupal_set_breadcrumb($breadcrumb);
 }
 
@@ -92,16 +259,18 @@ function menu_breadcrumb_init() {
  * Menu breadcrumb admin settings form.
  *
  * @return
- * The settings form used by Menu breadcrumb.
+ *   The settings form used by Menu breadcrumb.
  */
 function menu_breadcrumb_admin_settings_form() {
+  $form['#submit'][] = 'menu_breadcrumb_admin_settings_form_submit';
+
   $form['menu_breadcrumb_determine_menu'] = array(
     '#type' => 'checkbox',
     '#title' => t('Use menu the page belongs to for the breadcrumb.'),
     '#description' => t('By default, Drupal 6 will use the Navigation menu for the breadcrumb. If you want to use the menu the active page belongs to for the breadcrumb, enable this option.'),
     '#default_value' => variable_get('menu_breadcrumb_determine_menu', 1),
   );
-    
+
   $form['menu_breadcrumb_append_node_title'] = array(
     '#type' => 'checkbox',
     '#title' => t('Append page title to breadcrumb'),
@@ -123,30 +292,220 @@ function menu_breadcrumb_admin_settings_
     '#default_value' => variable_get('menu_breadcrumb_hide_on_single_item', 0),
   );
 
-  $include_exclude_description = 'Use this to specify which menus are used to generate breadcrumbs. ' ;
-  $form['include_exclude'] = array( 
+  $form['include_exclude'] = array(
     '#type' => 'fieldset',
-    '#title' => t('Include / Exclude Menus'),
-    '#description' => t($include_exclude_description),
+    '#title' => t('Enable / Disable Menus'),
+    '#description' => t('The breadcrumb will be generated from the first "enabled" menu that contains a menu item for the page. Re-order the list to change the priority of each menu.'),
   ) ;
 
-  $form['include_exclude']['menu_breadcrumb_menus_filter'] = array(
-    '#type' => 'radios',
-    '#title' => t('Menu filter'),
-    '#options' => array(
-      'blacklist' => t('Blacklist - Menu items will never be chosen from the menus selected below.'),
-      'whitelist' => t('Whitelist - Menu items will only be chosen from the menus selected below.'),
+  // Orderable list of menu selections
+  $form['include_exclude']['menu_breadcrumb_menus'] = array(
+    '#tree' => TRUE,
+    '#theme' => 'menu_breadcrumb_menus_table',
+  );
+
+  // Load stored configuration.
+  $menus = _menu_breadcrumb_get_menus();
+  $weight_delta = count($menus);
+  $opts_enabled = array(
+    1 => t('Enabled'),
+    0 => t('Disabled'),
+  ) ;
+
+  foreach ($menus as $menu_name => $menu) {
+    // Load menu titles.
+    $title = !empty($menu['title']) ? $menu['title'] : $menu_name;
+    if ($menu['type'] == 'menu') {
+      $drupal_menu = menu_load($menu_name);
+      if (!empty($drupal_menu['title'])) {
+        $title = $drupal_menu['title'];
+      }
+    }
+
+    $form['include_exclude']['menu_breadcrumb_menus'][$menu_name] = array(
+      'selected' => array(
+        '#type' => 'checkbox',
+        '#title' => '',
+        '#options' => $opts_enabled,
+        '#default_value' => $menu['selected'],
+      ),
+      'label' => array(
+        '#value' => $menu_name,
+      ),
+      'weight' => array(
+        '#type' => 'weight',
+        '#default_value' => !empty($menu['weight']) ? (int) $menu['weight'] : 0,
+        '#delta' => $weight_delta,
+      ),
+      'type' => array(
+        '#type' => 'value',
+        '#value' => $menu['type'],
+      ),
+      'title' => array(
+        '#type' => 'markup',
+        '#value' => $title,
+      ),
+    );
+
+    if ($menu['type'] == 'pattern') {
+      $title_field =& $form['include_exclude']['menu_breadcrumb_menus'][$menu_name]['title'];
+      $title_field['#value'] = t('<span title="@title">@name <em>(@hint)</em></span>', array('@title' => t("See 'Advanced' settings below."), '@name' => $title_field['#value'], '@hint' => t('pattern')));
+    }
+  }
+
+  $default_value = !empty($menus['zero_row']['selected']) ;
+  $form['include_exclude']['menu_breadcrumb_menus']['zero_row'] = array(
+    'selected' => array(
+      '#type' => 'checkbox',
+      '#title' => '',
+      '#options' => $opts_enabled,
+      '#default_value' => $default_value,
+    ),
+    'label' => array(
+      '#value' => $menu_name,
+    ),
+    'weight' => array(
+      '#type' => 'weight',
+      '#default_value' => 0,
+      '#delta' => $weight_delta,
+    ),
+    'type' => array(
+      '#type' => 'value',
+      '#value' => 'zero_row',
+    ),
+    'title' => array(
+      '#type' => 'markup',
+      '#value' => t('<em><span title="@title">@text</span></em>', array('@title' => t('Default setting for future menus.'), '@text' => t('Default setting (see below)'))),
     ),
-    '#default_value' => variable_get('menu_breadcrumb_menus_filter', 'blacklist'),
   );
 
-  $form['include_exclude']['menu_breadcrumb_menus'] = array(
-    '#type' => 'checkboxes',
-    '#title' => t('Menu list'),
-    '#description' => t('Select which menus to apply the blacklist / whitelist to.'),
-    '#options' => drupal_map_assoc(menu_get_names()),
-    '#default_value' => variable_get('menu_breadcrumb_menus', array('admin_menu', 'devel')),
+  $form['include_exclude']['description'] = array(
+    '#type' => 'markup',
+    '#prefix' => '<p class="description">',
+    '#suffix' => '</p>',
+    '#value' => t('<strong>Default setting</strong> is not a real menu - it defines the default position and enabled status for future menus. If it is "enabled", Menu Breadcrumb will automatically include new menus when looking for breadcrumbs. If it is disabled, new menus will not be used for breadcrumbs until they have explicitly been enabled here.'),
+  ) ;
+
+  $form['include_exclude']['advanced'] = array(
+    '#type' => 'fieldset',
+    '#title' => t('Advanced'),
+    '#collapsible' => TRUE,
+    '#collapsed' => TRUE,
+  );
+
+  $form['include_exclude']['advanced']['pattern_help'] = array(
+    '#type' => 'markup',
+    '#prefix' => '<p class="description">',
+    '#suffix' => '</p>',
+    '#value' => t("Enter regular expressions (one per line) to aggregate matching menu names into a single replacement title in the above list."),
+  );
+
+  $form['include_exclude']['advanced']['menu_breadcrumb_menu_patterns'] = array(
+    '#type' => 'textarea',
+    '#title' => t('Patterns'),
+    '#default_value' => variable_get('menu_breadcrumb_menu_patterns', MENU_BREADCRUMB_REGEX_DEFAULT),
+    '#description' => t("Syntax: /regex/title/"),
   );
 
   return system_settings_form($form);
-}
\ No newline at end of file
+}
+
+/**
+ * Form validation handler.
+ */
+function menu_breadcrumb_admin_settings_form_validate($form, &$form_state) {
+  $patterns =& $form_state['values']['menu_breadcrumb_menu_patterns'];
+
+  // Filter white-space before saving patterns.
+  $patterns = trim($patterns);
+  $patterns = preg_replace('/\s*[\r\n]+\s*/', "\n", $patterns);
+
+  // Check patterns against required syntax.
+  if ($patterns) {
+    foreach (explode("\n", $patterns) as $pattern) {
+      if (!preg_match(MENU_BREADCRUMB_REGEX_MATCH, $pattern)) {
+        form_set_error('menu_breadcrumb_menu_patterns', t("Invalid pattern syntax."));
+      }
+    }
+  }
+}
+
+/**
+ * Form submission handler.
+ *
+ * Adjust all weights with respect to zero_row before
+ * system_settings_form_submit() saves the values.
+ */
+function menu_breadcrumb_admin_settings_form_submit($form, &$form_state) {
+  $menus =& $form_state['values']['menu_breadcrumb_menus'];
+  $zero_weight = $menus['zero_row']['weight'];
+  foreach (array_keys($menus) as $menu) {
+    $menus[$menu]['weight'] -= $zero_weight;
+  }
+}
+
+/**
+ * Implementation of hook_theme().
+ */
+function menu_breadcrumb_theme() {
+  return array(
+    'menu_breadcrumb_menus_table' => array(
+      'arguments' => array('element' => NULL),
+    ),
+  );
+}
+
+/**
+ * Theme a drag-to-reorder table of menu selection checkboxes.
+ */
+function theme_menu_breadcrumb_menus_table($element) {
+  drupal_add_tabledrag('menu-breadcrumb-menus', 'order', 'sibling', 'menu-weight');
+
+  $header = array(
+    t('Menu'),
+    t('Enabled'),
+    t('Weight'),
+  );
+
+  // Separate out the draggable weight:0 row
+  $zero_row = _menu_breadcrumb_menus_table_row(&$element, 'zero_row');
+  unset($element['zero_row']);
+
+  // Generate table of draggable menu names
+  $rows = array();
+  foreach (element_children($element) as $menu_name) {
+    if ($zero_row) {
+      if ($element[$menu_name]['weight']['#value'] >= 0) {
+        $rows[] = $zero_row;
+        $zero_row = FALSE;
+        ++$element[$menu_name]['weight']['#value'];
+      }
+    }
+    else {
+      ++$element[$menu_name]['weight']['#value'];
+    }
+    $rows[] = _menu_breadcrumb_menus_table_row(&$element, $menu_name);
+  }
+
+  // All weights were > 0; add the zero row at the end.
+  if ($zero_row) {
+    $rows[] = $zero_row;
+  }
+
+  return theme('table', $header, $rows, array('id' => 'menu-breadcrumb-menus'));
+}
+
+/**
+ * Return a table row array for the specified menu
+ */
+function _menu_breadcrumb_menus_table_row(&$element, $menu_name) {
+  $element[$menu_name]['weight']['#attributes']['class'] = 'menu-weight';
+  return array(
+    'data' => array(
+      drupal_render($element[$menu_name]['title']),
+      drupal_render($element[$menu_name]['selected']),
+      drupal_render($element[$menu_name]['weight']),
+    ),
+    'class' => 'draggable',
+  );
+}