JuKu / JuKuCMS

system/packages/com.jukusoft.cms.admin/classes/settingspage.php

Indentation +65 added lines, -65 removed lines

@@ -27,93 +27,93 @@
 
 class SettingsPage extends PageType {
 
-	public function getContent(): string {
-		$template = new DwooTemplate("pages/settings");
+    public function getContent(): string {
+        $template = new DwooTemplate("pages/settings");
 
-		$template->assign("form_action", DomainUtils::generateURL("admin/settings", array("option" => "save")));
-		$template->assign("content", "");
+        $template->assign("form_action", DomainUtils::generateURL("admin/settings", array("option" => "save")));
+        $template->assign("content", "");
 
-		$categories = array();
+        $categories = array();
 
-		$all_settings_by_category = Settings::listAllSettingsByCategory();
+        $all_settings_by_category = Settings::listAllSettingsByCategory();
 
-		$save = false;
-		$save_success = true;
-		$invalide_field = "";
+        $save = false;
+        $save_success = true;
+        $invalide_field = "";
 
-		if (isset($_REQUEST['option']) && $_REQUEST['option'] == "save") {
-			$save = true;
-		}
+        if (isset($_REQUEST['option']) && $_REQUEST['option'] == "save") {
+            $save = true;
+        }
 
-		//check permission
-		if (!PermissionChecker::current()->hasRight("can_edit_global_settings")) {
-			$save = false;
-		}
+        //check permission
+        if (!PermissionChecker::current()->hasRight("can_edit_global_settings")) {
+            $save = false;
+        }
 
-		$template->assign("permission_to_edit_settings", PermissionChecker::current()->hasRight("can_edit_global_settings"));
+        $template->assign("permission_to_edit_settings", PermissionChecker::current()->hasRight("can_edit_global_settings"));
 
-		foreach (SettingsCategory::listAllCategories() as $category) {
-			$category = SettingsCategory::cast($category);
+        foreach (SettingsCategory::listAllCategories() as $category) {
+            $category = SettingsCategory::cast($category);
 
-			$settings = array();
+            $settings = array();
 
-			if (isset($all_settings_by_category[$category->getCategory()])) {
-				//list settings
-				$rows = $all_settings_by_category[$category->getCategory()];
+            if (isset($all_settings_by_category[$category->getCategory()])) {
+                //list settings
+                $rows = $all_settings_by_category[$category->getCategory()];
 
-				foreach ($rows as $key=>$row) {
-					$datatype = $row['datatype'];
-					$datatype_params = unserialize($row['datatype_params']);
+                foreach ($rows as $key=>$row) {
+                    $datatype = $row['datatype'];
+                    $datatype_params = unserialize($row['datatype_params']);
 
-					$obj = new $datatype();
+                    $obj = new $datatype();
 
-					if (!($obj instanceof DataType_Base)) {
-						throw new IllegalArgumentException("obj of class name '" . $datatype . "' has to be an instance of DataType_Base.");
-					}
+                    if (!($obj instanceof DataType_Base)) {
+                        throw new IllegalArgumentException("obj of class name '" . $datatype . "' has to be an instance of DataType_Base.");
+                    }
 
-					//load instance
-					$obj->load($row, $datatype_params);
+                    //load instance
+                    $obj->load($row, $datatype_params);
 
-					if ($save) {
-						//try to validate
-						if (!$obj->val()) {
-							$save_success = false;
-							$invalide_field = $obj->getTitle();
-						} else {
-							//save object
-							$obj->save();
-						}
-					}
+                    if ($save) {
+                        //try to validate
+                        if (!$obj->val()) {
+                            $save_success = false;
+                            $invalide_field = $obj->getTitle();
+                        } else {
+                            //save object
+                            $obj->save();
+                        }
+                    }
 
-					$settings[] = array(
-						'title' => Translator::translateTitle($row['title']),
-						'description' => Translator::translateTitle($row['description']),
-						'code' => $obj->getFormCode()
-					);
-				}
-			}
+                    $settings[] = array(
+                        'title' => Translator::translateTitle($row['title']),
+                        'description' => Translator::translateTitle($row['description']),
+                        'code' => $obj->getFormCode()
+                    );
+                }
+            }
 
-			$categories[] = array(
-				'title' => $category->getTitle(),
-				'settings' => $settings
-			);
-		}
+            $categories[] = array(
+                'title' => $category->getTitle(),
+                'settings' => $settings
+            );
+        }
 
-		Settings::saveAsync();
+        Settings::saveAsync();
 
-		//set state
-		$template->assign("save_success", (boolean) ($save && $save_success));
-		$template->assign("save_failed", (boolean) ($save && !$save_success));
-		$template->assign("invalide_field", $invalide_field);
+        //set state
+        $template->assign("save_success", (boolean) ($save && $save_success));
+        $template->assign("save_failed", (boolean) ($save && !$save_success));
+        $template->assign("invalide_field", $invalide_field);
 
-		$template->assign("categories", $categories);
+        $template->assign("categories", $categories);
 
-		return $template->getCode();
-	}
+        return $template->getCode();
+    }
 
-	public function listRequiredPermissions(): array {
-		return array("can_see_global_settings", "can_edit_global_settings");
-	}
+    public function listRequiredPermissions(): array {
+        return array("can_see_global_settings", "can_edit_global_settings");
+    }
 
 }
 

system/core/datatype/mail.php

Indentation +13 added lines, -13 removed lines

@@ -27,23 +27,23 @@
 
 class DataType_Mail extends DataType_Base {
 
-	public function getFormCode(): string {
-		return "<input type=\"email\" name=\"" . $this->getInputName() . "\" value=\"" . $this->getValue() . "\" class=\"form-control\" />";
-	}
+    public function getFormCode(): string {
+        return "<input type=\"email\" name=\"" . $this->getInputName() . "\" value=\"" . $this->getValue() . "\" class=\"form-control\" />";
+    }
 
-	public function validate(string $value): bool {
-		$allow_empty_string = true;
+    public function validate(string $value): bool {
+        $allow_empty_string = true;
 
-		if (empty($value)) {
-			return true;
-		}
+        if (empty($value)) {
+            return true;
+        }
 
-		return filter_var($value, FILTER_VALIDATE_EMAIL) !== false;
-	}
+        return filter_var($value, FILTER_VALIDATE_EMAIL) !== false;
+    }
 
-	protected function saveAsync($value) {
-		Settings::setAsync($this->getKey(), (string) $value);
-	}
+    protected function saveAsync($value) {
+        Settings::setAsync($this->getKey(), (string) $value);
+    }
 }
 
 ?>

system/core/datatype/integer.php

Indentation +52 added lines, -52 removed lines

@@ -27,58 +27,58 @@
 
 class DataType_Integer extends DataType_Base {
 
-	public function getFormCode(): string {
-		$min = null;
-		$max = null;
-		$unit = null;
-
-		if (is_array($this->getDatatypeParams())) {
-			$array = $this->getDatatypeParams();
-
-			if (isset($array['min'])) {
-				$min = (int) $array['min'];
-			}
-
-			if (isset($array['max'])) {
-				$max = (int) $array['max'];
-			}
-
-			if (isset($array['unit'])) {
-				$unit = $array['unit'];
-			}
-		}
-
-		return "<input type=\"number\" name=\"" . $this->getInputName() . "\" value=\"" . $this->getValue() . "\" step=\"1\"" . ($min != null ? " min=\"" . $min . "\"" : "") . "" . ($max != null ? " max=\"" . $max . "\"" : "") . " class=\"form-control\" />" . ($unit != null ? " " . $unit : "");
-	}
-
-	public function validate(string $value): bool {
-		$min = null;
-		$max = null;
-		$unit = null;
-
-		if (is_array($this->getDatatypeParams())) {
-			$array = $this->getDatatypeParams();
-
-			if (isset($array['min'])) {
-				$min = (int) $array['min'];
-			}
-
-			if (isset($array['max'])) {
-				$max = (int) $array['max'];
-			}
-
-			if (isset($array['unit'])) {
-				$unit = $array['unit'];
-			}
-		}
-
-		$val = new Validator_Int();
-		return $val->isValide($value) && ($min == null || $value >= $min);
-	}
-
-	protected function saveAsync($value) {
-		Settings::setAsync($this->getKey(), (int) $value);
-	}
+    public function getFormCode(): string {
+        $min = null;
+        $max = null;
+        $unit = null;
+
+        if (is_array($this->getDatatypeParams())) {
+            $array = $this->getDatatypeParams();
+
+            if (isset($array['min'])) {
+                $min = (int) $array['min'];
+            }
+
+            if (isset($array['max'])) {
+                $max = (int) $array['max'];
+            }
+
+            if (isset($array['unit'])) {
+                $unit = $array['unit'];
+            }
+        }
+
+        return "<input type=\"number\" name=\"" . $this->getInputName() . "\" value=\"" . $this->getValue() . "\" step=\"1\"" . ($min != null ? " min=\"" . $min . "\"" : "") . "" . ($max != null ? " max=\"" . $max . "\"" : "") . " class=\"form-control\" />" . ($unit != null ? " " . $unit : "");
+    }
+
+    public function validate(string $value): bool {
+        $min = null;
+        $max = null;
+        $unit = null;
+
+        if (is_array($this->getDatatypeParams())) {
+            $array = $this->getDatatypeParams();
+
+            if (isset($array['min'])) {
+                $min = (int) $array['min'];
+            }
+
+            if (isset($array['max'])) {
+                $max = (int) $array['max'];
+            }
+
+            if (isset($array['unit'])) {
+                $unit = $array['unit'];
+            }
+        }
+
+        $val = new Validator_Int();
+        return $val->isValide($value) && ($min == null || $value >= $min);
+    }
+
+    protected function saveAsync($value) {
+        Settings::setAsync($this->getKey(), (int) $value);
+    }
 }
 
 ?>

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

Indentation +37 added lines, -37 removed lines

@@ -27,50 +27,50 @@
 
 class PageInstaller extends PluginInstaller_Plugin {
 
-	public function install(Plugin $plugin, array $install_json): bool {
-		if (isset($install_json['pages'])) {
-			foreach ($install_json['pages'] as $page) {
-				$alias = $page['alias'];
-				$title = $page['title'];
-				$pagetype = $page['pagetype'];
-				$content = (isset($page['content']) ? $page['content'] : "");
-				$folder = (isset($page['folder']) ? $page['folder'] : "/");
-				$global_menu = (isset($page['global_menu']) ? intval($page['global_menu']) : -1);
-				$local_menu = (isset($page['local_menu']) ? intval($page['local_menu']) : -1);
-				$parentID = (isset($page['parentID']) ? intval($page['parentID']) : -1);
-				$sitemap = (isset($page['sitemap']) ? boolval($page['sitemap']) : true);
-				$published = (isset($page['published']) ? boolval($page['published']) : true);
-				$editable = (isset($page['editable']) ? boolval($page['editable']) : true);
-				$author = (isset($page['author']) ? $page['author'] : "System");
+    public function install(Plugin $plugin, array $install_json): bool {
+        if (isset($install_json['pages'])) {
+            foreach ($install_json['pages'] as $page) {
+                $alias = $page['alias'];
+                $title = $page['title'];
+                $pagetype = $page['pagetype'];
+                $content = (isset($page['content']) ? $page['content'] : "");
+                $folder = (isset($page['folder']) ? $page['folder'] : "/");
+                $global_menu = (isset($page['global_menu']) ? intval($page['global_menu']) : -1);
+                $local_menu = (isset($page['local_menu']) ? intval($page['local_menu']) : -1);
+                $parentID = (isset($page['parentID']) ? intval($page['parentID']) : -1);
+                $sitemap = (isset($page['sitemap']) ? boolval($page['sitemap']) : true);
+                $published = (isset($page['published']) ? boolval($page['published']) : true);
+                $editable = (isset($page['editable']) ? boolval($page['editable']) : true);
+                $author = (isset($page['author']) ? $page['author'] : "System");
 
-				Page::createIfAbsent($alias, $title, $pagetype, $content, $folder, $global_menu, $local_menu, $parentID, $sitemap, $published, $editable, false, $author);
-			}
-		}
+                Page::createIfAbsent($alias, $title, $pagetype, $content, $folder, $global_menu, $local_menu, $parentID, $sitemap, $published, $editable, false, $author);
+            }
+        }
 
-		return true;
-	}
+        return true;
+    }
 
-	public function uninstall(Plugin $plugin, array $install_json): bool {
-		if (isset($install_json['pages'])) {
-			foreach ($install_json['pages'] as $page) {
-				$alias = $page['alias'];
-				$autoremove_on_uninstall = boolval($page['autoremove_on_uninstall']);
+    public function uninstall(Plugin $plugin, array $install_json): bool {
+        if (isset($install_json['pages'])) {
+            foreach ($install_json['pages'] as $page) {
+                $alias = $page['alias'];
+                $autoremove_on_uninstall = boolval($page['autoremove_on_uninstall']);
 
-				if ($autoremove_on_uninstall) {
-					Page::delete($alias);
-				}
-			}
-		}
+                if ($autoremove_on_uninstall) {
+                    Page::delete($alias);
+                }
+            }
+        }
 
-		return true;
-	}
+        return true;
+    }
 
-	public function upgrade(Plugin $plugin, array $install_json): bool {
-		//TODO: remove old pages, which arent longer used
+    public function upgrade(Plugin $plugin, array $install_json): bool {
+        //TODO: remove old pages, which arent longer used
 
-		//install supports ON DUPLICATE KEY
-		$this->install($plugin, $install_json);
-	}
+        //install supports ON DUPLICATE KEY
+        $this->install($plugin, $install_json);
+    }
 
 }
 

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

Indentation +30 added lines, -30 removed lines

@@ -27,36 +27,36 @@
 
 class PageTypeInstaller extends PluginInstaller_Plugin {
 
-	public function install(Plugin $plugin, array $install_json): bool {
-		if (isset($install_json['pagetypes'])) {
-			foreach ($install_json['pagetypes'] as $pagetype) {
-				$class_name = $pagetype['class_name'];
-				$title = $pagetype['title'];
-				$permissions = (isset($pagetype['create_permissions']) ? $pagetype['create_permissions'] : array("none"));
-				$advanced = (isset($pagetype['advanced']) ? boolval($pagetype['advanced']) : false);
-				$order = (isset($pagetype['order']) ? intval($pagetype['order']) : 100);
-
-				//create page type
-				PageType::createPageType($class_name, $title, $advanced, $order, $permissions, "plugin_" . $plugin->getName());
-			}
-		}
-
-		return true;
-	}
-
-	public function uninstall(Plugin $plugin, array $install_json): bool {
-		//remove all page types which was created by this plugin
-		PageType::removePageTypesByOwner("plugin_" . $plugin->getName());
-
-		return true;
-	}
-
-	public function upgrade(Plugin $plugin, array $install_json): bool {
-		//TODO: remove page types, which arent longer in install json
-
-		//install supports ON DUPLICATE KEY
-		return $this->install($plugin, $install_json);
-	}
+    public function install(Plugin $plugin, array $install_json): bool {
+        if (isset($install_json['pagetypes'])) {
+            foreach ($install_json['pagetypes'] as $pagetype) {
+                $class_name = $pagetype['class_name'];
+                $title = $pagetype['title'];
+                $permissions = (isset($pagetype['create_permissions']) ? $pagetype['create_permissions'] : array("none"));
+                $advanced = (isset($pagetype['advanced']) ? boolval($pagetype['advanced']) : false);
+                $order = (isset($pagetype['order']) ? intval($pagetype['order']) : 100);
+
+                //create page type
+                PageType::createPageType($class_name, $title, $advanced, $order, $permissions, "plugin_" . $plugin->getName());
+            }
+        }
+
+        return true;
+    }
+
+    public function uninstall(Plugin $plugin, array $install_json): bool {
+        //remove all page types which was created by this plugin
+        PageType::removePageTypesByOwner("plugin_" . $plugin->getName());
+
+        return true;
+    }
+
+    public function upgrade(Plugin $plugin, array $install_json): bool {
+        //TODO: remove page types, which arent longer in install json
+
+        //install supports ON DUPLICATE KEY
+        return $this->install($plugin, $install_json);
+    }
 
 }
 

system/packages/com.jukusoft.cms.folder/classes/folder.php

Indentation +180 added lines, -180 removed lines

@@ -27,219 +27,219 @@
 
 class Folder {
 
-	protected $folder = "";
-	protected $row = array();
-
-	protected static $load_count = 0;
-
-	public function __construct($folder) {
-		$this->folder = $folder;
-	}
-
-	public function load ($folder) {
-		self::$load_count++;
-
-		if (self::$load_count > 50) {
-			throw new IllegalStateException("reached max allowed number of Folder::load() calls (to prevent recursion).");
-		}
-
-		//escape string
-		//$folder = Database::getInstance()->escape($folder);
+    protected $folder = "";
+    protected $row = array();
+
+    protected static $load_count = 0;
+
+    public function __construct($folder) {
+        $this->folder = $folder;
+    }
+
+    public function load ($folder) {
+        self::$load_count++;
+
+        if (self::$load_count > 50) {
+            throw new IllegalStateException("reached max allowed number of Folder::load() calls (to prevent recursion).");
+        }
+
+        //escape string
+        //$folder = Database::getInstance()->escape($folder);
 
-		if (empty($folder)) {
-			$folder = "/";
-		}
+        if (empty($folder)) {
+            $folder = "/";
+        }
 
-		if (Cache::contains("folder", "folder-" . $folder)) {
-			$this->row = Cache::get("folder", "folder-" . $folder);
-		} else {
-			$row = Database::getInstance()->getRow("SELECT * FROM `{praefix}folder` WHERE `folder` = :folder; ", array('folder' => $folder));
-
-			if (!$row) {
-				//load upper folder
-				if (strcmp($folder, "/") !== 0) {
-					//load upper dir
-					$folder = self::getUpperDir($folder);
+        if (Cache::contains("folder", "folder-" . $folder)) {
+            $this->row = Cache::get("folder", "folder-" . $folder);
+        } else {
+            $row = Database::getInstance()->getRow("SELECT * FROM `{praefix}folder` WHERE `folder` = :folder; ", array('folder' => $folder));
+
+            if (!$row) {
+                //load upper folder
+                if (strcmp($folder, "/") !== 0) {
+                    //load upper dir
+                    $folder = self::getUpperDir($folder);
 
-					$this->load($folder);
-				} else {
-					throw new IllegalStateException("no main folder / is defined. Please insert folder '/'.");
-				}
-			} else {
-				$this->row = $row;
-			}
+                    $this->load($folder);
+                } else {
+                    throw new IllegalStateException("no main folder / is defined. Please insert folder '/'.");
+                }
+            } else {
+                $this->row = $row;
+            }
 
-			Cache::put("folder", "folder-" . $folder, $this->row);
-		}
-	}
+            Cache::put("folder", "folder-" . $folder, $this->row);
+        }
+    }
 
-	public function getFolder () : string {
-		return $this->row['folder'];
-	}
+    public function getFolder () : string {
+        return $this->row['folder'];
+    }
 
-	public function listRequiredPermissions () : array {
-		return explode("|", $this->row['permissions']);
-	}
+    public function listRequiredPermissions () : array {
+        return explode("|", $this->row['permissions']);
+    }
 
-	public function checkPermissions (PermissionChecker $permission_checker) : bool {
-		foreach ($this->listRequiredPermissions() as $permission) {
-			if ($permission_checker->hasRight($permission)) {
-				return true;
-			} else if ($permission === "none") {
-				return true;
-			}
-		}
+    public function checkPermissions (PermissionChecker $permission_checker) : bool {
+        foreach ($this->listRequiredPermissions() as $permission) {
+            if ($permission_checker->hasRight($permission)) {
+                return true;
+            } else if ($permission === "none") {
+                return true;
+            }
+        }
 
-		return false;
-	}
+        return false;
+    }
 
-	public function isHidden () : bool {
-		return $this->row['hidden'] == 1;
-	}
+    public function isHidden () : bool {
+        return $this->row['hidden'] == 1;
+    }
 
-	public function hasCustomMainMenu () : bool {
-		return $this->row['main_menu'] != -1;
-	}
+    public function hasCustomMainMenu () : bool {
+        return $this->row['main_menu'] != -1;
+    }
 
-	public function getMainMenu () : int {
-		return $this->row['main_menu'];
-	}
+    public function getMainMenu () : int {
+        return $this->row['main_menu'];
+    }
 
-	public function hasCustomLocalMenu () : bool {
-		return $this->row['local_menu'] != -1;
-	}
+    public function hasCustomLocalMenu () : bool {
+        return $this->row['local_menu'] != -1;
+    }
 
-	public function getLocalMenu () : int {
-		return $this->row['local_menu'];
-	}
+    public function getLocalMenu () : int {
+        return $this->row['local_menu'];
+    }
 
-	public function isTitleTranslationEnabled () {
-		return $this->row['title_translation_support'] == 1;
-	}
+    public function isTitleTranslationEnabled () {
+        return $this->row['title_translation_support'] == 1;
+    }
 
-	public function isActivated () : bool {
-		return $this->row['activated'] == 1;
-	}
+    public function isActivated () : bool {
+        return $this->row['activated'] == 1;
+    }
 
-	public static function getFolderByPage (string $page) : string {
-		$array = explode("/", $page);
+    public static function getFolderByPage (string $page) : string {
+        $array = explode("/", $page);
 
-		if (sizeof($array) <= 2 && empty($array[0])) {
-			return "/";
-		}
+        if (sizeof($array) <= 2 && empty($array[0])) {
+            return "/";
+        }
 
-		//remove last element
-		array_pop($array);
+        //remove last element
+        array_pop($array);
 
-		return implode("/", $array) . "/";
-	}
+        return implode("/", $array) . "/";
+    }
 
-	public static function getUpperDir ($dir) {
-		if (PHPUtils::endsWith($dir, "/")) {
-			//remove last slash
-			$dir = substr($dir, 0, -1);
-		}
-
-		$array = explode("/", $dir);
+    public static function getUpperDir ($dir) {
+        if (PHPUtils::endsWith($dir, "/")) {
+            //remove last slash
+            $dir = substr($dir, 0, -1);
+        }
+
+        $array = explode("/", $dir);
 
-		if (sizeof($array) <= 2 && empty($array[0])) {
-			return "/";
-		}
+        if (sizeof($array) <= 2 && empty($array[0])) {
+            return "/";
+        }
 
-		//remove last element
-		array_pop($array);
+        //remove last element
+        array_pop($array);
 
-		return implode("/", $array) . "/";
-	}
-
-	public static function createFolder (string $folder, bool $hidden = false, array $permissions = array(), int $main_menu = -1, int $local_menu = -1, string $force_template = "none", bool $title_translation = true) {
-		//escape string
-		//$folder = Database::getInstance()->escape($folder);
-
-		$permissions_str = implode("|", $permissions);
+        return implode("/", $array) . "/";
+    }
+
+    public static function createFolder (string $folder, bool $hidden = false, array $permissions = array(), int $main_menu = -1, int $local_menu = -1, string $force_template = "none", bool $title_translation = true) {
+        //escape string
+        //$folder = Database::getInstance()->escape($folder);
+
+        $permissions_str = implode("|", $permissions);
 
-		if (sizeof($permissions) == 0) {
-			$permissions_str = "none";
-		}
+        if (sizeof($permissions) == 0) {
+            $permissions_str = "none";
+        }
 
-		Database::getInstance()->execute("INSERT INTO `{praefix}folder` (
+        Database::getInstance()->execute("INSERT INTO `{praefix}folder` (
 			`folder`, `force_template`, `main_menu`, `local_menu`, `permissions`, `title_translation_support`, `hidden`, `activated`
 		) VALUES (
 			:folder, :templatename, :main_menu, :local_menu, :permissions, :title_translation_support, :hidden, '1'
 		); ", array(
-			'folder' => $folder,
-			'templatename' => $force_template,
-			'main_menu' => $main_menu,
-			'local_menu' => $local_menu,
-			'permissions' => $permissions_str,
-			'title_translation_support' => ($title_translation ? 1 : 0),
-			'hidden' => $hidden ? 1 : 0
-		));
-
-		//clear cache
-		Cache::clear("folder");
-	}
-
-	public static function createFolderIfAbsent (string $folder, bool $hidden = false, array $permissions = array(), int $main_menu = -1, int $local_menu = -1, string $force_template = "none", bool $title_translation = true) {
-		//escape string
-		//$folder = Database::getInstance()->escape($folder);
-
-		$permissions_str = implode("|", $permissions);
-
-		if (sizeof($permissions) == 0) {
-			$permissions_str = "none";
-		}
-
-		Database::getInstance()->execute("INSERT INTO `{praefix}folder` (
+            'folder' => $folder,
+            'templatename' => $force_template,
+            'main_menu' => $main_menu,
+            'local_menu' => $local_menu,
+            'permissions' => $permissions_str,
+            'title_translation_support' => ($title_translation ? 1 : 0),
+            'hidden' => $hidden ? 1 : 0
+        ));
+
+        //clear cache
+        Cache::clear("folder");
+    }
+
+    public static function createFolderIfAbsent (string $folder, bool $hidden = false, array $permissions = array(), int $main_menu = -1, int $local_menu = -1, string $force_template = "none", bool $title_translation = true) {
+        //escape string
+        //$folder = Database::getInstance()->escape($folder);
+
+        $permissions_str = implode("|", $permissions);
+
+        if (sizeof($permissions) == 0) {
+            $permissions_str = "none";
+        }
+
+        Database::getInstance()->execute("INSERT INTO `{praefix}folder` (
 			`folder`, `force_template`, `main_menu`, `local_menu`, `permissions`, `title_translation_support`, `hidden`, `activated`
 		) VALUES (
 			:folder, :templatename, :main_menu, :local_menu, :permissions, :title_translation_support, :hidden, '1'
 		) ON DUPLICATE KEY UPDATE `hidden` = :hidden, `permissions` = :permissions, `force_template` = :templatename; ", array(
-			'folder' => $folder,
-			'templatename' => $force_template,
-			'main_menu' => $main_menu,
-			'local_menu' => $local_menu,
-			'permissions' => $permissions_str,
-			'title_translation_support' => ($title_translation ? 1 : 0),
-			'hidden' => $hidden ? 1 : 0
-		));
-
-		//clear cache
-		Cache::clear("folder");
-	}
-
-	public static function deleteFolder ($folder) {
-		//escape string
-		//$folder = Database::getInstance()->escape($folder);
-
-		Database::getInstance()->execute("DELETE FROM `{praefix}folder` WHERE `folder` = :folder; ", array('folder' => $folder));
-	}
-
-	public static function listFolders (bool $include_hidden_folders = false) {
-		if (Cache::contains("folder", "list_" . ($include_hidden_folders ? "hidden" : "not_hidden"))) {
-			return Cache::get("folder", "list_" . ($include_hidden_folders ? "hidden" : "not_hidden"));
-		} else {
-			$rows = array();
-
-			if ($include_hidden_folders) {
-				$rows = Database::getInstance()->listRows("SELECT * FROM `{praefix}folder` WHERE `activated` = 1; ");
-			} else {
-				$rows = Database::getInstance()->listRows("SELECT * FROM `{praefix}folder` WHERE `hidden` = 0 AND `activated` = 1; ");
-			}
-
-			Cache::put("folder", "list_" . ($include_hidden_folders ? "hidden" : "not_hidden"), $rows);
-
-			return $rows;
-		}
-	}
-
-	public static function exists (string $folder) : bool {
-		$row = Database::getInstance()->getRow("SELECT * FROM `{praefix}folder` WHERE `folder` = :folder; ", array(
-			'folder' => $folder
-		));
-
-		return $row !== false;
-	}
+            'folder' => $folder,
+            'templatename' => $force_template,
+            'main_menu' => $main_menu,
+            'local_menu' => $local_menu,
+            'permissions' => $permissions_str,
+            'title_translation_support' => ($title_translation ? 1 : 0),
+            'hidden' => $hidden ? 1 : 0
+        ));
+
+        //clear cache
+        Cache::clear("folder");
+    }
+
+    public static function deleteFolder ($folder) {
+        //escape string
+        //$folder = Database::getInstance()->escape($folder);
+
+        Database::getInstance()->execute("DELETE FROM `{praefix}folder` WHERE `folder` = :folder; ", array('folder' => $folder));
+    }
+
+    public static function listFolders (bool $include_hidden_folders = false) {
+        if (Cache::contains("folder", "list_" . ($include_hidden_folders ? "hidden" : "not_hidden"))) {
+            return Cache::get("folder", "list_" . ($include_hidden_folders ? "hidden" : "not_hidden"));
+        } else {
+            $rows = array();
+
+            if ($include_hidden_folders) {
+                $rows = Database::getInstance()->listRows("SELECT * FROM `{praefix}folder` WHERE `activated` = 1; ");
+            } else {
+                $rows = Database::getInstance()->listRows("SELECT * FROM `{praefix}folder` WHERE `hidden` = 0 AND `activated` = 1; ");
+            }
+
+            Cache::put("folder", "list_" . ($include_hidden_folders ? "hidden" : "not_hidden"), $rows);
+
+            return $rows;
+        }
+    }
+
+    public static function exists (string $folder) : bool {
+        $row = Database::getInstance()->getRow("SELECT * FROM `{praefix}folder` WHERE `folder` = :folder; ", array(
+            'folder' => $folder
+        ));
+
+        return $row !== false;
+    }
 
 }
 

Spacing +18 added lines, -18 removed lines

@@ -36,7 +36,7 @@ 
 		$this->folder = $folder;
 	}
 
-	public function load ($folder) {
+	public function load($folder) {
 		self::$load_count++;
 
 		if (self::$load_count > 50) {
@@ -73,15 +73,15 @@ 
 		}
 	}
 
-	public function getFolder () : string {
+	public function getFolder() : string {
 		return $this->row['folder'];
 	}
 
-	public function listRequiredPermissions () : array {
+	public function listRequiredPermissions() : array {
 		return explode("|", $this->row['permissions']);
 	}
 
-	public function checkPermissions (PermissionChecker $permission_checker) : bool {
+	public function checkPermissions(PermissionChecker $permission_checker) : bool {
 		foreach ($this->listRequiredPermissions() as $permission) {
 			if ($permission_checker->hasRight($permission)) {
 				return true;
@@ -93,35 +93,35 @@ 
 		return false;
 	}
 
-	public function isHidden () : bool {
+	public function isHidden() : bool {
 		return $this->row['hidden'] == 1;
 	}
 
-	public function hasCustomMainMenu () : bool {
+	public function hasCustomMainMenu() : bool {
 		return $this->row['main_menu'] != -1;
 	}
 
-	public function getMainMenu () : int {
+	public function getMainMenu() : int {
 		return $this->row['main_menu'];
 	}
 
-	public function hasCustomLocalMenu () : bool {
+	public function hasCustomLocalMenu() : bool {
 		return $this->row['local_menu'] != -1;
 	}
 
-	public function getLocalMenu () : int {
+	public function getLocalMenu() : int {
 		return $this->row['local_menu'];
 	}
 
-	public function isTitleTranslationEnabled () {
+	public function isTitleTranslationEnabled() {
 		return $this->row['title_translation_support'] == 1;
 	}
 
-	public function isActivated () : bool {
+	public function isActivated() : bool {
 		return $this->row['activated'] == 1;
 	}
 
-	public static function getFolderByPage (string $page) : string {
+	public static function getFolderByPage(string $page) : string {
 		$array = explode("/", $page);
 
 		if (sizeof($array) <= 2 && empty($array[0])) {
@@ -134,7 +134,7 @@ 
 		return implode("/", $array) . "/";
 	}
 
-	public static function getUpperDir ($dir) {
+	public static function getUpperDir($dir) {
 		if (PHPUtils::endsWith($dir, "/")) {
 			//remove last slash
 			$dir = substr($dir, 0, -1);
@@ -152,7 +152,7 @@ 
 		return implode("/", $array) . "/";
 	}
 
-	public static function createFolder (string $folder, bool $hidden = false, array $permissions = array(), int $main_menu = -1, int $local_menu = -1, string $force_template = "none", bool $title_translation = true) {
+	public static function createFolder(string $folder, bool $hidden = false, array $permissions = array(), int $main_menu = -1, int $local_menu = -1, string $force_template = "none", bool $title_translation = true) {
 		//escape string
 		//$folder = Database::getInstance()->escape($folder);
 
@@ -180,7 +180,7 @@ 
 		Cache::clear("folder");
 	}
 
-	public static function createFolderIfAbsent (string $folder, bool $hidden = false, array $permissions = array(), int $main_menu = -1, int $local_menu = -1, string $force_template = "none", bool $title_translation = true) {
+	public static function createFolderIfAbsent(string $folder, bool $hidden = false, array $permissions = array(), int $main_menu = -1, int $local_menu = -1, string $force_template = "none", bool $title_translation = true) {
 		//escape string
 		//$folder = Database::getInstance()->escape($folder);
 
@@ -208,14 +208,14 @@ 
 		Cache::clear("folder");
 	}
 
-	public static function deleteFolder ($folder) {
+	public static function deleteFolder($folder) {
 		//escape string
 		//$folder = Database::getInstance()->escape($folder);
 
 		Database::getInstance()->execute("DELETE FROM `{praefix}folder` WHERE `folder` = :folder; ", array('folder' => $folder));
 	}
 
-	public static function listFolders (bool $include_hidden_folders = false) {
+	public static function listFolders(bool $include_hidden_folders = false) {
 		if (Cache::contains("folder", "list_" . ($include_hidden_folders ? "hidden" : "not_hidden"))) {
 			return Cache::get("folder", "list_" . ($include_hidden_folders ? "hidden" : "not_hidden"));
 		} else {
@@ -233,7 +233,7 @@ 
 		}
 	}
 
-	public static function exists (string $folder) : bool {
+	public static function exists(string $folder) : bool {
 		$row = Database::getInstance()->getRow("SELECT * FROM `{praefix}folder` WHERE `folder` = :folder; ", array(
 			'folder' => $folder
 		));

system/packages/com.jukusoft.cms.admin/classes/createpagepage.php

Indentation +117 added lines, -117 removed lines

@@ -27,126 +27,126 @@
 
 class CreatePagePage extends PageType {
 
-	public function getContent(): string {
-		$template = new DwooTemplate("pages/createpage");
+    public function getContent(): string {
+        $template = new DwooTemplate("pages/createpage");
 
-		$errors = array();
-
-		if (isset($_REQUEST['action']) && $_REQUEST['action'] === "create" && PermissionChecker::current()->hasRight("can_create_pages")) {
-			//try to create a new page
-
-			//first, get all values
-			if (!isset($_REQUEST['folder']) || empty($_REQUEST['folder'])) {
-				$errors[] = "Folder is not set!";
-			}
+        $errors = array();
+
+        if (isset($_REQUEST['action']) && $_REQUEST['action'] === "create" && PermissionChecker::current()->hasRight("can_create_pages")) {
+            //try to create a new page
+
+            //first, get all values
+            if (!isset($_REQUEST['folder']) || empty($_REQUEST['folder'])) {
+                $errors[] = "Folder is not set!";
+            }
 
-			if (!isset($_REQUEST['page_alias']) || empty($_REQUEST['page_alias'])) {
-				$errors[] = "Page alias isn't set!";
-			}
+            if (!isset($_REQUEST['page_alias']) || empty($_REQUEST['page_alias'])) {
+                $errors[] = "Page alias isn't set!";
+            }
 
-			if (!isset($_REQUEST['title']) || empty($_REQUEST['title'])) {
-				$errors[] = "Title is't set!";
-			}
-
-			if (!isset($_REQUEST['pagetype']) || empty($_REQUEST['pagetype'])) {
-				$errors[] = "Pagetype is't set!";
-			}
-
-			if (empty($errors)) {
-				$folder = $_REQUEST['folder'];
-				$alias = $_REQUEST['page_alias'];
-				$title = $_REQUEST['title'];
-				$pagetype = $_REQUEST['pagetype'];
-
-				//check, if folder exists
-				if (!Folder::exists($folder)) {
-					$errors[] = "Folder '" . htmlentities($folder) . "' doesn't exists!";
-				}
-
-				//check, if page alias already exists
-				$page_full_alias = $folder . $alias;
-
-				if (PHPUtils::startsWith($page_full_alias, "/")) {
-					//remove / at beginning
-					$page_full_alias = substr($page_full_alias, 1);
-				}
-
-				if (Page::exists($page_full_alias)) {
-					$errors[] = "Page alias '" . htmlentities($page_full_alias) . "' already exists!";
-				}
-
-				//remove html characters in title
-				$title = htmlentities($title);
-
-				//check, if pagetype exists
-				if (!PageType::exists($pagetype)) {
-					$errors[] = "Pagetype '" . htmlentities($pagetype) . "' doesn't exists!";
-				}
-
-				Events::throwEvent("before_create_page", array(
-					'folder' => &$folder,
-					'alias' => &$alias,
-					'full_alias' => &$page_full_alias,
-					'title' => &$title,
-					'pagetype' => &$pagetype
-				));
-
-				if (empty($errors)) {
-					$pageID = Page::createIfAbsent($page_full_alias, htmlentities($title), $pagetype, "", $folder, -1, -1, -1, true, false, true, true, User::current()->getUsername());
-
-					Events::throwEvent("after_create_page", array(
-						'pageID' => $pageID
-					));
-
-					//redirect header
-					header("Location: " . DomainUtils::generateURL("admin/edit_page", array("edit" => $pageID)));
-
-					exit;
-				}
-			}
-		}
-
-		//set form action url
-		$template->assign("action_url", DomainUtils::generateURL($this->getPage()->getAlias(), array("action" => "create")));
-		$template->assign("username", User::current()->getUsername());
-
-		$template->assign("errors", $errors);
-
-		//list page types
-		$page_types_rows = PageType::listPageTypes();
-		$page_types = array();
-
-		foreach ($page_types_rows as $row) {
-			$page_types[] = array(
-				'title' => htmlentities(Translator::translateTitle($row['title'])),
-				'class_name' => $row['page_type']
-			);
-		}
-
-		$template->assign("pagetypes", $page_types);
-
-		$folders = array();
-
-		foreach (Folder::listFolders(false) as $row) {
-			$folders[] = array(
-				'folder' => $row['folder'],
-				'hidden' => $row['hidden'] == 1,
-				'is_root_folder' => $row['folder'] === "/"
-			);
-		}
-
-		$template->assign("folders", $folders);
-
-		return $template->getCode();
-	}
-
-	public function getFooterScripts(): string {
-		return "";
-	}
-
-	public function listRequiredPermissions(): array {
-		return array("can_create_pages");
-	}
+            if (!isset($_REQUEST['title']) || empty($_REQUEST['title'])) {
+                $errors[] = "Title is't set!";
+            }
+
+            if (!isset($_REQUEST['pagetype']) || empty($_REQUEST['pagetype'])) {
+                $errors[] = "Pagetype is't set!";
+            }
+
+            if (empty($errors)) {
+                $folder = $_REQUEST['folder'];
+                $alias = $_REQUEST['page_alias'];
+                $title = $_REQUEST['title'];
+                $pagetype = $_REQUEST['pagetype'];
+
+                //check, if folder exists
+                if (!Folder::exists($folder)) {
+                    $errors[] = "Folder '" . htmlentities($folder) . "' doesn't exists!";
+                }
+
+                //check, if page alias already exists
+                $page_full_alias = $folder . $alias;
+
+                if (PHPUtils::startsWith($page_full_alias, "/")) {
+                    //remove / at beginning
+                    $page_full_alias = substr($page_full_alias, 1);
+                }
+
+                if (Page::exists($page_full_alias)) {
+                    $errors[] = "Page alias '" . htmlentities($page_full_alias) . "' already exists!";
+                }
+
+                //remove html characters in title
+                $title = htmlentities($title);
+
+                //check, if pagetype exists
+                if (!PageType::exists($pagetype)) {
+                    $errors[] = "Pagetype '" . htmlentities($pagetype) . "' doesn't exists!";
+                }
+
+                Events::throwEvent("before_create_page", array(
+                    'folder' => &$folder,
+                    'alias' => &$alias,
+                    'full_alias' => &$page_full_alias,
+                    'title' => &$title,
+                    'pagetype' => &$pagetype
+                ));
+
+                if (empty($errors)) {
+                    $pageID = Page::createIfAbsent($page_full_alias, htmlentities($title), $pagetype, "", $folder, -1, -1, -1, true, false, true, true, User::current()->getUsername());
+
+                    Events::throwEvent("after_create_page", array(
+                        'pageID' => $pageID
+                    ));
+
+                    //redirect header
+                    header("Location: " . DomainUtils::generateURL("admin/edit_page", array("edit" => $pageID)));
+
+                    exit;
+                }
+            }
+        }
+
+        //set form action url
+        $template->assign("action_url", DomainUtils::generateURL($this->getPage()->getAlias(), array("action" => "create")));
+        $template->assign("username", User::current()->getUsername());
+
+        $template->assign("errors", $errors);
+
+        //list page types
+        $page_types_rows = PageType::listPageTypes();
+        $page_types = array();
+
+        foreach ($page_types_rows as $row) {
+            $page_types[] = array(
+                'title' => htmlentities(Translator::translateTitle($row['title'])),
+                'class_name' => $row['page_type']
+            );
+        }
+
+        $template->assign("pagetypes", $page_types);
+
+        $folders = array();
+
+        foreach (Folder::listFolders(false) as $row) {
+            $folders[] = array(
+                'folder' => $row['folder'],
+                'hidden' => $row['hidden'] == 1,
+                'is_root_folder' => $row['folder'] === "/"
+            );
+        }
+
+        $template->assign("folders", $folders);
+
+        return $template->getCode();
+    }
+
+    public function getFooterScripts(): string {
+        return "";
+    }
+
+    public function listRequiredPermissions(): array {
+        return array("can_create_pages");
+    }
 
 }
 

system/packages/com.jukusoft.cms.sitemap/classes/sitemappage.php

Indentation +30 added lines, -30 removed lines

@@ -27,50 +27,50 @@
 
 class SitemapPage extends PageType {
 
-	public function getContentType(): string {
-		return "text/xml; charset=" . $this->getCharset();
-	}
+    public function getContentType(): string {
+        return "text/xml; charset=" . $this->getCharset();
+    }
 
-	public function getContent(): string {
-		$template = new DwooTemplate(PACKAGE_PATH . "com.jukusoft.cms.sitemap/template/sitemap.tpl");
+    public function getContent(): string {
+        $template = new DwooTemplate(PACKAGE_PATH . "com.jukusoft.cms.sitemap/template/sitemap.tpl");
 
-		$urls = array();
+        $urls = array();
 
-		$rows = Database::getInstance()->listRows("SELECT * FROM `{praefix}pages` WHERE `sitemap` = '1' AND `published` = '1' AND `activated` = '1'; ");
+        $rows = Database::getInstance()->listRows("SELECT * FROM `{praefix}pages` WHERE `sitemap` = '1' AND `published` = '1' AND `activated` = '1'; ");
 
-		foreach ($rows as $row) {
-			$entry = array();
+        foreach ($rows as $row) {
+            $entry = array();
 
-			//generate url to page
-			$entry['loc'] = DomainUtils::generateURL($row['alias']);
+            //generate url to page
+            $entry['loc'] = DomainUtils::generateURL($row['alias']);
 
-			//get last modified timestamp
-			$last_update = ($row['last_update'] === "0000-00-00 00:00:00" ? $row['created'] : $row['last_update']);
+            //get last modified timestamp
+            $last_update = ($row['last_update'] === "0000-00-00 00:00:00" ? $row['created'] : $row['last_update']);
 
-			//timezone berlin
-			$timezone = "+01:00";
+            //timezone berlin
+            $timezone = "+01:00";
 
-			//convert last modification timestamp to w3c timestamp: https://www.w3.org/TR/NOTE-datetime
-			$entry['lastmod'] = date('Y-m-d\TH:i:s', strtotime($last_update)) . $timezone;
+            //convert last modification timestamp to w3c timestamp: https://www.w3.org/TR/NOTE-datetime
+            $entry['lastmod'] = date('Y-m-d\TH:i:s', strtotime($last_update)) . $timezone;
 
-			$entry['changefreq'] = strtolower($row['sitemap_changefreq']);
-			$entry['priority'] = $row['sitemap_priority'];
+            $entry['changefreq'] = strtolower($row['sitemap_changefreq']);
+            $entry['priority'] = $row['sitemap_priority'];
 
-			$urls[] = $entry;
-		}
+            $urls[] = $entry;
+        }
 
-		$template->assign("urls", $urls);
+        $template->assign("urls", $urls);
 
-		return $template->getCode();
-	}
+        return $template->getCode();
+    }
 
-	public function showDesign() {
-		return false;
-	}
+    public function showDesign() {
+        return false;
+    }
 
-	public function showHTMLComments(): bool {
-		return false;
-	}
+    public function showHTMLComments(): bool {
+        return false;
+    }
 
 }
 

styles/admin/bower_components/ckeditor/samples/old/assets/posteddata.php

Indentation +9 added lines, -9 removed lines

@@ -27,22 +27,22 @@
 
 if (!empty($_POST))
 {
-	foreach ( $_POST as $key => $value )
-	{
-		if ( ( !is_string($value) && !is_numeric($value) ) || !is_string($key) )
-			continue;
+    foreach ( $_POST as $key => $value )
+    {
+        if ( ( !is_string($value) && !is_numeric($value) ) || !is_string($key) )
+            continue;
 
-		if ( get_magic_quotes_gpc() )
-			$value = htmlspecialchars( stripslashes((string)$value) );
-		else
-			$value = htmlspecialchars( (string)$value );
+        if ( get_magic_quotes_gpc() )
+            $value = htmlspecialchars( stripslashes((string)$value) );
+        else
+            $value = htmlspecialchars( (string)$value );
 ?>
 		<tr>
 			<th style="vertical-align: top"><?php echo htmlspecialchars( (string)$key ); ?></th>
 			<td><pre class="samples"><?php echo $value; ?></pre></td>
 		</tr>
 	<?php
-	}
+    }
 }
 ?>
 	</table>

Spacing +6 added lines, -6 removed lines

@@ -27,18 +27,18 @@
 
 if (!empty($_POST))
 {
-	foreach ( $_POST as $key => $value )
+	foreach ($_POST as $key => $value)
 	{
-		if ( ( !is_string($value) && !is_numeric($value) ) || !is_string($key) )
+		if ((!is_string($value) && !is_numeric($value)) || !is_string($key))
 			continue;
 
-		if ( get_magic_quotes_gpc() )
-			$value = htmlspecialchars( stripslashes((string)$value) );
+		if (get_magic_quotes_gpc())
+			$value = htmlspecialchars(stripslashes((string) $value));
 		else
-			$value = htmlspecialchars( (string)$value );
+			$value = htmlspecialchars((string) $value);
 ?>
 		<tr>
-			<th style="vertical-align: top"><?php echo htmlspecialchars( (string)$key ); ?></th>
+			<th style="vertical-align: top"><?php echo htmlspecialchars((string) $key); ?></th>
 			<td><pre class="samples"><?php echo $value; ?></pre></td>
 		</tr>
 	<?php

Braces +9 added lines, -7 removed lines

@@ -29,14 +29,16 @@
 {
 	foreach ( $_POST as $key => $value )
 	{
-		if ( ( !is_string($value) && !is_numeric($value) ) || !is_string($key) )
-			continue;
+		if ( ( !is_string($value) && !is_numeric($value) ) || !is_string($key) ) {
+					continue;
+		}
 
-		if ( get_magic_quotes_gpc() )
-			$value = htmlspecialchars( stripslashes((string)$value) );
-		else
-			$value = htmlspecialchars( (string)$value );
-?>
+		if ( get_magic_quotes_gpc() ) {
+					$value = htmlspecialchars( stripslashes((string)$value) );
+		} else {
+					$value = htmlspecialchars( (string)$value );
+		}
+		?>
 		<tr>
 			<th style="vertical-align: top"><?php echo htmlspecialchars( (string)$key ); ?></th>
 			<td><pre class="samples"><?php echo $value; ?></pre></td>