/[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.2.11, Mon Jan 21 22:39:38 2008 UTC revision 1.19.2.11.2.20, Tue Jul 22 00:47:02 2008 UTC
# Line 1  Line 1 
1  <?php  <?php
2  // $Id: taxonomy_browser.module,v 1.19.2.10 2008/01/21 19:00:48 nancyw Exp $  // $Id: taxonomy_browser.module,v 1.19.2.11.2.19 2008/06/20 04:07:50 nancyw Exp $
3  // Original by Moshe Weitzman (weitzmna@tejasa.com)  // Original by Moshe Weitzman (weitzmna@tejasa.com)
4    
5  /**  /**
# Line 8  Line 8 
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().
17   */   */
18  function taxonomy_browser_menu($may_cache) {  function taxonomy_browser_menu() {
19    $items = array();    $items = array();
20    
21    if ($may_cache) {    $items['taxonomy_browser'] = array(
22      $items[] = array('path' => 'taxonomy_browser', 'title' => t('Category Browser'),      'title' => 'Category Browser',
23        'access' => user_access('access content'),      'page callback' => 'taxonomy_browser_page',
24        'callback' => 'taxonomy_browser_page',      'access arguments' => array('access content'),
25        'weight' => 7,      'description' => 'Find content on your own terms.',
26        'type' => MENU_NORMAL_ITEM);      );
27    
28      $items[] = array(    $items['admin/settings/taxonomy-browser'] = array(
29        'path' => 'admin/settings/taxonomy-browser',      'title' => 'Taxonomy Browser',
30        'title' => t('Taxonomy Browser'),      'description' => 'Set usage guidelines and included vocabularies.',
31        'description' => t('Set usage guidelines and included vocabularies.'),      'page callback' => 'drupal_get_form',
32        'callback' => 'drupal_get_form',      'page arguments' => array('taxonomy_browser_admin_settings'),
33        'callback arguments' => 'taxonomy_browser_admin_settings',      'access arguments' => array('administer site configuration'),
34        'access' => user_access('administer site configuration'),      );
       );  
   }  
   else {  
     drupal_add_css(drupal_get_path('module', 'taxonomy_browser') .'/taxonomy_browser.css');  
   }  
35    
36    return $items;    return $items;
37  }  }
38    
39  /**  /**
40     * Implementation of hook_init().
41     */
42    function taxonomy_browser_init() {
43      drupal_add_css(drupal_get_path('module', 'taxonomy_browser') .'/taxonomy_browser.css');
44    }
45    
46    /**
47   * Implementation of hook_help().   * Implementation of hook_help().
48   */   */
49  function taxonomy_browser_help($section = '') {  function taxonomy_browser_help($path, $arg) {
50    switch ($section) {    switch ($path) {
51      case 'admin/modules#description':      case 'admin/modules#description':
52        return t('An interface for viewing content grouped by arbitrary taxonomy terms.');        return t('An interface for viewing content grouped by arbitrary taxonomy terms.');
53      case 'taxonomy_browser':      case 'taxonomy_browser':
54        return variable_get('taxonomy_browser_guidelines', _taxonomy_browser_guidelines_default());        $output = check_markup(variable_get('taxonomy_browser_guidelines', _taxonomy_browser_guidelines_default()));
55          if (user_access('administer site configuration')) {
56            $output .= '<p class="links">'. l(t('Go to Taxonomy Browser settings'), 'admin/settings/taxonomy-browser', array('query' => drupal_get_destination())) .'</p>';
57          }
58          return $output;
59    }    }
60  }  }
61    
62  /********************************************************************  /**
63   * Drupal Hooks :: Core   * Implementation of hook_perm().
64   ********************************************************************/   */
65    function taxonomy_browser_perm() {
66      if (variable_get('taxonomy_browser_need_perm', false)) {
67        return array('access taxonomy browser');
68      }
69      else {
70        return array();
71      }
72    }
73    
74    /**
75     * Implementation of hook_menu_alter().
76     */
77    function taxonomy_browser_menu_alter(&$callbacks) {
78      $callbacks['taxonomy_browser']['access arguments'] = array(variable_get('taxonomy_browser_need_perm', false) ? 'access taxonomy browser' : 'access content');
79    }
80    
81    //********************************************************************
82    //* Drupal Hooks : Core
83    //********************************************************************
84    
85    /**
86     * Implementation of hook_block().
87     */
88    function taxonomy_browser_block($op = 'list', $delta = 0, $edit = array()) {
89      $block = array();
90      switch ($op) {
91        case 'list':
92          $block[0]['info'] = t('Category browser');
93          return $block;
94    
95        case 'view':
96          switch ($delta) {
97            case 0:
98              $block = _taxonomy_browser_block_view($delta);
99              break;
100          }
101          return $block;
102      }
103    }
104    
105  /**  /**
106   * Implementation of hook_settings().   * Settings form.
107   */   */
108  function taxonomy_browser_admin_settings() {  function taxonomy_browser_admin_settings() {
109    if (!module_exists('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(    $form['taxonomy_browser_select_type'] = array(
124      '#title' => t('Selection type'),      '#title' => t('Selection type'),
125      '#type' => 'radios',      '#type' => 'radios',
126      '#default_value' => variable_get('taxonomy_browser_select_type', 0),      '#default_value' => variable_get('taxonomy_browser_select_type', 1),
127      '#options' => array(t('Selection box'), t('Check boxes')),      '#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.'),      '#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_default_op'] = array(
134        '#title' => t('"Items containing" default'),
135        '#type' => 'radios',
136        '#default_value' => variable_get('taxonomy_browser_default_op', 0),
137        '#options' => array(t('All'), t('Any')),
138        '#description' => t('This option determines which "Items containing" choice is the default.'),
139        '#prefix' => '<div class="taxonomy_browser_radios">',
140        '#suffix' => '</div>',
141        );
142    
143    $form['taxonomy_browser_count_nodes'] = array(    $form['taxonomy_browser_count_nodes'] = array(
144      '#title' => t('Show node count'),      '#title' => t('Show node count'),
145      '#type' => 'checkbox',      '#type' => 'checkbox',
146      '#default_value' => variable_get('taxonomy_browser_count_nodes', false),      '#default_value' => variable_get('taxonomy_browser_count_nodes', false),
147      '#description' => t('Do you want to display the count of nodes tagged with each term? This can be SQL-intensive.'),      '#description' => t('Do you want to display the count of nodes tagged with each term? This can be SQL-intensive.'),
148    );      );
149    
150    $form['taxonomy_browser_show_unused'] = array(    $form['taxonomy_browser_show_unused'] = array(
151      '#title' => t('Show unused terms'),      '#title' => t('Show unused terms'),
152      '#type' => 'checkbox',      '#type' => 'checkbox',
153      '#default_value' => variable_get('taxonomy_browser_show_unused', false),      '#default_value' => variable_get('taxonomy_browser_show_unused', false),
154      '#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.'),      '#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.'),
155    );      );
156    
157      $form['taxonomy_browser_allow_children'] = array(
158        '#title' => t('Allow child terms to be included'),
159        '#type' => 'checkbox',
160        '#default_value' => variable_get('taxonomy_browser_allow_children', false),
161        '#description' => t('Do you want the user to see a check box to include child terms (sub-terms)?'),
162        );
163    
164      $form['taxonomy_browser_need_perm'] = array(
165        '#title' => t('Requires permission'),
166        '#type' => 'checkbox',
167        '#default_value' => variable_get('taxonomy_browser_need_perm', false),
168        '#description' => t('Do you want to require permission to see the browser page? If you change this you need to clear the menu cache, such as at <a href="!clear">the Performance page</a>.', array('!clear' => url('admin/settings/performance'))),
169        );
170    
171      $select = array();
172    $vocabularies = taxonomy_get_vocabularies();    $vocabularies = taxonomy_get_vocabularies();
173    foreach ($vocabularies as $vocabulary) {    foreach ($vocabularies as $vocabulary) {
174      $select[$vocabulary->vid] = $vocabulary->name;      $select[$vocabulary->vid] = $vocabulary->name;
175    }    }
176    
177    $form['taxonomy_browser_vocabularies'] = array(    $form['taxonomy_browser_vocabularies'] = array(
178      '#title' => t('Included Vocabularies'),      '#title' => t('Included Vocabularies'),
179      '#type' => 'select',      '#type' => 'checkboxes',
 //    '#type' => 'checkboxes',  
180      '#default_value' => variable_get('taxonomy_browser_vocabularies', array()),      '#default_value' => variable_get('taxonomy_browser_vocabularies', array()),
181      '#options' => $select,      '#options' => $select,
182      '#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.'),
183      '#multiple' => true,      '#prefix' => '<div class="taxonomy_browser_checkboxes">',
184      '#size' => min(10, count($select)),      '#suffix' => '</div>',
185    );      );
186    
187    if (module_exists('node_type_filter')) {    if (module_exists('node_type_filter')) {
188      $filter_options = array_merge(array('' => '-none-'), node_get_types('names'));      $filter_options = node_get_types('names');
     // If we switch to checkboxes, taxonomy_browser_form_submit gets an array instead of a single value.  
189      $form['taxonomy_browser_omit'] = array(      $form['taxonomy_browser_omit'] = array(
190        '#type' => 'select',        '#type' => 'checkboxes',
191        '#title' => t('Omit content types'),        '#title' => t('Omit content types'),
192        '#options' => $filter_options,        '#options' => $filter_options,
193        '#multiple' => true,        '#default_value' => variable_get('taxonomy_browser_omit', array('')),
       '#size' => min(10, count($filter_options)),  
       '#default_value' => variable_get('taxonomy_browser_omit', array()),  
194        '#description' => t('If any of these types is selected, it will be omitted from the list on the "Category Browser" page.'),        '#description' => t('If any of these types is selected, it will be omitted from the list on the "Category Browser" page.'),
195      );        '#prefix' => '<div class="taxonomy_browser_checkboxes">',
196          '#suffix' => '</div>',
197          );
198    }    }
199    
200     return system_settings_form($form);    return system_settings_form($form);
201    }
202    
203    function taxonomy_browser_admin_settings_validate($form, &$form_state) {
204      if ($form_state['values']['taxonomy_browser_count_nodes'] == false
205        && $form_state['values']['taxonomy_browser_show_unused'] == true) {
206        form_set_error('taxonomy_browser_show_unused', t('"Show unused" requires "count nodes."'));
207      }
208  }  }
209    
210  /********************************************************************  //********************************************************************
211   * Module Functions : Public  //* Module Functions : Public
212   ********************************************************************/  //********************************************************************
213    
214  /**  /**
215   * Menu callback: the query building interface for nodes selected based on   * Menu callback: the query building interface for nodes selected based on
# Line 142  function taxonomy_browser_page() { Line 222  function taxonomy_browser_page() {
222    
223  function taxonomy_browser_form() {  function taxonomy_browser_form() {
224    $form = array();    $form = array();
225      $selection_types = array('select', 'checkboxes');
226      $select_type = $selection_types[variable_get('taxonomy_browser_select_type', 1)];
227    $count_nodes = variable_get('taxonomy_browser_count_nodes', false);    $count_nodes = variable_get('taxonomy_browser_count_nodes', false);
228    $show_unused = variable_get('taxonomy_browser_show_unused', false);    $show_unused = variable_get('taxonomy_browser_show_unused', false);
229      $allow_children = variable_get('taxonomy_browser_allow_children', false);
230      $node_types = node_get_types('names');
231    
232    $form['scope'] = array(    $form['scope'] = array(
233      '#type' => 'fieldset',      '#type' => 'fieldset',
234      '#title' => t('Scope'),      '#title' => t('Scope'),
235      '#collapsed' => true,      '#collapsible' => true,
236      '#collapsible' => false,      '#collapsed' => false,
237    );      '#attributes' => array('class' => 'taxonomy_browser_scope'),
238        );
239    
240    if (module_exists('node_type_filter')) {    if (module_exists('node_type_filter')) {
     $filter_options = array_merge(array('all' => t('all')), node_get_types('names'));  
241      if ($count_nodes) {      if ($count_nodes) {
242        $total_count = 0;        $total_count = 0;
243        $result = db_query('SELECT type, COUNT(nid) AS count FROM {node} WHERE status=1 GROUP BY type ORDER BY type');        $result = db_query('SELECT DISTINCT(type), COUNT(nid) AS count FROM {node} WHERE status=1 GROUP BY type ORDER BY type');
244        while ($counter = db_fetch_array($result)) {        while ($counter = db_fetch_array($result)) {
245          $filter_options[$counter['type']] .= ' ('. $counter['count'] .')';          // Check if we know about this type - a disabled module could have orphans.
246            if (isset($node_types[$counter['type']])) {
247              $node_types[$counter['type']] .= ' ('. $counter['count'] .')';
248            }
249            else {
250              $node_types['unknown'] .= '<em>'. $counter['type'];
251              $node_types['unknown'] .= '</em>??? ('. $counter['count'] .') ';
252              watchdog('Taxonomy Browser', 'Unknown content type found: @type', array('@type' => $counter['type']), WATCHDOG_WARNING);
253            }
254          $total_count += $counter['count'];          $total_count += $counter['count'];
255        }        }
       $filter_options['all'] .= ' ('. $total_count .')';  
256      }      }
257      $omit = variable_get('taxonomy_browser_omit', array());  
258        $omit = array_filter(variable_get('taxonomy_browser_omit', array()));
259      if (!empty($omit)) {      if (!empty($omit)) {
260        foreach ($omit as $value) {        foreach ($omit as $omit_type) {
261          unset($filter_options[$value]);          unset($node_types[$omit_type]);
262        }        }
263      }      }
264      // If we switch to checkboxes, taxonomy_browser_form_submit gets an array instead of a single value.      $desc = t('Not selecting any type is the same as selecting all types.');
265        if ($count_nodes) {
266          $desc .= ' '. t('The total count of all types is !count.', array('!count' => $total_count));
267        }
268      $form['scope']['node_filter'] = array(      $form['scope']['node_filter'] = array(
269        '#type' => 'radios',        '#type' => $select_type,
 //      '#type' => 'checkboxes',  
270        '#title' => t('Restrict search by content type'),        '#title' => t('Restrict search by content type'),
271        '#options' => $filter_options,        '#options' => $node_types,
272        '#default_value' => 'all',        '#multiple' => true,
273      );        '#prefix' => '<div class="taxonomy_browser_checkboxes">',
274          '#suffix' => '</div>',
275          '#description' => $desc,
276          );
277      }
278      else {
279        $form['scope']['node_filter'] = array(
280          '#type' => value,
281          '#value' => array(),
282          );
283    }    }
284    
285    $form['scope']['operator'] = array(    $form['scope']['operator'] = array(
286      '#type' => 'radios',      '#type' => 'radios',
287      '#title' => t('Items containing'),      '#title' => t('Items containing'),
288      '#options' => array(t('<strong>all</strong> terms'), t('<strong>any</strong> terms')),      '#options' => array(t('<strong>all</strong> terms'), t('<strong>any</strong> terms')),
289      '#default_value' => 0,      '#default_value' => variable_get('taxonomy_browser_default_op', 0),
290    );      '#prefix' => '<div class="taxonomy_browser_radios">',
291        '#suffix' => '</div>',
292        );
293    
294    $vocabularies = variable_get('taxonomy_browser_vocabularies', array());    $vocabularies = array_filter(variable_get('taxonomy_browser_vocabularies', array()));
295      // Has the admin selected any vocabs?
296      if (count($vocabularies) == 0) {
297        $vocabs = taxonomy_get_vocabularies();
298        foreach ($vocabs as $vocabulary) {
299          $vocabularies[$vocabulary->vid] = 1;
300        }
301      }
302    
303      if ($allow_children) {
304        $form['children'] = array(
305          '#type' => 'fieldset',
306          '#title' => t('Include Children'),
307          '#collapsible' => true,
308          '#collapsed' => false,
309          );
310        $form['children']['include_children'] = array(
311          '#type' => 'checkbox',
312          '#title' => t('Automatically include children (sub-terms)'),
313          '#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."'),
314          );
315      }
316      else {
317        $form['include_children'] = array(
318          '#type' => 'value',
319          '#value' => false,
320          );
321      }
322    
323    $form['taxonomy'] = array(    $form['taxonomy'] = array(
324      '#type' => 'fieldset',      '#type' => 'fieldset',
# Line 196  function taxonomy_browser_form() { Line 328  function taxonomy_browser_form() {
328      '#tree' => TRUE,      '#tree' => TRUE,
329    );    );
330    
331    $types = array('select', 'checkboxes');    $selection_types = array('select', 'checkboxes');
332    $i = 0;    $i = 0;
333    foreach ($vocabularies as $v) {    foreach ($vocabularies as $v => $sel) {
334      $voc = taxonomy_get_vocabulary($v);      $voc = taxonomy_vocabulary_load($v);
335    
336        $voc_node_types = array();
337        if (isset($voc->nodes) && !empty($voc->nodes)) {
338          foreach ($voc->nodes as $key => $type) {
339            $voc_node_types[] = $node_types[$type];
340          }
341        }
342        else {
343          drupal_set_message(t('The %name vocabulary does not appear to be associated with any content types.', array('%name' => $voc->name)), 'warning');
344        }
345    
346        $count_types = count($voc_node_types);
347        if (count($voc_node_types) == 1) {
348          $node_type_list = $voc_node_types[0];
349        }
350        else {
351          $node_type_list = implode(', ', $voc_node_types);
352        }
353    
354      $tree = taxonomy_get_tree($v);      $tree = taxonomy_get_tree($v);
355      $term_opts = array();      $term_opts = array();
356    
357      if ($tree) {      if ($tree) {
358        foreach ($tree as $term) {        foreach ($tree as $term) {
359            $opt_string = null;
360          if ($count_nodes) {          if ($count_nodes) {
361            $count = db_result(db_query("SELECT COUNT(nid) FROM {term_node} WHERE tid=%d", $term->tid));            $count = taxonomy_term_count_nodes($term->tid);
362            if ($count > 0 || $show_unused) {            if ($count > 0 || $show_unused) {
363              $term_opts[$term->tid] = str_repeat('-', $term->depth) . $term->name .' ('. $count .')';              $opt_string = decode_entities(check_plain($term->name)) .' ('. $count .')';
364            }            }
365          }          }
366          else {          else {
367            $term_opts[$term->tid] = str_repeat('-', $term->depth) . $term->name;            $opt_string = decode_entities(check_plain($term->name));
368            }
369            if ($opt_string) {
370              $term_opts[$term->tid] = str_repeat('-', $term->depth) . $opt_string;
371          }          }
372        }        }
373      }      }
374    
375      $type = $types[variable_get('taxonomy_browser_select_type', 0)];      $vocname = check_plain($voc->name);
376        $description = $voc->description ? decode_entities(check_markup($voc->description)) : null;
377        $description .= t('"!name" is used for: !types.', array('!name' => '<strong>'. $vocname .'</strong>', '!types' => (empty($node_type_list) ? '<em>'. t('nothing') .'</em>' : $node_type_list)));
378      if (!empty($term_opts)) {      if (!empty($term_opts)) {
379        $form['taxonomy'][$v] = array('#type' => $type,        $form['taxonomy'][$v] = array(
380          '#title' => $voc->name,          '#type' => $select_type,
381          '#default_value' => $value,          '#title' => $vocname,
382          '#options' => $term_opts,          '#options' => $term_opts,
383          '#multiple' => true,          '#multiple' => true,
384          '#description' => $voc->description,          '#description' => $description,
385          '#size' => min(10, count($term_opts)),          '#size' => min(10, count($term_opts)),
386          '#prefix' => '<div class="taxonomy_browser_'. $type .'">',          '#prefix' => '<div class="taxonomy_browser_'. $select_type .'">',
387          '#suffix' => '</div>',          '#suffix' => '</div>',
388            '#field_suffix' => $node_type_list,
389          '#weight' => $i,          '#weight' => $i,
390          );          );
391        $i++;        ++$i;
392      }      }
393    }    }
394    
395    $form['submit'] = array(    $form['submit'] = array(
396      '#type' => 'submit',      '#type' => 'submit',
397      '#value' => t('Search'),      '#value' => t('Search'),
398      '#submit' => TRUE,  //    '#submit' => TRUE,
399    );      );
400    
401    return $form;    return $form;
402  }  }
403    
404  /**  /**
405     * Implementation of hook_theme().
406     */
407    function taxonomy_browser_theme() {
408      return array(
409        'taxonomy_browser_page' => array(
410          'arguments' => array('form'),
411        ),
412      );
413    }
414    
415    /**
416   * Themable form output for the category browser page.   * Themable form output for the category browser page.
417   */   */
418  function theme_taxonomy_browser_page($form) {  function theme_taxonomy_browser_page($form) {
# Line 262  function theme_taxonomy_browser_page($fo Line 431  function theme_taxonomy_browser_page($fo
431  /**  /**
432   * Implementation of hook_form_validate().   * Implementation of hook_form_validate().
433   */   */
434  function taxonomy_browser_form_validate($form_id, $form_values) {  function taxonomy_browser_form_validate($form, &$form_state) {
435    $tids = _taxonomy_browser_get_tid_list($form_values['taxonomy']);  
436      $include_children = $form_state['values']['include_children'];
437      $tids = _taxonomy_browser_get_tid_list($form_state['values']['taxonomy'], $include_children);
438    
439      $operator = $form_state['values']['operator'] ? 'or' : 'and';
440    
441      if ($operator == 'and' && $include_children == true) {
442        form_set_error('operator', t('You must use "Items containing <strong>any</strong>" to include child terms.'));
443      }
444    
445    if (empty($tids)) {    if (empty($tids)) {
446      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.'));
447    }    }
448    else {    else {
449      $operator = $form_values['operator'] ? 'or' : 'and';  //    $node_type = (isset($form_values['node_filter']) && $form_values['node_filter'] != 'all') ? $form_values['node_filter'] : NULL;
450      $node_type = (isset($form_values['node_filter']) && $form_values['node_filter'] != 'all') ? $form_values['node_filter'] : NULL;      $node_type = str_replace(',0', '', implode(',', $form_state['values']['node_filter']));
451    
452      if (!taxonomy_browser_count_nodes($tids, $operator, 0, $node_type)) {      if (!taxonomy_browser_count_nodes($tids, $operator, 0, $node_type)) {
453        form_set_error('taxonomy', t('No posts match your criteria.'));        form_set_error('taxonomy', t('No posts match your criteria.'));
454      }      }
# Line 280  function taxonomy_browser_form_validate( Line 458  function taxonomy_browser_form_validate(
458  /**  /**
459   * Implementation of hook_form_submit().   * Implementation of hook_form_submit().
460   */   */
461  function taxonomy_browser_form_submit($form_id, $form_values) {  function taxonomy_browser_form_submit($form, &$form_state) {
462    $tids = _taxonomy_browser_get_tid_list();    $tids = _taxonomy_browser_get_tid_list();
463    
464    $operator = $form_values['operator'] ? 'or' : 'and';    $operator = $form_state['values']['operator'] ? 'or' : 'and';
465    $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;  
466    
467    return array('taxonomy/term/'. $str_tids, (isset($node_type) ? 'type='. $node_type : ''));    $types = array_filter($form_state['values']['node_filter']);
468      $node_type = str_replace(',0', '', implode(',', $types));
469    
470      if ($types) {
471        $redir = array('taxonomy/term/'. $str_tids, (isset($node_type) ? 'type='. $node_type : ''));
472      }
473      else {
474        $redir = 'taxonomy/term/'. $str_tids;
475      }
476    
477      $form_state['redirect'] = $redir;
478  }  }
479    
480  /********************************************************************  //********************************************************************
481   * Module Functions :: Private  //* Module Functions : Private
482   ********************************************************************/  //********************************************************************
483    
484    /**
485     * Get the output to be displayed by the block.
486     *
487     * @param
488     *   $delta - integer for the block number.
489     *
490     * @return
491     *   array containing the title ("subject") and content of the block.
492     */
493    function _taxonomy_browser_block_view($delta) {
494      $block = array();
495      switch ($delta) {
496        case 0:
497          $block = array(
498            'content' => drupal_get_form('taxonomy_browser_form'),
499            );
500          break;
501      }
502      return $block;
503    }
504    
505  /**  /**
506   * 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 312  function taxonomy_browser_count_nodes($t Line 520  function taxonomy_browser_count_nodes($t
520    
521      $type_where = null;      $type_where = null;
522      if ($nodetype) {      if ($nodetype) {
523        $type_where = "n.type = '". db_escape_string($nodetype) ."'";  //      $type_where = "n.type = '". db_escape_string($nodetype) ."'";
524          $type_where = "n.type IN ('". implode("', '", explode(',', db_escape_string($nodetype))) ."')";
525      }      }
526    
527      if ($operator == 'or') {      if ($operator == 'or') {
528        $str_tids = implode(',', call_user_func_array('array_merge', $descendant_tids));        $str_tids = implode(',', call_user_func_array('array_merge', $descendant_tids));
529    
# Line 326  function taxonomy_browser_count_nodes($t Line 536  function taxonomy_browser_count_nodes($t
536          $wheres[] = $type_where;          $wheres[] = $type_where;
537        }        }
538        foreach ($descendant_tids as $index => $tids) {        foreach ($descendant_tids as $index => $tids) {
539          $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 ';
540          $wheres[] = 'tn'. $index .'.tid IN ('. implode(',', $tids) .')';          $wheres[] = 'tn'. $index .'.tid IN ('. implode(',', $tids) .')';
541        }        }
542        $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);
543      }      }
544    
545      return db_result(db_query(db_rewrite_sql($sql_count)));      return db_result(db_query(db_rewrite_sql($sql_count)));
# Line 342  function taxonomy_browser_count_nodes($t Line 552  function taxonomy_browser_count_nodes($t
552   * Transforms an unpredictably and irregularly nested set of tids (as returned   * Transforms an unpredictably and irregularly nested set of tids (as returned
553   * from a taxonomy form) into a linear array of tids.   * from a taxonomy form) into a linear array of tids.
554   */   */
555  function _taxonomy_browser_get_tid_list($tids = NULL) {  function _taxonomy_browser_get_tid_list($tids = null, $include_children = false) {
556    static $tid_list;    static $tid_list;
557    
558    if (isset($tids) && is_array($tids)) {    if (isset($tids) && is_array($tids)) {
559      $tid_list = array();      $tid_list = array();
560      foreach ($tids as $key => $tid) {      foreach ($tids as $key => $tid) {
# Line 352  function _taxonomy_browser_get_tid_list( Line 562  function _taxonomy_browser_get_tid_list(
562          if (is_array($tid)) {          if (is_array($tid)) {
563            foreach ($tid as $key2 => $tid2) {            foreach ($tid as $key2 => $tid2) {
564              if (!empty($tid2)) {              if (!empty($tid2)) {
565                $tid_list[] = $tid2;                $tid_list[$tid2] = $tid2;
566              }              }
567            }            }
568          }          }
569          else {          else {
570            $tid_list[] = $tid;            $tid_list[$tid] = $tid;
571          }          }
572        }        } /* end !empty */
573      }      } /* end foreach */
574    }    }
575    
576      if ($include_children) {
577        foreach ($tid_list as $tid) {
578          _taxonomy_browser_get_kids($tid_list, $tid);
579        }
580      }
581    
582    return $tid_list;    return $tid_list;
583  }  }
584    
585    function _taxonomy_browser_get_kids(&$tid_list, $tid) {
586      $children = taxonomy_get_children($tid);
587      if ($children) {
588        foreach ($children as $child_tid => $child_term) {
589          _taxonomy_browser_get_kids($tid_list, $child_tid);
590        }
591      }
592      else {
593        $tid_list[$tid] = $tid;
594      }
595    }
596    
597  /**  /**
598   * Provides default guideline text.   * Provides default guideline text.
599   */   */
Legend:
Removed from v.1.19.2.11  
changed lines
  Added in v.1.19.2.11.2.20
  ViewVC Help
Powered by ViewVC 1.1.2