diff --git a/zefie_wtvp_minisrv/includes/ServiceVault/wtv-head-waiter/login-stage-two.js b/zefie_wtvp_minisrv/includes/ServiceVault/wtv-head-waiter/login-stage-two.js index 614951ee..47497770 100644 --- a/zefie_wtvp_minisrv/includes/ServiceVault/wtv-head-waiter/login-stage-two.js +++ b/zefie_wtvp_minisrv/includes/ServiceVault/wtv-head-waiter/login-stage-two.js @@ -89,11 +89,11 @@ wtv-expire-all: wtv-head-waiter: `; if (!limitedLogin && !limitedLoginRegistered) { - + strf = strftime.timezone(timezone); headers += `wtv-country: US -wtv-client-time-zone: GMT ${timezone} +wtv-client-time-zone: GMT -0000 wtv-client-time-dst-rule: GMT -wtv-client-date: ${new Date().toUTCString()} +wtv-client-date: ${strf("%a, %d %b %Y %H:%M:%S", new Date(new Date().setUTCSeconds(new Date().getUTCSeconds())))} wtv-language-header: en-US,en wtv-noback-all: wtv- wtv-transition-override: off diff --git a/zefie_wtvp_minisrv/includes/ServiceVault/wtv-mail/listmail.js b/zefie_wtvp_minisrv/includes/ServiceVault/wtv-mail/listmail.js index 54e8f8dc..02850ab4 100644 --- a/zefie_wtvp_minisrv/includes/ServiceVault/wtv-mail/listmail.js +++ b/zefie_wtvp_minisrv/includes/ServiceVault/wtv-mail/listmail.js @@ -83,259 +83,259 @@ if (!session_data.isRegistered()) { }).getURL(); headers = `200 OK - Content-type: text/html`; +Content-type: text/html`; data = ` - - - - ${(mailbox_name === "Inbox") ? ' Mail list for ' + username : mailbox_name} - - - - - - -
- - - -
- -
- - - - - -
- - - - - - - - - - - -
-
- - - - -
-
Write -
- 		-
-
- - - - -
-
Storage -
- 		-
-
- - - - -
-
Addresses -
- 		-
-
- - - - -
-
Clean up -
- 		-
-
- - -

 

-
-

-
-
- Quick Tip: - - -
- - indicates messages from known senders
- -
- 		-
- - - - - -
- -
- -
- - - -
- - - - `; - var icon_image = null; - switch (mailbox_name) { - case "Inbox": - icon_image = session_data.mailstore.getMailboxIcon(); - break; - case "Sent": - icon_image = "MailboxSent.gif"; - break; - case "Trash": - icon_image = "MailboxDiscard.gif"; - break; - default: - icon_image = "MailboxStorage.gif"; - break; - } +message="Write a new e-mail message" +label="Write"> + + + +${(mailbox_name === "Inbox") ? ' Mail list for ' + username : mailbox_name} + + + + + + +
+ + + +
+ +
+ + + + + +
+ + + + + + + + + + + +
+
+ + + + +
+
Write +
+		 +
+
+ + + + +
+
Storage +
+		 +
+
+ + + + +
+
Addresses +
+		 +
+
+ + + + +
+
Clean up +
+		 +
+
+ + +

 

+
+

+
+
+Quick Tip: + + +
+ +indicates messages from known senders
+ +
+		 +
+ + + + + + +
+ +
+ +
+ + +
+ + + +`; + var icon_image = null; + switch (mailbox_name) { + case "Inbox": + icon_image = session_data.mailstore.getMailboxIcon(); + break; + case "Sent": + icon_image = "MailboxSent.gif"; + break; + case "Trash": + icon_image = "MailboxDiscard.gif"; + break; + default: + icon_image = "MailboxStorage.gif"; + break; + } + + data += ` + + +
+
+ + +
+ + +
+ + + ${(mailbox_name === "Inbox") ? ' Mail list for ' + username : mailbox_name} + + + + +
+Settings +		 + + +
+
+
+ + +
+ + +
`; + if (message_list) { data += ` - - 		-
-
- - -
- - -
- - - ${(mailbox_name === "Inbox") ? ' Mail list for ' + username : mailbox_name} - - - - -
- Settings - 		- - -
-
-
- - -
- - -
`; - if (message_list) { - + ${message_list_string} + + +
+${username}@${minisrv_config.config.service_name} +
+
+ +
+ + + +
+From +Subject +Date +
+ +
+`; + Object.keys(message_list).forEach(function (k) { + var message = message_list[k]; + if (typeof message.subject == "object" && message.subject) message.subject = wtvshared.decodeBufferText(message.subject); + message.known_sender = session_data.isAddressInAddressBook(message.from_addr); + var message_font_open = ""; + var message_font_close = ""; + if (message.unread) { + message_font_open = ``; + message_font_close = "" + } + data += ` + + +
+ + + +
${(message.known_sender) ? '' : ''} + +${message_font_open} +${(message.from_name) ? message.from_name : message.from_addr} +${message_font_close} + + +${message_font_open} +${(message.subject) ? wtvshared.htmlEntitize(message.subject) : "(No Subject)"} +${message_font_close} + + +${message_font_open} +`; + var message_date = new Date(message.date * 1000); + data += (message_date.getMonth() + 1) + "/" + message_date.getDate() + "\n"; data += ` - ${message_list_string} - - -
- ${username}@${minisrv_config.config.service_name} -
-
- -
- - - -
- From - Subject - Date -
- -
- `; - Object.keys(message_list).forEach(function (k) { - var message = message_list[k]; - if (typeof message.subject == "object" && message.subject) message.subject = wtvshared.decodeBufferText(message.subject); - message.known_sender = session_data.isAddressInAddressBook(message.from_addr); - var message_font_open = ""; - var message_font_close = ""; - if (message.unread) { - message_font_open = ``; - message_font_close = "" - } - data += ` - - - -
- - -
${(message.known_sender) ? '' : ''} - - ${message_font_open} - ${(message.from_name) ? message.from_name : message.from_addr} - ${message_font_close} - - - ${message_font_open} - ${(message.subject) ? wtvshared.htmlEntitize(message.subject) : "(No Subject)"} - ${message_font_close} - - - ${message_font_open} - `; - var message_date = new Date(message.date * 1000); - data += (message_date.getMonth() + 1) + "/" + message_date.getDate() + "\n"; - data += ` - ${message_font_close} -
-
`; - }); - } else { - data += ` - No ${(mailbox_name == "Inbox") ? `new e-mail messages for - -
- ${username}@${minisrv_config.config.service_name} -
` : 'e-mail messages in mailbox ' + mailbox_name} -
- `; - } +${message_font_close} +
+
`; + }); + } else { data += ` - -
- - + No ${(mailbox_name == "Inbox") ? `new e-mail messages for + +
+${username}@${minisrv_config.config.service_name} +
` : 'e-mail messages in mailbox ' + mailbox_name} +
+`; + } + data += ` + +
+ + `; diff --git a/zefie_wtvp_minisrv/includes/ServiceVault/wtv-mail/sendmail.js b/zefie_wtvp_minisrv/includes/ServiceVault/wtv-mail/sendmail.js index e5c91c79..86961738 100644 --- a/zefie_wtvp_minisrv/includes/ServiceVault/wtv-mail/sendmail.js +++ b/zefie_wtvp_minisrv/includes/ServiceVault/wtv-mail/sendmail.js @@ -32,9 +32,9 @@ if (!session_data.isRegistered()) { if (request_headers.query['wtv-saved-message-id']) delete request_headers.query['wtv-saved-message-id']; headers = `300 OK - wtv-expire-all: wtv-mail:/listmail - wtv-expire-all: wtv-mail:/sendmail - Location: ${gourl}`; +wtv-expire-all: wtv-mail:/listmail +wtv-expire-all: wtv-mail:/sendmail +Location: ${gourl}`; } else { var doClientError = function (msg) { var clientErrorMsg = new clientShowAlert({ @@ -122,11 +122,11 @@ if (!session_data.isRegistered()) { if (message_snapshot_data && request_headers.query.get_snap) { headers = `200 OK - Content-Type: image/jpeg`; +Content-Type: image/jpeg`; data = message_snapshot_data; } else if (message_voicemail_data && request_headers.query.get_gab) { headers = `200 OK - Content-Type: audio/wav`; +Content-Type: audio/wav`; data = message_voicemail_data; } else { @@ -258,9 +258,9 @@ if (!session_data.isRegistered()) { session_data.deleteSessionData("usenet_draft"); session_data.deleteSessionData("usenet_draft_attachments"); headers = `300 OK - wtv-expire-all: wtv-news:/news?group=${newsgroup} - wtv-expire-all wtv-mail:/sendmail - Location: wtv-news:/news?group=${newsgroup}`; +wtv-expire-all: wtv-news:/news?group=${newsgroup} +wtv-expire-all wtv-mail:/sendmail +Location: wtv-news:/news?group=${newsgroup}`; sendToClient(socket, headers, ''); }).catch((e) => { var err = this.wtvshared.doErrorPage(500, null, e.toString()) @@ -278,9 +278,9 @@ if (!session_data.isRegistered()) { session_data.deleteSessionData("mail_draft"); session_data.deleteSessionData("mail_draft_attachments"); headers = `300 OK - wtv-expire-all: wtv-mail:/listmail - wtv-expire-all: wtv-mail:/sendmail - Location: wtv-mail:/listmail`; +wtv-expire-all: wtv-mail:/listmail +wtv-expire-all: wtv-mail:/sendmail +Location: wtv-mail:/listmail`; } } @@ -296,13 +296,13 @@ if (!session_data.isRegistered()) { if (newsgroup) mail_draft_data.article = article; session_data.setSessionData((newsgroup) ? "usenet_draft" : "mail_draft", mail_draft_data); headers = `200 OK - Content-type: text/html - wtv-expire-all: wtv-mail:/sendmail`; +Content-type: text/html +wtv-expire-all: wtv-mail:/sendmail`; } } else { headers = `200 OK - Content-type: text/html`; +Content-type: text/html`; var mail_draft_data = session_data.getSessionData((newsgroup) ? "usenet_draft_attachments" : "mail_draft_attachments") || {}; if (request_headers.query.snapping == "false") { headers += "\nwtv-expire-all: cache:snapshot.jpg"; @@ -330,474 +330,474 @@ if (!session_data.isRegistered()) { else message_colors = session_data.mailstore.getSignatureColors(session_data.getSessionData("subscriber_signature"), true); data = ` - - - - - - - ${pageTitle} - - - -
- - - ${(request_headers.query.article) ? `` : ''} - - - - - - +
- - - -
- -
- - - - - -
- - - - + + + +
-
- - - `; - if (newsgroup) { - data += ` -
-
Group list`; - } else { - data += `Mail list`; - } +} + + +${pageTitle} + + + + + + +${(request_headers.query.article) ? `` : ''} + + + + + +
+ + + +
+ +
+ + + + + +
+ + + + - - - - -
+
+ + +`; + if (newsgroup) { + data += `
+
Group list`; + } else { + data += `Mail list`; + } - data += `
`; - if (!newsgroup) { - data += ` - 		-
-
- - - - -
-
Address -
`; - } - data += ` - 		-
-
- - - - -
-
Photo -
- 		-
-
- - - - - -
-
Recording -
- 		-
-
- - - - -
-
Erase -
- 		-
-
- -
- 		-
- - - - - - -
- -
- -
- - -
- - - - - -
-
- - -
- - -
- - - - ${pageTitle} - - - - -
-
-
- - - - -
- - -
- - - - -
-
- - -
- - - - - - - - - -
- From:  - - - -
- ${address} -
- (${userdisplayname}) -
- -
`; - if (!request_headers.query.discuss) { - data += 'To:'; - } else { - data += 'To:'; - } - data += `  - - -
- -
- Subject:  - - -
- -
- -
- `; - if (session_data.getSessionData("subscriber_signature") && session_data.getSessionData("subscriber_signature") != "" && !no_signature) { - data += wtvshared.sanitizeSignature(session_data.getSessionData("subscriber_signature")); - } - if (msg_url) { - data += ` - - Included Page: ${wtvshared.htmlEntitize(msg_url_title).replace(/'/gi, "'")}`; - } +data += `
`; + if (!newsgroup) { data += ` - 		- -
- - -
-
-
- -
- - - + + + + +
`; - if (!session_data.getSessionData("subscriber_signature") || session_data.getSessionData("subscriber_signature") == "") { - data += ` `; - } else if (no_signature) { - data += ` -  Add signature  -
`; - } else { - data += ` -  Remove signature  -
`; +		 +
+
+ + + + +
+
Address +
`; + } +data += ` +		 +
+
+ + + + +
+
Photo +
+		 +
+
+ + + + + +
+
Recording +
+		 +
+
+ + + + +
+
Erase +
+		 +
+
+ +
+		 +
+ + + + + + +
+ +
+ +
+ + +
+ + + + + +
+
+ + +
+ + +
+ + + +${pageTitle} + + + + +
+
+
+ + + + +
+ + +
+ + + + + + +
+
+ + +
+ + + + + + + + + +
+From:  + + + +
+${address} +
 +(${userdisplayname}) +
+ +
`; + if (!request_headers.query.discuss) { + data += 'To:'; + } else { + data += 'To:'; + } + data += `  + + +
+ +
+Subject:  + + +
+ +
+ +
+`; + if (session_data.getSessionData("subscriber_signature") && session_data.getSessionData("subscriber_signature") != "" && !no_signature) { + data += wtvshared.sanitizeSignature(session_data.getSessionData("subscriber_signature")); + } + if (msg_url) { + data += ` + +Included Page: ${wtvshared.htmlEntitize(msg_url_title).replace(/'/gi, "'")}`; + } + data += ` +		 + +
+ + +
+
+
+ +
+ + +
`; + if (!session_data.getSessionData("subscriber_signature") || session_data.getSessionData("subscriber_signature") == "") { + data += ` `; + } else if (no_signature) { + data += ` + Add signature  +
`; + } else { + data += ` + Remove signature  +
`; + } + data += ` +		 + + +
+ +`; + + if ((request_headers.query.snapping && request_headers.query.snapping !== 'false') || mail_draft_attachments.message_snapshot_data) { + data += `
+ +
+ + + + +
+ + + +
+ + + + + + + + + + + + + + +
`; + if (!mail_draft_attachments.message_snapshot_data) { + data += ` +`; } + data += ` - - - -
- - `; +
+ +
+
+ +
+ + + Detach  +
+
+ +
+ + + +`; + } - if ((request_headers.query.snapping && request_headers.query.snapping !== 'false') || mail_draft_attachments.message_snapshot_data) { - data += ` -
+ + + +
+ +
- -
- - - - - - - - -
- - - -
- - - - - - - - - - - - - - -
`; - if (!mail_draft_attachments.message_snapshot_data) { - data += ` - `; - } - - data += ` -
- -
-
- -
- - -  Detach  -
-
- -
- - - - `; - } - - if ((request_headers.query.gabbing && request_headers.query.gabbing !== 'false') || mail_draft_attachments.message_voicemail_data) { - data += ` -
- - - -
- -
- -
- - - - - - -
- - - -
- - - - - - - - - - - - - - -
- - ${(!mail_draft_attachments.message_voicemail_data) ? '' : ''} -
- -
-   Recording - - -  Detach  -
- -
- - - - `; - } - data += ` - - -
- - - -
- -
- - - `; + if ((request_headers.query.gabbing && request_headers.query.gabbing !== 'false') || mail_draft_attachments.message_voicemail_data) { + data += `
+ +
+ + + + + + +
+ + + +
+ + + + + + + + + + + + + + +
+ +${(!mail_draft_attachments.message_voicemail_data) ? '' : ''} +
+ +
+  Recording + + + Detach  +
+ +
+ + + +`; + } + data += ` + + +
+ + + +
+ +
+ + +`; } } } diff --git a/zefie_wtvp_minisrv/includes/ServiceVault/wtv-setup/timezone.js b/zefie_wtvp_minisrv/includes/ServiceVault/wtv-setup/timezone.js index 6eb0575d..0d8dda2b 100644 --- a/zefie_wtvp_minisrv/includes/ServiceVault/wtv-setup/timezone.js +++ b/zefie_wtvp_minisrv/includes/ServiceVault/wtv-setup/timezone.js @@ -17,7 +17,7 @@ wtv-expire-all: wtv- wtv-expire-all: http wtv-client-time-zone: GMT -0000 wtv-client-time-dst-rule: false -wtv-client-date: ${strf("%a, %d %b %Y %H:%M:%S", new Date(new Date().setUTCSeconds(new Date().getUTCSeconds())))} GMT +wtv-client-date: ${strf("%a, %d %b %Y %H:%M:%S", new Date(new Date().setUTCSeconds(new Date().getUTCSeconds())))} Content-Type: text/html`