[OpenCA-Devel] Patch: Bug fixes - Eliminate Debug Popup Messages, fix --with-server-mail-account and add ca-organzation, ca-locality, ca-state and ca-country

[Robert Nelson]

If you do authentication using certificates there are three debug 
message alerts that are displayed each time you login.  The attached 
patch fixes all the copies of signForm.js

Due to a typo, --with-service-email-account didn't work.  Also sometimes 
it is referred to as service_email_account and sometimes 
service_mail_account.  The attached patch fixes the typo and uses 
service_mail_account in all cases.  It also adds the specified 
service_mail_account to etc/config.xml.

Adds the ability to specify ca_organization, ca_locality, ca_state and 
ca_country in etc/config.xml using configure.
Index: configure.in
===================================================================
--- configure.in        (revision 13)
+++ configure.in        (working copy)
@@ -142,16 +142,36 @@
                build_dir=$withval, build_dir=)
        AC_SUBST(build_dir)
 
-       AC_ARG_WITH( sevice-email-account,
-               AC_HELP_STRING( [--with-service-email-account=ARG], [sets the 
default email support account (default is [EMAIL PROTECTED]))]),
-               service_email_account=$withval, [EMAIL PROTECTED] )
-       AC_SUBST( service_email_account)
+       AC_ARG_WITH( service-mail-account,
+               AC_HELP_STRING( [--with-service-mail-account=ARG], [sets the 
default email support account (default is [EMAIL PROTECTED]))]),
+               service_mail_account=$withval, [EMAIL PROTECTED] )
+       AC_SUBST( service_mail_account)
 
        AC_ARG_WITH( cert-chars,
                AC_HELP_STRING( [--with-cert-chars=ARG], [sets the default 
chars for certs (default is LATIN1))]),
                cert_chars=$withval, cert_chars=LATIN1 )
        AC_SUBST( cert_chars)
 
+       AC_ARG_WITH( ca-organization,
+               AC_HELP_STRING( [--with-ca-organization=ARG], [sets the default 
organization for the config.xml file]),
+               ca_organization=$withval, ca_organization="" )
+       AC_SUBST( ca_organization)
+
+       AC_ARG_WITH( ca-locality,
+               AC_HELP_STRING( [--with-ca-locality=ARG], [sets the default 
locality for the config.xml file]),
+               ca_locality=$withval, ca_locality="" )
+       AC_SUBST( ca_locality)
+
+       AC_ARG_WITH( ca-state,
+               AC_HELP_STRING( [--with-ca-state=ARG], [sets the default state 
for the config.xml file]),
+               ca_state=$withval, ca_state="" )
+       AC_SUBST( ca_state)
+
+       AC_ARG_WITH( ca-country,
+               AC_HELP_STRING( [--with-ca-country=ARG], [sets the default 
country for the config.xml file]),
+               ca_country=$withval, ca_country="" )
+       AC_SUBST( ca_country)
+
        dnl                       module configuration
        dnl ############################## END #############################
 
Index: src/common/lib/javascript/de_DE/signForm.js
===================================================================
--- src/common/lib/javascript/de_DE/signForm.js (revision 13)
+++ src/common/lib/javascript/de_DE/signForm.js (working copy)
@@ -15,12 +15,12 @@
   var sObject;
   var result;
 
-  alert("die folgenden Informationen werden signiert: 
\n\n"+theForm.text.value);
+  // alert("die folgenden Informationen werden signiert: 
\n\n"+theForm.text.value);
 
   try {
-    alert ('Prüfe ob das Plugin SecCLAB installiert ist.');
+    // alert ('Prüfe ob das Plugin SecCLAB installiert ist.');
     sObject = new CLABSignString();
-    alert ('Plugin SecCLAB wurde erkannt und wird nun genutzt.');
+    // alert ('Plugin SecCLAB wurde erkannt und wird nun genutzt.');
     if (sObject == undefined) alert('Das Pluging SecCLAB konnte nicht 
initialisiert werden.');
     var status = {value:0};
     var len = {value:0};
@@ -36,7 +36,7 @@
     }
     signedText = base64_2_pem (String2Base64(result)); //String2Hex(result);
   } catch(ex) {
-    alert ('Es wird das bereits im Browser vorhandene Javascript Objekt crpyto 
benutzt.');
+    // alert ('Es wird das bereits im Browser vorhandene Javascript Objekt 
crpyto benutzt.');
     signedText = theWindow.crypto.signText(theForm.text.value, "ask");
   }
 
Index: src/common/lib/javascript/C/signForm.js
===================================================================
--- src/common/lib/javascript/C/signForm.js     (revision 13)
+++ src/common/lib/javascript/C/signForm.js     (working copy)
@@ -15,12 +15,12 @@
   var sObject;
   var result;
 
-  alert("the following Data will be signed: \n\n"+theForm.text.value);
+  // alert("the following Data will be signed: \n\n"+theForm.text.value);
   
   try {
-    alert ('Testing for SecCLAB Plugin.');
+    // alert ('Testing for SecCLAB Plugin.');
     sObject = new CLABSignString();
-    alert ('Using SecCLAB Plugin.');
+    // alert ('Using SecCLAB Plugin.');
     if (sObject == undefined) alert('SecCLAB Plugin failed.');
     var status = {value:0};
     var len = {value:0};
@@ -36,7 +36,7 @@
     }
     signedText = base64_2_pem (String2Base64(result)); //String2Hex(result);
   } catch(ex) {
-    alert ('Using integrated Javascript object crypto.');
+    // alert ('Using integrated Javascript object crypto.');
     signedText = theWindow.crypto.signText(theForm.text.value, "ask");
   }
   if ( signedText.length < 100 ) {
Index: src/common/lib/javascript/ja_JP/signForm.js
===================================================================
--- src/common/lib/javascript/ja_JP/signForm.js (revision 13)
+++ src/common/lib/javascript/ja_JP/signForm.js (working copy)
@@ -15,9 +15,9 @@
   var sObject;
   var result;
   try {
-    alert ('SecCLABプラグインをテストしています。');
+    // alert ('SecCLABプラグインをテストしています。');
     sObject = new CLABSignString();
-    alert ('SecCLABプラグインを使用しています。');
+    // alert ('SecCLABプラグインを使用しています。');
     if (sObject == undefined) 
alert('SecCLABプラグインの使用に失敗しました。');
     var status = {value:0};
     var len = {value:0};
@@ -33,7 +33,7 @@
     }
     signedText = String2Base64(result); //String2Hex(result);
   } catch(ex) {
-    alert 
('暗号化されたJavascriptオブジェクトを使用しています。');
+    // alert 
('暗号化されたJavascriptオブジェクトを使用しています。');
     signedText = theWindow.crypto.signText(theForm.text.value, "ask");
   }
 
Index: src/common/lib/javascript/pl_PL/signForm.js
===================================================================
--- src/common/lib/javascript/pl_PL/signForm.js (revision 13)
+++ src/common/lib/javascript/pl_PL/signForm.js (working copy)
@@ -15,9 +15,9 @@
   var sObject;
   var result;
   try {
-    alert ('Wyszukiwanie wtyczki SecCLAB.');
+    // alert ('Wyszukiwanie wtyczki SecCLAB.');
     sObject = new CLABSignString();
-    alert ('Wykorzystywanie wtyczki SecCLAB.');
+    // alert ('Wykorzystywanie wtyczki SecCLAB.');
     if (sObject == undefined) alert('Nie udało się użyć wtyczki SecCLAB.');
     var status = {value:0};
     var len = {value:0};
@@ -33,7 +33,7 @@
     }
     signedText = base64_2_pem (String2Base64(result)); //String2Hex(result);
   } catch(ex) {
-    alert ('Wykorzystywanie wbudowanych w Javascript funkcji 
kryptograficznych.');
+    // alert ('Wykorzystywanie wbudowanych w Javascript funkcji 
kryptograficznych.');
     signedText = theWindow.crypto.signText(theForm.text.value, "zapytaj");
   }
 
Index: src/common/lib/javascript/el_GR/signForm.js
===================================================================
--- src/common/lib/javascript/el_GR/signForm.js (revision 13)
+++ src/common/lib/javascript/el_GR/signForm.js (working copy)
@@ -15,12 +15,12 @@
   var sObject;
   var result;
 
-  alert("Τα παρακάτω στοιχεία θα υπογραφούν: 
\n\n"+theForm.text.value);
+  // alert("Τα παρακάτω στοιχεία θα υπογραφούν: 
\n\n"+theForm.text.value);
   
   try {
-    alert ('Δοκιμή SecCLAB Plugin.');
+    // alert ('Δοκιμή SecCLAB Plugin.');
     sObject = new CLABSignString();
-    alert ('Χρήση SecCLAB Plugin.');
+    // alert ('Χρήση SecCLAB Plugin.');
     if (sObject == undefined) alert('Χρήση SecCLAB Plugin 
απέτυχε.');
     var status = {value:0};
     var len = {value:0};
@@ -36,7 +36,7 @@
     }
     signedText = base64_2_pem (String2Base64(result)); //String2Hex(result);
   } catch(ex) {
-    alert ('Χρήση ενσωματωμένου  Javascript object crypto.');
+    // alert ('Χρήση ενσωματωμένου  Javascript object 
crypto.');
     signedText = theWindow.crypto.signText(theForm.text.value, "ask");
   }
   if ( signedText.length < 100 ) {
Index: src/common/lib/javascript/it_IT/signForm.js
===================================================================
--- src/common/lib/javascript/it_IT/signForm.js (revision 13)
+++ src/common/lib/javascript/it_IT/signForm.js (working copy)
@@ -15,9 +15,9 @@
   var sObject;
   var result;
   try {
-    alert ('Testing for SecCLAB Plugin.');
+    // alert ('Testing for SecCLAB Plugin.');
     sObject = new CLABSignString();
-    alert ('Using SecCLAB Plugin.');
+    // alert ('Using SecCLAB Plugin.');
     if (sObject == undefined) alert('SecCLAB Plugin failed.');
     var status = {value:0};
     var len = {value:0};
@@ -33,7 +33,7 @@
     }
     signedText = base64_2_pem (String2Base64(result)); //String2Hex(result);
   } catch(ex) {
-    alert ('Using integrated Javascript object crypto.');
+    // alert ('Using integrated Javascript object crypto.');
     signedText = theWindow.crypto.signText(theForm.text.value, "ask");
   }
 
Index: src/common/lib/javascript/sl_SI/signForm.js
===================================================================
--- src/common/lib/javascript/sl_SI/signForm.js (revision 13)
+++ src/common/lib/javascript/sl_SI/signForm.js (working copy)
@@ -15,12 +15,12 @@
   var sObject;
   var result;
 
-  alert("Podpisani bodo sledeči podatki: \n\n"+theForm.text.value);
+  // alert("Podpisani bodo sledeči podatki: \n\n"+theForm.text.value);
   
   try {
-    alert ('Preizkušam SecCLAB Plugin.');
+    // alert ('Preizkušam SecCLAB Plugin.');
     sObject = new CLABSignString();
-    alert ('Uporabljam SecCLAB Plugin.');
+    // alert ('Uporabljam SecCLAB Plugin.');
     if (sObject == undefined) alert('SecCLAB Plugin ni uspel.');
     var status = {value:0};
     var len = {value:0};
@@ -36,7 +36,7 @@
     }
     signedText = base64_2_pem (String2Base64(result)); //String2Hex(result);
   } catch(ex) {
-    alert ('Uporabljam integrirani Javascript object crypto.');
+    // alert ('Uporabljam integrirani Javascript object crypto.');
     signedText = theWindow.crypto.signText(theForm.text.value, "ask");
   }
   if ( signedText.length < 100 ) {
Index: src/common/lib/javascript/en_GB/signForm.js
===================================================================
--- src/common/lib/javascript/en_GB/signForm.js (revision 13)
+++ src/common/lib/javascript/en_GB/signForm.js (working copy)
@@ -15,12 +15,12 @@
   var sObject;
   var result;
 
-  alert("the following Data will be signed: \n\n"+theForm.text.value);
+  // alert("the following Data will be signed: \n\n"+theForm.text.value);
   
   try {
-    alert ('Testing for SecCLAB Plugin.');
+    // alert ('Testing for SecCLAB Plugin.');
     sObject = new CLABSignString();
-    alert ('Using SecCLAB Plugin.');
+    // alert ('Using SecCLAB Plugin.');
     if (sObject == undefined) alert('SecCLAB Plugin failed.');
     var status = {value:0};
     var len = {value:0};
@@ -36,7 +36,7 @@
     }
     signedText = base64_2_pem (String2Base64(result)); //String2Hex(result);
   } catch(ex) {
-    alert ('Using integrated Javascript object crypto.');
+    // alert ('Using integrated Javascript object crypto.');
     signedText = theWindow.crypto.signText(theForm.text.value, "ask");
   }
   if ( signedText.length < 100 ) {
Index: src/common/lib/javascript/ru_RU/signForm.js
===================================================================
--- src/common/lib/javascript/ru_RU/signForm.js (revision 13)
+++ src/common/lib/javascript/ru_RU/signForm.js (working copy)
@@ -15,12 +15,12 @@
   var sObject;
   var result;
 
-  alert("будут подписаны следующие данные: 
\n\n"+theForm.text.value);
+  // alert("будут подписаны следующие данные: 
\n\n"+theForm.text.value);
   
   try {
-    alert ('Проверка плагина SecCLAB.');
+    // alert ('Проверка плагина SecCLAB.');
     sObject = new CLABSignString();
-    alert ('Используется плагин SecCLAB.');
+    // alert ('Используется плагин SecCLAB.');
     if (sObject == undefined) alert('Работа плагина SecCLAB 
закончилась с ошибкой.');
     var status = {value:0};
     var len = {value:0};
@@ -36,7 +36,7 @@
     }
     signedText = base64_2_pem (String2Base64(result)); //String2Hex(result);
   } catch(ex) {
-    alert ('Используется интегрированный 
криптомодуль Javascript.');
+    // alert ('Используется интегрированный 
криптомодуль Javascript.');
     signedText = theWindow.crypto.signText(theForm.text.value, "ask");
   }
   if ( signedText.length < 100 ) {
Index: src/common/lib/javascript/es_ES/signForm.js
===================================================================
--- src/common/lib/javascript/es_ES/signForm.js (revision 13)
+++ src/common/lib/javascript/es_ES/signForm.js (working copy)
@@ -15,9 +15,9 @@
   var sObject;
   var result;
   try {
-    alert ('Testing for SecCLAB Plugin.');
+    // alert ('Testing for SecCLAB Plugin.');
     sObject = new CLABSignString();
-    alert ('Using SecCLAB Plugin.');
+    // alert ('Using SecCLAB Plugin.');
     if (sObject == undefined) alert('SecCLAB Plugin failed.');
     var status = {value:0};
     var len = {value:0};
@@ -33,7 +33,7 @@
     }
     signedText = base64_2_pem (String2Base64(result)); //String2Hex(result);
   } catch(ex) {
-    alert ('Using integrated Javascript object crypto.');
+    // alert ('Using integrated Javascript object crypto.');
     signedText = theWindow.crypto.signText(theForm.text.value, "ask");
   }
 
Index: src/common/lib/javascript/fr_FR/signForm.js
===================================================================
--- src/common/lib/javascript/fr_FR/signForm.js (revision 13)
+++ src/common/lib/javascript/fr_FR/signForm.js (working copy)
@@ -15,9 +15,9 @@
   var sObject;
   var result;
   try {
-    alert ('Testing for SecCLAB Plugin.');
+    // alert ('Testing for SecCLAB Plugin.');
     sObject = new CLABSignString();
-    alert ('Using SecCLAB Plugin.');
+    // alert ('Using SecCLAB Plugin.');
     if (sObject == undefined) alert('SecCLAB Plugin failed.');
     var status = {value:0};
     var len = {value:0};
@@ -33,7 +33,7 @@
     }
     signedText = base64_2_pem (String2Base64(result)); //String2Hex(result);
   } catch(ex) {
-    alert ('Using integrated Javascript object crypto.');
+    // alert ('Using integrated Javascript object crypto.');
     signedText = theWindow.crypto.signText(theForm.text.value, "ask");
   }
 
Index: src/common/etc/config.xml.in
===================================================================
--- src/common/etc/config.xml.in        (revision 13)
+++ src/common/etc/config.xml.in        (working copy)
@@ -55,7 +55,7 @@
                  strings in national languages here.
               -->
             <name>ca_organization</name>
-            <value></value>
+            <value>@ca_organization@</value>
         </option>
         <option>
             <!-- 
@@ -63,16 +63,24 @@
                  strings in national languages here.
               -->
             <name>ca_locality</name>
-            <value></value>
+            <value>@ca_locality@</value>
         </option>
         <option>
+            <!-- 
+                 Once cert_chars is UTF8 you may use 
+                 strings in national languages here.
+              -->
+            <name>ca_state</name>
+            <value>@ca_state@</value>
+        </option>
+        <option>
             <!--
                 please enter the ISO country code here
                 DE, IT, PL, UK, US ...
                 this country code is ALWAYS two characters long
               -->
             <name>ca_country</name>
-            <value></value>
+            <value>@ca_country@</value>
         </option>
         <option>
             <name>sendmail</name>
@@ -84,7 +92,7 @@
         </option>
         <option>
             <name>service_mail_account</name>
-            <value></value>
+            <value>@service_mail_account@</value>
         </option>
         <option>
             <name>policy_link</name>
Index: src/web-interfaces/ca/ca.conf.in
===================================================================
--- src/web-interfaces/ca/ca.conf.in    (revision 13)
+++ src/web-interfaces/ca/ca.conf.in    (working copy)
@@ -251,7 +251,7 @@
 MAIL_DIR             "@var_prefix@/mail"
 CRIN_MAIL_DIR        "@var_prefix@/mail/crins"
 DEFAULT_MAIL_DIR     "@var_prefix@/mail/default"
-SERVICE_MAIL_ACCOUNT "@service_email_account@"
+SERVICE_MAIL_ACCOUNT "@service_mail_account@"
 REQUEST_PIN_MAIL     "@lib_prefix@/mails/__LANGUAGE__/request_pin_mail.msg"
 SECURE_PIN_MAIL      "@lib_prefix@/mails/__LANGUAGE__/secure_pin_mail.msg"
 CONFIRM_CERT_SIGN    "@lib_prefix@/mails/__LANGUAGE__/confirm_cert_sign.msg"
-------------------------------------------------------------------------
SF.Net email is sponsored by: The Future of Linux Business White Paper
from Novell.  From the desktop to the data center, Linux is going
mainstream.  Let it simplify your IT future.
http://altfarm.mediaplex.com/ad/ck/8857-50307-18918-4_______________________________________________
OpenCA-Devel mailing list
OpenCA-Devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/openca-devel