JuKu / JuKuCMS

system/core/validator/ip.php

Indentation +6 added lines, -6 removed lines

@@ -27,13 +27,13 @@
 
 class Validator_IP implements Validator_Base {
 
-	public function isValide($value): bool {
-		return filter_var($value, FILTER_VALIDATE_IP) !== FALSE;
-	}
+    public function isValide($value): bool {
+        return filter_var($value, FILTER_VALIDATE_IP) !== FALSE;
+    }
 
-	public function validate($value) {
-		return filter_var($value, FILTER_VALIDATE_IP);
-	}
+    public function validate($value) {
+        return filter_var($value, FILTER_VALIDATE_IP);
+    }
 
 }
 

system/packages/com.jukusoft.cms.captcha/classes/icaptcha.php

Indentation +3 added lines, -3 removed lines

@@ -27,11 +27,11 @@
 
 interface ICaptcha {
 
-	public function getHeader () : string;
+    public function getHeader () : string;
 
-	public function getFormCode () : string;
+    public function getFormCode () : string;
 
-	public function verify (array $params = array()) : bool;
+    public function verify (array $params = array()) : bool;
 
 }
 

Spacing +3 added lines, -3 removed lines

@@ -27,11 +27,11 @@
 
 interface ICaptcha {
 
-	public function getHeader () : string;
+	public function getHeader() : string;
 
-	public function getFormCode () : string;
+	public function getFormCode() : string;
 
-	public function verify (array $params = array()) : bool;
+	public function verify(array $params = array()) : bool;
 
 }
 

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

Indentation +12 added lines, -12 removed lines

@@ -27,21 +27,21 @@
 
 class Captcha {
 
-	protected static $instance = null;
+    protected static $instance = null;
 
-	public static function isEnabled () : bool {
-		return Settings::get("captcha_enabled", true);
-	}
+    public static function isEnabled () : bool {
+        return Settings::get("captcha_enabled", true);
+    }
 
-	public static function getInstance () : ICaptcha {
-		if (self::$instance == null) {
-			//create new instance
-			$class_name = Settings::get("captcha_class_name", "ReCaptcha");
-			self::$instance = new $class_name();
-		}
+    public static function getInstance () : ICaptcha {
+        if (self::$instance == null) {
+            //create new instance
+            $class_name = Settings::get("captcha_class_name", "ReCaptcha");
+            self::$instance = new $class_name();
+        }
 
-		return self::$instance;
-	}
+        return self::$instance;
+    }
 
 }
 

Spacing +2 added lines, -2 removed lines

@@ -29,11 +29,11 @@
 
 	protected static $instance = null;
 
-	public static function isEnabled () : bool {
+	public static function isEnabled() : bool {
 		return Settings::get("captcha_enabled", true);
 	}
 
-	public static function getInstance () : ICaptcha {
+	public static function getInstance() : ICaptcha {
 		if (self::$instance == null) {
 			//create new instance
 			$class_name = Settings::get("captcha_class_name", "ReCaptcha");

system/packages/com.jukusoft.cms.captcha/classes/recaptcha.php

Indentation +40 added lines, -40 removed lines

@@ -25,59 +25,59 @@
 
 class ReCaptcha implements ICaptcha {
 
-	public function getHeader(): string {
-		return "<script src='https://www.google.com/recaptcha/api.js'></script>";
-	}
+    public function getHeader(): string {
+        return "<script src='https://www.google.com/recaptcha/api.js'></script>";
+    }
 
-	public function getFormCode(): string {
-		//get website key
-		$website_key = Settings::get("recaptcha_website_key", "");
+    public function getFormCode(): string {
+        //get website key
+        $website_key = Settings::get("recaptcha_website_key", "");
 
-		if (empty($website_key)) {
-			throw new IllegalStateException("reCaptcha wasnt configured right. Administrators: generate a website & secret key by google recaptcha and set them in settings to fix this issue!");
-		}
+        if (empty($website_key)) {
+            throw new IllegalStateException("reCaptcha wasnt configured right. Administrators: generate a website & secret key by google recaptcha and set them in settings to fix this issue!");
+        }
 
-		return "<div class=\"g-recaptcha\" data-sitekey=\"" . $website_key . "\"></div>";
-	}
+        return "<div class=\"g-recaptcha\" data-sitekey=\"" . $website_key . "\"></div>";
+    }
 
-	public function verify(array $params = array()): bool {
-		$secret_key = Settings::get("recaptcha_secret_key", "");
+    public function verify(array $params = array()): bool {
+        $secret_key = Settings::get("recaptcha_secret_key", "");
 
-		if (empty($secret_key)) {
-			throw new IllegalStateException("Cannot verify recaptcha, because no secret key was set, <a href=\"https://www.google.com/recaptcha/admin\">generate a website & secret key by recaptcha</a> and set them in global settings.");
-		}
+        if (empty($secret_key)) {
+            throw new IllegalStateException("Cannot verify recaptcha, because no secret key was set, <a href=\"https://www.google.com/recaptcha/admin\">generate a website & secret key by recaptcha</a> and set them in global settings.");
+        }
 
-		if (!isset($_POST['g-recaptcha-response']) || empty($_POST['g-recaptcha-response'])) {
-			//no recaptcha response was set
-			return false;
-		}
+        if (!isset($_POST['g-recaptcha-response']) || empty($_POST['g-recaptcha-response'])) {
+            //no recaptcha response was set
+            return false;
+        }
 
-		$g_recaptcha_response = $_POST['g-recaptcha-response'];
+        $g_recaptcha_response = $_POST['g-recaptcha-response'];
 
-		$params = array(
-			'secret' => $secret_key,
-			'response' => $g_recaptcha_response//'remoteip' => "" Optional. The user's IP address.
-		);
+        $params = array(
+            'secret' => $secret_key,
+            'response' => $g_recaptcha_response//'remoteip' => "" Optional. The user's IP address.
+        );
 
-		//send POST request
-		$result = PHPUtils::sendPOSTRequest("https://www.google.com/recaptcha/api/siteverify", $params);
+        //send POST request
+        $result = PHPUtils::sendPOSTRequest("https://www.google.com/recaptcha/api/siteverify", $params);
 
-		if (!$result) {
-			//coulnd send POST request
-			throw new IllegalStateException("Couldnt send POST request to verify recaptcha");
-		}
+        if (!$result) {
+            //coulnd send POST request
+            throw new IllegalStateException("Couldnt send POST request to verify recaptcha");
+        }
 
-		$json = json_decode($result, true);
+        $json = json_decode($result, true);
 
-		if (isset($json['success']) && $json['success'] == true) {
-			//validation successfully
-			return true;
-		} else {
-			//for error-message see https://developers.google.com/recaptcha/docs/verify
+        if (isset($json['success']) && $json['success'] == true) {
+            //validation successfully
+            return true;
+        } else {
+            //for error-message see https://developers.google.com/recaptcha/docs/verify
 
-			return false;
-		}
-	}
+            return false;
+        }
+    }
 
 }
 

system/core/validator/username.php

Indentation +22 added lines, -22 removed lines

@@ -27,28 +27,28 @@
 
 class Validator_Username implements Validator_Base {
 
-	public function isValide($value): bool {
-		//https://stackoverflow.com/questions/4383878/php-username-validation
-
-		if(preg_match("/^[" . Settings::get("username_regex", "a-zA-Z0-9\.\-") . "]{" . Settings::get("username_min_length", 4) . "," . Settings::get("username_max_length", 20) . "}$/", $value)) { // for english chars + numbers only
-			return true;
-		}
-
-		return false;
-	}
-
-	public function validate($value) {
-		if ($this->isValide($value)) {
-			return $value;
-		} else {
-			throw new SecurityException("username is not valide '" . htmlentities($value) . "'!");
-		}
-	}
-
-	public static function get (string $value) : string {
-		$obj = new Validator_Username();
-		return $obj->validate($value);
-	}
+    public function isValide($value): bool {
+        //https://stackoverflow.com/questions/4383878/php-username-validation
+
+        if(preg_match("/^[" . Settings::get("username_regex", "a-zA-Z0-9\.\-") . "]{" . Settings::get("username_min_length", 4) . "," . Settings::get("username_max_length", 20) . "}$/", $value)) { // for english chars + numbers only
+            return true;
+        }
+
+        return false;
+    }
+
+    public function validate($value) {
+        if ($this->isValide($value)) {
+            return $value;
+        } else {
+            throw new SecurityException("username is not valide '" . htmlentities($value) . "'!");
+        }
+    }
+
+    public static function get (string $value) : string {
+        $obj = new Validator_Username();
+        return $obj->validate($value);
+    }
 
 }
 

Spacing +2 added lines, -2 removed lines

@@ -30,7 +30,7 @@ 
 	public function isValide($value): bool {
 		//https://stackoverflow.com/questions/4383878/php-username-validation
 
-		if(preg_match("/^[" . Settings::get("username_regex", "a-zA-Z0-9\.\-") . "]{" . Settings::get("username_min_length", 4) . "," . Settings::get("username_max_length", 20) . "}$/", $value)) { // for english chars + numbers only
+		if (preg_match("/^[" . Settings::get("username_regex", "a-zA-Z0-9\.\-") . "]{" . Settings::get("username_min_length", 4) . "," . Settings::get("username_max_length", 20) . "}$/", $value)) { // for english chars + numbers only
 			return true;
 		}
 
@@ -45,7 +45,7 @@ 
 		}
 	}
 
-	public static function get (string $value) : string {
+	public static function get(string $value) : string {
 		$obj = new Validator_Username();
 		return $obj->validate($value);
 	}

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

Indentation +127 added lines, -127 removed lines

@@ -27,133 +27,133 @@
 
 class LoginPage extends PageType {
 
-	public function getContent() : string {
-		$show_form = !User::current()->isLoggedIn();
-
-		$template = new Template("pages/login", Registry::singleton());
-
-		if (isset($_REQUEST['action']) && $_REQUEST['action'] === "login") {
-			//try to login
-
-			$username_set = false;
-			$mail_set = false;
-			$password_set = false;
-
-			if (isset($_POST['username']) && !empty($_POST['username'])) {
-				$username_set = true;
-			}
-
-			if (isset($_POST['mail']) && !empty($_POST['mail'])) {
-				$mail_set = true;
-			}
-
-			if (isset($_POST['password']) && !empty($_POST['password'])) {
-				$password_set = true;
-			}
-
-			if (!$username_set && !$mail_set && !$password_set) {
-				//form was not submitted
-			} else {
-				if (!$username_set && !$mail_set) {
-					$template->parse("main.no_username");
-					$template->parse("main.no_mail");
-				}
-
-				if (!$password_set) {
-					$template->parse("main.no_password");
-				}
-			}
-
-			if (($username_set || $mail_set) && $password_set) {
-				//check CSRF token
-				if (Security::checkCSRFToken()) {
-					//check, if user is already logged in
-					if (User::current()->isLoggedIn()) {
-						$template->assign("ERROR_TEXT", "User is already logged in!");
-						$template->parse("main.error_msg");
-
-						//dont show form, because user is already logged in
-						$show_form = false;
-					} else {
-						//try to login
-						$user = User::current();
-
-						if ($username_set) {
-							$res = $user->loginByUsername($_REQUEST['username'], $_REQUEST['password']);
-						} else {
-							$res = $user->loginByMail($_REQUEST['mail'], $_REQUEST['password']);
-						}
-
-						if ($res['success'] === true) {
-							//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']));
-
-								//flush gzip buffer
-								ob_end_flush();
-
-								exit;
-							} else {
-								//redirect to index page
-
-								//get domain
-								$domain = Registry::singleton()->getObject("domain");
-
-								//generate index url
-								$index_url = DomainUtils::generateURL($domain->getHomePage());
-
-								header("Location: " . $index_url);
-
-								//flush gzip buffer
-								ob_end_flush();
-
-								exit;
-							}
-
-							$template->parse("login_successful");
-
-							Events::throwEvent("page_login_successful");
-
-							$show_form = false;
-						} else {
-							if ($res['error'] === "user_not_exists") {
-								$template->assign("ERROR_TEXT", /*"Username doesnt exists!"*/"Wrong credentials!");
-								$template->parse("main.error_msg");
-							} else if ($res['error'] === "wrong_password") {
-								$template->assign("ERROR_TEXT", /*"Wrong password!"*/"Wrong credentials!");
-								$template->parse("main.error_msg");
-							} else if ($res['error'] === "mail_not_valide") {
-								$template->assign("ERROR_TEXT", /*"Mail is not valide!"*/"Wrong credentials!");
-								$template->parse("main.error_msg");
-							} else {
-								$template->assign("ERROR_TEXT", "Unknown error message: " . $res['error']);
-								$template->parse("main.error_msg");
-							}
-						}
-					}
-				} else {
-					$template->assign("ERROR_TEXT", "Wrong CSRF token! Please try to login again!");
-					$template->parse("main.error_msg");
-				}
-			}
-		}
-
-		if ($show_form) {//show form
-			$template->parse("main.form");
-		} else if (User::current()->isLoggedIn()) {
-			$template->assign("USERID", User::current()->getID());
-			$template->assign("USERNAME", User::current()->getUsername());
-
-			$template->parse("main.already_logged_in");
-		}
-
-		//get HTML code
-		$template->parse();
-		return $template->getCode();
-	}
+    public function getContent() : string {
+        $show_form = !User::current()->isLoggedIn();
+
+        $template = new Template("pages/login", Registry::singleton());
+
+        if (isset($_REQUEST['action']) && $_REQUEST['action'] === "login") {
+            //try to login
+
+            $username_set = false;
+            $mail_set = false;
+            $password_set = false;
+
+            if (isset($_POST['username']) && !empty($_POST['username'])) {
+                $username_set = true;
+            }
+
+            if (isset($_POST['mail']) && !empty($_POST['mail'])) {
+                $mail_set = true;
+            }
+
+            if (isset($_POST['password']) && !empty($_POST['password'])) {
+                $password_set = true;
+            }
+
+            if (!$username_set && !$mail_set && !$password_set) {
+                //form was not submitted
+            } else {
+                if (!$username_set && !$mail_set) {
+                    $template->parse("main.no_username");
+                    $template->parse("main.no_mail");
+                }
+
+                if (!$password_set) {
+                    $template->parse("main.no_password");
+                }
+            }
+
+            if (($username_set || $mail_set) && $password_set) {
+                //check CSRF token
+                if (Security::checkCSRFToken()) {
+                    //check, if user is already logged in
+                    if (User::current()->isLoggedIn()) {
+                        $template->assign("ERROR_TEXT", "User is already logged in!");
+                        $template->parse("main.error_msg");
+
+                        //dont show form, because user is already logged in
+                        $show_form = false;
+                    } else {
+                        //try to login
+                        $user = User::current();
+
+                        if ($username_set) {
+                            $res = $user->loginByUsername($_REQUEST['username'], $_REQUEST['password']);
+                        } else {
+                            $res = $user->loginByMail($_REQUEST['mail'], $_REQUEST['password']);
+                        }
+
+                        if ($res['success'] === true) {
+                            //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']));
+
+                                //flush gzip buffer
+                                ob_end_flush();
+
+                                exit;
+                            } else {
+                                //redirect to index page
+
+                                //get domain
+                                $domain = Registry::singleton()->getObject("domain");
+
+                                //generate index url
+                                $index_url = DomainUtils::generateURL($domain->getHomePage());
+
+                                header("Location: " . $index_url);
+
+                                //flush gzip buffer
+                                ob_end_flush();
+
+                                exit;
+                            }
+
+                            $template->parse("login_successful");
+
+                            Events::throwEvent("page_login_successful");
+
+                            $show_form = false;
+                        } else {
+                            if ($res['error'] === "user_not_exists") {
+                                $template->assign("ERROR_TEXT", /*"Username doesnt exists!"*/"Wrong credentials!");
+                                $template->parse("main.error_msg");
+                            } else if ($res['error'] === "wrong_password") {
+                                $template->assign("ERROR_TEXT", /*"Wrong password!"*/"Wrong credentials!");
+                                $template->parse("main.error_msg");
+                            } else if ($res['error'] === "mail_not_valide") {
+                                $template->assign("ERROR_TEXT", /*"Mail is not valide!"*/"Wrong credentials!");
+                                $template->parse("main.error_msg");
+                            } else {
+                                $template->assign("ERROR_TEXT", "Unknown error message: " . $res['error']);
+                                $template->parse("main.error_msg");
+                            }
+                        }
+                    }
+                } else {
+                    $template->assign("ERROR_TEXT", "Wrong CSRF token! Please try to login again!");
+                    $template->parse("main.error_msg");
+                }
+            }
+        }
+
+        if ($show_form) {//show form
+            $template->parse("main.form");
+        } else if (User::current()->isLoggedIn()) {
+            $template->assign("USERID", User::current()->getID());
+            $template->assign("USERNAME", User::current()->getUsername());
+
+            $template->parse("main.already_logged_in");
+        }
+
+        //get HTML code
+        $template->parse();
+        return $template->getCode();
+    }
 
 }
 

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

Spacing +3 added lines, -3 removed lines

@@ -27,7 +27,7 @@ 
 
 class Mail_Verification {
 
-	public static function sendMail (int $userID, string $username, string $mail) {
+	public static function sendMail(int $userID, string $username, string $mail) {
 		//generate token
 		$token = PHPUtils::randomString(64);
 
@@ -57,7 +57,7 @@ 
 		MailApi::sendHTMLMail($mail, "Mail Verification " . Settings::get("website_name", ""), $message);
 	}
 
-	public static function checkToken (string $token) : bool {
+	public static function checkToken(string $token) : bool {
 		$row = Database::getInstance()->getRow("SELECT * FROM `{praefix}register_mail_verification` WHERE `token` = :token; ", array('token' => $token));
 
 		if ($row === false) {
@@ -73,7 +73,7 @@ 
 		}
 	}
 
-	public static function removeToken (string $token) {
+	public static function removeToken(string $token) {
 		Database::getInstance()->execute("DELETE FROM `{praefix}register_mail_verification` WHERE `token` = :token; ", array('token' => $token));
 	}
 

Indentation +44 added lines, -44 removed lines

@@ -27,55 +27,55 @@
 
 class Mail_Verification {
 
-	public static function sendMail (int $userID, string $username, string $mail) {
-		//generate token
-		$token = PHPUtils::randomString(64);
+    public static function sendMail (int $userID, string $username, string $mail) {
+        //generate token
+        $token = PHPUtils::randomString(64);
 
-		Database::getInstance()->execute("INSERT INTO `{praefix}register_mail_verification` (
+        Database::getInstance()->execute("INSERT INTO `{praefix}register_mail_verification` (
 			`userID`, `token`
 		) VALUES (
 			:userID, :token
 		) ON DUPLICATE KEY UPDATE `token` = :token; ", array(
-			'userID' => $userID,
-			'token' => $token
-		));
-
-		//send mail
-		$template = new DwooTemplate(STORE_PATH . "templates/mail/verify_mail.tpl");
-
-		//assign variables
-		$template->assign("token", $token);
-		$template->assign("userID", $userID);
-		$template->assign("username", $username);
-		$template->assign("verify_url", DomainUtils::generateURL("user/verify_mail", array('token' => $token, 'username' => $username)));
-		$template->assign("base_url", DomainUtils::getBaseURL());
-		$template->assign("mail", $mail);
-
-		$message = $template->getCode();
-
-		//send mail
-		MailApi::sendHTMLMail($mail, "Mail Verification " . Settings::get("website_name", ""), $message);
-	}
-
-	public static function checkToken (string $token) : bool {
-		$row = Database::getInstance()->getRow("SELECT * FROM `{praefix}register_mail_verification` WHERE `token` = :token; ", array('token' => $token));
-
-		if ($row === false) {
-			return false;
-		} else {
-			//activate user
-			Database::getInstance()->execute("UPDATE `{praefix}user` SET `activated` = '1' WHERE `userID` = :userID AND `activated` = '2'; ", array('userID' => $row['userID']));
-
-			//remove token
-			self::removeToken($token);
-
-			return true;
-		}
-	}
-
-	public static function removeToken (string $token) {
-		Database::getInstance()->execute("DELETE FROM `{praefix}register_mail_verification` WHERE `token` = :token; ", array('token' => $token));
-	}
+            'userID' => $userID,
+            'token' => $token
+        ));
+
+        //send mail
+        $template = new DwooTemplate(STORE_PATH . "templates/mail/verify_mail.tpl");
+
+        //assign variables
+        $template->assign("token", $token);
+        $template->assign("userID", $userID);
+        $template->assign("username", $username);
+        $template->assign("verify_url", DomainUtils::generateURL("user/verify_mail", array('token' => $token, 'username' => $username)));
+        $template->assign("base_url", DomainUtils::getBaseURL());
+        $template->assign("mail", $mail);
+
+        $message = $template->getCode();
+
+        //send mail
+        MailApi::sendHTMLMail($mail, "Mail Verification " . Settings::get("website_name", ""), $message);
+    }
+
+    public static function checkToken (string $token) : bool {
+        $row = Database::getInstance()->getRow("SELECT * FROM `{praefix}register_mail_verification` WHERE `token` = :token; ", array('token' => $token));
+
+        if ($row === false) {
+            return false;
+        } else {
+            //activate user
+            Database::getInstance()->execute("UPDATE `{praefix}user` SET `activated` = '1' WHERE `userID` = :userID AND `activated` = '2'; ", array('userID' => $row['userID']));
+
+            //remove token
+            self::removeToken($token);
+
+            return true;
+        }
+    }
+
+    public static function removeToken (string $token) {
+        Database::getInstance()->execute("DELETE FROM `{praefix}register_mail_verification` WHERE `token` = :token; ", array('token' => $token));
+    }
 
 }
 

system/packages/com.jukusoft.cms.mail/classes/mailapi.php

Indentation +30 added lines, -30 removed lines

@@ -27,46 +27,46 @@
 
 class MailApi {
 
-	public static function sendPlainMail ($to, string $subject, string $message, array $options = array(), string $from = "", string $reply_to = "") : bool {
-		if (!Settings::get("send_mails_enabled", true)) {
-			//send mails is not enabled
-			return false;
-		}
+    public static function sendPlainMail ($to, string $subject, string $message, array $options = array(), string $from = "", string $reply_to = "") : bool {
+        if (!Settings::get("send_mails_enabled", true)) {
+            //send mails is not enabled
+            return false;
+        }
 
-		return self::getClass()->sendPlainMail($to, $subject, $message, $options, $from, $reply_to);
-	}
+        return self::getClass()->sendPlainMail($to, $subject, $message, $options, $from, $reply_to);
+    }
 
-	public static function sendHTMLMail ($to, string $subject, string $message, array $options = array(), string $from = "", string $reply_to = "") : bool {
-		if (!Settings::get("send_mails_enabled", true)) {
-			//send mails is not enabled
-			return false;
-		}
+    public static function sendHTMLMail ($to, string $subject, string $message, array $options = array(), string $from = "", string $reply_to = "") : bool {
+        if (!Settings::get("send_mails_enabled", true)) {
+            //send mails is not enabled
+            return false;
+        }
 
-		return self::getClass()->sendHTMLMail($to, $subject, $message, $options, $from, $reply_to);
-	}
+        return self::getClass()->sendHTMLMail($to, $subject, $message, $options, $from, $reply_to);
+    }
 
-	protected static function getClass () : MailSender {
-		//get setting
-		$class_name = Settings::get("sendmail_method", "PHPMail");
+    protected static function getClass () : MailSender {
+        //get setting
+        $class_name = Settings::get("sendmail_method", "PHPMail");
 
-		$obj = new $class_name();
+        $obj = new $class_name();
 
-		if (!($obj instanceof MailSender)) {
-			throw new IllegalStateException("setting sendmail_method isnt a valide class which implements interface 'MailSender'.");
-		}
+        if (!($obj instanceof MailSender)) {
+            throw new IllegalStateException("setting sendmail_method isnt a valide class which implements interface 'MailSender'.");
+        }
 
-		return $obj;
-	}
+        return $obj;
+    }
 
-	public static function getSignature () : string {
-		$signature = Settings::get("mail_signature", "");
+    public static function getSignature () : string {
+        $signature = Settings::get("mail_signature", "");
 
-		Events::throwEvent("get_mail_signature", array(
-			'signature' => &$signature
-		));
+        Events::throwEvent("get_mail_signature", array(
+            'signature' => &$signature
+        ));
 
-		return $signature;
-	}
+        return $signature;
+    }
 
 }
 

Spacing +4 added lines, -4 removed lines

@@ -27,7 +27,7 @@ 
 
 class MailApi {
 
-	public static function sendPlainMail ($to, string $subject, string $message, array $options = array(), string $from = "", string $reply_to = "") : bool {
+	public static function sendPlainMail($to, string $subject, string $message, array $options = array(), string $from = "", string $reply_to = "") : bool {
 		if (!Settings::get("send_mails_enabled", true)) {
 			//send mails is not enabled
 			return false;
@@ -36,7 +36,7 @@ 
 		return self::getClass()->sendPlainMail($to, $subject, $message, $options, $from, $reply_to);
 	}
 
-	public static function sendHTMLMail ($to, string $subject, string $message, array $options = array(), string $from = "", string $reply_to = "") : bool {
+	public static function sendHTMLMail($to, string $subject, string $message, array $options = array(), string $from = "", string $reply_to = "") : bool {
 		if (!Settings::get("send_mails_enabled", true)) {
 			//send mails is not enabled
 			return false;
@@ -45,7 +45,7 @@ 
 		return self::getClass()->sendHTMLMail($to, $subject, $message, $options, $from, $reply_to);
 	}
 
-	protected static function getClass () : MailSender {
+	protected static function getClass() : MailSender {
 		//get setting
 		$class_name = Settings::get("sendmail_method", "PHPMail");
 
@@ -58,7 +58,7 @@ 
 		return $obj;
 	}
 
-	public static function getSignature () : string {
+	public static function getSignature() : string {
 		$signature = Settings::get("mail_signature", "");
 
 		Events::throwEvent("get_mail_signature", array(

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

Indentation +286 added lines, -286 removed lines

@@ -27,296 +27,296 @@
 
 class RegisterPage extends PageType {
 
-	public function getAdditionalHeaderCode(): string {
-		//check, if captcha is enabled
-		if (!Captcha::isEnabled()) {
-			return "";
-		}
-
-		//get code between <head> and </head>
-		return Captcha::getInstance()->getHeader();
-	}
-
-	public function getContent(): string {
-		$template = new DwooTemplate("pages/register");
-
-		$registration_enabled = Settings::get("registration_enabled", false);
-
-		if (!$registration_enabled) {
-			//registration is not enabled
-			$template->assign("registration_enabled", false);
-		} else {
-			$template->assign("registration_enabled", true);
-			$template->assign("action_url", DomainUtils::generateURL($this->getPage()->getAlias()));
-
-			$fields = array();
-
-			//add fields
-			$fields[] = array(
-				'name' => "username",
-				'title' => "Username",
-				'type' => "text",
-				'placeholder' => "Username",
-				'required' => true,
-				'value' => (isset($_REQUEST['username']) && !empty($_REQUEST['username']) ? str_replace("\"", "", $_REQUEST['username']) : ""),
-				'custom_html' => false,
-				'text_behind',
-				'text_behind' => "",
-				'validator' => "Validator_Username"
-			);
-
-			$fields[] = array(
-				'name' => "mail",
-				'title' => "E-Mail",
-				'type' => "email",
-				'placeholder' => "john@example.com",
-				'required' => true,
-				'value' => (isset($_REQUEST['mail']) && !empty($_REQUEST['mail']) ? str_replace("\"", "", $_REQUEST['mail']) : ""),
-				'custom_html' => false,
-				'text_behind' => "",
-				'validator' => "Validator_Mail"
-			);
-
-			$fields[] = array(
-				'name' => "password",
-				'title' => "Password",
-				'type' => "password",
-				'placeholder' => "Password",
-				'required' => true,
-				'value' => "",
-				'custom_html' => false,
-				'text_behind' => "",
-				'validator' => "Validator_Password",
-				'hints' => "All characters are allowed, min length: 8, max length: 64"
-			);
-
-			$fields[] = array(
-				'name' => "password_repeat",
-				'title' => "Repeat password",
-				'type' => "password",
-				'placeholder' => "Password",
-				'required' => true,
-				'value' => "",
-				'custom_html' => false,
-				'text_behind' => "",
-				'validator' => "Validator_Password",
-				'hints' => "All characters are allowed, min length: 8, max length: 64"
-			);
-
-			$fields[] = array(
-				'name' => "agb",
-				'title' => "Terms of use",
-				'type' => "checkbox",
-				'placeholder' => "",
-				'required' => true,
-				'value' => "checked",
-				'custom_html' => false,
-				'text_behind' => "<br />I have read and agree with the <a href=\"" . DomainUtils::generateURL(Settings::get("agb_page", "agb")) . "\" target=\"_blank\">terms of use</a>",
-				'validator' => null
-			);
-
-			Events::throwEvent("register_fields", array(
-				'fields' => &$fields,
-				'template'  => &$template
-			));
-
-			//array with all validated values of fields
-			$field_values = array();
-
-			//add captcha field, if captcha enabled
-			if (Captcha::isEnabled()) {
-				$fields[] = array(
-					'name' => "captcha",
-					'title' => "Captcha",
-					'type' => "",
-					'placeholder' => "",
-					'required' => true,
-					'value' => "captcha",
-					'custom_html' => "<input type=\"hidden\" name=\"captcha\" value=\"captcha\" />" . Captcha::getInstance()->getFormCode(),
-					'validator' => null
-				);
-			}
-
-			if (isset($_REQUEST['submit']) && !empty($_REQUEST['submit'])) {
-				$validate = true;
-				$error_msg_array = array();
-
-				//check CSRF token
-				if (!Security::checkCSRFToken()) {
-					$validate = false;
-					$error_msg_array[] = "Wrong CSRF token!";
-				}
-
-				//check fields
-				foreach ($fields as $field) {
-					//check, if field is required
-					if ($field['required']) {
-						if (!isset($_POST[$field['name']]) || empty($_POST[$field['name']])) {
-							$validate = false;
-							$error_msg_array[] = "Field '" . $field['title'] . "' wasnt filled!";
-						}
-					}
-
-					//validate fields
-					if (isset($_POST[$field['name']])) {
-						$validator = $field['validator'];
-
-						if (!is_null($validator) && !empty($validator)) {
-							$obj = new $validator;
-
-							if (!$obj->isValide($_POST[$field['name']])) {
-								$validate = false;
-								$error_msg_array[] = "Field '" . $field['title'] . "' is not valide! " . (isset($field['hints']) ? $field['hints'] : "");
-							} else {
-								//set validated value
-								$field_values[$field['name']] = $obj->validate($_POST[$field['name']]);
-							}
-						}
-					}
-				}
-
-				//check, if username already exists
-				if (isset($_POST['username']) && !empty($_POST['username'])) {
-					$username = $_POST['username'];
-
-					if (User::existsUsername($username)) {
-						$validate = false;
-						$error_msg_array[] = "Username '" . htmlentities($_POST['username']) . "' already exists! Choose another username!";
-					}
-				}
-
-				//check, if mail already exists
-				if (isset($_POST['mail']) && !empty($_POST['mail'])) {
-					$mail = $_POST['mail'];
-
-					if (User::existsMail($mail)) {
-						$validate = false;
-						$error_msg_array[] = "Mail '" . htmlentities($_POST['mail']) . "' already exists in system! Maybe you are already registered? Choose another mail address or login!";
-					}
-				}
-
-				//check, if passwords are equals
-				if (isset($_POST['password']) && isset($_POST['password_repeat']) && !PHPUtils::strEqs($_POST['password'], $_POST['password_repeat'])) {
-					$validate = false;
-					$error_msg_array[] = "Repeated password isnt the same!";
-				}
-
-				//check, if agb is checked
-				if (!isset($_POST['agb']) || $_POST['agb'] !== "checked") {
-					$validate = false;
-					$error_msg_array[] = "Please agree to AGB and fillout checkbox!";
-				}
-
-				//check captcha, if enabled
-				if (Captcha::isEnabled()) {
-					if (!Captcha::getInstance()->verify()) {
-						$validate = false;
-						$error_msg_array[] = "Wrong captcha!";
-					}
-				}
-
-				Events::throwEvent("register_validate", array(
-					'valide' => &$validate,
-					'fields' => &$fields,
-					'field_values' => &$field_values,
-					'error_msg_array' => &$error_msg_array
-				));
-
-				if ($validate) {
-					$text = "";
-
-					//get activation method
-					$activation_method = Settings::get("register_activation_method", "auto");
-
-					$activated = 2;
-
-					if ($activation_method === "auto") {
-						$activated = 1;
-					}
-
-					//get fields
-					$username = $field_values['username'];
-					$password = $_POST['password'];
-					$mail = $field_values['mail'];
-
-					//get IP address of user
-					$ip = PHPUtils::getClientIP();
-
-					$main_group = 2;
-
-					//create new user
-					$res = User::create($username, $password, $mail, $ip, $main_group, "", $activated);
-
-					if ($res === true || $res['success'] === true) {
-						//throw event for custom registration fields
-						Events::throwEvent("register_execute", array(
-							'field_values' => $field_values,
-							'text' => &$text
-						));
-
-						switch ($activation_method) {
-							case "auto":
-								//login user automatically
-								User::current()->loginByID($res['userID']);
-
-								//redirect user to home page
-								//header("Location: " . DomainUtils::generateURL(Domain::getCurrent()->getHomePage()));
-								//exit;
-
-							$text .= "You are automatically logged-in now. <a href=\"" . DomainUtils::generateURL(Domain::getCurrent()->getHomePage()) . "\">Homepage</a>";
-
-								break;
-
-							case "mail_verification":
-								//send verification mail
-								Mail_Verification::sendMail($res['userID'], $res['username'], $res['mail']);
-
-								$text .= "Before you can login you have to verify your mail address! For this we have send you a mail with a link, please click on this link!";
-
-								break;
-
-							case "manual_verification":
-
-								//TODO: inform administrator
-
-								$text .= "An Administrator has to activate your account manually now.";
-
-								break;
-
-							default:
-								throw new IllegalStateException("Unknown activation method: " . $activation_method);
-								break;
-						}
-
-						$template->assign("error", !$validate);
-						$template->assign("error_msg_array", $error_msg_array);
-						$template->assign("success", $validate);
-						$template->assign("additional_success_text", $text);
-					} else {
-						$template->assign("error", true);
-						$template->assign("error_msg_array", array("Couldnt create user. Please contact the administrator of this website!"));
-						$template->assign("success", false);
-					}
-				} else {
-					$template->assign("error", !$validate);
-					$template->assign("error_msg_array", $error_msg_array);
-					$template->assign("success", $validate);
-				}
-			} else {
-				$template->assign("error", false);
-			}
+    public function getAdditionalHeaderCode(): string {
+        //check, if captcha is enabled
+        if (!Captcha::isEnabled()) {
+            return "";
+        }
+
+        //get code between <head> and </head>
+        return Captcha::getInstance()->getHeader();
+    }
+
+    public function getContent(): string {
+        $template = new DwooTemplate("pages/register");
+
+        $registration_enabled = Settings::get("registration_enabled", false);
+
+        if (!$registration_enabled) {
+            //registration is not enabled
+            $template->assign("registration_enabled", false);
+        } else {
+            $template->assign("registration_enabled", true);
+            $template->assign("action_url", DomainUtils::generateURL($this->getPage()->getAlias()));
+
+            $fields = array();
+
+            //add fields
+            $fields[] = array(
+                'name' => "username",
+                'title' => "Username",
+                'type' => "text",
+                'placeholder' => "Username",
+                'required' => true,
+                'value' => (isset($_REQUEST['username']) && !empty($_REQUEST['username']) ? str_replace("\"", "", $_REQUEST['username']) : ""),
+                'custom_html' => false,
+                'text_behind',
+                'text_behind' => "",
+                'validator' => "Validator_Username"
+            );
+
+            $fields[] = array(
+                'name' => "mail",
+                'title' => "E-Mail",
+                'type' => "email",
+                'placeholder' => "john@example.com",
+                'required' => true,
+                'value' => (isset($_REQUEST['mail']) && !empty($_REQUEST['mail']) ? str_replace("\"", "", $_REQUEST['mail']) : ""),
+                'custom_html' => false,
+                'text_behind' => "",
+                'validator' => "Validator_Mail"
+            );
+
+            $fields[] = array(
+                'name' => "password",
+                'title' => "Password",
+                'type' => "password",
+                'placeholder' => "Password",
+                'required' => true,
+                'value' => "",
+                'custom_html' => false,
+                'text_behind' => "",
+                'validator' => "Validator_Password",
+                'hints' => "All characters are allowed, min length: 8, max length: 64"
+            );
+
+            $fields[] = array(
+                'name' => "password_repeat",
+                'title' => "Repeat password",
+                'type' => "password",
+                'placeholder' => "Password",
+                'required' => true,
+                'value' => "",
+                'custom_html' => false,
+                'text_behind' => "",
+                'validator' => "Validator_Password",
+                'hints' => "All characters are allowed, min length: 8, max length: 64"
+            );
+
+            $fields[] = array(
+                'name' => "agb",
+                'title' => "Terms of use",
+                'type' => "checkbox",
+                'placeholder' => "",
+                'required' => true,
+                'value' => "checked",
+                'custom_html' => false,
+                'text_behind' => "<br />I have read and agree with the <a href=\"" . DomainUtils::generateURL(Settings::get("agb_page", "agb")) . "\" target=\"_blank\">terms of use</a>",
+                'validator' => null
+            );
+
+            Events::throwEvent("register_fields", array(
+                'fields' => &$fields,
+                'template'  => &$template
+            ));
+
+            //array with all validated values of fields
+            $field_values = array();
+
+            //add captcha field, if captcha enabled
+            if (Captcha::isEnabled()) {
+                $fields[] = array(
+                    'name' => "captcha",
+                    'title' => "Captcha",
+                    'type' => "",
+                    'placeholder' => "",
+                    'required' => true,
+                    'value' => "captcha",
+                    'custom_html' => "<input type=\"hidden\" name=\"captcha\" value=\"captcha\" />" . Captcha::getInstance()->getFormCode(),
+                    'validator' => null
+                );
+            }
+
+            if (isset($_REQUEST['submit']) && !empty($_REQUEST['submit'])) {
+                $validate = true;
+                $error_msg_array = array();
+
+                //check CSRF token
+                if (!Security::checkCSRFToken()) {
+                    $validate = false;
+                    $error_msg_array[] = "Wrong CSRF token!";
+                }
+
+                //check fields
+                foreach ($fields as $field) {
+                    //check, if field is required
+                    if ($field['required']) {
+                        if (!isset($_POST[$field['name']]) || empty($_POST[$field['name']])) {
+                            $validate = false;
+                            $error_msg_array[] = "Field '" . $field['title'] . "' wasnt filled!";
+                        }
+                    }
+
+                    //validate fields
+                    if (isset($_POST[$field['name']])) {
+                        $validator = $field['validator'];
+
+                        if (!is_null($validator) && !empty($validator)) {
+                            $obj = new $validator;
+
+                            if (!$obj->isValide($_POST[$field['name']])) {
+                                $validate = false;
+                                $error_msg_array[] = "Field '" . $field['title'] . "' is not valide! " . (isset($field['hints']) ? $field['hints'] : "");
+                            } else {
+                                //set validated value
+                                $field_values[$field['name']] = $obj->validate($_POST[$field['name']]);
+                            }
+                        }
+                    }
+                }
+
+                //check, if username already exists
+                if (isset($_POST['username']) && !empty($_POST['username'])) {
+                    $username = $_POST['username'];
+
+                    if (User::existsUsername($username)) {
+                        $validate = false;
+                        $error_msg_array[] = "Username '" . htmlentities($_POST['username']) . "' already exists! Choose another username!";
+                    }
+                }
+
+                //check, if mail already exists
+                if (isset($_POST['mail']) && !empty($_POST['mail'])) {
+                    $mail = $_POST['mail'];
+
+                    if (User::existsMail($mail)) {
+                        $validate = false;
+                        $error_msg_array[] = "Mail '" . htmlentities($_POST['mail']) . "' already exists in system! Maybe you are already registered? Choose another mail address or login!";
+                    }
+                }
+
+                //check, if passwords are equals
+                if (isset($_POST['password']) && isset($_POST['password_repeat']) && !PHPUtils::strEqs($_POST['password'], $_POST['password_repeat'])) {
+                    $validate = false;
+                    $error_msg_array[] = "Repeated password isnt the same!";
+                }
+
+                //check, if agb is checked
+                if (!isset($_POST['agb']) || $_POST['agb'] !== "checked") {
+                    $validate = false;
+                    $error_msg_array[] = "Please agree to AGB and fillout checkbox!";
+                }
+
+                //check captcha, if enabled
+                if (Captcha::isEnabled()) {
+                    if (!Captcha::getInstance()->verify()) {
+                        $validate = false;
+                        $error_msg_array[] = "Wrong captcha!";
+                    }
+                }
+
+                Events::throwEvent("register_validate", array(
+                    'valide' => &$validate,
+                    'fields' => &$fields,
+                    'field_values' => &$field_values,
+                    'error_msg_array' => &$error_msg_array
+                ));
+
+                if ($validate) {
+                    $text = "";
+
+                    //get activation method
+                    $activation_method = Settings::get("register_activation_method", "auto");
+
+                    $activated = 2;
+
+                    if ($activation_method === "auto") {
+                        $activated = 1;
+                    }
+
+                    //get fields
+                    $username = $field_values['username'];
+                    $password = $_POST['password'];
+                    $mail = $field_values['mail'];
+
+                    //get IP address of user
+                    $ip = PHPUtils::getClientIP();
+
+                    $main_group = 2;
+
+                    //create new user
+                    $res = User::create($username, $password, $mail, $ip, $main_group, "", $activated);
+
+                    if ($res === true || $res['success'] === true) {
+                        //throw event for custom registration fields
+                        Events::throwEvent("register_execute", array(
+                            'field_values' => $field_values,
+                            'text' => &$text
+                        ));
+
+                        switch ($activation_method) {
+                            case "auto":
+                                //login user automatically
+                                User::current()->loginByID($res['userID']);
+
+                                //redirect user to home page
+                                //header("Location: " . DomainUtils::generateURL(Domain::getCurrent()->getHomePage()));
+                                //exit;
+
+                            $text .= "You are automatically logged-in now. <a href=\"" . DomainUtils::generateURL(Domain::getCurrent()->getHomePage()) . "\">Homepage</a>";
+
+                                break;
+
+                            case "mail_verification":
+                                //send verification mail
+                                Mail_Verification::sendMail($res['userID'], $res['username'], $res['mail']);
+
+                                $text .= "Before you can login you have to verify your mail address! For this we have send you a mail with a link, please click on this link!";
+
+                                break;
+
+                            case "manual_verification":
+
+                                //TODO: inform administrator
+
+                                $text .= "An Administrator has to activate your account manually now.";
+
+                                break;
+
+                            default:
+                                throw new IllegalStateException("Unknown activation method: " . $activation_method);
+                                break;
+                        }
+
+                        $template->assign("error", !$validate);
+                        $template->assign("error_msg_array", $error_msg_array);
+                        $template->assign("success", $validate);
+                        $template->assign("additional_success_text", $text);
+                    } else {
+                        $template->assign("error", true);
+                        $template->assign("error_msg_array", array("Couldnt create user. Please contact the administrator of this website!"));
+                        $template->assign("success", false);
+                    }
+                } else {
+                    $template->assign("error", !$validate);
+                    $template->assign("error_msg_array", $error_msg_array);
+                    $template->assign("success", $validate);
+                }
+            } else {
+                $template->assign("error", false);
+            }
 
-			$template->assign("fields", $fields);
+            $template->assign("fields", $fields);
 
-			//TODO: add code here
-		}
+            //TODO: add code here
+        }
 
-		return $template->getCode();
-	}
+        return $template->getCode();
+    }
 
-	public function listRequiredPermissions(): array {
-		return array("not_logged_in");
-	}
+    public function listRequiredPermissions(): array {
+        return array("not_logged_in");
+    }
 
 }