Fixed My Users SMS button.
Ylian Saint-Hilaire committed
Apr 29, 2020 at 17:36 UTC
9f9fdf7b920b35fcc98978976c78c26818f68389
3 files changed
+55
-52
translate/translate.json
+53
-50
@@ -9383,9 +9383,9 @@
9383
"default.handlebars->29->1540",
9384
"default.handlebars->29->1586",
9385
"default.handlebars->29->278",
9386
- "login-mobile.handlebars->5->41",
9386
+ "login-mobile.handlebars->5->42",
9387
"login-mobile.handlebars->container->page_content->column_l->1->1->0->1->tokenpanel->1->7->1->4->1->3",
9388
- "login.handlebars->5->42",
9388
+ "login.handlebars->5->43",
9389
"login.handlebars->container->column_l->centralTable->1->0->logincell->tokenpanel->1->7->1->4->1->3"
9390
]
9391
},
@@ -9429,8 +9429,8 @@
9429
"en": "Email Confirmation",
9430
"nl": "E-mail bevestigen",
9431
"xloc": [
9432
- "login-mobile.handlebars->5->42",
9433
- "login.handlebars->5->43"
9432
+ "login-mobile.handlebars->5->43",
9433
+ "login.handlebars->5->44"
9434
]
9435
},
9436
{
@@ -9584,10 +9584,10 @@
9584
"ru": "Email:",
9585
"zh-chs": "電子郵件：",
9586
"xloc": [
9587
- "login-mobile.handlebars->5->20",
9587
+ "login-mobile.handlebars->5->21",
9588
"login-mobile.handlebars->container->page_content->column_l->1->1->0->1->createpanel->1->1->9->1->2->1",
9589
"login-mobile.handlebars->container->page_content->column_l->1->1->0->1->resetpanel->1->7->1->0->1",
9590
- "login.handlebars->5->20",
9590
+ "login.handlebars->5->21",
9591
"login.handlebars->container->column_l->centralTable->1->0->logincell->createpanel->1->9->1->2->nuEmail",
9592
"login.handlebars->container->column_l->centralTable->1->0->logincell->resetpanel->1->7->1->0->1"
9593
]
@@ -10642,8 +10642,8 @@
10642
"ru": "Забыли пароль?",
10643
"zh-chs": "忘記密碼？",
10644
"xloc": [
10645
- "login-mobile.handlebars->5->21",
10646
- "login.handlebars->5->21"
10645
+ "login-mobile.handlebars->5->22",
10646
+ "login.handlebars->5->22"
10647
]
10648
},
10649
{
@@ -11358,10 +11358,10 @@
11358
"ru": "Хороший пароль",
11359
"zh-chs": "好的密碼",
11360
"xloc": [
11361
- "login-mobile.handlebars->5->28",
11362
- "login-mobile.handlebars->5->32",
11363
- "login.handlebars->5->28",
11364
- "login.handlebars->5->32"
11361
+ "login-mobile.handlebars->5->29",
11362
+ "login-mobile.handlebars->5->33",
11363
+ "login.handlebars->5->29",
11364
+ "login.handlebars->5->33"
11365
]
11366
},
11367
{
@@ -15756,8 +15756,8 @@
15756
"ru": "Максимальная длина {0}",
15757
"zh-chs": "最大長度為{0}",
15758
"xloc": [
15759
- "login-mobile.handlebars->5->36",
15760
- "login.handlebars->5->36"
15759
+ "login-mobile.handlebars->5->37",
15760
+ "login.handlebars->5->37"
15761
]
15762
},
15763
{
@@ -16408,8 +16408,8 @@
16408
"ru": "Минимальная длина {0}",
16409
"zh-chs": "最小長度為{0}",
16410
"xloc": [
16411
- "login-mobile.handlebars->5->35",
16412
- "login.handlebars->5->35"
16411
+ "login-mobile.handlebars->5->36",
16412
+ "login.handlebars->5->36"
16413
]
16414
},
16415
{
@@ -18816,8 +18816,8 @@
18816
"ru": "Подсказка пароля",
18817
"zh-chs": "密碼提示",
18818
"xloc": [
18819
- "login-mobile.handlebars->5->26",
18820
- "login.handlebars->5->26"
18819
+ "login-mobile.handlebars->5->27",
18820
+ "login.handlebars->5->27"
18821
]
18822
},
18823
{
@@ -18853,11 +18853,11 @@
18853
"ru": "Политика пароля",
18854
"zh-chs": "密碼政策",
18855
"xloc": [
18856
- "login-mobile.handlebars->5->30",
18857
- "login-mobile.handlebars->5->34",
18858
- "login.handlebars->5->30",
18859
- "login.handlebars->5->34",
18860
- "login.handlebars->5->41"
18856
+ "login-mobile.handlebars->5->31",
18857
+ "login-mobile.handlebars->5->35",
18858
+ "login.handlebars->5->31",
18859
+ "login.handlebars->5->35",
18860
+ "login.handlebars->5->42"
18861
]
18862
},
18863
{
@@ -20324,10 +20324,13 @@
20324
"nl": "Onthoud dit apparaat gedurende 30 dagen.",
20325
"pt": "Lembre-se deste dispositivo por 30 dias.",
20326
"ru": "Запомнить это устройство на 30 дней.",
20327
- "zh-chs": "記住此設備30天。",
20327
+ "zh-chs": "記住此設備30天。"
20328
+ },
20329
+ {
20330
+ "en": "Remember this device for {0} days.",
20331
"xloc": [
20329
- "login-mobile.handlebars->container->page_content->column_l->1->1->0->1->tokenpanel->1->7->1->2->1->1",
20330
- "login.handlebars->container->column_l->centralTable->1->0->logincell->tokenpanel->1->7->1->2->1->1"
20332
+ "login-mobile.handlebars->5->20",
20333
+ "login.handlebars->5->20"
20334
]
20335
},
20336
{
@@ -21662,10 +21665,10 @@
21665
"ru": "Безопасный вход",
21666
"zh-chs": "安全登錄",
21667
"xloc": [
21665
- "login-mobile.handlebars->5->22",
21666
- "login-mobile.handlebars->5->24",
21667
- "login.handlebars->5->22",
21668
- "login.handlebars->5->24"
21668
+ "login-mobile.handlebars->5->23",
21669
+ "login-mobile.handlebars->5->25",
21670
+ "login.handlebars->5->23",
21671
+ "login.handlebars->5->25"
21672
]
21673
},
21674
{
@@ -22102,16 +22105,16 @@
22105
"ru": "Отправить токен на зарегистрированный адрес электронной почты?",
22106
"zh-chs": "將令牌發送到註冊的電子郵件地址？",
22107
"xloc": [
22105
- "login-mobile.handlebars->5->23",
22106
- "login.handlebars->5->23"
22108
+ "login-mobile.handlebars->5->24",
22109
+ "login.handlebars->5->24"
22110
]
22111
},
22112
{
22113
"en": "Send token to registed phone number?",
22114
"nl": "Token naar geregistreerd telefoonnummer verzenden?",
22115
"xloc": [
22113
- "login-mobile.handlebars->5->25",
22114
- "login.handlebars->5->25"
22116
+ "login-mobile.handlebars->5->26",
22117
+ "login.handlebars->5->26"
22118
]
22119
},
22120
{
@@ -23964,10 +23967,10 @@
23967
"ru": "Надежный пароль",
23968
"zh-chs": "強密碼",
23969
"xloc": [
23967
- "login-mobile.handlebars->5->27",
23968
- "login-mobile.handlebars->5->31",
23969
- "login.handlebars->5->27",
23970
- "login.handlebars->5->31"
23970
+ "login-mobile.handlebars->5->28",
23971
+ "login-mobile.handlebars->5->32",
23972
+ "login.handlebars->5->28",
23973
+ "login.handlebars->5->32"
23974
]
23975
},
23976
{
@@ -27181,10 +27184,10 @@
27184
"ru": "Слабый пароль",
27185
"zh-chs": "密碼強度低",
27186
"xloc": [
27184
- "login-mobile.handlebars->5->29",
27185
- "login-mobile.handlebars->5->33",
27186
- "login.handlebars->5->29",
27187
- "login.handlebars->5->33"
27187
+ "login-mobile.handlebars->5->30",
27188
+ "login-mobile.handlebars->5->34",
27189
+ "login.handlebars->5->30",
27190
+ "login.handlebars->5->34"
27191
]
27192
},
27193
{
@@ -29357,8 +29360,8 @@
29360
"ru": "{0} букв в нижнем регистре",
29361
"zh-chs": "{0}小寫",
29362
"xloc": [
29360
- "login-mobile.handlebars->5->38",
29361
- "login.handlebars->5->38"
29363
+ "login-mobile.handlebars->5->39",
29364
+ "login.handlebars->5->39"
29365
]
29366
},
29367
{
@@ -29443,8 +29446,8 @@
29446
"ru": "{0} спец. символы",
29447
"zh-chs": "{0}非字母數字",
29448
"xloc": [
29446
- "login-mobile.handlebars->5->40",
29447
- "login.handlebars->5->40"
29449
+ "login-mobile.handlebars->5->41",
29450
+ "login.handlebars->5->41"
29451
]
29452
},
29453
{
@@ -29461,8 +29464,8 @@
29464
"ru": "{0} цифры",
29465
"zh-chs": "{0}數字",
29466
"xloc": [
29464
- "login-mobile.handlebars->5->39",
29465
- "login.handlebars->5->39"
29467
+ "login-mobile.handlebars->5->40",
29468
+ "login.handlebars->5->40"
29469
]
29470
},
29471
{
@@ -29592,8 +29595,8 @@
29595
"ru": "{0} заглавных букв",
29596
"zh-chs": "{0}大寫",
29597
"xloc": [
29595
- "login-mobile.handlebars->5->37",
29596
- "login.handlebars->5->37"
29598
+ "login-mobile.handlebars->5->38",
29599
+ "login.handlebars->5->38"
29600
]
29601
},
29602
{
views/default.handlebars
+1
-1
@@ -9957,7 +9957,7 @@
9957
}
9958
9959
function showSendSMSValidate() { QE('idx_dlgOkButton', Q('d2smsText').value.length > 0); }
9960
- function showSendSMSEx(b, tag) { if (Q('d2smsText').value.length > 0) { meshserver.send({ action: 'smsuser', userid: tag, msg: Q('d2smsText').value }); } }
9960
+ function showSendSMSEx(b, tag) { if (Q('d2smsText').value.length > 0) { meshserver.send({ action: 'smsuser', userid: decodeURIComponent(tag), msg: Q('d2smsText').value }); } }
9961
9962
function showUserAlertDialog(e, userid) {
9963
if (xxdialogMode) return;
webserver.js
+1
-1
@@ -594,7 +594,7 @@ module.exports.CreateWebServer = function (parent, db, args, certificates) {
594
const cookies = req.headers.cookie.split('; ');
595
for (var i in cookies) {
596
if (cookies[i].startsWith('twofactor=')) {
597
- var twoFactorCookie = obj.parent.decodeCookie(decodeURIComponent(cookies[i].substring(10)), obj.parent.loginCookieEncryptionKey, (30 * 24 * 60)); // 30 day timeout
597
+ var twoFactorCookie = obj.parent.decodeCookie(decodeURIComponent(cookies[i].substring(10)), obj.parent.loginCookieEncryptionKey, (30 * 24 * 60)); // If the cookies does not have an expire feild, assume 30 day timeout.
598
if ((twoFactorCookie != null) && ((obj.args.cookieipcheck === false) || (twoFactorCookie.ip == null) || (twoFactorCookie.ip === cleanRemoteAddr(req.ip))) && (twoFactorCookie.userid == user._id)) { return false; }
599
}
600
}