JuKu / JuKuCMS

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

Indentation +78 added lines, -78 removed lines

@@ -27,84 +27,84 @@
 
 class PermissionChecker {
 
-	protected $userID = -1;
-
-	//list with all permissions - values: 0 (no), 1 (yes), 2 (never)
-	protected $permissions = array();
-
-	//singleton instance
-	protected static $instance = null;
-
-	public function __construct(int $userID) {
-		$this->userID = $userID;
-
-		if (Cache::contains("permissions", "permissions_user_" . $this->userID)) {
-			$this->permissions = Cache::get("permissions", "permissions_user_" . $this->userID);
-		} else {
-			//get all groups, where user is member on
-			$groups = new Groups();
-			$groups->loadMyGroups($userID);
-			$my_group_ids = $groups->listGroupIDs();
-
-			//iterate through all groups user is member on
-			foreach ($my_group_ids as $groupID) {
-				$group_rights = new GroupRights($groupID);
-
-				//affect group rights
-				foreach ($group_rights->listRights() as $token=>$value) {
-					$this->mergeRow($token, $value);
-				}
-			}
-
-			//get user rights
-			$user_rights = new UserRights($userID);
-
-			foreach ($user_rights->listRights() as $token=>$value) {
-				$this->mergeRow($token, $value);
-			}
-
-			//cache result
-			Cache::put("permissions", "permissions_user_" . $this->userID, $this->permissions);
-		}
-	}
-
-	protected function mergeRow (string $token, int $value) {
-		if ($value < 0 || $value > 2) {
-			throw new IllegalArgumentException("token ('" . $token . "') value '" . $value . "' is not allowed, value has to be >= 0 and <= 2.");
-		}
-
-		if (!isset($this->permissions[$token])) {
-			$this->permissions[$token] = $value;
-		} else {
-			$current_value = $this->permissions[$token];
-
-			if ($value > $current_value) {
-				$this->permissions[$token] = $value;
-			}
-		}
-	}
-
-	public function hasRight (string $token) {
-		//check, if user is super admin
-		if (/*$this->userID == 1 || */(isset($this->permissions["super_admin"]) && $this->permissions["super_admin"] == 1) && $token !== "not_logged_in") {
-			//super admin has all rights
-			return true;
-		}
-
-		if ($token === "none" || $token === "all") {
-			return true;
-		}
-
-		return isset($this->permissions[$token]) && $this->permissions[$token] == 1;
-	}
-
-	public static function &current () {
-		if (self::$instance == null) {
-			self::$instance = new PermissionChecker(User::current()->getID());
-		}
-
-		return self::$instance;
-	}
+    protected $userID = -1;
+
+    //list with all permissions - values: 0 (no), 1 (yes), 2 (never)
+    protected $permissions = array();
+
+    //singleton instance
+    protected static $instance = null;
+
+    public function __construct(int $userID) {
+        $this->userID = $userID;
+
+        if (Cache::contains("permissions", "permissions_user_" . $this->userID)) {
+            $this->permissions = Cache::get("permissions", "permissions_user_" . $this->userID);
+        } else {
+            //get all groups, where user is member on
+            $groups = new Groups();
+            $groups->loadMyGroups($userID);
+            $my_group_ids = $groups->listGroupIDs();
+
+            //iterate through all groups user is member on
+            foreach ($my_group_ids as $groupID) {
+                $group_rights = new GroupRights($groupID);
+
+                //affect group rights
+                foreach ($group_rights->listRights() as $token=>$value) {
+                    $this->mergeRow($token, $value);
+                }
+            }
+
+            //get user rights
+            $user_rights = new UserRights($userID);
+
+            foreach ($user_rights->listRights() as $token=>$value) {
+                $this->mergeRow($token, $value);
+            }
+
+            //cache result
+            Cache::put("permissions", "permissions_user_" . $this->userID, $this->permissions);
+        }
+    }
+
+    protected function mergeRow (string $token, int $value) {
+        if ($value < 0 || $value > 2) {
+            throw new IllegalArgumentException("token ('" . $token . "') value '" . $value . "' is not allowed, value has to be >= 0 and <= 2.");
+        }
+
+        if (!isset($this->permissions[$token])) {
+            $this->permissions[$token] = $value;
+        } else {
+            $current_value = $this->permissions[$token];
+
+            if ($value > $current_value) {
+                $this->permissions[$token] = $value;
+            }
+        }
+    }
+
+    public function hasRight (string $token) {
+        //check, if user is super admin
+        if (/*$this->userID == 1 || */(isset($this->permissions["super_admin"]) && $this->permissions["super_admin"] == 1) && $token !== "not_logged_in") {
+            //super admin has all rights
+            return true;
+        }
+
+        if ($token === "none" || $token === "all") {
+            return true;
+        }
+
+        return isset($this->permissions[$token]) && $this->permissions[$token] == 1;
+    }
+
+    public static function &current () {
+        if (self::$instance == null) {
+            self::$instance = new PermissionChecker(User::current()->getID());
+        }
+
+        return self::$instance;
+    }
 
 }
 

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

Indentation +2 added lines, -2 removed lines

@@ -27,9 +27,9 @@
 
 interface MailSender {
 
-	public function sendPlainMail ($to, string $subject, string $message, array $options = array(), string $from = "", string $reply_to = "") : bool;
+    public function sendPlainMail ($to, string $subject, string $message, array $options = array(), string $from = "", string $reply_to = "") : bool;
 
-	public function sendHTMLMail ($to, string $subject, string $message, array $options = array(), string $from = "", string $reply_to = "") : bool;
+    public function sendHTMLMail ($to, string $subject, string $message, array $options = array(), string $from = "", string $reply_to = "") : bool;
 
 }
 

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

Indentation +6 added lines, -6 removed lines

@@ -27,13 +27,13 @@
 
 class SMTPMail implements MailSender {
 
-	public function sendPlainMail($to, string $subject, string $message, array $options = array(), string $from = "", string $reply_to = ""): bool {
-		throw new Exception("method isnt implemented yet.");
-	}
+    public function sendPlainMail($to, string $subject, string $message, array $options = array(), string $from = "", string $reply_to = ""): bool {
+        throw new Exception("method isnt implemented yet.");
+    }
 
-	public function sendHTMLMail($to, string $subject, string $message, array $options = array(), string $from = "", string $reply_to = ""): bool {
-		throw new Exception("method isnt implemented yet.");
-	}
+    public function sendHTMLMail($to, string $subject, string $message, array $options = array(), string $from = "", string $reply_to = ""): bool {
+        throw new Exception("method isnt implemented yet.");
+    }
 }
 
 ?>

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

Indentation +145 added lines, -145 removed lines

@@ -27,152 +27,152 @@
 
 class PHPMail implements MailSender {
 
-	public function sendPlainMail($to, string $subject, string $message, array $options = array(), string $from = "", string $reply_to = ""): bool {
-		//http://php.net/manual/de/function.mail.php
-
-		// In case any of our lines are larger than 70 characters, we should use wordwrap()
-		$message = wordwrap($message, 70, "\r\n");
-
-		//throw event, so plugins can interact
-		Events::throwEvent("send_plain_mail_php", array(
-			'to' => &$to,
-			'subject' => &$subject,
-			'message' => &$message,
-			'options' => &$options,
-			'from' => &$from,
-			'reply_to' => &$reply_to
-		));
-
-		$options = self::getOptions($options, $from, $reply_to);
-		$to = self::convertToArray($to);
-		$headers = self::generateHeader($options, $to);
-
-		//add signature at end of message
-		$message .= MailApi::getSignature();
-
-		//send mail
-		return mail($to, $subject, $message, $headers);
-	}
-
-	public function sendHTMLMail($to, string $subject, string $message, array $options = array(), string $from = "", string $reply_to = ""): bool {
-		// In case any of our lines are larger than 70 characters, we should use wordwrap()
-		$message = wordwrap($message, 70, "<br />");
-
-		//throw event, so plugins can interact
-		Events::throwEvent("send_html_mail_php", array(
-			'to' => &$to,
-			'subject' => &$subject,
-			'message' => &$message,
-			'options' => &$options,
-			'from' => &$from,
-			'reply_to' => &$reply_to
-		));
-
-		$options = $this->getOptions($options, $from, $reply_to);
-		$to = self::convertToArray($to);
-		$headers = self::generateHeader($options, $to, true);
-
-		//add signature at end of message
-		$message .= MailApi::getSignature();
-
-		//send mail
-		return mail($to, $subject, $message, $headers);
-	}
-
-	public static function getOptions (array $options = array(), string $from = "", string $reply_to = "") : array {
-		if (!is_null($from) && !empty($from)) {
-			$options['from'] = $from;
-		}
-
-		if (!is_null($reply_to) && !empty($reply_to)) {
-			$options['reply_to'] = $reply_to;
-		}
-
-		//set from address
-		if (!isset($options['from']) || empty($options['from'])) {
-			//get from address from settings
-			$from_mail = Settings::get("mail_sender_address", "none");
-			$from_name = Settings::get("mail_sender_name", "");
-
-			if ($from_mail !== "none") {
-				$options['from'] = (!empty($from_name) ? $from_name . " " : "") . $from_mail;
-			}
-		}
-
-		if (!isset($options['reply_to']) || empty($options['reply_to'])) {
-			$reply_to = Settings::get("mail_reply_to", "");
-
-			if (!empty($reply_to)) {
-				$options['reply_to'] = $reply_to;
-			}
-		}
-
-		return $options;
-	}
-
-	public static function convertToArray ($to) : string {
-		if (is_array($to)) {
-			//convert array to RFC 2822 string
-			$to = implode(", ", $to);
-		}
-
-		return $to;
-	}
-
-	public static function generateHeader (array $options, string $to, bool $html_mail = false) {
-		//generate header
-		$headers = array();
-
-		if ($html_mail) {
-			$charset = Settings::get("mail_default_charset", "urf-8");
-
-			//add mime version, content type and charset
-			$headers[] = "MIME-Version: 1.0";
-			$headers[] = "Content-type: text/html; charset=" . $charset;
-
-			$headers[] = "To: " . $to;
-		}
-
-		$headers[] = "Content-Transfer-Encoding: quoted-printable";
-
-		if (isset($options['from']) && !empty($options['from'])) {
-			$headers[] = "From: " . $options['from'];
-		}
-
-		if (isset($options['reply_to']) && !empty($options['reply_to'])) {
-			$headers[] = "Reply-To: " . $options['reply_to'];
-		}
-
-		if (isset($options['cc'])) {
-			if (is_array($options['cc'])) {
-				//convert array to string
-				$options['cc'] = implode(", ", $options['cc']);
-			}
-
-			$headers[] = "Cc: " . $options['cc'];
-		}
-
-		if (isset($options['bcc'])) {
-			if (is_array($options['bcc'])) {
-				//convert array to string
-				$options['bcc'] = implode(", ", $options['bcc']);
-			}
-
-			$headers[] = "Bcc: " . $options['bcc'];
-		}
-
-		//add php X-Mailer header
-		$headers[] = "X-Mailer: PHP/" . phpversion();
-
-		if (count($headers) == 0) {
-			$headers = null;
-		} else {
-			//convert array to string
-			$headers = implode("\r\n", $headers);
-		}
+    public function sendPlainMail($to, string $subject, string $message, array $options = array(), string $from = "", string $reply_to = ""): bool {
+        //http://php.net/manual/de/function.mail.php
+
+        // In case any of our lines are larger than 70 characters, we should use wordwrap()
+        $message = wordwrap($message, 70, "\r\n");
+
+        //throw event, so plugins can interact
+        Events::throwEvent("send_plain_mail_php", array(
+            'to' => &$to,
+            'subject' => &$subject,
+            'message' => &$message,
+            'options' => &$options,
+            'from' => &$from,
+            'reply_to' => &$reply_to
+        ));
+
+        $options = self::getOptions($options, $from, $reply_to);
+        $to = self::convertToArray($to);
+        $headers = self::generateHeader($options, $to);
+
+        //add signature at end of message
+        $message .= MailApi::getSignature();
+
+        //send mail
+        return mail($to, $subject, $message, $headers);
+    }
+
+    public function sendHTMLMail($to, string $subject, string $message, array $options = array(), string $from = "", string $reply_to = ""): bool {
+        // In case any of our lines are larger than 70 characters, we should use wordwrap()
+        $message = wordwrap($message, 70, "<br />");
+
+        //throw event, so plugins can interact
+        Events::throwEvent("send_html_mail_php", array(
+            'to' => &$to,
+            'subject' => &$subject,
+            'message' => &$message,
+            'options' => &$options,
+            'from' => &$from,
+            'reply_to' => &$reply_to
+        ));
+
+        $options = $this->getOptions($options, $from, $reply_to);
+        $to = self::convertToArray($to);
+        $headers = self::generateHeader($options, $to, true);
+
+        //add signature at end of message
+        $message .= MailApi::getSignature();
+
+        //send mail
+        return mail($to, $subject, $message, $headers);
+    }
+
+    public static function getOptions (array $options = array(), string $from = "", string $reply_to = "") : array {
+        if (!is_null($from) && !empty($from)) {
+            $options['from'] = $from;
+        }
+
+        if (!is_null($reply_to) && !empty($reply_to)) {
+            $options['reply_to'] = $reply_to;
+        }
+
+        //set from address
+        if (!isset($options['from']) || empty($options['from'])) {
+            //get from address from settings
+            $from_mail = Settings::get("mail_sender_address", "none");
+            $from_name = Settings::get("mail_sender_name", "");
+
+            if ($from_mail !== "none") {
+                $options['from'] = (!empty($from_name) ? $from_name . " " : "") . $from_mail;
+            }
+        }
+
+        if (!isset($options['reply_to']) || empty($options['reply_to'])) {
+            $reply_to = Settings::get("mail_reply_to", "");
+
+            if (!empty($reply_to)) {
+                $options['reply_to'] = $reply_to;
+            }
+        }
+
+        return $options;
+    }
+
+    public static function convertToArray ($to) : string {
+        if (is_array($to)) {
+            //convert array to RFC 2822 string
+            $to = implode(", ", $to);
+        }
+
+        return $to;
+    }
+
+    public static function generateHeader (array $options, string $to, bool $html_mail = false) {
+        //generate header
+        $headers = array();
+
+        if ($html_mail) {
+            $charset = Settings::get("mail_default_charset", "urf-8");
+
+            //add mime version, content type and charset
+            $headers[] = "MIME-Version: 1.0";
+            $headers[] = "Content-type: text/html; charset=" . $charset;
+
+            $headers[] = "To: " . $to;
+        }
+
+        $headers[] = "Content-Transfer-Encoding: quoted-printable";
+
+        if (isset($options['from']) && !empty($options['from'])) {
+            $headers[] = "From: " . $options['from'];
+        }
+
+        if (isset($options['reply_to']) && !empty($options['reply_to'])) {
+            $headers[] = "Reply-To: " . $options['reply_to'];
+        }
+
+        if (isset($options['cc'])) {
+            if (is_array($options['cc'])) {
+                //convert array to string
+                $options['cc'] = implode(", ", $options['cc']);
+            }
+
+            $headers[] = "Cc: " . $options['cc'];
+        }
+
+        if (isset($options['bcc'])) {
+            if (is_array($options['bcc'])) {
+                //convert array to string
+                $options['bcc'] = implode(", ", $options['bcc']);
+            }
+
+            $headers[] = "Bcc: " . $options['bcc'];
+        }
+
+        //add php X-Mailer header
+        $headers[] = "X-Mailer: PHP/" . phpversion();
+
+        if (count($headers) == 0) {
+            $headers = null;
+        } else {
+            //convert array to string
+            $headers = implode("\r\n", $headers);
+        }
 
-		return $headers;
-	}
+        return $headers;
+    }
 
 }
 

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;
 
 }
 

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;
+    }
 
 }
 

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);
+    }
 
 }