JuKu / JuKuCMS

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

Spacing +2 added lines, -2 removed lines

@@ -18,7 +18,7 @@ 
 
 class Tasks {
 
-	public static function schedule (int $limit = 3) {
+	public static function schedule(int $limit = 3) {
 		//execute overdued tasks
 		foreach (self::getOverduedTasks($limit) as $task) {
 			//cast task
@@ -32,7 +32,7 @@ 
 		}
 	}
 
-	public static function getOverduedTasks (int $limit = 10) : array {
+	public static function getOverduedTasks(int $limit = 10) : array {
 		$rows = Database::getInstance()->listRows("SELECT * FROM `{praefix}tasks` WHERE (DATE_ADD(`last_execution`, INTERVAL `interval` MINUTE) < NOW() OR `last_execution` = '0000-00-00 00:00:00') AND `activated` = '1' LIMIT 0, :limit; ", array(
 			'limit' => array(
 				'type' => PDO::PARAM_INT,

Indentation +32 added lines, -32 removed lines

@@ -18,46 +18,46 @@
 
 class Tasks {
 
-	public static function schedule (int $limit = 3) {
-		//execute overdued tasks
-		foreach (self::getOverduedTasks($limit) as $task) {
-			//cast task
-			$task = Task::cast($task);
+    public static function schedule (int $limit = 3) {
+        //execute overdued tasks
+        foreach (self::getOverduedTasks($limit) as $task) {
+            //cast task
+            $task = Task::cast($task);
 
-			Logger::log(LogLevel::DEBUG, "execute task '" . $task->getTitle() . "'");
+            Logger::log(LogLevel::DEBUG, "execute task '" . $task->getTitle() . "'");
 
-			//execute task
-			$task->execute();
+            //execute task
+            $task->execute();
 
-			//check, if task is a one-time task
-			if ($task->deleteAfterExecution()) {
-				Logger::log(LogLevel::INFO, "delete task '" . $task->getTitle() . "', because delete_on_execution is enabled.");
+            //check, if task is a one-time task
+            if ($task->deleteAfterExecution()) {
+                Logger::log(LogLevel::INFO, "delete task '" . $task->getTitle() . "', because delete_on_execution is enabled.");
 
-				//delete task
-				$task->delete();
-			} else {
-				//update last execution timestamp
-				$task->setLastExecution();
-			}
-		}
-	}
+                //delete task
+                $task->delete();
+            } else {
+                //update last execution timestamp
+                $task->setLastExecution();
+            }
+        }
+    }
 
-	public static function getOverduedTasks (int $limit = 10) : array {
-		$rows = Database::getInstance()->listRows("SELECT * FROM `{praefix}tasks` WHERE (DATE_ADD(`last_execution`, INTERVAL `interval` MINUTE) < NOW() OR `last_execution` = '0000-00-00 00:00:00') AND `activated` = '1' LIMIT 0, :limit; ", array(
-			'limit' => array(
-				'type' => PDO::PARAM_INT,
-				'value' => $limit
-			)
-		));
+    public static function getOverduedTasks (int $limit = 10) : array {
+        $rows = Database::getInstance()->listRows("SELECT * FROM `{praefix}tasks` WHERE (DATE_ADD(`last_execution`, INTERVAL `interval` MINUTE) < NOW() OR `last_execution` = '0000-00-00 00:00:00') AND `activated` = '1' LIMIT 0, :limit; ", array(
+            'limit' => array(
+                'type' => PDO::PARAM_INT,
+                'value' => $limit
+            )
+        ));
 
-		$tasks = array();
+        $tasks = array();
 
-		foreach ($rows as $row) {
-			$tasks[] = new Task($row);
-		}
+        foreach ($rows as $row) {
+            $tasks[] = new Task($row);
+        }
 
-		return $tasks;
-	}
+        return $tasks;
+    }
 
 }
 

plugins/advancedpagetypes/classes/asciidocpage.php

Indentation +11 added lines, -11 removed lines

@@ -27,21 +27,21 @@ 
 
 class Plugin_AdvancedPageTypes_AsciiDocPage extends PageType {
 
-	public function getAdditionalHeaderCode(): string {
-		$base_url = DomainUtils::getBaseURL() . "/";
+    public function getAdditionalHeaderCode(): string {
+        $base_url = DomainUtils::getBaseURL() . "/";
 
-		return "<!-- header javascript -->
+        return "<!-- header javascript -->
     			<script language=\"javascript\" type=\"text/javascript\" src=\"" . $base_url . "plugins/advancedpagetypes/asciidoc/asciidoc/browser/asciidoctor.js\"></script>";
-	}
+    }
 
-	public function getContent(): string {
-		$content = $this->getPage()->getContent();
+    public function getContent(): string {
+        $content = $this->getPage()->getContent();
 
-		return "<div id=\"asciidocconverter\"></div>";
-	}
+        return "<div id=\"asciidocconverter\"></div>";
+    }
 
-	public function getFooterScripts(): string {
-		return "<script>
+    public function getFooterScripts(): string {
+        return "<script>
 					$(document).ready(function () {
 					    var asciidoctor = Asciidoctor();
 						var content = $" . "(\"#asciidocconverter\").html();
@@ -50,7 +50,7 @@ 
 						$" . "(\"#asciidocconverter\").html(content);
 					});
 				</script>";
-	}
+    }
 
 }
 

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

Indentation +49 added lines, -49 removed lines

@@ -27,55 +27,55 @@
 
 class StoreInstaller extends PluginInstaller_Plugin {
 
-	public function install(Plugin $plugin, array $install_json): bool {
-		if (isset($install_json['store'])) {
-			$store_dirs = $install_json['store'];
-
-			foreach ($store_dirs as $dir) {
-				if (is_array($dir)) {
-					$dir_path = STORE_PATH . $dir['dir'];
-					$permissions = "0" . $dir['chmod'];
-
-					//create directory, if not exists
-					if (!file_exists($dir_path)) {
-						//create directory
-						mkdir($dir_path);
-					}
-
-					chmod($dir_path, $permissions);
-				} else {
-					$dir = str_replace("..", "", $dir);
-
-					//get directory path
-					$dir_path = STORE_PATH . $dir;
-
-					//create directory, if not exists
-					if (!file_exists($dir_path)) {
-						//create directory
-						mkdir($dir_path);
-
-						if(!chmod($dir_path, 0777)) {
-							chmod($dir_path, 0755);
-
-							throw new IllegalStateException("Cannot change file permissions of directory '". $dir_path . "'");
-						}
-					}
-				}
-			}
-		}
-
-		return true;
-	}
-
-	public function uninstall(Plugin $plugin, array $install_json): bool {
-		//dont do anything, because directories should not be deleted
-
-		return true;
-	}
-
-	public function upgrade(Plugin $plugin, array $install_json): bool {
-		return $this->install($plugin, $install_json);
-	}
+    public function install(Plugin $plugin, array $install_json): bool {
+        if (isset($install_json['store'])) {
+            $store_dirs = $install_json['store'];
+
+            foreach ($store_dirs as $dir) {
+                if (is_array($dir)) {
+                    $dir_path = STORE_PATH . $dir['dir'];
+                    $permissions = "0" . $dir['chmod'];
+
+                    //create directory, if not exists
+                    if (!file_exists($dir_path)) {
+                        //create directory
+                        mkdir($dir_path);
+                    }
+
+                    chmod($dir_path, $permissions);
+                } else {
+                    $dir = str_replace("..", "", $dir);
+
+                    //get directory path
+                    $dir_path = STORE_PATH . $dir;
+
+                    //create directory, if not exists
+                    if (!file_exists($dir_path)) {
+                        //create directory
+                        mkdir($dir_path);
+
+                        if(!chmod($dir_path, 0777)) {
+                            chmod($dir_path, 0755);
+
+                            throw new IllegalStateException("Cannot change file permissions of directory '". $dir_path . "'");
+                        }
+                    }
+                }
+            }
+        }
+
+        return true;
+    }
+
+    public function uninstall(Plugin $plugin, array $install_json): bool {
+        //dont do anything, because directories should not be deleted
+
+        return true;
+    }
+
+    public function upgrade(Plugin $plugin, array $install_json): bool {
+        return $this->install($plugin, $install_json);
+    }
 
 }
 

Spacing +2 added lines, -2 removed lines

@@ -54,10 +54,10 @@
 						//create directory
 						mkdir($dir_path);
 
-						if(!chmod($dir_path, 0777)) {
+						if (!chmod($dir_path, 0777)) {
 							chmod($dir_path, 0755);
 
-							throw new IllegalStateException("Cannot change file permissions of directory '". $dir_path . "'");
+							throw new IllegalStateException("Cannot change file permissions of directory '" . $dir_path . "'");
 						}
 					}
 				}

system/core/classes/security.php

Indentation +25 added lines, -25 removed lines

@@ -34,20 +34,20 @@ 
         @ini_set("expose_php", "off");
 
         //dont allow include($url) to avoid code injection
-		@ini_set("allow_url_include", "0");
+        @ini_set("allow_url_include", "0");
 
-		header("X-Content-Type-Options: nosniff");
+        header("X-Content-Type-Options: nosniff");
 
-		//enable internet explorer XSS protection, https://www.perpetual-beta.org/weblog/security-headers.html
-		header("X-XSS-Protection: 1; mode=block");
+        //enable internet explorer XSS protection, https://www.perpetual-beta.org/weblog/security-headers.html
+        header("X-XSS-Protection: 1; mode=block");
 
-		//https://developer.mozilla.org/de/docs/Web/HTTP/Headers/X-Frame-Options
-		$x_frame_options = Settings::get("x_frame_options", "SAMEORIGIN");
+        //https://developer.mozilla.org/de/docs/Web/HTTP/Headers/X-Frame-Options
+        $x_frame_options = Settings::get("x_frame_options", "SAMEORIGIN");
 
-		if (strcmp($x_frame_options, "none") !== 0) {
-			//set X-Frame-Options header to avoid clickjacking attacks
-			header("X-Frame-Options: " . $x_frame_options);
-		}
+        if (strcmp($x_frame_options, "none") !== 0) {
+            //set X-Frame-Options header to avoid clickjacking attacks
+            header("X-Frame-Options: " . $x_frame_options);
+        }
 
         /**
          * dont allow some XSS attacks or SQL Injections from host or server name
@@ -69,10 +69,10 @@ 
     }
 
     protected static function initCSRFToken () {
-    	if (session_status() !== PHP_SESSION_ACTIVE) {
-    		throw new IllegalStateException("session wasnt started yet.");
-    		exit;
-		}
+        if (session_status() !== PHP_SESSION_ACTIVE) {
+            throw new IllegalStateException("session wasnt started yet.");
+            exit;
+        }
 
         if (!isset($_SESSION['csrf_token'])) {
             /*self::$csrf_token = hash_hmac(
@@ -82,7 +82,7 @@ 
             );*/
 
             //generate new CSRF token
-			self::generateNewCSRFToken();
+            self::generateNewCSRFToken();
         } else {
             //get CSRF token from string
             self::$csrf_token = $_SESSION['csrf_token'];
@@ -90,11 +90,11 @@ 
     }
 
     public static function generateNewCSRFToken () {
-		//generate new random token with 32 bytes
-		self::$csrf_token = base64_encode( openssl_random_pseudo_bytes(32));
+        //generate new random token with 32 bytes
+        self::$csrf_token = base64_encode( openssl_random_pseudo_bytes(32));
 
-		$_SESSION['csrf_token'] = self::$csrf_token;
-	}
+        $_SESSION['csrf_token'] = self::$csrf_token;
+    }
 
     public static function getCSRFToken () {
         //return CSRF token
@@ -106,13 +106,13 @@ 
     }
 
     public static function checkCSRFToken ($value = null) {
-    	if (is_null($value)) {
-    		if (!isset($_REQUEST['csrf_token']) || empty($_REQUEST['csrf_token'])) {
-    			return false;
-			}
+        if (is_null($value)) {
+            if (!isset($_REQUEST['csrf_token']) || empty($_REQUEST['csrf_token'])) {
+                return false;
+            }
 
-    		$value = $_REQUEST['csrf_token'];
-		}
+            $value = $_REQUEST['csrf_token'];
+        }
 
         return self::$csrf_token === $value;
     }

Spacing +9 added lines, -9 removed lines

@@ -4,7 +4,7 @@ 
 
     protected static $csrf_token = "";
 
-    public static function checkPHPOptions () {
+    public static function checkPHPOptions() {
         if (get_magic_quotes_gpc()) {
             throw new SecurityException("magic quotes is on.");
         }
@@ -21,7 +21,7 @@ 
         libxml_disable_entity_loader(true);
     }
 
-    public static function check () {
+    public static function check() {
         //check php options
         self::checkPHPOptions();
 
@@ -68,7 +68,7 @@ 
         self::initCSRFToken();
     }
 
-    protected static function initCSRFToken () {
+    protected static function initCSRFToken() {
     	if (session_status() !== PHP_SESSION_ACTIVE) {
     		throw new IllegalStateException("session wasnt started yet.");
     		exit;
@@ -89,23 +89,23 @@ 
         }
     }
 
-    public static function generateNewCSRFToken () {
+    public static function generateNewCSRFToken() {
 		//generate new random token with 32 bytes
-		self::$csrf_token = base64_encode( openssl_random_pseudo_bytes(32));
+		self::$csrf_token = base64_encode(openssl_random_pseudo_bytes(32));
 
 		$_SESSION['csrf_token'] = self::$csrf_token;
 	}
 
-    public static function getCSRFToken () {
+    public static function getCSRFToken() {
         //return CSRF token
         return self::$csrf_token;
     }
 
-    public static function getCSRFTokenField () {
+    public static function getCSRFTokenField() {
         return "<input type=\"hidden\" name=<\"csrf_token\" value=\"" . self::$csrf_token . "\" />";
     }
 
-    public static function checkCSRFToken ($value = null) {
+    public static function checkCSRFToken($value = null) {
     	if (is_null($value)) {
     		if (!isset($_REQUEST['csrf_token']) || empty($_REQUEST['csrf_token'])) {
     			return false;
@@ -117,7 +117,7 @@ 
         return self::$csrf_token === $value;
     }
 
-    public static function containsPort ($address) {
+    public static function containsPort($address) {
         if (strpos($address, ":") === false) {
             return false;
         }

plugins/httpauth/classes/httpauth.php

Spacing +3 added lines, -3 removed lines

@@ -29,7 +29,7 @@ 
 
 	//http://php.net/manual/de/features.http-auth.php
 
-	public static function headerEvent () {
+	public static function headerEvent() {
 		//get preferences first
 		$prefs = new Preferences("plugin_httpauth");
 
@@ -89,7 +89,7 @@ 
 		}
 	}
 
-	protected static function sendHeader (Preferences $prefs) {
+	protected static function sendHeader(Preferences $prefs) {
 		$realm_name = $prefs->get("realm_name", "Website");
 
 		//send http header, so browser will show a login form
@@ -103,7 +103,7 @@ 
 		exit;
 	}
 
-	public static function logoutEvent () {
+	public static function logoutEvent() {
 		//because browser safes http auth credentials by default, we need to do a little trick to clear browser auth cache
 		header("Location: " . DomainUtils::getProtocol() . "foo:bar@" . DomainUtils::getBaseURL(true));
 

Indentation +62 added lines, -62 removed lines

@@ -27,90 +27,90 @@
 
 class Plugin_HTTPAuth_HTTPAuth {
 
-	//http://php.net/manual/de/features.http-auth.php
+    //http://php.net/manual/de/features.http-auth.php
 
-	public static function headerEvent () {
-		//get preferences first
-		$prefs = new Preferences("plugin_httpauth");
+    public static function headerEvent () {
+        //get preferences first
+        $prefs = new Preferences("plugin_httpauth");
 
-		$activated = $prefs->get("activated", true);
+        $activated = $prefs->get("activated", true);
 
-		if (!$activated) {
-			return;
-		}
+        if (!$activated) {
+            return;
+        }
 
-		//check, if user is logged in
-		if (User::current()->isLoggedIn()) {
-			//http auth is not required, because user is already logged in
-			return;
-		}
+        //check, if user is logged in
+        if (User::current()->isLoggedIn()) {
+            //http auth is not required, because user is already logged in
+            return;
+        }
 
-		//check, if credentials was already send
-		if (!isset($_SERVER['PHP_AUTH_USER']) || !isset($_SERVER['PHP_AUTH_PW'])) {
-			self::sendHeader($prefs);
-		} else {
-			$username = $_SERVER['PHP_AUTH_USER'];
-			$password = $_SERVER['PHP_AUTH_PW'];
+        //check, if credentials was already send
+        if (!isset($_SERVER['PHP_AUTH_USER']) || !isset($_SERVER['PHP_AUTH_PW'])) {
+            self::sendHeader($prefs);
+        } else {
+            $username = $_SERVER['PHP_AUTH_USER'];
+            $password = $_SERVER['PHP_AUTH_PW'];
 
-			//try to login
-			$res = User::current()->loginByUsername($username, $password);
+            //try to login
+            $res = User::current()->loginByUsername($username, $password);
 
-			if ($res['success'] !== true) {
-				//send http header again
-				self::sendHeader($prefs);
-			} else {
-				//login successful, show redirect
-				if (isset($_REQUEST['redirect_url']) && !empty($_REQUEST['redirect_url'])) {
-					//TODO: check for security issues, maybe we should check if redirect_url is a known domain
+            if ($res['success'] !== true) {
+                //send http header again
+                self::sendHeader($prefs);
+            } else {
+                //login successful, show redirect
+                if (isset($_REQUEST['redirect_url']) && !empty($_REQUEST['redirect_url'])) {
+                    //TODO: check for security issues, maybe we should check if redirect_url is a known domain
 
-					header("Location: " . urldecode($_REQUEST['redirect_url']));
+                    header("Location: " . urldecode($_REQUEST['redirect_url']));
 
-					//flush gzip buffer
-					ob_end_flush();
+                    //flush gzip buffer
+                    ob_end_flush();
 
-					exit;
-				} else {
-					//redirect to index page
+                    exit;
+                } else {
+                    //redirect to index page
 
-					//get domain
-					$domain = Registry::singleton()->getObject("domain");
+                    //get domain
+                    $domain = Registry::singleton()->getObject("domain");
 
-					//generate index url
-					$index_url = DomainUtils::generateURL($domain->getHomePage());
+                    //generate index url
+                    $index_url = DomainUtils::generateURL($domain->getHomePage());
 
-					header("Location: " . $index_url);
+                    header("Location: " . $index_url);
 
-					//flush gzip buffer
-					ob_end_flush();
+                    //flush gzip buffer
+                    ob_end_flush();
 
-					exit;
-				}
-			}
-		}
-	}
+                    exit;
+                }
+            }
+        }
+    }
 
-	protected static function sendHeader (Preferences $prefs) {
-		$realm_name = $prefs->get("realm_name", "Website");
+    protected static function sendHeader (Preferences $prefs) {
+        $realm_name = $prefs->get("realm_name", "Website");
 
-		//send http header, so browser will show a login form
-		header('WWW-Authenticate: Basic realm="' . $realm_name . '"');
-		header('HTTP/1.0 401 Unauthorized');
+        //send http header, so browser will show a login form
+        header('WWW-Authenticate: Basic realm="' . $realm_name . '"');
+        header('HTTP/1.0 401 Unauthorized');
 
-		//text which will be sended, if user clicks on abort
-		echo $prefs->get("abort_text", "<h1>401 Authorization Required</h1>");
+        //text which will be sended, if user clicks on abort
+        echo $prefs->get("abort_text", "<h1>401 Authorization Required</h1>");
 
-		ob_end_flush();
-		exit;
-	}
+        ob_end_flush();
+        exit;
+    }
 
-	public static function logoutEvent () {
-		//because browser safes http auth credentials by default, we need to do a little trick to clear browser auth cache
-		header("Location: " . DomainUtils::getProtocol() . "foo:bar@" . DomainUtils::getBaseURL(true));
+    public static function logoutEvent () {
+        //because browser safes http auth credentials by default, we need to do a little trick to clear browser auth cache
+        header("Location: " . DomainUtils::getProtocol() . "foo:bar@" . DomainUtils::getBaseURL(true));
 
-		//echo "Location: " . DomainUtils::getProtocol() . "foo:bar@" . DomainUtils::getBaseURL(true);
+        //echo "Location: " . DomainUtils::getProtocol() . "foo:bar@" . DomainUtils::getBaseURL(true);
 
-		exit;
-	}
+        exit;
+    }
 
 }
 

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

Spacing +14 added lines, -14 removed lines

@@ -27,7 +27,7 @@ 
 
 class DomainUtils {
 
-	public static function getTLD ($url) {
+	public static function getTLD($url) {
 		$domain_tld = "";
 
 		//http://news.mullerdigital.com/2013/10/30/how-to-get-the-domain-and-tld-from-a-url-using-php-and-regular-expression/
@@ -37,19 +37,19 @@ 
 		return $domain_tld[0];
 	}
 
-	public static function isHTTPS () {
+	public static function isHTTPS() {
 		return isset($_SERVER['HTTPS']) && $_SERVER['HTTPS'] && $_SERVER['HTTPS'] != "off";
 	}
 
-	public static function getPort () {
+	public static function getPort() {
 		return (int) $_SERVER['SERVER_PORT'];
 	}
 
-	public static function isProxyUsed () {
+	public static function isProxyUsed() {
 		return isset($_SERVER['HTTP_X_FORWARDED_HOST']) && !empty($_SERVER['HTTP_X_FORWARDED_HOST']);
 	}
 
-	public static function getHost () {
+	public static function getHost() {
 		$host = "";
 
 		if (isset($_SERVER['HTTP_X_FORWARDED_HOST']) && !empty($_SERVER['HTTP_X_FORWARDED_HOST'])) {
@@ -80,23 +80,23 @@ 
 	 *
 	 * alias to getHost()
 	 */
-	public static function getDomain () {
+	public static function getDomain() {
 		return self::getHost();
 	}
 
-	public static function getReferer () {
+	public static function getReferer() {
 		return htmlentities($_SERVER['HTTP_REFERER']);
 	}
 
-	public static function getRequestMethod () {
+	public static function getRequestMethod() {
 		return htmlspecialchars($_SERVER['REQUEST_METHOD']);
 	}
 
-	public static function getRequestURI () {
+	public static function getRequestURI() {
 		return htmlentities($_SERVER['REQUEST_URI']);
 	}
 
-	public static function getBaseURL (bool $without_protocol = false) {
+	public static function getBaseURL(bool $without_protocol = false) {
 		$url = "";
 
 		if (!$without_protocol) {//add protocol
@@ -121,7 +121,7 @@ 
 	/**
 	 * generate an url for a page in this form: http(s)://<Domain><Base URL><Page>
 	 */
-	public static function generateURL (string $page, array $params = array()) : string {
+	public static function generateURL(string $page, array $params = array()) : string {
 		$params_str = "";
 
 		if (count($params) > 0) {
@@ -139,14 +139,14 @@ 
 		return self::getBaseURL() . "/" . $page . $params_str;
 	}
 
-	public static function getURL () {
+	public static function getURL() {
 		return self::getBaseURL() . self::getRequestURI();
 	}
 
 	/**
 	 * faster implementation of getTld()
 	 */
-	public static function getCurrentDomain () {
+	public static function getCurrentDomain() {
 		$host = $_SERVER['HTTP_HOST'] . $_SERVER['REQUEST_URI'];
 		$domain = explode("?", $host);
 		$host = $domain[0];
@@ -165,7 +165,7 @@ 
 		return /*$domain*/$host;
 	}
 
-	public static function getProtocol () : string {
+	public static function getProtocol() : string {
 		if (self::isHTTPS()) {
 			return "https://";
 		} else {

Indentation +110 added lines, -110 removed lines

@@ -27,157 +27,157 @@
 
 class DomainUtils {
 
-	public static function getTLD ($url) {
-		$domain_tld = "";
+    public static function getTLD ($url) {
+        $domain_tld = "";
 
-		//http://news.mullerdigital.com/2013/10/30/how-to-get-the-domain-and-tld-from-a-url-using-php-and-regular-expression/
+        //http://news.mullerdigital.com/2013/10/30/how-to-get-the-domain-and-tld-from-a-url-using-php-and-regular-expression/
 
-		preg_match("/[a-z0-9\-]{1,63}\.[a-z\.]{2,6}$/", parse_url($url, PHP_URL_HOST), $domain_tld);
+        preg_match("/[a-z0-9\-]{1,63}\.[a-z\.]{2,6}$/", parse_url($url, PHP_URL_HOST), $domain_tld);
 
-		return $domain_tld[0];
-	}
+        return $domain_tld[0];
+    }
 
-	public static function isHTTPS () {
-		return isset($_SERVER['HTTPS']) && $_SERVER['HTTPS'] && $_SERVER['HTTPS'] != "off";
-	}
+    public static function isHTTPS () {
+        return isset($_SERVER['HTTPS']) && $_SERVER['HTTPS'] && $_SERVER['HTTPS'] != "off";
+    }
 
-	public static function getPort () {
-		return (int) $_SERVER['SERVER_PORT'];
-	}
+    public static function getPort () {
+        return (int) $_SERVER['SERVER_PORT'];
+    }
 
-	public static function isProxyUsed () {
-		return isset($_SERVER['HTTP_X_FORWARDED_HOST']) && !empty($_SERVER['HTTP_X_FORWARDED_HOST']);
-	}
+    public static function isProxyUsed () {
+        return isset($_SERVER['HTTP_X_FORWARDED_HOST']) && !empty($_SERVER['HTTP_X_FORWARDED_HOST']);
+    }
 
-	public static function getHost () {
-		$host = "";
+    public static function getHost () {
+        $host = "";
 
-		if (isset($_SERVER['HTTP_X_FORWARDED_HOST']) && !empty($_SERVER['HTTP_X_FORWARDED_HOST'])) {
-			$host = $_SERVER['HTTP_X_FORWARDED_HOST'];
+        if (isset($_SERVER['HTTP_X_FORWARDED_HOST']) && !empty($_SERVER['HTTP_X_FORWARDED_HOST'])) {
+            $host = $_SERVER['HTTP_X_FORWARDED_HOST'];
 
-			//because HTTP_X_FORWARDED_HOST can contains more than 1 host, we only want to get the last host name
-			$elements = explode(',', $host);
-			$host = end($elements);
-		} else if (isset($_SERVER['SERVER_NAME']) && !empty($_SERVER['SERVER_NAME'])) {
-			$host = $_SERVER['SERVER_NAME'];
-		} else if (isset($_SERVER['HTTP_HOST']) && !empty($_SERVER['HTTP_HOST'])) {
-			$host = $_SERVER['HTTP_HOST'];
-		} else {
-			//unknown host
+            //because HTTP_X_FORWARDED_HOST can contains more than 1 host, we only want to get the last host name
+            $elements = explode(',', $host);
+            $host = end($elements);
+        } else if (isset($_SERVER['SERVER_NAME']) && !empty($_SERVER['SERVER_NAME'])) {
+            $host = $_SERVER['SERVER_NAME'];
+        } else if (isset($_SERVER['HTTP_HOST']) && !empty($_SERVER['HTTP_HOST'])) {
+            $host = $_SERVER['HTTP_HOST'];
+        } else {
+            //unknown host
 
-			//use server ip
-			return htmlentities($_SERVER['SERVER_ADDR']);
-		}
+            //use server ip
+            return htmlentities($_SERVER['SERVER_ADDR']);
+        }
 
-		//TODO: remove this code
-		/*if ($host == "cms.chipbyte.de") {
+        //TODO: remove this code
+        /*if ($host == "cms.chipbyte.de") {
 			echo "Debugging: Invalide host!";
 			var_dump($_SERVER);
 		}*/
 
-		// Remove port number from host
-		$host = preg_replace("%:\d+$%", "", $host);
+        // Remove port number from host
+        $host = preg_replace("%:\d+$%", "", $host);
 
-		return trim($host);
-	}
+        return trim($host);
+    }
 
-	/**
-	 * get domain
-	 *
-	 * alias to getHost()
-	 */
-	public static function getDomain () {
-		return self::getHost();
-	}
+    /**
+     * get domain
+     *
+     * alias to getHost()
+     */
+    public static function getDomain () {
+        return self::getHost();
+    }
 
-	public static function getReferer () {
-		return htmlentities($_SERVER['HTTP_REFERER']);
-	}
+    public static function getReferer () {
+        return htmlentities($_SERVER['HTTP_REFERER']);
+    }
 
-	public static function getRequestMethod () {
-		return htmlspecialchars($_SERVER['REQUEST_METHOD']);
-	}
+    public static function getRequestMethod () {
+        return htmlspecialchars($_SERVER['REQUEST_METHOD']);
+    }
 
-	public static function getRequestURI () {
-		return htmlentities($_SERVER['REQUEST_URI']);
-	}
+    public static function getRequestURI () {
+        return htmlentities($_SERVER['REQUEST_URI']);
+    }
 
-	public static function getBaseURL (bool $without_protocol = false) {
-		$url = "";
+    public static function getBaseURL (bool $without_protocol = false) {
+        $url = "";
 
-		if (!$without_protocol) {//add protocol
-			if (self::isHTTPS()) {
-				$url .= "https://";
-			} else {
-				$url .= "http://";
-			}
-		}
+        if (!$without_protocol) {//add protocol
+            if (self::isHTTPS()) {
+                $url .= "https://";
+            } else {
+                $url .= "http://";
+            }
+        }
 
-		//add domain
-		$url .= self::getDomain();
+        //add domain
+        $url .= self::getDomain();
 
-		//check, if an specific server port is used
-		if (self::getPort() != 80 && self::getPort() != 433) {
-			$url .= ":" . self::getPort();
-		}
+        //check, if an specific server port is used
+        if (self::getPort() != 80 && self::getPort() != 433) {
+            $url .= ":" . self::getPort();
+        }
 
-		return $url;
-	}
+        return $url;
+    }
 
-	/**
-	 * generate an url for a page in this form: http(s)://<Domain><Base URL><Page>
-	 */
-	public static function generateURL (string $page, array $params = array()) : string {
-		$params_str = "";
+    /**
+     * generate an url for a page in this form: http(s)://<Domain><Base URL><Page>
+     */
+    public static function generateURL (string $page, array $params = array()) : string {
+        $params_str = "";
 
-		if (count($params) > 0) {
-			$params_str = "?";
+        if (count($params) > 0) {
+            $params_str = "?";
 
-			$array = "";
+            $array = "";
 
-			foreach ($params as $key=>$value) {
-				$array[] = $key . "=" . $value;
-			}
+            foreach ($params as $key=>$value) {
+                $array[] = $key . "=" . $value;
+            }
 
-			$params_str .= implode("&amp;", $array);
-		}
+            $params_str .= implode("&amp;", $array);
+        }
 
-		return self::getBaseURL() . "/" . $page . $params_str;
-	}
+        return self::getBaseURL() . "/" . $page . $params_str;
+    }
 
-	public static function getURL () {
-		return self::getBaseURL() . self::getRequestURI();
-	}
+    public static function getURL () {
+        return self::getBaseURL() . self::getRequestURI();
+    }
 
-	/**
-	 * faster implementation of getTld()
-	 */
-	public static function getCurrentDomain () {
-		$host = $_SERVER['HTTP_HOST'] . $_SERVER['REQUEST_URI'];
-		$domain = explode("?", $host);
-		$host = $domain[0];
-		$array = explode("/", $host);
-		$host = $array[0];
+    /**
+     * faster implementation of getTld()
+     */
+    public static function getCurrentDomain () {
+        $host = $_SERVER['HTTP_HOST'] . $_SERVER['REQUEST_URI'];
+        $domain = explode("?", $host);
+        $host = $domain[0];
+        $array = explode("/", $host);
+        $host = $array[0];
 
-		/*$domain = "";
+        /*$domain = "";
 
 		for ($i = 0; $i < count($array) - 1; $i++) {
 			$domain .= $array[$i];
 		}*/
 
-		$array1 = explode(":", $host);
-		$host = $array1[0];
+        $array1 = explode(":", $host);
+        $host = $array1[0];
 
-		return /*$domain*/$host;
-	}
+        return /*$domain*/$host;
+    }
 
-	public static function getProtocol () : string {
-		if (self::isHTTPS()) {
-			return "https://";
-		} else {
-			return "http://";
-		}
-	}
+    public static function getProtocol () : string {
+        if (self::isHTTPS()) {
+            return "https://";
+        } else {
+            return "http://";
+        }
+    }
 
 }
 

system/packages/com.jukusoft.cms.user/classes/logoutpage.php

Indentation +27 added lines, -27 removed lines

@@ -27,45 +27,45 @@
 
 class LogoutPage extends HTMLPage {
 
-	protected $error = false;
+    protected $error = false;
 
-	public function setCustomHeader() {
-		//check, if session was started
-		PHPUtils::checkSessionStarted();
+    public function setCustomHeader() {
+        //check, if session was started
+        PHPUtils::checkSessionStarted();
 
-		if (!Security::checkCSRFToken()) {
-			$this->error = true;
+        if (!Security::checkCSRFToken()) {
+            $this->error = true;
 
-			//dont logout user, because csrf token isnt correct
-			return;
-		}
+            //dont logout user, because csrf token isnt correct
+            return;
+        }
 
-		//logout user
-		User::current()->logout();
+        //logout user
+        User::current()->logout();
 
-		Events::throwEvent("after_logout");
+        Events::throwEvent("after_logout");
 
-		//get domain
-		$domain = Registry::singleton()->getObject("domain");
+        //get domain
+        $domain = Registry::singleton()->getObject("domain");
 
-		//generate index url
-		$index_url = DomainUtils::generateURL($domain->getHomePage());
+        //generate index url
+        $index_url = DomainUtils::generateURL($domain->getHomePage());
 
-		header("Location: " . $index_url);
+        header("Location: " . $index_url);
 
-		//flush gzip buffer
-		ob_end_flush();
+        //flush gzip buffer
+        ob_end_flush();
 
-		exit;
-	}
+        exit;
+    }
 
-	public function getContent(): string {
-		if ($this->error) {
-			return "Wrong CSRF token!";
-		}
+    public function getContent(): string {
+        if ($this->error) {
+            return "Wrong CSRF token!";
+        }
 
-		return "";
-	}
+        return "";
+    }
 
 }
 

system/core/validator/password.php

Spacing +1 added lines, -1 removed lines

@@ -61,7 +61,7 @@
 		}
 	}
 
-	public static function get (string $value) : string {
+	public static function get(string $value) : string {
 		$obj = new Validator_Password();
 		return $obj->validate($value);
 	}

Indentation +31 added lines, -31 removed lines

@@ -27,44 +27,44 @@
 
 class Validator_Password implements Validator_Base {
 
-	public function isValide($value): bool {
-		$valide = true;
+    public function isValide($value): bool {
+        $valide = true;
 
-		//throw event, so plugins like pwned can interact
-		Events::throwEvent("validate_password", array(
-			'password' => &$value,
-			'valide' => &$valide
-		));
+        //throw event, so plugins like pwned can interact
+        Events::throwEvent("validate_password", array(
+            'password' => &$value,
+            'valide' => &$valide
+        ));
 
-		if (!$valide) {
-			return false;
-		}
+        if (!$valide) {
+            return false;
+        }
 
-		if (strlen($value) < Settings::get("password_min_length", 6)) {
-			return false;
-		}
+        if (strlen($value) < Settings::get("password_min_length", 6)) {
+            return false;
+        }
 
-		if (strlen($value) > Settings::get("password_max_length", 64)) {
-			//more than 64 characters arent supported
-			return false;
-		}
+        if (strlen($value) > Settings::get("password_max_length", 64)) {
+            //more than 64 characters arent supported
+            return false;
+        }
 
-		//everything is allowed
-		return true;
-	}
+        //everything is allowed
+        return true;
+    }
 
-	public function validate($value) {
-		if ($this->isValide($value)) {
-			return $value;
-		} else {
-			throw new SecurityException("password is not valide!");
-		}
-	}
+    public function validate($value) {
+        if ($this->isValide($value)) {
+            return $value;
+        } else {
+            throw new SecurityException("password is not valide!");
+        }
+    }
 
-	public static function get (string $value) : string {
-		$obj = new Validator_Password();
-		return $obj->validate($value);
-	}
+    public static function get (string $value) : string {
+        $obj = new Validator_Password();
+        return $obj->validate($value);
+    }
 
 }
 

system/packages/com.jukusoft.cms.user/classes/changepasswordpage.php

Indentation +52 added lines, -52 removed lines

@@ -27,58 +27,58 @@
 
 class ChangePasswordPage extends PageType {
 
-	public function getContent() : string {
-		$template = new DwooTemplate("pages/changepassword");
-
-		$template->assign("form_action", DomainUtils::generateURL($this->getPage()->getAlias()));
-
-		if (isset($_REQUEST['submit'])) {
-			//first, check CSRF token
-			if (!Security::checkCSRFToken()) {
-				$template->assign("error_message", "Wrong CSRF token!");
-			} else {
-				if (isset($_POST['old_password']) && !empty($_POST['old_password']) && isset($_POST['new_password']) && !empty($_POST['new_password']) && isset($_POST['retry_password']) && !empty($_POST['retry_password'])) {
-					$old_passowrd = $_POST['old_password'];
-					$new_password = $_POST['new_password'];
-					$retry_password = $_POST['retry_password'];
-
-					//first, check old password
-					if (!User::current()->checkPassword($old_passowrd)) {
-						$template->assign("error_message", "Wrong old password!");
-					} else if (!PHPUtils::strEqs($new_password, $retry_password)) {
-						$template->assign("error_message", "New and retried passwords are not equals!");
-					} else {
-						//create new instance of validator
-						$validator = new Validator_Password();
-
-						//check, if password is valide
-						if (!$validator->isValide($new_password)) {
-							$min_length = Settings::get("password_min_length", 6);
-							$max_length = Settings::get("password_max_length", 64);
-
-							$template->assign("error_message", "New password is not valide! Min length: " . $min_length . ", max length: " . $max_length . " .");
-						} else {
-							//validate password
-							//$new_password = $validator->validate($new_password);
-
-							User::current()->setPassword($new_password);
-
-							$template->assign("form_submit", true);
-							$template->assign("success_message", "Password changed successfully!");
-						}
-					}
-				} else {
-					$template->assign("error_message", "Please complete form!");
-				}
-			}
-		}
-
-		return $template->getCode();
-	}
-
-	public function listRequiredPermissions(): array {
-		return array("can_edit_own_password");
-	}
+    public function getContent() : string {
+        $template = new DwooTemplate("pages/changepassword");
+
+        $template->assign("form_action", DomainUtils::generateURL($this->getPage()->getAlias()));
+
+        if (isset($_REQUEST['submit'])) {
+            //first, check CSRF token
+            if (!Security::checkCSRFToken()) {
+                $template->assign("error_message", "Wrong CSRF token!");
+            } else {
+                if (isset($_POST['old_password']) && !empty($_POST['old_password']) && isset($_POST['new_password']) && !empty($_POST['new_password']) && isset($_POST['retry_password']) && !empty($_POST['retry_password'])) {
+                    $old_passowrd = $_POST['old_password'];
+                    $new_password = $_POST['new_password'];
+                    $retry_password = $_POST['retry_password'];
+
+                    //first, check old password
+                    if (!User::current()->checkPassword($old_passowrd)) {
+                        $template->assign("error_message", "Wrong old password!");
+                    } else if (!PHPUtils::strEqs($new_password, $retry_password)) {
+                        $template->assign("error_message", "New and retried passwords are not equals!");
+                    } else {
+                        //create new instance of validator
+                        $validator = new Validator_Password();
+
+                        //check, if password is valide
+                        if (!$validator->isValide($new_password)) {
+                            $min_length = Settings::get("password_min_length", 6);
+                            $max_length = Settings::get("password_max_length", 64);
+
+                            $template->assign("error_message", "New password is not valide! Min length: " . $min_length . ", max length: " . $max_length . " .");
+                        } else {
+                            //validate password
+                            //$new_password = $validator->validate($new_password);
+
+                            User::current()->setPassword($new_password);
+
+                            $template->assign("form_submit", true);
+                            $template->assign("success_message", "Password changed successfully!");
+                        }
+                    }
+                } else {
+                    $template->assign("error_message", "Please complete form!");
+                }
+            }
+        }
+
+        return $template->getCode();
+    }
+
+    public function listRequiredPermissions(): array {
+        return array("can_edit_own_password");
+    }
 
 }