JuKu / JuKuCMS

system/core/datatype/text.php

Indentation +12 added lines, -12 removed lines

@@ -27,18 +27,18 @@
 
 class DataType_Text extends DataType_Base {
 
-	public function getFormCode(): string {
-		return "<textarea name=\"" . $this->getInputName() . "\" rows=\"4\" cols=\"50\">" . $this->getValue() . "</textarea>";
-	}
-
-	public function validate(string $value): bool {
-		$val = new Validator_String();
-		return $val->isValide($value);
-	}
-
-	protected function saveAsync($value) {
-		Settings::setAsync($this->getKey(), (string) $value);
-	}
+    public function getFormCode(): string {
+        return "<textarea name=\"" . $this->getInputName() . "\" rows=\"4\" cols=\"50\">" . $this->getValue() . "</textarea>";
+    }
+
+    public function validate(string $value): bool {
+        $val = new Validator_String();
+        return $val->isValide($value);
+    }
+
+    protected function saveAsync($value) {
+        Settings::setAsync($this->getKey(), (string) $value);
+    }
 
 }
 

system/core/datatype/menuselector.php

Indentation +25 added lines, -25 removed lines

@@ -27,31 +27,31 @@
 
 class DataType_MenuSelector extends DataType_Base {
 
-	public function getFormCode(): string {
-		$code = "<select name=\"" . $this->getInputName() . "\" class=\"form-control select2\" style=\"width: 100%;\">";
-
-		foreach (Menu::listMenuNames() as $row) {
-			$code .= "<option value=\"" . $row['menuID'] . "\"" . ($row['menuID'] == $this->getValue() ? " selected=\"selected\"" : "") . ">" . $row['title'] . "</option>";
-		}
-
-		$code .= "</select>";
-		return $code;
-	}
-
-	public function validate(string $value): bool {
-		foreach (Menu::listMenuNames() as $row) {
-			if ($row['menuID'] == $value) {
-				//menuID exists
-				return true;
-			}
-		}
-
-		return false;
-	}
-
-	protected function saveAsync($value) {
-		Settings::setAsync($this->getKey(), (int) $value);
-	}
+    public function getFormCode(): string {
+        $code = "<select name=\"" . $this->getInputName() . "\" class=\"form-control select2\" style=\"width: 100%;\">";
+
+        foreach (Menu::listMenuNames() as $row) {
+            $code .= "<option value=\"" . $row['menuID'] . "\"" . ($row['menuID'] == $this->getValue() ? " selected=\"selected\"" : "") . ">" . $row['title'] . "</option>";
+        }
+
+        $code .= "</select>";
+        return $code;
+    }
+
+    public function validate(string $value): bool {
+        foreach (Menu::listMenuNames() as $row) {
+            if ($row['menuID'] == $value) {
+                //menuID exists
+                return true;
+            }
+        }
+
+        return false;
+    }
+
+    protected function saveAsync($value) {
+        Settings::setAsync($this->getKey(), (int) $value);
+    }
 
 }
 

system/core/datatype/sidebarchooser.php

Indentation +23 added lines, -23 removed lines

@@ -27,36 +27,36 @@
 
 class DataType_SidebarChooser extends DataType_Base {
 
-	public function getFormCode(): string {
-		$code = "<select name=\"" . $this->getInputName() . "\" class=\"form-control select2\" style=\"width: 100%;\">";
+    public function getFormCode(): string {
+        $code = "<select name=\"" . $this->getInputName() . "\" class=\"form-control select2\" style=\"width: 100%;\">";
 
-		foreach (Sidebar::listSidebars() as $sidebar) {
-			$sidebar = Sidebar::cast($sidebar);
-			$code .= "<option value=\"" . $sidebar->getSidebarId() . "\"" . ($sidebar->getSidebarId() == $this->getValue() ? " selected=\"selected\"" : "") . ">" . $sidebar->getTitle() . "</option>";
-		}
+        foreach (Sidebar::listSidebars() as $sidebar) {
+            $sidebar = Sidebar::cast($sidebar);
+            $code .= "<option value=\"" . $sidebar->getSidebarId() . "\"" . ($sidebar->getSidebarId() == $this->getValue() ? " selected=\"selected\"" : "") . ">" . $sidebar->getTitle() . "</option>";
+        }
 
-		$code .= "</select>";
+        $code .= "</select>";
 
-		return $code;
-	}
+        return $code;
+    }
 
-	public function validate(string $value): bool {
-		foreach (Sidebar::listSidebars() as $sidebar) {
-			$sidebar = Sidebar::cast($sidebar);
-			$value = (int) $value;
+    public function validate(string $value): bool {
+        foreach (Sidebar::listSidebars() as $sidebar) {
+            $sidebar = Sidebar::cast($sidebar);
+            $value = (int) $value;
 
-			if ($sidebar->getSidebarId() == $value) {
-				//sidebar exists
-				return true;
-			}
-		}
+            if ($sidebar->getSidebarId() == $value) {
+                //sidebar exists
+                return true;
+            }
+        }
 
-		return false;
-	}
+        return false;
+    }
 
-	protected function saveAsync($value) {
-		Settings::setAsync($this->getKey(), (int) $value);
-	}
+    protected function saveAsync($value) {
+        Settings::setAsync($this->getKey(), (int) $value);
+    }
 
 }
 

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

Indentation +250 added lines, -250 removed lines

@@ -25,280 +25,280 @@
  */
 class Settings {
 
-	//in-memory cache of settings
-	protected static $settings = array();
-
-	//flag, if global settings was initialized
-	protected static $initialized = false;
-
-	protected static $async_save_list = array();
-
-	/**
-	 * get value of setting
-	 *
-	 * @package com.jukusoft.cms.settings
-	 *
-	 * @param key setting
-	 *
-	 * @throws IllegalStateException of key doesnt exists and no default value is set
-	 *
-	 * @return mixed or null, if key doesnt exists in database / default value, if set
-	 */
-	public static function get (string $key, $default_value = null) {
-		//load settings if neccessary
-		self::loadSettingsIfAbsent();
-
-		if (!isset(self::$settings[$key])) {
-			if ($default_value !== null) {
-				return $default_value;
-			} else {
-				throw new IllegalStateException("Settings key '" . $key . "' doesnt exists.");
-			}
-		} else {
-			return unserialize(self::$settings[$key]);
-		}
-	}
-
-	/**
-	 * set setting
-	 *
-	 * @param $key setting
-	 * @param $value mixed value to set
-	 */
-	public static function set (string $key, $value) {
-		//serialize data
-		$value = serialize($value);
-
-		//update database
-		Database::getInstance()->execute("UPDATE `{praefix}global_settings` SET `value` = :value WHERE `key` = :key;", array(
-			'value' => $value,
-			'key' => $key
-		));
-
-		//update local in-memory cache
-		self::$settings[$key] = $value;
-
-		//clear cache (area "global_settings")
-		Cache::clear("global_settings");
-	}
-
-	public static function setAsync (string $key, $value) {
-		//only execute database query, if value was changed
-		if (isset(self::$async_save_list[$key]) || self::get($key) != $value) {
-			self::$async_save_list[$key] = $value;
-		}
-
-		//update local in-memory cache
-		self::$settings[$key] = serialize($value);
-	}
-
-	public static function saveAsync () {
-		if (!empty(self::$async_save_list)) {
-			foreach (self::$async_save_list as $key=>$value) {
-				Settings::set($key, $value);
-			}
-		}
-	}
-
-	/**
-	 * check if settings key exists
-	 *
-	 * @param $key string settings key
-	 *
-	 * @return true if setting key exists
-	 */
-	public static function contains (string $key) : bool {
-		//load settings if neccessary
-		self::loadSettingsIfAbsent();
-
-		//escape key
-		//$key = Database::getInstance()->escape($key);
-
-		return isset(self::$settings[$key]);
-	}
-
-	/**
-	 * set setting if key is absent
-	 *
-	 * @param $key setting
-	 * @param $value mixed value to set
-	 */
-	public static function setIfAbsent (string $key, $value) {
-		self::loadSettingsIfAbsent();
-
-		if (!isset(self::$settings[$key])) {
-			self::set($key, $value);
-		}
-	}
-
-	/**
-	 * create setting (so it can be shown on settings page)
-	 */
-	public static function create (string $key, $value, string $title, string $description, string $owner, string $category = "general", string $datatype = "DataType_String", $datatype_params = "", bool $editable = true, $visible_permissions = "can_see_global_settings", $change_permissions = "can_change_global_settings", int $order = 10, string $icon_path = "none", string $last_update = "0000-00-00 00:00:00") {
-		self::loadSettingsIfAbsent();
-
-		if (strlen($key) > 255) {
-			throw new IllegalArgumentException("max key length is 255, your key: " . $key);
-		}
-
-		//check, if setting already exists
-		/*if (isset(self::$settings[$key])) {
+    //in-memory cache of settings
+    protected static $settings = array();
+
+    //flag, if global settings was initialized
+    protected static $initialized = false;
+
+    protected static $async_save_list = array();
+
+    /**
+     * get value of setting
+     *
+     * @package com.jukusoft.cms.settings
+     *
+     * @param key setting
+     *
+     * @throws IllegalStateException of key doesnt exists and no default value is set
+     *
+     * @return mixed or null, if key doesnt exists in database / default value, if set
+     */
+    public static function get (string $key, $default_value = null) {
+        //load settings if neccessary
+        self::loadSettingsIfAbsent();
+
+        if (!isset(self::$settings[$key])) {
+            if ($default_value !== null) {
+                return $default_value;
+            } else {
+                throw new IllegalStateException("Settings key '" . $key . "' doesnt exists.");
+            }
+        } else {
+            return unserialize(self::$settings[$key]);
+        }
+    }
+
+    /**
+     * set setting
+     *
+     * @param $key setting
+     * @param $value mixed value to set
+     */
+    public static function set (string $key, $value) {
+        //serialize data
+        $value = serialize($value);
+
+        //update database
+        Database::getInstance()->execute("UPDATE `{praefix}global_settings` SET `value` = :value WHERE `key` = :key;", array(
+            'value' => $value,
+            'key' => $key
+        ));
+
+        //update local in-memory cache
+        self::$settings[$key] = $value;
+
+        //clear cache (area "global_settings")
+        Cache::clear("global_settings");
+    }
+
+    public static function setAsync (string $key, $value) {
+        //only execute database query, if value was changed
+        if (isset(self::$async_save_list[$key]) || self::get($key) != $value) {
+            self::$async_save_list[$key] = $value;
+        }
+
+        //update local in-memory cache
+        self::$settings[$key] = serialize($value);
+    }
+
+    public static function saveAsync () {
+        if (!empty(self::$async_save_list)) {
+            foreach (self::$async_save_list as $key=>$value) {
+                Settings::set($key, $value);
+            }
+        }
+    }
+
+    /**
+     * check if settings key exists
+     *
+     * @param $key string settings key
+     *
+     * @return true if setting key exists
+     */
+    public static function contains (string $key) : bool {
+        //load settings if neccessary
+        self::loadSettingsIfAbsent();
+
+        //escape key
+        //$key = Database::getInstance()->escape($key);
+
+        return isset(self::$settings[$key]);
+    }
+
+    /**
+     * set setting if key is absent
+     *
+     * @param $key setting
+     * @param $value mixed value to set
+     */
+    public static function setIfAbsent (string $key, $value) {
+        self::loadSettingsIfAbsent();
+
+        if (!isset(self::$settings[$key])) {
+            self::set($key, $value);
+        }
+    }
+
+    /**
+     * create setting (so it can be shown on settings page)
+     */
+    public static function create (string $key, $value, string $title, string $description, string $owner, string $category = "general", string $datatype = "DataType_String", $datatype_params = "", bool $editable = true, $visible_permissions = "can_see_global_settings", $change_permissions = "can_change_global_settings", int $order = 10, string $icon_path = "none", string $last_update = "0000-00-00 00:00:00") {
+        self::loadSettingsIfAbsent();
+
+        if (strlen($key) > 255) {
+            throw new IllegalArgumentException("max key length is 255, your key: " . $key);
+        }
+
+        //check, if setting already exists
+        /*if (isset(self::$settings[$key])) {
 			throw new IllegalArgumentException("global setting key '" . $key . "' already exists in database.");
 		}*/
 
-		//allow more than one possible permission as array
-		if (is_array($visible_permissions)) {
-			$visible_permissions = implode("|", $visible_permissions);
-		}
+        //allow more than one possible permission as array
+        if (is_array($visible_permissions)) {
+            $visible_permissions = implode("|", $visible_permissions);
+        }
 
-		//allow more than one possible permission as array
-		if (is_array($change_permissions)) {
-			$change_permissions = implode("|", $change_permissions);
-		}
+        //allow more than one possible permission as array
+        if (is_array($change_permissions)) {
+            $change_permissions = implode("|", $change_permissions);
+        }
 
-		//serialize value
-		$value = serialize($value);
-		$datatype_params = serialize($datatype_params);
+        //serialize value
+        $value = serialize($value);
+        $datatype_params = serialize($datatype_params);
 
-		//insert setting into database
-		Database::getInstance()->execute("INSERT INTO `{praefix}global_settings` (
+        //insert setting into database
+        Database::getInstance()->execute("INSERT INTO `{praefix}global_settings` (
 			`key`, `value`, `title`, `description`, `visible_permission`, `change_permission`, `owner`, `order`, `icon_path`, `last_update`, `datatype`, `datatype_params`, `editable`, `category`, `activated`
 		) VALUES (
 			:key, :value, :title, :description, :visible_permissions, :change_permissions, :owner, :order, :icon_path, '0000-00-00 00:00:00', :datatype, :datatype_params, :editable, :category, :activated
 		) ON DUPLICATE KEY UPDATE `title` = :title, `description` = :description, `visible_permission` = :visible_permissions, `change_permission` = :change_permissions, `owner` = :owner, `order` = :order, `icon_path` = :icon_path, `last_update` = CURRENT_TIMESTAMP, `datatype` = :datatype, `datatype_params` = :datatype_params, `editable` = :editable, `category` = :category; ", array(
-			'key' => $key,
-			'value' => $value,
-			'title' => $title,
-			'description' => $description,
-			'visible_permissions' => $visible_permissions,
-			'change_permissions' => $change_permissions,
-			'owner' => $owner,
-			'order' => (int) $order,
-			'icon_path' => $icon_path,
-			'datatype' => $datatype,
-			'datatype_params' => $datatype_params,
-			'editable' => ($editable ? 1 : 0),
-			'category' => $category,
-			'activated' => 1
-		));
-
-		//update value in local in-memory cache
-		self::$settings[$key] = $value;
-
-		//clear cache (area "global_settings")
-		Cache::clear("global_settings");
-	}
-
-	/**
-	 * delete setting
-	 */
-	public static function delete (string $key) {
-		//remove from in-memory cache
-		unset(self::$settings[$key]);
-
-		//remove key in database
-		Database::getInstance()->execute("DELETE FROM `{praefix}global_settings` WHERE `key` = :key; ", array('key' => $key));
-
-		//clear cache (area "global_settings")
-		Cache::clear("global_settings");
-	}
-
-	/**
-	 * initialize settings and get global settings
-	 */
-	protected static function loadCategorySettings (string $category) {
-		//$category = Database::getInstance()->escape($category);
-
-		$category_settings = array();
-
-		if (Cache::contains("global_settings", "settings-category-" + $category)) {
-			$category_settings = Cache::get("global_settings", "settings-category-" + $category);
-		} else {
-			//load settings from database
-			$rows = Database::getInstance()->listRows("SELECT * FROM `{praefix}global_settings` WHERE `category` = :category AND `activated` = '1' ORDER BY `order`; ", array(
-				'category' => array(
-					'type' => PDO::PARAM_STR,
-					'value' => $category
-				)
-			));
-
-			foreach ($rows as $row) {
-				$category_settings[$row['key']] = $row['value'];
-			}
-
-			//cache rows
-			Cache::put("global_settings", "settings-category-" + $category, $category_settings);
-		}
-
-		//merge arrays
-		self::$settings = array_merge(self::$settings, $category_settings);
-
-		self::$initialized = true;
-	}
-
-	/**
-	 * initialize settings and get global settings
-	 */
-	protected static function loadAllSettings () {
-		if (Cache::contains("global_settings", "all-settings")) {
-			self::$settings = Cache::get("global_settings", "all-settings");
-		} else {
-			//load settings from database
-			$rows = Database::getInstance()->listRows("SELECT * FROM `{praefix}global_settings` WHERE `activated` = '1' ORDER BY `order`; ");
+            'key' => $key,
+            'value' => $value,
+            'title' => $title,
+            'description' => $description,
+            'visible_permissions' => $visible_permissions,
+            'change_permissions' => $change_permissions,
+            'owner' => $owner,
+            'order' => (int) $order,
+            'icon_path' => $icon_path,
+            'datatype' => $datatype,
+            'datatype_params' => $datatype_params,
+            'editable' => ($editable ? 1 : 0),
+            'category' => $category,
+            'activated' => 1
+        ));
+
+        //update value in local in-memory cache
+        self::$settings[$key] = $value;
+
+        //clear cache (area "global_settings")
+        Cache::clear("global_settings");
+    }
+
+    /**
+     * delete setting
+     */
+    public static function delete (string $key) {
+        //remove from in-memory cache
+        unset(self::$settings[$key]);
+
+        //remove key in database
+        Database::getInstance()->execute("DELETE FROM `{praefix}global_settings` WHERE `key` = :key; ", array('key' => $key));
+
+        //clear cache (area "global_settings")
+        Cache::clear("global_settings");
+    }
+
+    /**
+     * initialize settings and get global settings
+     */
+    protected static function loadCategorySettings (string $category) {
+        //$category = Database::getInstance()->escape($category);
+
+        $category_settings = array();
+
+        if (Cache::contains("global_settings", "settings-category-" + $category)) {
+            $category_settings = Cache::get("global_settings", "settings-category-" + $category);
+        } else {
+            //load settings from database
+            $rows = Database::getInstance()->listRows("SELECT * FROM `{praefix}global_settings` WHERE `category` = :category AND `activated` = '1' ORDER BY `order`; ", array(
+                'category' => array(
+                    'type' => PDO::PARAM_STR,
+                    'value' => $category
+                )
+            ));
+
+            foreach ($rows as $row) {
+                $category_settings[$row['key']] = $row['value'];
+            }
+
+            //cache rows
+            Cache::put("global_settings", "settings-category-" + $category, $category_settings);
+        }
+
+        //merge arrays
+        self::$settings = array_merge(self::$settings, $category_settings);
+
+        self::$initialized = true;
+    }
+
+    /**
+     * initialize settings and get global settings
+     */
+    protected static function loadAllSettings () {
+        if (Cache::contains("global_settings", "all-settings")) {
+            self::$settings = Cache::get("global_settings", "all-settings");
+        } else {
+            //load settings from database
+            $rows = Database::getInstance()->listRows("SELECT * FROM `{praefix}global_settings` WHERE `activated` = '1' ORDER BY `order`; ");
 			
-			self::$settings = array();
+            self::$settings = array();
 
-			foreach ($rows as $row) {
-				self::$settings[$row['key']] = $row['value'];
-			}
+            foreach ($rows as $row) {
+                self::$settings[$row['key']] = $row['value'];
+            }
 
-			//cache rows
-			Cache::put("global_settings", "all-settings", self::$settings);
-		}
+            //cache rows
+            Cache::put("global_settings", "all-settings", self::$settings);
+        }
 
-		self::$initialized = true;
-	}
+        self::$initialized = true;
+    }
 
-	public static function listAllSettingsByCategory () {
-		//load settings if neccessary
-		self::loadSettingsIfAbsent();
+    public static function listAllSettingsByCategory () {
+        //load settings if neccessary
+        self::loadSettingsIfAbsent();
 
-		$rows = array();
+        $rows = array();
 
-		if (Cache::contains("global_settings", "all_rows")) {
-			$rows = Cache::get("global_settings", "all_rows");
-		} else {
-			//load settings from database
-			$rows = Database::getInstance()->listRows("SELECT * FROM `{praefix}global_settings` WHERE `activated` = '1' ORDER BY `order`; ");
+        if (Cache::contains("global_settings", "all_rows")) {
+            $rows = Cache::get("global_settings", "all_rows");
+        } else {
+            //load settings from database
+            $rows = Database::getInstance()->listRows("SELECT * FROM `{praefix}global_settings` WHERE `activated` = '1' ORDER BY `order`; ");
 
-			Cache::put("global_settings", "all_rows", $rows);
-		}
+            Cache::put("global_settings", "all_rows", $rows);
+        }
 
-		$list = array();
+        $list = array();
 
-		foreach ($rows as $row) {
-			$category = $row['category'];
-			$key = $row['key'];
+        foreach ($rows as $row) {
+            $category = $row['category'];
+            $key = $row['key'];
 
-			//add array, if key doesnt exists in array
-			if (!isset($list[$category])) {
-				$list[$category] = array();
-			}
+            //add array, if key doesnt exists in array
+            if (!isset($list[$category])) {
+                $list[$category] = array();
+            }
 
-			$list[$category][$key] = $row;
-		}
+            $list[$category][$key] = $row;
+        }
 
-		return $list;
-	}
+        return $list;
+    }
 
-	/**
-	 * load settings, if class was not initialized yet
-	 */
-	protected static function loadSettingsIfAbsent () {
-		if (!self::$initialized) {
-			self::loadAllSettings();
-		}
-	}
+    /**
+     * load settings, if class was not initialized yet
+     */
+    protected static function loadSettingsIfAbsent () {
+        if (!self::$initialized) {
+            self::loadAllSettings();
+        }
+    }
 
 }
 

Spacing +15 added lines, -15 removed lines

@@ -44,7 +44,7 @@ 
 	 *
 	 * @return mixed or null, if key doesnt exists in database / default value, if set
 	 */
-	public static function get (string $key, $default_value = null) {
+	public static function get(string $key, $default_value = null) {
 		//load settings if neccessary
 		self::loadSettingsIfAbsent();
 
@@ -65,7 +65,7 @@ 
 	 * @param $key setting
 	 * @param $value mixed value to set
 	 */
-	public static function set (string $key, $value) {
+	public static function set(string $key, $value) {
 		//serialize data
 		$value = serialize($value);
 
@@ -82,7 +82,7 @@ 
 		Cache::clear("global_settings");
 	}
 
-	public static function setAsync (string $key, $value) {
+	public static function setAsync(string $key, $value) {
 		//only execute database query, if value was changed
 		if (isset(self::$async_save_list[$key]) || self::get($key) != $value) {
 			self::$async_save_list[$key] = $value;
@@ -92,7 +92,7 @@ 
 		self::$settings[$key] = serialize($value);
 	}
 
-	public static function saveAsync () {
+	public static function saveAsync() {
 		if (!empty(self::$async_save_list)) {
 			foreach (self::$async_save_list as $key=>$value) {
 				Settings::set($key, $value);
@@ -107,7 +107,7 @@ 
 	 *
 	 * @return true if setting key exists
 	 */
-	public static function contains (string $key) : bool {
+	public static function contains(string $key) : bool {
 		//load settings if neccessary
 		self::loadSettingsIfAbsent();
 
@@ -123,7 +123,7 @@ 
 	 * @param $key setting
 	 * @param $value mixed value to set
 	 */
-	public static function setIfAbsent (string $key, $value) {
+	public static function setIfAbsent(string $key, $value) {
 		self::loadSettingsIfAbsent();
 
 		if (!isset(self::$settings[$key])) {
@@ -134,7 +134,7 @@ 
 	/**
 	 * create setting (so it can be shown on settings page)
 	 */
-	public static function create (string $key, $value, string $title, string $description, string $owner, string $category = "general", string $datatype = "DataType_String", $datatype_params = "", bool $editable = true, $visible_permissions = "can_see_global_settings", $change_permissions = "can_change_global_settings", int $order = 10, string $icon_path = "none", string $last_update = "0000-00-00 00:00:00") {
+	public static function create(string $key, $value, string $title, string $description, string $owner, string $category = "general", string $datatype = "DataType_String", $datatype_params = "", bool $editable = true, $visible_permissions = "can_see_global_settings", $change_permissions = "can_change_global_settings", int $order = 10, string $icon_path = "none", string $last_update = "0000-00-00 00:00:00") {
 		self::loadSettingsIfAbsent();
 
 		if (strlen($key) > 255) {
@@ -192,7 +192,7 @@ 
 	/**
 	 * delete setting
 	 */
-	public static function delete (string $key) {
+	public static function delete(string $key) {
 		//remove from in-memory cache
 		unset(self::$settings[$key]);
 
@@ -206,13 +206,13 @@ 
 	/**
 	 * initialize settings and get global settings
 	 */
-	protected static function loadCategorySettings (string $category) {
+	protected static function loadCategorySettings(string $category) {
 		//$category = Database::getInstance()->escape($category);
 
 		$category_settings = array();
 
-		if (Cache::contains("global_settings", "settings-category-" + $category)) {
-			$category_settings = Cache::get("global_settings", "settings-category-" + $category);
+		if (Cache::contains("global_settings", "settings-category-" +$category)) {
+			$category_settings = Cache::get("global_settings", "settings-category-" +$category);
 		} else {
 			//load settings from database
 			$rows = Database::getInstance()->listRows("SELECT * FROM `{praefix}global_settings` WHERE `category` = :category AND `activated` = '1' ORDER BY `order`; ", array(
@@ -227,7 +227,7 @@ 
 			}
 
 			//cache rows
-			Cache::put("global_settings", "settings-category-" + $category, $category_settings);
+			Cache::put("global_settings", "settings-category-" +$category, $category_settings);
 		}
 
 		//merge arrays
@@ -239,7 +239,7 @@ 
 	/**
 	 * initialize settings and get global settings
 	 */
-	protected static function loadAllSettings () {
+	protected static function loadAllSettings() {
 		if (Cache::contains("global_settings", "all-settings")) {
 			self::$settings = Cache::get("global_settings", "all-settings");
 		} else {
@@ -259,7 +259,7 @@ 
 		self::$initialized = true;
 	}
 
-	public static function listAllSettingsByCategory () {
+	public static function listAllSettingsByCategory() {
 		//load settings if neccessary
 		self::loadSettingsIfAbsent();
 
@@ -294,7 +294,7 @@ 
 	/**
 	 * load settings, if class was not initialized yet
 	 */
-	protected static function loadSettingsIfAbsent () {
+	protected static function loadSettingsIfAbsent() {
 		if (!self::$initialized) {
 			self::loadAllSettings();
 		}

system/core/datatype/boolean.php

Indentation +14 added lines, -14 removed lines

@@ -27,26 +27,26 @@
 
 class DataType_Boolean extends DataType_Base {
 
-	public function getFormCode(): string {
-		//return "<input type=\"checkbox\" name=\"" . $this->getInputName() . "\" value=\"" . $this->getTitle() . "\"" . ($this->getValue() == true ? " checked" : "") . " />";
+    public function getFormCode(): string {
+        //return "<input type=\"checkbox\" name=\"" . $this->getInputName() . "\" value=\"" . $this->getTitle() . "\"" . ($this->getValue() == true ? " checked" : "") . " />";
 
-		return "	<label>
+        return "	<label>
 						<input type=\"checkbox\" name=\"" . $this->getInputName() . "\" value=\"enabled\" class=\"flat-green\"" . ($this->getValue() == true ? " checked" : "") . " />
                 	</label>";
-	}
+    }
 
-	public function val () : bool {
-		//if key isn't set this means checkbox isn't checked
-		return true;
-	}
+    public function val () : bool {
+        //if key isn't set this means checkbox isn't checked
+        return true;
+    }
 
-	public function validate(string $value): bool {
-		return true;
-	}
+    public function validate(string $value): bool {
+        return true;
+    }
 
-	protected function saveAsync($value) {
-		Settings::setAsync($this->getKey(), (boolean) (isset($_REQUEST[$this->getInputName()]) ? true : false));
-	}
+    protected function saveAsync($value) {
+        Settings::setAsync($this->getKey(), (boolean) (isset($_REQUEST[$this->getInputName()]) ? true : false));
+    }
 }
 
 ?>

Spacing +1 added lines, -1 removed lines

@@ -35,7 +35,7 @@
                 	</label>";
 	}
 
-	public function val () : bool {
+	public function val() : bool {
 		//if key isn't set this means checkbox isn't checked
 		return true;
 	}

system/core/datatype/base.php

Indentation +46 added lines, -46 removed lines

@@ -27,68 +27,68 @@
 
 abstract class DataType_Base {
 
-	protected $row = array();
-	protected $datatype_params = null;
+    protected $row = array();
+    protected $datatype_params = null;
 
-	public function load (array $row, $datatype_params) {
-		$this->row = $row;
-		$this->datatype_params = $datatype_params;
-	}
+    public function load (array $row, $datatype_params) {
+        $this->row = $row;
+        $this->datatype_params = $datatype_params;
+    }
 
-	/**
-	 * @return array
-	 */
-	public function getRow (): array {
-		return $this->row;
-	}
+    /**
+     * @return array
+     */
+    public function getRow (): array {
+        return $this->row;
+    }
 
-	public function getDatatypeParams () {
-		return $this->datatype_params;
-	}
+    public function getDatatypeParams () {
+        return $this->datatype_params;
+    }
 
-	public function getInputName () {
-		return "setting_" . $this->row['key'];
-	}
+    public function getInputName () {
+        return "setting_" . $this->row['key'];
+    }
 
-	public function getKey () {
-		return $this->row['key'];
-	}
+    public function getKey () {
+        return $this->row['key'];
+    }
 
-	public function getTitle () : string {
-		if (is_array($this->datatype_params) && isset($this->datatype_params['checkbox_title'])) {
-			return $this->datatype_params['checkbox_title'];
-		}
+    public function getTitle () : string {
+        if (is_array($this->datatype_params) && isset($this->datatype_params['checkbox_title'])) {
+            return $this->datatype_params['checkbox_title'];
+        }
 
-		return $this->row['title'];
-	}
+        return $this->row['title'];
+    }
 
-	public function getDescription () : string {
-		return $this->row['description'];
-	}
+    public function getDescription () : string {
+        return $this->row['description'];
+    }
 
-	public function getValue () {
-		return unserialize($this->row['value']);
-	}
+    public function getValue () {
+        return unserialize($this->row['value']);
+    }
 
-	public abstract function getFormCode () : string;
+    public abstract function getFormCode () : string;
 
-	public abstract function validate (string $value) : bool;
+    public abstract function validate (string $value) : bool;
 
-	public function val () : bool {
-		return isset($_REQUEST[$this->getInputName()]) && $this->validate($_REQUEST[$this->getInputName()]);
-	}
+    public function val () : bool {
+        return isset($_REQUEST[$this->getInputName()]) && $this->validate($_REQUEST[$this->getInputName()]);
+    }
 
-	public final function save () {
-		//get value - because checkboxes doesn't require key is set, we have to check it first
-		$value = (isset($_REQUEST[$this->getInputName()]) ? $_REQUEST[$this->getInputName()] : "");
+    public final function save () {
+        //get value - because checkboxes doesn't require key is set, we have to check it first
+        $value = (isset($_REQUEST[$this->getInputName()]) ? $_REQUEST[$this->getInputName()] : "");
 
-		$this->saveAsync($value);
+        $this->saveAsync($value);
 
-		//set new value for form
-		$this->row['value'] = serialize($value);
-	}
+        //set new value for form
+        $this->row['value'] = serialize($value);
+    }
 
-	protected abstract function saveAsync ($value);
+    protected abstract function saveAsync ($value);
 
 }
 

Spacing +13 added lines, -13 removed lines

@@ -30,7 +30,7 @@ 
 	protected $row = array();
 	protected $datatype_params = null;
 
-	public function load (array $row, $datatype_params) {
+	public function load(array $row, $datatype_params) {
 		$this->row = $row;
 		$this->datatype_params = $datatype_params;
 	}
@@ -38,23 +38,23 @@ 
 	/**
 	 * @return array
 	 */
-	public function getRow (): array {
+	public function getRow(): array {
 		return $this->row;
 	}
 
-	public function getDatatypeParams () {
+	public function getDatatypeParams() {
 		return $this->datatype_params;
 	}
 
-	public function getInputName () {
+	public function getInputName() {
 		return "setting_" . $this->row['key'];
 	}
 
-	public function getKey () {
+	public function getKey() {
 		return $this->row['key'];
 	}
 
-	public function getTitle () : string {
+	public function getTitle() : string {
 		if (is_array($this->datatype_params) && isset($this->datatype_params['checkbox_title'])) {
 			return $this->datatype_params['checkbox_title'];
 		}
@@ -62,23 +62,23 @@ 
 		return $this->row['title'];
 	}
 
-	public function getDescription () : string {
+	public function getDescription() : string {
 		return $this->row['description'];
 	}
 
-	public function getValue () {
+	public function getValue() {
 		return unserialize($this->row['value']);
 	}
 
-	public abstract function getFormCode () : string;
+	public abstract function getFormCode() : string;
 
-	public abstract function validate (string $value) : bool;
+	public abstract function validate(string $value) : bool;
 
-	public function val () : bool {
+	public function val() : bool {
 		return isset($_REQUEST[$this->getInputName()]) && $this->validate($_REQUEST[$this->getInputName()]);
 	}
 
-	public final function save () {
+	public final function save() {
 		//get value - because checkboxes doesn't require key is set, we have to check it first
 		$value = (isset($_REQUEST[$this->getInputName()]) ? $_REQUEST[$this->getInputName()] : "");
 
@@ -88,7 +88,7 @@ 
 		$this->row['value'] = serialize($value);
 	}
 
-	protected abstract function saveAsync ($value);
+	protected abstract function saveAsync($value);
 
 }
 

system/core/datatype/string.php

Indentation +12 added lines, -12 removed lines

@@ -27,18 +27,18 @@
 
 class DataType_String extends DataType_Base {
 
-	public function getFormCode(): string {
-		return "<input type=\"text\" name=\"" . $this->getInputName() . "\" value=\"" . $this->getValue() . "\" class=\"form-control\" />";
-	}
-
-	public function validate(string $value): bool {
-		$val = new Validator_String();
-		return $val->isValide($value);
-	}
-
-	protected function saveAsync($value) {
-		Settings::setAsync($this->getKey(), (string) $value);
-	}
+    public function getFormCode(): string {
+        return "<input type=\"text\" name=\"" . $this->getInputName() . "\" value=\"" . $this->getValue() . "\" class=\"form-control\" />";
+    }
+
+    public function validate(string $value): bool {
+        $val = new Validator_String();
+        return $val->isValide($value);
+    }
+
+    protected function saveAsync($value) {
+        Settings::setAsync($this->getKey(), (string) $value);
+    }
 
 }
 

system/core/datatype/url.php

Indentation +12 added lines, -12 removed lines

@@ -27,21 +27,21 @@
 
 class DataType_URL extends DataType_Base {
 
-	public function getFormCode(): string {
-		return "<input type=\"text\" name=\"" . $this->getInputName() . "\" value=\"" . $this->getValue() . "\" required aria-required=\"true\" pattern=\"https?:\/\/.*|#.*\" placeholder=\"https://example.com\" class=\"form-control\" />";
-	}
+    public function getFormCode(): string {
+        return "<input type=\"text\" name=\"" . $this->getInputName() . "\" value=\"" . $this->getValue() . "\" required aria-required=\"true\" pattern=\"https?:\/\/.*|#.*\" placeholder=\"https://example.com\" class=\"form-control\" />";
+    }
 
-	public function validate(string $value): bool {
-		if ($value === "#") {
-			return true;
-		}
+    public function validate(string $value): bool {
+        if ($value === "#") {
+            return true;
+        }
 
-		return filter_var($value, FILTER_VALIDATE_URL);
-	}
+        return filter_var($value, FILTER_VALIDATE_URL);
+    }
 
-	protected function saveAsync($value) {
-		Settings::setAsync($this->getKey(), (string) $value);
-	}
+    protected function saveAsync($value) {
+        Settings::setAsync($this->getKey(), (string) $value);
+    }
 
 }
 

system/core/datatype/username.php

Indentation +11 added lines, -11 removed lines

@@ -27,20 +27,20 @@
 
 class DataType_Username extends DataType_Base {
 
-	public function getFormCode(): string {
-		$regex = Settings::get("username_regex");
+    public function getFormCode(): string {
+        $regex = Settings::get("username_regex");
 
-		return "<input type=\"text\" name=\"" . $this->getInputName() . "\" value=\"" . $this->getValue() . "\" class=\"form-control\" />";
-	}
+        return "<input type=\"text\" name=\"" . $this->getInputName() . "\" value=\"" . $this->getValue() . "\" class=\"form-control\" />";
+    }
 
-	public function validate(string $value): bool {
-		$val = new Validator_Username();
-		return $val->isValide($value);
-	}
+    public function validate(string $value): bool {
+        $val = new Validator_Username();
+        return $val->isValide($value);
+    }
 
-	protected function saveAsync($value) {
-		Settings::setAsync($this->getKey(), (string) $value);
-	}
+    protected function saveAsync($value) {
+        Settings::setAsync($this->getKey(), (string) $value);
+    }
 
 }