[push] Trim URLs in create message dialog & on backend side

Author: iartem

plugins/push/frontend/public/javascripts/component.push.js

@@ -100,7 +100,7 @@ window.component('push', function(push) {
         this.sent = m.prop(data.sent);
         this.sound = vprop(data.sound, function(v){ return !!v; }, t('pu.po.tab2.extras.sound.invalid'));
         this.badge = vprop(data.badge, function(v){ return v === undefined || ((v + '') === (parseInt(v) + '') && parseInt(v) >= 0); }, t('pu.po.tab2.extras.badge.invalid'));
-        this.url = vprop(data.url, function(v){ return v && URL_REGEXP.test(v); }, t('pu.po.tab2.extras.url.invalid'));
+        this.url = vprop(data.url, function(v){ return v && URL_REGEXP.test(v) && v[0] !== ' ' && v[v.length - 1] !== ' '; }, t('pu.po.tab2.extras.url.invalid'));
         this.data = vprop(typeof data.data === 'object' ? JSON.stringify(data.data) : data.data, function(v){
             try {
                 var o = window.jsonlite.parse(v);
@@ -224,6 +224,9 @@ window.component('push', function(push) {
             var prop = m.prop(),
                 f = function(){
                     if (arguments.length) {
+                        if (arguments[0]) {
+                            arguments[0] = arguments[0].trim();
+                        }
                         f.valid = false;
                         prop(arguments[0]);
 
@@ -403,9 +406,15 @@ window.component('push', function(push) {
                 obj.sound = this.sound();
                 obj.badge = this.badge();
                 obj.url = this.url();
+                if (obj.url) {
+                    obj.url = obj.url.trim();
+                }
                 obj.source = 'dash';
                 obj.buttons = parseInt(this.buttons());
                 obj.media = this.media();
+                if (obj.media) {
+                    obj.media = obj.media.trim();
+                }
                 obj.autoOnEntry = this.autoOnEntry();
                 obj.autoCancelTrigger = this.autoCancelTrigger();
                 obj.autoCohorts = this.autoCohorts();

plugins/push/frontend/public/javascripts/component.push.popup.js

@@ -367,6 +367,9 @@ window.component('push.popup', function(popup) {
                 k = (locale || activeLocale()) + (index === undefined ? (push.C.S + key) : (push.C.S + index + push.C.S + key));
 
                 if (arguments.length) {
+                    if (v && key === 'l') {
+                        v = v.trim();
+                    }
                     message.messagePerLocale()[k] = v;
                 }