Bommels05/Mozilla
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bug 383993 – remove p3p ui from suite. r=kairo, sr=jag.

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@233773 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
dwitte%stanford.edu
2007-09-03 00:58:05 +00:00
parent 1117acd638
commit 165cd21a84
24 changed files with 6 additions and 741 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
mozilla/suite/common/jar.mn
View File

@@ -2,7 +2,6 @@ comm.jar:
% content communicator %content/communicator/ xpcnativewrappers=yes
% overlay chrome://communicator/content/contentAreaContextOverlay.xul chrome://communicator/content/permissions/imageContextOverlay.xul
% overlay chrome://navigator/content/navigatorOverlay.xul chrome://communicator/content/permissions/permissionsNavigatorOverlay.xul
% overlay chrome://navigator/content/navigatorOverlay.xul chrome://communicator/content/permissions/cookieTasksOverlay.xul
% overlay chrome://global/content/console.xul chrome://communicator/content/consoleOverlay.xul
% overlay chrome://help/content/help.xul chrome://communicator/content/helpOverlay.xul
% overlay chrome://communicator/content/tasksOverlay.xul chrome://communicator/content/emOverlay.xul
@@ -128,9 +127,6 @@ comm.jar:
content/communicator/history/findHistory.js (history/findHistory.js)
content/communicator/history/findHistory.xul (history/findHistory.xul)
content/communicator/permissions/aboutPopups.xul (permissions/aboutPopups.xul)
content/communicator/permissions/cookieP3P.xul (permissions/cookieP3P.xul)
content/communicator/permissions/cookieP3PDialog.xul (permissions/cookieP3PDialog.xul)
content/communicator/permissions/cookieTasksOverlay.xul (permissions/cookieTasksOverlay.xul)
content/communicator/permissions/cookieViewer.js (permissions/cookieViewer.js)
content/communicator/permissions/cookieViewer.xul (permissions/cookieViewer.xul)
content/communicator/permissions/imageContextOverlay.xul (permissions/imageContextOverlay.xul)

262
mozilla/suite/common/permissions/cookieP3P.xul
View File

@@ -1,262 +0,0 @@
<?xml version="1.0"?>
<!--
- Version: MPL 1.1/GPL 2.0/LGPL 2.1
-
- ***** BEGIN LICENSE BLOCK *****
- Version: MPL 1.1/GPL 2.0/LGPL 2.1
-
- The contents of this file are subject to the Mozilla Public License Version
- 1.1 (the "License"); you may not use this file except in compliance with
- the License. You may obtain a copy of the License at
- http://www.mozilla.org/MPL/
-
- Software distributed under the License is distributed on an "AS IS" basis,
- WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- for the specific language governing rights and limitations under the
- License.
-
- The Original Code is Mozilla.org code.
-
- The Initial Developer of the Original Code is
- Netscape Communications Corp.
- Portions created by the Initial Developer are Copyright (C) 2001
- the Initial Developer. All Rights Reserved.
-
- Contributor(s):
-
- Alternatively, the contents of this file may be used under the terms of
- either the GNU General Public License Version 2 or later (the "GPL"), or
- the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- in which case the provisions of the GPL or the LGPL are applicable instead
- of those above. If you wish to allow use of your version of this file only
- under the terms of either the GPL or the LGPL, and not to allow others to
- use your version of this file under the terms of the MPL, indicate your
- decision by deleting the provisions above and replace them with the notice
- and other provisions required by the GPL or the LGPL. If you do not delete
- the provisions above, a recipient may use your version of this file under
- the terms of any one of the MPL, the GPL or the LGPL.
-
- ***** END LICENSE BLOCK ***** -->
<!-- CHANGE THIS WHEN MOVING FILES -->
<?xml-stylesheet href="chrome://communicator/skin/" type="text/css"?>
<!-- CHANGE THIS WHEN MOVING FILES -->
<!DOCTYPE dialog SYSTEM "chrome://communicator/locale/permissions/cookieP3P.dtd">
<dialog id="privacySettings"
buttons="accept,cancel,help"
title="&windowtitle.label;"
xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
onload="init();"
ondialogaccept="return onOK();"
ondialoghelp="return doHelpButton();"
style="width: 45em;">
<script type="application/x-javascript" src="chrome://help/content/contextHelp.js" />
<script type="application/x-javascript">
<![CDATA[
var pref;
var low = 0;
var medium = 1;
var high = 2;
var custom = 3;
var p3pLength = 8;
function init()
{
// get pref service
pref = Components.classes['@mozilla.org/preferences-service;1'];
pref = pref.getService();
pref = pref.QueryInterface(Components.interfaces.nsIPrefBranch);
var p3pLevel = medium;
try {
// set prefLevel radio button
p3pLevel = pref.getIntPref("network.cookie.p3plevel");
document.getElementById("p3pLevel").value = p3pLevel;
// set custom settings
if (p3pLevel == custom) {
for (var i=0; i<p3pLength; i++) {
document.getElementById("menulist_"+i).value =
pref.getCharPref("network.cookie.p3p").charAt(i);
}
}
} catch(e) {
}
// initialize the settings display
settings(p3pLevel);
}
function onOK(){
var p3pLevel = document.getElementById("p3pLevel").value;
pref.setIntPref("network.cookie.p3plevel", p3pLevel);
var value = "";
for (var i=0; i<p3pLength; i++) {
value += document.getElementById("menulist_"+i).value;
}
pref.setCharPref("network.cookie.p3p", value);
return true;
}
function settings(level) {
var settings = [];
switch (level) {
case low:
settings = "afafaaaa";
break;
case medium:
settings = "ffffaaaa";
break;
case high:
settings = "frfradaa";
break;
case custom:
break;
}
var hide = (level != custom);
var menulist;
for (var j=0; j<p3pLength; j++) {
menulist = document.getElementById("menulist_" + j);
menulist.disabled = hide;
if (hide) {
menulist.value = settings[j];
}
}
}
function doHelpButton()
{
openHelp('privacy_levels', 'chrome://communicator/locale/help/suitehelp.rdf');
}
]]>
</script>
<groupbox orient="vertical">
<caption label="&privacyLevel.label;"/>
<description>&p3pDetails;</description>
<spacer/>
<description>&choose;</description>
<radiogroup id="p3pLevel" orient="horizontal" align="center">
<radio group="p3pLevel" value="0" label="&low.label;"
accesskey="&low.accesskey;" oncommand="settings(low);"/>
<radio group="p3pLevel" value="1" label="&medium.label;"
accesskey="&medium.accesskey;" oncommand="settings(medium);"/>
<radio group="p3pLevel" value="2" label="&high.label;"
accesskey="&high.accesskey;" oncommand="settings(high);"/>
<radio group="p3pLevel" value="3" label="&custom.label;"
accesskey="&custom.accesskey;" oncommand="settings(custom);"/>
</radiogroup>
</groupbox>
<groupbox id="customSettingBox" orient="vertical">
<caption label="&customSettings.label;"/>
<grid>
<columns>
<column flex="1"/>
<column width="120"/>
<column width="120"/>
</columns>
<rows>
<row align="center">
<spacer/>
<description>&firstParty.label;</description>
<description>&thirdParty.label;</description>
</row>
<row align="center">
<description>&noPolicy.label;</description>
<menulist flex="1" id="menulist_0">
<menupopup>
<menuitem value="a" label="&accept.label;"/>
<menuitem value="f" label="&flag.label;"/>
<menuitem value="d" label="&downgrade.label;"/>
<menuitem value="r" label="&reject.label;"/>
</menupopup>
</menulist>
<menulist flex="1" id="menulist_1">
<menupopup>
<menuitem value="a" label="&accept.label;"/>
<menuitem value="f" label="&flag.label;"/>
<menuitem value="d" label="&downgrade.label;"/>
<menuitem value="r" label="&reject.label;"/>
</menupopup>
</menulist>
</row>
<row align="center">
<description>&noConsent.label;</description>
<menulist flex="1" id="menulist_2">
<menupopup>
<menuitem value="a" label="&accept.label;"/>
<menuitem value="f" label="&flag.label;"/>
<menuitem value="d" label="&downgrade.label;"/>
<menuitem value="r" label="&reject.label;"/>
</menupopup>
</menulist>
<menulist flex="1" id="menulist_3">
<menupopup>
<menuitem value="a" label="&accept.label;"/>
<menuitem value="f" label="&flag.label;"/>
<menuitem value="d" label="&downgrade.label;"/>
<menuitem value="r" label="&reject.label;"/>
</menupopup>
</menulist>
</row>
<row align="center">
<description>&implicitConsent.label;</description>
<menulist flex="1" id="menulist_4">
<menupopup>
<menuitem value="a" label="&accept.label;"/>
<menuitem value="f" label="&flag.label;"/>
<menuitem value="d" label="&downgrade.label;"/>
<menuitem value="r" label="&reject.label;"/>
</menupopup>
</menulist>
<menulist flex="1" id="menulist_5">
<menupopup>
<menuitem value="a" label="&accept.label;"/>
<menuitem value="f" label="&flag.label;"/>
<menuitem value="d" label="&downgrade.label;"/>
<menuitem value="r" label="&reject.label;"/>
</menupopup>
</menulist>
</row>
<row align="center">
<description>&explicitConsent.label;</description>
<menulist flex="1" id="menulist_6">
<menupopup>
<menuitem value="a" label="&accept.label;"/>
<menuitem value="f" label="&flag.label;"/>
<menuitem value="d" label="&downgrade.label;"/>
<menuitem value="r" label="&reject.label;"/>
</menupopup>
</menulist>
<menulist flex="1" id="menulist_7">
<menupopup>
<menuitem value="a" label="&accept.label;"/>
<menuitem value="f" label="&flag.label;"/>
<menuitem value="d" label="&downgrade.label;"/>
<menuitem value="r" label="&reject.label;"/>
</menupopup>
</menulist>
</row>
</rows>
</grid>
</groupbox>
</dialog>

113
mozilla/suite/common/permissions/cookieP3PDialog.xul
View File

@@ -1,113 +0,0 @@
<?xml version="1.0"?>
<!--
- Version: MPL 1.1/GPL 2.0/LGPL 2.1
-
- ***** BEGIN LICENSE BLOCK *****
- Version: MPL 1.1/GPL 2.0/LGPL 2.1
-
- The contents of this file are subject to the Mozilla Public License Version
- 1.1 (the "License"); you may not use this file except in compliance with
- the License. You may obtain a copy of the License at
- http://www.mozilla.org/MPL/
-
- Software distributed under the License is distributed on an "AS IS" basis,
- WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- for the specific language governing rights and limitations under the
- License.
-
- The Original Code is Mozilla.org code.
-
- The Initial Developer of the Original Code is
- Netscape Communications Corp.
- Portions created by the Initial Developer are Copyright (C) 2001
- the Initial Developer. All Rights Reserved.
-
- Contributor(s):
-
- Alternatively, the contents of this file may be used under the terms of
- either the GNU General Public License Version 2 or later (the "GPL"), or
- the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- in which case the provisions of the GPL or the LGPL are applicable instead
- of those above. If you wish to allow use of your version of this file only
- under the terms of either the GPL or the LGPL, and not to allow others to
- use your version of this file under the terms of the MPL, indicate your
- decision by deleting the provisions above and replace them with the notice
- and other provisions required by the GPL or the LGPL. If you do not delete
- the provisions above, a recipient may use your version of this file under
- the terms of any one of the MPL, the GPL or the LGPL.
-
- ***** END LICENSE BLOCK ***** -->
<!-- CHANGE THIS WHEN MOVING FILES -->
<?xml-stylesheet href="chrome://communicator/skin/" type="text/css"?>
<!-- CHANGE THIS WHEN MOVING FILES -->
<!DOCTYPE dialog SYSTEM "chrome://communicator/locale/permissions/cookieP3P.dtd">
<dialog id="p3pDialog"
buttons="accept,cancel,extra1,extra2,help"
buttonalign="center"
buttonlabelaccept="&p3pDialogOff.label;"
buttonlabelcancel="&p3pDialogClose.label;"
buttonlabelextra1="&p3pDialogViewCookies.label;"
buttonlabelextra2="&p3pDialogViewLevels.label;"
title="&p3pDialogTitle.label;"
xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
onload="init();"
ondialogaccept="return P3POff();"
ondialogextra1="ViewCookieManager();"
ondialogextra2="ViewPrivacyLevels();"
ondialoghelp="return doHelpButton();"
style="width: 45em;">
<script type="application/x-javascript" src="chrome://help/content/contextHelp.js" />
<script type="application/x-javascript">
<![CDATA[
function init()
{
window.arguments[0].gButtonPressed = "";
// focus on the cancel button
document.documentElement.getButton("cancel").focus();
}
function ViewCookieManager() {
window.arguments[0].gButtonPressed = "cookie";
window.close();
}
function ViewPrivacyLevels() {
window.arguments[0].gButtonPressed = "p3p";
window.close();
}
function P3POff() {
var pref = Components.classes['@mozilla.org/preferences-service;1'];
pref = pref.getService();
pref = pref.QueryInterface(Components.interfaces.nsIPrefBranch);
pref.setIntPref("network.cookie.cookieBehavior", 0);
return true;
}
function doHelpButton()
{
openHelp('cookie_notify', 'chrome://communicator/locale/help/suitehelp.rdf');
}
]]>
</script>
<description>&p3pDialogMessage1.label;</description>
<separator class="thin"/>
<box>
<spacer flex="1"/>
<image src="chrome://communicator/skin/cookie/status-cookie.gif"/>
<spacer flex="1"/>
</box>
<separator class="thin"/>
<description>&p3pDialogMessage2.label;</description>
</dialog>

135
mozilla/suite/common/permissions/cookieTasksOverlay.xul
View File

@@ -1,135 +0,0 @@
<?xml version="1.0"?>
<!-- ***** BEGIN LICENSE BLOCK *****
Version: MPL 1.1/GPL 2.0/LGPL 2.1
The contents of this file are subject to the Mozilla Public License Version
1.1 (the "License"); you may not use this file except in compliance with
the License. You may obtain a copy of the License at
http://www.mozilla.org/MPL/
Software distributed under the License is distributed on an "AS IS" basis,
WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
for the specific language governing rights and limitations under the
License.
The Original Code is Mozilla Communicator client code, released
March 31, 1998.
The Initial Developer of the Original Code is
Netscape Communications Corporation.
Portions created by the Initial Developer are Copyright (C) 1998-1999
the Initial Developer. All Rights Reserved.
Contributor(s):
Alternatively, the contents of this file may be used under the terms of
either the GNU General Public License Version 2 or later (the "GPL"), or
the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
in which case the provisions of the GPL or the LGPL are applicable instead
of those above. If you wish to allow use of your version of this file only
under the terms of either the GPL or the LGPL, and not to allow others to
use your version of this file under the terms of the MPL, indicate your
decision by deleting the provisions above and replace them with the notice
and other provisions required by the GPL or the LGPL. If you do not delete
the provisions above, a recipient may use your version of this file under
the terms of any one of the MPL, the GPL or the LGPL.
***** END LICENSE BLOCK ***** -->
<!DOCTYPE overlay SYSTEM "chrome://communicator/locale/permissions/cookieTasksOverlay.dtd">
<overlay id="cookieTasksOverlay"
xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
<script type="application/x-javascript" src="chrome://communicator/content/permissions/permissionsOverlay.js"/>
<script type="application/x-javascript">
<![CDATA[
/******* THE FOLLOWING IS FOR THE STATUSBAR OVERLAY *******/
var gButtonPressed;
var cookieIconObserver = {
observe: function(subject, topic, state) {
if (topic != "cookieIcon" || !document) {
return;
}
var cookieIcon = document.getElementById("privacy-button");
if (cookieIcon) {
if (state == "on") {
cookieIcon.removeAttribute("hidden");
} else if (state == "off") {
cookieIcon.setAttribute("hidden", "true");
}
}
}
}
function viewP3PDialog() {
var observerService = Components.classes["@mozilla.org/observer-service;1"].getService(Components.interfaces.nsIObserverService);
observerService.notifyObservers(null, "cookieIcon", "off");
window.openDialog
("chrome://communicator/content/permissions/cookieP3PDialog.xul","_blank","modal=yes,chrome,resizable=no", this);
if (gButtonPressed == "cookie") {
viewCookiesFromIcon();
} else if (gButtonPressed == "p3p") {
viewP3P();
}
}
function CookieTasksOnLoad(event) {
addEventListener("unload", CookieTasksOnUnload, false);
// determine if p3p pref is set
var pref = Components.classes['@mozilla.org/preferences-service;1'].
getService(Components.interfaces.nsIPrefBranch);
if (pref.getIntPref("network.cookie.cookieBehavior") == 3) {
// make sure p3p dll exists, else we can't keep pref set
if (!("@mozilla.org/cookie-consent;1" in Components.classes)) {
pref.setIntPref("network.cookie.cookieBehavior", 0);
}
}
if ("@mozilla.org/cookie-consent;1" in Components.classes) {
// p3p dll exists so create an observer for changes in visibility of cookie icon
var observerService = Components.classes["@mozilla.org/observer-service;1"].getService(Components.interfaces.nsIObserverService);
observerService.addObserver(cookieIconObserver, "cookieIcon", false);
// determine whether or not cookie icon in this new window should be displayed
var cookieservice = Components.classes["@mozilla.org/cookieService;1"].getService();
cookieservice = cookieservice.QueryInterface(Components.interfaces.nsICookieService);
if (cookieservice.cookieIconIsVisible) {
var cookieIcon = document.getElementById("privacy-button");
if (cookieIcon) {
cookieIcon.removeAttribute("hidden");
}
}
}
}
function CookieTasksOnUnload(event) {
if ("@mozilla.org/cookie-consent;1" in Components.classes) {
var observerService = Components.classes["@mozilla.org/observer-service;1"].getService(Components.interfaces.nsIObserverService);
observerService.removeObserver(cookieIconObserver, "cookieIcon", false);
}
}
addEventListener("load", CookieTasksOnLoad, false);
]]>
</script>
<!-- statusbarOverlay items -->
<statusbar id="status-bar">
<statusbarpanel class="statusbarpanel-iconic" id="privacy-button"
hidden="true" insertbefore="security-button"
oncommand="viewP3PDialog()" tooltiptext="&cookieIcon.label;"/>
</statusbar>
</overlay>

81
mozilla/suite/common/permissions/cookieViewer.js
View File

@@ -62,7 +62,6 @@ function Startup() {
// arguments passed to this routine:
// cookieManager
// cookieManagerFromIcon
// xpconnect to cookiemanager/permissionmanager/promptservice interfaces
cookiemanager = Components.classes["@mozilla.org/cookiemanager;1"].getService();
@@ -139,9 +138,6 @@ var cookiesTreeView = {
case "nameCol":
rv = cookies[row].name;
break;
case "statusCol":
rv = cookies[row].status;
break;
case "expiresCol":
rv = cookies[row].expires;
break;
@@ -158,8 +154,7 @@ var cookiesTreeView = {
};
var cookiesTree;
function Cookie(id,name,value,isDomain,host,rawHost,path,isSecure,expires,
status,policy) {
function Cookie(id,name,value,isDomain,host,rawHost,path,isSecure,expires) {
this.id = id;
this.name = name;
this.value = value;
@@ -170,55 +165,28 @@ function Cookie(id,name,value,isDomain,host,rawHost,path,isSecure,expires,
this.isSecure = isSecure;
this.expires = GetExpiresString(expires);
this.expiresSortValue = expires;
this.status = GetStatusString(status);
this.policy = policy;
}
function loadCookies() {
// load cookies into a table
var enumerator = cookiemanager.enumerator;
var count = 0;
var showPolicyField = false;
while (enumerator.hasMoreElements()) {
var nextCookie = enumerator.getNext();
if (!nextCookie) break;
nextCookie = nextCookie.QueryInterface(Components.interfaces.nsICookie);
var host = nextCookie.host;
if (nextCookie.policy != nsICookie.POLICY_UNKNOWN) {
showPolicyField = true;
}
cookies[count] =
new Cookie(count++, nextCookie.name, nextCookie.value, nextCookie.isDomain, host,
(host.charAt(0)==".") ? host.substring(1,host.length) : host,
nextCookie.path, nextCookie.isSecure, nextCookie.expires,
nextCookie.status, nextCookie.policy);
nextCookie.path, nextCookie.isSecure, nextCookie.expires);
}
cookiesTreeView.rowCount = cookies.length;
// sort and display the table
cookiesTree.treeBoxObject.view = cookiesTreeView;
if (window.arguments[0] == "cookieManagerFromIcon") { // came here by clicking on cookie icon
// turn off the icon
var observerService = Components.classes["@mozilla.org/observer-service;1"].getService(Components.interfaces.nsIObserverService);
observerService.notifyObservers(null, "cookieIcon", "off");
// unhide the status column and sort by reverse order on that column
// Note that the sort routine normally does an ascending sort. The only
// exception is if you sort on the same column more than once in a row.
// In that case, the subsequent sorts will be the reverse of the previous ones.
// So we are now going to force an initial reverse sort by fooling the sort routine
// into thinking that it previously sorted on the status column and in ascending
// order.
document.getElementById("statusCol").removeAttribute("hidden");
lastCookieSortAscending = true; // force order to have blanks last instead of vice versa
lastCookieSortColumn = 'status';
CookieColumnSort('status');
} else {
// sort by host column
CookieColumnSort('rawHost');
}
// sort by host column
CookieColumnSort('rawHost');
// disable "remove all cookies" button if there are no cookies
if (cookies.length == 0) {
@@ -226,11 +194,6 @@ function loadCookies() {
} else {
document.getElementById("removeAllCookies").removeAttribute("disabled");
}
// show policy field if at least one cookie has a policy
if (showPolicyField) {
document.getElementById("policyField").removeAttribute("hidden");
}
}
function GetExpiresString(expires) {
@@ -255,34 +218,6 @@ function GetExpiresString(expires) {
return cookieBundle.getString("AtEndOfSession");
}
function GetStatusString(status) {
switch (status) {
case nsICookie.STATUS_ACCEPTED:
return cookieBundle.getString("accepted");
case nsICookie.STATUS_FLAGGED:
return cookieBundle.getString("flagged");
case nsICookie.STATUS_DOWNGRADED:
return cookieBundle.getString("downgraded");
}
return "";
}
function GetPolicyString(policy) {
switch (policy) {
case nsICookie.POLICY_NONE:
return cookieBundle.getString("policyUnstated");
case nsICookie.POLICY_NO_CONSENT:
return cookieBundle.getString("policyNoConsent");
case nsICookie.POLICY_IMPLICIT_CONSENT:
return cookieBundle.getString("policyImplicitConsent");
case nsICookie.POLICY_EXPLICIT_CONSENT:
return cookieBundle.getString("policyExplicitConsent");
case nsICookie.POLICY_NO_II:
return cookieBundle.getString("policyNoIICollected");
}
return "";
}
function CookieSelected() {
var selections = GetTreeSelections(cookiesTree);
if (selections.length) {
@@ -313,8 +248,7 @@ function CookieSelected() {
value: cookies[idx].isSecure ?
cookieBundle.getString("forSecureOnly") :
cookieBundle.getString("forAnyConnection")},
{id: "ifl_expires", value: cookies[idx].expires},
{id: "ifl_policy", value: GetPolicyString(cookies[idx].policy)}
{id: "ifl_expires", value: cookies[idx].expires}
];
var value;
@@ -334,7 +268,7 @@ function CookieSelected() {
function ClearCookieProperties() {
var properties =
["ifl_name","ifl_value","ifl_host","ifl_path","ifl_isSecure","ifl_expires","ifl_policy"];
["ifl_name","ifl_value","ifl_host","ifl_path","ifl_isSecure","ifl_expires"];
for (var prop=0; prop<properties.length; prop++) {
document.getElementById(properties[prop]).value = "";
}
@@ -406,9 +340,6 @@ function CookieColumnSort(column) {
case "expires":
sortedCol = document.getElementById("expiresCol");
break;
case "status":
sortedCol = document.getElementById("statusCol");
break;
}
if (lastCookieSortAscending)
sortedCol.setAttribute("sortDirection", "descending");

10
mozilla/suite/common/permissions/cookieViewer.xul
View File

@@ -86,9 +86,6 @@
<splitter class="tree-splitter"/>
<treecol id="expiresCol" label="&treehead.cookieexpires.label;" flex="10"
hidden="true" onclick="CookieColumnSort('expires', true);" persist="width hidden"/>
<splitter class="tree-splitter"/>
<treecol id="statusCol" label="&treehead.cookiestatus.label;" flex="1"
hidden="true" onclick="CookieColumnSort('status', true);" persist="width hidden"/>
</treecols>
<treechildren/>
</tree>
@@ -144,13 +141,6 @@
<textbox id="ifl_expires" readonly="true" class="plain"/>
</row>
<row align="center" id="policyField" hidden="true">
<hbox align="center" pack="end">
<label value="&props.policy.label;"/>
</hbox>
<textbox id="ifl_policy" readonly="true" class="plain"/>
</row>
</rows>
</grid>
</groupbox>

8
mozilla/suite/common/permissions/permissionsOverlay.js
View File

@@ -88,11 +88,3 @@ function viewCookies() {
openCookieViewer("cookieManager");
}
function viewCookiesFromIcon() {
openCookieViewer("cookieManagerFromIcon");
}
function viewP3P() {
window.openDialog
("chrome://communicator/content/permissions/cookieP3P.xul","_blank","chrome,resizable=no");
}

19
mozilla/suite/common/pref/pref-cookies.xul
View File

@@ -59,17 +59,10 @@
{
parent.initPanel('chrome://communicator/content/pref/pref-cookies.xul');
setDisables(false);
const NS_COOKIECONSENT_CONTRACTID = '@mozilla.org/cookie-consent;1';
if (NS_COOKIECONSENT_CONTRACTID in Components.classes) {
var p3pRadioButton = document.getElementById("p3pRadioButton");
p3pRadioButton.removeAttribute("hidden");
}
}
const cookies_disabled = "2";
const cookies_no_third_party = "1";
const cookies_p3p = "3";
const cookies_enabled = "0";
const accept_normally = "0";
@@ -81,11 +74,6 @@
{
var cookieBehavior = document.getElementById("networkCookieBehavior");
var p3pButton = document.getElementById("p3pDialog");
p3pButton.disabled = (cookieBehavior.value != cookies_p3p);
if (parent.hPrefWindow.getPrefIsLocked(p3pButton.getAttribute("prefstring")) )
p3pButton.disabled = true;
var cookieLifetime = document.getElementById("networkCookieLifetime");
var lifetimeDays = document.getElementById("lifetimeDays");
var alwaysAcceptSession = document.getElementById("alwaysAcceptSession");
@@ -118,13 +106,6 @@
accesskey="&disableCookies.accesskey;" oncommand="setDisables(false);"/>
<radio value="1" label="&accOrgCookiesRadio.label;"
accesskey="&accOrgCookiesRadio.accesskey;" oncommand="setDisables(false);"/>
<hbox id="p3pRadioButton" hidden="true">
<radio value="3" label="&accP3PCookiesRadio.label;"
accesskey="&accP3PCookiesRadio.accesskey;" oncommand="setDisables(false);"/>
<button label="&viewP3P.label;" accesskey="&viewP3P.accesskey;" oncommand="viewP3P();"
id="p3pDialog"
prefstring="pref.advanced.cookies.disable_button.more_info"/>
</hbox>
<radio value="0" label="&accAllCookiesRadio.label;"
accesskey="&accAllCookiesRadio.accesskey;" oncommand="setDisables(false);"/>
</radiogroup>

75
mozilla/suite/locales/en-US/chrome/common/permissions/cookieP3P.dtd
View File

@@ -1,75 +0,0 @@
<!-- -*- Mode: SGML; indent-tabs-mode: nil; -*- -->
<!--
- Version: MPL 1.1/GPL 2.0/LGPL 2.1
-
- ***** BEGIN LICENSE BLOCK *****
- Version: MPL 1.1/GPL 2.0/LGPL 2.1
-
- The contents of this file are subject to the Mozilla Public License Version
- 1.1 (the "License"); you may not use this file except in compliance with
- the License. You may obtain a copy of the License at
- http://www.mozilla.org/MPL/
-
- Software distributed under the License is distributed on an "AS IS" basis,
- WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- for the specific language governing rights and limitations under the
- License.
-
- The Original Code is Mozilla.org code.
-
- The Initial Developer of the Original Code is
- Netscape Communications Corp.
- Portions created by the Initial Developer are Copyright (C) 2001
- the Initial Developer. All Rights Reserved.
-
- Contributor(s):
-
- Alternatively, the contents of this file may be used under the terms of
- either the GNU General Public License Version 2 or later (the "GPL"), or
- the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- in which case the provisions of the GPL or the LGPL are applicable instead
- of those above. If you wish to allow use of your version of this file only
- under the terms of either the GPL or the LGPL, and not to allow others to
- use your version of this file under the terms of the MPL, indicate your
- decision by deleting the provisions above and replace them with the notice
- and other provisions required by the GPL or the LGPL. If you do not delete
- the provisions above, a recipient may use your version of this file under
- the terms of any one of the MPL, the GPL or the LGPL.
-
- ***** END LICENSE BLOCK ***** -->
<!ENTITY windowtitle.label "Privacy Settings">
<!ENTITY privacyLevel.label "Level of Privacy">
<!ENTITY p3pDetails "Some sites publish privacy policies stating what they will do with your personal information. This dialog allows you to make cookie decisions based on the level of privacy that you are willing to accept.">
<!ENTITY choose "Choose a predefined level of privacy, or define your own custom setting:">
<!ENTITY low.label "low">
<!ENTITY medium.label "medium">
<!ENTITY high.label "high">
<!ENTITY custom.label "custom">
<!ENTITY low.accesskey "l">
<!ENTITY medium.accesskey "m">
<!ENTITY high.accesskey "h">
<!ENTITY custom.accesskey "c">
<!ENTITY customSettings.label "Cookie Acceptance Policy (a function of Level of Privacy)">
<!ENTITY firstParty.label "First Party Cookies">
<!ENTITY thirdParty.label "Third Party Cookies">
<!ENTITY noPolicy.label "Site has no privacy policy">
<!ENTITY noConsent.label "Site collects personally identifiable information without your consent">
<!ENTITY implicitConsent.label "Site collects personally identifiable information with only your implicit consent">
<!ENTITY explicitConsent.label "Site does not collect personally identifiable information without your explicit consent">
<!ENTITY accept.label "Accept">
<!ENTITY flag.label "Flag">
<!ENTITY downgrade.label "Session">
<!ENTITY reject.label "Reject">
<!ENTITY showIcon.label "Show warning icon when Cookie Acceptance Policy is triggered">
<!ENTITY p3pDialogTitle.label "Cookie Notification">
<!ENTITY p3pDialogOff.label "Allow All Cookies">
<!ENTITY p3pDialogClose.label "Close">
<!ENTITY p3pDialogViewCookies.label "View Cookie Manager">
<!ENTITY p3pDialogViewLevels.label "View Privacy Settings">
<!ENTITY p3pDialogMessage1.label "A website you have visited has set a cookie and triggered the cookie notification icon shown here, as required by your privacy settings.">
<!ENTITY p3pDialogMessage2.label "A cookie is a small bit of information stored on your computer by some websites. Use the Cookie Manager to manage your cookies and view their privacy status.">

3
mozilla/suite/locales/en-US/chrome/common/permissions/cookieTasksOverlay.dtd
View File

@@ -1,3 +0,0 @@
<!-- the following is for the statusbar overlay -->
<!ENTITY cookieIcon.label "Show cookie information">

2
mozilla/suite/locales/en-US/chrome/common/permissions/cookieViewer.dtd
View File

@@ -4,7 +4,6 @@
<!ENTITY div.cookiesonsystem.label "View and remove cookies that are stored on your computer.">
<!ENTITY treehead.cookiename.label "Cookie Name">
<!ENTITY treehead.cookiedomain.label "Site">
<!ENTITY treehead.cookiestatus.label "Status">
<!ENTITY treehead.cookieexpires.label "Expires">
<!ENTITY treehead.infoselected.label "Information about the selected Cookie">
<!ENTITY button.removecookie.label "Remove Cookie">
@@ -16,7 +15,6 @@
<!ENTITY props.path.label "Path:">
<!ENTITY props.secure.label "Send For:">
<!ENTITY props.expires.label "Expires:">
<!ENTITY props.policy.label "Policy:">
<!ENTITY treehead.sitename.label "Site">
<!ENTITY treehead.status.label "Status">

8
mozilla/suite/locales/en-US/chrome/common/permissions/cookieViewer.properties
View File

@@ -47,14 +47,6 @@ domainColon=Domain:
forSecureOnly=Encrypted connections only
forAnyConnection=Any type of connection
AtEndOfSession = at end of session
accepted=accepted
downgraded=session
flagged=flagged
policyUnstated = no policy about storing identifiable information
policyNoConsent = stores identifiable information without any user consent
policyImplicitConsent = stores identifiable information unless user opts out
policyExplicitConsent = stores identifiable information if user opts in
policyNoIICollected = does not store identifiable information
deleteAllCookies=Are you sure you want to delete all the cookies?
deleteAllCookiesTitle=Remove All Cookies
deleteAllCookiesYes=&Remove

5
mozilla/suite/locales/en-US/chrome/common/pref/pref-cookies.dtd
View File

@@ -10,9 +10,6 @@
<!ENTITY accOrgCookiesRadio.label "Allow cookies for the originating website only">
<!ENTITY accOrgCookiesRadio.accesskey "o">
<!ENTITY accP3PCookiesRadio.label "Allow cookies based on privacy settings">
<!ENTITY accP3PCookiesRadio.accesskey "p">
<!ENTITY disableCookies.label "Block cookies">
<!ENTITY disableCookies.accesskey "B">
@@ -38,6 +35,4 @@
<!ENTITY viewCookies.label "Cookie Manager">
<!ENTITY viewCookies.accesskey "M">
<!ENTITY viewP3P.label "View Privacy Settings">
<!ENTITY viewP3P.accesskey "V">

2
mozilla/suite/locales/jar.mn
View File

@@ -122,8 +122,6 @@
locale/@AB_CD@/communicator/migration/migration.dtd (%chrome/common/migration/migration.dtd)
locale/@AB_CD@/communicator/migration/migration.properties (%chrome/common/migration/migration.properties)
locale/@AB_CD@/communicator/permissions/aboutPopups.dtd (%chrome/common/permissions/aboutPopups.dtd)
locale/@AB_CD@/communicator/permissions/cookieP3P.dtd (%chrome/common/permissions/cookieP3P.dtd)
locale/@AB_CD@/communicator/permissions/cookieTasksOverlay.dtd (%chrome/common/permissions/cookieTasksOverlay.dtd)
locale/@AB_CD@/communicator/permissions/cookieViewer.properties (%chrome/common/permissions/cookieViewer.properties)
locale/@AB_CD@/communicator/permissions/cookieViewer.dtd (%chrome/common/permissions/cookieViewer.dtd)
locale/@AB_CD@/communicator/permissions/imageContextOverlay.dtd (%chrome/common/permissions/imageContextOverlay.dtd)

BIN
mozilla/themes/classic/communicator/permissions/status-cookie.gif
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 1.7 KiB

BIN
mozilla/themes/classic/communicator/permissions/taskbar-cookie.gif
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 1023 B

2
mozilla/themes/classic/jar.mn
View File

@@ -47,8 +47,6 @@ classic.jar:
skin/classic/communicator/directory/folder-clsd.gif (communicator/directory/folder-clsd.gif)
skin/classic/communicator/directory/folder-open.gif (communicator/directory/folder-open.gif)
skin/classic/communicator/directory/file.gif (communicator/directory/file.gif)
skin/classic/communicator/permissions/taskbar-cookie.gif (communicator/permissions/taskbar-cookie.gif)
skin/classic/communicator/permissions/status-cookie.gif (communicator/permissions/status-cookie.gif)
skin/classic/communicator/profile/migrate.gif (communicator/profile/migrate.gif)
skin/classic/communicator/profile/profile.css (communicator/profile/profile.css)
skin/classic/communicator/profile/profileManager.css (communicator/profile/profileManager.css)

4
mozilla/themes/classic/navigator/navigator.css
View File

@@ -326,10 +326,6 @@
list-style-image: url("chrome://communicator/skin/icons/lock-broken.png");
}
#privacy-button {
list-style-image: url("chrome://communicator/skin/permissions/taskbar-cookie.gif");
}
#popupIcon {
list-style-image: url("chrome://navigator/skin/icons/popup-blocked.png");
}

BIN
mozilla/themes/modern/communicator/permissions/status-cookie.gif
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 1.4 KiB

BIN
mozilla/themes/modern/communicator/permissions/taskbar-cookie.gif
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 1023 B

2
mozilla/themes/modern/jar.mn
View File

@@ -68,8 +68,6 @@ modern.jar:
skin/modern/communicator/icons/smileys/innocent_n.gif (communicator/icons/smileys/innocent_n.gif)
skin/modern/communicator/icons/smileys/cry_n.gif (communicator/icons/smileys/cry_n.gif)
skin/modern/communicator/icons/smileys/sealed_n.gif (communicator/icons/smileys/sealed_n.gif)
skin/modern/communicator/permissions/taskbar-cookie.gif (communicator/permissions/taskbar-cookie.gif)
skin/modern/communicator/permissions/status-cookie.gif (communicator/permissions/status-cookie.gif)
skin/modern/communicator/profile/migrate.gif (communicator/profile/migrate.gif)
skin/modern/communicator/profile/profile.gif (communicator/profile/profile.gif)
skin/modern/communicator/profile/profile.css (communicator/profile/profile.css)

4
mozilla/themes/modern/navigator/navigator.css
View File

@@ -577,10 +577,6 @@ toolbarbutton.chevron > .toolbarbutton-menu-dropmarker {
list-style-image: url("chrome://communicator/skin/icons/lock-broken.gif");
}
#privacy-button {
list-style-image: url("chrome://communicator/skin/permissions/taskbar-cookie.gif");
}
#popupIcon {
list-style-image: url("chrome://navigator/skin/icons/popup-blocked.png");
}

7
mozilla/toolkit/components/cookie/content/cookieAcceptDialog.xul
View File

@@ -141,13 +141,6 @@
<textbox id="ifl_expires" readonly="true" class="plain"/>
</row>
<row align="center" id="policyField" hidden="true">
<hbox align="center" pack="end">
<label value="&props.policy.label;"/>
</hbox>
<textbox id="ifl_policy" readonly="true" class="plain"/>
</row>
</rows>
</grid>
</vbox>

1
mozilla/xpfe/communicator/resources/content/contents.rdf
View File

@@ -34,7 +34,6 @@
<RDF:Seq about="chrome://navigator/content/navigatorOverlay.xul">
<RDF:li>chrome://communicator/content/permissions/permissionsNavigatorOverlay.xul</RDF:li>
<RDF:li>chrome://communicator/content/permissions/cookieTasksOverlay.xul</RDF:li>
</RDF:Seq>
</RDF:RDF>