Index: contentsearch.info =================================================================== RCS file: /cvs/drupal-contrib/contributions/modules/coresearches/contentsearch.info,v retrieving revision 1.1 diff -u -p -r1.1 contentsearch.info --- contentsearch.info 13 Dec 2007 12:21:36 -0000 1.1 +++ contentsearch.info 10 Jul 2008 00:39:09 -0000 @@ -2,5 +2,6 @@ name = Content search description = Adds a tab to the search page for finding content. package = Search -dependencies = search +dependencies[] = search version = VERSION +core = 6.x Index: contentsearch.module =================================================================== RCS file: /cvs/drupal-contrib/contributions/modules/coresearches/contentsearch.module,v retrieving revision 1.1.2.3 diff -u -p -r1.1.2.3 contentsearch.module --- contentsearch.module 7 Jul 2008 12:00:54 -0000 1.1.2.3 +++ contentsearch.module 10 Jul 2008 00:39:09 -0000 @@ -1,13 +1,19 @@ 'admin/content/search', 'title' => t('Search content'), - 'description' => t('Search content by keyword.'), - 'callback' => 'contentsearch_admin_search', - 'access' => user_access('administer nodes'), + $items['admin/content/search'] = array( + 'title' => 'Search content', + 'description' => 'Search content by keyword.', + 'page callback' => 'contentsearch_admin_search', + 'access arguments' => array('administer nodes'), 'type' => MENU_NORMAL_ITEM); } return $items; @@ -16,10 +22,10 @@ function contentsearch_menu($maycache) { function contentsearch_nodeapi(&$node, $op, $a3 = NULL, $a4 = NULL) { switch ($op) { case 'delete': - // Remove this node from the search index if needed. + // Remove this node from the search index if needed. search_wipe($node->nid, 'node'); - break; - } + break; + } } /** @@ -79,7 +85,7 @@ function contentsearch_update_shutdown() /** * Implementation of hook_form_alter(). */ -function contentsearch_form_alter($form_id, &$form) { +function contentsearch_form_alter(&$form, &$form_state, $form_id) { // Advanced node search form if ($form_id == 'search_form' && arg(1) == 'node' && user_access('use advanced search')) { // Keyword boxes: @@ -142,44 +148,44 @@ function contentsearch_form_alter($form_ '#suffix' => '', ); - $form['#validate']['contentsearch_search_validate'] = array(); + $form['#validate'][] = 'contentsearch_search_validate'; } } /** * Form API callback for the search form. Registered in node_form_alter(). */ -function contentsearch_search_validate($form_id, $form_values, $form) { +function contentsearch_search_validate($form, &$form_state) { // Initialise using any existing basic search keywords. - $keys = $form_values['processed_keys']; + $keys = $form_state['values']['processed_keys']; // Insert extra restrictions into the search keywords string. - if (isset($form_values['type']) && is_array($form_values['type'])) { + if (isset($form_state['values']['type']) && is_array($form_state['values']['type'])) { // Retrieve selected types - Forms API sets the value of unselected checkboxes to 0. - $form_values['type'] = array_filter($form_values['type']); - if (count($form_values['type'])) { - $keys = search_query_insert($keys, 'type', implode(',', array_keys($form_values['type']))); + $form_state['values']['type'] = array_filter($form_state['values']['type']); + if (count($form_state['values']['type'])) { + $keys = search_query_insert($keys, 'type', implode(',', array_keys($form_state['values']['type']))); } } - if (isset($form_values['category']) && is_array($form_values['category'])) { - $keys = search_query_insert($keys, 'category', implode(',', $form_values['category'])); + if (isset($form_state['values']['category']) && is_array($form_state['values']['category'])) { + $keys = search_query_insert($keys, 'category', implode(',', $form_state['values']['category'])); } - if ($form_values['or'] != '') { - if (preg_match_all('/ ("[^"]+"|[^" ]+)/i', ' '. $form_values['or'], $matches)) { + if ($form_state['values']['or'] != '') { + if (preg_match_all('/ ("[^"]+"|[^" ]+)/i', ' '. $form_state['values']['or'], $matches)) { $keys .= ' '. implode(' OR ', $matches[1]); } } - if ($form_values['negative'] != '') { - if (preg_match_all('/ ("[^"]+"|[^" ]+)/i', ' '. $form_values['negative'], $matches)) { + if ($form_state['values']['negative'] != '') { + if (preg_match_all('/ ("[^"]+"|[^" ]+)/i', ' '. $form_state['values']['negative'], $matches)) { $keys .= ' -'. implode(' -', $matches[1]); } } - if ($form_values['phrase'] != '') { - $keys .= ' "'. str_replace('"', ' ', $form_values['phrase']) .'"'; + if ($form_state['values']['phrase'] != '') { + $keys .= ' "'. str_replace('"', ' ', $form_state['values']['phrase']) .'"'; } if (!empty($keys)) { - form_set_value($form['basic']['inline']['processed_keys'], trim($keys)); + form_set_value($form['basic']['inline']['processed_keys'], trim($keys), $form_state); } } @@ -331,10 +337,21 @@ function contentsearch_search($op = 'sea } } + function contentsearch_admin_search() { return drupal_get_form('search_form', url('admin/content/search'), $_POST['keys'], 'node') . search_data($_POST['keys'], 'node'); -} +} +/** + * Implementation of hook_theme(). + */ +function contentsearch_theme() { + return array( + 'contentsearch_search_admin' => array( + 'arguments' => array('form' => NULL), + ), + ); +} function theme_contentsearch_search_admin($form) { $output = drupal_render($form['info']); Index: usersearch.info =================================================================== RCS file: /cvs/drupal-contrib/contributions/modules/coresearches/usersearch.info,v retrieving revision 1.1 diff -u -p -r1.1 usersearch.info --- usersearch.info 13 Dec 2007 12:21:36 -0000 1.1 +++ usersearch.info 10 Jul 2008 00:39:09 -0000 @@ -2,5 +2,6 @@ name = User search description = Adds a tab to the search page for finding users. package = Search -dependencies = search +dependencies[] = search version = VERSION +core = 6.x Index: usersearch.module =================================================================== RCS file: /cvs/drupal-contrib/contributions/modules/coresearches/usersearch.module,v retrieving revision 1.1.2.1 diff -u -p -r1.1.2.1 usersearch.module --- usersearch.module 7 Jul 2008 12:00:54 -0000 1.1.2.1 +++ usersearch.module 10 Jul 2008 00:39:09 -0000 @@ -1,6 +1,11 @@