Index: xmlsitemap_engines/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.13 diff -u -p -r1.1.2.13 xmlsitemap_engines.admin.inc --- xmlsitemap_engines/xmlsitemap_engines.admin.inc 10 Jun 2009 21:34:19 -0000 1.1.2.13 +++ xmlsitemap_engines/xmlsitemap_engines.admin.inc 12 Jun 2009 16:03:51 -0000 @@ -107,35 +107,35 @@ function xmlsitemap_engines_settings() { '#description' => t('The URL to submit the sitemap to. Use %placeholder like placeholder for the sitemap URL.', array('%placeholder' => '[sitemap]')), '#default_value' => variable_get('xmlsitemap_engines_moreover_url', 'http://api.moreover.com/ping?u=[sitemap]'), ); - // Windows Live fields. - $form['live'] = array( + // Bing fields. + $form['bing'] = array( '#type' => 'fieldset', - '#title' => t('Windows Live'), + '#title' => t('Bing (formerly Live Search)'), '#collapsible' => TRUE, '#collapsed' => TRUE, ); - $form['live']['xmlsitemap_engines_live_submit'] = array( + $form['bing']['xmlsitemap_engines_bing_submit'] = array( '#type' => 'checkbox', - '#title' => t('Submit the sitemap to Windows Live'), - '#default_value' => variable_get('xmlsitemap_engines_live_submit', FALSE), + '#title' => t('Submit the sitemap to Bing'), + '#default_value' => variable_get('xmlsitemap_engines_bing_submit', FALSE), ); - $form['live']['xmlsitemap_engines_live_url'] = array( + $form['bing']['xmlsitemap_engines_bing_url'] = array( '#type' => 'textfield', '#title' => t('Submission URL'), '#description' => t('The URL to submit the sitemap to. Use %placeholder like placeholder for the sitemap URL.', array('%placeholder' => '[sitemap]')), - '#default_value' => variable_get('xmlsitemap_engines_live_url', 'http://webmaster.live.com/ping.aspx?siteMap=[sitemap]'), + '#default_value' => variable_get('xmlsitemap_engines_bing_url', 'http://www.gin.com/webmaster/ping.aspx?siteMap=[sitemap]'), ); - $form['live']['xmlsitemap_engines_live_verify'] = array( + $form['bing']['xmlsitemap_engines_bing_verify'] = array( '#type' => 'textfield', '#title' => t('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'), + '#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['live']['xmlsitemap_engines_live_verify_string'] = array( + $form['bing']['xmlsitemap_engines_bing_verify_string'] = array( '#type' => 'textfield', - '#title' => t('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', ''), ); // Yahoo! fields. $form['yahoo'] = array( Index: xmlsitemap_engines/xmlsitemap_engines.install =================================================================== RCS file: /cvs/drupal-contrib/contributions/modules/xmlsitemap/xmlsitemap_engines/xmlsitemap_engines.install,v retrieving revision 1.3.2.20 diff -u -p -r1.3.2.20 xmlsitemap_engines.install --- xmlsitemap_engines/xmlsitemap_engines.install 10 Jun 2009 21:34:19 -0000 1.3.2.20 +++ xmlsitemap_engines/xmlsitemap_engines.install 12 Jun 2009 16:03:51 -0000 @@ -60,6 +60,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/xmlsitemap_engines.module =================================================================== RCS file: /cvs/drupal-contrib/contributions/modules/xmlsitemap/xmlsitemap_engines/xmlsitemap_engines.module,v retrieving revision 1.5.2.45 diff -u -p -r1.5.2.45 xmlsitemap_engines.module --- xmlsitemap_engines/xmlsitemap_engines.module 10 Jun 2009 21:34:19 -0000 1.5.2.45 +++ xmlsitemap_engines/xmlsitemap_engines.module 12 Jun 2009 16:03:51 -0000 @@ -3,7 +3,7 @@ /** * @file - * Define actions for Google, Yahoo!, Ask, and Windows Live. + * Define actions for Google, Yahoo!, Ask, and Bing. */ /** @@ -75,11 +75,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', @@ -102,6 +102,11 @@ function xmlsitemap_engines_xmlsitemap_o 'callback' => 'xmlsitemap_engines_ping_sitemap', 'callback arguments' => array('engine' => 'ask'), ), + 'submit_to_bing' => array( + 'label' => t('Submit the sitemap to Bing'), + 'callback' => 'xmlsitemap_engines_ping_sitemap', + 'callback arguments' => array('engine' => 'bing'), + ), 'submit_to_google' => array( 'label' => t('Submit the sitemap to Google'), 'callback' => 'xmlsitemap_engines_ping_sitemap', @@ -112,11 +117,6 @@ function xmlsitemap_engines_xmlsitemap_o 'callback' => 'xmlsitemap_engines_ping_sitemap', 'callback arguments' => array('engine' => 'moreover'), ), - 'submit_to_live' => array( - 'label' => t('Submit the sitemap to Microsoft Live'), - 'callback' => 'xmlsitemap_engines_ping_sitemap', - 'callback arguments' => array('engine' => 'live'), - ), 'submit_to_yahoo' => array( 'label' => t('Submit the sitemap to Yahoo!'), 'callback' => 'xmlsitemap_engines_ping_sitemap', @@ -138,6 +138,10 @@ function xmlsitemap_engines_ping_sitemap '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]' @@ -146,10 +150,6 @@ function xmlsitemap_engines_ping_sitemap '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]' Index: xmlsitemap_engines/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/xmlsitemap_engines.pages.inc 6 May 2009 18:59:01 -0000 1.1.2.2 +++ xmlsitemap_engines/xmlsitemap_engines.pages.inc 12 Jun 2009 16:03:51 -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; }