Fixed issue #7659: OptOut/OptIn page does not load the related template

LimeSurvey · Mar 13, 2013 · da57636 · da57636
1 parent 9a4282c
commit da57636
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 13 deletions.
diff --git a/application/controllers/OptinController.php b/application/controllers/OptinController.php
@@ -99,17 +99,20 @@ function actiontokens($surveyid, $token, $langcode = '')
         {
             $thistpl=getTemplatePath($thissurvey['templatedir']);
         }
-        $this->_renderHtml($html,$thistpl,$clang);
+        $this->_renderHtml($html,$thistpl,$clang,$thissurvey);
     }
 
-    private function _renderHtml($html,$thistpl,$clang)
+    private function _renderHtml($html,$thistpl, $oLanguage, $aSurveyInfo)
     {
         sendCacheHeaders();
         doHeader();
+        $aSupportData=array('thissurvey'=>$aSurveyInfo, 'clang'=>$oLanguage);
+        echo templatereplace(file_get_contents($thistpl.DIRECTORY_SEPARATOR.'startpage.pstpl'),array(), $aSupportData);
         $data['html'] = $html;
         $data['thistpl'] = $thistpl;
-        $data['clang'] = $clang;
         $this->render('/opt_view',$data);
+        echo templatereplace(file_get_contents($thistpl.DIRECTORY_SEPARATOR.'endpage.pstpl'),array(), $aSupportData);
         doFooter();
     }
+
 }
diff --git a/application/controllers/OptoutController.php b/application/controllers/OptoutController.php
@@ -103,7 +103,7 @@ function actiontokens()
             $thistpl=getTemplatePath($thissurvey['templatedir']);
         }
 
-        $this->_renderHtml($html,$thistpl);
+        $this->_renderHtml($html,$thistpl,$thissurvey);
     }
 
     /* This function is run when opting out of the participants system. The other function /optout/token
@@ -203,16 +203,19 @@ function actionparticipants()
             $thistpl=getTemplatePath($thissurvey['templatedir']);
         }
 
-        $this->_renderHtml($html,$thistpl);
+        $this->_renderHtml($html,$thistpl, $thissurvey);
     }
 
-    private function _renderHtml($html,$thistpl)
+    private function _renderHtml($html, $thistpl, $aSurveyInfo)
     {
         sendCacheHeaders();
         doHeader();
+        $aSupportData=array('thissurvey'=>$aSurveyInfo);
+        echo templatereplace(file_get_contents($thistpl.DIRECTORY_SEPARATOR.'startpage.pstpl'),array(), $aSupportData);
         $data['html'] = $html;
         $data['thistpl'] = $thistpl;
         $this->render('/opt_view',$data);
+        echo templatereplace(file_get_contents($thistpl.DIRECTORY_SEPARATOR.'endpage.pstpl'),array(), $aSupportData);
         doFooter();
     }
 

diff --git a/application/views/opt_view.php b/application/views/opt_view.php
@@ -1,12 +1,5 @@
-<?php
-    echo templatereplace(file_get_contents("$thistpl/startpage.pstpl"));
-    echo templatereplace(file_get_contents("$thistpl/survey.pstpl"));
-?>
 <div id="wrapper"><p id="optoutmessage">
 <?php
     echo $html;
 ?>
 </p></div>
-<?php
-    echo templatereplace(file_get_contents("$thistpl/endpage.pstpl"));
-?>