Enabled unique and valid question code enforcement for updates and im…

…port.
LimeSurvey · Nov 29, 2013 · 4ded98e · 4ded98e · Shnoulle · Nov 29, 2013
1 parent de20493
commit 4ded98e
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/application/helpers/admin/import_helper.php b/application/helpers/admin/import_helper.php
@@ -3682,7 +3682,7 @@ function XMLImportSurvey($sFullFilepath,$sXMLdata=NULL,$sNewSurveyName=NULL,$iDe
             }
             if ($insertdata)
                 XSSFilterArray($insertdata);
-            $question = new Question();
+            $question = new Question('import');
             $question->setAttributes($insertdata, false);
             $attempts = 0;
             while (!$question->validate(array('title')))

diff --git a/application/models/Question.php b/application/models/Question.php
@@ -94,7 +94,7 @@ public function rules()
                         )
                     ),
                     'message' => 'Question codes must be unique.'),
-                //array('title', 'match', 'pattern' => '/[a-z,A-Z][[:alnum:]]+/', 'message' => 'Question codes must start with a letter and may only contain alphanumeric characters.'),
+                array('title', 'match', 'pattern' => '/[a-z,A-Z][[:alnum:]]+/', 'message' => 'Question codes must start with a letter and may only contain alphanumeric characters.', 'on' => 'update, import'),
                 array('other', 'in','range'=>array('Y','N'), 'allowEmpty'=>true),
                 array('mandatory', 'in','range'=>array('Y','N'), 'allowEmpty'=>true),
                 array('question_order','numerical', 'integerOnly'=>true,'allowEmpty'=>true),