Fixed issue #3994: When importing a survey with an unknown template, …

…question preview is mixed up

Dev: Produces a warning on import but doesn't change anything so one can upload the template later. Question preview uses default tpl when it can not find the defined tpl.

git-svn-id: file:///Users/Shitiz/Downloads/lssvn/source/limesurvey@8255 b72ed6b6-b9f8-46b5-92b4-906544132732

admin/importsurvey.php

@@ -428,7 +428,7 @@
 		while ($isresult->RecordCount()>0);
 	}
 
-
+$importwarning = "";	// used to save the warnings while processing questions
 $insert=$surveyarray[0];
 if ($importversion>=111)
 {
@@ -447,6 +447,7 @@
 $surveyrowdata['sid']=$newsid;
 $surveyrowdata['active']='N';
 
+if (validate_templatedir($surveyrowdata['template'])!==$surveyrowdata['template']) $importwarning .= "<li>". sprintf($clang->gT('Template %s not found, please review when activating.'),$surveyrowdata['template']) ."</li>";
 
 if ($importversion<=100)
 // find the old language field and replace its contents with the new language shortcuts
@@ -760,7 +761,6 @@
 	}
 }
 
-$importwarning = "";	// used to save the warnings while processing questions
 $qtypes = getqtypelist("" ,"array");
 
 // DO GROUPS, QUESTIONS FOR GROUPS, THEN ANSWERS FOR QUESTIONS IN A NESTED FORMAT!
@@ -1414,7 +1414,7 @@
 	echo $clang->gT("Label Sets").": $countlabelsets\n";
     if ($deniedcountlabelsets>0) echo $clang->gT("Not imported Label Sets").": $deniedcountlabelsets (".$clang->gT("(Label Sets were not imported since you do not have the permission to create new label sets.)");
 	echo $clang->gT("Question Attributes").": $countquestion_attributes\n";
-	echo $clang->gT("Assessments").": $countassessments\n\n";
+	echo $clang->gT("Assessments").": $countassessments\n\n";	
 
 	echo $clang->gT("Import of Survey is completed.")."\n";
 	if ($importwarning != "") echo "\n".$clang->gT("Warnings").":\n" . $importwarning . "\n";

admin/preview.php

@@ -52,7 +52,16 @@
             8 => 'N' ); // ia[8] is usedinconditions
 
 $answers = retrieveAnswers($ia);
-$thistpl="$templaterootdir/".$thissurvey['template'];
+
+if (!$thissurvey['template']) 
+{
+    $thistpl=$templaterootdir."/".$defaulttemplate;
+} 
+    else 
+    {
+        $thistpl=$templaterootdir."/".validate_templatedir($thissurvey['template']);
+    }
+
 doHeader();
 $dummy_js = '
 		    <!-- JAVASCRIPT FOR CONDITIONAL QUESTIONS -->