[Fedora-directory-commits] esc/src/app/xul/esc/chrome/content/esc ESC.js, 1.21, 1.22

[Jack Magne]

Author: jmagne

Update of /cvs/dirsec/esc/src/app/xul/esc/chrome/content/esc
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26727

Modified Files:
	ESC.js 
Log Message:
Fix for #491003, global phone home pref.


Index: ESC.js
===================================================================
RCS file: /cvs/dirsec/esc/src/app/xul/esc/chrome/content/esc/ESC.js,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- ESC.js	27 Feb 2009 03:31:42 -0000	1.21
+++ ESC.js	29 Mar 2009 00:37:52 -0000	1.22
@@ -54,6 +54,7 @@
 const  ESC_FACE_TO_FACE_MODE = "esc.face.to.face.mode";
 const  ESC_SECURITY_URL="esc.security.url";
 const  ESC_SECURE_URL="esc.secure.url";
+const  ESC_GLOBAL_PHONE_HOME_URL= "esc.global.phone.home.url";
 const  ESC_HIDE_FORMAT="esc.hide.format";
 
 const  CLEAN_TOKEN = "cleanToken";
@@ -292,7 +293,12 @@
       return true;
   }
 
-  //Check for special key since we have no phone home info.
+  //Check for optional global phone home url.
+
+
+  if(!home)   {
+      home = GetGlobalPhoneHomeUrl(keyType,keyID);
+  }
 
   var homeRes = false;
 
@@ -315,6 +321,19 @@
   return homeRes;
 }
 
+//Get global phone home url if pref is set 
+
+function GetGlobalPhoneHomeUrl(keyType,keyID)
+{
+
+   var globalIssuerURL=null;
+
+   globalIssuerURL = DoCoolKeyGetConfigValue(ESC_GLOBAL_PHONE_HOME_URL);
+
+   return globalIssuerURL;
+
+}
+
 //Test Phone Home url in config UI
 
 function DoPhoneHomeTest()
@@ -644,7 +663,7 @@
       netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
     return netkey.GetCoolKeyPolicy(keyType, keyID);
   } catch (e) {
-    ReportException(getBundleString("errorCoolKeyGetPolicy"), e);
+    //ReportException(getBundleString("errorCoolKeyGetPolicy"), e);
     return "";
   }
 }