From 65947772f079ed76e79f0bb251905c3c00805b14 Mon Sep 17 00:00:00 2001 From: Stewart Allen Date: Thu, 4 Jun 2020 15:18:51 -0400 Subject: [PATCH] change query encoding to old style meta --- app.js | 4 ++-- js/kiri.js | 5 ++--- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/app.js b/app.js index 26d29d27..b8092465 100644 --- a/app.js +++ b/app.js @@ -404,9 +404,9 @@ function string2obj(s) { function handleVersion(req, res, next) { if (req.app.path === "/kiri/" && req.url.indexOf(version) < 0) { if (req.url.indexOf("?") > 0) { - return http.redirect(res, `${req.url}&ver=${version}`); + return http.redirect(res, `${req.url},ver:${version}`); } else { - return http.redirect(res, `${req.url}?ver=${version}`); + return http.redirect(res, `${req.url}?ver:${version}`); } } else { next(); diff --git a/js/kiri.js b/js/kiri.js index e251c177..929b64ae 100644 --- a/js/kiri.js +++ b/js/kiri.js @@ -407,7 +407,6 @@ self.kiri.copyright = exports.COPYRIGHT; let opt = {}, kv, kva; // handle kiri legacy and proper url encoding better ov.replace(/&/g,',').split(',').forEach(function(el) { - // el = el.replace(/=/g,':'); kv = decodeURIComponent(el).split(':'); if (kv.length === 2) { kva = opt[kv[0]] = opt[kv[0]] || []; @@ -422,9 +421,9 @@ self.kiri.copyright = exports.COPYRIGHT; Object.keys(opt).forEach(key => { if (key === 'ver') return; let val = opt[key]; - out.push(encodeURIComponent(key) + "=" + encodeURIComponent(val)); + out.push(encodeURIComponent(key) + ":" + encodeURIComponent(val)); }); - return out.length ? '?' + out.join('&') : ''; + return out.length ? '?' + out.join(',') : ''; } function ajax(url, fn, rt, po, hd) {