/[drupal]/contributions/modules/taxonomy_browser/taxonomy_browser.module
ViewVC logotype

Diff of /contributions/modules/taxonomy_browser/taxonomy_browser.module

Parent Directory Parent Directory | Revision Log Revision Log | View Revision Graph Revision Graph | View Patch Patch

revision 1.19, Thu Feb 1 18:52:00 2007 UTC revision 1.19.2.31, Thu Aug 14 14:27:13 2008 UTC
# Line 1  Line 1 
1  <?php  <?php
2  // $Id: taxonomy_browser.module,v 1.18 2007/02/01 18:43:57 weitzman Exp $  // $Id: taxonomy_browser.module,v 1.19.2.30 2008/07/22 00:47:13 nancyw Exp $
3  // Original by Moshe Weitzman (weitzmna@tejasa.com)  // Original by Moshe Weitzman (weitzmna@tejasa.com)
4    
5  /**  /**
6   * @file   * @file
7   * Enables users to construct their own view of content from terms across   *   Enables users to construct their own view of content from terms across
8   * multiple vocabularies.   *   multiple vocabularies.
9   */   */
10    
11  /********************************************************************  //*******************************************************************
12   * Drupal Hooks :: General Overview  //* Drupal Hooks : General Overview
13   ********************************************************************/  //*******************************************************************
14    
15  /**  /**
16   * Implementation of hook_menu().   * Implementation of hook_menu().
# Line 19  function taxonomy_browser_menu($may_cach Line 19  function taxonomy_browser_menu($may_cach
19    $items = array();    $items = array();
20    
21    if ($may_cache) {    if ($may_cache) {
22      $items[] = array('path' => 'taxonomy_browser', 'title' => t('category browser'),      $items[] = array(
23        'access' => user_access('access content'),        'path' => 'admin/settings/taxonomy-browser',
24          'title' => t('Taxonomy Browser'),
25          'description' => t('Set usage guidelines and included vocabularies.'),
26          'callback' => 'drupal_get_form',
27          'callback arguments' => 'taxonomy_browser_admin_settings',
28          'access' => user_access('administer site configuration'),
29          );
30      }
31      else {
32        $items[] = array(
33          'path' => 'taxonomy_browser',
34          'title' => t('Category Browser'),
35          'access' => user_access(variable_get('taxonomy_browser_need_perm', FALSE) ? 'access taxonomy browser' : 'access content'),
36        'callback' => 'taxonomy_browser_page',        'callback' => 'taxonomy_browser_page',
37        'weight' => 7,        'description' => t('Find content on your own terms.'),
38        'type' => MENU_NORMAL_ITEM);        'type' => MENU_NORMAL_ITEM,
39          );
40    
41        drupal_add_css(drupal_get_path('module', 'taxonomy_browser') .'/taxonomy_browser.css');
42    }    }
43    
44    return $items;    return $items;
# Line 37  function taxonomy_browser_help($section Line 52  function taxonomy_browser_help($section
52      case 'admin/modules#description':      case 'admin/modules#description':
53        return t('An interface for viewing content grouped by arbitrary taxonomy terms.');        return t('An interface for viewing content grouped by arbitrary taxonomy terms.');
54      case 'taxonomy_browser':      case 'taxonomy_browser':
55        return variable_get('taxonomy_browser_guidelines', _taxonomy_browser_guidelines_default());        $output = check_markup(variable_get('taxonomy_browser_guidelines', _taxonomy_browser_guidelines_default()));
56          if (user_access('administer site configuration')) {
57            $output .= '<p class="links">'. l(t('Go to Taxonomy Browser settings'), 'admin/settings/taxonomy-browser', array(), drupal_get_destination()) .'</p>';
58          }
59          return $output;
60      }
61    }
62    
63    /**
64     * Implementation of hook_perm().
65     */
66    function taxonomy_browser_perm() {
67      if (variable_get('taxonomy_browser_need_perm', FALSE)) {
68        return array('access taxonomy browser');
69      }
70      else {
71        return array();
72    }    }
73  }  }
74    
75  /********************************************************************  //********************************************************************
76   * Drupal Hooks :: Core  //* Drupal Hooks : Core
77   ********************************************************************/  //********************************************************************
78    
79    /**
80     * Implementation of hook_block().
81     */
82    function taxonomy_browser_block($op = 'list', $delta = 0, $edit = array()) {
83      $block = array();
84      switch ($op) {
85        case 'list':
86          $block[0]['info'] = t('Category browser');
87          return $block;
88    
89        case 'view':
90          switch ($delta) {
91            case 0:
92              $block = _taxonomy_browser_block_view($delta);
93              break;
94          }
95          return $block;
96    //
97    //    case 'configure':
98    //      return _taxonomy_browser_block_configure($delta);
99    //
100    //    case 'save':
101    //      _taxonomy_browser_block_save($delta, $edit);
102      }
103    }
104    
105  /**  /**
106   * Implementation of hook_settings().   * Implementation of hook_form().
107   */   */
108  function taxonomy_browser_settings() {  function taxonomy_browser_admin_settings() {
109    if (!module_exist('node_type_filter') && !drupal_set_message()) {    if (!module_exists('node_type_filter') && !drupal_set_message()) {
110      drupal_set_message(t('You do not have the node_type_filter module installed. This means that the \'restrict search by content type\' option will not be available on the category browser page.'));      drupal_set_message(t('You do not have the node_type_filter module installed. This means that the "restrict search by content type" option will not be available on the category browser page.'), 'status');
111    }    }
112    
113      drupal_add_js(drupal_get_path('module', 'taxonomy_browser') .'/taxonomy_browser.js', 'module');
114    
115    $form['taxonomy_browser_guidelines'] = array(    $form['taxonomy_browser_guidelines'] = array(
116      '#title' => t('Guidelines'),      '#title' => t('Guidelines'),
117      '#type' => 'textarea',      '#type' => 'textarea',
118      '#default_value' => variable_get('taxonomy_browser_guidelines', _taxonomy_browser_guidelines_default()),      '#default_value' => variable_get('taxonomy_browser_guidelines', _taxonomy_browser_guidelines_default()),
119      '#rows' => 6,      '#rows' => 2,
120      '#description' => t('Instructions which should appear at top of the category browser main page'),      '#description' => t('Instructions which should appear at top of the category browser main page'),
121    );      );
122    
123      $form['taxonomy_browser_select_type'] = array(
124        '#title' => t('Selection type'),
125        '#type' => 'radios',
126        '#default_value' => variable_get('taxonomy_browser_select_type', 1),
127        '#options' => array(t('Selection box'), t('Check boxes')),
128        '#description' => t('This option determines whether the user will see a selection list or check boxes.'),
129        '#prefix' => '<div class="taxonomy_browser_radios">',
130        '#suffix' => '</div>',
131        );
132    
133      $form['taxonomy_browser_collapse'] = array(
134        '#title' => t('Make vocabularies collapsible'),
135        '#type' => 'checkbox',
136        '#default_value' => variable_get('taxonomy_browser_collapse', FALSE),
137        '#description' => t('Do you want to display of the terms within a vocabulary to be collapsible? Requires "Check boxes" above.'),
138        );
139    
140      $form['taxonomy_browser_default_op'] = array(
141        '#title' => t('"Items containing" default'),
142        '#type' => 'radios',
143        '#default_value' => variable_get('taxonomy_browser_default_op', 0),
144        '#options' => array(t('All'), t('Any')),
145        '#description' => t('This option determines which "Items containing" choice is the default.'),
146        '#prefix' => '<div class="taxonomy_browser_radios">',
147        '#suffix' => '</div>',
148        );
149    
150      $form['taxonomy_browser_count_nodes'] = array(
151        '#title' => t('Show node count'),
152        '#type' => 'checkbox',
153        '#default_value' => variable_get('taxonomy_browser_count_nodes', FALSE),
154        '#description' => t('Do you want to display the count of nodes tagged with each term? This can be SQL-intensive.'),
155        );
156    
157      $form['taxonomy_browser_show_unused'] = array(
158        '#title' => t('Show unused terms'),
159        '#type' => 'checkbox',
160        '#default_value' => variable_get('taxonomy_browser_show_unused', FALSE),
161        '#description' => t('Do you want to display the term if no nodes are tagged with that term? This requires "Show node count" to be selected; if it is not seleted, all terms will be shown.'),
162        );
163    
164      $form['taxonomy_browser_allow_children'] = array(
165        '#title' => t('Allow child terms to be included'),
166        '#type' => 'checkbox',
167        '#default_value' => variable_get('taxonomy_browser_allow_children', FALSE),
168        '#description' => t('Do you want the user to see a check box to include child terms (sub-terms)?'),
169        );
170    
171      $form['taxonomy_browser_need_perm'] = array(
172        '#title' => t('Requires permission'),
173        '#type' => 'checkbox',
174        '#default_value' => variable_get('taxonomy_browser_need_perm', FALSE),
175        '#description' => t('Do you want to require permission to see the browser page?'),
176        );
177    
178      $form['taxonomy_browser_show_types'] = array(
179        '#title' => t('Show content types with vocabulary'),
180        '#type' => 'checkbox',
181        '#default_value' => variable_get('taxonomy_browser_show_types', FALSE),
182        '#description' => t('If checked, this option displays a list of the content types for which this vocabulary may be used.'),
183        );
184    
185      $select = array();
186    $vocabularies = taxonomy_get_vocabularies();    $vocabularies = taxonomy_get_vocabularies();
187    foreach ($vocabularies as $vocabulary) {    foreach ($vocabularies as $vocabulary) {
188      $select[$vocabulary->vid] = $vocabulary->name;      $select[$vocabulary->vid] = $vocabulary->name;
189    }    }
190    
191      $current_vocabs = variable_get('taxonomy_browser_vocabularies', array());
192      // Occasionally we get a 0 vid in the array.
193      unset($current_vocabs[0]);
194    
195    $form['taxonomy_browser_vocabularies'] = array(    $form['taxonomy_browser_vocabularies'] = array(
196      '#title' => t('Included Vocabularies'),      '#title' => t('Included Vocabularies'),
197      '#type' => 'select',      '#type' => 'checkboxes',
198      '#default_value' => variable_get('taxonomy_browser_vocabularies', array()),      '#default_value' => $current_vocabs,
199      '#options' => $select,      '#options' => $select,
200      '#description' => t('Select the vocabularies the user can select from on the category browser page'),      '#description' => t('Select the vocabularies the user can select from on the category browser page.'),
201      '#multiple' => TRUE,      '#prefix' => '<div class="taxonomy_browser_checkboxes">',
202      '#size' => 6,      '#suffix' => '</div>',
203    );      );
204    
205    return $form;    if (module_exists('node_type_filter')) {
206        $filter_options = node_get_types('names');
207        $form['taxonomy_browser_omit'] = array(
208          '#type' => 'checkboxes',
209          '#title' => t('Omit content types'),
210          '#options' => $filter_options,
211          '#default_value' => variable_get('taxonomy_browser_omit', array('')),
212          '#description' => t('If any of these types is selected, it will be omitted from the list on the "Category Browser" page.'),
213          '#prefix' => '<div class="taxonomy_browser_checkboxes">',
214          '#suffix' => '</div>',
215          );
216      }
217    
218      return system_settings_form($form);
219  }  }
220    
221  /********************************************************************  function taxonomy_browser_admin_settings_validate($form_id, &$form_values) {
222   * Module Functions :: Public    if ($form_values['taxonomy_browser_count_nodes'] == FALSE
223   ********************************************************************/      && $form_values['taxonomy_browser_show_unused'] == TRUE) {
224        form_set_error('taxonomy_browser_show_unused', t('"Show unused" requires "count nodes."'));
225      }
226    }
227    
228    //********************************************************************
229    //* Module Functions : Public
230    //********************************************************************
231    
232  /**  /**
233   * Menu callback: the query building interface for nodes selected based on   * Menu callback: the query building interface for nodes selected based on
234   * taxonomy terms.   * taxonomy terms.
235   */   */
236  function taxonomy_browser_page() {  function taxonomy_browser_page() {
237      $output .= drupal_get_form('taxonomy_browser_form');
238      return $output;
239    }
240    
241    function taxonomy_browser_form() {
242    $form = array();    $form = array();
243      $selection_types = array('select', 'checkboxes');
244      $select_type = $selection_types[variable_get('taxonomy_browser_select_type', 1)];
245      $collapsible = variable_get('taxonomy_browser_collapse', FALSE) && ($select_type == 'checkboxes');
246      $count_nodes = variable_get('taxonomy_browser_count_nodes', FALSE);
247      $show_unused = variable_get('taxonomy_browser_show_unused', FALSE);
248      $allow_children = variable_get('taxonomy_browser_allow_children', FALSE);
249      $node_types = node_get_types('names');
250    
251    $form['scope'] = array(    $form['scope'] = array(
252      '#type' => 'fieldset',      '#type' => 'fieldset',
253      '#title' => t('Scope'),      '#title' => t('Scope'),
254      '#collapsible' => FALSE,      '#collapsible' => TRUE,
255    );      '#collapsed' => FALSE,
256        '#attributes' => array('class' => 'taxonomy_browser_scope'),
257    if (module_exist('node_type_filter')) {      );
258      $filter_options['all'] = t('all');  
259      foreach (node_get_types() as $type => $name) {    if (module_exists('node_type_filter')) {
260        $filter_options[$type] = $name;      if ($count_nodes) {
261          $total_count = 0;
262          $result = db_query('SELECT DISTINCT(type), COUNT(nid) AS count FROM {node} WHERE status=1 GROUP BY type ORDER BY type');
263          while ($counter = db_fetch_array($result)) {
264            // Check if we know about this type - a disabled module could have orphans.
265            if (isset($node_types[$counter['type']])) {
266              $node_types[$counter['type']] .= ' ('. $counter['count'] .')';
267            }
268            else {
269              $node_types['unknown'] .= $counter['type'] .' ??? ('. $counter['count'] .') ';
270              watchdog('Taxonomy Browser', 'Unknown content type found: @type', array('@type' => $counter['type']), WATCHDOG_WARNING);
271            }
272            $total_count += $counter['count'];
273          }
274        }
275    
276        $omit = array_filter(variable_get('taxonomy_browser_omit', array()));
277        if (!empty($omit)) {
278          foreach ($omit as $omit_type) {
279            unset($node_types[$omit_type]);
280          }
281        }
282        $desc = t('Not selecting any type is the same as selecting all types.');
283        if ($count_nodes) {
284          $desc .= ' '. t('The total count of all types is !count.', array('!count' => $total_count));
285      }      }
286      $form['scope']['node_filter'] = array(      $form['scope']['node_filter'] = array(
287        '#type' => 'radios',  //      '#type' => 'checkboxes',
288          '#type' => $select_type,
289        '#title' => t('Restrict search by content type'),        '#title' => t('Restrict search by content type'),
290        '#options' => $filter_options,        '#options' => $node_types,
291        '#default_value' => 'all',        '#multiple' => TRUE,
292      );        '#prefix' => '<div class="taxonomy_browser_checkboxes">',
293          '#suffix' => '</div>',
294          '#description' => $desc,
295          );
296    }    }
297      else {
298        $form['scope']['node_filter'] = array(
299          '#type' => value,
300          '#value' => array(),
301          );
302      }
303    
304    $form['scope']['operator'] = array(    $form['scope']['operator'] = array(
305      '#type' => 'radios',      '#type' => 'radios',
306      '#title' => t('Items containing'),      '#title' => t('Items containing'),
307      '#options' => array(t('<strong>all</strong> terms'), t('<strong>any</strong> terms')),      '#options' => array(t('<strong>all</strong> terms'), t('<strong>any</strong> terms')),
308      '#default_value' => 0,      '#default_value' => variable_get('taxonomy_browser_default_op', 0),
309    );      '#prefix' => '<div class="taxonomy_browser_radios">',
310        '#suffix' => '</div>',
311        );
312    
313    $vocabularies = variable_get('taxonomy_browser_vocabularies', array());    $vocabularies = array_filter(variable_get('taxonomy_browser_vocabularies', array()));
314      // Occasionally we get a 0 vid in the array.
315      unset($vocabularies[0]);
316    
317      // Has the admin selected any vocabs?
318      if (count($vocabularies) == 0) {
319        $vocabs = taxonomy_get_vocabularies();
320        foreach ($vocabs as $vocabulary) {
321          $vocabularies[$vocabulary->vid] = 1;
322        }
323      }
324    
325      if ($allow_children) {
326        $form['children'] = array(
327          '#type' => 'fieldset',
328          '#title' => t('Include Children'),
329          '#collapsible' => TRUE,
330          '#collapsed' => FALSE,
331          );
332        $form['children']['include_children'] = array(
333          '#type' => 'checkbox',
334          '#title' => t('Automatically include children (sub-terms)'),
335          '#description' => t('If you select a term with children (sub-terms), do you want those child terms automatically included in the search? This requires that "Items containing" be "any."'),
336          );
337      }
338      else {
339        $form['include_children'] = array(
340          '#type' => 'value',
341          '#value' => FALSE,
342          );
343      }
344    
345    $form['taxonomy'] = array(    $form['taxonomy'] = array(
346      '#type' => 'fieldset',      '#type' => 'fieldset',
347      '#title' => t('Categories'),      '#title' => t('Categories'),
348        '#collapsible' => TRUE,
349        '#collapsed' => FALSE,
350      '#tree' => TRUE,      '#tree' => TRUE,
351    );    );
352    
353      $selection_types = array('select', 'checkboxes');
354    $i = 0;    $i = 0;
355    foreach ($vocabularies as $v) {    foreach ($vocabularies as $v => $sel) {
356      $form['taxonomy'][$v] = taxonomy_form($v);      $voc = taxonomy_get_vocabulary($v);
357      $form['taxonomy'][$v]['#weight'] = $i;  
358      $i++;      $voc_node_types = array();
359        if (isset($voc->nodes) && !empty($voc->nodes[0])) {
360          foreach ($voc->nodes as $key => $type) {
361            $voc_node_types[] = $node_types[$type];
362          }
363        }
364        else {
365          drupal_set_message(t('The %name vocabulary does not appear to be associated with any content types.', array('%name' => $voc->name)), 'error');
366        }
367    
368        $count_types = count($voc_node_types);
369        $node_type_list = implode(', ', $voc_node_types);
370    
371        $tree = taxonomy_get_tree($v);
372        $term_opts = array();
373    
374        if ($tree) {
375          foreach ($tree as $term) {
376            $opt_string = NULL;
377            if ($count_nodes) {
378    //          $count = db_result(db_query('SELECT COUNT(nid) FROM {term_node} WHERE tid=%d', $term->tid));
379              $count = taxonomy_term_count_nodes($term->tid);
380              if ($count > 0 || $show_unused) {
381                $opt_string = decode_entities(check_plain($term->name)) .' ('. $count .')';
382              }
383            }
384            else {
385              $opt_string = decode_entities(check_plain($term->name));
386            }
387            if ($opt_string) {
388              $term_opts[$term->tid] = str_repeat('-', $term->depth) . $opt_string;
389            }
390          }
391        }
392    
393        $vocname = check_plain($voc->name);
394        $description = $voc->description ? decode_entities(check_markup($voc->description)) : NULL;
395        if (variable_get('taxonomy_browser_show_types', FALSE)) {
396          $description .= t('"!name" is used for: !types.', array('!name' => '<strong>'. $vocname .'</strong>', '!types' => (empty($node_type_list) ? '<em>'. t('nothing') .'</em>' : $node_type_list)));
397        }
398    
399        if (!empty($term_opts)) {
400          $voc_element = array(
401            '#type' => $select_type,
402            '#title' => $vocname,
403            '#options' => $term_opts,
404            '#multiple' => TRUE,
405            '#description' => $description,
406            '#prefix' => '<div class="taxonomy_browser_'. $select_type .'">',
407            '#suffix' => '</div>',
408            '#field_suffix' => $node_type_list,
409            '#weight' => $i,
410            );
411    
412          if ($collapsible) {
413            $fld_set = 'set'. $voc->vid;
414            $form['taxonomy'][$fld_set] = array(
415              '#type' => 'fieldset',
416              '#title' => $vocname,
417              '#collapsible' => TRUE,
418              '#collapsed' => TRUE,
419              );
420            $form['taxonomy'][$fld_set][$v] = $voc_element;
421          }
422          else {
423            $form['taxonomy'][$v] = $voc_element;
424          }
425          ++$i;
426        }
427    }    }
428    
429    $form['submit'] = array(    $form['submit'] = array(
430      '#type' => 'submit',      '#type' => 'submit',
431      '#value' => t('Search'),      '#value' => t('Search'),
432    );      '#submit' => TRUE,
433        );
434    
435    return drupal_get_form('taxonomy_browser_page', $form);    return $form;
436  }  }
437    
438  /**  /**
# Line 146  function theme_taxonomy_browser_page($fo Line 443  function theme_taxonomy_browser_page($fo
443    
444    $vocabularies = variable_get('taxonomy_browser_vocabularies', array());    $vocabularies = variable_get('taxonomy_browser_vocabularies', array());
445    if (empty($vocabularies)) {    if (empty($vocabularies)) {
446      form_set_error('taxonomy_browser_page', t('You must select the vocabularies to display from the <a href="%link">taxonomy browser settings page</a>.', array ('%link' => url('admin/settings/taxonomy_browser'))));      form_set_error('taxonomy_browser_page', t('You must select the vocabularies to display from the <a href="%link">taxonomy browser settings page</a>.', array('%link' => url('admin/settings/taxonomy_browser'))));
447      return ' ';      return ' ';
448    }    }
449    
450    $output .= form_render($form);    $output .= drupal_render($form);
451    return $output;    return $output;
452  }  }
453    
454  /**  /**
455   * Implementation of hook_form_validate().   * Implementation of hook_form_validate().
456   */   */
457  function taxonomy_browser_page_validate($form_id, $form_values) {  function taxonomy_browser_form_validate($form_id, &$form_values) {
458    $tids = _taxonomy_browser_get_tid_list($form_values['taxonomy']);  
459      $include_children = $form_values['include_children'];
460      $tids = _taxonomy_browser_get_tid_list($form_values['taxonomy'], $include_children);
461    
462      $operator = $form_values['operator'] ? 'or' : 'and';
463    
464      if ($operator == 'and' && $include_children == TRUE) {
465        form_set_error('operator', t('You must use "Items containing <strong>any</strong>" to include child terms.'));
466      }
467    
468    if (empty($tids)) {    if (empty($tids)) {
469      form_set_error('taxonomy', t('You must select at least one category in your search.'));      form_set_error('taxonomy', t('You must select at least one category in your search.'));
470    }    }
471    else {    else {
472      $operator = $form_values['operator'] ? 'or' : 'and';  //    $node_type = (isset($form_values['node_filter']) && $form_values['node_filter'] != 'all') ? $form_values['node_filter'] : NULL;
473      $node_type = (isset($form_values['node_filter']) && $form_values['node_filter'] != 'all') ? $form_values['node_filter'] : NULL;      $node_type = str_replace(',0', '', implode(',', $form_values['node_filter']));
474    
475      if (!taxonomy_browser_count_nodes($tids, $operator, 0, $node_type)) {      if (!taxonomy_browser_count_nodes($tids, $operator, 0, $node_type)) {
476        form_set_error('taxonomy', t('No posts match your criteria.'));        form_set_error('taxonomy', t('No posts match your criteria.'));
477      }      }
# Line 175  function taxonomy_browser_page_validate( Line 481  function taxonomy_browser_page_validate(
481  /**  /**
482   * Implementation of hook_form_submit().   * Implementation of hook_form_submit().
483   */   */
484  function taxonomy_browser_page_submit($form_id, $form_values) {  function taxonomy_browser_form_submit($form_id, &$form_values) {
485    $tids = _taxonomy_browser_get_tid_list();    $tids = _taxonomy_browser_get_tid_list();
486    
487    $operator = $form_values['operator'] ? 'or' : 'and';    $operator = $form_values['operator'] ? 'or' : 'and';
488    $str_tids = ($operator == 'and') ? implode(',', $tids) : implode('+', $tids);    $str_tids = ($operator == 'and') ? implode(',', $tids) : implode('+', $tids);
   $node_type = (isset($form_values['node_filter']) && $form_values['node_filter'] != 'all') ? $form_values['node_filter'] : NULL;  
489    
490    return array('taxonomy/term/'. $str_tids, (isset($node_type) ? 'type='. $node_type : ''));    $types = array_filter($form_values['node_filter']);
491      $node_type = str_replace(',0', '', implode(',', $types));
492    
493      if ($types) {
494        return array('taxonomy/term/'. $str_tids, 'type='. $node_type);
495      }
496      else {
497        return 'taxonomy/term/'. $str_tids;
498      }
499    
500  }  }
501    
502  /********************************************************************  //********************************************************************
503   * Module Functions :: Private  //* Module Functions : Private
504   ********************************************************************/  //********************************************************************
505    
506    /**
507     * Get the output to be displayed by the block.
508     *
509     * @param
510     *   $delta - integer for the block number.
511     *
512     * @return
513     *   array containing the title ("subject") and content of the block.
514     */
515    function _taxonomy_browser_block_view($delta) {
516      $block = array();
517      switch ($delta) {
518        case 0:
519          $block = array(
520            'content' => drupal_get_form('taxonomy_browser_form'),
521            );
522          break;
523      }
524      return $block;
525    }
526    
527  /**  /**
528   * Private function to count the number of nodes found by the user's query.   * Private function to count the number of nodes found by the user's query.
# Line 204  function taxonomy_browser_count_nodes($t Line 540  function taxonomy_browser_count_nodes($t
540        $descendant_tids[] = array_merge(array($tid), array_map('_taxonomy_get_tid_from_term', $tree));        $descendant_tids[] = array_merge(array($tid), array_map('_taxonomy_get_tid_from_term', $tree));
541      }      }
542    
543      $type_where = $nodetype ? "n.type = '". db_escape_string($nodetype). "'" : 1;      $type_where = NULL;
544        if ($nodetype) {
545    //      $type_where = "n.type = '". db_escape_string($nodetype) ."'";
546          $type_where = "n.type IN ('". implode("', '", explode(',', db_escape_string($nodetype))) ."')";
547        }
548    
549      if ($operator == 'or') {      if ($operator == 'or') {
550        $str_tids = implode(',', call_user_func_array('array_merge', $descendant_tids));        $str_tids = implode(',', call_user_func_array('array_merge', $descendant_tids));
551          $sql_count = 'SELECT COUNT(n.nid) FROM {node} n INNER JOIN {term_node} tn USING(nid) WHERE '. ($type_where ? $type_where .' AND ' : NULL) ."tn.tid IN ($str_tids) ORDER BY n.sticky DESC, n.title ASC";
       $sql_count = "SELECT COUNT(n.nid) FROM {node} n INNER JOIN {term_node} tn ON n.nid = tn.nid WHERE $type_where AND tn.tid IN ($str_tids) ORDER BY n.sticky DESC, n.title ASC";  
552      }      }
553      else {      else {
554        $joins = '';        $joins = '';
555        $wheres = array();        $wheres = array();
556        $wheres[] = $type_where;        if ($type_where) {
557            $wheres[] = $type_where;
558          }
559        foreach ($descendant_tids as $index => $tids) {        foreach ($descendant_tids as $index => $tids) {
560          $joins .= ' INNER JOIN {term_node} tn'. $index .' ON n.nid = tn'. $index .'.nid';          $joins .= 'INNER JOIN {term_node} tn'. $index .' ON n.nid = tn'. $index .'.nid ';
561          $wheres[] = 'tn'. $index .'.tid IN ('. implode(',', $tids) .')';          $wheres[] = 'tn'. $index .'.tid IN ('. implode(',', $tids) .')';
562        }        }
563        $sql_count = "SELECT COUNT(n.nid) FROM {node} n $joins WHERE ". implode(' AND ', $wheres);        $sql_count = 'SELECT COUNT(n.nid) FROM {node} n '. $joins .' WHERE '. implode(' AND ', $wheres);
564      }      }
565    
566    //    drupal_set_message('Count query: '. $sql_count);
567      return db_result(db_query(db_rewrite_sql($sql_count)));      return db_result(db_query(db_rewrite_sql($sql_count)));
568    }    }
569    
# Line 231  function taxonomy_browser_count_nodes($t Line 574  function taxonomy_browser_count_nodes($t
574   * Transforms an unpredictably and irregularly nested set of tids (as returned   * Transforms an unpredictably and irregularly nested set of tids (as returned
575   * from a taxonomy form) into a linear array of tids.   * from a taxonomy form) into a linear array of tids.
576   */   */
577  function _taxonomy_browser_get_tid_list($tids = NULL) {  function _taxonomy_browser_get_tid_list($tids = NULL, $include_children = FALSE) {
578    static $tid_list;    static $tid_list;
579    
580    if (isset($tids) && is_array($tids)) {    if (isset($tids) && is_array($tids)) {
581      $tid_list = array();      $tid_list = array();
582      foreach ($tids as $key => $tid) {      foreach ($tids as $key => $tid) {
# Line 241  function _taxonomy_browser_get_tid_list( Line 584  function _taxonomy_browser_get_tid_list(
584          if (is_array($tid)) {          if (is_array($tid)) {
585            foreach ($tid as $key2 => $tid2) {            foreach ($tid as $key2 => $tid2) {
586              if (!empty($tid2)) {              if (!empty($tid2)) {
587                $tid_list[] = $tid2;                $tid_list[$tid2] = $tid2;
588              }              }
589            }            }
590          }          }
591          else {          else {
592            $tid_list[] = $tid;            $tid_list[$tid] = $tid;
593          }          }
594        }        } /* end !empty */
595      }      } /* end foreach */
596    }    }
597    
598      if ($include_children) {
599        foreach ($tid_list as $tid) {
600          _taxonomy_browser_get_kids($tid_list, $tid);
601        }
602      }
603    
604    return $tid_list;    return $tid_list;
605  }  }
606    
607    function _taxonomy_browser_get_kids(&$tid_list, $tid) {
608      $children = taxonomy_get_children($tid);
609      if ($children) {
610        foreach ($children as $child_tid => $child_term) {
611          _taxonomy_browser_get_kids($tid_list, $child_tid);
612        }
613      }
614      else {
615        $tid_list[$tid] = $tid;
616      }
617    }
618    
619  /**  /**
620   * Provides default guideline text.   * Provides default guideline text.
621   */   */
622  function _taxonomy_browser_guidelines_default() {  function _taxonomy_browser_guidelines_default() {
623    return t('<p>You may select multiple items from each list by holding down the <code>Ctrl</code> (Mac: <code>command</code>) key while left-clicking each item.</p>');    return t('<p>You may select multiple items from each list by holding down the <code>Ctrl</code> (Mac: <code>command</code>) key while left-clicking each item.</p>');
624  }  }
   
 ?>  
Legend:
Removed from v.1.19  
changed lines
  Added in v.1.19.2.31
  ViewVC Help
Powered by ViewVC 1.1.2