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.3 diff -u -p -r1.1.2.3 xmlsitemap_engines.install --- xmlsitemap_engines/xmlsitemap_engines.install 19 May 2008 06:21:17 -0000 1.1.2.3 +++ xmlsitemap_engines/xmlsitemap_engines.install 28 Jun 2009 16:23:24 -0000 @@ -46,7 +46,7 @@ function xmlsitemap_engines_uninstall() /** * Implementation of hook_update_N(). - * + * * Replace Moreover with Windows Live. */ function xmlsitemap_engines_update_1() { @@ -62,3 +62,23 @@ function xmlsitemap_engines_update_1() { return $ret; } +/** + * Update variables from Live Search to Bing. + */ +function xmlsitemap_engines_update_6107() { + $variables = array( + 'submit' => FALSE, + 'url' => 'http://www.bing.com/webmaster/ping.aspx?siteMap='. xmlsitemap_url('sitemap.xml', drupal_lookup_path('alias', 'sitemap.xml') ? drupal_lookup_path('alias', 'sitemap.xml') : NULL, NULL, NULL, TRUE), + '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='. xmlsitemap_url('sitemap.xml', drupal_lookup_path('alias', 'sitemap.xml') ? drupal_lookup_path('alias', 'sitemap.xml') : NULL, NULL, NULL, TRUE); + } + variable_set('xmlsitemap_engines_bing_' . $variable, $value); + variable_del('xmlsitemap_engines_live_' . $variable); + } + return array(); +} 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.8 diff -u -p -r1.1.2.8 xmlsitemap_engines.module --- xmlsitemap_engines/xmlsitemap_engines.module 2 Jun 2008 14:31:33 -0000 1.1.2.8 +++ xmlsitemap_engines/xmlsitemap_engines.module 28 Jun 2009 16:23:24 -0000 @@ -2,7 +2,7 @@ // $Id: xmlsitemap_engines.module,v 1.1.2.8 2008/06/02 14:31:33 darrenoh Exp $ /** - * @file Define actions for Google, Yahoo!, Ask, and Windows Live. + * @file Define actions for Google, Yahoo!, Ask, and Bing. */ /** @@ -20,13 +20,13 @@ function xmlsitemap_engines_xmlsitemap_e $form = array_merge($form, _xmlsitemap_engines_google('form')); $form = array_merge($form, _xmlsitemap_engines_yahoo('form')); $form = array_merge($form, _xmlsitemap_engines_ask('form')); - $form = array_merge($form, _xmlsitemap_engines_live('form')); + $form = array_merge($form, _xmlsitemap_engines_bing('form')); return $form; case 'ping': _xmlsitemap_engines_google('ping'); _xmlsitemap_engines_yahoo('ping'); _xmlsitemap_engines_ask('ping'); - _xmlsitemap_engines_live('ping'); + _xmlsitemap_engines_bing('ping'); break; case 'access': if (strpos($_SERVER['HTTP_USER_AGENT'], 'Googlebot') !== FALSE) { @@ -170,49 +170,49 @@ function _xmlsitemap_engines_ask($op) { } /** - * Define actions for Windows Live. + * Define actions for Bing. */ -function _xmlsitemap_engines_live($op) { +function _xmlsitemap_engines_bing($op) { switch ($op) { case 'form': - $form['live'] = array( + $form['bing'] = array( '#type' => 'fieldset', - '#title' => t('Windows Live'), + '#title' => t('Bing (formerly Windows Live)'), '#collapsible' => TRUE, '#collapsed' => TRUE, ); - $form['live']['xmlsitemap_engines_live_submit'] = array( + $form['bing']['xmlsitemap_engines_bing_submit'] = array( '#type' => 'checkbox', - '#title' => t('Submit site map to Windows Live.'), - '#default_value' => variable_get('xmlsitemap_engines_live_submit', FALSE), + '#title' => t('Submit site map 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'), - '#default_value' => variable_get('xmlsitemap_engines_live_url', 'http://webmaster.live.com/ping.aspx?siteMap='. xmlsitemap_url('sitemap.xml', drupal_lookup_path('alias', 'sitemap.xml') ? drupal_lookup_path('alias', 'sitemap.xml') : NULL, NULL, NULL, TRUE)), + '#default_value' => variable_get('xmlsitemap_engines_bing_url', 'http://www.bing.com/webmaster/ping.aspx?siteMap='. xmlsitemap_url('sitemap.xml', drupal_lookup_path('alias', 'sitemap.xml') ? drupal_lookup_path('alias', 'sitemap.xml') : NULL, NULL, NULL, TRUE)), '#description' => t('The URL to submit the site map to.'), ); - $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.'), ); return $form; case 'ping': - if (variable_get('xmlsitemap_engines_live_submit', FALSE)) { - $result = drupal_http_request(variable_get('xmlsitemap_engines_live_url', 'http://webmaster.live.com/ping.aspx?siteMap='. xmlsitemap_url('sitemap.xml', drupal_lookup_path('alias', 'sitemap.xml') ? drupal_lookup_path('alias', 'sitemap.xml') : NULL, NULL, NULL, TRUE))); + if (variable_get('xmlsitemap_engines_bing_submit', FALSE)) { + $result = drupal_http_request(variable_get('xmlsitemap_engines_bing_url', 'http://www.bing.com/webmaster/ping.aspx?siteMap='. xmlsitemap_url('sitemap.xml', drupal_lookup_path('alias', 'sitemap.xml') ? drupal_lookup_path('alias', 'sitemap.xml') : NULL, NULL, NULL, TRUE))); if ($result->code == 200) { - watchdog('xmlsitemap', t('Site map successfully submitted to Windows Live.')); + watchdog('xmlsitemap', t('Site map successfully submitted to Bing.')); } else { - watchdog('xmlsitemap', t('Error occurred submitting site map to Windows Live: @code', array('@code' => $result->code)), WATCHDOG_ERROR); + watchdog('xmlsitemap', t('Error occurred submitting site map to Bing: @code', array('@code' => $result->code)), WATCHDOG_ERROR); } } break; @@ -246,12 +246,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, ); @@ -278,10 +278,10 @@ function _xmlsitemap_engines_verify($eng 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; } @@ -290,4 +290,3 @@ function _xmlsitemap_engines_verify($eng /** * @} End of "addtogroup xmlsitemap". */ -