fix and unify plugin load logic

system/typemill/Assets.php

@@ -91,7 +91,7 @@ class Assets
 
 	public function activateVue()
 	{
-		$vueUrl = '<script src="' . $this->baseUrl . '/system/author/js/vue.js"></script>';
+		$vueUrl = '<script src="' . $this->baseUrl . '/system/typemill/author/js/vue.js"></script>';
 		if(!in_array($vueUrl, $this->JS))
 		{
 			$this->JS[] = $vueUrl;
@@ -100,7 +100,7 @@ class Assets
 
 	public function activateAxios()
 	{
-		$axiosUrl = '<script src="' . $this->baseUrl . '/system/author/js/axios.min.js"></script>';
+		$axiosUrl = '<script src="' . $this->baseUrl . '/system/typemill/author/js/axios.min.js"></script>';
 		if(!in_array($axiosUrl, $this->JS))
 		{
 			$this->JS[] = $axiosUrl;

system/typemill/Models/Extension.php

@@ -128,18 +128,14 @@ class Extension
 
 	public function getPlugins()
 	{
-		$pluginFolder 	= $this->storage->getFolderPath('pluginsFolder');
-		$pluginFolderC 	= scandir($pluginFolder);
-		$plugins 		= [];
-		foreach ($pluginFolderC as $key => $plugin)
+
+		$pluginlist = \Typemill\Static\Plugins::loadPlugins();
+
+		$plugins = [];
+
+		foreach($pluginlist as $plugin)
 		{
-			if (!in_array($plugin, [".",".."]))
-			{
-				if (is_dir($pluginFolder . DIRECTORY_SEPARATOR . $plugin))
-				{
-					$plugins[] = $plugin;
-				}
-			}
+			$plugins[] = $plugin['name'];
 		}
 
 		return $plugins;

system/typemill/Static/Plugins.php

@@ -9,7 +9,7 @@ class Plugins
 		$rootpath 			= getcwd();
 		$pluginFolder 		= self::scanPluginFolder($rootpath);
 		$classNames 		= [];
-
+		
 		# iterate over plugin folders
 		foreach($pluginFolder as $plugin)
 		{

system/typemill/author/js/vue-plugins.js

@@ -139,6 +139,11 @@ const app = Vue.createApp({
 	methods: {
 		getActiveClass(pluginname)
 		{
+			if(typeof this.formData[pluginname] == "undefined")
+			{
+				console.info(pluginname);
+				return;
+			}
 			if(this.formData[pluginname]['active'])
 			{
 				return 'bg-stone-200 dark:bg-stone-900';

system/typemill/system.php

@@ -58,7 +58,6 @@ $settings = $settingsModel->loadSettings();
 /****************************
 * HANDLE DISPLAY ERRORS 	  *
 ****************************/
-
 if(isset($settings['displayErrorDetails']) && $settings['displayErrorDetails'])
 {
 	ini_set('display_errors', 1);