Index: xmlsitemap_engines/xmlsitemap_engines.install =================================================================== RCS file: /cvs/drupal-contrib/contributions/modules/xmlsitemap/xmlsitemap_engines/xmlsitemap_engines.install,v retrieving revision 1.1.2.1.2.7 diff -u -p -r1.1.2.1.2.7 xmlsitemap_engines.install --- xmlsitemap_engines/xmlsitemap_engines.install 19 May 2009 07:27:23 -0000 1.1.2.1.2.7 +++ xmlsitemap_engines/xmlsitemap_engines.install 5 Jun 2009 18:57:45 -0000 @@ -27,8 +27,29 @@ function xmlsitemap_engines_update_1() { } /** + * Update variables from Live Search to Bing. + */ +function xmlsitemap_engines_update_2() { + $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() { db_query("DELETE FROM {variable} WHERE name LIKE 'xmlsitemap\_engines\_'"); -} \ No newline at end of file +} Index: xmlsitemap_engines/xmlsitemap_engines.module =================================================================== RCS file: /cvs/drupal-contrib/contributions/modules/xmlsitemap/xmlsitemap_engines/xmlsitemap_engines.module,v retrieving revision 1.1.2.5.2.17 diff -u -p -r1.1.2.5.2.17 xmlsitemap_engines.module --- xmlsitemap_engines/xmlsitemap_engines.module 19 May 2009 07:27:23 -0000 1.1.2.5.2.17 +++ xmlsitemap_engines/xmlsitemap_engines.module 5 Jun 2009 18:57:45 -0000 @@ -3,7 +3,7 @@ /** * @file - * Defines actions for Google, Yahoo!, Ask, and Windows Live. + * Defines actions for Google, Yahoo!, Ask, and Bing. */ /** @@ -38,12 +38,12 @@ function xmlsitemap_engines_menu($may_ca 'access' => $access_content, ); } - if (($verify = variable_get('xmlsitemap_engines_live_verify', 'LiveSearchSiteAuth.xml')) != '') { + if (($verify = variable_get('xmlsitemap_engines_bing_verify', '')) != '') { $items[] = array( 'path' => $verify, - 'title' => t('Windows Live verification page'), + 'title' => t('Bing verification page'), 'callback' => 'xmlsitemap_engines_verify', - 'callback arguments' => array('live'), + 'callback arguments' => array('bing'), 'type' => MENU_CALLBACK, 'access' => $access_content, ); @@ -119,35 +119,35 @@ function xmlsitemap_engines_xmlsitemap_e '#default_value' => variable_get('xmlsitemap_engines_moreover_url', 'http://api.moreover.com/ping?u=[sitemap]'), '#description' => t('The URL to submit the sitemap to. Use %placeholder like placeholder for the sitemap URL.', array('%placeholder' => '[sitemap]')), ); - // Windows Live form. - $form['live'] = array( + // Bing form. + $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 Big'), + '#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'), - '#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.bing.com/webmaster/ping.aspx?siteMap=[sitemap]'), '#description' => t('The URL to submit the sitemap to. Use %placeholder like placeholder for the sitemap URL.', array('%placeholder' => '[sitemap]')), ); - $form['live']['xmlsitemap_engines_live_verify'] = array( + $form['bing']['xmlsitemap_engines_bing_verify'] = array( '#type' => 'textfield', '#title' => t('Authentication file'), - '#default_value' => variable_get('xmlsitemap_engines_live_verify', 'LiveSearchSiteAuth.xml'), - '#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_bing_verify', ''), + '#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.'), ); - $form['live']['xmlsitemap_engines_live_verify_string'] = array( + $form['bing']['xmlsitemap_engines_bing_verify_string'] = array( '#type' => 'textfield', '#title' => t('Authentication tag'), - '#default_value' => variable_get('xmlsitemap_engines_live_verify_string', ''), - '#description' => t('Windows Live will give you an authentication tag.'), + '#default_value' => variable_get('xmlsitemap_engines_bing_verify_string', ''), + '#description' => t('Bing will give you an authentication tag.'), ); // Yahoo! form. $form['yahoo'] = array( @@ -199,10 +199,10 @@ function xmlsitemap_engines_xmlsitemap_e 'http://api.moreover.com/ping?u=[sitemap]' ); } - // Windows Live. - if (variable_get('xmlsitemap_engines_ask_submit', FALSE)) { - xmlsitemap_engines_submit_sitemap('Windows Live', 'xmlsitemap_engines_live_url', - 'http://webmaster.live.com/ping.aspx?siteMap=[sitemap]' + // Bing. + if (variable_get('xmlsitemap_engines_bing_submit', FALSE)) { + xmlsitemap_engines_submit_sitemap('Bing', 'xmlsitemap_engines_bing_url', + 'http://www.bing.com/webmaster/ping.aspx?siteMap=[sitemap]' ); } // Yahoo!. @@ -241,10 +241,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; }