Fixed error: Templates that were not the 'default' were not displayed…

… properly
LimeSurvey · Aug 24, 2017 · a8d3b8f · a8d3b8f
1 parent 9c3f07f
commit a8d3b8f
Show file tree

Hide file tree

Showing 11 changed files with 28 additions and 76 deletions.
diff --git a/application/controllers/admin/SurveysGroupsController.php b/application/controllers/admin/SurveysGroupsController.php
@@ -78,7 +78,7 @@ public function update($id)
         $oSurveySearch->gsid = $model->gsid;
         $aData['oSurveySearch'] = $oSurveySearch;
 
-        $oTemplateOptions = Template::getTemplateConfiguration(null, null, $model->gsid);
+        $oTemplateOptions = TemplateConfiguration::getInstance(null, null, $model->gsid);
         $oTemplateOptions->bUseMagicInherit = false;
         $oTemplateOptionsReplacement = TemplateConfiguration::model()->findByPk($oTemplateOptions->id);
         $templateOptionPage           = $oTemplateOptionsReplacement->optionPage;

diff --git a/application/controllers/admin/database.php b/application/controllers/admin/database.php
@@ -1031,7 +1031,7 @@ private function actionUpdateSurveyLocaleSettings($iSurveyID)
             $current_template = $oSurvey->template;
             $new_template =  $this->_filterEmptyFields($oSurvey,'template');
             if(  $current_template != '' && $current_template !== $new_template ){
-                $currentConfiguration = Template::getTemplateConfiguration($current_template, $oSurvey->sid);
+                $currentConfiguration = TemplateConfiguration::getInstance($current_template, $oSurvey->gsid, $oSurvey->sid);
 
                 if(is_a($currentConfiguration, "TemplateConfiguration"))
                     TemplateConfiguration::model()->deleteByPk($currentConfiguration->id);

diff --git a/application/controllers/admin/templateoptions.php b/application/controllers/admin/templateoptions.php
@@ -126,7 +126,7 @@ public function updatesurvey($sid)
             $this->getController()->redirect(Yii::app()->getController()->createUrl("/admin/templateoptions/sa/updatesurvey",['surveyid'=>$sid,'sid'=>$sid]));
         }
 
-        $model = Template::getTemplateConfiguration(null, $sid);
+        $model = TemplateConfiguration::getInstance(null, null, $sid);
 
 
         if(isset($_POST['TemplateConfiguration'])){
@@ -150,7 +150,7 @@ public function updatesurveygroup($gsid)
             $this->getController()->redirect(Yii::app()->getController()->createUrl("/admin/surveysgroups/sa/update/",['id'=>$gsid]));
         }
 
-        $model = Template::getTemplateConfiguration(null, null, $gsid);
+        $model = TemplateConfiguration::getInstance(null, $gsid);
 
 
         if(isset($_POST['TemplateConfiguration'])){

diff --git a/application/controllers/admin/templates.php b/application/controllers/admin/templates.php
@@ -42,8 +42,8 @@ public function runWithParams($params)
     */
     public function templatezip($templatename)
     {
-        $oEditedTemplate = Template::model()->getTemplateConfiguration($templatename);
-        $oEditedTemplate->prepareTemplateRendering($sTemplateName);
+        $oEditedTemplate = Template::getInstance($templatename);
+
         if (!Permission::model()->hasGlobalPermission('templates','export'))
         {
             die('No permission');
@@ -229,8 +229,8 @@ public function uploadfile()
         $action = returnGlobal('action');
         $editfile = App()->request->getPost('editfile');
         $templatename = returnGlobal('templatename');
-        $oEditedTemplate = Template::model()->getTemplateConfiguration($templatename);
-        $oEditedTemplate->prepareTemplateRendering($sTemplateName);
+        $oEditedTemplate = Template::getInstance($templatename);
+
         $templatedir = $oEditedTemplate->viewPath;
         $screenname = returnGlobal('screenname');
         $cssfiles = $oEditedTemplate->getValidScreenFiles("css");
@@ -389,7 +389,7 @@ public function templatefiledelete()
         }
 
         $sTemplateName   = Template::templateNameFilter(App()->request->getPost('templatename'));
-        $oEditedTemplate = Template::model()->getTemplateConfiguration($sTemplateName); $oEditedTemplate->prepareTemplateRendering($sTemplateName);
+        $oEditedTemplate = Template::getInstance($sTemplateName);
         $templatedir     = $oEditedTemplate->viewPath;
         $filesdir        = $oEditedTemplate->filesPath;
         $sPostedFile     = App()->request->getPost('otherfile');
@@ -781,7 +781,7 @@ protected function _templatesummary($templatename, $screenname, $editfile, $rela
     protected function _initialise($templatename, $screenname, $editfile, $showsummary = true)
     {
         // LimeSurvey style
-        $oEditedTemplate = Template::model()->getInstance($templatename, null,null, true);
+        $oEditedTemplate = Template::getInstance($templatename, null,null, true);
 
             //App()->getClientScript()->reset();
         Yii::app()->loadHelper('surveytranslator');

diff --git a/application/helpers/admin/template_helper.php b/application/helpers/admin/template_helper.php
@@ -41,24 +41,6 @@ function getListOfFiles($wh){
     return $arr;
 }
 
-/**
-* Load this editfile
-*
-* @param string $template name
-* @param string $templatefile
-* @param string[] $templates directory
-* @return string
-*/
-function filetext($templatename,$templatefile,$templates) {
-    $sFileName = gettemplatefilename($templatename,$templatefile);
-    if (file_exists($sFileName))
-    {
-        return file_get_contents($sFileName);
-    }
-    else
-    {
-    }
-}
 
 /**
  * @param string $target
@@ -155,34 +137,3 @@ function templateExtractFilter($p_event, &$p_header)
     }
 }
 
-/**
-* Determine the storage path for a file
-* TODO: remove all that logic.
-*
-* @param string $template
-* @param string $templatefile
-*/
-function gettemplatefilename($template, $templatefile) {
-    $oEditedTemplate = Template::model()->getTemplateConfiguration($template);
-    switch (pathinfo($templatefile, PATHINFO_EXTENSION))
-    {
-        case 'twig':
-            // TODO: recursivity
-            $oEditedTemplate = Template::model()->getTemplateConfiguration($template);
-            return $oEditedTemplate->viewPath.$templatefile;
-            break;
-        case 'pstpl':
-            $oEditedTemplate = Template::model()->getTemplateConfiguration($template);
-            return $oEditedTemplate->viewPath.$templatefile;
-            break;
-        case 'css':
-            return $oEditedTemplate->path.DIRECTORY_SEPARATOR.$templatefile;
-            break;
-        case 'js':
-            return $oEditedTemplate->path.DIRECTORY_SEPARATOR.$templatefile;
-            break;
-        default:
-            return $oEditedTemplate->path.DIRECTORY_SEPARATOR.$templatefile;
-            break;
-    }
-}
diff --git a/application/models/Survey.php b/application/models/Survey.php
@@ -589,7 +589,7 @@ public function getGoogleanalyticsapikey(){
     }
 
     public function getSurveyTemplateConfiguration(){
-        return Template::getTemplateConfiguration(null, $this->sid);
+        return TemplateConfiguration::getInstance(null, null, $this->sid);
     }
 
     private function _createSurveymenuArray($oSurveyMenuObjects)

diff --git a/application/models/Template.php b/application/models/Template.php
@@ -375,18 +375,19 @@ public static function isStandardTemplate($sTemplateName)
      * @param int|string $iSurveyGroupId
      * @return TemplateConfiguration
      */
-    public static function getInstance($sTemplateName='', $iSurveyId='', $iSurveyGroupId='', $bForceXML=false)
+    public static function getInstance($sTemplateName=null, $iSurveyId=null, $iSurveyGroupId=null, $bForceXML=null)
     {
-
-        // Template developper could prefer to work with XML rather than DB as a first step, for quick and easy changes
-        if (App()->getConfig('force_xmlsettings_for_survey_rendering') && YII_DEBUG){
-            $bForceXML=true;
-        }elseif( App()->getConfig('force_xmlsettings_for_survey_rendering') && YII_DEBUG){
-            $bForceXML=false;
+        if($bForceXML === null){
+            // Template developper could prefer to work with XML rather than DB as a first step, for quick and easy changes
+            if (App()->getConfig('force_xmlsettings_for_survey_rendering') && YII_DEBUG){
+                $bForceXML=true;
+            }elseif( App()->getConfig('force_xmlsettings_for_survey_rendering') && YII_DEBUG){
+                $bForceXML=false;
+            }
         }
 
         if (empty(self::$instance)) {
-            self::$instance = self::getTemplateConfiguration($sTemplateName, $iSurveyId, $iSurveyGroupId, $bForceXML);
+            self::$instance = self::getTemplateConfiguration($sTemplateName, $iSurveyGroupId, $iSurveyId, $bForceXML);
             self::$instance->prepareTemplateRendering($sTemplateName, $iSurveyId);
         }
 

diff --git a/application/models/TemplateConfig.php b/application/models/TemplateConfig.php
@@ -266,7 +266,7 @@ protected function setIsStandard()
     // Then, the lonely differences between TemplateManifest and TemplateConfiguration should be how to retreive and format the data
     // Note: signature are already the same
 
-    public function prepareTemplateRendering($sTemplateName='', $iSurveyId=''){}
+    public function prepareTemplateRendering($sTemplateName='', $iSurveyId='', $bUseMagicInherit=true){}
     public function addFileReplacement($sFile, $sType){}
 
     protected function getFilesToLoad($oTemplate, $sType){}

diff --git a/application/models/TemplateConfiguration.php b/application/models/TemplateConfiguration.php
@@ -375,9 +375,9 @@ public function checkTemplate()
      * @param  string $iSurveyId the id of the survey. If
      * @return $this
      */
-    public function prepareTemplateRendering($sTemplateName='', $iSurveyId='')
+    public function prepareTemplateRendering($sTemplateName='', $iSurveyId='', $bUseMagicInherit=true)
     {
-        $this->bUseMagicInherit = true;
+        $this->bUseMagicInherit = $bUseMagicInherit;
         $this->sTemplateName = $this->template->name;
         $this->setIsStandard();                                                 // Check if  it is a CORE template
         $this->path = ($this->isStandard)
@@ -553,10 +553,10 @@ protected function setMotherTemplates()
     {
         if(!empty($this->template->extends_templates_name)){
             $sMotherTemplateName   = $this->template->extends_templates_name;
-            $this->oMotherTemplate = Template::getTemplateConfiguration($sMotherTemplateName);
-            $this->oMotherTemplate->prepareTemplateRendering($sMotherTemplateName);
+            $this->oMotherTemplate = TemplateConfiguration::getInstanceFromTemplateName($sMotherTemplateName);
+            $this->oMotherTemplate->prepareTemplateRendering($sMotherTemplateName, null);
             if ($this->oMotherTemplate->checkTemplate()){
-                $this->oMotherTemplate->prepareTemplateRendering($sMotherTemplateName); // Object Recursion
+                $this->oMotherTemplate->prepareTemplateRendering($sMotherTemplateName, null); // Object Recursion
             }else{
                 // Throw exception? Set to default template?
             }

diff --git a/application/models/TemplateManifest.php b/application/models/TemplateManifest.php
@@ -368,7 +368,7 @@ private function setTemplateName($sTemplateName='', $iSurveyId='')
      * @param  string $iSurveyId the id of the survey. If
      * @return $this
      */
-    public function prepareTemplateRendering($sTemplateName='', $iSurveyId='')
+    public function prepareTemplateRendering($sTemplateName='', $iSurveyId='', $bUseMagicInherit=true)
     {
         $this->setTemplateName($sTemplateName, $iSurveyId);                     // Check and set template name
         $this->setIsStandard();                                                 // Check if  it is a CORE template

diff --git a/templates/default/views/subviews/start_form.twig b/templates/default/views/subviews/start_form.twig
@@ -31,7 +31,7 @@
         'id'          : 'limesurvey',
         'name'        : 'limesurvey',
         'autocomplete': 'off',
-        'class'       : 'survey-form-container',
+        'class'       : 'survey-form-container form-horizontal',
     }
 %}