Dev More updates to $redata arrays that feed templatereplace().

Dev More testing needed to (a) ensure don't pass undefined variables, and (b) ensure all needed vars declared before $redata declaration (else not available to templatereplace())

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

application/controllers/admin/question.php

@@ -1308,37 +1308,37 @@ function noop_checkconditions(value, name, type)
 		};
 
 $redata = array(
-	'answer' => &$answer,
-	'assessments' => &$assessments,
-	'captchapath' => &$captchapath,
-	'clienttoken' => &$clienttoken,
-	'completed' => &$completed,
-	'errormsg' => &$errormsg,
-	'groupdescription' => &$groupdescription,
-	'groupname' => &$groupname,
-	'help' => &$help,
-	'imageurl' => &$imageurl,
-	'languagechanger' => &$languagechanger,
-	'loadname' => &$loadname,
-	'move' => &$move,
-	'navigator' => &$navigator,
-	'percentcomplete' => &$percentcomplete,
-	'privacy' => &$privacy,
-	'question' => &$question,
-	'register_errormsg' => &$register_errormsg,
-	'relativeurl' => &$relativeurl,
-	's_lang' => &$s_lang,
-	'saved_id' => &$saved_id,
-	'showgroupinfo' => &$showgroupinfo,
-	'showqnumcode' => &$showqnumcode,
-	'showXquestions' => &$showXquestions,
-	'sitename' => &$sitename,
-	'surveylist' => &$surveylist,
-	'templatedir' => &$templatedir,
-	'thissurvey' => &$thissurvey,
-	'token' => &$token,
-	'totalBoilerplatequestions' => &$totalBoilerplatequestions,
-	'totalquestions' => &$totalquestions,
+	'answer' => $answer,
+	'assessments' => $assessments,
+	'captchapath' => $captchapath,
+	'clienttoken' => $clienttoken,
+	'completed' => $completed,
+	'errormsg' => $errormsg,
+	'groupdescription' => $groupdescription,
+	'groupname' => $groupname,
+	'help' => $help,
+	'imageurl' => $imageurl,
+	'languagechanger' => $languagechanger,
+	'loadname' => $loadname,
+	'move' => $move,
+	'navigator' => $navigator,
+	'percentcomplete' => $percentcomplete,
+	'privacy' => $privacy,
+	'question' => $question,
+	'register_errormsg' => $register_errormsg,
+	'relativeurl' => $relativeurl,
+	's_lang' => $s_lang,
+	'saved_id' => $saved_id,
+	'showgroupinfo' => $showgroupinfo,
+	'showqnumcode' => $showqnumcode,
+	'showXquestions' => $showXquestions,
+	'sitename' => $sitename,
+	'surveylist' => $surveylist,
+	'templatedir' => $templatedir,
+	'thissurvey' => $thissurvey,
+	'token' => $token,
+	'totalBoilerplatequestions' => $totalBoilerplatequestions,
+	'totalquestions' => $totalquestions,
 );
 
 

application/controllers/admin/tokens.php

@@ -455,7 +455,8 @@ function adddummys($surveyid)
 		    }
 
 		    $santitizedtoken='';
-
+
+            $tokenoutput = '';
 		    $tokenoutput .= "\t<div class='header ui-widget-header'>".$clang->gT("Add dummy tokens")."</div>\n"
 		    ."\t<div class='messagebox ui-corner-all'>\n";
 		    $data = array('firstname' => $_POST['firstname'],