Site id parameter for theme list to set correct active theme for current site, excluded backup folder from site duplicate skip folders

Author: givanz

admin/controller/theme/themes.php

@@ -41,7 +41,7 @@ function duplicate() {
 
 		$srcDir      = DIR_THEMES . $theme;
 		$destDir     = DIR_THEMES . $newSlug;
-		$skipFolders = ['backup', 'src', 'node_modules', '.git'];
+		$skipFolders = [/*'backup', */'src', 'node_modules', '.git'];
 
 		if ($dest) {
 			if (file_exists($destDir)) {
@@ -128,7 +128,7 @@ function upload() {
 	}
 
 	function index() {
-		$themes             =  ThemesList :: getList();
+		$themes             =  ThemesList :: getList($this->global['site_id']);
 
 		$this->view->themes = $themes;
 		//$this->view->count  = count($themes);
@@ -179,7 +179,7 @@ function import() {
 	function activate() {
 		$theme = $this->request->get['theme'];
 
-		if (Sites::setTheme($this->global['site_id'], $theme)) {
+		if (Sites::setTheme($this->global['site_id'], $theme, 'index.html')) {
 			$themeName               = \Vvveb\humanReadable($theme);
 			$this->themeActivateUrl  = \Vvveb\url(['module' => 'theme/themes', 'action'=> 'import', 'theme' => $theme]);
 			$successMessage          = sprintf(__('Theme <b>%s</b> was activated!'), $themeName, $this->themeActivateUrl);

system/extensions/themes.php

@@ -48,8 +48,8 @@ static function getInfo($content, $name = false) {
 		return $params;
 	}
 
-	static function getList($path = '') {
-		$activeTheme = Sites::getTheme() ?? 'default';
+	static function getList($site_id = false) {
+		$activeTheme = Sites::getTheme($site_id) ?? 'default';
 		$list        = glob(DIR_ROOT . '/public/themes/*/index.html');
 
 		$themes = [];