JuKu / JuKuCMS

system/packages/com.jukusoft.cms.htmlpage/classes/error403page.php

Spacing +1 added lines, -1 removed lines

@@ -27,7 +27,7 @@
 
 class Error403Page extends HTMLPage {
 
-	public function setCustomHeader () {
+	public function setCustomHeader() {
 		//set error 403 forbidden header
 		header('HTTP/1.0 403 Forbidden');
 	}

Indentation +20 added lines, -20 removed lines

@@ -27,26 +27,26 @@
 
 class Error403Page extends HTMLPage {
 
-	public function setCustomHeader () {
-		//set error 403 forbidden header
-		header('HTTP/1.0 403 Forbidden');
-	}
-
-	public function getContent(): string {
-		//first check, if specific template exists
-		$current_style = Registry::singleton()->getSetting("current_style_name");
-		if (file_exists(STYLE_PATH . $current_style . "/pages/error403.tpl")) {
-			$template = new Template($this->getPage()->hasCustomTemplate() ? $this->getPage()->getCustomTemplate() : "pages/error403");
-
-			$template->assign("TITLE", $this->getPage()->getTitle());
-			$template->assign("CONTENT", parent::getContent());
-
-			$template->parse("main");
-			return $template->getCode();
-		} else {
-			return parent::getContent();
-		}
-	}
+    public function setCustomHeader () {
+        //set error 403 forbidden header
+        header('HTTP/1.0 403 Forbidden');
+    }
+
+    public function getContent(): string {
+        //first check, if specific template exists
+        $current_style = Registry::singleton()->getSetting("current_style_name");
+        if (file_exists(STYLE_PATH . $current_style . "/pages/error403.tpl")) {
+            $template = new Template($this->getPage()->hasCustomTemplate() ? $this->getPage()->getCustomTemplate() : "pages/error403");
+
+            $template->assign("TITLE", $this->getPage()->getTitle());
+            $template->assign("CONTENT", parent::getContent());
+
+            $template->parse("main");
+            return $template->getCode();
+        } else {
+            return parent::getContent();
+        }
+    }
 
 }
 

system/packages/com.jukusoft.cms.style/classes/stylerules.php

Indentation +215 added lines, -215 removed lines

@@ -18,225 +18,225 @@
 
 class StyleRules {
 
-	protected static $rules = array();
-	protected static $initialized = false;
-
-	protected static $allowed_types = array("DOMAIN", "FOLDER", "MEDIA", "LANGUAGE");
-
-	/**
-	 * default constructor
-	 */
-	public function __construct() {
-		//
-	}
-
-	public static function getStyle (Registry &$registry, string $default_style_name) : string {
-		//load all rules, if absent
-		self::initIfAbsent();
-
-		return self::applyRules(-1, $registry, $default_style_name);
-	}
-
-	protected static function applyRules (int $parentID, Registry &$registry, $default_value) : string {
-		if (!isset(self::$rules[$parentID])) {
-			//parentID isnt set in array
-			return $default_value;
-		}
-
-		//get all root rules
-		$root_rules = self::$rules[$parentID];
-
-		$style_name = $default_value;
-
-		//iterate through rules
-		foreach ($root_rules as $rule) {
-			$type = $rule['type'];
-			$expected_value = $rule['expected_value'];
-
-			//validate condition
-			if (self::checkCondition($type, $expected_value, $registry)) {
-				//set new default value
-				$style_name = $rule['style_name'];
-				$parentID = $rule['rule_id'];
-
-				//search for next rules
-				return self::applyRules($parentID, $registry, $style_name);
-
-				break;
-			}
-		}
-
-		return $style_name;
-	}
-
-	/**
-	 * check, if a condition is true
-	 *
-	 * @param $type condition type ("DOMAIN", "FOLDER", "MEDIA", "LANGUAGE")
-	 * @param $expected_value expected value
-	 * @param $registry instance of Registry
-	 *
-	 * @return true, if condition is true
-	 */
-	public static function checkCondition (string $type, string $expected_value, Registry &$registry) : bool {
-		$type = strtoupper($type);
-
-		//check, if condition type is allowed
-		if (!in_array($type, self::$allowed_types)) {
-			throw new IllegalArgumentException("condition type '" . $type . "' is unknown.");
-		}
-
-		//TODO: check condition
-		switch ($type) {
-			case "DOMAIN":
-				//get current domain
-				$current_domain = $registry->getSetting("domain_name");
-
-				//compare expected domain with
-				return strcmp($current_domain, $expected_value) === 0;
-
-				break;
-			case "FOLDER":
-				$page_folder = $registry->getSetting("folder");
-
-				return PHPUtils::startsWith($page_folder, $expected_value);
-
-				break;
-			case "MEDIA":
-				switch (strtoupper($expected_value)) {
-					case "MOBILE":
-						//mobile devices (mbile phone / tablet)
-						return $registry->getSetting("isMobile");
-
-						break;
-					case "MOBILE_PHONE":
-						//mobile phone (iOS / android phone)
-						return Browser::isMobilePhone();
-
-						break;
-					case "TABLET":
-						//tablet (iPad / android tablet)
-						return Browser::isTablet();
-
-						break;
-					case "DESKTOP":
-						//desktop browsers
-						return !$registry->getSetting("isMobile");
-
-						break;
-					case "ANDROID":
-						//android phones & tablets
-						return Browser::isAndroid();
-
-						break;
-					case "IOS":
-						//iPod / iPhone / iPad
-						return Browser::isAppleiOS();
-
-						break;
-					case "ALL":
-						//all devices
-						return true;
-
-						break;
-				}
-
-				break;
-			case "PREF_LANG":
-				//get prefered user language token
-				$lang_token = Lang::getPrefLangToken();
-
-				return strcmp($lang_token, strtolower($expected_value)) == 0;
-
-				break;
-			case "SUPPORTED_LANG":
-				//get current user language token
-				$lang_tokens = $_SERVER['HTTP_ACCEPT_LANGUAGE'];
-
-				//check, if language is supported by browser
-				return stripos($lang_tokens, $expected_value) !== false;
-
-				break;
-			case "DEFAULT":
-				//default value, if all other conditions are false
-				return true;
-
-				break;
-			default:
-				throw new IllegalStateException("Unknown style rule type: " . $type);
-				break;
-		}
-	}
-
-	public static function loadAllRules () {
-		if (Cache::contains("style", "style-rules")) {
-			self::$rules = Cache::get("style", "style-rules");
-		} else {
-			//get all style rules from database
-			$rows = Database::getInstance()->listRows("SELECT * FROM `{praefix}style_rules` WHERE `activated` = '1' ORDER BY `order`; ");
-
-			$rules = array();
-
-			foreach ($rows as $row) {
-				$parentID = $row['parent'];
-
-				if (!isset($rules[$parentID])) {
-					$rules[$parentID] = array();
-				}
-
-				$rules[$parentID][] = $row;
-			}
-
-			if (!isset($rules[-1])) {
-				$rules[-1] = array();
-			}
-
-			self::$rules = $rules;
-
-			//cache array
-			Cache::put("style", "style-rules", self::$rules);
-		}
-
-		//set initialized flag
-		self::$initialized = true;
-	}
-
-	protected static function initIfAbsent () {
-		if (!self::$initialized) {
-			self::loadAllRules();
-		}
-	}
-
-	public static function createRuleWithPredefinedID (int $ruleID, string $type, string $expected_value, string $style_name, int $parent = -1, int $order = 10) {
-		$type = strtoupper($type);
-
-		if ($type !== "DOMAIN" && $type !== "FOLDER" && $type !== "MEDIA" && $type !== "PREF_LANG" && $type !== "SUPPORTED_LANG") {
-			throw new IllegalArgumentException("unknown style rule type '" , $type . "'!");
-		}
-
-		Database::getInstance()->execute("INSERT INTO `{praefix}style_rules` (
+    protected static $rules = array();
+    protected static $initialized = false;
+
+    protected static $allowed_types = array("DOMAIN", "FOLDER", "MEDIA", "LANGUAGE");
+
+    /**
+     * default constructor
+     */
+    public function __construct() {
+        //
+    }
+
+    public static function getStyle (Registry &$registry, string $default_style_name) : string {
+        //load all rules, if absent
+        self::initIfAbsent();
+
+        return self::applyRules(-1, $registry, $default_style_name);
+    }
+
+    protected static function applyRules (int $parentID, Registry &$registry, $default_value) : string {
+        if (!isset(self::$rules[$parentID])) {
+            //parentID isnt set in array
+            return $default_value;
+        }
+
+        //get all root rules
+        $root_rules = self::$rules[$parentID];
+
+        $style_name = $default_value;
+
+        //iterate through rules
+        foreach ($root_rules as $rule) {
+            $type = $rule['type'];
+            $expected_value = $rule['expected_value'];
+
+            //validate condition
+            if (self::checkCondition($type, $expected_value, $registry)) {
+                //set new default value
+                $style_name = $rule['style_name'];
+                $parentID = $rule['rule_id'];
+
+                //search for next rules
+                return self::applyRules($parentID, $registry, $style_name);
+
+                break;
+            }
+        }
+
+        return $style_name;
+    }
+
+    /**
+     * check, if a condition is true
+     *
+     * @param $type condition type ("DOMAIN", "FOLDER", "MEDIA", "LANGUAGE")
+     * @param $expected_value expected value
+     * @param $registry instance of Registry
+     *
+     * @return true, if condition is true
+     */
+    public static function checkCondition (string $type, string $expected_value, Registry &$registry) : bool {
+        $type = strtoupper($type);
+
+        //check, if condition type is allowed
+        if (!in_array($type, self::$allowed_types)) {
+            throw new IllegalArgumentException("condition type '" . $type . "' is unknown.");
+        }
+
+        //TODO: check condition
+        switch ($type) {
+            case "DOMAIN":
+                //get current domain
+                $current_domain = $registry->getSetting("domain_name");
+
+                //compare expected domain with
+                return strcmp($current_domain, $expected_value) === 0;
+
+                break;
+            case "FOLDER":
+                $page_folder = $registry->getSetting("folder");
+
+                return PHPUtils::startsWith($page_folder, $expected_value);
+
+                break;
+            case "MEDIA":
+                switch (strtoupper($expected_value)) {
+                    case "MOBILE":
+                        //mobile devices (mbile phone / tablet)
+                        return $registry->getSetting("isMobile");
+
+                        break;
+                    case "MOBILE_PHONE":
+                        //mobile phone (iOS / android phone)
+                        return Browser::isMobilePhone();
+
+                        break;
+                    case "TABLET":
+                        //tablet (iPad / android tablet)
+                        return Browser::isTablet();
+
+                        break;
+                    case "DESKTOP":
+                        //desktop browsers
+                        return !$registry->getSetting("isMobile");
+
+                        break;
+                    case "ANDROID":
+                        //android phones & tablets
+                        return Browser::isAndroid();
+
+                        break;
+                    case "IOS":
+                        //iPod / iPhone / iPad
+                        return Browser::isAppleiOS();
+
+                        break;
+                    case "ALL":
+                        //all devices
+                        return true;
+
+                        break;
+                }
+
+                break;
+            case "PREF_LANG":
+                //get prefered user language token
+                $lang_token = Lang::getPrefLangToken();
+
+                return strcmp($lang_token, strtolower($expected_value)) == 0;
+
+                break;
+            case "SUPPORTED_LANG":
+                //get current user language token
+                $lang_tokens = $_SERVER['HTTP_ACCEPT_LANGUAGE'];
+
+                //check, if language is supported by browser
+                return stripos($lang_tokens, $expected_value) !== false;
+
+                break;
+            case "DEFAULT":
+                //default value, if all other conditions are false
+                return true;
+
+                break;
+            default:
+                throw new IllegalStateException("Unknown style rule type: " . $type);
+                break;
+        }
+    }
+
+    public static function loadAllRules () {
+        if (Cache::contains("style", "style-rules")) {
+            self::$rules = Cache::get("style", "style-rules");
+        } else {
+            //get all style rules from database
+            $rows = Database::getInstance()->listRows("SELECT * FROM `{praefix}style_rules` WHERE `activated` = '1' ORDER BY `order`; ");
+
+            $rules = array();
+
+            foreach ($rows as $row) {
+                $parentID = $row['parent'];
+
+                if (!isset($rules[$parentID])) {
+                    $rules[$parentID] = array();
+                }
+
+                $rules[$parentID][] = $row;
+            }
+
+            if (!isset($rules[-1])) {
+                $rules[-1] = array();
+            }
+
+            self::$rules = $rules;
+
+            //cache array
+            Cache::put("style", "style-rules", self::$rules);
+        }
+
+        //set initialized flag
+        self::$initialized = true;
+    }
+
+    protected static function initIfAbsent () {
+        if (!self::$initialized) {
+            self::loadAllRules();
+        }
+    }
+
+    public static function createRuleWithPredefinedID (int $ruleID, string $type, string $expected_value, string $style_name, int $parent = -1, int $order = 10) {
+        $type = strtoupper($type);
+
+        if ($type !== "DOMAIN" && $type !== "FOLDER" && $type !== "MEDIA" && $type !== "PREF_LANG" && $type !== "SUPPORTED_LANG") {
+            throw new IllegalArgumentException("unknown style rule type '" , $type . "'!");
+        }
+
+        Database::getInstance()->execute("INSERT INTO `{praefix}style_rules` (
 			`rule_id`, `type`, `expected_value`, `style_name`, `parent`, `order`, `activated`
 		) VALUES (
 			:ruleID, :type, :value, :style, :parent, :order, '1'
 		) ON DUPLICATE KEY UPDATE `order` = :order; ", array(
-			'ruleID' => $ruleID,
-			'type' => $type,
-			'value' => $expected_value,
-			'style' => $style_name,
-			'parent' => $parent,
-			'order' => $order
-		));
-
-		//clear cache
-		Cache::clear("style", "style-rules");
-	}
-
-	public static function deleteRule (int $ruleID) {
-		Database::getInstance()->execute("DELETE FROM `{praefix}style_rules` WHERE `rule_id` = :ruleID; ", array('ruleID' => $ruleID));
-
-		//clear cache
-		Cache::clear("style", "style-rules");
-	}
+            'ruleID' => $ruleID,
+            'type' => $type,
+            'value' => $expected_value,
+            'style' => $style_name,
+            'parent' => $parent,
+            'order' => $order
+        ));
+
+        //clear cache
+        Cache::clear("style", "style-rules");
+    }
+
+    public static function deleteRule (int $ruleID) {
+        Database::getInstance()->execute("DELETE FROM `{praefix}style_rules` WHERE `rule_id` = :ruleID; ", array('ruleID' => $ruleID));
+
+        //clear cache
+        Cache::clear("style", "style-rules");
+    }
 
 }
 

Spacing +8 added lines, -8 removed lines

@@ -30,14 +30,14 @@ 
 		//
 	}
 
-	public static function getStyle (Registry &$registry, string $default_style_name) : string {
+	public static function getStyle(Registry &$registry, string $default_style_name) : string {
 		//load all rules, if absent
 		self::initIfAbsent();
 
 		return self::applyRules(-1, $registry, $default_style_name);
 	}
 
-	protected static function applyRules (int $parentID, Registry &$registry, $default_value) : string {
+	protected static function applyRules(int $parentID, Registry &$registry, $default_value) : string {
 		if (!isset(self::$rules[$parentID])) {
 			//parentID isnt set in array
 			return $default_value;
@@ -78,7 +78,7 @@ 
 	 *
 	 * @return true, if condition is true
 	 */
-	public static function checkCondition (string $type, string $expected_value, Registry &$registry) : bool {
+	public static function checkCondition(string $type, string $expected_value, Registry &$registry) : bool {
 		$type = strtoupper($type);
 
 		//check, if condition type is allowed
@@ -168,7 +168,7 @@ 
 		}
 	}
 
-	public static function loadAllRules () {
+	public static function loadAllRules() {
 		if (Cache::contains("style", "style-rules")) {
 			self::$rules = Cache::get("style", "style-rules");
 		} else {
@@ -201,17 +201,17 @@ 
 		self::$initialized = true;
 	}
 
-	protected static function initIfAbsent () {
+	protected static function initIfAbsent() {
 		if (!self::$initialized) {
 			self::loadAllRules();
 		}
 	}
 
-	public static function createRuleWithPredefinedID (int $ruleID, string $type, string $expected_value, string $style_name, int $parent = -1, int $order = 10) {
+	public static function createRuleWithPredefinedID(int $ruleID, string $type, string $expected_value, string $style_name, int $parent = -1, int $order = 10) {
 		$type = strtoupper($type);
 
 		if ($type !== "DOMAIN" && $type !== "FOLDER" && $type !== "MEDIA" && $type !== "PREF_LANG" && $type !== "SUPPORTED_LANG") {
-			throw new IllegalArgumentException("unknown style rule type '" , $type . "'!");
+			throw new IllegalArgumentException("unknown style rule type '", $type . "'!");
 		}
 
 		Database::getInstance()->execute("INSERT INTO `{praefix}style_rules` (
@@ -231,7 +231,7 @@ 
 		Cache::clear("style", "style-rules");
 	}
 
-	public static function deleteRule (int $ruleID) {
+	public static function deleteRule(int $ruleID) {
 		Database::getInstance()->execute("DELETE FROM `{praefix}style_rules` WHERE `rule_id` = :ruleID; ", array('ruleID' => $ruleID));
 
 		//clear cache

css.php

Spacing +5 added lines, -5 removed lines

@@ -99,7 +99,7 @@ 
 
 //http://blog.franky.ws/php-und-das-caching-via-http-header-etag/
 
-$cache_strategy = Settings::get("css_cache_strategy", "expires_header");//etag / expires
+$cache_strategy = Settings::get("css_cache_strategy", "expires_header"); //etag / expires
 
 //intelligent caching
 if (file_exists($css_cache_path)) {
@@ -114,19 +114,19 @@ 
 		header("Cache-Control: max-age=" . $seconds_to_cache);
 	} else if ($cache_strategy === "etag_header") {
 		//get the last-modified-date of this very file
-		$lastModified=filemtime($css_cache_path);
+		$lastModified = filemtime($css_cache_path);
 
 		//get a unique hash of this file (etag)
 		$etagFile = md5_file($css_cache_path);
 
 		//get the HTTP_IF_MODIFIED_SINCE header if set
-		$ifModifiedSince=(isset($_SERVER['HTTP_IF_MODIFIED_SINCE']) ? $_SERVER['HTTP_IF_MODIFIED_SINCE'] : false);
+		$ifModifiedSince = (isset($_SERVER['HTTP_IF_MODIFIED_SINCE']) ? $_SERVER['HTTP_IF_MODIFIED_SINCE'] : false);
 
 		//get the HTTP_IF_NONE_MATCH header if set (etag: unique file hash)
-		$etagHeader=(isset($_SERVER['HTTP_IF_NONE_MATCH']) ? trim($_SERVER['HTTP_IF_NONE_MATCH']) : false);
+		$etagHeader = (isset($_SERVER['HTTP_IF_NONE_MATCH']) ? trim($_SERVER['HTTP_IF_NONE_MATCH']) : false);
 
 		//set last-modified header
-		header("Last-Modified: ".gmdate("D, d M Y H:i:s", $lastModified)." GMT");
+		header("Last-Modified: " . gmdate("D, d M Y H:i:s", $lastModified) . " GMT");
 
 		//set etag-header
 		header("Etag: $etagFile");

Indentation +63 added lines, -63 removed lines

@@ -35,9 +35,9 @@ 
 
 //reset OpCache in debug mode
 if (CLEAR_OP_CACHE) {
-	//http://php.net/manual/en/function.opcache-reset.php
-	//http://php.net/manual/en/function.opcache-invalidate.php
-	opcache_reset();
+    //http://php.net/manual/en/function.opcache-reset.php
+    //http://php.net/manual/en/function.opcache-invalidate.php
+    opcache_reset();
 }
 
 ob_start("ob_gzhandler");
@@ -53,8 +53,8 @@ 
 
 //get required style
 if (!isset($_REQUEST['style']) || empty($_REQUEST['style'])) {
-	echo "No style set. Use css.php?style=your-style-name .";
-	exit;
+    echo "No style set. Use css.php?style=your-style-name .";
+    exit;
 }
 
 $style = $_REQUEST['style'];
@@ -65,34 +65,34 @@ 
 $validator = new Validator_Filename();
 
 if (!$validator->isValide($style)) {
-	echo "Invalide style name '" . htmlentities($style) . "' (only allowed characters: a-z, A-Z and 0-9)!";
-	exit;
+    echo "Invalide style name '" . htmlentities($style) . "' (only allowed characters: a-z, A-Z and 0-9)!";
+    exit;
 }
 
 $style = $validator->validate($style);
 
 //check, if style exists
 if (!file_exists(STYLE_PATH . $style)) {
-	echo "Style '" . $style . "' doesnt exists!";
-	exit;
+    echo "Style '" . $style . "' doesnt exists!";
+    exit;
 }
 
 if (isset($_REQUEST['media']) && !empty($_REQUEST['media'])) {
-	if (!$validator->isValide($_REQUEST['media'])) {
-		echo "Invalide media '" . htmlentities($_REQUEST['media']) . "'!";
-		exit;
-	}
+    if (!$validator->isValide($_REQUEST['media'])) {
+        echo "Invalide media '" . htmlentities($_REQUEST['media']) . "'!";
+        exit;
+    }
 
-	$media = $validator->validate($_REQUEST['media']);
+    $media = $validator->validate($_REQUEST['media']);
 }
 
 if (isset($_REQUEST['position']) && !empty($_REQUEST['position'])) {
-	if (!$validator->isValide($_REQUEST['position'])) {
-		echo "Invalide position '" . htmlentities($_REQUEST['position']) . "'!";
-		exit;
-	}
+    if (!$validator->isValide($_REQUEST['position'])) {
+        echo "Invalide position '" . htmlentities($_REQUEST['position']) . "'!";
+        exit;
+    }
 
-	$position = $validator->validate($_REQUEST['position']);
+    $position = $validator->validate($_REQUEST['position']);
 }
 
 //create css builder
@@ -103,7 +103,7 @@ 
 
 //generate css file, if neccessary
 if (!$css_builder->existsCache($style, $media, $position)) {
-	$css_builder->generateCSS($style, $media, $position);
+    $css_builder->generateCSS($style, $media, $position);
 }
 
 //http://blog.franky.ws/php-und-das-caching-via-http-header-etag/
@@ -112,48 +112,48 @@ 
 
 //intelligent caching
 if (file_exists($css_cache_path)) {
-	if ($cache_strategy === "expires_header") {
-		//https://www.electrictoolbox.com/php-caching-headers/
-
-		//set expires header, so browser can cache this css file
-		$seconds_to_cache = (int) Settings::get("css_cache_expires_header_ttl", "31536000");
-		$ts = gmdate("D, d M Y H:i:s", time() + $seconds_to_cache) . " GMT";
-		header("Expires: " . $ts);
-		header("Pragma: cache");
-		header("Cache-Control: max-age=" . $seconds_to_cache);
-	} else if ($cache_strategy === "etag_header") {
-		//get the last-modified-date of this very file
-		$lastModified=filemtime($css_cache_path);
-
-		//get a unique hash of this file (etag)
-		$etagFile = md5_file($css_cache_path);
-
-		//get the HTTP_IF_MODIFIED_SINCE header if set
-		$ifModifiedSince=(isset($_SERVER['HTTP_IF_MODIFIED_SINCE']) ? $_SERVER['HTTP_IF_MODIFIED_SINCE'] : false);
-
-		//get the HTTP_IF_NONE_MATCH header if set (etag: unique file hash)
-		$etagHeader=(isset($_SERVER['HTTP_IF_NONE_MATCH']) ? trim($_SERVER['HTTP_IF_NONE_MATCH']) : false);
-
-		//set last-modified header
-		header("Last-Modified: ".gmdate("D, d M Y H:i:s", $lastModified)." GMT");
-
-		//set etag-header
-		header("Etag: $etagFile");
-
-		//make sure caching is turned on
-		header('Cache-Control: public');
-
-		//check if page has changed. If not, send 304 and exit
-		if (@strtotime($_SERVER['HTTP_IF_MODIFIED_SINCE']) == $lastModified || $etagHeader == $etagFile) {
-			header("HTTP/1.1 304 Not Modified");
-			exit;
-		}
-	} else if ($cache_strategy === "none") {
-		//dont set browser cache header
-	} else {
-		echo "Unknown css_cache_strategy '" . $cache_strategy . "'!";
-		exit;
-	}
+    if ($cache_strategy === "expires_header") {
+        //https://www.electrictoolbox.com/php-caching-headers/
+
+        //set expires header, so browser can cache this css file
+        $seconds_to_cache = (int) Settings::get("css_cache_expires_header_ttl", "31536000");
+        $ts = gmdate("D, d M Y H:i:s", time() + $seconds_to_cache) . " GMT";
+        header("Expires: " . $ts);
+        header("Pragma: cache");
+        header("Cache-Control: max-age=" . $seconds_to_cache);
+    } else if ($cache_strategy === "etag_header") {
+        //get the last-modified-date of this very file
+        $lastModified=filemtime($css_cache_path);
+
+        //get a unique hash of this file (etag)
+        $etagFile = md5_file($css_cache_path);
+
+        //get the HTTP_IF_MODIFIED_SINCE header if set
+        $ifModifiedSince=(isset($_SERVER['HTTP_IF_MODIFIED_SINCE']) ? $_SERVER['HTTP_IF_MODIFIED_SINCE'] : false);
+
+        //get the HTTP_IF_NONE_MATCH header if set (etag: unique file hash)
+        $etagHeader=(isset($_SERVER['HTTP_IF_NONE_MATCH']) ? trim($_SERVER['HTTP_IF_NONE_MATCH']) : false);
+
+        //set last-modified header
+        header("Last-Modified: ".gmdate("D, d M Y H:i:s", $lastModified)." GMT");
+
+        //set etag-header
+        header("Etag: $etagFile");
+
+        //make sure caching is turned on
+        header('Cache-Control: public');
+
+        //check if page has changed. If not, send 304 and exit
+        if (@strtotime($_SERVER['HTTP_IF_MODIFIED_SINCE']) == $lastModified || $etagHeader == $etagFile) {
+            header("HTTP/1.1 304 Not Modified");
+            exit;
+        }
+    } else if ($cache_strategy === "none") {
+        //dont set browser cache header
+    } else {
+        echo "Unknown css_cache_strategy '" . $cache_strategy . "'!";
+        exit;
+    }
 }
 
 //load css builder
@@ -167,7 +167,7 @@ 
 
 //send logs to server
 if (LOGGING_ENABLED) {
-	Logger::send();
+    Logger::send();
 }
 
 Events::throwEvent("after_show_css");

config/mysql.example.php

Indentation +55 added lines, -55 removed lines

@@ -6,74 +6,74 @@
 
 //allow including of mysql.cfg only once (for security reasons)
 if (defined('MYSQL_CONFIG_INCLUDED')) {
-	echo "Error! Cannot include mysql.cfg again (because for security reasons).";
-	exit;
+    echo "Error! Cannot include mysql.cfg again (because for security reasons).";
+    exit;
 }
 
 define('MYSQL_CONFIG_INCLUDED', true);
 
 $mysql_settings = array(
-	/**
-	 * MySQL Host
-	 *
-	 * For example "localhost" or the ip of your mysql server
-	 */
-	'host' => "localhost",
+    /**
+     * MySQL Host
+     *
+     * For example "localhost" or the ip of your mysql server
+     */
+    'host' => "localhost",
 
-	/**
-	 * MySQL Port
-	 *
-	 * by default 3306
-	 */
-	'port' => 3306,
+    /**
+     * MySQL Port
+     *
+     * by default 3306
+     */
+    'port' => 3306,
 
-	/**
-	 * MySQL database user
-	 *
-	 * If you have an choice: Dont use "root" !
-	 */
-	'username' => "root",
+    /**
+     * MySQL database user
+     *
+     * If you have an choice: Dont use "root" !
+     */
+    'username' => "root",
 
-	/**
-	 * MySQL database password
-	 */
-	'password' => "<Insert your password here>",
+    /**
+     * MySQL database password
+     */
+    'password' => "<Insert your password here>",
 
-	/**
-	 * MySQL database name
-	 */
-	'database' => "pscf",
+    /**
+     * MySQL database name
+     */
+    'database' => "pscf",
 
-	/**
-	 * MySQL table praefix (praefix before table name, for example "prefix_<Table Name>")
-	 *
-	 * Also "" is allowed
-	 */
-	'praefix' => "pscf_",
+    /**
+     * MySQL table praefix (praefix before table name, for example "prefix_<Table Name>")
+     *
+     * Also "" is allowed
+     */
+    'praefix' => "pscf_",
 
-	/**
-	 * optional PhpMyAdmin configuration to show PhpMyAdmin menu or other thinks in administration panel
-	 */
-	'phpmyadmin' => array(
-		'enabled' => false,
-		'link' => "<Insert your PhpMyAdmin Link here (optional)>",
+    /**
+     * optional PhpMyAdmin configuration to show PhpMyAdmin menu or other thinks in administration panel
+     */
+    'phpmyadmin' => array(
+        'enabled' => false,
+        'link' => "<Insert your PhpMyAdmin Link here (optional)>",
 
-		/**
-		 * should phpMyAdmin shown in administration panel?
-		 *
-		 * true / false
-		 */
-		'admin_access' => true
-	),
+        /**
+         * should phpMyAdmin shown in administration panel?
+         *
+         * true / false
+         */
+        'admin_access' => true
+    ),
 
-	'options' => array(
-		/**
-		 * use connection pooling, dont create an new connection on every request, use connection caching
-		 *
-		 * @link http://php.net/manual/de/pdo.connections.php
-		 */
-		PDO::ATTR_PERSISTENT => true
-	)
+    'options' => array(
+        /**
+         * use connection pooling, dont create an new connection on every request, use connection caching
+         *
+         * @link http://php.net/manual/de/pdo.connections.php
+         */
+        PDO::ATTR_PERSISTENT => true
+    )
 );
 
 ?>

config/config.php

Indentation +1 added lines, -1 removed lines

@@ -27,7 +27,7 @@
 error_reporting(E_ALL);
 
 $config = array(
-	'PHP_BENCHMARK' => true
+    'PHP_BENCHMARK' => true
 );
 
 ?>

twig_performance/xtpl_cached.php

Indentation +1 added lines, -1 removed lines

@@ -36,7 +36,7 @@
 require(ROOT_PATH . "system/packages/com.jukusoft.cms.xtpl/xtpl/caching_xtemplate.class.php");
 
 if (!file_exists(ROOT_PATH . "/twig_performance/cache/")) {
-	mkdir(ROOT_PATH . "/twig_performance/cache/");
+    mkdir(ROOT_PATH . "/twig_performance/cache/");
 }
 
 $template = new CachingXTemplate(dirname(__FILLE__) . "/index.tpl");

store/autoloader/autoloader.php

Indentation +24 added lines, -24 removed lines

@@ -21,30 +21,30 @@
  */
 
 $autoloader_classes = array(
-	"system/core/exception/classloaderexception.php",
-	"system/core/classes/dbdriver.php",
-	"system/core/driver/mysqldriver.php",
-	"system/core/classes/database.php",
-	"system/core/classes/security.php",
-	"system/core/classes/icache.php",
-	"system/core/classes/cache.php",
-	"system/core/classes/phputils.php",
-	"system/core/driver/filecache.php",
-	"system/core/classes/events.php",
-	"system/packages/com.jukusoft.cms.settings/classes/settings.php",
-	"system/packages/com.jukusoft.cms.xtpl/classes/template.php",
-	"system/packages/com.jukusoft.cms.xtpl/xtpl/xtemplate.class.php",
-	"system/packages/com.jukusoft.cms.xtpl/xtpl/caching_xtemplate.class.php",
-	"system/packages/com.jukusoft.cms.browser/classes/browser.php",
-	"system/packages/com.jukusoft.cms.lang/classes/lang.php",
-	"system/packages/com.jukusoft.cms.style/classes/stylerules.php",
-	"system/packages/com.jukusoft.cms.style/classes/stylecontroller.php",
-	"system/packages/com.jukusoft.cms.page/classes/page.php",
-	"system/packages/com.jukusoft.cms.page/classes/pagetype.php",
-	"system/packages/com.jukusoft.cms.htmlpage/classes/htmlpage.php",
-	"system/packages/com.jukusoft.cms.user/classes/user.php",
-	"system/packages/com.jukusoft.cms.cssbuilder/classes/cssbuilder.php",
-	"system/packages/com.jukusoft.cms.jsbuilder/classes/jsbuilder.php"
+    "system/core/exception/classloaderexception.php",
+    "system/core/classes/dbdriver.php",
+    "system/core/driver/mysqldriver.php",
+    "system/core/classes/database.php",
+    "system/core/classes/security.php",
+    "system/core/classes/icache.php",
+    "system/core/classes/cache.php",
+    "system/core/classes/phputils.php",
+    "system/core/driver/filecache.php",
+    "system/core/classes/events.php",
+    "system/packages/com.jukusoft.cms.settings/classes/settings.php",
+    "system/packages/com.jukusoft.cms.xtpl/classes/template.php",
+    "system/packages/com.jukusoft.cms.xtpl/xtpl/xtemplate.class.php",
+    "system/packages/com.jukusoft.cms.xtpl/xtpl/caching_xtemplate.class.php",
+    "system/packages/com.jukusoft.cms.browser/classes/browser.php",
+    "system/packages/com.jukusoft.cms.lang/classes/lang.php",
+    "system/packages/com.jukusoft.cms.style/classes/stylerules.php",
+    "system/packages/com.jukusoft.cms.style/classes/stylecontroller.php",
+    "system/packages/com.jukusoft.cms.page/classes/page.php",
+    "system/packages/com.jukusoft.cms.page/classes/pagetype.php",
+    "system/packages/com.jukusoft.cms.htmlpage/classes/htmlpage.php",
+    "system/packages/com.jukusoft.cms.user/classes/user.php",
+    "system/packages/com.jukusoft.cms.cssbuilder/classes/cssbuilder.php",
+    "system/packages/com.jukusoft.cms.jsbuilder/classes/jsbuilder.php"
 );
 
 ?>

index.php

Spacing +1 added lines, -1 removed lines

@@ -33,7 +33,7 @@
 		header("HTTP/1.1 302 Found");
 	}
 
-	header("Location: " + $domain->getRedirectUrl());
+	header("Location: " +$domain->getRedirectUrl());
 	header("Connection: close");
 
 	exit;

Indentation +91 added lines, -91 removed lines

@@ -11,9 +11,9 @@ 
 
 //reset OpCache in debug mode
 if (CLEAR_OP_CACHE) {
-	//http://php.net/manual/en/function.opcache-reset.php
-	//http://php.net/manual/en/function.opcache-invalidate.php
-	opcache_reset();
+    //http://php.net/manual/en/function.opcache-reset.php
+    //http://php.net/manual/en/function.opcache-invalidate.php
+    opcache_reset();
 }
 
 //throw event
@@ -24,38 +24,38 @@ 
 
 //check, if redirect is enabled
 if ($domain->isRedirectUrl()) {
-	if ($domain->getRedirectCode() == 301) {
-		header("HTTP/1.1 301 Moved Permanently");
-	} else if ($domain->getRedirectCode() == 302) {
-		header("HTTP/1.1 302 Found");
-	}
+    if ($domain->getRedirectCode() == 301) {
+        header("HTTP/1.1 301 Moved Permanently");
+    } else if ($domain->getRedirectCode() == 302) {
+        header("HTTP/1.1 302 Found");
+    }
 
-	header("Location: " + $domain->getRedirectUrl());
-	header("Connection: close");
+    header("Location: " + $domain->getRedirectUrl());
+    header("Connection: close");
 
-	exit;
+    exit;
 }
 
 //check, if gzip compression is enabled
 if (Settings::get("gzip_compression", false)) {
-	//use gzip compression
-	ob_start();
+    //use gzip compression
+    ob_start();
 }
 
 //TODO: remove this code in production
 if (isset($_REQUEST['clear_cache'])) {
-	//clear cache
-	Cache::clear();
+    //clear cache
+    Cache::clear();
 
-	//clear gettext cache
-	PHPUtils::clearGetTextCache();
+    //clear gettext cache
+    PHPUtils::clearGetTextCache();
 
-	echo "Clear cache!<br />";
+    echo "Clear cache!<br />";
 }
 
 //TODO: remove this code later
 if (isset($_REQUEST['generate_csrf_token'])) {
-	Security::generateNewCSRFToken();
+    Security::generateNewCSRFToken();
 }
 
 //create new instance of registry
@@ -106,8 +106,8 @@ 
 
 //check, if user has folder permissions
 if (!$folder->checkPermissions(PermissionChecker::current())) {
-	//user dont has permissions to access folder
-	$page->load("error403");
+    //user dont has permissions to access folder
+    $page->load("error403");
 }
 
 //set folder
@@ -119,12 +119,12 @@ 
 
 //check, if user has page permissions
 if (!$page_type->checkPermissions(PermissionChecker::current())) {
-	//user dont has custom permissions to access page
-	$page->load("error403");
+    //user dont has custom permissions to access page
+    $page->load("error403");
 
-	//create page type
-	$page_type = PageLoader::loadInstance($page->getPageType());
-	$page_type->setPage($page);
+    //create page type
+    $page_type = PageLoader::loadInstance($page->getPageType());
+    $page_type->setPage($page);
 }
 
 //check page rights
@@ -136,29 +136,29 @@ 
 
 //check, if page is not published
 if (!$page->isPublished()) {
-	//another permission is required, because page is not published yet
-	if (isset($_REQUEST['preview']) && $_REQUEST['preview'] == "true") {
-		//show preview
-
-		//check permissions
-		if (PermissionChecker::current()->hasRight("can_edit_all_pages") || (PermissionChecker::current()->hasRight("can_edit_own_pages") && $page->getAuthorID() == User::current()->getID())) {
-			//editor's can see previews of this page, also if they aren't published yet
-			$page_permission = "see";
-		} else {
-			$page_permission = "see_draft";
-		}
-	} else {
-		$page_permission = "see_draft";
-	}
+    //another permission is required, because page is not published yet
+    if (isset($_REQUEST['preview']) && $_REQUEST['preview'] == "true") {
+        //show preview
+
+        //check permissions
+        if (PermissionChecker::current()->hasRight("can_edit_all_pages") || (PermissionChecker::current()->hasRight("can_edit_own_pages") && $page->getAuthorID() == User::current()->getID())) {
+            //editor's can see previews of this page, also if they aren't published yet
+            $page_permission = "see";
+        } else {
+            $page_permission = "see_draft";
+        }
+    } else {
+        $page_permission = "see_draft";
+    }
 }
 
 if (!$page_rights->checkRights($user->getID(), $groups->listGroupIDs(), $page_permission)) {
-	//user dont has custom permissions to access page
-	$page->load("error403");
+    //user dont has custom permissions to access page
+    $page->load("error403");
 
-	//create page type
-	$page_type = PageLoader::loadInstance($page->getPageType());
-	$page_type->setPage($page);
+    //create page type
+    $page_type = PageLoader::loadInstance($page->getPageType());
+    $page_type->setPage($page);
 }
 
 $registry->storeObject("page", $page);
@@ -179,7 +179,7 @@ 
 $redirect_url = urlencode(DomainUtils::getURL());
 
 if (isset($_REQUEST['redirect_url']) && !empty($_REQUEST['redirect_url'])) {
-	$redirect_url = $_REQUEST['redirect_url'];
+    $redirect_url = $_REQUEST['redirect_url'];
 }
 
 $registry->setSetting("login_url", DomainUtils::getBaseURL() . "/" . Settings::get("login_page", "login") . "?action=login&redirect_url=" . $redirect_url);
@@ -210,60 +210,60 @@ 
 $registry->setSetting("footer", "");
 
 Events::throwEvent("Show page", array(
-	'registry' => &$registry
+    'registry' => &$registry
 ));
 
 //show page here
 if ($page_type->showDesign()) {
-	//show page with design
-	StyleController::showPage($registry, $page, $page_type);
+    //show page with design
+    StyleController::showPage($registry, $page, $page_type);
 } else {
-	//only show content
-	echo $page_type->getContent();
+    //only show content
+    echo $page_type->getContent();
 
-	if ($page_type->exitAfterOutput()) {
-		//flush gzip cache
-		ob_end_flush();
+    if ($page_type->exitAfterOutput()) {
+        //flush gzip cache
+        ob_end_flush();
 
-		exit;
-	}
+        exit;
+    }
 }
 
 $end_time = microtime(true);
 $exec_time = $end_time - $start_time;
 
 if ($page_type->showHTMLComments()) {
-	//benchmark code
-	if (ACTIVATE_BENCHMARK) {
-		echo "<!-- page was generated in " . $exec_time . " seconds -->\n";
-		echo "<!-- mobile detection executed in " . $mobile_detection_exec_time . " seconds, isMobile: " . ($registry->getSetting("isMobile") ? "true" : "false") . " -->\n";
-
-		//benchmark dwoo template engine
-		foreach (DwooTemplate::listFileBenchmark() as $file=>$exec_time) {
-			echo "<!-- Dwoo benchmark file '" . $file . "': " . $exec_time . " seconds -->\n";
-		}
-
-		foreach (CSSBuilder::listBenchmarks() as $key=>$exec_time) {
-			echo "<!-- css generation of file '" . $key . "': " . $exec_time . " seconds -->\n";
-		}
-
-		foreach (JSBuilder::listBenchmarks() as $key=>$exec_time) {
-			echo "<!-- js generation of file '" . $key . "': " . $exec_time . " seconds -->\n";
-		}
-	}
-
-	if (DEBUG_MODE) {
-		echo "<!-- userID: " . User::current()->getID() . ", username: " . User::current()->getUsername() . " -->\n";
-		echo "<!-- " . Database::getInstance()->countQueries() . " sql queries executed -->\n";
-		echo "<!-- pref_lang: " . $registry->getSetting("pref_lang") . " -->\n";
-		echo "<!-- lang_token: " . $registry->getSetting("lang_token") . " -->\n";
-
-		if (DEBUG_SQL_QUERIES) {
-			foreach (Database::getInstance()->listQueryHistory() as $query_array) {
-				echo "<!-- query: " . $query_array['query'] . " -->\n";
-			}
-		}
-	}
+    //benchmark code
+    if (ACTIVATE_BENCHMARK) {
+        echo "<!-- page was generated in " . $exec_time . " seconds -->\n";
+        echo "<!-- mobile detection executed in " . $mobile_detection_exec_time . " seconds, isMobile: " . ($registry->getSetting("isMobile") ? "true" : "false") . " -->\n";
+
+        //benchmark dwoo template engine
+        foreach (DwooTemplate::listFileBenchmark() as $file=>$exec_time) {
+            echo "<!-- Dwoo benchmark file '" . $file . "': " . $exec_time . " seconds -->\n";
+        }
+
+        foreach (CSSBuilder::listBenchmarks() as $key=>$exec_time) {
+            echo "<!-- css generation of file '" . $key . "': " . $exec_time . " seconds -->\n";
+        }
+
+        foreach (JSBuilder::listBenchmarks() as $key=>$exec_time) {
+            echo "<!-- js generation of file '" . $key . "': " . $exec_time . " seconds -->\n";
+        }
+    }
+
+    if (DEBUG_MODE) {
+        echo "<!-- userID: " . User::current()->getID() . ", username: " . User::current()->getUsername() . " -->\n";
+        echo "<!-- " . Database::getInstance()->countQueries() . " sql queries executed -->\n";
+        echo "<!-- pref_lang: " . $registry->getSetting("pref_lang") . " -->\n";
+        echo "<!-- lang_token: " . $registry->getSetting("lang_token") . " -->\n";
+
+        if (DEBUG_SQL_QUERIES) {
+            foreach (Database::getInstance()->listQueryHistory() as $query_array) {
+                echo "<!-- query: " . $query_array['query'] . " -->\n";
+            }
+        }
+    }
 }
 
 //flush gzip cache
@@ -274,8 +274,8 @@ 
 
 //clear cache
 if ($registry->getSetting("clear_cache") == true) {
-	//clear cache
-	Cache::clear();
+    //clear cache
+    Cache::clear();
 }
 
 //update online list
@@ -286,7 +286,7 @@ 
 
 //execute tasks
 if (!Settings::get("cronjon_enabled", true)) {
-	Tasks::schedule(Settings::get("max_tasks_on_site", 3));
+    Tasks::schedule(Settings::get("max_tasks_on_site", 3));
 }
 
 //save changed settings into database
@@ -294,7 +294,7 @@ 
 
 //send logs to server
 if (LOGGING_ENABLED) {
-	Logger::send();
+    Logger::send();
 }
 
 ob_end_flush();

js.php

Spacing +5 added lines, -5 removed lines

@@ -106,7 +106,7 @@ 
 	$js_builder->generateJS($style, $media, $position);
 }
 
-$cache_strategy = Settings::get("js_cache_strategy", "expires_header");//etag / expires
+$cache_strategy = Settings::get("js_cache_strategy", "expires_header"); //etag / expires
 
 //intelligent caching
 if (file_exists($js_cache_path)) {
@@ -121,19 +121,19 @@ 
 		header("Cache-Control: max-age=" . $seconds_to_cache);
 	} else if ($cache_strategy === "etag_header") {
 		//get the last-modified-date of this very file
-		$lastModified=filemtime($js_cache_path);
+		$lastModified = filemtime($js_cache_path);
 
 		//get a unique hash of this file (etag)
 		$etagFile = md5_file($js_cache_path);
 
 		//get the HTTP_IF_MODIFIED_SINCE header if set
-		$ifModifiedSince=(isset($_SERVER['HTTP_IF_MODIFIED_SINCE']) ? $_SERVER['HTTP_IF_MODIFIED_SINCE'] : false);
+		$ifModifiedSince = (isset($_SERVER['HTTP_IF_MODIFIED_SINCE']) ? $_SERVER['HTTP_IF_MODIFIED_SINCE'] : false);
 
 		//get the HTTP_IF_NONE_MATCH header if set (etag: unique file hash)
-		$etagHeader=(isset($_SERVER['HTTP_IF_NONE_MATCH']) ? trim($_SERVER['HTTP_IF_NONE_MATCH']) : false);
+		$etagHeader = (isset($_SERVER['HTTP_IF_NONE_MATCH']) ? trim($_SERVER['HTTP_IF_NONE_MATCH']) : false);
 
 		//set last-modified header
-		header("Last-Modified: ".gmdate("D, d M Y H:i:s", $lastModified)." GMT");
+		header("Last-Modified: " . gmdate("D, d M Y H:i:s", $lastModified) . " GMT");
 
 		//set etag-header
 		header("Etag: $etagFile");

Indentation +63 added lines, -63 removed lines

@@ -34,9 +34,9 @@ 
 
 //reset OpCache in debug mode
 if (CLEAR_OP_CACHE) {
-	//http://php.net/manual/en/function.opcache-reset.php
-	//http://php.net/manual/en/function.opcache-invalidate.php
-	opcache_reset();
+    //http://php.net/manual/en/function.opcache-reset.php
+    //http://php.net/manual/en/function.opcache-invalidate.php
+    opcache_reset();
 }
 
 ob_start("ob_gzhandler");
@@ -52,8 +52,8 @@ 
 
 //get required style
 if (!isset($_REQUEST['style']) || empty($_REQUEST['style'])) {
-	echo "No style set. Use js.php?style=your-style-name&position=your-position .";
-	exit;
+    echo "No style set. Use js.php?style=your-style-name&position=your-position .";
+    exit;
 }
 
 $style = $_REQUEST['style'];
@@ -64,34 +64,34 @@ 
 $validator = new Validator_Filename();
 
 if (!$validator->isValide($style)) {
-	echo "Invalide style name '" . htmlentities($style) . "' (only allowed characters: a-z, A-Z and 0-9)!";
-	exit;
+    echo "Invalide style name '" . htmlentities($style) . "' (only allowed characters: a-z, A-Z and 0-9)!";
+    exit;
 }
 
 $style = $validator->validate($style);
 
 //check, if style exists
 if (!file_exists(STYLE_PATH . $style)) {
-	echo "Style '" . $style . "' doesnt exists!";
-	exit;
+    echo "Style '" . $style . "' doesnt exists!";
+    exit;
 }
 
 if (isset($_REQUEST['media']) && !empty($_REQUEST['media'])) {
-	if (!$validator->isValide($_REQUEST['media'])) {
-		echo "Invalide media '" . htmlentities($_REQUEST['media']) . "'!";
-		exit;
-	}
+    if (!$validator->isValide($_REQUEST['media'])) {
+        echo "Invalide media '" . htmlentities($_REQUEST['media']) . "'!";
+        exit;
+    }
 
-	$media = $validator->validate($_REQUEST['media']);
+    $media = $validator->validate($_REQUEST['media']);
 }
 
 if (isset($_REQUEST['position']) && !empty($_REQUEST['position'])) {
-	if (!$validator->isValide($_REQUEST['position'])) {
-		echo "Invalide position '" . htmlentities($_REQUEST['position']) . "'!";
-		exit;
-	}
+    if (!$validator->isValide($_REQUEST['position'])) {
+        echo "Invalide position '" . htmlentities($_REQUEST['position']) . "'!";
+        exit;
+    }
 
-	$position = $validator->validate($_REQUEST['position']);
+    $position = $validator->validate($_REQUEST['position']);
 }
 
 //create js builder
@@ -102,55 +102,55 @@ 
 
 //generate js file, if neccessary
 if (!$js_builder->existsCache($style, $media, $position)) {
-	$js_builder->generateJS($style, $media, $position);
+    $js_builder->generateJS($style, $media, $position);
 }
 
 $cache_strategy = Settings::get("js_cache_strategy", "expires_header");//etag / expires
 
 //intelligent caching
 if (file_exists($js_cache_path)) {
-	if ($cache_strategy === "expires_header") {
-		//https://www.electrictoolbox.com/php-caching-headers/
-
-		//set expires header, so browser can cache this js file
-		$seconds_to_cache = (int) Settings::get("js_cache_expires_header_ttl", "31536000");
-		$ts = gmdate("D, d M Y H:i:s", time() + $seconds_to_cache) . " GMT";
-		header("Expires: " . $ts);
-		header("Pragma: cache");
-		header("Cache-Control: max-age=" . $seconds_to_cache);
-	} else if ($cache_strategy === "etag_header") {
-		//get the last-modified-date of this very file
-		$lastModified=filemtime($js_cache_path);
-
-		//get a unique hash of this file (etag)
-		$etagFile = md5_file($js_cache_path);
-
-		//get the HTTP_IF_MODIFIED_SINCE header if set
-		$ifModifiedSince=(isset($_SERVER['HTTP_IF_MODIFIED_SINCE']) ? $_SERVER['HTTP_IF_MODIFIED_SINCE'] : false);
-
-		//get the HTTP_IF_NONE_MATCH header if set (etag: unique file hash)
-		$etagHeader=(isset($_SERVER['HTTP_IF_NONE_MATCH']) ? trim($_SERVER['HTTP_IF_NONE_MATCH']) : false);
-
-		//set last-modified header
-		header("Last-Modified: ".gmdate("D, d M Y H:i:s", $lastModified)." GMT");
-
-		//set etag-header
-		header("Etag: $etagFile");
-
-		//make sure caching is turned on
-		header('Cache-Control: public');
-
-		//check if page has changed. If not, send 304 and exit
-		if (@strtotime($_SERVER['HTTP_IF_MODIFIED_SINCE']) == $lastModified || $etagHeader == $etagFile) {
-			header("HTTP/1.1 304 Not Modified");
-			exit;
-		}
-	} else if ($cache_strategy === "none") {
-		//dont set browser cache header
-	} else {
-		echo "Unknown js_cache_strategy '" . $cache_strategy . "'!";
-		exit;
-	}
+    if ($cache_strategy === "expires_header") {
+        //https://www.electrictoolbox.com/php-caching-headers/
+
+        //set expires header, so browser can cache this js file
+        $seconds_to_cache = (int) Settings::get("js_cache_expires_header_ttl", "31536000");
+        $ts = gmdate("D, d M Y H:i:s", time() + $seconds_to_cache) . " GMT";
+        header("Expires: " . $ts);
+        header("Pragma: cache");
+        header("Cache-Control: max-age=" . $seconds_to_cache);
+    } else if ($cache_strategy === "etag_header") {
+        //get the last-modified-date of this very file
+        $lastModified=filemtime($js_cache_path);
+
+        //get a unique hash of this file (etag)
+        $etagFile = md5_file($js_cache_path);
+
+        //get the HTTP_IF_MODIFIED_SINCE header if set
+        $ifModifiedSince=(isset($_SERVER['HTTP_IF_MODIFIED_SINCE']) ? $_SERVER['HTTP_IF_MODIFIED_SINCE'] : false);
+
+        //get the HTTP_IF_NONE_MATCH header if set (etag: unique file hash)
+        $etagHeader=(isset($_SERVER['HTTP_IF_NONE_MATCH']) ? trim($_SERVER['HTTP_IF_NONE_MATCH']) : false);
+
+        //set last-modified header
+        header("Last-Modified: ".gmdate("D, d M Y H:i:s", $lastModified)." GMT");
+
+        //set etag-header
+        header("Etag: $etagFile");
+
+        //make sure caching is turned on
+        header('Cache-Control: public');
+
+        //check if page has changed. If not, send 304 and exit
+        if (@strtotime($_SERVER['HTTP_IF_MODIFIED_SINCE']) == $lastModified || $etagHeader == $etagFile) {
+            header("HTTP/1.1 304 Not Modified");
+            exit;
+        }
+    } else if ($cache_strategy === "none") {
+        //dont set browser cache header
+    } else {
+        echo "Unknown js_cache_strategy '" . $cache_strategy . "'!";
+        exit;
+    }
 }
 
 //load js builder
@@ -164,7 +164,7 @@ 
 
 //send logs to server
 if (LOGGING_ENABLED) {
-	Logger::send();
+    Logger::send();
 }
 
 Events::throwEvent("after_show_js");