JuKu / JuKuCMS

system/packages/com.jukusoft.cms.dashboard/classes/admin_dashboard.php

Indentation +1 added lines, -1 removed lines

@@ -27,7 +27,7 @@
 
 class Admin_Dashboard extends PageType {
 
-	//
+    //
 
 }
 

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

Indentation +66 added lines, -66 removed lines

@@ -18,99 +18,99 @@
 
 class Robots {
 
-	//https://developers.google.com/search/reference/robots_txt?hl=de
+    //https://developers.google.com/search/reference/robots_txt?hl=de
 
-	protected $robots = array();
+    protected $robots = array();
 
-	public function __construct () {
-		//
-	}
+    public function __construct () {
+        //
+    }
 
-	public function loadFromDB () {
-		$rows = DataBase::getInstance()->listRows("SELECT * FROM `{prefix}robots` WHERE `activated` = '1'; ");
-		$this->robots = $rows;
-	}
+    public function loadFromDB () {
+        $rows = DataBase::getInstance()->listRows("SELECT * FROM `{prefix}robots` WHERE `activated` = '1'; ");
+        $this->robots = $rows;
+    }
 
-	public function sortByUserAgent () {
-		$array = array();
+    public function sortByUserAgent () {
+        $array = array();
 
-		foreach ($this->robots as $row) {
-			if (!isset($row['useragent'])) {
-				$array[$row['useragent']] = array();
-			}
+        foreach ($this->robots as $row) {
+            if (!isset($row['useragent'])) {
+                $array[$row['useragent']] = array();
+            }
 
-			$array[$row['useragent']][] = $row;
-		}
+            $array[$row['useragent']][] = $row;
+        }
 
-		return $array;
-	}
+        return $array;
+    }
 
-	public function writeFile () {
-		$array = $this->sortByUserAgent();
+    public function writeFile () {
+        $array = $this->sortByUserAgent();
 
-		if (!is_writable(ROOT_PATH . "robots.txt")) {
-			throw new IllegalStateException(ROOT_PATH . "robots.txt is not writable, please correct file permissions!");
-		}
+        if (!is_writable(ROOT_PATH . "robots.txt")) {
+            throw new IllegalStateException(ROOT_PATH . "robots.txt is not writable, please correct file permissions!");
+        }
 
-		$handle = fopen(ROOT_PATH . "robots.txt", "w");
+        $handle = fopen(ROOT_PATH . "robots.txt", "w");
 
-		foreach ($array as $useragent=>$value) {
+        foreach ($array as $useragent=>$value) {
 
-			fwrite($handle, "User-agent: " . $useragent . "\r\n");
+            fwrite($handle, "User-agent: " . $useragent . "\r\n");
 
-			foreach ($value as $line) {
-				fwrite($handle, "" . $line['option'] . ": " . $line['value'] . "\r\n");
-			}
+            foreach ($value as $line) {
+                fwrite($handle, "" . $line['option'] . ": " . $line['value'] . "\r\n");
+            }
 
-			fwrite($handle, "\r\n");
+            fwrite($handle, "\r\n");
 
-		}
+        }
 
-		fclose($handle);
-	}
+        fclose($handle);
+    }
 
-	public function getContent () {
-		$array = $this->sortByUserAgent();
+    public function getContent () {
+        $array = $this->sortByUserAgent();
 
-		$buffer = "";
+        $buffer = "";
 
-		foreach ($array as $useragent=>$value) {
-			$buffer .= "User-agent: " . $useragent . "\r\n";
+        foreach ($array as $useragent=>$value) {
+            $buffer .= "User-agent: " . $useragent . "\r\n";
 
-			foreach ($value as $line) {
-				$buffer .= "" . $line['option'] . ": " . $line['value'] . "\r\n";
-			}
+            foreach ($value as $line) {
+                $buffer .= "" . $line['option'] . ": " . $line['value'] . "\r\n";
+            }
 
-			$buffer .= "\r\n";
-		}
+            $buffer .= "\r\n";
+        }
 
-		return $buffer;
-	}
+        return $buffer;
+    }
 
-	public static function addRule (string $option, string $value, string $useragent = "*") {
-		Database::getInstance()->execute("INSERT INTO `{praefix}robots` (
+    public static function addRule (string $option, string $value, string $useragent = "*") {
+        Database::getInstance()->execute("INSERT INTO `{praefix}robots` (
 			`useragent`, `option`, `value`, `activated`
 		) VALUES (
 			:useragent, :option, :value, '1'
 		) ON DUPLICATE KEY UPDATE `option` = :option, `activated` = '1'; ", array(
-			'useragent' => $useragent,
-			'option' => $option,
-			'value' => $value
-		));
-	}
-
-	public static function removeRule (string $option, string $value, string $useragent = "*") {
-		Database::getInstance()->execute("DELETE FROM `{praefix}robots` WHERE `useragent` = :useragent AND `option` = :option AND `value` = :value; ", array(
-			'useragent' => $useragent,
-			'option' => $option,
-			'value' => $value
-		));
-	}
-
-	public static function listRules () : array {
-		$rows = Database::getInstance()->listRows("SELECT * FROM `{praefix}robots`; ");
-		return $rows;
-	}
+            'useragent' => $useragent,
+            'option' => $option,
+            'value' => $value
+        ));
+    }
+
+    public static function removeRule (string $option, string $value, string $useragent = "*") {
+        Database::getInstance()->execute("DELETE FROM `{praefix}robots` WHERE `useragent` = :useragent AND `option` = :option AND `value` = :value; ", array(
+            'useragent' => $useragent,
+            'option' => $option,
+            'value' => $value
+        ));
+    }
+
+    public static function listRules () : array {
+        $rows = Database::getInstance()->listRows("SELECT * FROM `{praefix}robots`; ");
+        return $rows;
+    }
 
 }
 

Spacing +8 added lines, -8 removed lines

@@ -22,16 +22,16 @@ 
 
 	protected $robots = array();
 
-	public function __construct () {
+	public function __construct() {
 		//
 	}
 
-	public function loadFromDB () {
+	public function loadFromDB() {
 		$rows = DataBase::getInstance()->listRows("SELECT * FROM `{prefix}robots` WHERE `activated` = '1'; ");
 		$this->robots = $rows;
 	}
 
-	public function sortByUserAgent () {
+	public function sortByUserAgent() {
 		$array = array();
 
 		foreach ($this->robots as $row) {
@@ -45,7 +45,7 @@ 
 		return $array;
 	}
 
-	public function writeFile () {
+	public function writeFile() {
 		$array = $this->sortByUserAgent();
 
 		if (!is_writable(ROOT_PATH . "robots.txt")) {
@@ -69,7 +69,7 @@ 
 		fclose($handle);
 	}
 
-	public function getContent () {
+	public function getContent() {
 		$array = $this->sortByUserAgent();
 
 		$buffer = "";
@@ -87,7 +87,7 @@ 
 		return $buffer;
 	}
 
-	public static function addRule (string $option, string $value, string $useragent = "*") {
+	public static function addRule(string $option, string $value, string $useragent = "*") {
 		Database::getInstance()->execute("INSERT INTO `{praefix}robots` (
 			`useragent`, `option`, `value`, `activated`
 		) VALUES (
@@ -99,7 +99,7 @@ 
 		));
 	}
 
-	public static function removeRule (string $option, string $value, string $useragent = "*") {
+	public static function removeRule(string $option, string $value, string $useragent = "*") {
 		Database::getInstance()->execute("DELETE FROM `{praefix}robots` WHERE `useragent` = :useragent AND `option` = :option AND `value` = :value; ", array(
 			'useragent' => $useragent,
 			'option' => $option,
@@ -107,7 +107,7 @@ 
 		));
 	}
 
-	public static function listRules () : array {
+	public static function listRules() : array {
 		$rows = Database::getInstance()->listRows("SELECT * FROM `{praefix}robots`; ");
 		return $rows;
 	}

system/packages/com.jukusoft.cms.robots/classes/robotspage.php

Indentation +21 added lines, -21 removed lines

@@ -27,27 +27,27 @@
 
 class RobotsPage extends PageType {
 
-	public function getContentType(): string {
-		return "text/plain";
-	}
-
-	public function showDesign() {
-		return false;
-	}
-
-	public function exitAfterOutput() {
-		//dont add additional text (like HTML comments for benchmarks) at end of this content
-		return true;
-	}
-
-	public function getContent(): string {
-		//load robots.txt entries from database
-		$robots = new Robots();
-		$robots->loadFromDB();
-
-		//get robots.txt content
-		return $robots->getContent();
-	}
+    public function getContentType(): string {
+        return "text/plain";
+    }
+
+    public function showDesign() {
+        return false;
+    }
+
+    public function exitAfterOutput() {
+        //dont add additional text (like HTML comments for benchmarks) at end of this content
+        return true;
+    }
+
+    public function getContent(): string {
+        //load robots.txt entries from database
+        $robots = new Robots();
+        $robots->loadFromDB();
+
+        //get robots.txt content
+        return $robots->getContent();
+    }
 
 }
 

system/packages/com.jukusoft.cms.permissions/classes/userrights.php

Indentation +92 added lines, -92 removed lines

@@ -27,102 +27,102 @@
 
 class UserRights {
 
-	protected $userID = -1;
-
-	//array with permissions - value: 0 (no), 1 (yes), 2 (never)
-	protected $permissions = array();
-
-	public function __construct(int $userID) {
-		$this->userID = $userID;
-
-		//load permissions
-		$this->load($userID);
-	}
-
-	protected function load (int $userID) {
-		if (Cache::contains("user_permissions", "user_" . $userID)) {
-			$this->permissions = Cache::get("user_permissions", "user_" . $userID);
-		} else {
-			$rows = Database::getInstance()->listRows("SELECT * FROM `{praefix}user_rights` WHERE `userID` = :userID; ", array(
-				'userID' => array(
-					'type' => PDO::PARAM_INT,
-					'value' => $userID
-				)
-			));
-
-			$this->permissions = array();
-
-			foreach ($rows as $row) {
-				$this->permissions[$row['token']] = $row['value'];
-			}
-
-			//cache result
-			Cache::put("user_permissions", "user_user_" . $userID, $this->permissions);
-		}
-	}
-
-	public function setRight (string $token, int $value = 1) {
-		//validate token
-		$token = Validator_Token::get($token);
-
-		if ($value < 0 || $value > 2) {
-			throw new IllegalArgumentException("token value '" . $value . "' is not allowed, value has to be >= 0 and <= 2.");
-		}
-
-		//update database
-		Database::getInstance()->execute("INSERT INTO `{praefix}user_rights` (
+    protected $userID = -1;
+
+    //array with permissions - value: 0 (no), 1 (yes), 2 (never)
+    protected $permissions = array();
+
+    public function __construct(int $userID) {
+        $this->userID = $userID;
+
+        //load permissions
+        $this->load($userID);
+    }
+
+    protected function load (int $userID) {
+        if (Cache::contains("user_permissions", "user_" . $userID)) {
+            $this->permissions = Cache::get("user_permissions", "user_" . $userID);
+        } else {
+            $rows = Database::getInstance()->listRows("SELECT * FROM `{praefix}user_rights` WHERE `userID` = :userID; ", array(
+                'userID' => array(
+                    'type' => PDO::PARAM_INT,
+                    'value' => $userID
+                )
+            ));
+
+            $this->permissions = array();
+
+            foreach ($rows as $row) {
+                $this->permissions[$row['token']] = $row['value'];
+            }
+
+            //cache result
+            Cache::put("user_permissions", "user_user_" . $userID, $this->permissions);
+        }
+    }
+
+    public function setRight (string $token, int $value = 1) {
+        //validate token
+        $token = Validator_Token::get($token);
+
+        if ($value < 0 || $value > 2) {
+            throw new IllegalArgumentException("token value '" . $value . "' is not allowed, value has to be >= 0 and <= 2.");
+        }
+
+        //update database
+        Database::getInstance()->execute("INSERT INTO `{praefix}user_rights` (
 			`userID`, `token`, `value`
 		) VALUES (
 			:userID, :token, :value
 		) ON DUPLICATE KEY UPDATE `value` = :value; ", array(
-			'userID' => array(
-				'type' => PDO::PARAM_INT,
-				'value' => $this->userID
-			),
-			'token' => $token,
-			'value' => array(
-				'type' => PDO::PARAM_INT,
-				'value' => $value
-			)
-		));
-
-		$this->permissions[$token] = $value;
-
-		//clear cache
-		Cache::clear("user_permissions", "user_" . $this->userID);
-		Cache::clear("permissions", "permissions_user_" . $this->userID);
-	}
-
-	public function removeRight (string $token) {
-		//validate token
-		$token = Validator_Token::get($token);
-
-		//delete from database
-		Database::getInstance()->execute("DELETE FROM `{praefix}user_rights` WHERE `userID` = :userID AND `token` = :token; ", array(
-			'userID' => array(
-				'type' => PDO::PARAM_INT,
-				'value' => $this->userID
-			),
-			'token' => $token
-		));
-
-		//delete from in-memory cache
-		if (isset($this->permissions[$token])) {
-			unset($this->permissions[$token]);
-		}
-
-		//clear cache
-		Cache::clear("user_permissions", "user_" . $this->userID);
-		Cache::clear("permissions", "permissions_user_" . $this->userID);
-	}
-
-	public function listRights () : array {
-		return $this->permissions;
-	}
-
-	public function hasRight (string $token) {
-		return isset($this->permissions[$token]) && $this->permissions[$token] == 1;
-	}
+            'userID' => array(
+                'type' => PDO::PARAM_INT,
+                'value' => $this->userID
+            ),
+            'token' => $token,
+            'value' => array(
+                'type' => PDO::PARAM_INT,
+                'value' => $value
+            )
+        ));
+
+        $this->permissions[$token] = $value;
+
+        //clear cache
+        Cache::clear("user_permissions", "user_" . $this->userID);
+        Cache::clear("permissions", "permissions_user_" . $this->userID);
+    }
+
+    public function removeRight (string $token) {
+        //validate token
+        $token = Validator_Token::get($token);
+
+        //delete from database
+        Database::getInstance()->execute("DELETE FROM `{praefix}user_rights` WHERE `userID` = :userID AND `token` = :token; ", array(
+            'userID' => array(
+                'type' => PDO::PARAM_INT,
+                'value' => $this->userID
+            ),
+            'token' => $token
+        ));
+
+        //delete from in-memory cache
+        if (isset($this->permissions[$token])) {
+            unset($this->permissions[$token]);
+        }
+
+        //clear cache
+        Cache::clear("user_permissions", "user_" . $this->userID);
+        Cache::clear("permissions", "permissions_user_" . $this->userID);
+    }
+
+    public function listRights () : array {
+        return $this->permissions;
+    }
+
+    public function hasRight (string $token) {
+        return isset($this->permissions[$token]) && $this->permissions[$token] == 1;
+    }
 
 }
 

Spacing +5 added lines, -5 removed lines

@@ -39,7 +39,7 @@ 
 		$this->load($userID);
 	}
 
-	protected function load (int $userID) {
+	protected function load(int $userID) {
 		if (Cache::contains("user_permissions", "user_" . $userID)) {
 			$this->permissions = Cache::get("user_permissions", "user_" . $userID);
 		} else {
@@ -61,7 +61,7 @@ 
 		}
 	}
 
-	public function setRight (string $token, int $value = 1) {
+	public function setRight(string $token, int $value = 1) {
 		//validate token
 		$token = Validator_Token::get($token);
 
@@ -93,7 +93,7 @@ 
 		Cache::clear("permissions", "permissions_user_" . $this->userID);
 	}
 
-	public function removeRight (string $token) {
+	public function removeRight(string $token) {
 		//validate token
 		$token = Validator_Token::get($token);
 
@@ -116,11 +116,11 @@ 
 		Cache::clear("permissions", "permissions_user_" . $this->userID);
 	}
 
-	public function listRights () : array {
+	public function listRights() : array {
 		return $this->permissions;
 	}
 
-	public function hasRight (string $token) {
+	public function hasRight(string $token) {
 		return isset($this->permissions[$token]) && $this->permissions[$token] == 1;
 	}
 

system/packages/com.jukusoft.cms.permissions/classes/grouprights.php

Indentation +92 added lines, -92 removed lines

@@ -27,102 +27,102 @@
 
 class GroupRights {
 
-	protected $groupID = -1;
-
-	//array with permissions - value: 0 (no), 1 (yes), 2 (never)
-	protected $permissions = array();
-
-	public function __construct(int $groupID) {
-		$this->groupID = $groupID;
-
-		//load permissions
-		$this->load($groupID);
-	}
-
-	protected function load (int $groupID) {
-		if (Cache::contains("group_permissions", "group_" . $groupID)) {
-			$this->permissions = Cache::get("group_permissions", "group_" . $groupID);
-		} else {
-			$rows = Database::getInstance()->listRows("SELECT * FROM `{praefix}group_rights` WHERE `groupID` = :groupID; ", array(
-				'groupID' => array(
-					'type' => PDO::PARAM_INT,
-					'value' => $groupID
-				)
-			));
-
-			$this->permissions = array();
-
-			foreach ($rows as $row) {
-				$this->permissions[$row['token']] = $row['value'];
-			}
-
-			//cache result
-			Cache::put("group_permissions", "group_" . $groupID, $this->permissions);
-		}
-	}
-
-	public function setRight (string $token, int $value = 1) {
-		//validate token
-		$token = Validator_Token::get($token);
-
-		if ($value < 0 || $value > 2) {
-			throw new IllegalArgumentException("token value '" . $value . "' is not allowed, value has to be >= 0 and <= 2.");
-		}
-
-		//update database
-		Database::getInstance()->execute("INSERT INTO `{praefix}group_rights` (
+    protected $groupID = -1;
+
+    //array with permissions - value: 0 (no), 1 (yes), 2 (never)
+    protected $permissions = array();
+
+    public function __construct(int $groupID) {
+        $this->groupID = $groupID;
+
+        //load permissions
+        $this->load($groupID);
+    }
+
+    protected function load (int $groupID) {
+        if (Cache::contains("group_permissions", "group_" . $groupID)) {
+            $this->permissions = Cache::get("group_permissions", "group_" . $groupID);
+        } else {
+            $rows = Database::getInstance()->listRows("SELECT * FROM `{praefix}group_rights` WHERE `groupID` = :groupID; ", array(
+                'groupID' => array(
+                    'type' => PDO::PARAM_INT,
+                    'value' => $groupID
+                )
+            ));
+
+            $this->permissions = array();
+
+            foreach ($rows as $row) {
+                $this->permissions[$row['token']] = $row['value'];
+            }
+
+            //cache result
+            Cache::put("group_permissions", "group_" . $groupID, $this->permissions);
+        }
+    }
+
+    public function setRight (string $token, int $value = 1) {
+        //validate token
+        $token = Validator_Token::get($token);
+
+        if ($value < 0 || $value > 2) {
+            throw new IllegalArgumentException("token value '" . $value . "' is not allowed, value has to be >= 0 and <= 2.");
+        }
+
+        //update database
+        Database::getInstance()->execute("INSERT INTO `{praefix}group_rights` (
 			`groupID`, `token`, `value`
 		) VALUES (
 			:groupID, :token, :value
 		) ON DUPLICATE KEY UPDATE `value` = :value; ", array(
-			'groupID' => array(
-				'type' => PDO::PARAM_INT,
-				'value' => $this->groupID
-			),
-			'token' => $token,
-			'value' => array(
-				'type' => PDO::PARAM_INT,
-				'value' => $value
-			)
-		));
-
-		$this->permissions[$token] = $value;
-
-		//clear cache
-		Cache::clear("group_permissions", "group_" . $this->groupID);
-		Cache::clear("permissions");
-	}
-
-	public function removeRight (string $token) {
-		//validate token
-		$token = Validator_Token::get($token);
-
-		//delete from database
-		Database::getInstance()->execute("DELETE FROM `{praefix}group_rights` WHERE `groupID` = :groupID AND `token` = :token; ", array(
-			'groupID' => array(
-				'type' => PDO::PARAM_INT,
-				'value' => $this->groupID
-			),
-			'token' => $token
-		));
-
-		//delete from in-memory cache
-		if (isset($this->permissions[$token])) {
-			unset($this->permissions[$token]);
-		}
-
-		//clear cache
-		Cache::clear("group_permissions", "group_" . $this->groupID);
-		Cache::clear("permissions");
-	}
-
-	public function listRights () : array {
-		return $this->permissions;
-	}
-
-	public function hasRight (string $token) {
-		return isset($this->permissions[$token]) && $this->permissions[$token] == 1;
-	}
+            'groupID' => array(
+                'type' => PDO::PARAM_INT,
+                'value' => $this->groupID
+            ),
+            'token' => $token,
+            'value' => array(
+                'type' => PDO::PARAM_INT,
+                'value' => $value
+            )
+        ));
+
+        $this->permissions[$token] = $value;
+
+        //clear cache
+        Cache::clear("group_permissions", "group_" . $this->groupID);
+        Cache::clear("permissions");
+    }
+
+    public function removeRight (string $token) {
+        //validate token
+        $token = Validator_Token::get($token);
+
+        //delete from database
+        Database::getInstance()->execute("DELETE FROM `{praefix}group_rights` WHERE `groupID` = :groupID AND `token` = :token; ", array(
+            'groupID' => array(
+                'type' => PDO::PARAM_INT,
+                'value' => $this->groupID
+            ),
+            'token' => $token
+        ));
+
+        //delete from in-memory cache
+        if (isset($this->permissions[$token])) {
+            unset($this->permissions[$token]);
+        }
+
+        //clear cache
+        Cache::clear("group_permissions", "group_" . $this->groupID);
+        Cache::clear("permissions");
+    }
+
+    public function listRights () : array {
+        return $this->permissions;
+    }
+
+    public function hasRight (string $token) {
+        return isset($this->permissions[$token]) && $this->permissions[$token] == 1;
+    }
 
 }
 

Spacing +5 added lines, -5 removed lines

@@ -39,7 +39,7 @@ 
 		$this->load($groupID);
 	}
 
-	protected function load (int $groupID) {
+	protected function load(int $groupID) {
 		if (Cache::contains("group_permissions", "group_" . $groupID)) {
 			$this->permissions = Cache::get("group_permissions", "group_" . $groupID);
 		} else {
@@ -61,7 +61,7 @@ 
 		}
 	}
 
-	public function setRight (string $token, int $value = 1) {
+	public function setRight(string $token, int $value = 1) {
 		//validate token
 		$token = Validator_Token::get($token);
 
@@ -93,7 +93,7 @@ 
 		Cache::clear("permissions");
 	}
 
-	public function removeRight (string $token) {
+	public function removeRight(string $token) {
 		//validate token
 		$token = Validator_Token::get($token);
 
@@ -116,11 +116,11 @@ 
 		Cache::clear("permissions");
 	}
 
-	public function listRights () : array {
+	public function listRights() : array {
 		return $this->permissions;
 	}
 
-	public function hasRight (string $token) {
+	public function hasRight(string $token) {
 		return isset($this->permissions[$token]) && $this->permissions[$token] == 1;
 	}
 

system/packages/com.jukusoft.cms.jsbuilder/classes/jsqueeze.php

Indentation +1000 added lines, -1000 removed lines

@@ -57,1006 +57,1006 @@
 
 class JSqueeze
 {
-	const
-
-		SPECIAL_VAR_PACKER = '(\$+[a-zA-Z_]|_[a-zA-Z0-9$])[a-zA-Z0-9_$]*';
-
-	public
-
-		$charFreq;
-
-	protected
-
-		$strings,
-		$closures,
-		$str0,
-		$str1,
-		$argFreq,
-		$specialVarRx,
-		$keepImportantComments,
-
-		$varRx = '(?:[a-zA-Z_$])[a-zA-Z0-9_$]*',
-		$reserved = array(
-		// Literals
-		'true','false','null',
-		// ES6
-		'break','case','class','catch','const','continue','debugger','default','delete','do','else','export','extends','finally','for','function','if','import','in','instanceof','new','return','super','switch','this','throw','try','typeof','var','void','while','with','yield',
-		// Future
-		'enum',
-		// Strict mode
-		'implements','package','protected','static','let','interface','private','public',
-		// Module
-		'await',
-		// Older standards
-		'abstract','boolean','byte','char','double','final','float','goto','int','long','native','short','synchronized','throws','transient','volatile',
-	);
-
-	public function __construct()
-	{
-		$this->reserved = array_flip($this->reserved);
-		$this->charFreq = array_fill(0, 256, 0);
-	}
-
-	/**
-	 * Squeezes a JavaScript source code.
-	 *
-	 * Set $singleLine to false if you want optional
-	 * semi-colons to be replaced by line feeds.
-	 *
-	 * Set $keepImportantComments to false if you want /*! comments to be removed.
-	 *
-	 * $specialVarRx defines the regular expression of special variables names
-	 * for global vars, methods, properties and in string substitution.
-	 * Set it to false if you don't want any.
-	 *
-	 * If the analysed javascript source contains a single line comment like
-	 * this one, then the directive will overwrite $specialVarRx:
-	 *
-	 * // jsqueeze.specialVarRx = your_special_var_regexp_here
-	 *
-	 * Only the first directive is parsed, others are ignored. It is not possible
-	 * to redefine $specialVarRx in the middle of the javascript source.
-	 *
-	 * Example:
-	 * $parser = new JSqueeze;
-	 * $squeezed_js = $parser->squeeze($fat_js);
-	 */
-	public function squeeze($code, $singleLine = true, $keepImportantComments = true, $specialVarRx = false)
-	{
-		$code = trim($code);
-		if ('' === $code) {
-			return '';
-		}
-
-		$this->argFreq = array(-1 => 0);
-		$this->specialVarRx = $specialVarRx;
-		$this->keepImportantComments = !!$keepImportantComments;
-
-		if (preg_match("#//[ \t]*jsqueeze\.specialVarRx[ \t]*=[ \t]*([\"']?)(.*)\\1#i", $code, $key)) {
-			if (!$key[1]) {
-				$key[2] = trim($key[2]);
-				$key[1] = strtolower($key[2]);
-				$key[1] = $key[1] && $key[1] != 'false' && $key[1] != 'none' && $key[1] != 'off';
-			}
-
-			$this->specialVarRx = $key[1] ? $key[2] : false;
-		}
-
-		// Remove capturing parentheses
-		$this->specialVarRx && $this->specialVarRx = preg_replace('/(?<!\\\\)((?:\\\\\\\\)*)\((?!\?)/', '(?:', $this->specialVarRx);
-
-		false !== strpos($code, "\r") && $code = strtr(str_replace("\r\n", "\n", $code), "\r", "\n");
-		false !== strpos($code, "\xC2\x85") && $code = str_replace("\xC2\x85", "\n", $code); // Next Line
-		false !== strpos($code, "\xE2\x80\xA8") && $code = str_replace("\xE2\x80\xA8", "\n", $code); // Line Separator
-		false !== strpos($code, "\xE2\x80\xA9") && $code = str_replace("\xE2\x80\xA9", "\n", $code); // Paragraph Separator
-
-		list($code, $this->strings) = $this->extractStrings($code);
-		list($code, $this->closures) = $this->extractClosures($code);
-
-		$key = "//''\"\"#0'"; // This crap has a wonderful property: it can not happen in any valid javascript, even in strings
-		$this->closures[$key] = &$code;
-
-		$tree = array($key => array('parent' => false));
-		$this->makeVars($code, $tree[$key], $key);
-		$this->renameVars($tree[$key], true);
-
-		$code = substr($tree[$key]['code'], 1);
-		$code = preg_replace("'\breturn !'", 'return!', $code);
-		$code = preg_replace("'\}(?=(else|while)[^\$.a-zA-Z0-9_])'", "}\r", $code);
-		$code = str_replace(array_keys($this->strings), array_values($this->strings), $code);
-
-		if ($singleLine) {
-			$code = strtr($code, "\n", ';');
-		} else {
-			$code = str_replace("\n", ";\n", $code);
-		}
-		false !== strpos($code, "\r") && $code = strtr(trim($code), "\r", "\n");
-
-		// Cleanup memory
-		$this->charFreq = array_fill(0, 256, 0);
-		$this->strings = $this->closures = $this->argFreq = array();
-		$this->str0 = $this->str1 = '';
-
-		return $code;
-	}
-
-	protected function extractStrings($f)
-	{
-		if ($cc_on = false !== strpos($f, '@cc_on')) {
-			// Protect conditional comments from being removed
-			$f = str_replace('#', '##', $f);
-			$f = str_replace('/*@', '1#@', $f);
-			$f = preg_replace("'//@([^\n]+)'", '2#@$1@#3', $f);
-			$f = str_replace('@*/', '@#1', $f);
-		}
-
-		$len = strlen($f);
-		$code = str_repeat(' ', $len);
-		$j = 0;
-
-		$strings = array();
-		$K = 0;
-
-		$instr = false;
-
-		$q = array(
-			"'", '"',
-			"'" => 0,
-			'"' => 0,
-		);
-
-		// Extract strings, removes comments
-		for ($i = 0; $i < $len; ++$i) {
-			if ($instr) {
-				if ('//' == $instr) {
-					if ("\n" == $f[$i]) {
-						$f[$i--] = ' ';
-						$instr = false;
-					}
-				} elseif ($f[$i] == $instr || ('/' == $f[$i] && "/'" == $instr)) {
-					if ('!' == $instr) {
-					} elseif ('*' == $instr) {
-						if ('/' == $f[$i + 1]) {
-							++$i;
-							$instr = false;
-						}
-					} else {
-						if ("/'" == $instr) {
-							while (isset($f[$i + 1]) && false !== strpos('gmi', $f[$i + 1])) {
-								$s[] = $f[$i++];
-							}
-							$s[] = $f[$i];
-						}
-
-						$instr = false;
-					}
-				} elseif ('*' == $instr) {
-				} elseif ('!' == $instr) {
-					if ('*' == $f[$i] && '/' == $f[$i + 1]) {
-						$s[] = "*/\r";
-						++$i;
-						$instr = false;
-					} elseif ("\n" == $f[$i]) {
-						$s[] = "\r";
-					} else {
-						$s[] = $f[$i];
-					}
-				} elseif ('\\' == $f[$i]) {
-					++$i;
-
-					if ("\n" != $f[$i]) {
-						isset($q[$f[$i]]) && ++$q[$f[$i]];
-						$s[] = '\\'.$f[$i];
-					}
-				} elseif ('[' == $f[$i] && "/'" == $instr) {
-					$instr = '/[';
-					$s[] = '[';
-				} elseif (']' == $f[$i] && '/[' == $instr) {
-					$instr = "/'";
-					$s[] = ']';
-				} elseif ("'" == $f[$i] || '"' == $f[$i]) {
-					++$q[$f[$i]];
-					$s[] = '\\'.$f[$i];
-				} else {
-					$s[] = $f[$i];
-				}
-			} else {
-				switch ($f[$i]) {
-					case ';':
-						// Remove triple semi-colon
-						if ($i > 0 && ';' == $f[$i - 1] && $i + 1 < $len && ';' == $f[$i + 1]) {
-							$f[$i] = $f[$i + 1] = '/';
-						} else {
-							$code[++$j] = ';';
-							break;
-						}
-
-					case '/':
-						if ('*' == $f[$i + 1]) {
-							++$i;
-							$instr = '*';
-
-							if ($this->keepImportantComments && '!' == $f[$i + 1]) {
-								++$i;
-								// no break here
-							} else {
-								break;
-							}
-						} elseif ('/' == $f[$i + 1]) {
-							++$i;
-							$instr = '//';
-							break;
-						} else {
-							$a = $j && (' ' == $code[$j] || "\x7F" == $code[$j]) ? $code[$j - 1] : $code[$j];
-							if (false !== strpos('-!%&;<=>~:^+|,()*?[{} ', $a)
-								|| (false !== strpos('oenfd', $a)
-									&& preg_match(
-										"'(?<![\$.a-zA-Z0-9_])(do|else|return|typeof|yield[ \x7F]?\*?)[ \x7F]?$'",
-										substr($code, $j - 7, 8)
-									))
-							) {
-								if (')' === $a && $j > 1) {
-									$a = 1;
-									$k = $j - (' ' == $code[$j] || "\x7F" == $code[$j]) - 1;
-									while ($k >= 0 && $a) {
-										if ('(' === $code[$k]) {
-											--$a;
-										} elseif (')' === $code[$k]) {
-											++$a;
-										}
-										--$k;
-									}
-									if (!preg_match("'(?<![\$.a-zA-Z0-9_])(if|for|while)[ \x7F]?$'", substr($code, 0, $k + 1))) {
-										$code[++$j] = '/';
-										break;
-									}
-								}
-
-								$key = "//''\"\"".$K++.$instr = "/'";
-								$a = $j;
-								$code .= $key;
-								while (isset($key[++$j - $a - 1])) {
-									$code[$j] = $key[$j - $a - 1];
-								}
-								--$j;
-								isset($s) && ($s = implode('', $s)) && $cc_on && $this->restoreCc($s);
-								$strings[$key] = array('/');
-								$s = &$strings[$key];
-							} else {
-								$code[++$j] = '/';
-							}
-
-							break;
-						}
-
-					case "'":
-					case '"':
-						$instr = $f[$i];
-						$key = "//''\"\"".$K++.('!' == $instr ? ']' : "'");
-						$a = $j;
-						$code .= $key;
-						while (isset($key[++$j - $a - 1])) {
-							$code[$j] = $key[$j - $a - 1];
-						}
-						--$j;
-						isset($s) && ($s = implode('', $s)) && $cc_on && $this->restoreCc($s);
-						$strings[$key] = array();
-						$s = &$strings[$key];
-						'!' == $instr && $s[] = "\r/*!";
-
-						break;
-
-					case "\n":
-						if ($j > 3) {
-							if (' ' == $code[$j] || "\x7F" == $code[$j]) {
-								--$j;
-							}
-
-							$code[++$j] =
-								false !== strpos('kend+-', $code[$j - 1])
-								&& preg_match(
-									"'(?:\+\+|--|(?<![\$.a-zA-Z0-9_])(break|continue|return|yield[ \x7F]?\*?))[ \x7F]?$'",
-									substr($code, $j - 8, 9)
-								)
-									? ';' : "\x7F";
-
-							break;
-						}
-
-					case "\t": $f[$i] = ' ';
-					case ' ':
-						if (!$j || ' ' == $code[$j] || "\x7F" == $code[$j]) {
-							break;
-						}
-
-					default:
-						$code[++$j] = $f[$i];
-				}
-			}
-		}
-
-		isset($s) && ($s = implode('', $s)) && $cc_on && $this->restoreCc($s);
-		unset($s);
-
-		$code = substr($code, 0, $j + 1);
-		$cc_on && $this->restoreCc($code, false);
-
-		// Protect wanted spaces and remove unwanted ones
-		$code = strtr($code, "\x7F", ' ');
-		$code = str_replace('- -', "-\x7F-", $code);
-		$code = str_replace('+ +', "+\x7F+", $code);
-		$code = preg_replace("'(\d)\s+\.\s*([a-zA-Z\$_[(])'", "$1\x7F.$2", $code);
-		$code = preg_replace("# ([-!%&;<=>~:.^+|,()*?[\]{}/']+)#", '$1', $code);
-		$code = preg_replace("#([-!%&;<=>~:.^+|,()*?[\]{}/]+) #", '$1', $code);
-		$cc_on && $code = preg_replace_callback("'//[^\'].*?@#3'", function ($m) { return strtr($m[0], ' ', "\x7F"); }, $code);
-
-		// Replace new Array/Object by []/{}
-		false !== strpos($code, 'new Array') && $code = preg_replace("'new Array(?:\(\)|([;\])},:]))'", '[]$1', $code);
-		false !== strpos($code, 'new Object') && $code = preg_replace("'new Object(?:\(\)|([;\])},:]))'", '{}$1', $code);
-
-		// Add missing semi-colons after curly braces
-		// This adds more semi-colons than strictly needed,
-		// but it seems that later gzipping is favorable to the repetition of "};"
-		$code = preg_replace("'\}(?![:,;.()\[\]}\|&]|(else|catch|finally|while)[^\$.a-zA-Z0-9_])'", '};', $code);
-
-		// Tag possible empty instruction for easy detection
-		$code = preg_replace("'(?<![\$.a-zA-Z0-9_])if\('", '1#(', $code);
-		$code = preg_replace("'(?<![\$.a-zA-Z0-9_])for\('", '2#(', $code);
-		$code = preg_replace("'(?<![\$.a-zA-Z0-9_])while\('", '3#(', $code);
-
-		$forPool = array();
-		$instrPool = array();
-		$s = 0;
-
-		$f = array();
-		$j = -1;
-
-		// Remove as much semi-colon as possible
-		$len = strlen($code);
-		for ($i = 0; $i < $len; ++$i) {
-			switch ($code[$i]) {
-				case '(':
-					if ($j >= 0 && "\n" == $f[$j]) {
-						$f[$j] = ';';
-					}
-
-					++$s;
-
-					if ($i && '#' == $code[$i - 1]) {
-						$instrPool[$s - 1] = 1;
-						if ('2' == $code[$i - 2]) {
-							$forPool[$s] = 1;
-						}
-					}
-
-					$f[++$j] = '(';
-					break;
-
-				case ']':
-				case ')':
-					if ($i + 1 < $len && !isset($forPool[$s]) && !isset($instrPool[$s - 1]) && preg_match("'[a-zA-Z0-9_\$]'", $code[$i + 1])) {
-						$f[$j] .= $code[$i];
-						$f[++$j] = "\n";
-					} else {
-						$f[++$j] = $code[$i];
-					}
-
-					if (')' == $code[$i]) {
-						unset($forPool[$s]);
-						--$s;
-					}
-
-					continue 2;
-
-				case '}':
-					if ("\n" == $f[$j]) {
-						$f[$j] = '}';
-					} else {
-						$f[++$j] = '}';
-					}
-					break;
-
-				case ';':
-					if (isset($forPool[$s]) || isset($instrPool[$s])) {
-						$f[++$j] = ';';
-					} elseif ($j >= 0 && "\n" != $f[$j] && ';' != $f[$j]) {
-						$f[++$j] = "\n";
-					}
-
-					break;
-
-				case '#':
-					switch ($f[$j]) {
-						case '1': $f[$j] = 'if';    break 2;
-						case '2': $f[$j] = 'for';   break 2;
-						case '3': $f[$j] = 'while'; break 2;
-					}
-
-				case '[';
-					if ($j >= 0 && "\n" == $f[$j]) {
-						$f[$j] = ';';
-					}
-
-				default: $f[++$j] = $code[$i];
-			}
-
-			unset($instrPool[$s]);
-		}
-
-		$f = implode('', $f);
-		$cc_on && $f = str_replace('@#3', "\r", $f);
-
-		// Fix "else ;" empty instructions
-		$f = preg_replace("'(?<![\$.a-zA-Z0-9_])else\n'", "\n", $f);
-
-		$r1 = array( // keywords with a direct object
-			'case','delete','do','else','function','in','instanceof','of','break',
-			'new','return','throw','typeof','var','void','yield','let','if',
-			'const','get','set',
-		);
-
-		$r2 = array( // keywords with a subject
-			'in','instanceof','of',
-		);
-
-		// Fix missing semi-colons
-		$f = preg_replace("'(?<!(?<![a-zA-Z0-9_\$])".implode(')(?<!(?<![a-zA-Z0-9_\$])', $r1).') (?!('.implode('|', $r2).")(?![a-zA-Z0-9_\$]))'", "\n", $f);
-		$f = preg_replace("'(?<!(?<![a-zA-Z0-9_\$])do)(?<!(?<![a-zA-Z0-9_\$])else) if\('", "\nif(", $f);
-		$f = preg_replace("'(?<=--|\+\+)(?<![a-zA-Z0-9_\$])(".implode('|', $r1).")(?![a-zA-Z0-9_\$])'", "\n$1", $f);
-		$f = preg_replace("'(?<![a-zA-Z0-9_\$])for\neach\('", 'for each(', $f);
-		$f = preg_replace("'(?<![a-zA-Z0-9_\$])\n(".implode('|', $r2).")(?![a-zA-Z0-9_\$])'", '$1', $f);
-
-		// Merge strings
-		if ($q["'"] > $q['"']) {
-			$q = array($q[1], $q[0]);
-		}
-		$f = preg_replace("#//''\"\"[0-9]+'#", $q[0].'$0'.$q[0], $f);
-		strpos($f, $q[0].'+'.$q[0]) && $f = str_replace($q[0].'+'.$q[0], '', $f);
-		$len = count($strings);
-		foreach ($strings as $r1 => &$r2) {
-			$r2 = "/'" == substr($r1, -2)
-				? str_replace(array("\\'", '\\"'), array("'", '"'), $r2)
-				: str_replace('\\'.$q[1], $q[1], $r2);
-		}
-
-		// Restore wanted spaces
-		$f = strtr($f, "\x7F", ' ');
-
-		return array($f, $strings);
-	}
-
-	protected function extractClosures($code)
-	{
-		$code = ';'.$code;
-
-		$this->argFreq[-1] += substr_count($code, '}catch(');
-
-		if ($this->argFreq[-1]) {
-			// Special catch scope handling
-
-			// FIXME: this implementation doesn't work with nested catch scopes who need
-			// access to their parent's caught variable (but who needs that?).
-
-			$f = preg_split("@}catch\(({$this->varRx})@", $code, -1, PREG_SPLIT_DELIM_CAPTURE);
-
-			$code = 'catch$scope$var'.mt_rand();
-			$this->specialVarRx = $this->specialVarRx ? '(?:'.$this->specialVarRx.'|'.preg_quote($code).')' : preg_quote($code);
-			$i = count($f) - 1;
-
-			while ($i) {
-				$c = 1;
-				$j = 0;
-				$l = strlen($f[$i]);
-
-				while ($c && $j < $l) {
-					$s = $f[$i][$j++];
-					$c += '(' == $s ? 1 : (')' == $s ? -1 : 0);
-				}
-
-				if (!$c) {
-					do {
-						$s = $f[$i][$j++];
-						$c += '{' == $s ? 1 : ('}' == $s ? -1 : 0);
-					} while ($c && $j < $l);
-				}
-
-				$c = preg_quote($f[$i - 1], '#');
-				$f[$i - 2] .= '}catch('.preg_replace("#([.,{]?)(?<![a-zA-Z0-9_\$@]){$c}\\b#", '$1'.$code, $f[$i - 1].substr($f[$i], 0, $j)).substr($f[$i], $j);
-
-				unset($f[$i--], $f[$i--]);
-			}
-
-			$code = $f[0];
-		}
-
-		$f = preg_split("'(?<![a-zA-Z0-9_\$])((?:function[ (]|get |set ).*?\{)'", $code, -1, PREG_SPLIT_DELIM_CAPTURE);
-		$i = count($f) - 1;
-		$closures = array();
-
-		while ($i) {
-			$c = 1;
-			$j = 0;
-			$l = strlen($f[$i]);
-
-			while ($c && $j < $l) {
-				$s = $f[$i][$j++];
-				$c += '{' == $s ? 1 : ('}' == $s ? -1 : 0);
-			}
-
-			switch (substr($f[$i - 2], -1)) {
-				default:
-					if (false !== $c = strpos($f[$i - 1], ' ', 8)) {
-						break;
-					}
-				case false: case "\n": case ';': case '{': case '}': case ')': case ']':
-				$c = strpos($f[$i - 1], '(', 4);
-			}
-
-			$l = "//''\"\"#$i'";
-			$code = substr($f[$i - 1], $c);
-			$closures[$l] = $code.substr($f[$i], 0, $j);
-			$f[$i - 2] .= substr($f[$i - 1], 0, $c).$l.substr($f[$i], $j);
-
-			if ('(){' !== $code) {
-				$j = substr_count($code, ',');
-				do {
-					isset($this->argFreq[$j]) ? ++$this->argFreq[$j] : $this->argFreq[$j] = 1;
-				} while ($j--);
-			}
-
-			$i -= 2;
-		}
-
-		return array($f[0], $closures);
-	}
-
-	protected function makeVars($closure, &$tree, $key)
-	{
-		$tree['code'] = &$closure;
-		$tree['nfe'] = false;
-		$tree['used'] = array();
-		$tree['local'] = array();
-
-		// Replace multiple "var" declarations by a single one
-		$closure = preg_replace_callback("'(?<=[\n\{\}])var [^\n\{\};]+(?:\nvar [^\n\{\};]+)+'", array($this, 'mergeVarDeclarations'), $closure);
-
-		// Get all local vars (functions, arguments and "var" prefixed)
-
-		$vars = &$tree['local'];
-
-		if (preg_match("'^( [^(]*)?\((.*?)\)\{'", $closure, $v)) {
-			if ($v[1]) {
-				$vars[$tree['nfe'] = substr($v[1], 1)] = -1;
-				$tree['parent']['local'][';'.$key] = &$vars[$tree['nfe']];
-			}
-
-			if ($v[2]) {
-				$i = 0;
-				$v = explode(',', $v[2]);
-				foreach ($v as $w) {
-					$vars[$w] = $this->argFreq[$i++] - 1; // Give a bonus to argument variables
-				}
-			}
-		}
-
-		$v = preg_split("'(?<![\$.a-zA-Z0-9_])var '", $closure);
-		if ($i = count($v) - 1) {
-			$w = array();
-
-			while ($i) {
-				$j = $c = 0;
-				$l = strlen($v[$i]);
-
-				while ($j < $l) {
-					switch ($v[$i][$j]) {
-						case '(': case '[': case '{':
-						++$c;
-						break;
-
-						case ')': case ']': case '}':
-						if ($c-- <= 0) {
-							break 2;
-						}
-						break;
-
-						case ';': case "\n":
-						if (!$c) {
-							break 2;
-						}
-
-						default:
-							$c || $w[] = $v[$i][$j];
-					}
-
-					++$j;
-				}
-
-				$w[] = ',';
-				--$i;
-			}
-
-			$v = explode(',', implode('', $w));
-			foreach ($v as $w) {
-				if (preg_match("'^{$this->varRx}'", $w, $v)) {
-					isset($vars[$v[0]]) || $vars[$v[0]] = 0;
-				}
-			}
-		}
-
-		if (preg_match_all("@function ({$this->varRx})//''\"\"#@", $closure, $v)) {
-			foreach ($v[1] as $w) {
-				isset($vars[$w]) || $vars[$w] = 0;
-			}
-		}
-
-		if ($this->argFreq[-1] && preg_match_all("@}catch\(({$this->varRx})@", $closure, $v)) {
-			$v[0] = array();
-			foreach ($v[1] as $w) {
-				isset($v[0][$w]) ? ++$v[0][$w] : $v[0][$w] = 1;
-			}
-			foreach ($v[0] as $w => $v) {
-				$vars[$w] = $this->argFreq[-1] - $v;
-			}
-		}
-
-		// Get all used vars, local and non-local
-
-		$vars = &$tree['used'];
-
-		if (preg_match_all("#([.,{]?(?:[gs]et )?)(?<![a-zA-Z0-9_\$])({$this->varRx})(:?)#", $closure, $w, PREG_SET_ORDER)) {
-			foreach ($w as $k) {
-				if (isset($k[1][0]) && (',' === $k[1][0] || '{' === $k[1][0])) {
-					if (':' === $k[3]) {
-						$k = '.'.$k[2];
-					} elseif ('get ' === substr($k[1], 1, 4) || 'set ' === substr($k[1], 1, 4)) {
-						++$this->charFreq[ord($k[1][1])]; // "g" or "s"
-						++$this->charFreq[101]; // "e"
-						++$this->charFreq[116]; // "t"
-						$k = '.'.$k[2];
-					} else {
-						$k = $k[2];
-					}
-				} else {
-					$k = $k[1].$k[2];
-				}
-
-				isset($vars[$k]) ? ++$vars[$k] : $vars[$k] = 1;
-			}
-		}
-
-		if (preg_match_all("#//''\"\"[0-9]+(?:['!]|/')#", $closure, $w)) {
-			foreach ($w[0] as $a) {
-				$v = "'" === substr($a, -1) && "/'" !== substr($a, -2) && $this->specialVarRx
-					? preg_split("#([.,{]?(?:[gs]et )?(?<![a-zA-Z0-9_\$@]){$this->specialVarRx}:?)#", $this->strings[$a], -1, PREG_SPLIT_DELIM_CAPTURE)
-					: array($this->strings[$a]);
-				$a = count($v);
-
-				for ($i = 0; $i < $a; ++$i) {
-					$k = $v[$i];
-
-					if (1 === $i % 2) {
-						if (',' === $k[0] || '{' === $k[0]) {
-							if (':' === substr($k, -1)) {
-								$k = '.'.substr($k, 1, -1);
-							} elseif ('get ' === substr($k, 1, 4) || 'set ' === substr($k, 1, 4)) {
-								++$this->charFreq[ord($k[1])]; // "g" or "s"
-								++$this->charFreq[101]; // "e"
-								++$this->charFreq[116]; // "t"
-								$k = '.'.substr($k, 5);
-							} else {
-								$k = substr($k, 1);
-							}
-						} elseif (':' === substr($k, -1)) {
-							$k = substr($k, 0, -1);
-						}
-
-						$w = &$tree;
-
-						while (isset($w['parent']) && !(isset($w['used'][$k]) || isset($w['local'][$k]))) {
-							$w = &$w['parent'];
-						}
-
-						(isset($w['used'][$k]) || isset($w['local'][$k])) && (isset($vars[$k]) ? ++$vars[$k] : $vars[$k] = 1);
-
-						unset($w);
-					}
-
-					if (0 === $i % 2 || !isset($vars[$k])) {
-						foreach (count_chars($v[$i], 1) as $k => $w) {
-							$this->charFreq[$k] += $w;
-						}
-					}
-				}
-			}
-		}
-
-		// Propagate the usage number to parents
-
-		foreach ($vars as $w => $a) {
-			$k = &$tree;
-			$chain = array();
-			do {
-				$vars = &$k['local'];
-				$chain[] = &$k;
-				if (isset($vars[$w])) {
-					unset($k['used'][$w]);
-					if (isset($vars[$w])) {
-						$vars[$w] += $a;
-					} else {
-						$vars[$w] = $a;
-					}
-					$a = false;
-					break;
-				}
-			} while ($k['parent'] && $k = &$k['parent']);
-
-			if ($a && !$k['parent']) {
-				if (isset($vars[$w])) {
-					$vars[$w] += $a;
-				} else {
-					$vars[$w] = $a;
-				}
-			}
-
-			if (isset($tree['used'][$w]) && isset($vars[$w])) {
-				foreach ($chain as &$b) {
-					isset($b['local'][$w]) || $b['used'][$w] = &$vars[$w];
-				}
-			}
-		}
-
-		// Analyse childs
-
-		$tree['childs'] = array();
-		$vars = &$tree['childs'];
-
-		if (preg_match_all("@//''\"\"#[0-9]+'@", $closure, $w)) {
-			foreach ($w[0] as $a) {
-				$vars[$a] = array('parent' => &$tree);
-				$this->makeVars($this->closures[$a], $vars[$a], $a);
-			}
-		}
-	}
-
-	protected function mergeVarDeclarations($m)
-	{
-		return str_replace("\nvar ", ',', $m[0]);
-	}
-
-	protected function renameVars(&$tree, $root)
-	{
-		if ($root) {
-			$tree['local'] += $tree['used'];
-			$tree['used'] = array();
-
-			foreach ($tree['local'] as $k => $v) {
-				if ('.' == $k[0]) {
-					$k = substr($k, 1);
-				}
-
-				if ('true' === $k) {
-					$this->charFreq[48] += $v;
-				} elseif ('false' === $k) {
-					$this->charFreq[49] += $v;
-				} elseif (!$this->specialVarRx || !preg_match("#^{$this->specialVarRx}$#", $k)) {
-					foreach (count_chars($k, 1) as $k => $w) {
-						$this->charFreq[$k] += $w * $v;
-					}
-				} elseif (2 == strlen($k)) {
-					$tree['used'][] = $k[1];
-				}
-			}
-
-			$this->charFreq = $this->rsort($this->charFreq);
-
-			$this->str0 = '';
-			$this->str1 = '';
-
-			foreach ($this->charFreq as $k => $v) {
-				if (!$v) {
-					break;
-				}
-
-				$v = chr($k);
-
-				if ((64 < $k && $k < 91) || (96 < $k && $k < 123)) { // A-Z a-z
-					$this->str0 .= $v;
-					$this->str1 .= $v;
-				} elseif (47 < $k && $k < 58) { // 0-9
-					$this->str1 .= $v;
-				}
-			}
-
-			if ('' === $this->str0) {
-				$this->str0 = 'claspemitdbfrugnjvhowkxqyzCLASPEMITDBFRUGNJVHOWKXQYZ';
-				$this->str1 = $this->str0.'0123456789';
-			}
-
-			foreach ($tree['local'] as $var => $root) {
-				if ('.' != substr($var, 0, 1) && isset($tree['local'][".{$var}"])) {
-					$tree['local'][$var] += $tree['local'][".{$var}"];
-				}
-			}
-
-			foreach ($tree['local'] as $var => $root) {
-				if ('.' == substr($var, 0, 1) && isset($tree['local'][substr($var, 1)])) {
-					$tree['local'][$var] = $tree['local'][substr($var, 1)];
-				}
-			}
-
-			$tree['local'] = $this->rsort($tree['local']);
-
-			foreach ($tree['local'] as $var => $root) {
-				switch (substr($var, 0, 1)) {
-					case '.':
-						if (!isset($tree['local'][substr($var, 1)])) {
-							$tree['local'][$var] = '#'.($this->specialVarRx && 3 < strlen($var) && preg_match("'^\.{$this->specialVarRx}$'", $var) ? $this->getNextName($tree).'$' : substr($var, 1));
-						}
-						break;
-
-					case ';': $tree['local'][$var] = 0 === $root ? '' : $this->getNextName($tree);
-					case '#': break;
-
-					default:
-						$root = $this->specialVarRx && 2 < strlen($var) && preg_match("'^{$this->specialVarRx}$'", $var) ? $this->getNextName($tree).'$' : $var;
-						$tree['local'][$var] = $root;
-						if (isset($tree['local'][".{$var}"])) {
-							$tree['local'][".{$var}"] = '#'.$root;
-						}
-				}
-			}
-
-			foreach ($tree['local'] as $var => $root) {
-				$tree['local'][$var] = preg_replace("'^#'", '.', $tree['local'][$var]);
-			}
-		} else {
-			$tree['local'] = $this->rsort($tree['local']);
-			if (false !== $tree['nfe']) {
-				$tree['used'][] = $tree['local'][$tree['nfe']];
-			}
-
-			foreach ($tree['local'] as $var => $root) {
-				if ($tree['nfe'] !== $var) {
-					$tree['local'][$var] = 0 === $root ? '' : $this->getNextName($tree);
-				}
-			}
-		}
-
-		$this->local_tree = &$tree['local'];
-		$this->used_tree = &$tree['used'];
-
-		$tree['code'] = preg_replace_callback("#[.,{ ]?(?:[gs]et )?(?<![a-zA-Z0-9_\$@]){$this->varRx}:?#", array($this, 'getNewName'), $tree['code']);
-
-		if ($this->specialVarRx && preg_match_all("#//''\"\"[0-9]+'#", $tree['code'], $b)) {
-			foreach ($b[0] as $a) {
-				$this->strings[$a] = preg_replace_callback(
-					"#[.,{]?(?:[gs]et )?(?<![a-zA-Z0-9_\$@]){$this->specialVarRx}:?#",
-					array($this, 'getNewName'),
-					$this->strings[$a]
-				);
-			}
-		}
-
-		foreach ($tree['childs'] as $a => &$b) {
-			$this->renameVars($b, false);
-			$tree['code'] = str_replace($a, $b['code'], $tree['code']);
-			unset($tree['childs'][$a]);
-		}
-	}
-
-	protected function getNewName($m)
-	{
-		$m = $m[0];
-
-		$pre = '.' === $m[0] ? '.' : '';
-		$post = '';
-
-		if (',' === $m[0] || '{' === $m[0] || ' ' === $m[0]) {
-			$pre = $m[0];
-
-			if (':' === substr($m, -1)) {
-				$post = ':';
-				$m = (' ' !== $m[0] ? '.' : '').substr($m, 1, -1);
-			} elseif ('get ' === substr($m, 1, 4) || 'set ' === substr($m, 1, 4)) {
-				$pre .= substr($m, 1, 4);
-				$m = '.'.substr($m, 5);
-			} else {
-				$m = substr($m, 1);
-			}
-		} elseif (':' === substr($m, -1)) {
-			$post = ':';
-			$m = substr($m, 0, -1);
-		}
-
-		$post = (isset($this->reserved[$m])
-				? ('true' === $m ? '!0' : ('false' === $m ? '!1' : $m))
-				: (
-				isset($this->local_tree[$m])
-					? $this->local_tree[$m]
-					: (
-				isset($this->used_tree[$m])
-					? $this->used_tree[$m]
-					: $m
-				)
-				)
-			).$post;
-
-		return '' === $post ? '' : ($pre.('.' === $post[0] ? substr($post, 1) : $post));
-	}
-
-	protected function getNextName(&$tree = array(), &$counter = false)
-	{
-		if (false === $counter) {
-			$counter = &$tree['counter'];
-			isset($counter) || $counter = -1;
-			$exclude = array_flip($tree['used']);
-		} else {
-			$exclude = $tree;
-		}
-
-		++$counter;
-
-		$len0 = strlen($this->str0);
-		$len1 = strlen($this->str0);
-
-		$name = $this->str0[$counter % $len0];
-
-		$i = intval($counter / $len0) - 1;
-		while ($i >= 0) {
-			$name .= $this->str1[ $i % $len1 ];
-			$i = intval($i / $len1) - 1;
-		}
-
-		return !(isset($this->reserved[$name]) || isset($exclude[$name])) ? $name : $this->getNextName($exclude, $counter);
-	}
-
-	protected function restoreCc(&$s, $lf = true)
-	{
-		$lf && $s = str_replace('@#3', '', $s);
-
-		$s = str_replace('@#1', '@*/', $s);
-		$s = str_replace('2#@', '//@', $s);
-		$s = str_replace('1#@', '/*@', $s);
-		$s = str_replace('##', '#', $s);
-	}
-
-	private function rsort($array)
-	{
-		if (!$array) {
-			return $array;
-		}
-
-		$i = 0;
-		$tuples = array();
-		foreach ($array as $k => &$v) {
-			$tuples[] = array(++$i, $k, &$v);
-		}
-
-		usort($tuples, function ($a, $b) {
-			if ($b[2] > $a[2]) {
-				return 1;
-			}
-			if ($b[2] < $a[2]) {
-				return -1;
-			}
-			if ($b[0] > $a[0]) {
-				return -1;
-			}
-			if ($b[0] < $a[0]) {
-				return 1;
-			}
-
-			return 0;
-		});
-
-		$array = array();
-
-		foreach ($tuples as $t) {
-			$array[$t[1]] = &$t[2];
-		}
-
-		return $array;
-	}
+    const
+
+        SPECIAL_VAR_PACKER = '(\$+[a-zA-Z_]|_[a-zA-Z0-9$])[a-zA-Z0-9_$]*';
+
+    public
+
+        $charFreq;
+
+    protected
+
+        $strings,
+        $closures,
+        $str0,
+        $str1,
+        $argFreq,
+        $specialVarRx,
+        $keepImportantComments,
+
+        $varRx = '(?:[a-zA-Z_$])[a-zA-Z0-9_$]*',
+        $reserved = array(
+        // Literals
+        'true','false','null',
+        // ES6
+        'break','case','class','catch','const','continue','debugger','default','delete','do','else','export','extends','finally','for','function','if','import','in','instanceof','new','return','super','switch','this','throw','try','typeof','var','void','while','with','yield',
+        // Future
+        'enum',
+        // Strict mode
+        'implements','package','protected','static','let','interface','private','public',
+        // Module
+        'await',
+        // Older standards
+        'abstract','boolean','byte','char','double','final','float','goto','int','long','native','short','synchronized','throws','transient','volatile',
+    );
+
+    public function __construct()
+    {
+        $this->reserved = array_flip($this->reserved);
+        $this->charFreq = array_fill(0, 256, 0);
+    }
+
+    /**
+     * Squeezes a JavaScript source code.
+     *
+     * Set $singleLine to false if you want optional
+     * semi-colons to be replaced by line feeds.
+     *
+     * Set $keepImportantComments to false if you want /*! comments to be removed.
+     *
+     * $specialVarRx defines the regular expression of special variables names
+     * for global vars, methods, properties and in string substitution.
+     * Set it to false if you don't want any.
+     *
+     * If the analysed javascript source contains a single line comment like
+     * this one, then the directive will overwrite $specialVarRx:
+     *
+     * // jsqueeze.specialVarRx = your_special_var_regexp_here
+     *
+     * Only the first directive is parsed, others are ignored. It is not possible
+     * to redefine $specialVarRx in the middle of the javascript source.
+     *
+     * Example:
+     * $parser = new JSqueeze;
+     * $squeezed_js = $parser->squeeze($fat_js);
+     */
+    public function squeeze($code, $singleLine = true, $keepImportantComments = true, $specialVarRx = false)
+    {
+        $code = trim($code);
+        if ('' === $code) {
+            return '';
+        }
+
+        $this->argFreq = array(-1 => 0);
+        $this->specialVarRx = $specialVarRx;
+        $this->keepImportantComments = !!$keepImportantComments;
+
+        if (preg_match("#//[ \t]*jsqueeze\.specialVarRx[ \t]*=[ \t]*([\"']?)(.*)\\1#i", $code, $key)) {
+            if (!$key[1]) {
+                $key[2] = trim($key[2]);
+                $key[1] = strtolower($key[2]);
+                $key[1] = $key[1] && $key[1] != 'false' && $key[1] != 'none' && $key[1] != 'off';
+            }
+
+            $this->specialVarRx = $key[1] ? $key[2] : false;
+        }
+
+        // Remove capturing parentheses
+        $this->specialVarRx && $this->specialVarRx = preg_replace('/(?<!\\\\)((?:\\\\\\\\)*)\((?!\?)/', '(?:', $this->specialVarRx);
+
+        false !== strpos($code, "\r") && $code = strtr(str_replace("\r\n", "\n", $code), "\r", "\n");
+        false !== strpos($code, "\xC2\x85") && $code = str_replace("\xC2\x85", "\n", $code); // Next Line
+        false !== strpos($code, "\xE2\x80\xA8") && $code = str_replace("\xE2\x80\xA8", "\n", $code); // Line Separator
+        false !== strpos($code, "\xE2\x80\xA9") && $code = str_replace("\xE2\x80\xA9", "\n", $code); // Paragraph Separator
+
+        list($code, $this->strings) = $this->extractStrings($code);
+        list($code, $this->closures) = $this->extractClosures($code);
+
+        $key = "//''\"\"#0'"; // This crap has a wonderful property: it can not happen in any valid javascript, even in strings
+        $this->closures[$key] = &$code;
+
+        $tree = array($key => array('parent' => false));
+        $this->makeVars($code, $tree[$key], $key);
+        $this->renameVars($tree[$key], true);
+
+        $code = substr($tree[$key]['code'], 1);
+        $code = preg_replace("'\breturn !'", 'return!', $code);
+        $code = preg_replace("'\}(?=(else|while)[^\$.a-zA-Z0-9_])'", "}\r", $code);
+        $code = str_replace(array_keys($this->strings), array_values($this->strings), $code);
+
+        if ($singleLine) {
+            $code = strtr($code, "\n", ';');
+        } else {
+            $code = str_replace("\n", ";\n", $code);
+        }
+        false !== strpos($code, "\r") && $code = strtr(trim($code), "\r", "\n");
+
+        // Cleanup memory
+        $this->charFreq = array_fill(0, 256, 0);
+        $this->strings = $this->closures = $this->argFreq = array();
+        $this->str0 = $this->str1 = '';
+
+        return $code;
+    }
+
+    protected function extractStrings($f)
+    {
+        if ($cc_on = false !== strpos($f, '@cc_on')) {
+            // Protect conditional comments from being removed
+            $f = str_replace('#', '##', $f);
+            $f = str_replace('/*@', '1#@', $f);
+            $f = preg_replace("'//@([^\n]+)'", '2#@$1@#3', $f);
+            $f = str_replace('@*/', '@#1', $f);
+        }
+
+        $len = strlen($f);
+        $code = str_repeat(' ', $len);
+        $j = 0;
+
+        $strings = array();
+        $K = 0;
+
+        $instr = false;
+
+        $q = array(
+            "'", '"',
+            "'" => 0,
+            '"' => 0,
+        );
+
+        // Extract strings, removes comments
+        for ($i = 0; $i < $len; ++$i) {
+            if ($instr) {
+                if ('//' == $instr) {
+                    if ("\n" == $f[$i]) {
+                        $f[$i--] = ' ';
+                        $instr = false;
+                    }
+                } elseif ($f[$i] == $instr || ('/' == $f[$i] && "/'" == $instr)) {
+                    if ('!' == $instr) {
+                    } elseif ('*' == $instr) {
+                        if ('/' == $f[$i + 1]) {
+                            ++$i;
+                            $instr = false;
+                        }
+                    } else {
+                        if ("/'" == $instr) {
+                            while (isset($f[$i + 1]) && false !== strpos('gmi', $f[$i + 1])) {
+                                $s[] = $f[$i++];
+                            }
+                            $s[] = $f[$i];
+                        }
+
+                        $instr = false;
+                    }
+                } elseif ('*' == $instr) {
+                } elseif ('!' == $instr) {
+                    if ('*' == $f[$i] && '/' == $f[$i + 1]) {
+                        $s[] = "*/\r";
+                        ++$i;
+                        $instr = false;
+                    } elseif ("\n" == $f[$i]) {
+                        $s[] = "\r";
+                    } else {
+                        $s[] = $f[$i];
+                    }
+                } elseif ('\\' == $f[$i]) {
+                    ++$i;
+
+                    if ("\n" != $f[$i]) {
+                        isset($q[$f[$i]]) && ++$q[$f[$i]];
+                        $s[] = '\\'.$f[$i];
+                    }
+                } elseif ('[' == $f[$i] && "/'" == $instr) {
+                    $instr = '/[';
+                    $s[] = '[';
+                } elseif (']' == $f[$i] && '/[' == $instr) {
+                    $instr = "/'";
+                    $s[] = ']';
+                } elseif ("'" == $f[$i] || '"' == $f[$i]) {
+                    ++$q[$f[$i]];
+                    $s[] = '\\'.$f[$i];
+                } else {
+                    $s[] = $f[$i];
+                }
+            } else {
+                switch ($f[$i]) {
+                    case ';':
+                        // Remove triple semi-colon
+                        if ($i > 0 && ';' == $f[$i - 1] && $i + 1 < $len && ';' == $f[$i + 1]) {
+                            $f[$i] = $f[$i + 1] = '/';
+                        } else {
+                            $code[++$j] = ';';
+                            break;
+                        }
+
+                    case '/':
+                        if ('*' == $f[$i + 1]) {
+                            ++$i;
+                            $instr = '*';
+
+                            if ($this->keepImportantComments && '!' == $f[$i + 1]) {
+                                ++$i;
+                                // no break here
+                            } else {
+                                break;
+                            }
+                        } elseif ('/' == $f[$i + 1]) {
+                            ++$i;
+                            $instr = '//';
+                            break;
+                        } else {
+                            $a = $j && (' ' == $code[$j] || "\x7F" == $code[$j]) ? $code[$j - 1] : $code[$j];
+                            if (false !== strpos('-!%&;<=>~:^+|,()*?[{} ', $a)
+                                || (false !== strpos('oenfd', $a)
+                                    && preg_match(
+                                        "'(?<![\$.a-zA-Z0-9_])(do|else|return|typeof|yield[ \x7F]?\*?)[ \x7F]?$'",
+                                        substr($code, $j - 7, 8)
+                                    ))
+                            ) {
+                                if (')' === $a && $j > 1) {
+                                    $a = 1;
+                                    $k = $j - (' ' == $code[$j] || "\x7F" == $code[$j]) - 1;
+                                    while ($k >= 0 && $a) {
+                                        if ('(' === $code[$k]) {
+                                            --$a;
+                                        } elseif (')' === $code[$k]) {
+                                            ++$a;
+                                        }
+                                        --$k;
+                                    }
+                                    if (!preg_match("'(?<![\$.a-zA-Z0-9_])(if|for|while)[ \x7F]?$'", substr($code, 0, $k + 1))) {
+                                        $code[++$j] = '/';
+                                        break;
+                                    }
+                                }
+
+                                $key = "//''\"\"".$K++.$instr = "/'";
+                                $a = $j;
+                                $code .= $key;
+                                while (isset($key[++$j - $a - 1])) {
+                                    $code[$j] = $key[$j - $a - 1];
+                                }
+                                --$j;
+                                isset($s) && ($s = implode('', $s)) && $cc_on && $this->restoreCc($s);
+                                $strings[$key] = array('/');
+                                $s = &$strings[$key];
+                            } else {
+                                $code[++$j] = '/';
+                            }
+
+                            break;
+                        }
+
+                    case "'":
+                    case '"':
+                        $instr = $f[$i];
+                        $key = "//''\"\"".$K++.('!' == $instr ? ']' : "'");
+                        $a = $j;
+                        $code .= $key;
+                        while (isset($key[++$j - $a - 1])) {
+                            $code[$j] = $key[$j - $a - 1];
+                        }
+                        --$j;
+                        isset($s) && ($s = implode('', $s)) && $cc_on && $this->restoreCc($s);
+                        $strings[$key] = array();
+                        $s = &$strings[$key];
+                        '!' == $instr && $s[] = "\r/*!";
+
+                        break;
+
+                    case "\n":
+                        if ($j > 3) {
+                            if (' ' == $code[$j] || "\x7F" == $code[$j]) {
+                                --$j;
+                            }
+
+                            $code[++$j] =
+                                false !== strpos('kend+-', $code[$j - 1])
+                                && preg_match(
+                                    "'(?:\+\+|--|(?<![\$.a-zA-Z0-9_])(break|continue|return|yield[ \x7F]?\*?))[ \x7F]?$'",
+                                    substr($code, $j - 8, 9)
+                                )
+                                    ? ';' : "\x7F";
+
+                            break;
+                        }
+
+                    case "\t": $f[$i] = ' ';
+                    case ' ':
+                        if (!$j || ' ' == $code[$j] || "\x7F" == $code[$j]) {
+                            break;
+                        }
+
+                    default:
+                        $code[++$j] = $f[$i];
+                }
+            }
+        }
+
+        isset($s) && ($s = implode('', $s)) && $cc_on && $this->restoreCc($s);
+        unset($s);
+
+        $code = substr($code, 0, $j + 1);
+        $cc_on && $this->restoreCc($code, false);
+
+        // Protect wanted spaces and remove unwanted ones
+        $code = strtr($code, "\x7F", ' ');
+        $code = str_replace('- -', "-\x7F-", $code);
+        $code = str_replace('+ +', "+\x7F+", $code);
+        $code = preg_replace("'(\d)\s+\.\s*([a-zA-Z\$_[(])'", "$1\x7F.$2", $code);
+        $code = preg_replace("# ([-!%&;<=>~:.^+|,()*?[\]{}/']+)#", '$1', $code);
+        $code = preg_replace("#([-!%&;<=>~:.^+|,()*?[\]{}/]+) #", '$1', $code);
+        $cc_on && $code = preg_replace_callback("'//[^\'].*?@#3'", function ($m) { return strtr($m[0], ' ', "\x7F"); }, $code);
+
+        // Replace new Array/Object by []/{}
+        false !== strpos($code, 'new Array') && $code = preg_replace("'new Array(?:\(\)|([;\])},:]))'", '[]$1', $code);
+        false !== strpos($code, 'new Object') && $code = preg_replace("'new Object(?:\(\)|([;\])},:]))'", '{}$1', $code);
+
+        // Add missing semi-colons after curly braces
+        // This adds more semi-colons than strictly needed,
+        // but it seems that later gzipping is favorable to the repetition of "};"
+        $code = preg_replace("'\}(?![:,;.()\[\]}\|&]|(else|catch|finally|while)[^\$.a-zA-Z0-9_])'", '};', $code);
+
+        // Tag possible empty instruction for easy detection
+        $code = preg_replace("'(?<![\$.a-zA-Z0-9_])if\('", '1#(', $code);
+        $code = preg_replace("'(?<![\$.a-zA-Z0-9_])for\('", '2#(', $code);
+        $code = preg_replace("'(?<![\$.a-zA-Z0-9_])while\('", '3#(', $code);
+
+        $forPool = array();
+        $instrPool = array();
+        $s = 0;
+
+        $f = array();
+        $j = -1;
+
+        // Remove as much semi-colon as possible
+        $len = strlen($code);
+        for ($i = 0; $i < $len; ++$i) {
+            switch ($code[$i]) {
+                case '(':
+                    if ($j >= 0 && "\n" == $f[$j]) {
+                        $f[$j] = ';';
+                    }
+
+                    ++$s;
+
+                    if ($i && '#' == $code[$i - 1]) {
+                        $instrPool[$s - 1] = 1;
+                        if ('2' == $code[$i - 2]) {
+                            $forPool[$s] = 1;
+                        }
+                    }
+
+                    $f[++$j] = '(';
+                    break;
+
+                case ']':
+                case ')':
+                    if ($i + 1 < $len && !isset($forPool[$s]) && !isset($instrPool[$s - 1]) && preg_match("'[a-zA-Z0-9_\$]'", $code[$i + 1])) {
+                        $f[$j] .= $code[$i];
+                        $f[++$j] = "\n";
+                    } else {
+                        $f[++$j] = $code[$i];
+                    }
+
+                    if (')' == $code[$i]) {
+                        unset($forPool[$s]);
+                        --$s;
+                    }
+
+                    continue 2;
+
+                case '}':
+                    if ("\n" == $f[$j]) {
+                        $f[$j] = '}';
+                    } else {
+                        $f[++$j] = '}';
+                    }
+                    break;
+
+                case ';':
+                    if (isset($forPool[$s]) || isset($instrPool[$s])) {
+                        $f[++$j] = ';';
+                    } elseif ($j >= 0 && "\n" != $f[$j] && ';' != $f[$j]) {
+                        $f[++$j] = "\n";
+                    }
+
+                    break;
+
+                case '#':
+                    switch ($f[$j]) {
+                        case '1': $f[$j] = 'if';    break 2;
+                        case '2': $f[$j] = 'for';   break 2;
+                        case '3': $f[$j] = 'while'; break 2;
+                    }
+
+                case '[';
+                    if ($j >= 0 && "\n" == $f[$j]) {
+                        $f[$j] = ';';
+                    }
+
+                default: $f[++$j] = $code[$i];
+            }
+
+            unset($instrPool[$s]);
+        }
+
+        $f = implode('', $f);
+        $cc_on && $f = str_replace('@#3', "\r", $f);
+
+        // Fix "else ;" empty instructions
+        $f = preg_replace("'(?<![\$.a-zA-Z0-9_])else\n'", "\n", $f);
+
+        $r1 = array( // keywords with a direct object
+            'case','delete','do','else','function','in','instanceof','of','break',
+            'new','return','throw','typeof','var','void','yield','let','if',
+            'const','get','set',
+        );
+
+        $r2 = array( // keywords with a subject
+            'in','instanceof','of',
+        );
+
+        // Fix missing semi-colons
+        $f = preg_replace("'(?<!(?<![a-zA-Z0-9_\$])".implode(')(?<!(?<![a-zA-Z0-9_\$])', $r1).') (?!('.implode('|', $r2).")(?![a-zA-Z0-9_\$]))'", "\n", $f);
+        $f = preg_replace("'(?<!(?<![a-zA-Z0-9_\$])do)(?<!(?<![a-zA-Z0-9_\$])else) if\('", "\nif(", $f);
+        $f = preg_replace("'(?<=--|\+\+)(?<![a-zA-Z0-9_\$])(".implode('|', $r1).")(?![a-zA-Z0-9_\$])'", "\n$1", $f);
+        $f = preg_replace("'(?<![a-zA-Z0-9_\$])for\neach\('", 'for each(', $f);
+        $f = preg_replace("'(?<![a-zA-Z0-9_\$])\n(".implode('|', $r2).")(?![a-zA-Z0-9_\$])'", '$1', $f);
+
+        // Merge strings
+        if ($q["'"] > $q['"']) {
+            $q = array($q[1], $q[0]);
+        }
+        $f = preg_replace("#//''\"\"[0-9]+'#", $q[0].'$0'.$q[0], $f);
+        strpos($f, $q[0].'+'.$q[0]) && $f = str_replace($q[0].'+'.$q[0], '', $f);
+        $len = count($strings);
+        foreach ($strings as $r1 => &$r2) {
+            $r2 = "/'" == substr($r1, -2)
+                ? str_replace(array("\\'", '\\"'), array("'", '"'), $r2)
+                : str_replace('\\'.$q[1], $q[1], $r2);
+        }
+
+        // Restore wanted spaces
+        $f = strtr($f, "\x7F", ' ');
+
+        return array($f, $strings);
+    }
+
+    protected function extractClosures($code)
+    {
+        $code = ';'.$code;
+
+        $this->argFreq[-1] += substr_count($code, '}catch(');
+
+        if ($this->argFreq[-1]) {
+            // Special catch scope handling
+
+            // FIXME: this implementation doesn't work with nested catch scopes who need
+            // access to their parent's caught variable (but who needs that?).
+
+            $f = preg_split("@}catch\(({$this->varRx})@", $code, -1, PREG_SPLIT_DELIM_CAPTURE);
+
+            $code = 'catch$scope$var'.mt_rand();
+            $this->specialVarRx = $this->specialVarRx ? '(?:'.$this->specialVarRx.'|'.preg_quote($code).')' : preg_quote($code);
+            $i = count($f) - 1;
+
+            while ($i) {
+                $c = 1;
+                $j = 0;
+                $l = strlen($f[$i]);
+
+                while ($c && $j < $l) {
+                    $s = $f[$i][$j++];
+                    $c += '(' == $s ? 1 : (')' == $s ? -1 : 0);
+                }
+
+                if (!$c) {
+                    do {
+                        $s = $f[$i][$j++];
+                        $c += '{' == $s ? 1 : ('}' == $s ? -1 : 0);
+                    } while ($c && $j < $l);
+                }
+
+                $c = preg_quote($f[$i - 1], '#');
+                $f[$i - 2] .= '}catch('.preg_replace("#([.,{]?)(?<![a-zA-Z0-9_\$@]){$c}\\b#", '$1'.$code, $f[$i - 1].substr($f[$i], 0, $j)).substr($f[$i], $j);
+
+                unset($f[$i--], $f[$i--]);
+            }
+
+            $code = $f[0];
+        }
+
+        $f = preg_split("'(?<![a-zA-Z0-9_\$])((?:function[ (]|get |set ).*?\{)'", $code, -1, PREG_SPLIT_DELIM_CAPTURE);
+        $i = count($f) - 1;
+        $closures = array();
+
+        while ($i) {
+            $c = 1;
+            $j = 0;
+            $l = strlen($f[$i]);
+
+            while ($c && $j < $l) {
+                $s = $f[$i][$j++];
+                $c += '{' == $s ? 1 : ('}' == $s ? -1 : 0);
+            }
+
+            switch (substr($f[$i - 2], -1)) {
+                default:
+                    if (false !== $c = strpos($f[$i - 1], ' ', 8)) {
+                        break;
+                    }
+                case false: case "\n": case ';': case '{': case '}': case ')': case ']':
+                $c = strpos($f[$i - 1], '(', 4);
+            }
+
+            $l = "//''\"\"#$i'";
+            $code = substr($f[$i - 1], $c);
+            $closures[$l] = $code.substr($f[$i], 0, $j);
+            $f[$i - 2] .= substr($f[$i - 1], 0, $c).$l.substr($f[$i], $j);
+
+            if ('(){' !== $code) {
+                $j = substr_count($code, ',');
+                do {
+                    isset($this->argFreq[$j]) ? ++$this->argFreq[$j] : $this->argFreq[$j] = 1;
+                } while ($j--);
+            }
+
+            $i -= 2;
+        }
+
+        return array($f[0], $closures);
+    }
+
+    protected function makeVars($closure, &$tree, $key)
+    {
+        $tree['code'] = &$closure;
+        $tree['nfe'] = false;
+        $tree['used'] = array();
+        $tree['local'] = array();
+
+        // Replace multiple "var" declarations by a single one
+        $closure = preg_replace_callback("'(?<=[\n\{\}])var [^\n\{\};]+(?:\nvar [^\n\{\};]+)+'", array($this, 'mergeVarDeclarations'), $closure);
+
+        // Get all local vars (functions, arguments and "var" prefixed)
+
+        $vars = &$tree['local'];
+
+        if (preg_match("'^( [^(]*)?\((.*?)\)\{'", $closure, $v)) {
+            if ($v[1]) {
+                $vars[$tree['nfe'] = substr($v[1], 1)] = -1;
+                $tree['parent']['local'][';'.$key] = &$vars[$tree['nfe']];
+            }
+
+            if ($v[2]) {
+                $i = 0;
+                $v = explode(',', $v[2]);
+                foreach ($v as $w) {
+                    $vars[$w] = $this->argFreq[$i++] - 1; // Give a bonus to argument variables
+                }
+            }
+        }
+
+        $v = preg_split("'(?<![\$.a-zA-Z0-9_])var '", $closure);
+        if ($i = count($v) - 1) {
+            $w = array();
+
+            while ($i) {
+                $j = $c = 0;
+                $l = strlen($v[$i]);
+
+                while ($j < $l) {
+                    switch ($v[$i][$j]) {
+                        case '(': case '[': case '{':
+                        ++$c;
+                        break;
+
+                        case ')': case ']': case '}':
+                        if ($c-- <= 0) {
+                            break 2;
+                        }
+                        break;
+
+                        case ';': case "\n":
+                        if (!$c) {
+                            break 2;
+                        }
+
+                        default:
+                            $c || $w[] = $v[$i][$j];
+                    }
+
+                    ++$j;
+                }
+
+                $w[] = ',';
+                --$i;
+            }
+
+            $v = explode(',', implode('', $w));
+            foreach ($v as $w) {
+                if (preg_match("'^{$this->varRx}'", $w, $v)) {
+                    isset($vars[$v[0]]) || $vars[$v[0]] = 0;
+                }
+            }
+        }
+
+        if (preg_match_all("@function ({$this->varRx})//''\"\"#@", $closure, $v)) {
+            foreach ($v[1] as $w) {
+                isset($vars[$w]) || $vars[$w] = 0;
+            }
+        }
+
+        if ($this->argFreq[-1] && preg_match_all("@}catch\(({$this->varRx})@", $closure, $v)) {
+            $v[0] = array();
+            foreach ($v[1] as $w) {
+                isset($v[0][$w]) ? ++$v[0][$w] : $v[0][$w] = 1;
+            }
+            foreach ($v[0] as $w => $v) {
+                $vars[$w] = $this->argFreq[-1] - $v;
+            }
+        }
+
+        // Get all used vars, local and non-local
+
+        $vars = &$tree['used'];
+
+        if (preg_match_all("#([.,{]?(?:[gs]et )?)(?<![a-zA-Z0-9_\$])({$this->varRx})(:?)#", $closure, $w, PREG_SET_ORDER)) {
+            foreach ($w as $k) {
+                if (isset($k[1][0]) && (',' === $k[1][0] || '{' === $k[1][0])) {
+                    if (':' === $k[3]) {
+                        $k = '.'.$k[2];
+                    } elseif ('get ' === substr($k[1], 1, 4) || 'set ' === substr($k[1], 1, 4)) {
+                        ++$this->charFreq[ord($k[1][1])]; // "g" or "s"
+                        ++$this->charFreq[101]; // "e"
+                        ++$this->charFreq[116]; // "t"
+                        $k = '.'.$k[2];
+                    } else {
+                        $k = $k[2];
+                    }
+                } else {
+                    $k = $k[1].$k[2];
+                }
+
+                isset($vars[$k]) ? ++$vars[$k] : $vars[$k] = 1;
+            }
+        }
+
+        if (preg_match_all("#//''\"\"[0-9]+(?:['!]|/')#", $closure, $w)) {
+            foreach ($w[0] as $a) {
+                $v = "'" === substr($a, -1) && "/'" !== substr($a, -2) && $this->specialVarRx
+                    ? preg_split("#([.,{]?(?:[gs]et )?(?<![a-zA-Z0-9_\$@]){$this->specialVarRx}:?)#", $this->strings[$a], -1, PREG_SPLIT_DELIM_CAPTURE)
+                    : array($this->strings[$a]);
+                $a = count($v);
+
+                for ($i = 0; $i < $a; ++$i) {
+                    $k = $v[$i];
+
+                    if (1 === $i % 2) {
+                        if (',' === $k[0] || '{' === $k[0]) {
+                            if (':' === substr($k, -1)) {
+                                $k = '.'.substr($k, 1, -1);
+                            } elseif ('get ' === substr($k, 1, 4) || 'set ' === substr($k, 1, 4)) {
+                                ++$this->charFreq[ord($k[1])]; // "g" or "s"
+                                ++$this->charFreq[101]; // "e"
+                                ++$this->charFreq[116]; // "t"
+                                $k = '.'.substr($k, 5);
+                            } else {
+                                $k = substr($k, 1);
+                            }
+                        } elseif (':' === substr($k, -1)) {
+                            $k = substr($k, 0, -1);
+                        }
+
+                        $w = &$tree;
+
+                        while (isset($w['parent']) && !(isset($w['used'][$k]) || isset($w['local'][$k]))) {
+                            $w = &$w['parent'];
+                        }
+
+                        (isset($w['used'][$k]) || isset($w['local'][$k])) && (isset($vars[$k]) ? ++$vars[$k] : $vars[$k] = 1);
+
+                        unset($w);
+                    }
+
+                    if (0 === $i % 2 || !isset($vars[$k])) {
+                        foreach (count_chars($v[$i], 1) as $k => $w) {
+                            $this->charFreq[$k] += $w;
+                        }
+                    }
+                }
+            }
+        }
+
+        // Propagate the usage number to parents
+
+        foreach ($vars as $w => $a) {
+            $k = &$tree;
+            $chain = array();
+            do {
+                $vars = &$k['local'];
+                $chain[] = &$k;
+                if (isset($vars[$w])) {
+                    unset($k['used'][$w]);
+                    if (isset($vars[$w])) {
+                        $vars[$w] += $a;
+                    } else {
+                        $vars[$w] = $a;
+                    }
+                    $a = false;
+                    break;
+                }
+            } while ($k['parent'] && $k = &$k['parent']);
+
+            if ($a && !$k['parent']) {
+                if (isset($vars[$w])) {
+                    $vars[$w] += $a;
+                } else {
+                    $vars[$w] = $a;
+                }
+            }
+
+            if (isset($tree['used'][$w]) && isset($vars[$w])) {
+                foreach ($chain as &$b) {
+                    isset($b['local'][$w]) || $b['used'][$w] = &$vars[$w];
+                }
+            }
+        }
+
+        // Analyse childs
+
+        $tree['childs'] = array();
+        $vars = &$tree['childs'];
+
+        if (preg_match_all("@//''\"\"#[0-9]+'@", $closure, $w)) {
+            foreach ($w[0] as $a) {
+                $vars[$a] = array('parent' => &$tree);
+                $this->makeVars($this->closures[$a], $vars[$a], $a);
+            }
+        }
+    }
+
+    protected function mergeVarDeclarations($m)
+    {
+        return str_replace("\nvar ", ',', $m[0]);
+    }
+
+    protected function renameVars(&$tree, $root)
+    {
+        if ($root) {
+            $tree['local'] += $tree['used'];
+            $tree['used'] = array();
+
+            foreach ($tree['local'] as $k => $v) {
+                if ('.' == $k[0]) {
+                    $k = substr($k, 1);
+                }
+
+                if ('true' === $k) {
+                    $this->charFreq[48] += $v;
+                } elseif ('false' === $k) {
+                    $this->charFreq[49] += $v;
+                } elseif (!$this->specialVarRx || !preg_match("#^{$this->specialVarRx}$#", $k)) {
+                    foreach (count_chars($k, 1) as $k => $w) {
+                        $this->charFreq[$k] += $w * $v;
+                    }
+                } elseif (2 == strlen($k)) {
+                    $tree['used'][] = $k[1];
+                }
+            }
+
+            $this->charFreq = $this->rsort($this->charFreq);
+
+            $this->str0 = '';
+            $this->str1 = '';
+
+            foreach ($this->charFreq as $k => $v) {
+                if (!$v) {
+                    break;
+                }
+
+                $v = chr($k);
+
+                if ((64 < $k && $k < 91) || (96 < $k && $k < 123)) { // A-Z a-z
+                    $this->str0 .= $v;
+                    $this->str1 .= $v;
+                } elseif (47 < $k && $k < 58) { // 0-9
+                    $this->str1 .= $v;
+                }
+            }
+
+            if ('' === $this->str0) {
+                $this->str0 = 'claspemitdbfrugnjvhowkxqyzCLASPEMITDBFRUGNJVHOWKXQYZ';
+                $this->str1 = $this->str0.'0123456789';
+            }
+
+            foreach ($tree['local'] as $var => $root) {
+                if ('.' != substr($var, 0, 1) && isset($tree['local'][".{$var}"])) {
+                    $tree['local'][$var] += $tree['local'][".{$var}"];
+                }
+            }
+
+            foreach ($tree['local'] as $var => $root) {
+                if ('.' == substr($var, 0, 1) && isset($tree['local'][substr($var, 1)])) {
+                    $tree['local'][$var] = $tree['local'][substr($var, 1)];
+                }
+            }
+
+            $tree['local'] = $this->rsort($tree['local']);
+
+            foreach ($tree['local'] as $var => $root) {
+                switch (substr($var, 0, 1)) {
+                    case '.':
+                        if (!isset($tree['local'][substr($var, 1)])) {
+                            $tree['local'][$var] = '#'.($this->specialVarRx && 3 < strlen($var) && preg_match("'^\.{$this->specialVarRx}$'", $var) ? $this->getNextName($tree).'$' : substr($var, 1));
+                        }
+                        break;
+
+                    case ';': $tree['local'][$var] = 0 === $root ? '' : $this->getNextName($tree);
+                    case '#': break;
+
+                    default:
+                        $root = $this->specialVarRx && 2 < strlen($var) && preg_match("'^{$this->specialVarRx}$'", $var) ? $this->getNextName($tree).'$' : $var;
+                        $tree['local'][$var] = $root;
+                        if (isset($tree['local'][".{$var}"])) {
+                            $tree['local'][".{$var}"] = '#'.$root;
+                        }
+                }
+            }
+
+            foreach ($tree['local'] as $var => $root) {
+                $tree['local'][$var] = preg_replace("'^#'", '.', $tree['local'][$var]);
+            }
+        } else {
+            $tree['local'] = $this->rsort($tree['local']);
+            if (false !== $tree['nfe']) {
+                $tree['used'][] = $tree['local'][$tree['nfe']];
+            }
+
+            foreach ($tree['local'] as $var => $root) {
+                if ($tree['nfe'] !== $var) {
+                    $tree['local'][$var] = 0 === $root ? '' : $this->getNextName($tree);
+                }
+            }
+        }
+
+        $this->local_tree = &$tree['local'];
+        $this->used_tree = &$tree['used'];
+
+        $tree['code'] = preg_replace_callback("#[.,{ ]?(?:[gs]et )?(?<![a-zA-Z0-9_\$@]){$this->varRx}:?#", array($this, 'getNewName'), $tree['code']);
+
+        if ($this->specialVarRx && preg_match_all("#//''\"\"[0-9]+'#", $tree['code'], $b)) {
+            foreach ($b[0] as $a) {
+                $this->strings[$a] = preg_replace_callback(
+                    "#[.,{]?(?:[gs]et )?(?<![a-zA-Z0-9_\$@]){$this->specialVarRx}:?#",
+                    array($this, 'getNewName'),
+                    $this->strings[$a]
+                );
+            }
+        }
+
+        foreach ($tree['childs'] as $a => &$b) {
+            $this->renameVars($b, false);
+            $tree['code'] = str_replace($a, $b['code'], $tree['code']);
+            unset($tree['childs'][$a]);
+        }
+    }
+
+    protected function getNewName($m)
+    {
+        $m = $m[0];
+
+        $pre = '.' === $m[0] ? '.' : '';
+        $post = '';
+
+        if (',' === $m[0] || '{' === $m[0] || ' ' === $m[0]) {
+            $pre = $m[0];
+
+            if (':' === substr($m, -1)) {
+                $post = ':';
+                $m = (' ' !== $m[0] ? '.' : '').substr($m, 1, -1);
+            } elseif ('get ' === substr($m, 1, 4) || 'set ' === substr($m, 1, 4)) {
+                $pre .= substr($m, 1, 4);
+                $m = '.'.substr($m, 5);
+            } else {
+                $m = substr($m, 1);
+            }
+        } elseif (':' === substr($m, -1)) {
+            $post = ':';
+            $m = substr($m, 0, -1);
+        }
+
+        $post = (isset($this->reserved[$m])
+                ? ('true' === $m ? '!0' : ('false' === $m ? '!1' : $m))
+                : (
+                isset($this->local_tree[$m])
+                    ? $this->local_tree[$m]
+                    : (
+                isset($this->used_tree[$m])
+                    ? $this->used_tree[$m]
+                    : $m
+                )
+                )
+            ).$post;
+
+        return '' === $post ? '' : ($pre.('.' === $post[0] ? substr($post, 1) : $post));
+    }
+
+    protected function getNextName(&$tree = array(), &$counter = false)
+    {
+        if (false === $counter) {
+            $counter = &$tree['counter'];
+            isset($counter) || $counter = -1;
+            $exclude = array_flip($tree['used']);
+        } else {
+            $exclude = $tree;
+        }
+
+        ++$counter;
+
+        $len0 = strlen($this->str0);
+        $len1 = strlen($this->str0);
+
+        $name = $this->str0[$counter % $len0];
+
+        $i = intval($counter / $len0) - 1;
+        while ($i >= 0) {
+            $name .= $this->str1[ $i % $len1 ];
+            $i = intval($i / $len1) - 1;
+        }
+
+        return !(isset($this->reserved[$name]) || isset($exclude[$name])) ? $name : $this->getNextName($exclude, $counter);
+    }
+
+    protected function restoreCc(&$s, $lf = true)
+    {
+        $lf && $s = str_replace('@#3', '', $s);
+
+        $s = str_replace('@#1', '@*/', $s);
+        $s = str_replace('2#@', '//@', $s);
+        $s = str_replace('1#@', '/*@', $s);
+        $s = str_replace('##', '#', $s);
+    }
+
+    private function rsort($array)
+    {
+        if (!$array) {
+            return $array;
+        }
+
+        $i = 0;
+        $tuples = array();
+        foreach ($array as $k => &$v) {
+            $tuples[] = array(++$i, $k, &$v);
+        }
+
+        usort($tuples, function ($a, $b) {
+            if ($b[2] > $a[2]) {
+                return 1;
+            }
+            if ($b[2] < $a[2]) {
+                return -1;
+            }
+            if ($b[0] > $a[0]) {
+                return -1;
+            }
+            if ($b[0] < $a[0]) {
+                return 1;
+            }
+
+            return 0;
+        });
+
+        $array = array();
+
+        foreach ($tuples as $t) {
+            $array[$t[1]] = &$t[2];
+        }
+
+        return $array;
+    }
 }
 
 ?>

Spacing +43 added lines, -43 removed lines

@@ -78,17 +78,17 @@ 
 		$varRx = '(?:[a-zA-Z_$])[a-zA-Z0-9_$]*',
 		$reserved = array(
 		// Literals
-		'true','false','null',
+		'true', 'false', 'null',
 		// ES6
-		'break','case','class','catch','const','continue','debugger','default','delete','do','else','export','extends','finally','for','function','if','import','in','instanceof','new','return','super','switch','this','throw','try','typeof','var','void','while','with','yield',
+		'break', 'case', 'class', 'catch', 'const', 'continue', 'debugger', 'default', 'delete', 'do', 'else', 'export', 'extends', 'finally', 'for', 'function', 'if', 'import', 'in', 'instanceof', 'new', 'return', 'super', 'switch', 'this', 'throw', 'try', 'typeof', 'var', 'void', 'while', 'with', 'yield',
 		// Future
 		'enum',
 		// Strict mode
-		'implements','package','protected','static','let','interface','private','public',
+		'implements', 'package', 'protected', 'static', 'let', 'interface', 'private', 'public',
 		// Module
 		'await',
 		// Older standards
-		'abstract','boolean','byte','char','double','final','float','goto','int','long','native','short','synchronized','throws','transient','volatile',
+		'abstract', 'boolean', 'byte', 'char', 'double', 'final', 'float', 'goto', 'int', 'long', 'native', 'short', 'synchronized', 'throws', 'transient', 'volatile',
 	);
 
 	public function __construct()
@@ -246,7 +246,7 @@ 
 
 					if ("\n" != $f[$i]) {
 						isset($q[$f[$i]]) && ++$q[$f[$i]];
-						$s[] = '\\'.$f[$i];
+						$s[] = '\\' . $f[$i];
 					}
 				} elseif ('[' == $f[$i] && "/'" == $instr) {
 					$instr = '/[';
@@ -256,7 +256,7 @@ 
 					$s[] = ']';
 				} elseif ("'" == $f[$i] || '"' == $f[$i]) {
 					++$q[$f[$i]];
-					$s[] = '\\'.$f[$i];
+					$s[] = '\\' . $f[$i];
 				} else {
 					$s[] = $f[$i];
 				}
@@ -312,7 +312,7 @@ 
 									}
 								}
 
-								$key = "//''\"\"".$K++.$instr = "/'";
+								$key = "//''\"\"" . $K++ . $instr = "/'";
 								$a = $j;
 								$code .= $key;
 								while (isset($key[++$j - $a - 1])) {
@@ -332,7 +332,7 @@ 
 					case "'":
 					case '"':
 						$instr = $f[$i];
-						$key = "//''\"\"".$K++.('!' == $instr ? ']' : "'");
+						$key = "//''\"\"" . $K++ . ('!' == $instr ? ']' : "'");
 						$a = $j;
 						$code .= $key;
 						while (isset($key[++$j - $a - 1])) {
@@ -388,7 +388,7 @@ 
 		$code = preg_replace("'(\d)\s+\.\s*([a-zA-Z\$_[(])'", "$1\x7F.$2", $code);
 		$code = preg_replace("# ([-!%&;<=>~:.^+|,()*?[\]{}/']+)#", '$1', $code);
 		$code = preg_replace("#([-!%&;<=>~:.^+|,()*?[\]{}/]+) #", '$1', $code);
-		$cc_on && $code = preg_replace_callback("'//[^\'].*?@#3'", function ($m) { return strtr($m[0], ' ', "\x7F"); }, $code);
+		$cc_on && $code = preg_replace_callback("'//[^\'].*?@#3'", function($m) { return strtr($m[0], ' ', "\x7F"); }, $code);
 
 		// Replace new Array/Object by []/{}
 		false !== strpos($code, 'new Array') && $code = preg_replace("'new Array(?:\(\)|([;\])},:]))'", '[]$1', $code);
@@ -467,8 +467,8 @@ 
 
 				case '#':
 					switch ($f[$j]) {
-						case '1': $f[$j] = 'if';    break 2;
-						case '2': $f[$j] = 'for';   break 2;
+						case '1': $f[$j] = 'if'; break 2;
+						case '2': $f[$j] = 'for'; break 2;
 						case '3': $f[$j] = 'while'; break 2;
 					}
 
@@ -490,33 +490,33 @@ 
 		$f = preg_replace("'(?<![\$.a-zA-Z0-9_])else\n'", "\n", $f);
 
 		$r1 = array( // keywords with a direct object
-			'case','delete','do','else','function','in','instanceof','of','break',
-			'new','return','throw','typeof','var','void','yield','let','if',
-			'const','get','set',
+			'case', 'delete', 'do', 'else', 'function', 'in', 'instanceof', 'of', 'break',
+			'new', 'return', 'throw', 'typeof', 'var', 'void', 'yield', 'let', 'if',
+			'const', 'get', 'set',
 		);
 
 		$r2 = array( // keywords with a subject
-			'in','instanceof','of',
+			'in', 'instanceof', 'of',
 		);
 
 		// Fix missing semi-colons
-		$f = preg_replace("'(?<!(?<![a-zA-Z0-9_\$])".implode(')(?<!(?<![a-zA-Z0-9_\$])', $r1).') (?!('.implode('|', $r2).")(?![a-zA-Z0-9_\$]))'", "\n", $f);
+		$f = preg_replace("'(?<!(?<![a-zA-Z0-9_\$])" . implode(')(?<!(?<![a-zA-Z0-9_\$])', $r1) . ') (?!(' . implode('|', $r2) . ")(?![a-zA-Z0-9_\$]))'", "\n", $f);
 		$f = preg_replace("'(?<!(?<![a-zA-Z0-9_\$])do)(?<!(?<![a-zA-Z0-9_\$])else) if\('", "\nif(", $f);
-		$f = preg_replace("'(?<=--|\+\+)(?<![a-zA-Z0-9_\$])(".implode('|', $r1).")(?![a-zA-Z0-9_\$])'", "\n$1", $f);
+		$f = preg_replace("'(?<=--|\+\+)(?<![a-zA-Z0-9_\$])(" . implode('|', $r1) . ")(?![a-zA-Z0-9_\$])'", "\n$1", $f);
 		$f = preg_replace("'(?<![a-zA-Z0-9_\$])for\neach\('", 'for each(', $f);
-		$f = preg_replace("'(?<![a-zA-Z0-9_\$])\n(".implode('|', $r2).")(?![a-zA-Z0-9_\$])'", '$1', $f);
+		$f = preg_replace("'(?<![a-zA-Z0-9_\$])\n(" . implode('|', $r2) . ")(?![a-zA-Z0-9_\$])'", '$1', $f);
 
 		// Merge strings
 		if ($q["'"] > $q['"']) {
 			$q = array($q[1], $q[0]);
 		}
-		$f = preg_replace("#//''\"\"[0-9]+'#", $q[0].'$0'.$q[0], $f);
-		strpos($f, $q[0].'+'.$q[0]) && $f = str_replace($q[0].'+'.$q[0], '', $f);
+		$f = preg_replace("#//''\"\"[0-9]+'#", $q[0] . '$0' . $q[0], $f);
+		strpos($f, $q[0] . '+' . $q[0]) && $f = str_replace($q[0] . '+' . $q[0], '', $f);
 		$len = count($strings);
 		foreach ($strings as $r1 => &$r2) {
 			$r2 = "/'" == substr($r1, -2)
 				? str_replace(array("\\'", '\\"'), array("'", '"'), $r2)
-				: str_replace('\\'.$q[1], $q[1], $r2);
+				: str_replace('\\' . $q[1], $q[1], $r2);
 		}
 
 		// Restore wanted spaces
@@ -527,7 +527,7 @@ 
 
 	protected function extractClosures($code)
 	{
-		$code = ';'.$code;
+		$code = ';' . $code;
 
 		$this->argFreq[-1] += substr_count($code, '}catch(');
 
@@ -539,8 +539,8 @@ 
 
 			$f = preg_split("@}catch\(({$this->varRx})@", $code, -1, PREG_SPLIT_DELIM_CAPTURE);
 
-			$code = 'catch$scope$var'.mt_rand();
-			$this->specialVarRx = $this->specialVarRx ? '(?:'.$this->specialVarRx.'|'.preg_quote($code).')' : preg_quote($code);
+			$code = 'catch$scope$var' . mt_rand();
+			$this->specialVarRx = $this->specialVarRx ? '(?:' . $this->specialVarRx . '|' . preg_quote($code) . ')' : preg_quote($code);
 			$i = count($f) - 1;
 
 			while ($i) {
@@ -561,7 +561,7 @@ 
 				}
 
 				$c = preg_quote($f[$i - 1], '#');
-				$f[$i - 2] .= '}catch('.preg_replace("#([.,{]?)(?<![a-zA-Z0-9_\$@]){$c}\\b#", '$1'.$code, $f[$i - 1].substr($f[$i], 0, $j)).substr($f[$i], $j);
+				$f[$i - 2] .= '}catch(' . preg_replace("#([.,{]?)(?<![a-zA-Z0-9_\$@]){$c}\\b#", '$1' . $code, $f[$i - 1] . substr($f[$i], 0, $j)) . substr($f[$i], $j);
 
 				unset($f[$i--], $f[$i--]);
 			}
@@ -594,8 +594,8 @@ 
 
 			$l = "//''\"\"#$i'";
 			$code = substr($f[$i - 1], $c);
-			$closures[$l] = $code.substr($f[$i], 0, $j);
-			$f[$i - 2] .= substr($f[$i - 1], 0, $c).$l.substr($f[$i], $j);
+			$closures[$l] = $code . substr($f[$i], 0, $j);
+			$f[$i - 2] .= substr($f[$i - 1], 0, $c) . $l . substr($f[$i], $j);
 
 			if ('(){' !== $code) {
 				$j = substr_count($code, ',');
@@ -627,7 +627,7 @@ 
 		if (preg_match("'^( [^(]*)?\((.*?)\)\{'", $closure, $v)) {
 			if ($v[1]) {
 				$vars[$tree['nfe'] = substr($v[1], 1)] = -1;
-				$tree['parent']['local'][';'.$key] = &$vars[$tree['nfe']];
+				$tree['parent']['local'][';' . $key] = &$vars[$tree['nfe']];
 			}
 
 			if ($v[2]) {
@@ -707,17 +707,17 @@ 
 			foreach ($w as $k) {
 				if (isset($k[1][0]) && (',' === $k[1][0] || '{' === $k[1][0])) {
 					if (':' === $k[3]) {
-						$k = '.'.$k[2];
+						$k = '.' . $k[2];
 					} elseif ('get ' === substr($k[1], 1, 4) || 'set ' === substr($k[1], 1, 4)) {
 						++$this->charFreq[ord($k[1][1])]; // "g" or "s"
 						++$this->charFreq[101]; // "e"
 						++$this->charFreq[116]; // "t"
-						$k = '.'.$k[2];
+						$k = '.' . $k[2];
 					} else {
 						$k = $k[2];
 					}
 				} else {
-					$k = $k[1].$k[2];
+					$k = $k[1] . $k[2];
 				}
 
 				isset($vars[$k]) ? ++$vars[$k] : $vars[$k] = 1;
@@ -737,12 +737,12 @@ 
 					if (1 === $i % 2) {
 						if (',' === $k[0] || '{' === $k[0]) {
 							if (':' === substr($k, -1)) {
-								$k = '.'.substr($k, 1, -1);
+								$k = '.' . substr($k, 1, -1);
 							} elseif ('get ' === substr($k, 1, 4) || 'set ' === substr($k, 1, 4)) {
 								++$this->charFreq[ord($k[1])]; // "g" or "s"
 								++$this->charFreq[101]; // "e"
 								++$this->charFreq[116]; // "t"
-								$k = '.'.substr($k, 5);
+								$k = '.' . substr($k, 5);
 							} else {
 								$k = substr($k, 1);
 							}
@@ -869,7 +869,7 @@ 
 
 			if ('' === $this->str0) {
 				$this->str0 = 'claspemitdbfrugnjvhowkxqyzCLASPEMITDBFRUGNJVHOWKXQYZ';
-				$this->str1 = $this->str0.'0123456789';
+				$this->str1 = $this->str0 . '0123456789';
 			}
 
 			foreach ($tree['local'] as $var => $root) {
@@ -890,7 +890,7 @@ 
 				switch (substr($var, 0, 1)) {
 					case '.':
 						if (!isset($tree['local'][substr($var, 1)])) {
-							$tree['local'][$var] = '#'.($this->specialVarRx && 3 < strlen($var) && preg_match("'^\.{$this->specialVarRx}$'", $var) ? $this->getNextName($tree).'$' : substr($var, 1));
+							$tree['local'][$var] = '#' . ($this->specialVarRx && 3 < strlen($var) && preg_match("'^\.{$this->specialVarRx}$'", $var) ? $this->getNextName($tree) . '$' : substr($var, 1));
 						}
 						break;
 
@@ -898,10 +898,10 @@ 
 					case '#': break;
 
 					default:
-						$root = $this->specialVarRx && 2 < strlen($var) && preg_match("'^{$this->specialVarRx}$'", $var) ? $this->getNextName($tree).'$' : $var;
+						$root = $this->specialVarRx && 2 < strlen($var) && preg_match("'^{$this->specialVarRx}$'", $var) ? $this->getNextName($tree) . '$' : $var;
 						$tree['local'][$var] = $root;
 						if (isset($tree['local'][".{$var}"])) {
-							$tree['local'][".{$var}"] = '#'.$root;
+							$tree['local'][".{$var}"] = '#' . $root;
 						}
 				}
 			}
@@ -956,10 +956,10 @@ 
 
 			if (':' === substr($m, -1)) {
 				$post = ':';
-				$m = (' ' !== $m[0] ? '.' : '').substr($m, 1, -1);
+				$m = (' ' !== $m[0] ? '.' : '') . substr($m, 1, -1);
 			} elseif ('get ' === substr($m, 1, 4) || 'set ' === substr($m, 1, 4)) {
 				$pre .= substr($m, 1, 4);
-				$m = '.'.substr($m, 5);
+				$m = '.' . substr($m, 5);
 			} else {
 				$m = substr($m, 1);
 			}
@@ -979,9 +979,9 @@ 
 					: $m
 				)
 				)
-			).$post;
+			) . $post;
 
-		return '' === $post ? '' : ($pre.('.' === $post[0] ? substr($post, 1) : $post));
+		return '' === $post ? '' : ($pre . ('.' === $post[0] ? substr($post, 1) : $post));
 	}
 
 	protected function getNextName(&$tree = array(), &$counter = false)
@@ -1003,7 +1003,7 @@ 
 
 		$i = intval($counter / $len0) - 1;
 		while ($i >= 0) {
-			$name .= $this->str1[ $i % $len1 ];
+			$name .= $this->str1[$i % $len1];
 			$i = intval($i / $len1) - 1;
 		}
 
@@ -1032,7 +1032,7 @@ 
 			$tuples[] = array(++$i, $k, &$v);
 		}
 
-		usort($tuples, function ($a, $b) {
+		usort($tuples, function($a, $b) {
 			if ($b[2] > $a[2]) {
 				return 1;
 			}

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

Indentation +140 added lines, -140 removed lines

@@ -23,179 +23,179 @@
 
 class Lang {
 
-	protected static $supported_languages = array();
-	protected static $initialized = false;
+    protected static $supported_languages = array();
+    protected static $initialized = false;
 
-	//https://paulund.co.uk/auto-detect-browser-language-in-php
+    //https://paulund.co.uk/auto-detect-browser-language-in-php
 
-	public static function getPrefLangToken () : string {
-		if (!isset($_SERVER['HTTP_ACCEPT_LANGUAGE'])) {
-			$_SERVER['HTTP_ACCEPT_LANGUAGE'] = Settings::get("default_lang");
-		}
+    public static function getPrefLangToken () : string {
+        if (!isset($_SERVER['HTTP_ACCEPT_LANGUAGE'])) {
+            $_SERVER['HTTP_ACCEPT_LANGUAGE'] = Settings::get("default_lang");
+        }
 
-		return substr($_SERVER['HTTP_ACCEPT_LANGUAGE'], 0, 2);
-	}
+        return substr($_SERVER['HTTP_ACCEPT_LANGUAGE'], 0, 2);
+    }
 
-	public static function getLangToken (array $supported_lang_tokens) : string {
-		//http://php.net/manual/fa/function.http-negotiate-language.php
+    public static function getLangToken (array $supported_lang_tokens) : string {
+        //http://php.net/manual/fa/function.http-negotiate-language.php
 
-		//https://stackoverflow.com/questions/6038236/using-the-php-http-accept-language-server-variable
+        //https://stackoverflow.com/questions/6038236/using-the-php-http-accept-language-server-variable
 
-		//https://stackoverflow.com/questions/3770513/detect-browser-language-in-php
+        //https://stackoverflow.com/questions/3770513/detect-browser-language-in-php
 
-		return self::prefered_language($supported_lang_tokens);//http_negotiate_language($supported_lang_tokens);
-	}
+        return self::prefered_language($supported_lang_tokens);//http_negotiate_language($supported_lang_tokens);
+    }
 
-	public static function loadSupportedLangs () {
-		if (Cache::contains("supported-languages", "list")) {
-			self::$supported_languages = Cache::get("supported-languages", "list");
-		} else {
-			$rows = Database::getInstance()->listRows("SELECT * FROM `{praefix}supported_languages`; ");
+    public static function loadSupportedLangs () {
+        if (Cache::contains("supported-languages", "list")) {
+            self::$supported_languages = Cache::get("supported-languages", "list");
+        } else {
+            $rows = Database::getInstance()->listRows("SELECT * FROM `{praefix}supported_languages`; ");
 
-			$array = array();
+            $array = array();
 
-			foreach ($rows as $row) {
-				$array[$row['lang_token']] = $row;
-			}
+            foreach ($rows as $row) {
+                $array[$row['lang_token']] = $row;
+            }
 
-			//cache values
-			Cache::put("supported-languages", "list", $array);
+            //cache values
+            Cache::put("supported-languages", "list", $array);
 
-			self::$supported_languages = $array;
-		}
+            self::$supported_languages = $array;
+        }
 
-		self::$initialized = true;
-	}
+        self::$initialized = true;
+    }
 
-	protected static function loadIfAbsent () {
-		if (!self::$initialized) {
-			self::loadSupportedLangs();
-		}
-	}
+    protected static function loadIfAbsent () {
+        if (!self::$initialized) {
+            self::loadSupportedLangs();
+        }
+    }
 
-	public static function listSupportedLangTokens () {
-		//load tokens, if not initialized
-		self::loadIfAbsent();
+    public static function listSupportedLangTokens () {
+        //load tokens, if not initialized
+        self::loadIfAbsent();
 
-		$keys = array_keys(self::$supported_languages);
+        $keys = array_keys(self::$supported_languages);
 
-		//get default language
-		$default_lang = Settings::get("default_lang");
+        //get default language
+        $default_lang = Settings::get("default_lang");
 
-		if (!in_array($default_lang, $keys)) {
-			throw new IllegalStateException("default language (in global settings) isnt a supported language");
-		}
+        if (!in_array($default_lang, $keys)) {
+            throw new IllegalStateException("default language (in global settings) isnt a supported language");
+        }
 
-		//remove element from array
-		if (($key = array_search($default_lang, $keys)) !== false) {
-			unset($keys[$key]);
-		}
+        //remove element from array
+        if (($key = array_search($default_lang, $keys)) !== false) {
+            unset($keys[$key]);
+        }
 
-		//add as first element
-		array_unshift($keys, $default_lang);
+        //add as first element
+        array_unshift($keys, $default_lang);
 
-		return $keys;
-	}
+        return $keys;
+    }
 
-	public static function addLang (string $token, string $title) {
-		Database::getInstance()->execute("INSERT INTO `{praefix}supported_languages` (
+    public static function addLang (string $token, string $title) {
+        Database::getInstance()->execute("INSERT INTO `{praefix}supported_languages` (
 			`lang_token`, `title`
 		) VALUES (
 			:token, :title
 		); ", array(
-			'token' => $token,
-			'title' => $title
-		));
+            'token' => $token,
+            'title' => $title
+        ));
 
-		//clear local in-memory cache
-		self::$initialized = false;
+        //clear local in-memory cache
+        self::$initialized = false;
 
-		//clear cache
-		Cache::clear("supported-languages");
-	}
+        //clear cache
+        Cache::clear("supported-languages");
+    }
 
-	public static function addLangOrUpdate (string $token, string $title) {
-		Database::getInstance()->execute("INSERT INTO `{praefix}supported_languages` (
+    public static function addLangOrUpdate (string $token, string $title) {
+        Database::getInstance()->execute("INSERT INTO `{praefix}supported_languages` (
 			`lang_token`, `title`
 		) VALUES (
 			:token, :title
 		) ON DUPLICATE KEY UPDATE `title` = :title; ", array(
-			'token' => $token,
-			'title' => $title
-		));
-
-		//clear local in-memory cache
-		self::$initialized = false;
-
-		//clear cache
-		Cache::clear("supported-languages");
-	}
-
-	/**
-	 * determine which language out of an available set the user prefers most
-	 *
-	 * @param $available_languages array with language-tag-strings (must be lowercase) that are available
-	 * @param $http_accept_language a HTTP_ACCEPT_LANGUAGE string (read from $_SERVER['HTTP_ACCEPT_LANGUAGE'] if left out)
-	 */
-
-	/**
-	 * determine which language out of an available set the user prefers most
-	 *
-	 * @param $available_languages array with language-tag-strings (must be lowercase) that are available
-	 * @param $http_accept_language string HTTP_ACCEPT_LANGUAGE string (read from $_SERVER['HTTP_ACCEPT_LANGUAGE'] if left out)
-	 *
-	 * @link http://www.theserverpages.com/php/manual/en/function.http-negotiate-language.php
-	 *
-	 * @return prefered language
-	 */
-	protected static function prefered_language (array $available_languages, string $http_accept_language = "auto") : string {
-		if (!isset($_SERVER['HTTP_ACCEPT_LANGUAGE'])) {
-			$_SERVER['HTTP_ACCEPT_LANGUAGE'] = Settings::get("default_lang");
-		}
-
-		// if $http_accept_language was left out, read it from the HTTP-Header
-		if ($http_accept_language == "auto") $http_accept_language = $_SERVER['HTTP_ACCEPT_LANGUAGE'];
-
-		// standard  for HTTP_ACCEPT_LANGUAGE is defined under
-		// http://www.w3.org/Protocols/rfc2616/rfc2616-sec14.html#sec14.4
-		// pattern to find is therefore something like this:
-		//    1#( language-range [ ";" "q" "=" qvalue ] )
-		// where:
-		//    language-range  = ( ( 1*8ALPHA *( "-" 1*8ALPHA ) ) | "*" )
-		//    qvalue         = ( "0" [ "." 0*3DIGIT ] )
-		//            | ( "1" [ "." 0*3("0") ] )
-		preg_match_all("/([[:alpha:]]{1,8})(-([[:alpha:]|-]{1,8}))?" .
-			"(\s*;\s*q\s*=\s*(1\.0{0,3}|0\.\d{0,3}))?\s*(,|$)/i",
-			$http_accept_language, $hits, PREG_SET_ORDER);
-
-		// default language (in case of no hits) is the first in the array
-		$bestlang = $available_languages[0];
-		$bestqval = 0;
-
-		foreach ($hits as $arr) {
-			// read data from the array of this hit
-			$langprefix = strtolower ($arr[1]);
-			if (!empty($arr[3])) {
-				$langrange = strtolower ($arr[3]);
-				$language = $langprefix . "-" . $langrange;
-			}
-			else $language = $langprefix;
-			$qvalue = 1.0;
-			if (!empty($arr[5])) $qvalue = floatval($arr[5]);
-
-			// find q-maximal language
-			if (in_array($language,$available_languages) && ($qvalue > $bestqval)) {
-				$bestlang = $language;
-				$bestqval = $qvalue;
-			}
-			// if no direct hit, try the prefix only but decrease q-value by 10% (as http_negotiate_language does)
-			else if (in_array($langprefix,$available_languages) && (($qvalue*0.9) > $bestqval)) {
-				$bestlang = $langprefix;
-				$bestqval = $qvalue*0.9;
-			}
-		}
-		return $bestlang;
-	}
+            'token' => $token,
+            'title' => $title
+        ));
+
+        //clear local in-memory cache
+        self::$initialized = false;
+
+        //clear cache
+        Cache::clear("supported-languages");
+    }
+
+    /**
+     * determine which language out of an available set the user prefers most
+     *
+     * @param $available_languages array with language-tag-strings (must be lowercase) that are available
+     * @param $http_accept_language a HTTP_ACCEPT_LANGUAGE string (read from $_SERVER['HTTP_ACCEPT_LANGUAGE'] if left out)
+     */
+
+    /**
+     * determine which language out of an available set the user prefers most
+     *
+     * @param $available_languages array with language-tag-strings (must be lowercase) that are available
+     * @param $http_accept_language string HTTP_ACCEPT_LANGUAGE string (read from $_SERVER['HTTP_ACCEPT_LANGUAGE'] if left out)
+     *
+     * @link http://www.theserverpages.com/php/manual/en/function.http-negotiate-language.php
+     *
+     * @return prefered language
+     */
+    protected static function prefered_language (array $available_languages, string $http_accept_language = "auto") : string {
+        if (!isset($_SERVER['HTTP_ACCEPT_LANGUAGE'])) {
+            $_SERVER['HTTP_ACCEPT_LANGUAGE'] = Settings::get("default_lang");
+        }
+
+        // if $http_accept_language was left out, read it from the HTTP-Header
+        if ($http_accept_language == "auto") $http_accept_language = $_SERVER['HTTP_ACCEPT_LANGUAGE'];
+
+        // standard  for HTTP_ACCEPT_LANGUAGE is defined under
+        // http://www.w3.org/Protocols/rfc2616/rfc2616-sec14.html#sec14.4
+        // pattern to find is therefore something like this:
+        //    1#( language-range [ ";" "q" "=" qvalue ] )
+        // where:
+        //    language-range  = ( ( 1*8ALPHA *( "-" 1*8ALPHA ) ) | "*" )
+        //    qvalue         = ( "0" [ "." 0*3DIGIT ] )
+        //            | ( "1" [ "." 0*3("0") ] )
+        preg_match_all("/([[:alpha:]]{1,8})(-([[:alpha:]|-]{1,8}))?" .
+            "(\s*;\s*q\s*=\s*(1\.0{0,3}|0\.\d{0,3}))?\s*(,|$)/i",
+            $http_accept_language, $hits, PREG_SET_ORDER);
+
+        // default language (in case of no hits) is the first in the array
+        $bestlang = $available_languages[0];
+        $bestqval = 0;
+
+        foreach ($hits as $arr) {
+            // read data from the array of this hit
+            $langprefix = strtolower ($arr[1]);
+            if (!empty($arr[3])) {
+                $langrange = strtolower ($arr[3]);
+                $language = $langprefix . "-" . $langrange;
+            }
+            else $language = $langprefix;
+            $qvalue = 1.0;
+            if (!empty($arr[5])) $qvalue = floatval($arr[5]);
+
+            // find q-maximal language
+            if (in_array($language,$available_languages) && ($qvalue > $bestqval)) {
+                $bestlang = $language;
+                $bestqval = $qvalue;
+            }
+            // if no direct hit, try the prefix only but decrease q-value by 10% (as http_negotiate_language does)
+            else if (in_array($langprefix,$available_languages) && (($qvalue*0.9) > $bestqval)) {
+                $bestlang = $langprefix;
+                $bestqval = $qvalue*0.9;
+            }
+        }
+        return $bestlang;
+    }
 
 }
 

Spacing +14 added lines, -14 removed lines

@@ -28,7 +28,7 @@ 
 
 	//https://paulund.co.uk/auto-detect-browser-language-in-php
 
-	public static function getPrefLangToken () : string {
+	public static function getPrefLangToken() : string {
 		if (!isset($_SERVER['HTTP_ACCEPT_LANGUAGE'])) {
 			$_SERVER['HTTP_ACCEPT_LANGUAGE'] = Settings::get("default_lang");
 		}
@@ -36,17 +36,17 @@ 
 		return substr($_SERVER['HTTP_ACCEPT_LANGUAGE'], 0, 2);
 	}
 
-	public static function getLangToken (array $supported_lang_tokens) : string {
+	public static function getLangToken(array $supported_lang_tokens) : string {
 		//http://php.net/manual/fa/function.http-negotiate-language.php
 
 		//https://stackoverflow.com/questions/6038236/using-the-php-http-accept-language-server-variable
 
 		//https://stackoverflow.com/questions/3770513/detect-browser-language-in-php
 
-		return self::prefered_language($supported_lang_tokens);//http_negotiate_language($supported_lang_tokens);
+		return self::prefered_language($supported_lang_tokens); //http_negotiate_language($supported_lang_tokens);
 	}
 
-	public static function loadSupportedLangs () {
+	public static function loadSupportedLangs() {
 		if (Cache::contains("supported-languages", "list")) {
 			self::$supported_languages = Cache::get("supported-languages", "list");
 		} else {
@@ -67,13 +67,13 @@ 
 		self::$initialized = true;
 	}
 
-	protected static function loadIfAbsent () {
+	protected static function loadIfAbsent() {
 		if (!self::$initialized) {
 			self::loadSupportedLangs();
 		}
 	}
 
-	public static function listSupportedLangTokens () {
+	public static function listSupportedLangTokens() {
 		//load tokens, if not initialized
 		self::loadIfAbsent();
 
@@ -97,7 +97,7 @@ 
 		return $keys;
 	}
 
-	public static function addLang (string $token, string $title) {
+	public static function addLang(string $token, string $title) {
 		Database::getInstance()->execute("INSERT INTO `{praefix}supported_languages` (
 			`lang_token`, `title`
 		) VALUES (
@@ -114,7 +114,7 @@ 
 		Cache::clear("supported-languages");
 	}
 
-	public static function addLangOrUpdate (string $token, string $title) {
+	public static function addLangOrUpdate(string $token, string $title) {
 		Database::getInstance()->execute("INSERT INTO `{praefix}supported_languages` (
 			`lang_token`, `title`
 		) VALUES (
@@ -148,7 +148,7 @@ 
 	 *
 	 * @return prefered language
 	 */
-	protected static function prefered_language (array $available_languages, string $http_accept_language = "auto") : string {
+	protected static function prefered_language(array $available_languages, string $http_accept_language = "auto") : string {
 		if (!isset($_SERVER['HTTP_ACCEPT_LANGUAGE'])) {
 			$_SERVER['HTTP_ACCEPT_LANGUAGE'] = Settings::get("default_lang");
 		}
@@ -174,9 +174,9 @@ 
 
 		foreach ($hits as $arr) {
 			// read data from the array of this hit
-			$langprefix = strtolower ($arr[1]);
+			$langprefix = strtolower($arr[1]);
 			if (!empty($arr[3])) {
-				$langrange = strtolower ($arr[3]);
+				$langrange = strtolower($arr[3]);
 				$language = $langprefix . "-" . $langrange;
 			}
 			else $language = $langprefix;
@@ -184,14 +184,14 @@ 
 			if (!empty($arr[5])) $qvalue = floatval($arr[5]);
 
 			// find q-maximal language
-			if (in_array($language,$available_languages) && ($qvalue > $bestqval)) {
+			if (in_array($language, $available_languages) && ($qvalue > $bestqval)) {
 				$bestlang = $language;
 				$bestqval = $qvalue;
 			}
 			// if no direct hit, try the prefix only but decrease q-value by 10% (as http_negotiate_language does)
-			else if (in_array($langprefix,$available_languages) && (($qvalue*0.9) > $bestqval)) {
+			else if (in_array($langprefix, $available_languages) && (($qvalue * 0.9) > $bestqval)) {
 				$bestlang = $langprefix;
-				$bestqval = $qvalue*0.9;
+				$bestqval = $qvalue * 0.9;
 			}
 		}
 		return $bestlang;

Braces +8 added lines, -3 removed lines

@@ -154,7 +154,9 @@ 
 		}
 
 		// if $http_accept_language was left out, read it from the HTTP-Header
-		if ($http_accept_language == "auto") $http_accept_language = $_SERVER['HTTP_ACCEPT_LANGUAGE'];
+		if ($http_accept_language == "auto") {
+		    $http_accept_language = $_SERVER['HTTP_ACCEPT_LANGUAGE'];
+		}
 
 		// standard  for HTTP_ACCEPT_LANGUAGE is defined under
 		// http://www.w3.org/Protocols/rfc2616/rfc2616-sec14.html#sec14.4
@@ -178,10 +180,13 @@ 
 			if (!empty($arr[3])) {
 				$langrange = strtolower ($arr[3]);
 				$language = $langprefix . "-" . $langrange;
+			} else {
+			    $language = $langprefix;
 			}
-			else $language = $langprefix;
 			$qvalue = 1.0;
-			if (!empty($arr[5])) $qvalue = floatval($arr[5]);
+			if (!empty($arr[5])) {
+			    $qvalue = floatval($arr[5]);
+			}
 
 			// find q-maximal language
 			if (in_array($language,$available_languages) && ($qvalue > $bestqval)) {

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

Indentation +155 added lines, -155 removed lines

@@ -27,198 +27,198 @@
 
 class Domain {
 
-	protected static $instance = null;
-
-	protected $id = 0;
-	protected $row = null;
-
-	/**
-	 * constructor
-	 */
-	public function __construct() {
-		//
-	}
-
-	public function load ($id = null) {
-		if ($id == null) {
-			//get current domain
-			$id = self::getIDByDomain(DomainUtils::getCurrentDomain());
-		}
-
-		if (!is_int($id)) {
-			throw new IllegalArgumentException("domain id has to be an integer.");
-		}
-
-		$this->id = $id;
-
-		if (Cache::getCache()->contains("domain", "domain_" . $id)) {
-			$this->row = Cache::getCache()->get("domain", "domain_" . $id);
-		} else {
-			//load domain from database
-			$row = Database::getInstance()->getRow("SELECT * FROM `{praefix}domain` WHERE `id` = :id; ", array('id' => $id));
-
-			if (!$row) {
-				throw new DomainNotFoundException("Couldnt find domainID " . $id . " in database.");
-			}
-
-			$this->row = $row;
-
-			//put row into cache
-			Cache::getCache()->put("domain", "domain_" . $id, $this->row);
-		}
-
-		//throw event, so plugin can execute code here
-		Events::throwEvent("load_domain", array(
-			'id' => &$this->id,
-			'row' => &$this->row
-		));
-	}
+    protected static $instance = null;
+
+    protected $id = 0;
+    protected $row = null;
+
+    /**
+     * constructor
+     */
+    public function __construct() {
+        //
+    }
+
+    public function load ($id = null) {
+        if ($id == null) {
+            //get current domain
+            $id = self::getIDByDomain(DomainUtils::getCurrentDomain());
+        }
+
+        if (!is_int($id)) {
+            throw new IllegalArgumentException("domain id has to be an integer.");
+        }
+
+        $this->id = $id;
+
+        if (Cache::getCache()->contains("domain", "domain_" . $id)) {
+            $this->row = Cache::getCache()->get("domain", "domain_" . $id);
+        } else {
+            //load domain from database
+            $row = Database::getInstance()->getRow("SELECT * FROM `{praefix}domain` WHERE `id` = :id; ", array('id' => $id));
+
+            if (!$row) {
+                throw new DomainNotFoundException("Couldnt find domainID " . $id . " in database.");
+            }
+
+            $this->row = $row;
+
+            //put row into cache
+            Cache::getCache()->put("domain", "domain_" . $id, $this->row);
+        }
+
+        //throw event, so plugin can execute code here
+        Events::throwEvent("load_domain", array(
+            'id' => &$this->id,
+            'row' => &$this->row
+        ));
+    }
 
-	public function isAlias () : bool {
-		return $this->row['alias'] != -1 && $this->row['alias'] != 0;
-	}
-
-	public function getDomain () : string {
-		return $this->row['domain'];
-	}
-
-	public function getStyleID () : int {
-		return $this->row['styleID'];
-	}
+    public function isAlias () : bool {
+        return $this->row['alias'] != -1 && $this->row['alias'] != 0;
+    }
+
+    public function getDomain () : string {
+        return $this->row['domain'];
+    }
+
+    public function getStyleID () : int {
+        return $this->row['styleID'];
+    }
 
-	public function getHomePage () : string {
-		return $this->row['home_page'];
-	}
+    public function getHomePage () : string {
+        return $this->row['home_page'];
+    }
 
-	public function isRedirectUrl () : bool {
-		return $this->row['redirect_url'] !== "none";
-	}
+    public function isRedirectUrl () : bool {
+        return $this->row['redirect_url'] !== "none";
+    }
 
-	public function getRedirectUrl () : string {
-		return $this->row['redirect_url'];
-	}
+    public function getRedirectUrl () : string {
+        return $this->row['redirect_url'];
+    }
 
-	public function getRedirectCode () : int {
-		return $this->row['redirect_code'];
-	}
+    public function getRedirectCode () : int {
+        return $this->row['redirect_code'];
+    }
 
-	public static function getIDByDomain (string $domain) : int {
-		if (is_int($domain)) {
-			throw new IllegalArgumentException("domain cannot be an integer, because a domain string is requested.");
-		}
+    public static function getIDByDomain (string $domain) : int {
+        if (is_int($domain)) {
+            throw new IllegalArgumentException("domain cannot be an integer, because a domain string is requested.");
+        }
 
-		if (Cache::getCache()->contains("domain", "id_" . $domain)) {
-			return (int) Cache::getCache()->contains("domain", "id_" . $domain);
-		} else {
-			//get id from database
-			$row = Database::getInstance()->getRow("SELECT * FROM `{praefix}domain` WHERE `domain` = :domain AND `activated` = '1'; ", array('domain' => $domain));
+        if (Cache::getCache()->contains("domain", "id_" . $domain)) {
+            return (int) Cache::getCache()->contains("domain", "id_" . $domain);
+        } else {
+            //get id from database
+            $row = Database::getInstance()->getRow("SELECT * FROM `{praefix}domain` WHERE `domain` = :domain AND `activated` = '1'; ", array('domain' => $domain));
 
-			$id = -1;
+            $id = -1;
 
-			if ($row) {
-				//get id from database row
-				$id = $row['id'];
-			}
+            if ($row) {
+                //get id from database row
+                $id = $row['id'];
+            }
 
-			if ($id == -1) {
-				//domain doesnt exists, so get wildcard domain
-				$wildcard_domain_row = self::getWildcardDomainRow();
+            if ($id == -1) {
+                //domain doesnt exists, so get wildcard domain
+                $wildcard_domain_row = self::getWildcardDomainRow();
 
-				//check, if id belongs to wildcard domain
-				if ($wildcard_domain_row['domain'] != $domain) {
-					//get id of wildcard domain
-					$id = self::getIDByDomain(self::getWildcardDomain());
-				} else {
-					//throw exception
-					throw new DomainNotFoundException("Couldnt find domain " . htmlspecialchars($domain) . " in database.");
-				}
-			}
-
-			//add id to cache
-			Cache::getCache()->put("domain", "id_" . $domain, (int) $id);
+                //check, if id belongs to wildcard domain
+                if ($wildcard_domain_row['domain'] != $domain) {
+                    //get id of wildcard domain
+                    $id = self::getIDByDomain(self::getWildcardDomain());
+                } else {
+                    //throw exception
+                    throw new DomainNotFoundException("Couldnt find domain " . htmlspecialchars($domain) . " in database.");
+                }
+            }
+
+            //add id to cache
+            Cache::getCache()->put("domain", "id_" . $domain, (int) $id);
 
-			return $id;
-		}
-	}
+            return $id;
+        }
+    }
 
-	public static function getWildcardDomainID () : int {
-		$row = self::getWildcardDomainRow();
+    public static function getWildcardDomainID () : int {
+        $row = self::getWildcardDomainRow();
 
-		if (!$row) {
-			//repair the missing wildcard domain
-			self::createWildcardDomain();
+        if (!$row) {
+            //repair the missing wildcard domain
+            self::createWildcardDomain();
 
-			//select domain again
-			return self::getWildcardDomainID();
+            //select domain again
+            return self::getWildcardDomainID();
 
-			//throw new WildcardDomainNotFoundException("Couldnt found wildcard domain in database.");
-		}
+            //throw new WildcardDomainNotFoundException("Couldnt found wildcard domain in database.");
+        }
 
-		return $row['id'];
-	}
+        return $row['id'];
+    }
 
-	public static function getWildcardDomain () : string {
-		$row = self::getWildcardDomainRow();
+    public static function getWildcardDomain () : string {
+        $row = self::getWildcardDomainRow();
 
-		if (!$row) {
-			//repair the missing wildcard domain
-			self::createWildcardDomain();
+        if (!$row) {
+            //repair the missing wildcard domain
+            self::createWildcardDomain();
 
-			//select domain again
-			return self::getWildcardDomainID();
+            //select domain again
+            return self::getWildcardDomainID();
 
-			//throw new WildcardDomainNotFoundException("Couldnt found wildcard domain in database.");
-		}
+            //throw new WildcardDomainNotFoundException("Couldnt found wildcard domain in database.");
+        }
 
-		return $row['domain'];
-	}
+        return $row['domain'];
+    }
 
-	public static function getWildcardDomainRow () {
-		if (Cache::getCache()->contains("domain", "wildcard_domain_row")) {
-			return Cache::getCache()->get("domain", "wildcard_domain_row");
-		} else {
-			//get domain id from database
-			$row = Database::getInstance()->getRow("SELECT * FROM `{praefix}domain` WHERE `wildcard` = 'YES' AND `activated` = '1'; ");
+    public static function getWildcardDomainRow () {
+        if (Cache::getCache()->contains("domain", "wildcard_domain_row")) {
+            return Cache::getCache()->get("domain", "wildcard_domain_row");
+        } else {
+            //get domain id from database
+            $row = Database::getInstance()->getRow("SELECT * FROM `{praefix}domain` WHERE `wildcard` = 'YES' AND `activated` = '1'; ");
 
-			if (!$row) {
-				self::createWildcardDomain();
+            if (!$row) {
+                self::createWildcardDomain();
 
-				return self::getWildcardDomainRow();
+                return self::getWildcardDomainRow();
 
-				//throw new WildcardDomainNotFoundException("Couldnt found wildcard domain in database.");
-			}
+                //throw new WildcardDomainNotFoundException("Couldnt found wildcard domain in database.");
+            }
 
-			//put id into cache
-			Cache::getCache()->put("domain", "wildcard_domain_row", $row);
+            //put id into cache
+            Cache::getCache()->put("domain", "wildcard_domain_row", $row);
 
-			//return id
-			return $row;
-		}
-	}
+            //return id
+            return $row;
+        }
+    }
 
-	public static function createWildcardDomain () {
-		Database::getInstance()->execute("INSERT INTO `{praefix}domain` (
+    public static function createWildcardDomain () {
+        Database::getInstance()->execute("INSERT INTO `{praefix}domain` (
 			`id`, `domain`, `alias`, `home_page`, `wildcard`, `styleID`, `redirect_url`, `redirect_code`, `lastUpdate`, `activated`
 		) VALUES (
 			NULL, '*', '-1', 'home', 'YES', '-1', 'none', '302', CURRENT_TIMESTAMP, '1'
 		) ON DUPLICATE KEY UPDATE `activated` = '1'; ");
-	}
+    }
 
-	public static function getCurrent () : Domain {
-		//check, if instance exists
-		if (self::$instance == null) {
-			//create new instance of domain
-			self::$instance = new Domain();
+    public static function getCurrent () : Domain {
+        //check, if instance exists
+        if (self::$instance == null) {
+            //create new instance of domain
+            self::$instance = new Domain();
 
-			//get id of domain
-			$domainID = self::getIDByDomain(DomainUtils::getDomain());
+            //get id of domain
+            $domainID = self::getIDByDomain(DomainUtils::getDomain());
 
-			//load data of domain with id
-			self::$instance->load($domainID);
-		}
+            //load data of domain with id
+            self::$instance->load($domainID);
+        }
 
-		return self::$instance;
-	}
+        return self::$instance;
+    }
 
 }
 

Spacing +14 added lines, -14 removed lines

@@ -39,7 +39,7 @@ 
 		//
 	}
 
-	public function load ($id = null) {
+	public function load($id = null) {
 		if ($id == null) {
 			//get current domain
 			$id = self::getIDByDomain(DomainUtils::getCurrentDomain());
@@ -74,35 +74,35 @@ 
 		));
 	}
 
-	public function isAlias () : bool {
+	public function isAlias() : bool {
 		return $this->row['alias'] != -1 && $this->row['alias'] != 0;
 	}
 
-	public function getDomain () : string {
+	public function getDomain() : string {
 		return $this->row['domain'];
 	}
 
-	public function getStyleID () : int {
+	public function getStyleID() : int {
 		return $this->row['styleID'];
 	}
 
-	public function getHomePage () : string {
+	public function getHomePage() : string {
 		return $this->row['home_page'];
 	}
 
-	public function isRedirectUrl () : bool {
+	public function isRedirectUrl() : bool {
 		return $this->row['redirect_url'] !== "none";
 	}
 
-	public function getRedirectUrl () : string {
+	public function getRedirectUrl() : string {
 		return $this->row['redirect_url'];
 	}
 
-	public function getRedirectCode () : int {
+	public function getRedirectCode() : int {
 		return $this->row['redirect_code'];
 	}
 
-	public static function getIDByDomain (string $domain) : int {
+	public static function getIDByDomain(string $domain) : int {
 		if (is_int($domain)) {
 			throw new IllegalArgumentException("domain cannot be an integer, because a domain string is requested.");
 		}
@@ -141,7 +141,7 @@ 
 		}
 	}
 
-	public static function getWildcardDomainID () : int {
+	public static function getWildcardDomainID() : int {
 		$row = self::getWildcardDomainRow();
 
 		if (!$row) {
@@ -157,7 +157,7 @@ 
 		return $row['id'];
 	}
 
-	public static function getWildcardDomain () : string {
+	public static function getWildcardDomain() : string {
 		$row = self::getWildcardDomainRow();
 
 		if (!$row) {
@@ -173,7 +173,7 @@ 
 		return $row['domain'];
 	}
 
-	public static function getWildcardDomainRow () {
+	public static function getWildcardDomainRow() {
 		if (Cache::getCache()->contains("domain", "wildcard_domain_row")) {
 			return Cache::getCache()->get("domain", "wildcard_domain_row");
 		} else {
@@ -196,7 +196,7 @@ 
 		}
 	}
 
-	public static function createWildcardDomain () {
+	public static function createWildcardDomain() {
 		Database::getInstance()->execute("INSERT INTO `{praefix}domain` (
 			`id`, `domain`, `alias`, `home_page`, `wildcard`, `styleID`, `redirect_url`, `redirect_code`, `lastUpdate`, `activated`
 		) VALUES (
@@ -204,7 +204,7 @@ 
 		) ON DUPLICATE KEY UPDATE `activated` = '1'; ");
 	}
 
-	public static function getCurrent () : Domain {
+	public static function getCurrent() : Domain {
 		//check, if instance exists
 		if (self::$instance == null) {
 			//create new instance of domain

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

Spacing +1 added lines, -1 removed lines

@@ -47,7 +47,7 @@
 		return false;
 	}
 
-	protected function getHTML () : string {
+	protected function getHTML() : string {
 		$content = $this->getPage()->getContent();
 
 		Events::throwEvent("get_content", array(

Indentation +25 added lines, -25 removed lines

@@ -27,37 +27,37 @@
 
 class IndexPage extends HTMLPage {
 
-	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/home.tpl")) {
-			$template = new Template($this->getPage()->hasCustomTemplate() ? $this->getPage()->getCustomTemplate() : "pages/home");
+    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/home.tpl")) {
+            $template = new Template($this->getPage()->hasCustomTemplate() ? $this->getPage()->getCustomTemplate() : "pages/home");
 
-			$template->assign("TITLE", $this->getPage()->getTitle());
-			$template->assign("CONTENT", $this->getHTML());
+            $template->assign("TITLE", $this->getPage()->getTitle());
+            $template->assign("CONTENT", $this->getHTML());
 
-			$template->parse("main");
-			return $template->getCode();
-		} else {
-			return $this->getHTML();
-		}
-	}
+            $template->parse("main");
+            return $template->getCode();
+        } else {
+            return $this->getHTML();
+        }
+    }
 
-	public function showFooter(): bool {
-		return false;
-	}
+    public function showFooter(): bool {
+        return false;
+    }
 
-	protected function getHTML () : string {
-		$content = $this->getPage()->getContent();
+    protected function getHTML () : string {
+        $content = $this->getPage()->getContent();
 
-		Events::throwEvent("get_content", array(
-			'content' => &$content,
-			'page' => &$this->page,
-			'page_type' => &$this
-		));
+        Events::throwEvent("get_content", array(
+            'content' => &$content,
+            'page' => &$this->page,
+            'page_type' => &$this
+        ));
 
-		return $content;
-	}
+        return $content;
+    }
 
 }