Impossible to upload some themes - issue #579

.gitignore

@@ -36,7 +36,10 @@ composer.lock
 /config/settings.inc.php
 /config/settings.old.php
 /config/xml/*
+!/config/xml/themes/
+/config/xml/themes/*
 !/config/xml/themes/default.xml
+!/config/xml/themes/community-theme-default.xml
 
 /config/defines_custom.inc.php
 /config/settings_custom.inc.php

classes/Theme.php

@@ -192,30 +192,21 @@ public static function getThemeInfo($idTheme)
         $theme = new Theme((int) $idTheme);
         $themeArr = [];
 
-        if (file_exists(_PS_ROOT_DIR_.'/config/xml/themes/'.$theme->directory.'.xml')) {
-            $configFile = _PS_ROOT_DIR_.'/config/xml/themes/'.$theme->directory.'.xml';
-        } elseif ($theme->name == 'community-theme-default') {
-            $configFile = _PS_ROOT_DIR_.'/config/xml/themes/default.xml';
-        } else {
-            $configFile = false;
-        }
+        $xmlTheme = $theme->loadConfigFile();
 
-        if ($configFile) {
+        if ($xmlTheme) {
             $themeArr['theme_id'] = (int) $theme->id;
-            $xmlTheme = @simplexml_load_file($configFile);
 
-            if ($xmlTheme !== false) {
-                foreach ($xmlTheme->attributes() as $key => $value) {
-                    $themeArr['theme_'.$key] = (string) $value;
-                }
+            foreach ($xmlTheme->attributes() as $key => $value) {
+                $themeArr['theme_'.$key] = (string) $value;
+            }
 
-                foreach ($xmlTheme->author->attributes() as $key => $value) {
-                    $themeArr['author_'.$key] = (string) $value;
-                }
+            foreach ($xmlTheme->author->attributes() as $key => $value) {
+                $themeArr['author_'.$key] = (string) $value;
+            }
 
-                if ($themeArr['theme_name'] == 'community-theme-default') {
-                    $themeArr['tc'] = Module::isEnabled('themeconfigurator');
-                }
+            if ($themeArr['theme_name'] == 'community-theme-default') {
+                $themeArr['tc'] = Module::isEnabled('themeconfigurator');
             }
         } else {
             // If no xml we use data from database
@@ -241,9 +232,12 @@ public static function getNonInstalledTheme()
         $notInstalledTheme = [];
         foreach (glob(_PS_ALL_THEMES_DIR_.'*', GLOB_ONLYDIR) as $themeDir) {
             $dir = basename($themeDir);
-            $configFile = _PS_ALL_THEMES_DIR_.$dir.'/config.xml';
-            if (!in_array($dir, $installedThemeDirectories) && @filemtime($configFile)) {
-                if ($xmlTheme = @simplexml_load_file($configFile)) {
+            if (!in_array($dir, $installedThemeDirectories)) {
+                $xmlTheme = static::loadConfigFromFile(_PS_ALL_THEMES_DIR_.$dir.'/Config.xml', true);
+                if (! $xmlTheme) {
+                    $xmlTheme = static::loadConfigFromFile(_PS_ALL_THEMES_DIR_.$dir.'/config.xml', true);
+                }
+                if ($xmlTheme) {
                     $theme = [];
                     foreach ($xmlTheme->attributes() as $key => $value) {
                         $theme[$key] = (string) $value;
@@ -557,17 +551,108 @@ public function toggleDefaultRightColumn()
      */
     public function getConfiguration()
     {
-        $target = _PS_ROOT_DIR_.'/themes/'.$this->name.'/Config.xml';
-        if (!file_exists($target)) {
-            $target = _PS_ROOT_DIR_.'/themes/'.$this->name.'/config.xml';
-            if (!file_exists($target)) {
-                return [];
+        $ob = $this->loadConfigFile();
+        if ($ob) {
+            // convert SimpleXMLElement to array
+            return json_decode(json_encode($ob), true);
+        }
+        return [];
+    }
+
+    /**
+     * Get the configuration file as SimpleXMLElement
+     *
+     * @param boolean $validate - if true, configuration file will be validated
+     *
+     * @return SimpleXMLElement | false
+     *
+     * @since 1.0.7
+     */
+    public function loadConfigFile($validate=false)
+    {
+        return static::loadConfigFromFile($this->getConfigFilePath(), $validate);
+    }
+
+
+    /**
+     * Get the path to configuration file
+     *
+     * @return string | false
+     *
+     * @since 1.0.7
+     */
+    protected function getConfigFilePath()
+    {
+        $path = _PS_ROOT_DIR_.'/config/xml/themes/'.$this->directory.'.xml';
+        if (file_exists($path)) {
+            return $path;
+        }
+
+        if ($this->name == 'community-theme-default') {
+            $path = _PS_ROOT_DIR_.'/config/xml/themes/default.xml';
+            if (file_exists($path)) {
+                return $path;
+            }
+        }
+
+        return false;
+    }
+
+    /**
+     * Get the configuration file as SimpleXMLElement
+     *
+     * @param string $filePath - path to xml config file to load
+     * @param boolean $validate - if true, configuration file will be validated
+     *
+     * @return SimpleXMLElement | false
+     *
+     * @since 1.0.7
+     */
+    public static function loadConfigFromFile($filePath, $validate)
+    {
+        if (file_exists($filePath)) {
+            $content = @simplexml_load_file($filePath);
+            if ($content && $validate && !static::validateConfigFile($content)) {
+                return false;
             }
+            return $content;
         }
+        return false;
+    }
 
-        $xmlfile = file_get_contents($target);
-        $ob = simplexml_load_string($xmlfile);
-        $json = json_encode($ob);
-        return json_decode($json, true);
+    /**
+     * Validate xml fields in config file
+     *
+     * @param SimpleXMLElement $xml
+     *
+     * @return boolean
+     *
+     * @since 1.0.7
+     */
+    public static function validateConfigFile($xml)
+    {
+        if (! $xml) {
+            return false;
+        }
+        if (!$xml['version'] || !$xml['name']) {
+            return false;
+        }
+        foreach ($xml->variations->variation as $val) {
+            if (!$val['name'] || !$val['directory'] || !$val['from'] || !$val['to']) {
+                return false;
+            }
+        }
+        foreach ($xml->modules->module as $val) {
+            if (!$val['action'] || !$val['name']) {
+                return false;
+            }
+        }
+        foreach ($xml->modules->hooks->hook as $val) {
+            if (!$val['module'] || !$val['hook'] || !$val['position']) {
+                return false;
+            }
+        }
+        return true;
     }
+
 }