JuKu / JuKuCMS

system/packages/com.jukusoft.cms.dwoo/dwoo/lib/Dwoo/Plugins/Blocks/PluginLang.php

Indentation +38 added lines, -38 removed lines

@@ -32,64 +32,64 @@
 
 class PluginLang extends Plugin implements ICompilableBlock {
 
-	protected static $domain = "";
-
-	/**
-	 * @param Compiler $compiler
-	 * @param mixed    $value
-	 * @param mixed    $var
-	 *
-	 * @return string
-	 */
-	/*public static function compile(Compiler $compiler, $value, $domain = "") {
+    protected static $domain = "";
+
+    /**
+     * @param Compiler $compiler
+     * @param mixed    $value
+     * @param mixed    $var
+     *
+     * @return string
+     */
+    /*public static function compile(Compiler $compiler, $value, $domain = "") {
 		return 'Translator::translate(' . $value . ', ' . $domain . ')';
 	}*/
 
-	// parameters go here if you need any settings
-	public function init() {
-		//
-	}
+    // parameters go here if you need any settings
+    public function init() {
+        //
+    }
 
-	// this can be ommitted, it's called once when the block ends, don't implement if you don't need it
-	public function end() {
-		//
-	}
+    // this can be ommitted, it's called once when the block ends, don't implement if you don't need it
+    public function end() {
+        //
+    }
 
-	// this is called when the block is required to output it's data, it should read $this->buffer, process it and return it
-	/*public function process(){
+    // this is called when the block is required to output it's data, it should read $this->buffer, process it and return it
+    /*public function process(){
 		var_dump($this->buffer);
 
 		return strtoupper($this->buffer);
 	}*/
 
-	public static function preProcessing(Compiler $compiler, array $params, $prepend, $append, $type) {
-		$domain = "";
+    public static function preProcessing(Compiler $compiler, array $params, $prepend, $append, $type) {
+        $domain = "";
 
-		/*if (isset($params[1])) {
+        /*if (isset($params[1])) {
 			$domain = $params[1][1];
 		}
 
 		return Compiler::PHP_OPEN . $prepend . " echo Translator::translate(\"" . $params[0][1] . "\", \"" . $domain . "\"); " . $append . Compiler::PHP_CLOSE;*/
 
-		if (isset($params[0])) {
-			$domain = $params[0][1];
-		}
+        if (isset($params[0])) {
+            $domain = $params[0][1];
+        }
 
-		self::$domain = $domain;
+        self::$domain = $domain;
 
-		return Compiler::PHP_OPEN . "echo Translator::translate(\"";
-	}
+        return Compiler::PHP_OPEN . "echo Translator::translate(\"";
+    }
 
-	public static function postProcessing(Compiler $compiler, array $params, $prepend, $append, $content) {
-		/**
-		 * the block is responsible for outputting it's entire content (passed as $content),
-		 * so you can transform it and then return it, but in this case we don't because
-		 * we want the content to be uppercased at runtime and not at compile time
-		 */
-		//return $content . Compiler::PHP_OPEN . $prepend . ' ' . $append . Compiler::PHP_CLOSE;
+    public static function postProcessing(Compiler $compiler, array $params, $prepend, $append, $content) {
+        /**
+         * the block is responsible for outputting it's entire content (passed as $content),
+         * so you can transform it and then return it, but in this case we don't because
+         * we want the content to be uppercased at runtime and not at compile time
+         */
+        //return $content . Compiler::PHP_OPEN . $prepend . ' ' . $append . Compiler::PHP_CLOSE;
 
-		return $content . "\", \"" . self::$domain . "\"); " . Compiler::PHP_CLOSE;
-	}
+        return $content . "\", \"" . self::$domain . "\"); " . Compiler::PHP_CLOSE;
+    }
 
 }
 

system/packages/com.jukusoft.cms.dwoo/classes/dwootemplate.php

Indentation +112 added lines, -112 removed lines

@@ -27,155 +27,155 @@
 
 class DwooTemplate extends Template {
 
-	protected static $core = null;
+    protected static $core = null;
 
-	protected static $files = array();
+    protected static $files = array();
 
-	protected static $benchmark = array();
+    protected static $benchmark = array();
 
-	//variables
-	//protected $vars = array();
-	protected $data = null;
+    //variables
+    //protected $vars = array();
+    protected $data = null;
 
-	protected $file = "";
-	protected $template = null;
+    protected $file = "";
+    protected $template = null;
 
-	public function __construct($file, Registry $registry = null) {
-		if ($registry == null) {
-			$registry = Registry::singleton();
-		}
+    public function __construct($file, Registry $registry = null) {
+        if ($registry == null) {
+            $registry = Registry::singleton();
+        }
 
-		//initialize core if neccessary
-		self::initCoreIfAbsent();
+        //initialize core if neccessary
+        self::initCoreIfAbsent();
 
-		$start_time = microtime(true);
+        $start_time = microtime(true);
 
-		//find file
-		$this->file = Template::findTemplate($file, $registry);
+        //find file
+        $this->file = Template::findTemplate($file, $registry);
 
-		//load a template file, this is reusable if you want to render multiple times the same template with different data
-		if (isset(self::$files[$file])) {
-			$this->template = self::$files[$this->file];
-		} else {
-			$this->template = new Dwoo\Template\File($this->file);
-			self::$files[$file] = $this->template;
-		}
+        //load a template file, this is reusable if you want to render multiple times the same template with different data
+        if (isset(self::$files[$file])) {
+            $this->template = self::$files[$this->file];
+        } else {
+            $this->template = new Dwoo\Template\File($this->file);
+            self::$files[$file] = $this->template;
+        }
 
-		//create a data set, this data set can be reused to render multiple templates if it contains enough data to fill them all
-		$this->data = new Dwoo\Data();
+        //create a data set, this data set can be reused to render multiple templates if it contains enough data to fill them all
+        $this->data = new Dwoo\Data();
 
-		//set default values
-		$this->assign("REGISTRY", $registry->listSettings());
+        //set default values
+        $this->assign("REGISTRY", $registry->listSettings());
 
-		//set CSRF token
-		$this->assign("CSRF_TOKEN", Security::getCSRFToken());
+        //set CSRF token
+        $this->assign("CSRF_TOKEN", Security::getCSRFToken());
 
-		//set domain, current page and so on
-		$this->assign("DOMAIN", DomainUtils::getCurrentDomain());
-		$this->assign("BASE_URL", DomainUtils::getBaseURL());
-		$this->assign("CURRENT_URL", DomainUtils::getURL());
-		$this->assign("FOLDER", $registry->getSetting("folder"));
+        //set domain, current page and so on
+        $this->assign("DOMAIN", DomainUtils::getCurrentDomain());
+        $this->assign("BASE_URL", DomainUtils::getBaseURL());
+        $this->assign("CURRENT_URL", DomainUtils::getURL());
+        $this->assign("FOLDER", $registry->getSetting("folder"));
 
-		//set language settings
-		$this->assign("PREF_LANG", $registry->getSetting("pref_lang"));
-		$this->assign("LANG_TOKEN", $registry->getSetting("lang_token"));
+        //set language settings
+        $this->assign("PREF_LANG", $registry->getSetting("pref_lang"));
+        $this->assign("LANG_TOKEN", $registry->getSetting("lang_token"));
 
-		$domain = $registry->getObject("domain");
-		$this->assign("HOME_PAGE", $domain->getHomePage());
-		$this->assign("LOGIN_PAGE", Settings::get("login_page", "login"));
-		$this->assign("LOGIN_URL", $registry->getSetting("login_url"));
-		$this->assign("LOGOUT_PAGE", Settings::get("logout_page", "logout"));
-		$this->assign("LOGOUT_URL", $registry->getSetting("logout_url"));
+        $domain = $registry->getObject("domain");
+        $this->assign("HOME_PAGE", $domain->getHomePage());
+        $this->assign("LOGIN_PAGE", Settings::get("login_page", "login"));
+        $this->assign("LOGIN_URL", $registry->getSetting("login_url"));
+        $this->assign("LOGOUT_PAGE", Settings::get("logout_page", "logout"));
+        $this->assign("LOGOUT_URL", $registry->getSetting("logout_url"));
 
-		//set user variables
-		$this->assign("USERID", User::current()->getID());
-		$this->assign("USERNAME", User::current()->getUsername());
+        //set user variables
+        $this->assign("USERID", User::current()->getID());
+        $this->assign("USERNAME", User::current()->getUsername());
 
-		$style_name = $registry->getSetting("current_style_name");
-		$this->assign("STYLE_PATH",DomainUtils::getBaseURL() . "/styles/" . $style_name . "/");
+        $style_name = $registry->getSetting("current_style_name");
+        $this->assign("STYLE_PATH",DomainUtils::getBaseURL() . "/styles/" . $style_name . "/");
 
-		$end_time = microtime(true);
-		$exec_time = $end_time - $start_time;
+        $end_time = microtime(true);
+        $exec_time = $end_time - $start_time;
 
-		//store benchmark
-		self::$benchmark[$this->file] = $exec_time;
-	}
+        //store benchmark
+        self::$benchmark[$this->file] = $exec_time;
+    }
 
-	public function assign ($var, $value) {
-		//$this->vars[$var] = $value;
-		$this->data->assign($var, $value);
-	}
+    public function assign ($var, $value) {
+        //$this->vars[$var] = $value;
+        $this->data->assign($var, $value);
+    }
 
-	public function parse ($name = "main") {
-		throw new Exception("Method DwooTemplate::parse() is not supported from Dwoo template engine.");
-	}
+    public function parse ($name = "main") {
+        throw new Exception("Method DwooTemplate::parse() is not supported from Dwoo template engine.");
+    }
 
-	public function getCode ($name = "main") {
-		$start_time = microtime(true);
+    public function getCode ($name = "main") {
+        $start_time = microtime(true);
 
-		// Output the result
-		$html = self::$core->get($this->template, $this->data);
+        // Output the result
+        $html = self::$core->get($this->template, $this->data);
 
-		$end_time = microtime(true);
-		$exec_time = $end_time - $start_time;
+        $end_time = microtime(true);
+        $exec_time = $end_time - $start_time;
 
-		//store benchmark
-		if (isset(self::$benchmark[$this->file])) {
-			self::$benchmark[$this->file] = self::$benchmark[$this->file] + $exec_time;
-		} else {
-			self::$benchmark[$this->file] = $exec_time;
-		}
+        //store benchmark
+        if (isset(self::$benchmark[$this->file])) {
+            self::$benchmark[$this->file] = self::$benchmark[$this->file] + $exec_time;
+        } else {
+            self::$benchmark[$this->file] = $exec_time;
+        }
 
-		return $html;
-	}
+        return $html;
+    }
 
-	protected static function initCoreIfAbsent () {
-		if (self::$core == null) {
-			self::$core = new Dwoo\Core();
+    protected static function initCoreIfAbsent () {
+        if (self::$core == null) {
+            self::$core = new Dwoo\Core();
 
-			$cache_dir = CACHE_PATH . "dwoo/";
-			$compile_dir = CACHE_PATH . "dwoo-compile/";
+            $cache_dir = CACHE_PATH . "dwoo/";
+            $compile_dir = CACHE_PATH . "dwoo-compile/";
 
-			//check, if cache dir exists
-			if (!file_exists($cache_dir)) {
-				mkdir($cache_dir);
-			}
+            //check, if cache dir exists
+            if (!file_exists($cache_dir)) {
+                mkdir($cache_dir);
+            }
 
-			//check, if compile dir exists
-			if (!file_exists($compile_dir)) {
-				mkdir($compile_dir);
-			}
+            //check, if compile dir exists
+            if (!file_exists($compile_dir)) {
+                mkdir($compile_dir);
+            }
 
-			//set cache dir
-			self::$core->setCacheDir($cache_dir);
-			self::$core->setCompileDir($compile_dir);
+            //set cache dir
+            self::$core->setCacheDir($cache_dir);
+            self::$core->setCompileDir($compile_dir);
 
-			//allow some php functions
-			//self::$core->setSecurityPolicy(new \Dwoo\Security\Policy());
-			//self::$core->getSecurityPolicy()->allowPhpFunction("count");
-			//self::$core->getSecurityPolicy()->allowPhpFunction("sizeof");
-
-			//add plugins
-			//self::$core->addPlugin("if");
+            //allow some php functions
+            //self::$core->setSecurityPolicy(new \Dwoo\Security\Policy());
+            //self::$core->getSecurityPolicy()->allowPhpFunction("count");
+            //self::$core->getSecurityPolicy()->allowPhpFunction("sizeof");
+
+            //add plugins
+            //self::$core->addPlugin("if");
 
-			//self::$core->addPlugin("lang", new \Dwoo\Plugins\Functions\PluginLang(self::$core));
+            //self::$core->addPlugin("lang", new \Dwoo\Plugins\Functions\PluginLang(self::$core));
 
-			// add custom plugin
-			/*self::$core->addPlugin('lang', function (Dwoo\Core $core, $str, $str1 = "") {
+            // add custom plugin
+            /*self::$core->addPlugin('lang', function (Dwoo\Core $core, $str, $str1 = "") {
 				return "test_" . $str;
 			});*/
 
-			Events::throwEvent("init_dwoo", array(
-				'core' => &self::$core,
-				'cache_path' => CACHE_PATH,
-				'cache_dir' => $cache_dir
-			));
-		}
-	}
-
-	public static function listFileBenchmark () {
-		return self::$benchmark;
-	}
+            Events::throwEvent("init_dwoo", array(
+                'core' => &self::$core,
+                'cache_path' => CACHE_PATH,
+                'cache_dir' => $cache_dir
+            ));
+        }
+    }
+
+    public static function listFileBenchmark () {
+        return self::$benchmark;
+    }
 
 }
 

system/packages/com.jukusoft.cms.plugin/classes/plugininstaller_plugin.php

Indentation +9 added lines, -9 removed lines

@@ -27,19 +27,19 @@
 
 abstract class PluginInstaller_Plugin {
 
-	public abstract function install (Plugin $plugin, array $install_json) : bool;
+    public abstract function install (Plugin $plugin, array $install_json) : bool;
 
-	public abstract function uninstall (Plugin $plugin, array $install_json) : bool;
+    public abstract function uninstall (Plugin $plugin, array $install_json) : bool;
 
-	public abstract function upgrade (Plugin $plugin, array $install_json) : bool;
+    public abstract function upgrade (Plugin $plugin, array $install_json) : bool;
 
-	public function getPriority () : int {
-		return 10;
-	}
+    public function getPriority () : int {
+        return 10;
+    }
 
-	public static function cast (PluginInstaller_Plugin $plugin) : PluginInstaller_Plugin {
-		return $plugin;
-	}
+    public static function cast (PluginInstaller_Plugin $plugin) : PluginInstaller_Plugin {
+        return $plugin;
+    }
 
 }
 

system/core/validator/pluginname.php

Indentation +14 added lines, -14 removed lines

@@ -27,24 +27,24 @@
 
 class Validator_PluginName implements Validator_Base {
 
-	protected static $instance = null;
+    protected static $instance = null;
 
-	public function isValide($value): bool {
-		return $value === $this->validate($value);
-	}
+    public function isValide($value): bool {
+        return $value === $this->validate($value);
+    }
 
-	public function validate($value) {
-		//remove all characters except except a-z, A-Z and 0-9
-		return preg_replace("/[^a-zA-Z_\-0-9]+/", "", $value);
-	}
+    public function validate($value) {
+        //remove all characters except except a-z, A-Z and 0-9
+        return preg_replace("/[^a-zA-Z_\-0-9]+/", "", $value);
+    }
 
-	public static function getInstance () : Validator_PluginName {
-		if (self::$instance == null) {
-			self::$instance = new Validator_PluginName();
-		}
+    public static function getInstance () : Validator_PluginName {
+        if (self::$instance == null) {
+            self::$instance = new Validator_PluginName();
+        }
 
-		return self::$instance;
-	}
+        return self::$instance;
+    }
 
 }
 

system/packages/com.jukusoft.cms.plugin/classes/plugins.php

Indentation +75 added lines, -75 removed lines

@@ -27,107 +27,107 @@
 
 class Plugins {
 
-	public static function listAvailablePluginNames () : array {
-		$names = array();
+    public static function listAvailablePluginNames () : array {
+        $names = array();
 
-		//use directory iterator
-		$dir = new DirectoryIterator(PLUGIN_PATH);
+        //use directory iterator
+        $dir = new DirectoryIterator(PLUGIN_PATH);
 
-		foreach ($dir as $fileinfo) {
-			if ($fileinfo->isDir() && !$fileinfo->isDot()) {
-				$names[] = $fileinfo->getFilename();
-			}
-		}
+        foreach ($dir as $fileinfo) {
+            if ($fileinfo->isDir() && !$fileinfo->isDot()) {
+                $names[] = $fileinfo->getFilename();
+            }
+        }
 
-		return $names;
-	}
+        return $names;
+    }
 
-	public static function listInstalledPluginNames () : array {
-		if (Cache::contains("plugins", "installed_plugin_names")) {
-			return Cache::get("plugins", "installed_plugin_names");
-		} else {
-			$rows = Database::getInstance()->listRows("SELECT * FROM `{praefix}plugins` WHERE `installed` = '1'; ");
+    public static function listInstalledPluginNames () : array {
+        if (Cache::contains("plugins", "installed_plugin_names")) {
+            return Cache::get("plugins", "installed_plugin_names");
+        } else {
+            $rows = Database::getInstance()->listRows("SELECT * FROM `{praefix}plugins` WHERE `installed` = '1'; ");
 
-			$array = array();
+            $array = array();
 
-			foreach ($rows as $row) {
-				$array[] = $row['name'];
-			}
+            foreach ($rows as $row) {
+                $array[] = $row['name'];
+            }
 
-			//cache rows
-			Cache::put("plugins", "installed_plugin_names", $array);
+            //cache rows
+            Cache::put("plugins", "installed_plugin_names", $array);
 
-			return $array;
-		}
-	}
+            return $array;
+        }
+    }
 
-	public static function listInstalledPlugins () : array {
-		if (Cache::contains("plugins", "installed_plugins")) {
-			return Cache::get("plugins", "installed_plugins");
-		} else {
-			//read installed plugins from database
-			$rows = Database::getInstance()->listRows("SELECT * FROM `{praefix}plugins` WHERE `installed` = '1'; ");
+    public static function listInstalledPlugins () : array {
+        if (Cache::contains("plugins", "installed_plugins")) {
+            return Cache::get("plugins", "installed_plugins");
+        } else {
+            //read installed plugins from database
+            $rows = Database::getInstance()->listRows("SELECT * FROM `{praefix}plugins` WHERE `installed` = '1'; ");
 
-			$plugins = array();
+            $plugins = array();
 
-			foreach ($rows as $row) {
-				//create new plugin instance
-				$plugin = new Plugin($row['name'], $row);
+            foreach ($rows as $row) {
+                //create new plugin instance
+                $plugin = new Plugin($row['name'], $row);
 
-				//load plugin
-				$plugin->load();
+                //load plugin
+                $plugin->load();
 
-				$plugins[$plugin->getName()] = $plugin;
-			}
+                $plugins[$plugin->getName()] = $plugin;
+            }
 
-			//cache plugins
-			Cache::put("plugins", "installed_plugins", $plugins);
+            //cache plugins
+            Cache::put("plugins", "installed_plugins", $plugins);
 
-			return $plugins;
-		}
-	}
+            return $plugins;
+        }
+    }
 
-	public static function listUninstalledPlugins () : array {
-		$installed_plugin_names = self::listInstalledPluginNames();
+    public static function listUninstalledPlugins () : array {
+        $installed_plugin_names = self::listInstalledPluginNames();
 
-		//create new empty list
-		$list = array();
+        //create new empty list
+        $list = array();
 
-		$dir = new DirectoryIterator(PLUGIN_PATH);
+        $dir = new DirectoryIterator(PLUGIN_PATH);
 
-		foreach ($dir as $fileInfo) {
-			if ($fileInfo->isDot()) {
-				//dont parse directory "."
-				continue;
-			}
+        foreach ($dir as $fileInfo) {
+            if ($fileInfo->isDot()) {
+                //dont parse directory "."
+                continue;
+            }
 
-			if (!$fileInfo->isDir()) {
-				//we only search for directories
-				continue;
-			}
+            if (!$fileInfo->isDir()) {
+                //we only search for directories
+                continue;
+            }
 
-			//get directory name
-			$name = $fileInfo->getFilename();
+            //get directory name
+            $name = $fileInfo->getFilename();
 
-			//check, if plugin is already installed
-			if (in_array($name, $installed_plugin_names)) {
-				continue;
-			}
+            //check, if plugin is already installed
+            if (in_array($name, $installed_plugin_names)) {
+                continue;
+            }
 
-			//create and load new plugin
-			$plugin = new Plugin($name);
-			$plugin->load();
+            //create and load new plugin
+            $plugin = new Plugin($name);
+            $plugin->load();
 
-			//add plugin to list
-			$list[] = $plugin;
-		}
+            //add plugin to list
+            $list[] = $plugin;
+        }
 
-		return $list;
-	}
+        return $list;
+    }
 
-	public static function clearCache () {
-		Cache::clear("plugins");
-	}
+    public static function clearCache () {
+        Cache::clear("plugins");
+    }
 
 }
 

system/packages/com.jukusoft.cms.plugin/classes/pluginspage.php

Indentation +87 added lines, -87 removed lines

@@ -27,92 +27,92 @@ 
 
 class PluginsPage extends PageType {
 
-	public function getContent(): string {
-		$template = new DwooTemplate("pages/plugins");
-
-		//get list with installed plugins
-		$installed_plugins = Plugins::listInstalledPlugins();
-
-		$array = array();
-
-		$lang_token = substr(Registry::singleton()->getSetting("lang_token"), 0, 2);
-
-		foreach ($installed_plugins as $plugin) {
-			$plugin = Plugin::castPlugin($plugin);
-
-			//create new instance of PluginInstaller to check plugin compatibility
-			$installer = new PluginInstaller($plugin);
-
-			$array[] = array(
-				'name' => $plugin->getName(),
-				'title' => $plugin->getTitle(),
-				'description' => $plugin->getDescription($lang_token),
-				'version' => $plugin->getVersion(),
-				'installed_version' => $plugin->getInstalledVersion(),
-				'homepage' => $plugin->getHomepage(),
-				'authors' => $plugin->listAuthors(),
-				'license' => $plugin->getLicense(),
-				'keywords' => $plugin->listKeywords(),
-				'categories' => $plugin->listCategories(),
-				'text' => "",
-				'issues' => $plugin->getIssuesLink(),
-				'source' => $plugin->getSourceLink(),
-				'support_mail' => $plugin->getSupportMail(),
-				'support_links' => $plugin->listSupportLinks(),
-				'compatible' => $installer->checkRequirements(true),
-				'uptodate' => true,//TODO: check, if plugin is newest version
-				'alpha' => $plugin->isAlpha(),
-				'beta' => $plugin->isBeta(),
-				'installed' => false,
-				'activated' => $plugin->isActivated()
-			);
-		}
-
-		//assign list with installed plugins
-		$template->assign("installed_plugins", $array);
-
-		//get list with all uninstalled plugins
-		$plugins = Plugins::listUninstalledPlugins();
-
-		$plugin_list = array();
-
-		foreach ($plugins as $plugin) {
-			$plugin = Plugin::castPlugin($plugin);
-
-			//create new instance of PluginInstaller to check plugin compatibility
-			$installer = new PluginInstaller($plugin);
-
-			$plugin_list[] = array(
-				'name' => $plugin->getName(),
-				'title' => $plugin->getTitle(),
-				'description' => $plugin->getDescription($lang_token),
-				'version' => $plugin->getVersion(),
-				'homepage' => $plugin->getHomepage(),
-				'authors' => $plugin->listAuthors(),
-				'license' => $plugin->getLicense(),
-				'keywords' => $plugin->listKeywords(),
-				'categories' => $plugin->listCategories(),
-				'text' => "",
-				'issues' => $plugin->getIssuesLink(),
-				'source' => $plugin->getSourceLink(),
-				'support_mail' => $plugin->getSupportMail(),
-				'support_links' => $plugin->listSupportLinks(),
-				'compatible' => $installer->checkRequirements(true),
-				'uptodate' => true,//TODO: check, if plugin is newest version
-				'alpha' => $plugin->isAlpha(),
-				'beta' => $plugin->isBeta(),
-				'installed' => false,
-				'activated' => $plugin->isActivated()
-			);
-		}
-
-		$template->assign("plugins", $plugin_list);
-
-		return $template->getCode();
-	}
-
-	public function getFooterScripts(): string {
-		return "<!-- page script -->
+    public function getContent(): string {
+        $template = new DwooTemplate("pages/plugins");
+
+        //get list with installed plugins
+        $installed_plugins = Plugins::listInstalledPlugins();
+
+        $array = array();
+
+        $lang_token = substr(Registry::singleton()->getSetting("lang_token"), 0, 2);
+
+        foreach ($installed_plugins as $plugin) {
+            $plugin = Plugin::castPlugin($plugin);
+
+            //create new instance of PluginInstaller to check plugin compatibility
+            $installer = new PluginInstaller($plugin);
+
+            $array[] = array(
+                'name' => $plugin->getName(),
+                'title' => $plugin->getTitle(),
+                'description' => $plugin->getDescription($lang_token),
+                'version' => $plugin->getVersion(),
+                'installed_version' => $plugin->getInstalledVersion(),
+                'homepage' => $plugin->getHomepage(),
+                'authors' => $plugin->listAuthors(),
+                'license' => $plugin->getLicense(),
+                'keywords' => $plugin->listKeywords(),
+                'categories' => $plugin->listCategories(),
+                'text' => "",
+                'issues' => $plugin->getIssuesLink(),
+                'source' => $plugin->getSourceLink(),
+                'support_mail' => $plugin->getSupportMail(),
+                'support_links' => $plugin->listSupportLinks(),
+                'compatible' => $installer->checkRequirements(true),
+                'uptodate' => true,//TODO: check, if plugin is newest version
+                'alpha' => $plugin->isAlpha(),
+                'beta' => $plugin->isBeta(),
+                'installed' => false,
+                'activated' => $plugin->isActivated()
+            );
+        }
+
+        //assign list with installed plugins
+        $template->assign("installed_plugins", $array);
+
+        //get list with all uninstalled plugins
+        $plugins = Plugins::listUninstalledPlugins();
+
+        $plugin_list = array();
+
+        foreach ($plugins as $plugin) {
+            $plugin = Plugin::castPlugin($plugin);
+
+            //create new instance of PluginInstaller to check plugin compatibility
+            $installer = new PluginInstaller($plugin);
+
+            $plugin_list[] = array(
+                'name' => $plugin->getName(),
+                'title' => $plugin->getTitle(),
+                'description' => $plugin->getDescription($lang_token),
+                'version' => $plugin->getVersion(),
+                'homepage' => $plugin->getHomepage(),
+                'authors' => $plugin->listAuthors(),
+                'license' => $plugin->getLicense(),
+                'keywords' => $plugin->listKeywords(),
+                'categories' => $plugin->listCategories(),
+                'text' => "",
+                'issues' => $plugin->getIssuesLink(),
+                'source' => $plugin->getSourceLink(),
+                'support_mail' => $plugin->getSupportMail(),
+                'support_links' => $plugin->listSupportLinks(),
+                'compatible' => $installer->checkRequirements(true),
+                'uptodate' => true,//TODO: check, if plugin is newest version
+                'alpha' => $plugin->isAlpha(),
+                'beta' => $plugin->isBeta(),
+                'installed' => false,
+                'activated' => $plugin->isActivated()
+            );
+        }
+
+        $template->assign("plugins", $plugin_list);
+
+        return $template->getCode();
+    }
+
+    public function getFooterScripts(): string {
+        return "<!-- page script -->
 			<script>
 				$(function () {
 					/*$('#example1').DataTable();*/
@@ -134,7 +134,7 @@ 
 					});
 				});
 			</script>";
-	}
+    }
 
 }
 

system/packages/com.jukusoft.cms.plugin/classes/plugininstallerpage.php

Indentation +158 added lines, -158 removed lines

@@ -27,164 +27,164 @@
 
 class PluginInstallerPage extends PageType {
 
-	public function getContent(): string {
-		$template = new DwooTemplate("pages/plugininstaller");
-
-		$error = false;
-
-		$template->assign("error_message", "");
-
-		if (isset($_REQUEST['action']) && !empty($_REQUEST['action'])) {
-			//
-		} else {
-			//set error message
-			$template->assign("error_message", "Invalide request, no action set!");
-
-			$error = true;
-		}
-
-		if (!isset($_REQUEST['plugin']) || empty($_REQUEST['plugin'])) {
-			//set error message
-			$template->assign("error_message", "Invalide request, no plugin was set!");
-
-			$error = true;
-		}
-
-		if (!$error) {
-			$plugin = $_REQUEST['plugin'];
-			$action = $_REQUEST['action'];
-
-			//validate plugin
-			if (!Validator_PluginName::getInstance()->isValide($plugin)) {
-				//set error message
-				$template->assign("error_message", "Invalide plugin name '" . htmlentities($plugin) . "'!");
-
-				$error = true;
-			} else {
-				//create new instance
-				$plugin = new Plugin($plugin);
-
-				if (!$plugin->exists()) {
-					//set error message
-					$template->assign("error_message", "Plugin '" . htmlentities($plugin->getName()) . "' doesnt exists!");
-
-					$error = true;
-				} else {
-					//load plugin.json
-					$plugin->load();
-					$plugin->loadRow();
-
-					switch ($action) {
-						case "install":
-							//install plugin
-							if ($this->installPlugin($plugin) === TRUE) {
-								//send redirect header
-								header("Location: " . DomainUtils::generateURL("admin/plugins"));
-
-								$template->assign("success_message", "Plugin '" . $plugin->getName() . "' installed successfully!");
-							} else {
-								//set error message
-								$template->assign("error_message", "Couldnt install plugin '" . htmlentities($plugin->getName()) . "'!");
-							}
-
-							break;
-						case "uninstall":
-							//load database row
-							$plugin->loadRow();
-
-							//uninstall plugin
-							if ($this->uninstallPlugin($plugin) === TRUE) {
-								//send redirect header
-								header("Location: " . DomainUtils::generateURL("admin/plugins"));
-
-								$template->assign("success_message", "Plugin '" . $plugin->getName() . "' uninstalled successfully!");
-							} else {
-								//set error message
-								$template->assign("error_message", "Couldnt uninstall plugin '" . htmlentities($plugin) . "'!");
-							}
-
-							break;
-						case "upgrade":
-							//load database row
-							$plugin->loadRow();
-
-							//upgrade plugin
-							if ($this->upgradePlugin($plugin) === TRUE) {
-								//send redirect header
-								header("Location: " . DomainUtils::generateURL("admin/plugins"));
-
-								$template->assign("success_message", "Plugin '" . $plugin->getName() . "' upgraded successfully!");
-							} else {
-								//set error message
-								$template->assign("error_message", "Couldnt upgrade plugin '" . htmlentities($plugin) . "'!");
-							}
-
-							break;
-						default:
-							//set error message
-							$template->assign("error_message", "Unknown action type '" . htmlentities($action) . "'!");
-
-							break;
-					}
-				}
-			}
-		}
-
-		return $template->getCode();
-	}
-
-	protected function installPlugin (Plugin $plugin) {
-		$installer = new PluginInstaller($plugin);
-
-		$res = $installer->checkRequirements();
-
-		//check requirements first
-		if ($res !== TRUE) {
-			return array(
-				'error' => $res
-			);
-		}
-
-		//check, if plugin is already installed
-		if ($plugin->isInstalled()) {
-			return false;
-		}
-
-		//try to install plugin
-		return $installer->install();
-	}
-
-	protected function uninstallPlugin (Plugin $plugin) {
-		//first check, if plugin is installed
-		if (!PluginInstaller::isPluginInstalled($plugin->getName())) {
-			return array(
-				'error' => "plugin_not_installed"
-			);
-		}
-
-		$installer = new PluginInstaller($plugin);
-
-		//try to uninstall plugin
-		return $installer->uninstall();
-	}
-
-	protected function upgradePlugin (Plugin $plugin) {
-		//first check, if plugin is installed
-		if (!PluginInstaller::isPluginInstalled($plugin->getName())) {
-			return array(
-				'error' => "plugin_not_installed"
-			);
-		}
-
-		$installer = new PluginInstaller($plugin);
-
-		//try to uninstall plugin
-		return $installer->upgrade();
-	}
-
-	public function listRequiredPermissions(): array {
-		return array("can_install_plugins");
-	}
+    public function getContent(): string {
+        $template = new DwooTemplate("pages/plugininstaller");
+
+        $error = false;
+
+        $template->assign("error_message", "");
+
+        if (isset($_REQUEST['action']) && !empty($_REQUEST['action'])) {
+            //
+        } else {
+            //set error message
+            $template->assign("error_message", "Invalide request, no action set!");
+
+            $error = true;
+        }
+
+        if (!isset($_REQUEST['plugin']) || empty($_REQUEST['plugin'])) {
+            //set error message
+            $template->assign("error_message", "Invalide request, no plugin was set!");
+
+            $error = true;
+        }
+
+        if (!$error) {
+            $plugin = $_REQUEST['plugin'];
+            $action = $_REQUEST['action'];
+
+            //validate plugin
+            if (!Validator_PluginName::getInstance()->isValide($plugin)) {
+                //set error message
+                $template->assign("error_message", "Invalide plugin name '" . htmlentities($plugin) . "'!");
+
+                $error = true;
+            } else {
+                //create new instance
+                $plugin = new Plugin($plugin);
+
+                if (!$plugin->exists()) {
+                    //set error message
+                    $template->assign("error_message", "Plugin '" . htmlentities($plugin->getName()) . "' doesnt exists!");
+
+                    $error = true;
+                } else {
+                    //load plugin.json
+                    $plugin->load();
+                    $plugin->loadRow();
+
+                    switch ($action) {
+                        case "install":
+                            //install plugin
+                            if ($this->installPlugin($plugin) === TRUE) {
+                                //send redirect header
+                                header("Location: " . DomainUtils::generateURL("admin/plugins"));
+
+                                $template->assign("success_message", "Plugin '" . $plugin->getName() . "' installed successfully!");
+                            } else {
+                                //set error message
+                                $template->assign("error_message", "Couldnt install plugin '" . htmlentities($plugin->getName()) . "'!");
+                            }
+
+                            break;
+                        case "uninstall":
+                            //load database row
+                            $plugin->loadRow();
+
+                            //uninstall plugin
+                            if ($this->uninstallPlugin($plugin) === TRUE) {
+                                //send redirect header
+                                header("Location: " . DomainUtils::generateURL("admin/plugins"));
+
+                                $template->assign("success_message", "Plugin '" . $plugin->getName() . "' uninstalled successfully!");
+                            } else {
+                                //set error message
+                                $template->assign("error_message", "Couldnt uninstall plugin '" . htmlentities($plugin) . "'!");
+                            }
+
+                            break;
+                        case "upgrade":
+                            //load database row
+                            $plugin->loadRow();
+
+                            //upgrade plugin
+                            if ($this->upgradePlugin($plugin) === TRUE) {
+                                //send redirect header
+                                header("Location: " . DomainUtils::generateURL("admin/plugins"));
+
+                                $template->assign("success_message", "Plugin '" . $plugin->getName() . "' upgraded successfully!");
+                            } else {
+                                //set error message
+                                $template->assign("error_message", "Couldnt upgrade plugin '" . htmlentities($plugin) . "'!");
+                            }
+
+                            break;
+                        default:
+                            //set error message
+                            $template->assign("error_message", "Unknown action type '" . htmlentities($action) . "'!");
+
+                            break;
+                    }
+                }
+            }
+        }
+
+        return $template->getCode();
+    }
+
+    protected function installPlugin (Plugin $plugin) {
+        $installer = new PluginInstaller($plugin);
+
+        $res = $installer->checkRequirements();
+
+        //check requirements first
+        if ($res !== TRUE) {
+            return array(
+                'error' => $res
+            );
+        }
+
+        //check, if plugin is already installed
+        if ($plugin->isInstalled()) {
+            return false;
+        }
+
+        //try to install plugin
+        return $installer->install();
+    }
+
+    protected function uninstallPlugin (Plugin $plugin) {
+        //first check, if plugin is installed
+        if (!PluginInstaller::isPluginInstalled($plugin->getName())) {
+            return array(
+                'error' => "plugin_not_installed"
+            );
+        }
+
+        $installer = new PluginInstaller($plugin);
+
+        //try to uninstall plugin
+        return $installer->uninstall();
+    }
+
+    protected function upgradePlugin (Plugin $plugin) {
+        //first check, if plugin is installed
+        if (!PluginInstaller::isPluginInstalled($plugin->getName())) {
+            return array(
+                'error' => "plugin_not_installed"
+            );
+        }
+
+        $installer = new PluginInstaller($plugin);
+
+        //try to uninstall plugin
+        return $installer->upgrade();
+    }
+
+    public function listRequiredPermissions(): array {
+        return array("can_install_plugins");
+    }
 
 }
 

system/packages/com.jukusoft.cms.plugin/extensions/folderinstaller.php

Indentation +28 added lines, -28 removed lines

@@ -27,34 +27,34 @@
 
 class FolderInstaller extends PluginInstaller_Plugin {
 
-	public function install(Plugin $plugin, array $install_json): bool {
-		if (isset($install_json['folders'])) {
-			foreach ($install_json['folders'] as $folder) {
-				$name = $folder['folder'];
-				$hidden = (isset($folder['hidden']) ? boolval($folder['hidden']) : false);
-				$permissions = (isset($folder['permissions']) ? $folder['permissions'] : array("none"));
-				$main_menu = (isset($folder['main_menu']) ? intval($folder['main_menu']) : -1);
-				$local_menu = (isset($folder['local_menu']) ? intval($folder['local_menu']) : -1);
-				$force_template = (isset($folder['force_template']) ? $folder['force_template'] : "none");
-				$title_translation = (isset($folder['title_translation']) ? boolval($folder['title_translation']) : true);
-
-				//create folder
-				Folder::createFolderIfAbsent($name, $hidden, $permissions, $main_menu, $local_menu, $force_template, $title_translation);
-			}
-		}
-
-		return true;
-	}
-
-	public function uninstall(Plugin $plugin, array $install_json): bool {
-		//folders will not removed, because they can contain pages
-		return true;
-	}
-
-	public function upgrade(Plugin $plugin, array $install_json): bool {
-		//install supports ON DUPLICATE KEY
-		return $this->install($plugin, $install_json);
-	}
+    public function install(Plugin $plugin, array $install_json): bool {
+        if (isset($install_json['folders'])) {
+            foreach ($install_json['folders'] as $folder) {
+                $name = $folder['folder'];
+                $hidden = (isset($folder['hidden']) ? boolval($folder['hidden']) : false);
+                $permissions = (isset($folder['permissions']) ? $folder['permissions'] : array("none"));
+                $main_menu = (isset($folder['main_menu']) ? intval($folder['main_menu']) : -1);
+                $local_menu = (isset($folder['local_menu']) ? intval($folder['local_menu']) : -1);
+                $force_template = (isset($folder['force_template']) ? $folder['force_template'] : "none");
+                $title_translation = (isset($folder['title_translation']) ? boolval($folder['title_translation']) : true);
+
+                //create folder
+                Folder::createFolderIfAbsent($name, $hidden, $permissions, $main_menu, $local_menu, $force_template, $title_translation);
+            }
+        }
+
+        return true;
+    }
+
+    public function uninstall(Plugin $plugin, array $install_json): bool {
+        //folders will not removed, because they can contain pages
+        return true;
+    }
+
+    public function upgrade(Plugin $plugin, array $install_json): bool {
+        //install supports ON DUPLICATE KEY
+        return $this->install($plugin, $install_json);
+    }
 
 }
 

system/packages/com.jukusoft.cms.plugin/extensions/permissioninstaller.php

Indentation +26 added lines, -26 removed lines

@@ -27,39 +27,39 @@
 
 class PermissionInstaller extends PluginInstaller_Plugin {
 
-	public function install(Plugin $plugin, array $install_json): bool {
-		if (isset($install_json['permissions'])) {
-			$permissions = $install_json['permissions'];
+    public function install(Plugin $plugin, array $install_json): bool {
+        if (isset($install_json['permissions'])) {
+            $permissions = $install_json['permissions'];
 
-			foreach ($permissions as $permission) {
-				$token = $permission['token'];
-				$title = $permission['title'];
-				$description = $permission['description'];
-				$category = (isset($permission['category']) ? $permission['category'] : "plugins");
-				$order = (isset($permission['order']) ? intval($permission['order']) : 100);
+            foreach ($permissions as $permission) {
+                $token = $permission['token'];
+                $title = $permission['title'];
+                $description = $permission['description'];
+                $category = (isset($permission['category']) ? $permission['category'] : "plugins");
+                $order = (isset($permission['order']) ? intval($permission['order']) : 100);
 
-				Permissions::createPermission($token, $title, $description, $category, "plugin_" . $plugin->getName(), $order);
-			}
-		}
+                Permissions::createPermission($token, $title, $description, $category, "plugin_" . $plugin->getName(), $order);
+            }
+        }
 
-		return true;
-	}
+        return true;
+    }
 
-	public function uninstall(Plugin $plugin, array $install_json): bool {
-		//delete permissions with plugin owner
-		if (isset($install_json['permissions'])) {
-			Permissions::deletePermissionsByOwner("plugin_" . $plugin->getName());
-		}
+    public function uninstall(Plugin $plugin, array $install_json): bool {
+        //delete permissions with plugin owner
+        if (isset($install_json['permissions'])) {
+            Permissions::deletePermissionsByOwner("plugin_" . $plugin->getName());
+        }
 
-		return true;
-	}
+        return true;
+    }
 
-	public function upgrade(Plugin $plugin, array $install_json): bool {
-		//TODO: remove permissions, which arent longer in install json
+    public function upgrade(Plugin $plugin, array $install_json): bool {
+        //TODO: remove permissions, which arent longer in install json
 
-		//install queries supports ON DUPLICATE KEY
-		return $this->install($plugin, $install_json);
-	}
+        //install queries supports ON DUPLICATE KEY
+        return $this->install($plugin, $install_json);
+    }
 
 }