diff -ur relatedlinks/relatedlinks.info relatedlinks-new/relatedlinks.info --- relatedlinks/relatedlinks.info 2008-02-16 07:06:14.000000000 -0500 +++ relatedlinks-new/relatedlinks.info 2008-02-16 14:36:09.000000000 -0500 @@ -3,7 +3,8 @@ description = Displays links related to content. ; Information added by drupal.org packaging script on 2008-02-16 -version = "5.x-1.x-dev" +version = "6.x-1.x-dev" +core = "6.x" project = "relatedlinks" datestamp = "1203163574" diff -ur relatedlinks/relatedlinks.module relatedlinks-new/relatedlinks.module --- relatedlinks/relatedlinks.module 2007-12-19 08:59:23.000000000 -0500 +++ relatedlinks-new/relatedlinks.module 2008-02-16 14:44:26.000000000 -0500 @@ -26,8 +26,8 @@ /** * Implementation of hook_help(). */ -function relatedlinks_help($section) { - switch ($section) { +function relatedlinks_help($path, $arg) { + switch ($path) { case 'admin/settings/relatedlinks': return t('Select the types of links to store and display.'); case 'admin/settings/relatedlinks/discovered': @@ -239,7 +239,7 @@ /** * Implementation of hook_form_alter(). */ -function relatedlinks_form_alter($form_id, &$form) { +function relatedlinks_form_alter(&$form, $form_state, $form_id) { if (user_access('add related links') && isset($form['type']) && ($form['type']['#value'] .'_node_form' == $form_id)) { @@ -302,7 +302,7 @@ if (_relatedlinks_get_type_property(RELATEDLINKS_DISCOVERED, 'enabled') && $discovered['cron']) { $updated = time() - ($discovered['cron'] * 24 * 60 * 60); // Select all stale nodes. - $result = db_query("SELECT nid FROM {relatedlinks_tracker} WHERE updated != 0 AND updated < %d", $updated); + $result = db_query("SELECT nid FROM {relatedlinks_tracker} WHERE updated <> 0 AND updated < %d", $updated); $nids = array(); while ($node = db_fetch_array($result)) { $nids[] = $node['nid']; @@ -402,14 +402,14 @@ /** * Process relatedlinks settings form submissions. */ -function _relatedlinks_settings_form_submit($form_id, $form_values) { +function _relatedlinks_settings_form_submit($form, $form_state) { // Sort on 'weight'. - uasort($form_values['relatedlinks_types'], '_relatedlinks_compare'); + uasort($form_state['values']['relatedlinks_types'], '_relatedlinks_compare'); // Store the entire relatedlinks_types table. - variable_set('relatedlinks_types', $form_values['relatedlinks_types']); + variable_set('relatedlinks_types', $form_state['values']['relatedlinks_types']); - $node_types = array_filter($form_values['relatedlinks_node_types']); + $node_types = array_filter($form_state['values']['relatedlinks_node_types']); variable_set('relatedlinks_node_types', array_keys($node_types)); // Block table needs to be reset. @@ -525,7 +525,7 @@ $form['relatedlinks_discovered']['cron']['refresh'] = array( '#type' => 'select', '#title' => t('Automatically update discovered links older than'), - '#description' => t('This feature requires cron to be enabled.', array('!cron' => url('admin/logs/status'))), + '#description' => t('This feature requires cron to be enabled.', array('!cron' => url('admin/reports/status'))), '#parents' => array('relatedlinks_discovered', 'cron'), '#options' => array( 1 => t('One day'), @@ -545,17 +545,17 @@ /** * Validate discovered links settings form submissions. */ -function _relatedlinks_discovered_settings_form_validate($form_id, $form_values) { - if ($form_values['relatedlinks_discovered']['ranking']['taxonomy'] === $form_values['relatedlinks_discovered']['ranking']['search'] && - $form_values['relatedlinks_discovered']['ranking']['taxonomy'] === 0) { +function _relatedlinks_discovered_settings_form_validate($form, &$form_state) { + if ($form_state['values']['relatedlinks_discovered']['ranking']['taxonomy'] === $form_state['values']['relatedlinks_discovered']['ranking']['search'] && + $form_state['values']['relatedlinks_discovered']['ranking']['taxonomy'] === 0) { $error = t('The discovered links feature requires either taxonomy or search results to be enabled.'); form_set_error('relatedlinks_discovered][criteria][ranking', $error); } - if ($form_values['relatedlinks_discovered']['ranking']['taxonomy'] === 'taxonomy' && !module_exists('taxonomy')) { + if ($form_state['values']['relatedlinks_discovered']['ranking']['taxonomy'] === 'taxonomy' && !module_exists('taxonomy')) { form_set_error('relatedlinks_discovered][criteria][ranking', t('The taxonomy module needs to be enabled for taxonomy results to be calculated.')); } - if ($form_values['relatedlinks_discovered']['ranking']['search'] === 'search' && !module_exists('search')) { + if ($form_state['values']['relatedlinks_discovered']['ranking']['search'] === 'search' && !module_exists('search')) { form_set_error('relatedlinks_discovered][criteria][ranking', t('The search module needs to be enabled for taxonomy results to be calculated.')); } } @@ -563,16 +563,16 @@ /** * Process discovered links settings form submissions. */ -function _relatedlinks_discovered_settings_form_submit($form_id, $form_values) { +function _relatedlinks_discovered_settings_form_submit($form, &$form_state) { $indices = array('ranking', 'vocabularies', 'node_types'); foreach ($indices as $index) { - if (isset($form_values['relatedlinks_discovered'][$index])) { - $form_values['relatedlinks_discovered'][$index] = array_filter($form_values['relatedlinks_discovered'][$index]); - $form_values['relatedlinks_discovered'][$index] = array_keys($form_values['relatedlinks_discovered'][$index]); + if (isset($form_state['values']['relatedlinks_discovered'][$index])) { + $form_state['values']['relatedlinks_discovered'][$index] = array_filter($form_state['values']['relatedlinks_discovered'][$index]); + $form_state['values']['relatedlinks_discovered'][$index] = array_keys($form_state['values']['relatedlinks_discovered'][$index]); } } - variable_set('relatedlinks_discovered', $form_values['relatedlinks_discovered']); + variable_set('relatedlinks_discovered', $form_state['values']['relatedlinks_discovered']); } /*