Fixed issue: Misspelling of the word 'separator'

application/controllers/admin/participantsaction.php

@@ -697,7 +697,7 @@ function getSearchIDs()
     {
         $searchcondition = basename(Yii::app()->request->getPost('searchcondition')); // get the search condition from the URL
         /* a search contains posted data inside $_POST['searchcondition'].
-        * Each seperate query is made up of 3 fields, seperated by double-pipes ("|")
+        * Each separate query is made up of 3 fields, separated by double-pipes ("|")
         * EG: fname||eq||jason||lname||ct||c
         *
         */
@@ -1117,7 +1117,7 @@ function attributeMapCSV()
             $regularfields = array('firstname', 'participant_id', 'lastname', 'email', 'language', 'blacklisted', 'owner_uid');
             $csvread = fopen($sFilePath, 'r');
 
-            $seperator = Yii::app()->request->getPost('seperatorused');
+            $separator = Yii::app()->request->getPost('separatorused');
             $firstline = fgetcsv($csvread, 1000, ',');
             $selectedcsvfields = array();
             foreach ($firstline as $key => $value)
@@ -1151,7 +1151,7 @@ function uploadCSV()
     {
         unset(Yii::app()->session['summary']);
         $characterset = Yii::app()->request->getPost('characterset');
-        $seperator = Yii::app()->request->getPost('seperatorused');
+        $separator = Yii::app()->request->getPost('separatorused');
         $newarray = Yii::app()->request->getPost('newarray');
         $mappedarray = Yii::app()->request->getPost('mappedarray');
         $filterblankemails = Yii::app()->request->getPost('filterbea');
@@ -1177,7 +1177,7 @@ function uploadCSV()
         $tokenlistarray = file($sFilePath);
 
         // open it and trim the endings
-        $separator = Yii::app()->request->getPost('seperatorused');
+        $separator = Yii::app()->request->getPost('separatorused');
         $uploadcharset = Yii::app()->request->getPost('characterset');
         /* The $newarray contains a list of fields that will be used
            to create new attributes */

application/controllers/admin/printablesurvey.php

@@ -293,7 +293,7 @@ function index($surveyid, $lang = null)
 
                             if($x > 0)
                             {
-                                $sExplanation .= ' <em class="scenario-and-seperator">'.$clang->gT('and').'</em> ';
+                                $sExplanation .= ' <em class="scenario-and-separator">'.$clang->gT('and').'</em> ';
                             }
                             if(trim($distinctrow['method'])=='') //If there is no method chosen assume "equals"
                             {
@@ -573,7 +573,7 @@ function index($surveyid, $lang = null)
 
                             if (count($conditions) > 1)
                             {
-                                $sExplanation .=  "'".implode("' <em class='scenario-or-seperator'>".$clang->gT("or")."</em> '", $conditions)."'";
+                                $sExplanation .=  "'".implode("' <em class='scenario-or-separator'>".$clang->gT("or")."</em> '", $conditions)."'";
                             }
                             elseif (count($conditions) == 1)
                             {
@@ -583,7 +583,7 @@ function index($surveyid, $lang = null)
                             // Following line commented out because answer_section  was lost, but is required for some question types
                             //$explanation .= " ".$clang->gT("to question")." '".$mapquestionsNumbers[$distinctrow['cqid']]."' $answer_section ";
                             if($distinctrow['cqid']){
-                                $sExplanation .= " <span class='scenario-at-seperator'>".$clang->gT("at question")."</span> '".$mapquestionsNumbers[$distinctrow['cqid']]." [".$subresult['title']."]' (".strip_tags($subresult['question'])."$answer_section)" ;
+                                $sExplanation .= " <span class='scenario-at-separator'>".$clang->gT("at question")."</span> '".$mapquestionsNumbers[$distinctrow['cqid']]." [".$subresult['title']."]' (".strip_tags($subresult['question'])."$answer_section)" ;
                             }
                             else{
                                 $sExplanation .= " ".$distinctrow['value'] ;

application/controllers/admin/question.php

@@ -1085,7 +1085,7 @@ public function preview($surveyid, $qid, $lang = null)
         );
 
         $radix=getRadixPointData($thissurvey['surveyls_numberformat']);
-        $radix = $radix['seperator'];
+        $radix = $radix['separator'];
         $surveyOptions = array(
         'radix'=>$radix,
         'tempdir'=>Yii::app()->getConfig('tempdir')

application/helpers/SurveyRuntimeHelper.php

@@ -50,7 +50,7 @@ function run($surveyid,$args) {
                 break;
         }
         $radix=getRadixPointData($thissurvey['surveyls_numberformat']);
-        $radix = $radix['seperator'];
+        $radix = $radix['separator'];
 
         $surveyOptions = array(
         'active' => ($thissurvey['active'] == 'Y'),

application/helpers/admin/statistics_helper.php

@@ -470,7 +470,7 @@ function buildSelects($allfields, $surveyid, $language) {
                 elseif (($firstletter == "T" || $firstletter == "Q" ) && $_POST[$pv] != "")
                 {
                     $selectSubs = array();
-                    //We intepret and * and % as wildcard matches, and use ' OR ' and , as the seperators
+                    //We intepret and * and % as wildcard matches, and use ' OR ' and , as the separators
                     $pvParts = explode(",",str_replace('*','%', str_replace(' OR ',',',$_POST[$pv])));
                     if(is_array($pvParts) AND count($pvParts)){
                         foreach($pvParts AS $pvPart){
@@ -704,7 +704,7 @@ protected function buildOutputList($rt, $language, $surveyid, $outputType, $sql,
             $tmpqid=substr($qqid, 0, strlen($qqid)-1);
 
             //check if we have a QID that actually exists. if not create them by substringing. Note that
-            //all of this is due to the fact that when we create a field for an subquestion, we don't seperate
+            //all of this is due to the fact that when we create a field for an subquestion, we don't separate
             //the question id from the subquestion id - and this is a weird, backwards way of doing that.
             while (!in_array ($tmpqid,$legitqids)) $tmpqid=substr($tmpqid, 0, strlen($tmpqid)-1);
             //length of QID

application/helpers/common_helper.php

@@ -3276,7 +3276,7 @@ function questionAttributes($returnByName=false)
     'category'=>$clang->gT('Logic'),
     'sortorder'=>130,
     'inputtype'=>'text',
-    "help"=>$clang->gT('Excludes all other options if a certain answer is selected - just enter the answer code(s) seperated with a semikolon.'),
+    "help"=>$clang->gT('Excludes all other options if a certain answer is selected - just enter the answer code(s) separated with a semikolon.'),
     "caption"=>$clang->gT('Exclusive option'));
 
     $qattributes["exclude_all_others_auto"]=array(
@@ -4796,9 +4796,9 @@ function CSVEscape($sString)
     return '"' . str_replace('"','""', $sString) . '"';
 }
 
-function convertCSVRowToArray($string, $seperator, $quotechar)
+function convertCSVRowToArray($string, $separator, $quotechar)
 {
-    $fields=preg_split('/' . $seperator . '(?=([^"]*"[^"]*")*(?![^"]*"))/',trim($string));
+    $fields=preg_split('/' . $separator . '(?=([^"]*"[^"]*")*(?![^"]*"))/',trim($string));
     $fields=array_map('CSVUnquote',$fields);
     return $fields;
 }
@@ -6475,7 +6475,7 @@ function accessDenied($action,$sid='')
 /**
 * cleanLanguagesFromSurvey() removes any languages from survey tables that are not in the passed list
 * @param string $sid - the currently selected survey
-* @param string $availlangs - space seperated list of additional languages in survey
+* @param string $availlangs - space separated list of additional languages in survey
 * @return bool - always returns true
 */
 function cleanLanguagesFromSurvey($sid, $availlangs)
@@ -6529,7 +6529,7 @@ function cleanLanguagesFromSurvey($sid, $availlangs)
 /**
 * fixLanguageConsistency() fixes missing groups, questions, answers, quotas & assessments for languages on a survey
 * @param string $sid - the currently selected survey
-* @param string $availlangs - space seperated list of additional languages in survey - if empty all additional languages of a survey are checked against the base language
+* @param string $availlangs - space separated list of additional languages in survey - if empty all additional languages of a survey are checked against the base language
 * @return bool - always returns true
 */
 function fixLanguageConsistency($sid, $availlangs='')