Index: relatedlinks.info =================================================================== RCS file: /cvs/drupal-contrib/contributions/modules/relatedlinks/relatedlinks.info,v retrieving revision 1.2 diff -u -p -r1.2 relatedlinks.info --- relatedlinks.info 18 Jun 2007 22:53:56 -0000 1.2 +++ relatedlinks.info 27 Mar 2008 19:42:02 -0000 @@ -1,3 +1,6 @@ ; $Id: relatedlinks.info,v 1.2 2007/06/18 22:53:56 dww Exp $ name = Related Links -description = Displays links related to content. +description = Displays links related to content +package = Development +version = "6.x-1.x-dev" +core = "6.x" Index: relatedlinks.install =================================================================== RCS file: /cvs/drupal-contrib/contributions/modules/relatedlinks/relatedlinks.install,v retrieving revision 1.19 diff -u -p -r1.19 relatedlinks.install --- relatedlinks.install 26 Feb 2007 17:26:10 -0000 1.19 +++ relatedlinks.install 27 Mar 2008 19:42:02 -0000 @@ -5,66 +5,21 @@ * Implementation of hook_install(). */ function relatedlinks_install() { - $ret = array(); - - switch ($GLOBALS['db_type']) { - case 'mysqli': - case 'mysql': - db_query("CREATE TABLE {relatedlinks} ( - lid int(11) unsigned NOT NULL auto_increment, - nid int(11) unsigned NOT NULL default 0, - url varchar(255) NOT NULL default '', - title varchar(255) default NULL, - type tinyint(4) unsigned NOT NULL default 1, - PRIMARY KEY (lid), - KEY nid (nid), - KEY nid_type (nid, type)) - COMMENT = 'Relatedlinks module: store manual and parsed links.' - /*!40100 default CHARACTER SET utf8 */" - ); - db_query("CREATE TABLE {relatedlinks_tracker} ( - nid int(11) UNSIGNED NOT NULL, - keywords varchar(255) NULL, - updated int(11) NOT NULL default 0, - PRIMARY KEY (nid), - KEY (updated)) - COMMENT = 'Table keeping track of discovered links.' - /*!40100 default CHARACTER SET utf8 */" - ); - break; - case 'pgsql': - db_query("CREATE TABLE {relatedlinks} ( - lid serial, - nid integer NOT NULL default 0, - url varchar(255) NOT NULL default '', - title varchar(255) default NULL, - type smallint NOT NULL default 1 - PRIMARY KEY (lid))" - ); - db_query("CREATE INDEX {relatedlinks}_nid_idx ON {relatedlinks}(nid)"); - db_query("CREATE INDEX {relatedlinks}_nid_type_idx ON {relatedlinks}(nid, type)"); - db_query("CREATE TABLE {relatedlinks_tracker} ( - nid integer NOT NULL default 0, - keywords varchar(255) NULL, - updated integer NOT NULL default 0 - PRIMARY KEY (nid))" - ); - db_query("CREATE INDEX {relatedlinks_tracker}_updated_idx ON {relatedlinks_tracker}(updated)"); - } - drupal_set_message(t('The relatedlinks module installation script has completed.')); if (!module_exists('taxonomy') && !module_exists('search')) { drupal_set_message(t('The discovered links feature of the relatedlinks module requires one of the following modules: ')); + return; } - - return $ret; + + // Create tables. + drupal_install_schema('relatedlinks'); } /** - * Convert existing variables from strings to internal constants used in the + * Convert existing variables from strings to internal constants used in the * module. */ function relatedlinks_update_2() { @@ -99,25 +54,13 @@ function relatedlinks_update_2() { function relatedlinks_update_3() { $ret = array(); - switch ($GLOBALS['db_type']) { - case 'mysqli': - case 'mysql': - $ret[] = update_sql("ALTER TABLE {relatedlinks} ADD lid int(11) UNSIGNED NOT NULL AUTO_INCREMENT PRIMARY KEY FIRST"); - $ret[] = update_sql("ALTER TABLE {relatedlinks} CHANGE link url varchar(255) NOT NULL default ''"); - $ret[] = update_sql("ALTER TABLE {relatedlinks} ADD title varchar(255) DEFAULT NULL AFTER url"); - // nid and type are UNSIGNED fields. - $ret[] = update_sql("ALTER TABLE {relatedlinks} CHANGE nid nid int(11) UNSIGNED NOT NULL DEFAULT 0"); - $ret[] = update_sql("ALTER TABLE {relatedlinks} CHANGE type type tinyint(4) UNSIGNED NOT NULL DEFAULT 1"); - $ret[] = update_sql("ALTER TABLE {relatedlinks} ADD INDEX nid_type (nid, type)"); - break; - case 'pgsql': - // Needs testing. Field ordering needs to be added. - db_add_column($ret, 'relatedlinks', 'lid', 'serial'); - db_change_column($ret, 'relatedlinks', 'link', 'url', 'varchar(255)', array('default' => "''", 'not null' => TRUE)); - db_add_column($ret, 'relatedlinks', 'title', 'varchar(255)', array('default' => "NULL")); - $ret[] = update_sql("CREATE INDEX {relatedlinks}_nid_type_idx ON {relatedlinks}(nid, type)"); - break; - } + db_drop_primary_key($ret, 'relatedlinks'); + db_add_field($ret, 'relatedlinks', 'lid', array('type' => 'serial', 'size' => 'tiny', 'not null' => TRUE)); + db_change_field($ret, 'relatedlinks', 'link', 'url', array('type' => 'varchar', 'length' => 255, 'not null' => TRUE, 'default' => '')); + db_add_field($ret, 'relatedlinks', 'title', array('type' => 'varchar', 'length' => '255', 'default' => NULL)); + db_change_field($ret, 'relatedlinks', 'nid', array('type' => 'int', 'size' => 'tiny', 'unsigned' => TRUE, 'not null' => TRUE, 'default' => 0)); + db_change_field($ret, 'relatedlinks', 'type', array('type' => 'int', 'size' => 'tiny', 'unsigned' => TRUE, 'not null' => TRUE, 'default' => 1)); + db_add_index($ret, 'relatedlinks', 'nid_type', array('nid', 'type')); $result = db_query("SELECT * FROM {relatedlinks}"); while ($link = db_fetch_array($result)) { @@ -127,7 +70,7 @@ function relatedlinks_update_3() { db_query("UPDATE {relatedlinks} SET url = '%s', title = '%s' WHERE lid = %d", $matches[1], trim($matches[3]), $link['lid']); } } - + return $ret; } @@ -137,29 +80,31 @@ function relatedlinks_update_3() { function relatedlinks_update_4() { $ret = array(); - switch ($GLOBALS['db_type']) { - case 'mysqli': - case 'mysql': - $ret[] = update_sql("CREATE TABLE {relatedlinks_tracker} ( - nid int(11) UNSIGNED NOT NULL, - keywords varchar(255) NULL, - updated int(11) NOT NULL default 0, - PRIMARY KEY (nid), - KEY (updated)) - COMMENT = 'Table keeping track of discovered links.' - /*!40100 default CHARACTER SET utf8 */" - ); - break; - case 'pgsql': - $ret[] = update_sql("CREATE TABLE {relatedlinks_tracker} ( - nid integer NOT NULL default 0, - keywords varchar(255) NULL, - updated integer NOT NULL default 0 - PRIMARY KEY (nid))" - ); - $ret[] = update_sql("CREATE INDEX {relatedlinks_tracker}_updated_idx ON {relatedlinks_tracker}(updated)"); - } + $schema['relatedlinks_tracker'] = array( + 'description' => t('Table keeping track of discovered links.'), + 'fields' => array( + 'nid' => array( + 'type' => 'serial', + 'size' => 'tiny', + 'unsigned' => TRUE, + 'not null' => TRUE), + 'keywords' => array( + 'type' => 'varchar', + 'length' => 255, + 'not null' => FALSE), + 'updated' => array( + 'type' => 'int', + 'size' => 'tiny', + 'not null' => TRUE, + 'default' => 0), + ), + 'indexes' => array( + 'updated' => array('updated'), + ), + 'primary key' => array('nid'), + ); + db_create_table($ret, 'relatedlinks_tracker', $schema); $ret[] = update_sql("INSERT INTO {relatedlinks_tracker} (nid) SELECT DISTINCT(nid) FROM {relatedlinks}"); return $ret; @@ -169,7 +114,77 @@ function relatedlinks_update_4() { * Implementation of hook_uninstall(). */ function relatedlinks_uninstall() { - db_query('DROP TABLE {relatedlinks_tracker}, {relatedlinks}'); + $ret = array(); + db_drop_table($ret, 'relatedlinks'); + db_drop_table($ret, 'relatedlinks_tracker'); variable_del('relatedlinks_types'); variable_del('relatedlinks_node_types'); } + +/** + * Implementation of hook_schema(). + */ +function relatedlinks_schema() { + $schema['relatedlinks'] = array( + 'description' => t('Relatedlinks module: store manual and parsed links.'), + 'fields' => array( + 'lid' => array( + 'type' => 'serial', + 'size' => 'tiny', + 'unsigned' => TRUE, + 'not null' => TRUE), + 'nid' => array( + 'type' => 'int', + 'size' => 'tiny', + 'unsigned' => TRUE, + 'default' => 0), + 'url' => array( + 'type' => 'varchar', + 'length' => 255, + 'not null' => TRUE, + 'default' => ''), + 'title' => array( + 'type' => 'varchar', + 'length' => 255, + 'not null' => FALSE, + 'default' => NULL), + 'type' => array( + 'type' => 'int', + 'size' => 'tiny', + 'unsigned' => TRUE, + 'not null' => TRUE, + 'default' => 1), + ), + 'indexes' => array( + 'nid' => array('nid'), + 'nid_type' => array('nid', 'type'), + ), + 'primary key' => array('lid'), + ); + + $schema['relatedlinks_tracker'] = array( + 'description' => t('Table keeping track of discovered links.'), + 'fields' => array( + 'nid' => array( + 'type' => 'serial', + 'size' => 'tiny', + 'unsigned' => TRUE, + 'not null' => TRUE), + 'keywords' => array( + 'type' => 'varchar', + 'length' => 255, + 'not null' => FALSE), + 'updated' => array( + 'type' => 'int', + 'size' => 'tiny', + 'not null' => TRUE, + 'default' => 0), + ), + 'indexes' => array( + 'updated' => array('updated'), + ), + 'primary key' => array('nid'), + ); + + return $schema; +} Index: relatedlinks.module =================================================================== RCS file: /cvs/drupal-contrib/contributions/modules/relatedlinks/relatedlinks.module,v retrieving revision 1.58.2.3 diff -u -p -r1.58.2.3 relatedlinks.module --- relatedlinks.module 18 Feb 2008 14:42:59 -0000 1.58.2.3 +++ relatedlinks.module 27 Mar 2008 19:42:06 -0000 @@ -17,7 +17,7 @@ * 4. Manual links UI could use some JS goodness. */ -// Define mnemonics to indicate the types of links stored in the relatedlinks +// Define mnemonics to indicate the types of links stored in the relatedlinks // table [type field]. define('RELATEDLINKS_PARSED', 1); define('RELATEDLINKS_MANUAL', 2); @@ -26,8 +26,8 @@ define('RELATEDLINKS_DISCOVERED', 3); /** * 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': @@ -57,46 +57,38 @@ Links: /** * Implementation of hook_menu(). */ -function relatedlinks_menu($may_cache) { +function relatedlinks_menu() { $items = array(); - if ($may_cache) { - $items[] = array( - 'path' => 'admin/settings/relatedlinks', - 'title' => t('Related links'), - 'description' => t('Configure related links settings.'), - 'callback' => 'drupal_get_form', - 'callback arguments' => array('_relatedlinks_settings_form'), - 'access' => user_access('administer related links') - ); - $items[] = array( - 'path' => 'admin/settings/relatedlinks/configure', - 'title' => t('Settings'), - 'callback' => 'drupal_get_form', - 'callback arguments' => array('_relatedlinks_settings_form'), - 'access' => user_access('administer related links'), - 'type' => MENU_DEFAULT_LOCAL_TASK - ); - $items[] = array( - 'path' => 'admin/settings/relatedlinks/discovered', - 'title' => t('Discovered links'), - 'callback' => 'drupal_get_form', - 'callback arguments' => array('_relatedlinks_discovered_settings_form'), - 'access' => user_access('administer related links'), - 'type' => MENU_LOCAL_TASK, - 'weight' => 2 - ); - } - else { - $items[] = array( - 'path' => 'relatedlinks/autocomplete', - 'callback' => 'relatedlinks_autocomplete', - 'callback arguments' => array(arg(2)), - 'access' => user_access('add related links'), - 'type' => MENU_LOCAL_TASK, - 'weight' => 2 - ); - } + $items['admin/settings/relatedlinks'] = array( + 'title' => 'Related links', + 'description' => 'Configure related links settings.', + 'page callback' => 'drupal_get_form', + 'page arguments' => array('_relatedlinks_settings_form'), + 'access arguments' => array('administer related links') + ); + $items['admin/settings/relatedlinks/configure'] = array( + 'title' => 'Settings', + 'page callback' => 'drupal_get_form', + 'page arguments' => array('_relatedlinks_settings_form'), + 'access arguments' => array('administer related links'), + 'type' => MENU_DEFAULT_LOCAL_TASK + ); + $items['admin/settings/relatedlinks/discovered'] = array( + 'title' => 'Discovered links', + 'page callback' => 'drupal_get_form', + 'page arguments' => array('_relatedlinks_discovered_settings_form'), + 'access arguments' => array('administer related links'), + 'type' => MENU_LOCAL_TASK, + 'weight' => 2 + ); + $items['relatedlinks/autocomplete'] = array( + 'page callback' => 'relatedlinks_autocomplete', + 'page arguments' => array(arg(2)), + 'access arguments' => array('add related links'), + 'type' => MENU_LOCAL_TASK, + 'weight' => 2 + ); return $items; } @@ -133,7 +125,7 @@ function relatedlinks_block($op = 'list' // This is only valid if we're looking at a node now. if (arg(0) == 'node' && is_numeric(arg(1))) { $block = array(); - $node = node_load(arg(1)); + $node = menu_get_object(); // Only display if node type is associated with this module. if ($node && in_array($node->type, variable_get('relatedlinks_node_types', _relatedlinks_node_get_types(TRUE)))) { $link_types = variable_get('relatedlinks_types', _relatedlinks_get_type_defaults()); @@ -181,7 +173,7 @@ function relatedlinks_block($op = 'list' /** * Implementation of hook_nodeapi(). * - * @TODO: Move the parsed links filtering into a filter_process(). The current + * @TODO: Move the parsed links filtering into a filter_process(). The current * implementation is not PHP filter friendly. */ function relatedlinks_nodeapi(&$node, $op, $arg) { @@ -192,7 +184,7 @@ function relatedlinks_nodeapi(&$node, $o break; default: // The delete op should be allowed to account for admins who do not have - // the 'add related links' permission. + // the 'add related links' permission. if (user_access('add related links') || $op == 'delete') { switch ($op) { case 'delete': @@ -214,10 +206,10 @@ function relatedlinks_nodeapi(&$node, $o // Handle any submitted keywords. Discovered links are calculated // and cached (as necessary) in hook_block. $discovered = variable_get('relatedlinks_discovered', _relatedlinks_get_discovered_defaults()); - // Existing keywords are removed if the keywords functionality is + // Existing keywords are removed if the keywords functionality is // disabled. $keywords = ''; - if (_relatedlinks_get_type_property(RELATEDLINKS_DISCOVERED, 'enabled') && + if (_relatedlinks_get_type_property(RELATEDLINKS_DISCOVERED, 'enabled') && in_array('search', $discovered['ranking']) && $discovered['keywords']) { $keywords = $node->relatedlinks_fieldset['keywords']; } @@ -249,7 +241,7 @@ function relatedlinks_nodeapi(&$node, $o /** * 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)) { @@ -298,7 +290,7 @@ function relatedlinks_form_alter($form_i drupal_add_js('misc/autocomplete.js'); } $discovered = variable_get('relatedlinks_discovered', _relatedlinks_get_discovered_defaults()); - if (_relatedlinks_get_type_property(RELATEDLINKS_DISCOVERED, 'enabled') && + if (_relatedlinks_get_type_property(RELATEDLINKS_DISCOVERED, 'enabled') && in_array('search', $discovered['ranking']) && $discovered['keywords']) { $form['relatedlinks_fieldset']['keywords'] = array( @@ -306,7 +298,7 @@ function relatedlinks_form_alter($form_i '#title' => t('Keywords'), '#description' => t('Enter search keywords that will aid in finding related content.'), ); - + if ($track = _relatedlinks_get_tracker($node->nid)) { $form['relatedlinks_fieldset']['keywords']['#default_value'] = $track['keywords']; $form['relatedlinks_fieldset']['#collapsed'] = $form['relatedlinks_fieldset']['#collapsed'] && empty($track['keywords']); @@ -326,7 +318,7 @@ function relatedlinks_cron() { 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']; @@ -426,21 +418,21 @@ Related links blocks and forms will only /** * 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. _block_rehash(); cache_clear_all(); - drupal_set_message(t('Configuration settings saved. If necessary, relatedlinks + drupal_set_message(t('Configuration settings saved. If necessary, relatedlinks blocks can be configured via the block configuration page.', array('!block-page' => url('admin/build/block')))); } @@ -452,7 +444,7 @@ blocks can be configured via the modules page to enable them.', array('!modules' => url('admin/build/modules'))), 'error'); drupal_goto('admin/settings/relatedlinks'); } @@ -460,8 +452,8 @@ for discovered links. Please use the 'fieldset', '#title' => t('Criteria'), - '#description' => t('Define how discovered links are calculated. The following -criteria are applied to results derived from the taxonomy and/or search module + '#description' => t('Define how discovered links are calculated. The following +criteria are applied to results derived from the taxonomy and/or search module (if selected) on a best effort basis.'), '#collapsible' => TRUE, '#collapsed' => FALSE @@ -531,7 +523,7 @@ can be used to aid in the calculation of $form['relatedlinks_discovered']['search_options']['keywords'] = array( '#type' => 'checkbox', '#title' => t('Display a search keywords field.'), - '#description' => t('The textfield will appear on node forms. Provided keywords + '#description' => t('The textfield will appear on node forms. Provided keywords will be used to discover related content and will generally provide better results. Advanced search queries can also be entered as specfied by the search modules.'), '#parents' => array('relatedlinks_discovered', 'keywords'), @@ -549,7 +541,7 @@ that they be periodically purged and rec $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'), @@ -569,17 +561,17 @@ that they be periodically purged and rec /** * 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.')); } } @@ -587,16 +579,16 @@ function _relatedlinks_discovered_settin /** * 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']); } /** @@ -613,7 +605,7 @@ function relatedlinks_autocomplete($stri } /* - * Helper function to sort related link types by weight, enabled status and + * Helper function to sort related link types by weight, enabled status and * block status respectively. */ function _relatedlinks_compare($a, $b) { @@ -632,8 +624,8 @@ function _relatedlinks_compare($a, $b) { /** * Create a data structure for link types data. To add a new link type, simply * add a new array to the structure below. - * - * @return + * + * @return * Default settings for the relatedlinks type associations. */ function _relatedlinks_get_type_defaults() { @@ -706,7 +698,7 @@ function _relatedlinks_get_discovered_de /** * Insert related links into the database. - * + * * @param $nid * Node ID of the node to add links for. * @param $links @@ -722,12 +714,12 @@ function _relatedlinks_add_links($nid, $ /** * Delete related links associated with a node from the database. - * + * * @param $nid * Node ID of the node to delete links for. * @param $type * The type of the links to delete as denoted by the type constants. - * + * */ function _relatedlinks_delete_links($nid, $type = NULL) { if (isset($type)) { @@ -740,10 +732,10 @@ function _relatedlinks_delete_links($nid /** * Retrieve related links from the database. - * + * * @param $nid * Node ID of the node to retrieve links for. - * + * * @return $links * An associative array of links arranged by link type. */ @@ -763,15 +755,15 @@ function _relatedlinks_get_links($nid) { } /** - * Filter an array of related links. Check for duplicates and return as a list + * Filter an array of related links. Check for duplicates and return as a list * of URLs. - * + * * @param $links * Associative array of links. - * + * * @return * An array of HTML links. - * + * * @TODO: Either fix url() to handle links starting with '/' or handle locally. * Path aliasing is not available due to the current approach. This only affects * parsed and manual links. @@ -796,10 +788,10 @@ function _relatedlinks_filter($links) { /** * Check and return an updated list of discovered links. - * + * * @param $node * The node whose discovered links need to be checked and returned. - * + * * @return $links * An associative array of discovered links. */ @@ -824,12 +816,12 @@ function _relatedlinks_update_discovered } /** - * Retrieve information on the discovered links for a node from the track + * Retrieve information on the discovered links for a node from the track * database. - * + * * @param $nid * Node ID of the node to get tracker information for. - * + * * @return * An associative array with a row from the tracker table, or FALSE if no * data could be retrieved. @@ -846,7 +838,7 @@ function _relatedlinks_get_tracker($nid) /** * Insert a record into the relatedlinks_tracker table. - * + * * @param $nid * Node ID of the node to insert a tracker record for. * @param $keywords @@ -859,7 +851,7 @@ function _relatedlinks_insert_tracker($n /** * Insert a record into the relatedlinks_tracker table. - * + * * @param $nid * Node ID of the node whose tracker record is to be updated. * @param $updated @@ -872,7 +864,7 @@ function _relatedlinks_update_tracker_ti /** * Delete a record from the relatedlinks_tracker table. - * + * * @param $nid * Node ID of the node whose tracker record is to be deleted. */ @@ -882,11 +874,11 @@ function _relatedlinks_delete_tracker($n /** * Helper function that caches node types. - * + * * @param $keys * A boolean variable that decides whether an associative array of node types * is to be returned (or not). - * + * * @return * An associative or non-associative array of node types. */ @@ -906,12 +898,12 @@ function _relatedlinks_node_get_types($k /** * Check links for duplicates and return as an associative array. - * + * * @param $url_matches * An array of URLs. * @param $title_matches * An array of titles (corresponding to the $url_matches array). - * + * * @return $links * An array of distinct URL and title pairs. */ @@ -934,7 +926,7 @@ function _relatedlinks_check_links($url_ /** * Calculate, collate and return the discovered links for a node. - * + * * @param $node * The node whose discovered links are to be calculated. * @param $keywords @@ -953,7 +945,7 @@ function _relatedlinks_get_discovered_li if (module_exists('taxonomy') && in_array('taxonomy', $discovered['ranking'])) { $vids = isset($discovered['vocabularies']) ? $discovered['vocabularies'] : array(); $tids = array_keys($node->taxonomy); - $taxonomy_links = _relatedlinks_taxonomy_select_nodes($node->nid, $tids, $max, $vids, $node_types, $date, $user, $comments); + $taxonomy_links = _relatedlinks_taxonomy_select_nodes($node->nid, $tids, $max, $vids, $node_types, $date, $user, $comments); } if (module_exists('search') && in_array('search', $discovered['ranking'])) { $search_links = _relatedlinks_search_select_nodes($node->nid, $keywords, $max, $node_types); @@ -993,8 +985,8 @@ function _relatedlinks_get_discovered_li * * @return $links * An array of discovered links related by taxonomy terms to the current node. - * - * @todo + * + * @todo * Handle term hierarchies (depth). * Escape SQL input as an added precaution. */ @@ -1064,7 +1056,7 @@ function _relatedlinks_taxonomy_select_n * * @return $links * An array of discovered links provided by the search module. - * + * * @todo * Hook search currently does not appear to have an option to specify the * number of results that can be returned. @@ -1109,7 +1101,7 @@ function _relatedlinks_search_select_nod /** * Sort through the taxonomy and search link arrays and retrieve the discovered * links for a node. - * + * * @param $set1 * An array of discovered links. * @param $set2 @@ -1165,14 +1157,23 @@ function _relatedlinks_node_candidates($ } /** + * Implementation of hook_theme(). + */ +function relatedlinks_theme() { + return array( + 'relatedlinks_types_table' => array('form' => NULL), + ); +} + +/** * Theme the related links configuration table. - * + * * @param $form * The configuration form to theme. - * + * * @return * A themed table of configuration settings. - * + * * @todo * Get rid of the inline styles. */ @@ -1197,10 +1198,10 @@ function theme_relatedlinks_types_table( /** * Theme the relatedlinks block output. - * + * * @param $links * An array of links to theme. - * + * * @return * A themed list of links. */