Index: trip_search.module
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/trip_search/trip_search.module,v
retrieving revision 1.30
diff --unified=3 -r1.30 trip_search.module
--- trip_search.module	19 Jul 2005 22:16:59 -0000	1.30
+++ trip_search.module	17 Aug 2005 22:27:16 -0000
@@ -384,7 +384,7 @@
     $group = theme('table', '', $rows);
     $form .= form_group(t('Find content'), $group);
     $vocabularies = array();
-    if (module_exist('taxonomy') && variable_get('trip_search_toggle_categories', TRUE)) {
+    if (module_exist('taxonomy') && variable_get('trip_search_toggle_category', TRUE)) {
       $group = form_radios(t('Find content'), 'taxonomy_operator', 1, array(t('In %all of the selected categories', array('%all' => theme('placeholder', t('all')))), t('In %atleastone of the selected categories', array('%atleastone' => theme('placeholder', t('at least one'))))));
       if ($content_type) {
         $result = db_query("SELECT * FROM {vocabulary} v INNER JOIN {vocabulary_node_types} vn ON v.vid = vn.vid WHERE vn.type = '%s' ORDER BY v.weight, v.name", $content_type);
@@ -401,12 +401,12 @@
       $form .= $group ? form_group(t('Find content by category'), $group) : '';
     }
     if (!$content_type  && variable_get('trip_search_toggle_node_types', TRUE)) {
-      foreach (node_list() as $type) {
+     foreach (node_list() as $type) {
         $nodetypes[$type] = node_invoke($type, 'node_name');
       }
       $group = form_checkboxes('', 'nodes', explode(',', $edit['nodes']), $nodetypes, t('Select the content types you wish to search for.'), NULL, FALSE);
       $form .= form_group(t('Limit search to specific content types'), $group);
-    }
+    } 
     $result = db_query("SELECT uid, name FROM {users} WHERE status > 0 ORDER BY name");
     if (variable_get('trip_search_toggle_user', TRUE)) {
       if (db_num_rows($result) < 1000) {
@@ -427,7 +427,7 @@
     $row[] = form_textfield('', 'before', $edit['before'], 15, 30, '');
     $row[] = t('<a href="javascript: void(0);" onclick="return getCalendar(\'edit-before\');"><img src="modules/trip_search/popupcalendar/calendar.png" border="0" /></a>');
     $date_line = '<div class="container-inline">'. implode('&nbsp;', $row). '</div>';
-    $group .= form_item(t('Date'), $date_line, t('dates should be in the format of dd/mm/yyyy. for example, 22/03/2004'));
+    $group = form_item(t('Date'), $date_line, t('dates should be in the format of dd/mm/yyyy. for example, 22/03/2004'));
     $form .= form_group(t('Filter by date and user'), $group);
     $form .= form_hidden('content_type', $content_type);
     $form .= form_submit(t('search'));