Index: xmlsitemap_engines.admin.inc =================================================================== RCS file: /cvs/drupal-contrib/contributions/modules/xmlsitemap/xmlsitemap_engines/Attic/xmlsitemap_engines.admin.inc,v retrieving revision 1.1.2.9 diff -u -p -r1.1.2.9 xmlsitemap_engines.admin.inc --- xmlsitemap_engines.admin.inc 23 May 2009 14:08:18 -0000 1.1.2.9 +++ xmlsitemap_engines.admin.inc 5 Jun 2009 18:43:17 -0000 @@ -81,17 +81,17 @@ function xmlsitemap_engines_settings() { '#description' => t('In order to show statistics, Google will ask you to verify that you control this site by creating a file with a certain name. Enter that name here and the XML sitemap module will create a path to that file name. This will only work if you have clean URLs enabled.'), '#default_value' => variable_get('xmlsitemap_engines_google_verify', ''), ); - $form['verification']['live']['xmlsitemap_engines_live_verify'] = array( + $form['verification']['bing']['xmlsitemap_engines_bing_verify'] = array( '#type' => 'textfield', - '#title' => t('Windows Live authentication file'), - '#description' => t('Before allowing you to view additional information, Windows Live will ask you to verify that you control this site by creating a file with a certain name. Enter that name here, and XML sitemap will create a path to that file name. This will only work if you have clean URLs enabled.'), - '#default_value' => variable_get('xmlsitemap_engines_live_verify', 'LiveSearchSiteAuth.xml'), + '#title' => t('Bing (formerly Live Search) authentication file'), + '#description' => t('Before allowing you to view additional information, Bing will ask you to verify that you control this site by creating a file with a certain name. Enter that name here, and XML sitemap will create a path to that file name. This will only work if you have clean URLs enabled.'), + '#default_value' => variable_get('xmlsitemap_engines_bing_verify', ''), ); - $form['verification']['live']['xmlsitemap_engines_live_verify_string'] = array( + $form['verification']['bing']['xmlsitemap_engines_bing_verify_string'] = array( '#type' => 'textfield', - '#title' => t('Windows Live authentication tag'), - '#description' => t('Windows Live will give you an authentication tag.'), - '#default_value' => variable_get('xmlsitemap_engines_live_verify_string', ''), + '#title' => t('Bing authentication tag'), + '#description' => t('Bing will give you an authentication tag.'), + '#default_value' => variable_get('xmlsitemap_engines_bing_verify_string', ''), ); $form['verification']['yahoo']['xmlsitemap_engines_yahoo_verify'] = array( '#type' => 'textfield', Index: xmlsitemap_engines.install =================================================================== RCS file: /cvs/drupal-contrib/contributions/modules/xmlsitemap/xmlsitemap_engines/xmlsitemap_engines.install,v retrieving revision 1.3.2.17 diff -u -p -r1.3.2.17 xmlsitemap_engines.install --- xmlsitemap_engines.install 25 May 2009 18:33:03 -0000 1.3.2.17 +++ xmlsitemap_engines.install 5 Jun 2009 18:43:17 -0000 @@ -59,6 +59,27 @@ function xmlsitemap_engines_update_6106( } /** + * Update variables from Live Search to Bing. + */ +function xmlsitemap_engines_update_6107() { + $variables = array( + 'submit' => FALSE, + 'url' => 'http://webmaster.live.com/ping.aspx?siteMap=[sitemap]', + 'verify' => '', + 'verify_string' => '', + ); + foreach ($variables as $variable => $default) { + $value = variable_get('xmlsitemap_engines_live_' . $variable, $default); + if ($variable == 'url' && $value == $default) { + $value = 'http://www.bing.com/webmaster/ping.aspx?siteMap=[sitemap]'; + } + variable_set('xmlsitemap_engines_bing_' . $variable, $value); + variable_del('xmlsitemap_engines_live_' . $variable); + } + return array(); +} + +/** * Implementation of hook_uninstall(). */ function xmlsitemap_engines_uninstall() { Index: xmlsitemap_engines.module =================================================================== RCS file: /cvs/drupal-contrib/contributions/modules/xmlsitemap/xmlsitemap_engines/xmlsitemap_engines.module,v retrieving revision 1.5.2.42 diff -u -p -r1.5.2.42 xmlsitemap_engines.module --- xmlsitemap_engines.module 25 May 2009 02:52:15 -0000 1.5.2.42 +++ xmlsitemap_engines.module 5 Jun 2009 18:43:17 -0000 @@ -3,7 +3,7 @@ /** * @file - * Define actions for Google, Yahoo!, Ask, and Windows Live. + * Define actions for Google, Yahoo!, Ask, and Bing. */ /** @@ -72,11 +72,11 @@ function xmlsitemap_engines_menu() { 'file' => 'xmlsitemap_engines.pages.inc', ); } - if ($verify = variable_get("xmlsitemap_engines_live_verify", '')) { + if ($verify = variable_get("xmlsitemap_engines_bing_verify", '')) { $items[$verify] = array( - 'title' => 'Windows Live verification page', + 'title' => 'Bing verification page', 'page callback' => 'xmlsitemap_engines_verify', - 'page arguments' => array('live'), + 'page arguments' => array('bing'), 'access arguments' => array('access content'), 'type' => MENU_CALLBACK, 'file' => 'xmlsitemap_engines.pages.inc', @@ -91,9 +91,9 @@ function xmlsitemap_engines_menu() { function xmlsitemap_engines_form_xmlsitemap_tools_alter(&$form, &$from_state) { $options = array( 'ask' => t('Ask.com'), + 'bing' => t('Bing'), 'google' => t('Google'), 'moreover' => t('Moreover.com'), - 'live' => t('Microsoft Live'), 'yahoo' => t('Yahoo!'), ); $form['xmlsitemap_engine_submit_to_search_engines'] = array( @@ -103,7 +103,7 @@ function xmlsitemap_engines_form_xmlsite ); $form['xmlsitemap_engine_submit_to_search_engines']['search_engines'] = array( '#type' => 'checkboxes', - '#title' => t('Search engines'), + '#title' => t('Search engines'), '#default_value' => array(), '#options' => $options, '#checkall' => TRUE, @@ -141,7 +141,7 @@ function xmlsitemap_engines_submit_to_se */ function xmlsitemap_engines_ping_sitemap($engines = array(), $all = FALSE) { if (empty($engines) && $all) { - $engines = array('ask', 'google', 'moreover', 'live', 'yahoo'); + $engines = array('ask', 'bing', 'google', 'moreover', 'yahoo'); } if (!empty($engines)) { foreach (_xmlsitemap_engines_get_engines_data() as $id => $info) { @@ -187,6 +187,10 @@ function _xmlsitemap_engines_get_engines 'Ask.com', 'http://submissions.ask.com/ping?sitemap=[sitemap]', ), + 'bing' => array( + 'Bing (formerly Live Search)', + 'http://www.bing.com/webmaster/ping.aspx?siteMap=[sitemap]', + ), 'google' => array( 'Google', 'http://www.google.com/webmasters/tools/ping?sitemap=[sitemap]', @@ -195,10 +199,6 @@ function _xmlsitemap_engines_get_engines 'Moreover.com', 'http://api.moreover.com/ping?u=[sitemap]', ), - 'live' => array( - 'Windows Live', - 'http://webmaster.live.com/ping.aspx?siteMap=[sitemap]', - ), 'yahoo' => array( 'Yahoo!', 'http://search.yahooapis.com/SiteExplorerService/V1/ping?sitemap=[sitemap]', @@ -209,4 +209,3 @@ function _xmlsitemap_engines_get_engines /** * @} End of "addtogroup xmlsitemap". */ - Index: xmlsitemap_engines.pages.inc =================================================================== RCS file: /cvs/drupal-contrib/contributions/modules/xmlsitemap/xmlsitemap_engines/Attic/xmlsitemap_engines.pages.inc,v retrieving revision 1.1.2.2 diff -u -p -r1.1.2.2 xmlsitemap_engines.pages.inc --- xmlsitemap_engines.pages.inc 6 May 2009 18:59:01 -0000 1.1.2.2 +++ xmlsitemap_engines.pages.inc 5 Jun 2009 18:43:17 -0000 @@ -33,10 +33,10 @@ function xmlsitemap_engines_verify($engi case 'yahoo': print variable_get('xmlsitemap_engines_yahoo_verify_string', ''); break; - case 'live': + case 'bing': print ''."\n"; print "\n"; - print ' '. variable_get('xmlsitemap_engines_live_verify_string', '') ."\n"; + print ' '. variable_get('xmlsitemap_engines_bing_verify_string', '') ."\n"; print "\n"; break; }