v.1.0.10

Author: findlabnet

README.md

@@ -1,8 +1,8 @@
 Easy XML sitemap
-===================================
+================
 
 Provides XML sitemap conforming to [Google's recommendations](https://support.google.com/webmasters/answer/2620865) 
-for using "hreflang" attribute in sitemap on multilingual site and [sitemaps.org protocol](http://www.sitemaps.org/protocol.html).
+by using "hreflang" attribute in sitemap on multilingual site and [sitemaps.org protocol](http://www.sitemaps.org/protocol.html).
 
 Features
 --------
@@ -23,7 +23,7 @@ You may exclude from sitemap:
 Each time sitemap re-built, backup copy of previous file state is saved as 
 *public://easy_xmlsitemap/sitemap.xml.bak*
 
-Less important and optional URLs attributes "priority" and "lastmod" are omitted in this version.
+Less important and optional URLs attributes "priority" and "lastmod" are omitted.
 
 You can want add at end of your file robots.txt line:
 

easy_xmlsitemap.admin.inc

@@ -54,7 +54,7 @@ function easy_xmlsitemap_settings_form() {
     '#type' => 'checkbox',
     '#title' => t('Force "https" protocol for URLs in sitemap.'),
     '#default_value' => $config->get('force_https'),
-    '#description' => t('Can be used for generating links behind SSL-proxy like Cloudflare.'),
+    '#description' => t('Can be used for sites behind SSL-proxy like Cloudflare.'),
   );
 
   $form['settings']['base_url'] = array(
@@ -82,7 +82,9 @@ function easy_xmlsitemap_settings_form() {
     . '<br />403.html'
     . '<br />404.html'
     . '<br />node/123'
-    . '<br />some-test-page.html'
+    . '<br />' . t('Multiple similar URLs can be selected by using asterisk wildcard (*), for example:')
+    . '<br /><em>post-*</em>,'
+    . '<br />' . t('so all URLs starting with post- (such as post-123 or post-about-cat.html) will be excluded from sitemap.')
   );
   if (count($site_langs) > 1) {
     $form['settings']['excluded_langs'] = array(

easy_xmlsitemap.info

@@ -4,5 +4,5 @@ package = SEO
 backdrop = 1.x
 type = module
 configure = admin/config/metadata/easy_xmlsitemap
-version = 1.0.9
+version = 1.0.10
 

easy_xmlsitemap.module

@@ -152,14 +152,41 @@ function easy_xmlsitemap_url_excluded($url) {
   $excluded_raw_urls = $config->get('excluded_urls');
   $excluded_urls     = easy_xmlsitemap_textarea_to_array($excluded_raw_urls);
   $excluded          = FALSE;
+  $masked            = array();
 
   if (!empty($excluded_urls)) {
-    if (in_array(substr($url, 1), $excluded_urls)) {
-      $excluded = TRUE;
+    // Check for url groups masked by *, then full url 
+    foreach ($excluded_urls as $excluded_url) {
+      if (substr($excluded_url, -1) == '*') {
+        $masked[] = substr($excluded_url, 0, -1);
+      }
+    }
+    if (!empty($masked)) {
+      foreach ($masked as $found) {
+        $position = strpos($url, $found);
+        if ($position !== FALSE) {
+          $excluded = TRUE;
+        }
+        else {
+          $excluded = easy_xml_found($url, $excluded_urls);
+        }
+      }
+    }
+    else {
+      $excluded = easy_xml_found($url, $excluded_urls);
     }
   }
   return $excluded;
 }
+/**
+ * Found in array
+ * @param string $url
+ * @param array $excluded_urls
+ * @return boolean
+ */
+function easy_xml_found($url, $excluded_urls) {
+  return in_array(substr($url, 1), $excluded_urls);
+}
 
 /**
  * Return node nid if this node set as front page
@@ -177,7 +204,7 @@ function easy_xmlsitemap_get_frontpage_nid() {
 }
 
 /**
- * Find ans print front page(s) URL 
+ * Find and print front page(s) URL 
  * @param string $base_url
  * @return string
  */
@@ -364,6 +391,7 @@ function easy_xmlsitemap_file_save($content) {
     rename($file_path, $file_path . '.bak');
   }
 
+  $content = $content . "\n" . '<!-- ' . format_date(time(), 'short') . ' -->';
   file_put_contents($file_path, $content);
 
   $success = file_exists($file_path);
@@ -384,23 +412,18 @@ function easy_xmlsitemap_output() {
   $config          = config('easy_xmlsitemap.settings');
   $file_dir        = 'public://' . $config->get('sitemap_dir');
   $file_path       = $file_dir . '/' . 'sitemap.xml';
-  $last_build_date = state_get('easy_xmlsitemap_last_build_date', 0);
 
   if (!file_exists($file_path) || !is_readable($file_path)) {
-    return backdrop_not_found();
+    backdrop_not_found();
+    backdrop_exit();
+  }
+  else {
+    $file = file_get_contents($file_path);
+    backdrop_add_http_header('Content-type', 'text/xml; charset=utf-8');
+    backdrop_add_http_header('X-Robots-Tag', 'noindex, follow');
+    echo $file;
+    exit();
   }
-  
-  $file = file_get_contents($file_path);
-/** DEBUG  
-  $ua   = getenv('HTTP_USER_AGENT');
-  $ip   = getenv('REMOTE_ADDR');
-  watchdog('easy_xmlsitemap', 'Request for sitemap.xml by ' . $ua . ' from ' . $ip, NULL, WATCHDOG_INFO);  
-*/  
-  backdrop_add_http_header('Content-type', 'text/xml; charset=utf-8');
-  backdrop_add_http_header('X-Robots-Tag', 'noindex, follow');
-  echo $file;
-  echo "\n" . '<!-- ' . format_date($last_build_date, 'short') . ' -->';
-  exit();
 }
 
 /**