Index: README.txt =================================================================== RCS file: /cvs/drupal-contrib/contributions/modules/gsitemap/README.txt,v retrieving revision 1.1.6.2 diff -u -p -r1.1.6.2 README.txt --- README.txt 9 Apr 2007 22:45:00 -0000 1.1.6.2 +++ README.txt 23 Apr 2007 20:54:02 -0000 @@ -5,9 +5,9 @@ Written as part of the Google Summer of Description ----------- -This module creates an XML sitemap at q=gsitemap that conforms to the Google -specification. It allows many options for customization of the data reported -in the sitemap. +This module creates an XML sitemap at q=gsitemap that conforms to the +sitemaps.org specification. It allows many options for customization of the +data reported in the sitemap. Dependencies ------------ @@ -19,4 +19,10 @@ See INSTALL.txt in this directory. More Information ---------------- -See http://www.google.com/webmasters/sitemap +sitemaps.org +http://www.google.com/webmasters/sitemap +http://developer.yahoo.com/search/siteexplorer/V1/ping.html + +Site maps may be manually submitted to MSN by visiting +http://search.msn.com/docs/submit.aspx and submitting the URL of the site +map. \ No newline at end of file Index: gsitemap.install =================================================================== RCS file: /cvs/drupal-contrib/contributions/modules/gsitemap/Attic/gsitemap.install,v retrieving revision 1.4.2.4 diff -u -p -r1.4.2.4 gsitemap.install --- gsitemap.install 16 Mar 2007 13:25:59 -0000 1.4.2.4 +++ gsitemap.install 23 Apr 2007 20:54:02 -0000 @@ -30,6 +30,38 @@ function gsitemap_install() { } } +/** + * Implementation of hook_uninstall(). + */ +function gsitemap_uninstall() { + db_query('DROP TABLE {gsitemap}'); + variable_del('gsitemap_verify'); + variable_del('gsitemap_submit'); + variable_del('gsitemap_frontpage'); + variable_del('gsitemap_promotewt'); + variable_del('gsitemap_commentwt'); + foreach (node_get_types('names') as $type => $name) { + variable_del('gsitemap_'. $type .'wt'); + } + variable_del('gsitemap_google_submit'); + variable_del('gsitemap_google_url'); + variable_del('gsitemap_verify'); + variable_del('gsitemap_yahoo_submit'); + variable_del('gsitemap_yahoo_url'); + variable_del('gsitemap_ask.com_submit'); + variable_del('gsitemap_ask.com_url'); + variable_del('gsitemap_submit'); + variable_del('gsitemap_cron_submit'); + variable_del('gsitemap_logacc'); + variable_del('gsitemap_chunk_size'); + variable_del('gsitemap_countcom'); + variable_del('gsitemap_showterms'); + variable_del('gsitemap_showusers'); +} + +/** + * Implementation of hook_update_N(). + */ function gsitemap_update_1() { return _system_update_utf8(array('gsitemap')); } Index: gsitemap.module =================================================================== RCS file: /cvs/drupal-contrib/contributions/modules/gsitemap/Attic/gsitemap.module,v retrieving revision 1.56.2.24 diff -u -p -r1.56.2.24 gsitemap.module --- gsitemap.module 23 Apr 2007 15:16:21 -0000 1.56.2.24 +++ gsitemap.module 23 Apr 2007 20:54:03 -0000 @@ -173,24 +173,16 @@ function gsitemap_comment($comment, $op) function gsitemap_admin_settings() { $form['priority_settings'] = array( '#type' => 'fieldset', - '#title' => t('Priority Settings'), + '#title' => t('Priority settings'), '#collapsible' => TRUE, ); - $form['priority_settings']['gsitemap_chunk_size'] = array( - '#type' => 'textfield', - '#title' => t('Chunk size'), - '#default_value' => variable_get('gsitemap_chunk_size', 10000), - '#size' => 10, - '#maxlength' => 5, - '#description' => t('This is the number of links to send at one time. Values can range between 1 and 50,000.'), - ); $form['priority_settings']['gsitemap_frontpage'] = array( '#type' => 'textfield', '#title' => t('Front page priority'), '#default_value' => variable_get('gsitemap_frontpage', '1.0'), '#size' => 10, '#maxlength' => 5, - '#description' => t('This is the absolute priority for the front page. Values can range between 0.0 and 1.0.'), + '#description' => t('This is the absolute priority for the front page. Values can range between 0.0 and 1.0.'), ); $form['priority_settings']['gsitemap_promotewt'] = array( '#type' => 'textfield', @@ -208,13 +200,9 @@ function gsitemap_admin_settings() { '#maxlength' => 5, '#description' => t('This number will be multiplied with the ratio of the number of comments on the node over the number of comments on the node with the most comments, i.e., this number will be added to the priority of the node with the most comments.'), ); - - // markup - $form['priority_settings']['note'] = array( - '#type' => 'markup', - '#value' => t('You can enter -1 in any of the following fields to prevent nodes of that type from appearing in the sitemap.'), + $form['priority_settings'][] = array( + '#value' => '

'. t('You can enter -1 in any of the following fields to prevent nodes of that type from appearing in the sitemap.') .'

', ); - foreach (node_get_types('names') as $type => $name) { $form['priority_settings']['gsitemap_'. $type .'wt'] = array( '#type' => 'textfield', @@ -226,18 +214,96 @@ function gsitemap_admin_settings() { ); } - $form['other_settings'] = array( + $form['search_engines'] = array( '#type' => 'fieldset', - '#title' => t('Other Settings'), + '#title' => t('Search engines'), '#collapsible' => TRUE, '#collapsed' => TRUE, ); - $form['other_settings']['gsitemap_verify'] = array( + $form['search_engines']['google'] = array( + '#type' => 'fieldset', + '#title' => t('Google'), + ); + $form['search_engines']['google']['gsitemap_google_submit'] = array( + '#type' => 'checkbox', + '#title' => t('Submit site map to Google.'), + ); + $form['search_engines']['google']['gsitemap_google_url'] = array( + '#type' => 'textfield', + '#title' => t('Submission URL'), + '#default_value' => variable_get('gsitemap_google_url', 'http://www.google.com/webmasters/tools/ping?sitemap='), + '#description' => t('The URL to submit the site map to. The path to the site map will be added automatically.'), + ); + $form['search_engines']['google']['gsitemap_verify'] = array( '#type' => 'textfield', '#title' => t('Verification link'), '#return value' => '', '#default_value' => variable_get('gsitemap_verify', ''), - '#description' => t('In order to view stats, Google will ask you to verify that you control this site by creating a page with a certain name. Enter that name here and the gsitemap module will hook that filename. Note that this will only work if you have clean URLs enabled.'), + '#description' => t('In order to show statistics, Google will ask you to verify that you control this site by creating a page with a certain name. Enter that name here and the gsitemap module will hook that filename. Note that this will only work if you have clean URLs enabled.'), + ); + $form['search_engines']['yahoo'] = array( + '#type' => 'fieldset', + '#title' => t('Yahoo'), + ); + $form['search_engines']['yahoo']['gsitemap_yahoo_submit'] = array( + '#type' => 'checkbox', + '#title' => t('Submit site map to Yahoo.'), + ); + $form['search_engines']['yahoo']['gsitemap_yahoo_url'] = array( + '#type' => 'textfield', + '#title' => t('Submission URL'), + '#default_value' => variable_get('gsitemap_yahoo_url', 'http://search.yahooapis.com/SiteExplorerService/V1/ping?sitemap='), + '#description' => t('The URL to submit the site map to. The path to the site map will be added automatically.'), + ); + $form['search_engines']['ask.com'] = array( + '#type' => 'fieldset', + '#title' => t('Ask.com'), + ); + $form['search_engines']['ask.com']['gsitemap_ask.com_submit'] = array( + '#type' => 'checkbox', + '#title' => t('Submit site map to Ask.com.'), + ); + $form['search_engines']['ask.com']['gsitemap_ask.com_url'] = array( + '#type' => 'textfield', + '#title' => t('Submission URL'), + '#default_value' => variable_get('gsitemap_ask.com_url', 'http://submissions.ask.com/ping?sitemap='), + '#description' => t('The URL to submit the site map to. The path to the site map will be added automatically.'), + ); + $form['search_engines']['gsitemap_submit'] = array( + '#type' => 'checkbox', + '#title' => t('Submit sitemap when updated.'), + '#return_value' => 1, + '#default_value' => variable_get('gsitemap_submit', 0), + '#description' => t('If enabled, the sitemap will be submitted via HTTP request each time it is updated.'), + ); + $form['search_engines']['gsitemap_cron_submit'] = array( + '#type' => 'checkbox', + '#title' => t('Submit sitemap on cron run.'), + '#return_value' => 1, + '#default_value' => variable_get('gsitemap_cron_submit', 0), + '#description' => t('If enabled, the sitemap will be submitted via HTTP request each time the cron job is run.'), + ); + $form['search_engines']['gsitemap_logacc'] = array( + '#type' => 'checkbox', + '#title' => t('Log accesses.'), + '#return_value' => 1, + '#default_value' => variable_get('gsitemap_logacc', 0), + '#description' => t('If enabled, an watchdog entry will be made each time the sitemap is accessed, containing information about the requestor.'), + ); + + $form['other_settings'] = array( + '#type' => 'fieldset', + '#title' => t('Other settings'), + '#collapsible' => TRUE, + '#collapsed' => TRUE, + ); + $form['other_settings']['gsitemap_chunk_size'] = array( + '#type' => 'textfield', + '#title' => t('Chunk size'), + '#default_value' => variable_get('gsitemap_chunk_size', 10000), + '#size' => 10, + '#maxlength' => 5, + '#description' => t('This is the number of links to send at one time. Values can range between 1 and 50,000.'), ); $form['other_settings']['gsitemap_countcom'] = array( '#type' => 'checkbox', @@ -260,27 +326,6 @@ function gsitemap_admin_settings() { '#default_value' => variable_get('gsitemap_showusers', 0), '#description' => t('If enabled, links to user profile pages will be included in the sitemap (requires requestor to have "access user profiles" permission).'), ); - $form['other_settings']['gsitemap_submit'] = array( - '#type' => 'checkbox', - '#title' => t('Submit sitemap to Google when updated'), - '#return_value' => 1, - '#default_value' => variable_get('gsitemap_submit', 0), - '#description' => t('If enabled, the sitemap will be submitted to Google via HTTP request each time it is updated. If you have submitted your sitemap using a Google Account, this is probably unnecessary.'), - ); - $form['other_settings']['gsitemap_cron_submit'] = array( - '#type' => 'checkbox', - '#title' => t('Submit sitemap to Google on cron run'), - '#return_value' => 1, - '#default_value' => variable_get('gsitemap_cron_submit', 0), - '#description' => t('If enabled, the sitemap will be submitted to Google via HTTP request each time the cron job is run. If you have submitted your sitemap using a Google Account, this is probably unnecessary.'), - ); - $form['other_settings']['gsitemap_logacc'] = array( - '#type' => 'checkbox', - '#title' => t('Log accesses'), - '#return_value' => 1, - '#default_value' => variable_get('gsitemap_logacc', 0), - '#description' => t('If enabled, an watchdog entry will be made each time the sitemap is accessed, containing information about the requestor.'), - ); menu_rebuild(); // Needed for verification link @@ -771,12 +816,32 @@ function gsitemap_exit() { } function _gsitemap_submit() { - $result = drupal_http_request('http://www.google.com/webmasters/tools/ping?sitemap='. url('gsitemap', NULL, NULL, TRUE)); - if ($result->code == 200) { - watchdog('gsitemap', t('Sitemap successfully submitted to Google.')); + if (variable_get('gsitemap_google_submit', FALSE)) { + $result = drupal_http_request(variable_get('gsitemap_google_url', 'http://www.google.com/webmasters/tools/ping?sitemap=') . url('gsitemap', NULL, NULL, TRUE)); + if ($result->code == 200) { + watchdog('gsitemap', t('Sitemap successfully submitted to Google.')); + } + else { + watchdog('gsitemap', t('Error occurred submitting sitemap to Google: @code', array('@code' => $result->code)), WATCHDOG_ERROR); + } } - else { - watchdog('gsitemap', t('Error occurred submitting sitemap to Google: @code', array('@code' => $result->code)), WATCHDOG_ERROR); + if (variable_get('gsitemap_ask.com_submit', FALSE)) { + $result = drupal_http_request(variable_get('gsitemap_ask.com_url', 'http://submissions.ask.com/ping?sitemap=') . url('gsitemap', NULL, NULL, TRUE)); + if ($result->code == 200) { + watchdog('gsitemap', t('Sitemap successfully submitted to Yahoo.')); + } + else { + watchdog('gsitemap', t('Error occurred submitting sitemap to Yahoo: @code', array('@code' => $result->code)), WATCHDOG_ERROR); + } + } + if (variable_get('gsitemap_yahoo_submit', FALSE)) { + $result = drupal_http_request(variable_get('gsitemap_yahoo_url', 'http://search.yahooapis.com/SiteExplorerService/V1/ping?sitemap=') . url('gsitemap', NULL, NULL, TRUE)); + if ($result->code == 200) { + watchdog('gsitemap', t('Sitemap successfully submitted to Ask.com.')); + } + else { + watchdog('gsitemap', t('Error occurred submitting sitemap to Ask.com: @code', array('@code' => $result->code)), WATCHDOG_ERROR); + } } }