Index: branches/2.3/preferences/handlecertificate.php
===================================================================
--- branches/2.3/preferences/handlecertificate.php	(revision 5010)
+++ branches/2.3/preferences/handlecertificate.php	(revision 5898)
@@ -156,55 +156,58 @@
                                                                                        ";
                     $cod_applet =
-        /*    // com debug ativado
-                '<script type="text/javascript">
-                                            if (navigator.userAgent.match(\'MSIE\')){
-                                                    document.write(\'<object style="display:yes;width:0;height:0;vertical-align:bottom;" id="login_applet" \' +
-                                                    \'classid="clsid:8AD9C840-044E-11D1-B3E9-00805F499D93"> \' +
-                                                    \'<param name="type" value="application/x-java-applet;version=1.5"> \' +
-                                                    \'<param name="code" value="LoginApplet.class"> \' +
-                                                    \'<param name="locale" value="' . $lang . '"> \' +
-                                                    \'<param name="mayscript" value="true"> \' + '
-                                                    . $param1
-                                                    . ' \'<param name="archive" value="ExpressoCertLogin.jar,ExpressoCert.jar,commons-httpclient-3.1.jar,commons-logging-1.1.1.jar,commons-codec-1.3.jar,bcmail-jdk15-142.jar,mail.jar,activation.jar,bcprov-jdk15-142.jar"> \' +
-                            \'<param name="debug" value="true"> \' +
-                                                    \'</object>\');
-                                            }
-                                            else {
-                                                    document.write(\'<embed style="display:yes;width:0;height:0;vertical-align:bottom;" id="login_applet" code="LoginApplet.class" locale="' . $lang . '"\' +
-                                                    \'archive="ExpressoCertLogin.jar,ExpressoCert.jar,commons-httpclient-3.1.jar,commons-logging-1.1.1.jar,commons-codec-1.3.jar,bcmail-jdk15-142.jar,mail.jar,activation.jar,bcprov-jdk15-142.jar" \' + '
-                                                    . $param2
-                                                    . ' \'type="application/x-java-applet;version=1.5" debug= "true" mayscript > \' +
-                                                    \'<noembed> \' +
-                                                    \'No Java Support. \' +
-                                                    \'</noembed> \' +
-                                                    \'</embed> \');
-                                            }
-                                    </script>';
-        */
-                // sem debug ativado
-                '<script type="text/javascript">
-                                            if (navigator.userAgent.match(\'MSIE\')){
-                                                    document.write(\'<object style="display:yes;width:0;height:0;vertical-align:bottom;" id="login_applet" \' +
-                                                    \'classid="clsid:8AD9C840-044E-11D1-B3E9-00805F499D93"> \' +
-                                                    \'<param name="type" value="application/x-java-applet;version=1.5"> \' +
-                                                    \'<param name="codebase" value="/security/">\' +
-                                                    \'<param name="code" value="LoginApplet.class"> \' +
-                                                    \'<param name="locale" value="' . $lang . '"> \' +
-                                                    \'<param name="mayscript" value="true"> \' + '
-                                                    . $param1
-                                                    . ' \'<param name="archive" value="ExpressoCertLogin.jar,ExpressoCert.jar,commons-httpclient-3.1.jar,commons-logging-1.1.1.jar,commons-codec-1.3.jar,bcmail-jdk15-142.jar,mail.jar,activation.jar,bcprov-jdk15-142.jar"> \' +
-                                                    \'</object>\');
-                                            }
-                                            else {
-                                                    document.write(\'<embed style="display:yes;width:0;height:0;vertical-align:bottom;" id="login_applet" codebase="/security/" code="LoginApplet.class" locale="' . $lang . '"\' +
-                                                    \'archive="ExpressoCertLogin.jar,ExpressoCert.jar,commons-httpclient-3.1.jar,commons-logging-1.1.1.jar,commons-codec-1.3.jar,bcmail-jdk15-142.jar,mail.jar,activation.jar,bcprov-jdk15-142.jar" \' + '
-                                                    . $param2
-                                                    . ' \'type="application/x-java-applet;version=1.5" mayscript > \' +
-                                                    \'<noembed> \' +
-                                                    \'No Java Support. \' +
-                                                    \'</noembed> \' +
-                                                    \'</embed> \');
-                                            }
-                                    </script>';
+/*
+// com debug ativado
+            '<script type="text/javascript">
+					if (navigator.userAgent.match(\'MSIE\')){
+						document.write(\'<object style="display:yes;width:0;height:0;vertical-align:bottom;" id="login_applet" \' +
+						\'classid="clsid:8AD9C840-044E-11D1-B3E9-00805F499D93"> \' +
+						\'<param name="type" value="application/x-java-applet;version=1.5"> \' +
+                                                \'<param name="codebase" value="/security/">\' +
+						\'<param name="code" value="LoginApplet.class"> \' +
+						\'<param name="locale" value="' . $GLOBALS['phpgw']->translation->userlang . '"> \' +
+						\'<param name="mayscript" value="true"> \' + '
+						. $param1
+						. ' \'<param name="archive" value="ExpressoCertLogin.jar,ExpressoCert.jar,commons-httpclient-3.1.jar,commons-logging-1.1.1.jar,commons-codec-1.3.jar,bcmail-jdk15-142.jar,mail.jar,activation.jar,bcprov-jdk15-142.jar"> \' +
+                        \'<param name="debug" value="true"> \' +
+						\'</object>\');
+					}
+					else {
+						document.write(\'<embed style="display:yes;width:0;height:0;vertical-align:bottom;" id="login_applet" codebase="/security/" code="LoginApplet.class" locale="' . $GLOBALS['phpgw']->translation->userlang . '"\' +
+						\'archive="ExpressoCertLogin.jar,ExpressoCert.jar,commons-httpclient-3.1.jar,commons-logging-1.1.1.jar,commons-codec-1.3.jar,bcmail-jdk15-142.jar,mail.jar,activation.jar,bcprov-jdk15-142.jar" \' + '
+						. $param2
+						. ' \'type="application/x-java-applet;version=1.5" debug= "true" mayscript > \' +
+						\'<noembed> \' +
+						\'No Java Support. \' +
+						\'</noembed> \' +
+						\'</embed> \');
+					}
+				</script>';
+*/
+            // sem debug ativado
+            '<script type="text/javascript">
+					if (navigator.userAgent.match(\'MSIE\')){
+						document.write(\'<object style="display:yes;width:0;height:0;vertical-align:bottom;" id="login_applet" \' +
+						\'classid="clsid:8AD9C840-044E-11D1-B3E9-00805F499D93"> \' +
+						\'<param name="type" value="application/x-java-applet;version=1.5"> \' +
+                                                \'<param name="codebase" value="/security/">\' +
+						\'<param name="code" value="LoginApplet.class"> \' +
+						\'<param name="locale" value="' . $GLOBALS['phpgw']->translation->userlang . '"> \' +
+						\'<param name="mayscript" value="true"> \' + '
+						. $param1
+						. ' \'<param name="archive" value="ExpressoCertLogin.jar,ExpressoCert.jar,commons-httpclient-3.1.jar,commons-logging-1.1.1.jar,commons-codec-1.3.jar,bcmail-jdk15-142.jar,mail.jar,activation.jar,bcprov-jdk15-142.jar"> \' +
+						\'</object>\');
+					}
+					else {
+						document.write(\'<embed style="display:yes;width:0;height:0;vertical-align:bottom;" id="login_applet" codebase="/security/" code="LoginApplet.class" locale="' . $GLOBALS['phpgw']->translation->userlang . '"\' +
+						\'archive="ExpressoCertLogin.jar,ExpressoCert.jar,commons-httpclient-3.1.jar,commons-logging-1.1.1.jar,commons-codec-1.3.jar,bcmail-jdk15-142.jar,mail.jar,activation.jar,bcprov-jdk15-142.jar" \' + '
+						. $param2
+						. ' \'type="application/x-java-applet;version=1.5" mayscript > \' +
+						\'<noembed> \' +
+						\'No Java Support. \' +
+						\'</noembed> \' +
+						\'</embed> \');
+					}
+				</script>';
+
                   echo $cod_applet;
                   echo '<form id="certificateForm" name="certificateForm" method="POST" action="handlecertificate.php" >';
