Fixed issue: Redirect in public registration plugins always wrong

LimeSurvey · Jun 27, 2018 · d4c5d3b · d4c5d3b
1 parent 1c65964
commit d4c5d3b
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 2 deletions.
diff --git a/application/controllers/RegisterController.php b/application/controllers/RegisterController.php
@@ -132,7 +132,7 @@ public function actionIndex($sid = null)
             $directLogin = $event->get('directLogin', false);
             if ($directLogin == true) {
                 $oToken = Token::model($iSurveyId)->findByPk($iTokenId);
-                $redirectUrl = Yii::app()->getController()->createUrl('/'.$iSurveyId.'/', array('token' => $oToken->token, 'lang'=>$sLanguage));
+                $redirectUrl = Yii::app()->getController()->createUrl('/survey/', array('sid' => $iSurveyId,'token' => $oToken->token, 'lang'=>$sLanguage));
                 Yii::app()->getController()->redirect($redirectUrl);
                 Yii::app()->end();
             }

diff --git a/application/models/TemplateConfig.php b/application/models/TemplateConfig.php
@@ -547,10 +547,11 @@ public function getClassAndAttributes()
         $aClassAndAttributes['class']['registerform']             = ' register-form  ';
         $aClassAndAttributes['class']['registerul']               = '  ';
         $aClassAndAttributes['class']['registerformcolrowlabel']  = ' ';
-        $aClassAndAttributes['class']['registerformcol']          = '  ';
+        $aClassAndAttributes['class']['registerformcol']          = ' register-form-column ';
         $aClassAndAttributes['class']['registerformcolrow']       = ' ';
         $aClassAndAttributes['class']['registerformcolrowb']      = '  ';
         $aClassAndAttributes['class']['registerformcolrowc']      = '  ';
+        $aClassAndAttributes['class']['registerformcoladdidtions']= ' register-form-column-additions ';
         $aClassAndAttributes['class']['registerformextras']       = '  ';
         $aClassAndAttributes['class']['registerformcaptcha']      = ' captcha-item ';
         $aClassAndAttributes['class']['registerformcolrowblabel'] = ' ';

diff --git a/themes/survey/vanilla/views/subviews/registration/register_form.twig b/themes/survey/vanilla/views/subviews/registration/register_form.twig
@@ -93,6 +93,8 @@
         </div>
 
         {# If there is additional form parts, a.e. trhough a plugin render it out here #}
+    </div>
+    <div class='{{ aSurveyInfo.class.registerformcoladdidtions }} col-md-8 col-md-offset-2' {{ aSurveyInfo.attr.registerformcoladdidtions }}>
         {{ aSurveyInfo.formAdditions | raw  }}
     </div>