зеркало из https://github.com/mozilla/pjs.git
cookie management changes
This commit is contained in:
Родитель
5e67bc2f91
Коммит
6639da6400
|
@ -7502,16 +7502,14 @@ ResDef(MK_ACCESS_VALUE, XP_MSG_BASE + 1341,
|
|||
"Value:")
|
||||
ResDef(MK_ACCESS_HOST, XP_MSG_BASE + 1342,
|
||||
"Host:")
|
||||
ResDef(MK_ACCESS_SEND_TO_HOST, XP_MSG_BASE + 1343,
|
||||
"Send to host:")
|
||||
ResDef(MK_ACCESS_IS_DOMAIN, XP_MSG_BASE + 1344,
|
||||
"any host in the domain from the host above")
|
||||
ResDef(MK_ACCESS_IS_NOT_DOMAIN, XP_MSG_BASE + 1345,
|
||||
"the above fully qualified host only")
|
||||
ResDef(MK_ACCESS_SEND_TO_PATH, XP_MSG_BASE + 1346,
|
||||
"Send to path:")
|
||||
ResDef(MK_ACCESS_AND_BELOW, XP_MSG_BASE + 1347,
|
||||
" (and below)")
|
||||
ResDef(MK_ACCESS_DOMAIN, XP_MSG_BASE + 1343,
|
||||
"Domain:")
|
||||
ResDef(MK_ACCESS_PATH, XP_MSG_BASE + 1344,
|
||||
"Path:")
|
||||
ResDef(MK_ACCESS_YES, XP_MSG_BASE + 1345,
|
||||
"Yes")
|
||||
ResDef(MK_ACCESS_NO, XP_MSG_BASE + 1346,
|
||||
"No")
|
||||
ResDef(MK_ACCESS_SECURE, XP_MSG_BASE + 1348,
|
||||
"Secure:")
|
||||
ResDef(MK_ACCESS_EXPIRES, XP_MSG_BASE + 1349,
|
||||
|
|
|
@ -7502,16 +7502,14 @@ ResDef(MK_ACCESS_VALUE, XP_MSG_BASE + 1341,
|
|||
"Value:")
|
||||
ResDef(MK_ACCESS_HOST, XP_MSG_BASE + 1342,
|
||||
"Host:")
|
||||
ResDef(MK_ACCESS_SEND_TO_HOST, XP_MSG_BASE + 1343,
|
||||
"Send to host:")
|
||||
ResDef(MK_ACCESS_IS_DOMAIN, XP_MSG_BASE + 1344,
|
||||
"any host in the domain from the host above")
|
||||
ResDef(MK_ACCESS_IS_NOT_DOMAIN, XP_MSG_BASE + 1345,
|
||||
"the above fully qualified host only")
|
||||
ResDef(MK_ACCESS_SEND_TO_PATH, XP_MSG_BASE + 1346,
|
||||
"Send to path:")
|
||||
ResDef(MK_ACCESS_AND_BELOW, XP_MSG_BASE + 1347,
|
||||
" (and below)")
|
||||
ResDef(MK_ACCESS_DOMAIN, XP_MSG_BASE + 1343,
|
||||
"Domain:")
|
||||
ResDef(MK_ACCESS_PATH, XP_MSG_BASE + 1344,
|
||||
"Path:")
|
||||
ResDef(MK_ACCESS_YES, XP_MSG_BASE + 1345,
|
||||
"Yes")
|
||||
ResDef(MK_ACCESS_NO, XP_MSG_BASE + 1346,
|
||||
"No")
|
||||
ResDef(MK_ACCESS_SECURE, XP_MSG_BASE + 1348,
|
||||
"Secure:")
|
||||
ResDef(MK_ACCESS_EXPIRES, XP_MSG_BASE + 1349,
|
||||
|
|
|
@ -87,11 +87,10 @@ extern int MK_ACCESS_NO_COOKIES;
|
|||
extern int MK_ACCESS_NAME;
|
||||
extern int MK_ACCESS_VALUE;
|
||||
extern int MK_ACCESS_HOST;
|
||||
extern int MK_ACCESS_SEND_TO_HOST;
|
||||
extern int MK_ACCESS_IS_DOMAIN;
|
||||
extern int MK_ACCESS_IS_NOT_DOMAIN;
|
||||
extern int MK_ACCESS_SEND_TO_PATH;
|
||||
extern int MK_ACCESS_AND_BELOW;
|
||||
extern int MK_ACCESS_DOMAIN;
|
||||
extern int MK_ACCESS_PATH;
|
||||
extern int MK_ACCESS_YES;
|
||||
extern int MK_ACCESS_NO;
|
||||
extern int MK_ACCESS_SECURE;
|
||||
extern int MK_ACCESS_EXPIRES;
|
||||
extern int MK_ACCESS_END_OF_SESSION;
|
||||
|
@ -3301,41 +3300,39 @@ net_DisplayCookieDetailsAsHTML(MWContext *context,
|
|||
"<TABLE>");
|
||||
|
||||
g += PR_snprintf(buffer+g, BUFLEN-g,
|
||||
"<TR><TD><b>%s</b></TD> <TD>%s</TD></TR>", XP_GetString(MK_ACCESS_NAME), cookie_name);
|
||||
"<TR><TD><b>%s</b></TD> <TD>%s</TD></TR>",
|
||||
XP_GetString(MK_ACCESS_NAME), cookie_name);
|
||||
FLUSH_BUFFER
|
||||
|
||||
g += PR_snprintf(buffer+g, BUFLEN-g,
|
||||
"<TR><TD><b>%s</b></TD> <TD>%s</TD></TR>", XP_GetString(MK_ACCESS_VALUE), cookie_cookie);
|
||||
FLUSH_BUFFER
|
||||
|
||||
g += PR_snprintf(buffer+g, BUFLEN-g,
|
||||
"<TR><TD><b>%s</b></TD> <TD>%s</TD></TR>", XP_GetString(MK_ACCESS_HOST), cookie_host);
|
||||
"<TR><TD><b>%s</b></TD> <TD>%s</TD></TR>",
|
||||
XP_GetString(MK_ACCESS_VALUE), cookie_cookie);
|
||||
FLUSH_BUFFER
|
||||
|
||||
if (cookie_is_domain) {
|
||||
g += PR_snprintf(buffer+g, BUFLEN-g,
|
||||
"<TR><TD><b>%s</b></TD> <TD>%s</TD></TR>", XP_GetString(MK_ACCESS_SEND_TO_HOST),
|
||||
XP_GetString(MK_ACCESS_IS_DOMAIN));
|
||||
"<TR><TD><b>%s</b></TD> <TD>%s</TD></TR>",
|
||||
XP_GetString(MK_ACCESS_DOMAIN), cookie_host);
|
||||
} else {
|
||||
g += PR_snprintf(buffer+g, BUFLEN-g,
|
||||
"<TR><TD><b>%s</b></TD> <TD>%s</TD></TR>", XP_GetString(MK_ACCESS_SEND_TO_HOST),
|
||||
XP_GetString(MK_ACCESS_IS_NOT_DOMAIN));
|
||||
"<TR><TD><b>%s</b></TD> <TD>%s</TD></TR>",
|
||||
XP_GetString(MK_ACCESS_HOST), cookie_host);
|
||||
}
|
||||
FLUSH_BUFFER
|
||||
|
||||
g += PR_snprintf(buffer+g, BUFLEN-g,
|
||||
"<TR><TD><b>%s</b></TD> <TD>%s %s</TD></TR>", XP_GetString(MK_ACCESS_SEND_TO_PATH),
|
||||
cookie_path, XP_GetString(MK_ACCESS_AND_BELOW));
|
||||
"<TR><TD><b>%s</b></TD> <TD>%s</TD></TR>",
|
||||
XP_GetString(MK_ACCESS_PATH), cookie_path);
|
||||
FLUSH_BUFFER
|
||||
|
||||
if(cookie_secure) {
|
||||
g += PR_snprintf(buffer+g, BUFLEN-g,
|
||||
"<TR><TD><b>%s</b></TD> <TD>%s</TD></TR>", XP_GetString(MK_ACCESS_SECURE),
|
||||
"Yes"); /* bad -- needs i18n */
|
||||
"<TR><TD><b>%s</b></TD> <TD>%s</TD></TR>",
|
||||
XP_GetString(MK_ACCESS_SECURE), XP_GetString(MK_ACCESS_YES));
|
||||
} else {
|
||||
g += PR_snprintf(buffer+g, BUFLEN-g,
|
||||
"<TR><TD><b>%s</b></TD> <TD>%s</TD></TR>", XP_GetString(MK_ACCESS_SECURE),
|
||||
"No"); /* bad -- needs i18n */
|
||||
"<TR><TD><b>%s</b></TD> <TD>%s</TD></TR>",
|
||||
XP_GetString(MK_ACCESS_SECURE), XP_GetString(MK_ACCESS_NO));
|
||||
}
|
||||
FLUSH_BUFFER
|
||||
|
||||
|
@ -3343,16 +3340,17 @@ net_DisplayCookieDetailsAsHTML(MWContext *context,
|
|||
expireDate=ctime(&(cookie_expires));
|
||||
if (expireDate) {
|
||||
g += PR_snprintf(buffer+g, BUFLEN-g,
|
||||
"<TR><TD><b>%s</b></TD> <TD>%s %s</TD></TR>", XP_GetString(MK_ACCESS_EXPIRES),
|
||||
expireDate);
|
||||
"<TR><TD><b>%s</b></TD> <TD>%s</TD></TR>",
|
||||
XP_GetString(MK_ACCESS_EXPIRES), expireDate);
|
||||
} else {
|
||||
g += PR_snprintf(buffer+g, BUFLEN-g,
|
||||
"<TR><TD><b>%s</b></TD> <TD>%s</TD></TR>", XP_GetString(MK_ACCESS_EXPIRES),
|
||||
"");
|
||||
"<TR><TD><b>%s</b></TD> <TD>%s</TD></TR>",
|
||||
XP_GetString(MK_ACCESS_EXPIRES), "");
|
||||
}
|
||||
} else {
|
||||
g += PR_snprintf(buffer+g, BUFLEN-g,
|
||||
"<TR><TD><b>%s</b></TD> <TD>%s</TD></TR>", XP_GetString(MK_ACCESS_EXPIRES),
|
||||
"<TR><TD><b>%s</b></TD> <TD>%s</TD></TR>",
|
||||
XP_GetString(MK_ACCESS_EXPIRES),
|
||||
XP_GetString(MK_ACCESS_END_OF_SESSION));
|
||||
}
|
||||
|
||||
|
|
Загрузка…
Ссылка в новой задаче