Fixed issue #6708: Error messages not displaying at survey signup whe…

…n user did not completely/correctly fill out the form
LimeSurvey · Oct 16, 2012 · 13ae777 · 13ae777
1 parent 887eb23
commit 13ae777
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 3 deletions.
diff --git a/application/controllers/RegisterController.php b/application/controllers/RegisterController.php
@@ -122,6 +122,7 @@ function actionIndex($surveyid = null)
         }
         if ($register_errormsg != "")
         {
+            $_SESSION['survey_'.$surveyid]['register_errormsg']=$register_errormsg;
             Yii::app()->request->redirect(Yii::app()->createUrl('survey/index/sid/'.$surveyid));
         }
 
@@ -132,6 +133,7 @@ function actionIndex($surveyid = null)
         if ($usrow)
         {
             $register_errormsg=$clang->gT("The email you used has already been registered.");
+            $_SESSION['survey_'.$surveyid]['register_errormsg']=$register_errormsg;
             Yii::app()->request->redirect(Yii::app()->createUrl('survey/index/sid/'.$surveyid));
             //include "index.php";
             //exit;

diff --git a/application/helpers/replacements_helper.php b/application/helpers/replacements_helper.php
@@ -768,10 +768,14 @@ function templatereplace($line, $replacements = array(), &$redata = array(), $de
     {
         $_endtext = $thissurvey['surveyls_endtext'];
     }
+    if (isset($_SESSION['survey_'.$surveyid]) && isset($_SESSION['survey_'.$surveyid]['register_errormsg']))
+    {
+        $register_errormsg=$_SESSION['survey_'.$surveyid]['register_errormsg'];
+        unset($_SESSION['survey_'.$surveyid]['register_errormsg']);
+    }
 
 
     // Set the array of replacement variables here - don't include curly braces
-
     $coreReplacements = array();
 	$coreReplacements['ACTIVE'] = (isset($thissurvey['active']) && !($thissurvey['active'] != "Y"));
     $coreReplacements['AID'] = isset($questiondetails['aid']) ? $questiondetails['aid'] : '';

diff --git a/scripts/admin/questions.js b/scripts/admin/questions.js
@@ -16,10 +16,10 @@ $(document).ready(function(){
         if ( key==null || key==0 || key==8 || key==9  || key==27 )
             return true;
         thischar=String.fromCharCode(key);
-        returnvalue=(thischar==thischar.replace(/['`~!@#$%^&*()_|+\-=?;:'",.<>\{\}\[\]\\\/]/gi,''));
+        returnvalue=(thischar==thischar.replace(/['`~!@#$%^&*()|+\-=?;:'",.<>\{\}\[\]\\\/]/gi,''));
         return returnvalue;
     });
     $("body").delegate("#title", "keyup", function() {
-        $(this).val($(this).val().replace(/['`~!@#$%^&*()_|+\-=?;:'",.<>\{\}\[\]\\\/]/gi,''));
+        $(this).val($(this).val().replace(/['`~!@#$%^&*()|+\-=?;:'",.<>\{\}\[\]\\\/]/gi,''));
     });
 });