/[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.21, Thu Aug 14 14:27:30 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.20 2008/07/22 00:47:02 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     * 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   * Drupal Hooks :: Core   * 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_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(    $form['taxonomy_browser_count_nodes'] = array(
151      '#title' => t('Show node count'),      '#title' => t('Show node count'),
152      '#type' => 'checkbox',      '#type' => 'checkbox',
153      '#default_value' => variable_get('taxonomy_browser_count_nodes', false),      '#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.'),      '#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(    $form['taxonomy_browser_show_unused'] = array(
158      '#title' => t('Show unused terms'),      '#title' => t('Show unused terms'),
159      '#type' => 'checkbox',      '#type' => 'checkbox',
160      '#default_value' => variable_get('taxonomy_browser_show_unused', false),      '#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.'),      '#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? 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'))),
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    $form['taxonomy_browser_vocabularies'] = array(    $form['taxonomy_browser_vocabularies'] = array(
192      '#title' => t('Included Vocabularies'),      '#title' => t('Included Vocabularies'),
193      '#type' => 'select',      '#type' => 'checkboxes',
 //    '#type' => 'checkboxes',  
194      '#default_value' => variable_get('taxonomy_browser_vocabularies', array()),      '#default_value' => variable_get('taxonomy_browser_vocabularies', array()),
195      '#options' => $select,      '#options' => $select,
196      '#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.'),
197      '#multiple' => true,      '#prefix' => '<div class="taxonomy_browser_checkboxes">',
198      '#size' => min(10, count($select)),      '#suffix' => '</div>',
199    );      );
200    
201    if (module_exists('node_type_filter')) {    if (module_exists('node_type_filter')) {
202      $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.  
203      $form['taxonomy_browser_omit'] = array(      $form['taxonomy_browser_omit'] = array(
204        '#type' => 'select',        '#type' => 'checkboxes',
205        '#title' => t('Omit content types'),        '#title' => t('Omit content types'),
206        '#options' => $filter_options,        '#options' => $filter_options,
207        '#multiple' => true,        '#default_value' => variable_get('taxonomy_browser_omit', array('')),
       '#size' => min(10, count($filter_options)),  
       '#default_value' => variable_get('taxonomy_browser_omit', array()),  
208        '#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.'),
209      );        '#prefix' => '<div class="taxonomy_browser_checkboxes">',
210          '#suffix' => '</div>',
211          );
212    }    }
213    
214     return system_settings_form($form);    return system_settings_form($form);
215  }  }
216    
217  /********************************************************************  function taxonomy_browser_admin_settings_validate($form, &$form_state) {
218   * Module Functions : Public    if ($form_state['values']['taxonomy_browser_count_nodes'] == FALSE
219   ********************************************************************/      && $form_state['values']['taxonomy_browser_show_unused'] == TRUE) {
220        form_set_error('taxonomy_browser_show_unused', t('"Show unused" requires "count nodes."'));
221      }
222    }
223    
224    //********************************************************************
225    //* Module Functions : Public
226    //********************************************************************
227    
228  /**  /**
229   * 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 236  function taxonomy_browser_page() {
236    
237  function taxonomy_browser_form() {  function taxonomy_browser_form() {
238    $form = array();    $form = array();
239    $count_nodes = variable_get('taxonomy_browser_count_nodes', false);    $selection_types = array('select', 'checkboxes');
240    $show_unused = variable_get('taxonomy_browser_show_unused', false);    $select_type = $selection_types[variable_get('taxonomy_browser_select_type', 1)];
241      $collapsible = variable_get('taxonomy_browser_collapse', FALSE) && ($select_type == 'checkboxes');
242      $count_nodes = variable_get('taxonomy_browser_count_nodes', FALSE);
243      $show_unused = variable_get('taxonomy_browser_show_unused', FALSE);
244      $allow_children = variable_get('taxonomy_browser_allow_children', FALSE);
245      $node_types = node_get_types('names');
246    
247    $form['scope'] = array(    $form['scope'] = array(
248      '#type' => 'fieldset',      '#type' => 'fieldset',
249      '#title' => t('Scope'),      '#title' => t('Scope'),
250      '#collapsed' => true,      '#collapsible' => TRUE,
251      '#collapsible' => false,      '#collapsed' => FALSE,
252    );      '#attributes' => array('class' => 'taxonomy_browser_scope'),
253        );
254    
255    if (module_exists('node_type_filter')) {    if (module_exists('node_type_filter')) {
     $filter_options = array_merge(array('all' => t('all')), node_get_types('names'));  
256      if ($count_nodes) {      if ($count_nodes) {
257        $total_count = 0;        $total_count = 0;
258        $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');
259        while ($counter = db_fetch_array($result)) {        while ($counter = db_fetch_array($result)) {
260          $filter_options[$counter['type']] .= ' ('. $counter['count'] .')';          // Check if we know about this type - a disabled module could have orphans.
261            if (isset($node_types[$counter['type']])) {
262              $node_types[$counter['type']] .= ' ('. $counter['count'] .')';
263            }
264            else {
265              $node_types['unknown'] .= $counter['type'] .' ??? ('. $counter['count'] .') ';
266              watchdog('Taxonomy Browser', 'Unknown content type found: @type', array('@type' => $counter['type']), WATCHDOG_WARNING);
267            }
268          $total_count += $counter['count'];          $total_count += $counter['count'];
269        }        }
       $filter_options['all'] .= ' ('. $total_count .')';  
270      }      }
271      $omit = variable_get('taxonomy_browser_omit', array());  
272        $omit = array_filter(variable_get('taxonomy_browser_omit', array()));
273      if (!empty($omit)) {      if (!empty($omit)) {
274        foreach ($omit as $value) {        foreach ($omit as $omit_type) {
275          unset($filter_options[$value]);          unset($node_types[$omit_type]);
276        }        }
277      }      }
278      // 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.');
279        if ($count_nodes) {
280          $desc .= ' '. t('The total count of all types is !count.', array('!count' => $total_count));
281        }
282      $form['scope']['node_filter'] = array(      $form['scope']['node_filter'] = array(
283        '#type' => 'radios',        '#type' => $select_type,
 //      '#type' => 'checkboxes',  
284        '#title' => t('Restrict search by content type'),        '#title' => t('Restrict search by content type'),
285        '#options' => $filter_options,        '#options' => $node_types,
286        '#default_value' => 'all',        '#multiple' => TRUE,
287      );        '#prefix' => '<div class="taxonomy_browser_checkboxes">',
288          '#suffix' => '</div>',
289          '#description' => $desc,
290          );
291      }
292      else {
293        $form['scope']['node_filter'] = array(
294          '#type' => value,
295          '#value' => array(),
296          );
297    }    }
298    
299    $form['scope']['operator'] = array(    $form['scope']['operator'] = array(
300      '#type' => 'radios',      '#type' => 'radios',
301      '#title' => t('Items containing'),      '#title' => t('Items containing'),
302      '#options' => array(t('<strong>all</strong> terms'), t('<strong>any</strong> terms')),      '#options' => array(t('<strong>all</strong> terms'), t('<strong>any</strong> terms')),
303      '#default_value' => 0,      '#default_value' => variable_get('taxonomy_browser_default_op', 0),
304    );      '#prefix' => '<div class="taxonomy_browser_radios">',
305        '#suffix' => '</div>',
306        );
307    
308    $vocabularies = variable_get('taxonomy_browser_vocabularies', array());    $vocabularies = array_filter(variable_get('taxonomy_browser_vocabularies', array()));
309      // Has the admin selected any vocabs?
310      if (count($vocabularies) == 0) {
311        $vocabs = taxonomy_get_vocabularies();
312        foreach ($vocabs as $vocabulary) {
313          $vocabularies[$vocabulary->vid] = 1;
314        }
315      }
316    
317      if ($allow_children) {
318        $form['children'] = array(
319          '#type' => 'fieldset',
320          '#title' => t('Include Children'),
321          '#collapsible' => TRUE,
322          '#collapsed' => FALSE,
323          );
324        $form['children']['include_children'] = array(
325          '#type' => 'checkbox',
326          '#title' => t('Automatically include children (sub-terms)'),
327          '#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."'),
328          );
329      }
330      else {
331        $form['include_children'] = array(
332          '#type' => 'value',
333          '#value' => FALSE,
334          );
335      }
336    
337    $form['taxonomy'] = array(    $form['taxonomy'] = array(
338      '#type' => 'fieldset',      '#type' => 'fieldset',
339      '#title' => t('Categories'),      '#title' => t('Categories'),
340      '#collapsible' => true,      '#collapsible' => TRUE,
341      '#collapsed' => false,      '#collapsed' => FALSE,
342      '#tree' => TRUE,      '#tree' => TRUE,
343    );    );
344    
345    $types = array('select', 'checkboxes');    $selection_types = array('select', 'checkboxes');
346    $i = 0;    $i = 0;
347    foreach ($vocabularies as $v) {    foreach ($vocabularies as $v => $sel) {
348      $voc = taxonomy_get_vocabulary($v);      $voc = taxonomy_vocabulary_load($v);
349    
350        $voc_node_types = array();
351        if (isset($voc->nodes) && !empty($voc->nodes)) {
352          foreach ($voc->nodes as $key => $type) {
353            $voc_node_types[] = $node_types[$type];
354          }
355        }
356        else {
357          drupal_set_message(t('The %name vocabulary does not appear to be associated with any content types.', array('%name' => $voc->name)), 'warning');
358        }
359    
360        $count_types = count($voc_node_types);
361        if (count($voc_node_types) == 1) {
362          $node_type_list = $voc_node_types[0];
363        }
364        else {
365          $node_type_list = implode(', ', $voc_node_types);
366        }
367    
368      $tree = taxonomy_get_tree($v);      $tree = taxonomy_get_tree($v);
369      $term_opts = array();      $term_opts = array();
370    
371      if ($tree) {      if ($tree) {
372        foreach ($tree as $term) {        foreach ($tree as $term) {
373            $opt_string = NULL;
374          if ($count_nodes) {          if ($count_nodes) {
375            $count = db_result(db_query("SELECT COUNT(nid) FROM {term_node} WHERE tid=%d", $term->tid));            $count = taxonomy_term_count_nodes($term->tid);
376            if ($count > 0 || $show_unused) {            if ($count > 0 || $show_unused) {
377              $term_opts[$term->tid] = str_repeat('-', $term->depth) . $term->name .' ('. $count .')';              $opt_string = decode_entities(check_plain($term->name)) .' ('. $count .')';
378            }            }
379          }          }
380          else {          else {
381            $term_opts[$term->tid] = str_repeat('-', $term->depth) . $term->name;            $opt_string = decode_entities(check_plain($term->name));
382            }
383            if ($opt_string) {
384              $term_opts[$term->tid] = str_repeat('-', $term->depth) . $opt_string;
385          }          }
386        }        }
387      }      }
388    
389      $type = $types[variable_get('taxonomy_browser_select_type', 0)];      $vocname = check_plain($voc->name);
390        $description = $voc->description ? decode_entities(check_markup($voc->description)) : NULL;
391        if (variable_get('taxonomy_browser_show_types', FALSE)) {
392          $description .= t('"!name" is used for: !types.', array('!name' => '<strong>'. $vocname .'</strong>', '!types' => (empty($node_type_list) ? '<em>'. t('nothing') .'</em>' : $node_type_list)));
393        }
394    
395      if (!empty($term_opts)) {      if (!empty($term_opts)) {
396        $form['taxonomy'][$v] = array('#type' => $type,        $voc_element = array(
397          '#title' => $voc->name,          '#type' => $select_type,
398          '#default_value' => $value,          '#title' => $vocname,
399          '#options' => $term_opts,          '#options' => $term_opts,
400          '#multiple' => true,          '#multiple' => TRUE,
401          '#description' => $voc->description,          '#description' => $description,
402          '#size' => min(10, count($term_opts)),          '#prefix' => '<div class="taxonomy_browser_'. $select_type .'">',
         '#prefix' => '<div class="taxonomy_browser_'. $type .'">',  
403          '#suffix' => '</div>',          '#suffix' => '</div>',
404            '#field_suffix' => $node_type_list,
405          '#weight' => $i,          '#weight' => $i,
406          );          );
407        $i++;  
408          if ($collapsible) {
409            $fld_set = 'set'. $voc->vid;
410            $form['taxonomy'][$fld_set] = array(
411              '#type' => 'fieldset',
412              '#title' => $vocname,
413              '#collapsible' => TRUE,
414              '#collapsed' => TRUE,
415              );
416            $form['taxonomy'][$fld_set][$v] = $voc_element;
417          }
418          else {
419            $form['taxonomy'][$v] = $voc_element;
420          }
421          ++$i;
422      }      }
423    }    }
424    
425    $form['submit'] = array(    $form['submit'] = array(
426      '#type' => 'submit',      '#type' => 'submit',
427      '#value' => t('Search'),      '#value' => t('Search'),
428      '#submit' => TRUE,  //    '#submit' => TRUE,
429    );      );
430    
431    return $form;    return $form;
432  }  }
433    
434  /**  /**
435     * Implementation of hook_theme().
436     */
437    function taxonomy_browser_theme() {
438      return array(
439        'taxonomy_browser_page' => array(
440          'arguments' => array('form'),
441        ),
442      );
443    }
444    
445    /**
446   * Themable form output for the category browser page.   * Themable form output for the category browser page.
447   */   */
448  function theme_taxonomy_browser_page($form) {  function theme_taxonomy_browser_page($form) {
# Line 262  function theme_taxonomy_browser_page($fo Line 461  function theme_taxonomy_browser_page($fo
461  /**  /**
462   * Implementation of hook_form_validate().   * Implementation of hook_form_validate().
463   */   */
464  function taxonomy_browser_form_validate($form_id, $form_values) {  function taxonomy_browser_form_validate($form, &$form_state) {
465    $tids = _taxonomy_browser_get_tid_list($form_values['taxonomy']);  
466      $include_children = $form_state['values']['include_children'];
467      $tids = _taxonomy_browser_get_tid_list($form_state['values']['taxonomy'], $include_children);
468    
469      $operator = $form_state['values']['operator'] ? 'or' : 'and';
470    
471      if ($operator == 'and' && $include_children == TRUE) {
472        form_set_error('operator', t('You must use "Items containing <strong>any</strong>" to include child terms.'));
473      }
474    
475    if (empty($tids)) {    if (empty($tids)) {
476      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.'));
477    }    }
478    else {    else {
479      $operator = $form_values['operator'] ? 'or' : 'and';  //    $node_type = (isset($form_values['node_filter']) && $form_values['node_filter'] != 'all') ? $form_values['node_filter'] : NULL;
480      $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']));
481    
482      if (!taxonomy_browser_count_nodes($tids, $operator, 0, $node_type)) {      if (!taxonomy_browser_count_nodes($tids, $operator, 0, $node_type)) {
483        form_set_error('taxonomy', t('No posts match your criteria.'));        form_set_error('taxonomy', t('No posts match your criteria.'));
484      }      }
# Line 280  function taxonomy_browser_form_validate( Line 488  function taxonomy_browser_form_validate(
488  /**  /**
489   * Implementation of hook_form_submit().   * Implementation of hook_form_submit().
490   */   */
491  function taxonomy_browser_form_submit($form_id, $form_values) {  function taxonomy_browser_form_submit($form, &$form_state) {
492    $tids = _taxonomy_browser_get_tid_list();    $tids = _taxonomy_browser_get_tid_list();
493    
494    $operator = $form_values['operator'] ? 'or' : 'and';    $operator = $form_state['values']['operator'] ? 'or' : 'and';
495    $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;  
496    
497    return array('taxonomy/term/'. $str_tids, (isset($node_type) ? 'type='. $node_type : ''));    $types = array_filter($form_state['values']['node_filter']);
498      $node_type = str_replace(',0', '', implode(',', $types));
499    
500      if ($types) {
501        $redir = array('taxonomy/term/'. $str_tids, (isset($node_type) ? 'type='. $node_type : ''));
502      }
503      else {
504        $redir = 'taxonomy/term/'. $str_tids;
505      }
506    
507      $form_state['redirect'] = $redir;
508  }  }
509    
510  /********************************************************************  //********************************************************************
511   * Module Functions :: Private  //* Module Functions : Private
512   ********************************************************************/  //********************************************************************
513    
514    /**
515     * Get the output to be displayed by the block.
516     *
517     * @param
518     *   $delta - integer for the block number.
519     *
520     * @return
521     *   array containing the title ("subject") and content of the block.
522     */
523    function _taxonomy_browser_block_view($delta) {
524      $block = array();
525      switch ($delta) {
526        case 0:
527          $block = array(
528            'content' => drupal_get_form('taxonomy_browser_form'),
529            );
530          break;
531      }
532      return $block;
533    }
534    
535  /**  /**
536   * 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 310  function taxonomy_browser_count_nodes($t Line 548  function taxonomy_browser_count_nodes($t
548        $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));
549      }      }
550    
551      $type_where = null;      $type_where = NULL;
552      if ($nodetype) {      if ($nodetype) {
553        $type_where = "n.type = '". db_escape_string($nodetype) ."'";  //      $type_where = "n.type = '". db_escape_string($nodetype) ."'";
554          $type_where = "n.type IN ('". implode("', '", explode(',', db_escape_string($nodetype))) ."')";
555      }      }
556    
557      if ($operator == 'or') {      if ($operator == 'or') {
558        $str_tids = implode(',', call_user_func_array('array_merge', $descendant_tids));        $str_tids = implode(',', call_user_func_array('array_merge', $descendant_tids));
559    
560        $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 USING(nid) WHERE '. ($type_where ? $type_where .' AND ' : NULL) ."tn.tid IN ($str_tids) ORDER BY n.sticky DESC, n.title ASC";
561      }      }
562      else {      else {
563        $joins = '';        $joins = '';
# Line 326  function taxonomy_browser_count_nodes($t Line 566  function taxonomy_browser_count_nodes($t
566          $wheres[] = $type_where;          $wheres[] = $type_where;
567        }        }
568        foreach ($descendant_tids as $index => $tids) {        foreach ($descendant_tids as $index => $tids) {
569          $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 ';
570          $wheres[] = 'tn'. $index .'.tid IN ('. implode(',', $tids) .')';          $wheres[] = 'tn'. $index .'.tid IN ('. implode(',', $tids) .')';
571        }        }
572        $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);
573      }      }
574    
575      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 582  function taxonomy_browser_count_nodes($t
582   * Transforms an unpredictably and irregularly nested set of tids (as returned   * Transforms an unpredictably and irregularly nested set of tids (as returned
583   * from a taxonomy form) into a linear array of tids.   * from a taxonomy form) into a linear array of tids.
584   */   */
585  function _taxonomy_browser_get_tid_list($tids = NULL) {  function _taxonomy_browser_get_tid_list($tids = NULL, $include_children = FALSE) {
586    static $tid_list;    static $tid_list;
587    
588    if (isset($tids) && is_array($tids)) {    if (isset($tids) && is_array($tids)) {
589      $tid_list = array();      $tid_list = array();
590      foreach ($tids as $key => $tid) {      foreach ($tids as $key => $tid) {
# Line 352  function _taxonomy_browser_get_tid_list( Line 592  function _taxonomy_browser_get_tid_list(
592          if (is_array($tid)) {          if (is_array($tid)) {
593            foreach ($tid as $key2 => $tid2) {            foreach ($tid as $key2 => $tid2) {
594              if (!empty($tid2)) {              if (!empty($tid2)) {
595                $tid_list[] = $tid2;                $tid_list[$tid2] = $tid2;
596              }              }
597            }            }
598          }          }
599          else {          else {
600            $tid_list[] = $tid;            $tid_list[$tid] = $tid;
601          }          }
602        }        } /* end !empty */
603      }      } /* end foreach */
604    }    }
605    
606      if ($include_children) {
607        foreach ($tid_list as $tid) {
608          _taxonomy_browser_get_kids($tid_list, $tid);
609        }
610      }
611    
612    return $tid_list;    return $tid_list;
613  }  }
614    
615    function _taxonomy_browser_get_kids(&$tid_list, $tid) {
616      $children = taxonomy_get_children($tid);
617      if ($children) {
618        foreach ($children as $child_tid => $child_term) {
619          _taxonomy_browser_get_kids($tid_list, $child_tid);
620        }
621      }
622      else {
623        $tid_list[$tid] = $tid;
624      }
625    }
626    
627  /**  /**
628   * Provides default guideline text.   * Provides default guideline text.
629   */   */
Legend:
Removed from v.1.19.2.11  
changed lines
  Added in v.1.19.2.11.2.21
  ViewVC Help
Powered by ViewVC 1.1.2