Merge branch '2.05' of git@github.com:LimeSurvey/LimeSurvey.git into …

…2.05

application/helpers/admin/export/HtmlWriter.php

@@ -39,13 +39,17 @@ public function init(SurveyObj $survey, $sLanguageCode, FormattingOptions $oOpti
             }
             $this->groupMap = array();
             $index = 0;
-            foreach ($survey->fieldMap as $column => $question)
-            {
+            foreach ($oOptions->selectedColumns as $column) {
+                if (isset($survey->fieldMap[$column])) {
+                    $question = $survey->fieldMap[$column];
+                } else {
+                    // Token field
+                    $question = array('gid'=>0, 'qid'=>'');
+                }
                 $question['index'] = $index;
                 $this->groupMap[intval($question['gid'])][] = $question;
                 $index++;
-            }
-
+            }            
         }
 
         protected function writeHeader()

application/helpers/admin/export/SurveyDao.php

@@ -73,6 +73,13 @@ public function loadSurveyById($id, $lang = null)
         $recordSet = Yii::app()->db->createCommand($sQuery)->query();
         $survey->languageSettings = $recordSet->read();
         $recordSet->close();
+
+        if (tableExists('tokens_'.$survey->id) && array_key_exists ('token',SurveyDynamic::model($survey->id)->attributes) && Permission::model()->hasSurveyPermission($survey->id,'tokens','read'))
+        {
+            // Now add the tokenFields
+            $survey->tokenFields = getTokenFieldsAndNames($survey->id);
+            unset($survey->tokenFields['token']);
+        }
 
         return $survey;
     }

application/helpers/admin/export/SurveyObj.php

@@ -55,6 +55,13 @@ class SurveyObj
     * @var array[int][string]mixed
     */
     public $tokens;
+
+    /**
+     * When relevant holds the available fields from the token table
+     * 
+     * @var array[fieldname][localised description]
+     */
+    public $tokenFields = array();
 
     /**
     * Stores the responses to the survey in a two dimensional array form.

application/helpers/admin/export/Writer.php

@@ -46,9 +46,9 @@ public function init(SurveyObj $survey, $sLanguageCode, FormattingOptions $oOpti
     */
     public function getAbbreviatedHeading(SurveyObj $survey, $fieldName)
     {
-        $question = $survey->fieldMap[$fieldName];
-        if ($question)
-        {
+        if (isset($survey->fieldMap[$fieldName])) {
+            $question = $survey->fieldMap[$fieldName];
+
             $heading = $question['question'];
             $heading = $this->stripTagsFull($heading);
             $heading = mb_substr($heading, 0, 15).'.. ';
@@ -58,8 +58,13 @@ public function getAbbreviatedHeading(SurveyObj $survey, $fieldName)
                 $heading .= '['.$this->stripTagsFull($aid).']';
             }
             return $heading;
+        } else {
+            // Token field
+            if (isset($survey->tokenFields[$fieldName])) {
+                return $survey->tokenFields[$fieldName]['description'];
+            }
+            return $fieldName;
         }
-        return false;
     }
 
     /**
@@ -72,13 +77,21 @@ public function getAbbreviatedHeading(SurveyObj $survey, $fieldName)
     * @return string (or false)
     */
     public function getFullHeading(SurveyObj $survey, FormattingOptions $oOptions, $fieldName)
-    {                                                  
-        $question = $survey->fieldMap[$fieldName];
-
-        $heading = $question['question'];
-        $heading = $this->stripTagsFull($heading);
-        $heading.=$this->getFullFieldSubHeading($survey, $oOptions, $fieldName);
-        return $heading;
+    {                                
+        if (isset($survey->fieldMap[$fieldName])) {
+            $question = $survey->fieldMap[$fieldName];
+
+            $heading = $question['question'];
+            $heading = $this->stripTagsFull($heading);
+            $heading.=$this->getFullFieldSubHeading($survey, $oOptions, $fieldName);
+            return $heading;
+        } else {
+            // Token field
+            if (isset($survey->tokenFields[$fieldName])) {
+                return $survey->tokenFields[$fieldName]['description'];
+            }
+            return $fieldName;
+        }        
     }
 
     public function getCodeHeading(SurveyObj $survey, FormattingOptions $oOptions, $fieldName)
@@ -362,7 +375,12 @@ final public function write(SurveyObj $survey, $sLanguageCode, FormattingOptions
                         break;
                     default:
                     case 'code':
-                        $value = viewHelper::getFieldCode($survey->fieldMap[$column]);
+                        if (isset($survey->fieldMap[$column])) {
+                            $value = viewHelper::getFieldCode($survey->fieldMap[$column]);
+                        } else {
+                            // Token field
+                            $value = $column;
+                        }
                         break;
                 }
                 if ($oOptions->headerSpacesToUnderscores)

application/helpers/surveytranslator_helper.php

@@ -97,6 +97,13 @@ function getLanguageData($bOrderByNative=false,$sLanguageCode='en') {
         $supportedLanguages['ar']['dateformat'] = 2;
         $supportedLanguages['ar']['radixpoint'] = 0;
 
+        // Armenian
+        $supportedLanguages['hy']['description'] = $clang->gT('Armenian');
+        $supportedLanguages['hy']['nativedescription'] = 'հայերեն';
+        $supportedLanguages['hy']['rtl'] = false;
+        $supportedLanguages['hy']['dateformat'] = 1;
+        $supportedLanguages['hy']['radixpoint'] = 1;
+
         // Basque
         $supportedLanguages['eu']['description'] = $clang->gT('Basque');
         $supportedLanguages['eu']['nativedescription'] = 'Euskara';
@@ -196,6 +203,13 @@ function getLanguageData($bOrderByNative=false,$sLanguageCode='en') {
         $supportedLanguages['da']['dateformat'] =  2;
         $supportedLanguages['da']['radixpoint'] = 1;
 
+        // Dari
+        $supportedLanguages['prs']['description'] = $clang->gT('Dari');
+        $supportedLanguages['prs']['nativedescription'] = 'دری';
+        $supportedLanguages['prs']['rtl'] = true;
+        $supportedLanguages['prs']['dateformat'] = 6;
+        $supportedLanguages['prs']['radixpoint'] = 0;
+
         // Dutch
         $supportedLanguages['nl']['description'] = $clang->gT('Dutch');
         $supportedLanguages['nl']['nativedescription'] = 'Nederlands';
@@ -238,6 +252,13 @@ function getLanguageData($bOrderByNative=false,$sLanguageCode='en') {
         $supportedLanguages['fr']['dateformat'] = 5;
         $supportedLanguages['fr']['radixpoint'] = 1;
 
+        // Fula
+        $supportedLanguages['ful']['description'] = $clang->gT('Fula');
+        $supportedLanguages['ful']['nativedescription'] = 'Fulfulde';
+        $supportedLanguages['ful']['rtl'] = false;
+        $supportedLanguages['ful']['dateformat'] = 5;
+        $supportedLanguages['ful']['radixpoint'] = 1;
+
         // Galician
         $supportedLanguages['gl']['description'] = $clang->gT('Galician');
         $supportedLanguages['gl']['nativedescription'] = 'Galego';
@@ -329,6 +350,13 @@ function getLanguageData($bOrderByNative=false,$sLanguageCode='en') {
         $supportedLanguages['ja']['dateformat'] = 6;
         $supportedLanguages['ja']['radixpoint'] = 0;
 
+        // Kinyarwanda 
+        $supportedLanguages['rw']['description'] = $clang->gT('Kinyarwanda');
+        $supportedLanguages['rw']['nativedescription'] = 'Kinyarwanda';
+        $supportedLanguages['rw']['rtl'] = false;
+        $supportedLanguages['rw']['dateformat'] = 5;
+        $supportedLanguages['rw']['radixpoint'] = 1;
+
         // Korean
         $supportedLanguages['ko']['description'] = $clang->gT('Korean');
         $supportedLanguages['ko']['nativedescription'] = '한국어';
@@ -407,6 +435,13 @@ function getLanguageData($bOrderByNative=false,$sLanguageCode='en') {
         $supportedLanguages['oc']['dateformat'] = 5;
         $supportedLanguages['oc']['radixpoint'] = 1;
 
+        // Pashto
+        $supportedLanguages['ps']['description'] = $clang->gT('Pashto');
+        $supportedLanguages['ps']['nativedescription'] = 'پښتو';
+        $supportedLanguages['ps']['rtl'] = true;
+        $supportedLanguages['ps']['dateformat'] = 6;
+        $supportedLanguages['ps']['radixpoint'] = 0;
+
         // Persian
         $supportedLanguages['fa']['description'] = $clang->gT('Persian');
         $supportedLanguages['fa']['nativedescription'] = 'فارسی';

application/models/Token.php

@@ -143,10 +143,10 @@ public function scopes()
                 'incomplete' => array(
                     'condition' => 'completed = "N"'
                 ),
-                array(
+                'usable' => array(
                     'condition' => "COALESCE(validuntil, '$now') >= '$now' AND COALESCE(validfrom, '$now') <= '$now'"
                 ),
-                array(
+                'editable' => array(
                     'condition' => "usesleft > 0 AND COALESCE(validuntil, '$now') >= '$now' AND COALESCE(validfrom, '$now') <= '$now'"
                 )
             );