JuKu / JuKuCMS

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

Spacing +1 added lines, -1 removed lines

@@ -45,7 +45,7 @@
 		return $this->addEvents($plugin, $install_json);
 	}
 
-	protected function addEvents (Plugin $plugin, array $install_json) : bool {
+	protected function addEvents(Plugin $plugin, array $install_json) : bool {
 		//check, if events are specified
 		if (isset($install_json['events']) && is_array($install_json['events'])) {
 			//create events

Indentation +60 added lines, -60 removed lines

@@ -27,66 +27,66 @@
 
 class EventInstaller extends PluginInstaller_Plugin {
 
-	public function install(Plugin $plugin, array $install_json): bool {
-		//add events if absent
-		return $this->addEvents($plugin, $install_json);
-	}
-
-	public function uninstall(Plugin $plugin, array $install_json): bool {
-		//check, if events are specified
-		if (isset($install_json['events']) && is_array($install_json['events'])) {
-			//remove all events from this plugin
-			Events::removePluginEvents($plugin->getName());
-		}
-
-		return true;
-	}
-
-	public function upgrade(Plugin $plugin, array $install_json): bool {
-		//remove events first
-		$this->uninstall($plugin, $install_json);
-
-		//add events if absent
-		return $this->addEvents($plugin, $install_json);
-	}
-
-	protected function addEvents (Plugin $plugin, array $install_json) : bool {
-		//check, if events are specified
-		if (isset($install_json['events']) && is_array($install_json['events'])) {
-			//create events
-			foreach ($install_json['events'] as $event) {
-				if (!is_array($event)) {
-					throw new IllegalStateException("Invalide install.json, key 'events' has to contains arrays!");
-				}
-
-				$event_name = $event['event'];
-
-				$type = "class_static_method";
-
-				//get type
-				if (isset($event['type'])) {
-					$type = strtolower($event['type']);
-				}
-
-				switch ($type) {
-					case "file":
-						throw new Exception("UnuspportedOperationException: event type 'file' is not supported yet.");
-						break;
-					case "function":
-						throw new Exception("UnuspportedOperationException: event type 'function' is not supported yet.");
-						break;
-					case "class_static_method":
-						Events::addEventClass($event_name, $event['class'], $event['method'], $plugin->getName());
-						break;
-					default:
-						throw new IllegalArgumentException("Unknown event type: " . $type . " (event: " . $event_name . ") in install.json of plugin '" . $plugin->getName() . "'!");
-						break;
-				}
-			}
-		}
-
-		return true;
-	}
+    public function install(Plugin $plugin, array $install_json): bool {
+        //add events if absent
+        return $this->addEvents($plugin, $install_json);
+    }
+
+    public function uninstall(Plugin $plugin, array $install_json): bool {
+        //check, if events are specified
+        if (isset($install_json['events']) && is_array($install_json['events'])) {
+            //remove all events from this plugin
+            Events::removePluginEvents($plugin->getName());
+        }
+
+        return true;
+    }
+
+    public function upgrade(Plugin $plugin, array $install_json): bool {
+        //remove events first
+        $this->uninstall($plugin, $install_json);
+
+        //add events if absent
+        return $this->addEvents($plugin, $install_json);
+    }
+
+    protected function addEvents (Plugin $plugin, array $install_json) : bool {
+        //check, if events are specified
+        if (isset($install_json['events']) && is_array($install_json['events'])) {
+            //create events
+            foreach ($install_json['events'] as $event) {
+                if (!is_array($event)) {
+                    throw new IllegalStateException("Invalide install.json, key 'events' has to contains arrays!");
+                }
+
+                $event_name = $event['event'];
+
+                $type = "class_static_method";
+
+                //get type
+                if (isset($event['type'])) {
+                    $type = strtolower($event['type']);
+                }
+
+                switch ($type) {
+                    case "file":
+                        throw new Exception("UnuspportedOperationException: event type 'file' is not supported yet.");
+                        break;
+                    case "function":
+                        throw new Exception("UnuspportedOperationException: event type 'function' is not supported yet.");
+                        break;
+                    case "class_static_method":
+                        Events::addEventClass($event_name, $event['class'], $event['method'], $plugin->getName());
+                        break;
+                    default:
+                        throw new IllegalArgumentException("Unknown event type: " . $type . " (event: " . $event_name . ") in install.json of plugin '" . $plugin->getName() . "'!");
+                        break;
+                }
+            }
+        }
+
+        return true;
+    }
 
 }
 

system/core/classes/events.php

Spacing +5 added lines, -5 removed lines

@@ -31,7 +31,7 @@ 
 
 	protected static $isInitialized = false;
 
-	public static function init () {
+	public static function init() {
 		if (Cache::getCache()->contains("events", "events")) {
 			self::$events = Cache::getCache()->get("events", "events");
 		} else {
@@ -60,7 +60,7 @@ 
 		self::$isInitialized = true;
 	}
 
-	public static function throwEvent ($name, $params = array()) {
+	public static function throwEvent($name, $params = array()) {
 		if (!is_array($params)) {
 			throw new IllegalArgumentException("second parameter params has to be an array.");
 		}
@@ -78,7 +78,7 @@ 
 		}
 	}
 
-	protected static function executeEvent ($row, $params) {
+	protected static function executeEvent($row, $params) {
 		$type = strtolower($row['type']);
 		$file = $row['file'];
 		$class_name = $row['class_name'];
@@ -106,7 +106,7 @@ 
 		}
 	}
 
-	public static function addEventClass (string $event, string $class_name, string $method, string $plugin_name) {
+	public static function addEventClass(string $event, string $class_name, string $method, string $plugin_name) {
 		Database::getInstance()->execute("INSERT INTO `{praefix}events` (
 			`id`, `name`, `type`, `file`, `class_name`, `class_method`, `created_from`, `activated`
 		) VALUES (
@@ -119,7 +119,7 @@ 
 		));
 	}
 
-	public static function removePluginEvents (string $plugin_name) {
+	public static function removePluginEvents(string $plugin_name) {
 		Database::getInstance()->execute("DELETE FROM `{praefix}events` WHERE `created_from` = :created_from; ", array(
 			'created_from' => "plugin_" . $plugin_name
 		));

Indentation +93 added lines, -93 removed lines

@@ -27,103 +27,103 @@
 
 class Events {
 
-	protected static $events = array();
-
-	protected static $isInitialized = false;
-
-	public static function init () {
-		if (Cache::getCache()->contains("events", "events")) {
-			self::$events = Cache::getCache()->get("events", "events");
-		} else {
-			//load events from database
-			$rows = Database::getInstance()->listRows("SELECT * FROM `{PRAEFIX}events` WHERE `activated` = '1'; ");
-
-			//iterate through rows
-			foreach ($rows as $row) {
-				//get name of event
-				$name = $row['name'];
-
-				//check, if name exists in array
-				if (!isset(self::$events[$name])) {
-					self::$events[$name] = array();
-				}
-
-				//add row to array
-				self::$events[$name][] = $row;
-			}
-
-			//put events into cache
-			Cache::getCache()->put("events", "events", self::$events);
-		}
-
-		//set initialized flag to true
-		self::$isInitialized = true;
-	}
-
-	public static function throwEvent ($name, $params = array()) {
-		if (!is_array($params)) {
-			throw new IllegalArgumentException("second parameter params has to be an array.");
-		}
-
-		//check, if events was initialized first
-		if (!self::$isInitialized) {
-			//initialize events
-			self::init();
-		}
-
-		if (isset(self::$events[$name])) {
-			foreach (self::$events[$name] as $event) {
-				self::executeEvent($event, $params);
-			}
-		}
-	}
-
-	protected static function executeEvent ($row, $params) {
-		$type = strtolower($row['type']);
-		$file = $row['file'];
-		$class_name = $row['class_name'];
-		$class_method = $row['class_method'];
-
-		switch ($type) {
-			case "file":
-				//check, if file exists
-				if (file_exists(ROOT_PATH . $file)) {
-					require(ROOT_PATH . $file);
-				} else {
-					throw new IllegalStateException("required file for event not found: " . $file);
-				}
-
-				break;
-			case "function":
-				call_user_func($class_method, $params);
-				break;
-			case "class_static_method":
-				call_user_func(array($class_name, $class_method), $params);
-				break;
-			default:
-				throw new IllegalStateException("unknown event type '" . $type . "' for event '" . $row['name'] . "'!");
-				break;
-		}
-	}
-
-	public static function addEventClass (string $event, string $class_name, string $method, string $plugin_name) {
-		Database::getInstance()->execute("INSERT INTO `{praefix}events` (
+    protected static $events = array();
+
+    protected static $isInitialized = false;
+
+    public static function init () {
+        if (Cache::getCache()->contains("events", "events")) {
+            self::$events = Cache::getCache()->get("events", "events");
+        } else {
+            //load events from database
+            $rows = Database::getInstance()->listRows("SELECT * FROM `{PRAEFIX}events` WHERE `activated` = '1'; ");
+
+            //iterate through rows
+            foreach ($rows as $row) {
+                //get name of event
+                $name = $row['name'];
+
+                //check, if name exists in array
+                if (!isset(self::$events[$name])) {
+                    self::$events[$name] = array();
+                }
+
+                //add row to array
+                self::$events[$name][] = $row;
+            }
+
+            //put events into cache
+            Cache::getCache()->put("events", "events", self::$events);
+        }
+
+        //set initialized flag to true
+        self::$isInitialized = true;
+    }
+
+    public static function throwEvent ($name, $params = array()) {
+        if (!is_array($params)) {
+            throw new IllegalArgumentException("second parameter params has to be an array.");
+        }
+
+        //check, if events was initialized first
+        if (!self::$isInitialized) {
+            //initialize events
+            self::init();
+        }
+
+        if (isset(self::$events[$name])) {
+            foreach (self::$events[$name] as $event) {
+                self::executeEvent($event, $params);
+            }
+        }
+    }
+
+    protected static function executeEvent ($row, $params) {
+        $type = strtolower($row['type']);
+        $file = $row['file'];
+        $class_name = $row['class_name'];
+        $class_method = $row['class_method'];
+
+        switch ($type) {
+            case "file":
+                //check, if file exists
+                if (file_exists(ROOT_PATH . $file)) {
+                    require(ROOT_PATH . $file);
+                } else {
+                    throw new IllegalStateException("required file for event not found: " . $file);
+                }
+
+                break;
+            case "function":
+                call_user_func($class_method, $params);
+                break;
+            case "class_static_method":
+                call_user_func(array($class_name, $class_method), $params);
+                break;
+            default:
+                throw new IllegalStateException("unknown event type '" . $type . "' for event '" . $row['name'] . "'!");
+                break;
+        }
+    }
+
+    public static function addEventClass (string $event, string $class_name, string $method, string $plugin_name) {
+        Database::getInstance()->execute("INSERT INTO `{praefix}events` (
 			`id`, `name`, `type`, `file`, `class_name`, `class_method`, `created_from`, `activated`
 		) VALUES (
 			NULL, :event, 'CLASS_STATIC_METHOD', '', :class_name, :method, :created_from, '1'
 		) ON DUPLICATE KEY UPDATE `activated` = '1';", array(
-			'event' => $event,
-			'class_name' => $class_name,
-			'method' => $method,
-			'created_from' => "plugin_" . $plugin_name
-		));
-	}
-
-	public static function removePluginEvents (string $plugin_name) {
-		Database::getInstance()->execute("DELETE FROM `{praefix}events` WHERE `created_from` = :created_from; ", array(
-			'created_from' => "plugin_" . $plugin_name
-		));
-	}
+            'event' => $event,
+            'class_name' => $class_name,
+            'method' => $method,
+            'created_from' => "plugin_" . $plugin_name
+        ));
+    }
+
+    public static function removePluginEvents (string $plugin_name) {
+        Database::getInstance()->execute("DELETE FROM `{praefix}events` WHERE `created_from` = :created_from; ", array(
+            'created_from' => "plugin_" . $plugin_name
+        ));
+    }
 
 }
 

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;
+    }
 
 }
 

Spacing +1 added lines, -1 removed lines

@@ -38,7 +38,7 @@
 		return preg_replace("/[^a-zA-Z_\-0-9]+/", "", $value);
 	}
 
-	public static function getInstance () : Validator_PluginName {
+	public static function getInstance() : Validator_PluginName {
 		if (self::$instance == null) {
 			self::$instance = new Validator_PluginName();
 		}

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

Spacing +3 added lines, -3 removed lines

@@ -123,7 +123,7 @@ 
 		return $template->getCode();
 	}
 
-	protected function installPlugin (Plugin $plugin) {
+	protected function installPlugin(Plugin $plugin) {
 		$installer = new PluginInstaller($plugin);
 
 		$res = $installer->checkRequirements();
@@ -139,7 +139,7 @@ 
 		return $installer->install();
 	}
 
-	protected function uninstallPlugin (Plugin $plugin) {
+	protected function uninstallPlugin(Plugin $plugin) {
 		//first check, if plugin is installed
 		if (!PluginInstaller::isPluginInstalled($plugin->getName())) {
 			return array(
@@ -153,7 +153,7 @@ 
 		return $installer->uninstall();
 	}
 
-	protected function upgradePlugin (Plugin $plugin) {
+	protected function upgradePlugin(Plugin $plugin) {
 		//first check, if plugin is installed
 		if (!PluginInstaller::isPluginInstalled($plugin->getName())) {
 			return array(

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/classes/pluginspage.php

Spacing +2 added lines, -2 removed lines

@@ -60,7 +60,7 @@ 
 				'support_mail' => $plugin->getSupportMail(),
 				'support_links' => $plugin->listSupportLinks(),
 				'compatible' => $installer->checkRequirements(true),
-				'uptodate' => true,//TODO: check, if plugin is newest version
+				'uptodate' => true, //TODO: check, if plugin is newest version
 				'alpha' => $plugin->isAlpha(),
 				'beta' => $plugin->isBeta(),
 				'installed' => false,
@@ -99,7 +99,7 @@ 
 				'support_mail' => $plugin->getSupportMail(),
 				'support_links' => $plugin->listSupportLinks(),
 				'compatible' => $installer->checkRequirements(true),
-				'uptodate' => true,//TODO: check, if plugin is newest version
+				'uptodate' => true, //TODO: check, if plugin is newest version
 				'alpha' => $plugin->isAlpha(),
 				'beta' => $plugin->isBeta(),
 				'installed' => false,

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/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);
+    }
 
 }
 

plugins/advancedpagetypes/parsedown-1.7.1/Parsedown.php

Indentation +3 added lines, -3 removed lines

@@ -1687,8 +1687,8 @@
         'q', 'rt', 'ins', 'font',          'strong',
         's', 'tt', 'kbd', 'mark',
         'u', 'xm', 'sub', 'nobr',
-                   'sup', 'ruby',
-                   'var', 'span',
-                   'wbr', 'time',
+                    'sup', 'ruby',
+                    'var', 'span',
+                    'wbr', 'time',
     );
 }

Spacing +80 added lines, -80 removed lines

@@ -193,7 +193,7 @@ 
 
             while (isset($line[$indent]) and $line[$indent] === ' ')
             {
-                $indent ++;
+                $indent++;
             }
 
             $text = $indent > 0 ? substr($line, $indent) : $line;
@@ -206,7 +206,7 @@ 
 
             if (isset($CurrentBlock['continuable']))
             {
-                $Block = $this->{'block'.$CurrentBlock['type'].'Continue'}($Line, $CurrentBlock);
+                $Block = $this->{'block' . $CurrentBlock['type'] . 'Continue'}($Line, $CurrentBlock);
 
                 if (isset($Block))
                 {
@@ -218,7 +218,7 @@ 
                 {
                     if ($this->isBlockCompletable($CurrentBlock['type']))
                     {
-                        $CurrentBlock = $this->{'block'.$CurrentBlock['type'].'Complete'}($CurrentBlock);
+                        $CurrentBlock = $this->{'block' . $CurrentBlock['type'] . 'Complete'}($CurrentBlock);
                     }
                 }
             }
@@ -235,7 +235,7 @@ 
             {
                 foreach ($this->BlockTypes[$marker] as $blockType)
                 {
-                    $blockTypes []= $blockType;
+                    $blockTypes [] = $blockType;
                 }
             }
 
@@ -244,15 +244,15 @@ 
 
             foreach ($blockTypes as $blockType)
             {
-                $Block = $this->{'block'.$blockType}($Line, $CurrentBlock);
+                $Block = $this->{'block' . $blockType}($Line, $CurrentBlock);
 
                 if (isset($Block))
                 {
                     $Block['type'] = $blockType;
 
-                    if ( ! isset($Block['identified']))
+                    if (!isset($Block['identified']))
                     {
-                        $Blocks []= $CurrentBlock;
+                        $Blocks [] = $CurrentBlock;
 
                         $Block['identified'] = true;
                     }
@@ -270,13 +270,13 @@ 
 
             # ~
 
-            if (isset($CurrentBlock) and ! isset($CurrentBlock['type']) and ! isset($CurrentBlock['interrupted']))
+            if (isset($CurrentBlock) and !isset($CurrentBlock['type']) and !isset($CurrentBlock['interrupted']))
             {
-                $CurrentBlock['element']['text'] .= "\n".$text;
+                $CurrentBlock['element']['text'] .= "\n" . $text;
             }
             else
             {
-                $Blocks []= $CurrentBlock;
+                $Blocks [] = $CurrentBlock;
 
                 $CurrentBlock = $this->paragraph($Line);
 
@@ -288,12 +288,12 @@ 
 
         if (isset($CurrentBlock['continuable']) and $this->isBlockCompletable($CurrentBlock['type']))
         {
-            $CurrentBlock = $this->{'block'.$CurrentBlock['type'].'Complete'}($CurrentBlock);
+            $CurrentBlock = $this->{'block' . $CurrentBlock['type'] . 'Complete'}($CurrentBlock);
         }
 
         # ~
 
-        $Blocks []= $CurrentBlock;
+        $Blocks [] = $CurrentBlock;
 
         unset($Blocks[0]);
 
@@ -321,12 +321,12 @@ 
 
     protected function isBlockContinuable($Type)
     {
-        return method_exists($this, 'block'.$Type.'Continue');
+        return method_exists($this, 'block' . $Type . 'Continue');
     }
 
     protected function isBlockCompletable($Type)
     {
-        return method_exists($this, 'block'.$Type.'Complete');
+        return method_exists($this, 'block' . $Type . 'Complete');
     }
 
     #
@@ -334,7 +334,7 @@ 
 
     protected function blockCode($Line, $Block = null)
     {
-        if (isset($Block) and ! isset($Block['type']) and ! isset($Block['interrupted']))
+        if (isset($Block) and !isset($Block['type']) and !isset($Block['interrupted']))
         {
             return;
         }
@@ -435,7 +435,7 @@ 
 
     protected function blockFencedCode($Line)
     {
-        if (preg_match('/^['.$Line['text'][0].']{3,}[ ]*([^`]+)?[ ]*$/', $Line['text'], $matches))
+        if (preg_match('/^[' . $Line['text'][0] . ']{3,}[ ]*([^`]+)?[ ]*$/', $Line['text'], $matches))
         {
             $Element = array(
                 'name' => 'code',
@@ -444,7 +444,7 @@ 
 
             if (isset($matches[1]))
             {
-                $class = 'language-'.$matches[1];
+                $class = 'language-' . $matches[1];
 
                 $Element['attributes'] = array(
                     'class' => $class,
@@ -478,7 +478,7 @@ 
             unset($Block['interrupted']);
         }
 
-        if (preg_match('/^'.$Block['char'].'{3,}[ ]*$/', $Line['text']))
+        if (preg_match('/^' . $Block['char'] . '{3,}[ ]*$/', $Line['text']))
         {
             $Block['element']['text']['text'] = substr($Block['element']['text']['text'], 1);
 
@@ -487,7 +487,7 @@ 
             return $Block;
         }
 
-        $Block['element']['text']['text'] .= "\n".$Line['body'];
+        $Block['element']['text']['text'] .= "\n" . $Line['body'];
 
         return $Block;
     }
@@ -512,7 +512,7 @@ 
 
             while (isset($Line['text'][$level]) and $Line['text'][$level] === '#')
             {
-                $level ++;
+                $level++;
             }
 
             if ($level > 6)
@@ -541,7 +541,7 @@ 
     {
         list($name, $pattern) = $Line['text'][0] <= '-' ? array('ul', '[*+-]') : array('ol', '[0-9]+[.]');
 
-        if (preg_match('/^('.$pattern.'[ ]+)(.*)/', $Line['text'], $matches))
+        if (preg_match('/^(' . $pattern . '[ ]+)(.*)/', $Line['text'], $matches))
         {
             $Block = array(
                 'indent' => $Line['indent'],
@@ -552,11 +552,11 @@ 
                 ),
             );
 
-            if($name === 'ol')
+            if ($name === 'ol')
             {
                 $listStart = stristr($matches[0], '.', true);
 
-                if($listStart !== '1')
+                if ($listStart !== '1')
                 {
                     $Block['element']['attributes'] = array('start' => $listStart);
                 }
@@ -570,7 +570,7 @@ 
                 ),
             );
 
-            $Block['element']['text'] []= & $Block['li'];
+            $Block['element']['text'] [] = & $Block['li'];
 
             return $Block;
         }
@@ -578,11 +578,11 @@ 
 
     protected function blockListContinue($Line, array $Block)
     {
-        if ($Block['indent'] === $Line['indent'] and preg_match('/^'.$Block['pattern'].'(?:[ ]+(.*)|$)/', $Line['text'], $matches))
+        if ($Block['indent'] === $Line['indent'] and preg_match('/^' . $Block['pattern'] . '(?:[ ]+(.*)|$)/', $Line['text'], $matches))
         {
             if (isset($Block['interrupted']))
             {
-                $Block['li']['text'] []= '';
+                $Block['li']['text'] [] = '';
 
                 $Block['loose'] = true;
 
@@ -601,7 +601,7 @@ 
                 ),
             );
 
-            $Block['element']['text'] []= & $Block['li'];
+            $Block['element']['text'] [] = & $Block['li'];
 
             return $Block;
         }
@@ -611,22 +611,22 @@ 
             return $Block;
         }
 
-        if ( ! isset($Block['interrupted']))
+        if (!isset($Block['interrupted']))
         {
             $text = preg_replace('/^[ ]{0,4}/', '', $Line['body']);
 
-            $Block['li']['text'] []= $text;
+            $Block['li']['text'] [] = $text;
 
             return $Block;
         }
 
         if ($Line['indent'] > 0)
         {
-            $Block['li']['text'] []= '';
+            $Block['li']['text'] [] = '';
 
             $text = preg_replace('/^[ ]{0,4}/', '', $Line['body']);
 
-            $Block['li']['text'] []= $text;
+            $Block['li']['text'] [] = $text;
 
             unset($Block['interrupted']);
 
@@ -642,7 +642,7 @@ 
             {
                 if (end($li['text']) !== '')
                 {
-                    $li['text'] []= '';
+                    $li['text'] [] = '';
                 }
             }
         }
@@ -675,19 +675,19 @@ 
         {
             if (isset($Block['interrupted']))
             {
-                $Block['element']['text'] []= '';
+                $Block['element']['text'] [] = '';
 
                 unset($Block['interrupted']);
             }
 
-            $Block['element']['text'] []= $matches[1];
+            $Block['element']['text'] [] = $matches[1];
 
             return $Block;
         }
 
-        if ( ! isset($Block['interrupted']))
+        if (!isset($Block['interrupted']))
         {
-            $Block['element']['text'] []= $Line['text'];
+            $Block['element']['text'] [] = $Line['text'];
 
             return $Block;
         }
@@ -698,7 +698,7 @@ 
 
     protected function blockRule($Line)
     {
-        if (preg_match('/^(['.$Line['text'][0].'])([ ]*\1){2,}[ ]*$/', $Line['text']))
+        if (preg_match('/^([' . $Line['text'][0] . '])([ ]*\1){2,}[ ]*$/', $Line['text']))
         {
             $Block = array(
                 'element' => array(
@@ -715,7 +715,7 @@ 
 
     protected function blockSetextHeader($Line, array $Block = null)
     {
-        if ( ! isset($Block) or isset($Block['type']) or isset($Block['interrupted']))
+        if (!isset($Block) or isset($Block['type']) or isset($Block['interrupted']))
         {
             return;
         }
@@ -738,7 +738,7 @@ 
             return;
         }
 
-        if (preg_match('/^<(\w[\w-]*)(?:[ ]*'.$this->regexHtmlAttribute.')*[ ]*(\/)?>/', $Line['text'], $matches))
+        if (preg_match('/^<(\w[\w-]*)(?:[ ]*' . $this->regexHtmlAttribute . ')*[ ]*(\/)?>/', $Line['text'], $matches))
         {
             $element = strtolower($matches[1]);
 
@@ -773,7 +773,7 @@ 
                     return;
                 }
 
-                if (preg_match('/<\/'.$matches[1].'>[ ]*$/i', $remainder))
+                if (preg_match('/<\/' . $matches[1] . '>[ ]*$/i', $remainder))
                 {
                     $Block['closed'] = true;
                 }
@@ -790,16 +790,16 @@ 
             return;
         }
 
-        if (preg_match('/^<'.$Block['name'].'(?:[ ]*'.$this->regexHtmlAttribute.')*[ ]*>/i', $Line['text'])) # open
+        if (preg_match('/^<' . $Block['name'] . '(?:[ ]*' . $this->regexHtmlAttribute . ')*[ ]*>/i', $Line['text'])) # open
         {
-            $Block['depth'] ++;
+            $Block['depth']++;
         }
 
-        if (preg_match('/(.*?)<\/'.$Block['name'].'>[ ]*$/i', $Line['text'], $matches)) # close
+        if (preg_match('/(.*?)<\/' . $Block['name'] . '>[ ]*$/i', $Line['text'], $matches)) # close
         {
             if ($Block['depth'] > 0)
             {
-                $Block['depth'] --;
+                $Block['depth']--;
             }
             else
             {
@@ -814,7 +814,7 @@ 
             unset($Block['interrupted']);
         }
 
-        $Block['markup'] .= "\n".$Line['body'];
+        $Block['markup'] .= "\n" . $Line['body'];
 
         return $Block;
     }
@@ -853,7 +853,7 @@ 
 
     protected function blockTable($Line, array $Block = null)
     {
-        if ( ! isset($Block) or isset($Block['type']) or isset($Block['interrupted']))
+        if (!isset($Block) or isset($Block['type']) or isset($Block['interrupted']))
         {
             return;
         }
@@ -890,7 +890,7 @@ 
                     $alignment = $alignment === 'left' ? 'center' : 'right';
                 }
 
-                $alignments []= $alignment;
+                $alignments [] = $alignment;
             }
 
             # ~
@@ -919,11 +919,11 @@ 
                     $alignment = $alignments[$index];
 
                     $HeaderElement['attributes'] = array(
-                        'style' => 'text-align: '.$alignment.';',
+                        'style' => 'text-align: ' . $alignment . ';',
                     );
                 }
 
-                $HeaderElements []= $HeaderElement;
+                $HeaderElements [] = $HeaderElement;
             }
 
             # ~
@@ -937,18 +937,18 @@ 
                 ),
             );
 
-            $Block['element']['text'] []= array(
+            $Block['element']['text'] [] = array(
                 'name' => 'thead',
                 'handler' => 'elements',
             );
 
-            $Block['element']['text'] []= array(
+            $Block['element']['text'] [] = array(
                 'name' => 'tbody',
                 'handler' => 'elements',
                 'text' => array(),
             );
 
-            $Block['element']['text'][0]['text'] []= array(
+            $Block['element']['text'][0]['text'] [] = array(
                 'name' => 'tr',
                 'handler' => 'elements',
                 'text' => $HeaderElements,
@@ -989,11 +989,11 @@ 
                 if (isset($Block['alignments'][$index]))
                 {
                     $Element['attributes'] = array(
-                        'style' => 'text-align: '.$Block['alignments'][$index].';',
+                        'style' => 'text-align: ' . $Block['alignments'][$index] . ';',
                     );
                 }
 
-                $Elements []= $Element;
+                $Elements [] = $Element;
             }
 
             $Element = array(
@@ -1002,7 +1002,7 @@ 
                 'text' => $Elements,
             );
 
-            $Block['element']['text'][1]['text'] []= $Element;
+            $Block['element']['text'][1]['text'] [] = $Element;
 
             return $Block;
         }
@@ -1052,7 +1052,7 @@ 
     # ~
     #
 
-    public function line($text, $nonNestables=array())
+    public function line($text, $nonNestables = array())
     {
         $markup = '';
 
@@ -1070,14 +1070,14 @@ 
             {
                 # check to see if the current inline type is nestable in the current context
 
-                if ( ! empty($nonNestables) and in_array($inlineType, $nonNestables))
+                if (!empty($nonNestables) and in_array($inlineType, $nonNestables))
                 {
                     continue;
                 }
 
-                $Inline = $this->{'inline'.$inlineType}($Excerpt);
+                $Inline = $this->{'inline' . $inlineType}($Excerpt);
 
-                if ( ! isset($Inline))
+                if (!isset($Inline))
                 {
                     continue;
                 }
@@ -1091,7 +1091,7 @@ 
 
                 # sets a default inline position
 
-                if ( ! isset($Inline['position']))
+                if (!isset($Inline['position']))
                 {
                     $Inline['position'] = $markerPosition;
                 }
@@ -1140,7 +1140,7 @@ 
     {
         $marker = $Excerpt['text'][0];
 
-        if (preg_match('/^('.$marker.'+)[ ]*(.+?)[ ]*(?<!'.$marker.')\1(?!'.$marker.')/s', $Excerpt['text'], $matches))
+        if (preg_match('/^(' . $marker . '+)[ ]*(.+?)[ ]*(?<!' . $marker . ')\1(?!' . $marker . ')/s', $Excerpt['text'], $matches))
         {
             $text = $matches[2];
             $text = preg_replace("/[ ]*\n/", ' ', $text);
@@ -1161,7 +1161,7 @@ 
         {
             $url = $matches[1];
 
-            if ( ! isset($matches[2]))
+            if (!isset($matches[2]))
             {
                 $url = 'mailto:' . $url;
             }
@@ -1181,7 +1181,7 @@ 
 
     protected function inlineEmphasis($Excerpt)
     {
-        if ( ! isset($Excerpt['text'][1]))
+        if (!isset($Excerpt['text'][1]))
         {
             return;
         }
@@ -1224,12 +1224,12 @@ 
 
     protected function inlineImage($Excerpt)
     {
-        if ( ! isset($Excerpt['text'][1]) or $Excerpt['text'][1] !== '[')
+        if (!isset($Excerpt['text'][1]) or $Excerpt['text'][1] !== '[')
         {
             return;
         }
 
-        $Excerpt['text']= substr($Excerpt['text'], 1);
+        $Excerpt['text'] = substr($Excerpt['text'], 1);
 
         $Link = $this->inlineLink($Excerpt);
 
@@ -1311,7 +1311,7 @@ 
                 $definition = strtolower($Element['text']);
             }
 
-            if ( ! isset($this->DefinitionData['Reference'][$definition]))
+            if (!isset($this->DefinitionData['Reference'][$definition]))
             {
                 return;
             }
@@ -1351,7 +1351,7 @@ 
             );
         }
 
-        if ($Excerpt['text'][1] !== ' ' and preg_match('/^<\w[\w-]*(?:[ ]*'.$this->regexHtmlAttribute.')*[ ]*\/?>/s', $Excerpt['text'], $matches))
+        if ($Excerpt['text'][1] !== ' ' and preg_match('/^<\w[\w-]*(?:[ ]*' . $this->regexHtmlAttribute . ')*[ ]*\/?>/s', $Excerpt['text'], $matches))
         {
             return array(
                 'markup' => $matches[0],
@@ -1362,7 +1362,7 @@ 
 
     protected function inlineSpecialCharacter($Excerpt)
     {
-        if ($Excerpt['text'][0] === '&' and ! preg_match('/^&#?\w+;/', $Excerpt['text']))
+        if ($Excerpt['text'][0] === '&' and !preg_match('/^&#?\w+;/', $Excerpt['text']))
         {
             return array(
                 'markup' => '&amp;',
@@ -1375,7 +1375,7 @@ 
         if (isset($SpecialCharacter[$Excerpt['text'][0]]))
         {
             return array(
-                'markup' => '&'.$SpecialCharacter[$Excerpt['text'][0]].';',
+                'markup' => '&' . $SpecialCharacter[$Excerpt['text'][0]] . ';',
                 'extent' => 1,
             );
         }
@@ -1383,7 +1383,7 @@ 
 
     protected function inlineStrikethrough($Excerpt)
     {
-        if ( ! isset($Excerpt['text'][1]))
+        if (!isset($Excerpt['text'][1]))
         {
             return;
         }
@@ -1403,7 +1403,7 @@ 
 
     protected function inlineUrl($Excerpt)
     {
-        if ($this->urlsLinked !== true or ! isset($Excerpt['text'][2]) or $Excerpt['text'][2] !== '/')
+        if ($this->urlsLinked !== true or !isset($Excerpt['text'][2]) or $Excerpt['text'][2] !== '/')
         {
             return;
         }
@@ -1475,7 +1475,7 @@ 
             $Element = $this->sanitiseElement($Element);
         }
 
-        $markup = '<'.$Element['name'];
+        $markup = '<' . $Element['name'];
 
         if (isset($Element['attributes']))
         {
@@ -1486,7 +1486,7 @@ 
                     continue;
                 }
 
-                $markup .= ' '.$name.'="'.self::escape($value).'"';
+                $markup .= ' ' . $name . '="' . self::escape($value) . '"';
             }
         }
 
@@ -1508,7 +1508,7 @@ 
                 $markup .= self::escape($Element['text'], true);
             }
 
-            $markup .= '</'.$Element['name'].'>';
+            $markup .= '</' . $Element['name'] . '>';
         }
         else
         {
@@ -1540,7 +1540,7 @@ 
 
         $trimmedMarkup = trim($markup);
 
-        if ( ! in_array('', $lines) and substr($trimmedMarkup, 0, 3) === '<p>')
+        if (!in_array('', $lines) and substr($trimmedMarkup, 0, 3) === '<p>')
         {
             $markup = $trimmedMarkup;
             $markup = substr($markup, 3);
@@ -1567,7 +1567,7 @@ 
     protected function sanitiseElement(array $Element)
     {
         static $goodAttribute = '/^[a-zA-Z0-9][a-zA-Z0-9-_]*+$/';
-        static $safeUrlNameToAtt  = array(
+        static $safeUrlNameToAtt = array(
             'a'   => 'href',
             'img' => 'src',
         );
@@ -1577,12 +1577,12 @@ 
             $Element = $this->filterUnsafeUrlInAttribute($Element, $safeUrlNameToAtt[$Element['name']]);
         }
 
-        if ( ! empty($Element['attributes']))
+        if (!empty($Element['attributes']))
         {
             foreach ($Element['attributes'] as $att => $val)
             {
                 # filter out badly parsed attribute
-                if ( ! preg_match($goodAttribute, $att))
+                if (!preg_match($goodAttribute, $att))
                 {
                     unset($Element['attributes'][$att]);
                 }
@@ -1683,8 +1683,8 @@ 
     protected $textLevelElements = array(
         'a', 'br', 'bdo', 'abbr', 'blink', 'nextid', 'acronym', 'basefont',
         'b', 'em', 'big', 'cite', 'small', 'spacer', 'listing',
-        'i', 'rp', 'del', 'code',          'strike', 'marquee',
-        'q', 'rt', 'ins', 'font',          'strong',
+        'i', 'rp', 'del', 'code', 'strike', 'marquee',
+        'q', 'rt', 'ins', 'font', 'strong',
         's', 'tt', 'kbd', 'mark',
         'u', 'xm', 'sub', 'nobr',
                    'sup', 'ruby',

Braces +19 added lines, -28 removed lines

@@ -213,8 +213,7 @@ 
                     $CurrentBlock = $Block;
 
                     continue;
-                }
-                else
+                } else
                 {
                     if ($this->isBlockCompletable($CurrentBlock['type']))
                     {
@@ -273,8 +272,7 @@ 
             if (isset($CurrentBlock) and ! isset($CurrentBlock['type']) and ! isset($CurrentBlock['interrupted']))
             {
                 $CurrentBlock['element']['text'] .= "\n".$text;
-            }
-            else
+            } else
             {
                 $Blocks []= $CurrentBlock;
 
@@ -765,8 +763,7 @@ 
 
                     $Block['void'] = true;
                 }
-            }
-            else
+            } else
             {
                 if (isset($matches[2]) or in_array($matches[1], $this->voidElements))
                 {
@@ -790,18 +787,21 @@ 
             return;
         }
 
-        if (preg_match('/^<'.$Block['name'].'(?:[ ]*'.$this->regexHtmlAttribute.')*[ ]*>/i', $Line['text'])) # open
+        if (preg_match('/^<'.$Block['name'].'(?:[ ]*'.$this->regexHtmlAttribute.')*[ ]*>/i', $Line['text'])) {
+            # open
         {
             $Block['depth'] ++;
         }
+        }
 
-        if (preg_match('/(.*?)<\/'.$Block['name'].'>[ ]*$/i', $Line['text'], $matches)) # close
+        if (preg_match('/(.*?)<\/'.$Block['name'].'>[ ]*$/i', $Line['text'], $matches)) {
+            # close
         {
             if ($Block['depth'] > 0)
             {
                 $Block['depth'] --;
-            }
-            else
+        }
+            } else
             {
                 $Block['closed'] = true;
             }
@@ -1191,12 +1191,10 @@ 
         if ($Excerpt['text'][1] === $marker and preg_match($this->StrongRegex[$marker], $Excerpt['text'], $matches))
         {
             $emphasis = 'strong';
-        }
-        elseif (preg_match($this->EmRegex[$marker], $Excerpt['text'], $matches))
+        } elseif (preg_match($this->EmRegex[$marker], $Excerpt['text'], $matches))
         {
             $emphasis = 'em';
-        }
-        else
+        } else
         {
             return;
         }
@@ -1280,8 +1278,7 @@ 
             $extent += strlen($matches[0]);
 
             $remainder = substr($remainder, $extent);
-        }
-        else
+        } else
         {
             return;
         }
@@ -1296,8 +1293,7 @@ 
             }
 
             $extent += strlen($matches[0]);
-        }
-        else
+        } else
         {
             if (preg_match('/^\s*\[(.*?)\]/', $remainder, $matches))
             {
@@ -1305,8 +1301,7 @@ 
                 $definition = strtolower($definition);
 
                 $extent += strlen($matches[0]);
-            }
-            else
+            } else
             {
                 $definition = strtolower($Element['text']);
             }
@@ -1454,8 +1449,7 @@ 
         if ($this->breaksEnabled)
         {
             $text = preg_replace('/[ ]*\n/', "<br />\n", $text);
-        }
-        else
+        } else
         {
             $text = preg_replace('/(?:[ ][ ]+|[ ]*\\\\)\n/', "<br />\n", $text);
             $text = str_replace(" \n", "\n", $text);
@@ -1502,15 +1496,13 @@ 
             if (isset($Element['handler']))
             {
                 $markup .= $this->{$Element['handler']}($Element['text'], $Element['nonNestables']);
-            }
-            else
+            } else
             {
                 $markup .= self::escape($Element['text'], true);
             }
 
             $markup .= '</'.$Element['name'].'>';
-        }
-        else
+        } else
         {
             $markup .= ' />';
         }
@@ -1628,8 +1620,7 @@ 
         if ($len > strlen($string))
         {
             return false;
-        }
-        else
+        } else
         {
             return strtolower(substr($string, 0, $len)) === strtolower($needle);
         }

plugins/advancedpagetypes/classes/markdownpage.php

Indentation +34 added lines, -34 removed lines

@@ -27,56 +27,56 @@
 
 class Plugin_AdvancedPageTypes_MarkdownPage extends PageType {
 
-	//https://commonmark.thephpleague.com/
+    //https://commonmark.thephpleague.com/
 
-	//https://caret.io/
+    //https://caret.io/
 
-	//http://parsedown.org/
+    //http://parsedown.org/
 
-	//https://github.com/erusev/parsedown-extra
+    //https://github.com/erusev/parsedown-extra
 
-	//https://stackoverflow.com/questions/32068537/generate-table-of-contents-from-markdown-in-php
+    //https://stackoverflow.com/questions/32068537/generate-table-of-contents-from-markdown-in-php
 
-	//https://github.com/erusev/parsedown/wiki/Tutorial:-Get-Started
+    //https://github.com/erusev/parsedown/wiki/Tutorial:-Get-Started
 
-	public function getContent(): string {
-		$content = "";
+    public function getContent(): string {
+        $content = "";
 
-		//check, if generated html is already cached
-		if (Cache::contains("plugin_advancedpagetypes", "markdown_" . $this->getPage()->getAlias())) {
-			$content = Cache::get("plugin_advancedpagetypes", "markdown_" . $this->getPage()->getAlias());
-		} else {
-			//require parsedown
-			require_once(PLUGIN_PATH . "advancedpagetypes/parsedown-1.7.1/Parsedown.php");
+        //check, if generated html is already cached
+        if (Cache::contains("plugin_advancedpagetypes", "markdown_" . $this->getPage()->getAlias())) {
+            $content = Cache::get("plugin_advancedpagetypes", "markdown_" . $this->getPage()->getAlias());
+        } else {
+            //require parsedown
+            require_once(PLUGIN_PATH . "advancedpagetypes/parsedown-1.7.1/Parsedown.php");
 
-			$parsedown = Parsedown::instance();
+            $parsedown = Parsedown::instance();
 
-			//enables automatic line breaks
-			$parsedown->setBreaksEnabled(true);
+            //enables automatic line breaks
+            $parsedown->setBreaksEnabled(true);
 
-			//escape html
-			$parsedown->setMarkupEscaped(true);
+            //escape html
+            $parsedown->setMarkupEscaped(true);
 
-			//automatically link urls
-			$parsedown->setUrlsLinked(true);
+            //automatically link urls
+            $parsedown->setUrlsLinked(true);
 
-			//enable safe mode
-			$parsedown->setSafeMode(true);
+            //enable safe mode
+            $parsedown->setSafeMode(true);
 
-			$content = $parsedown->text($this->getPage()->getContent());
+            $content = $parsedown->text($this->getPage()->getContent());
 
-			//cache content
-			Cache::put("plugin_advancedpagetypes", "markdown_" . $this->getPage()->getAlias(), $content);
-		}
+            //cache content
+            Cache::put("plugin_advancedpagetypes", "markdown_" . $this->getPage()->getAlias(), $content);
+        }
 
-		Events::throwEvent("plugin_markdownpage_parse", array(
-			'content' => &$content,
-			'page' => &$this->getPage(),
-			'page_type' => &$this
-		));
+        Events::throwEvent("plugin_markdownpage_parse", array(
+            'content' => &$content,
+            'page' => &$this->getPage(),
+            'page_type' => &$this
+        ));
 
-		return $content;
-	}
+        return $content;
+    }
 
 }