Skip to content

Commit a659dde

Browse files
Fix: replace legacy substr with substring
substr() is legacy/deprecated, but, in this case, substring() can be replaced without a single problem! (see comments on PR #3)
1 parent 9b43c54 commit a659dde

File tree

1 file changed

+45
-46
lines changed

1 file changed

+45
-46
lines changed

gwynethllewelyn/postlocalstorage/styles/all/template/postlocalstorage_functions.js

Lines changed: 45 additions & 46 deletions
Original file line numberDiff line numberDiff line change
@@ -55,69 +55,68 @@
5555
// Kudos to @gvp9000 and for the fix below. (gwyneth 20240414)
5656
// @see https://www.phpbb.com/customise/db/extension/postlocalstorage/support/topic/246616?p=877489#p877489
5757

58-
59-
// POSTING
60-
//possible key formats
61-
//./phpBB3/posting.php?mode=edit&&p=xxxxx#preview#preview#preview#preview .......
62-
//./phpBB3/posting.php?mode=quote&p=xxxxx#preview#preview#preview#preview .......
63-
//./phpBB3/posting.php?mode=reply&t=yyyyy#preview#preview#preview#preview .......
64-
//Remove all "#preview" strings at the end
58+
// POSTING
59+
//possible key formats
60+
//./phpBB3/posting.php?mode=edit&&p=xxxxx#preview#preview#preview#preview .......
61+
//./phpBB3/posting.php?mode=quote&p=xxxxx#preview#preview#preview#preview .......
62+
//./phpBB3/posting.php?mode=reply&t=yyyyy#preview#preview#preview#preview .......
63+
//Remove all "#preview" strings at the end
6564
if (key.includes("posting.php?mode=")) {
6665
if (key.endsWith("#preview")) {
6766
var count_hash = key.split("#").length - 1;
6867
for (let i = 0; i < count_hash; i++) {
69-
key = key.substring(0, key.lastIndexOf('#'));
68+
key = key.substring(0, key.lastIndexOf('#'));
7069
}
7170
}
7271
}
7372

74-
// PM'ing
75-
//possible key formats
73+
// PM'ing
74+
//possible key formats
7675

77-
//1 case
78-
//./phpBB3/ucp.php?i=pm&mode=compose
79-
//nothing to do here
76+
//1 case
77+
//./phpBB3/ucp.php?i=pm&mode=compose
78+
//nothing to do here
8079

81-
//2 case
82-
//./phpBB3/ucp.php?i=ucp_pm&mode=compose returns
83-
//./phpBB3/ucp.php?i=pm&mode=compose
80+
//2 case
81+
//./phpBB3/ucp.php?i=ucp_pm&mode=compose returns
82+
//./phpBB3/ucp.php?i=pm&mode=compose
8483
if (key.includes("ucp.php?i=ucp_pm&mode=compose")) {
85-
key = key.split("?")[0].concat("?i=pm&mode=compose");
84+
key = key.split("?")[0].concat("?i=pm&mode=compose");
8685
}
8786

88-
//3 case
89-
//./phpBB3/ucp.php?i=pm&mode=compose&action=post&sid=sssssssssssssssssssssssssss returns
90-
//./phpBB3/ucp.php?i=pm&mode=compose
87+
//3 case
88+
//./phpBB3/ucp.php?i=pm&mode=compose&action=post&sid=sssssssssssssssssssssssssss returns
89+
//./phpBB3/ucp.php?i=pm&mode=compose
9190
if (key.includes("ucp.php?i=pm&mode=compose&action=post")) {
92-
key = key.split("?")[0].concat("?i=pm&mode=compose");
91+
key = key.split("?")[0].concat("?i=pm&mode=compose");
9392
}
9493

95-
//4 case ./phpBB3/ucp.php?i=pm&mode=compose&action=reply&f=xxx&p=yyy
96-
//5 case ./phpBB3/ucp.php?i=pm&mode=compose&action=forward&f=xxx&p=yyy
97-
//6 case ./phpBB3/ucp.php?i=pm&mode=compose&action=quote&f=xxx&p=yyy
94+
//4 case ./phpBB3/ucp.php?i=pm&mode=compose&action=reply&f=xxx&p=yyy
95+
//5 case ./phpBB3/ucp.php?i=pm&mode=compose&action=forward&f=xxx&p=yyy
96+
//6 case ./phpBB3/ucp.php?i=pm&mode=compose&action=quote&f=xxx&p=yyy
9897
if (key.includes("ucp.php?i=pm&mode=compose&action=reply&f=") || key.includes("ucp.php?i=pm&mode=compose&action=forward&f=") || key.includes("ucp.php?i=pm&mode=compose&action=quote&f=")) {
99-
var fpos = key.indexOf("&f="),
100-
ppos = key.indexOf("&p=");
101-
if (fpos > -1 && ppos > fpos) {
102-
key = key.substr(0, fpos)+key.substr(ppos);
103-
}
98+
var fpos = key.indexOf("&f="),
99+
ppos = key.indexOf("&p=");
100+
if (fpos > -1 && ppos > fpos) {
101+
key = key.substring(0, fpos) + key.substring(ppos);
102+
}
104103
}
105-
106-
//7 case
107-
//./phpBB3/ucp.php?i=pm&mode=compose&action=reply&sid=sssssssssssssssssssssssssss&p=yyy returns
108-
//./phpBB3/ucp.php?i=pm&mode=compose&action=reply&p=yyy
109-
//8th case
110-
//./phpBB3/ucp.php?i=pm&mode=compose&action=forward&sid=sssssssssssssssssssssssssss&p=yyy returns
111-
//./phpBB3/ucp.php?i=pm&mode=compose&action=forward&p=yyy
112-
//9th case
113-
//./phpBB3/ucp.php?i=pm&mode=compose&action=quote&sid=sssssssssssssssssssssssssss&p=yyy returns
114-
//./phpBB3/ucp.php?i=pm&mode=compose&action=quote&p=yyy
104+
105+
//7 case
106+
//./phpBB3/ucp.php?i=pm&mode=compose&action=reply&sid=sssssssssssssssssssssssssss&p=yyy returns
107+
//./phpBB3/ucp.php?i=pm&mode=compose&action=reply&p=yyy
108+
//8th case
109+
//./phpBB3/ucp.php?i=pm&mode=compose&action=forward&sid=sssssssssssssssssssssssssss&p=yyy returns
110+
//./phpBB3/ucp.php?i=pm&mode=compose&action=forward&p=yyy
111+
//9th case
112+
//./phpBB3/ucp.php?i=pm&mode=compose&action=quote&sid=sssssssssssssssssssssssssss&p=yyy returns
113+
//./phpBB3/ucp.php?i=pm&mode=compose&action=quote&p=yyy
115114
if (key.includes("ucp.php?i=pm&mode=compose&action=reply&sid=") || key.includes("ucp.php?i=pm&mode=compose&action=forward&sid=") || key.includes("ucp.php?i=pm&mode=compose&action=quote&sid=")) {
116-
var sipos = key.indexOf("&sid="),
117-
pipos = key.indexOf("&p=");
118-
if (sipos > -1 && pipos > sipos) {
119-
key = key.substr(0, sipos)+key.substr(pipos);
120-
}
115+
var sipos = key.indexOf("&sid="),
116+
pipos = key.indexOf("&p=");
117+
if (sipos > -1 && pipos > sipos) {
118+
key = key.substring(0, sipos) + key.substring(pipos);
119+
}
121120
}
122121

123122
/**
@@ -241,7 +240,7 @@
241240
* @type {number}
242241
*/
243242
const expiry_time = parseInt(document.getElementById('expiry-time').innerText.trim(), 10);
244-
const dateNow = Math.floor(Date.now() / 1000); // we get milliseconds, so we need to convert to seconds.
243+
const dateNow = Math.floor(Date.now() / 1000); // we get milliseconds, so we need to convert to seconds.
245244
console.debug("Date.now() in seconds is " + dateNow + " and expiry_time is " + expiry_time);
246245
if (dateNow > expiry_time) {
247246
// We won't clear anything if the session already expired, so return.
@@ -259,4 +258,4 @@
259258
}
260259
}
261260
);
262-
})(this, this.document);
261+
})(this, this.document);

0 commit comments

Comments
 (0)