[open-ils-commits] r10676 - in trunk/Open-ILS: web/opac/locale/en-US xul/staff_client/chrome/content/auth xul/staff_client/chrome/content/main

[svn at svn.open-ils.org]

Author: phasefx
Date: 2008-09-22 04:13:45 -0400 (Mon, 22 Sep 2008)
New Revision: 10676

Modified:
   trunk/Open-ILS/web/opac/locale/en-US/lang.dtd
   trunk/Open-ILS/xul/staff_client/chrome/content/auth/controller.js
   trunk/Open-ILS/xul/staff_client/chrome/content/main/main.xul
Log:
test SSL cert before login (this will catch the folks who Cancel such dialogs), and with xulrunner 1.9, offer the stricter SSL exception dialog that Firefox 3 introduced

Modified: trunk/Open-ILS/web/opac/locale/en-US/lang.dtd
===================================================================
--- trunk/Open-ILS/web/opac/locale/en-US/lang.dtd	2008-09-22 05:04:45 UTC (rev 10675)
+++ trunk/Open-ILS/web/opac/locale/en-US/lang.dtd	2008-09-22 08:13:45 UTC (rev 10676)
@@ -550,6 +550,7 @@
 <!ENTITY staff.main.auth.offline.interface.accesskey "S">
 <!ENTITY staff.main.auth.retest "Re-Test Server">
 <!ENTITY staff.main.auth.retest.accesskey "R">
+<!ENTITY staff.main.auth.add_ssl_exception "Add SSL Exception">
 <!ENTITY staff.main.auth.server "Server">
 <!ENTITY staff.main.auth.status "Status">
 <!ENTITY staff.main.auth.version "Version">

Modified: trunk/Open-ILS/xul/staff_client/chrome/content/auth/controller.js
===================================================================
--- trunk/Open-ILS/xul/staff_client/chrome/content/auth/controller.js	2008-09-22 05:04:45 UTC (rev 10675)
+++ trunk/Open-ILS/xul/staff_client/chrome/content/auth/controller.js	2008-09-22 08:13:45 UTC (rev 10676)
@@ -84,6 +84,37 @@
 							obj.test_server( obj.controller.view.server_prompt.value );
 						}
 					],
+                    'ssl_exception' : [
+                        ['render'],
+                        function(e) {
+                            return function() {
+                                try {
+                                    obj.controller.view.cmd_ssl_exception.setAttribute('hidden','true');
+                                    var x = new XMLHttpRequest();
+                                    x.open("GET",'chrome://pippki/content/exceptionDialog.xul',false);
+                                    x.send(null);
+                                    obj.controller.view.cmd_ssl_exception.setAttribute('hidden','false');
+                                } catch(E) {
+                                    obj.controller.view.cmd_ssl_exception.setAttribute('hidden','true');
+                                }
+                            };
+                        }
+                    ],
+                    'cmd_ssl_exception' : [
+                        ['command'],
+                        function() {
+                            window.openDialog(
+                                'chrome://pippki/content/exceptionDialog.xul',
+                                '', 
+                                'chrome,centerscreen,modal', 
+                                { 
+                                    'location' : 'https://' + obj.controller.view.server_prompt.value, 
+                                    'prefetchCert' : true 
+                                } 
+                            );
+		                    obj.test_server( obj.controller.view.server_prompt.value );
+                        }
+                    ],
 					'server_prompt' : [
 						['keypress'],
 						handle_keypress

Modified: trunk/Open-ILS/xul/staff_client/chrome/content/main/main.xul
===================================================================
--- trunk/Open-ILS/xul/staff_client/chrome/content/main/main.xul	2008-09-22 05:04:45 UTC (rev 10675)
+++ trunk/Open-ILS/xul/staff_client/chrome/content/main/main.xul	2008-09-22 08:13:45 UTC (rev 10676)
@@ -69,6 +69,7 @@
 		<command id="cmd_js_console"/>
 		<command id="cmd_clear_cache"/>
 		<command id="cmd_test_server"/>
+		<command id="cmd_ssl_exception" hidden="true"/>
 	</commandset>
 
 	<keyset id="auth_keys">
@@ -104,7 +105,10 @@
 						<label value="&staff.main.auth.hostname;" control="server_prompt" accesskey="&staff.main.auth.hostname.accesskey;"/>
 						<vbox>
 							<textbox id="server_prompt"/>
-							<button label="&staff.main.auth.retest;" id="retest" accesskey="&staff.main.auth.retest.accesskey;" command="cmd_test_server"/>
+                            <hbox>
+							    <button label="&staff.main.auth.retest;" id="retest" accesskey="&staff.main.auth.retest.accesskey;" command="cmd_test_server"/>
+							    <button label="&staff.main.auth.add_ssl_exception;" id="ssl_exception" command="cmd_ssl_exception"/>
+                            </hbox>
 						</vbox>
 					</row>
 					<row>