Bug 886099 Remove "Manage CRLs..." button from Preferences r=IanN a=IanN
authorNeil Rashbrook <neil@parkwaycc.co.uk>
Sun, 21 Jul 2013 22:40:50 +0100
changeset 15840 6c95aea0685b94e040ce967bb8936c162881fc05
parent 15839 ef78bb79f08e6f775738805724903cd3f99e74e3
child 15841 d595ece2c097d6df3471a80e64f65f5ddc04b8d1
push idunknown
push userunknown
push dateunknown
reviewersIanN, IanN
bugs886099
Bug 886099 Remove "Manage CRLs..." button from Preferences r=IanN a=IanN
suite/common/pref/preferences.xul
suite/security/jar.mn
suite/security/prefs/pref-certs.js
suite/security/prefs/pref-certs.xul
suite/security/prefs/pref-validation.js
suite/security/prefs/pref-validation.xul
--- a/suite/common/pref/preferences.xul
+++ b/suite/common/pref/preferences.xul
@@ -179,21 +179,16 @@
                     prefpane="ssl_pane"
                     url="chrome://pippki/content/pref-ssl.xul"
                     helpTopic="ssl_prefs"/>
           <treeitem id="certItem"
                     label="&certs.label;"
                     prefpane="certs_pane"
                     url="chrome://pippki/content/pref-certs.xul"
                     helpTopic="certs_prefs"/>
-          <treeitem id="validationItem"
-                    label="&validation.label;"
-                    prefpane="validation_pane"
-                    url="chrome://pippki/content/pref-validation.xul"
-                    helpTopic="validation_prefs"/>
         </treechildren>
       </treeitem>
 
       <!-- Sync -->
       <treeitem id="syncItem"
                 label="&sync.label;"
                 prefpane="sync_pane"
                 url="chrome://communicator/content/pref/pref-sync.xul"
--- a/suite/security/jar.mn
+++ b/suite/security/jar.mn
@@ -4,10 +4,8 @@
 
 pippki.jar:
    content/pippki/pref-certs.js             (prefs/pref-certs.js)
    content/pippki/pref-certs.xul            (prefs/pref-certs.xul)
    content/pippki/pref-masterpass.js        (prefs/pref-masterpass.js)
    content/pippki/pref-masterpass.xul       (prefs/pref-masterpass.xul)
    content/pippki/pref-ssl.js               (prefs/pref-ssl.js)
    content/pippki/pref-ssl.xul              (prefs/pref-ssl.xul)
-   content/pippki/pref-validation.js        (prefs/pref-validation.js)
-   content/pippki/pref-validation.xul       (prefs/pref-validation.xul)
--- a/suite/security/prefs/pref-certs.js
+++ b/suite/security/prefs/pref-certs.js
@@ -1,14 +1,25 @@
 /* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
+function Startup()
+{
+  var securityOCSPEnabled = document.getElementById("security.OCSP.enabled");
+  DoEnabling(securityOCSPEnabled.value);
+}
+
+function DoEnabling(aOCSPPrefValue)
+{
+  EnableElementById("requireWorkingOCSP", aOCSPPrefValue != 0, false);
+}
+
 function OpenCertManager()
 {
     document.documentElement
             .openWindow("mozilla:certmanager", 
                         "chrome://pippki/content/certManager.xul",
                         "", null);
 }
 
--- a/suite/security/prefs/pref-certs.xul
+++ b/suite/security/prefs/pref-certs.xul
@@ -5,16 +5,18 @@
 
 <?xml-stylesheet href="chrome://communicator/skin/" type="text/css"?>
 
 <!DOCTYPE overlay [
   <!ENTITY % brandDTD SYSTEM "chrome://branding/locale/brand.dtd">
   %brandDTD;
   <!ENTITY % prefCertsDTD SYSTEM "chrome://pippki/locale/pref-certs.dtd">
   %prefCertsDTD;
+  <!ENTITY % prefValidationDTD SYSTEM "chrome://pippki/locale/pref-validation.dtd">
+  %prefValidationDTD;
   <!ENTITY % prefSslDTD SYSTEM "chrome://pippki/locale/pref-ssl.dtd">
   %prefSslDTD;
 ]>
 
 <overlay xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
 
   <prefpane id="certs_pane"
             label="&pref.certs.title;"
@@ -24,16 +26,23 @@
                   name="security.default_personal_cert"
                   type="string"/>
       <preference id="security.disable_button.openCertManager"
                   name="security.disable_button.openCertManager"
                   type="bool"/>
       <preference id="security.disable_button.openDeviceManager"
                   name="security.disable_button.openDeviceManager"
                   type="bool"/>
+      <preference id="security.OCSP.enabled"
+                  name="security.OCSP.enabled"
+                  type="int"
+                  onchange="DoEnabling(this.value);"/>
+      <preference id="security.OCSP.require"
+                  name="security.OCSP.require"
+                  type="bool"/>
     </preferences>
 
 
   <groupbox align="start">
     <caption label="&SSLClientAuthMethod.caption;"/>
     <description>&certselect.description;</description>
     <radiogroup id="certSelection"
                 orient="horizontal"
@@ -69,10 +78,25 @@
       <button label="&managedevices.button;"
               oncommand="OpenDeviceManager();"
               id="openDeviceManagerButton"
               accesskey="&managedevices.accesskey;"
               preference="security.disable_button.openDeviceManager"/>
     </hbox>
   </groupbox>
 
+  <!-- Validation -->
+  <groupbox align="start">
+    <caption label="&validation.ocsp.caption;"/>
+    <checkbox id="enableOCSPBox"
+              label="&enableOCSP.label;"
+              accesskey="&enableOCSP.accesskey;"
+              onsynctopreference="return +this.checked;"
+              preference="security.OCSP.enabled"/>
+    <separator class="thin"/>
+    <checkbox id="requireWorkingOCSP"
+              label="&validation.requireOCSP.description;"
+              accesskey="&validation.requireOCSP.accesskey;"
+              preference="security.OCSP.require"/>
+  </groupbox>
+
   </prefpane>
 </overlay>
deleted file mode 100644
--- a/suite/security/prefs/pref-validation.js
+++ /dev/null
@@ -1,26 +0,0 @@
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-const nsIOCSPResponder = Components.interfaces.nsIOCSPResponder;
-
-var gCacheRadio = 0;
-
-function Startup()
-{
-  var securityOCSPEnabled = document.getElementById("security.OCSP.enabled");
-  DoEnabling(securityOCSPEnabled.value);
-}
-
-function DoEnabling(aOCSPPrefValue)
-{
-  EnableElementById("requireWorkingOCSP", aOCSPPrefValue != 0, false);
-}
-
-function OpenCrlManager()
-{
-    document.documentElement
-            .openWindow("mozilla:crlmanager", 
-                        "chrome://pippki/content/crlManager.xul",
-                        "", null);
-}
deleted file mode 100644
--- a/suite/security/prefs/pref-validation.xul
+++ /dev/null
@@ -1,59 +0,0 @@
-<?xml version="1.0"?> 
-<!-- This Source Code Form is subject to the terms of the Mozilla Public
-   - License, v. 2.0. If a copy of the MPL was not distributed with this
-   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
-
-<?xml-stylesheet href="chrome://communicator/skin/" type="text/css"?>
-
-<!DOCTYPE overlay [
-  <!ENTITY % prefValidationDTD SYSTEM "chrome://pippki/locale/pref-validation.dtd">
-  %prefValidationDTD;
-]>
-
-<overlay xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
-
-  <prefpane id="validation_pane"
-            label="&pref.validation.title;"
-            script="chrome://pippki/content/pref-validation.js">
-    <preferences id="validation_preferences">
-      <preference id="security.OCSP.disable_button.managecrl"
-                  name="security.OCSP.disable_button.managecrl"
-                  type="bool"/>
-      <preference id="security.OCSP.enabled"
-                  name="security.OCSP.enabled"
-                  type="int"
-                  onchange="DoEnabling(this.value);"/>
-      <preference id="security.OCSP.require"
-                  name="security.OCSP.require"
-                  type="bool"/>
-    </preferences>
-
-    <groupbox>
-      <caption label="&validation.crl.caption;"/>
-      <description>&validation.crl.description;</description>
-      <hbox>
-        <button id="managecrlbutton"
-                label="&validation.managecrls.button;"
-                accesskey="&validation.managecrls.accesskey;"
-                oncommand="OpenCrlManager();"
-                preference="security.OCSP.disable_button.managecrl"/>
-      </hbox>
-    </groupbox>
-
-    <groupbox align="start">
-      <caption label="&validation.ocsp.caption;"/>
-      <checkbox id="enableOCSPBox"
-                label="&enableOCSP.label;"
-                accesskey="&enableOCSP.accesskey;"
-                onsynctopreference="return +this.checked;"
-                preference="security.OCSP.enabled"/>
-      <separator class="thin"/>
-      <checkbox id="requireWorkingOCSP"
-                label="&validation.requireOCSP.description;"
-                accesskey="&validation.requireOCSP.accesskey;"
-                preference="security.OCSP.require"/>
-
-    </groupbox>
-
-  </prefpane>
-</overlay>