]> git.ipfire.org Git - thirdparty/cups.git/commitdiff
projects / thirdparty / cups.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: a276ace)
The web interface now checks whether the web browser has cookies enabled and
authormike <mike@7a7537e8-13f0-0310-91df-b6672ffda945>
Mon, 1 Oct 2012 03:49:06 +0000 (03:49 +0000)
committermike <mike@7a7537e8-13f0-0310-91df-b6672ffda945>
Mon, 1 Oct 2012 03:49:06 +0000 (03:49 +0000)
displays a suitable error message (STR #4141)

git-svn-id: svn+ssh://src.apple.com/svn/cups/cups.org/trunk@10630 7a7537e8-13f0-0310-91df-b6672ffda945

CHANGES.txt patch | blob | blame | history
templates/ca/header.tmpl.in patch | blob | blame | history
templates/ca/trailer.tmpl patch | blob | blame | history
templates/es/header.tmpl.in patch | blob | blame | history
templates/es/trailer.tmpl patch | blob | blame | history
templates/header.tmpl.in patch | blob | blame | history
templates/ja/header.tmpl.in patch | blob | blame | history
templates/ja/trailer.tmpl patch | blob | blame | history
templates/trailer.tmpl patch | blob | blame | history

diff --git a/CHANGES.txt b/CHANGES.txt
index c60449303de453213fd992877af790cf61b4db92..3b1c5c7a8066c3defc7a6baf7ef4e8a69d848428 100644 (file)
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,7 +1,9 @@
-CHANGES.txt - 1.7b1 - 2012-08-30
+CHANGES.txt - 1.7b1 - 2012-09-30
 --------------------------------
 
 CHANGES IN CUPS V1.7b1
 
        - CUPS now supports higher-level PIN printing, external accounting
          systems, and "print here" printing environments (STR #4169)
+       - The web interface now checks whether the web browser has cookies
+         enabled and displays a suitable error message (STR #4141)
diff --git a/templates/ca/header.tmpl.in b/templates/ca/header.tmpl.in
index 988d6bf794a790003b7e36fff51a5a5221808546..02cf580812db02e48097d8ead85eb552d516466f 100644 (file)
--- a/templates/ca/header.tmpl.in
+++ b/templates/ca/header.tmpl.in
@@ -6,8 +6,16 @@
        <LINK REL="STYLESHEET" TYPE="text/css" HREF="/cups.css">
        <LINK REL="SHORTCUT ICON" HREF="/images/cups-icon.png" TYPE="image/png">
        {refresh_page?<META HTTP-EQUIV="Refresh" CONTENT="{refresh_page}">:}
+       <SCRIPT TYPE="text/javascript"><!--
+       /* Show an error if cookies are disabled */
+       function check_cookies() {
+         if (!navigator.cookieEnabled) {
+               document.getElementById('body').innerHTML = 'This page uses cookies to prevent common cross-site attacks. Please enable cookies in your browser.';
+         }
+       }
+       --></SCRIPT>
 </HEAD>
-<BODY>
+<BODY ONLOAD="check_cookies();">
 <TABLE CLASS="page" SUMMARY="{title}">
 <TR><TD CLASS="body">
 <TABLE BORDER="0" CELLPADDING="0" CELLSPACING="0" SUMMARY="">
@@ -27,3 +35,4 @@ VALUE="{SECTION=help?{?QUERY}:}" AUTOSAVE="org.cups.help" RESULTS="20"></FORM></
 </TR>
 <TR><TD COLSPAN="9">&nbsp;</TD></TR>
 </TABLE>
+<DIV ID="body">
diff --git a/templates/ca/trailer.tmpl b/templates/ca/trailer.tmpl
index f16123f70f9acb1b0ace3313fd711d64f6aeae73..655c068d792afc41632874ab67a0a431940947e4 100644 (file)
--- a/templates/ca/trailer.tmpl
+++ b/templates/ca/trailer.tmpl
@@ -1,4 +1,4 @@
-</TD></TR>
+</DIV></TD></TR>
 <TR><TD>&nbsp;</TD></TR>
 <TR><TD CLASS="trailer">CUPS i el logotip de CUPS s&oacute;n marques registrades per
 <A HREF="http://www.apple.com">Apple Inc.</A> CUPS t&eacute; copyright 2007-2012 Apple
diff --git a/templates/es/header.tmpl.in b/templates/es/header.tmpl.in
index b6c63b431549c2743c94ca08d94eda316014878c..3e974c802e87ab143bbfb24d65171500f10868a2 100644 (file)
--- a/templates/es/header.tmpl.in
+++ b/templates/es/header.tmpl.in
@@ -6,8 +6,16 @@
        <LINK REL="STYLESHEET" TYPE="text/css" HREF="/cups.css">
        <LINK REL="SHORTCUT ICON" HREF="/images/cups-icon.png" TYPE="image/png">
        {refresh_page?<META HTTP-EQUIV="Refresh" CONTENT="{refresh_page}">:}
+       <SCRIPT TYPE="text/javascript"><!--
+       /* Show an error if cookies are disabled */
+       function check_cookies() {
+         if (!navigator.cookieEnabled) {
+               document.getElementById('body').innerHTML = 'This page uses cookies to prevent common cross-site attacks. Please enable cookies in your browser.';
+         }
+       }
+       --></SCRIPT>
 </HEAD>
-<BODY>
+<BODY ONLOAD="check_cookies();">
 <TABLE CLASS="page" SUMMARY="{title}">
 <TR><TD CLASS="body">
 <TABLE BORDER="0" CELLPADDING="0" CELLSPACING="0" SUMMARY="">
@@ -27,3 +35,4 @@ VALUE="{SECTION=help?{?QUERY}:}" AUTOSAVE="org.cups.help" RESULTS="20"></FORM></
 </TR>
 <TR><TD COLSPAN="9">&nbsp;</TD></TR>
 </TABLE>
+<DIV ID="body">
diff --git a/templates/es/trailer.tmpl b/templates/es/trailer.tmpl
index a19924548d05bf071bf1f091a1ed209c98cf3b3b..335afd36e6390b708fd1cad6d606d014a4240f14 100644 (file)
--- a/templates/es/trailer.tmpl
+++ b/templates/es/trailer.tmpl
@@ -1,4 +1,4 @@
-</TD></TR>
+</DIV></TD></TR>
 <TR><TD>&nbsp;</TD></TR>
 <TR><TD CLASS="trailer">CUPS y el logo de CUPS son marcas registradas de
 <A HREF="http://www.apple.com">Apple, Inc.</A> Los derechos de copia de CUPS
diff --git a/templates/header.tmpl.in b/templates/header.tmpl.in
index a383725c511212d7d88cf1811b95ab1f652937cf..8aaf89c1828a7a8ba7ba7f50dd15373bf2ec0d93 100644 (file)
--- a/templates/header.tmpl.in
+++ b/templates/header.tmpl.in
@@ -6,8 +6,16 @@
        <LINK REL="STYLESHEET" TYPE="text/css" HREF="/cups.css">
        <LINK REL="SHORTCUT ICON" HREF="/images/cups-icon.png" TYPE="image/png">
        {refresh_page?<META HTTP-EQUIV="Refresh" CONTENT="{refresh_page}">:}
+       <SCRIPT TYPE="text/javascript"><!--
+       /* Show an error if cookies are disabled */
+       function check_cookies() {
+         if (!navigator.cookieEnabled) {
+               document.getElementById('body').innerHTML = 'This page uses cookies to prevent common cross-site attacks. Please enable cookies in your browser.';
+         }
+       }
+       --></SCRIPT>
 </HEAD>
-<BODY>
+<BODY ONLOAD="check_cookies();">
 <TABLE CLASS="page" SUMMARY="{title}">
 <TR><TD CLASS="body">
 <TABLE BORDER="0" CELLPADDING="0" CELLSPACING="0" SUMMARY="">
@@ -27,3 +35,4 @@ VALUE="{SECTION=help?{?QUERY}:}" AUTOSAVE="org.cups.help" RESULTS="20"></FORM></
 </TR>
 <TR><TD COLSPAN="9">&nbsp;</TD></TR>
 </TABLE>
+<DIV ID="body">
diff --git a/templates/ja/header.tmpl.in b/templates/ja/header.tmpl.in
index 71a39f101fb9480a58eae912533cd580e2cb3ed4..1bf55fdeec48f34bbf1c54bdea8e377b291f2558 100644 (file)
--- a/templates/ja/header.tmpl.in
+++ b/templates/ja/header.tmpl.in
@@ -6,8 +6,16 @@
        <LINK REL="STYLESHEET" TYPE="text/css" HREF="/cups.css">
        <LINK REL="SHORTCUT ICON" HREF="/images/cups-icon.png" TYPE="image/png">
        {refresh_page?<META HTTP-EQUIV="Refresh" CONTENT="{refresh_page}">:}
+       <SCRIPT TYPE="text/javascript"><!--
+       /* Show an error if cookies are disabled */
+       function check_cookies() {
+         if (!navigator.cookieEnabled) {
+               document.getElementById('body').innerHTML = 'This page uses cookies to prevent common cross-site attacks. Please enable cookies in your browser.';
+         }
+       }
+       --></SCRIPT>
 </HEAD>
-<BODY>
+<BODY ONLOAD="check_cookies();">
 <TABLE CLASS="page" SUMMARY="{title}">
 <TR><TD CLASS="body">
 <TABLE BORDER="0" CELLPADDING="0" CELLSPACING="0" SUMMARY="">
@@ -27,3 +35,4 @@ VALUE="{SECTION=help?{?QUERY}:}" AUTOSAVE="org.cups.help" RESULTS="20"></FORM></
 </TR>
 <TR><TD COLSPAN="9">&nbsp;</TD></TR>
 </TABLE>
+<DIV ID="body">
diff --git a/templates/ja/trailer.tmpl b/templates/ja/trailer.tmpl
index 123a19722bdd525a700d9dcc69b7bf862a7447d2..14412f1ca3d7bbb828d5134fa22402f493690c64 100644 (file)
--- a/templates/ja/trailer.tmpl
+++ b/templates/ja/trailer.tmpl
@@ -1,4 +1,4 @@
-</TD></TR>
+</DIV></TD></TR>
 <TR><TD>&nbsp;</TD></TR>
 <TR><TD CLASS="trailer">CUPS and the CUPS logo are trademarks of
 <A HREF="http://www.apple.com">Apple Inc.</A> CUPS is copyright 2007-2012 Apple
diff --git a/templates/trailer.tmpl b/templates/trailer.tmpl
index 123a19722bdd525a700d9dcc69b7bf862a7447d2..14412f1ca3d7bbb828d5134fa22402f493690c64 100644 (file)
--- a/templates/trailer.tmpl
+++ b/templates/trailer.tmpl
@@ -1,4 +1,4 @@
-</TD></TR>
+</DIV></TD></TR>
 <TR><TD>&nbsp;</TD></TR>
 <TR><TD CLASS="trailer">CUPS and the CUPS logo are trademarks of
 <A HREF="http://www.apple.com">Apple Inc.</A> CUPS is copyright 2007-2012 Apple
Unnamed repository; edit this file 'description' to name the repository.