JuKu / JuKuCMS

plugins/ldaplogin/classes/ldapauthentificator.php

Indentation +85 added lines, -85 removed lines

@@ -35,91 +35,91 @@
 
 class LDAPAuthentificator implements IAuthentificator {
 
-	public function __construct() {
-		//
-	}
-
-	/**
-	 * check password of user and import user, if neccessary
-	 *
-	 * @param $username string name of user
-	 * @param $password string password of user
-	 *
-	 * @return userID or -1, if credentials are wrong
-	 */
-	public function checkPasswordAndImport(string $username, string $password): int {
-		//https://samjlevy.com/php-ldap-login/
-
-		//Free test ldap server: https://www.forumsys.com/tutorials/integration-how-to/ldap/online-ldap-test-server/
-
-		//https://www.experts-exchange.com/questions/23969673/Using-PHP-with-LDAP-to-connect-to-Active-Directory-on-another-machine.html
-
-		//http://www.devshed.com/c/a/php/using-php-with-ldap-part-1/3/
-
-		//check, if username contains a komma (because komma is not allowed here)
-		if (strpos($username, ",") !== FALSE) {
-			throw new IllegalArgumentException("',' is not allowed in username.");
-			return -1;
-		}
-
-		$ldap_client = new LDAPClient();
-
-		//try to login user on ldap server
-		$res = $ldap_client->bind($username, $password);
-
-		if (!$res) {
-			//user doesnt exists or credentials are wrong
-			return -1;
-		}
-
-		//TODO: set user groups
-
-		//get attributes of user
-		$attributes = $ldap_client->listAllAttributesOfUser($username);
-
-		$mail = "";
-
-		//get mail of user
-		if (isset($attributes['mail'])) {
-			//get first mail
-			$mail = $attributes['mail'][0];
-		} else {
-			//generate random local mail
-			$mail = md5(PHPUtils::randomString(10) . time()) . "@local";
-		}
-
-		$common_name = "";
-
-		if (isset($attributes['cn'])) {
-			$common_name = $attributes['cn'][0];
-		} else {
-			$common_name = $username;
-		}
-
-		//get surname
-		$surname = "";
-
-		if (isset($attributes['sn'])) {
-			$surname = $attributes['sn'][0];
-		}
-
-		//unbind
-		$ldap_client->unbind();
-
-		//check, if we have to import user
-		if (!User::existsUsername($username)) {
-			//generate random password
-			$password = md5(PHPUtils::randomString(16) . time());
-
-			//import user and create user in database
-			$res = User::create($username, $password, $mail, PHPUtils::getClientIP(), 2, "none", 1, "Plugin\\LDAPLogin\\LDAPAuthentificator");
-
-			return $res['userID'];
-		} else {
-			//return userID
-			return User::getIDByUsernameFromDB($username);
-		}
-	}
+    public function __construct() {
+        //
+    }
+
+    /**
+     * check password of user and import user, if neccessary
+     *
+     * @param $username string name of user
+     * @param $password string password of user
+     *
+     * @return userID or -1, if credentials are wrong
+     */
+    public function checkPasswordAndImport(string $username, string $password): int {
+        //https://samjlevy.com/php-ldap-login/
+
+        //Free test ldap server: https://www.forumsys.com/tutorials/integration-how-to/ldap/online-ldap-test-server/
+
+        //https://www.experts-exchange.com/questions/23969673/Using-PHP-with-LDAP-to-connect-to-Active-Directory-on-another-machine.html
+
+        //http://www.devshed.com/c/a/php/using-php-with-ldap-part-1/3/
+
+        //check, if username contains a komma (because komma is not allowed here)
+        if (strpos($username, ",") !== FALSE) {
+            throw new IllegalArgumentException("',' is not allowed in username.");
+            return -1;
+        }
+
+        $ldap_client = new LDAPClient();
+
+        //try to login user on ldap server
+        $res = $ldap_client->bind($username, $password);
+
+        if (!$res) {
+            //user doesnt exists or credentials are wrong
+            return -1;
+        }
+
+        //TODO: set user groups
+
+        //get attributes of user
+        $attributes = $ldap_client->listAllAttributesOfUser($username);
+
+        $mail = "";
+
+        //get mail of user
+        if (isset($attributes['mail'])) {
+            //get first mail
+            $mail = $attributes['mail'][0];
+        } else {
+            //generate random local mail
+            $mail = md5(PHPUtils::randomString(10) . time()) . "@local";
+        }
+
+        $common_name = "";
+
+        if (isset($attributes['cn'])) {
+            $common_name = $attributes['cn'][0];
+        } else {
+            $common_name = $username;
+        }
+
+        //get surname
+        $surname = "";
+
+        if (isset($attributes['sn'])) {
+            $surname = $attributes['sn'][0];
+        }
+
+        //unbind
+        $ldap_client->unbind();
+
+        //check, if we have to import user
+        if (!User::existsUsername($username)) {
+            //generate random password
+            $password = md5(PHPUtils::randomString(16) . time());
+
+            //import user and create user in database
+            $res = User::create($username, $password, $mail, PHPUtils::getClientIP(), 2, "none", 1, "Plugin\\LDAPLogin\\LDAPAuthentificator");
+
+            return $res['userID'];
+        } else {
+            //return userID
+            return User::getIDByUsernameFromDB($username);
+        }
+    }
 }
 
 ?>

system/packages/com.jukusoft.cms.api/classes/apiauth.php

Indentation +53 added lines, -53 removed lines

@@ -27,59 +27,59 @@
 
 class ApiAuth {
 
-	protected static $instance = null;
-
-	protected $oauth = null;
-	protected $is_authentificated = false;//flag, if user is authentificated
-
-	/**
-	 * ApiAuth constructor.
-	 */
-	public function __construct() {
-		//
-	}
-
-	public function init () {
-		//check for secret token
-		if (isset($_REQUEST['access_token'])) {
-			$access_token = Validator_String::get($_REQUEST['access_token']);
-
-			//try to verify access token
-			$oauth = new ApiOAuth();
-			if (!$oauth->load($access_token)) {
-				//api token isn't valide
-				return;
-			}
-
-			//user is authentificated
-			$this->is_authentificated = true;
-			$this->oauth = $oauth;
-
-			//set userID and load user
-			User::current()->load($oauth->getUserID());
-		}
-	}
-
-	/**
-	 * check, if user is authentificated
-	 *
-	 * @return bool
-	 */
-	public function isAuthentificated () : bool {
-		return $this->is_authentificated;
-	}
-
-	public function getOAuth () : OAuth {
-		return $this->oauth;
-	}
-
-	public static function &getInstance () : ApiAuth {
-		if (self::$instance == null) {
-			self::$instance = new ApiAuth();
-		}
-
-		return self::$instance;
-	}
+    protected static $instance = null;
+
+    protected $oauth = null;
+    protected $is_authentificated = false;//flag, if user is authentificated
+
+    /**
+     * ApiAuth constructor.
+     */
+    public function __construct() {
+        //
+    }
+
+    public function init () {
+        //check for secret token
+        if (isset($_REQUEST['access_token'])) {
+            $access_token = Validator_String::get($_REQUEST['access_token']);
+
+            //try to verify access token
+            $oauth = new ApiOAuth();
+            if (!$oauth->load($access_token)) {
+                //api token isn't valide
+                return;
+            }
+
+            //user is authentificated
+            $this->is_authentificated = true;
+            $this->oauth = $oauth;
+
+            //set userID and load user
+            User::current()->load($oauth->getUserID());
+        }
+    }
+
+    /**
+     * check, if user is authentificated
+     *
+     * @return bool
+     */
+    public function isAuthentificated () : bool {
+        return $this->is_authentificated;
+    }
+
+    public function getOAuth () : OAuth {
+        return $this->oauth;
+    }
+
+    public static function &getInstance () : ApiAuth {
+        if (self::$instance == null) {
+            self::$instance = new ApiAuth();
+        }
+
+        return self::$instance;
+    }
 
 }
 

Spacing +5 added lines, -5 removed lines

@@ -30,7 +30,7 @@ 
 	protected static $instance = null;
 
 	protected $oauth = null;
-	protected $is_authentificated = false;//flag, if user is authentificated
+	protected $is_authentificated = false; //flag, if user is authentificated
 
 	/**
 	 * ApiAuth constructor.
@@ -39,7 +39,7 @@ 
 		//
 	}
 
-	public function init () {
+	public function init() {
 		//check for secret token
 		if (isset($_REQUEST['access_token'])) {
 			$access_token = Validator_String::get($_REQUEST['access_token']);
@@ -65,15 +65,15 @@ 
 	 *
 	 * @return bool
 	 */
-	public function isAuthentificated () : bool {
+	public function isAuthentificated() : bool {
 		return $this->is_authentificated;
 	}
 
-	public function getOAuth () : OAuth {
+	public function getOAuth() : OAuth {
 		return $this->oauth;
 	}
 
-	public static function &getInstance () : ApiAuth {
+	public static function &getInstance() : ApiAuth {
 		if (self::$instance == null) {
 			self::$instance = new ApiAuth();
 		}

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

Indentation +133 added lines, -133 removed lines

@@ -27,187 +27,187 @@
 
 class JSBuilder {
 
-	protected $content = "";
+    protected $content = "";
 
-	protected static $benchmark = array();
+    protected static $benchmark = array();
 	
-	public function __construct() {
-		//
-	}
+    public function __construct() {
+        //
+    }
 
-	public function generateJS (string $style_name, string $media = "ALL", string $position = "header") {
-		if (ACTIVATE_BENCHMARK) {
-			$start_time = microtime(true);
-		}
+    public function generateJS (string $style_name, string $media = "ALL", string $position = "header") {
+        if (ACTIVATE_BENCHMARK) {
+            $start_time = microtime(true);
+        }
 
-		//validate values
-		$style_name = Validator_Filename::get($style_name);
-		$media = strtoupper(Validator_Filename::get($media));
-		$position = strtoupper(Validator_Filename::get($position));
+        //validate values
+        $style_name = Validator_Filename::get($style_name);
+        $media = strtoupper(Validator_Filename::get($media));
+        $position = strtoupper(Validator_Filename::get($position));
 
-		$suffix = "";
+        $suffix = "";
 
-		if ($position !== "HEADER") {
-			$suffix = "_" . strtolower($position);
-		}
+        if ($position !== "HEADER") {
+            $suffix = "_" . strtolower($position);
+        }
 
-		$js_files = array();
+        $js_files = array();
 
-		//get css files from style.json
-		if (file_exists(STYLE_PATH . $style_name . "/style.json")) {
-			$json = json_decode(file_get_contents(STYLE_PATH . $style_name . "/style.json"), true);
+        //get css files from style.json
+        if (file_exists(STYLE_PATH . $style_name . "/style.json")) {
+            $json = json_decode(file_get_contents(STYLE_PATH . $style_name . "/style.json"), true);
 
-			if (isset($json['js' . $suffix]) && is_array($json['js' . $suffix])) {
-				foreach ($json['js' . $suffix] as $js_file) {
-					$full_path = STYLE_PATH . $style_name . "/" . $js_file;
-					$js_files[] = $full_path;
-				}
-			}
-		}
+            if (isset($json['js' . $suffix]) && is_array($json['js' . $suffix])) {
+                foreach ($json['js' . $suffix] as $js_file) {
+                    $full_path = STYLE_PATH . $style_name . "/" . $js_file;
+                    $js_files[] = $full_path;
+                }
+            }
+        }
 
-		//load js files from database
-		$rows = Database::getInstance()->listRows("SELECT * FROM `{praefix}js_files` WHERE (`style` = :style OR `style` = 'ALL') AND (`media` = :media OR `media` = 'ALL') AND `position` = :position AND `activated` = '1'; ", array(
-			'style' => $style_name,
-			'media' => $media,
-			'position' => $position
-		));
+        //load js files from database
+        $rows = Database::getInstance()->listRows("SELECT * FROM `{praefix}js_files` WHERE (`style` = :style OR `style` = 'ALL') AND (`media` = :media OR `media` = 'ALL') AND `position` = :position AND `activated` = '1'; ", array(
+            'style' => $style_name,
+            'media' => $media,
+            'position' => $position
+        ));
 
-		foreach ($rows as $row) {
-			$js_files[] = $row['js_file'];
-		}
+        foreach ($rows as $row) {
+            $js_files[] = $row['js_file'];
+        }
 
-		$buffer = "";
+        $buffer = "";
 
-		foreach ($js_files as $js_file) {
-			//first check, if file exists
-			if (!file_exists($js_file)) {
-				if (DEBUG_MODE) {
-					echo "Coulnd't found javascript file (style: " . $style_name . "): " . $js_file;
+        foreach ($js_files as $js_file) {
+            //first check, if file exists
+            if (!file_exists($js_file)) {
+                if (DEBUG_MODE) {
+                    echo "Coulnd't found javascript file (style: " . $style_name . "): " . $js_file;
 
-					ob_end_flush();
-					exit;
-				} else {
-					continue;
-				}
-			}
+                    ob_end_flush();
+                    exit;
+                } else {
+                    continue;
+                }
+            }
 
-			//add file content to buffer
-			$buffer .= file_get_contents($js_file) . "\n";
-		}
+            //add file content to buffer
+            $buffer .= file_get_contents($js_file) . "\n";
+        }
 
-		//$code = preg_replace("/\s\s+/", " ", $code);
+        //$code = preg_replace("/\s\s+/", " ", $code);
 
-		//https://github.com/matthiasmullie/minify
+        //https://github.com/matthiasmullie/minify
 
-		//https://github.com/tchwork/jsqueeze
+        //https://github.com/tchwork/jsqueeze
 
-		//https://ourcodeworld.com/articles/read/350/how-to-minify-javascript-and-css-using-php
+        //https://ourcodeworld.com/articles/read/350/how-to-minify-javascript-and-css-using-php
 
-		//compress js: https://github.com/tedious/JShrink
+        //compress js: https://github.com/tedious/JShrink
 
-		//remove comments
-		//$buffer = preg_replace('!/\*[^*]*\*+([^/][^*]*\*+)*/!', '', $buffer);
+        //remove comments
+        //$buffer = preg_replace('!/\*[^*]*\*+([^/][^*]*\*+)*/!', '', $buffer);
 
-		// remove space after colons
-		//$buffer = str_replace(': ', ':', $buffer);
+        // remove space after colons
+        //$buffer = str_replace(': ', ':', $buffer);
 
-		//remove whitespace
-		//$buffer = str_replace(array("\r\n", "\r", "\n", "\t", '  ', '    ', '    '), '', $buffer);
+        //remove whitespace
+        //$buffer = str_replace(array("\r\n", "\r", "\n", "\t", '  ', '    ', '    '), '', $buffer);
 
-		//replace template variables
-		$buffer = str_replace("{STYLE_PATH}", DomainUtils::getBaseURL() . "/styles/" . $style_name . "/", $buffer);
+        //replace template variables
+        $buffer = str_replace("{STYLE_PATH}", DomainUtils::getBaseURL() . "/styles/" . $style_name . "/", $buffer);
 
-		//compress code
-		$jz = new JSqueeze();
-		$buffer = $jz->squeeze(
-			$buffer,
-			true,   // $singleLine
-			false,   // $keepImportantComments
-			false   // $specialVarRx
-		);
+        //compress code
+        $jz = new JSqueeze();
+        $buffer = $jz->squeeze(
+            $buffer,
+            true,   // $singleLine
+            false,   // $keepImportantComments
+            false   // $specialVarRx
+        );
 
-		//set flag, if buffer is empty
-		$empty_flag = empty($buffer);
+        //set flag, if buffer is empty
+        $empty_flag = empty($buffer);
 
-		//add comment so md5 hash will change
-		$buffer = "/* generated by jsbuilder on " . gmdate("D, d M Y H:i:s", time()) . ", empty flag: " . ($empty_flag ? "true" : "false") . " */" . $buffer;
+        //add comment so md5 hash will change
+        $buffer = "/* generated by jsbuilder on " . gmdate("D, d M Y H:i:s", time()) . ", empty flag: " . ($empty_flag ? "true" : "false") . " */" . $buffer;
 
-		//create cache directory, if neccessary
-		if (!file_exists(CACHE_PATH . "jsbuilder/")) {
-			mkdir(CACHE_PATH . "jsbuilder/");
-		}
+        //create cache directory, if neccessary
+        if (!file_exists(CACHE_PATH . "jsbuilder/")) {
+            mkdir(CACHE_PATH . "jsbuilder/");
+        }
 
-		//cache buffer
-		file_put_contents($this->getCachePath($style_name, $media, $position), $buffer);
+        //cache buffer
+        file_put_contents($this->getCachePath($style_name, $media, $position), $buffer);
 
-		Cache::put("jsbuilder", "hash_" . $style_name . "_" . $media . "_" . strtolower($position), md5($buffer));
-		Cache::put("jsbuilder", "meta_" . $style_name . "_" . $media . "_" . strtolower($position), array('empty_flag' => $empty_flag));
+        Cache::put("jsbuilder", "hash_" . $style_name . "_" . $media . "_" . strtolower($position), md5($buffer));
+        Cache::put("jsbuilder", "meta_" . $style_name . "_" . $media . "_" . strtolower($position), array('empty_flag' => $empty_flag));
 
-		$this->content = $buffer;
+        $this->content = $buffer;
 
-		if (ACTIVATE_BENCHMARK) {
-			$end_time = microtime(true);
-			$exec_time = $end_time - $start_time;
+        if (ACTIVATE_BENCHMARK) {
+            $end_time = microtime(true);
+            $exec_time = $end_time - $start_time;
 
-			self::$benchmark[$style_name . "_" . $media] = $exec_time;
-		}
+            self::$benchmark[$style_name . "_" . $media] = $exec_time;
+        }
 
-		return $buffer;
-	}
+        return $buffer;
+    }
 
-	public function getCachePath (string $style, string $media = "ALL", string $position = "header") : string {
-		$position = strtolower($position);
+    public function getCachePath (string $style, string $media = "ALL", string $position = "header") : string {
+        $position = strtolower($position);
 
-		$md5_filename = md5("js_" . $style . "_" . $media . "_" . $position);
-		$js_cache_path = CACHE_PATH . "jsbuilder/" . $md5_filename . ".js";
+        $md5_filename = md5("js_" . $style . "_" . $media . "_" . $position);
+        $js_cache_path = CACHE_PATH . "jsbuilder/" . $md5_filename . ".js";
 
-		return $js_cache_path;
-	}
+        return $js_cache_path;
+    }
 
-	public function existsCache (string $style, string $media = "ALL", string $position = "header") : bool {
-		return file_exists($this->getCachePath($style, $media, $position));
-	}
+    public function existsCache (string $style, string $media = "ALL", string $position = "header") : bool {
+        return file_exists($this->getCachePath($style, $media, $position));
+    }
 
-	public function getHash (string $style, string $media = "ALL", string $position = "header") : string {
-		if (!$this->existsCache($style, $media, $position)) {
-			//generate cached js file
-			$this->generateJS($style, $media, $position);
-		}
+    public function getHash (string $style, string $media = "ALL", string $position = "header") : string {
+        if (!$this->existsCache($style, $media, $position)) {
+            //generate cached js file
+            $this->generateJS($style, $media, $position);
+        }
 
-		if (!Cache::contains("jsbuilder", "hash_" . $style . "_" . $media . "_" . $position)) {
-			throw new IllegalStateException("cached js file 'hash_" . $style . "_" . $media . "_" . $position . "' doesnt exists.");
-		}
+        if (!Cache::contains("jsbuilder", "hash_" . $style . "_" . $media . "_" . $position)) {
+            throw new IllegalStateException("cached js file 'hash_" . $style . "_" . $media . "_" . $position . "' doesnt exists.");
+        }
 
-		return Cache::get("jsbuilder", "hash_" . $style . "_" . $media . "_" . $position);
-	}
+        return Cache::get("jsbuilder", "hash_" . $style . "_" . $media . "_" . $position);
+    }
 
-	public function isEmpty (string $style, string $media = "ALL", string $position = "header") : bool {
-		if (!Cache::contains("jsbuilder", "meta_" . $style . "_" . $media . "_" . $position)) {
-			throw new IllegalStateException("cached js file 'meta_" . $style . "_" . $media . "_" . $position . "' doesnt exists.");
-		}
+    public function isEmpty (string $style, string $media = "ALL", string $position = "header") : bool {
+        if (!Cache::contains("jsbuilder", "meta_" . $style . "_" . $media . "_" . $position)) {
+            throw new IllegalStateException("cached js file 'meta_" . $style . "_" . $media . "_" . $position . "' doesnt exists.");
+        }
 
-		$array = Cache::get("jsbuilder", "meta_" . $style . "_" . $media . "_" . $position);
+        $array = Cache::get("jsbuilder", "meta_" . $style . "_" . $media . "_" . $position);
 
-		return $array['empty_flag'] == true;
-	}
+        return $array['empty_flag'] == true;
+    }
 
-	public function load (string $style, string $media = "ALL", string $position = "header") {
-		$cache_path = $this->getCachePath($style, $media, $position);
+    public function load (string $style, string $media = "ALL", string $position = "header") {
+        $cache_path = $this->getCachePath($style, $media, $position);
 
-		if (!$this->existsCache($style, $media, $position)) {
-			$this->generateJS($style, $media, $position);
-		} else {
-			$this->content = file_get_contents($cache_path);
-		}
-	}
+        if (!$this->existsCache($style, $media, $position)) {
+            $this->generateJS($style, $media, $position);
+        } else {
+            $this->content = file_get_contents($cache_path);
+        }
+    }
 
-	public function getBuffer () : string {
-		return $this->content;
-	}
+    public function getBuffer () : string {
+        return $this->content;
+    }
 
-	public static function listBenchmarks () {
-		return self::$benchmark;
-	}
+    public static function listBenchmarks () {
+        return self::$benchmark;
+    }
 
 }
 

Spacing +10 added lines, -10 removed lines

@@ -35,7 +35,7 @@ 
 		//
 	}
 
-	public function generateJS (string $style_name, string $media = "ALL", string $position = "header") {
+	public function generateJS(string $style_name, string $media = "ALL", string $position = "header") {
 		if (ACTIVATE_BENCHMARK) {
 			$start_time = microtime(true);
 		}
@@ -121,8 +121,8 @@ 
 		$jz = new JSqueeze();
 		$buffer = $jz->squeeze(
 			$buffer,
-			true,   // $singleLine
-			false,   // $keepImportantComments
+			true, // $singleLine
+			false, // $keepImportantComments
 			false   // $specialVarRx
 		);
 
@@ -155,7 +155,7 @@ 
 		return $buffer;
 	}
 
-	public function getCachePath (string $style, string $media = "ALL", string $position = "header") : string {
+	public function getCachePath(string $style, string $media = "ALL", string $position = "header") : string {
 		$position = strtolower($position);
 
 		$md5_filename = md5("js_" . $style . "_" . $media . "_" . $position);
@@ -164,11 +164,11 @@ 
 		return $js_cache_path;
 	}
 
-	public function existsCache (string $style, string $media = "ALL", string $position = "header") : bool {
+	public function existsCache(string $style, string $media = "ALL", string $position = "header") : bool {
 		return file_exists($this->getCachePath($style, $media, $position));
 	}
 
-	public function getHash (string $style, string $media = "ALL", string $position = "header") : string {
+	public function getHash(string $style, string $media = "ALL", string $position = "header") : string {
 		if (!$this->existsCache($style, $media, $position)) {
 			//generate cached js file
 			$this->generateJS($style, $media, $position);
@@ -181,7 +181,7 @@ 
 		return Cache::get("jsbuilder", "hash_" . $style . "_" . $media . "_" . $position);
 	}
 
-	public function isEmpty (string $style, string $media = "ALL", string $position = "header") : bool {
+	public function isEmpty(string $style, string $media = "ALL", string $position = "header") : bool {
 		if (!Cache::contains("jsbuilder", "meta_" . $style . "_" . $media . "_" . $position)) {
 			throw new IllegalStateException("cached js file 'meta_" . $style . "_" . $media . "_" . $position . "' doesnt exists.");
 		}
@@ -191,7 +191,7 @@ 
 		return $array['empty_flag'] == true;
 	}
 
-	public function load (string $style, string $media = "ALL", string $position = "header") {
+	public function load(string $style, string $media = "ALL", string $position = "header") {
 		$cache_path = $this->getCachePath($style, $media, $position);
 
 		if (!$this->existsCache($style, $media, $position)) {
@@ -201,11 +201,11 @@ 
 		}
 	}
 
-	public function getBuffer () : string {
+	public function getBuffer() : string {
 		return $this->content;
 	}
 
-	public static function listBenchmarks () {
+	public static function listBenchmarks() {
 		return self::$benchmark;
 	}
 

system/packages/com.jukusoft.cms.logging/classes/loglevel.php

Indentation +11 added lines, -11 removed lines

@@ -27,17 +27,17 @@
 
 class LogLevel {
 
-	/**
-	 * Those are PSR-3 compatible loggin levels
-	 */
-	const EMERGENCY = 'emergency';
-	const ALERT = 'alert';
-	const CRITICAL = 'critical';
-	const ERROR = 'error';
-	const WARNING = 'warning';
-	const NOTICE = 'notice';
-	const INFO = 'info';
-	const DEBUG = 'debug';
+    /**
+     * Those are PSR-3 compatible loggin levels
+     */
+    const EMERGENCY = 'emergency';
+    const ALERT = 'alert';
+    const CRITICAL = 'critical';
+    const ERROR = 'error';
+    const WARNING = 'warning';
+    const NOTICE = 'notice';
+    const INFO = 'info';
+    const DEBUG = 'debug';
 
 }
 

system/packages/com.jukusoft.cms.logging/classes/logger.php

Indentation +34 added lines, -34 removed lines

@@ -27,46 +27,46 @@
 
 class Logger {
 
-	//instance of logging provider
-	protected static $provider = null;
+    //instance of logging provider
+    protected static $provider = null;
 
-	/**
-	 * initialize logging provider
-	 */
-	public static function init () {
-		self::getProvider()->init();
-	}
+    /**
+     * initialize logging provider
+     */
+    public static function init () {
+        self::getProvider()->init();
+    }
 
-	/**
-	 * log message
-	 */
-	public static function log (string $level, string $message, $args = array()) {
-		self::getProvider()->log($level, $message, $args);
-	}
+    /**
+     * log message
+     */
+    public static function log (string $level, string $message, $args = array()) {
+        self::getProvider()->log($level, $message, $args);
+    }
 
-	/**
-	 * lazy logging - write logs into file or send it to server
-	 */
-	public static function send () {
-		self::getProvider()->send();
-	}
+    /**
+     * lazy logging - write logs into file or send it to server
+     */
+    public static function send () {
+        self::getProvider()->send();
+    }
 
-	public static function &getProvider () : LogProvider {
-		if (self::$provider == null) {
-			if (defined("LOGGING_ENABLED") && LOGGING_ENABLED == true) {
-				//search for loggging provider
-				$logging_provider = Settings::get("logging_provider", "EmptyLogProvider");
+    public static function &getProvider () : LogProvider {
+        if (self::$provider == null) {
+            if (defined("LOGGING_ENABLED") && LOGGING_ENABLED == true) {
+                //search for loggging provider
+                $logging_provider = Settings::get("logging_provider", "EmptyLogProvider");
 
-				//create new instance of class in string
-				self::$provider = new $logging_provider();
-			} else {
-				//use dummy logging provider, which doesnt do anything
-				self::$provider = new EmptyLogProvider();
-			}
-		}
+                //create new instance of class in string
+                self::$provider = new $logging_provider();
+            } else {
+                //use dummy logging provider, which doesnt do anything
+                self::$provider = new EmptyLogProvider();
+            }
+        }
 
-		return self::$provider;
-	}
+        return self::$provider;
+    }
 
 }
 

Spacing +4 added lines, -4 removed lines

@@ -33,25 +33,25 @@
 	/**
 	 * initialize logging provider
 	 */
-	public static function init () {
+	public static function init() {
 		self::getProvider()->init();
 	}
 
 	/**
 	 * log message
 	 */
-	public static function log (string $level, string $message, $args = array()) {
+	public static function log(string $level, string $message, $args = array()) {
 		self::getProvider()->log($level, $message, $args);
 	}
 
 	/**
 	 * lazy logging - write logs into file or send it to server
 	 */
-	public static function send () {
+	public static function send() {
 		self::getProvider()->send();
 	}
 
-	public static function &getProvider () : LogProvider {
+	public static function &getProvider() : LogProvider {
 		if (self::$provider == null) {
 			if (defined("LOGGING_ENABLED") && LOGGING_ENABLED == true) {
 				//search for loggging provider

system/packages/com.jukusoft.cms.logging/classes/logprovider.php

Indentation +14 added lines, -14 removed lines

@@ -27,20 +27,20 @@
 
 interface LogProvider {
 
-	/**
-	 * initialize logging provider
-	 */
-	public function init ();
-
-	/**
-	 * log message
-	 */
-	public function log (string $level, string $message, $args = array());
-
-	/**
-	 * lazy logging - after generating page write logs to file or send them to server
-	 */
-	public function send ();
+    /**
+     * initialize logging provider
+     */
+    public function init ();
+
+    /**
+     * log message
+     */
+    public function log (string $level, string $message, $args = array());
+
+    /**
+     * lazy logging - after generating page write logs to file or send them to server
+     */
+    public function send ();
 
 }
 

Spacing +3 added lines, -3 removed lines

@@ -30,17 +30,17 @@
 	/**
 	 * initialize logging provider
 	 */
-	public function init ();
+	public function init();
 
 	/**
 	 * log message
 	 */
-	public function log (string $level, string $message, $args = array());
+	public function log(string $level, string $message, $args = array());
 
 	/**
 	 * lazy logging - after generating page write logs to file or send them to server
 	 */
-	public function send ();
+	public function send();
 
 }
 

api.php

Indentation +16 added lines, -16 removed lines

@@ -26,7 +26,7 @@ 
 require("system/core/init.php");
 
 if (DEBUG_MODE) {
-	@ini_set('display_errors', 1);
+    @ini_set('display_errors', 1);
 }
 
 //throw event
@@ -44,25 +44,25 @@ 
 $method = "";
 
 if (isset($_REQUEST['method']) && !empty($_REQUEST['method'])) {
-	$method = htmlentities($_REQUEST['method']);
+    $method = htmlentities($_REQUEST['method']);
 }
 
 //execute api method, if available
 if (!empty($method)) {
-	//load api method
-	$res = $api_method->loadMethod($method);
-
-	if (!$res) {
-		//print error message
-		header("Content-Type: application/json");
-		echo "{\"error\": \"Api method '" . $method . "' doesnt exists\", \"status\": 400}";
-	} else {
-		$api_method->executeApiMethod();
-	}
+    //load api method
+    $res = $api_method->loadMethod($method);
+
+    if (!$res) {
+        //print error message
+        header("Content-Type: application/json");
+        echo "{\"error\": \"Api method '" . $method . "' doesnt exists\", \"status\": 400}";
+    } else {
+        $api_method->executeApiMethod();
+    }
 } else {
-	//print error message
-	header("Content-Type: application/json");
-	echo "{\"error\": \"No api method in request, correct call: api.php?method=<API_METHOD>\", \"status\": 400}";
+    //print error message
+    header("Content-Type: application/json");
+    echo "{\"error\": \"No api method in request, correct call: api.php?method=<API_METHOD>\", \"status\": 400}";
 }
 
 $end_time = microtime(true);
@@ -73,7 +73,7 @@ 
 
 //send logs to server
 if (LOGGING_ENABLED) {
-	Logger::send();
+    Logger::send();
 }
 
 

tests/basictest.php

Indentation +9 added lines, -9 removed lines

@@ -29,17 +29,17 @@
 
 class MyFirstTest extends PHPUnit_Framework_TestCase {
 
-	public function setUp() {
-		//
-	}
+    public function setUp() {
+        //
+    }
 
-	public function tearDown() {
-		//
-	}
+    public function tearDown() {
+        //
+    }
 
-	public function testSomething() {
-		//
-	}
+    public function testSomething() {
+        //
+    }
 
 }
 

plugins/rollbar/rollbar-php-1.6.2/Rollbar/Utilities.php

Spacing +2 added lines, -2 removed lines

@@ -111,11 +111,11 @@
             mt_rand(0, 0xffff),
             // 16 bits for "time_hi_and_version",
             // four most significant bits holds version number 4
-            mt_rand(0, 0x0fff) | 0x4000,
+            mt_rand(0, 0x0fff)|0x4000,
             // 16 bits, 8 bits for "clk_seq_hi_res",
             // 8 bits for "clk_seq_low",
             // two most significant bits holds zero and one for variant DCE1.1
-            mt_rand(0, 0x3fff) | 0x8000,
+            mt_rand(0, 0x3fff)|0x8000,
             // 48 bits for "node"
             mt_rand(0, 0xffff),
             mt_rand(0, 0xffff),