From 5de3d34fc6c705e2ada74e4da22403337053ef5c Mon Sep 17 00:00:00 2001
From: Denis Chenu <courriel@shnoulle.net>
Date: Fri, 20 Jun 2014 09:02:22 +0200
Subject: [PATCH] Dev: some other fix with language changer Dev: Again some no
 js issue : only the {LAGUAGECHANGER} can set the language Dev: Maybe
 remove/hide language question without JS (set it to read only and remove
 readonly in js)

---
 application/helpers/qanda_helper.php | 19 ++++++++++---------
 scripts/survey_runtime.js            |  1 +
 2 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/application/helpers/qanda_helper.php b/application/helpers/qanda_helper.php
index 7a46164c05e..867482ffb5c 100644
--- a/application/helpers/qanda_helper.php
+++ b/application/helpers/qanda_helper.php
@@ -1371,17 +1371,19 @@ function do_language($ia)
 
     $answerlangs = Survey::model()->findByPk(Yii::app()->getConfig('surveyID'))->additionalLanguages;
     $answerlangs [] = Survey::model()->findByPk(Yii::app()->getConfig('surveyID'))->language;
+    // Get actual answer
+    $sLang=$_SESSION['survey_'.Yii::app()->getConfig('surveyID')]['s_lang'];
+    if(!in_array($sLang,$answerlangs))
+    {
+        $sLang=Survey::model()->findByPk(Yii::app()->getConfig('surveyID'))->language;
+    }
     $answer = "\n\t<p class=\"question answer-item dropdown-item langage-item\">\n"
     ."<label for='answer{$ia[1]}' class='hide label'>{$clang->gT('Choose your language')}</label>"
     ."<select name=\"$ia[1]\" id=\"answer$ia[1]\" onchange=\"$checkconditionFunction(this.value, this.name, this.type);\" class=\"languagesurvey\">\n";
-    if (!$_SESSION['survey_'.Yii::app()->getConfig('surveyID')][$ia[1]]) {$answer .= "\t<option value=\"\" selected=\"selected\">".$clang->gT('Please choose...')."</option>\n";}
     foreach ($answerlangs as $ansrow)
     {
         $answer .= "\t<option value=\"{$ansrow}\"";
-        if ($_SESSION['survey_'.Yii::app()->getConfig('surveyID')][$ia[1]] == $ansrow)
-        {
-            $answer .= SELECTED;
-        }elseif($_SESSION['survey_'.Yii::app()->getConfig('surveyID')]['s_lang'] == $ansrow)
+        if ($sLang == $ansrow)
         {
             $answer .= SELECTED;
         }
@@ -1389,14 +1391,13 @@ function do_language($ia)
         $answer .= '>'.$aLanguage[1]."</option>\n";
     }
     $answer .= "</select>\n";
-    $answer .= "<input type=\"hidden\" name=\"java{$ia[1]}\" id=\"java{$ia[1]}\" value=\"".$_SESSION['survey_'.Yii::app()->getConfig('surveyID')][$ia[1]]."\" />\n";
+    $answer .= "<input type=\"hidden\" name=\"java{$ia[1]}\" id=\"java{$ia[1]}\" value=\"{$sLang}\" />\n";
     $inputnames[]=$ia[1];
-    
-    $answer .= "\n<input type=\"hidden\" name=\"lang\" value=\"\" />\n\t</p>\n";
+
     $answer .= "<script type='text/javascript'>\n"
     . "/*<![CDATA[*/\n"
     ."$('#answer{$ia[1]}').change(function(){ "
-    ."$('input[name=\"lang\"]').val($(this).val());"
+    ."$('<input type=\"hidden\">').attr('name','lang').val($(this).val()).appendTo($('form#limesurvey'));"
     ." })\n"
     ." /*]]>*/\n"
     ."</script>\n";
diff --git a/scripts/survey_runtime.js b/scripts/survey_runtime.js
index 0054297b39f..4c371e6f5e1 100644
--- a/scripts/survey_runtime.js
+++ b/scripts/survey_runtime.js
@@ -259,6 +259,7 @@ function activateLanguageChanger(){
                 }).appendTo(document.body).submit();
             }
         }else{
+            $("form#limesurvey [name='lang']").not($(this)).remove();// Remove other lang
             $('#changelangbtn').click();
         }
     });