enforcing better URL formatting for Site URL setting.

vehery · Jun 5, 2015 · bc77ce6 · bc77ce6
1 parent b3aa6d0
commit bc77ce6
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 4 deletions.
diff --git a/History.md b/History.md
@@ -8,6 +8,7 @@ Just a couple minor bug fixes.
 * Generate public user properties list from schema.
 * Fixed video lightbox issue.
 * Updated Getting Started content.
+* Enforcing better URL formatting for Site URL setting.
 
 ## v0.20.4 “RefactorScope”
 

diff --git a/packages/telescope-core/lib/client/templates/forms/urlCustomType.js b/packages/telescope-core/lib/client/templates/forms/urlCustomType.js
@@ -2,8 +2,17 @@ AutoForm.addInputType("bootstrap-url", {
   template: "afBootstrapUrl",
   valueOut: function () {
     var url = this.val();
-    if(!!url)
-      return (url.substring(0, 7) === "http://" || url.substring(0, 8) === "https://") ? url : "http://"+url;
+    if (!!url) {
+      // add http:// if missing
+      if (url.substring(0, 7) !== "http://" && url.substring(0, 8) !== "https://") {
+        url = "http://"+url;
+      }
+      // add trailing / if missing (unless URL contains a "?")
+      if (url.slice(-1) !== "/" && url.indexOf("?") === -1) {
+        url = url + "/";
+      }
+      return url;
+    }
   }
 });
 

diff --git a/packages/telescope-releases/releases/0.20.5.md b/packages/telescope-releases/releases/0.20.5.md
@@ -7,4 +7,5 @@ Just a couple minor bug fixes.
 * Improve profile completion screen validation & errors.
 * Generate public user properties list from schema.
 * Fixed video lightbox issue.
-* Updated Getting Started content.
+* Updated Getting Started content.
+* Enforcing better URL formatting for Site URL setting.
diff --git a/packages/telescope-settings/lib/settings.js b/packages/telescope-settings/lib/settings.js
@@ -15,9 +15,10 @@ Settings.schema = new SimpleSchema({
   siteUrl: {
     type: String,
     optional: true,
-    regEx: SimpleSchema.RegEx.Url,
+    // regEx: SimpleSchema.RegEx.Url,
     autoform: {
       group: "01_general",
+      type: "bootstrap-url",
       instructions: 'Your site\'s URL (with trailing "/"). Will default to Meteor.absoluteUrl()'
     }
   },