Index: nodewords_extra/nodewords_extra.install =================================================================== RCS file: /cvs/drupal-contrib/contributions/modules/nodewords/nodewords_extra/nodewords_extra.install,v retrieving revision 1.1.2.14 diff -u -p -r1.1.2.14 nodewords_extra.install --- nodewords_extra/nodewords_extra.install 21 Mar 2010 13:11:24 -0000 1.1.2.14 +++ nodewords_extra/nodewords_extra.install 29 Oct 2010 21:18:33 -0000 @@ -14,10 +14,6 @@ function nodewords_extra_install() { } /** - * Next update ID: 6106. -*/ - -/** * Implements hook_uninstall(). */ function nodewords_extra_uninstall() { @@ -36,3 +32,17 @@ function nodewords_extra_uninstall() { db_query("DELETE FROM {nodewords} WHERE name IN (". db_placeholders($metatags, 'varchar') .")", $metatags); } } + +/** + * Implements hook_update_last_removed(). + */ +function nodewords_extra_update_last_removed() { + return 6105; +} + +/** + * Removed support for IRCA PICS labels. + */ +function nodewords_extra_update_6106() { + db_query("DELETE FROM {nodewords} WHERE name = 'pics-label'"); +} Index: nodewords_extra/nodewords_extra.module =================================================================== RCS file: /cvs/drupal-contrib/contributions/modules/nodewords/nodewords_extra/nodewords_extra.module,v retrieving revision 1.1.2.65 diff -u -p -r1.1.2.65 nodewords_extra.module --- nodewords_extra/nodewords_extra.module 8 May 2010 16:41:34 -0000 1.1.2.65 +++ nodewords_extra/nodewords_extra.module 29 Oct 2010 21:18:33 -0000 @@ -18,22 +18,6 @@ function nodewords_extra_form_nodewords_ } /** - * Implements hook_menu(). - */ -function nodewords_extra_menu() { - $items = array(); - - $items['labels.rdf'] = array( - 'title' => 'ICRA labels', - 'page callback' => 'nodewords_extra_verification_content', - 'access arguments' => array('access content'), - 'type' => MENU_CALLBACK, - ); - - return $items; -} - -/** * Implements hook_nodewords_api(). */ function nodewords_extra_nodewords_api() { @@ -42,9 +26,3 @@ function nodewords_extra_nodewords_api() 'path' => '', ); } - -function nodewords_extra_verification_content() { - drupal_set_header('Content-Type: application/rdf+xml; charset=utf-8'); - - print variable_get('nodewords_icra_validation_content', ''); -} Index: nodewords_extra/includes/nodewords_extra.nodewords.hooks.inc =================================================================== RCS file: /cvs/drupal-contrib/contributions/modules/nodewords/nodewords_extra/includes/Attic/nodewords_extra.nodewords.hooks.inc,v retrieving revision 1.1.2.9 diff -u -p -r1.1.2.9 nodewords_extra.nodewords.hooks.inc --- nodewords_extra/includes/nodewords_extra.nodewords.hooks.inc 28 May 2010 15:03:49 -0000 1.1.2.9 +++ nodewords_extra/includes/nodewords_extra.nodewords.hooks.inc 29 Oct 2010 21:18:33 -0000 @@ -114,30 +114,6 @@ function nodewords_extra_nodewords_tags_ ), 'tokens' => TRUE, ), - 'pics-label' => array( - 'attributes' => array( - 'meta' => array( - 'title' => 'ICRA labels', - 'type' => 'application/rdf+xml', - ), - ), - 'callback' => 'nodewords_extra_pics', - 'context' => array( - 'allowed' => array( - NODEWORDS_TYPE_DEFAULT, - NODEWORDS_TYPE_NODE, - NODEWORDS_TYPE_PAGE, - ), - ), - 'label' => t('PICS labels'), - 'templates' => array( - 'head' => array( - 'pics-label' => NODEWORDS_HTTP_EQUIV, - 'meta' => NODEWORDS_LINK_REL, - ), - ), - 'weight' => array('meta' => -10), - ), 'shorturl' => array( 'context' => array( 'denied' => array( Index: nodewords_extra/includes/nodewords_extra.nodewords.tags.inc =================================================================== RCS file: /cvs/drupal-contrib/contributions/modules/nodewords/nodewords_extra/includes/Attic/nodewords_extra.nodewords.tags.inc,v retrieving revision 1.1.2.6 diff -u -p -r1.1.2.6 nodewords_extra.nodewords.tags.inc --- nodewords_extra/includes/nodewords_extra.nodewords.tags.inc 19 May 2010 20:20:28 -0000 1.1.2.6 +++ nodewords_extra/includes/nodewords_extra.nodewords.tags.inc 29 Oct 2010 21:18:33 -0000 @@ -285,65 +285,6 @@ function nodewords_extra_location_prepar /** * Set the form fields used to implement the options for the meta tag. */ -function nodewords_extra_pics_form(&$form, $content, $options) { - $form['pics-label'] = array( - '#tree' => TRUE, - ); - - $form['pics-label']['value'] = array( - '#type' => 'textfield', - '#title' => t('PICS labels'), - '#description' => t('Enter the ICRA PICS labels only, without any extra characters; ICRA PICS labels should be something similar to %icra-pics-example. You can use the online ICRA label generator.', array('%icra-pics-example' => 'n 0 s 0 v 0 l 0 oa 0 ob 0 oc 0 od 0 oe 0 of 0 og 0 oh 0 c 1', '@icra-label-generator' => 'http://www.icra.org/label/generator/')) . $options['description'], - '#default_value' => empty($content['value']) ? '' : $content['value'], - '#maxlength' => variable_get('nodewords_max_size', 350), - ); -} - -/** - * Set the meta tag content. - */ -function nodewords_extra_pics_prepare(&$tags, $content, $options) { - if (!empty($content['value'])) { - if ($options['type'] == NODEWORDS_TYPE_NODE) { - $tags['pics-label'] = strtr( - '(pics-1.1 "http://www.icra.org/pics/vocabularyv03/" l gen true for %url r (%pics))', - array( - '%url' => nodewords_url("node/{$options['id']}"), - '%pics' => $value, - ) - ); - } - elseif ($options['type'] == NODEWORDS_TYPE_PAGE) { - $tags['pics-label'] = strtr( - '(pics-1.1 "http://www.icra.org/pics/vocabularyv03/" l gen true for %url r (%pics))', - array( - '%url' => nodewords_url($_GET['q']), - '%pics' => $value, - ) - ); - } - } - - if (variable_get('nodewords_icra_validation_content', '')) { - $tags['pics-label:meta'] = nodewords_url('labels.rdf', array('absolute' => TRUE)); - } -} - -function nodewords_extra_pics_settings_form(&$form, $form_id, $options) { - if ($form_id == 'nodewords_admin_settings_form') { - $form['metatags_creation']['nodewords_icra_validation_content'] = array( - '#type' => 'textarea', - '#title' => t('ICRA validation content'), - '#description' => t('Enter the validation content you obtained from the ICRA label generator. For more information, see ICRA support.', array('@icra-support' => 'http://www.icra.org/support/', '@icra-generator' => 'http://www.icra.org/label/generator/')), - '#default_value' => variable_get('nodewords_icra_validation_content', ''), - '#wysiwyg' => FALSE, - ); - } -} - -/** - * Set the form fields used to implement the options for the meta tag. - */ function nodewords_extra_shorturl_form(&$form, $content, $options) { $form['shorturl'] = array( '#tree' => TRUE,