You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ponymail.apache.org by se...@apache.org on 2021/12/08 00:27:10 UTC
[incubator-ponymail-foal] 02/02: unshortenID should only unshorten short MIDs
This is an automated email from the ASF dual-hosted git repository.
sebb pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-ponymail-foal.git
commit cce3d91ff7b53ce65e988ac8299bf80d224a2444
Author: Sebb <se...@apache.org>
AuthorDate: Wed Dec 8 00:23:29 2021 +0000
unshortenID should only unshorten short MIDs
This fixes #171
---
webui/admin.html | 8 ++++----
webui/index.html | 6 +++---
webui/js/ponymail.js | 6 ++++--
webui/list.html | 8 ++++----
webui/oauth.html | 8 ++++----
webui/thread.html | 8 ++++----
6 files changed, 23 insertions(+), 21 deletions(-)
diff --git a/webui/admin.html b/webui/admin.html
index 7eb815f..c218d2b 100644
--- a/webui/admin.html
+++ b/webui/admin.html
@@ -25,7 +25,7 @@ the License. -->
<!-- Bootstrap -->
<link href="css/bootstrap.min.css" rel="stylesheet" media="all">
- <link href="css/scaffolding.css?revision=724e7ca" rel="stylesheet" media="all">
+ <link href="css/scaffolding.css?revision=8eb39b3" rel="stylesheet" media="all">
<link href="css/modal.css" rel="stylesheet" media="all">
<link href="css/spinner.css" rel="stylesheet" media="all">
<link rel="alternate" href="/api/static.lua"/>
@@ -79,9 +79,9 @@ the License. -->
<script src="js/jquery-1.12.4.min.js" integrity="sha256-ZosEbRLbNQzLpnKIkEdrPv7lOy9C27hHQ+Xp8a4MxAQ="></script>
<!-- Include all compiled plugins (below), or include individual files as needed -->
<script src="js/bootstrap.min.js"></script>
- <script src="js/config.js?revision=724e7ca"></script>
- <script src="js/wordcloud.js?revision=724e7ca"></script>
- <script src="js/ponymail.js?revision=724e7ca"></script>
+ <script src="js/config.js?revision=8eb39b3"></script>
+ <script src="js/wordcloud.js?revision=8eb39b3"></script>
+ <script src="js/ponymail.js?revision=8eb39b3"></script>
<div id="splash" class="splash fade-in"> </div>
<div style="clear: both;"></div>
</body>
diff --git a/webui/index.html b/webui/index.html
index e302dd9..061dc78 100644
--- a/webui/index.html
+++ b/webui/index.html
@@ -24,7 +24,7 @@ the License. -->
<!-- Bootstrap -->
<link href="css/bootstrap.min.css" rel="stylesheet" media="all">
- <link href="css/scaffolding.css?revision=724e7ca" rel="stylesheet" media="all">
+ <link href="css/scaffolding.css?revision=8eb39b3" rel="stylesheet" media="all">
<link href="css/modal.css" rel="stylesheet" media="all">
<link href="css/spinner.css" rel="stylesheet" media="all">
<link rel="alternate" href="/api/static.lua"/>
@@ -60,8 +60,8 @@ the License. -->
<script src="js/jquery-1.12.4.min.js" integrity="sha256-ZosEbRLbNQzLpnKIkEdrPv7lOy9C27hHQ+Xp8a4MxAQ="></script>
<!-- Include all compiled plugins (below), or include individual files as needed -->
<script src="js/bootstrap.min.js"></script>
- <script src="js/config.js?revision=724e7ca"></script>
- <script src="js/ponymail.js?revision=724e7ca"></script>
+ <script src="js/config.js?revision=8eb39b3"></script>
+ <script src="js/ponymail.js?revision=8eb39b3"></script>
<div id="splash" class="splash fade-in"> </div>
<div style="clear: both;"></div>
diff --git a/webui/js/ponymail.js b/webui/js/ponymail.js
index 79c68e0..4b29c03 100644
--- a/webui/js/ponymail.js
+++ b/webui/js/ponymail.js
@@ -16,7 +16,7 @@
*/
// THIS IS AN AUTOMATICALLY COMBINED FILE. PLEASE EDIT THE source/ FILES!
-const PONYMAIL_REVISION = '724e7ca';
+const PONYMAIL_REVISION = '8eb39b3';
/******************************************
@@ -3552,7 +3552,9 @@ function unshortenID(mid) {
// all short links begin with 'Z'. If not, it's not a short link
// so let's just pass it through unaltered if so.
// Some old shortlinks begin with 'B', so let's be backwards compatible for now.
- if (mid[0] == 'Z' || mid[0] == 'B') {
+ // Shortlinks are also 15 chars (including prefix)
+ // They should also consist of base 36 chars or '-'
+ if ((mid[0] == 'Z' || mid[0] == 'B') && mid.length == 15){
// remove padding
let id1 = parseInt(mid.substr(1, 7).replace(/-/g, ""), 36)
let id2 = parseInt(mid.substr(8, 7).replace(/-/g, ""), 36)
diff --git a/webui/list.html b/webui/list.html
index 4168d10..0250f3d 100644
--- a/webui/list.html
+++ b/webui/list.html
@@ -24,7 +24,7 @@ the License. -->
<!-- Bootstrap -->
<link href="css/bootstrap.min.css" rel="stylesheet" media="all">
- <link href="css/scaffolding.css?revision=724e7ca" rel="stylesheet" media="all">
+ <link href="css/scaffolding.css?revision=8eb39b3" rel="stylesheet" media="all">
<link href="css/modal.css" rel="stylesheet" media="all">
<link href="css/spinner.css" rel="stylesheet" media="all">
<link rel="alternate" href="/api/static.lua"/>
@@ -173,9 +173,9 @@ the License. -->
</script>
<!-- Include all compiled plugins (below), or include individual files as needed -->
<script src="js/bootstrap.min.js"></script>
- <script src="js/config.js?revision=724e7ca"></script>
- <script src="js/wordcloud.js?revision=724e7ca"></script>
- <script src="js/ponymail.js?revision=724e7ca"></script>
+ <script src="js/config.js?revision=8eb39b3"></script>
+ <script src="js/wordcloud.js?revision=8eb39b3"></script>
+ <script src="js/ponymail.js?revision=8eb39b3"></script>
<div id="splash" class="splash fade-in"> </div>
<div style="clear: both;"></div>
<script type="text/javascript">
diff --git a/webui/oauth.html b/webui/oauth.html
index 07704ad..1c148b6 100644
--- a/webui/oauth.html
+++ b/webui/oauth.html
@@ -21,7 +21,7 @@ the License. -->
<!-- CSS -->
<link href="css/bootstrap.min.css" rel="stylesheet" media="all">
- <link href="css/scaffolding.css?revision=724e7ca" rel="stylesheet" media="all">
+ <link href="css/scaffolding.css?revision=8eb39b3" rel="stylesheet" media="all">
<link href="css/modal.css" rel="stylesheet" media="all">
<link href="css/spinner.css" rel="stylesheet" media="all">
@@ -54,8 +54,8 @@ the License. -->
<script src="js/jquery-1.12.4.min.js" integrity="sha256-ZosEbRLbNQzLpnKIkEdrPv7lOy9C27hHQ+Xp8a4MxAQ="></script>
<!-- Include all compiled plugins (below), or include individual files as needed -->
<script src="js/bootstrap.min.js"></script>
- <script src="js/config.js?revision=724e7ca"></script>
- <script src="js/ponymail.js?revision=724e7ca"></script>
- <script src="js/oauth.js?revision=724e7ca"></script>
+ <script src="js/config.js?revision=8eb39b3"></script>
+ <script src="js/ponymail.js?revision=8eb39b3"></script>
+ <script src="js/oauth.js?revision=8eb39b3"></script>
</body>
</html>
diff --git a/webui/thread.html b/webui/thread.html
index 4c56a88..9d1372c 100644
--- a/webui/thread.html
+++ b/webui/thread.html
@@ -25,7 +25,7 @@ the License. -->
<!-- Bootstrap -->
<link href="css/bootstrap.min.css" rel="stylesheet" media="all">
- <link href="css/scaffolding.css?revision=724e7ca" rel="stylesheet" media="all">
+ <link href="css/scaffolding.css?revision=8eb39b3" rel="stylesheet" media="all">
<link href="css/modal.css" rel="stylesheet" media="all">
<link href="css/spinner.css" rel="stylesheet" media="all">
<link rel="alternate" href="/api/static.lua"/>
@@ -97,9 +97,9 @@ the License. -->
<script src="js/jquery-1.12.4.min.js" integrity="sha256-ZosEbRLbNQzLpnKIkEdrPv7lOy9C27hHQ+Xp8a4MxAQ="></script>
<!-- Include all compiled plugins (below), or include individual files as needed -->
<script src="js/bootstrap.min.js"></script>
- <script src="js/config.js?revision=724e7ca"></script>
- <script src="js/wordcloud.js?revision=724e7ca"></script>
- <script src="js/ponymail.js?revision=724e7ca"></script>
+ <script src="js/config.js?revision=8eb39b3"></script>
+ <script src="js/wordcloud.js?revision=8eb39b3"></script>
+ <script src="js/ponymail.js?revision=8eb39b3"></script>
<div id="splash" class="splash fade-in"> </div>
<div style="clear: both;"></div>
</body>