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

[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-serv21298/esc/chrome/content/esc

Modified Files:
	ESC.js 
Log Message:
No more command line switch for sec officer mode, #236268.


Index: ESC.js
===================================================================
RCS file: /cvs/dirsec/esc/src/app/xul/esc/chrome/content/esc/ESC.js,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- ESC.js	26 Feb 2009 23:30:15 -0000	1.20
+++ ESC.js	27 Feb 2009 03:31:42 -0000	1.21
@@ -1909,6 +1909,20 @@
     return result;
 }
 
+function SelectESCPageCMDLine()
+{
+    var securityURL =   DoCoolKeyGetConfigValue(ESC_SECURITY_URL);
+
+    if(securityURL)
+    {
+        launchESCSecMode();
+        return;
+    }
+
+    launchSETTINGS();
+
+}
+
 function SelectESCPage(keyType,keyID,phoneHomeFailed)
 {
 
@@ -3800,15 +3814,24 @@
 //Is the security mode up?
 function CheckForSecurityMode()
 {
-   var securityWnd = IsPageWindowPresent(SECURITY_WINDOW);
-   var faceToFaceMode = 0;
+    var securityWnd = IsPageWindowPresent(SECURITY_WINDOW);
+    var faceToFaceMode = 0;
 
-   recordMessage("CheckForSecurityMode: " + securityWnd);
+    recordMessage("CheckForSecurityMode: " + securityWnd);
+
+    if(securityWnd) {
+        faceToFaceMode = 1;
+        return faceToFaceMode;
+    }
 
-   if(securityWnd)
-       faceToFaceMode = 1;
+    var securityURL =   DoCoolKeyGetConfigValue(ESC_SECURITY_URL);
 
-   return faceToFaceMode;
+    if(securityURL)
+    {
+        faceToFaceMode = 1;
+    }
+
+    return faceToFaceMode;
 }
 
 //Launch Phone Home bootstrap dialog as last resort
@@ -3904,12 +3927,10 @@
 
 //Launch security mode window
 
-function launchESCSecMode(aUrl)
+function launchESCSecMode()
 {
     recordMessage("In launchESCSecMode");
 
-    DoCoolKeySetConfigValue(ESC_SECURITY_URL,aUrl);
-
     var secWnd = IsPageWindowPresent(SECURITY_WINDOW);
     if(!secWnd)
     {
@@ -3952,6 +3973,15 @@
    var enrollWnd = IsPageWindowPresent(ENROLL_WINDOW);
    var adminWnd  = IsPageWindowPresent(ADMIN_WINDOW);
 
+   var securityURL =   DoCoolKeyGetConfigValue(ESC_SECURITY_URL);
+
+   if(securityURL)
+   {
+       launchESCSecMode();
+       return;
+
+   }
+
    if(!adminWnd)
    {
         launchSETTINGS();