Fixed issue: Error on survey creation

LimeSurvey · Jul 20, 2012 · d527478 · d527478
1 parent 9f69785
commit d527478
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 18 deletions.
diff --git a/application/controllers/admin/surveyadmin.php b/application/controllers/admin/surveyadmin.php
@@ -894,7 +894,7 @@ public function copy()
             if ($action == 'importsurvey' && !$aData['bFailed'])
             {
                 $aImportResults=importSurveyFile($sFullFilepath,(isset($_POST['translinksfields'])));
-                if (is_null($aImportResults)) $importerror = true; 
+                if (is_null($aImportResults)) $importerror = true;
             }
             elseif ($action == 'copysurvey' && (empty($importerror) || !$importerror))
             {
@@ -1556,7 +1556,7 @@ function insert($iSurveyId=null)
             );
 
             $langsettings = new Surveys_languagesettings;
-            $langsettings->insertNewSurvey($aInsertData, $xssfilter);
+            $langsettings->insertNewSurvey($aInsertData);
 
             Yii::app()->session['flashmessage'] = $this->getController()->lang->gT("Survey was successfully added.");
 

diff --git a/application/helpers/admin/import_helper.php b/application/helpers/admin/import_helper.php
@@ -2693,7 +2693,7 @@ function CSVImportSurvey($sFullFilepath,$iDesiredSurveyId=NULL,$bTranslateLinks=
         unset($surveylsrowdata['lastpage']);
         $surveylsrowdata['surveyls_survey_id']=$iNewSID;
 
-        $lsiresult = Surveys_languagesettings::model()->insertNewSurvey($surveylsrowdata, $xssfilter) or safeDie("<br />".$clang->gT("Import of this survey file failed")."<br />");
+        $lsiresult = Surveys_languagesettings::model()->insertNewSurvey($surveylsrowdata) or safeDie("<br />".$clang->gT("Import of this survey file failed")."<br />");
 
     }
 

diff --git a/application/models/Surveys_languagesettings.php b/application/models/Surveys_languagesettings.php
@@ -212,23 +212,9 @@ function getAllData($sid,$lcode)
         return $this->db->query($query, array($sid, $sid, $lcode));
     }
 
-    function insertNewSurvey($data, $xssfiltering = false)
+    function insertNewSurvey($data)
     {
         if (isset($data['surveyls_url']) && $data['surveyls_url']== 'http://') {$data['surveyls_url']="";}
-
-		if($xssfiltering)
-		{
-			$filter = new CHtmlPurifier();
-			$filter->options = array('URI.AllowedSchemes'=>array(
-  				'http' => true,
-  				'https' => true,
-			));
-			$data["description"] = $filter->purify($data["description"]);
-			$data["title"] = $filter->purify($data["title"]);
-			$data["welcome"] = $filter->purify($data["welcome"]);
-			$data["endtext"] = $filter->purify($data["endtext"]);
-		}
-
 		return $this->insertSomeRecords($data);
     }