LimeSurvey - the Online Survey Tool

Revision: 12233
          http://limesurvey.svn.sourceforge.net/limesurvey/?rev=12233&view=rev
Author:   c_schmitz
Date:     2012-01-27 17:03:15 +0000 (Fri, 27 Jan 2012)
Log Message:
-----------
More fixes for language selection - Native language is now shown first in language selection box

Modified Paths:
--------------
    source/limesurvey_yii/application/helpers/frontend_helper.php

Modified: source/limesurvey_yii/application/helpers/frontend_helper.php
===================================================================
--- source/limesurvey_yii/application/helpers/frontend_helper.php	2012-01-27 17:02:12 UTC (rev 12232)
+++ source/limesurvey_yii/application/helpers/frontend_helper.php	2012-01-27 17:03:15 UTC (rev 12233)
@@ -205,6 +205,11 @@
         return $graph;
     }
 
+    /**
+    * This function creates the language selector for a particular survey
+    *
+    * @param mixed $sSelectedLanguage The language in which all information is shown
+    */
     function makeLanguageChangerSurvey($sSelectedLanguage)
     {
         $surveyid = Yii::app()->getConfig('surveyID');
@@ -226,20 +231,18 @@
         }
         foreach ($slangs as $sLanguage)
         {
-            $htmlcode .= "<option value=\"{$sTargetURL}?sid=". $surveyid ."&amp;lang=". $sLanguage ."{$sAddToURL}\" ";
+            $sHTMLCode .= "<option value=\"{$sTargetURL}?sid=". $surveyid ."&amp;lang=". $sLanguage ."{$sAddToURL}\" ";
             if ($sLanguage==$sSelectedLanguage)
             {
-                $htmlcode .=" selected='selected'";
+                $sHTMLCode .=" selected='selected'";
 
             }
-            $htmlcode .=">".getLanguageNameFromCode($sLanguage,false)."</option>\n";
+            $sHTMLCode .=">".getLanguageNameFromCode($sLanguage,false)."</option>\n";
         }
+        $sHTMLCode .= "</select>\n";
 
+        return $sHTMLCode;
 
-        $htmlcode .= "</select>\n";
-
-        return $htmlcode;
-
     }
 
     /**
@@ -256,7 +259,7 @@
             if($sLanguageID == $sSelectedLanguage)
             {
                 $sHTMLCode .= " selected='selected' ";
-                $sHTMLCode .= ">{$aLanguageProperties['description']}</option>\n";
+                $sHTMLCode .= ">{$aLanguageProperties['nativedescription']}</option>\n";
             }
             else
             {

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 12362
          http://limesurvey.svn.sourceforge.net/limesurvey/?rev=12362&view=rev
Author:   tmswhite
Date:     2012-02-05 19:42:22 +0000 (Sun, 05 Feb 2012)
Log Message:
-----------
Fixed issue #05759: Default date based on token gives incorrect result
Dev defaults need to be set by EM, not by buildsurveysession

Modified Paths:
--------------
    source/limesurvey_yii/application/helpers/frontend_helper.php

Modified: source/limesurvey_yii/application/helpers/frontend_helper.php
===================================================================
--- source/limesurvey_yii/application/helpers/frontend_helper.php	2012-02-05 19:40:30 UTC (rev 12361)
+++ source/limesurvey_yii/application/helpers/frontend_helper.php	2012-02-05 19:42:22 UTC (rev 12362)
@@ -2033,14 +2033,15 @@
 
     }
 
-    // Prefill question/answer from defaultvalues
-    foreach ($fieldmap as $field)
-    {
-        if (isset($field['defaultvalue']))
-        {
-            $_SESSION['survey_'.$surveyid][$field['fieldname']]=$field['defaultvalue'];
-        }
-    }
+    // Defaults need to be set within Expression Manager so that it can process defaults comprised of equations
+//    // Prefill question/answer from defaultvalues
+//    foreach ($fieldmap as $field)
+//    {
+//        if (isset($field['defaultvalue']))
+//        {
+//            $_SESSION['survey_'.$surveyid][$field['fieldname']]=$field['defaultvalue'];
+//        }
+//    }
     // Prefill questions/answers from command line params
     if (isset($_SESSION['survey_'.$surveyid]['insertarray']))
     {

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 12447
          http://limesurvey.svn.sourceforge.net/limesurvey/?rev=12447&view=rev
Author:   shnoulle
Date:     2012-02-12 15:11:53 +0000 (Sun, 12 Feb 2012)
Log Message:
-----------
Dev : in survey : return a dropdow only of there are more than one lanagage

Modified Paths:
--------------
    source/limesurvey_yii/application/helpers/frontend_helper.php

Modified: source/limesurvey_yii/application/helpers/frontend_helper.php
===================================================================
--- source/limesurvey_yii/application/helpers/frontend_helper.php	2012-02-12 14:12:34 UTC (rev 12446)
+++ source/limesurvey_yii/application/helpers/frontend_helper.php	2012-02-12 15:11:53 UTC (rev 12447)
@@ -1,7 +1,7 @@
 <?php if ( ! defined('BASEPATH')) exit('No direct script access allowed');
     /*
     * LimeSurvey
-    * Copyright (C) 2007-2011 The LimeSurvey Project Team / Carsten Schmitz
+    * Copyright (C) 2007-2012 The LimeSurvey Project Team / Carsten Schmitz
     * All rights reserved.
     * License: GNU/GPL License v2 or later, see LICENSE.php
     * LimeSurvey is free software. This version may have been modified pursuant
@@ -217,32 +217,37 @@
 
         $slangs = Survey::model()->findByPk($surveyid)->getAdditionalLanguages();
         $slangs[]= GetBaseLanguageFromSurveyID($surveyid);
-        $previewgrp = false;
-        if (isset($_REQUEST['action'])&& $_REQUEST['action']=='previewgroup')
+        if (count($slangs)>1) // return a dropdow only of there are more than one lanagage
         {
-            $previewgrp = true;
-        }
-
-        $sHTMLCode = "<select id='languagechanger' name='languagechanger' class='languagechanger' onchange='javascript:window.location=this.value'>\n";
-        $sAddToURL = "";
-        $sTargetURL = Yii::app()->getController()->createUrl("/survey/index");
-        if ($previewgrp){
-            $sAddToURL = "&amp;action=previewgroup&amp;gid={$_REQUEST['gid']}";
-        }
-        foreach ($slangs as $sLanguage)
-        {
-            $sHTMLCode .= "<option value=\"{$sTargetURL}?sid=". $surveyid ."&amp;lang=". $sLanguage ."{$sAddToURL}\" ";
-            if ($sLanguage==$sSelectedLanguage)
+            $previewgrp = false;
+            if (isset($_REQUEST['action'])&& $_REQUEST['action']=='previewgroup')
             {
-                $sHTMLCode .=" selected='selected'";
+                $previewgrp = true;
+            }
+            $sHTMLCode = "<select id='languagechanger' name='languagechanger' class='languagechanger' onchange='javascript:window.location=this.value'>\n";
+            $sAddToURL = "";
+            $sTargetURL = Yii::app()->getController()->createUrl("/survey/index");
+            if ($previewgrp){
+                $sAddToURL = "&amp;action=previewgroup&amp;gid={$_REQUEST['gid']}";
+            }
+            foreach ($slangs as $sLanguage)
+            {
+                $sHTMLCode .= "<option value=\"{$sTargetURL}?sid=". $surveyid ."&amp;lang=". $sLanguage ."{$sAddToURL}\" ";
+                if ($sLanguage==$sSelectedLanguage)
+                {
+                    $sHTMLCode .=" selected='selected'";
 
+                }
+                $sHTMLCode .=">".getLanguageNameFromCode($sLanguage,false)."</option>\n";
             }
-            $sHTMLCode .=">".getLanguageNameFromCode($sLanguage,false)."</option>\n";
+            $sHTMLCode .= "</select>\n";
+            return $sHTMLCode;
         }
-        $sHTMLCode .= "</select>\n";
+        else
+        {
+            return false;
+        }
 
-        return $sHTMLCode;
-
     }
 
     /**

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.