Fixed issue #09877: Possible issue with activation of token with malf…

…ormed attributedescriptions
LimeSurvey · Sep 10, 2015 · c5d12ac · c5d12ac
1 parent df55564
commit c5d12ac
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 9 deletions.
diff --git a/application/models/Survey.php b/application/models/Survey.php
@@ -527,13 +527,16 @@ public function getTokenAttributes()
         $aCompleteData=array();
         foreach ($attdescriptiondata as $sKey=>$aValues)
         {
-            if (!is_array($aValues)) $aValues=array();
-            $aCompleteData[$sKey]= array_merge(array(
-                    'description' => '',
-                    'mandatory' => 'N',
-                    'show_register' => 'N',
-                    'cpdbmap' =>''
-                    ),$aValues);
+            if(preg_match("/^attribute_[0-9]$/",$sKey))
+            {
+                if (!is_array($aValues)) $aValues=array();
+                $aCompleteData[$sKey]= array_merge(array(
+                      'description' => '',
+                      'mandatory' => 'N',
+                      'show_register' => 'N',
+                      'cpdbmap' =>''
+                      ),$aValues);
+           }
         }
         return $aCompleteData;
     }
@@ -1049,4 +1052,4 @@ public function deleteDependent() {
 
 
 
-}
+}
diff --git a/application/models/Token.php b/application/models/Token.php
@@ -107,7 +107,7 @@ public static function createTable($surveyId, array $extraFields = [])
             }
 
             // create fields for the custom token attributes associated with this survey
-            $tokenattributefieldnames = Survey::model()->findByPk($surveyId)->tokenAttributes;
+            $tokenattributefieldnames = Survey::model()->findByPk($surveyId)->getTokenAttributes();
             foreach($tokenattributefieldnames as $attrname=>$attrdetails)
             {
                 if (!isset($fields[$attrname])) {