test SSL cert before login (this will catch the folks who Cancel such dialogs), and...

git-svn-id: svn://svn.open-ils.org/ILS/branches/rel_1_2@10677 dcc99617-32d9-48b4-a31d-7c20da2025e4

diff --git a/Open-ILS/xul/staff_client/chrome/content/auth/controller.js b/Open-ILS/xul/staff_client/chrome/content/auth/controller.js
index 482c98e..43966e1 100644 (file)
--- a/Open-ILS/xul/staff_client/chrome/content/auth/controller.js
+++ b/Open-ILS/xul/staff_client/chrome/content/auth/controller.js
@@ -83,6 +83,37 @@ auth.controller.prototype = {
                                                        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
@@ -222,7 +253,7 @@ auth.controller.prototype = {
                        return;
                }
                try {
-                       if ( ! url.match(/^http:\/\//) ) url = 'http://' + url;
+                       if ( ! url.match(/^https:\/\//) ) url = 'https://' + url;
                        var x = new XMLHttpRequest();
                        dump('server url = ' + url + '\n');
                        x.open("GET",url,true);

diff --git a/Open-ILS/xul/staff_client/chrome/content/main/main.xul b/Open-ILS/xul/staff_client/chrome/content/main/main.xul
index f3fc59d..0ece48a 100644 (file)
--- a/Open-ILS/xul/staff_client/chrome/content/main/main.xul
+++ b/Open-ILS/xul/staff_client/chrome/content/main/main.xul
@@ -67,6 +67,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">
@@ -102,7 +103,10 @@
                                                <label value="Hostname" control="server_prompt" accesskey="H"/>
                                                <vbox>
                                                        <textbox id="server_prompt"/>
-                                                       <button label="Re-Test Server" id="retest" accesskey="R" command="cmd_test_server"/>
+                            <hbox>
+                                                           <button label="Re-Test Server" id="retest" accesskey="R" command="cmd_test_server"/>
+                                                           <button label="Add SSL Exception" id="ssl_exception" command="cmd_ssl_exception"/>
+                            </hbox>
                                                </vbox>
                                        </row>
                                        <row>