Skip to content

Commit 1fb7576

Browse files
committed
v.1.0.7
1 parent b7100f2 commit 1fb7576

File tree

5 files changed

+22
-4
lines changed

5 files changed

+22
-4
lines changed

README.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,7 @@ and may be useful for:
4242
- view information when last time sitemap was generated.
4343

4444
Under "Advanced settings" fieldset:
45+
- set forced "https" protocol for URLs in sitemap;
4546
- set (if you need) different default base URL used for sitemap links;
4647
- select sitemap rebuild frequency: manually, daily (default) or any cron run;
4748
- add exclusions for URLs you won't include in sitemap;

easy_xmlsitemap.admin.inc

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,14 @@ function easy_xmlsitemap_settings_form() {
4848
'#title' => t('Advanced settings'),
4949
'#collapsible' => TRUE,
5050
'#collapsed' => TRUE,
51-
);
51+
);
52+
53+
$form['settings']['force_https'] = array(
54+
'#type' => 'checkbox',
55+
'#title' => t('Force "https" protocol for URLs in sitemap.'),
56+
'#default_value' => $config->get('force_https'),
57+
'#description' => t('Can be used for generating links behind SSL-proxy like Cloudflare.'),
58+
);
5259

5360
$form['settings']['base_url'] = array(
5461
'#type' => 'textfield',
@@ -106,6 +113,7 @@ function easy_xmlsitemap_settings_form_submit($form, &$form_state) {
106113
$config = config('easy_xmlsitemap.settings');
107114

108115
if ($form_state['clicked_button']['#id'] == 'edit-submit') {
116+
$config->set('force_https', $form_state['values']['force_https']);
109117
$config->set('base_url', trim($form_state['values']['base_url']));
110118
$config->set('rebuild_frequency', $form_state['values']['rebuild_frequency']);
111119
$config->set('excluded_urls', trim($form_state['values']['excluded_urls']));

easy_xmlsitemap.info

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,5 +4,5 @@ package = SEO
44
backdrop = 1.x
55
type = module
66
configure = admin/config/metadata/easy_xmlsitemap
7-
version = 1.0.6
7+
version = 1.0.7
88

easy_xmlsitemap.install

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,3 +45,11 @@ function easy_xmlsitemap_update_1001() {
4545
$config->clear('last_build_date');
4646
$config->save();
4747
}
48+
/**
49+
* Add and initialize new variable
50+
*/
51+
function easy_xmlsitemap_update_1002() {
52+
$config = config('easy_xmlsitemap.settings');
53+
$config->set('force_https', 0);
54+
$config->save();
55+
}

easy_xmlsitemap.module

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,8 @@ function easy_xmlsitemap_build() {
9494
set_time_limit(1800);
9595

9696
$config = config('easy_xmlsitemap.settings');
97-
$proto = (!empty($_SERVER['HTTPS']) && $_SERVER['HTTPS'] !== 'off') ? "https://" : "http://";
97+
$force_https = $config->get('force_https');
98+
$proto = ((!empty($_SERVER['HTTPS']) && $_SERVER['HTTPS'] !== 'off') || $force_https) ? "https://" : "http://";
9899
$host = $_SERVER['HTTP_HOST'];
99100
$config_base_url = rtrim($config->get('base_url'), '/');
100101
$base_url = !empty($config_base_url) ? $config_base_url : $proto . $host;
@@ -257,7 +258,7 @@ function easy_xmlsitemap_build_node_items($base_url, $urls_blok) {
257258
}
258259

259260
/**
260-
* Find ans print non-empty taxonomy term pages
261+
* Find and print non-empty taxonomy term pages
261262
* @global object $language
262263
* @param string $base_url
263264
* @return string

0 commit comments

Comments
 (0)