From 9fcd1dc7d4b406e50eb1e4e5ff96e62ab4c76d73 Mon Sep 17 00:00:00 2001
From: Denis Chenu <courriel@shnoulle.net>
Date: Fri, 28 Feb 2014 17:17:18 +0100
Subject: [PATCH] Fixed issue #08783: The main container form is not 508
 compliant Dev: input id="runonce" are replaced by Expression manager
 function.

---
 application/helpers/SurveyRuntimeHelper.php | 12 +++---------
 application/helpers/qanda_helper.php        |  7 +++----
 2 files changed, 6 insertions(+), 13 deletions(-)

diff --git a/application/helpers/SurveyRuntimeHelper.php b/application/helpers/SurveyRuntimeHelper.php
index db5b67db8fa..502fd5c1a07 100644
--- a/application/helpers/SurveyRuntimeHelper.php
+++ b/application/helpers/SurveyRuntimeHelper.php
@@ -995,15 +995,9 @@ function run($surveyid,$args) {
             echo templatereplace(file_get_contents($sTemplatePath."survey.pstpl"), array(), $redata);
         }
 
-        // the runonce element has been changed from a hidden to a text/display:none one
-        // in order to workaround an not-reproduced issue #4453 (lemeur)
-        echo "<input type='text' id='runonce' value='0' style='display: none;'/>";
-        
-#        // lemradix and var for LemRadix
-#        $sLemRadixVarScript=" LEMradix='" . $radix . "';\n"
-#                        ." numRegex = new RegExp('[^-' + LEMradix + '0-9]','g');\n"
-#                        ." intRegex = new RegExp('[^-0-9]','g');\n";
-#        Yii::app()->clientScript->registerScript('LemRadixVarScript',$sLemRadixVarScript,CClientScript::POS_HEAD);
+        // runonce element has been changed from a hidden to a text/display:none one. In order to workaround an not-reproduced issue #4453 (lemeur)
+        // We don't need runonce actually (140228): the script was updated and replaced by EM see #08783 (grep show no other runonce)
+        // echo "<input type='text' id='runonce' value='0' style='display: none;'/>";
 
         $showpopups=Yii::app()->getConfig('showpopups');
         //Display the "mandatory" message on page if necessary
diff --git a/application/helpers/qanda_helper.php b/application/helpers/qanda_helper.php
index abc7a9167c0..36d27f97ec8 100644
--- a/application/helpers/qanda_helper.php
+++ b/application/helpers/qanda_helper.php
@@ -2423,17 +2423,16 @@ function do_multiplechoice($ia)
             }
             $answer .= htmlspecialchars($dispVal,ENT_QUOTES);
         }
-        $answer .="\" />";
-        $answer .="<script type='text/javascript'>\n";
+        $answer .="\" />\n";
+        $answer .="<script type='text/javascript'>\n/*<![CDATA[*/\n";
         $answer .="$('#answer{$myfname}cbox').prop('aria-hidden', 'true').css('visibility','');";
         $answer .="$('#answer{$myfname}').bind('keyup focusout',function(event){\n";
         $answer .= " if ($.trim($(this).val()).length>0) { $(\"#answer{$myfname}cbox\").prop(\"checked\",true); } else { \$(\"#answer{$myfname}cbox\").prop(\"checked\",false); }; $(\"#java{$myfname}\").val($(this).val());LEMflagMandOther(\"$myfname\",$('#answer{$myfname}cbox').is(\":checked\")); $oth_checkconditionFunction(this.value, this.name, this.type); \n";
         $answer .="});\n";
         $answer .="$('#answer{$myfname}cbox').click(function(event){\n";
-        $answer .= " //if (($(this)).is(':checked')) { $(\"#answer{$myfname}\").focus(); } else { $(\"#answer{$myfname}\").val('');{$checkconditionFunction}(\"\", \"{$myfname}\", \"text\"); }; return true;\n";
         $answer .= " if (($(this)).is(':checked') && $.trim($(\"#answer{$myfname}\").val()).length==0) { $(\"#answer{$myfname}\").focus();LEMflagMandOther(\"$myfname\",true);return false; } else {  $(\"#answer{$myfname}\").val('');{$checkconditionFunction}(\"\", \"{$myfname}\", \"text\");LEMflagMandOther(\"$myfname\",false); return true; }; \n";
         $answer .="});\n";
-        $answer .="</script>\n";
+        $answer .="/*]]>*/\n</script>\n";
         $answer .= '<input type="hidden" name="java'.$myfname.'" id="java'.$myfname.'" value="';
 
         //        if ($maxansw > 0)