Index: README.txt =================================================================== RCS file: /cvs/drupal-contrib/contributions/modules/nodewords/README.txt,v retrieving revision 1.27.2.21 diff -u -p -r1.27.2.21 README.txt --- README.txt 7 May 2010 05:55:38 -0000 1.27.2.21 +++ README.txt 15 Jan 2011 21:37:25 -0000 @@ -26,6 +26,10 @@ To assure compatibility between Nodeword latest version available of Nodewords and Meta tags Node Type; previous versions were not compatible with the recent changes in Nodewords. +Search engine site verification support is no longer included, please use one +of the separate modules for controlling this, e.g. Site_Verify: + http://drupal.org/project/site_verify + Credits / Contact ------------------------------------------------------------------------------ Original author of this module is Andras Barthazi. Mike Carter [2] and Index: nodewords.install =================================================================== RCS file: /cvs/drupal-contrib/contributions/modules/nodewords/nodewords.install,v retrieving revision 1.10.2.187 diff -u -p -r1.10.2.187 nodewords.install --- nodewords.install 26 May 2010 04:22:57 -0000 1.10.2.187 +++ nodewords.install 15 Jan 2011 21:37:25 -0000 @@ -1112,6 +1112,45 @@ function nodewords_update_6179() { } /** + * Implements hook_update_N(). + */ +function nodewords_update_6180() { + $ret = array(); + + // Delete the unnecessary variables. + $engines = array( + 'alexa_verification_code', + 'bing_webmaster_center', + 'google_webmaster_tools', + 'yahoo_site_explorer', + 'yandex_webmaster_tools', + ); + $nodewords_admin_edit = variable_get('nodewords_admin_edit', array()); + $nodewords_head = variable_get('nodewords_head', array()); + $nodewords_search_index = variable_get('nodewords_search_index', array()); + foreach ($engines as $engine) { + variable_del('nodewords_admin_use_default_value_'. $engine); + unset($nodewords_admin_edit[$engine]); + unset($nodewords_head[$engine]); + unset($nodewords_search_index[$engine]); + } + // Update the three settings arrays. + variable_set('nodewords_admin_edit', $nodewords_admin_edit); + variable_set('nodewords_head', $nodewords_head); + variable_set('nodewords_search_index', $nodewords_search_index); + + // Remove the module definition from the system table. + $ret[] = update_sql("DELETE FROM {system} WHERE name IN ('nodewords_verification_tags'"); + + $ret[] = array( + 'success' => TRUE, + 'query' => 'Search engine site verification support has been removed from Nodewords, please make sure to replace this functionality with e.g. the Site_Verify module. Note that the verification tags have not been removed, only some anciliary variables, allowing the other modules to convert the settings as needed.', + ); + + return $ret; +} + +/** * Implements hook_uninstall(). */ function nodewords_uninstall() { Index: nodewords_verification_tags/nodewords_verification_tags.info =================================================================== RCS file: nodewords_verification_tags/nodewords_verification_tags.info diff -N nodewords_verification_tags/nodewords_verification_tags.info --- nodewords_verification_tags/nodewords_verification_tags.info 21 Mar 2010 13:11:24 -0000 1.1.2.4 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,6 +0,0 @@ -; $Id: nodewords_verification_tags.info,v 1.1.2.4 2010/03/21 13:11:24 kiam Exp $ -name = Site verification meta tags -description = Define site verification meta tags required by some web sites (mainly from search engines) to verify a web site. -package = Meta tags -core = 6.x -dependencies[] = nodewords Index: nodewords_verification_tags/nodewords_verification_tags.install =================================================================== RCS file: nodewords_verification_tags/nodewords_verification_tags.install diff -N nodewords_verification_tags/nodewords_verification_tags.install --- nodewords_verification_tags/nodewords_verification_tags.install 21 Mar 2010 13:11:24 -0000 1.1.2.10 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,49 +0,0 @@ - t('Site verification meta tags'), - 'description' => t('You have enabled two modules with similar purpose (site_verify.module and nodewords_verification_tags.module.'), - 'severity' => REQUIREMENT_ERROR, - 'value' => t('Disable one of the modules in modules page'. array('@modules-page' => url('admin/build/modules'))), - ); - } - } - - return $requirements; -} - -/** - * Implements hook_install(). - */ -function nodewords_verification_tags_install() { - db_query("UPDATE {system} SET weight = 16 WHERE name = 'nodewords_verification_tags' AND type = 'module'"); -} - -/** - * Implements hook_uninstall(). - */ -function nodewords_verification_tags_uninstall() { - if (db_table_exists('nodewords')) { - $metatags = array( - 'bing_webmaster_center', - 'google_webmaster_tools', - 'yahoo_site_explorer', - ); - - db_query("DELETE FROM {nodewords} WHERE name IN (" . db_placeholders($metatags, 'varchar') . ")", $metatags); - } -} Index: nodewords_verification_tags/nodewords_verification_tags.module =================================================================== RCS file: nodewords_verification_tags/nodewords_verification_tags.module diff -N nodewords_verification_tags/nodewords_verification_tags.module --- nodewords_verification_tags/nodewords_verification_tags.module 8 May 2010 16:41:35 -0000 1.1.2.20 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,18 +0,0 @@ - '1.14', - 'path' => '', - ); -} Index: nodewords_verification_tags/includes/nodewords_verification_tags.nodewords.hooks.inc =================================================================== RCS file: nodewords_verification_tags/includes/nodewords_verification_tags.nodewords.hooks.inc diff -N nodewords_verification_tags/includes/nodewords_verification_tags.nodewords.hooks.inc --- nodewords_verification_tags/includes/nodewords_verification_tags.nodewords.hooks.inc 30 Oct 2010 19:19:00 -0000 1.1.2.6 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,87 +0,0 @@ - array( - 'callback' => 'nodewords_verification_tags_alexa_verification_code', - 'context' => array( - 'allowed' => array( - NODEWORDS_TYPE_PAGE, - ), - ), - 'label' => t('Alexa verification code'), - 'templates' => array( - 'head' => array( - 'alexaVerifyID' => NODEWORDS_META, - ), - ), - ), - 'bing_webmaster_center' => array( - 'callback' => 'nodewords_verification_tags_bing_webmaster_center', - 'context' => array( - 'allowed' => array( - NODEWORDS_TYPE_PAGE, - ), - ), - 'label' => t('Bing Webmaster Center verification code'), - 'templates' => array( - 'head' => array( - 'msvalidate.01' => NODEWORDS_META, - ), - ), - ), - 'google_webmaster_tools' => array( - 'callback' => 'nodewords_verification_tags_google_webmaster_tools', - 'context' => array( - 'allowed' => array( - NODEWORDS_TYPE_PAGE, - ), - ), - 'label' => t('Google Webmaster Tools verification code'), - 'templates' => array( - 'head' => array( - 'google-site-verification' => NODEWORDS_META, - ), - ), - ), - 'yahoo_site_explorer' => array( - 'callback' => 'nodewords_verification_tags_yahoo_site_explorer', - 'context' => array( - 'allowed' => array( - NODEWORDS_TYPE_PAGE, - ), - ), - 'label' => t('Yahoo! Site Explorer verification code'), - 'templates' => array( - 'head' => array( - 'y_key' => NODEWORDS_META, - ), - ), - ), - 'yandex_webmaster_tools' => array( - 'callback' => 'nodewords_verification_tags_yandex_webmaster_tools', - 'context' => array( - 'allowed' => array( - NODEWORDS_TYPE_PAGE, - ), - ), - 'label' => t('Yandex verification code'), - 'templates' => array( - 'head' => array( - 'yandex-verification' => NODEWORDS_META, - ), - ), - ), - ); - - return $tags; -} Index: nodewords_verification_tags/includes/nodewords_verification_tags.nodewords.tags.inc =================================================================== RCS file: nodewords_verification_tags/includes/nodewords_verification_tags.nodewords.tags.inc diff -N nodewords_verification_tags/includes/nodewords_verification_tags.nodewords.tags.inc --- nodewords_verification_tags/includes/nodewords_verification_tags.nodewords.tags.inc 30 Oct 2010 19:19:00 -0000 1.1.2.5 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,137 +0,0 @@ - TRUE, - ); - - $form['alexa_verification_code']['value'] = array( - '#type' => 'textfield', - '#title' => t('Alexa verification code'), - '#description' => t('Alexa will ask you to add a meta tag in order to verify you have write access to the pages of the web site you registered with their services. You can obtain a verification code claiming your site', array('@alexa-url' => 'http://www.alexa.com', '@alexa-claim-your-site' => 'http://www.alexa.com/siteowners/claim')) . $options['description'], - '#default_value' => empty($content['value']) ? '' : $content['value'], - '#maxlength' => variable_get('nodewords_max_size', 350), - ); -} - -/** - * Set the meta tag content. - */ -function nodewords_verification_tags_alexa_verification_code_prepare(&$tags, $content, $options) { - if (!empty($content['value'])) { - $tags['alexa_verification_code:alexaVerifyID'] = $content['value']; - } -} - -/** - * Set the form fields used to implement the options for the meta tag. - */ -function nodewords_verification_tags_bing_webmaster_center_form(&$form, $content, $options) { - $form['bing_webmaster_center'] = array( - '#tree' => TRUE, - ); - - $form['bing_webmaster_center']['value'] = array( - '#type' => 'textfield', - '#title' => t('Bing Webmaster Center verification code'), - '#description' => t('Bing Webmaster Center will ask you to add a meta tag in order to verify you have write access to the pages of the web site you registered with their services.', array('@bing-url' => 'http://www.bing.com/webmaster')) . $options['description'], - '#default_value' => empty($content['value']) ? '' : $content['value'], - '#maxlength' => variable_get('nodewords_max_size', 350), - ); -} - -/** - * Set the meta tag content. - */ -function nodewords_verification_tags_bing_webmaster_center_prepare(&$tags, $content, $options) { - if (!empty($content['value'])) { - $tags['bing_webmaster_center:msvalidate.01'] = $content['value']; - } -} - -/** - * Set the form fields used to implement the options for the meta tag. - */ -function nodewords_verification_tags_google_webmaster_tools_form(&$form, $content, $options) { - $form['google_webmaster_tools'] = array( - '#tree' => TRUE, - ); - - $form['google_webmaster_tools']['value'] = array( - '#type' => 'textfield', - '#title' => t('Google Webmaster Tools verification code'), - '#description' => t('Google Webmaster Tools will ask you to add a meta tag in your web site to provide you with an easy way to make your site more Google-friendly.', array('@google-url' => 'http://www.google.com/webmasters/tools')) . $options['description'], - '#default_value' => empty($content['value']) ? '' : $content['value'], - '#maxlength' => variable_get('nodewords_max_size', 350), - ); -} - -/** - * Set the meta tag content. - */ -function nodewords_verification_tags_google_webmaster_tools_prepare(&$tags, $content, $options) { - if (!empty($content['value'])) { - $tags['google_webmaster_tools:google-site-verification'] = $content['value']; - } -} - -/** - * Set the form fields used to implement the options for the meta tag. - */ -function nodewords_verification_tags_yahoo_site_explorer_form(&$form, $content, $options) { - $form['yahoo_site_explorer'] = array( - '#tree' => TRUE, - ); - - $form['yahoo_site_explorer']['value'] = array( - '#type' => 'textfield', - '#title' => t('Yahoo! Site Explorer'), - '#description' => t('Yahoo! Site Explorer will ask you to add a meta tag in your web site to allow you to explore all the web pages indexed by Yahoo! Search.', array('@yahoo-url' => 'https://siteexplorer.search.yahoo.com/')) . $options['description'], - '#default_value' => empty($content['value']) ? '' : $content['value'], - '#maxlength' => variable_get('nodewords_max_size', 350), - ); -} - -/** - * Set the meta tag content. - */ -function nodewords_verification_tags_yahoo_site_explorer_prepare(&$tags, $content, $options) { - if (!empty($content['value'])) { - $tags['yahoo_site_explorer:y_key'] = $content['value']; - } -} - -/** - * Set the form fields used to implement the options for the meta tag. - */ -function nodewords_verification_tags_yandex_webmaster_tools_form(&$form, $content, $options) { - $form['yandex_webmaster_tools'] = array( - '#tree' => TRUE, - ); - - $form['yandex_webmaster_tools']['value'] = array( - '#type' => 'textfield', - '#title' => t('Yandex verification code'), - '#description' => t('Yandex Webmaster will ask you to add a meta tag in your web site to provide you with an easy way to make your site more Yandex-friendly.', array('@yandex-webmaster' => 'https://webmaster.yandex.ru/', '@yandex-url' => 'http://yandex.ru')) . $options['description'], - '#default_value' => empty($content['value']) ? '' : $content['value'], - '#maxlength' => variable_get('nodewords_max_size', 350), - ); -} - -/** - * Set the meta tag content. - */ -function nodewords_verification_tags_yandex_webmaster_tools_prepare(&$tags, $content, $options) { - if (!empty($content['value'])) { - $tags['yandex_webmaster_tools:yandex-verification'] = $content['value']; - } -}