Fix for .md URLs

Author: johndmulhausen

404.md

@@ -5,21 +5,35 @@ permalink: /404.html
 ---
 
 <script language="JavaScript">
-  var forwardingURL=window.location.pathname;
-  if (forwardingURL.charAt(forwardingURL.length - 1) != "/") forwardingURL += "/";
-  var gonnaFwd = false;
-  var newURL = "";
-  var baseURL = "";
-  console.log(forwardingURL);
-  {% for item in site.data.docsarchive.docker-compose %}
+var forwardingURL=window.location.pathname;
+if (forwardingURL.charAt(forwardingURL.length - 1) != "/") forwardingURL += "/";
+var gonnaFwd = false;
+var newURL = "";
+var baseURL = "";
+var archive = false;
+console.log(forwardingURL);
+
+// .MD EXTENSION CHECK
+if (forwardingURL.indexOf(".md") > -1)
+{
+  gonnaFwd = true;
+  newURL = forwardingURL.replace(".md","");
+} else {
+
+  // DOCS ARCHIVE CHECK
+{% for item in site.data.docsarchive.docker-compose %}
   if (forwardingURL.indexOf("/{{ item[0] }}") > -1)
   {
     console.log("Found via Docker Compose file for Acrhive")
     gonnaFwd = true;
+    archive = true;
     // make it so redirects cascade; first, use the base URL, then append path
-    baseURL = forwardingURL.replace("/{{ item[0] }}","{{ page.archiveserver }}:{{ item[1].ports[0] | replace:':4000','' }}");
-    forwardingURL = forwardingURL.replace("/{{ item[0] }}/","");
+    baseURL = "{{ page.archiveserver }}:{{ item[1].ports[0] | replace:':4000','' }}";
+    newURL = forwardingURL.replace("/{{ item[0] }}","");
   }{% endfor %}
+
+if (archive==false) {
+  // CSV CHECK
   {% for item in site.data.redirects %}
   var redirectVal = {{ item | jsonify }};
   if (forwardingURL == redirectVal.source)
@@ -28,8 +42,10 @@ permalink: /404.html
     gonnaFwd = true;
     newURL = forwardingURL.replace(redirectVal.source,redirectVal.destination);
   }
-  {% endfor %}
-  {% for page in site.pages %}{% if page.aliases %}
+{% endfor %}
+
+  // PAGE ALIASES CHECK
+{% for page in site.pages %}{% if page.aliases %}
   var aliases = {{ page.aliases | jsonify }};
   if( Object.prototype.toString.call( aliases ) === '[object Array]' ) {
     // aliases is an array, therefore, there are multiple aliases
@@ -51,16 +67,20 @@ permalink: /404.html
       newURL = "{{ page.url }}";
     }
   }
-  {% endif %}{% endfor %}
-  if (gonnaFwd) {
-    newURL = baseURL + newURL;
-    console.log("Forwarding to: " + newURL);
-    window.location.replace(newURL);
-    window.location.href = newURL;
-    document.write('<meta http-equiv="refresh" content="0; url=' + newURL + '">')
-  } else {
-    window.location.replace("/sorry/#" + forwardingURL);
-    window.location.href = "/sorry/#" + forwardingURL;
-    document.write('<meta http-equiv="refresh" content="0; url=/sorry/#' + forwardingURL + '">')
-  }
+{% endif %}{% endfor %}
+
+} // end of check for .md
+} // end of check for archive
+
+if (gonnaFwd) {
+  newURL = baseURL + newURL;
+  console.log("Forwarding to: " + newURL);
+  window.location.replace(newURL);
+  window.location.href = newURL;
+  document.write('<meta http-equiv="refresh" content="0; url=' + newURL + '">')
+} else {
+  window.location.replace("/sorry/#" + forwardingURL);
+  window.location.href = "/sorry/#" + forwardingURL;
+  document.write('<meta http-equiv="refresh" content="0; url=/sorry/#' + forwardingURL + '">')
+}
 </script>