Fixed issue #10646: No error msg when validating registration form

LimeSurvey · Mar 7, 2016 · a53ba3c · a53ba3c
1 parent 8f99ed4
commit a53ba3c
Show file tree

Hide file tree

Showing 6 changed files with 12 additions and 11 deletions.
diff --git a/application/controllers/RegisterController.php b/application/controllers/RegisterController.php
@@ -154,10 +154,9 @@ public function getRegisterErrors($iSurveyId){
         }
     }
 
-    public function getRegisterForm($iSurveyId){
-
+    public function getRegisterForm($iSurveyId)
+    {
         $aSurveyInfo=getSurveyInfo($iSurveyId,App()->language);
-        $sTemplate=getTemplatePath($aSurveyInfo['template']);
 
         // Event to replace register form
         $event = new PluginEvent('beforeRegisterForm');
@@ -197,8 +196,9 @@ public function getRegisterForm($iSurveyId){
         $aData['thissurvey'] = $aSurveyInfo;
         Yii::app()->setConfig('surveyID',$iSurveyId);//Needed for languagechanger
         $aData['languagechanger'] = makeLanguageChangerSurvey(App()->language);
-
-        $oTemplate = Template::model()->getInstance($sTemplate);
+        global $oTemplate;
+        $oTemplate = new TemplateConfiguration;
+        $oTemplate->setTemplateConfiguration('',$iSurveyId);
         return templatereplace(file_get_contents($oTemplate->viewPath . "/register.pstpl"),$aReplacement,$aData);
     }
 

diff --git a/application/models/TemplateConfiguration.php b/application/models/TemplateConfiguration.php
@@ -99,15 +99,15 @@ public function setTemplateConfiguration($sTemplateName='', $iSurveyId='')
             else
             {
                 $this->path = Yii::app()->getConfig("standardtemplaterootdir").DIRECTORY_SEPARATOR.$this->sTemplateName;
-                $this->xmlFile = $this->path.'config.xml';
+                $this->xmlFile = $this->path.DIRECTORY_SEPARATOR.'config.xml';
             }
 
         }
         else
         {
             $this->xmlFile = $this->path.DIRECTORY_SEPARATOR.'config.xml';
         }
-
+        //var_dump(realpath ($this->xmlFile)); die();
         $this->config = simplexml_load_file(realpath ($this->xmlFile));
 
         // The template configuration.

diff --git a/application/views/register/display.php b/application/views/register/display.php
@@ -1,5 +1,6 @@
 <?php
-    $oTemplate = Template::model()->getInstance($sTemplate);
+    global $oTemplate;
+
     echo templatereplace(file_get_contents($oTemplate->viewPath."startpage.pstpl"),array(),$aData);
     echo templatereplace(file_get_contents($oTemplate->viewPath."survey.pstpl"),array(),$aData);
     echo $content;

diff --git a/templates/default/views/register.pstpl b/templates/default/views/register.pstpl
@@ -1,4 +1,4 @@
-<span class="warning-text">{REGISTERERROR}</span>
+<div class="alert alert-danger" role="alert">{REGISTERERROR}</div>
 <p class="register-message-1">{REGISTERMESSAGE1}</p>
 <p class="register-message-2">{REGISTERMESSAGE2}</p>
 <div class="register-form">{REGISTERFORM}</div>
diff --git a/templates/news_paper/views/register.pstpl b/templates/news_paper/views/register.pstpl
@@ -1,4 +1,4 @@
-<span class="warning-text">{REGISTERERROR}</span>
+<div class="alert alert-danger" role="alert">{REGISTERERROR}</div>
 <p class="register-message-1">{REGISTERMESSAGE1}</p>
 <p class="register-message-2">{REGISTERMESSAGE2}</p>
 <div class="register-form">{REGISTERFORM}</div>
diff --git a/templates/ubuntu_orange/views/register.pstpl b/templates/ubuntu_orange/views/register.pstpl
@@ -1,4 +1,4 @@
-<span class="warning-text">{REGISTERERROR}</span>
+<div class="alert alert-danger" role="alert">{REGISTERERROR}</div>
 <p class="register-message-1">{REGISTERMESSAGE1}</p>
 <p class="register-message-2">{REGISTERMESSAGE2}</p>
 <div class="register-form">{REGISTERFORM}</div>