Input to decodeTokenAttributes must not be null

LimeSurvey · Mar 29, 2023 · fac323d · fac323d
1 parent dac9b88
commit fac323d
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 8 deletions.
diff --git a/application/helpers/update/updatedb_helper.php b/application/helpers/update/updatedb_helper.php
@@ -2194,7 +2194,7 @@ function upgradeSurveys177()
     $oSurveyResult = $oDB->createCommand($sSurveyQuery)->queryAll();
     $sSurveyLSUpdateQuery = "update {{surveys_languagesettings}} set surveyls_attributecaptions=:attributecaptions where surveyls_survey_id=:surveyid and surveyls_language=:language";
     foreach ($oSurveyResult as $aSurveyRow) {
-        $aAttributeDescriptions = decodeTokenAttributes($aSurveyRow['surveyls_attributecaptions']);
+        $aAttributeDescriptions = decodeTokenAttributes($aSurveyRow['surveyls_attributecaptions'] ?? '');
         if (!$aAttributeDescriptions) {
             $aAttributeDescriptions = array();
         }
@@ -2208,7 +2208,7 @@ function upgradeSurveys177()
     $oSurveyResult = $oDB->createCommand($sSurveyQuery)->queryAll();
     $sSurveyUpdateQuery = "update {{surveys}} set attributedescriptions=:attributedescriptions where sid=:surveyid";
     foreach ($oSurveyResult as $aSurveyRow) {
-        $aAttributeDescriptions = decodeTokenAttributes($aSurveyRow['attributedescriptions']);
+        $aAttributeDescriptions = decodeTokenAttributes($aSurveyRow['attributedescriptions'] ?? '');
         if (!$aAttributeDescriptions) {
             $aAttributeDescriptions = array();
         }

diff --git a/application/models/Participant.php b/application/models/Participant.php
@@ -1567,7 +1567,7 @@ private function createColumnsInTokenTable($surveyId, array $newAttributes)
             ->from('{{surveys}}')
             ->bindParam(":sid", $surveyId, PDO::PARAM_INT);
         $aTokenAttributes = $previousatt->queryRow();
-        $aTokenAttributes = decodeTokenAttributes($aTokenAttributes['attributedescriptions']);
+        $aTokenAttributes = decodeTokenAttributes($aTokenAttributes['attributedescriptions'] ?? '');
 
         foreach ($fieldcontents as $key => $iIDAttributeCPDB) {
             $aTokenAttributes[$key] = $iIDAttributeCPDB;
@@ -1894,7 +1894,7 @@ public function copyToCentral($surveyid, $aAttributesToBeCreated, $aMapped, $ove
         $sucessfull = 0;
         $attid = []; //Will store the CPDB attribute_id of new or existing attributes keyed by CPDB at
 
-        $aTokenAttributes = decodeTokenAttributes($survey->attributedescriptions);
+        $aTokenAttributes = decodeTokenAttributes($survey->attributedescriptions ?? '');
         $aAutoMapped = $survey->getCPDBMappings();
 
         /* Create CPDB attributes */

diff --git a/application/models/Survey.php b/application/models/Survey.php
@@ -661,7 +661,7 @@ public function getAllLanguages()
      */
     public function getTokenAttributes()
     {
-        $attdescriptiondata = decodeTokenAttributes($this->attributedescriptions);
+        $attdescriptiondata = decodeTokenAttributes($this->attributedescriptions ?? '');
 
         // Catches malformed data
         if ($attdescriptiondata && strpos((string) key(reset($attdescriptiondata)), 'attribute_') === false) {
@@ -1446,7 +1446,7 @@ public function getCountPartialAnswers()
      */
     public function getDecodedAttributedescriptions()
     {
-        return decodeTokenAttributes($this->attributedescriptions);
+        return decodeTokenAttributes($this->attributedescriptions ?? '');
     }
 
     /**

diff --git a/application/models/Token.php b/application/models/Token.php
@@ -104,7 +104,7 @@ public function attributeLabels()
             'validfrom' => gT('Valid from'),
             'validuntil' => gT('Valid until'),
         );
-        foreach (decodeTokenAttributes($this->survey->attributedescriptions) as $key => $info) {
+        foreach (decodeTokenAttributes($this->survey->attributedescriptions ?? '') as $key => $info) {
             $labels[$key] = !empty($info['description']) ? $info['description'] : '';
         }
         return $labels;
@@ -435,7 +435,7 @@ public function rules()
             array('validfrom', 'date','format' => ['yyyy-M-d H:m:s.???','yyyy-M-d H:m:s','yyyy-M-d H:m','yyyy-M-d'],'allowEmpty' => true),
             array('validuntil','date','format' => ['yyyy-M-d H:m:s.???','yyyy-M-d H:m:s','yyyy-M-d H:m','yyyy-M-d'],'allowEmpty' => true),
         );
-        foreach (decodeTokenAttributes($this->survey->attributedescriptions) as $key => $info) {
+        foreach (decodeTokenAttributes($this->survey->attributedescriptions ?? '') as $key => $info) {
             $aRules[] = array(
                 $key, 'filter',
                 'filter' => array(self::class, 'sanitizeAttribute'),