Dev: Throw exception if theme extends it self (TODO: Show alert so us…

…er can repair)
LimeSurvey · Jan 16, 2018 · bff5e7e · bff5e7e
1 parent f11c047
commit bff5e7e
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 2 deletions.
diff --git a/application/models/Template.php b/application/models/Template.php
@@ -198,11 +198,15 @@ public function checkTemplate()
         // Check that extended template is installed.
         $this->checkTemplateExtends();
 
+        // A template should not extend it self.
+        $this->checkExtendsItSelf();
+
         return true;
     }
 
     /**
-     * Returns false if any of the extended templates are not installed; otherwise true.
+     * Throws exception if any of the extended templates are not installed; otherwise
+     * returns true.
      * @return boolean
      * @throws Exception if extended template is not installed.
      */
@@ -222,6 +226,23 @@ public function checkTemplateExtends()
         return true;
     }
 
+    /**
+     * @return boolean
+     * @throws Exception if name equals extends.
+     */
+    public function checkExtendsItSelf()
+    {
+        if ($this->name == $this->extends) {
+            throw new Exception(
+                sprintf(
+                    'Error: The template %s extends it self',
+                    $this->name
+                )
+            );
+        }
+        return true;
+    }
+
     /**
      * Check if a given Template has a valid XML File
      * @TODO: check api version

diff --git a/application/models/TemplateConfiguration.php b/application/models/TemplateConfiguration.php
@@ -751,7 +751,9 @@ protected function setMotherTemplates()
     {
         if (!empty($this->template->extends)) {
             $sMotherTemplateName   = $this->template->extends;
-            $this->oMotherTemplate = TemplateConfiguration::getInstanceFromTemplateName($sMotherTemplateName)->prepareTemplateRendering($sMotherTemplateName, null);
+            $instance = TemplateConfiguration::getInstanceFromTemplateName($sMotherTemplateName);
+            $instance->template->checkTemplate();
+            $this->oMotherTemplate = $instance->prepareTemplateRendering($sMotherTemplateName, null);
         }
     }