Fixed issue: survey url params not transferred after captcha

LimeSurvey · Nov 27, 2017 · f5871e5 · f5871e5
1 parent ae07e40
commit f5871e5
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 2 deletions.
diff --git a/application/views/survey/frontpage/enterCaptcha.php b/application/views/survey/frontpage/enterCaptcha.php
@@ -1,3 +1,7 @@
+<?php
+    $currentUrl = $_SERVER['REQUEST_URI'];
+    $urlParted = parse_url($currentUrl);
+?>
 <div class="tokenmessage-wrapper">
     <?php if (isset($error)): ?>
         <span class='error'>$error</span><br/>
@@ -16,7 +20,7 @@
     </div>
     <?php endif; ?>
     <div class="container">
-        <?php echo CHtml::beginForm(array("/survey/index/sid/{$iSurveyId}"), 'post', array(
+        <?php echo CHtml::beginForm($urlParted['path'].'?'.$urlParted['query'], 'post', array(
             'id' => 'tokenform',
             'class' => 'form-horizontal col-sm-12 col-md-10 col-md-offset-1'
         )); ?>

diff --git a/application/views/survey/frontpage/enterToken.php b/application/views/survey/frontpage/enterToken.php
@@ -1,3 +1,7 @@
+<?php
+    $currentUrl = $_SERVER['REQUEST_URI'];
+    $urlParted = parse_url($currentUrl);
+?>
 <div class="tokenmessage-wrapper">
     <?php if (isset($error)): ?>
         <span class='error'>$error</span><br/>
@@ -22,7 +26,7 @@
     <?php endif; ?>
 
     <div class="container">
-        <?php echo CHtml::beginForm(array("/survey/index/sid/{$iSurveyId}"), 'post', array(
+        <?php echo CHtml::beginForm($urlParted['path'].'?'.$urlParted['query'], 'post', array(
             'id' => 'tokenform',
             'class' => 'form-horizontal col-sm-12 col-md-10 col-md-offset-1'
         )); ?>